diff --git a/Modem/hardware.c b/Modem/hardware.c index 39397b2..5f95961 100644 --- a/Modem/hardware.c +++ b/Modem/hardware.c @@ -19,7 +19,7 @@ static Afsk *modem; // M1 correction = 9500 // M2 correction = 40000 -#define FREQUENCY_CORRECTION 9500 +#define FREQUENCY_CORRECTION 0 // This function initializes the ADC and configures // it the way we need. diff --git a/buildrev.h b/buildrev.h index 9537481..dd91f6d 100644 --- a/buildrev.h +++ b/buildrev.h @@ -1,2 +1,2 @@ -#define VERS_BUILD 1927 +#define VERS_BUILD 1929 #define VERS_HOST "shard" diff --git a/images/Modem.bin b/images/Modem.bin index 85217fe..dda2da8 100755 Binary files a/images/Modem.bin and b/images/Modem.bin differ diff --git a/images/Modem.elf b/images/Modem.elf index 3c8f2d7..f2337bf 100755 Binary files a/images/Modem.elf and b/images/Modem.elf differ diff --git a/images/Modem.hex b/images/Modem.hex index b66e924..387352a 100644 --- a/images/Modem.hex +++ b/images/Modem.hex @@ -687,7 +687,7 @@ :102AE000109228021092270297CFCF93DF93EC0128 :102AF0007093D9056093D8058630910544F041E282 :102B000050E06AED75E082ED95E00E94DE251092BE -:102B1000800089E18093810082E896E090938700AD +:102B1000800089E18093810085E896E090938700AA :102B2000809386008C2F806480937C0087B121E0A5 :102B300030E001C0220FCA95EAF7922F90958923C1 :102B400087B988B1892388B980917E00822B8093D0 diff --git a/images/Modem.map b/images/Modem.map index fe3edb5..69d711a 100644 --- a/images/Modem.map +++ b/images/Modem.map @@ -1665,51 +1665,51 @@ END GROUP .debug_frame 0x0000000000001844 0x98 obj/Modem/bertos/mware/formatwr_P.o .debug_frame 0x00000000000018dc 0x290 obj/Modem/bertos/drv/kdebug_P.o -.debug_str 0x0000000000000000 0x1f0c +.debug_str 0x0000000000000000 0x1f10 *(.debug_str) .debug_str 0x0000000000000000 0x0 obj/Modem/bertos/cpu/avr/drv/ser_avr.o - .debug_str 0x0000000000000000 0x4c2 obj/Modem/bertos/cpu/avr/drv/ser_mega.o - 0x5a8 (size before relaxing) - .debug_str 0x00000000000004c2 0x0 obj/Modem/bertos/cpu/avr/drv/timer_avr.o - .debug_str 0x00000000000004c2 0x2e obj/Modem/bertos/cpu/avr/drv/timer_mega.o - 0x1df (size before relaxing) - .debug_str 0x00000000000004f0 0x1f7 obj/Modem/bertos/drv/ser.o - 0x625 (size before relaxing) - .debug_str 0x00000000000006e7 0x1c0 obj/Modem/bertos/drv/timer.o - 0x3fa (size before relaxing) - .debug_str 0x00000000000008a7 0x1a3 obj/Modem/bertos/io/kfile.o - 0x4a7 (size before relaxing) - .debug_str 0x0000000000000a4a 0x74 obj/Modem/bertos/mware/event.o - 0x282 (size before relaxing) - .debug_str 0x0000000000000abe 0x20d obj/Modem/bertos/mware/formatwr.o - 0x3a3 (size before relaxing) - .debug_str 0x0000000000000ccb 0x13 obj/Modem/bertos/mware/hex.o - 0xc8 (size before relaxing) - .debug_str 0x0000000000000cde 0xaa obj/Modem/bertos/struct/heap.o - 0x203 (size before relaxing) - .debug_str 0x0000000000000d88 0x1d6 obj/Modem/bertos/net/ax25.o - 0x4b1 (size before relaxing) - .debug_str 0x0000000000000f5e 0x18 obj/Modem/bertos/algo/crc_ccitt.o - 0x19b (size before relaxing) - .debug_str 0x0000000000000f76 0x17f obj/Modem/Modem/main.o - 0x5f9 (size before relaxing) - .debug_str 0x00000000000010f5 0x5b obj/Modem/Modem/hardware.o - 0x470 (size before relaxing) - .debug_str 0x0000000000001150 0xca obj/Modem/Modem/afsk.o - 0x636 (size before relaxing) - .debug_str 0x000000000000121a 0x5a4 obj/Modem/Modem/protocol/mp1.o - 0x9b2 (size before relaxing) - .debug_str 0x00000000000017be 0xeb obj/Modem/Modem/protocol/SimpleSerial.o - 0x4e4 (size before relaxing) - .debug_str 0x00000000000018a9 0x0 obj/Modem/Modem/protocol/KISS.o - .debug_str 0x00000000000018a9 0x220 obj/Modem/Modem/compression/heatshrink_decoder.o - 0x597 (size before relaxing) - .debug_str 0x0000000000001ac9 0x34d obj/Modem/Modem/compression/heatshrink_encoder.o - 0x760 (size before relaxing) - .debug_str 0x0000000000001e16 0x13 obj/Modem/bertos/mware/formatwr_P.o - 0x3a5 (size before relaxing) - .debug_str 0x0000000000001e29 0xe3 obj/Modem/bertos/drv/kdebug_P.o - 0x2ba (size before relaxing) + .debug_str 0x0000000000000000 0x4c6 obj/Modem/bertos/cpu/avr/drv/ser_mega.o + 0x5ac (size before relaxing) + .debug_str 0x00000000000004c6 0x0 obj/Modem/bertos/cpu/avr/drv/timer_avr.o + .debug_str 0x00000000000004c6 0x2e obj/Modem/bertos/cpu/avr/drv/timer_mega.o + 0x1e3 (size before relaxing) + .debug_str 0x00000000000004f4 0x1f7 obj/Modem/bertos/drv/ser.o + 0x629 (size before relaxing) + .debug_str 0x00000000000006eb 0x1c0 obj/Modem/bertos/drv/timer.o + 0x3fe (size before relaxing) + .debug_str 0x00000000000008ab 0x1a3 obj/Modem/bertos/io/kfile.o + 0x4ab (size before relaxing) + .debug_str 0x0000000000000a4e 0x74 obj/Modem/bertos/mware/event.o + 0x286 (size before relaxing) + .debug_str 0x0000000000000ac2 0x20d obj/Modem/bertos/mware/formatwr.o + 0x3a7 (size before relaxing) + .debug_str 0x0000000000000ccf 0x13 obj/Modem/bertos/mware/hex.o + 0xcc (size before relaxing) + .debug_str 0x0000000000000ce2 0xaa obj/Modem/bertos/struct/heap.o + 0x207 (size before relaxing) + .debug_str 0x0000000000000d8c 0x1d6 obj/Modem/bertos/net/ax25.o + 0x4b5 (size before relaxing) + .debug_str 0x0000000000000f62 0x18 obj/Modem/bertos/algo/crc_ccitt.o + 0x19f (size before relaxing) + .debug_str 0x0000000000000f7a 0x17f obj/Modem/Modem/main.o + 0x5fd (size before relaxing) + .debug_str 0x00000000000010f9 0x5b obj/Modem/Modem/hardware.o + 0x474 (size before relaxing) + .debug_str 0x0000000000001154 0xca obj/Modem/Modem/afsk.o + 0x63a (size before relaxing) + .debug_str 0x000000000000121e 0x5a4 obj/Modem/Modem/protocol/mp1.o + 0x9b6 (size before relaxing) + .debug_str 0x00000000000017c2 0xeb obj/Modem/Modem/protocol/SimpleSerial.o + 0x4e8 (size before relaxing) + .debug_str 0x00000000000018ad 0x0 obj/Modem/Modem/protocol/KISS.o + .debug_str 0x00000000000018ad 0x220 obj/Modem/Modem/compression/heatshrink_decoder.o + 0x59b (size before relaxing) + .debug_str 0x0000000000001acd 0x34d obj/Modem/Modem/compression/heatshrink_encoder.o + 0x764 (size before relaxing) + .debug_str 0x0000000000001e1a 0x13 obj/Modem/bertos/mware/formatwr_P.o + 0x3a9 (size before relaxing) + .debug_str 0x0000000000001e2d 0xe3 obj/Modem/bertos/drv/kdebug_P.o + 0x2be (size before relaxing) .debug_loc 0x0000000000000000 0xc2fb *(.debug_loc) diff --git a/images/Modem.s19 b/images/Modem.s19 index 211d463..5aca09a 100755 --- a/images/Modem.s19 +++ b/images/Modem.s19 @@ -688,7 +688,7 @@ S1132AD046E753E08BE292E00E941B1C1092260210 S1132AE0109228021092270297CFCF93DF93EC0124 S1132AF07093D9056093D8058630910544F041E27E S1132B0050E06AED75E082ED95E00E94DE251092BA -S1132B10800089E18093810082E896E090938700A9 +S1132B10800089E18093810085E896E090938700A6 S1132B20809386008C2F806480937C0087B121E0A1 S1132B3030E001C0220FCA95EAF7922F90958923BD S1132B4087B988B1892388B980917E00822B8093CC