|
|
@@ -227,7 +227,7 @@ float AD7124_DataToRes(uint32_t data, uint8_t resolution, float refRes, uint8_t
|
|
|
*/
|
|
|
float AD7124_DataToResDefault(uint32_t data)
|
|
|
{
|
|
|
- return (float)((((float)data - 8388608.0f) * 5110.0f) / (16.0f * 8388608.0f));
|
|
|
+ return (float)((((float)data - 8388608.0) * 5110.0) / (16.0 * 8388608.0));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -506,25 +506,25 @@ uint8_t AD7124_ReadAllReg(struct AD7124_ATY_Cfg* cfg, struct AD7124_ATY_Dev* dev
|
|
|
// AD7124_Calc(group_AD7124_Data);
|
|
|
|
|
|
// // IC Temp
|
|
|
-// fastTempCalc = ((float)(ad7124Code - 0x800000) / 13584.0f) - 272.5f;
|
|
|
+// fastTempCalc = ((float)(ad7124Code - 0x800000) / 13584.0) - 272.5;
|
|
|
|
|
|
// // RTD4
|
|
|
-// calcRes = AD7124_DataToRes(ad7124Code, 24, 5110.0f, 16);
|
|
|
+// calcRes = AD7124_DataToRes(ad7124Code, 24, 5110.0, 16);
|
|
|
// fastTempCalc = ALGO_Temp_RTD_Res_Fast(calcRes);
|
|
|
// aboveTempCalc = ALGO_Temp_RTD_Res_Above(calcRes);
|
|
|
// belowTempCalc = ALGO_Temp_RTD_Res_Below(calcRes);
|
|
|
|
|
|
// // NTC1K
|
|
|
-// calcRes = AD7124_DataToRes(ad7124Code, 24, 5110.0f, 2);
|
|
|
-// fastTempCalc = ALGO_ResToKelvinTemp((calcRes / 1000.0f), 1.0f, 3950);
|
|
|
+// calcRes = AD7124_DataToRes(ad7124Code, 24, 5110.0, 2);
|
|
|
+// fastTempCalc = ALGO_ResToKelvinTemp((calcRes / 1000.0), 1.0, 3950);
|
|
|
// // NTC10K
|
|
|
-// calcVol = (((float)ad7124Code - 8388608.0f) * 2500.0f / (1.0f * 8388608.0f));
|
|
|
-// calcRes = ((calcVol * 10.0f) / (2500.0f - calcVol));
|
|
|
-// fastTempCalc = ALGO_ResToKelvinTemp(calcRes, 10.0f, 3380);
|
|
|
+// calcVol = (((float)ad7124Code - 8388608.0) * 2500.0 / (1.0 * 8388608.0));
|
|
|
+// calcRes = ((calcVol * 10.0) / (2500.0 - calcVol));
|
|
|
+// fastTempCalc = ALGO_ResToKelvinTemp(calcRes, 10.0, 3380);
|
|
|
|
|
|
// // TC
|
|
|
-// calcVol = (((float)ad7124Code - 8388608.0f) * 2500.0f / (128.0f * 8388608.0f));
|
|
|
-// float coldTemp = 25.0f;
|
|
|
+// calcVol = (((float)ad7124Code - 8388608.0) * 2500.0 / (128.0 * 8388608.0));
|
|
|
+// float coldTemp = 25.0;
|
|
|
// float calcVolCold = ALGO_Temp_TC_TempToVol('T', coldTemp);
|
|
|
// calcVol += calcVolCold;
|
|
|
// aboveTempCalc = ALGO_Temp_TC_VolToTemp('T', calcVol);
|
|
|
@@ -557,29 +557,29 @@ uint8_t AD7124_ReadAllReg(struct AD7124_ATY_Cfg* cfg, struct AD7124_ATY_Dev* dev
|
|
|
|
|
|
// float calcVol = 0, calcRes = 0, fastTempCalc = 0, aboveTempCalc = 0, belowTempCalc = 0;
|
|
|
// if((codeGroup[4] & 0x0F) == 0){ // IC Temp
|
|
|
-// fastTempCalc = ((float)(ad7124Code - 0x800000) / 13584.0f) - 272.5f;
|
|
|
+// fastTempCalc = ((float)(ad7124Code - 0x800000) / 13584.0) - 272.5;
|
|
|
// }
|
|
|
// if((codeGroup[4] & 0x0F) == 1){ // RTD4
|
|
|
-// calcRes = AD7124_DataToRes(ad7124Code, 24, 5110.0f, 16);
|
|
|
+// calcRes = AD7124_DataToRes(ad7124Code, 24, 5110.0, 16);
|
|
|
// fastTempCalc = ALGO_Temp_RTD_Res_Fast(calcRes);
|
|
|
// aboveTempCalc = ALGO_Temp_RTD_Res_Above(calcRes);
|
|
|
// belowTempCalc = ALGO_Temp_RTD_Res_Below(calcRes);
|
|
|
// }
|
|
|
// if((codeGroup[4] & 0x0F) == 2){ // NTC1K
|
|
|
-// calcRes = AD7124_DataToRes(ad7124Code, 24, 5110.0f, 2);
|
|
|
-// fastTempCalc = ALGO_ResToKelvinTemp((calcRes / 1000.0f), 1.0f, 3950);
|
|
|
+// calcRes = AD7124_DataToRes(ad7124Code, 24, 5110.0, 2);
|
|
|
+// fastTempCalc = ALGO_ResToKelvinTemp((calcRes / 1000.0), 1.0, 3950);
|
|
|
// }
|
|
|
// if(((codeGroup[4] & 0x0F) == 3) || ((codeGroup[4] & 0x0F) == 4)){ // NTC10K
|
|
|
-// calcVol = (((float)ad7124Code - 8388608.0f) * 2500.0f / (1.0f * 8388608.0f));
|
|
|
-// calcRes = ((calcVol * 10.0f) / (2500.0f - calcVol));
|
|
|
+// calcVol = (((float)ad7124Code - 8388608.0) * 2500.0 / (1.0 * 8388608.0));
|
|
|
+// calcRes = ((calcVol * 10.0) / (2500.0 - calcVol));
|
|
|
// if((codeGroup[4] & 0x0F) == 3)
|
|
|
-// fastTempCalc = ALGO_ResToKelvinTemp(calcRes, 10.0f, 3380);
|
|
|
+// fastTempCalc = ALGO_ResToKelvinTemp(calcRes, 10.0, 3380);
|
|
|
// else if((codeGroup[4] & 0x0F) == 4)
|
|
|
-// fastTempCalc = ALGO_ResToKelvinTemp(calcRes, 10.0f, 3950);
|
|
|
+// fastTempCalc = ALGO_ResToKelvinTemp(calcRes, 10.0, 3950);
|
|
|
// }
|
|
|
// if(((codeGroup[4] & 0x0F) == 5) || ((codeGroup[4] & 0x0F) == 6)){ // TC
|
|
|
-// calcVol = (((float)ad7124Code - 8388608.0f) * 2500.0f / (128.0f * 8388608.0f));
|
|
|
-// float coldTemp = 25.0f;
|
|
|
+// calcVol = (((float)ad7124Code - 8388608.0) * 2500.0 / (128.0 * 8388608.0));
|
|
|
+// float coldTemp = 25.0;
|
|
|
// float calcVolCold = ALGO_Temp_TC_TempToVol('T', coldTemp);
|
|
|
// calcVol += calcVolCold;
|
|
|
// aboveTempCalc = ALGO_Temp_TC_VolToTemp('T', calcVol);
|