Bugfixes and cleanup

Author: henrikekblad

libraries/MySensors/MyConfig.h

@@ -18,6 +18,6 @@
 /***
  * Enable/Disable debug logging
  */
-#define DEBUG
+//#define DEBUG
 
 #endif

libraries/MySensors/MySensor.cpp

@@ -81,7 +81,9 @@ void MySensor::begin(void (*_msgCallback)(const MyMessage &), uint8_t _nodeId, b
 		requestNodeId();
 	}
 
-	debug(PSTR("%s started, id %d\n"), repeaterMode?"repeater":"sensor", nc.nodeId);
+	if (!isGateway) {
+		debug(PSTR("%s started, id %d\n"), repeaterMode?"repeater":"sensor", nc.nodeId);
+	}
 
 	// Open reading pipe for messages directed to this node (set write pipe to same)
 	RF24::openReadingPipe(WRITE_PIPE, TO_ADDR(nc.nodeId));

libraries/MySensors/examples/EthernetGateway/EthernetGateway.ino

@@ -104,24 +104,29 @@ void setup()
 { 
   // Initialize gateway at maximum PA level, channel 70 and callback for write operations 
   gw.begin(incomingMessage, 0, true, 0, RF24_PA_LEVEL_GW, RF24_CHANNEL, RF24_DATARATE);
- 
+   // Setup pipes for radio library
+  gw.openReadingPipe(WRITE_PIPE, BASE_RADIO_ID);
+  gw.openReadingPipe(CURRENT_NODE_PIPE, BASE_RADIO_ID);
+  gw.startListening();
+  
   Ethernet.begin(mac, myIp);
   setupGateway(RADIO_RX_LED_PIN, RADIO_TX_LED_PIN, RADIO_ERROR_LED_PIN, INCLUSION_MODE_PIN, INCLUSION_MODE_TIME, output);
 
-
   // Add led timer interrupt
   MsTimer2::set(300, ledTimersInterrupt);
   MsTimer2::start();
 
   // Add interrupt for inclusion button to pin
   PCintPort::attachInterrupt(pinInclusion, startInclusionInterrupt, RISING);
 
-
   // give the Ethernet interface a second to initialize
   delay(1000);
-
+  
   // start listening for clients
   server.begin();
+
+  //output(PSTR("0;0;%d;0;%d;Gateway startup complete.\n"),  C_INTERNAL, I_GATEWAY_READY);
+
 }
 
 
@@ -132,20 +137,21 @@ void loop()
 
   checkButtonTriggeredInclusion();
   checkInclusionFinished();
-  
+
   // if an incoming client connects, there will be
   // bytes available to read via the client object
   EthernetClient client = server.available();
 
   if (client) {
-      // if got 1 or more bytes
+
+    // if got 1 or more bytes
       if (client.available()) {
          // read the bytes incoming from the client
          char inChar = client.read();
-
          if (inputPos<MAX_RECEIVE_LENGTH-1) { 
            // if newline then command is complete
            if (inChar == '\n') {  
+             Serial.println("Finished");
               // a command was issued by the client
               // we will now try to send it to the actuator
               inputString[inputPos] = 0;
@@ -167,7 +173,7 @@ void loop()
            inputPos = 0;
         }
       }
-   }  
+   } 
 }
 
 

libraries/MySensors/examples/EthernetGateway/GatewayUtil.h

@@ -1,7 +1,6 @@
 #ifndef __GATEWAYUTIL_H__
 #define __GATEWAYUTIL_H__
 
-#include <stdarg.h>
 
 #ifdef ARDUINO
 
@@ -48,6 +47,7 @@ void setupGateway(uint8_t _rx, uint8_t _tx, uint8_t _er, uint8_t _inc, uint8_t _
   countTx = 0;
   countErr = 0;
 
+
   // Setup led pins
   pinMode(pinRx, OUTPUT);
   pinMode(pinTx, OUTPUT);
@@ -240,7 +240,6 @@ void ledTimersInterrupt() {
      digitalWrite(pinEr, HIGH);
    }
    if(countErr != 255) { countErr--; }
-
 }
 
 void rxBlink(uint8_t cnt) {

libraries/MySensors/examples/MQTTGateway/GatewayUtil.h

@@ -144,7 +144,11 @@ void setup()
 { 
   // Initialize gateway at maximum PA level, channel 70 and callback for write operations 
   gw.begin(incomingMessage, 0, true, 0, RF24_PA_LEVEL_GW, RF24_CHANNEL, RF24_DATARATE);
- 
+  // Setup pipes for radio library
+  gw.openReadingPipe(WRITE_PIPE, BASE_RADIO_ID);
+  gw.openReadingPipe(CURRENT_NODE_PIPE, BASE_RADIO_ID);
+  gw.startListening();
+  
   Ethernet.begin(TCP_MAC, TCP_IP);
 
 

libraries/MySensors/examples/MQTTGateway/MQTTGateway.ino

@@ -63,8 +63,6 @@ void setup()
   gw.openReadingPipe(CURRENT_NODE_PIPE, BASE_RADIO_ID);
   gw.startListening();
 
-  Serial.begin(BAUD_RATE);
-
   setupGateway(RADIO_RX_LED_PIN, RADIO_TX_LED_PIN, RADIO_ERROR_LED_PIN, INCLUSION_MODE_PIN, INCLUSION_MODE_TIME, output);  
 
   // Add led timer interrupt