Merge branch 'espressif:master' into main

Author: Jason2866

boards.txt

@@ -21180,15 +21180,12 @@ heltec_wireless_stick.build.bootloader_addr=0x1000
 heltec_wireless_stick.build.target=esp32
 heltec_wireless_stick.build.mcu=esp32
 heltec_wireless_stick.build.core=esp32
-heltec_wireless_stick.build.variant=heltec_wireless_stick
 heltec_wireless_stick.build.board=HELTEC_WIRELESS_STICK
 
 heltec_wireless_stick.build.f_cpu=240000000L
-heltec_wireless_stick.build.flash_size=8MB
 heltec_wireless_stick.build.flash_freq=80m
 heltec_wireless_stick.build.flash_mode=dio
 heltec_wireless_stick.build.boot=dio
-heltec_wireless_stick.build.partitions=default_8MB
 heltec_wireless_stick.build.defines=-D{build.band} -DLoRaWAN_DEBUG_LEVEL={build.LoRaWanDebugLevel} -DACTIVE_REGION=LORAMAC_{build.band} {build.psram}
 
 heltec_wireless_stick.menu.PSRAM.disabled=Disabled
@@ -21268,6 +21265,24 @@ heltec_wireless_stick.menu.EraseFlash.none.upload.erase_cmd=
 heltec_wireless_stick.menu.EraseFlash.all=Enabled
 heltec_wireless_stick.menu.EraseFlash.all.upload.erase_cmd=-e
 
+heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V1=Heltec Wireless Stick V1 (SX1276)
+heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V1.build.board=HELTEC_WIRELESS_STICK_V1
+heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V1.build.variant=heltec_wireless_stick_V1
+heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V1.build.flash_size=4MB
+heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V1.build.partitions=default
+
+heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V2=Heltec Wireless Stick V2 (SX1276)
+heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V2.build.board=HELTEC_WIRELESS_STICK_V2
+heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V2.build.variant=heltec_wireless_stick
+heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V2.build.flash_size=8MB
+heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V2.build.partitions=default_8MB
+
+heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V3=Heltec Wireless Stick V3 (SX1262)
+heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V3.build.board=HELTEC_WIRELESS_STICK_V3
+heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V3.build.variant=heltec_wireless_stick
+heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V3.build.flash_size=8MB
+heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V3.build.partitions=default_8MB
+
 ##############################################################
 
 heltec_wireless_stick_lite.name=Heltec Wireless Stick Lite

cores/esp32/esp32-hal-rmt.c

@@ -61,6 +61,7 @@ struct rmt_obj_s {
   bool rmt_ch_is_looping;                    // Is this RMT TX Channel in LOOPING MODE?
   size_t *num_symbols_read;                  // Pointer to the number of RMT symbol read by IDF RMT RX Done
   uint32_t frequency_Hz;                     // RMT Frequency
+  uint8_t rmt_EOT_Level;                     // RMT End of Transmission Level - default is LOW
 
 #if !CONFIG_DISABLE_HAL_LOCKS
   SemaphoreHandle_t g_rmt_objlocks;           // Channel Semaphore Lock
@@ -185,6 +186,20 @@ static bool _rmtDetachBus(void *busptr)
    Public method definitions
 */
 
+bool rmtSetEOT(int pin, uint8_t EOT_Level)
+{
+  rmt_bus_handle_t bus = _rmtGetBus(pin, __FUNCTION__);
+  if (bus == NULL) {
+    return false;
+  }
+  if (!_rmtCheckDirection(pin, RMT_TX_MODE, __FUNCTION__)) {
+    return false;
+  }
+
+  bus->rmt_EOT_Level = EOT_Level > 0 ? 1 : 0;
+  return true;
+}
+
 bool rmtSetCarrier(int pin, bool carrier_en, bool carrier_level, uint32_t frequency_Hz, float duty_percent)
 {
   rmt_bus_handle_t bus = _rmtGetBus(pin, __FUNCTION__);
@@ -316,6 +331,10 @@ static bool _rmtWrite(int pin, rmt_data_t* data, size_t num_rmt_symbols, bool bl
     rmt_enable(bus->rmt_channel_h);
     bus->rmt_ch_is_looping = false;  // not looping anymore
   }
+  // sets the End of Transmission level to HIGH if the user has requested so
+  if (bus->rmt_EOT_Level) {
+    transmit_cfg.flags.eot_level = 1;  // EOT is HIGH
+  }
   if (loopCancel) {
     // just resets and releases the channel, maybe, already done above, then exits
     bus->rmt_ch_is_looping = false;
@@ -487,7 +506,7 @@ bool rmtInit(int pin, rmt_ch_dir_t channel_direction, rmt_reserve_memsize_t mem_
   // store the RMT Freq to check Filter and Idle valid values in the RMT API
   bus->frequency_Hz = frequency_Hz;
   // pulses with width smaller than min_ns will be ignored (as a glitch)
-  bus->signal_range_min_ns = 0; // disabled
+  //bus->signal_range_min_ns = 0; // disabled  --> not necessary CALLOC set all to ZERO.
   // RMT stops reading if the input stays idle for longer than max_ns
   bus->signal_range_max_ns = (1000000000 / frequency_Hz) * RMT_LL_MAX_IDLE_VALUE; // maximum possible
   // creates the event group to control read_done and write_done

cores/esp32/esp32-hal-rmt.h

@@ -76,6 +76,20 @@ typedef union {
 */
 bool rmtInit(int pin, rmt_ch_dir_t channel_direction, rmt_reserve_memsize_t memsize, uint32_t frequency_Hz);
 
+/**
+     Sets the End of Transmission level to be set for the <pin> when the RMT transmission ends.
+     This function affects how rmtWrite(), rmtWriteAsync() or rmtWriteLooping() will set the pin after writing the data.
+     The default EOT level is LOW, in case this function isn't used before RMT Writing.
+     This level can be set for each RMT pin and can be changed between writings to the same pin.
+
+     <EOT_Level> shall be Zero (LOW) or non-zero (HIGH) value.
+     It only affects the transmission process, therefore, it doesn't affect any IDLE LEVEL before starting the RMT transmission. 
+     The pre-transmission idle level can be set manually calling, for instance, digitalWrite(pin, Level).
+
+     Returns <true> when EOT has been correctly set for <pin>, <false> otherwise.
+*/
+bool rmtSetEOT(int pin, uint8_t EOT_Level);
+
 /**
      Sending data in Blocking Mode. 
      <rmt_symbol> is a 32 bits structure as defined by rmt_data_t type.

libraries/BluetoothSerial/src/BluetoothSerial.cpp

@@ -55,7 +55,7 @@ static TaskHandle_t _spp_task_handle = NULL;
 static EventGroupHandle_t _spp_event_group = NULL;
 static EventGroupHandle_t _bt_event_group = NULL;
 static boolean secondConnectionAttempt;
-static esp_spp_cb_t * custom_spp_callback = NULL;
+static esp_spp_cb_t custom_spp_callback = NULL;
 static BluetoothSerialDataCb custom_data_callback = NULL;
 static esp_bd_addr_t current_bd_addr;
 static ConfirmRequestCb confirm_request_callback = NULL;
@@ -945,7 +945,7 @@ void BluetoothSerial::confirmReply(boolean confirm)
 }
 
 
-esp_err_t BluetoothSerial::register_callback(esp_spp_cb_t * callback)
+esp_err_t BluetoothSerial::register_callback(esp_spp_cb_t callback)
 {
     custom_spp_callback = callback;
     return ESP_OK;

libraries/BluetoothSerial/src/BluetoothSerial.h

@@ -28,7 +28,6 @@
 #include "BTScan.h"
 #include "BTAdvertisedDevice.h"
 
-
 typedef std::function<void(const uint8_t *buffer, size_t size)> BluetoothSerialDataCb;
 typedef std::function<void(uint32_t num_val)> ConfirmRequestCb;
 typedef std::function<void()> KeyRequestCb;
@@ -57,7 +56,7 @@ class BluetoothSerial: public Stream
         void memrelease();
         void setTimeout(int timeoutMS);
         void onData(BluetoothSerialDataCb cb);
-        esp_err_t register_callback(esp_spp_cb_t * callback);
+        esp_err_t register_callback(esp_spp_cb_t callback);
 
 #ifdef CONFIG_BT_SSP_ENABLED
         void onConfirmRequest(ConfirmRequestCb cb);

libraries/ESP32/examples/RMT/RMT_EndOfTransmissionState/RMT_EndOfTransmissionState.ino

@@ -0,0 +1,59 @@
+#define BLINK_GPIO 2
+#define EOT_INITIAL_STATE_TIME_MS 1000
+
+// BLINK_GPIO shall start at RMT_EOT (HIGH or LOW) as initial state for EOT_INITIAL_STATE_TIME_MS, 
+// BLINK: 1 second ON, 1 second OFF and then return/stay to RMT_EOT level at the end.
+#define RMT_EOT HIGH
+
+// RMT is at 400KHz with a 2.5us tick
+// This RMT data sends a 0.5Hz pulse with 1s High and 1s Low signal
+rmt_data_t blink_1s_rmt_data[] = {
+  // 400,000 x 2.5us = 1 second ON
+  {25000, 1, 25000, 1,},
+  {25000, 1, 25000, 1,},
+  {25000, 1, 25000, 1,},
+  {25000, 1, 25000, 1,},
+  {25000, 1, 25000, 1,},
+  {25000, 1, 25000, 1,},
+  {25000, 1, 25000, 1,},
+  {25000, 1, 25000, 1,},
+  // 400,000 x 2.5us = 1 second OFF
+  {25000, 0, 25000, 0,},
+  {25000, 0, 25000, 0,},
+  {25000, 0, 25000, 0,},
+  {25000, 0, 25000, 0,},
+  {25000, 0, 25000, 0,},
+  {25000, 0, 25000, 0,},
+  {25000, 0, 25000, 0,},
+  {25000, 0, 25000, 0,},
+  // Looping mode needs a Zero ending data to mark the EOF
+  {0, 0, 0, 0}
+};
+
+void setup() {
+  Serial.begin(115200);
+  Serial.println("Starting Blink testing...");
+  Serial.flush();
+  
+  // 1 RMT Block has 64 RMT_SYMBOLS (ESP32|ESP32S2) or 48 RMT_SYMBOLS (ESP32C3|ESP32S3)
+  if (!rmtInit(BLINK_GPIO, RMT_TX_MODE, RMT_MEM_NUM_BLOCKS_1, 400000)) { //2.5us tick
+    Serial.println("===> rmtInit Error!");
+  }
+   
+  // sets the End of Transmission Level to HIGH, after writing to the pin. DEFAULT is LOW.
+  rmtSetEOT(BLINK_GPIO, RMT_EOT);
+  // set initial RMT state by writing a single RMT data
+  rmt_data_t initStateSetup_rmt_data[] = { {1, RMT_EOT, 0, 0} };  
+  rmtWrite(BLINK_GPIO, initStateSetup_rmt_data, RMT_SYMBOLS_OF(initStateSetup_rmt_data), RMT_WAIT_FOR_EVER);
+  Serial.printf("\nLED GPIO%d start in the inital level %s\n", BLINK_GPIO, RMT_EOT == LOW ? "LOW" : "HIGH");
+  delay(EOT_INITIAL_STATE_TIME_MS); // set initial state of the LED is set by RMT_EOT.
+   
+  // Send the data and wait until it is done - set EOT level to HIGH
+  Serial.printf("\nLED GPIO%d Blinks 1 second HIGH - 1 second LOW.\n", BLINK_GPIO);
+  if (!rmtWrite(BLINK_GPIO, blink_1s_rmt_data, RMT_SYMBOLS_OF(blink_1s_rmt_data) - 2, RMT_WAIT_FOR_EVER)) {
+    Serial.println("===> rmtWrite Blink 1s Error!");
+  }
+  Serial.printf("\nLED GPIO%d goes to the EOT level %s\n", BLINK_GPIO, RMT_EOT == LOW ? "LOW" : "HIGH");
+}
+
+void loop(){}

libraries/Ethernet/examples/ETH_LAN8720/ETH_LAN8720.ino

@@ -5,12 +5,14 @@
 
 // Important to be defined BEFORE including ETH.h for ETH.begin() to work.
 // Example RMII LAN8720 (Olimex, etc.)
+#ifndef ETH_PHY_TYPE
 #define ETH_PHY_TYPE        ETH_PHY_LAN8720
 #define ETH_PHY_ADDR         0
 #define ETH_PHY_MDC         23
 #define ETH_PHY_MDIO        18
 #define ETH_PHY_POWER       -1
 #define ETH_CLK_MODE        ETH_CLOCK_GPIO0_IN
+#endif
 
 #include <ETH.h>
 

libraries/Ethernet/examples/ETH_TLK110/ETH_TLK110.ino

@@ -5,12 +5,14 @@
 
 #include <ETH.h>
 
-#define ETH_TYPE            ETH_PHY_TLK110
-#define ETH_ADDR            31
-#define ETH_MDC_PIN         23
-#define ETH_MDIO_PIN        18
-#define ETH_POWER_PIN       17
+#ifndef ETH_PHY_TYPE
+#define ETH_PHY_TYPE        ETH_PHY_TLK110
+#define ETH_PHY_ADDR        31
+#define ETH_PHY_MDC         23
+#define ETH_PHY_MDIO        18
+#define ETH_PHY_POWER       17
 #define ETH_CLK_MODE        ETH_CLOCK_GPIO0_IN
+#endif
 
 static bool eth_connected = false;
 
@@ -73,7 +75,7 @@ void setup()
 {
   Serial.begin(115200);
   WiFi.onEvent(WiFiEvent);  // Will call WiFiEvent() from another thread.
-  ETH.begin(ETH_TYPE, ETH_ADDR, ETH_MDC_PIN, ETH_MDIO_PIN, ETH_POWER_PIN, ETH_CLK_MODE);
+  ETH.begin(ETH_PHY_TYPE, ETH_PHY_ADDR, ETH_PHY_MDC, ETH_PHY_MDIO, ETH_PHY_POWER, ETH_CLK_MODE);
 }
 
 

libraries/Ethernet/examples/ETH_W5500_Arduino_SPI/ETH_W5500_Arduino_SPI.ino

@@ -9,24 +9,28 @@
 // Set this to 1 to enable dual Ethernet support
 #define USE_TWO_ETH_PORTS 0
 
-#define ETH_TYPE        ETH_PHY_W5500
-#define ETH_ADDR         1
-#define ETH_CS          15
-#define ETH_IRQ          4
-#define ETH_RST          5
+#ifndef ETH_PHY_TYPE
+#define ETH_PHY_TYPE        ETH_PHY_W5500
+#define ETH_PHY_ADDR         1
+#define ETH_PHY_CS          15
+#define ETH_PHY_IRQ          4
+#define ETH_PHY_RST          5
+#endif
 
 // SPI pins
-#define ETH_SPI_SCK     14
-#define ETH_SPI_MISO    12
-#define ETH_SPI_MOSI    13
+#define ETH_SPI_SCK         14
+#define ETH_SPI_MISO        12
+#define ETH_SPI_MOSI        13
 
 #if USE_TWO_ETH_PORTS
 // Second port on shared SPI bus
-#define ETH1_TYPE        ETH_PHY_W5500
-#define ETH1_ADDR         1
-#define ETH1_CS          32
-#define ETH1_IRQ         33
-#define ETH1_RST         18
+#ifndef ETH1_PHY_TYPE
+#define ETH1_PHY_TYPE        ETH_PHY_W5500
+#define ETH1_PHY_ADDR         1
+#define ETH1_PHY_CS          32
+#define ETH1_PHY_IRQ         33
+#define ETH1_PHY_RST         18
+#endif
 ETHClass ETH1(1);
 #endif
 
@@ -94,9 +98,9 @@ void setup()
   WiFi.onEvent(onEvent);
 
   SPI.begin(ETH_SPI_SCK, ETH_SPI_MISO, ETH_SPI_MOSI);
-  ETH.begin(ETH_TYPE, ETH_ADDR, ETH_CS, ETH_IRQ, ETH_RST, SPI);
+  ETH.begin(ETH_PHY_TYPE, ETH_PHY_ADDR, ETH_PHY_CS, ETH_PHY_IRQ, ETH_PHY_RST, SPI);
 #if USE_TWO_ETH_PORTS
-  ETH1.begin(ETH1_TYPE, ETH1_ADDR, ETH1_CS, ETH1_IRQ, ETH1_RST, SPI);
+  ETH1.begin(ETH1_PHY_TYPE, ETH1_PHY_ADDR, ETH1_PHY_CS, ETH1_PHY_IRQ, ETH1_PHY_RST, SPI);
 #endif
 }
 

libraries/Ethernet/examples/ETH_W5500_IDF_SPI/ETH_W5500_IDF_SPI.ino

@@ -8,23 +8,27 @@
 // Set this to 1 to enable dual Ethernet support
 #define USE_TWO_ETH_PORTS 0
 
-#define ETH_TYPE        ETH_PHY_W5500
-#define ETH_ADDR         1
-#define ETH_CS          15
-#define ETH_IRQ          4
-#define ETH_RST          5
-#define ETH_SPI_HOST    SPI2_HOST
-#define ETH_SPI_SCK     14
-#define ETH_SPI_MISO    12
-#define ETH_SPI_MOSI    13
+#ifndef ETH_PHY_TYPE
+#define ETH_PHY_TYPE        ETH_PHY_W5500
+#define ETH_PHY_ADDR         1
+#define ETH_PHY_CS          15
+#define ETH_PHY_IRQ          4
+#define ETH_PHY_RST          5
+#define ETH_PHY_SPI_HOST    SPI2_HOST
+#define ETH_PHY_SPI_SCK     14
+#define ETH_PHY_SPI_MISO    12
+#define ETH_PHY_SPI_MOSI    13
+#endif
 
 #if USE_TWO_ETH_PORTS
 // Second port on shared SPI bus
-#define ETH1_TYPE        ETH_PHY_W5500
-#define ETH1_ADDR         1
-#define ETH1_CS          32
-#define ETH1_IRQ         33
-#define ETH1_RST         18
+#ifndef ETH1_PHY_TYPE
+#define ETH1_PHY_TYPE        ETH_PHY_W5500
+#define ETH1_PHY_ADDR         1
+#define ETH1_PHY_CS          32
+#define ETH1_PHY_IRQ         33
+#define ETH1_PHY_RST         18
+#endif
 ETHClass ETH1(1);
 #endif
 
@@ -90,10 +94,10 @@ void setup()
 {
   Serial.begin(115200);
   WiFi.onEvent(onEvent);
-  ETH.begin(ETH_TYPE, ETH_ADDR, ETH_CS, ETH_IRQ, ETH_RST, ETH_SPI_HOST, ETH_SPI_SCK, ETH_SPI_MISO, ETH_SPI_MOSI);
+  ETH.begin(ETH_PHY_TYPE, ETH_PHY_ADDR, ETH_PHY_CS, ETH_PHY_IRQ, ETH_PHY_RST, ETH_PHY_SPI_HOST, ETH_PHY_SPI_SCK, ETH_PHY_SPI_MISO, ETH_PHY_SPI_MOSI);
 #if USE_TWO_ETH_PORTS
   // Since SPI bus is shared, we should skip the SPI pins when calling ETH1.begin()
-  ETH1.begin(ETH1_TYPE, ETH1_ADDR, ETH1_CS, ETH1_IRQ, ETH1_RST, ETH_SPI_HOST);
+  ETH1.begin(ETH1_PHY_TYPE, ETH1_PHY_ADDR, ETH1_PHY_CS, ETH1_PHY_IRQ, ETH1_PHY_RST, ETH_PHY_SPI_HOST);
 #endif
 }