diff --git a/create_sinus_tables.py b/create_sinus_tables.py index aecddeb..c4fe13b 100755 --- a/create_sinus_tables.py +++ b/create_sinus_tables.py @@ -33,62 +33,76 @@ with open(os.path.join(os.path.dirname(__file__), 'include/afsk_sinus.hpp'), 'w' #define N_SHIFTS {N_SHIFTS} #define N_SINUS_1200 {len(sinus1200)} #define N_SINUS_2200 {len(sinus2200)} +#define SKEW_ROUNDS {round(abs(1/(int(1000000/BAUD)-1000000/BAUD)))} const PROGMEM uint8_t SINUS1200[] = {{ {', '.join([str(i) for i in sinus1200])} }}; const PROGMEM uint8_t SINUS2200[] = {{ {', '.join([str(i) for i in sinus2200])} }}; const size_t PS1200[] = {{ {', '.join([str(i) for i in phaseShift1200])} }}; const size_t PS2200[] = {{ {', '.join([str(i) for i in phaseShift2200])} }}; +uint8_t timeskew = 0; + void sendOne(uint32_t *us, uint8_t *phaseShift) {{ uint32_t t; - while ((t = micros() - *us) < INV_BAUD) {{ - OUT_PORT = pgm_read_byte(&SINUS1200[ (PS1200[*phaseShift] + t) % N_SINUS_1200 ]); + while ((t = micros() - *us) < INV_BAUD + (timeskew == 0)) {{ + OUT_PORT = pgm_read_byte(&SINUS1200[ (PS1200[*phaseShift] + t) % N_SINUS_1200 ]) >> 2; }} - *us += INV_BAUD; + *us += INV_BAUD + (timeskew == 0); + timeskew = (timeskew + 1) % SKEW_ROUNDS; }} void sendZero(uint32_t *us, uint8_t *phaseShift) {{ uint32_t t; - while ((t = micros() - *us) < INV_BAUD) {{ - OUT_PORT = pgm_read_byte(&SINUS2200[ (PS2200[*phaseShift] + t) % N_SINUS_2200 ]); + while ((t = micros() - *us) < INV_BAUD + (timeskew == 0)) {{ + OUT_PORT = pgm_read_byte(&SINUS2200[ (PS2200[*phaseShift] + t) % N_SINUS_2200 ]) >> 2; }} *phaseShift = (*phaseShift + 1) % N_SHIFTS; - *us += INV_BAUD; + *us += INV_BAUD + (timeskew == 0); + timeskew = (timeskew + 1) % SKEW_ROUNDS; }} void setZero() {{ - OUT_PORT = pgm_read_byte(&SINUS2200[0]); + OUT_PORT = pgm_read_byte(&SINUS2200[0]) >> 2; }} ''') -#from matplotlib import pyplot as plt -# -#phase_shift = 0 -# -#signal = [] -# -# -#def one(): -# global phase_shift -# for i in range(int(1000000/BAUD)): -# signal.append(sinus1200[int((phaseShift1200[phase_shift]+i) % len(sinus1200))]) -# -#def zero(): -# global phase_shift -# for i in range(int(1000000/BAUD)): -# signal.append(sinus2200[int((phaseShift2200[phase_shift]+i) % len(sinus2200))]) -# phase_shift = (phase_shift + 1) % len(phaseShift2200) -# -# -#for i in range(20): -# if i % 3 == 0: -# one() -# else: -# zero() -# -# -#plt.plot(signal) -#plt.vlines([i*int(1000000/BAUD) for i in range(21)], ymin=0, ymax=255, color='red') -#plt.show() +# from matplotlib import pyplot as plt +# +# phase_shift = 0 +# time_skew = 0 +# +# signal = [] +# skew_corrected_signal = [] +# +# +# def one(): +# global phase_shift, time_skew +# for i in range(int(1000000/BAUD)): +# signal.append(sinus1200[int((phaseShift1200[phase_shift]+i) % len(sinus1200))]) +# for i in range(int(1000000/BAUD)+(time_skew == 0)): +# skew_corrected_signal.append(sinus1200[int((phaseShift1200[phase_shift]+i) % len(sinus1200))]) +# time_skew = (time_skew + 1) % 3 +# +# def zero(): +# global phase_shift, time_skew +# for i in range(int(1000000/BAUD)): +# signal.append(sinus2200[int((phaseShift2200[phase_shift]+i) % len(sinus2200))]) +# for i in range(int(1000000/BAUD)+(time_skew == 0)): +# skew_corrected_signal.append(sinus2200[int((phaseShift2200[phase_shift]+i) % len(sinus2200))]) +# phase_shift = (phase_shift + 1) % len(phaseShift2200) +# time_skew = (time_skew + 1) % 3 +# +# +# for i in range(200): +# if i % 3 == 0: +# one() +# else: +# zero() +# +# +# plt.plot(signal, color='blue') +# plt.plot(skew_corrected_signal, color='purple') +# plt.vlines([i*int(1000000/BAUD) for i in range(21)], ymin=0, ymax=255, color='red') +# plt.show() diff --git a/include/afsk_sinus.hpp b/include/afsk_sinus.hpp index 5b21486..1cdd81b 100644 --- a/include/afsk_sinus.hpp +++ b/include/afsk_sinus.hpp @@ -8,30 +8,35 @@ #define N_SHIFTS 6 #define N_SINUS_1200 833 #define N_SINUS_2200 454 +#define SKEW_ROUNDS 3 const PROGMEM uint8_t SINUS1200[] = { 128, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 176, 177, 178, 179, 180, 181, 182, 183, 183, 184, 185, 186, 187, 188, 189, 189, 190, 191, 192, 193, 194, 194, 195, 196, 197, 198, 199, 199, 200, 201, 202, 202, 203, 204, 205, 206, 206, 207, 208, 209, 209, 210, 211, 212, 212, 213, 214, 214, 215, 216, 217, 217, 218, 219, 219, 220, 221, 221, 222, 223, 223, 224, 224, 225, 226, 226, 227, 228, 228, 229, 229, 230, 230, 231, 232, 232, 233, 233, 234, 234, 235, 235, 236, 236, 237, 237, 238, 238, 239, 239, 240, 240, 241, 241, 242, 242, 242, 243, 243, 244, 244, 245, 245, 245, 246, 246, 246, 247, 247, 247, 248, 248, 248, 249, 249, 249, 250, 250, 250, 250, 251, 251, 251, 251, 252, 252, 252, 252, 253, 253, 253, 253, 253, 254, 254, 254, 254, 254, 254, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 254, 254, 254, 254, 254, 254, 253, 253, 253, 253, 253, 253, 252, 252, 252, 252, 251, 251, 251, 251, 250, 250, 250, 250, 249, 249, 249, 248, 248, 248, 247, 247, 247, 246, 246, 246, 245, 245, 244, 244, 244, 243, 243, 242, 242, 241, 241, 241, 240, 240, 239, 239, 238, 238, 237, 237, 236, 236, 235, 235, 234, 234, 233, 233, 232, 231, 231, 230, 230, 229, 229, 228, 227, 227, 226, 226, 225, 224, 224, 223, 222, 222, 221, 220, 220, 219, 218, 218, 217, 216, 216, 215, 214, 213, 213, 212, 211, 211, 210, 209, 208, 208, 207, 206, 205, 205, 204, 203, 202, 201, 201, 200, 199, 198, 197, 197, 196, 195, 194, 193, 193, 192, 191, 190, 189, 188, 187, 187, 186, 185, 184, 183, 182, 181, 181, 180, 179, 178, 177, 176, 175, 174, 173, 173, 172, 171, 170, 169, 168, 167, 166, 165, 164, 163, 162, 162, 161, 160, 159, 158, 157, 156, 155, 154, 153, 152, 151, 150, 149, 148, 147, 146, 145, 144, 144, 143, 142, 141, 140, 139, 138, 137, 136, 135, 134, 133, 132, 131, 130, 129, 128, 127, 126, 125, 124, 123, 122, 121, 120, 119, 118, 118, 117, 116, 115, 114, 113, 112, 111, 110, 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99, 98, 98, 97, 96, 95, 94, 93, 92, 91, 90, 89, 88, 87, 86, 86, 85, 84, 83, 82, 81, 80, 79, 78, 77, 77, 76, 75, 74, 73, 72, 71, 70, 70, 69, 68, 67, 66, 65, 64, 64, 63, 62, 61, 60, 59, 59, 58, 57, 56, 55, 55, 54, 53, 52, 51, 51, 50, 49, 48, 48, 47, 46, 45, 45, 44, 43, 42, 42, 41, 40, 40, 39, 38, 38, 37, 36, 36, 35, 34, 34, 33, 32, 32, 31, 30, 30, 29, 28, 28, 27, 27, 26, 25, 25, 24, 24, 23, 23, 22, 22, 21, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16, 15, 15, 15, 14, 14, 13, 13, 12, 12, 12, 11, 11, 10, 10, 10, 9, 9, 8, 8, 8, 7, 7, 7, 6, 6, 6, 6, 5, 5, 5, 4, 4, 4, 4, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 10, 10, 10, 11, 11, 12, 12, 12, 13, 13, 14, 14, 15, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, 27, 27, 28, 28, 29, 30, 30, 31, 32, 32, 33, 34, 34, 35, 36, 36, 37, 38, 38, 39, 40, 40, 41, 42, 42, 43, 44, 45, 45, 46, 47, 48, 48, 49, 50, 51, 51, 52, 53, 54, 55, 55, 56, 57, 58, 59, 59, 60, 61, 62, 63, 64, 64, 65, 66, 67, 68, 69, 70, 70, 71, 72, 73, 74, 75, 76, 77, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 118, 119, 120, 121, 122, 123, 124, 125, 126 }; const PROGMEM uint8_t SINUS2200[] = { 128, 129, 131, 133, 135, 136, 138, 140, 142, 143, 145, 147, 149, 150, 152, 154, 156, 157, 159, 161, 162, 164, 166, 168, 169, 171, 173, 174, 176, 177, 179, 181, 182, 184, 185, 187, 189, 190, 192, 193, 195, 196, 198, 199, 201, 202, 204, 205, 206, 208, 209, 210, 212, 213, 214, 216, 217, 218, 219, 221, 222, 223, 224, 225, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 239, 240, 241, 242, 243, 243, 244, 245, 246, 246, 247, 248, 248, 249, 249, 250, 250, 251, 251, 252, 252, 253, 253, 253, 254, 254, 254, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 254, 254, 254, 253, 253, 253, 252, 252, 251, 251, 250, 250, 249, 249, 248, 248, 247, 246, 246, 245, 244, 244, 243, 242, 241, 241, 240, 239, 238, 237, 236, 235, 234, 233, 232, 231, 230, 229, 228, 227, 226, 225, 223, 222, 221, 220, 219, 217, 216, 215, 213, 212, 211, 209, 208, 207, 205, 204, 202, 201, 200, 198, 197, 195, 194, 192, 191, 189, 187, 186, 184, 183, 181, 180, 178, 176, 175, 173, 171, 170, 168, 166, 165, 163, 161, 159, 158, 156, 154, 153, 151, 149, 147, 146, 144, 142, 140, 139, 137, 135, 133, 132, 130, 128, 126, 124, 123, 121, 119, 117, 116, 114, 112, 110, 109, 107, 105, 103, 102, 100, 98, 96, 95, 93, 91, 90, 88, 86, 85, 83, 81, 80, 78, 76, 75, 73, 72, 70, 68, 67, 65, 64, 62, 61, 59, 58, 56, 55, 53, 52, 50, 49, 48, 46, 45, 44, 42, 41, 40, 38, 37, 36, 35, 33, 32, 31, 30, 29, 28, 27, 25, 24, 23, 22, 21, 20, 19, 18, 18, 17, 16, 15, 14, 13, 13, 12, 11, 10, 10, 9, 8, 8, 7, 6, 6, 5, 5, 4, 4, 3, 3, 3, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6, 7, 7, 8, 8, 9, 10, 10, 11, 12, 13, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 36, 37, 39, 40, 41, 42, 44, 45, 47, 48, 49, 51, 52, 54, 55, 56, 58, 59, 61, 62, 64, 66, 67, 69, 70, 72, 73, 75, 77, 78, 80, 82, 83, 85, 87, 88, 90, 92, 93, 95, 97, 98, 100, 102, 104, 105, 107, 109, 111, 112, 114, 116, 118, 119, 121, 123, 125 }; const size_t PS1200[] = { 0, 694, 555, 416, 277, 138 }; const size_t PS2200[] = { 0, 378, 303, 227, 151, 75 }; +uint8_t timeskew = 0; + void sendOne(uint32_t *us, uint8_t *phaseShift) { uint32_t t; - while ((t = micros() - *us) < INV_BAUD) { - OUT_PORT = pgm_read_byte(&SINUS1200[ (PS1200[*phaseShift] + t) % N_SINUS_1200 ]); + while ((t = micros() - *us) < INV_BAUD + (timeskew == 0)) { + OUT_PORT = pgm_read_byte(&SINUS1200[ (PS1200[*phaseShift] + t) % N_SINUS_1200 ]) >> 2; } - *us += INV_BAUD; + *us += INV_BAUD + (timeskew == 0); + timeskew = (timeskew + 1) % SKEW_ROUNDS; } void sendZero(uint32_t *us, uint8_t *phaseShift) { uint32_t t; - while ((t = micros() - *us) < INV_BAUD) { - OUT_PORT = pgm_read_byte(&SINUS2200[ (PS2200[*phaseShift] + t) % N_SINUS_2200 ]); + while ((t = micros() - *us) < INV_BAUD + (timeskew == 0)) { + OUT_PORT = pgm_read_byte(&SINUS2200[ (PS2200[*phaseShift] + t) % N_SINUS_2200 ]) >> 2; } *phaseShift = (*phaseShift + 1) % N_SHIFTS; - *us += INV_BAUD; + *us += INV_BAUD + (timeskew == 0); + timeskew = (timeskew + 1) % SKEW_ROUNDS; } void setZero() { - OUT_PORT = pgm_read_byte(&SINUS2200[0]); + OUT_PORT = pgm_read_byte(&SINUS2200[0]) >> 2; } diff --git a/platformio.ini b/platformio.ini index 3fb21ef..86e19b5 100644 --- a/platformio.ini +++ b/platformio.ini @@ -12,4 +12,34 @@ platform = atmelavr board = uno framework = arduino -build_flags = -DOUT_PORT=PORTD -DOUT_DDR=DDRD +build_flags = -DOUT_PORT=PORTC -DOUT_DDR=DDRC + +[env:mega] +platform = atmelavr +board = megaatmega2560 +framework = arduino +build_flags = -DOUT_PORT=PORTF -DOUT_DDR=DDRF + +[env:nano] +platform = atmelavr +board = nanoatmega328 +framework = arduino +build_flags = -DOUT_PORT=PORTC -DOUT_DDR=DDRC + +[env:one] +platform = atmelavr +board = uno +framework = arduino +build_flags = -DOUT_PORT=PORTD -DOUT_DDR=DDRD -DONE + +[env:zero] +platform = atmelavr +board = uno +framework = arduino +build_flags = -DOUT_PORT=PORTD -DOUT_DDR=DDRD -DZERO + +[env:alternate] +platform = atmelavr +board = megaatmega2560 +framework = arduino +build_flags = -DOUT_PORT=PORTF -DOUT_DDR=DDRF -DALT \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 47af543..0764818 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4,30 +4,15 @@ #include "afsk_sinus.hpp" -#define NCOMMENT 0 #define CALLSIGN "HB3YBQ" - - -uint8_t txdelay[32]; +#define DESTINATION "GPS " +#define TXDELAY 32 struct ax25 { - uint8_t sflag; uint8_t daddr[7]; uint8_t saddr[7]; uint8_t ctrl; uint8_t proto; - struct { - uint8_t dtid; - uint8_t type; - char time[7]; - char lat[8]; - uint8_t sym_table_id; - char lon[9]; - uint8_t sym_code; - char comment[NCOMMENT]; - } __attribute__((packed)) aprs; - uint16_t fcs; - uint8_t eflag; } __attribute__((packed)) frame; enum AprsSymbol : uint8_t { @@ -57,66 +42,166 @@ extern void setZero(); uint32_t m = 0; uint8_t phaseShift = 0; bool nrzi = true; +uint8_t oneCount = 0; -void sendBell202(uint8_t byt, bool sync) { +void sendNrziBit(bool bit, bool zeroStuff) { + if (!bit) { + nrzi = !nrzi; + oneCount = 0; + } else if (zeroStuff) { + oneCount++; + } + if (nrzi) { + sendOne(&m, &phaseShift); + } else { + sendZero(&m, &phaseShift); + } + if (oneCount >= 5) { + sendNrziBit(0, true); + } +} + +void sendFlag(bool sync, size_t count) { if (sync) { phaseShift = 0; m = micros(); } - for (uint8_t i = 0; i < 8; ++i) { - if (!((byt >> i) & 1)) { - nrzi = !nrzi; - } - if (nrzi) { - sendOne(&m, &phaseShift); - } else { - sendZero(&m, &phaseShift); + uint8_t flag = 0x7e; + for (size_t n = 0; n < count; ++n) { + for (uint8_t i = 0; i < 8; ++i) { + sendNrziBit((flag >> i) & 1, false); } } } +void sendAbort(bool sync) { + if (sync) { + phaseShift = 0; + m = micros(); + } + for (uint8_t i = 0; i < 16; ++i) { + sendNrziBit(1, false); + } +} + void sendBell202buf(uint8_t *buf, size_t len, bool sync) { - for (size_t i = 0; i < len; ++i) { - sendBell202(buf[i], sync); - sync = false; + if (sync) { + phaseShift = 0; + m = micros(); + } + for (size_t n = 0; n < len; ++n) { + for (uint8_t i = 0; i < 8; ++i) { + sendNrziBit((buf[n] >> i) & 1, true); + } } } void initFrame() { - memset(txdelay, 0x7e, sizeof(txdelay)); memset(&frame, 0, sizeof(frame)); - frame.sflag = 0x7e; - memcpy(&frame.daddr, "GPS\x00\x00\x00\x00", 7); + memcpy(&frame.daddr, DESTINATION, 6); memcpy(&frame.saddr, CALLSIGN, 6); + for (uint8_t i = 0; i < 7; ++i) { + frame.daddr[i] <<=1; + frame.saddr[i] <<=1; + } + frame.daddr[6] = (NONE << 1) | 0xe0; // command bit + reserved bits (AX.25 3.12.2) + frame.saddr[6] = (BICYCLE << 1) | 0xe1; // command bit + reserved bits + end bit frame.ctrl = 0x03; frame.proto = 0xf0; - frame.aprs.dtid = 1; - memcpy(&frame.aprs.time, "151430h", 7); - memcpy(&frame.aprs.lat, "4730.00N", 8); - frame.aprs.sym_table_id = '/'; - memcpy(&frame.aprs.lon, "00730.00E", 9); - frame.aprs.sym_code = BICYCLE; - frame.fcs = 0xffff; - for (size_t i = 0; i < sizeof(frame) - 3; ++i) { - frame.fcs = _crc_xmodem_update(frame.fcs, ((uint8_t*) &frame)[i]); - } - frame.eflag = 0x7e; } +uint8_t mirrorByte(uint8_t byt) { + return ((byt & 1) << 7) | ((byt & 2) << 5) | ((byt & 4) << 3) | ((byt & 8) << 1) + | ((byt & 16) >> 1) | ((byt & 32) >> 3) | ((byt & 64) >> 5) | ((byt & 128) >> 7); +} + void setup() { - OUT_DDR = 0xff; + OUT_DDR = 0x3f; setZero(); + nrzi = true; initFrame(); + Serial.begin(9600); +#ifdef ALT + phaseShift = 0; + m = micros(); + while (true) { + sendOne(&m, &phaseShift); + sendZero(&m, &phaseShift); + } +#endif +#ifdef ONE + phaseShift = 0; + m = micros(); + while (true) { + sendOne(&m, &phaseShift); + } +#endif +#ifdef ZERO + phaseShift = 0; + m = micros(); + while (true) { + sendZero(&m, &phaseShift); + } +#endif +} + + +void readNmeaGll() { + uint8_t state = 0; + char str[83]; + char *sptr; + + while (state != 2) { + if (!Serial.available()) { + continue; + } + int16_t byt = Serial.read(); + if (state == 0) { + if (byt == '$') { + state = 1; + sptr = str; + *(sptr++) = (char) byt; + } + } else if (state == 1) { + *(sptr++) = (char) byt; + if (byt == '\n') { + state = 2; + *sptr = 0; + if (str[3] == 'G' && str[4] == 'L' && str[5] == 'L') { + state = 2; + } else { + state = 0; + } + Serial.print(str); + Serial.flush(); + } + } + if (sptr > str + sizeof(str)) { + state = 0; + } + } + // AX.25 3.8 - FCS is sent MSB first + uint16_t fcs = 0xffff; + for (size_t i = 0; i < sizeof(frame); ++i) { + fcs = _crc_xmodem_update(fcs, mirrorByte(((uint8_t*) &frame)[i])); + } + for (char *c = str; c < sptr; ++c) { + fcs = _crc_xmodem_update(fcs, mirrorByte(*c)); + } + fcs ^= 0xffff; + fcs = (mirrorByte(fcs & 0xff) << 8) | mirrorByte(fcs >> 8); + sendFlag(true, TXDELAY+1); + sendBell202buf((uint8_t*) &frame, sizeof(frame), false); + sendBell202buf((uint8_t*) str, sptr-str, false); + sendBell202buf((uint8_t*) &fcs, 2, false); + sendFlag(false, 1); + setZero(); nrzi = true; } + void loop() { - sendBell202buf(txdelay, sizeof(txdelay), true); - //sendBell202buf((uint8_t*) &frame, sizeof(frame) - 1, false); - //sendBell202buf((uint8_t*) &frame, sizeof(frame) - 1, false); - sendBell202buf((uint8_t*) &frame, sizeof(frame), false); - setZero(); - nrzi = true; + readNmeaGll(); delay(10000); }