Merge pull request #5030 from dhalbert/update-to-raspberrypi-pico-sdk-1.2.0
Update pico-sdk to 1.2.0, using raspberrypi repo
This commit is contained in:
commit
e14923028f
2
.gitmodules
vendored
2
.gitmodules
vendored
@ -177,7 +177,7 @@
|
||||
url = https://github.com/adafruit/Adafruit_CircuitPython_SimpleMath
|
||||
[submodule "ports/raspberrypi/sdk"]
|
||||
path = ports/raspberrypi/sdk
|
||||
url = https://github.com/adafruit/pico-sdk.git
|
||||
url = https://github.com/raspberrypi/pico-sdk.git
|
||||
[submodule "data/nvm.toml"]
|
||||
path = data/nvm.toml
|
||||
url = https://github.com/adafruit/nvm.toml.git
|
||||
|
@ -76,6 +76,7 @@ INC += -I. \
|
||||
-isystem sdk/src/rp2_common/hardware_base/include/ \
|
||||
-isystem sdk/src/rp2_common/hardware_claim/include/ \
|
||||
-isystem sdk/src/rp2_common/hardware_clocks/include/ \
|
||||
-isystem sdk/src/rp2_common/hardware_divider/include/ \
|
||||
-isystem sdk/src/rp2_common/hardware_dma/include/ \
|
||||
-isystem sdk/src/rp2_common/hardware_flash/include/ \
|
||||
-isystem sdk/src/rp2_common/hardware_gpio/include/ \
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 49c0c1613dca37eea85f168290e858cca4411d81
|
||||
Subproject commit bfcbefafc5d2a210551a4d9d80b4303d4ae0adf7
|
@ -1,19 +1,22 @@
|
||||
#pragma once
|
||||
|
||||
#define PICO_IE_26_29_UNCHANGED_ON_RESET (0)
|
||||
#define PICO_USE_STACK_GUARDS (0)
|
||||
// alphabetized
|
||||
#define LIB_PICO_BINARY_INFO (0)
|
||||
#define LIB_PICO_PRINTF_NONE (0)
|
||||
#define LIB_PICO_PRINTF_PICO (0)
|
||||
#define LIB_PICO_STDIO_SEMIHOSTING (0)
|
||||
#define LIB_PICO_STDIO_UART (0)
|
||||
#define LIB_PICO_STDIO_USB (0)
|
||||
#define PICO_DIVIDER_DISABLE_INTERRUPTS (0)
|
||||
#define PICO_DOUBLE_SUPPORT_ROM_V1 (1)
|
||||
#define PICO_ENTER_USB_BOOT_ON_EXIT (0)
|
||||
#define PICO_USE_OPTIMISTIC_SBRK (0)
|
||||
#define PICO_FLOAT_SUPPORT_ROM_V1 (1)
|
||||
#define PICO_IE_26_29_UNCHANGED_ON_RESET (0)
|
||||
#define PICO_INT64_OPS_IN_RAM (0)
|
||||
#define PICO_NO_HARDWARE (0)
|
||||
#define PICO_ON_DEVICE (1)
|
||||
#define PICO_USE_CRT_PRINTF (0)
|
||||
#define PICO_NO_PRINTF (0)
|
||||
#define PICO_FLOAT_SUPPORT_ROM_V1 (1)
|
||||
#define PICO_DOUBLE_SUPPORT_ROM_V1 (1)
|
||||
#define PICO_STDIO_UART (0)
|
||||
#define PICO_STDIO_USB (0)
|
||||
#define PICO_STDIO_SEMIHOSTING (0)
|
||||
#define PICO_STDIO_IGNORE_NESTED_STDOUT (0)
|
||||
#define PICO_PRINTF_PICO (0)
|
||||
#define PICO_PRINTF_NONE (0)
|
||||
#define PICO_PRINTF_ALWAYS_INCLUDED (1)
|
||||
#define PICO_STDIO_IGNORE_NESTED_STDOUT (0)
|
||||
#define PICO_USE_CRT_PRINTF (0)
|
||||
#define PICO_USE_OPTIMISTIC_SBRK (0)
|
||||
#define PICO_USE_STACK_GUARDS (0)
|
||||
|
@ -12,8 +12,8 @@
|
||||
#define _PICO_VERSION_H
|
||||
|
||||
#define PICO_SDK_VERSION_MAJOR 1
|
||||
#define PICO_SDK_VERSION_MINOR 0
|
||||
#define PICO_SDK_VERSION_MINOR 2
|
||||
#define PICO_SDK_VERSION_REVISION 0
|
||||
#define PICO_SDK_VERSION_STRING "1.0.0"
|
||||
#define PICO_SDK_VERSION_STRING "1.2.0"
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user