Jamie Satchell
/
JSatchell_SOFT253ReferredCoursework
Finished project.
Fork of ReferredCoursework2016 by
Diff: Components/hts221/hts221_class.cpp
- Revision:
- 26:e8bca468b3a6
- Parent:
- 24:92cc9c6e4b2b
- Child:
- 38:e06de1c26727
diff -r aaeaa3d8643a -r e8bca468b3a6 Components/hts221/hts221_class.cpp --- a/Components/hts221/hts221_class.cpp Wed Jun 03 15:02:51 2015 +0200 +++ b/Components/hts221/hts221_class.cpp Wed Jun 03 13:10:04 2015 +0000 @@ -286,8 +286,8 @@ H_rh = ( float )(((( H_T_out - H0_T0_out ) * ( H1_rh - H0_rh )) / ( H1_T0_out - H0_T0_out )) + H0_rh ); // Truncate to specific number of decimal digits - humidity_t = (uint16_t)(H_rh * pow(10, HUM_DECIMAL_DIGITS)); - *pfData = ((float)humidity_t) / pow(10, HUM_DECIMAL_DIGITS); + humidity_t = (uint16_t)(H_rh * pow(10.0f, HUM_DECIMAL_DIGITS)); + *pfData = ((float)humidity_t) / pow(10.0f, HUM_DECIMAL_DIGITS); // Prevent data going below 0% and above 100% due to linear interpolation if ( *pfData < 0.0f ) *pfData = 0.0f; @@ -354,9 +354,9 @@ T_degC = ((float)(T_out - T0_out)) / (T1_out - T0_out) * (T1_degC - T0_degC) + T0_degC; - temperature_t = (int16_t)(T_degC * pow(10, TEMP_DECIMAL_DIGITS)); + temperature_t = (int16_t)(T_degC * pow(10.0f, TEMP_DECIMAL_DIGITS)); - *pfData = ((float)temperature_t) / pow(10, TEMP_DECIMAL_DIGITS); + *pfData = ((float)temperature_t) / pow(10.0f, TEMP_DECIMAL_DIGITS); return HUM_TEMP_OK; }