Skip to content

Introduce a RFM69 compatibility mode for RFM12. #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Introduce a RFM69 compatibility mode for RFM12. #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d38d40f
Introduce a RFM69 compatibility mode for RFM12.
aanon4 Oct 18, 2013
4e55db5
Support RF69 library style ACK
aanon4 Oct 19, 2013
7ca20d9
Merge remote-tracking branch 'upstream/master'
aanon4 Nov 24, 2013
2775877
Merge remote-tracking branch 'upstream/master'
aanon4 Dec 14, 2013
8cdec30
Disable RSSI check (optional)
aanon4 Dec 15, 2013
e895dd9
Default bitrate matches default in RFM69 library
aanon4 Dec 17, 2013
22e6214
Warn if we try to use encryption in RFM69 mode (not compatible)
aanon4 Dec 17, 2013
575442c
Re-enable RSSI check (was off for testing)
aanon4 Dec 23, 2013
95e2faa
ReceiveStarted now only true if the node id matches
aanon4 Dec 26, 2013
38c1ffd
Merge remote-tracking branch 'upstream/master'
aanon4 Dec 29, 2013
28b30d0
Changed to enable ACKs in RFM69 compatibility mode
uChip Feb 10, 2014
d0e504c
Merge pull request #1 from uChip/master
aanon4 Feb 10, 2014
737acdc
Fix typo in RFM_Struct_node
uChip Feb 11, 2014
b4be33d
Updated example sketches to match lib changes
uChip Feb 12, 2014
0712af7
Merge pull request #2 from uChip/master
aanon4 May 31, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Examples/LED_Control_Gateway/LED_Control_Gateway.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ void loop()
{
digitalWrite(LED,1);
Serial.print('[');Serial.print(radio.GetSender(), DEC);Serial.print("] ");
for (byte i = 0; i < *radio.DataLen; i++)
Serial.print((char)radio.Data[i]);
for (byte i = 0; i < radio.GetDataLen(); i++)
Serial.print((char)radio.GetData()[i]);

if (radio.ACKRequested())
{
Expand Down Expand Up @@ -140,9 +140,10 @@ void sendMessage()
// wait up to ACK_TIME for proper ACK, return true if received
static bool waitForAck() {
long now = millis();
while (millis() - now <= ACK_TIME)
do {
if (radio.ACKReceived(nodeId))
return true;
} while (millis() - now <= ACK_TIME);
return false;
}

Expand Down
14 changes: 7 additions & 7 deletions Examples/LED_Control_Node/LED_Control_Node.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,16 @@ void loop()
if (radio.CRCPass())
{
Serial.print('[');Serial.print(radio.GetSender(), DEC);Serial.print("] ");
for (byte i = 0; i < *radio.DataLen; i++)
Serial.print((char)radio.Data[i]);
for (byte i = 0; i < radio.GetDataLen(); i++)
Serial.print((char)radio.GetData()[i]);

Serial.print(" - ");
//check for a LED blink/pulse/stop request
if (*radio.DataLen == 3
&& (radio.Data[0]=='b' || radio.Data[0]=='p' || radio.Data[0]=='o')
&& radio.Data[1] == ':'
&& (radio.Data[2]=='s' || radio.Data[2]=='m' || radio.Data[2]=='f'))
handleRequest(radio.Data[0], radio.Data[2]);
if (radio.GetDataLen() == 3
&& (radio.GetData()[0]=='b' || radio.GetData()[0]=='p' || radio.GetData()[0]=='o')
&& radio.GetData()[1] == ':'
&& (radio.GetData()[2]=='s' || radio.GetData()[2]=='m' || radio.GetData()[2]=='f'))
handleRequest(radio.GetData()[0], radio.GetData()[2]);

if (radio.ACKRequested())
{
Expand Down
8 changes: 4 additions & 4 deletions Examples/RFM12B_Struct_gateway/RFM12B_Struct_gateway.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ void loop() {
{
Serial.print('[');Serial.print(radio.GetSender(), DEC);Serial.print("] ");

if (*radio.DataLen != sizeof(Payload))
if (radio.GetDataLen() != sizeof(Payload))
Serial.print("Invalid payload received, not matching Payload struct!");
else
{
theData = *(Payload*)radio.Data; //assume radio.DATA actually contains our struct and not something else
theData = *(Payload*)radio.GetData(); //assume radio.DATA actually contains our struct and not something else
Serial.print(" nodeId=");
Serial.print(theData.nodeId);
Serial.print(" uptime=");
Expand Down Expand Up @@ -119,9 +119,9 @@ void Blink(byte PIN, int DELAY_MS)
// wait a few milliseconds for proper ACK to me, return true if indeed received
static bool waitForAck(byte theNodeID) {
long now = millis();
while (millis() - now <= ACK_TIME) {
do {
if (radio.ACKReceived(theNodeID))
return true;
}
} while (millis() - now <= ACK_TIME);
return false;
}
8 changes: 4 additions & 4 deletions Examples/RFM12B_Struct_node/RFM12B_Struct_node.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ void loop() {
if (radio.CRCPass())
{
Serial.print('[');Serial.print(radio.GetSender(), DEC);Serial.print("] ");
for (byte i = 0; i < *radio.DataLen; i++)
Serial.print((char)radio.Data[i]);
for (byte i = 0; i < radio.GetDataLen(); i++)
Serial.print((char)radio.GetData()[i]);

if (radio.ACKRequested())
{
Expand Down Expand Up @@ -138,9 +138,9 @@ void Blink(byte PIN, int DELAY_MS)
// wait a few milliseconds for proper ACK to me, return true if indeed received
static bool waitForAck(byte theNodeID) {
long now = millis();
while (millis() - now <= ACK_TIME) {
do {
if (radio.ACKReceived(theNodeID))
return true;
}
} while (millis() - now <= ACK_TIME);
return false;
}
6 changes: 3 additions & 3 deletions Examples/Receive/Receive.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ void loop()
if (radio.CRCPass())
{
Serial.print('[');Serial.print(radio.GetSender());Serial.print("] ");
for (byte i = 0; i < *radio.DataLen; i++) //can also use radio.GetDataLen() if you don't like pointers
Serial.print((char)radio.Data[i]);
for (byte i = 0; i < radio.GetDataLen(); i++) //can also use radio.GetDataLen() if you don't like pointers
Serial.print((char)radio.GetData()[i]);

if (radio.ACKRequested())
{
Expand All @@ -50,4 +50,4 @@ void loop()

Serial.println();
}
}
}
6 changes: 4 additions & 2 deletions Examples/Send/Send.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,10 @@ void loop()
// wait a few milliseconds for proper ACK, return true if received
static bool waitForAck() {
long now = millis();
while (millis() - now <= ACK_TIME)
do
{
if (radio.ACKReceived(GATEWAYID))
return true;
} while (millis() - now <= ACK_TIME);
return false;
}
}
8 changes: 4 additions & 4 deletions Examples/Test_2way_gateway/Test_2way_gateway.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ void loop()
{
digitalWrite(9,1);
Serial.print('[');Serial.print(radio.GetSender(), DEC);Serial.print("] ");
for (byte i = 0; i < *radio.DataLen; i++)
Serial.print((char)radio.Data[i]);
for (byte i = 0; i < radio.GetDataLen(); i++)
Serial.print((char)radio.GetData()[i]);

if (radio.ACKRequested())
{
Expand Down Expand Up @@ -67,9 +67,9 @@ void loop()
// wait a few milliseconds for proper ACK to me, return true if indeed received
static bool waitForAck(byte theNodeID) {
long now = millis();
while (millis() - now <= ACK_TIME) {
do {
if (radio.ACKReceived(theNodeID))
return true;
}
} while (millis() - now <= ACK_TIME);
return false;
}
8 changes: 4 additions & 4 deletions Examples/Test_2way_node/Test_2way_node.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ void loop()
if (radio.CRCPass())
{
Serial.print('[');Serial.print(radio.GetSender(), DEC);Serial.print("] ");
for (byte i = 0; i < *radio.DataLen; i++)
Serial.print((char)radio.Data[i]);
for (byte i = 0; i < radio.GetDataLen(); i++)
Serial.print((char)radio.GetData()[i]);

if (radio.ACKRequested())
{
Expand Down Expand Up @@ -95,10 +95,10 @@ void loop()
// wait a few milliseconds for proper ACK to me, return true if indeed received
static bool waitForAck(byte theNodeID) {
long now = millis();
while (millis() - now <= ACK_TIME) {
do {
if (radio.ACKReceived(theNodeID))
return true;
}
} while (millis() - now <= ACK_TIME);
return false;
}

Expand Down
8 changes: 4 additions & 4 deletions Examples/Test_2way_node_withFlash/Test_2way_node_withFlash.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ void loop()
if (radio.CRCPass())
{
Serial.print('[');Serial.print(radio.GetSender(), DEC);Serial.print("] ");
for (byte i = 0; i < *radio.DataLen; i++)
Serial.print((char)radio.Data[i]);
for (byte i = 0; i < radio.GetDataLen(); i++)
Serial.print((char)radio.GetData()[i]);

if (radio.ACKRequested())
{
Expand Down Expand Up @@ -126,10 +126,10 @@ void loop()
// wait a few milliseconds for proper ACK to me, return true if indeed received
static bool waitForAck(byte theNodeID) {
long now = millis();
while (millis() - now <= ACK_TIME) {
do {
if (radio.ACKReceived(theNodeID))
return true;
}
} while (millis() - now <= ACK_TIME);
return false;
}

Expand Down
4 changes: 2 additions & 2 deletions Examples/WirelessProgramming_gateway/WirelessProgramming_gateway.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ void loop(){
{
if (radio.CRCPass())
{
for (byte i = 0; i < *radio.DataLen; i++)
Serial.print((char)radio.Data[i]);
for (byte i = 0; i < radio.GetDataLen(); i++)
Serial.print((char)radio.GetData()[i]);

if (radio.ACKRequested())
{
Expand Down
6 changes: 3 additions & 3 deletions Examples/WirelessProgramming_node/WirelessProgramming_node.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ void loop(){
if (radio.CRCPass())
{
Serial.print("Got [");
Serial.print(*radio.DataLen);
Serial.print(radio.GetDataLen());
Serial.print("] > ");
for (byte i = 0; i < *radio.DataLen; i++)
Serial.print((char)radio.Data[i], HEX);
for (byte i = 0; i < radio.GetDataLen(); i++)
Serial.print((char)radio.GetData()[i], HEX);
Serial.println();

CheckForWirelessHEX(radio, flash, true);
Expand Down
Loading