Merge branch 'kolaf-development' into development

Author: henrikekblad

libraries/MySensors/MyConfig.h

@@ -6,12 +6,15 @@
  */
 
 // pick ONE of these - other board layouts can be easily added this way
-#define MYSENSORS_SENSOR
-//#define MYSENSORS_SERIAL_GATEWAY
+// #define MYSENSORS_SENSOR
+#define MYSENSORS_SERIAL_GATEWAY
 //#define MYSENSORS_ETHERNET_MQTT_GATEWAY
 
 // Choose radio type by enabling one of the following
-#define MYSENSORS_RF_NRF24
+//#define MYSENSORS_RF_NRF24
+#define MYSENSORS_RF_RF69
+
+
 
 
 
@@ -20,6 +23,11 @@
 typedef class MyDriverNRF24 MyDriverClass;
 #endif
 
+#ifdef MYSENSORS_RF_RF69
+#include "MyDriverRF69.h"
+typedef class MyDriverRF69 MyDriverClass;
+#endif
+
 /***
  * Enable/Disable debug logging
  */

libraries/MySensors/MyDriverNRF24.cpp

@@ -15,13 +15,13 @@ void MyDriverNRF24::init() {
 	}
 	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();
+	rf24->enableDynamicAck();
 
 	// All nodes listen to broadcast pipe (for FIND_PARENT_RESPONSE messages)
 	rf24->openReadingPipe(BROADCAST_PIPE, TO_ADDR(BROADCAST_ADDRESS));

libraries/MySensors/MyDriverRF69.cpp

@@ -0,0 +1,50 @@
+#include <RHReliableDatagram.h>
+#include "MyDriver.h"
+#include "MyDriverRF69.h"
+
+MyDriverRF69::MyDriverRF69() : MyDriver() {
+	radio = new RFM69();
+}
+
+void MyDriverRF69::init() {
+	// Start up the radio library
+	radio->initialize(FREQUENCY,_address,NETWORKID);
+#ifdef IS_RFM69HW
+    radio->setHighPower(); //uncomment only for RFM69HW!
+#endif
+    // radio->encrypt(ENCRYPTKEY);
+	
+}
+
+void MyDriverRF69::setAddress(uint8_t address) {
+	_address = address;
+	radio->setAddress(address);
+}
+
+uint8_t MyDriverRF69::getAddress() {
+	return _address;
+}
+
+bool MyDriverRF69::send(uint8_t to, const void* data, uint8_t len) {
+	// Make sure radio has powered up
+	return radio->sendWithRetry(to,data,len);
+}
+
+bool MyDriverRF69::available(uint8_t *to) {
+	return radio->receiveDone();
+}
+
+uint8_t MyDriverRF69::receive(void* data) {
+	// for (byte i = 0; i < radio->DATALEN; i++){
+		// data[i]= (void)radio->DATA[i];
+	// }
+	memcpy(data,(const void *)radio->DATA, radio->DATALEN);
+	if (radio->ACKRequested())
+    {
+      radio->sendACK();
+    }
+}	
+
+void MyDriverRF69::powerDown() {
+	radio->sleep();
+}

libraries/MySensors/MyDriverRF69.h

@@ -0,0 +1,44 @@
+#ifndef MyCommDriver_h
+#define MyCommDriver_h
+
+#include "MyConfig.h"
+#include "MyDriver.h"
+#include <stdint.h>
+#include "RFM69.h"
+#include <SPI.h>
+
+#define NODEID        2    //unique for each node on same network
+#define NETWORKID     100  //the same on all nodes that talk to each other
+#define GATEWAYID     1
+//Match frequency to the hardware version of the radio on your Moteino (uncomment one):
+// #define FREQUENCY   RF69_433MHZ
+#define FREQUENCY   RF69_868MHZ
+//#define FREQUENCY     RF69_915MHZ
+#define ENCRYPTKEY    "sampleEncryptKey" //exactly the same 16 characters/bytes on all nodes!
+//#define IS_RFM69HW    //uncomment only for RFM69HW! Leave out if you have RFM69W!
+#define ACK_TIME      30 // max # of ms to wait for an ack
+#ifdef __AVR_ATmega1284P__
+  #define LED           15 // Moteino MEGAs have LEDs on D15
+  #define FLASH_SS      23 // and FLASH SS on D23
+#else
+  #define LED           9 // Moteinos have LEDs on D9
+  #define FLASH_SS      8 // and FLASH SS on D8
+#endif
+
+class MyDriverRF69 : public MyDriver
+{ 
+public:
+	MyDriverRF69();
+	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:
+	RFM69 *radio = NULL;
+	uint8_t _address;
+};
+
+#endif

libraries/MySensors/MySensor.cpp

@@ -275,6 +275,7 @@ boolean MySensor::process() {
 				msg.sender, msg.last, msg.destination,  msg.sensor, mGetCommand(msg), msg.type, mGetPayloadType(msg), mGetLength(msg), msg.getString(convBuf));
 
 	if(!(mGetVersion(msg) == PROTOCOL_VERSION)) {
+		debug(PSTR("version: %d\n"),mGetVersion(msg));
 		debug(PSTR("version mismatch\n"));
 		return false;
 	}