From 9b4b0cac673d04a34187b4a655fff451e007520c Mon Sep 17 00:00:00 2001
From: BlackMark <me@blackmark.me>
Date: Sat, 3 Aug 2019 16:26:32 +0200
Subject: [PATCH] Adapted to new interface

---
 uart/main.cpp     |  45 +++-------------
 uart/uart         |   2 +-
 uart/uart.cppproj | 130 +++++++++++++++++++++++-----------------------
 3 files changed, 73 insertions(+), 104 deletions(-)

diff --git a/uart/main.cpp b/uart/main.cpp
index cc2f359..f932ace 100644
--- a/uart/main.cpp
+++ b/uart/main.cpp
@@ -6,14 +6,13 @@
 
 #include "flash/flash.hpp"
 #include "io/io.hpp"
-#include "uart/uart.h"
 #include "uart/uart.hpp"
-#include "uart/usart.h"
 
 void newUartUsage()
 {
 	using namespace uart;
 	Uart<Hardware1<Mode::ASYNCHRONOUS, Config<>, Driven::INTERRUPT>> serial1;
+	serial1.init();
 	sei();
 
 	serial1 << F("Hello World from RAM. ") << F("Hello World from flash\r\n");
@@ -21,7 +20,7 @@ void newUartUsage()
 	while (true) {
 		uint8_t received = 0;
 
-		while (!serial1.peek(received))
+		while (!serial1.peek())
 			;
 
 		{
@@ -46,27 +45,15 @@ void newUartUsage2()
 
 	using config = Config<9600, DataBits::EIGHT, Parity::NONE, StopBits::ONE>;
 	using uart0 = Hardware0<Mode::ASYNCHRONOUS, config, Driven::BLOCKING>;
-	using softuart = Software<io::P::B1, io::P::B2, config>;
 
 	Uart<uart0> serial;
-	Uart<softuart> softSerial;
+	serial.init();
 
 	serial << "Hello World from RAM. " << F("Hello World from flash\r\n");
-	// softSerial << "Hello World using finalized software interface!" << F("\r\nAlso greetz from progmem\r\n");
 
 	_delay_ms(1000);
 }
 
-void oldUsartUsage()
-{
-	USART0 &serial = USART0::inst();
-	serial.init(9600);
-
-	serial << "Hello World from RAM. "
-	       << "Hello World from flash\r\n";
-
-	_delay_ms(1000);
-}
 /*
 namespace spi {
 
@@ -145,17 +132,17 @@ void spiTest()
 */
 static inline void initUart(const uint32_t baudRate)
 {
-	UBRR0 = static_cast<uint16_t>((F_CPU / (16 * baudRate)) - 1);
-	UCSR0C = (1 << UCSZ01) | (1 << UCSZ00);
-	UCSR0B = (1 << RXEN0) | (1 << TXEN0);
+	UBRR1 = static_cast<uint16_t>((F_CPU / (16 * baudRate)) - 1);
+	UCSR1C = (1 << UCSZ11) | (1 << UCSZ10);
+	UCSR1B = (1 << RXEN1) | (1 << TXEN1);
 }
 
 static inline void txUart(uint8_t byte)
 {
-	while (!(UCSR0A & (1 << UDRE0)))
+	while (!(UCSR1A & (1 << UDRE1)))
 		;
 
-	UDR0 = byte;
+	UDR1 = byte;
 }
 
 static inline void txString(const char *str)
@@ -185,26 +172,10 @@ void optimalUartTest()
 	_delay_ms(1000);
 }
 
-void cUartLibTest()
-{
-	auto ramString = "Hello World from RAM. ";
-	auto flashString = F("Hello World from flash\r\n");
-
-	uart1_init(UART_BAUD_SELECT(9600, F_CPU));
-	sei();
-
-	uart1_puts(ramString);
-	uart1_puts_p(reinterpret_cast<const char *>(flashString));
-
-	_delay_ms(1000);
-}
-
 int main()
 {
 	newUartUsage();
-	// oldUsartUsage();
 	// optimalUartTest();
-	// cUartLibTest();
 
 	// spiTest();
 
diff --git a/uart/uart b/uart/uart
index 925bb56..fe9e670 160000
--- a/uart/uart
+++ b/uart/uart
@@ -1 +1 @@
-Subproject commit 925bb56f9895ff46a81209fe5f0f6b59f6c809f9
+Subproject commit fe9e67036e4acfb539499d0fa31afbc9ef99315d
diff --git a/uart/uart.cppproj b/uart/uart.cppproj
index fb99325..7a89214 100644
--- a/uart/uart.cppproj
+++ b/uart/uart.cppproj
@@ -42,8 +42,8 @@
       <ToolNumber>070000004699</ToolNumber>
       <ToolName>JTAGICE mkII</ToolName>
     </com_atmel_avrdbg_tool_jtagicemkii>
-    <avrtoolinterface>ISP</avrtoolinterface>
-    <avrtoolinterfaceclock>125000</avrtoolinterfaceclock>
+    <avrtoolinterface>JTAG</avrtoolinterface>
+    <avrtoolinterfaceclock>5000000</avrtoolinterfaceclock>
     <AAFDebugger>
       <AAFDebugFiles>
         <DebugFile>
@@ -75,8 +75,9 @@
       <ToolOptions>
         <InterfaceProperties>
           <IspClock>125000</IspClock>
+          <JtagDbgClock>5000000</JtagDbgClock>
         </InterfaceProperties>
-        <InterfaceName>ISP</InterfaceName>
+        <InterfaceName>JTAG</InterfaceName>
       </ToolOptions>
       <ToolType>com.atmel.avrdbg.tool.atmelice</ToolType>
       <ToolNumber>J41800099437</ToolNumber>
@@ -86,58 +87,58 @@
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <ToolchainSettings>
       <AvrGccCpp>
-  <avrgcc.common.Device>-mmcu=atmega1284p -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\gcc\dev\atmega1284p"</avrgcc.common.Device>
-  <avrgcc.common.optimization.RelaxBranches>True</avrgcc.common.optimization.RelaxBranches>
-  <avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
-  <avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
-  <avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
-  <avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
-  <avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
-  <avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
-  <avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
-  <avrgcc.compiler.symbols.DefSymbols>
-    <ListValues>
-      <Value>NDEBUG</Value>
-    </ListValues>
-  </avrgcc.compiler.symbols.DefSymbols>
-  <avrgcc.compiler.directories.IncludePaths>
-    <ListValues>
-      <Value>%24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\include</Value>
-    </ListValues>
-  </avrgcc.compiler.directories.IncludePaths>
-  <avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
-  <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
-  <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
-  <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
-  <avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>
-  <avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>
-  <avrgcccpp.compiler.symbols.DefSymbols>
-    <ListValues>
-      <Value>NDEBUG</Value>
-    </ListValues>
-  </avrgcccpp.compiler.symbols.DefSymbols>
-  <avrgcccpp.compiler.directories.IncludePaths>
-    <ListValues>
-      <Value>%24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\include</Value>
-    </ListValues>
-  </avrgcccpp.compiler.directories.IncludePaths>
-  <avrgcccpp.compiler.optimization.level>Optimize for size (-Os)</avrgcccpp.compiler.optimization.level>
-  <avrgcccpp.compiler.optimization.PackStructureMembers>True</avrgcccpp.compiler.optimization.PackStructureMembers>
-  <avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>
-  <avrgcccpp.compiler.warnings.AllWarnings>True</avrgcccpp.compiler.warnings.AllWarnings>
-  <avrgcccpp.compiler.warnings.Pedantic>True</avrgcccpp.compiler.warnings.Pedantic>
-  <avrgcccpp.compiler.miscellaneous.OtherFlags>-Wextra -std=c++17</avrgcccpp.compiler.miscellaneous.OtherFlags>
-  <avrgcccpp.linker.libraries.Libraries>
-    <ListValues>
-      <Value>libm</Value>
-    </ListValues>
-  </avrgcccpp.linker.libraries.Libraries>
-  <avrgcccpp.assembler.general.IncludePaths>
-    <ListValues>
-      <Value>%24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\include</Value>
-    </ListValues>
-  </avrgcccpp.assembler.general.IncludePaths>
-</AvrGccCpp>
+        <avrgcc.common.Device>-mmcu=atmega1284p -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\gcc\dev\atmega1284p"</avrgcc.common.Device>
+        <avrgcc.common.optimization.RelaxBranches>True</avrgcc.common.optimization.RelaxBranches>
+        <avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
+        <avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
+        <avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
+        <avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
+        <avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
+        <avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
+        <avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
+        <avrgcc.compiler.symbols.DefSymbols>
+          <ListValues>
+            <Value>NDEBUG</Value>
+          </ListValues>
+        </avrgcc.compiler.symbols.DefSymbols>
+        <avrgcc.compiler.directories.IncludePaths>
+          <ListValues>
+            <Value>%24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\include</Value>
+          </ListValues>
+        </avrgcc.compiler.directories.IncludePaths>
+        <avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
+        <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
+        <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
+        <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
+        <avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>
+        <avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>
+        <avrgcccpp.compiler.symbols.DefSymbols>
+          <ListValues>
+            <Value>NDEBUG</Value>
+          </ListValues>
+        </avrgcccpp.compiler.symbols.DefSymbols>
+        <avrgcccpp.compiler.directories.IncludePaths>
+          <ListValues>
+            <Value>%24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\include</Value>
+          </ListValues>
+        </avrgcccpp.compiler.directories.IncludePaths>
+        <avrgcccpp.compiler.optimization.level>Optimize for size (-Os)</avrgcccpp.compiler.optimization.level>
+        <avrgcccpp.compiler.optimization.PackStructureMembers>True</avrgcccpp.compiler.optimization.PackStructureMembers>
+        <avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>
+        <avrgcccpp.compiler.warnings.AllWarnings>True</avrgcccpp.compiler.warnings.AllWarnings>
+        <avrgcccpp.compiler.warnings.Pedantic>True</avrgcccpp.compiler.warnings.Pedantic>
+        <avrgcccpp.compiler.miscellaneous.OtherFlags>-Wextra -std=c++17</avrgcccpp.compiler.miscellaneous.OtherFlags>
+        <avrgcccpp.linker.libraries.Libraries>
+          <ListValues>
+            <Value>libm</Value>
+          </ListValues>
+        </avrgcccpp.linker.libraries.Libraries>
+        <avrgcccpp.assembler.general.IncludePaths>
+          <ListValues>
+            <Value>%24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\include</Value>
+          </ListValues>
+        </avrgcccpp.assembler.general.IncludePaths>
+      </AvrGccCpp>
     </ToolchainSettings>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -213,34 +214,31 @@
     <Compile Include="main.cpp">
       <SubType>compile</SubType>
     </Compile>
-    <None Include="uart\usart.cpp">
+    <Compile Include="uart\config.hpp">
       <SubType>compile</SubType>
-    </None>
+    </Compile>
     <Compile Include="uart\hardware.hpp">
       <SubType>compile</SubType>
     </Compile>
+    <Compile Include="uart\hardware0.cpp">
+      <SubType>compile</SubType>
+    </Compile>
     <Compile Include="uart\hardware0.hpp">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="uart\hardware1.hpp">
+    <Compile Include="uart\hardware1.cpp">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="uart\config.hpp">
+    <Compile Include="uart\hardware1.hpp">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="uart\software.hpp">
       <SubType>compile</SubType>
     </Compile>
-    <None Include="uart\uart.cpp">
-      <SubType>compile</SubType>
-    </None>
-    <Compile Include="uart\uart.h">
-      <SubType>compile</SubType>
-    </Compile>
     <Compile Include="uart\uart.hpp">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="uart\usart.h">
+    <Compile Include="uart\utils.hpp">
       <SubType>compile</SubType>
     </Compile>
   </ItemGroup>