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

update examples, rev arduino version

This commit is contained in:
morgan 2018-10-21 18:45:58 -07:00
parent 88264e1998
commit 5e895f7799
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/CTCSS/CTCSS.ino
View File

@ -95,7 +95,7 @@ void setup() {
radio.setRfPower(0); radio.setRfPower(0);
// CTCSS Setup code // CTCSS Setup code
ctcss_tone = 134.4; ctcss_tone = 131.8;
radio.setCtcss(ctcss_tone); radio.setCtcss(ctcss_tone);
radio.enableCtcss(); radio.enableCtcss();
Serial.print("ctcss tone: "); Serial.print("ctcss tone: ");

25
examples/Morse/Morse.ino
View File

@ -22,7 +22,17 @@
#define MORSE_FREQ 600 #define MORSE_FREQ 600
#define MORSE_DOT 100 // ms #define MORSE_DOT 100 // ms
// Note that all timing is defined in terms of MORSE_DOT relative durations // Note that all timing is defined in terms of MORSE_DOT relative durations
// You may want to tweak those timings in the receiver below // You may want to tweak those timings below
#define SYMBOL_END_TIME 5 //millis
#define CHAR_END_TIME (MORSE_DOT*2.3)
#define MESSAGE_END_TIME (MORSE_DOT*15)
#define MIN_DOT_TIME (MORSE_DOT*0.7)
#define MAX_DOT_TIME (MORSE_DOT*1.3)
#define MIN_DASH_TIME (MORSE_DOT*2.7)
#define MAX_DASH_TIME (MORSE_DOT*3.3)
HamShield radio; HamShield radio;
@ -98,7 +108,7 @@ void loop() {
// we wait for a bit of silence before ending the last // we wait for a bit of silence before ending the last
// symbol in order to smooth out the detector // symbol in order to smooth out the detector
if ((millis() - space_in_progress) > 5) //MORSE_DOT*0.05) if ((millis() - space_in_progress) > SYMBOL_END_TIME)
{ {
if (tone_in_progress != 0) { if (tone_in_progress != 0) {
// end the last tone // end the last tone
@ -109,7 +119,7 @@ void loop() {
} }
// we might be done with a character if the space is long enough // we might be done with a character if the space is long enough
if ((millis() - space_in_progress) > MORSE_DOT*2.3) { if ((millis() - space_in_progress) > CHAR_END_TIME) {
char m = parseMorse(); char m = parseMorse();
if (m != 0) { if (m != 0) {
rx_msg[rx_idx++] = m; rx_msg[rx_idx++] = m;
@ -117,7 +127,7 @@ void loop() {
} }
// we might be done with a message if the space is long enough // we might be done with a message if the space is long enough
if ((millis() - space_in_progress) > MORSE_DOT*15) { if ((millis() - space_in_progress) > MESSAGE_END_TIME) {
if (rx_idx > 0) { if (rx_idx > 0) {
// we got a message, print it now // we got a message, print it now
rx_msg[rx_idx] = '\0'; // null terminate rx_msg[rx_idx] = '\0'; // null terminate
@ -163,16 +173,17 @@ void loop() {
void handleTone(uint16_t tone_time) { void handleTone(uint16_t tone_time) {
//Serial.println(tone_time); //Serial.println(tone_time);
if (tone_time > (MORSE_DOT*0.7) && tone_time < (MORSE_DOT*1.3)) { if (tone_time > MIN_DOT_TIME && tone_time < MAX_DOT_TIME) {
// add a dot // add a dot
//Serial.print("."); //Serial.print(".");
//nothing to do for this bit position, since . = 0 //nothing to do for this bit position, since . = 0
} else if (tone_time > (MORSE_DOT*2.7) && tone_time < (MORSE_DOT*3.3)) { } else if (tone_time > MIN_DASH_TIME && tone_time < MAX_DASH_TIME) {
// add a dash // add a dash
//Serial.print("-"); //Serial.print("-");
rx_morse_char += rx_morse_bit; rx_morse_char += rx_morse_bit;
} }
// prep for the next bit
rx_morse_bit = rx_morse_bit << 1; rx_morse_bit = rx_morse_bit << 1;
} }
@ -189,4 +200,4 @@ char parseMorse() {
rx_morse_bit = 1; rx_morse_bit = 1;
return c; return c;
} }

2
library.properties
View File

@ -1,5 +1,5 @@
name=HamShield name=HamShield
version=1.0.6 version=1.1.0
author=Morgan Redfield <morgan@enhancedradio.com>, Casey Halverson <casey@enhancedradio.com> author=Morgan Redfield <morgan@enhancedradio.com>, Casey Halverson <casey@enhancedradio.com>
maintainer=Morgan Redfield <morgan@enhancedradio.com> maintainer=Morgan Redfield <morgan@enhancedradio.com>
sentence=A library for use with HamShield by Enhanced Radio Devices. sentence=A library for use with HamShield by Enhanced Radio Devices.