From e891e1019f0aebb7030ae746fc1f5dc0e2c8e436 Mon Sep 17 00:00:00 2001
From: BlackMark <me@blackmark.me>
Date: Fri, 2 Aug 2019 09:22:27 +0200
Subject: [PATCH] Switched to only Uart1 for testing

---
 uart/main.cpp     |  2 --
 uart/uart         |  2 +-
 uart/uart.cppproj | 20 +++++++++++++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/uart/main.cpp b/uart/main.cpp
index 12cb2e3..cea9758 100644
--- a/uart/main.cpp
+++ b/uart/main.cpp
@@ -13,10 +13,8 @@
 void newUartUsage()
 {
 	using namespace uart;
-	Uart0<> serial;
 	Uart1<> serial1;
 
-	serial << "Hello World from RAM. " << F("Hello World from flash\r\n");
 	serial1 << "Hello World from RAM. " << F("Hello World from flash\r\n");
 
 	_delay_ms(1000);
diff --git a/uart/uart b/uart/uart
index f0a3cd6..92c96bb 160000
--- a/uart/uart
+++ b/uart/uart
@@ -1 +1 @@
-Subproject commit f0a3cd6da8d6e7152064be2f1145cabba56c6e32
+Subproject commit 92c96bbc72e8784f10d38e85073c5bd010ab877e
diff --git a/uart/uart.cppproj b/uart/uart.cppproj
index 42ca68c..8efb015 100644
--- a/uart/uart.cppproj
+++ b/uart/uart.cppproj
@@ -28,13 +28,13 @@
     <ResetRule>0</ResetRule>
     <eraseonlaunchrule>0</eraseonlaunchrule>
     <EraseKey />
-    <avrtool>com.atmel.avrdbg.tool.jtagicemkii</avrtool>
-    <avrtoolserialnumber>070000004699</avrtoolserialnumber>
+    <avrtool>com.atmel.avrdbg.tool.atmelice</avrtool>
+    <avrtoolserialnumber>J41800099437</avrtoolserialnumber>
     <avrdeviceexpectedsignature>0x1E9705</avrdeviceexpectedsignature>
     <com_atmel_avrdbg_tool_jtagicemkii>
       <ToolOptions>
         <InterfaceProperties>
-          <IspClock>125000</IspClock>
+          <IspClock>0</IspClock>
         </InterfaceProperties>
         <InterfaceName>ISP</InterfaceName>
       </ToolOptions>
@@ -71,6 +71,17 @@
         </dependencies>
       </framework-data>
     </AsfFrameworkConfig>
+    <com_atmel_avrdbg_tool_atmelice>
+      <ToolOptions>
+        <InterfaceProperties>
+          <IspClock>125000</IspClock>
+        </InterfaceProperties>
+        <InterfaceName>ISP</InterfaceName>
+      </ToolOptions>
+      <ToolType>com.atmel.avrdbg.tool.atmelice</ToolType>
+      <ToolNumber>J41800099437</ToolNumber>
+      <ToolName>Atmel-ICE</ToolName>
+    </com_atmel_avrdbg_tool_atmelice>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <ToolchainSettings>
@@ -205,6 +216,9 @@
     <None Include="uart\usart.cpp">
       <SubType>compile</SubType>
     </None>
+    <Compile Include="uart\hardware.hpp">
+      <SubType>compile</SubType>
+    </Compile>
     <Compile Include="uart\hardware0.hpp">
       <SubType>compile</SubType>
     </Compile>