Merge branch 'master' into brent/autosportLabs-esp32-can-x2_board_support

brentpicasso · web-flow · commit 6f27cc43d20c · 2024-05-27T20:31:45.000-07:00
diff --git a/.github/ISSUE_TEMPLATE/Issue-report.yml b/.github/ISSUE_TEMPLATE/Issue-report.yml
@@ -41,6 +41,10 @@ body:
       options:
         - latest master (checkout manually)
         - latest development Release Candidate (RC-X)
+        - v3.0.0
+        - v2.0.17
+        - v2.0.16
+        - v2.0.15
         - v2.0.14
         - v2.0.13
         - v2.0.12
diff --git a/.github/scripts/merge_packages.py b/.github/scripts/merge_packages.py
@@ -5,7 +5,8 @@
 # Written by Ivan Grokhotkov, 2015
 #
 from __future__ import print_function
-from distutils.version import LooseVersion
+#from distutils.version import LooseVersion
+from packaging.version import Version
 import re
 import json
 import sys
@@ -33,7 +34,7 @@ def merge_objects(versions, obj):
 def pkgVersionNormalized(versionString):
 
     verStr = str(versionString)
-    verParts = re.split('\.|-rc', verStr, flags=re.IGNORECASE)
+    verParts = re.split('\.|-rc|-alpha', verStr, flags=re.IGNORECASE)
     
     if len(verParts) == 3:
         if (sys.version_info > (3, 0)): # Python 3
@@ -74,7 +75,8 @@ def main(args):
             print("Adding platform {0}-{1}".format(name, version), file=sys.stderr)
             pkg1['platforms'].append(platforms[name][version])
                 
-    pkg1['platforms'] = sorted(pkg1['platforms'], key=lambda k: LooseVersion(pkgVersionNormalized(k['version'])), reverse=True)
+    #pkg1['platforms'] = sorted(pkg1['platforms'], key=lambda k: LooseVersion(pkgVersionNormalized(k['version'])), reverse=True)
+    pkg1['platforms'] = sorted(pkg1['platforms'], key=lambda k: Version(pkgVersionNormalized(k['version'])), reverse=True)
 
     json.dump({'packages':[pkg1]}, sys.stdout, indent=2)
 
diff --git a/.github/scripts/tests_run.sh b/.github/scripts/tests_run.sh
@@ -7,6 +7,7 @@ function run_test() {
     local erase_flash=$4
     local sketchdir=$(dirname $sketch)
     local sketchname=$(basename $sketchdir)
+    local result=0
 
     if [[ -f "$sketchdir/.skip.$platform" ]] || [[ -f "$sketchdir/.skip.$target" ]] || [[ -f "$sketchdir/.skip.$platform.$target" ]]; then
       echo "Skipping $sketchname test for $target, platform: $platform"
@@ -61,11 +62,18 @@ function run_test() {
             extra_args="--embedded-services esp,arduino"
         fi
 
+        result=0
         echo "pytest tests --build-dir $build_dir -k test_$sketchname --junit-xml=$report_file $extra_args"
-        bash -c "pytest tests --build-dir $build_dir -k test_$sketchname --junit-xml=$report_file $extra_args"
+        bash -c "set +e; pytest tests --build-dir $build_dir -k test_$sketchname --junit-xml=$report_file $extra_args; exit \$?" || result=$?
         result=$?
         if [ $result -ne 0 ]; then
-            return $result
+            result=0
+            echo "Retrying test: $sketchname -- Config: $i"
+            bash -c "set +e; pytest tests --build-dir $build_dir -k test_$sketchname --junit-xml=$report_file $extra_args; exit \$?" || result=$?
+            result=$?
+            if [ $result -ne 0 ]; then
+              exit $result
+            fi
         fi
     done
 }
diff --git a/.github/workflows/hil.yml b/.github/workflows/hil.yml
@@ -59,6 +59,12 @@ jobs:
           echo "test_folder=${test_folder}" >> $GITHUB_OUTPUT
           echo "test_type=${test_type}" >> $GITHUB_OUTPUT
 
+      - name: Upload Event file
+        uses: actions/upload-artifact@v4
+        with:
+          name: event_file
+          path: ${{github.event_path}}
+
   build:
     needs: gen_chunks
     name: ${{matrix.chip}}-Build#${{matrix.chunks}}
@@ -267,13 +273,3 @@ jobs:
           path: |
             tests/**/*.xml
             tests/**/result_*.json
-
-  event_file:
-    name: "Event File"
-    runs-on: ubuntu-latest
-    steps:
-       - name: Upload
-         uses: actions/upload-artifact@v4
-         with:
-           name: event_file
-           path: ${{github.event_path}}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,6 +16,7 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: '3.x'
+    - run: pip install packaging
     - name: Build Release
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/wokwi.yml b/.github/workflows/wokwi.yml
@@ -95,6 +95,9 @@ jobs:
       - name: Install Wokwi CLI
         run: curl -L https://wokwi.com/ci/install.sh | sh
 
+      - name: Wokwi CI Server
+        uses: wokwi/wokwi-ci-server-action@v1
+
       - name: Install dependencies
         run: |
           pip install -U pip
diff --git a/Kconfig.projbuild b/Kconfig.projbuild
@@ -311,8 +311,8 @@ config ARDUINO_SELECTIVE_FFat
     depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_FS
     default y
 
-config ARDUINO_SELECTIVE_LITTLEFS
-    bool "Enable LITTLEFS"
+config ARDUINO_SELECTIVE_LittleFS
+    bool "Enable LittleFS"
     depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_FS
     default y
 
diff --git a/README.md b/README.md
@@ -57,8 +57,8 @@ Here are the ESP32 series supported by the Arduino-ESP32 project:
 | ESP32-S2 |     Yes    |       Yes       | [ESP32-S2](https://www.espressif.com/sites/default/files/documentation/esp32-s2_datasheet_en.pdf) |
 | ESP32-C3 |     Yes    |       Yes       | [ESP32-C3](https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf) |
 | ESP32-S3 |     Yes    |       Yes       | [ESP32-S3](https://www.espressif.com/sites/default/files/documentation/esp32-s3_datasheet_en.pdf) |
-| ESP32-C6 |     No     |       Yes       | [ESP32-C6](https://www.espressif.com/sites/default/files/documentation/esp32-c6_datasheet_en.pdf) |
-| ESP32-H2 |     No     |       Yes       | [ESP32-H2](https://www.espressif.com/sites/default/files/documentation/esp32-h2_datasheet_en.pdf) |
+| ESP32-C6 |     Yes    |       Yes       | [ESP32-C6](https://www.espressif.com/sites/default/files/documentation/esp32-c6_datasheet_en.pdf) |
+| ESP32-H2 |     Yes    |       Yes       | [ESP32-H2](https://www.espressif.com/sites/default/files/documentation/esp32-h2_datasheet_en.pdf) |
 
 > [!NOTE]
 > ESP32-C2 is also supported by Arduino-ESP32 but requires rebuilding the static libraries. This is not trivial and requires a good understanding of the ESP-IDF
diff --git a/boards.txt b/boards.txt
@@ -19365,7 +19365,7 @@ m5stack_unit_cams3.build.partitions=default
 m5stack_unit_cams3.build.defines=
 m5stack_unit_cams3.build.loop_core=
 m5stack_unit_cams3.build.event_core=
-m5stack_unit_cams3.build.psram_type=qspi
+m5stack_unit_cams3.build.psram_type=opi
 m5stack_unit_cams3.build.memory_type={build.boot}_{build.psram_type}
 
 ## IDE 2.0 Seems to not update the value
@@ -19381,15 +19381,12 @@ m5stack_unit_cams3.menu.JTAGAdapter.bridge=ESP USB Bridge
 m5stack_unit_cams3.menu.JTAGAdapter.bridge.build.openocdscript=esp32s3-bridge.cfg
 m5stack_unit_cams3.menu.JTAGAdapter.bridge.build.copy_jtag_files=1
 
-m5stack_unit_cams3.menu.PSRAM.enabled=QSPI PSRAM
-m5stack_unit_cams3.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
-m5stack_unit_cams3.menu.PSRAM.enabled.build.psram_type=qspi
-m5stack_unit_cams3.menu.PSRAM.disabled=Disabled
-m5stack_unit_cams3.menu.PSRAM.disabled.build.defines=
-m5stack_unit_cams3.menu.PSRAM.disabled.build.psram_type=qspi
 m5stack_unit_cams3.menu.PSRAM.opi=OPI PSRAM
 m5stack_unit_cams3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
 m5stack_unit_cams3.menu.PSRAM.opi.build.psram_type=opi
+m5stack_unit_cams3.menu.PSRAM.disabled=Disabled
+m5stack_unit_cams3.menu.PSRAM.disabled.build.defines=
+m5stack_unit_cams3.menu.PSRAM.disabled.build.psram_type=qspi
 
 m5stack_unit_cams3.menu.FlashMode.qio=QIO 80MHz
 m5stack_unit_cams3.menu.FlashMode.qio.build.flash_mode=dio
diff --git a/cores/esp32/esp32-hal-adc.c b/cores/esp32/esp32-hal-adc.c
@@ -440,7 +440,7 @@ esp_err_t __analogContinuousInit(adc_channel_t *channel, uint8_t channel_num, ad
   dig_cfg.pattern_num = channel_num;
   for (int i = 0; i < channel_num; i++) {
     adc_pattern[i].atten = __adcContinuousAtten;
-    adc_pattern[i].channel = channel[i] & 0x7;
+    adc_pattern[i].channel = channel[i];
     adc_pattern[i].unit = ADC_UNIT_1;
     adc_pattern[i].bit_width = __adcContinuousWidth;
   }
diff --git a/cores/esp32/esp32-hal-log.h b/cores/esp32/esp32-hal-log.h
@@ -80,6 +80,12 @@ extern "C" {
 #define ARDUHAL_LOG_COLOR_PRINT_END
 #endif
 
+#ifdef USE_ESP_IDF_LOG
+#ifndef ARDUHAL_ESP_LOG_TAG
+#define ARDUHAL_ESP_LOG_TAG "ARDUINO"
+#endif
+#endif
+
 const char *pathToFileName(const char *path);
 int log_printf(const char *fmt, ...);
 void log_print_buf(const uint8_t *b, size_t len);
@@ -102,17 +108,17 @@ void log_print_buf(const uint8_t *b, size_t len);
     ARDUHAL_LOG_COLOR_PRINT_END; \
   } while (0)
 #else
-#define log_v(format, ...)                                            \
-  do {                                                                \
-    ESP_LOG_LEVEL_LOCAL(ESP_LOG_VERBOSE, TAG, format, ##__VA_ARGS__); \
+#define log_v(format, ...)                                                            \
+  do {                                                                                \
+    ESP_LOG_LEVEL_LOCAL(ESP_LOG_VERBOSE, ARDUHAL_ESP_LOG_TAG, format, ##__VA_ARGS__); \
   } while (0)
-#define isr_log_v(format, ...)                                                  \
-  do {                                                                          \
-    ets_printf(LOG_FORMAT(V, format), esp_log_timestamp(), TAG, ##__VA_ARGS__); \
+#define isr_log_v(format, ...)                                                                  \
+  do {                                                                                          \
+    ets_printf(LOG_FORMAT(V, format), esp_log_timestamp(), ARDUHAL_ESP_LOG_TAG, ##__VA_ARGS__); \
   } while (0)
-#define log_buf_v(b, l)                                 \
-  do {                                                  \
-    ESP_LOG_BUFFER_HEXDUMP(TAG, b, l, ESP_LOG_VERBOSE); \
+#define log_buf_v(b, l)                                                 \
+  do {                                                                  \
+    ESP_LOG_BUFFER_HEXDUMP(ARDUHAL_ESP_LOG_TAG, b, l, ESP_LOG_VERBOSE); \
   } while (0)
 #endif
 #else
@@ -138,17 +144,17 @@ void log_print_buf(const uint8_t *b, size_t len);
     ARDUHAL_LOG_COLOR_PRINT_END; \
   } while (0)
 #else
-#define log_d(format, ...)                                          \
-  do {                                                              \
-    ESP_LOG_LEVEL_LOCAL(ESP_LOG_DEBUG, TAG, format, ##__VA_ARGS__); \
+#define log_d(format, ...)                                                          \
+  do {                                                                              \
+    ESP_LOG_LEVEL_LOCAL(ESP_LOG_DEBUG, ARDUHAL_ESP_LOG_TAG, format, ##__VA_ARGS__); \
   } while (0)
-#define isr_log_d(format, ...)                                                  \
-  do {                                                                          \
-    ets_printf(LOG_FORMAT(D, format), esp_log_timestamp(), TAG, ##__VA_ARGS__); \
+#define isr_log_d(format, ...)                                                                  \
+  do {                                                                                          \
+    ets_printf(LOG_FORMAT(D, format), esp_log_timestamp(), ARDUHAL_ESP_LOG_TAG, ##__VA_ARGS__); \
   } while (0)
-#define log_buf_d(b, l)                               \
-  do {                                                \
-    ESP_LOG_BUFFER_HEXDUMP(TAG, b, l, ESP_LOG_DEBUG); \
+#define log_buf_d(b, l)                                               \
+  do {                                                                \
+    ESP_LOG_BUFFER_HEXDUMP(ARDUHAL_ESP_LOG_TAG, b, l, ESP_LOG_DEBUG); \
   } while (0)
 #endif
 #else
@@ -174,17 +180,17 @@ void log_print_buf(const uint8_t *b, size_t len);
     ARDUHAL_LOG_COLOR_PRINT_END; \
   } while (0)
 #else
-#define log_i(format, ...)                                         \
-  do {                                                             \
-    ESP_LOG_LEVEL_LOCAL(ESP_LOG_INFO, TAG, format, ##__VA_ARGS__); \
+#define log_i(format, ...)                                                         \
+  do {                                                                             \
+    ESP_LOG_LEVEL_LOCAL(ESP_LOG_INFO, ARDUHAL_ESP_LOG_TAG, format, ##__VA_ARGS__); \
   } while (0)
-#define isr_log_i(format, ...)                                                  \
-  do {                                                                          \
-    ets_printf(LOG_FORMAT(I, format), esp_log_timestamp(), TAG, ##__VA_ARGS__); \
+#define isr_log_i(format, ...)                                                                  \
+  do {                                                                                          \
+    ets_printf(LOG_FORMAT(I, format), esp_log_timestamp(), ARDUHAL_ESP_LOG_TAG, ##__VA_ARGS__); \
   } while (0)
-#define log_buf_i(b, l)                              \
-  do {                                               \
-    ESP_LOG_BUFFER_HEXDUMP(TAG, b, l, ESP_LOG_INFO); \
+#define log_buf_i(b, l)                                              \
+  do {                                                               \
+    ESP_LOG_BUFFER_HEXDUMP(ARDUHAL_ESP_LOG_TAG, b, l, ESP_LOG_INFO); \
   } while (0)
 #endif
 #else
@@ -210,17 +216,17 @@ void log_print_buf(const uint8_t *b, size_t len);
     ARDUHAL_LOG_COLOR_PRINT_END; \
   } while (0)
 #else
-#define log_w(format, ...)                                         \
-  do {                                                             \
-    ESP_LOG_LEVEL_LOCAL(ESP_LOG_WARN, TAG, format, ##__VA_ARGS__); \
+#define log_w(format, ...)                                                         \
+  do {                                                                             \
+    ESP_LOG_LEVEL_LOCAL(ESP_LOG_WARN, ARDUHAL_ESP_LOG_TAG, format, ##__VA_ARGS__); \
   } while (0)
-#define isr_log_w(format, ...)                                                  \
-  do {                                                                          \
-    ets_printf(LOG_FORMAT(W, format), esp_log_timestamp(), TAG, ##__VA_ARGS__); \
+#define isr_log_w(format, ...)                                                                  \
+  do {                                                                                          \
+    ets_printf(LOG_FORMAT(W, format), esp_log_timestamp(), ARDUHAL_ESP_LOG_TAG, ##__VA_ARGS__); \
   } while (0)
-#define log_buf_w(b, l)                              \
-  do {                                               \
-    ESP_LOG_BUFFER_HEXDUMP(TAG, b, l, ESP_LOG_WARN); \
+#define log_buf_w(b, l)                                              \
+  do {                                                               \
+    ESP_LOG_BUFFER_HEXDUMP(ARDUHAL_ESP_LOG_TAG, b, l, ESP_LOG_WARN); \
   } while (0)
 #endif
 #else
@@ -246,17 +252,17 @@ void log_print_buf(const uint8_t *b, size_t len);
     ARDUHAL_LOG_COLOR_PRINT_END; \
   } while (0)
 #else
-#define log_e(format, ...)                                          \
-  do {                                                              \
-    ESP_LOG_LEVEL_LOCAL(ESP_LOG_ERROR, TAG, format, ##__VA_ARGS__); \
+#define log_e(format, ...)                                                          \
+  do {                                                                              \
+    ESP_LOG_LEVEL_LOCAL(ESP_LOG_ERROR, ARDUHAL_ESP_LOG_TAG, format, ##__VA_ARGS__); \
   } while (0)
-#define isr_log_e(format, ...)                                                  \
-  do {                                                                          \
-    ets_printf(LOG_FORMAT(E, format), esp_log_timestamp(), TAG, ##__VA_ARGS__); \
+#define isr_log_e(format, ...)                                                                  \
+  do {                                                                                          \
+    ets_printf(LOG_FORMAT(E, format), esp_log_timestamp(), ARDUHAL_ESP_LOG_TAG, ##__VA_ARGS__); \
   } while (0)
-#define log_buf_e(b, l)                               \
-  do {                                                \
-    ESP_LOG_BUFFER_HEXDUMP(TAG, b, l, ESP_LOG_ERROR); \
+#define log_buf_e(b, l)                                               \
+  do {                                                                \
+    ESP_LOG_BUFFER_HEXDUMP(ARDUHAL_ESP_LOG_TAG, b, l, ESP_LOG_ERROR); \
   } while (0)
 #endif
 #else
@@ -282,17 +288,17 @@ void log_print_buf(const uint8_t *b, size_t len);
     ARDUHAL_LOG_COLOR_PRINT_END; \
   } while (0)
 #else
-#define log_n(format, ...)                                          \
-  do {                                                              \
-    ESP_LOG_LEVEL_LOCAL(ESP_LOG_ERROR, TAG, format, ##__VA_ARGS__); \
+#define log_n(format, ...)                                                          \
+  do {                                                                              \
+    ESP_LOG_LEVEL_LOCAL(ESP_LOG_ERROR, ARDUHAL_ESP_LOG_TAG, format, ##__VA_ARGS__); \
   } while (0)
-#define isr_log_n(format, ...)                                                  \
-  do {                                                                          \
-    ets_printf(LOG_FORMAT(E, format), esp_log_timestamp(), TAG, ##__VA_ARGS__); \
+#define isr_log_n(format, ...)                                                                  \
+  do {                                                                                          \
+    ets_printf(LOG_FORMAT(E, format), esp_log_timestamp(), ARDUHAL_ESP_LOG_TAG, ##__VA_ARGS__); \
   } while (0)
-#define log_buf_n(b, l)                               \
-  do {                                                \
-    ESP_LOG_BUFFER_HEXDUMP(TAG, b, l, ESP_LOG_ERROR); \
+#define log_buf_n(b, l)                                               \
+  do {                                                                \
+    ESP_LOG_BUFFER_HEXDUMP(ARDUHAL_ESP_LOG_TAG, b, l, ESP_LOG_ERROR); \
   } while (0)
 #endif
 #else
@@ -309,12 +315,7 @@ void log_print_buf(const uint8_t *b, size_t len);
 
 #include "esp_log.h"
 
-#ifdef USE_ESP_IDF_LOG
-//#ifndef TAG
-//#define TAG "ARDUINO"
-//#endif
-//#define log_n(format, ...) myLog(ESP_LOG_NONE, format, ##__VA_ARGS__)
-#else
+#ifndef USE_ESP_IDF_LOG
 #ifdef CONFIG_ARDUHAL_ESP_LOG
 #undef ESP_LOGE
 #undef ESP_LOGW
diff --git a/docs/en/api/ledc.rst b/docs/en/api/ledc.rst
@@ -68,7 +68,7 @@ This function is used to set duty for the LEDC pin.
 
 .. code-block:: arduino
 
-    void ledcWrite(uint8_t pin, uint32_t duty);
+    bool ledcWrite(uint8_t pin, uint32_t duty);
 
 * ``pin`` select LEDC pin.
 * ``duty`` select duty to be set for selected LEDC pin.
diff --git a/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino b/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino
@@ -21,6 +21,7 @@
 //#define CAMERA_MODEL_M5STACK_WIDE // Has PSRAM
 //#define CAMERA_MODEL_M5STACK_ESP32CAM // No PSRAM
 //#define CAMERA_MODEL_M5STACK_UNITCAM // No PSRAM
+//#define CAMERA_MODEL_M5STACK_CAMS3_UNIT  // Has PSRAM
 //#define CAMERA_MODEL_AI_THINKER // Has PSRAM
 //#define CAMERA_MODEL_TTGO_T_JOURNAL // No PSRAM
 //#define CAMERA_MODEL_XIAO_ESP32S3 // Has PSRAM
diff --git a/libraries/ESP32/examples/Camera/CameraWebServer/camera_pins.h b/libraries/ESP32/examples/Camera/CameraWebServer/camera_pins.h
diff --git a/libraries/Ethernet/src/ETH.cpp b/libraries/Ethernet/src/ETH.cpp

Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ esp_err_t __analogContinuousInit(adc_channel_t *channel, uint8_t channel_num, ad`
`440`	`440`	`dig_cfg.pattern_num = channel_num;`
`441`	`441`	`for (int i = 0; i < channel_num; i++) {`
`442`	`442`	`adc_pattern[i].atten = __adcContinuousAtten;`
`443`		`- adc_pattern[i].channel = channel[i] & 0x7;`
	`443`	`+ adc_pattern[i].channel = channel[i];`
`444`	`444`	`adc_pattern[i].unit = ADC_UNIT_1;`
`445`	`445`	`adc_pattern[i].bit_width = __adcContinuousWidth;`
`446`	`446`	`}`