From 2cb62d4fac904158f1aef520143d0d652b562aac Mon Sep 17 00:00:00 2001
From: BlackMark <me@blackmark.me>
Date: Sat, 27 Jul 2019 13:38:45 +0200
Subject: [PATCH] Added flash submodule for flash strings

---
 .gitmodules       |  3 +++
 uart/flash        |  1 +
 uart/main.cpp     | 16 ++++++++++++++++
 uart/uart.cppproj | 15 +++++++++++++++
 4 files changed, 35 insertions(+)
 create mode 160000 uart/flash

diff --git a/.gitmodules b/.gitmodules
index 7996c56..1e6c151 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "uart/uart"]
 	path = uart/uart
 	url = git@blackmark.me:avr/uart.git
+[submodule "uart/flash"]
+	path = uart/flash
+	url = git@blackmark.me:avr/flash.git
diff --git a/uart/flash b/uart/flash
new file mode 160000
index 0000000..b0f602b
--- /dev/null
+++ b/uart/flash
@@ -0,0 +1 @@
+Subproject commit b0f602b3be5608d71a401f5c75609f09e92df4a9
diff --git a/uart/main.cpp b/uart/main.cpp
index e8671f1..19625f8 100644
--- a/uart/main.cpp
+++ b/uart/main.cpp
@@ -1,6 +1,22 @@
 #include "clock.h"
 
+#include <avr/interrupt.h>
+
+#include "flash/flash.hpp"
+#include "uart/usart.h"
+
 int main()
 {
+	USART0 &serial = USART0::inst();
+	serial.init(9600);
+	sei();
+
+	while (true) {
+		serial << "Hello World!"
+		       << "\r\n";
+
+		_delay_ms(1000);
+	}
+
 	return 0;
 }
diff --git a/uart/uart.cppproj b/uart/uart.cppproj
index 7238492..2223ecc 100644
--- a/uart/uart.cppproj
+++ b/uart/uart.cppproj
@@ -46,6 +46,17 @@
     <avrtoolinterfaceclock>125000</avrtoolinterfaceclock>
     <AAFDebugger>
       <AAFDebugFiles>
+        <DebugFile>
+          <path>\Debug\uart.lss</path>
+          <AAFSetting>
+            <Label>Lss Files</Label>
+            <Extention>.lss</Extention>
+            <Regex>^\s*(?&lt;address&gt;[a-f0-9]*):\s*.*$</Regex>
+            <DebugEnabled>true</DebugEnabled>
+            <RegexGroups>address</RegexGroups>
+            <DebuggerExpression>$pc</DebuggerExpression>
+          </AAFSetting>
+        </DebugFile>
       </AAFDebugFiles>
     </AAFDebugger>
     <AsfFrameworkConfig>
@@ -182,6 +193,9 @@
     <Compile Include="clock.h">
       <SubType>compile</SubType>
     </Compile>
+    <Compile Include="flash\flash.hpp">
+      <SubType>compile</SubType>
+    </Compile>
     <Compile Include="io\io.hpp">
       <SubType>compile</SubType>
     </Compile>
@@ -197,6 +211,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="io" />
+    <Folder Include="flash" />
     <Folder Include="uart" />
   </ItemGroup>
   <Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\Compiler.targets" />