Merge pull request #203 from mcci-catena/issue199

fix #199: add two serial support for 4630
mcci-catena · May 30, 2023 · 1b73674 · 1b73674
2 parents 5c0be8d + 682c846
commit 1b73674
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -196,7 +196,7 @@ Remember to restart the IDE whenever you change `platform.txt`, `boards.txt` or
 
 ## Release History
 
-- [HEAD](https://github.com/mcci-catena/Arduino_Core_STM32/). Added support for new board Model 4917 and Model 4916.
+- [HEAD](https://github.com/mcci-catena/Arduino_Core_STM32/). Added support for new board Model 4917 and Model 4916. Added Two HW Serial support for Catena 4630.
 
 - [v3.0.5](https://github.com/mcci-catena/Arduino_Core_STM32/releases/tag/v3.0.5) Patch release. Don't use `<algorithm>` to implement `min()` and `max()` ([#184](https://github.com/mcci-catena/Arduino_Core_STM32/issues/184)). Prevent hangs if USB is enabled but D+/D- float to high/high ([#189](https://github.com/mcci-catena/Arduino_Core_STM32/issues/189), [#190](https://github.com/mcci-catena/Arduino_Core_STM32/issues/190)) -- thanks to Mohammed Mayyan ([@mmayyan](https://github.com/mhmayyan)) for help in finding this.
 

diff --git a/boards.template b/boards.template
@@ -294,12 +294,14 @@ $section xserial
 %%+xserial_usb_serial12
 {{board}}.menu.xserial.usbhwserial=USB + Two HW Serial
 {{board}}.menu.xserial.usb=USB Serial Only
+{{board}}.menu.xserial.two=Two HW Serial
 {{board}}.menu.xserial.generic=Generic Serial
 {{board}}.menu.xserial.none=No Serial
 {{board}}.menu.xserial.usbhwserial.build.xSerial={build.usb_flags} -DARDUINO_BSP_CONFIG_SERIAL_MASK=0x7
 {{board}}.menu.xserial.usb.build.xSerial={build.usb_flags} -DARDUINO_BSP_CONFIG_SERIAL_MASK=0x1
 {{board}}.menu.xserial.generic.build.xSerial=-DARDUINO_BSP_CONFIG_SERIAL_MASK=0x2
 {{board}}.menu.xserial.none.build.xSerial=-DARDUINO_BSP_CONFIG_SERIAL_MASK=0x0
+{{board}}.menu.xserial.two.build.xSerial=-DARDUINO_BSP_CONFIG_SERIAL_MASK=0x6
 %%-xserial_usb_serial12
 
 %%+xserial_nousb

diff --git a/boards.txt b/boards.txt
@@ -1300,12 +1300,14 @@ mcci_catena_4630.menu.upload_method.STLink.upload.maximum_data_size=20480
 # menu.xserial
 mcci_catena_4630.menu.xserial.usbhwserial=USB + Two HW Serial
 mcci_catena_4630.menu.xserial.usb=USB Serial Only
+mcci_catena_4630.menu.xserial.two=Two HW Serial
 mcci_catena_4630.menu.xserial.generic=Generic Serial
 mcci_catena_4630.menu.xserial.none=No Serial
 mcci_catena_4630.menu.xserial.usbhwserial.build.xSerial={build.usb_flags} -DARDUINO_BSP_CONFIG_SERIAL_MASK=0x7
 mcci_catena_4630.menu.xserial.usb.build.xSerial={build.usb_flags} -DARDUINO_BSP_CONFIG_SERIAL_MASK=0x1
 mcci_catena_4630.menu.xserial.generic.build.xSerial=-DARDUINO_BSP_CONFIG_SERIAL_MASK=0x2
 mcci_catena_4630.menu.xserial.none.build.xSerial=-DARDUINO_BSP_CONFIG_SERIAL_MASK=0x0
+mcci_catena_4630.menu.xserial.two.build.xSerial=-DARDUINO_BSP_CONFIG_SERIAL_MASK=0x6
 
 #
 # menu.sysclk

diff --git a/variants/CATENA_4630/variant.h b/variants/CATENA_4630/variant.h
@@ -126,6 +126,14 @@ enum {
 //Do not use basic timer: OC is required
 #define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 
+// UART Definitions
+// Define here Serial instance number to map on Serial generic name
+#define SERIAL_UART_INSTANCE    2 //ex: 2 for Serial2 (USART2)
+// Default pin used for 'Serial' instance (ex: ST-Link)
+// Mandatory for Firmata
+#define PIN_SERIAL_RX           D0
+#define PIN_SERIAL_TX           D1
+
 // UART Definitions
 
 #ifdef __cplusplus