simon
/
EmonTH
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix DIP switch had no effect (#2) 

* Fix DIP switch had no effect

* don't devide version number in config function
This commit is contained in:
elias-rexometer 2017-07-27 01:31:33 +02:00 committed by Glyn Hudson
parent 16448ac2a9
commit 9812cc3138
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/src/config.ino
View File

@ -65,7 +65,7 @@ static void config (char c) {
break; break;
case 'v': // print firmware version case 'v': // print firmware version
Serial.print(F("[emonTH FW: V")); Serial.print(version*0.1); Serial.print(F("]")); Serial.print(F("[emonTH FW: V")); Serial.print(version); Serial.print(F("]"));
break; break;
default: default:

10
firmware/src/src.ino
View File

@ -30,6 +30,7 @@
31 - Special allocation in JeeLib RFM12 driver - Node31 can communicate with nodes on any network group 31 - Special allocation in JeeLib RFM12 driver - Node31 can communicate with nodes on any network group
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------
Change log: Change log:
V3.2.3 - (17/07/17) Fix DIP switch had no effect
V3.2.2 - (12/05/17) Fix DIP switch nodeID not being read when EEPROM is configures 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.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
@ -63,7 +64,7 @@
boolean debug=1; // Set to 1 to few debug serial output boolean debug=1; // Set to 1 to few debug serial output
boolean flash_led=0; // Flash LED after each sample (battery drain) default=0 boolean flash_led=0; // Flash LED after each sample (battery drain) default=0
const unsigned int version = 321; // firmware version divided by 10 e,g 16 = V1.6 const unsigned int version = 323; // firmware version
// These variables control the transmit timing of the emonTH // These variables control the transmit timing of the emonTH
const unsigned long WDT_PERIOD = 80; // mseconds. 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: const unsigned long WDT_MAX_NUMBER = 690; // Data sent after WDT_MAX_NUMBER periods of WDT_PERIOD ms without pulses:
@ -197,9 +198,7 @@ void setup() {
RF_STATUS=1; RF_STATUS=1;
if (RF_STATUS==1){ if (RF_STATUS==1){
load_config(); // Load RF config from EEPROM (if any exist 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 // Add effect of DIP switch positions to nodeID
if ((DIP1 == HIGH) && (DIP2 == HIGH)) nodeID=nodeID; if ((DIP1 == HIGH) && (DIP2 == HIGH)) nodeID=nodeID;
@ -207,6 +206,9 @@ void setup() {
if ((DIP1 == HIGH) && (DIP2 == LOW)) nodeID=nodeID+2; if ((DIP1 == HIGH) && (DIP2 == LOW)) nodeID=nodeID+2;
if ((DIP1 == LOW) && (DIP2 == LOW)) nodeID=nodeID+3; if ((DIP1 == LOW) && (DIP2 == LOW)) nodeID=nodeID+3;
if (debug) Serial.println("Int RFM...");
rf12_initialize(nodeID, RF_freq, networkGroup); // Initialize RFM
if (debug){ if (debug){
Serial.println("RFM Started"); Serial.println("RFM Started");
Serial.print("Node: "); Serial.print("Node: ");