Updates & MEGA support

This commit is contained in:
Felix Rusu 2014-08-12 22:31:42 -04:00
parent c6960e7de5
commit ccbd7ff7d0
2 changed files with 23 additions and 10 deletions

View File

@ -24,19 +24,24 @@
#include <WirelessHEX69.h> #include <WirelessHEX69.h>
#define NETWORKID 250 //what network this node is on #define NETWORKID 250 //what network this node is on
#define NODEID 5 //this node's ID, should be unique among nodes on this NETWORKID #define NODEID 254 //this node's ID, should be unique among nodes on this NETWORKID
//Match frequency to the hardware version of the radio on your Moteino (uncomment one): //Match frequency to the hardware version of the radio on your Moteino (uncomment one):
//#define FREQUENCY RF69_433MHZ //#define FREQUENCY RF69_433MHZ
//#define FREQUENCY RF69_868MHZ //#define FREQUENCY RF69_868MHZ
#define FREQUENCY RF69_915MHZ #define FREQUENCY RF69_915MHZ
#define ENCRYPTKEY "sampleEncryptKey" //(16 bytes of your choice - keep the same on all encrypted nodes) #define ENCRYPTKEY "sampleEncryptKey" //(16 bytes of your choice - keep the same on all encrypted nodes)
//#define IS_RFM69HW //uncomment only for RFM69HW! Leave out if you have RFM69W! //#define IS_RFM69HW //uncomment only for RFM69HW! Leave out if you have RFM69W!
#define LED 9
#define SERIAL_BAUD 115200 #define SERIAL_BAUD 115200
#define ACK_TIME 50 // # of ms to wait for an ack #define ACK_TIME 50 // # of ms to wait for an ack
#define TIMEOUT 3000 #define TIMEOUT 3000
#ifdef __AVR_ATmega1284P__
#define LED 15 // Moteino MEGAs have LEDs on D15
#else
#define LED 9 // Moteinos hsave LEDs on D9
#endif
RFM69 radio; RFM69 radio;
char c = 0; char c = 0;
char input[64]; //serial input buffer char input[64]; //serial input buffer

View File

@ -29,12 +29,19 @@
//#define FREQUENCY RF69_433MHZ //#define FREQUENCY RF69_433MHZ
//#define FREQUENCY RF69_868MHZ //#define FREQUENCY RF69_868MHZ
#define FREQUENCY RF69_915MHZ #define FREQUENCY RF69_915MHZ
//#define IS_RFM69HW //uncomment only for RFM69HW! Leave out if you have RFM69W! #define IS_RFM69HW //uncomment only for RFM69HW! Leave out if you have RFM69W!
#define SERIAL_BAUD 115200 #define SERIAL_BAUD 115200
#define ACK_TIME 50 // # of ms to wait for an ack #define ACK_TIME 30 // # of ms to wait for an ack
#define ENCRYPTKEY "sampleEncryptKey" #define ENCRYPTKEY "sampleEncryptKey" //(16 bytes of your choice - keep the same on all encrypted nodes)
#define LED 9 #define BLINKPERIOD 500
#define BLINKPERIOD 200
#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 hsave LEDs on D9
#define FLASH_SS 8 // and FLASH SS on D8
#endif
RFM69 radio; RFM69 radio;
char input = 0; char input = 0;
@ -47,7 +54,7 @@ long lastPeriod = -1;
// 0xEF30 for windbond 4mbit flash // 0xEF30 for windbond 4mbit flash
// 0xEF40 for windbond 16/64mbit flash // 0xEF40 for windbond 16/64mbit flash
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
SPIFlash flash(8, 0xEF30); //EF30 for windbond 4mbit flash SPIFlash flash(FLASH_SS, 0xEF30); //EF30 for windbond 4mbit flash
void setup(){ void setup(){
pinMode(LED, OUTPUT); pinMode(LED, OUTPUT);
@ -128,6 +135,7 @@ void loop(){
CheckForWirelessHEX(radio, flash, true); CheckForWirelessHEX(radio, flash, true);
Serial.println(); Serial.println();
} }
//else Serial.print('.');
//////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////
// Real sketch code here, let's blink the onboard LED // Real sketch code here, let's blink the onboard LED