Browse Source
uart: standalone configuration
- setup uart at boot instead of delaying until some module needs it removes global `SERIAL_BAUDRATE` and `DEBUG_PORT` in favour or globally accessible numbered port configurations with `MODULE_NAME_PORT` - automagically enable uart support for sensors that need it - allow every sensor to configure uart0 (normal and swapped), uart1 and an optional software-serial mode support with an extra build flag remove individual includes across the sensors - settings queries and runtime port configuration (prefixed with uart) - update dependencies header to cross-reference used ports at build time - update deprecations header with serial baudrate noticepull/2552/head
Maxim Prokhorov
1 year ago
39 changed files with 1656 additions and 1331 deletions
Split View
Diff Options
-
+1 -1code/espurna/config/all.h
-
+34 -33code/espurna/config/arduino.h
-
+88 -0code/espurna/config/defaults.h
-
+82 -3code/espurna/config/dependencies.h
-
+7 -2code/espurna/config/deprecated.h
-
+55 -51code/espurna/config/general.h
-
+151 -86code/espurna/config/hardware.h
-
+60 -111code/espurna/config/sensors.h
-
+12 -18code/espurna/curtain_kingart.cpp
-
+52 -14code/espurna/debug.cpp
-
+1 -0code/espurna/espurna.h
-
+3 -7code/espurna/garland/color.h
-
+3 -3code/espurna/gpio.cpp
-
+15 -11code/espurna/lightfox.cpp
-
+3 -0code/espurna/main.cpp
-
+25 -15code/espurna/relay.cpp
-
+18 -12code/espurna/rfbridge.cpp
-
+3 -2code/espurna/rtcmem.cpp
-
+75 -58code/espurna/sensor.cpp
-
+18 -87code/espurna/sensors/CSE7766Sensor.h
-
+5 -44code/espurna/sensors/EZOPHSensor.h
-
+5 -43code/espurna/sensors/MHZ19Sensor.h
-
+7 -74code/espurna/sensors/PM1006Sensor.h
-
+9 -86code/espurna/sensors/PMSX003Sensor.h
-
+208 -96code/espurna/sensors/PZEM004TSensor.h
-
+10 -114code/espurna/sensors/PZEM004TV30Sensor.h
-
+5 -48code/espurna/sensors/SDS011Sensor.h
-
+7 -73code/espurna/sensors/SM300D2Sensor.h
-
+5 -47code/espurna/sensors/SenseAirSensor.h
-
+5 -46code/espurna/sensors/T6613Sensor.h
-
+5 -42code/espurna/sensors/V9261FSensor.h
-
+34 -4code/espurna/terminal.cpp
-
+22 -17code/espurna/tuya.cpp
-
+566 -0code/espurna/uart.cpp
-
+40 -0code/espurna/uart.h
-
+15 -79code/espurna/uartmqtt.cpp
-
+1 -1code/espurna/web.cpp
-
+0 -1code/platformio.ini
-
+1 -2code/test/build/rfbridge.h
+ 1
- 1
code/espurna/config/all.h
View File
+ 34
- 33
code/espurna/config/arduino.h
View File
+ 88
- 0
code/espurna/config/defaults.h
View File
+ 82
- 3
code/espurna/config/dependencies.h
View File
+ 7
- 2
code/espurna/config/deprecated.h
View File
+ 55
- 51
code/espurna/config/general.h
View File
+ 151
- 86
code/espurna/config/hardware.h
View File
+ 60
- 111
code/espurna/config/sensors.h
View File
+ 12
- 18
code/espurna/curtain_kingart.cpp
View File
+ 52
- 14
code/espurna/debug.cpp
View File
+ 1
- 0
code/espurna/espurna.h
View File
+ 3
- 7
code/espurna/garland/color.h
View File
+ 3
- 3
code/espurna/gpio.cpp
View File
+ 15
- 11
code/espurna/lightfox.cpp
View File
+ 3
- 0
code/espurna/main.cpp
View File
+ 25
- 15
code/espurna/relay.cpp
View File
+ 18
- 12
code/espurna/rfbridge.cpp
View File
+ 3
- 2
code/espurna/rtcmem.cpp
View File
+ 75
- 58
code/espurna/sensor.cpp
View File
+ 18
- 87
code/espurna/sensors/CSE7766Sensor.h
View File
+ 5
- 44
code/espurna/sensors/EZOPHSensor.h
View File
+ 5
- 43
code/espurna/sensors/MHZ19Sensor.h
View File
+ 7
- 74
code/espurna/sensors/PM1006Sensor.h
View File
+ 9
- 86
code/espurna/sensors/PMSX003Sensor.h
View File
+ 208
- 96
code/espurna/sensors/PZEM004TSensor.h
View File
+ 10
- 114
code/espurna/sensors/PZEM004TV30Sensor.h
View File
+ 5
- 48
code/espurna/sensors/SDS011Sensor.h
View File
+ 7
- 73
code/espurna/sensors/SM300D2Sensor.h
View File
+ 5
- 47
code/espurna/sensors/SenseAirSensor.h
View File
+ 5
- 46
code/espurna/sensors/T6613Sensor.h
View File
+ 5
- 42
code/espurna/sensors/V9261FSensor.h
View File
+ 34
- 4
code/espurna/terminal.cpp
View File
+ 22
- 17
code/espurna/tuya.cpp
View File
+ 566
- 0
code/espurna/uart.cpp
View File
| @ -0,0 +1,566 @@ | |||
| /* | |||
| UART MODULE | |||
| Copyright (C) 2022 by Maxim Prokhorov <prokhorov dot max at outlook dot com> | |||
| */ | |||
| #include "espurna.h" | |||
| #if UART_SUPPORT | |||
| #include "uart.h" | |||
| #include "utils.h" | |||
| #if UART_SOFTWARE_SUPPORT | |||
| #include <SoftwareSerial.h> | |||
| #endif | |||
| #include <array> | |||
| #include <utility> | |||
| namespace espurna { | |||
| namespace driver { | |||
| namespace uart { | |||
| namespace { | |||
| enum class Parity { | |||
| None, | |||
| Even, | |||
| Odd, | |||
| }; | |||
| struct Config { | |||
| uint8_t data_bits; | |||
| Parity parity; | |||
| uint8_t stop_bits; | |||
| }; | |||
| } // namespace | |||
| } // namespace uart | |||
| } // namespace driver | |||
| namespace settings { | |||
| namespace internal { | |||
| namespace { | |||
| alignas(4) static constexpr char ParityNone[] PROGMEM = "none"; | |||
| alignas(4) static constexpr char ParityEven[] PROGMEM = "even"; | |||
| alignas(4) static constexpr char ParityOdd[] PROGMEM = "odd"; | |||
| static constexpr std::array<settings::options::Enumeration<driver::uart::Parity>, 3> ParityOptions PROGMEM { | |||
| {{driver::uart::Parity::None, ParityNone}, | |||
| {driver::uart::Parity::Even, ParityEven}, | |||
| {driver::uart::Parity::Odd, ParityOdd}} | |||
| }; | |||
| } // namespace | |||
| template <> | |||
| driver::uart::Parity convert(const String& value) { | |||
| return convert(ParityOptions, value, driver::uart::Parity::None); | |||
| } | |||
| String serialize(driver::uart::Parity value) { | |||
| return espurna::settings::internal::serialize(ParityOptions, value); | |||
| } | |||
| } // namespace internal | |||
| } // namespace settings | |||
| namespace driver { | |||
| namespace uart { | |||
| namespace { | |||
| namespace build { | |||
| // i.e. uart0, uart1 and a single sw port | |||
| // for general use, hardware uart *should* be prefered method | |||
| constexpr size_t PortsMax { 3 }; | |||
| // todo; technically, tx==2 is also possible | |||
| // but, we reserve that for the uart1 TX-only interface | |||
| constexpr bool uart0_normal(uint8_t tx, uint8_t rx) { | |||
| return ((tx == 1) && (rx == 3)) | |||
| || ((tx == GPIO_NONE) && (rx == 3)) | |||
| || ((tx == 1) && (rx == GPIO_NONE)); | |||
| } | |||
| constexpr bool uart0_swapped(uint8_t tx, uint8_t rx) { | |||
| return ((tx == 15) && (rx == 13)) | |||
| || ((tx == GPIO_NONE) && (rx == 13)) | |||
| || ((tx == 15) && (rx == GPIO_NONE)); | |||
| } | |||
| constexpr bool uart1_normal(uint8_t tx, uint8_t rx) { | |||
| return (tx == 2) && (rx == GPIO_NONE); | |||
| } | |||
| constexpr uint8_t tx(size_t index) { | |||
| return (0 == index) ? (UART1_TX_PIN) : | |||
| (1 == index) ? (UART2_TX_PIN) : | |||
| (2 == index) ? (UART3_TX_PIN) : | |||
| GPIO_NONE; | |||
| } | |||
| constexpr uint8_t rx(size_t index) { | |||
| return (0 == index) ? (UART1_RX_PIN) : | |||
| (1 == index) ? (UART2_RX_PIN) : | |||
| (2 == index) ? (UART3_RX_PIN) : | |||
| GPIO_NONE; | |||
| } | |||
| constexpr uint32_t baudrate(size_t index) { | |||
| return (0 == index) ? (UART1_BAUDRATE) : | |||
| (1 == index) ? (UART2_BAUDRATE) : | |||
| (2 == index) ? (UART3_BAUDRATE) : | |||
| 0; | |||
| } | |||
| constexpr uint8_t data_bits(size_t index) { | |||
| return (0 == index) ? (UART1_DATA_BITS) : | |||
| (1 == index) ? (UART2_DATA_BITS) : | |||
| (2 == index) ? (UART3_DATA_BITS) | |||
| : 0; | |||
| } | |||
| constexpr Parity parity(size_t index) { | |||
| return (0 == index) ? (Parity::UART1_PARITY) : | |||
| (1 == index) ? (Parity::UART2_PARITY) : | |||
| (2 == index) ? (Parity::UART3_PARITY) | |||
| : Parity::None; | |||
| } | |||
| constexpr uint8_t stop_bits(size_t index) { | |||
| return (0 == index) ? (UART1_STOP_BITS) : | |||
| (1 == index) ? (UART2_STOP_BITS) : | |||
| (2 == index) ? (UART3_STOP_BITS) | |||
| : 0; | |||
| } | |||
| constexpr bool invert(size_t index) { | |||
| return (0 == index) ? (UART1_INVERT == 1) : | |||
| (1 == index) ? (UART2_INVERT == 1) : | |||
| (2 == index) ? (UART3_INVERT == 1) | |||
| : false; | |||
| } | |||
| } // namespace build | |||
| constexpr int data_bits_from_config(uint8_t bits) { | |||
| return (bits == 5) ? 0 : | |||
| (bits == 6) ? 0b100 : | |||
| (bits == 7) ? 0b1000 : | |||
| (bits == 8) ? 0b1100 : | |||
| data_bits_from_config(8); | |||
| } | |||
| constexpr int parity_from_config(Parity parity) { | |||
| return (parity == Parity::None) ? 0 : | |||
| (parity == Parity::Even) ? 0b10 : | |||
| (parity == Parity::Odd) ? 0b11 : | |||
| parity_from_config(Parity::None); | |||
| } | |||
| constexpr int stop_bits_from_config(uint8_t bits) { | |||
| return (bits == 1) ? 0b10000 : | |||
| (bits == 2) ? 0b110000 : | |||
| stop_bits_from_config(1); | |||
| } | |||
| template <typename T> | |||
| constexpr T from_config(Config); | |||
| template <> | |||
| constexpr ::SerialConfig from_config(Config config) { | |||
| return static_cast<::SerialConfig>( | |||
| data_bits_from_config(config.data_bits) | |||
| | parity_from_config(config.parity) | |||
| | stop_bits_from_config(config.stop_bits)); | |||
| } | |||
| namespace settings { | |||
| namespace keys { | |||
| alignas(4) static constexpr char TxPin[] PROGMEM = "uartTx"; | |||
| alignas(4) static constexpr char RxPin[] PROGMEM = "uartRx"; | |||
| alignas(4) static constexpr char Baudrate[] PROGMEM = "uartBaud"; | |||
| alignas(4) static constexpr char DataBits[] PROGMEM = "uartDataBits"; | |||
| alignas(4) static constexpr char StopBits[] PROGMEM = "uartStopBits"; | |||
| alignas(4) static constexpr char Parity[] PROGMEM = "uartParity"; | |||
| alignas(4) static constexpr char Invert[] PROGMEM = "uartInv"; | |||
| } // namespace keys | |||
| uint8_t tx(size_t index) { | |||
| return getSetting({keys::TxPin, index}, build::tx(index)); | |||
| } | |||
| uint8_t rx(size_t index) { | |||
| return getSetting({keys::RxPin, index}, build::rx(index)); | |||
| } | |||
| uint32_t baudrate(size_t index) { | |||
| return getSetting({keys::Baudrate, index}, build::baudrate(index)); | |||
| } | |||
| uint8_t data_bits(size_t index) { | |||
| return getSetting({keys::DataBits, index}, build::data_bits(index)); | |||
| } | |||
| uint8_t stop_bits(size_t index) { | |||
| return getSetting({keys::StopBits, index}, build::stop_bits(index)); | |||
| } | |||
| Parity parity(size_t index) { | |||
| return getSetting({keys::Parity, index}, build::parity(index)); | |||
| } | |||
| bool invert(size_t index) { | |||
| return getSetting({keys::Invert, index}, build::invert(index)); | |||
| } | |||
| } // namespace settings | |||
| using StreamPtr = std::unique_ptr<Stream>; | |||
| struct BasePort { | |||
| Type type; | |||
| bool tx; | |||
| bool rx; | |||
| StreamPtr stream; | |||
| }; | |||
| using BasePortPtr = std::unique_ptr<BasePort>; | |||
| BasePortPtr hardware_port( | |||
| uint32_t baudrate, uint8_t tx, uint8_t rx, Config config, bool invert) | |||
| { | |||
| const int number = | |||
| build::uart0_normal(tx, rx) | |||
| ? 0 : | |||
| build::uart0_swapped(tx, rx) | |||
| ? 0 : | |||
| build::uart1_normal(tx, rx) | |||
| ? 1 | |||
| : -1; | |||
| if (number < 0) { | |||
| return nullptr; | |||
| } | |||
| const int mode = | |||
| (tx == GPIO_NONE) | |||
| ? SERIAL_RX_ONLY : | |||
| (rx == GPIO_NONE) | |||
| ? SERIAL_TX_ONLY : | |||
| ((tx != GPIO_NONE) && (rx != GPIO_NONE)) | |||
| ? SERIAL_FULL | |||
| : -1; | |||
| if (mode < 0) { | |||
| return nullptr; | |||
| } | |||
| auto* ptr = new HardwareSerial(number); | |||
| ptr->begin(baudrate, | |||
| from_config<::SerialConfig>(config), | |||
| static_cast<SerialMode>(mode), | |||
| tx, invert); | |||
| if ((number == 0) && (build::uart0_swapped(tx, rx))) { | |||
| ptr->flush(); | |||
| ptr->swap(); | |||
| } | |||
| return std::make_unique<BasePort>( | |||
| BasePort{ | |||
| .type = (number == 0) ? Type::Uart0 : Type::Uart1, | |||
| .tx = (tx != GPIO_NONE), | |||
| .rx = (rx != GPIO_NONE), | |||
| .stream = StreamPtr(ptr), | |||
| }); | |||
| } | |||
| // based on the values in v6 of the lib. still, return bits instead of the octal notation used there | |||
| #if UART_SOFTWARE_SUPPORT | |||
| constexpr int software_serial_data_bits_from_config(uint8_t bits) { | |||
| return (bits == 5) ? 0 : | |||
| (bits == 6) ? 0b1 : | |||
| (bits == 7) ? 0b10 : | |||
| (bits == 8) ? 0b11 : | |||
| software_serial_data_bits_from_config(8); | |||
| } | |||
| // btw, SoftwareSerial also has Mark and Space | |||
| // no support on the hardware peripheral though (afaik) | |||
| constexpr int software_serial_parity_from_config(Parity parity) { | |||
| return (parity == Parity::None) ? 0 : | |||
| (parity == Parity::Even) ? 0b10000 : | |||
| (parity == Parity::Odd) ? 0b11000 : | |||
| software_serial_parity_from_config(Parity::None); | |||
| } | |||
| constexpr int software_serial_stop_bits_from_config(uint8_t bits) { | |||
| return (bits == 1) ? 0b0 : | |||
| (bits == 2) ? 0b10000000 : | |||
| software_serial_stop_bits_from_config(1); | |||
| } | |||
| template <> | |||
| constexpr ::SoftwareSerialConfig from_config(Config config) { | |||
| return static_cast<::SoftwareSerialConfig>( | |||
| software_serial_data_bits_from_config(config.data_bits) | |||
| | software_serial_parity_from_config(config.parity) | |||
| | software_serial_stop_bits_from_config(config.stop_bits)); | |||
| } | |||
| BasePortPtr software_serial_port( | |||
| uint32_t baudrate, uint8_t tx, uint8_t rx, Config config, bool invert) | |||
| { | |||
| const int8_t tx_pin = (tx == GPIO_NONE) ? -1 : tx; | |||
| const int8_t rx_pin = (rx == GPIO_NONE) ? -1 : rx; | |||
| auto* ptr = new SoftwareSerial(tx_pin, rx_pin, invert); | |||
| ptr->begin(baudrate, from_config<::SoftwareSerialConfig>(config)); | |||
| return std::make_unique<BasePort>( | |||
| BasePort{ | |||
| .type = Type::Software, | |||
| .tx = (tx_pin > 0), | |||
| .rx = (rx_pin > 0), | |||
| .stream = StreamPtr(ptr), | |||
| }); | |||
| } | |||
| #endif | |||
| BasePortPtr make_port(size_t index) { | |||
| BasePortPtr out; | |||
| const auto tx = settings::tx(index); | |||
| const auto rx = settings::rx(index); | |||
| if ((tx == GPIO_NONE) && (rx == GPIO_NONE)) { | |||
| return out; | |||
| } | |||
| if ((tx != GPIO_NONE) && !gpioLock(tx)) { | |||
| return out; | |||
| } | |||
| if ((rx != GPIO_NONE) && !gpioLock(rx)) { | |||
| gpioUnlock(tx); | |||
| return out; | |||
| } | |||
| const auto config = Config{ | |||
| .data_bits = settings::data_bits(index), | |||
| .parity = settings::parity(index), | |||
| .stop_bits = settings::stop_bits(index), | |||
| }; | |||
| const auto baudrate = settings::baudrate(index); | |||
| const auto invert = settings::invert(index); | |||
| if (build::uart0_normal(tx, rx) | |||
| || build::uart0_swapped(tx, rx) | |||
| || build::uart1_normal(tx, rx)) | |||
| { | |||
| out = hardware_port(baudrate, tx, rx, config, invert); | |||
| } | |||
| #if UART_SOFTWARE_SUPPORT | |||
| else { | |||
| out = software_serial_port(baudrate, tx, rx, config, invert); | |||
| } | |||
| #endif | |||
| return out; | |||
| } | |||
| namespace internal { | |||
| BasePortPtr ports[build::PortsMax]; | |||
| } // namespace internal | |||
| size_t ports() { | |||
| size_t out = 0; | |||
| for (const auto& port : internal::ports) { | |||
| if (!port) { | |||
| break; | |||
| } | |||
| ++out; | |||
| } | |||
| return out; | |||
| } | |||
| namespace settings { | |||
| namespace query { | |||
| #define ID_VALUE(NAME)\ | |||
| String NAME (size_t id) {\ | |||
| return espurna::settings::internal::serialize(\ | |||
| espurna::driver::uart::settings::NAME(id));\ | |||
| } | |||
| ID_VALUE(tx) | |||
| ID_VALUE(rx) | |||
| ID_VALUE(baudrate) | |||
| ID_VALUE(data_bits) | |||
| ID_VALUE(stop_bits) | |||
| ID_VALUE(parity) | |||
| ID_VALUE(invert) | |||
| #undef ID_VALUE | |||
| static constexpr espurna::settings::query::IndexedSetting IndexedSettings[] PROGMEM { | |||
| {keys::TxPin, query::tx}, | |||
| {keys::RxPin, query::rx}, | |||
| {keys::Baudrate, query::baudrate}, | |||
| {keys::DataBits, query::data_bits}, | |||
| {keys::StopBits, query::stop_bits}, | |||
| {keys::Parity, query::parity}, | |||
| {keys::Invert, query::invert}, | |||
| }; | |||
| bool checkSamePrefix(StringView key) { | |||
| alignas(4) static constexpr char Prefix[] PROGMEM = "uart"; | |||
| return espurna::settings::query::samePrefix(key, Prefix); | |||
| } | |||
| String findIndexedValueFrom(StringView key) { | |||
| return espurna::settings::query::IndexedSetting::findValueFrom( | |||
| ports(), IndexedSettings, key); | |||
| } | |||
| void setup() { | |||
| settingsRegisterQueryHandler({ | |||
| .check = checkSamePrefix, | |||
| .get = findIndexedValueFrom, | |||
| }); | |||
| } | |||
| } // namespace query | |||
| } // namespace settings | |||
| #if TERMINAL_SUPPORT | |||
| namespace terminal { | |||
| namespace commands { | |||
| String port_type(Type type) { | |||
| const char* out = PSTR("UNKNOWN"); | |||
| switch (type) { | |||
| case Type::Unknown: | |||
| break; | |||
| case Type::Software: | |||
| out = PSTR("SOFTWARE"); | |||
| break; | |||
| case Type::Uart0: | |||
| out = PSTR("UART0"); | |||
| break; | |||
| case Type::Uart1: | |||
| out = PSTR("UART1"); | |||
| break; | |||
| } | |||
| return out; | |||
| } | |||
| void uart(::terminal::CommandContext&& ctx) { | |||
| if (ctx.argv.size() == 1) { | |||
| for (size_t index = 0; index < std::size(internal::ports); ++index) { | |||
| const auto& port = internal::ports[index]; | |||
| if (!port) { | |||
| break; | |||
| } | |||
| ctx.output.printf_P( | |||
| PSTR("%zu - %s{tx=%c rx=%c}\n"), | |||
| index, port_type(port->type).c_str(), | |||
| port->tx ? 'y' : 'n', | |||
| port->rx ? 'y' : 'n'); | |||
| } | |||
| } else if (ctx.argv.size() == 2) { | |||
| const auto parse_id = espurna::settings::internal::convert<size_t>; | |||
| const auto id = parse_id(ctx.argv[1]); | |||
| if (id >= ports()) { | |||
| terminalError(ctx, F("Invalid ID")); | |||
| return; | |||
| } | |||
| settingsDump(ctx, settings::query::IndexedSettings, id); | |||
| } else { | |||
| terminalError(ctx, F("UART [<ID>]")); | |||
| return; | |||
| } | |||
| terminalOK(ctx); | |||
| } | |||
| alignas(4) static constexpr char Uart[] PROGMEM = "UART"; | |||
| static constexpr ::terminal::Command List[] PROGMEM { | |||
| {Uart, commands::uart}, | |||
| }; | |||
| } // namespace commands | |||
| void setup() { | |||
| espurna::terminal::add(commands::List); | |||
| } | |||
| } // namespace terminal | |||
| #endif | |||
| PortPtr port(size_t index) { | |||
| const auto& ptr = internal::ports[index]; | |||
| if ((index < std::size(internal::ports)) && (ptr)) { | |||
| return std::make_unique<Port>( | |||
| Port{ | |||
| .type = ptr->type, | |||
| .tx = ptr->tx, | |||
| .rx = ptr->rx, | |||
| .stream = ptr->stream.get(), | |||
| }); | |||
| } | |||
| return nullptr; | |||
| } | |||
| void setup() { | |||
| #if TERMINAL_SUPPORT | |||
| terminal::setup(); | |||
| #endif | |||
| settings::query::setup(); | |||
| for (size_t index = 0; index < build::PortsMax; ++index) { | |||
| auto& port = internal::ports[index]; | |||
| port = make_port(index); | |||
| if (!port) { | |||
| break; | |||
| } | |||
| } | |||
| } | |||
| } // namespace uart | |||
| } // namespace | |||
| } // namespace driver | |||
| } // namespace espurna | |||
| espurna::driver::uart::PortPtr uartPort(size_t index) { | |||
| return espurna::driver::uart::port(index); | |||
| } | |||
| void uartSetup() { | |||
| espurna::driver::uart::setup(); | |||
| } | |||
| #endif // UART_SUPPORT | |||
+ 40
- 0
code/espurna/uart.h
View File
| @ -0,0 +1,40 @@ | |||
| /* | |||
| UART MODULE | |||
| Copyright (C) 2022 by Maxim Prokhorov <prokhorov dot max at outlook dot com> | |||
| */ | |||
| #pragma once | |||
| #include <Arduino.h> | |||
| #include <memory> | |||
| namespace espurna { | |||
| namespace driver { | |||
| namespace uart { | |||
| enum class Type { | |||
| Unknown, | |||
| Software, | |||
| Uart0, | |||
| Uart1, | |||
| }; | |||
| struct Port { | |||
| Type type; | |||
| bool tx; | |||
| bool rx; | |||
| Stream* stream; | |||
| }; | |||
| using PortPtr = std::unique_ptr<Port>; | |||
| } // namespace uart | |||
| } // namespace driver | |||
| } // namespace espurna | |||
| espurna::driver::uart::PortPtr uartPort(size_t index); | |||
| void uartSetup(); | |||
+ 15
- 79
code/espurna/uartmqtt.cpp
View File
+ 1
- 1
code/espurna/web.cpp
View File
+ 0
- 1
code/platformio.ini
View File
+ 1
- 2
code/test/build/rfbridge.h
View File
| @ -1,5 +1,4 @@ | |||
| #define DUMMY_RELAY_COUNT 8 | |||
| #define SERIAL_BAUDRATE 19200 | |||
| #define DEBUG_SERIAL_SUPPORT 0 | |||
| #define RELAY_SUPPORT 1 | |||
| #define RFB_SUPPORT 1 | |||
| #define RFB_PROVIDER RFB_PROVIDER_EFM8BB1 | |||