From a5a267f4890491c7cb1c77da422377a0c124d8e3 Mon Sep 17 00:00:00 2001 From: Christian Lind Madsen Date: Fri, 1 Nov 2024 16:54:03 +0100 Subject: [PATCH] commit --- .gitmodules | 3 + storno_cqp6xx_digital_xtal/Debug/Makefile | 16 ++- storno_cqp6xx_digital_xtal/Debug/main.d | 15 ++- storno_cqp6xx_digital_xtal/Debug/main.o | Bin 9656 -> 2688 bytes storno_cqp6xx_digital_xtal/Debug/makedep.mk | 2 + .../Debug/si5351_driver/si5351_driver.o | Bin 22128 -> 22132 bytes .../Debug/storno_cqp6xx_digital_xtal.elf | Bin 15388 -> 15012 bytes .../Debug/storno_cqp6xx_digital_xtal.lss | 14 +-- .../Debug/storno_cqp6xx_digital_xtal.map | 37 ++++--- .../avr_global_config.h | 19 ++++ storno_cqp6xx_digital_xtal/avr_uart_driver | 1 + storno_cqp6xx_digital_xtal/main.c | 5 +- storno_cqp6xx_digital_xtal/si5351_driver | 2 +- .../storno_config_msg.h | 33 ++++++ .../storno_cqp6xx_digital_xtal.cproj | 101 +++++++++++------- 15 files changed, 177 insertions(+), 71 deletions(-) create mode 100644 storno_cqp6xx_digital_xtal/avr_global_config.h create mode 160000 storno_cqp6xx_digital_xtal/avr_uart_driver create mode 100644 storno_cqp6xx_digital_xtal/storno_config_msg.h diff --git a/.gitmodules b/.gitmodules index 22343c8..89b9aed 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "storno_cqp6xx_digital_xtal/avr_i2c_driver"] path = storno_cqp6xx_digital_xtal/avr_i2c_driver url = https://OZ1CM@bitbucket.org/oz1cm/avr_i2c_driver.git +[submodule "storno_cqp6xx_digital_xtal/avr_uart_driver"] + path = storno_cqp6xx_digital_xtal/avr_uart_driver + url = https://OZ1CM@bitbucket.org/oz1cm/avr_uart_driver.git diff --git a/storno_cqp6xx_digital_xtal/Debug/Makefile b/storno_cqp6xx_digital_xtal/Debug/Makefile index 051cbf8..7162ea7 100644 --- a/storno_cqp6xx_digital_xtal/Debug/Makefile +++ b/storno_cqp6xx_digital_xtal/Debug/Makefile @@ -34,6 +34,8 @@ LINKER_SCRIPT_DEP:= # Every subdirectory with source files must be described here SUBDIRS := \ ../avr_i2c_driver/ \ +../avr_uart_driver/ \ +../avr_uart_driver/include \ ../si5351_driver/ \ ../si5351_driver/include/ @@ -41,6 +43,7 @@ SUBDIRS := \ # Add inputs and outputs from these tool invocations to the build variables C_SRCS += \ ../avr_i2c_driver/avr_i2c.c \ +../avr_uart_driver/avr_uart.c \ ../cqm6xx_app.c \ ../main.c \ ../si5351_driver/si5351_driver.c @@ -54,24 +57,28 @@ ASM_SRCS += OBJS += \ avr_i2c_driver/avr_i2c.o \ +avr_uart_driver/avr_uart.o \ cqm6xx_app.o \ main.o \ si5351_driver/si5351_driver.o OBJS_AS_ARGS += \ avr_i2c_driver/avr_i2c.o \ +avr_uart_driver/avr_uart.o \ cqm6xx_app.o \ main.o \ si5351_driver/si5351_driver.o C_DEPS += \ avr_i2c_driver/avr_i2c.d \ +avr_uart_driver/avr_uart.d \ cqm6xx_app.d \ main.d \ si5351_driver/si5351_driver.d C_DEPS_AS_ARGS += \ avr_i2c_driver/avr_i2c.d \ +avr_uart_driver/avr_uart.d \ cqm6xx_app.d \ main.d \ si5351_driver/si5351_driver.d @@ -97,6 +104,13 @@ avr_i2c_driver/avr_i2c.o: ../avr_i2c_driver/avr_i2c.c @echo Finished building: $< +avr_uart_driver/avr_uart.o: ../avr_uart_driver/avr_uart.c + @echo Building file: $< + @echo Invoking: AVR/GNU C Compiler : 5.4.0 + $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATtiny_DFP\1.10.348\include" -Og -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=attiny402 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATtiny_DFP\1.10.348\gcc\dev\attiny402" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" + @echo Finished building: $< + + ./cqm6xx_app.o: .././cqm6xx_app.c @echo Building file: $< @echo Invoking: AVR/GNU C Compiler : 5.4.0 @@ -144,7 +158,7 @@ all: $(OUTPUT_FILE_PATH) $(ADDITIONAL_DEPENDENCIES) $(OUTPUT_FILE_PATH): $(OBJS) $(USER_OBJS) $(OUTPUT_FILE_DEP) $(LIB_DEP) $(LINKER_SCRIPT_DEP) @echo Building target: $@ @echo Invoking: AVR/GNU Linker : 5.4.0 - $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -o$(OUTPUT_FILE_PATH_AS_ARGS) $(OBJS_AS_ARGS) $(USER_OBJS) $(LIBS) -Wl,-Map="storno_cqp6xx_digital_xtal.map" -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,-L"D:\cm_projects\microchip_studio_projects\storno_cqp6xx_digital_xtal\storno_cqp6xx_digital_xtal\si5351_driver\include" -Wl,--gc-sections -mmcu=attiny402 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATtiny_DFP\1.10.348\gcc\dev\attiny402" + $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -o$(OUTPUT_FILE_PATH_AS_ARGS) $(OBJS_AS_ARGS) $(USER_OBJS) $(LIBS) -Wl,-Map="storno_cqp6xx_digital_xtal.map" -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,-L"D:\cm_projects\microchip_studio_projects\storno_cqp6xx_digital_xtal\storno_cqp6xx_digital_xtal\si5351_driver\include" -Wl,-L"../avr_uart_driver" -Wl,--gc-sections -mmcu=attiny402 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATtiny_DFP\1.10.348\gcc\dev\attiny402" @echo Finished building target: $@ "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -O ihex -R .eeprom -R .fuse -R .lock -R .signature -R .user_signatures "storno_cqp6xx_digital_xtal.elf" "storno_cqp6xx_digital_xtal.hex" "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -j .eeprom --set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O ihex "storno_cqp6xx_digital_xtal.elf" "storno_cqp6xx_digital_xtal.eep" || exit 0 diff --git a/storno_cqp6xx_digital_xtal/Debug/main.d b/storno_cqp6xx_digital_xtal/Debug/main.d index b7396e1..bf66685 100644 --- a/storno_cqp6xx_digital_xtal/Debug/main.d +++ b/storno_cqp6xx_digital_xtal/Debug/main.d @@ -1,4 +1,4 @@ -main.d main.o: .././main.c \ +main.d main.o: .././main.c .././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 \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h \ @@ -11,9 +11,10 @@ main.d main.o: .././main.c \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\xmega.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\fuse.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\lock.h \ - .././storno_frq_lst.h \ - c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdbool.h \ - c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h + .././avr_uart_driver/include/avr_uart.h \ + .././avr_uart_driver/include/../../avr_global_config.h + +.././avr_global_config.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h: @@ -39,8 +40,6 @@ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\lock.h: -.././storno_frq_lst.h: +.././avr_uart_driver/include/avr_uart.h: -c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdbool.h: - -c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h: +.././avr_uart_driver/include/../../avr_global_config.h: diff --git a/storno_cqp6xx_digital_xtal/Debug/main.o b/storno_cqp6xx_digital_xtal/Debug/main.o index 2227679745fba9156f64ba032358d09c4f8d20ff..8d4d9900e04b0112d290c8a1a71af73e823ed78c 100644 GIT binary patch literal 2688 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 Xkm=z%TWgf)=L*}vWA7B(Zp{4wX7{e= 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 4d0aa06..3185320 100644 --- a/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.lss +++ b/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.lss @@ -13,17 +13,17 @@ Idx Name Size VMA LMA File off Algn CONTENTS, READONLY 4 .debug_aranges 00000020 00000000 00000000 0000010c 2**0 CONTENTS, READONLY, DEBUGGING - 5 .debug_info 000012c2 00000000 00000000 0000012c 2**0 + 5 .debug_info 0000125a 00000000 00000000 0000012c 2**0 CONTENTS, READONLY, DEBUGGING - 6 .debug_abbrev 0000117a 00000000 00000000 000013ee 2**0 + 6 .debug_abbrev 00001127 00000000 00000000 00001386 2**0 CONTENTS, READONLY, DEBUGGING - 7 .debug_line 000001e5 00000000 00000000 00002568 2**0 + 7 .debug_line 0000016f 00000000 00000000 000024ad 2**0 CONTENTS, READONLY, DEBUGGING - 8 .debug_frame 00000024 00000000 00000000 00002750 2**2 + 8 .debug_frame 00000024 00000000 00000000 0000261c 2**2 CONTENTS, READONLY, DEBUGGING - 9 .debug_str 00000960 00000000 00000000 00002774 2**0 + 9 .debug_str 00000919 00000000 00000000 00002640 2**0 CONTENTS, READONLY, DEBUGGING - 10 .debug_ranges 00000010 00000000 00000000 000030d4 2**0 + 10 .debug_ranges 00000010 00000000 00000000 00002f59 2**0 CONTENTS, READONLY, DEBUGGING Disassembly of section .text: @@ -71,7 +71,7 @@ Disassembly of section .text: 00000046
: //#include "avr_i2c_driver/avr_i2c.h" -#include "storno_frq_lst.h" +//#include "storno_frq_lst.h" int main(void) 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 04c9cbd..7d62ab2 100644 --- a/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.map +++ b/storno_cqp6xx_digital_xtal/Debug/storno_cqp6xx_digital_xtal.map @@ -49,6 +49,20 @@ Discarded input sections .debug_line 0x00000000 0x1a avr_i2c_driver/avr_i2c.o .debug_str 0x00000000 0x1af avr_i2c_driver/avr_i2c.o .comment 0x00000000 0x31 avr_i2c_driver/avr_i2c.o + .text 0x00000000 0x0 avr_uart_driver/avr_uart.o + .data 0x00000000 0x0 avr_uart_driver/avr_uart.o + .bss 0x00000000 0x0 avr_uart_driver/avr_uart.o + .text.cm_uart_init + 0x00000000 0x6 avr_uart_driver/avr_uart.o + .debug_info 0x00000000 0x208 avr_uart_driver/avr_uart.o + .debug_abbrev 0x00000000 0xa2 avr_uart_driver/avr_uart.o + .debug_aranges + 0x00000000 0x20 avr_uart_driver/avr_uart.o + .debug_ranges 0x00000000 0x10 avr_uart_driver/avr_uart.o + .debug_line 0x00000000 0x114 avr_uart_driver/avr_uart.o + .debug_str 0x00000000 0x276 avr_uart_driver/avr_uart.o + .comment 0x00000000 0x31 avr_uart_driver/avr_uart.o + .debug_frame 0x00000000 0x24 avr_uart_driver/avr_uart.o .text 0x00000000 0x0 cqm6xx_app.o .data 0x00000000 0x0 cqm6xx_app.o .bss 0x00000000 0x0 cqm6xx_app.o @@ -58,8 +72,6 @@ Discarded input sections .text 0x00000000 0x0 main.o .data 0x00000000 0x0 main.o .bss 0x00000000 0x0 main.o - .rodata.storno_cqp632_lst - 0x00000000 0x1908 main.o .text 0x00000000 0x0 si5351_driver/si5351_driver.o .data 0x00000000 0x0 si5351_driver/si5351_driver.o .bss 0x00000000 0x0 si5351_driver/si5351_driver.o @@ -68,7 +80,7 @@ Discarded input sections .text.writeRegister 0x00000000 0x7e si5351_driver/si5351_driver.o .text.cm_setPLLParameters - 0x00000000 0x302 si5351_driver/si5351_driver.o + 0x00000000 0x306 si5351_driver/si5351_driver.o .text.cm_setInputSource 0x00000000 0x3c si5351_driver/si5351_driver.o .text.cm_si5351_getRevisionNumber @@ -211,6 +223,7 @@ Address of section .data set to 0x803f00 0x00008000 __RODATA_PM_OFFSET__ = 0x8000 LOAD C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATtiny_DFP/1.10.348/gcc/dev/attiny402/avrxmega3/short-calls/crtattiny402.o LOAD avr_i2c_driver/avr_i2c.o +LOAD avr_uart_driver/avr_uart.o LOAD cqm6xx_app.o LOAD main.o LOAD si5351_driver/si5351_driver.o @@ -536,30 +549,30 @@ END GROUP .debug_pubnames *(.debug_pubnames) -.debug_info 0x00000000 0x12c2 +.debug_info 0x00000000 0x125a *(.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 0xec main.o + .debug_info 0x000011d6 0x84 main.o -.debug_abbrev 0x00000000 0x117a +.debug_abbrev 0x00000000 0x1127 *(.debug_abbrev) .debug_abbrev 0x00000000 0x10de C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATtiny_DFP/1.10.348/gcc/dev/attiny402/avrxmega3/short-calls/crtattiny402.o - .debug_abbrev 0x000010de 0x9c main.o + .debug_abbrev 0x000010de 0x49 main.o -.debug_line 0x00000000 0x1e5 +.debug_line 0x00000000 0x16f *(.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 0xaf main.o + .debug_line 0x00000136 0x39 main.o .debug_frame 0x00000000 0x24 *(.debug_frame) .debug_frame 0x00000000 0x24 main.o -.debug_str 0x00000000 0x960 +.debug_str 0x00000000 0x919 *(.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 0x1b7 main.o - 0x1eb (size before relaxing) + .debug_str 0x000007a9 0x170 main.o + 0x1a4 (size before relaxing) .debug_loc *(.debug_loc) diff --git a/storno_cqp6xx_digital_xtal/avr_global_config.h b/storno_cqp6xx_digital_xtal/avr_global_config.h new file mode 100644 index 0000000..603de4b --- /dev/null +++ b/storno_cqp6xx_digital_xtal/avr_global_config.h @@ -0,0 +1,19 @@ +/* + * avr_global_config.h + * + * Created: 25-10-2024 17:34:24 + * Author: Christian Lind Vie Madsen - OZ1CM + */ + + +#ifndef AVR_GLOBAL_CONFIG_H_ +#define AVR_GLOBAL_CONFIG_H_ + +#define AVR_ATTINY_402 + +#define F_CPU 8000000 // Internal CPU Clock + + + + +#endif /* AVR_GLOBAL_CONFIG_H_ */ \ No newline at end of file diff --git a/storno_cqp6xx_digital_xtal/avr_uart_driver b/storno_cqp6xx_digital_xtal/avr_uart_driver new file mode 160000 index 0000000..3c304e8 --- /dev/null +++ b/storno_cqp6xx_digital_xtal/avr_uart_driver @@ -0,0 +1 @@ +Subproject commit 3c304e80ce359aee1ae1f697c9ca1b4ac87eadf8 diff --git a/storno_cqp6xx_digital_xtal/main.c b/storno_cqp6xx_digital_xtal/main.c index 081b7b3..265e9a7 100644 --- a/storno_cqp6xx_digital_xtal/main.c +++ b/storno_cqp6xx_digital_xtal/main.c @@ -4,10 +4,11 @@ * Created: 21-08-2024 20:28:13 * Author : Chris */ -#define F_CPU 16000000 +#include "avr_global_config.h" #include +#include "avr_uart_driver/include/avr_uart.h" //#include "avr_i2c_driver/avr_i2c.h" -#include "storno_frq_lst.h" +//#include "storno_frq_lst.h" int main(void) diff --git a/storno_cqp6xx_digital_xtal/si5351_driver b/storno_cqp6xx_digital_xtal/si5351_driver index ba98f5b..1d1a65c 160000 --- a/storno_cqp6xx_digital_xtal/si5351_driver +++ b/storno_cqp6xx_digital_xtal/si5351_driver @@ -1 +1 @@ -Subproject commit ba98f5b35e40249168a080ee69d14f82a595b48f +Subproject commit 1d1a65c4756deeb3959937ea407ca8fc4f0a7302 diff --git a/storno_cqp6xx_digital_xtal/storno_config_msg.h b/storno_cqp6xx_digital_xtal/storno_config_msg.h new file mode 100644 index 0000000..d00a75b --- /dev/null +++ b/storno_cqp6xx_digital_xtal/storno_config_msg.h @@ -0,0 +1,33 @@ +/* + * storno_config_msg.h + * + * Created: 25-10-2024 17:07:27 + * Author: Chris + */ + + +#ifndef STORNO_CONFIG_MSG_H_ +#define STORNO_CONFIG_MSG_H_ + +typedef struct +{ + uint8_t crystal_freq; + + // Feedback Divider: + uint32_t a_feedback_div; + uint32_t b_feedback_div; + uint32_t c_feedback_div; + + // MultiSynthDivider: + uint32_t d_multisynth_div; + + // 'R' Output Divider: + uint32_t r_output_div; + + uint8_t selected_pll; + +}si5351_config_msg_t; + + + +#endif /* STORNO_CONFIG_MSG_H_ */ \ No newline at end of file diff --git a/storno_cqp6xx_digital_xtal/storno_cqp6xx_digital_xtal.cproj b/storno_cqp6xx_digital_xtal/storno_cqp6xx_digital_xtal.cproj index 78d4fcd..71786c8 100644 --- a/storno_cqp6xx_digital_xtal/storno_cqp6xx_digital_xtal.cproj +++ b/storno_cqp6xx_digital_xtal/storno_cqp6xx_digital_xtal.cproj @@ -20,10 +20,10 @@ false true true - + 0x20000000 true - + exception_table 2 0 0 @@ -32,44 +32,44 @@ - -mmcu=attiny402 -B "%24(PackRepoDir)\atmel\ATtiny_DFP\1.10.348\gcc\dev\attiny402" - True - True - True - True - False - True - True - - - NDEBUG - - - - - %24(PackRepoDir)\atmel\ATtiny_DFP\1.10.348\include\ - - - Optimize for size (-Os) - True - True - True - - - libm - - - - - D:\cm_projects\microchip_studio_projects\storno_cqp6xx_digital_xtal\storno_cqp6xx_digital_xtal\si5351_driver\include - - - - - %24(PackRepoDir)\atmel\ATtiny_DFP\1.10.348\include\ - - - + -mmcu=attiny402 -B "%24(PackRepoDir)\atmel\ATtiny_DFP\1.10.348\gcc\dev\attiny402" + True + True + True + True + False + True + True + + + NDEBUG + + + + + %24(PackRepoDir)\atmel\ATtiny_DFP\1.10.348\include\ + + + Optimize for size (-Os) + True + True + True + + + libm + + + + + D:\cm_projects\microchip_studio_projects\storno_cqp6xx_digital_xtal\storno_cqp6xx_digital_xtal\si5351_driver\include + + + + + %24(PackRepoDir)\atmel\ATtiny_DFP\1.10.348\include\ + + + @@ -106,6 +106,7 @@ D:\cm_projects\microchip_studio_projects\storno_cqp6xx_digital_xtal\storno_cqp6xx_digital_xtal\si5351_driver\include + ../avr_uart_driver @@ -118,12 +119,21 @@ + + compile + compile compile + + compile + + + compile + compile @@ -139,12 +149,17 @@ compile + + compile + compile + + @@ -155,6 +170,12 @@ compile + + compile + + + compile + compile