Compare commits
2 Commits
e1fa527369
...
c0d2cb5e0b
Author | SHA1 | Date |
---|---|---|
interfisch | c0d2cb5e0b | |
interfisch | 0a6f4c2e41 |
|
@ -29,8 +29,7 @@ bool ec_flag_measurement_available=false;
|
|||
#define EC_RESOLUTION 8
|
||||
#define EC_FREQUENCY 5000
|
||||
|
||||
//#define EC_CALIB_ARRAY_SIZE 128
|
||||
#define EC_CALIB_ARRAY_SIZE 32 //temporarily changed
|
||||
#define EC_CALIB_ARRAY_SIZE 128
|
||||
uint16_t ec_calib_array[EC_CALIB_ARRAY_SIZE];
|
||||
uint16_t ec_calib_array_pos=0;
|
||||
#define EC_CALIB_READ_INTERVAL 250 //interval of reading adc value inside a measurement
|
||||
|
|
|
@ -153,5 +153,6 @@ float ec_calibration_linearize_below_adc_B=2000; //use linear approximation belo
|
|||
float ec_calibration_linear_lowADC_B=728; //x0
|
||||
float ec_calibration_linear_lowEC_B=0; //y0
|
||||
|
||||
Funktion getestet. Ergebnis in 20240423_FunctionTest.ods
|
||||
|
||||
|
||||
|
|
Binary file not shown.
27
src/main.cpp
27
src/main.cpp
|
@ -4,9 +4,9 @@
|
|||
|
||||
#include "wifi_functions.h"
|
||||
|
||||
bool debug=false; //print Serial information
|
||||
bool mqtt=false;
|
||||
bool eccalibrationoutput=true; //serial output for ec calibration
|
||||
bool debug=true; //print Serial information
|
||||
bool mqtt=true;
|
||||
bool eccalibrationoutput=false; //serial output for ec calibration
|
||||
/* Write to file with:
|
||||
sudo stty -F /dev/ttyUSB0 115200
|
||||
cat /dev/ttyUSB0 | tee received.txt
|
||||
|
@ -79,8 +79,8 @@ void setup() {
|
|||
Serial.println("Setup EC");
|
||||
ec_setup();
|
||||
|
||||
//Serial.println("Setup Waterlevel");
|
||||
//waterlevel_setup(); //temporarily disabled
|
||||
Serial.println("Setup Waterlevel");
|
||||
waterlevel_setup(); //temporarily disabled
|
||||
|
||||
Serial.println("Setup Temperature");
|
||||
temperature_setup();
|
||||
|
@ -95,15 +95,18 @@ void setup() {
|
|||
delay(200);
|
||||
|
||||
//Test adc to ec function output
|
||||
/*
|
||||
if (eccalibrationoutput) {
|
||||
Serial.println();
|
||||
for (int i=750;i<14183;i+=100) {
|
||||
float _ec=ec_getECfromADC(i);
|
||||
Serial.print(i); Serial.print(","); Serial.print(_ec); Serial.println();
|
||||
Serial.print("adc"); Serial.print(","); Serial.print("ecA"); Serial.print(","); Serial.print("ecB"); Serial.println();
|
||||
for (int i=728;i<14000;i+=100) {
|
||||
//float _ec=ec_getECfromADC(i);
|
||||
float _ecA=ec_getECfromADC(i, ec_calibration_polynom_A, sizeof(ec_calibration_polynom_A), ec_calibration_linearize_below_adc_A, ec_calibration_linear_lowADC_A, ec_calibration_linear_lowEC_A);
|
||||
float _ecB=ec_getECfromADC(i, ec_calibration_polynom_B, sizeof(ec_calibration_polynom_B), ec_calibration_linearize_below_adc_B, ec_calibration_linear_lowADC_B, ec_calibration_linear_lowEC_B);
|
||||
Serial.print(i); Serial.print(","); Serial.print(_ecA); Serial.print(","); Serial.print(_ecB); Serial.println();
|
||||
}
|
||||
delay(100000);
|
||||
}
|
||||
|
||||
delay(100000);
|
||||
*/
|
||||
|
||||
|
||||
//Serial.println("time,tempReservoir,ECadcCalib,ECadc,ECadcAdjusted,EC,EC25");
|
||||
|
@ -120,7 +123,7 @@ void loop() {
|
|||
|
||||
temperature_loop(loopmillis);
|
||||
|
||||
//waterlevel_loop(loopmillis);
|
||||
waterlevel_loop(loopmillis);
|
||||
|
||||
flow_loop(loopmillis);
|
||||
|
||||
|
|
Loading…
Reference in New Issue