okoyono/weatherstation
7
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Read sensor data code replaced by separate function.

Browse source
This commit is contained in:
klaute 2022-09-13 23:18:05 +02:00
parent 7770f83ef7
commit 446c7a5807
1 changed files with 94 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
firmware/firmware.ino
View file

@ -30,7 +30,6 @@ const uint8_t VALUES = 8; // see constants.h file - count of number of SENSOR_ d
float currentSensorData[VALUES] = { nanf("no value"), nanf("no value"), nanf("no value"),
nanf("no value"), nanf("no value"), nanf("no value"),
nanf("no value"), nanf("no value") };
float (*sensors[VALUES])() = {};
uint32_t update_sensor_cnt = 0;
uint32_t update_webserver_cnt = 0;
@ -47,6 +46,8 @@ uint8_t sensor_cnt = 0;
boolean validData = false;
boolean do_not_read_windsensor = false;
//*************************************************************************//
void debug(String x)
@ -138,35 +139,84 @@ void initSensors()
{
// Initialize and configure the sensors
#ifdef SENSOR_APDS9930
if (sensor_apds9930_begin()) {
sensors[SENSOR_LIGHT] = &apds9930_light;
}
if (sensor_apds9930_begin();
#endif
#ifdef SENSOR_APDS9960
if (sensor_apds9960_begin()) {
sensors[SENSOR_LIGHT] = &apds9960_light;
}
sensor_apds9960_begin();
#endif
#ifdef SENSOR_BME280
//Temperature + pressure
if (sensor_bme280_begin(BME_ADDRESS)) {
sensors[SENSOR_TEMPERATURE] = &bme280_temperature;
sensors[SENSOR_HUMIDITY] = &bme280_humidity;
sensors[SENSOR_PRESSURE] = &bme280_pressure;
sensor_bme280_begin(BME_ADDRESS);
#endif
}
float readSensors(uint8_t s)
{
float ret = nan("no value");
switch(s)
{
case SENSOR_LIGHT: // Initialize and configure the sensors
#ifdef SENSOR_APDS9930
ret = apds9930_light();
#endif
#ifdef SENSOR_APDS9960
ret = apds9960_light();
#endif
break;
case SENSOR_TEMPERATURE:
#ifdef SENSOR_BME280
ret = bme280_temperature();
#endif
break;
case SENSOR_HUMIDITY:
#ifdef SENSOR_BME280
ret = bme280_humidity();
#endif
break;
case SENSOR_PRESSURE:
#ifdef SENSOR_BME280
ret = bme280_pressure();
#endif
break;
case SENSOR_WINDSPEED:
#ifdef SENSOR_WIND
if (do_not_read_windsensor == false)
{
ret = wind_speed();
}
#endif
break;
#ifdef SENSOR_WIND
sensors[SENSOR_WINDSPEED] = &wind_speed;
#endif
case SENSOR_BAT_VOLTAGE:
#ifdef SENSOR_BATTERY
sensors[SENSOR_BAT_VOLTAGE] = &battery_voltage;
sensors[SENSOR_BATCHARGESTATE] = &battery_charging;
sensors[SENSOR_ESAVEMODE] = &isEnergySavingMode;
ret = battery_voltage();
#endif
break;
case SENSOR_ESAVEMODE:
#ifdef SENSOR_BATTERY
ret = battery_charging();
#endif
break;
case SENSOR_BATCHARGESTATE:
#ifdef SENSOR_BATTERY
ret = isEnergySavingMode();
#endif
break;
default:
break;
}
return ret;
}
//*************************************************************************//
@ -323,12 +373,14 @@ void _loop()
#ifdef defined(BATTERY_POWERED) && defined(SENSOR_WIND)
if (energySavingMode() == 1) {
// Disable expensive tasks
sensors[SENSOR_WINDSPEED] = 0;
//sensors[SENSOR_WINDSPEED] = 0;
//debug("read of wind sensor because of low battery disabled");
do_not_read_windsensor = true;
} else {
sensors[SENSOR_WINDSPEED] = &wind_speed;
//sensors[SENSOR_WINDSPEED] = &wind_speed;
//debug("read of wind sensor because of high battery enabled");
do_not_read_windsensor = false;
}
#endif
sensor_cnt = 0;
@ -340,17 +392,8 @@ void _loop()
if ((update_sensor_cnt + (UPDATE_SENSOR_INTERVAL_S * 1000)) <= millis())
{
debug("read sensor data " + String(sensor_cnt));
if (sensors[sensor_cnt])
{
debug("sensors[sensor_ids[" + String(sensor_cnt) + "]]=" + String((int)sensors[sensor_cnt]));
//currentSensorData[sensor_cnt] = sensors[sensor_cnt]();
currentSensorData[sensor_cnt] = sensor_cnt;
} else {
debug("sensors[" + String(sensor_cnt) + "]=nan");
currentSensorData[sensor_cnt] = nan("no value");
}
currentSensorData[sensor_cnt] = readSensors(sensor_cnt);
if (sensor_cnt < VALUES)
{
@ -426,11 +469,10 @@ void _loop()
void readWindSpeedExceed()
{
if (sensors[SENSOR_WINDSPEED])
{
// read from windspeed sensorSTATUS_LED_PIN
digitalWrite(STATUS_LED_PIN, HIGH);
currentSensorData[SENSOR_WINDSPEED] = sensors[SENSOR_WINDSPEED]();
currentSensorData[SENSOR_WINDSPEED] = readSensors(SENSOR_WINDSPEED);
digitalWrite(STATUS_LED_PIN, LOW);
if (currentSensorData[SENSOR_WINDSPEED] >= HTTP_CALL_ON_WINDSPEED_EXCEED_MPS)
@ -460,9 +502,6 @@ void readWindSpeedExceed()
setSensorData(currentSensorData);
#endif
} else {
currentSensorData[SENSOR_WINDSPEED] = nan("no value");
}
}
//*************************************************************************//