Update submodule

Adapt to new interrupt handling interface and change example back to atmega1284p
Update uart submodule
2020-04-13 17:17:38 +02:00 · 2020-04-13 16:43:48 +02:00 · 2020-04-13 13:06:31 +02:00 · 2020-04-12 23:59:18 +02:00 · 2020-04-07 03:54:40 +02:00 · 2020-04-05 03:37:41 +02:00
8 changed files with 176 additions and 155 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "uart/flash"]
 	path = uart/flash
 	url = git@git.blackmark.me:avr/flash.git
+[submodule "uart/type"]
+	path = uart/type
+	url = git@git.blackmark.me:avr/type.git
--- a/uart/clock.hpp
+++ b/uart/clock.hpp
@@ -1,4 +1,4 @@
 #pragma once

-#define F_CPU 20000000
+#define F_CPU 16'000'000
 #include <util/delay.h>
--- a/uart/flash
+++ b/uart/flash
--- a/uart/io
+++ b/uart/io
--- a/uart/main.cpp
+++ b/uart/main.cpp
@@ -8,44 +8,67 @@
 #include "io/io.hpp"
 #include "uart/uart.hpp"

-#define UART1_INT_VECTORS
-#include "uart/hardware1.hpp"
+using uart0_interface_t =
+    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()
+{
+	uart0_interface_t serial;
+	serial.init();
+
+	uint8_t counter = 100;
+	uint8_t data;
+
+	while (counter) {
+		if (serial.rxByte(data)) {
+			serial.txByte(data);
+			--counter;
+		}
+	}
+
+	serial << F("\r\n");
+
+	serial.flushTx();
+}

 void newUartUsage()
 {
 	using namespace uart;
-	Uart<Hardware1<Config<115200>, Driven::BLOCKING, Mode::ASYNCHRONOUS>> serial1;
-	serial1.init();
+	Uart<Hardware0<Config<115200>, Driven::BLOCKING, Mode::ASYNCHRONOUS>> serial;
+	serial.init();

-	serial1 << "New uart hi from RAM. " << F("New uart hi from flash\r\n");
+	serial << "New uart hi from RAM. " << F("New uart hi from flash\r\n");

 	while (false) {
 		uint8_t received = 0;

-		while (!serial1.peek())
+		while (!serial.peek())
 			;

 		{
-			serial1 << F("Peeked: ");
-			serial1.txByte(received);
-			serial1 << F("\r\n");
+			serial << F("Peeked: ");
+			serial.txByte(received);
+			serial << F("\r\n");
 		}

-		if (serial1.rxByte(received)) {
-			serial1 << F("Received: ");
-			serial1.txByte(received);
-			serial1 << F("\r\n");
+		if (serial.rxByte(received)) {
+			serial << F("Received: ");
+			serial.txByte(received);
+			serial << F("\r\n");
 		}
 	}

-	serial1.flushTx();
+	serial.flushTx();
 }

 void newUartUsage2()
 {
-	using namespace uart;
-
-	Uart<Hardware1<Config<115200>, Driven::INTERRUPT>> serial1;
+	uart1_interface_t serial1;

 	auto ramString = "Hello World from RAM. ";
 	auto flashString = F("Hello World from flash\r\n");
@@ -61,7 +84,7 @@ void newUartUsage2()
 void newUartStreamOverloads()
 {
 	using namespace uart;
-	Uart<Hardware1<Config<115200>, Driven::BLOCKING, Mode::ASYNCHRONOUS>> serial;
+	Uart<Hardware0<Config<115200>, Driven::BLOCKING, Mode::ASYNCHRONOUS>> serial;
 	serial.init();

 	bool bVal = true;
@@ -191,17 +214,18 @@ void spiTest()

 static inline void initUart(const uint32_t baudRate)
 {
-	UBRR1 = static_cast<uint16_t>((F_CPU + 8 * baudRate) / (16 * baudRate) - 1);
-	UCSR1C = (1 << UCSZ11) | (1 << UCSZ10);
-	UCSR1B = (1 << RXEN1) | (1 << TXEN1);
+	UBRR0 = static_cast<uint16_t>((F_CPU + 8 * baudRate) / (16 * baudRate) - 1);
+	UCSR0A = 0;
+	UCSR0C = (1 << UCSZ01) | (1 << UCSZ00);
+	UCSR0B = (1 << RXEN0) | (1 << TXEN0);
 }

 static inline void txUart(uint8_t byte)
 {
-	while (!(UCSR1A & (1 << UDRE1)))
+	while (!(UCSR0A & (1 << UDRE0)))
 		;

-	UDR1 = byte;
+	UDR0 = byte;
 }

 static inline void txString(const char *str)
@@ -220,11 +244,11 @@ static inline void txString(const detail::FlashString *str)

 static inline void flushTx()
 {
-	while (!(UCSR1A & (1 << UDRE1)))
+	while (!(UCSR0A & (1 << UDRE0)))
 		;
-	while (!(UCSR1A & (1 << TXC1)))
+	while (!(UCSR0A & (1 << TXC0)))
 		;
-	UCSR1A |= (1 << TXC1);
+	UCSR0A |= (1 << TXC0);
 }

 void optimalUartTest()
@@ -244,6 +268,8 @@ int main()
 {
 	sei();

+	doubleSpeedTest();
+
 	newUartUsage2();
 	optimalUartTest();
 	newUartStreamOverloads();
--- a/uart/type
+++ b/uart/type
--- a/uart/uart
+++ b/uart/uart
--- a/uart/uart.cppproj
+++ b/uart/uart.cppproj
@@ -28,9 +28,10 @@
    <ResetRule>0</ResetRule>
    <eraseonlaunchrule>0</eraseonlaunchrule>
    <EraseKey />
-    <avrtool>com.atmel.avrdbg.tool.atmelice</avrtool>
+    <avrtool>
+    </avrtool>
    <avrtoolserialnumber>J41800099437</avrtoolserialnumber>
-    <avrdeviceexpectedsignature>0x1E9705</avrdeviceexpectedsignature>
+    <avrdeviceexpectedsignature>0x1E950F</avrdeviceexpectedsignature>
    <com_atmel_avrdbg_tool_jtagicemkii>
      <ToolOptions>
        <InterfaceProperties>
@@ -43,20 +44,9 @@
      <ToolName>JTAGICE mkII</ToolName>
    </com_atmel_avrdbg_tool_jtagicemkii>
    <avrtoolinterface>ISP</avrtoolinterface>
-    <avrtoolinterfaceclock>5000000</avrtoolinterfaceclock>
+    <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>
@@ -87,7 +77,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>
@@ -139,13 +129,13 @@
      <Value>%24(PackRepoDir)\Atmel\ATmega_DFP\1.3.300\include</Value>
    </ListValues>
  </avrgcccpp.assembler.general.IncludePaths>
-      </AvrGccCpp>
+</AvrGccCpp>
    </ToolchainSettings>
  </PropertyGroup>
  <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>
@@ -199,7 +189,7 @@
    </ListValues>
  </avrgcccpp.assembler.general.IncludePaths>
  <avrgcccpp.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcccpp.assembler.debugging.DebugLevel>
-      </AvrGccCpp>
+</AvrGccCpp>
    </ToolchainSettings>
  </PropertyGroup>
  <ItemGroup>
@@ -215,6 +205,9 @@
    <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>
@@ -233,13 +226,11 @@
    <Compile Include="uart\uart.hpp">
      <SubType>compile</SubType>
    </Compile>
-    <Compile Include="uart\utils.hpp">
-      <SubType>compile</SubType>
-    </Compile>
  </ItemGroup>
  <ItemGroup>
    <Folder Include="io" />
    <Folder Include="flash" />
+    <Folder Include="type" />
    <Folder Include="uart" />
  </ItemGroup>
  <Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\Compiler.targets" />
Author	SHA1	Message	Date
BlackMark	e760cf541c	Update submodule	2020-04-13 17:17:38 +02:00
BlackMark	6b90c1779f	Adapt to new interrupt handling interface and change example back to atmega1284p	2020-04-13 16:43:48 +02:00
BlackMark	8bb1bd7397	Update uart submodule	2020-04-13 13:06:31 +02:00
BlackMark	24d17688c0	Add double speed test and change to atmega328p	2020-04-12 23:59:18 +02:00
BlackMark	414ebbebff	Refactor uart utils to separate submodule	2020-04-07 03:54:40 +02:00
BlackMark	717a69c231	Updated uart submodule	2020-04-05 03:37:41 +02:00
BlackMark	f0abf335e5	Updated flash submodule	2020-04-05 00:02:33 +02:00