Merge pull request #483 from tekka007/transportUpdate

TransportProcess cleanup

Author: henrikekblad

libraries/MySensors/MyConfig.h

@@ -81,6 +81,40 @@
 //#define MY_RADIO_RFM69
 //#define MY_RS485
 
+/**
+ * @def MY_REGISTRATION_FEATURE
+ * @brief If enabled, node has to register to gateway/controller before allowed to send sensor data.
+ */
+#define MY_REGISTRATION_FEATURE
+
+ /**
+ * @def MY_REGISTRATION_RETRIES
+ * @brief Number of registration retries if no reply received from GW/controller
+ */
+
+#ifndef MY_REGISTRATION_RETRIES
+#define MY_REGISTRATION_RETRIES 3
+#endif
+
+ /**
+ * @def MY_REGISTRATION_DEFAULT
+ * @brief Node registration default - this applies if no registration response is recieved from controller
+ */
+
+#define MY_REGISTRATION_DEFAULT true
+
+ /**
+ * @def MY_REGISTRATION_CONTROLLER
+ * @brief If enabled, node registration request has to be handled by controller
+ */
+ // #define MY_REGISTRATION_CONTROLLER
+
+ /**
+ * @def MY_CORE_COMPATIBILITY_CHECK
+ * @brief If enabled, library compatibility is checked during node registration. Incompatible libraries are unable to send sensor data.
+ */
+#define MY_CORE_COMPATIBILITY_CHECK
+
 /**
  * @def MY_NODE_ID
  * @brief Node id defaults to AUTO (tries to fetch id from controller).
@@ -97,6 +131,12 @@
 #define MY_PARENT_NODE_ID AUTO
 #endif
 
+/**
+ * @def MY_PARENT_NODE_IS_STATIC
+ * @brief Enable MY_PARENT_NODE_IS_STATIC to disable fall back if parent node fails
+ */
+//#define MY_PARENT_NODE_IS_STATIC
+
 // Enables repeater functionality (relays messages from other nodes)
 // #define MY_REPEATER_FEATURE
 
@@ -646,4 +686,6 @@
 #define MY_SIGNING_REQUEST_SIGNATURES
 #define MY_SIGNING_NODE_WHITELISTING {{.nodeId = GATEWAY_ADDRESS,.serial = {0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01}}}
 #define MY_IS_RFM69HW
+#define MY_PARENT_NODE_IS_STATIC
+#define MY_DEBUG_VERBOSE_RF24
 #endif

libraries/MySensors/MySensors.h

@@ -172,6 +172,11 @@
 #endif
 
 
+// FLASH
+#if defined(MY_OTA_FIRMWARE_FEATURE)
+	#include "drivers/SPIFlash/SPIFlash.cpp"
+	#include "core/MyOTAFirmwareUpdate.cpp"
+#endif
 
 // GATEWAY - TRANSPORT
 #if defined(MY_GATEWAY_MQTT_CLIENT)
@@ -245,11 +250,6 @@
 		#include "drivers/AVR/DigitalIO/DigitalIO.h"
 	#endif
 
-	// FLASH
-	#ifdef MY_OTA_FIRMWARE_FEATURE
-		#include "drivers/SPIFlash/SPIFlash.cpp"
-		#include "core/MyOTAFirmwareUpdate.cpp"
-	#endif
 	#include "core/MyTransport.cpp"
 	#if (defined(MY_RADIO_NRF24) && defined(MY_RADIO_RFM69)) || (defined(MY_RADIO_NRF24) && defined(MY_RS485)) || (defined(MY_RADIO_RFM69) && defined(MY_RS485))
 		#error Only one forward link driver can be activated

libraries/MySensors/core/MyGatewayTransport.cpp

@@ -19,7 +19,7 @@
 
 #include "MyGatewayTransport.h"
 
-extern boolean transportSendRoute(MyMessage &message);
+extern bool transportSendRoute(MyMessage &message);
 extern MyMessage _msg;
 
 inline void gatewayTransportProcess() {

libraries/MySensors/core/MyInclusionMode.h

@@ -1,4 +1,4 @@
-/**
+/*
  * The MySensors Arduino library handles the wireless radio link and protocol
  * between your home built sensors/actuators and HA controller of choice.
  * The sensors forms a self healing radio network with optional repeaters. Each

libraries/MySensors/core/MyIndication.cpp

@@ -1,4 +1,4 @@
-/**
+/*
  * The MySensors Arduino library handles the wireless radio link and protocol
  * between your home built sensors/actuators and HA controller of choice.
  * The sensors forms a self healing radio network with optional repeaters. Each

libraries/MySensors/core/MyIndication.h

@@ -1,4 +1,4 @@
-/**
+/*
  * The MySensors Arduino library handles the wireless radio link and protocol
  * between your home built sensors/actuators and HA controller of choice.
  * The sensors forms a self healing radio network with optional repeaters. Each
@@ -34,6 +34,8 @@ typedef enum {
     INDICATION_GOT_PARENT,                    //!< Found parent node.
     INDICATION_REQ_NODEID,                    //!< Request node ID.
     INDICATION_GOT_NODEID,                    //!< Got a node ID.
+    INDICATION_REQ_REGISTRATION,              //!< Request node registration.
+    INDICATION_GOT_REGISTRATION,              //!< Got registration reponse.
     INDICATION_REBOOT,                        //!< Rebooting node.
     INDICATION_PRESENT,                       //!< Presenting node to gateway.
     INDICATION_CLEAR_ROUTING,                 //!< Clear rrouting table requested.

libraries/MySensors/core/MyMessage.h

@@ -188,8 +188,8 @@ typedef enum {
 	I_LOCKED				= 23,	//!< Node is locked (reason in string-payload)
 	I_PING					= 24,	//!< Ping sent to node, payload incremental hop counter
 	I_PONG					= 25,	//!< In return to ping, sent back to sender, payload incremental hop counter
-	I_REGISTER_REQUEST		= 26,	//!< Register request to GW
-	I_REGISTER_RESPONSE		= 27,	//!< Register response from GW
+	I_REGISTRATION_REQUEST	= 26,	//!< Register request to GW
+	I_REGISTRATION_RESPONSE	= 27,	//!< Register response from GW
 	I_DEBUG					= 28	//!< Debug message
 } mysensor_internal;