Update uart example to use latest library version

.gitmodules

@@ -7,6 +7,6 @@
 [submodule "uart/flash"]
 	path = uart/flash
 	url = git@git.blackmark.me:avr/flash.git
-[submodule "uart/type"]
+[submodule "uart/util"]
-	path = uart/type
+	path = uart/util
-	url = git@git.blackmark.me:avr/type.git
+	url = git@git.blackmark.me:avr/util.git

uart/main.cpp

@@ -8,13 +8,17 @@
 #include "io/io.hpp"
 #include "uart/uart.hpp"
 
-#define UART0_INT_VECTORS
+using uart0_interface_t =
-#include "uart/hardware0.hpp"
+    uart::Uart<uart::Hardware0<uart::Config<115200>, uart::Driven::INTERRUPT, uart::Mode::ASYNCHRONOUS>>;
+
+using uart1_interface_t = uart::Uart1<>;
+
+REGISTER_UART0_INT_VECTORS(uart0_interface_t);
+REGISTER_UART1_INT_VECTORS(uart1_interface_t);
 
 void doubleSpeedTest()
 {
-	using namespace uart;
+	uart0_interface_t serial;
-	Uart<Hardware0<Config<115200>, Driven::INTERRUPT, Mode::ASYNCHRONOUS>> serial;
 	serial.init();
 
 	uint8_t counter = 100;
@@ -27,6 +31,8 @@ void doubleSpeedTest()
 		}
 	}
 
+	serial << F("\r\n");
+
 	serial.flushTx();
 }
 
@@ -62,9 +68,7 @@ void newUartUsage()
 
 void newUartUsage2()
 {
-	using namespace uart;
+	uart1_interface_t serial1;
-
-	Uart<Hardware0<Config<115200>, Driven::INTERRUPT>> serial1;
 
 	auto ramString = "Hello World from RAM. ";
 	auto flashString = F("Hello World from flash\r\n");

uart/uart.cppproj

@@ -5,7 +5,7 @@
     <ProjectVersion>7.0</ProjectVersion>
     <ToolchainName>com.Atmel.AVRGCC8.CPP</ToolchainName>
     <ProjectGuid>dce6c7e3-ee26-4d79-826b-08594b9ad897</ProjectGuid>
-    <avrdevice>ATmega328P</avrdevice>
+    <avrdevice>ATmega1284P</avrdevice>
     <avrdeviceseries>none</avrdeviceseries>
     <OutputType>Executable</OutputType>
     <Language>CPP</Language>
@@ -28,7 +28,8 @@
     <ResetRule>0</ResetRule>
     <eraseonlaunchrule>0</eraseonlaunchrule>
     <EraseKey />
-    <avrtool>com.atmel.avrdbg.tool.atmelice</avrtool>
+    <avrtool>
+    </avrtool>
     <avrtoolserialnumber>J41800099437</avrtoolserialnumber>
     <avrdeviceexpectedsignature>0x1E950F</avrdeviceexpectedsignature>
     <com_atmel_avrdbg_tool_jtagicemkii>
@@ -46,6 +47,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>
@@ -76,7 +88,7 @@
   <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.Device>-mmcu=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>
@@ -134,7 +146,7 @@
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <ToolchainSettings>
       <AvrGccCpp>
-        <avrgcc.common.Device>-mmcu=atmega1284p -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\gcc\dev\atmega1284p"</avrgcc.common.Device>
+        <avrgcc.common.Device>-mmcu=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>
@@ -204,9 +216,6 @@
     <Compile Include="main.cpp">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="type\type.hpp">
-      <SubType>compile</SubType>
-    </Compile>
     <Compile Include="uart\config.hpp">
       <SubType>compile</SubType>
     </Compile>
@@ -225,11 +234,20 @@
     <Compile Include="uart\uart.hpp">
       <SubType>compile</SubType>
     </Compile>
+    <Compile Include="util\func.hpp">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="util\type.hpp">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="util\util.hpp">
+      <SubType>compile</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="io" />
     <Folder Include="flash" />
-    <Folder Include="type" />
+    <Folder Include="util" />
     <Folder Include="uart" />
   </ItemGroup>
   <Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\Compiler.targets" />