From fcdce7cc1d1accb7293a55072e583757ed66df0d Mon Sep 17 00:00:00 2001
From: BlackMark <me@blackmark.me>
Date: Wed, 14 Aug 2019 20:00:40 +0200
Subject: [PATCH] Adapted example slightly and updated submodules

---
 uart/flash        |  2 +-
 uart/io           |  2 +-
 uart/main.cpp     | 28 ++++++++++++++++------------
 uart/uart         |  2 +-
 uart/uart.cppproj |  4 ++--
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/uart/flash b/uart/flash
index 2215491..2c66479 160000
--- a/uart/flash
+++ b/uart/flash
@@ -1 +1 @@
-Subproject commit 2215491c0b0606d734dcf44e6c4213e36176d25f
+Subproject commit 2c66479a49953a6649a375c0b3e5999f64b2223d
diff --git a/uart/io b/uart/io
index 387bc5f..1265702 160000
--- a/uart/io
+++ b/uart/io
@@ -1 +1 @@
-Subproject commit 387bc5f1107fb27684c0ed96f558a8c65c470cfe
+Subproject commit 1265702325432ee16a35ff29ae1e67e7222ceefa
diff --git a/uart/main.cpp b/uart/main.cpp
index 8207fdc..ecfbd6c 100644
--- a/uart/main.cpp
+++ b/uart/main.cpp
@@ -11,7 +11,7 @@
 void newUartUsage()
 {
 	using namespace uart;
-	Uart<Hardware1<Config<115200>, Driven::INTERRUPT, Mode::ASYNCHRONOUS>> serial1;
+	Uart<Hardware1<Config<115200>, Driven::BLOCKING, Mode::ASYNCHRONOUS>> serial1;
 	serial1.init();
 
 	serial1 << "New uart hi from RAM. " << F("New uart hi from flash\r\n");
@@ -42,15 +42,17 @@ void newUartUsage2()
 {
 	using namespace uart;
 
-	using config = Config<115200, DataBits::EIGHT, Parity::NONE, StopBits::ONE>;
-	using uart0 = Hardware0<config, Driven::INTERRUPT, Mode::ASYNCHRONOUS>;
+	Uart<Hardware1<Config<115200>, Driven::BLOCKING>> serial1;
 
-	Uart<uart0> serial;
-	serial.init();
+	auto ramString = "Hello World from RAM. ";
+	auto flashString = F("Hello World from flash\r\n");
 
-	serial << "Hello World from RAM. " << F("Hello World from flash\r\n");
+	serial1.init();
 
-	_delay_ms(1000);
+	serial1 << ramString;
+	serial1 << flashString;
+
+	serial1.flushTx();
 }
 
 void newUartStreamOverloads()
@@ -238,14 +240,16 @@ void optimalUartTest()
 int main()
 {
 	sei();
-	newUartUsage();
 	optimalUartTest();
-	newUartStreamOverloads();
 
-	txString(F("\r\n"));
-	flushTx();
+	newUartUsage2();
+	// optimalUartTest();
+	// newUartStreamOverloads();
 
-	spiTest();
+	// txString(F("\r\n"));
+	// flushTx();
+
+	// spiTest();
 
 	return 0;
 }
diff --git a/uart/uart b/uart/uart
index c4f38cb..16c9015 160000
--- a/uart/uart
+++ b/uart/uart
@@ -1 +1 @@
-Subproject commit c4f38cbcdf722c2c41325617066f5910c4a8cfea
+Subproject commit 16c9015f43f5218ce8676098e6de3e16b1a97f9c
diff --git a/uart/uart.cppproj b/uart/uart.cppproj
index c89992a..f193f81 100644
--- a/uart/uart.cppproj
+++ b/uart/uart.cppproj
@@ -42,7 +42,7 @@
       <ToolNumber>070000004699</ToolNumber>
       <ToolName>JTAGICE mkII</ToolName>
     </com_atmel_avrdbg_tool_jtagicemkii>
-    <avrtoolinterface>JTAG</avrtoolinterface>
+    <avrtoolinterface>ISP</avrtoolinterface>
     <avrtoolinterfaceclock>5000000</avrtoolinterfaceclock>
     <AAFDebugger>
       <AAFDebugFiles>
@@ -77,7 +77,7 @@
           <IspClock>125000</IspClock>
           <JtagDbgClock>5000000</JtagDbgClock>
         </InterfaceProperties>
-        <InterfaceName>JTAG</InterfaceName>
+        <InterfaceName>ISP</InterfaceName>
       </ToolOptions>
       <ToolType>com.atmel.avrdbg.tool.atmelice</ToolType>
       <ToolNumber>J41800099437</ToolNumber>