switched to low-power library

Author: kolaf

libraries/MySensors/MyConfig.h

@@ -6,12 +6,12 @@
  */
 
 // 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
 
 

libraries/MySensors/MyDriverRF69.cpp

@@ -1,21 +1,24 @@
+#include <RHReliableDatagram.h>
 #include "MyDriver.h"
 #include "MyDriverRF69.h"
 
 MyDriverRF69::MyDriverRF69() : MyDriver() {
-	driver = new RH_RF69(RF69_CS_PIN, RF69_INTERRUPT_PIN);
+	radio = new RFM69();
 }
 
 void MyDriverRF69::init() {
 	// Start up the radio library
-	manager = new RHReliableDatagram(*driver, _address);
-	driver->setFrequency(RF69_FREQUENCY);
-	driver->setTxPower(RF69_TRANSMIT_POWER)
+	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;
-	manager->setThisAddress(_address);
+	radio->setAddress(address);
 }
 
 uint8_t MyDriverRF69::getAddress() {
@@ -24,24 +27,24 @@ uint8_t MyDriverRF69::getAddress() {
 
 bool MyDriverRF69::send(uint8_t to, const void* data, uint8_t len) {
 	// Make sure radio has powered up
-	uint8_t status = manager->sendtoWait((uint8_t *) data, len, to);
-	if(status==RH_ROUTER_ERROR_NONE) {
-		return true;
-	} else {
-		return false;
-	}
+	return radio->sendWithRetry(to,data,len);
 }
 
 bool MyDriverRF69::available(uint8_t *to) {
-	return manager->available();
+	return radio->receiveDone();
 }
 
 uint8_t MyDriverRF69::receive(void* data) {
-	uint8_t len = 256;
-	uint8_t from;
-	manager->recvfromAck((uint8_t *) data, &len, &from);
-}
+	// 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() {
-	driver->sleep();
+	radio->sleep();
 }

libraries/MySensors/MyDriverRF69.h

@@ -4,14 +4,26 @@
 #include "MyConfig.h"
 #include "MyDriver.h"
 #include <stdint.h>
-#include <RH_RF69.h>
-#include <RHReliableDatagram.h>
+#include "RFM69.h"
+#include <SPI.h>
 
-#define RF69_FREQUENCY	868;
-#define RF69_TRANSMIT_POWER	14;
-#define RF69_MODEM_CONFIG   RH_RF69::GFSK_Rb250Fd250;
-#define RF69_INTERRUPT_PIN	2;
-#define RF69_CS_PIN	10;
+#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
 { 
@@ -25,8 +37,7 @@ class MyDriverRF69 : public MyDriver
 	uint8_t receive(void* data);
 	void powerDown();
 private:
-	RH_RF69 *driver = NULL;
-	RHReliableDatagram *manager = NULL;
+	RFM69 *radio = NULL;
 	uint8_t _address;
 };
 

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;
 	}