From fe6d4e98fa917489a13dca304db6dda7260343e6 Mon Sep 17 00:00:00 2001
From: Fisch <interfisch@gmx.net>
Date: Wed, 3 May 2023 01:47:42 +0200
Subject: [PATCH] ec calibration measurements 20230502

---
 include/ec.h |  8 ++++----
 src/main.cpp | 14 +++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/include/ec.h b/include/ec.h
index d862b1f..fccb0ec 100644
--- a/include/ec.h
+++ b/include/ec.h
@@ -31,7 +31,8 @@ unsigned long last_measurement_ec=0;
 
 #define EC_RELAY_SWITCH_SETTLETIME 500  //time until voltage of ec circuit has settled
 
-const uint16_t ec_centerADCvalue=1909; //adc value when probe resistance is equal to the range resistor (mean of both)
+//const uint16_t ec_centerADCvalue=9026; //adc value when probe resistance is equal to the range resistor (mean of both)
+//Range Resistor is two parallel 1k2 = 600 Ohm
 
 unsigned long ec_last_change_relay=0; //millis of last relay change
 
@@ -46,7 +47,7 @@ float ec; //ec value after adjustment for reference (at current temperature)
 float ec25; //ec value but temperature adjusted for 25 degC
 
 float ec_tempadjust_alpa=0.2; //TODO
-float ec_reference_adc=5889; //adc reference value for the calibration resistor measurement
+float ec_reference_adc=6011.5; //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};
@@ -82,7 +83,7 @@ void ec_loop(unsigned long loopmillis) {
         last_measurement_ec=loopmillis;
         ec_startMeasurement();
         ec_connectProbe(true);
-        Serial.println("Measuring EC");
+        
         ecstate=MEASURE;
       }
       break;
@@ -90,7 +91,6 @@ void ec_loop(unsigned long loopmillis) {
     case MEASURE:
       if (ec_measurementReady()) {
         ec_releaseRelay();
-        Serial.println("Finished EC");
         ec_adc=getMean(ec_array,EC_ARRAY_SIZE);
         if (isValueArrayOK(ec_calib_array,EC_CALIB_ARRAY_SIZE,0)){
           ec_calib_adc=getMean(ec_calib_array,EC_CALIB_ARRAY_SIZE);
diff --git a/src/main.cpp b/src/main.cpp
index 433585a..ddc6549 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -62,16 +62,20 @@ void setup() {
   delay(200);
 
   //Test adc to ec function output
+  /*
   Serial.println();
   for (int i=830;i<13300;i+=100) {
     float _ec=ec_getECfromADC(i);
     Serial.print(i); Serial.print(","); Serial.print(_ec); Serial.println();
   }
-  
 
   delay(100000);
+  */
+  
 
-  Serial.println("time,tempReservoir,ECadcCalib,ECadc,ECadcAdjusted,EC,EC25");
+
+  //Serial.println("time,tempReservoir,ECadcCalib,ECadc,ECadcAdjusted,EC,EC25");
+  Serial.println("time,tempReservoir,ECadcCalib,ECadc,ECadcAdjusted");
 
 }
 
@@ -120,9 +124,9 @@ void loop() {
       
       Serial.print(ec_calib_adc); Serial.print(",");
       Serial.print(ec_adc); Serial.print(",");
-      Serial.print(ec_adc_adjusted); Serial.print(",");
-      Serial.print(ec); Serial.print(",");
-      Serial.print(ec25);
+      Serial.print(ec_adc_adjusted); //Serial.print(",");
+      //Serial.print(ec); Serial.print(",");
+      //Serial.print(ec25);
       
       
       Serial.println();