Merge branch 'tosa' of https://github.com/ToSa27/Arduino into

ToSa27-tosa

Conflicts:
	libraries/MySensors/examples/EthernetGateway/EthernetGateway.ino

Author: henrikekblad

Bootloader/MyOtaBootloader.c

@@ -56,9 +56,9 @@ static uint8_t sendAndWait(uint8_t reqType, uint8_t resType) {
 	msg.type = reqType;
 	for (uint8_t i = 0; i < 10; i++) {
 		sendWrite(msg);
-		for (uint16_t j = 0; j < 20; j++) {
+		for (uint8_t j = 0; j < 20; j++) {
 			wdt_reset();
-			for (uint16_t j = 0; j < 100; j++) {
+			for (uint8_t j = 0; j < 100; j++) {
 				wdt_reset();
 				uint8_t pipe;
 				boolean avail = available(&pipe);

Bootloader/MyOtaBootloader.hex

@@ -32,8 +32,9 @@ static void delayu() {
 	asm("nop"); 
 }
 
-static void delaym(uint16_t t) {
-	uint16_t d, a;
+static void delaym(uint8_t t) {
+	uint8_t d;
+	uint16_t a;
 	for (d = 0; d < t; d++)
 		for (a = 0; a < DELAY_M; a++)
 			asm("nop"); 

Bootloader/MyOtaBootloaderHW.h

@@ -706,5 +706,8 @@ dbc.connect('mongodb://' + dbAddress + ':' + dbPort + '/' + dbName, function(err
 	} else {
 		throw new Error('unknown Gateway type');
 	}
+	setInterval(function() {
+		sendTime(BROADCAST_ADDRESS, NODE_SENSOR_ID, gw);
+	}, 5*60*1000);
 });
 

NodeJsController/NodeJsController.js

@@ -4,17 +4,22 @@
 /***
  * Configure Sensor Network
  */
-#define RF24_CHANNEL	   76             //RF channel for the sensor net, 0-127
-#define RF24_DATARATE 	   RF24_250KBPS   //RF24_250KBPS for 250kbs, RF24_1MBPS for 1Mbps, or RF24_2MBPS for 2Mbps
-#define RF24_PA_LEVEL 	   RF24_PA_MAX    //Sensor PA Level == RF24_PA_MIN=-18dBm, RF24_PA_LOW=-12dBm, RF24_PA_HIGH=-6dBM, and RF24_PA_MAX=0dBm
-#define RF24_PA_LEVEL_GW   RF24_PA_LOW  //Gateway PA Level, defaults to Sensor net PA Level.  Tune here if using an amplified nRF2401+ in your gateway.
-#define BASE_RADIO_ID 	   ((uint64_t)0xA8A8E1FC00LL) // This is also act as base value for sensor nodeId addresses. Change this (or channel) if you have more than one sensor network.
+ 
+// pick ONE of these - other board layouts can be easily added this way
+#define MYSENSORS_SENSOR
+//#define MYSENSORS_SERIAL_GATEWAY
+//#define MYSENSORS_ETHERNET_MQTT_GATEWAY
 
-// MySensors online examples defaults
-#define DEFAULT_CE_PIN 9
-#define DEFAULT_CS_PIN 10
+// Choose radio type by enabling one of the following
+#define MYSENSORS_RF_NRF24
 
 
+
+#ifdef MYSENSORS_RF_NRF24
+#include "MyDriverNRF24.h"
+typedef class MyDriverNRF24 MyDriverClass;
+#endif
+
 /***
  * Enable/Disable debug logging
  */

libraries/MySensors/MyConfig.h

@@ -0,0 +1,4 @@
+#include "MyDriver.h"
+
+MyDriver::MyDriver() {
+}

libraries/MySensors/MyDriver.cpp

@@ -0,0 +1,52 @@
+#ifndef MyDriver_h
+#define MyDriver_h
+
+#include <stdint.h>
+
+#ifdef DEBUG
+#define debug(x,...) debugPrint(x, ##__VA_ARGS__)
+#else
+#define debug(x,...)
+#endif
+
+#define AUTO 0xFF // 0-254. Id 255 is reserved for auto initialization of nodeId.
+#define NODE_SENSOR_ID 0xFF // Node child id is always created for when a node
+
+// This is the nodeId for sensor net gateway receiver sketch (where all sensors should send their data).
+#define GATEWAY_ADDRESS ((uint8_t)0)
+#define BROADCAST_ADDRESS ((uint8_t)0xFF)
+
+class MyDriver
+{ 
+public:
+	// MyDriver constructor
+	// different parameters would be needed depending on radio module (e.g. pins connected etc.)
+	// keeping these parameters as #define's in MyConfig to streamline the driver interface
+	MyDriver();
+	// init()
+	// different parameters would be needed depending on radio module (e.g. channel, power, crc, etc.)
+	// keeping these parameters as #define's in MyConfig to streamline the driver interface
+	virtual void init() = 0;
+	// setAddress(address)
+	// set the node address and start listening to that address (and the broadcast address)
+	virtual void setAddress(uint8_t address) = 0;
+	// getAddress()
+	// returns the current address from the radio driver
+	virtual uint8_t getAddress() = 0;
+	// send(to, data, len)
+	// reliable transmission of the data with given length (in bytes) to the destination address
+	// returns true if successfully submitted
+	virtual bool send(uint8_t to, const void* data, uint8_t len) = 0;
+	// available(to)
+	// returns true if a new packet arrived in the rx buffer
+	// populates "to" parameter with the address the packet was sent to (either own address or broadcast)
+	virtual bool available(uint8_t *to) = 0;
+	// receive(data)
+	// returns length of received packet
+	// populates "data" parameter with received data
+	virtual uint8_t receive(void* data) = 0;
+	// powers down the radio
+	virtual void powerDown() = 0;
+};
+
+#endif

libraries/MySensors/MyDriver.h

@@ -0,0 +1,68 @@
+#include "MyDriver.h"
+#include "MyDriverNRF24.h"
+
+MyDriverNRF24::MyDriverNRF24() : MyDriver() {
+	rf24 = new RF24(RF24_CE_PIN, RF24_CS_PIN);
+}
+
+void MyDriverNRF24::init() {
+	// Start up the radio library
+	rf24->begin();
+
+	if (!rf24->isPVariant()) {
+		debug(PSTR("check wires\n"));
+		while(1);
+	}
+	rf24->setAutoAck(1);
+	rf24->setAutoAck(BROADCAST_PIPE,false); // Turn off auto ack for broadcast
+	rf24->enableAckPayload();
+	rf24->setChannel(RF24_CHANNEL);
+	rf24->setPALevel(RF24_PA_LEVEL);
+	rf24->setDataRate(RF24_DATARATE);
+	rf24->setRetries(5,15);
+	rf24->setCRCLength(RF24_CRC_16);
+	rf24->enableDynamicPayloads();
+
+	// All nodes listen to broadcast pipe (for FIND_PARENT_RESPONSE messages)
+	rf24->openReadingPipe(BROADCAST_PIPE, TO_ADDR(BROADCAST_ADDRESS));
+}
+
+void MyDriverNRF24::setAddress(uint8_t address) {
+	_address = address;
+	rf24->openReadingPipe(WRITE_PIPE, TO_ADDR(address));
+	rf24->openReadingPipe(CURRENT_NODE_PIPE, TO_ADDR(address));
+	rf24->startListening();
+}
+
+uint8_t MyDriverNRF24::getAddress() {
+	return _address;
+}
+
+bool MyDriverNRF24::send(uint8_t to, const void* data, uint8_t len) {
+	// Make sure radio has powered up
+	rf24->powerUp();
+	rf24->stopListening();
+	rf24->openWritingPipe(TO_ADDR(to));
+	bool ok = rf24->write(data, len, to == BROADCAST_ADDRESS);
+	rf24->startListening();
+	return ok;
+}
+
+bool MyDriverNRF24::available(uint8_t *to) {
+	uint8_t pipe = 255;
+	boolean avail = rf24->available(&pipe); 
+	if (pipe == CURRENT_NODE_PIPE)
+		*to = _address;
+	else if (pipe == BROADCAST_PIPE)
+		*to = BROADCAST_ADDRESS;
+	return (rf24->available() && pipe < 6);
+}
+
+uint8_t MyDriverNRF24::receive(void* data) {
+	uint8_t len = rf24->getDynamicPayloadSize();
+	rf24->read(data, len);
+}
+
+void MyDriverNRF24::powerDown() {
+	rf24->powerDown();
+}

libraries/MySensors/MyDriverNRF24.cpp

@@ -0,0 +1,56 @@
+#ifndef MyCommDriver_h
+#define MyCommDriver_h
+
+#include "MyConfig.h"
+#include "MyDriver.h"
+#include <stdint.h>
+#include "utility/RF24.h"
+#include "utility/RF24_config.h"
+
+
+
+#ifdef MYSENSORS_SENSOR
+#define RF24_CE_PIN		   9
+#define RF24_CS_PIN		   10
+#define RF24_PA_LEVEL 	   RF24_PA_MAX
+#endif
+
+#ifdef MYSENSORS_SERIAL_GATEWAY
+#define RF24_CE_PIN		   9
+#define RF24_CS_PIN		   10
+#define RF24_PA_LEVEL 	   RF24_PA_LOW
+#endif
+
+#ifdef MYSENSORS_ETHERNET_MQTT_GATEWAY
+#define RF24_CE_PIN		   5
+#define RF24_CS_PIN		   6
+#define RF24_PA_LEVEL 	   RF24_PA_LOW
+#endif
+
+#define RF24_CHANNEL	   76             //RF channel for the sensor net, 0-127
+#define RF24_DATARATE 	   RF24_250KBPS   //RF24_250KBPS for 250kbs, RF24_1MBPS for 1Mbps, or RF24_2MBPS for 2Mbps
+#define RF24_BASE_RADIO_ID ((uint64_t)0xA8A8E1FC00LL) // This is also act as base value for sensor nodeId addresses. Change this (or channel) if you have more than one sensor network.
+
+#define TO_ADDR(x) (RF24_BASE_RADIO_ID + x)
+
+#define WRITE_PIPE ((uint8_t)0)
+#define CURRENT_NODE_PIPE ((uint8_t)1)
+#define BROADCAST_PIPE ((uint8_t)2)
+
+class MyDriverNRF24 : public MyDriver
+{ 
+public:
+	MyDriverNRF24();
+	void init();
+	void setAddress(uint8_t address);
+	uint8_t getAddress();
+	bool send(uint8_t to, const void* data, uint8_t len);
+	bool available(uint8_t *to);
+	uint8_t receive(void* data);
+	void powerDown();
+private:
+	RF24 *rf24;
+	uint8_t _address;
+};
+
+#endif