Improved InfluxDB code to prevent deadlock

This commit is contained in:
Kai Lauterbach 2022-09-15 13:04:42 +02:00
parent 417493c8ba
commit 3e8d65d121
4 changed files with 34 additions and 18 deletions

View File

@ -14,6 +14,7 @@
#define WIND_SENSOR_MEAS_TIME_S 15
#define WATCHDOG_TIMEOUT_MS 30000
#define WIFI_CHECK_INTERVAL_MS 120000
#define INFLUXDB_TIMEOUT_MS 1000
#define ENERGY_SAVING_ITERATIONS 30

View File

@ -41,7 +41,7 @@ const String wifiName = "oko-weather-" + DEVICE_NAME;
WiFiManager wifiManager;
uint8_t fsm_state = FSM_STATE_1;
start_measure_wind
uint8_t sensor_cnt = 0;
boolean validData = false;
@ -360,9 +360,12 @@ void _fsm_loop()
// reset the wait timer to get a value every HTTP_CALL_ON_WINDSPEED_INTERVAL_S independently to the runtime of the measurement
update_windspeed_exceed_cnt = millis();
start_measure_wind(); // start measurement of wind speed
// start measurement of wind speed
start_measure_wind();
fsm_state = FSM_STATE_11; // wait untile the wind meas time exceeded
break; // abort case here to prevent read of next sensor in list
}
#endif
fsm_state = FSM_STATE_2;

View File

@ -176,26 +176,35 @@ void pushToInfluxDB(String device, float sensorValues[]) {
void _writePoint()
{
uint32_t _timeout = millis();
debug("InfluxDB: check connection");
do {
} while (client.validateConnection() and (_timeout + INFLUXDB_TIMEOUT_MS) <= millis());
if (! client.validateConnection())
{
debug("Can't write to InfluxDB2, timeout validating connection");
return;
}
_timeout = millis();
debug("InfluxDB: waiting for write ready");
// wait unitl ready
do {
#ifdef DEBUG
Serial.print("InfluxDB: waiting for write ready\n");
#endif
} while (client.canSendRequest() == false);
} while (client.canSendRequest() == false and (_timeout + INFLUXDB_TIMEOUT_MS) <= millis());
if (! client.canSendRequest())
{
debug("Can't write to InfluxDB2, timeout canSendRequest");
return;
}
// Write point
if (!client.writePoint(sensor)) {
#ifdef DEBUG
Serial.print("InfluxDB write failed: ");
Serial.println(client.getLastErrorMessage());
Serial.print("\nErrorcode: ");
Serial.println(client.getLastStatusCode());
Serial.print("\n");
#endif
} else {
#ifdef DEBUG
Serial.print("InfluxDB write done\n");
#endif
if (!client.writePoint(sensor))
{
debug("InfluxDB write failed: " + String(client.getLastErrorMessage()) + " Err: " + String(client.getLastStatusCode()));
}
}

View File

@ -25,9 +25,11 @@ float wind_speed()
void start_measure_wind()
{
start_meas_wind_time = millis();
anemometerRotations = 0;
interruptNumber = digitalPinToInterrupt(ANEMOMETER_PIN);
}
boolean check_measure_wind_done()
@ -42,5 +44,6 @@ boolean check_measure_wind_done()
float measure_wind_result()
{
start_meas_wind_time = 0;
return (float)anemometerRotations * WINDSPEED_FACTOR;
}