From ad7d729010c4093d9846deac09ce7b80915890cd Mon Sep 17 00:00:00 2001 From: nick6x Date: Sat, 13 Aug 2016 15:39:53 -0700 Subject: [PATCH] Fix examples to match Master branch. --- .../AFSK-SerialMessenger.ino | 2 +- examples/AX25Receive/AX25Receive.ino | 1 - examples/FunctionalTest/FunctionalTest.ino | 17 ++++++++++------- examples/Gauges/Gauges.ino | 2 +- examples/QPSK63Transmit/QPSK63Transmit.ino | 2 +- examples/SSTV/SSTV.ino | 2 +- .../SerialTransceiver/SerialTransceiver.ino | 2 +- 7 files changed, 15 insertions(+), 13 deletions(-) diff --git a/examples/AFSK-SerialMessenger/AFSK-SerialMessenger.ino b/examples/AFSK-SerialMessenger/AFSK-SerialMessenger.ino index eeb47cb..96434bc 100644 --- a/examples/AFSK-SerialMessenger/AFSK-SerialMessenger.ino +++ b/examples/AFSK-SerialMessenger/AFSK-SerialMessenger.ino @@ -43,7 +43,7 @@ void setup() { // turn on the radio digitalWrite(RESET_PIN, HIGH); - Serial.begin(115200); + Serial.begin(9600); radio.initialize(); radio.frequency(145570); diff --git a/examples/AX25Receive/AX25Receive.ino b/examples/AX25Receive/AX25Receive.ino index e728e81..a2ac961 100644 --- a/examples/AX25Receive/AX25Receive.ino +++ b/examples/AX25Receive/AX25Receive.ino @@ -29,7 +29,6 @@ void setup() { radio.initialize(); radio.frequency(145010); radio.setSQOff(); - I2Cdev::writeWord(A1846S_DEV_ADDR_SENLOW, 0x44, 0b11111111); Serial.println(F("Frequency")); delay(100); Serial.print(F("Squelch(H/L): ")); diff --git a/examples/FunctionalTest/FunctionalTest.ino b/examples/FunctionalTest/FunctionalTest.ino index 063d16c..e3cd51b 100644 --- a/examples/FunctionalTest/FunctionalTest.ino +++ b/examples/FunctionalTest/FunctionalTest.ino @@ -1,12 +1,15 @@ /* Hamshield - * Example: Fox Hunt - * Plays a one minute tone at 10-13 minute intervals. Script - * will check to see if the channel is clear before it will - * transmit. + * Example: Functional Test + * This is a simple example to demonstrate HamShield receive + * and transmit functionality. * Connect the HamShield to your Arduino. Screw the antenna - * into the HamShield RF jack. Connect the Arduino to wall power and then - * to your computer via USB. To test, set a HandyTalkie - * to 438MHz. You should hear a one-minute tone every 10-13 minutes. + * into the HamShield RF jack. Plug a pair of headphones into + * the HamShield. Connect the Arduino to wall power and then + * to your computer via USB. After uploading this program to + * your adruino, open the Serial Monitor. Serial Monitor will + * describe what you should be expecting to hear from your + * headphones. Tune a HandytTalkie to 446MHz to hear morse + * code example. */ #include diff --git a/examples/Gauges/Gauges.ino b/examples/Gauges/Gauges.ino index e288445..0010756 100755 --- a/examples/Gauges/Gauges.ino +++ b/examples/Gauges/Gauges.ino @@ -35,7 +35,7 @@ void setup() { digitalWrite(RESET_PIN, HIGH); analogReference(DEFAULT); - Serial.begin(115200); + Serial.begin(9600); Serial.print("Radio status: "); int result = radio.testConnection(); diff --git a/examples/QPSK63Transmit/QPSK63Transmit.ino b/examples/QPSK63Transmit/QPSK63Transmit.ino index 9517c4a..bc9858d 100644 --- a/examples/QPSK63Transmit/QPSK63Transmit.ino +++ b/examples/QPSK63Transmit/QPSK63Transmit.ino @@ -58,7 +58,7 @@ void sendChar(uint8_t c) { //PORTD &= ~_BV(2); // Diagnostic pin (D2) } -char *string = "Why hello there, friend. Nice to meet you. Welcome to PSK31. 73, VE6SLP sk\r\n"; +char *string = "Why hello there, friend. Nice to meet you. Welcome to QPSK63. 73, VE6SLP sk\r\n"; void loop() { int i; // put your main code here, to run repeatedly: diff --git a/examples/SSTV/SSTV.ino b/examples/SSTV/SSTV.ino index 44ec29e..e28e81c 100755 --- a/examples/SSTV/SSTV.ino +++ b/examples/SSTV/SSTV.ino @@ -51,7 +51,7 @@ void setup() { void loop() { - if(radio.waitForChannel(1000,2000)) { // Wait forever for calling frequency to open, then wait 2 seconds for breakers + if(radio.waitForChannel(1000,2000, rssi)) { // Wait forever for calling frequency to open, then wait 2 seconds for breakers radio.setModeTransmit(); // Turn on the transmitter delay(250); // Wait a moment radio.SSTVTestPattern(MARTIN1); // send a MARTIN1 test pattern diff --git a/examples/SerialTransceiver/SerialTransceiver.ino b/examples/SerialTransceiver/SerialTransceiver.ino index 6403c9e..0f0a0a0 100644 --- a/examples/SerialTransceiver/SerialTransceiver.ino +++ b/examples/SerialTransceiver/SerialTransceiver.ino @@ -89,7 +89,7 @@ void setup() { pinMode(RESET_PIN, OUTPUT); digitalWrite(RESET_PIN, HIGH); - Serial.begin(115200); + Serial.begin(9600); Serial.print(";;;;;;;;;;;;;;;;;;;;;;;;;;"); int result = radio.testConnection();