From 98bd0e12389c18303aee30c12d749003407a774b Mon Sep 17 00:00:00 2001 From: BlackMark Date: Sat, 27 Jul 2019 11:01:56 +0200 Subject: [PATCH] Added clock and io/uart submodules --- .gitmodules | 6 ++ uart/clock.h | 4 + uart/io | 1 + uart/main.cpp | 7 +- uart/uart | 1 + uart/uart.cppproj | 205 ++++++++++++++++++++++++++++++---------------- 6 files changed, 153 insertions(+), 71 deletions(-) create mode 100644 .gitmodules create mode 100644 uart/clock.h create mode 160000 uart/io create mode 160000 uart/uart diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..7996c56 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "uart/io"] + path = uart/io + url = git@blackmark.me:avr/io.git +[submodule "uart/uart"] + path = uart/uart + url = git@blackmark.me:avr/uart.git diff --git a/uart/clock.h b/uart/clock.h new file mode 100644 index 0000000..977e6d9 --- /dev/null +++ b/uart/clock.h @@ -0,0 +1,4 @@ +#pragma once + +#define F_CPU 20000000 +#include diff --git a/uart/io b/uart/io new file mode 160000 index 0000000..d647937 --- /dev/null +++ b/uart/io @@ -0,0 +1 @@ +Subproject commit d64793770cd82513bedcb839b7878c9102aba258 diff --git a/uart/main.cpp b/uart/main.cpp index 76e8197..e8671f1 100644 --- a/uart/main.cpp +++ b/uart/main.cpp @@ -1 +1,6 @@ -int main() { return 0; } +#include "clock.h" + +int main() +{ + return 0; +} diff --git a/uart/uart b/uart/uart new file mode 160000 index 0000000..81e6a9f --- /dev/null +++ b/uart/uart @@ -0,0 +1 @@ +Subproject commit 81e6a9fdc0c588712b4a1b1598a927326d282c53 diff --git a/uart/uart.cppproj b/uart/uart.cppproj index 9ebe460..7238492 100644 --- a/uart/uart.cppproj +++ b/uart/uart.cppproj @@ -46,93 +46,158 @@ 125000 - - \Debug\uart.lss - - - .lss - ^\s*(?<address>[a-f0-9]*):\s*.*$ - true - address - $pc - - + + + + + + + + + + + + - -mmcu=atmega1284p -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\gcc\dev\atmega1284p" - True - True - True - True - True - False - True - True - %24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\include - True - True - True - True - True - %24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\include - True - True - True - True - -Wextra -std=c++17 - libm - %24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\include - NDEBUG - Optimize for size (-Os) - NDEBUG - Optimize for size (-Os) - + -mmcu=atmega1284p -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\gcc\dev\atmega1284p" + True + True + True + True + True + False + True + True + + + %24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\include + + + True + True + True + True + True + + + %24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\include + + + True + True + True + True + -Wextra -std=c++17 + + + libm + + + + + %24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\include + + + + + NDEBUG + + + Optimize for size (-Os) + + + NDEBUG + + + Optimize for size (-Os) + - -mmcu=atmega1284p -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\gcc\dev\atmega1284p" - True - True - True - True - True - False - True - True - %24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\include - True - True - True - True - True - %24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\include - True - True - True - True - -Wextra -std=c++17 - libm - %24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\include - DEBUG - Optimize (-O1) - Default (-g2) - DEBUG - Optimize (-O1) - Default (-g2) - Default (-Wa,-g) - + -mmcu=atmega1284p -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\gcc\dev\atmega1284p" + True + True + True + True + True + False + True + True + + + %24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\include + + + True + True + True + True + True + + + %24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\include + + + True + True + True + True + -Wextra -std=c++17 + + + libm + + + + + %24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\include + + + + + DEBUG + + + Optimize (-O1) + Default (-g2) + + + DEBUG + + + Optimize (-O1) + Default (-g2) + Default (-Wa,-g) + + + compile + + + compile + compile + + compile + + + compile + + + + + \ No newline at end of file