mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14275 from barbudor/fix_adc_ph 

make adc_ph formula more flexible
This commit is contained in:
Theo Arends 2022-01-04 17:26:59 +01:00 committed by GitHub
parent ce17266512 27a08b456e
commit ecd101d408
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tasmota/xsns_02_analog.ino
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];