Elron_dev/elbear_arduino_bsp
8
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

объявляются два экземпляра serial по номеру железного uart, по дефолту используется тот, что задан для каждой платы

Browse Source
This commit is contained in:
KLASSENTS 2025-05-26 13:39:40 +07:00
parent 7e32e92845
commit 2a561ad0ed
6 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cores/arduino/HardwareSerial.cpp
View File

@ -8,10 +8,13 @@
#include "wiring_LL.h" #include "wiring_LL.h"
// HardwareSerial class objects for use in Arduino IDE // HardwareSerial class objects for use in Arduino IDE
HardwareSerial Serial(0); HardwareSerial Serial0(0);
#if SERIAL_PORT_QTY > 1 #if SERIAL_PORT_QTY > 1
HardwareSerial Serial1(1); HardwareSerial Serial1(1);
#endif #endif
// default interface
HardwareSerial& Serial = DEFAULT_SERIAL;
void serialEvent() __attribute__((weak)); void serialEvent() __attribute__((weak));
bool Serial0_available() __attribute__((weak)); bool Serial0_available() __attribute__((weak));
@ -144,7 +147,7 @@ extern "C" void __attribute__((optimize("O3"))) serial_interrupt_handler(uint8_t
{ {
if (uartNumInt == 0) if (uartNumInt == 0)
{ {
Serial.rx_complete_irq(); Serial0.rx_complete_irq();
} }
else if ((uartNumInt == 1) && (SERIAL_PORT_QTY > 1)) else if ((uartNumInt == 1) && (SERIAL_PORT_QTY > 1))
{ {

4
cores/arduino/HardwareSerial.h
View File

@ -103,10 +103,12 @@ class HardwareSerial : public Stream
inline void rx_complete_irq(void) __attribute__((always_inline, optimize("O3"))); inline void rx_complete_irq(void) __attribute__((always_inline, optimize("O3")));
}; };
extern HardwareSerial Serial; extern HardwareSerial Serial0;
#if SERIAL_PORT_QTY > 1 #if SERIAL_PORT_QTY > 1
extern HardwareSerial Serial1; extern HardwareSerial Serial1;
#endif #endif
// default interface
extern HardwareSerial& Serial;
extern void serialEventRun(void) __attribute__((weak)); extern void serialEventRun(void) __attribute__((weak));

1
variants/elbear_ace_nano/pins_arduino.h
View File

@ -81,6 +81,7 @@ void additionalPinsDeinit(uint32_t PinNumber);
// UART // UART
// available uarts quantity // available uarts quantity
#define SERIAL_PORT_QTY 2 #define SERIAL_PORT_QTY 2
#define DEFAULT_SERIAL Serial0
// ADC // ADC
#define MCU_ADC_RESOLUTION 12 // bits #define MCU_ADC_RESOLUTION 12 // bits

1
variants/elbear_ace_uno/pins_arduino.h
View File

@ -76,6 +76,7 @@ static inline void additionalPinsDeinit(uint32_t PinNumber){}
// UART // UART
// available uarts quantity // available uarts quantity
#define SERIAL_PORT_QTY 2 #define SERIAL_PORT_QTY 2
#define DEFAULT_SERIAL Serial0
// ADC // ADC
#define MCU_ADC_RESOLUTION 12 // bits #define MCU_ADC_RESOLUTION 12 // bits

1
variants/elsomik/pins_arduino.h
View File

@ -109,6 +109,7 @@ static inline void additionalPinsDeinit(uint32_t PinNumber){}
// UART // UART
// available uarts quantity // available uarts quantity
#define SERIAL_PORT_QTY 2 #define SERIAL_PORT_QTY 2
#define DEFAULT_SERIAL Serial0
// ADC // ADC
#define MCU_ADC_RESOLUTION 12 // bits #define MCU_ADC_RESOLUTION 12 // bits

1
variants/start/pins_arduino.h
View File

@ -122,6 +122,7 @@ static inline void additionalPinsDeinit(uint32_t PinNumber){}
// UART // UART
// available uarts quantity // available uarts quantity
#define SERIAL_PORT_QTY 2 #define SERIAL_PORT_QTY 2
#define DEFAULT_SERIAL Serial0
// ADC // ADC
#define MCU_ADC_RESOLUTION 12 // bits #define MCU_ADC_RESOLUTION 12 // bits