.gitignore

@@ -4,4 +4,3 @@ firmware/.DS_Store
 schematics/#auto_saved_files#
 schematics/_autosave-oko-weatherstation.sch
 firmware.ino.bin
-firmware/extract me in arduino libraries folder.zip

firmware/firmware.ino

@@ -30,6 +30,16 @@ 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])() = {};
+
+uint8_t sensor_value[] = { SENSOR_TEMPERATURE,
+                           SENSOR_HUMIDITY,
+                           SENSOR_LIGHT,
+                           SENSOR_WINDSPEED,
+                           SENSOR_PRESSURE,
+                           SENSOR_BAT_VOLTAGE,
+                           SENSOR_ESAVEMODE,
+                           SENSOR_BATCHARGESTATE };
 
 uint32_t update_sensor_cnt           = 0;
 uint32_t update_webserver_cnt        = 0;
@@ -46,8 +56,6 @@ uint8_t sensor_cnt = 0;
 
 boolean validData = false;
 
-boolean do_not_read_windsensor = false;
-
 //*************************************************************************//
 
 void debug(String x)
@@ -139,84 +147,35 @@ void initSensors()
 {
   // Initialize and configure the sensors
 #ifdef SENSOR_APDS9930
-  if (sensor_apds9930_begin();
+  if (sensor_apds9930_begin()) {
+    sensors[SENSOR_LIGHT] = &apds9930_light;
+  }
 #endif
 
 #ifdef SENSOR_APDS9960
-  sensor_apds9960_begin();
+  if (sensor_apds9960_begin()) {
+    sensors[SENSOR_LIGHT] = &apds9960_light;
+  }
 #endif
 
 #ifdef SENSOR_BME280
   //Temperature + pressure
-  sensor_bme280_begin(BME_ADDRESS);
+  if (sensor_bme280_begin(BME_ADDRESS)) {
-#endif
+    sensors[SENSOR_TEMPERATURE] = &bme280_temperature;
-}
+    sensors[SENSOR_HUMIDITY]    = &bme280_humidity;
-
+    sensors[SENSOR_PRESSURE]    = &bme280_pressure;
-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;
-
-    case SENSOR_BAT_VOLTAGE:
-#ifdef SENSOR_BATTERY
-      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;
   }
+#endif
 
-  return ret;
+#ifdef SENSOR_WIND
+  sensors[SENSOR_WINDSPEED] = &wind_speed;
+#endif
+
+#ifdef SENSOR_BATTERY
+  sensors[SENSOR_BAT_VOLTAGE]    = &battery_voltage;
+  sensors[SENSOR_BATCHARGESTATE] = &battery_charging;
+  sensors[SENSOR_ESAVEMODE]      = &isEnergySavingMode;
+#endif
 }
 
 //*************************************************************************//
@@ -335,7 +294,7 @@ void _loop()
       break;
 
     case FSM_STATE_WSE:
-      //debug("wind speed exceeded check if required");
+      debug("wind speed exceeded check if required");
 #ifdef HTTP_CALL_ON_WINDSPEED_EXCEED
       if ((update_windspeed_exceed_cnt + (HTTP_CALL_ON_WINDSPEED_INTERVAL_S * 1000)) <= millis())
       {
@@ -373,14 +332,11 @@ 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;
@@ -392,30 +348,35 @@ 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_value[" + String(sensor_cnt) + " ]]=" + String((int)sensors[sensor_value[sensor_cnt]]) + ":" + String(sensor_value[sensor_cnt]));
+          currentSensorData[sensor_cnt] = sensors[sensor_value[sensor_cnt]]();
+          //currentSensorData[sensor_cnt] = sensor_cnt;
 
-        currentSensorData[sensor_cnt] = readSensors(sensor_cnt);
+        } else {
+
+          debug("sensors[sensor_value[" + String(sensor_cnt) + "]]=nan");
+          currentSensorData[sensor_cnt] = nan("no value");
+        }
   
         if (sensor_cnt < VALUES)
         {
           sensor_cnt++;
           fsm_state = FSM_STATE_US; // jump to same state again, more sensors to read
-
         } else {
-
           update_sensor_cnt = millis();
           sensor_cnt = 0;
           fsm_state = FSM_STATE_SC; // next state
         }
-
       } else {
-
+        debug("skip read sensor data");
-        //debug("skip read sensor data");
         fsm_state = FSM_STATE_WU; // no new data, reset FSM
       }
       break;
 
     case FSM_STATE_SC:
-      //debug("log to serial if required");
+      debug("log to serial if required");
 #ifdef SERIAL_FEATURE
       logToSerial(currentSensorData);
 #endif
@@ -423,7 +384,7 @@ void _loop()
       break;
 
     case FSM_STATE_ID:
-      //debug("send data to influxdb if required");
+      debug("send data to influxdb if required");
 #ifdef INFLUXDB_FEATURE
       for (uint8_t i = 0; i < 5 and validData == false; i++)
       {
@@ -443,7 +404,7 @@ void _loop()
       break;
 
     case FSM_STATE_SD:
-      //debug("set sensor data in webupdater if required");
+      debug("set sensor data in webupdater if required");
 #ifdef WEBUPDATER_FEATURE
       setSensorData(currentSensorData);
 #endif
@@ -469,39 +430,43 @@ void _loop()
 
 void readWindSpeedExceed()
 {
-
+  if (sensors[SENSOR_WINDSPEED])
-  // read from windspeed sensorSTATUS_LED_PIN
-  digitalWrite(STATUS_LED_PIN, HIGH);
-  currentSensorData[SENSOR_WINDSPEED] = readSensors(SENSOR_WINDSPEED);
-  digitalWrite(STATUS_LED_PIN, LOW);
-
-  if (currentSensorData[SENSOR_WINDSPEED] >= HTTP_CALL_ON_WINDSPEED_EXCEED_MPS)
   {
+    // read from windspeed sensorSTATUS_LED_PIN
     digitalWrite(STATUS_LED_PIN, HIGH);
+    currentSensorData[SENSOR_WINDSPEED] = sensors[SENSOR_WINDSPEED]();
+    digitalWrite(STATUS_LED_PIN, LOW);
 
-    // call the url HTTP_CALL_ON_WINDSPEED_URL
+    if (currentSensorData[SENSOR_WINDSPEED] >= HTTP_CALL_ON_WINDSPEED_EXCEED_MPS)
-    WiFiClient client;
+    {
-    HTTPClient http;
+      digitalWrite(STATUS_LED_PIN, HIGH);
 
-    http.begin(client, String(HTTP_CALL_ON_WINDSPEED_URL).c_str());
+      // call the url HTTP_CALL_ON_WINDSPEED_URL
-    // Send HTTP GET request
+      WiFiClient client;
-    int httpResponseCode = http.GET();
+      HTTPClient http;
 
-    if (httpResponseCode > 0) {
+      http.begin(client, String(HTTP_CALL_ON_WINDSPEED_URL).c_str());
-      String response = http.getString();
+      // Send HTTP GET request
-      debug("http response code: " + String(httpResponseCode) + " = " + response);
+      int httpResponseCode = http.GET();
-      // TODO handle response
+
+      if (httpResponseCode > 0) {
+        String response = http.getString();
+        debug("http response code: " + String(httpResponseCode) + " = " + response);
+        // TODO handle response
+      }
+
+      http.end();
+      debug("Called windspeed exceed callout");
+      digitalWrite(STATUS_LED_PIN, LOW);
     }
 
-    http.end();
-    debug("Called windspeed exceed callout");
-    digitalWrite(STATUS_LED_PIN, LOW);
-  }
-
 #ifdef WEBUPDATER_FEATURE
-  setSensorData(currentSensorData);
+    setSensorData(currentSensorData);
 #endif
 
+  } else {
+    currentSensorData[SENSOR_WINDSPEED] = nan("no value");
+  }
 }
 
 //*************************************************************************//

firmware/webUpdater.ino

@@ -210,7 +210,7 @@ void measureWindspeed()
 
 #ifdef USE_LOGGER
 
-#define LOGFILE_SIZE 25
+#define LOGFILE_SIZE 20
 
 String logfile[LOGFILE_SIZE];