Add targeted ID wireless programming
Specify the node ID of the target in the command line by newly added command line argument Some refactoring
This commit is contained in:
parent
99beb8194b
commit
85a0cd85bb
|
|
@ -23,39 +23,67 @@
|
||||||
#include <SPIFlash.h>
|
#include <SPIFlash.h>
|
||||||
#include <WirelessHEX69.h>
|
#include <WirelessHEX69.h>
|
||||||
|
|
||||||
#define MYID 1 // node ID used for this unit
|
#define NETWORKID 250 //what network this node is on
|
||||||
#define TARGET_ID 55 // ID of node being wirelessly reprogrammed
|
#define NODEID 5 //this node's ID, should be unique among nodes on this NETWORKID
|
||||||
#define NETWORKID 250
|
|
||||||
//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 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 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
|
||||||
#define ENCRYPTKEY "sampleEncryptKey"
|
|
||||||
|
|
||||||
RFM69 radio;
|
RFM69 radio;
|
||||||
char c = 0;
|
char c = 0;
|
||||||
char input[64]; //serial input buffer
|
char input[64]; //serial input buffer
|
||||||
|
byte targetID=0;
|
||||||
|
|
||||||
void setup(){
|
void setup(){
|
||||||
Serial.begin(SERIAL_BAUD);
|
Serial.begin(SERIAL_BAUD);
|
||||||
radio.initialize(FREQUENCY,MYID,NETWORKID);
|
radio.initialize(FREQUENCY,NODEID,NETWORKID);
|
||||||
//radio.encrypt(ENCRYPTKEY); //OPTIONAL
|
radio.encrypt(ENCRYPTKEY); //OPTIONAL
|
||||||
#ifdef IS_RFM69HW
|
#ifdef IS_RFM69HW
|
||||||
radio.setHighPower(); //only for RFM69HW!
|
radio.setHighPower(); //only for RFM69HW!
|
||||||
#endif
|
#endif
|
||||||
Serial.print("Start wireless gateway...");
|
Serial.println("Start wireless gateway...");
|
||||||
}
|
}
|
||||||
|
|
||||||
void loop(){
|
void loop(){
|
||||||
byte inputLen = readSerialLine(input);
|
byte inputLen = readSerialLine(input, 10, 64, 100); //readSerialLine(char* input, char endOfLineChar=10, byte maxLength=64, uint16_t timeout=1000);
|
||||||
|
|
||||||
if (inputLen==4 && input[0]=='F' && input[1]=='L' && input[2]=='X' && input[3]=='?') {
|
if (inputLen==4 && input[0]=='F' && input[1]=='L' && input[2]=='X' && input[3]=='?') {
|
||||||
CheckForSerialHEX((byte*)input, inputLen, radio, TARGET_ID, TIMEOUT, ACK_TIME, true);
|
if (targetID==0)
|
||||||
|
Serial.println("TO?");
|
||||||
|
else
|
||||||
|
CheckForSerialHEX((byte*)input, inputLen, radio, targetID, TIMEOUT, ACK_TIME, true);
|
||||||
|
}
|
||||||
|
else if (inputLen>3 && inputLen<=6 && input[0]=='T' && input[1]=='O' && input[2]==':')
|
||||||
|
{
|
||||||
|
byte newTarget=0;
|
||||||
|
for (byte i = 3; i<inputLen; i++) //up to 3 characters for target ID
|
||||||
|
if (input[i] >=48 && input[i]<=57)
|
||||||
|
newTarget = newTarget*10+input[i]-48;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
newTarget=0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (newTarget>0)
|
||||||
|
{
|
||||||
|
targetID = newTarget;
|
||||||
|
Serial.print("TO:");
|
||||||
|
Serial.print(newTarget);
|
||||||
|
Serial.println(":OK");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Serial.print(input);
|
||||||
|
Serial.print(":INV");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if (inputLen>0) { //just echo back
|
else if (inputLen>0) { //just echo back
|
||||||
Serial.print("SERIAL IN > ");Serial.println(input);
|
Serial.print("SERIAL IN > ");Serial.println(input);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue