From 7bb62b5e4ecc559015343762c8df33ad1f7fa4e0 Mon Sep 17 00:00:00 2001
From: klaute <klaute@gmail.com>
Date: Tue, 8 Jan 2019 21:07:16 +0100
Subject: [PATCH] Fixed anemometer read and humidity value.

---
 firmware/config.h     |  2 --
 firmware/firmware.ino | 15 +++++++--------
 firmware/sensors.ino  |  7 ++-----
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/firmware/config.h b/firmware/config.h
index a6612e0..735d847 100644
--- a/firmware/config.h
+++ b/firmware/config.h
@@ -4,8 +4,6 @@
 #define BATTERY_POWERED 1
 #define POWERSAVING 1
 
-#define BOARD_03962A
-
 #define SENSOR_TEMPERATURE    0
 #define SENSOR_HUMIDITY       1
 #define SENSOR_LIGHT          2
diff --git a/firmware/firmware.ino b/firmware/firmware.ino
index 4114efe..1617f9d 100644
--- a/firmware/firmware.ino
+++ b/firmware/firmware.ino
@@ -195,15 +195,14 @@ void _loop() {
     currentSensorData[SENSOR_TEMPERATURE] = fetchTemperature();
     currentSensorData[SENSOR_HUMIDITY]    = fetchHumidity();
     currentSensorData[SENSOR_LIGHT]       = fetchLight();
-
-    // Disable expensive tasks
-    if (energySavingMode() == 0) {
-      currentSensorData[SENSOR_WINDSPEED]   = fetchWindspeed();
-    } else {
-      currentSensorData[SENSOR_WINDSPEED]   = -1;
-    }
     currentSensorData[SENSOR_PRESSURE]    = fetchPressure();
     currentSensorData[SENSOR_BAT_VOLTAGE] = getBatteryVoltage();
+    // Disable expensive tasks
+    if (energySavingMode() == 0) {
+      currentSensorData[SENSOR_WINDSPEED] = fetchWindspeed();
+    } else {
+      currentSensorData[SENSOR_WINDSPEED] = -1;
+    }
 
 #ifdef DEBUG
     Serial.println("");
@@ -229,4 +228,4 @@ void _loop() {
 
 }
 
-//*************************************************************************//
+//*************************************************************************//
diff --git a/firmware/sensors.ino b/firmware/sensors.ino
index 36ff461..c77d9e4 100755
--- a/firmware/sensors.ino
+++ b/firmware/sensors.ino
@@ -13,7 +13,7 @@ float fetchPressure() {
 }
 
 float fetchHumidity() {
-  return bme.readHumidity();
+  return bme.readHumidity() * 2;
 }
 
 float fetchLight() {
@@ -50,10 +50,7 @@ float fetchWindspeed() {
 float getBatteryVoltage() {
   uint16_t raw = analogRead(A0);
   float volt = raw / 1023.0;
-#ifdef BOARD_03962A
-  return volt * 6.79;
-#else
   return volt * 4.2;
-#endif
+
 }