From d4f8f3774c60a35dd11a53da9677b4506a8034a7 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Wed, 18 Jun 2014 13:39:26 +0200 Subject: [PATCH] Removed accidentially set frequency correction --- Modem/hardware.c | 2 +- buildrev.h | 2 +- images/Modem.bin | Bin 21098 -> 21098 bytes images/Modem.elf | Bin 208492 -> 208496 bytes images/Modem.hex | 2 +- images/Modem.map | 86 +++++++++++++++++++++++------------------------ images/Modem.s19 | 2 +- 7 files changed, 47 insertions(+), 47 deletions(-) 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 85217feb979294218227f2928a2bcceed8039287..dda2da87f4aa4229ce38097b2c326cc5da4e906f 100755 GIT binary patch delta 16 XcmaF0gz?o9#tjnMjIEm`wFA`wJy`|^ delta 16 XcmaF0gz?o9#tjnMj7^&*wFA`wJx2xv diff --git a/images/Modem.elf b/images/Modem.elf index 3c8f2d7900bc40db95a86f94ae11abe376cc1137..f2337bf7821b46afb85ddbb88ef9b547116d0dda 100755 GIT binary patch delta 22402 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 Ufj#+n*uRpG-rH9Mtar=)55MnJTmS$7 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