diff --git a/include/ec.h b/include/ec.h index 780df9d..17710b5 100644 --- a/include/ec.h +++ b/include/ec.h @@ -50,8 +50,9 @@ float ec_tempadjust_alpa=0.2; //TODO float ec_reference_adc=6016.88; //adc reference value for the calibration resistor measurement. //x^0*p[0] + ... + x^n*p[n] -float ec_calibration_polynom[]={691.5992624638029,-1.4015367296761692,0.0008513503472324141,-2.2140576823179093e-07,2.8962580780180067e-11,-1.8577565383307114e-15,4.7162479484903865e-20}; -float ec_calibration_linearize_below_adc=6000; //use linear approximation below this adc value +//float ec_calibration_polynom[]={691.5992624638029,-1.4015367296761692,0.0008513503472324141,-2.2140576823179093e-07,2.8962580780180067e-11,-1.8577565383307114e-15,4.7162479484903865e-20}; +float ec_calibration_polynom[]={1033.928052655456,-3.8909104921922895,0.005627541436014758,-4.103988840997024e-06,1.7231981870816133e-09,-4.433707707721975e-13,7.203892111369395e-17,-7.406549810844244e-21,4.667420606439905e-25,-1.6439457516812463e-29,2.477292190335455e-34}; +float ec_calibration_linearize_below_adc=0; //use linear approximation below this adc value. 0=disable float ec_calibration_linear_lowADC=830; //x0 float ec_calibration_linear_lowEC=0; //y0 diff --git a/src/main.cpp b/src/main.cpp index 2885517..53dc362 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -64,7 +64,7 @@ void setup() { //Test adc to ec function output /* Serial.println(); - for (int i=830;i<13300;i+=100) { + for (int i=750;i<14183;i+=100) { float _ec=ec_getECfromADC(i); Serial.print(i); Serial.print(","); Serial.print(_ec); Serial.println(); } @@ -72,6 +72,7 @@ void setup() { delay(100000); */ + //Serial.println("time,tempReservoir,ECadcCalib,ECadc,ECadcAdjusted,EC,EC25");