From 9924b2d0cf01bce40d84a845ffc1c587926f95d8 Mon Sep 17 00:00:00 2001
From: Glyn Hudson <glyn.hudson@gmail.com>
Date: Fri, 12 May 2017 12:52:49 +0100
Subject: [PATCH] V3.2.2 fix DIP switches not being read when EEPROM is
 configured

---
 firmware/src/config.ino | 18 +++++++++---------
 firmware/src/src.ino    | 21 ++++++++++++---------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/firmware/src/config.ino b/firmware/src/config.ino
index 0995272..3070c7e 100644
--- a/firmware/src/config.ino
+++ b/firmware/src/config.ino
@@ -5,7 +5,7 @@
 byte value;
 
 static void load_config(){
-  
+
   byte flag=0;
   // Read nodeID
   if (EEPROM.read(0) != 255){                                // 255 = EEPROM default (blank) value
@@ -20,18 +20,18 @@ static void load_config(){
     networkGroup = EEPROM.read(2);
     flag++;
   }
-  
+
   if (flag > 0){
     Serial.println("Loaded EEPROM RF config >");
   }
   else {
     Serial.println("No EEPROM config");
   }
-  
-  }
+
+}
 
 static void config (char c) {
-  
+
   if ('0' <= c && c <= '9') {
     value = 10 * value + c - '0';
     return;
@@ -53,7 +53,7 @@ static void config (char c) {
           RF_freq = value;
         }
         break;
-    
+
       case 'g': // set network group
         if (value>=0){
           networkGroup = value;
@@ -67,7 +67,7 @@ static void config (char c) {
       case 'v': // print firmware version
         Serial.print(F("[emonTH FW: V")); Serial.print(version*0.1); Serial.print(F("]"));
         break;
-      
+
       default:
         showString(helpText1);
       } //end case
@@ -86,9 +86,9 @@ static void config (char c) {
                    RF_freq == RF12_915MHZ ? 915 : 0);
       Serial.print(F(" MHz"));
     }
-    
+
     Serial.println(F(" "));
-    
+
   } // end c > ' '
   value = 0;
 
diff --git a/firmware/src/src.ino b/firmware/src/src.ino
index 4dfed61..8157d38 100644
--- a/firmware/src/src.ino
+++ b/firmware/src/src.ino
@@ -30,8 +30,9 @@
   31	- Special allocation in JeeLib RFM12 driver - Node31 can communicate with nodes on any network group
   -------------------------------------------------------------------------------------------------------------
   Change log:
+  V3.2.2   - (12/05/17) Fix DIP switch nodeID not being read when EEPROM is configures
   V3.2.1   - (30/11/16) Fix emonTx port typo
-  V3.2.0   - (13/11/16) run-time serial nodeID config
+  V3.2.0   - (13/11/16) Run-time serial nodeID config
   V3.1.0   - (19/10/16) Test for RFM69CW and SI7201 at startup, allow serial use without RF prescent
   V3.0.0   - (xx/10/16) Add support for SI7021 sensor instead of DHT22 (emonTH V2.0 hardware)
   ^^^ emonTH V2.0 hardware ^^^
@@ -62,7 +63,7 @@
 boolean debug=1;                                                      // Set to 1 to few debug serial output
 boolean flash_led=0;                                                  // Flash LED after each sample (battery drain) default=0
 
-const byte version = 32;                                              // firmware version divided by 10 e,g 16 = V1.6
+const byte version = 322;                                              // firmware version divided by 10 e,g 16 = V1.6
 // These variables control the transmit timing of the emonTH
 const unsigned long WDT_PERIOD = 80;                                  // mseconds.
 const unsigned long WDT_MAX_NUMBER = 690;                             // Data sent after WDT_MAX_NUMBER periods of WDT_PERIOD ms without pulses:
@@ -171,10 +172,6 @@ void setup() {
   boolean DIP1 = digitalRead(DIP_switch1);
   boolean DIP2 = digitalRead(DIP_switch2);
 
-  if ((DIP1 == HIGH) && (DIP2 == HIGH)) nodeID=nodeID;
-  if ((DIP1 == LOW) && (DIP2 == HIGH)) nodeID=nodeID+1;
-  if ((DIP1 == HIGH) && (DIP2 == LOW)) nodeID=nodeID+2;
-  if ((DIP1 == LOW) && (DIP2 == LOW)) nodeID=nodeID+3;
 
   if (debug==1)
   {
@@ -198,12 +195,18 @@ void setup() {
     // RF_STATUS =0;
   // }
  RF_STATUS=1;
-  
+
   if (RF_STATUS==1){
     load_config();                                                        // Load RF config from EEPROM (if any exist
     if (debug) Serial.println("Int RFM...");
     rf12_initialize(nodeID, RF_freq, networkGroup);                       // Initialize RFM
-    
+
+    // Add effect of DIP switch positions to nodeID
+    if ((DIP1 == HIGH) && (DIP2 == HIGH)) nodeID=nodeID;
+    if ((DIP1 == LOW) && (DIP2 == HIGH)) nodeID=nodeID+1;
+    if ((DIP1 == HIGH) && (DIP2 == LOW)) nodeID=nodeID+2;
+    if ((DIP1 == LOW) && (DIP2 == LOW)) nodeID=nodeID+3;
+
     if (debug){
       Serial.println("RFM Started");
       Serial.print("Node: ");
@@ -296,7 +299,7 @@ void setup() {
   WDT_number=720;
   p = 0;
   attachInterrupt(pulse_countINT, onPulse, RISING);
-  
+
   //################################################################################################################################
   // RF Config mode
   //################################################################################################################################