Merge branch 'master' into power-management

Author: tshcherban

.github/ISSUE_TEMPLATE/Issue-report.yml

@@ -41,6 +41,7 @@ body:
       options:
         - latest master (checkout manually)
         - latest development Release Candidate (RC-X)
+        - v3.0.4
         - v3.0.3
         - v3.0.2
         - v3.0.1

.github/scripts/on-release.sh

@@ -421,7 +421,54 @@ if [ "$RELEASE_PRE" == "false" ]; then
     fi
 fi
 
-# Upload package JSONs (temporary halted to fix json generation)
+# Test the package JSONs
+
+echo "Installing arduino-cli ..."
+export PATH="/home/runner/bin:$PATH"
+source ./.github/scripts/install-arduino-cli.sh
+
+echo "Testing $PACKAGE_JSON_DEV install ..."
+echo "Updating index ..."
+arduino-cli core update-index --additional-urls "file://$OUTPUT_DIR/$PACKAGE_JSON_DEV"
+if [ $? -ne 0 ]; then echo "ERROR: Failed to update index ($?)"; exit 1; fi
+
+echo "Installing esp32 ..."
+arduino-cli core install esp32:esp32
+if [ $? -ne 0 ]; then echo "ERROR: Failed to install esp32 ($?)"; exit 1; fi
+
+echo "Compiling example ..."
+arduino-cli compile --fqbn esp32:esp32:esp32 $GITHUB_WORKSPACE/libraries/ESP32/examples/CI/CIBoardsTest/CIBoardsTest.ino
+if [ $? -ne 0 ]; then echo "ERROR: Failed to compile example ($?)"; exit 1; fi
+
+echo "Uninstalling esp32 ..."
+arduino-cli core uninstall esp32:esp32
+if [ $? -ne 0 ]; then echo "ERROR: Failed to uninstall esp32 ($?)"; exit 1; fi
+
+echo "Test successful!"
+
+if [ "$RELEASE_PRE" == "false" ]; then
+    echo "Testing $PACKAGE_JSON_REL install ..."
+    echo "Updating index ..."
+    arduino-cli core update-index --additional-urls "file://$OUTPUT_DIR/$PACKAGE_JSON_REL"
+    if [ $? -ne 0 ]; then echo "ERROR: Failed to update index ($?)"; exit 1; fi
+
+    echo "Installing esp32 ..."
+    arduino-cli core install esp32:esp32
+    if [ $? -ne 0 ]; then echo "ERROR: Failed to install esp32 ($?)"; exit 1; fi
+
+    echo "Compiling example ..."
+    arduino-cli compile --fqbn esp32:esp32:esp32 $GITHUB_WORKSPACE/libraries/ESP32/examples/CI/CIBoardsTest/CIBoardsTest.ino
+    if [ $? -ne 0 ]; then echo "ERROR: Failed to compile example ($?)"; exit 1; fi
+
+    echo "Uninstalling esp32 ..."
+    arduino-cli core uninstall esp32:esp32
+    if [ $? -ne 0 ]; then echo "ERROR: Failed to uninstall esp32 ($?)"; exit 1; fi
+
+    echo "Test successful!"
+fi
+
+# Upload package JSONs
+
 echo "Uploading $PACKAGE_JSON_DEV ..."
 echo "Download URL: "`git_safe_upload_asset "$OUTPUT_DIR/$PACKAGE_JSON_DEV"`
 echo "Pages URL: "`git_safe_upload_to_pages "$PACKAGE_JSON_DEV" "$OUTPUT_DIR/$PACKAGE_JSON_DEV"`

.github/workflows/release.yml

@@ -17,6 +17,7 @@ jobs:
       with:
         python-version: '3.x'
     - run: pip install packaging
+    - run: pip install pyserial
     - name: Build Release
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

boards.txt

@@ -895,7 +895,8 @@ int log_printfv(const char *format, va_list arg) {
     }
 #endif
 */
-#if CONFIG_IDF_TARGET_ESP32C3 || ((CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C6) && ARDUINO_USB_CDC_ON_BOOT)
+#if (ARDUINO_USB_CDC_ON_BOOT == 1 && ARDUINO_USB_MODE == 0) || CONFIG_IDF_TARGET_ESP32C3 \
+  || ((CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C6) && ARDUINO_USB_CDC_ON_BOOT == 1)
   vsnprintf(temp, len + 1, format, arg);
   ets_printf("%s", temp);
 #else

cores/esp32/esp32-hal-uart.c

@@ -23,7 +23,7 @@ extern "C" {
 /** Minor version number (x.X.x) */
 #define ESP_ARDUINO_VERSION_MINOR 0
 /** Patch version number (x.x.X) */
-#define ESP_ARDUINO_VERSION_PATCH 3
+#define ESP_ARDUINO_VERSION_PATCH 4
 
 /**
  * Macro to convert ARDUINO version number into an integer

cores/esp32/esp_arduino_version.h

@@ -21,7 +21,7 @@ ADC OneShot mode
 
 
 The ADC OneShot mode API is fully compatible with Arduino's ``analogRead`` function.
-When you call the ``analogRead`` or ``analogReadMillivolts`` function, it returns the result of a single conversion on the requested pin.
+When you call the ``analogRead`` or ``analogReadMilliVolts`` function, it returns the result of a single conversion on the requested pin.
 
 analogRead
 ^^^^^^^^^^
@@ -36,7 +36,7 @@ This function is used to get the ADC raw value for a given pin/ADC channel.
 
 This function will return analog raw value (non-calibrated).
 
-analogReadMillivolts
+analogReadMilliVolts
 ^^^^^^^^^^^^^^^^^^^^
 
 This function is used to get ADC raw value for a given pin/ADC channel and convert it to calibrated result in millivolts.

docs/en/api/adc.rst

@@ -62,12 +62,12 @@ Preferences directly supports the following data types:
    +-------------------+-------------------+---------------+
    | ULong             | uint32_t          | 4             |
    +-------------------+-------------------+---------------+
+   | Float             | float_t           | 4             |
+   +-------------------+-------------------+---------------+
    | Long64            | int64_t           | 8             |
    +-------------------+-------------------+---------------+
    | ULong64           | uint64_t          | 8             |
    +-------------------+-------------------+---------------+
-   | Float             | float_t           | 8             |
-   +-------------------+-------------------+---------------+
    | Double            | double_t          | 8             |
    +-------------------+-------------------+---------------+
    |                   | const char*       | variable      |
@@ -258,6 +258,8 @@ Arduino-esp32 Preferences API
 ``putInt, putUInt``
 ********************
 ``putLong, putULong``
+**********************
+``putFloat``
 **********************
 
    Store a value against a given key in the currently open namespace.
@@ -268,6 +270,7 @@ Arduino-esp32 Preferences API
        size_t putUInt(const char* key, uint32_t value)
        size_t putLong(const char* key, int32_t value)
        size_t putULong(const char* key, uint32_t value)
+       size_t putFloat(const char* key, float_t value)
 
    ..
 
@@ -288,16 +291,15 @@ Arduino-esp32 Preferences API
 
 ``putLong64, putULong64``
 *************************
-``putFloat, putDouble``
-***********************
+``putDouble``
+*************************
 
    Store a value against a given key in the currently open namespace.
 
    .. code-block:: arduino
 
        size_t putLong64(const char* key, int64_t value)
        size_t putULong64(const char* key, uint64_t value)
-       size_t putFloat(const char* key, float_t value)
        size_t putDouble(const char* key, double_t value)
 
    ..

docs/en/api/preferences.rst

@@ -70,16 +70,16 @@ Preferences directly supports the following data types:
    +-------------------+-------------------+---------------+
    | ULong             | uint32_t          | 4             |
    +-------------------+-------------------+---------------+
+   | Float             | float_t           | 4             |
+   +-------------------+-------------------+---------------+
    | Long64            | int64_t           | 8             |
    +-------------------+-------------------+---------------+
    | ULong64           | uint64_t          | 8             |
    +-------------------+-------------------+---------------+
-   | Float             | float_t           | 8             |
-   +-------------------+-------------------+---------------+
    | Double            | double_t          | 8             |
    +-------------------+-------------------+---------------+
-   |                   | const char*       |               |
-   | String            +-------------------+ variable      |
+   |                   | const char*       | variable      |
+   | String            +-------------------+               |
    |                   | String            |               |
    +-------------------+-------------------+---------------+
    | Bytes             | uint8_t           | variable      |
@@ -233,9 +233,9 @@ Like so:
 
 .. code-block:: arduino
 
-   float myFloat = myPreferences.getFloat("pi");
+   float_t myFloat = myPreferences.getFloat("pi");
 
-This will retrieve the float value from the namespace key ``"pi"`` and assign it to the float type variable ``myFloat``.
+This will retrieve the float_t value from the namespace key ``"pi"`` and assign it to the float_t type variable ``myFloat``.
 
 
 Summary

docs/en/tutorials/preferences.rst

@@ -1,5 +1,5 @@
 name=ArduinoOTA
-version=3.0.3
+version=3.0.4
 author=Ivan Grokhotkov and Hristo Gochkov
 maintainer=Hristo Gochkov <[email protected]>
 sentence=Enables Over The Air upgrades, via wifi and espota.py UDP request/TCP download.

libraries/ArduinoOTA/library.properties

@@ -1,5 +1,5 @@
 name=ESP32 Async UDP
-version=3.0.3
+version=3.0.4
 author=Me-No-Dev
 maintainer=Me-No-Dev
 sentence=Async UDP Library for ESP32

libraries/AsyncUDP/library.properties

@@ -1,5 +1,5 @@
 name=BLE
-version=3.0.3
+version=3.0.4
 author=Neil Kolban <[email protected]>
 maintainer=Dariusz Krempa <[email protected]>
 sentence=BLE functions for ESP32

libraries/BLE/library.properties

@@ -1,5 +1,5 @@
 name=BluetoothSerial
-version=3.0.3
+version=3.0.4
 author=Evandro Copercini
 maintainer=Evandro Copercini
 sentence=Simple UART to Classical Bluetooth bridge for ESP32

libraries/BluetoothSerial/library.properties

@@ -1,5 +1,5 @@
 name=DNSServer
-version=3.0.3
+version=3.0.4
 author=Kristijan Novoselić
 maintainer=Kristijan Novoselić, <[email protected]>
 sentence=A simple DNS server for ESP32.

libraries/DNSServer/library.properties

@@ -1,5 +1,5 @@
 name=EEPROM
-version=3.0.3
+version=3.0.4
 author=Ivan Grokhotkov
 maintainer=Paolo Becchi <[email protected]>
 sentence=Enables reading and writing data a sequential, addressable FLASH storage

libraries/EEPROM/library.properties

@@ -1,5 +1,5 @@
 name=ESP32
-version=3.0.3
+version=3.0.4
 author=Hristo Gochkov, Ivan Grokhtkov
 maintainer=Hristo Gochkov <[email protected]>
 sentence=ESP32 sketches examples

libraries/ESP32/library.properties

@@ -1,5 +1,5 @@
 name=ESP_I2S
-version=3.0.3
+version=3.0.4
 author=me-no-dev
 maintainer=me-no-dev
 sentence=Library for ESP I2S communication

libraries/ESP_I2S/library.properties

@@ -1,5 +1,5 @@
 name=ESP_NOW
-version=3.0.3
+version=3.0.4
 author=me-no-dev
 maintainer=P-R-O-C-H-Y
 sentence=Library for ESP_NOW

libraries/ESP_NOW/library.properties

@@ -190,13 +190,19 @@ bool ESP_NOW_Class::end() {
   if (!_esp_now_has_begun) {
     return true;
   }
-  //remove all peers?
+  //remove all peers
+  for (uint8_t i = 0; i < ESP_NOW_MAX_TOTAL_PEER_NUM; i++) {
+    if (_esp_now_peers[i] != NULL) {
+      removePeer(*_esp_now_peers[i]);
+    }
+  }
   esp_err_t err = esp_now_deinit();
   if (err != ESP_OK) {
     log_e("esp_now_deinit failed! 0x%x", err);
     return false;
   }
   _esp_now_has_begun = false;
+  //clear the peer list
   memset(_esp_now_peers, 0, sizeof(ESP_NOW_Peer *) * ESP_NOW_MAX_TOTAL_PEER_NUM);
   return true;
 }
@@ -262,6 +268,10 @@ void ESP_NOW_Class::onNewPeer(void (*cb)(const esp_now_recv_info_t *info, const
   new_arg = arg;
 }
 
+bool ESP_NOW_Class::removePeer(ESP_NOW_Peer &peer) {
+  return peer.remove();
+}
+
 ESP_NOW_Class ESP_NOW;
 
 /*

libraries/ESP_NOW/src/ESP32_NOW.cpp

@@ -6,6 +6,31 @@
 #include "esp32-hal-log.h"
 #include "esp_mac.h"
 
+class ESP_NOW_Peer;  //forward declaration for friend function
+
+class ESP_NOW_Class : public Print {
+public:
+  const uint8_t BROADCAST_ADDR[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+
+  ESP_NOW_Class();
+  ~ESP_NOW_Class();
+
+  bool begin(const uint8_t *pmk = NULL /* 16 bytes */);
+  bool end();
+
+  int getTotalPeerCount();
+  int getEncryptedPeerCount();
+
+  int availableForWrite();
+  size_t write(const uint8_t *data, size_t len);
+  size_t write(uint8_t data) {
+    return write(&data, 1);
+  }
+
+  void onNewPeer(void (*cb)(const esp_now_recv_info_t *info, const uint8_t *data, int len, void *arg), void *arg);
+  bool removePeer(ESP_NOW_Peer &peer);
+};
+
 class ESP_NOW_Peer {
 private:
   uint8_t mac[6];
@@ -47,28 +72,8 @@ class ESP_NOW_Peer {
   virtual void onSent(bool success) {
     log_i("Message transmission to peer " MACSTR " %s", MAC2STR(mac), success ? "successful" : "failed");
   }
-};
-
-class ESP_NOW_Class : public Print {
-public:
-  const uint8_t BROADCAST_ADDR[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-
-  ESP_NOW_Class();
-  ~ESP_NOW_Class();
-
-  bool begin(const uint8_t *pmk = NULL /* 16 bytes */);
-  bool end();
-
-  int getTotalPeerCount();
-  int getEncryptedPeerCount();
-
-  int availableForWrite();
-  size_t write(const uint8_t *data, size_t len);
-  size_t write(uint8_t data) {
-    return write(&data, 1);
-  }
 
-  void onNewPeer(void (*cb)(const esp_now_recv_info_t *info, const uint8_t *data, int len, void *arg), void *arg);
+  friend bool ESP_NOW_Class::removePeer(ESP_NOW_Peer &);
 };
 
 extern ESP_NOW_Class ESP_NOW;

libraries/ESP_NOW/src/ESP32_NOW.h

@@ -1,5 +1,5 @@
 name=ESP_SR
-version=3.0.3
+version=3.0.4
 author=me-no-dev
 maintainer=me-no-dev
 sentence=Library for ESP Sound Recognition

libraries/ESP_SR/library.properties

@@ -1,5 +1,5 @@
 name=ESPmDNS
-version=3.0.3
+version=3.0.4
 author=Hristo Gochkov, Ivan Grokhtkov
 maintainer=Hristo Gochkov <[email protected]>
 sentence=ESP32 mDNS Library