SKY-20210407USB\Administrator před 1 rokem
rodič
revize
a7f2b94488

+ 1 - 1
AD5245_ATY.c

@@ -58,7 +58,7 @@ uint8_t AD5245_SetValue(uint8_t value, struct AD5245_ATY_Dev* dev)
     errCode = dev->i2cProcess(dev->addr, data_t, 2, _ATY_RW_W);
     errCode = dev->i2cProcess(dev->addr, data_t, 2, _ATY_RW_W);
 
 
     if(dev->debugEnable == 1){
     if(dev->debugEnable == 1){
-        dev->LOG("\r\nAD5245 %02X ResSet:  %03d | %d Ohm", dev->addr, value, (uint16_t)(((0xFF - value) * 1.0f * 10.0f / 256.0f) * 1000));
+        dev->LOG("\r\nAD5245 %02X ResSet:  %03d | %d Ohm", dev->addr, value, (uint16_t)(((0xFF - value) * 1.0 * 10.0 / 256.0) * 1000));
         dev->LOG("\r\nAD5245 %02X set : %03d | %03d", dev->addr, data_t[0], data_t[1]);
         dev->LOG("\r\nAD5245 %02X set : %03d | %03d", dev->addr, data_t[0], data_t[1]);
     }
     }
     __ATY_UNLOCK(dev);
     __ATY_UNLOCK(dev);

+ 20 - 20
AD7124_ATY.c

@@ -227,7 +227,7 @@ float AD7124_DataToRes(uint32_t data, uint8_t resolution, float refRes, uint8_t
  */
  */
 float AD7124_DataToResDefault(uint32_t data)
 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);
 // AD7124_Calc(group_AD7124_Data);
 
 
 // // IC Temp
 // // IC Temp
-// fastTempCalc = ((float)(ad7124Code - 0x800000) / 13584.0f) - 272.5f;
+// fastTempCalc = ((float)(ad7124Code - 0x800000) / 13584.0) - 272.5;
 
 
 // // RTD4
 // // RTD4
-// calcRes = AD7124_DataToRes(ad7124Code, 24, 5110.0f, 16);
+// calcRes = AD7124_DataToRes(ad7124Code, 24, 5110.0, 16);
 // fastTempCalc = ALGO_Temp_RTD_Res_Fast(calcRes);
 // fastTempCalc = ALGO_Temp_RTD_Res_Fast(calcRes);
 // aboveTempCalc = ALGO_Temp_RTD_Res_Above(calcRes);
 // aboveTempCalc = ALGO_Temp_RTD_Res_Above(calcRes);
 // belowTempCalc = ALGO_Temp_RTD_Res_Below(calcRes);
 // belowTempCalc = ALGO_Temp_RTD_Res_Below(calcRes);
 
 
 // // NTC1K
 // // 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
 // // 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
 // // 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);
 // float calcVolCold = ALGO_Temp_TC_TempToVol('T', coldTemp);
 // calcVol += calcVolCold;
 // calcVol += calcVolCold;
 // aboveTempCalc = ALGO_Temp_TC_VolToTemp('T', calcVol);
 // 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;
 //     float calcVol = 0, calcRes = 0, fastTempCalc = 0, aboveTempCalc = 0, belowTempCalc = 0;
 //     if((codeGroup[4] & 0x0F) == 0){                                             // IC Temp
 //     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
 //     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);
 //         fastTempCalc = ALGO_Temp_RTD_Res_Fast(calcRes);
 //         aboveTempCalc = ALGO_Temp_RTD_Res_Above(calcRes);
 //         aboveTempCalc = ALGO_Temp_RTD_Res_Above(calcRes);
 //         belowTempCalc = ALGO_Temp_RTD_Res_Below(calcRes);
 //         belowTempCalc = ALGO_Temp_RTD_Res_Below(calcRes);
 //     }
 //     }
 //     if((codeGroup[4] & 0x0F) == 2){                                             // NTC1K
 //     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
 //     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)
 //         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)
 //         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
 //     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);
 //         float calcVolCold = ALGO_Temp_TC_TempToVol('T', coldTemp);
 //         calcVol += calcVolCold;
 //         calcVol += calcVolCold;
 //         aboveTempCalc = ALGO_Temp_TC_VolToTemp('T', calcVol);
 //         aboveTempCalc = ALGO_Temp_TC_VolToTemp('T', calcVol);

+ 2 - 2
ADS1112_ATY.c

@@ -106,9 +106,9 @@ uint16_t ADS1112_Read(uint8_t addr, uint8_t channel)
 float ADS1112_VoltageConvert(uint16_t u16Data)
 float ADS1112_VoltageConvert(uint16_t u16Data)
 {
 {
     if(u16Data > 0x7FFF)
     if(u16Data > 0x7FFF)
-        return ((((float)(u16Data - 0x8000) / 65536.0f) * 2.048f * 2) + (VREF_COM - 2.048f));
+        return ((((float)(u16Data - 0x8000) / 65536.0) * 2.048 * 2) + (VREF_COM - 2.048));
     else
     else
-        return ((((float)(u16Data + 0x8000) / 65536.0f) * 2.048f * 2) + (VREF_COM - 2.048f));
+        return ((((float)(u16Data + 0x8000) / 65536.0) * 2.048 * 2) + (VREF_COM - 2.048));
 }
 }
 
 
 
 

+ 1 - 1
ADS1112_ATY.h

@@ -55,7 +55,7 @@
 #define ADS1112_ADDRESS  (0x4F)
 #define ADS1112_ADDRESS  (0x4F)
 #endif
 #endif
 
 
-#define VREF_COM    1.24f
+#define VREF_COM    1.24
 // #define __DEBUG_ADS1112_ATY
 // #define __DEBUG_ADS1112_ATY
 // #define ADS1112_I2C I2C_C1
 // #define ADS1112_I2C I2C_C1
 
 

+ 4 - 4
ALGO_AlgorithmBase_ATY.c

@@ -227,16 +227,16 @@ float ALGO_NumberSuitScop(float valueIn, float scopMin, float scopMax, float ste
 
 
 float ALGO_Sqrt_NewtonNumber(float x)
 float ALGO_Sqrt_NewtonNumber(float x)
 {
 {
-    float xhalf = 0.5f * x;
+    float xhalf = 0.5 * x;
     int i = *(int*)&x;
     int i = *(int*)&x;
 
 
     if(!x) return 0;
     if(!x) return 0;
 
 
     i = 0x5f375a86 - (i >> 1);      // beautiful number
     i = 0x5f375a86 - (i >> 1);      // beautiful number
     x = *(float*)&i;
     x = *(float*)&i;
-    x = x * (1.5f - xhalf * x * x); // Newton iteration
-    x = x * (1.5f - xhalf * x * x); // Newton iteration
-    x = x * (1.5f - xhalf * x * x); // Newton iteration
+    x = x * (1.5 - xhalf * x * x); // Newton iteration
+    x = x * (1.5 - xhalf * x * x); // Newton iteration
+    x = x * (1.5 - xhalf * x * x); // Newton iteration
     return (1 / x);
     return (1 / x);
 }
 }
 
 

+ 3 - 1
ALGO_AlgorithmBase_ATY.h

@@ -392,7 +392,7 @@ typedef struct rcPara
 
 
 
 
 
 
-// #define SIGMOID(x) (1.0f / (1.0f + exp(-x)))
+// #define SIGMOID(x) (1.0 / (1.0 + exp(-x)))
 
 
 
 
 float ALGO_MATH_POW_EASY(float x, uint8_t n);
 float ALGO_MATH_POW_EASY(float x, uint8_t n);
@@ -407,6 +407,8 @@ float ALGO_NumberSuitScop(float valueIn, float scopMin, float scopMax, float ste
 double rcLpFilter(rcPara_t* rcPara, double val);
 double rcLpFilter(rcPara_t* rcPara, double val);
 double rcHpFilter(rcPara_t* rcPara, double val);
 double rcHpFilter(rcPara_t* rcPara, double val);
 
 
+uint16_t binarySearch(const double* arr, uint16_t size, double target);
+
 
 
 #ifdef __DEBUG_ALGO_AlgorithmBase_ATY
 #ifdef __DEBUG_ALGO_AlgorithmBase_ATY
 void ALGO_Swap_Test(void);
 void ALGO_Swap_Test(void);

+ 17 - 17
ALGO_Algorithm_ATY.c

@@ -95,7 +95,7 @@ void WavePeakZeroPointFind(
     deepKalmanWave[0] = deepKalmanWave[size * 3 / 5];
     deepKalmanWave[0] = deepKalmanWave[size * 3 / 5];
     for(i = size * 3 / 5; i < size * 4 / 5; i++)
     for(i = size * 3 / 5; i < size * 4 / 5; i++)
         tempKalmanDiff += deepKalmanWave[i] - deepKalmanWave[size * 3 / 5];
         tempKalmanDiff += deepKalmanWave[i] - deepKalmanWave[size * 3 / 5];
-    tempKalmanDiff /= (float)(size / 5.0f);
+    tempKalmanDiff /= (float)(size / 5.0);
     deepKalmanWave[0] += tempKalmanDiff;        // wave averange
     deepKalmanWave[0] += tempKalmanDiff;        // wave averange
     // printf("\r\ndeepKalmanAve: %d\r\n", deepKalmanWave[0]);
     // printf("\r\ndeepKalmanAve: %d\r\n", deepKalmanWave[0]);
 
 
@@ -307,7 +307,7 @@ void WaveParamCalc(uint16_t* peakZeroPoints, uint16_t firstWavePoint, uint16_t s
                     if(temp_kfpDeep.L_P == 1)
                     if(temp_kfpDeep.L_P == 1)
                         temp_kfpDeep.L_P = newSpace;
                         temp_kfpDeep.L_P = newSpace;
                     // carry, float to uint
                     // carry, float to uint
-                    wave_quarterSpace = ALGO_KalmanFilter1D(&temp_kfpDeep, (float)newSpace) + 0.6f;
+                    wave_quarterSpace = ALGO_KalmanFilter1D(&temp_kfpDeep, (float)newSpace) + 0.6;
                     // printf("$%d %d;", newSpace, wave_quarterSpace);
                     // printf("$%d %d;", newSpace, wave_quarterSpace);
                 }
                 }
                 else
                 else
@@ -325,8 +325,8 @@ void WaveParamCalc(uint16_t* peakZeroPoints, uint16_t firstWavePoint, uint16_t s
 
 
     if(wave_quarterSpace > 0)
     if(wave_quarterSpace > 0)
     {
     {
-        wavePeriod = wave_quarterSpace * 4.0f * ADC_TIME_UNIT;
-        waveFreq = 1000.0f / wavePeriod;
+        wavePeriod = wave_quarterSpace * 4.0 * ADC_TIME_UNIT;
+        waveFreq = 1000.0 / wavePeriod;
         // printf("$%d %f %f;", wave_quarterSpace, wavePeriod, waveFreq);
         // printf("$%d %f %f;", wave_quarterSpace, wavePeriod, waveFreq);
 
 
         peakZeroPoints[0] = wave_quarterSpace;
         peakZeroPoints[0] = wave_quarterSpace;
@@ -361,7 +361,7 @@ void WaveVppCalc(uint16_t* kalmanWave, uint16_t* peakZeroPoints, uint16_t size)
         }
         }
     }
     }
 
 
-    maxVppVoltagge = 2.5 * (wave_maxVpp * WAVE_KALMAN_ATTENUATION) / 4096.0f;
+    maxVppVoltagge = 2.5 * (wave_maxVpp * WAVE_KALMAN_ATTENUATION) / 4096.0;
 }
 }
 
 
 
 
@@ -429,10 +429,10 @@ void WaveAnalyse_Test(uint16_t* testWaveDataIn, uint8_t WAVE_DISPLAY_FLAG)
                 printf("%d ", wave_firstWavePeakPoint * 10);
                 printf("%d ", wave_firstWavePeakPoint * 10);
                 // printf("%f ", wave_firstWavePeakPoint * ADC_TIME_UNIT);
                 // printf("%f ", wave_firstWavePeakPoint * ADC_TIME_UNIT);
                 // printf("%d ", wave_quarterSpace);
                 // printf("%d ", wave_quarterSpace);
-                // printf("%f ", wave_quarterSpace * 4.0f * ADC_TIME_UNIT);
-                // printf("%f ", 1000.0f / (wave_quarterSpace * 4.0f * ADC_TIME_UNIT));
+                // printf("%f ", wave_quarterSpace * 4.0 * ADC_TIME_UNIT);
+                // printf("%f ", 1000.0 / (wave_quarterSpace * 4.0 * ADC_TIME_UNIT));
                 // printf("%d ", wave_maxVpp);
                 // printf("%d ", wave_maxVpp);
-                // printf("%f ", 2.5 * (wave_maxVpp * WAVE_KALMAN_ATTENUATION) / 4096.0f);
+                // printf("%f ", 2.5 * (wave_maxVpp * WAVE_KALMAN_ATTENUATION) / 4096.0);
                 printf(";");
                 printf(";");
             }
             }
         }
         }
@@ -443,10 +443,10 @@ void WaveAnalyse_Test(uint16_t* testWaveDataIn, uint8_t WAVE_DISPLAY_FLAG)
             // printf("%f ", wave_firstWavePeakPoint * ADC_TIME_UNIT);
             // printf("%f ", wave_firstWavePeakPoint * ADC_TIME_UNIT);
             printf("%d ", wave_quarterSpace * 40);
             printf("%d ", wave_quarterSpace * 40);
             // printf("%d ", wave_quarterSpace);
             // printf("%d ", wave_quarterSpace);
-            // printf("%f ", wave_quarterSpace * 4.0f * ADC_TIME_UNIT);
-            // printf("%f ", 1000.0f / (wave_quarterSpace * 4.0f * ADC_TIME_UNIT));
+            // printf("%f ", wave_quarterSpace * 4.0 * ADC_TIME_UNIT);
+            // printf("%f ", 1000.0 / (wave_quarterSpace * 4.0 * ADC_TIME_UNIT));
             printf("%d ", wave_maxVpp);
             printf("%d ", wave_maxVpp);
-            // printf("%f ", 2.5 * (wave_maxVpp * WAVE_KALMAN_ATTENUATION) / 4096.0f);
+            // printf("%f ", 2.5 * (wave_maxVpp * WAVE_KALMAN_ATTENUATION) / 4096.0);
             printf(";");
             printf(";");
         }
         }
 
 
@@ -502,18 +502,18 @@ void WaveAnalyse_Test(uint16_t* testWaveDataIn, uint8_t WAVE_DISPLAY_FLAG)
 //     else if((mainReg.powerQuantity < FULL_BAT_VOLTAGE) && (mainReg.powerQuantity >= TWENTY_BAT_VOLTAGE))
 //     else if((mainReg.powerQuantity < FULL_BAT_VOLTAGE) && (mainReg.powerQuantity >= TWENTY_BAT_VOLTAGE))
 //     {
 //     {
 //         mainReg.powerQuantity =
 //         mainReg.powerQuantity =
-//             ((17220.0f * (float)mainReg.powerQuantity / (float)mainReg.maxBatVoltage)
-//                 - ((8820.0f * (float)mainReg.powerQuantity * (float)mainReg.powerQuantity)
+//             ((17220.0 * (float)mainReg.powerQuantity / (float)mainReg.maxBatVoltage)
+//                 - ((8820.0 * (float)mainReg.powerQuantity * (float)mainReg.powerQuantity)
 //                     / ((float)mainReg.maxBatVoltage * (float)mainReg.maxBatVoltage))
 //                     / ((float)mainReg.maxBatVoltage * (float)mainReg.maxBatVoltage))
-//                 - 8305.0f) * 100;
+//                 - 8305.0) * 100;
 //     }
 //     }
 //     else if((mainReg.powerQuantity < TWENTY_BAT_VOLTAGE) && (mainReg.powerQuantity > EMPTY_BAT_VOLTAGE))
 //     else if((mainReg.powerQuantity < TWENTY_BAT_VOLTAGE) && (mainReg.powerQuantity > EMPTY_BAT_VOLTAGE))
 //     {
 //     {
 //         mainReg.powerQuantity =
 //         mainReg.powerQuantity =
-//             (((720.0f * (float)mainReg.powerQuantity * (float)mainReg.powerQuantity)
+//             (((720.0 * (float)mainReg.powerQuantity * (float)mainReg.powerQuantity)
 //                 / ((float)mainReg.maxBatVoltage * (float)mainReg.maxBatVoltage))
 //                 / ((float)mainReg.maxBatVoltage * (float)mainReg.maxBatVoltage))
-//                 - ((7200.0f * (float)mainReg.powerQuantity) / (7 * (float)mainReg.maxBatVoltage))
-//                 + (18000.0f / 49.0f)) * 100;
+//                 - ((7200.0 * (float)mainReg.powerQuantity) / (7 * (float)mainReg.maxBatVoltage))
+//                 + (18000.0 / 49.0)) * 100;
 //     }
 //     }
 //     else// if(mainReg.powerQuantity <= EMPTY_BAT_VOLTAGE)
 //     else// if(mainReg.powerQuantity <= EMPTY_BAT_VOLTAGE)
 //     {
 //     {

+ 1 - 1
ALGO_Algorithm_ATY.h

@@ -89,7 +89,7 @@ void WaveFirstPulseFind(uint16_t* inputWave, uint16_t* peakZeroPoints, uint16_t
 
 
 // trans time(12bit@36MHz ADCCLK) = point to point time
 // trans time(12bit@36MHz ADCCLK) = point to point time
 // 15 x 1_000_000us / 36_000_000Hz = 5/12us = 0.4167us
 // 15 x 1_000_000us / 36_000_000Hz = 5/12us = 0.4167us
-#define ADC_TIME_UNIT               (15.0f / 36.0f)
+#define ADC_TIME_UNIT               (15.0 / 36.0)
 void WaveParamCalc(uint16_t* peakZeroPoints, uint16_t firstWavePoint, uint16_t size);
 void WaveParamCalc(uint16_t* peakZeroPoints, uint16_t firstWavePoint, uint16_t size);
 void WaveVppCalc(uint16_t* peakZeroPoints, uint16_t* kalmanWave, uint16_t size);
 void WaveVppCalc(uint16_t* peakZeroPoints, uint16_t* kalmanWave, uint16_t size);
 
 

+ 1 - 1
ALGO_Bat_ATY.c

@@ -79,7 +79,7 @@ uint8_t Bat_AD_Levels(float vin, uint8_t lastLevel, float vmax, float vmin, uint
 
 
 
 
 // mbP_CVBV = 3.2;//ADC_Get(&hadc1, ADC_CHANNEL_VREFINT) * VOL_PER_AD_ATY;
 // mbP_CVBV = 3.2;//ADC_Get(&hadc1, ADC_CHANNEL_VREFINT) * VOL_PER_AD_ATY;
-// mbP_CVPV = Bat_AD_Levels(mbP_CVBV, mbP_CVPV, 4.18f, 3.20f, 5, 0.096f);
+// mbP_CVPV = Bat_AD_Levels(mbP_CVBV, mbP_CVPV, 4.18, 3.20, 5, 0.096);
 
 
 #endif /* __ALGO_Bat_ATY_C */
 #endif /* __ALGO_Bat_ATY_C */
 
 

+ 1 - 1
ALGO_Kalman_ATY.c

@@ -157,7 +157,7 @@ float ALGO_KalmanFilter1D(ALGO_Kalman1D_S* kfp, float input)
  */
  */
 float ALGO_KalmanFilter2D(ALGO_Kalman2D_S* kfp, float input)
 float ALGO_KalmanFilter2D(ALGO_Kalman2D_S* kfp, float input)
 {
 {
-    float temp[3] = {0.0f};
+    float temp[3] = {0.0};
 
 
     /* Step1: Predict */
     /* Step1: Predict */
     kfp->X[0] = kfp->A[0][0] * kfp->X[0] + kfp->A[0][1] * kfp->X[1];
     kfp->X[0] = kfp->A[0][0] * kfp->X[0] + kfp->A[0][1] * kfp->X[1];

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 37
ALGO_RT_Table_NTC10K_B3950.h


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 37
ALGO_RT_Table_PT100.h


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 37
ALGO_RT_Table_PT1000.h


+ 79 - 50
ALGO_Temperature_ATY.c

@@ -124,7 +124,7 @@ double ALGO_Temp_RTD_Res_Above(double rtdRes)
     return (double)((-(3.9083e-3)
     return (double)((-(3.9083e-3)
         + ALGO_Sqrt_NewtonNumber(((3.9083e-3) * (3.9083e-3))
         + ALGO_Sqrt_NewtonNumber(((3.9083e-3) * (3.9083e-3))
         // + sqrt(((3.9083e-3) * (3.9083e-3))
         // + sqrt(((3.9083e-3) * (3.9083e-3))
-            - 4 * (-5.775e-7) * (1 - (rtdRes / 100.0f))))
+            - 4 * (-5.775e-7) * (1 - (rtdRes / 100.0))))
         / (2 * (-5.775e-7)));
         / (2 * (-5.775e-7)));
 }
 }
 double ALGO_Temp_RTD_Res_Below(double rtdRes)
 double ALGO_Temp_RTD_Res_Below(double rtdRes)
@@ -235,7 +235,7 @@ double ALGO_Temp_RTD_Res_PT100(double resist)
 
 
 double ALGO_Temp_RTD_Res_PT1000(double resist)
 double ALGO_Temp_RTD_Res_PT1000(double resist)
 {
 {
-    return ALGO_Temp_RTD_Res_PT100(resist / 10.0f);
+    return ALGO_Temp_RTD_Res_PT100(resist / 10.0);
 }
 }
 
 
 
 
@@ -326,64 +326,93 @@ double ALGO_Temp_TC_VolToTemp(uint8_t type, double voltage)
 
 
 
 
 
 
-uint16_t binarySearch(const double* arr, uint16_t size, double target) {
-    for(uint16_t left = 0, right = size - 1, mid; left <= right; ) {
-        if((arr[mid = left + (right - left) / 2]) == target) return mid;
-        (arr[mid] < target) ? (left = mid + 1) : (right = mid - 1);
-    }
-    return -1;
-}
-
-double ALGO_RT_Table_R2T(double R, double* tableT, double* tableR, uint16_t tableSize)
+// T in C, R in R
+/**
+ * @brief
+ *
+ * @param R in R, or v to Thermocouple, just follow your tableR
+ * @param tableT
+ * @param tableR
+ * @param tableSize T/R table must be the same size
+ * @return double
+ */
+double ALGO_RT_Table_R2T(double R, const double* tableT, const double* tableR, uint16_t tableSize)
 {
 {
-    // check border
-    if(R < tableR[tableSize - 1] ||
-        R > tableR[0]) {
-        return 0.0;
+    // negative temperature coefficient, like ntc
+    if(tableR[0] > tableR[1]){
+        // check border
+        if(R < tableR[tableSize - 1] || R > tableR[0]) {
+            return -273.15;
+        }
+        // cycle
+        for(uint16_t i = 0; i < tableSize - 1; i++) {
+            if(R == tableR[i]){
+                return tableT[i];
+            }
+            if(R <= tableR[i] && R >= tableR[i + 1]) {
+                double T1 = tableT[i];
+                double T2 = tableT[i + 1];
+                double R1 = tableR[i];
+                double R2 = tableR[i + 1];
+                return T1 + (R - R1) * (T2 - T1) / (R2 - R1);
+            }
+        }
     }
     }
-    uint16_t index = binarySearch(tableR, tableSize, R);
-    if(index < 0 || index >= tableSize - 1) {
-        return 0.0;
+    // positive temperature coefficient, like rtd
+    else{
+        // check border
+        if(R > tableR[tableSize - 1] || R < tableR[0]) {
+            return -273.15;
+        }
+        // cycle
+        for(uint16_t i = 0; i < tableSize - 1; i++) {
+            if(R == tableR[i]){
+                return tableT[i];
+            }
+            if(R >= tableR[i] && R <= tableR[i + 1]) {
+                double T1 = tableT[i];
+                double T2 = tableT[i + 1];
+                double R1 = tableR[i];
+                double R2 = tableR[i + 1];
+                return T1 + (R - R1) * (T2 - T1) / (R2 - R1);
+            }
+        }
     }
     }
-    double T1 = tableT[index];
-    double T2 = tableT[index + 1];
-    double R1 = tableR[index];
-    double R2 = tableR[index + 1];
-    return T1 + (R - R1) * (T2 - T1) / (R2 - R1);
 
 
-    // cycle
-    // for(uint16_t i = 0; i < tableSize - 1; i++) {
-    //     if(R == tableR[i]){
-    //         return tableT[i];
-    //     }
-    //     if(R <= tableR[i] && R >= tableR[i + 1]) {
-    //         double T1 = tableT[i];
-    //         double T2 = tableT[i + 1];
-    //         double R1 = tableR[i];
-    //         double R2 = tableR[i + 1];
-    //         return T1 + (R - R1) * (T2 - T1) / (R2 - R1);
-    //     }
-    // }
-    // return 0.0;
+    return -273.15;
 }
 }
 
 
-double ALGO_RT_Table_T2R(double T, double* tableT, double* tableR, uint16_t tableSize)
+
+/**
+ * @brief
+ *
+ * @param T in C, just follow your tableT
+ * @param tableT
+ * @param tableR
+ * @param tableSize T/R table must be the same size
+ * @return double
+ */
+double ALGO_RT_Table_T2R(double T, const double* tableT, const double* tableR, uint16_t tableSize)
 {
 {
     // check border
     // check border
-    if(T < tableT[tableSize - 1] ||
-        T > tableT[0]) {
-        return 0.0;
+    if(T > tableT[tableSize - 1] ||
+        T < tableT[0]) {
+        return -273.15;
     }
     }
-    uint16_t index = binarySearch(tableT, tableSize, R);
-    if(index < 0 || index >= tableSize - 1) {
-        return 0.0;
+    // cycle
+    for(uint16_t i = 0; i < tableSize - 1; i++) {
+        if(T == tableR[i]){
+            return tableT[i];
+        }
+        if(T <= tableR[i] && T >= tableR[i + 1]) {
+            double T1 = tableT[i];
+            double T2 = tableT[i + 1];
+            double R1 = tableR[i];
+            double R2 = tableR[i + 1];
+            return R1 + (T - T1) * (R2 - R1) / (T2 - T1);
+        }
     }
     }
-    double T1 = tableT[index];
-    double T2 = tableT[index + 1];
-    double R1 = tableR[index];
-    double R2 = tableR[index + 1];
-
-    return R1 + (T - T1) * (R2 - R1) / (T2 - T1);
+    return -273.15;
 }
 }
 
 
 
 

+ 4 - 0
ALGO_Temperature_ATY.h

@@ -76,6 +76,10 @@ double ALGO_Temp_RTD_Res_PT1000(double resist);
 double ALGO_Temp_TC_TempToVol(uint8_t type, double Temp);
 double ALGO_Temp_TC_TempToVol(uint8_t type, double Temp);
 double ALGO_Temp_TC_VolToTemp(uint8_t type, double voltage);
 double ALGO_Temp_TC_VolToTemp(uint8_t type, double voltage);
 
 
+double ALGO_RT_Table_R2T(double R, const double* tableT, const double* tableR, uint16_t tableSize);
+double ALGO_RT_Table_T2R(double T, const double* tableT, const double* tableR, uint16_t tableSize);
+
+
 
 
 #endif /* __ALGO_Temperature_ATY_H */
 #endif /* __ALGO_Temperature_ATY_H */
 
 

+ 11 - 11
ALGO_WaveAnalyse_ATY.c

@@ -95,7 +95,7 @@ void WavePeakZeroPointFind(
     deepKalmanWave[0] = deepKalmanWave[size * 3 / 5];
     deepKalmanWave[0] = deepKalmanWave[size * 3 / 5];
     for(i = size * 3 / 5; i < size * 4 / 5; i++)
     for(i = size * 3 / 5; i < size * 4 / 5; i++)
         tempKalmanDiff += deepKalmanWave[i] - deepKalmanWave[size * 3 / 5];
         tempKalmanDiff += deepKalmanWave[i] - deepKalmanWave[size * 3 / 5];
-    tempKalmanDiff /= (float)(size / 5.0f);
+    tempKalmanDiff /= (float)(size / 5.0);
     deepKalmanWave[0] += tempKalmanDiff;        // wave averange
     deepKalmanWave[0] += tempKalmanDiff;        // wave averange
     // printf("\r\ndeepKalmanAve: %d\r\n", deepKalmanWave[0]);
     // printf("\r\ndeepKalmanAve: %d\r\n", deepKalmanWave[0]);
 
 
@@ -307,7 +307,7 @@ void WaveParamCalc(uint16_t* peakZeroPoints, uint16_t firstWavePoint, uint16_t s
                     if(temp_kfpDeep.L_P == 1)
                     if(temp_kfpDeep.L_P == 1)
                         temp_kfpDeep.L_P = newSpace;
                         temp_kfpDeep.L_P = newSpace;
                     // carry, float to uint
                     // carry, float to uint
-                    wave_quarterSpace = ALGO_KalmanFilter1D(&temp_kfpDeep, (float)newSpace) + 0.6f;
+                    wave_quarterSpace = ALGO_KalmanFilter1D(&temp_kfpDeep, (float)newSpace) + 0.6;
                     // printf("$%d %d;", newSpace, wave_quarterSpace);
                     // printf("$%d %d;", newSpace, wave_quarterSpace);
                 }
                 }
                 else
                 else
@@ -325,8 +325,8 @@ void WaveParamCalc(uint16_t* peakZeroPoints, uint16_t firstWavePoint, uint16_t s
 
 
     if(wave_quarterSpace > 0)
     if(wave_quarterSpace > 0)
     {
     {
-        wavePeriod = wave_quarterSpace * 4.0f * ADC_TIME_UNIT;
-        waveFreq = 1000.0f / wavePeriod;
+        wavePeriod = wave_quarterSpace * 4.0 * ADC_TIME_UNIT;
+        waveFreq = 1000.0 / wavePeriod;
         // printf("$%d %f %f;", wave_quarterSpace, wavePeriod, waveFreq);
         // printf("$%d %f %f;", wave_quarterSpace, wavePeriod, waveFreq);
 
 
         peakZeroPoints[0] = wave_quarterSpace;
         peakZeroPoints[0] = wave_quarterSpace;
@@ -361,7 +361,7 @@ void WaveVppCalc(uint16_t* kalmanWave, uint16_t* peakZeroPoints, uint16_t size)
         }
         }
     }
     }
 
 
-    maxVppVoltagge = 2.5 * (wave_maxVpp * WAVE_KALMAN_ATTENUATION) / 4096.0f;
+    maxVppVoltagge = 2.5 * (wave_maxVpp * WAVE_KALMAN_ATTENUATION) / 4096.0;
 }
 }
 
 
 
 
@@ -429,10 +429,10 @@ void WaveAnalyse_Test(uint16_t* testWaveDataIn, uint8_t WAVE_DISPLAY_FLAG)
                 printf("%d ", wave_firstWavePeakPoint * 10);
                 printf("%d ", wave_firstWavePeakPoint * 10);
                 // printf("%f ", wave_firstWavePeakPoint * ADC_TIME_UNIT);
                 // printf("%f ", wave_firstWavePeakPoint * ADC_TIME_UNIT);
                 // printf("%d ", wave_quarterSpace);
                 // printf("%d ", wave_quarterSpace);
-                // printf("%f ", wave_quarterSpace * 4.0f * ADC_TIME_UNIT);
-                // printf("%f ", 1000.0f / (wave_quarterSpace * 4.0f * ADC_TIME_UNIT));
+                // printf("%f ", wave_quarterSpace * 4.0 * ADC_TIME_UNIT);
+                // printf("%f ", 1000.0 / (wave_quarterSpace * 4.0 * ADC_TIME_UNIT));
                 // printf("%d ", wave_maxVpp);
                 // printf("%d ", wave_maxVpp);
-                // printf("%f ", 2.5 * (wave_maxVpp * WAVE_KALMAN_ATTENUATION) / 4096.0f);
+                // printf("%f ", 2.5 * (wave_maxVpp * WAVE_KALMAN_ATTENUATION) / 4096.0);
                 printf(";");
                 printf(";");
             }
             }
         }
         }
@@ -443,10 +443,10 @@ void WaveAnalyse_Test(uint16_t* testWaveDataIn, uint8_t WAVE_DISPLAY_FLAG)
             // printf("%f ", wave_firstWavePeakPoint * ADC_TIME_UNIT);
             // printf("%f ", wave_firstWavePeakPoint * ADC_TIME_UNIT);
             printf("%d ", wave_quarterSpace * 40);
             printf("%d ", wave_quarterSpace * 40);
             // printf("%d ", wave_quarterSpace);
             // printf("%d ", wave_quarterSpace);
-            // printf("%f ", wave_quarterSpace * 4.0f * ADC_TIME_UNIT);
-            // printf("%f ", 1000.0f / (wave_quarterSpace * 4.0f * ADC_TIME_UNIT));
+            // printf("%f ", wave_quarterSpace * 4.0 * ADC_TIME_UNIT);
+            // printf("%f ", 1000.0 / (wave_quarterSpace * 4.0 * ADC_TIME_UNIT));
             printf("%d ", wave_maxVpp);
             printf("%d ", wave_maxVpp);
-            // printf("%f ", 2.5 * (wave_maxVpp * WAVE_KALMAN_ATTENUATION) / 4096.0f);
+            // printf("%f ", 2.5 * (wave_maxVpp * WAVE_KALMAN_ATTENUATION) / 4096.0);
             printf(";");
             printf(";");
         }
         }
 
 

+ 1 - 1
ALGO_WaveAnalyse_ATY.h

@@ -62,7 +62,7 @@ void WaveFirstPulseFind(uint16_t* inputWave, uint16_t* peakZeroPoints, uint16_t
 
 
 // trans time(12bit@36MHz ADCCLK) = point to point time
 // trans time(12bit@36MHz ADCCLK) = point to point time
 // 15 x 1_000_000us / 36_000_000Hz = 5/12us = 0.4167us
 // 15 x 1_000_000us / 36_000_000Hz = 5/12us = 0.4167us
-#define ADC_TIME_UNIT               (15.0f / 36.0f)
+#define ADC_TIME_UNIT               (15.0 / 36.0)
 void WaveParamCalc(uint16_t* peakZeroPoints, uint16_t firstWavePoint, uint16_t size);
 void WaveParamCalc(uint16_t* peakZeroPoints, uint16_t firstWavePoint, uint16_t size);
 void WaveVppCalc(uint16_t* peakZeroPoints, uint16_t* kalmanWave, uint16_t size);
 void WaveVppCalc(uint16_t* peakZeroPoints, uint16_t* kalmanWave, uint16_t size);
 
 

+ 1 - 1
HW_UART_ATY.c

@@ -139,7 +139,7 @@ void UartSendFloatStr(float dataFloat, uint8_t DECIMALS_NUM, struct HW_UART_ATY_
 // void UartSendFloatStr(double dataFloat)
 // void UartSendFloatStr(double dataFloat)
 {
 {
     uint8_t i = 0;
     uint8_t i = 0;
-    uint8_t dataStr[10];    // ulongint 4294967295, 6.4f
+    uint8_t dataStr[10];    // ulongint 4294967295, 6.4
     unsigned long int tempSaveData = 0;
     unsigned long int tempSaveData = 0;
 
 
     for(i = 0; i < 10; i++)
     for(i = 0; i < 10; i++)

+ 1 - 1
MOTOR_DC_ATY.h

@@ -101,7 +101,7 @@ void MOTOR_DC_StateMachine(struct MOTOR_DC_ATY_Dev* dev);
 #define MOTOR_DC_SET_RUNNING           1
 #define MOTOR_DC_SET_RUNNING           1
 
 
 /* for motor soft start  */
 /* for motor soft start  */
-#define MOTOR_DC_S_PARAM_C                   0.5f      // 0-1
+#define MOTOR_DC_S_PARAM_C                   0.5      // 0-1
 
 
 #endif /* __MOTOR_DC_ATY_H */
 #endif /* __MOTOR_DC_ATY_H */
 
 

+ 1 - 1
MOTOR_STEP_ATY.h

@@ -38,7 +38,7 @@
 
 
 /******************************* For user *************************************/
 /******************************* For user *************************************/
 // #define __DEBUG_MOTOR_STEP_ATY
 // #define __DEBUG_MOTOR_STEP_ATY
-// #define S_PARAM_C 0.5f      // 0-1
+// #define S_PARAM_C 0.5      // 0-1
 // #define Motor_StartLine_2
 // #define Motor_StartLine_2
 #define Motor_StartLine_T
 #define Motor_StartLine_T
 // #define Motor_StartLine_S
 // #define Motor_StartLine_S

+ 15 - 15
NoPublic/ALGO_MilkContent_ATY.c

@@ -37,11 +37,11 @@
 uint8_t detectContent_Milk = COW_MILK;
 uint8_t detectContent_Milk = COW_MILK;
 __CODE MilkCoefficient_S coeSave[MILK_KIND_MAX - 1] = {
 __CODE MilkCoefficient_S coeSave[MILK_KIND_MAX - 1] = {
     // P/L/S/FM/FPl/FPo/SC/PH
     // P/L/S/FM/FPl/FPo/SC/PH
-    {0.3925f, 0.5251f, 0.0727f, -0.071f, 0.0588f, -0.52f},    // 2-COW_MILK
-    // {0.367f, 0.55f, 0.083f, 0, 0.52f},   // 2-COW_MILK
-    {0.5987f, 0.3683f, 0.066f, -0, -0, -0.52f},  // 3-SHEEP_MILK
-    // {0.475f, 0.45f, 0.075f, 0.52f},  // 3-SHEEP_MILK
-    {0.3972f, 0.5205f, 0.0802f, -0.071134f, 0.0874f, -0.52f},    // 4-UHT_MILK
+    {0.3925, 0.5251, 0.0727, -0.071, 0.0588, -0.52},    // 2-COW_MILK
+    // {0.367, 0.55, 0.083, 0, 0.52},   // 2-COW_MILK
+    {0.5987, 0.3683, 0.066, -0, -0, -0.52},  // 3-SHEEP_MILK
+    // {0.475, 0.45, 0.075, 0.52},  // 3-SHEEP_MILK
+    {0.3972, 0.5205, 0.0802, -0.071134, 0.0874, -0.52},    // 4-UHT_MILK
 };  // Use: coeSave[kind - 2]
 };  // Use: coeSave[kind - 2]
 
 
 MilkContent_S milcDefault = {0};
 MilkContent_S milcDefault = {0};
@@ -68,7 +68,7 @@ void MilkDensityFatFromUS(float usSpeed, float usDamp, float refT, float offset)
             40.5036 1535.311
             40.5036 1535.311
             49.490  1523.449
             49.490  1523.449
             */
             */
-            // Speed=-0.13T^2+10.376T+(1328.33) (3.18F,2.97P g/100ml)
+            // Speed=-0.13T^2+10.376T+(1328.33) (3.18,2.97P g/100ml)
             float speedParam_C = 0;
             float speedParam_C = 0;
 
 
 #define P_A 0.13
 #define P_A 0.13
@@ -110,7 +110,7 @@ void MilkDensityFatFromUS(float usSpeed, float usDamp, float refT, float offset)
         44.571 1534.34
         44.571 1534.34
         49.471 1537.76
         49.471 1537.76
         */
         */
-        // y=0.0189x^2-1.0874x+(1545.3) (3.18F,2.97P g/100ml)
+        // y=0.0189x^2-1.0874x+(1545.3) (3.18,2.97P g/100ml)
         float dampParam_C = 0;
         float dampParam_C = 0;
 
 
         dampParam_C = usDamp
         dampParam_C = usDamp
@@ -123,7 +123,7 @@ void MilkDensityFatFromUS(float usSpeed, float usDamp, float refT, float offset)
         //     milcDefault.conFat = 4.5;
         //     milcDefault.conFat = 4.5;
         // else
         // else
         milcDefault.conFat = dampAtRefT * RefFat / 100;
         milcDefault.conFat = dampAtRefT * RefFat / 100;
-        // milcDefault.conFat = (0.1500f * (milcDefault.conDensity - 1000)) + 0.0160f; // Temp debug
+        // milcDefault.conFat = (0.1500 * (milcDefault.conDensity - 1000)) + 0.0160; // Temp debug
         // milcDefault.conFat = milcDefault.conFat
         // milcDefault.conFat = milcDefault.conFat
         //     + ((milcDefault.conFat - (milcDefault.conDensity - 1006) / 10)
         //     + ((milcDefault.conFat - (milcDefault.conDensity - 1006) / 10)
         //         * (1 - (milcDefault.conFat / RefFat)));
         //         * (1 - (milcDefault.conFat / RefFat)));
@@ -149,8 +149,8 @@ void MilkDensityFatFromUS(float usSpeed, float usDamp, float refT, float offset)
 void MilkContentFromDensity(void)
 void MilkContentFromDensity(void)
 {
 {
     // Test algo
     // Test algo
-    // milcDefault.conDensity = 25.73f;
-    // milcDefault.conFat = 3.87f;
+    // milcDefault.conDensity = 25.73;
+    // milcDefault.conFat = 3.87;
 
 
     if(detectContent_Milk == PURE_WATER || milcDefault.conDensity < 1000)
     if(detectContent_Milk == PURE_WATER || milcDefault.conDensity < 1000)
     {
     {
@@ -171,10 +171,10 @@ void MilkContentFromDensity(void)
             (99865)
             (99865)
             // Pure water density with temperature: y = -0.0038x2 - 0.0475x + 1000.5 (y = -0.3844x2 - 4.7525x + 100046)
             // Pure water density with temperature: y = -0.0038x2 - 0.0475x + 1000.5 (y = -0.3844x2 - 4.7525x + 100046)
             // (100046 - (4.7525 * milcDefault.conTemperature) - (0.3844 * milcDefault.conTemperature * milcDefault.conTemperature))
             // (100046 - (4.7525 * milcDefault.conTemperature) - (0.3844 * milcDefault.conTemperature * milcDefault.conTemperature))
-            // / (milcDefault.conDensity + 1000)) + (0.075f * milcDefault.conFat)) / 0.378f;
-            / (milcDefault.conDensity)) + (0.075f * milcDefault.conFat)) / 0.378f;
-        // milcDefault.conSnf = (100 - (100000 / (milcDefault.conDensity + 1000)) + (0.075f * milcDefault.conFat)) / 0.378f;
-        // milcDefault.conSnf = (100 - (100000 / (milcDefault.conDensity + 1000)) + (0.075f * milcDefault.conFat)) / 0.3647f;
+            // / (milcDefault.conDensity + 1000)) + (0.075 * milcDefault.conFat)) / 0.378;
+            / (milcDefault.conDensity)) + (0.075 * milcDefault.conFat)) / 0.378;
+        // milcDefault.conSnf = (100 - (100000 / (milcDefault.conDensity + 1000)) + (0.075 * milcDefault.conFat)) / 0.378;
+        // milcDefault.conSnf = (100 - (100000 / (milcDefault.conDensity + 1000)) + (0.075 * milcDefault.conFat)) / 0.3647;
 
 
 
 
         milcDefault.conProtein = coeSave[detectContent_Milk - 2].coeProtein * milcDefault.conSnf;
         milcDefault.conProtein = coeSave[detectContent_Milk - 2].coeProtein * milcDefault.conSnf;
@@ -184,7 +184,7 @@ void MilkContentFromDensity(void)
 
 
         if(milcDefault.conFreeze < coeSave[detectContent_Milk - 2].coeFreezePoint)
         if(milcDefault.conFreeze < coeSave[detectContent_Milk - 2].coeFreezePoint)
             milcDefault.conFreeze = coeSave[detectContent_Milk - 2].coeFreezePoint;
             milcDefault.conFreeze = coeSave[detectContent_Milk - 2].coeFreezePoint;
-        milcDefault.conWater = 100.0f - (100.0f * milcDefault.conFreeze / coeSave[detectContent_Milk - 2].coeFreezePoint);
+        milcDefault.conWater = 100.0 - (100.0 * milcDefault.conFreeze / coeSave[detectContent_Milk - 2].coeFreezePoint);
         milcDefault.conSC = 0;
         milcDefault.conSC = 0;
         milcDefault.conPH = 0;
         milcDefault.conPH = 0;
     }
     }

+ 1 - 1
TMC2209_ATY.c

@@ -257,7 +257,7 @@ void TMC2209_StateMachine_PWM(struct TMC2209_ATY_Dev* dev)
 // void MOTOR_1_FREQ_SET(uint16_t freq) {
 // void MOTOR_1_FREQ_SET(uint16_t freq) {
 //     HAL_TIM_PWM_Stop(&htim3, TIM_CHANNEL_3);
 //     HAL_TIM_PWM_Stop(&htim3, TIM_CHANNEL_3);
 //     __HAL_TIM_SET_AUTORELOAD(&htim3, freq);
 //     __HAL_TIM_SET_AUTORELOAD(&htim3, freq);
-//     __HAL_TIM_SET_COMPARE(&htim3, TIM_CHANNEL_3, (uint16_t)(freq * 0.5f));
+//     __HAL_TIM_SET_COMPARE(&htim3, TIM_CHANNEL_3, (uint16_t)(freq * 0.5));
 //     HAL_TIM_PWM_Start(&htim3, TIM_CHANNEL_3);
 //     HAL_TIM_PWM_Start(&htim3, TIM_CHANNEL_3);
 // }
 // }
 // struct TMC2209_ATY_Dev TMC2209_ATY_Dev_1 = {
 // struct TMC2209_ATY_Dev TMC2209_ATY_Dev_1 = {

+ 1 - 1
TMC2209_ATY.h

@@ -117,7 +117,7 @@ void TMC2209_StateMachine_PWM(struct TMC2209_ATY_Dev *dev);
 #define TMC2209_SET_RUNNING             1
 #define TMC2209_SET_RUNNING             1
 
 
 /* for motor soft start  */
 /* for motor soft start  */
-#define TMC2209_S_PARAM_C               0.5f      // 0-1
+#define TMC2209_S_PARAM_C               0.5      // 0-1
 
 
 #endif /* __TMC2209_ATY_H */
 #endif /* __TMC2209_ATY_H */
 
 

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů