Fixed analog reference compilation error with ATmega1284 (#496)

Author: user2684

nodemanager/Constants.h

@@ -85,7 +85,7 @@ Chip type
 #if defined (__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)
 #define CHIP_TINYX5
 #endif
-#if defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+#if defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644__) || defined(__AVR_ATmega644A__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__)
 #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)

sensors/SensorBattery.h

@@ -87,11 +87,10 @@ class SensorBattery: public Sensor {
 		if (_battery_internal_vcc || _battery_pin == -1) volt = (float)hwCPUVoltage()/1000;
 		else {
 			// when measuring the battery from a pin, analog reference must be internal
-#ifdef CHIP_AVR
-			nodeManager.setAnalogReference(INTERNAL);
-#endif
-#ifdef CHIP_MEGA
+#if defined(CHIP_MEGA)
 			nodeManager.setAnalogReference(INTERNAL1V1);
+#elif defined(CHIP_AVR)
+			nodeManager.setAnalogReference(INTERNAL);
 #endif
 			volt = analogRead(_battery_pin) * _battery_volts_per_bit;
 		}