Merge branch 'master' into release/v3.1.x

Author: me-no-dev

.github/scripts/tests_run.sh

@@ -132,6 +132,10 @@ while [ ! -z "$1" ]; do
     -W )
         shift
         wokwi_timeout=$1
+        if [[ -z $WOKWI_CLI_TOKEN ]]; then
+            echo "Wokwi CLI token is not set"
+            exit 1
+        fi
         platform="wokwi"
         ;;
     -o )

cores/esp32/esp32-hal-timer.c

@@ -242,7 +242,7 @@ uint64_t timerReadMicros(hw_timer_t *timer) {
   return timer_val * 1000000 / frequency;
 }
 
-uint64_t timerReadMilis(hw_timer_t *timer) {
+uint64_t timerReadMillis(hw_timer_t *timer) {
   if (timer == NULL) {
     log_e("Timer handle is NULL");
     return 0;

cores/esp32/esp32-hal-timer.h

@@ -42,7 +42,7 @@ void timerWrite(hw_timer_t *timer, uint64_t val);
 
 uint64_t timerRead(hw_timer_t *timer);
 uint64_t timerReadMicros(hw_timer_t *timer);
-uint64_t timerReadMilis(hw_timer_t *timer);
+uint64_t timerReadMillis(hw_timer_t *timer);
 double timerReadSeconds(hw_timer_t *timer);
 
 uint32_t timerGetFrequency(hw_timer_t *timer);

docs/en/api/timer.rst

@@ -119,14 +119,14 @@ This function is used to read counter value in microseconds of the timer.
 
 This function will return ``counter value`` of the timer in microseconds.
 
-timerReadMilis
-**************
+timerReadMillis
+***************
 
 This function is used to read counter value in milliseconds of the timer.
 
 .. code-block:: arduino
 
-    uint64_t timerReadMilis(hw_timer_t * timer);
+    uint64_t timerReadMillis(hw_timer_t * timer);
 
 * ``timer`` timer struct.
 

docs/requirements.txt

@@ -1,3 +1,4 @@
 esp-docs>=1.4.0
 sphinx-copybutton==0.5.0
 sphinx-tabs==3.2.0
+numpydoc==1.5.0

platform.txt

@@ -44,10 +44,14 @@ compiler.warning_flags.default=
 compiler.warning_flags.more=-Wall
 compiler.warning_flags.all=-Wall -Wextra
 
+# Additional flags specific to Arduino (not based on IDF flags).
+# Update tools/platformio-build.py when changing these flags.
+compiler.common_werror_flags=-Werror=return-type
+
 # Compile Flags
 compiler.cpreprocessor.flags="@{compiler.sdk.path}/flags/defines" "-I{build.source.path}" -iprefix "{compiler.sdk.path}/include/" "@{compiler.sdk.path}/flags/includes" "-I{compiler.sdk.path}/{build.memory_type}/include"
-compiler.c.flags="@{compiler.sdk.path}/flags/c_flags" {compiler.warning_flags} {compiler.optimization_flags}
-compiler.cpp.flags="@{compiler.sdk.path}/flags/cpp_flags" {compiler.warning_flags} {compiler.optimization_flags}
+compiler.c.flags="@{compiler.sdk.path}/flags/c_flags" {compiler.warning_flags} {compiler.optimization_flags} {compiler.common_werror_flags}
+compiler.cpp.flags="@{compiler.sdk.path}/flags/cpp_flags" {compiler.warning_flags} {compiler.optimization_flags} {compiler.common_werror_flags}
 compiler.S.flags="@{compiler.sdk.path}/flags/S_flags" {compiler.warning_flags} {compiler.optimization_flags}
 compiler.c.elf.flags="@{compiler.sdk.path}/flags/ld_flags" "@{compiler.sdk.path}/flags/ld_scripts"
 compiler.c.elf.libs="@{compiler.sdk.path}/flags/ld_libs"

tests/requirements.txt

@@ -1,7 +1,7 @@
 cryptography==42.0.7
 --only-binary cryptography
 pytest-cov==5.0.0
-pytest-embedded-serial-esp==1.11.0
-pytest-embedded-arduino==1.11.0
-pytest-embedded-wokwi==1.11.0
-pytest-embedded-qemu==1.11.0
+pytest-embedded-serial-esp==1.11.5
+pytest-embedded-arduino==1.11.5
+pytest-embedded-wokwi==1.11.5
+pytest-embedded-qemu==1.11.5

tests/validation/democfg/test_democfg.py

@@ -1,2 +1,2 @@
 def test_cfg(dut):
-    dut.expect("Hello cfg!")
+    dut.expect_exact("Hello cfg!")

tests/validation/hello_world/test_hello_world.py

@@ -1,2 +1,2 @@
 def test_hello_world(dut):
-    dut.expect("Hello Arduino!")
+    dut.expect_exact("Hello Arduino!")

tests/validation/nvs/test_nvs.py

@@ -1,4 +1,4 @@
 def test_nvs(dut):
-    dut.expect("Current counter value: 0")
-    dut.expect("Current counter value: 1")
-    dut.expect("Current counter value: 2")
+    dut.expect_exact("Current counter value: 0")
+    dut.expect_exact("Current counter value: 1")
+    dut.expect_exact("Current counter value: 2")