Merge remote-tracking branch 'espressif/master' into release/v3.0.x

Author: lucasssvaz

Diff for: .github/scripts/tests_run.sh

@@ -125,6 +125,8 @@ function run_test() {
             extra_args="--embedded-services esp,arduino"
         fi
 
+        rm $sketchdir/diagram.json 2>/dev/null || true
+
         result=0
         printf "\033[95mpytest tests --build-dir $build_dir -k test_$sketchname --junit-xml=$report_file $extra_args\033[0m\n"
         bash -c "set +e; pytest tests --build-dir $build_dir -k test_$sketchname --junit-xml=$report_file $extra_args; exit \$?" || result=$?

Diff for: boards.txt

@@ -1,5 +1,5 @@
 /*
-   Simple BLE5 multi advertising example on esp32 C3/S3
+   Simple BLE5 periodic advertising example on esp32 C3/S3
    only ESP_BLE_GAP_SET_EXT_ADV_PROP_NONCONN_NONSCANNABLE_UNDIRECTED can be used for periodic advertising
 
    author: chegewara

Diff for: libraries/BLE/examples/BLE5_periodic_advertising/BLE5_periodic_advertising.ino

@@ -377,6 +377,10 @@ def load_tools_list(filename, platform):
     tools_info = json.load(open(filename))["packages"][0]["tools"]
     tools_to_download = []
     for t in tools_info:
+        if platform == "x86_64-mingw32":
+            if "i686-mingw32" not in [p["host"] for p in t["systems"]]:
+                raise Exception("Windows x64 requires both i686-mingw32 and x86_64-mingw32 tools")
+
         tool_platform = [p for p in t["systems"] if p["host"] == platform]
         if len(tool_platform) == 0:
             # Fallback to x86 on Apple ARM
@@ -390,6 +394,8 @@ def load_tools_list(filename, platform):
                 if len(tool_platform) == 0:
                     continue
             else:
+                if verbose:
+                    print(f"Tool {t['name']} is not available for platform {platform}")
                 continue
         tools_to_download.append(tool_platform[0])
     return tools_to_download
@@ -441,6 +447,12 @@ def identify_platform():
     force_all = args.force_all
     is_test = args.test
 
+    # Set current directory to the script location
+    if getattr(sys, "frozen", False):
+        os.chdir(os.path.dirname(sys.executable))
+    else:
+        os.chdir(os.path.dirname(os.path.abspath(__file__)))
+
     if is_test and (force_download or force_extract or force_all):
         print("Cannot combine test (-t) and forced execution (-d | -e | -f)")
         parser.print_help(sys.stderr)

Diff for: tools/get.py

@@ -0,0 +1,49 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+#include "soc/soc_caps.h"
+
+// BN: ESP32 Family Device
+#define USB_VID 0x303a
+#define USB_PID 0x824A
+
+#define USB_MANUFACTURER "Waveshare"
+#define USB_PRODUCT      "ESP32-S3-Touch-AMOLED-1.43"
+#define USB_SERIAL       ""
+
+// display QSPI SPI2
+#define QSPI_CS       9
+#define QSPI_SCK      10
+#define QSPI_D0       11
+#define QSPI_D1       12
+#define QSPI_D2       13
+#define QSPI_D3       14
+#define AMOLED_RESET  21
+#define AMOLED_TE     -1
+#define AMOLED_PWR_EN -1
+// Touch I2C
+#define TP_SCL 48
+#define TP_SDA 47
+#define TP_RST -1
+#define TP_INT -1
+
+// RTC
+#define RTC_INT 15
+// Partial voltage measurement method
+#define BAT_ADC 4
+// Onboard  QMI8658 IMU
+#define QMI_INT1 8
+
+static const uint8_t SDA = 47;
+static const uint8_t SCL = 48;
+// UART0 pins
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+//esp32s3-PSFlash   SPI1/SPI0
+static const uint8_t SS = 34;    // FSPICS0
+static const uint8_t MOSI = 35;  // FSPID
+static const uint8_t MISO = 37;  // FSPIQ
+static const uint8_t SCK = 36;   // FSPICLK
+#endif                           /* Pins_Arduino_h */

Diff for: variants/waveshare_esp32_s3_touch_amoled_143/pins_arduino.h

@@ -0,0 +1,55 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+#include "soc/soc_caps.h"
+
+// BN: ESP32 Family Device
+#define USB_VID 0x303a
+#define USB_PID 0x8249
+
+#define USB_MANUFACTURER "Waveshare"
+#define USB_PRODUCT      "ESP32-S3-Touch-AMOLED-1.64"
+#define USB_SERIAL       ""
+
+// display QSPI SPI2
+#define QSPI_CS       9
+#define QSPI_SCK      10
+#define QSPI_D0       11
+#define QSPI_D1       12
+#define QSPI_D2       13
+#define QSPI_D3       14
+#define AMOLED_RESET  21
+#define AMOLED_TE     -1
+#define AMOLED_PWR_EN -1
+
+// Touch I2C
+#define TP_SCL 48
+#define TP_SDA 47
+#define TP_RST -1
+#define TP_INT -1
+
+//key
+#define KEY_0 0
+//ADC
+#define BAT_ADC 4
+
+//SD_CARD
+#define SD_CS   38
+#define SD_MOSI 39
+#define SD_MISO 40
+#define SD_SCLK 41
+
+static const uint8_t SDA = 47;
+static const uint8_t SCL = 48;
+
+// UART0 pins
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+//esp32s3-PSFlash   SPI1/SPI0
+static const uint8_t SS = 34;    // FSPICS0
+static const uint8_t MOSI = 35;  // FSPID
+static const uint8_t MISO = 37;  // FSPIQ
+static const uint8_t SCK = 36;   // FSPICLK
+#endif                           /* Pins_Arduino_h */

Diff for: variants/waveshare_esp32_s3_touch_amoled_164/pins_arduino.h

@@ -0,0 +1,57 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+#include "soc/soc_caps.h"
+
+// BN: ESP32 Family Device
+#define USB_VID 0x303a
+#define USB_PID 0x824B
+
+#define USB_MANUFACTURER "Waveshare"
+#define USB_PRODUCT      "ESP32-S3-Touch-AMOLED-1.91"
+#define USB_SERIAL       ""
+
+// display QSPI SPI2
+#define QSPI_CS       6
+#define QSPI_SCK      47
+#define QSPI_D0       18
+#define QSPI_D1       7
+#define QSPI_D2       48
+#define QSPI_D3       5
+#define AMOLED_RESET  17
+#define AMOLED_TE     -1
+#define AMOLED_PWR_EN -1
+// Touch I2C
+#define TP_SCL 39
+#define TP_SDA 40
+#define TP_RST -1
+#define TP_INT -1
+
+// Partial voltage measurement method
+#define BAT_ADC 1
+// Onboard  QMI8658 IMU
+#define QMI_INT1 45
+#define QMI_INT1 46
+
+//SD
+#define SD_CS   9
+#define SD_MISO 8
+#define SD_MOSI 42
+#define SD_CLK  47
+
+//i2c
+
+static const uint8_t SDA = 40;
+static const uint8_t SCL = 39;
+
+// UART0 pins
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+//esp32s3-PSFlash   SPI1/SPI0
+static const uint8_t SS = 34;    // FSPICS0
+static const uint8_t MOSI = 35;  // FSPID
+static const uint8_t MISO = 37;  // FSPIQ
+static const uint8_t SCK = 36;   // FSPICLK
+#endif                           /* Pins_Arduino_h */