diff --git a/storno_cqp6xx_digital_xtal/Debug/avr_i2c_driver/avr_i2c.o b/storno_cqp6xx_digital_xtal/Debug/avr_i2c_driver/avr_i2c.o index 3bc09d6..1417051 100644 Binary files a/storno_cqp6xx_digital_xtal/Debug/avr_i2c_driver/avr_i2c.o and b/storno_cqp6xx_digital_xtal/Debug/avr_i2c_driver/avr_i2c.o differ diff --git a/storno_cqp6xx_digital_xtal/Debug/cqm6xx_app.d b/storno_cqp6xx_digital_xtal/Debug/cqm6xx_app.d index bf0def0..fe97637 100644 --- a/storno_cqp6xx_digital_xtal/Debug/cqm6xx_app.d +++ b/storno_cqp6xx_digital_xtal/Debug/cqm6xx_app.d @@ -6,8 +6,7 @@ cqm6xx_app.d cqm6xx_app.o: .././cqm6xx_app.c .././cqm6xx_app.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\string.h \ - .././si5351_driver/include/si5351_driver.h \ - .././avr_gpio_driver/avr_gpio.h \ + .././si5351_driver/si5351_driver.h .././avr_gpio_driver/avr_gpio.h \ .././avr_gpio_driver/../avr_global_config.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h \ @@ -42,7 +41,7 @@ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\string.h: -.././si5351_driver/include/si5351_driver.h: +.././si5351_driver/si5351_driver.h: .././avr_gpio_driver/avr_gpio.h: diff --git a/storno_cqp6xx_digital_xtal/Debug/cqm6xx_app.o b/storno_cqp6xx_digital_xtal/Debug/cqm6xx_app.o index 3393f38..085cb0b 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.d b/storno_cqp6xx_digital_xtal/Debug/main.d index a63f4ec..742db92 100644 --- a/storno_cqp6xx_digital_xtal/Debug/main.d +++ b/storno_cqp6xx_digital_xtal/Debug/main.d @@ -21,7 +21,7 @@ main.d main.o: .././main.c .././avr_global_config.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h \ .././avr_i2c_driver/avr_i2c.h .././avr_i2c_driver/../avr_global_config.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdbool.h \ - .././si5351_driver/include/si5351_driver.h .././cqm6xx_app.h \ + .././si5351_driver/si5351_driver.h .././cqm6xx_app.h \ .././avr_eeprom_driver/avr_eeprom_driver.h .././avr_global_config.h: @@ -72,7 +72,7 @@ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdbool.h: -.././si5351_driver/include/si5351_driver.h: +.././si5351_driver/si5351_driver.h: .././cqm6xx_app.h: diff --git a/storno_cqp6xx_digital_xtal/Debug/main.o b/storno_cqp6xx_digital_xtal/Debug/main.o index 376cc3e..68abe1e 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/si5351_driver/si5351_driver.d b/storno_cqp6xx_digital_xtal/Debug/si5351_driver/si5351_driver.d index fe89ffd..4d7ec7d 100644 --- a/storno_cqp6xx_digital_xtal/Debug/si5351_driver/si5351_driver.d +++ b/storno_cqp6xx_digital_xtal/Debug/si5351_driver/si5351_driver.d @@ -1,6 +1,5 @@ si5351_driver/si5351_driver.d si5351_driver/si5351_driver.o: \ - ../si5351_driver/si5351_driver.c \ - ../si5351_driver/include/si5351_driver.h \ + ../si5351_driver/si5351_driver.c ../si5351_driver/si5351_driver.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h \ @@ -11,7 +10,7 @@ si5351_driver/si5351_driver.d si5351_driver/si5351_driver.o: \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\string.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\math.h -../si5351_driver/include/si5351_driver.h: +../si5351_driver/si5351_driver.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h: diff --git a/storno_cqp6xx_digital_xtal/Debug/si5351_driver/si5351_driver.o b/storno_cqp6xx_digital_xtal/Debug/si5351_driver/si5351_driver.o index 51118e3..59965f3 100644 Binary files a/storno_cqp6xx_digital_xtal/Debug/si5351_driver/si5351_driver.o and b/storno_cqp6xx_digital_xtal/Debug/si5351_driver/si5351_driver.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 0f91a83..b806fe2 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.lss b/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.lss index 29a763d..afc99e3 100644 --- a/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.lss +++ b/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.lss @@ -19,15 +19,15 @@ Idx Name Size VMA LMA File off Algn CONTENTS, READONLY, DEBUGGING 7 .debug_abbrev 00001f08 00000000 00000000 00006eeb 2**0 CONTENTS, READONLY, DEBUGGING - 8 .debug_line 000019ae 00000000 00000000 00008df3 2**0 + 8 .debug_line 00001984 00000000 00000000 00008df3 2**0 CONTENTS, READONLY, DEBUGGING - 9 .debug_frame 0000061c 00000000 00000000 0000a7a4 2**2 + 9 .debug_frame 0000061c 00000000 00000000 0000a778 2**2 CONTENTS, READONLY, DEBUGGING - 10 .debug_str 000022c2 00000000 00000000 0000adc0 2**0 + 10 .debug_str 000022c6 00000000 00000000 0000ad94 2**0 CONTENTS, READONLY, DEBUGGING - 11 .debug_loc 00002855 00000000 00000000 0000d082 2**0 + 11 .debug_loc 00002855 00000000 00000000 0000d05a 2**0 CONTENTS, READONLY, DEBUGGING - 12 .debug_ranges 00000230 00000000 00000000 0000f8d7 2**0 + 12 .debug_ranges 00000230 00000000 00000000 0000f8af 2**0 CONTENTS, READONLY, DEBUGGING Disassembly of section .text: @@ -1139,8 +1139,8 @@ static void cqm6xx_app_updateOsc(storno_xtal_app_t *inst){ 548: cf 93 push r28 54a: df 93 push r29 54c: fc 01 movw r30, r24 - //storno_pll_param_msg temp_msg; - //uint8_t *msg_ptr = (void*)&temp_msg; +#define PLLA_SETTINGS_EEPROM_ADDR 0x00 // addr 0 +#define PLLB_SETTINGS_EEPROM_ADDR 0x20 // addr 32 (64 bytes total memory) static uint8_t isStructValid(storno_xtal_app_t *inst){ @@ -1280,8 +1280,8 @@ void cqm6xx_app_statemachine(storno_xtal_app_t *inst){ 5cc: 1f 93 push r17 5ce: cf 93 push r28 5d0: df 93 push r29 - //storno_pll_param_msg temp_msg; - //uint8_t *msg_ptr = (void*)&temp_msg; +#define PLLA_SETTINGS_EEPROM_ADDR 0x00 // addr 0 +#define PLLB_SETTINGS_EEPROM_ADDR 0x20 // addr 32 (64 bytes total memory) static uint8_t isStructValid(storno_xtal_app_t *inst){ @@ -2504,6 +2504,7 @@ int cm_si5351_init(si5351_driver *inst, void *i2c_transfer_inst, setGet_I2C_Even d2c: c6 01 movw r24, r12 d2e: 89 dd rcall .-1262 ; 0x842 + // Enable xtal clk.. temp = 0b01000000; d30: 80 e4 ldi r24, 0x40 ; 64 d32: 89 83 std Y+1, r24 ; 0x01 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 fc2a234..1bef047 100644 --- a/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.map +++ b/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.map @@ -808,7 +808,7 @@ END GROUP .debug_abbrev 0x00001ee0 0x14 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_abbrev 0x00001ef4 0x14 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_line 0x00000000 0x19ae +.debug_line 0x00000000 0x1984 *(.debug_line .debug_line.* .debug_line_end) .debug_line 0x00000000 0x136 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATtiny_DFP/1.10.348/gcc/dev/attiny402/avrxmega3/short-calls/crtattiny402.o .debug_line 0x00000136 0x16e avr_eeprom_driver/avr_eeprom_driver.o @@ -816,11 +816,11 @@ END GROUP .debug_line 0x0000044c 0x42b avr_i2c_driver/avr_i2c.o .debug_line 0x00000877 0x217 avr_uart_driver/avr_uart.o .debug_line 0x00000a8e 0x1e6 cm_msg/cm_msg.o - .debug_line 0x00000c74 0x47e cqm6xx_app.o - .debug_line 0x000010f2 0x18f main.o - .debug_line 0x00001281 0x5ed si5351_driver/si5351_driver.o - .debug_line 0x0000186e 0x7c 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_line 0x000018ea 0xc4 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_line 0x00000c74 0x475 cqm6xx_app.o + .debug_line 0x000010e9 0x187 main.o + .debug_line 0x00001270 0x5d4 si5351_driver/si5351_driver.o + .debug_line 0x00001844 0x7c 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_line 0x000018c0 0xc4 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_frame 0x00000000 0x61c *(.debug_frame) @@ -833,25 +833,25 @@ END GROUP .debug_frame 0x00000360 0x34 main.o .debug_frame 0x00000394 0x288 si5351_driver/si5351_driver.o -.debug_str 0x00000000 0x22c2 +.debug_str 0x00000000 0x22c6 *(.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 0x1d5 avr_eeprom_driver/avr_eeprom_driver.o - 0x21b (size before relaxing) - .debug_str 0x0000097e 0x16e avr_gpio_driver/avr_gpio.o - 0x315 (size before relaxing) - .debug_str 0x00000aec 0x2ab avr_i2c_driver/avr_i2c.o - 0x502 (size before relaxing) - .debug_str 0x00000d97 0x283 avr_uart_driver/avr_uart.o - 0x4f4 (size before relaxing) - .debug_str 0x0000101a 0x23a cm_msg/cm_msg.o - 0x3fa (size before relaxing) - .debug_str 0x00001254 0x3da cqm6xx_app.o - 0x639 (size before relaxing) - .debug_str 0x0000162e 0x8ff main.o - 0xc54 (size before relaxing) - .debug_str 0x00001f2d 0x395 si5351_driver/si5351_driver.o - 0xff5 (size before relaxing) + .debug_str 0x000007a9 0x1d9 avr_eeprom_driver/avr_eeprom_driver.o + 0x21f (size before relaxing) + .debug_str 0x00000982 0x16e avr_gpio_driver/avr_gpio.o + 0x319 (size before relaxing) + .debug_str 0x00000af0 0x2ab avr_i2c_driver/avr_i2c.o + 0x506 (size before relaxing) + .debug_str 0x00000d9b 0x283 avr_uart_driver/avr_uart.o + 0x4f8 (size before relaxing) + .debug_str 0x0000101e 0x23a cm_msg/cm_msg.o + 0x3fe (size before relaxing) + .debug_str 0x00001258 0x3da cqm6xx_app.o + 0x63d (size before relaxing) + .debug_str 0x00001632 0x8ff main.o + 0xc58 (size before relaxing) + .debug_str 0x00001f31 0x395 si5351_driver/si5351_driver.o + 0xff9 (size before relaxing) .debug_loc 0x00000000 0x2855 *(.debug_loc) diff --git a/storno_cqp6xx_digital_xtal/avr_i2c_driver b/storno_cqp6xx_digital_xtal/avr_i2c_driver index 9c0dcfd..e53bc5b 160000 --- a/storno_cqp6xx_digital_xtal/avr_i2c_driver +++ b/storno_cqp6xx_digital_xtal/avr_i2c_driver @@ -1 +1 @@ -Subproject commit 9c0dcfdb3174cfbfd1e1c4aa2c1efb49956e8e37 +Subproject commit e53bc5b7fa923a96db6244baf556261cef28ac1e diff --git a/storno_cqp6xx_digital_xtal/cm_msg b/storno_cqp6xx_digital_xtal/cm_msg index 7afa6fe..8a8fe0f 160000 --- a/storno_cqp6xx_digital_xtal/cm_msg +++ b/storno_cqp6xx_digital_xtal/cm_msg @@ -1 +1 @@ -Subproject commit 7afa6fe99a29e9540ca46bd4594be23b39f44dba +Subproject commit 8a8fe0f12f61b6405eaca04884571b1c0100cb94 diff --git a/storno_cqp6xx_digital_xtal/cqm6xx_app.c b/storno_cqp6xx_digital_xtal/cqm6xx_app.c index 3ae7a9a..1a36978 100644 --- a/storno_cqp6xx_digital_xtal/cqm6xx_app.c +++ b/storno_cqp6xx_digital_xtal/cqm6xx_app.c @@ -6,20 +6,16 @@ */ #include "cqm6xx_app.h" #include "string.h" -#include "si5351_driver/include/si5351_driver.h" +#include "si5351_driver/si5351_driver.h" #include "avr_gpio_driver/avr_gpio.h" #include "avr_uart_driver/avr_uart.h" #include "avr_global_config.h" #include "avr_eeprom_driver/avr_eeprom_driver.h" #include "cm_msg/cm_msg.h" #include -# define EEPROM_OFFSET 0x1400 #define PLLA_SETTINGS_EEPROM_ADDR 0x00 // addr 0 #define PLLB_SETTINGS_EEPROM_ADDR 0x20 // addr 32 (64 bytes total memory) - //storno_pll_param_msg temp_msg; - //uint8_t *msg_ptr = (void*)&temp_msg; - static uint8_t isStructValid(storno_xtal_app_t *inst){ if(inst->si5351_dev == NULL) return 1; diff --git a/storno_cqp6xx_digital_xtal/main.c b/storno_cqp6xx_digital_xtal/main.c index cc09dcc..469bf17 100644 --- a/storno_cqp6xx_digital_xtal/main.c +++ b/storno_cqp6xx_digital_xtal/main.c @@ -9,7 +9,7 @@ #include #include "avr_uart_driver/avr_uart.h" #include "avr_i2c_driver/avr_i2c.h" -#include "si5351_driver/include/si5351_driver.h" +#include "si5351_driver/si5351_driver.h" #include "cqm6xx_app.h" #include "avr_eeprom_driver/avr_eeprom_driver.h" @@ -42,32 +42,3 @@ int main(void) _delay_ms(100); } } - -/* -storno_pll_param_msg StockPLLParam[2] = { - - { - .PLL_Ident = 0, - .MSNx_P1 = 3395, - .MSNx_P2 = 11510, - .MSNx_P3 = 1067099, - - .MSx_P1 = 18, - .MSx_P2 = 0, - .MSx_P3 = 1, - - - }, - { - .PLL_Ident = 0, - .MSNx_P1 = 3395, - .MSNx_P2 = 11510, - .MSNx_P3 = 1067099, - - .MSx_P1 = 18, - .MSx_P2 = 0, - .MSx_P3 = 1, - } - - -};*/ diff --git a/storno_cqp6xx_digital_xtal/si5351_driver b/storno_cqp6xx_digital_xtal/si5351_driver index 4576085..78e4f5f 160000 --- a/storno_cqp6xx_digital_xtal/si5351_driver +++ b/storno_cqp6xx_digital_xtal/si5351_driver @@ -1 +1 @@ -Subproject commit 4576085237f3156e1fea04d69f0df1fcc4e52407 +Subproject commit 78e4f5f73e53641c116b802b28a80ddd2da17ca3