Merge branch 'arduino:master' into master

0hotpotman0 · web-flow · commit 75543037a146 · 2022-01-06T11:10:26.000+08:00
diff --git a/cores/arduino/mbed/targets/TARGET_RASPBERRYPI/TARGET_RP2040/pico-sdk/rp2_common/hardware_rtc/include/hardware/rtc.h b/cores/arduino/mbed/targets/TARGET_RASPBERRYPI/TARGET_RP2040/pico-sdk/rp2_common/hardware_rtc/include/hardware/rtc.h
@@ -34,7 +34,7 @@ typedef void (*rtc_callback_t)(void);
 /*! \brief Initialise the RTC system
  *  \ingroup hardware_rtc
  */
-void rtc_init(void);
+void _rtc_init(void);
 
 /*! \brief Set the RTC to the specified time
  *  \ingroup hardware_rtc
diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
@@ -45,6 +45,8 @@ void arduino::MbedI2C::end() {
 	}
 #ifdef DEVICE_I2CSLAVE
 	if (slave != NULL) {
+		slave_th.terminate();
+		slave_th.free_stack();
 		delete slave;
 	}
 #endif
diff --git a/package_full.sh b/package_full.sh
@@ -1,5 +1,5 @@
 #Get version from git(hub) tag
-export VERSION="2.5.2"
+export VERSION="2.6.1"
 
 FLAVOURS=`ls *.variables`
 
diff --git a/patches/0045-RP2040-backport-p2040_usb_device_enumeration-fix.patch b/patches/0045-RP2040-backport-p2040_usb_device_enumeration-fix.patch
@@ -0,0 +1,95 @@
+From 6303e807ab476b4e111e1eb7f6a7fd789d1650f3 Mon Sep 17 00:00:00 2001
+From: Martino Facchin <m.facchin@arduino.cc>
+Date: Mon, 15 Nov 2021 16:47:42 +0100
+Subject: [PATCH] RP2040: backport p2040_usb_device_enumeration fix
+
+---
+ .../rp2040_usb_device_enumeration.c           | 42 +++++++++++++++----
+ 1 file changed, 33 insertions(+), 9 deletions(-)
+
+diff --git a/targets/TARGET_RASPBERRYPI/TARGET_RP2040/pico-sdk/rp2_common/pico_fix/rp2040_usb_device_enumeration/rp2040_usb_device_enumeration.c b/targets/TARGET_RASPBERRYPI/TARGET_RP2040/pico-sdk/rp2_common/pico_fix/rp2040_usb_device_enumeration/rp2040_usb_device_enumeration.c
+index 8319e36cb7..91583205bb 100644
+--- a/targets/TARGET_RASPBERRYPI/TARGET_RP2040/pico-sdk/rp2_common/pico_fix/rp2040_usb_device_enumeration/rp2040_usb_device_enumeration.c
++++ b/targets/TARGET_RASPBERRYPI/TARGET_RP2040/pico-sdk/rp2_common/pico_fix/rp2040_usb_device_enumeration/rp2040_usb_device_enumeration.c
+@@ -8,6 +8,8 @@
+ #include "pico/time.h"
+ #include "hardware/structs/usb.h"
+ #include "hardware/gpio.h"
++#include "hardware/structs/iobank0.h"
++#include "hardware/structs/padsbank0.h"
+ #include "pico/fix/rp2040_usb_device_enumeration.h"
+ 
+ #define LS_SE0 0b00
+@@ -36,7 +38,7 @@ static inline uint8_t hw_line_state(void) {
+     return (usb_hw->sie_status & USB_SIE_STATUS_LINE_STATE_BITS) >> USB_SIE_STATUS_LINE_STATE_LSB;
+ }
+ 
+-int64_t hw_enumeration_fix_wait_se0_callback(alarm_id_t id, void *user_data) {
++int64_t hw_enumeration_fix_wait_se0_callback(__unused alarm_id_t id, __unused void *user_data) {
+     if (hw_line_state() == LS_SE0) {
+         // Come back in 1ms and check again
+         return 1000;
+@@ -69,25 +71,42 @@ static void hw_enumeration_fix_wait_se0(void) {
+     hw_enumeration_fix_busy_wait_se0();
+ }
+ 
+-int64_t hw_enumeration_fix_force_ls_j_done(alarm_id_t id, void *user_data) {
++int64_t hw_enumeration_fix_force_ls_j_done(__unused alarm_id_t id, __unused void *user_data) {
+     hw_enumeration_fix_finish();
+     return 0;
+ }
+ 
++static uint32_t gpio_ctrl_prev = 0;
++static uint32_t pad_ctrl_prev = 0;
++static const uint dp = 15;
++static const uint dm = 16;
++
+ static void hw_enumeration_fix_force_ls_j(void) {
+-    // Force LS_J
+-    const uint dp = 15;
+-    //const uint dm = 16;
+-    gpio_set_function(dp, 8);
+-    // TODO: assert dm is not funcseld to usb
++    // DM must be 0 for this to work. This is true if it is selected
++    // to any other function. fn 8 on this pin is only for debug so shouldn't
++    // be selected
++    if (gpio_get_function(dm) == 8) {
++        panic("Not expecting DM to be function 8");
++    }
++
++    // Before changing any pin state, take a copy of the current gpio control register
++    gpio_ctrl_prev = iobank0_hw->io[dp].ctrl;
++    // Also take a copy of the pads register
++    pad_ctrl_prev = padsbank0_hw->io[dp];
++
++    // Enable bus keep and force pin to tristate, so USB DP muxing doesn't affect
++    // pin state
++    gpio_set_pulls(dp, true, true);
++    gpio_set_oeover(dp, GPIO_OVERRIDE_LOW);
++    // Select function 8 (USB debug muxing) without disturbing other controls
++    hw_write_masked(&iobank0_hw->io[dp].ctrl,
++        8 << IO_BANK0_GPIO15_CTRL_FUNCSEL_LSB, IO_BANK0_GPIO15_CTRL_FUNCSEL_BITS);
+ 
+     // J state is a differential 1 for a full speed device so
+     // DP = 1 and DM = 0. Don't actually need to set DM low as it
+     // is already gated assuming it isn't funcseld.
+     gpio_set_inover(dp, GPIO_OVERRIDE_HIGH);
+ 
+-    // TODO: What to do about existing DP state here?
+-
+     // Force PHY pull up to stay before switching away from the phy
+     hw_set_alias(usb_hw)->phy_direct = USB_USBPHY_DIRECT_DP_PULLUP_EN_BITS;
+     hw_set_alias(usb_hw)->phy_direct_override = USB_USBPHY_DIRECT_OVERRIDE_DP_PULLUP_EN_OVERRIDE_EN_BITS;
+@@ -118,4 +137,9 @@ static void hw_enumeration_fix_finish(void) {
+ 
+     // Get rid of DP pullup override
+     hw_clear_alias(usb_hw)->phy_direct_override = USB_USBPHY_DIRECT_OVERRIDE_DP_PULLUP_EN_OVERRIDE_EN_BITS;
++
++    // Finally, restore the gpio ctrl value back to GPIO15
++    iobank0_hw->io[dp].ctrl = gpio_ctrl_prev;
++    // Restore the pad ctrl value
++    padsbank0_hw->io[dp] = pad_ctrl_prev;
+ }
+-- 
+2.33.1
+
diff --git a/patches/0045-RP2040-restore-GPIO15-functionality-after-USB_DEVICE.patch b/patches/0045-RP2040-restore-GPIO15-functionality-after-USB_DEVICE.patch
diff --git a/patches/0090-RP2040-correct-system-clock-frequency.patch b/patches/0090-RP2040-correct-system-clock-frequency.patch
@@ -0,0 +1,36 @@
+From 8ccd98f8d597f315f33fbe943f5a8c5f8d0e28d1 Mon Sep 17 00:00:00 2001
+From: Martino Facchin <m.facchin@arduino.cc>
+Date: Mon, 6 Dec 2021 12:02:28 +0100
+Subject: [PATCH] RP2040: correct system clock frequency
+
+Fixes https://github.com/arduino/ArduinoCore-mbed/issues/271
+---
+ .../TARGET_RP2040/TARGET_NANO_RP2040_CONNECT/board.c            | 2 +-
+ .../TARGET_RP2040/TARGET_RASPBERRY_PI_PICO/board.c              | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/targets/TARGET_RASPBERRYPI/TARGET_RP2040/TARGET_NANO_RP2040_CONNECT/board.c b/targets/TARGET_RASPBERRYPI/TARGET_RP2040/TARGET_NANO_RP2040_CONNECT/board.c
+index 1f775638f9..b9ad1319af 100644
+--- a/targets/TARGET_RASPBERRYPI/TARGET_RP2040/TARGET_NANO_RP2040_CONNECT/board.c
++++ b/targets/TARGET_RASPBERRYPI/TARGET_RP2040/TARGET_NANO_RP2040_CONNECT/board.c
+@@ -1,3 +1,3 @@
+ #include "PinNames.h"
+ 
+-uint32_t SystemCoreClock = 120000000;
+\ No newline at end of file
++uint32_t SystemCoreClock = 125000000;
+\ No newline at end of file
+diff --git a/targets/TARGET_RASPBERRYPI/TARGET_RP2040/TARGET_RASPBERRY_PI_PICO/board.c b/targets/TARGET_RASPBERRYPI/TARGET_RP2040/TARGET_RASPBERRY_PI_PICO/board.c
+index 1f775638f9..b9ad1319af 100644
+--- a/targets/TARGET_RASPBERRYPI/TARGET_RP2040/TARGET_RASPBERRY_PI_PICO/board.c
++++ b/targets/TARGET_RASPBERRYPI/TARGET_RP2040/TARGET_RASPBERRY_PI_PICO/board.c
+@@ -1,3 +1,3 @@
+ #include "PinNames.h"
+ 
+-uint32_t SystemCoreClock = 120000000;
+\ No newline at end of file
++uint32_t SystemCoreClock = 125000000;
+\ No newline at end of file
+-- 
+2.34.1
+
diff --git a/platform.txt b/platform.txt
@@ -82,7 +82,7 @@ recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} -DARDUIN
 recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
 
 ## Preprocess linker script
-recipe.hooks.linking.prelink.1.pattern="{compiler.path}{compiler.c.elf.cmd}" -E -P -x c {build.extra_ldflags} "{build.variant.path}/{build.ldscript}" -o {build.path}/{build.ldscript}
+recipe.hooks.linking.prelink.1.pattern="{compiler.path}{compiler.c.elf.cmd}" -E -P -x c {build.extra_ldflags} "{build.variant.path}/{build.ldscript}" -o "{build.path}/{build.ldscript}"
 
 ## Combine gc-sections, archives, and objects
 recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}"  "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} {build.extra_flags} {build.extra_ldflags} "@{compiler.mbed.ldflags}" "-T{build.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" --specs=nosys.specs {compiler.ldflags} -o "{build.path}/{build.project_name}.elf" {object_files} -Wl,--whole-archive "{build.path}/{archive_file}" {compiler.mbed} -Wl,--no-whole-archive -Wl,--start-group {compiler.mbed.extra_ldflags} {compiler.libraries.ldflags} -Wl,--end-group
@@ -103,7 +103,7 @@ recipe.objcopy.zip.pattern="{tools.nrfutil.cmd}" dfu genpkg --dev-type 0x0052 --
 ## Compute size
 recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
 recipe.size.regex.data=^(?:\.data|\.bss)\s+([0-9]+).*
-recipe.size.regex=^(?:\.data|\.text)\s+([0-9]+).*
+recipe.size.regex=^(?:\.data|\.text)\S*?\s+([0-9]+).*
 
 ## Save hex
 recipe.output.tmp_file={build.project_name}.bin
diff --git a/variants/ARDUINO_NANO33BLE/defines.txt b/variants/ARDUINO_NANO33BLE/defines.txt
@@ -33,7 +33,7 @@
 -DFEATURE_STORAGE=1
 -D__FPU_PRESENT=1
 -D__MBED__=1
--DMBED_BUILD_TIMESTAMP=1632403401.7148244
+-DMBED_BUILD_TIMESTAMP=1637232276.1675022
 -D__MBED_CMSIS_RTOS_CM
 -DMBED_MPU_CUSTOM
 -DMBED_TICKLESS
diff --git a/variants/EDGE_CONTROL/defines.txt b/variants/EDGE_CONTROL/defines.txt
@@ -38,7 +38,7 @@
 -DFEATURE_STORAGE=1
 -D__FPU_PRESENT=1
 -D__MBED__=1
--DMBED_BUILD_TIMESTAMP=1632403591.1261852
+-DMBED_BUILD_TIMESTAMP=1637232401.5872405
 -D__MBED_CMSIS_RTOS_CM
 -DMBED_MPU_CUSTOM
 -DMBED_TICKLESS
diff --git a/variants/NANO_RP2040_CONNECT/defines.txt b/variants/NANO_RP2040_CONNECT/defines.txt
@@ -12,14 +12,15 @@
 -DDEVICE_PORT_OUT=1
 -DDEVICE_PWMOUT=1
 -DDEVICE_RESET_REASON=1
+-DDEVICE_RTC=1
 -DDEVICE_SERIAL=1
 -DDEVICE_SERIAL_FC=1
 -DDEVICE_SPI=1
 -DDEVICE_USBDEVICE=1
 -DDEVICE_USTICKER=1
 -DDEVICE_WATCHDOG=1
 -D__MBED__=1
--DMBED_BUILD_TIMESTAMP=1632403376.6567667
+-DMBED_BUILD_TIMESTAMP=1637232257.481197
 -D__MBED_CMSIS_RTOS_CM
 -DMBED_MPU_CUSTOM
 -DPICO_FLASH_SIZE_BYTES=16*1024*1024
diff --git a/variants/NANO_RP2040_CONNECT/libs/libmbed.a b/variants/NANO_RP2040_CONNECT/libs/libmbed.a
diff --git a/variants/NICLA/defines.txt b/variants/NICLA/defines.txt
@@ -32,7 +32,7 @@
 -DFEATURE_BLE=1
 -D__FPU_PRESENT=1
 -D__MBED__=1
--DMBED_BUILD_TIMESTAMP=1632403632.3026016
+-DMBED_BUILD_TIMESTAMP=1637232432.6955237
 -D__MBED_CMSIS_RTOS_CM
 -DMBED_MPU_CUSTOM
 -DMBED_TICKLESS
diff --git a/variants/PORTENTA_H7_M4/defines.txt b/variants/PORTENTA_H7_M4/defines.txt
@@ -43,7 +43,7 @@
 -DFEATURE_BLE=1
 -D__FPU_PRESENT=1
 -D__MBED__=1
--DMBED_BUILD_TIMESTAMP=1632403527.8572242
+-DMBED_BUILD_TIMESTAMP=1637232354.9239724
 -D__MBED_CMSIS_RTOS_CM
 -DMBED_MPU_CUSTOM
 -DMBED_TICKLESS
diff --git a/variants/PORTENTA_H7_M4/libs/libmbed.a b/variants/PORTENTA_H7_M4/libs/libmbed.a
diff --git a/variants/PORTENTA_H7_M7/defines.txt b/variants/PORTENTA_H7_M7/defines.txt
@@ -44,7 +44,7 @@
 -DFEATURE_BLE=1
 -D__FPU_PRESENT=1
 -D__MBED__=1
--DMBED_BUILD_TIMESTAMP=1632403464.1729383
+-DMBED_BUILD_TIMESTAMP=1637232307.3555584
 -D__MBED_CMSIS_RTOS_CM
 -DMBED_TICKLESS
 -DMBEDTLS_FS_IO
diff --git a/variants/PORTENTA_H7_M7/libs/libmbed.a b/variants/PORTENTA_H7_M7/libs/libmbed.a
diff --git a/variants/RASPBERRY_PI_PICO/defines.txt b/variants/RASPBERRY_PI_PICO/defines.txt
@@ -12,14 +12,15 @@
 -DDEVICE_PORT_OUT=1
 -DDEVICE_PWMOUT=1
 -DDEVICE_RESET_REASON=1
+-DDEVICE_RTC=1
 -DDEVICE_SERIAL=1
 -DDEVICE_SERIAL_FC=1
 -DDEVICE_SPI=1
 -DDEVICE_USBDEVICE=1
 -DDEVICE_USTICKER=1
 -DDEVICE_WATCHDOG=1
 -D__MBED__=1
--DMBED_BUILD_TIMESTAMP=1632403438.5330071
+-DMBED_BUILD_TIMESTAMP=1637232303.3760371
 -D__MBED_CMSIS_RTOS_CM
 -DMBED_MPU_CUSTOM
 -DPICO_NO_BINARY_INFO=1
diff --git a/variants/RASPBERRY_PI_PICO/libs/libmbed.a b/variants/RASPBERRY_PI_PICO/libs/libmbed.a

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,8 @@ void arduino::MbedI2C::end() {`
`45`	`45`	`}`
`46`	`46`	`#ifdef DEVICE_I2CSLAVE`
`47`	`47`	`if (slave != NULL) {`
	`48`	`+ slave_th.terminate();`
	`49`	`+ slave_th.free_stack();`
`48`	`50`	`delete slave;`
`49`	`51`	`}`
`50`	`52`	`#endif`