Fix compilation errors for non-AVR chips (#300)

Author: user2684

NodeManager.ino

@@ -20,27 +20,33 @@
 
  DESCRIPTION
 
-NodeManager is intended to take care on your behalf of all those common tasks that a MySensors node has to accomplish, speeding up the development cycle of your projects. 
-Consider it as a sort of frontend for your MySensors projects. When you need to add a sensor (which requires just uncommeting a single line),
-NodeManager will take care of importing the required library, presenting the sensor to the gateway/controller, executing periodically the main function of the sensor 
-(e.g. measure a temperature, detect a motion, etc.), allowing you to interact with the sensor and even configuring it remotely.
+NodeManager is intended to take care on your behalf of all those common tasks that a 
+MySensors node has to accomplish, speeding up the development cycle of your projects. 
+Consider it as a sort of frontend for your MySensors projects. When you need to add 
+a sensor (which requires just uncommeting a single line),
+NodeManager will take care of importing the required library, presenting the sensor 
+to the gateway/controller, executing periodically the main function of the sensor 
+(e.g. measure a temperature, detect a motion, etc.), allowing you to interact with 
+the sensor and even configuring it remotely.
 
 Documentation available on: https://github.com/mysensors/NodeManager
-NodeManager provides built-in implementation of a number of sensors through ad-hoc classes. 
+NodeManager provides built-in implementation of a number of sensors through ad-hoc 
+classes. 
 
 To use a buil-in sensor:
 * Install the required library if any
 * Enable the corresponding module (uncomment it) in the main sketch
 * Declare the sensor (uncomment it) in the main sketch
 
-Once created, the sensor will automatically present one or more child to the gateway and controller.
-A list of buil-in sensors, module to enable, required dependencies and the number of child automatically created is presented below:
+Once created, the sensor will automatically present one or more child to the gateway 
+and controller. A list of buil-in sensors, module to enable, required dependencies 
+and the number of child automatically created is presented below:
 
 Sensor Name         |#Child | Module to enable   | Description                                                                                       | Dependencies
 --------------------|-------|--------------------|---------------------------------------------------------------------------------------------------|----------------------------------------------------------
-SensorBattery       | 1     | -                  | Built-in sensor for automatic battery reporting                                                   | - 
-SensorSignal        | 1     | -                  | Built-in sensor for automatic signal level reporting                                              | -
-SensorConfiguration | 1     | -                  | Built-in sensor for OTA remote configuration of any registered sensor                             | -
+SensorBattery       | 1     | USE_BATTERY        | Built-in sensor for automatic battery reporting                                                   | - 
+SensorSignal        | 1     | USE_SIGNAL         | Built-in sensor for automatic signal level reporting                                              | -
+SensorConfiguration | 1     | USE_CONFIGURATION  | Built-in sensor for OTA remote configuration of any registered sensor                             | -
 SensorAnalogInput   | 1     | USE_ANALOG_INPUT   | Generic analog sensor, return a pin's analog value or its percentage                              | -
 SensorLDR           | 1     | USE_ANALOG_INPUT   | LDR sensor, return the light level of an attached light resistor in percentage                    | -
 SensorRain          | 1     | USE_ANALOG_INPUT   | Rain sensor, return the percentage of rain from an attached analog sensor                         | -
@@ -89,10 +95,11 @@ SensorServo         | 1     | USE_SERVO          | Control a generic Servo motor
 SensorAPDS9960      | 1     | USE_APDS9960       | SparkFun RGB and Gesture Sensor                                                                   | https://github.com/sparkfun/APDS-9960_RGB_and_Gesture_Sensor
 SensorNeopixel      | 1     | USE_NEOPIXEL       | Control a Neopixel LED                                                                            | https://github.com/adafruit/Adafruit_NeoPixel
 
-NodeManager provides useful built-in features which can be disabled if you need to save some storage for your code. 
-To enable/disable a buil-in feature:
+NodeManager provides useful built-in features which can be disabled if you need 
+to save some storage for your code. To enable/disable a buil-in feature:
 * Install the required library if any
-* Enable the corresponding feature by setting it to ON in the main sketch. To disable it, set it to OFF
+* Enable the corresponding feature by setting it to ON in the main sketch. To 
+disable it, set it to OFF
 
 A list of buil-in features and the required dependencies is presented below:
 
@@ -236,6 +243,9 @@ FEATURE_HOOKING             | OFF     | allow custom code to be hooked in the ou
  * NodeManager modules for supported sensors
  */
 
+//#define USE_BATTERY
+//#define USE_SIGNAL
+//#define USE_CONFIGURATION
 //#define USE_ANALOG_INPUT
 //#define USE_THERMISTOR
 //#define USE_ML8511

NodeManagerLibrary.h

@@ -38,6 +38,29 @@
 #define EEPROM_SLEEP_3 7
 #define EEPROM_USER_START 100
 
+/***********************************
+   Chip type
+*/
+// 168 and 328 Arduinos
+#if defined (__AVR_ATtiny24__) || defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__)
+  #define CHIP_TINYX4
+#endif
+#if defined (__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)
+  #define CHIP_TINYX5
+#endif
+#if defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+  #define CHIP_MEGA
+#endif
+#if defined(ARDUINO_ARCH_STM32F0) || defined(ARDUINO_ARCH_STM32F1) || defined(ARDUINO_ARCH_STM32F3) || defined(ARDUINO_ARCH_STM32F4) || defined(ARDUINO_ARCH_STM32L4)
+  #define CHIP_STM32
+#endif
+#if defined(ESP8266) || defined(MY_GATEWAY_ESP8266)
+  #define CHIP_ESP8266
+#endif
+#if !defined(CHIP_ESP8266) && !defined(CHIP_STM32)
+  #define CHIP_AVR
+#endif
+
 /***********************************
    Default configuration settings
 */
@@ -105,13 +128,16 @@
 #ifdef MY_USE_UDP
     #include <WiFiUdp.h>
 #endif
-#ifdef MY_GATEWAY_ESP8266
+#ifdef CHIP_ESP8266
   #include <ESP8266WiFi.h>
 #endif
 // load MySensors library
 #include <MySensors.h>
 
 // include third party libraries
+#ifdef USE_SIGNAL
+  #define MY_SIGNAL_REPORT_ENABLED
+#endif
 #ifdef USE_DHT
   #include <DHT.h>
 #endif
@@ -610,6 +636,7 @@ class Sensor {
 #endif
 };
 
+#ifdef USE_BATTERY
 /*
    SensorBattery: report battery level
 */
@@ -637,8 +664,9 @@ class SensorBattery: public Sensor {
       int _battery_pin = -1;
       float _battery_volts_per_bit = 0.003363075;
 };
+#endif
 
-#ifdef MY_SIGNAL_REPORT_ENABLED
+#ifdef USE_SIGNAL
 /*
    SensorSignal: report RSSI signal strength from the radio
 */
@@ -655,6 +683,7 @@ class SensorSignal: public Sensor {
 };
 #endif
 
+#ifdef USE_CONFIGURATION
 /*
    SensorConfiguration: allow remote configuration of the board and any configured sensor
 */
@@ -668,6 +697,7 @@ class SensorConfiguration: public Sensor {
     void onReceive(MyMessage* message);
   protected:
 };
+#endif
 
 #ifdef USE_ANALOG_INPUT
 /*

NodeManagerLibrary.ino

@@ -711,10 +711,11 @@ void Sensor::onLoop(Child* child){}
 void Sensor::onReceive(MyMessage* message){}
 void Sensor::onInterrupt(){}
 
+
+#ifdef USE_BATTERY
 /*
    SensorBattery
 */
-#ifndef MY_GATEWAY_ESP8266
 // contructor
 SensorBattery::SensorBattery(NodeManager& node_manager, int child_id): Sensor(node_manager) {
   _name = "BATTERY";
@@ -741,13 +742,15 @@ void SensorBattery::setBatteryVoltsPerBit(float value) {
 
 // what to do during setup
 void SensorBattery::onSetup() {
+#ifdef CHIP_AVR
   // when measuring the battery from a pin, analog reference must be internal
   if (! _battery_internal_vcc && _battery_pin > -1)
-#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+#ifdef CHIP_MEGA
     analogReference(INTERNAL1V1);
 #else
     analogReference(INTERNAL);
 #endif
+#endif
 }
 
 // what to do during loop
@@ -780,11 +783,10 @@ void SensorBattery::onReceive(MyMessage* message) {
 }
 #endif
 
-#ifdef MY_SIGNAL_REPORT_ENABLED
+#ifdef USE_SIGNAL
 /*
    SensorSignal
 */
-#ifndef MY_GATEWAY_ESP8266
 // contructor
 SensorSignal::SensorSignal(NodeManager& node_manager, int child_id): Sensor(node_manager) {
   _name = "SIGNAL";
@@ -816,7 +818,6 @@ void SensorSignal::onReceive(MyMessage* message) {
   if (message->getCommand() == C_REQ && message->type == child->type) onLoop(child);
 }
 #endif
-#endif
 
 #ifdef USE_ANALOG_INPUT
 /*
@@ -882,7 +883,7 @@ void SensorAnalogInput::onReceive(MyMessage* message) {
 
 // read the analog input
 int SensorAnalogInput::_getAnalogRead() {
-#ifndef MY_GATEWAY_ESP8266
+#ifdef CHIP_AVR
   // set the reference
   if (_reference != -1) {
     analogReference(_reference);
@@ -4003,6 +4004,7 @@ void SensorNeopixel::setColor(char* string) {
 
 #endif
 
+#ifdef USE_CONFIGURATION
 /*
    SensorConfiguration
 */
@@ -4045,7 +4047,7 @@ void SensorConfiguration::onReceive(MyMessage* message) {
       case 20: _node->setSleepBetweenSend(request.getValueInt()); break;
       case 9: _node->wakeup(); break;
 #endif
-#ifndef MY_GATEWAY_ESP8266
+#ifdef CHIP_AVR
       case 6: _node->reboot(); return;
 #endif
 #if FEATURE_EEPROM == ON
@@ -4104,8 +4106,8 @@ void SensorConfiguration::onReceive(MyMessage* message) {
         default: return;
       }
     } else {
-      #ifndef MY_GATEWAY_ESP8266
       // the message is for a function specific to a sensor
+      #ifdef USE_BATTERY
       if (strcmp(sensor->getName(),"BATTERY") == 0) {
         SensorBattery* custom_sensor = (SensorBattery*)sensor;
         switch(function) {
@@ -4117,7 +4119,8 @@ void SensorConfiguration::onReceive(MyMessage* message) {
           default: return;
         }
       }
-      #ifdef MY_SIGNAL_REPORT_ENABLED
+      #endif
+      #ifdef USE_SIGNAL
       if (strcmp(sensor->getName(),"SIGNAL") == 0) {
         SensorSignal* custom_sensor = (SensorSignal*)sensor;
         switch(function) {
@@ -4126,7 +4129,6 @@ void SensorConfiguration::onReceive(MyMessage* message) {
         }
       }
       #endif
-      #endif
       #ifdef USE_ANALOG_INPUT
       if (strcmp(sensor->getName(),"ANALOG_I") == 0 || strcmp(sensor->getName(),"LDR") == 0 || strcmp(sensor->getName(),"RAIN") == 0 || strcmp(sensor->getName(),"SOIL") == 0) {
         SensorAnalogInput* custom_sensor = (SensorAnalogInput*)sensor;
@@ -4336,6 +4338,7 @@ void SensorConfiguration::onReceive(MyMessage* message) {
   }
   _node->sendMessage(CONFIGURATION_CHILD_ID,V_CUSTOM,function);
 }
+#endif
 
 /*******************************************
    NodeManager
@@ -4655,7 +4658,7 @@ void NodeManager::receive(const MyMessage &message) {
       powerOn();
     #endif
     // call the sensor's receive()
-    sensor->receive(&message);
+    sensor->receive((MyMessage*) &message);
     // turn off the pin powering all the sensors
     #if FEATURE_POWER_MANAGER == ON
       powerOff();
@@ -4693,7 +4696,7 @@ void NodeManager::hello() {
 
 // reboot the board
 void NodeManager::reboot() {
-  #ifndef MY_GATEWAY_ESP8266
+#ifdef CHIP_AVR
   #if FEATURE_DEBUG == ON
     Serial.println(F("REBOOT"));
   #endif
@@ -4708,7 +4711,7 @@ void NodeManager::reboot() {
     // Infinite loop until watchdog reset after 16 ms
     while(true){}
   }
-  #endif
+#endif
 }
 
 #if FEATURE_EEPROM == ON
@@ -4749,13 +4752,13 @@ void NodeManager::setSmartSleep(bool value) {
 
 // return vcc in V
 float NodeManager::getVcc() {
-  #ifndef MY_GATEWAY_ESP8266
+#ifdef CHIP_AVR
     // Measure Vcc against 1.1V Vref
-    #if defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+    #if defined(CHIP_MEGA)
       ADMUX = (_BV(REFS0) | _BV(MUX4) | _BV(MUX3) | _BV(MUX2) | _BV(MUX1));
-    #elif defined (__AVR_ATtiny24__) || defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__)
+    #elif defined (CHIP_TINYX4)
       ADMUX = (_BV(MUX5) | _BV(MUX0));
-    #elif defined (__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)
+    #elif defined (CHIP_TINYX5)
       ADMUX = (_BV(MUX3) | _BV(MUX2));
     #else
       ADMUX = (_BV(REFS0) | _BV(MUX3) | _BV(MUX2) | _BV(MUX1));
@@ -4767,9 +4770,9 @@ float NodeManager::getVcc() {
     while (bit_is_set(ADCSRA, ADSC)) {};
     // return Vcc in mV
     return (float)((1125300UL) / ADC) / 1000;
-  #else
+#else
     return (float)0;
-  #endif
+#endif
 }
 
 #if FEATURE_INTERRUPTS == ON
@@ -4848,12 +4851,12 @@ void NodeManager::setRebootPin(int value) {
 
 // turn the ADC off so to save 0.2 mA
 void NodeManager::setADCOff() {
-  #ifndef MY_GATEWAY_ESP8266
+#ifdef CHIP_AVR
     // Disable the ADC by setting the ADEN bit (bit 7) to zero
     ADCSRA = ADCSRA & B01111111;
     // Disable the analog comparator by setting the ACD bit (bit 7) to one
     ACSR = B10000000;
-  #endif
+#endif
 }
 
 // sleep if the node is a battery powered or wait if it is not for the given number of milliseconds 
@@ -4913,7 +4916,7 @@ void NodeManager::_onInterrupt_2() {
 // send a message by providing the source child, type of the message and value
 void NodeManager::sendMessage(int child_id, int type, int value) {
   _message.clear();
-  _message.set(value);
+  _message.set((uint32_t) value);
   _sendMessage(child_id,type);
 }
 void NodeManager::sendMessage(int child_id, int type, float value, int precision) {

README.md

@@ -1,3 +1,5 @@
+# NodeManager
+
 NodeManager is intended to take care on your behalf of all those common tasks that a MySensors node has to accomplish, speeding up the development cycle of your projects. 
 Consider it as a sort of frontend for your MySensors projects. When you need to add a sensor (which requires just uncommeting a single line),
 NodeManager will take care of importing the required library, presenting the sensor to the gateway/controller, executing periodically the main function of the sensor 
@@ -31,9 +33,9 @@ A list of buil-in sensors, module to enable, required dependencies and the numbe
 
 Sensor Name         |#Child | Module to enable   | Description                                                                                       | Dependencies
 --------------------|-------|--------------------|---------------------------------------------------------------------------------------------------|----------------------------------------------------------
-SensorBattery       | 1     | -                  | Built-in sensor for automatic battery reporting                                                   | - 
-SensorSignal        | 1     | -                  | Built-in sensor for automatic signal level reporting                                              | -
-SensorConfiguration | 1     | -                  | Built-in sensor for OTA remote configuration of any registered sensor                             | -
+SensorBattery       | 1     | USE_BATTERY        | Built-in sensor for automatic battery reporting                                                   | - 
+SensorSignal        | 1     | USE_SIGNAL         | Built-in sensor for automatic signal level reporting                                              | -
+SensorConfiguration | 1     | USE_CONFIGURATION  | Built-in sensor for OTA remote configuration of any registered sensor                             | -
 SensorAnalogInput   | 1     | USE_ANALOG_INPUT   | Generic analog sensor, return a pin's analog value or its percentage                              | -
 SensorLDR           | 1     | USE_ANALOG_INPUT   | LDR sensor, return the light level of an attached light resistor in percentage                    | -
 SensorRain          | 1     | USE_ANALOG_INPUT   | Rain sensor, return the percentage of rain from an attached analog sensor                         | -