Changed WIRE address range from [1-120] to [0-119]

DccPlusPlus · DccPlusPlus · commit c561f58fbd65 · 2016-02-06T19:44:41.000-05:00
* DCC++ MASTER = WIRE Address 0
* DCC++ BOOSTER = WIRE Address 1-119
diff --git a/DCCpp/DCCpp.ino b/DCCpp/DCCpp.ino
@@ -177,6 +177,7 @@ DCC++ BASE STATION is configured through the Config.h file that contains all use
 #include "EEStore.h"
 #include "Config.h"
 #include "Comm.h"
+#include "DccServer.h"
 
 void showConfiguration();
 
@@ -246,6 +247,11 @@ void setup(){
   Serial.print(__TIME__);
   Serial.print(">");
 
+  Serial.print("<J");
+  Serial.print(DccServer::serverID);
+  Serial.print(">");
+  DccServer::setServer(DccServer::serverID);  
+
   #if COMM_TYPE == 1
     #ifdef IP_ADDRESS
       Ethernet.begin(mac,IP_ADDRESS);           // Start networking using STATIC IP Address
diff --git a/DCCpp/DccServer.cpp b/DCCpp/DccServer.cpp
@@ -5,6 +5,21 @@ COPYRIGHT (c) 2013-2016 Gregg E. Berman
 
 Part of DCC++ BASE STATION for the Arduino
 
+**********************************************************************/
+/**********************************************************************
+
+DCC++ BASE STATION supports the use of multiple Arduinos communicating
+via the Arduino's built-in TWI/I2C Interface, utilizing Arduino's WIRE library.
+Each Arduino requiures a unique WIRE address from 0 through 119.  This address
+is set interactively with the <J ID> command, and saved to EEPROM when
+the <E> command is issued.
+
+When multiple Arduinos are used, one acts as the DCC++ MASTER and all others
+are DCC++ BOOSTERS.
+
+* The DCC++ MASTER must have a WIRE address of 0.  
+* DCC++ BOOSTERS must have a unique WIRE address from 1 through 119 
+
 **********************************************************************/
 
 #include "DCCpp.h"
@@ -28,8 +43,8 @@ void DccServer::parse(char *c){
   
   switch(sscanf(c,"%d",&n)){
 
-    case 1:                      // argument is serverID (1-120)
-      if(n>=1 && n<=120){
+    case 1:                      // argument is serverID (0=DCC++ MASTER, 1-119=DCC++ BOOSTER)
+      if(n>=0 && n<=119){
         INTERFACE.print("<O>");
         setServer(n);
       } else {
@@ -64,15 +79,15 @@ void DccServer::setServer(int id){
   
   Wire.end();
   Wire.onReceive(receiveWire);
-  Wire.begin(serverID+7);         // set as SERVER with ID+7 (yielding address between 8 and 127
+  Wire.begin(serverID+8);         // set as WIRE SERVER with ID+8 (yielding address between 8 and 127)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void DccServer::setMaster(){
 
   Wire.end();
-  Wire.begin();                   // set as MASTER
+  Wire.begin();                   // set as WIRE MASTER
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/DCCpp/EEStore.cpp b/DCCpp/EEStore.cpp
@@ -29,7 +29,7 @@ void EEStore::init(){
     eeStore->data.nTurnouts=0;
     eeStore->data.nSensors=0;
     eeStore->data.nOutputs=0;
-    eeStore->data.serverID=1;        
+    eeStore->data.serverID=0;        
     EEPROM.put(0,eeStore->data);    
   }
   
@@ -48,7 +48,7 @@ void EEStore::clear(){
   eeStore->data.nTurnouts=0;
   eeStore->data.nSensors=0;
   eeStore->data.nOutputs=0;
-  eeStore->data.serverID=1;
+  eeStore->data.serverID=0;
   EEPROM.put(0,eeStore->data);    
   
 }
diff --git a/DCCpp/SerialCommand.cpp b/DCCpp/SerialCommand.cpp
@@ -232,7 +232,7 @@ void SerialCommand::parse(char *com){
  *   
  *    returns: <J ID>
  *   
- *   ID: the WIRE address for this board (1-120)  
+ *   ID: the WIRE address for this board (0=DCC++ MASTER, 1-119=DCC++ BOOSTER)  
  * 
  */
 

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ void SerialCommand::parse(char *com){`
`232`	`232`	`*`
`233`	`233`	`* returns: <J ID>`
`234`	`234`	`*`
`235`		`- * ID: the WIRE address for this board (1-120)`
	`235`	`+ * ID: the WIRE address for this board (0=DCC++ MASTER, 1-119=DCC++ BOOSTER)`
`236`	`236`	`*`
`237`	`237`	`*/`
`238`	`238`