tobimai/waterlevel-software
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

FAR nicer logging
Some checks failed
Test compiling project / test (push) Failing after 2m14s
Details

Browse Source
This commit is contained in:
Tobias Maier
2025-03-20 22:33:22 +01:00
parent 9064d3cd01
commit 2fa4b0761b
8 changed files with 98 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/sensor/sensor.cpp
View File

@@ -12,6 +12,10 @@ INA226 ina_sensor(0x40);
#include <INA233.h>
INA233 ina_sensor(0x40);
#endif
#include <tools/log.h>
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
extern Preferences prefs;
extern WaterData water_data;
@@ -40,13 +44,13 @@ void read_sensor_task(void* parameter)
while (true) {
// Get Values from sensor
char* chip_id = ina_sensor.print_device_number(0x40);
logger.log(MYLOG, ERROR, "Chip Model: %s", chip_id);
String chip_id = ina_sensor.print_device_number();
LOG(DEBUG, "Chip Model: %s", chip_id.c_str());
float bus_voltage = ina_sensor.getBusVoltage();
float shunt_voltage = ina_sensor.getShuntVoltage_mV() - zero_value;
logger.log(0, DEBUG, "RAW Shunt voltage: %F mV", ina_sensor.getShuntVoltage_mV());
LOG(DEBUG, "RAW Shunt voltage: %F mV", ina_sensor.getShuntVoltage_mV());
float shunt_current = shunt_voltage / RESISTOR_VALUE;
@@ -66,8 +70,8 @@ void read_sensor_task(void* parameter)
float min_water_level_mA = 4 + min_water_level_mA_over_zero;
float max_water_level_mA = 4 + max_water_level_mA_over_zero;
logger.log(0, DEBUG, "max_water_level_mA: %F", max_water_level_mA);
logger.log(0, DEBUG, "min_water_level_mA_over_zero: %F", min_water_level_mA_over_zero);
LOG(DEBUG, "max_water_level_mA: %F", max_water_level_mA);
LOG(DEBUG, "min_water_level_mA_over_zero: %F", min_water_level_mA_over_zero);
// Current over the 0 level of the water
float shunt_current_over_zero = shunt_current - min_water_level_mA;
@@ -87,10 +91,10 @@ void read_sensor_task(void* parameter)
active_errors.current_high = shunt_current > 20.2;
active_errors.voltage_low = bus_voltage < 23;
active_errors.voltage_high = bus_voltage > 25;
logger.log(0, DEBUG, "Shunt current: %F", shunt_current);
logger.log(0, DEBUG, "Shunt voltage: %F", shunt_voltage);
logger.log(0, DEBUG, "Bus voltage: %F", bus_voltage);
logger.log(0, DEBUG, "cm_over_zero: %F", cm_over_zero);
LOG(DEBUG, "Shunt current: %F", shunt_current);
LOG(DEBUG, "Shunt voltage: %F", shunt_voltage);
LOG(DEBUG, "Bus voltage: %F", bus_voltage);
LOG(DEBUG, "cm_over_zero: %F", cm_over_zero);
shunt_data.bus_voltage = bus_voltage;
shunt_data.shunt_voltage = shunt_voltage;