third-party
/
HamShield
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed origin/destination swap. Saved a little RAM to improve stability.

This commit is contained in:
Nigel Vander Houwen 2018-04-06 17:20:38 -07:00
parent d4027f1e7b
commit 5e36ab2898
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
examples/AFSK_PacketTester/AFSK_PacketTester.ino
View File

@ -57,7 +57,6 @@ void setup() {
} }
void loop() { void loop() {
messagebuff = "KC7IBT,KC7IBT,:HAMSHIELD TEST";
prepMessage(); prepMessage();
delay(10000); delay(10000);
} }
@ -65,17 +64,17 @@ void loop() {
void prepMessage() { void prepMessage() {
radio.setModeTransmit(); radio.setModeTransmit();
delay(500); delay(500);
origin_call = messagebuff.substring(0,messagebuff.indexOf(',')); // get originating callsign origin_call = "KC7IBT"; // get originating callsign
destination_call = messagebuff.substring(messagebuff.indexOf(',')+1,messagebuff.indexOf(',',messagebuff.indexOf(',')+1)); // get the destination call destination_call = "KC7IBT"; // get the destination call
textmessage = messagebuff.substring(messagebuff.indexOf(":")+1); textmessage = ":HAMSHIELD TEST";
Serial.print("From: "); Serial.print(origin_call); Serial.print(" To: "); Serial.println(destination_call); Serial.println("Text: "); Serial.println(textmessage); Serial.print("From: "); Serial.print(origin_call); Serial.print(" To: "); Serial.println(destination_call); Serial.println("Text: "); Serial.print(textmessage);
AFSK::Packet *packet = AFSK::PacketBuffer::makePacket(22 + 32); AFSK::Packet *packet = AFSK::PacketBuffer::makePacket(22 + 32);
packet->start(); packet->start();
packet->appendCallsign(origin_call.c_str(),0); packet->appendCallsign(destination_call.c_str(),0);
packet->appendCallsign(destination_call.c_str(),15,true); packet->appendCallsign(origin_call.c_str(),15,true);
packet->appendFCS(0x03); packet->appendFCS(0x03);
packet->appendFCS(0xf0); packet->appendFCS(0xf0);
packet->print(textmessage); packet->print(textmessage);
@ -84,17 +83,15 @@ void prepMessage() {
bool ret = afsk.putTXPacket(packet); bool ret = afsk.putTXPacket(packet);
if(afsk.txReady()) { if(afsk.txReady()) {
Serial.println(F("txReady")); Serial.println(F("TX"));
radio.setModeTransmit(); radio.setModeTransmit();
//delay(100); //delay(100);
if(afsk.txStart()) { if(afsk.txStart()) {
Serial.println(F("txStart"));
} else { } else {
radio.setModeReceive(); radio.setModeReceive();
} }
} }
// Wait 2 seconds before we send our beacon again. // Wait 2 seconds before we send our beacon again.
Serial.println("tick");
// Wait up to 2.5 seconds to finish sending, and stop transmitter. // Wait up to 2.5 seconds to finish sending, and stop transmitter.
// TODO: This is hackery. // TODO: This is hackery.
for(int i = 0; i < 500; i++) { for(int i = 0; i < 500; i++) {
@ -102,7 +99,7 @@ void prepMessage() {
break; break;
delay(50); delay(50);
} }
Serial.println("Done sending"); Serial.println("RX");
radio.setModeReceive(); radio.setModeReceive();
} }