diff --git a/.vs/storno_cqp6xx_digital_xtal/v14/.atsuo b/.vs/storno_cqp6xx_digital_xtal/v14/.atsuo index b28ad4a..68435d2 100644 Binary files a/.vs/storno_cqp6xx_digital_xtal/v14/.atsuo and b/.vs/storno_cqp6xx_digital_xtal/v14/.atsuo differ diff --git a/storno_cqp6xx_digital_xtal/Debug/cqm6xx_app.o b/storno_cqp6xx_digital_xtal/Debug/cqm6xx_app.o index a06e4e7..0077ed8 100644 Binary files a/storno_cqp6xx_digital_xtal/Debug/cqm6xx_app.o and b/storno_cqp6xx_digital_xtal/Debug/cqm6xx_app.o differ diff --git a/storno_cqp6xx_digital_xtal/Debug/main.o b/storno_cqp6xx_digital_xtal/Debug/main.o index 395c48a..37c1912 100644 Binary files a/storno_cqp6xx_digital_xtal/Debug/main.o and b/storno_cqp6xx_digital_xtal/Debug/main.o differ diff --git a/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.elf b/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.elf index 0a424a7..7b8f301 100644 Binary files a/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.elf and b/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.elf differ diff --git a/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.hex b/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.hex index 1e8514d..d4d1289 100644 --- a/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.hex +++ b/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.hex @@ -2,7 +2,7 @@ :100010002CC02BC02AC029C028C027C026C025C09C :1000200024C023C022C021C020C01FC069C11DC080 :100030001CC01BC011241FBECFEFCDBFDFE3DEBF4E -:100040002FE3A6E0BFE301C01D92AB36B207E1F794 +:100040002FE3A6E0BFE301C01D92AC36B207E1F793 :100050001FE3A0E0BFE3E4ECFFE002C005900D92D7 :10006000A630B107D9F7DBD3ABC7CACFEF92FF9267 :100070000F931F93CF93DF93EB018C017B01E40E71 @@ -95,11 +95,11 @@ :1005E00022813381232B09F465C0009709F462C08E :1005F000EC018181813061F4CE01B1DF8981888392 :1006000063E080E069DD019709F054C082E045C0F5 -:10061000813008F044C018828E010C5F1F4F4DE1FD +:10061000813008F044C018828E010C5F1F4F4EE1FC :10062000B80180E090E03DDD81E493E00197F1F7CF :10063000000060E08A819B813DD2E1E4F3E03197E4 :10064000F1F7000040E060E0CE0143DF81E493E099 -:100650000197F1F700004DE1B80180E290E021DD63 +:100650000197F1F700004EE1B80180E290E021DD62 :10066000E1E4F3E03197F1F7000041E061E0CE0111 :1006700030DF42E061E0CE012CDF40E062E08A81C1 :100680009B81DDD181E493E00197F1F7000040E028 @@ -107,26 +107,26 @@ :1006A00049F4CE015CDF8981888363E080E014DD5A :1006B000892B91F3DF91CF911F910F910895CF93E3 :1006C000DF93EC018C81813099F058F08E3FC1F0BE -:1006D0008F3FE9F44DE1BE016C5F7F4F80E290E017 -:1006E00015C04DE1BE016C5F7F4F80E090E006C019 -:1006F0004DE1BE016C5F7F4F80E290E0B7DC07C048 -:100700004DE1BE016C5F7F4F80E090E0CADC198252 -:10071000DF91CF910895DC0114962DE1FB0101904A +:1006D0008F3FE9F44EE1BE016C5F7F4F80E290E016 +:1006E00015C04EE1BE016C5F7F4F80E090E006C018 +:1006F0004EE1BE016C5F7F4F80E290E0B7DC07C047 +:100700004EE1BE016C5F7F4F80E090E0CADC198251 +:10071000DF91CF910895DC0114962EE1FB01019049 :100720000D922A95E1F7CBDF80E090E008950F93DA :100730001F93CF93DF936115710509F46BC0009788 :1007400009F468C0EC01198218826A837B836BE824 :1007500073E0B1DE6BE072E0CE01FDDD8E010C5F77 -:100760001F4F4DE1B80180E090E09BDCF8019E0155 -:100770002F5D3F4F819181508E3F08F44BC0E217AF +:100760001F4F4EE1B80180E090E09BDCF8019E0154 +:100770002E5D3F4F819181508E3F08F44BC0E217B0 :10078000F307C1F71C8283E49DE0A0E0B0E08D8315 :100790009E83AF83B88786EF9CE2A0E0B0E08987B4 :1007A0009A87AB87BC878BE598E4A0E1B0E08D87A2 :1007B0009E87AF87B88B82E190E0A0E0B0E0898BA4 :1007C0009A8BAB8BBC8B1D8A1E8A1F8A188E81E088 :1007D00090E0A0E0B0E0898F9A8FAB8FBC8F80E46F -:1007E00098E7ADE7B1E08D8F9E8FAF8FB8A34DE155 +:1007E00098E7ADE7B1E08E8F9F8FA8A3B9A34EE144 :1007F000B80180E090E03ADC81E493E00197F1F702 -:1008000000004DE1B80180E290E0DF91CF911F91AF +:1008000000004EE1B80180E290E0DF91CF911F91AE :100810000F912CCCDF91CF911F910F910895CF9321 :10082000DF93CDB7DEB7CB55D109CDBFDEBF80E0BA :1008300090E019DD40E660E070E0CE01875A9F4FFE @@ -210,46 +210,46 @@ :100D10004F5F5F4F6BEBC701AEDD80E090E002C03C :100D20008FEF9FEF0F90DF91CF911F910F91FF9069 :100D3000EF9008950F931F93CF93DF938230910527 -:100D400010F482E090E0E091693FF0916A3F20E08A +:100D400010F482E090E0E0916A3FF0916B3F20E088 :100D500030E0A0E0B0E0309719F14081518102818C :100D6000138148175907C8F08417950769F410973D :100D700031F012960C93129713961C9327C0009390 -:100D8000693F10936A3F22C02115310519F04217BF +:100D80006A3F10936B3F22C02115310519F04217BD :100D9000530718F49A01BD01EF01DF01F801DBCF21 :100DA00021153105F9F0281B390B2430310580F469 :100DB0008A819B816115710521F0FB0182839383F8 -:100DC00004C08093693F90936A3FFE01329644C00D +:100DC00004C080936A3F90936B3FFE01329644C00B :100DD000FE01E20FF31F8193919322503109288382 -:100DE00039833AC02091673F3091683F232B41F40B -:100DF0002091023F3091033F2093673F3093683F3B +:100DE00039833AC02091683F3091693F232B41F409 +:100DF0002091023F3091033F2093683F3093693F39 :100E00002091003F3091013F2115310541F42DB76C :100E10003EB74091043F5091053F241B350BE091B4 -:100E2000673FF091683FE217F307A0F42E1B3F0BDA +:100E2000683FF091693FE217F307A0F42E1B3F0BD8 :100E30002817390778F0AC014E5F5F4F241735074C -:100E400048F04E0F5F1F4093673F5093683F819378 +:100E400048F04E0F5F1F4093683F5093693F819376 :100E5000919302C0E0E0F0E0CF01DF91CF911F91CC :100E60000F910895CF93DF93009709F481C0FC019F -:100E7000329712821382A091693FB0916A3F109716 -:100E800081F420813181820F931F2091673F30913F -:100E9000683F2817390751F5E093673FF093683FA3 +:100E7000329712821382A0916A3FB0916B3F109714 +:100E800081F420813181820F931F2091683F30913E +:100E9000693F2817390751F5E093683FF093693FA0 :100EA00067C0ED0120E030E0CE17DF0740F44A8153 :100EB0005B819E0141155105F1F0EA01F5CFC28336 :100EC000D38340815181840F951FC817D90759F4E6 :100ED00088819981840F951F0296808391838A81EE -:100EE0009B81828393832115310529F4E093693F27 -:100EF000F0936A3F3DC0E901EA83FB834991599130 +:100EE0009B81828393832115310529F4E0936A3F26 +:100EF000F0936B3F3DC0E901EA83FB83499159912F :100F0000C40FD51FEC17FD0761F480819181840F18 :100F1000951F0296E90188839983828193818A8350 :100F20009B83E0E0F0E012968D919C9113970097DF :100F300019F0FD01DC01F7CF8D919C9111979D0176 -:100F40002E5F3F4F820F931F2091673F3091683F84 -:100F50002817390769F4309729F41092693F1092E5 -:100F60006A3F02C012821382A093673FB093683F2A +:100F40002E5F3F4F820F931F2091683F3091693F82 +:100F50002817390769F4309729F410926A3F1092E4 +:100F60006B3F02C012821382A093683FB093693F27 :100F7000DF91CF910895FB01DC0102C001900D9239 :100F800041505040D8F7089503D0808199270895A3 :100F9000FC01E050FC4E0895262FAF93BF93E0E094 :100FA000F0E1328131FDFDCFDC01A050BC4E2C932D :100FB0002DE924BF23E020830196BF91AF910895CE :040FC000F894FFCFD3 -:060FC40000006B3F20005D +:060FC40000006C3F20005C :00000001FF diff --git a/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.lss b/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.lss index d917ac6..cd15548 100644 --- a/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.lss +++ b/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.lss @@ -7,7 +7,7 @@ Idx Name Size VMA LMA File off Algn CONTENTS, ALLOC, LOAD, DATA 1 .text 00000fc4 00000000 00000000 00000094 2**1 CONTENTS, ALLOC, LOAD, READONLY, CODE - 2 .bss 00000065 00803f06 00803f06 0000105e 2**0 + 2 .bss 00000066 00803f06 00803f06 0000105e 2**0 ALLOC 3 .comment 00000030 00000000 00000000 0000105e 2**0 CONTENTS, READONLY @@ -15,19 +15,19 @@ Idx Name Size VMA LMA File off Algn CONTENTS, READONLY 5 .debug_aranges 00000240 00000000 00000000 000010d0 2**3 CONTENTS, READONLY, DEBUGGING - 6 .debug_info 00005484 00000000 00000000 00001310 2**0 + 6 .debug_info 000054a0 00000000 00000000 00001310 2**0 CONTENTS, READONLY, DEBUGGING - 7 .debug_abbrev 00001ebe 00000000 00000000 00006794 2**0 + 7 .debug_abbrev 00001ebe 00000000 00000000 000067b0 2**0 CONTENTS, READONLY, DEBUGGING - 8 .debug_line 00001876 00000000 00000000 00008652 2**0 + 8 .debug_line 00001876 00000000 00000000 0000866e 2**0 CONTENTS, READONLY, DEBUGGING - 9 .debug_frame 00000630 00000000 00000000 00009ec8 2**2 + 9 .debug_frame 00000630 00000000 00000000 00009ee4 2**2 CONTENTS, READONLY, DEBUGGING - 10 .debug_str 000022f5 00000000 00000000 0000a4f8 2**0 + 10 .debug_str 00002302 00000000 00000000 0000a514 2**0 CONTENTS, READONLY, DEBUGGING - 11 .debug_loc 000023e8 00000000 00000000 0000c7ed 2**0 + 11 .debug_loc 000023e8 00000000 00000000 0000c816 2**0 CONTENTS, READONLY, DEBUGGING - 12 .debug_ranges 000001c8 00000000 00000000 0000ebd5 2**0 + 12 .debug_ranges 000001c8 00000000 00000000 0000ebfe 2**0 CONTENTS, READONLY, DEBUGGING Disassembly of section .text: @@ -78,7 +78,7 @@ Disassembly of section .text: 48: 1d 92 st X+, r1 0000004a <.do_clear_bss_start>: - 4a: ab 36 cpi r26, 0x6B ; 107 + 4a: ac 36 cpi r26, 0x6C ; 108 4c: b2 07 cpc r27, r18 4e: e1 f7 brne .-8 ; 0x48 <.do_clear_bss_loop> @@ -1356,7 +1356,7 @@ static void cqm6xx_app_loadPLLParam(storno_xtal_app_t *inst){ 618: 8e 01 movw r16, r28 61a: 0c 5f subi r16, 0xFC ; 252 61c: 1f 4f sbci r17, 0xFF ; 255 - 61e: 4d e1 ldi r20, 0x1D ; 29 + 61e: 4e e1 ldi r20, 0x1E ; 30 620: b8 01 movw r22, r16 622: 80 e0 ldi r24, 0x00 ; 0 624: 90 e0 ldi r25, 0x00 ; 0 @@ -1394,7 +1394,7 @@ static void cqm6xx_app_loadPLLParam(storno_xtal_app_t *inst){ cm_EEPROM_read((uint8_t*)PLLB_SETTINGS_EEPROM_ADDR,(uint8_t *)&inst->pll_param_data,sizeof(storno_pll_param_msg)); - 656: 4d e1 ldi r20, 0x1D ; 29 + 656: 4e e1 ldi r20, 0x1E ; 30 658: b8 01 movw r22, r16 65a: 80 e2 ldi r24, 0x20 ; 32 65c: 90 e0 ldi r25, 0x00 ; 0 @@ -1511,7 +1511,7 @@ void programPLL_Parameters(storno_xtal_app_t *inst){ case MSG_GET_PLLB_PARAM: cm_EEPROM_read((uint8_t*)PLLB_SETTINGS_EEPROM_ADDR,(uint8_t *)&inst->pll_param_data,sizeof(storno_pll_param_msg)); - 6d4: 4d e1 ldi r20, 0x1D ; 29 + 6d4: 4e e1 ldi r20, 0x1E ; 30 6d6: be 01 movw r22, r28 6d8: 6c 5f subi r22, 0xFC ; 252 6da: 7f 4f sbci r23, 0xFF ; 255 @@ -1524,7 +1524,7 @@ void programPLL_Parameters(storno_xtal_app_t *inst){ case MSG_PLLA_PARAM: cm_EEPROM_write((uint8_t*)PLLA_SETTINGS_EEPROM_ADDR,(uint8_t*)&(inst->pll_param_data), sizeof(storno_pll_param_msg)); - 6e2: 4d e1 ldi r20, 0x1D ; 29 + 6e2: 4e e1 ldi r20, 0x1E ; 30 6e4: be 01 movw r22, r28 6e6: 6c 5f subi r22, 0xFC ; 252 6e8: 7f 4f sbci r23, 0xFF ; 255 @@ -1535,7 +1535,7 @@ void programPLL_Parameters(storno_xtal_app_t *inst){ case MSG_PLLB_PARAM: cm_EEPROM_write((uint8_t*)PLLB_SETTINGS_EEPROM_ADDR,(uint8_t*)&(inst->pll_param_data), sizeof(storno_pll_param_msg)); - 6f0: 4d e1 ldi r20, 0x1D ; 29 + 6f0: 4e e1 ldi r20, 0x1E ; 30 6f2: be 01 movw r22, r28 6f4: 6c 5f subi r22, 0xFC ; 252 6f6: 7f 4f sbci r23, 0xFF ; 255 @@ -1547,7 +1547,7 @@ void programPLL_Parameters(storno_xtal_app_t *inst){ case MSG_GET_PLLA_PARAM: cm_EEPROM_read((uint8_t*)PLLA_SETTINGS_EEPROM_ADDR,(uint8_t *)&inst->pll_param_data,sizeof(storno_pll_param_msg)); - 700: 4d e1 ldi r20, 0x1D ; 29 + 700: 4e e1 ldi r20, 0x1E ; 30 702: be 01 movw r22, r28 704: 6c 5f subi r22, 0xFC ; 252 706: 7f 4f sbci r23, 0xFF ; 255 @@ -1580,7 +1580,7 @@ int uart_rx_event(storno_xtal_app_t *inst, void *rxData){ memcpy(&inst->pll_param_data,rxData,sizeof(storno_pll_param_msg)); 716: dc 01 movw r26, r24 718: 14 96 adiw r26, 0x04 ; 4 - 71a: 2d e1 ldi r18, 0x1D ; 29 + 71a: 2e e1 ldi r18, 0x1E ; 30 71c: fb 01 movw r30, r22 71e: 01 90 ld r0, Z+ 720: 0d 92 st X+, r0 @@ -1643,14 +1643,14 @@ static int isEEPROMValid(storno_xtal_app_t *inst){ 75c: 8e 01 movw r16, r28 75e: 0c 5f subi r16, 0xFC ; 252 760: 1f 4f sbci r17, 0xFF ; 255 - 762: 4d e1 ldi r20, 0x1D ; 29 + 762: 4e e1 ldi r20, 0x1E ; 30 764: b8 01 movw r22, r16 766: 80 e0 ldi r24, 0x00 ; 0 768: 90 e0 ldi r25, 0x00 ; 0 76a: 9b dc rcall .-1738 ; 0xa2 76c: f8 01 movw r30, r16 76e: 9e 01 movw r18, r28 - 770: 2f 5d subi r18, 0xDF ; 223 + 770: 2e 5d subi r18, 0xDE ; 222 772: 3f 4f sbci r19, 0xFF ; 255 uint8_t *ptr = (void*)&inst->pll_param_data; @@ -1735,13 +1735,13 @@ static int writeDefaultSettingsEEprom(storno_xtal_app_t *inst){ 7e0: 98 e7 ldi r25, 0x78 ; 120 7e2: ad e7 ldi r26, 0x7D ; 125 7e4: b1 e0 ldi r27, 0x01 ; 1 - 7e6: 8d 8f std Y+29, r24 ; 0x1d - 7e8: 9e 8f std Y+30, r25 ; 0x1e - 7ea: af 8f std Y+31, r26 ; 0x1f - 7ec: b8 a3 std Y+32, r27 ; 0x20 + 7e6: 8e 8f std Y+30, r24 ; 0x1e + 7e8: 9f 8f std Y+31, r25 ; 0x1f + 7ea: a8 a3 std Y+32, r26 ; 0x20 + 7ec: b9 a3 std Y+33, r27 ; 0x21 cm_EEPROM_write((uint8_t*)PLLA_SETTINGS_EEPROM_ADDR,(uint8_t*)&(inst->pll_param_data), sizeof(storno_pll_param_msg)); - 7ee: 4d e1 ldi r20, 0x1D ; 29 + 7ee: 4e e1 ldi r20, 0x1E ; 30 7f0: b8 01 movw r22, r16 7f2: 80 e0 ldi r24, 0x00 ; 0 7f4: 90 e0 ldi r25, 0x00 ; 0 @@ -1753,7 +1753,7 @@ static int writeDefaultSettingsEEprom(storno_xtal_app_t *inst){ 800: 00 00 nop _delay_ms(1); cm_EEPROM_write((uint8_t*)PLLB_SETTINGS_EEPROM_ADDR,(uint8_t*)&(inst->pll_param_data), sizeof(storno_pll_param_msg)); - 802: 4d e1 ldi r20, 0x1D ; 29 + 802: 4e e1 ldi r20, 0x1E ; 30 804: b8 01 movw r22, r16 806: 80 e2 ldi r24, 0x20 ; 32 808: 90 e0 ldi r25, 0x00 ; 0 @@ -2542,8 +2542,8 @@ int cm_si5351_init(si5351_driver *inst, void *i2c_transfer_inst, setGet_I2C_Even d40: 10 f4 brcc .+4 ; 0xd46 d42: 82 e0 ldi r24, 0x02 ; 2 d44: 90 e0 ldi r25, 0x00 ; 0 - d46: e0 91 69 3f lds r30, 0x3F69 ; 0x803f69 <__flp> - d4a: f0 91 6a 3f lds r31, 0x3F6A ; 0x803f6a <__flp+0x1> + d46: e0 91 6a 3f lds r30, 0x3F6A ; 0x803f6a <__flp> + d4a: f0 91 6b 3f lds r31, 0x3F6B ; 0x803f6b <__flp+0x1> d4e: 20 e0 ldi r18, 0x00 ; 0 d50: 30 e0 ldi r19, 0x00 ; 0 d52: a0 e0 ldi r26, 0x00 ; 0 @@ -2568,8 +2568,8 @@ int cm_si5351_init(si5351_driver *inst, void *i2c_transfer_inst, setGet_I2C_Even d78: 13 96 adiw r26, 0x03 ; 3 d7a: 1c 93 st X, r17 d7c: 27 c0 rjmp .+78 ; 0xdcc - d7e: 00 93 69 3f sts 0x3F69, r16 ; 0x803f69 <__flp> - d82: 10 93 6a 3f sts 0x3F6A, r17 ; 0x803f6a <__flp+0x1> + d7e: 00 93 6a 3f sts 0x3F6A, r16 ; 0x803f6a <__flp> + d82: 10 93 6b 3f sts 0x3F6B, r17 ; 0x803f6b <__flp+0x1> d86: 22 c0 rjmp .+68 ; 0xdcc d88: 21 15 cp r18, r1 d8a: 31 05 cpc r19, r1 @@ -2600,8 +2600,8 @@ int cm_si5351_init(si5351_driver *inst, void *i2c_transfer_inst, setGet_I2C_Even dbc: 82 83 std Z+2, r24 ; 0x02 dbe: 93 83 std Z+3, r25 ; 0x03 dc0: 04 c0 rjmp .+8 ; 0xdca - dc2: 80 93 69 3f sts 0x3F69, r24 ; 0x803f69 <__flp> - dc6: 90 93 6a 3f sts 0x3F6A, r25 ; 0x803f6a <__flp+0x1> + dc2: 80 93 6a 3f sts 0x3F6A, r24 ; 0x803f6a <__flp> + dc6: 90 93 6b 3f sts 0x3F6B, r25 ; 0x803f6b <__flp+0x1> dca: fe 01 movw r30, r28 dcc: 32 96 adiw r30, 0x02 ; 2 dce: 44 c0 rjmp .+136 ; 0xe58 @@ -2615,16 +2615,16 @@ int cm_si5351_init(si5351_driver *inst, void *i2c_transfer_inst, setGet_I2C_Even dde: 28 83 st Y, r18 de0: 39 83 std Y+1, r19 ; 0x01 de2: 3a c0 rjmp .+116 ; 0xe58 - de4: 20 91 67 3f lds r18, 0x3F67 ; 0x803f67 <__brkval> - de8: 30 91 68 3f lds r19, 0x3F68 ; 0x803f68 <__brkval+0x1> + de4: 20 91 68 3f lds r18, 0x3F68 ; 0x803f68 <__brkval> + de8: 30 91 69 3f lds r19, 0x3F69 ; 0x803f69 <__brkval+0x1> dec: 23 2b or r18, r19 dee: 41 f4 brne .+16 ; 0xe00 df0: 20 91 02 3f lds r18, 0x3F02 ; 0x803f02 <__malloc_heap_start> df4: 30 91 03 3f lds r19, 0x3F03 ; 0x803f03 <__malloc_heap_start+0x1> - df8: 20 93 67 3f sts 0x3F67, r18 ; 0x803f67 <__brkval> - dfc: 30 93 68 3f sts 0x3F68, r19 ; 0x803f68 <__brkval+0x1> - e00: 20 91 00 3f lds r18, 0x3F00 ; 0x803f00 <__data_start> - e04: 30 91 01 3f lds r19, 0x3F01 ; 0x803f01 <__data_start+0x1> + df8: 20 93 68 3f sts 0x3F68, r18 ; 0x803f68 <__brkval> + dfc: 30 93 69 3f sts 0x3F69, r19 ; 0x803f69 <__brkval+0x1> + e00: 20 91 00 3f lds r18, 0x3F00 ; 0x803f00 <__DATA_REGION_ORIGIN__> + e04: 30 91 01 3f lds r19, 0x3F01 ; 0x803f01 <__DATA_REGION_ORIGIN__+0x1> e08: 21 15 cp r18, r1 e0a: 31 05 cpc r19, r1 e0c: 41 f4 brne .+16 ; 0xe1e @@ -2634,8 +2634,8 @@ int cm_si5351_init(si5351_driver *inst, void *i2c_transfer_inst, setGet_I2C_Even e16: 50 91 05 3f lds r21, 0x3F05 ; 0x803f05 <__malloc_margin+0x1> e1a: 24 1b sub r18, r20 e1c: 35 0b sbc r19, r21 - e1e: e0 91 67 3f lds r30, 0x3F67 ; 0x803f67 <__brkval> - e22: f0 91 68 3f lds r31, 0x3F68 ; 0x803f68 <__brkval+0x1> + e1e: e0 91 68 3f lds r30, 0x3F68 ; 0x803f68 <__brkval> + e22: f0 91 69 3f lds r31, 0x3F69 ; 0x803f69 <__brkval+0x1> e26: e2 17 cp r30, r18 e28: f3 07 cpc r31, r19 e2a: a0 f4 brcc .+40 ; 0xe54 @@ -2652,8 +2652,8 @@ int cm_si5351_init(si5351_driver *inst, void *i2c_transfer_inst, setGet_I2C_Even e40: 48 f0 brcs .+18 ; 0xe54 e42: 4e 0f add r20, r30 e44: 5f 1f adc r21, r31 - e46: 40 93 67 3f sts 0x3F67, r20 ; 0x803f67 <__brkval> - e4a: 50 93 68 3f sts 0x3F68, r21 ; 0x803f68 <__brkval+0x1> + e46: 40 93 68 3f sts 0x3F68, r20 ; 0x803f68 <__brkval> + e4a: 50 93 69 3f sts 0x3F69, r21 ; 0x803f69 <__brkval+0x1> e4e: 81 93 st Z+, r24 e50: 91 93 st Z+, r25 e52: 02 c0 rjmp .+4 ; 0xe58 @@ -2676,21 +2676,21 @@ int cm_si5351_init(si5351_driver *inst, void *i2c_transfer_inst, setGet_I2C_Even e70: 32 97 sbiw r30, 0x02 ; 2 e72: 12 82 std Z+2, r1 ; 0x02 e74: 13 82 std Z+3, r1 ; 0x03 - e76: a0 91 69 3f lds r26, 0x3F69 ; 0x803f69 <__flp> - e7a: b0 91 6a 3f lds r27, 0x3F6A ; 0x803f6a <__flp+0x1> + e76: a0 91 6a 3f lds r26, 0x3F6A ; 0x803f6a <__flp> + e7a: b0 91 6b 3f lds r27, 0x3F6B ; 0x803f6b <__flp+0x1> e7e: 10 97 sbiw r26, 0x00 ; 0 e80: 81 f4 brne .+32 ; 0xea2 e82: 20 81 ld r18, Z e84: 31 81 ldd r19, Z+1 ; 0x01 e86: 82 0f add r24, r18 e88: 93 1f adc r25, r19 - e8a: 20 91 67 3f lds r18, 0x3F67 ; 0x803f67 <__brkval> - e8e: 30 91 68 3f lds r19, 0x3F68 ; 0x803f68 <__brkval+0x1> + e8a: 20 91 68 3f lds r18, 0x3F68 ; 0x803f68 <__brkval> + e8e: 30 91 69 3f lds r19, 0x3F69 ; 0x803f69 <__brkval+0x1> e92: 28 17 cp r18, r24 e94: 39 07 cpc r19, r25 e96: 51 f5 brne .+84 ; 0xeec - e98: e0 93 67 3f sts 0x3F67, r30 ; 0x803f67 <__brkval> - e9c: f0 93 68 3f sts 0x3F68, r31 ; 0x803f68 <__brkval+0x1> + e98: e0 93 68 3f sts 0x3F68, r30 ; 0x803f68 <__brkval> + e9c: f0 93 69 3f sts 0x3F69, r31 ; 0x803f69 <__brkval+0x1> ea0: 67 c0 rjmp .+206 ; 0xf70 ea2: ed 01 movw r28, r26 ea4: 20 e0 ldi r18, 0x00 ; 0 @@ -2729,8 +2729,8 @@ int cm_si5351_init(si5351_driver *inst, void *i2c_transfer_inst, setGet_I2C_Even ee6: 21 15 cp r18, r1 ee8: 31 05 cpc r19, r1 eea: 29 f4 brne .+10 ; 0xef6 - eec: e0 93 69 3f sts 0x3F69, r30 ; 0x803f69 <__flp> - ef0: f0 93 6a 3f sts 0x3F6A, r31 ; 0x803f6a <__flp+0x1> + eec: e0 93 6a 3f sts 0x3F6A, r30 ; 0x803f6a <__flp> + ef0: f0 93 6b 3f sts 0x3F6B, r31 ; 0x803f6b <__flp+0x1> ef4: 3d c0 rjmp .+122 ; 0xf70 ef6: e9 01 movw r28, r18 ef8: ea 83 std Y+2, r30 ; 0x02 @@ -2773,20 +2773,20 @@ int cm_si5351_init(si5351_driver *inst, void *i2c_transfer_inst, setGet_I2C_Even f42: 3f 4f sbci r19, 0xFF ; 255 f44: 82 0f add r24, r18 f46: 93 1f adc r25, r19 - f48: 20 91 67 3f lds r18, 0x3F67 ; 0x803f67 <__brkval> - f4c: 30 91 68 3f lds r19, 0x3F68 ; 0x803f68 <__brkval+0x1> + f48: 20 91 68 3f lds r18, 0x3F68 ; 0x803f68 <__brkval> + f4c: 30 91 69 3f lds r19, 0x3F69 ; 0x803f69 <__brkval+0x1> f50: 28 17 cp r18, r24 f52: 39 07 cpc r19, r25 f54: 69 f4 brne .+26 ; 0xf70 f56: 30 97 sbiw r30, 0x00 ; 0 f58: 29 f4 brne .+10 ; 0xf64 - f5a: 10 92 69 3f sts 0x3F69, r1 ; 0x803f69 <__flp> - f5e: 10 92 6a 3f sts 0x3F6A, r1 ; 0x803f6a <__flp+0x1> + f5a: 10 92 6a 3f sts 0x3F6A, r1 ; 0x803f6a <__flp> + f5e: 10 92 6b 3f sts 0x3F6B, r1 ; 0x803f6b <__flp+0x1> f62: 02 c0 rjmp .+4 ; 0xf68 f64: 12 82 std Z+2, r1 ; 0x02 f66: 13 82 std Z+3, r1 ; 0x03 - f68: a0 93 67 3f sts 0x3F67, r26 ; 0x803f67 <__brkval> - f6c: b0 93 68 3f sts 0x3F68, r27 ; 0x803f68 <__brkval+0x1> + f68: a0 93 68 3f sts 0x3F68, r26 ; 0x803f68 <__brkval> + f6c: b0 93 69 3f sts 0x3F69, r27 ; 0x803f69 <__brkval+0x1> f70: df 91 pop r29 f72: cf 91 pop r28 f74: 08 95 ret diff --git a/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.map b/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.map index 56698f8..e905bca 100644 --- a/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.map +++ b/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.map @@ -58,7 +58,7 @@ c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/.. Allocating common symbols Common symbol size file -storno_xtal_app 0x21 main.o +storno_xtal_app 0x22 main.o __brkval 0x2 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega3/short-calls\libc.a(malloc.o) __flp 0x2 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega3/short-calls\libc.a(malloc.o) @@ -649,7 +649,7 @@ END GROUP 0x00803f06 _edata = . 0x00803f06 PROVIDE (__data_end, .) -.bss 0x00803f06 0x65 +.bss 0x00803f06 0x66 0x00803f06 PROVIDE (__bss_start, .) *(.bss) *(.bss*) @@ -670,21 +670,21 @@ END GROUP 0x00803f44 0x2 cm_msg/cm_msg.o 0x00803f44 s_msg_cmplete_evt_fpt *(COMMON) - COMMON 0x00803f46 0x21 main.o + COMMON 0x00803f46 0x22 main.o 0x00803f46 storno_xtal_app - COMMON 0x00803f67 0x4 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega3/short-calls\libc.a(malloc.o) - 0x00803f67 __brkval - 0x00803f69 __flp - 0x00803f6b PROVIDE (__bss_end, .) + COMMON 0x00803f68 0x4 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega3/short-calls\libc.a(malloc.o) + 0x00803f68 __brkval + 0x00803f6a __flp + 0x00803f6c PROVIDE (__bss_end, .) 0x00000fc4 __data_load_start = LOADADDR (.data) 0x00000fca __data_load_end = (__data_load_start + SIZEOF (.data)) -.noinit 0x00803f6b 0x0 +.noinit 0x00803f6c 0x0 [!provide] PROVIDE (__noinit_start, .) *(.noinit*) [!provide] PROVIDE (__noinit_end, .) - 0x00803f6b _end = . - 0x00803f6b PROVIDE (__heap_start, .) + 0x00803f6c _end = . + 0x00803f6c PROVIDE (__heap_start, .) .eeprom 0x00810000 0x0 *(.eeprom*) @@ -782,7 +782,7 @@ END GROUP .debug_pubnames *(.debug_pubnames) -.debug_info 0x00000000 0x5484 +.debug_info 0x00000000 0x54a0 *(.debug_info .gnu.linkonce.wi.*) .debug_info 0x00000000 0x11d6 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATtiny_DFP/1.10.348/gcc/dev/attiny402/avrxmega3/short-calls/crtattiny402.o .debug_info 0x000011d6 0x183 avr_eeprom_driver/avr_eeprom_driver.o @@ -790,11 +790,11 @@ END GROUP .debug_info 0x00001679 0x736 avr_i2c_driver/avr_i2c.o .debug_info 0x00001daf 0x4fc avr_uart_driver/avr_uart.o .debug_info 0x000022ab 0x2b4 cm_msg/cm_msg.o - .debug_info 0x0000255f 0xbfb cqm6xx_app.o - .debug_info 0x0000315a 0xced main.o - .debug_info 0x00003e47 0x14e3 si5351_driver/si5351_driver.o - .debug_info 0x0000532a 0xad C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATtiny_DFP/1.10.348/gcc/dev/attiny402/avrxmega3/short-calls\libattiny402.a(eerd_byte.o) - .debug_info 0x000053d7 0xad C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATtiny_DFP/1.10.348/gcc/dev/attiny402/avrxmega3/short-calls\libattiny402.a(eewr_byte.o) + .debug_info 0x0000255f 0xc09 cqm6xx_app.o + .debug_info 0x00003168 0xcfb main.o + .debug_info 0x00003e63 0x14e3 si5351_driver/si5351_driver.o + .debug_info 0x00005346 0xad C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATtiny_DFP/1.10.348/gcc/dev/attiny402/avrxmega3/short-calls\libattiny402.a(eerd_byte.o) + .debug_info 0x000053f3 0xad C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATtiny_DFP/1.10.348/gcc/dev/attiny402/avrxmega3/short-calls\libattiny402.a(eewr_byte.o) .debug_abbrev 0x00000000 0x1ebe *(.debug_abbrev) @@ -835,7 +835,7 @@ END GROUP .debug_frame 0x000003ac 0x34 main.o .debug_frame 0x000003e0 0x250 si5351_driver/si5351_driver.o -.debug_str 0x00000000 0x22f5 +.debug_str 0x00000000 0x2302 *(.debug_str) .debug_str 0x00000000 0x7a9 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATtiny_DFP/1.10.348/gcc/dev/attiny402/avrxmega3/short-calls/crtattiny402.o .debug_str 0x000007a9 0x1d9 avr_eeprom_driver/avr_eeprom_driver.o @@ -848,11 +848,11 @@ END GROUP 0x4f8 (size before relaxing) .debug_str 0x0000101e 0x23a cm_msg/cm_msg.o 0x3fe (size before relaxing) - .debug_str 0x00001258 0x412 cqm6xx_app.o - 0x675 (size before relaxing) - .debug_str 0x0000166a 0x8ff main.o - 0xc61 (size before relaxing) - .debug_str 0x00001f69 0x38c si5351_driver/si5351_driver.o + .debug_str 0x00001258 0x41f cqm6xx_app.o + 0x682 (size before relaxing) + .debug_str 0x00001677 0x8ff main.o + 0xc6e (size before relaxing) + .debug_str 0x00001f76 0x38c si5351_driver/si5351_driver.o 0xff9 (size before relaxing) .debug_loc 0x00000000 0x23e8 diff --git a/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.srec b/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.srec index 5c38bcb..c7556ca 100644 --- a/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.srec +++ b/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.srec @@ -3,7 +3,7 @@ S113000019C033C032C031C030C02FC02EC02DC083 S11300102CC02BC02AC029C028C027C026C025C098 S113002024C023C022C021C020C01FC069C11DC07C S11300301CC01BC011241FBECFEFCDBFDFE3DEBF4A -S11300402FE3A6E0BFE301C01D92AB36B207E1F790 +S11300402FE3A6E0BFE301C01D92AC36B207E1F78F S11300501FE3A0E0BFE3E4ECFFE002C005900D92D3 S1130060A630B107D9F7DBD3ABC7CACFEF92FF9263 S11300700F931F93CF93DF93EB018C017B01E40E6D @@ -96,11 +96,11 @@ S11305D0DF91CF9108950F931F93CF93DF93FC0185 S11305E022813381232B09F465C0009709F462C08A S11305F0EC018181813061F4CE01B1DF898188838E S113060063E080E069DD019709F054C082E045C0F1 -S1130610813008F044C018828E010C5F1F4F4DE1F9 +S1130610813008F044C018828E010C5F1F4F4EE1F8 S1130620B80180E090E03DDD81E493E00197F1F7CB S1130630000060E08A819B813DD2E1E4F3E03197E0 S1130640F1F7000040E060E0CE0143DF81E493E095 -S11306500197F1F700004DE1B80180E290E021DD5F +S11306500197F1F700004EE1B80180E290E021DD5E S1130660E1E4F3E03197F1F7000041E061E0CE010D S113067030DF42E061E0CE012CDF40E062E08A81BD S11306809B81DDD181E493E00197F1F7000040E024 @@ -108,26 +108,26 @@ S113069062E08A819B81B0D181E089830BC0823082 S11306A049F4CE015CDF8981888363E080E014DD56 S11306B0892B91F3DF91CF911F910F910895CF93DF S11306C0DF93EC018C81813099F058F08E3FC1F0BA -S11306D08F3FE9F44DE1BE016C5F7F4F80E290E013 -S11306E015C04DE1BE016C5F7F4F80E090E006C015 -S11306F04DE1BE016C5F7F4F80E290E0B7DC07C044 -S11307004DE1BE016C5F7F4F80E090E0CADC19824E -S1130710DF91CF910895DC0114962DE1FB01019046 +S11306D08F3FE9F44EE1BE016C5F7F4F80E290E012 +S11306E015C04EE1BE016C5F7F4F80E090E006C014 +S11306F04EE1BE016C5F7F4F80E290E0B7DC07C043 +S11307004EE1BE016C5F7F4F80E090E0CADC19824D +S1130710DF91CF910895DC0114962EE1FB01019045 S11307200D922A95E1F7CBDF80E090E008950F93D6 S11307301F93CF93DF936115710509F46BC0009784 S113074009F468C0EC01198218826A837B836BE820 S113075073E0B1DE6BE072E0CE01FDDD8E010C5F73 -S11307601F4F4DE1B80180E090E09BDCF8019E0151 -S11307702F5D3F4F819181508E3F08F44BC0E217AB +S11307601F4F4EE1B80180E090E09BDCF8019E0150 +S11307702E5D3F4F819181508E3F08F44BC0E217AC S1130780F307C1F71C8283E49DE0A0E0B0E08D8311 S11307909E83AF83B88786EF9CE2A0E0B0E08987B0 S11307A09A87AB87BC878BE598E4A0E1B0E08D879E S11307B09E87AF87B88B82E190E0A0E0B0E0898BA0 S11307C09A8BAB8BBC8B1D8A1E8A1F8A188E81E084 S11307D090E0A0E0B0E0898F9A8FAB8FBC8F80E46B -S11307E098E7ADE7B1E08D8F9E8FAF8FB8A34DE151 +S11307E098E7ADE7B1E08E8F9F8FA8A3B9A34EE140 S11307F0B80180E090E03ADC81E493E00197F1F7FE -S113080000004DE1B80180E290E0DF91CF911F91AB +S113080000004EE1B80180E290E0DF91CF911F91AA S11308100F912CCCDF91CF911F910F910895CF931D S1130820DF93CDB7DEB7CB55D109CDBFDEBF80E0B6 S113083090E019DD40E660E070E0CE01875A9F4FFA @@ -211,46 +211,46 @@ S1130D00BADD80E4898301E010E020E030E0AE0148 S1130D104F5F5F4F6BEBC701AEDD80E090E002C038 S1130D208FEF9FEF0F90DF91CF911F910F91FF9065 S1130D30EF9008950F931F93CF93DF938230910523 -S1130D4010F482E090E0E091693FF0916A3F20E086 +S1130D4010F482E090E0E0916A3FF0916B3F20E084 S1130D5030E0A0E0B0E0309719F140815181028188 S1130D60138148175907C8F08417950769F4109739 S1130D7031F012960C93129713961C9327C000938C -S1130D80693F10936A3F22C02115310519F04217BB +S1130D806A3F10936B3F22C02115310519F04217B9 S1130D90530718F49A01BD01EF01DF01F801DBCF1D S1130DA021153105F9F0281B390B2430310580F465 S1130DB08A819B816115710521F0FB0182839383F4 -S1130DC004C08093693F90936A3FFE01329644C009 +S1130DC004C080936A3F90936B3FFE01329644C007 S1130DD0FE01E20FF31F819391932250310928837E -S1130DE039833AC02091673F3091683F232B41F407 -S1130DF02091023F3091033F2093673F3093683F37 +S1130DE039833AC02091683F3091693F232B41F405 +S1130DF02091023F3091033F2093683F3093693F35 S1130E002091003F3091013F2115310541F42DB768 S1130E103EB74091043F5091053F241B350BE091B0 -S1130E20673FF091683FE217F307A0F42E1B3F0BD6 +S1130E20683FF091693FE217F307A0F42E1B3F0BD4 S1130E302817390778F0AC014E5F5F4F2417350748 -S1130E4048F04E0F5F1F4093673F5093683F819374 +S1130E4048F04E0F5F1F4093683F5093693F819372 S1130E50919302C0E0E0F0E0CF01DF91CF911F91C8 S1130E600F910895CF93DF93009709F481C0FC019B -S1130E70329712821382A091693FB0916A3F109712 -S1130E8081F420813181820F931F2091673F30913B -S1130E90683F2817390751F5E093673FF093683F9F +S1130E70329712821382A0916A3FB0916B3F109710 +S1130E8081F420813181820F931F2091683F30913A +S1130E90693F2817390751F5E093683FF093693F9C S1130EA067C0ED0120E030E0CE17DF0740F44A814F S1130EB05B819E0141155105F1F0EA01F5CFC28332 S1130EC0D38340815181840F951FC817D90759F4E2 S1130ED088819981840F951F0296808391838A81EA -S1130EE09B81828393832115310529F4E093693F23 -S1130EF0F0936A3F3DC0E901EA83FB83499159912C +S1130EE09B81828393832115310529F4E0936A3F22 +S1130EF0F0936B3F3DC0E901EA83FB83499159912B S1130F00C40FD51FEC17FD0761F480819181840F14 S1130F10951F0296E90188839983828193818A834C S1130F209B83E0E0F0E012968D919C9113970097DB S1130F3019F0FD01DC01F7CF8D919C9111979D0172 -S1130F402E5F3F4F820F931F2091673F3091683F80 -S1130F502817390769F4309729F41092693F1092E1 -S1130F606A3F02C012821382A093673FB093683F26 +S1130F402E5F3F4F820F931F2091683F3091693F7E +S1130F502817390769F4309729F410926A3F1092E0 +S1130F606B3F02C012821382A093683FB093693F23 S1130F70DF91CF910895FB01DC0102C001900D9235 S1130F8041505040D8F7089503D08081992708959F S1130F90FC01E050FC4E0895262FAF93BF93E0E090 S1130FA0F0E1328131FDFDCFDC01A050BC4E2C9329 S1130FB02DE924BF23E020830196BF91AF910895CA S1070FC0F894FFCFCF -S1090FC400006B3F200059 +S1090FC400006C3F200058 S9030000FC diff --git a/storno_cqp6xx_digital_xtal/cqm6xx_app.h b/storno_cqp6xx_digital_xtal/cqm6xx_app.h index e03e0e6..ef8b08e 100644 --- a/storno_cqp6xx_digital_xtal/cqm6xx_app.h +++ b/storno_cqp6xx_digital_xtal/cqm6xx_app.h @@ -31,6 +31,7 @@ typedef struct { uint32_t MSx_P1; uint32_t MSx_P2; uint32_t MSx_P3; + uint8_t R_outdivider; uint32_t XtalFreq;