Merge pull request #331 from zuckschwerdt/fix-integerpromotion

clean up casts regarding C Integer Promotions

src/devices/fineoffset.c

@@ -63,8 +63,7 @@ static int fineoffset_WH2_callback(bitbuffer_t *bitbuffer) {
 
         // Nibble 5,6,7 contains 12 bits of temperature
         // The temperature is signed magnitude and scaled by 10
-        temp = bb[0][3];
-        temp |= (int16_t)(bb[0][2] & 0x0F) << 8;
+        temp = ((bb[0][2] & 0x0F) << 8) | bb[0][3];
         if(temp & 0x800) {
             temp &= 0x7FF;	// remove sign bit
             temp = -temp;	// reverse magnitude

src/devices/oil_watchman.c

@@ -80,7 +80,7 @@ static int oil_watchman_callback(bitbuffer_t *bitbuffer) {
 		else
 			// A depth reading of zero indicates no reading. Even with
 			// the sensor flat down on a table, it still reads about 13.
-			depth = b[6] | ((((uint16_t)b[5]) & 3) << 8);
+			depth = ((b[5] & 3) << 8) | b[6];
 
 		data = data_make("time", "", DATA_STRING, time_str,
 				 "model", "", DATA_STRING, "Oil Watchman",

src/devices/s3318p.c

@@ -86,8 +86,8 @@ static int s3318p_callback(bitbuffer_t *bitbuffer) {
     channel = (uint8_t)(((bb[1][1] & 0x30) >> 4) + 1);
     sensor_id = (uint8_t)(bb[1][0]);
 
-    temperature_with_offset = (uint16_t)(((bb[1][2] & 0x0F) << 8) | (bb[1][2] & 0xF0) | (bb[1][1] & 0x0F));
-    temperature_f = (float)((temperature_with_offset - 900) / 10.0);
+    temperature_with_offset = ((bb[1][2] & 0x0F) << 8) | (bb[1][2] & 0xF0) | (bb[1][1] & 0x0F);
+    temperature_f = (temperature_with_offset - 900) / 10.0;
 
     if (debug_output) {
       bitbuffer_print(bitbuffer);