Merge pull request #79 from leomar75/rs485_slave-support-for-mega-promicro-boards

#38 ATmega32U4, ATmega2560, ATmega1280 supported as a RS485 Slave

Author: talbotmcinnis

src/DcsBios.h

@@ -45,8 +45,13 @@ do not come with their own build system, we are just putting everything into the
 	#include "internal/DcsBiosNgRS485Master.cpp.inc"
 #endif
 #ifdef DCSBIOS_RS485_SLAVE
-	#include "internal/DcsBiosNgRS485Slave.h"
-	#include "internal/DcsBiosNgRS485Slave.cpp.inc"
+	#if defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1280__)
+		#include "internal/UART.Mod/DcsBiosNgRS485Slave.h"
+		#include "internal/UART.Mod/DcsBiosNgRS485Slave.cpp.inc"
+	#else
+		#include "internal/DcsBiosNgRS485Slave.h"
+		#include "internal/DcsBiosNgRS485Slave.cpp.inc"
+	#endif
 #endif
 #ifdef DCSBIOS_ESP32_WIFI
 	#include "internal/ESP32WiFi/DcsBiosESP32WiFiSlave.h"

src/internal/UART.Mod/DcsBiosNgRS485Slave.cpp.inc

@@ -172,8 +172,8 @@ namespace DcsBios {
 
 	}
 
-	// Arduino Mega UART 1
-	#ifdef UART1_SELECT
+	// Arduino Mega UART 1 or Arduino ProMicro
+	#if defined(UART1_SELECT) || defined(__AVR_ATmega32U4__)
 		RS485Slave rs485slave(&UDR1, &UCSR1A, &UCSR1B, &UCSR1C, TXENABLE_PIN);	
 		ISR(USART1_RX_vect) { rs485slave.rxISR(); }
 		ISR(USART1_TX_vect) { rs485slave.txcISR(); }
@@ -204,8 +204,8 @@ namespace DcsBios {
 
 	void setup() {
 
-		// Arduino Mega UART 1
-		#ifdef UART1_SELECT
+		// Arduino Mega UART 1 or Arduino ProMicro
+		#if defined(UART1_SELECT) || defined(__AVR_ATmega32U4__)
 			PRR1 &= ~(0<<PRUSART1); // PRR1 Bit 0 - PRUSART1: Power Reduction USART1
 			UBRR1H = 0;
 			UBRR1L = 3; // 250000 bps

src/internal/UART.Mod/DcsBiosNgRS485Slave.h

@@ -4,13 +4,15 @@
 
 // Check for Arduino Mega when using UART 1,2 or 3
 #if defined (UART1_SELECT) || defined(UART2_SELECT) || defined(UART3_SELECT)
-	#if not (defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1280__))
+	#if defined(__AVR_ATmega32U4__) && (defined (UART2_SELECT) || defined (UART3_SELECT))
+		#error The RS485Slave sketch requires an Arduino Mega for UART 2 or UART 3!
+	#elseif not (defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1280__))
 	    #error The RS485Slave sketch requires an Arduino Mega for UART 1, UART 2 or UART 3!
 	#endif
 #endif
 
 #include "Arduino.h"
-#include "RingBuffer.h"
+#include "../RingBuffer.h"
 
 namespace DcsBios {
 
@@ -87,8 +89,8 @@ namespace DcsBios {
 		void udreISR();
 		void txcISR();
 
-		// Arduino Mega UART 1
-		#ifdef UART1_SELECT
+		// Arduino Mega UART 1 or Arduino ProMicro
+		#if defined(UART1_SELECT) || defined(__AVR_ATmega32U4__)
 			inline void set_txen() { *ucsrb &= ~((1<<RXEN1) | (1<<RXCIE1)); *txen_port |= txen_pin_mask; *ucsrb |= (1<<TXEN1) | (1<<TXCIE1); };
 			inline void clear_txen() { *ucsrb &= ~((1<<TXEN1) | (1<<TXCIE1)); *txen_port &= ~txen_pin_mask; *ucsrb |= (1<<RXEN1) | (1<<RXCIE1); };
 			inline void tx_byte(uint8_t c) { set_txen(); *udr = c; *ucsra |= (1<<TXC1); }