Merge branch 'master' into uart_read_faster

SuGlider · web-flow · commit 08f668d2d152 · 2022-12-06T10:02:19.000-03:00
diff --git a/boards.txt b/boards.txt
@@ -19452,3 +19452,178 @@ cytron_maker_feather_aiot_s3.menu.EraseFlash.all=Enabled
 cytron_maker_feather_aiot_s3.menu.EraseFlash.all.upload.erase_cmd=-e
 
 ##############################################################
+# RedPill(+) ESP32-S3
+
+redpill_esp32s3.name=RedPill(+) ESP32-S3
+redpill_esp32s3.vid.0=0x303a
+redpill_esp32s3.pid.0=0x1001
+
+redpill_esp32s3.bootloader.tool=esptool_py
+redpill_esp32s3.bootloader.tool.default=esptool_py
+
+redpill_esp32s3.upload.tool=esptool_py
+redpill_esp32s3.upload.tool.default=esptool_py
+redpill_esp32s3.upload.tool.network=esp_ota
+
+redpill_esp32s3.upload.maximum_size=1310720
+redpill_esp32s3.upload.maximum_data_size=327680
+redpill_esp32s3.upload.flags=
+redpill_esp32s3.upload.extra_flags=
+redpill_esp32s3.upload.use_1200bps_touch=true
+redpill_esp32s3.upload.wait_for_upload_port=true
+
+redpill_esp32s3.serial.disableDTR=false
+redpill_esp32s3.serial.disableRTS=false
+
+redpill_esp32s3.build.tarch=xtensa
+redpill_esp32s3.build.bootloader_addr=0x0
+redpill_esp32s3.build.target=esp32s3
+redpill_esp32s3.build.mcu=esp32s3
+redpill_esp32s3.build.core=esp32
+redpill_esp32s3.build.variant=redpill_esp32s3
+redpill_esp32s3.build.board=REDPILL_ESP32S3
+
+redpill_esp32s3.build.usb_mode=0
+redpill_esp32s3.build.cdc_on_boot=1
+redpill_esp32s3.build.msc_on_boot=0
+redpill_esp32s3.build.dfu_on_boot=0
+redpill_esp32s3.build.f_cpu=240000000L
+redpill_esp32s3.build.flash_size=8MB
+redpill_esp32s3.build.flash_freq=80m
+redpill_esp32s3.build.flash_mode=dio
+redpill_esp32s3.build.boot=qio
+redpill_esp32s3.build.partitions=default
+redpill_esp32s3.build.defines=
+redpill_esp32s3.build.loop_core=
+redpill_esp32s3.build.event_core=
+redpill_esp32s3.build.flash_type=qio
+redpill_esp32s3.build.psram_type=qspi
+redpill_esp32s3.build.memory_type={build.flash_type}_{build.psram_type}
+
+redpill_esp32s3.menu.LoopCore.1=Core 1
+redpill_esp32s3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+redpill_esp32s3.menu.LoopCore.0=Core 0
+redpill_esp32s3.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+redpill_esp32s3.menu.EventsCore.1=Core 1
+redpill_esp32s3.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+redpill_esp32s3.menu.EventsCore.0=Core 0
+redpill_esp32s3.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+redpill_esp32s3.menu.USBMode.default=USB-OTG (TinyUSB)
+redpill_esp32s3.menu.USBMode.default.build.usb_mode=0
+redpill_esp32s3.menu.USBMode.hwcdc=Hardware CDC and JTAG
+redpill_esp32s3.menu.USBMode.hwcdc.build.usb_mode=1
+
+redpill_esp32s3.menu.CDCOnBoot.cdc=Enabled
+redpill_esp32s3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+redpill_esp32s3.menu.CDCOnBoot.default=Disabled
+redpill_esp32s3.menu.CDCOnBoot.default.build.cdc_on_boot=0
+
+redpill_esp32s3.menu.MSCOnBoot.default=Disabled
+redpill_esp32s3.menu.MSCOnBoot.default.build.msc_on_boot=0
+redpill_esp32s3.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+redpill_esp32s3.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+redpill_esp32s3.menu.DFUOnBoot.default=Disabled
+redpill_esp32s3.menu.DFUOnBoot.default.build.dfu_on_boot=0
+redpill_esp32s3.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+redpill_esp32s3.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+redpill_esp32s3.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
+redpill_esp32s3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+redpill_esp32s3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+redpill_esp32s3.menu.UploadMode.default=UART0 / Hardware CDC
+redpill_esp32s3.menu.UploadMode.default.upload.use_1200bps_touch=false
+redpill_esp32s3.menu.UploadMode.default.upload.wait_for_upload_port=false
+
+redpill_esp32s3.menu.PSRAM.enabled=QSPI PSRAM
+redpill_esp32s3.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+redpill_esp32s3.menu.PSRAM.enabled.build.psram_type=qspi
+redpill_esp32s3.menu.PSRAM.disabled=Disabled
+redpill_esp32s3.menu.PSRAM.disabled.build.defines=
+redpill_esp32s3.menu.PSRAM.disabled.build.psram_type=qspi
+redpill_esp32s3.menu.PSRAM.opi=OPI PSRAM
+redpill_esp32s3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
+redpill_esp32s3.menu.PSRAM.opi.build.psram_type=opi
+
+redpill_esp32s3.menu.PartitionScheme.tinyuf2=TinyUF2 8MB (2MB APP/3.7MB FFAT)
+redpill_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
+redpill_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-8MB-tinyuf2
+redpill_esp32s3.menu.PartitionScheme.tinyuf2.upload.maximum_size=2097152
+redpill_esp32s3.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+redpill_esp32s3.menu.PartitionScheme.default_8MB=Default (3MB APP/1.5MB SPIFFS)
+redpill_esp32s3.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+redpill_esp32s3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+
+redpill_esp32s3.menu.CPUFreq.240=240MHz (WiFi)
+redpill_esp32s3.menu.CPUFreq.240.build.f_cpu=240000000L
+redpill_esp32s3.menu.CPUFreq.160=160MHz (WiFi)
+redpill_esp32s3.menu.CPUFreq.160.build.f_cpu=160000000L
+redpill_esp32s3.menu.CPUFreq.80=80MHz (WiFi)
+redpill_esp32s3.menu.CPUFreq.80.build.f_cpu=80000000L
+redpill_esp32s3.menu.CPUFreq.40=40MHz
+redpill_esp32s3.menu.CPUFreq.40.build.f_cpu=40000000L
+redpill_esp32s3.menu.CPUFreq.20=20MHz
+redpill_esp32s3.menu.CPUFreq.20.build.f_cpu=20000000L
+redpill_esp32s3.menu.CPUFreq.10=10MHz
+redpill_esp32s3.menu.CPUFreq.10.build.f_cpu=10000000L
+
+redpill_esp32s3.menu.FlashMode.qio=QIO 80MHz
+redpill_esp32s3.menu.FlashMode.qio.build.flash_mode=dio
+redpill_esp32s3.menu.FlashMode.qio.build.boot=qio
+redpill_esp32s3.menu.FlashMode.qio.build.boot_freq=80m
+redpill_esp32s3.menu.FlashMode.qio.build.flash_freq=80m
+redpill_esp32s3.menu.FlashMode.qio120=QIO 120MHz
+redpill_esp32s3.menu.FlashMode.qio120.build.flash_mode=dio
+redpill_esp32s3.menu.FlashMode.qio120.build.boot=qio
+redpill_esp32s3.menu.FlashMode.qio120.build.boot_freq=120m
+redpill_esp32s3.menu.FlashMode.qio120.build.flash_freq=80m
+redpill_esp32s3.menu.FlashMode.dio=DIO 80MHz
+redpill_esp32s3.menu.FlashMode.dio.build.flash_mode=dio
+redpill_esp32s3.menu.FlashMode.dio.build.boot=dio
+redpill_esp32s3.menu.FlashMode.dio.build.boot_freq=80m
+redpill_esp32s3.menu.FlashMode.dio.build.flash_freq=80m
+redpill_esp32s3.menu.FlashMode.opi=OPI 80MHz
+redpill_esp32s3.menu.FlashMode.opi.build.flash_mode=dout
+redpill_esp32s3.menu.FlashMode.opi.build.boot=opi
+redpill_esp32s3.menu.FlashMode.opi.build.boot_freq=80m
+redpill_esp32s3.menu.FlashMode.opi.build.flash_freq=80m
+
+redpill_esp32s3.menu.FlashSize.8M=8MB (64Mb)
+redpill_esp32s3.menu.FlashSize.8M.build.flash_size=8MB
+
+redpill_esp32s3.menu.UploadSpeed.921600=921600
+redpill_esp32s3.menu.UploadSpeed.921600.upload.speed=921600
+redpill_esp32s3.menu.UploadSpeed.115200=115200
+redpill_esp32s3.menu.UploadSpeed.115200.upload.speed=115200
+redpill_esp32s3.menu.UploadSpeed.256000.windows=256000
+redpill_esp32s3.menu.UploadSpeed.256000.upload.speed=256000
+redpill_esp32s3.menu.UploadSpeed.230400.windows.upload.speed=256000
+redpill_esp32s3.menu.UploadSpeed.230400=230400
+redpill_esp32s3.menu.UploadSpeed.230400.upload.speed=230400
+redpill_esp32s3.menu.UploadSpeed.460800.linux=460800
+redpill_esp32s3.menu.UploadSpeed.460800.macosx=460800
+redpill_esp32s3.menu.UploadSpeed.460800.upload.speed=460800
+redpill_esp32s3.menu.UploadSpeed.512000.windows=512000
+redpill_esp32s3.menu.UploadSpeed.512000.upload.speed=512000
+
+redpill_esp32s3.menu.DebugLevel.none=None
+redpill_esp32s3.menu.DebugLevel.none.build.code_debug=0
+redpill_esp32s3.menu.DebugLevel.error=Error
+redpill_esp32s3.menu.DebugLevel.error.build.code_debug=1
+redpill_esp32s3.menu.DebugLevel.warn=Warn
+redpill_esp32s3.menu.DebugLevel.warn.build.code_debug=2
+redpill_esp32s3.menu.DebugLevel.info=Info
+redpill_esp32s3.menu.DebugLevel.info.build.code_debug=3
+redpill_esp32s3.menu.DebugLevel.debug=Debug
+redpill_esp32s3.menu.DebugLevel.debug.build.code_debug=4
+redpill_esp32s3.menu.DebugLevel.verbose=Verbose
+redpill_esp32s3.menu.DebugLevel.verbose.build.code_debug=5
+
+redpill_esp32s3.menu.EraseFlash.none=Disabled
+redpill_esp32s3.menu.EraseFlash.none.upload.erase_cmd=
+redpill_esp32s3.menu.EraseFlash.all=Enabled
+redpill_esp32s3.menu.EraseFlash.all.upload.erase_cmd=-e
+
+##############################################################
diff --git a/libraries/ESP32/examples/TWAI/TWAIreceive/TWAIreceive.ino b/libraries/ESP32/examples/TWAI/TWAIreceive/TWAIreceive.ino
@@ -0,0 +1,127 @@
+/* ESP32 TWAI receive example.
+  Receive messages and sends them over serial.
+
+  Connect a CAN bus transceiver to the RX/TX pins.
+  For example: SN65HVD230
+
+  TWAI_MODE_LISTEN_ONLY is used so that the TWAI controller will not influence the bus.
+
+  The API gives other possible speeds and alerts:
+  https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/peripherals/twai.html
+
+  Example output from a can bus message:
+  -> Message received
+  -> Message is in Standard Format
+  -> ID: 604
+  -> Byte: 0 = 00, 1 = 0f, 2 = 13, 3 = 02, 4 = 00, 5 = 00, 6 = 08, 7 = 00
+
+  Example output with alerts:
+  -> Alert: A (Bit, Stuff, CRC, Form, ACK) error has occurred on the bus.
+  -> Bus error count: 171
+  -> Alert: The RX queue is full causing a received frame to be lost.
+  -> RX buffered: 4  RX missed: 46 RX overrun 0
+
+  created 05-11-2022 by Stephan Martin (designer2k2)
+*/
+
+#include "driver/twai.h"
+
+// Pins used to connect to CAN bus transceiver:
+#define RX_PIN 21
+#define TX_PIN 22
+
+// Intervall:
+#define POLLING_RATE_MS 1000
+
+static bool driver_installed = false;
+
+void setup() {
+  // Start Serial:
+  Serial.begin(115200);
+
+  // Initialize configuration structures using macro initializers
+  twai_general_config_t g_config = TWAI_GENERAL_CONFIG_DEFAULT((gpio_num_t)TX_PIN, (gpio_num_t)RX_PIN, TWAI_MODE_LISTEN_ONLY);
+  twai_timing_config_t t_config = TWAI_TIMING_CONFIG_500KBITS();  //Look in the api-reference for other speed sets.
+  twai_filter_config_t f_config = TWAI_FILTER_CONFIG_ACCEPT_ALL();
+
+  // Install TWAI driver
+  if (twai_driver_install(&g_config, &t_config, &f_config) == ESP_OK) {
+    Serial.println("Driver installed");
+  } else {
+    Serial.println("Failed to install driver");
+    return;
+  }
+
+  // Start TWAI driver
+  if (twai_start() == ESP_OK) {
+    Serial.println("Driver started");
+  } else {
+    Serial.println("Failed to start driver");
+    return;
+  }
+
+  // Reconfigure alerts to detect frame receive, Bus-Off error and RX queue full states
+  uint32_t alerts_to_enable = TWAI_ALERT_RX_DATA | TWAI_ALERT_ERR_PASS | TWAI_ALERT_BUS_ERROR | TWAI_ALERT_RX_QUEUE_FULL;
+  if (twai_reconfigure_alerts(alerts_to_enable, NULL) == ESP_OK) {
+    Serial.println("CAN Alerts reconfigured");
+  } else {
+    Serial.println("Failed to reconfigure alerts");
+    return;
+  }
+
+  // TWAI driver is now successfully installed and started
+  driver_installed = true;
+}
+
+static void handle_rx_message(twai_message_t& message) {
+  // Process received message
+  if (message.extd) {
+    Serial.println("Message is in Extended Format");
+  } else {
+    Serial.println("Message is in Standard Format");
+  }
+  Serial.printf("ID: %x\nByte:", message.identifier);
+  if (!(message.rtr)) {
+    for (int i = 0; i < message.data_length_code; i++) {
+      Serial.printf(" %d = %02x,", i, message.data[i]);
+    }
+    Serial.println("");
+  }
+}
+
+void loop() {
+  if (!driver_installed) {
+    // Driver not installed
+    delay(1000);
+    return;
+  }
+  // Check if alert happened
+  uint32_t alerts_triggered;
+  twai_read_alerts(&alerts_triggered, pdMS_TO_TICKS(POLLING_RATE_MS));
+  twai_status_info_t twaistatus;
+  twai_get_status_info(&twaistatus);
+
+  // Handle alerts
+  if (alerts_triggered & TWAI_ALERT_ERR_PASS) {
+    Serial.println("Alert: TWAI controller has become error passive.");
+  }
+  if (alerts_triggered & TWAI_ALERT_BUS_ERROR) {
+    Serial.println("Alert: A (Bit, Stuff, CRC, Form, ACK) error has occurred on the bus.");
+    Serial.printf("Bus error count: %d\n", twaistatus.bus_error_count);
+  }
+  if (alerts_triggered & TWAI_ALERT_RX_QUEUE_FULL) {
+    Serial.println("Alert: The RX queue is full causing a received frame to be lost.");
+    Serial.printf("RX buffered: %d\t", twaistatus.msgs_to_rx);
+    Serial.printf("RX missed: %d\t", twaistatus.rx_missed_count);
+    Serial.printf("RX overrun %d\n", twaistatus.rx_overrun_count);
+  }
+
+  // Check if message is received
+  if (alerts_triggered & TWAI_ALERT_RX_DATA) {
+    // One or more messages received. Handle all.
+    twai_message_t message;
+    while (twai_receive(&message, 0) == ESP_OK) {
+      handle_rx_message(message);
+    }
+  }
+}
diff --git a/variants/redpill_esp32s3/pins_arduino.h b/variants/redpill_esp32s3/pins_arduino.h
@@ -0,0 +1,65 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x303A
+#define USB_PID 0x1001
+
+#define EXTERNAL_NUM_INTERRUPTS 46
+#define NUM_DIGITAL_PINS        48
+#define NUM_ANALOG_INPUTS       20
+
+#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
+#define digitalPinHasPWM(p)         (p < 46)
+
+static const uint8_t LED_BUILTIN = 3;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+static const uint8_t SDA = 11;
+static const uint8_t SCL = 10;
+
+static const uint8_t A0 = 1;
+static const uint8_t A1 = 2;
+static const uint8_t A2 = 3;
+static const uint8_t A3 = 4;
+static const uint8_t A4 = 5;
+static const uint8_t A5 = 6;
+static const uint8_t A6 = 7;
+static const uint8_t A7 = 8;
+static const uint8_t A8 = 9;
+static const uint8_t A9 = 10;
+static const uint8_t A10 = 11;
+static const uint8_t A11 = 12;
+static const uint8_t A12 = 13;
+static const uint8_t A13 = 14;
+static const uint8_t A14 = 15;
+static const uint8_t A15 = 16;
+static const uint8_t A16 = 17;
+static const uint8_t A17 = 18;
+static const uint8_t A18 = 19;
+static const uint8_t A19 = 20;
+
+static const uint8_t T1 = 1;
+static const uint8_t T2 = 2;
+static const uint8_t T3 = 3;
+static const uint8_t T4 = 4;
+static const uint8_t T5 = 5;
+static const uint8_t T6 = 6;
+static const uint8_t T7 = 7;
+static const uint8_t T8 = 8;
+static const uint8_t T9 = 9;
+static const uint8_t T10 = 10;
+static const uint8_t T11 = 11;
+static const uint8_t T12 = 12;
+static const uint8_t T13 = 13;
+static const uint8_t T14 = 14;
+
+#endif /* Pins_Arduino_h */
diff --git a/variants/redpill_esp32s3/tinyuf2.bin b/variants/redpill_esp32s3/tinyuf2.bin
