v1.7 pre-release tests

Author: user2684

NodeManager.ino

@@ -70,7 +70,8 @@ SensorDs18b20            | 1+    | USE_DS18B20        | DS18B20 sensor, return t
 SensorBH1750             | 1     | USE_BH1750         | BH1750 sensor, return light level in lux                                                          | https://github.com/claws/BH1750
 SensorMLX90614           | 2     | USE_MLX90614       | MLX90614 contactless temperature sensor, return ambient and object temperature                    | https://github.com/adafruit/Adafruit-MLX90614-Library
 SensorBME280             | 4     | USE_BME280         | BME280 sensor, return temperature/humidity/pressure based on the attached BME280 sensor           | https://github.com/adafruit/Adafruit_BME280_Library
-SensorBMP085             | 3     | USE_BMP085         | BMP085/BMP180 sensor, return temperature and pressure                                             | https://github.com/adafruit/Adafruit-BMP085-Library
+SensorBMP085             | 3     | USE_BMP085_180     | BMP085 sensor, return temperature and pressure                                                    | https://github.com/adafruit/Adafruit-BMP085-Library
+SensorBMP180             | 3     | USE_BMP085_180     | BMP180 sensor, return temperature and pressure                                                    | https://github.com/adafruit/Adafruit-BMP085-Library
 SensorBMP280             | 3     | USE_BMP280         | BMP280 sensor, return temperature/pressure based on the attached BMP280 sensor                    | https://github.com/adafruit/Adafruit_BMP280_Library
 SensorSonoff             | 1     | USE_SONOFF         | Sonoff wireless smart switch                                                                      | https://github.com/thomasfredericks/Bounce2
 SensorHCSR04             | 1     | USE_HCSR04         | HC-SR04 sensor, return the distance between the sensor and an object                              | https://github.com/mysensors/MySensorsArduinoExamples/tree/master/libraries/NewPing
@@ -119,6 +120,7 @@ FEATURE_TIME                | OFF     | allow keeping the current system time in
 FEATURE_RTC                 | OFF     | allow keeping the current system time in sync with an attached RTC device (requires FEATURE_TIME)| https://github.com/JChristensen/DS3232RTC
 FEATURE_SD                  | OFF     | allow reading from and writing to SD cards                                                       | -
 FEATURE_HOOKING             | OFF     | allow custom code to be hooked in the out of the box sensors                                     | -
+**/
 
 /**********************************
  * MySensors node configuration
@@ -262,7 +264,7 @@ FEATURE_HOOKING             | OFF     | allow custom code to be hooked in the ou
 //#define USE_BH1750
 //#define USE_MLX90614
 //#define USE_BME280
-//#define USE_BMP085
+//#define USE_BMP085_180
 //#define USE_BMP280
 //#define USE_SONOFF
 //#define USE_HCSR04
@@ -345,6 +347,7 @@ NodeManager node;
 //SensorMLX90614 mlx90614(node);
 //SensorBME280 bme280(node);
 //SensorBMP085 bmp085(node);
+//SensorBMP180 bmp180(node);
 //SensorBMP280 bmp280(node);
 //SensorSonoff sonoff(node);
 //SensorHCSR04 hcsr04(node,6);
@@ -385,6 +388,8 @@ void before() {
   //node.setReportIntervalSeconds(10);
   // report measures of every attached sensors every 10 minutes
   //node.setReportIntervalMinutes(10);
+  // set the node to sleep in 30 seconds cycles
+  //node.setSleepSeconds(30);
   // set the node to sleep in 5 minutes cycles
   //node.setSleepMinutes(5);
   // report battery level every 10 minutes

NodeManagerLibrary.h

@@ -177,7 +177,7 @@
 #ifdef USE_SONOFF
   #include <Bounce2.h>
 #endif
-#ifdef USE_BMP085
+#ifdef USE_BMP085_180
   #include <Wire.h>
   #include <Adafruit_BMP085.h>
 #endif
@@ -319,7 +319,7 @@ template<typename T> class List {
   inline iterator begin() { return _internalArray; }
   inline iterator end() { return _internalArray + _endPosition; }
   inline bool empty() { return (_endPosition == 0); }
-  inline unsigned int size() { return _endPosition; }
+  inline int size() { return _endPosition; }
   void allocateBlocks(int alloc) {
     _allocBlocks = alloc;
     T* newArray = new T[_allocBlocks];
@@ -1110,17 +1110,17 @@ class SensorMLX90614: public Sensor {
  * SensorBosch
 */
 
-#if defined(USE_BME280) || defined(USE_BMP085) || defined(USE_BMP280)
+#if defined(USE_BME280) || defined(USE_BMP085_180) || defined(USE_BMP280)
 class SensorBosch: public Sensor {
   public:
     SensorBosch(NodeManager& node_manager, int child_id = -255);
     // [101] define how many pressure samples to keep track of for calculating the forecast (default: 5)
     void setForecastSamplesCount(int value);
     // define what to do at each stage of the sketch
     void onReceive(MyMessage* message);
-    uint8_t GetI2CAddress(uint8_t chip_id);
+    uint8_t detectI2CAddress(uint8_t chip_id);
   protected:
-    char* _weather[6] = { "stable", "sunny", "cloudy", "unstable", "thunderstorm", "unknown" };
+    const char* _weather[6] = { "stable", "sunny", "cloudy", "unstable", "thunderstorm", "unknown" };
     int _forecast_samples_count = 5;
     float* _forecast_samples;
     int _minute_count = 0;
@@ -1129,7 +1129,7 @@ class SensorBosch: public Sensor {
     float _dP_dt;
     bool _first_round = true;
     float _getLastPressureSamplesAverage();
-    char* _forecast(float pressure);
+    const char* _forecast(float pressure);
 };
 #endif
 
@@ -1151,7 +1151,7 @@ class SensorBME280: public SensorBosch {
 /*
    SensorBMP085
 */
-#ifdef USE_BMP085
+#ifdef USE_BMP085_180
 class SensorBMP085: public SensorBosch {
   public:
     SensorBMP085(NodeManager& node_manager, int child_id = -255);
@@ -1161,6 +1161,14 @@ class SensorBMP085: public SensorBosch {
   protected:
     Adafruit_BMP085* _bm;
 };
+
+/*
+   SensorBMP180
+*/
+class SensorBMP180: public SensorBMP085 {
+  public:
+    SensorBMP180(NodeManager& node_manager, int child_id = -255);
+};
 #endif
 
 /*
@@ -1617,7 +1625,7 @@ class DisplaySSD1306: public Display {
     uint8_t _i2caddress = 0x3c;
     int _fontsize = 1;
     int _caption_fontsize = 2;
-    uint8_t* _font = Adafruit5x7;
+    const uint8_t* _font = Adafruit5x7;
     uint8_t _contrast = -1;
 };
 #endif