Merge branch 'development' of https://github.com/arendst/Tasmota into development

This commit is contained in:
Theo Arends 2022-01-04 17:42:00 +01:00
commit df58c7caea

View File

@ -338,13 +338,13 @@ float AdcGetPh(uint32_t idx) {
int adc = AdcRead(Adc[idx].pin, 2);
float y1 = Adc[idx].param1 / ANALOG_PH_DECIMAL_MULTIPLIER;
uint32_t x1 = Adc[idx].param2;
float y2 = Adc[idx].param3 / ANALOG_PH_DECIMAL_MULTIPLIER;
uint32_t x2 = Adc[idx].param4;
float y1 = (float)Adc[idx].param1 / ANALOG_PH_DECIMAL_MULTIPLIER;
int32_t x1 = Adc[idx].param2;
float y2 = (float)Adc[idx].param3 / ANALOG_PH_DECIMAL_MULTIPLIER;
int32_t x2 = Adc[idx].param4;
float m = (y2 - y1) / (x2 - x1);
float ph = m * (adc - x1) + y1;
float m = (y2 - y1) / (float)(x2 - x1);
float ph = m * (float)(adc - x1) + y1;
char phLow_chr[6];