8000 update libs again · Santroller/arduino-pico@607497c · GitHub
[go: up one dir, main page]

Skip to content

Commit 607497c

Browse files
committed
update libs again
2 parents c2b9388 + bac65d9 commit 607497c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+804
-590
lines changed

ArduinoCore-API

Submodule ArduinoCore-API updated 138 files

boards.txt

Lines changed: 582 additions & 582 deletions
Large diffs are not rendered by default.

cores/rp2040/main.cpp

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "RP2040USB.h"
2323
#include <pico/stdlib.h>
2424
#include <pico/multicore.h>
25+
#include <hardware/vreg.h>
2526
#include <reent.h>
2627
#ifdef RP2350_PSRAM_CS
2728
#include "psram.h"
@@ -83,6 +84,16 @@ static struct _reent *_impure_ptr1 = nullptr;
8384

8485
extern "C" int main() {
8586
#if (defined(PICO_RP2040) && (F_CPU != 125000000)) || (defined(PICO_RP2350) && (F_CPU != 150000000))
87+
88+
#if defined(PICO_RP2040)
89+
// From runtime_init_clocks() to bump up RP2040 V for 200Mhz+ operation
90+
if ((F_CPU > 133000000) && (vreg_get_voltage() < VREG_VOLTAGE_1_15)) {
91+
vreg_set_voltage(VREG_VOLTAGE_1_15);
92+
// wait for voltage to settle; must use CPU cycles as TIMER is not yet clocked correctly
93+
busy_wait_at_least_cycles((uint32_t)((SYS_CLK_VREG_VOLTAGE_AUTO_ADJUST_DELAY_US * (uint64_t)XOSC_HZ) / 1000000));
94+
}
95+
#endif
96+
8697
#if defined(RP2350_PSRAM_CS) && (F_CPU > 150000000)
8798
// Need to increase the qmi divider before upping sysclk to ensure we keep the output sck w/in legal bounds
8899
psram_reinit_timing(F_CPU);
@@ -93,7 +104,9 @@ extern "C" int main() {
93104
*x ^= 0xff;
94105
asm volatile("" ::: "memory");
95106
#endif
107+
96108
set_sys_clock_khz(F_CPU / 1000, true);
109+
97110
#if defined(RP2350_PSRAM_CS) && (F_CPU < 150000000)
98111
psram_reinit_timing();
99112
// Per datasheet, need to do a dummy access and memory barrier before it takes effect
@@ -103,7 +116,8 @@ extern "C" int main() {
103116
*x ^= 0xff;
104117
asm volatile("" ::: "memory");
105118
#endif
106-
#endif
119+
120+
#endif // over/underclock
107121

108122
// Let rest of core know if we're using FreeRTOS
109123
__isFreeRTOS = initFreeRTOS ? true : false;

include/rp2040/pico_base/pico/version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#define PICO_SDK_VERSION_MAJOR 2
1515
#define PICO_SDK_VERSION_MINOR 1
16-
#define PICO_SDK_VERSION_REVISION 0
17-
#define PICO_SDK_VERSION_STRING "2.1.0"
16+
#define PICO_SDK_VERSION_REVISION 1
17+
#define PICO_SDK_VERSION_STRING "2.1.1"
1818

1919
#endif

include/rp2350-riscv/btstack_config.h

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
#ifndef _PICO_BTSTACK_BTSTACK_CONFIG_H
2+
#define _PICO_BTSTACK_BTSTACK_CONFIG_H
3+
4+
// BTstack features that can be enabled
5+
#ifdef ENABLE_BLE
6+
#define ENABLE_LE_PERIPHERAL
7+
#define ENABLE_LE_CENTRAL
8+
#define ENABLE_L2CAP_LE_CREDIT_BASED_FLOW_CONTROL_MODE
9+
#endif
10+
#define ENABLE_LOG_INFO
11+
#define ENABLE_LOG_ERROR
12+
#define ENABLE_PRINTF_HEXDUMP
13+
#define ENABLE_SCO_OVER_HCI
14+
15+
// BTstack configuration. buffers, sizes, ...
16+
#define HCI_OUTGOING_PRE_BUFFER_SIZE 4
17+
#define HCI_ACL_PAYLOAD_SIZE (1691 + 4)
18+
#define HCI_ACL_CHUNK_SIZE_ALIGNMENT 4
19+
#define MAX_NR_AVDTP_CONNECTIONS 1
20+
#define MAX_NR_AVDTP_STREAM_ENDPOINTS 1
21+
#define MAX_NR_AVRCP_CONNECTIONS 2
22+
#define MAX_NR_BNEP_CHANNELS 1
23+
#define MAX_NR_BNEP_SERVICES 1
24+
#define MAX_NR_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES 2
25+
#define MAX_NR_GATT_CLIENTS 1
26+
#define MAX_NR_HCI_CONNECTIONS 2
27+
#define MAX_NR_HID_HOST_CONNECTIONS 1
28+
#define MAX_NR_HIDS_CLIENTS 1
29+
#define MAX_NR_HFP_CONNECTIONS 1
30+
#define MAX_NR_L2CAP_CHANNELS 4
31+
#define MAX_NR_L2CAP_SERVICES 3
32+
#define MAX_NR_RFCOMM_CHANNELS 1
33+
#define MAX_NR_RFCOMM_MULTIPLEXERS 1
34+
#define MAX_NR_RFCOMM_SERVICES 1
35+
#define MAX_NR_SERVICE_RECORD_ITEMS 4
36+
#define MAX_NR_SM_LOOKUP_ENTRIES 3
37+
#define MAX_NR_WHITELIST_ENTRIES 16
38+
#define MAX_NR_LE_DEVICE_DB_ENTRIES 16
39+
40+
// Limit number of ACL/SCO Buffer to use by stack to avoid cyw43 shared bus overrun
41+
#define MAX_NR_CONTROLLER_ACL_BUFFERS 3
42+
#define MAX_NR_CONTROLLER_SCO_PACKETS 3
43+
44+
// Enable and configure HCI Controller to Host Flow Control to avoid cyw43 shared bus overrun
45+
#define ENABLE_HCI_CONTROLLER_TO_HOST_FLOW_CONTROL
46+
#define HCI_HOST_ACL_PACKET_LEN 1024
47+
#define HCI_HOST_ACL_PACKET_NUM 3
48+
#define HCI_HOST_SCO_PACKET_LEN 120
49+
#define HCI_HOST_SCO_PACKET_NUM 3
50+
51+
// Link Key DB and LE Device DB using TLV on top of Flash Sector interface
52+
#define NVM_NUM_DEVICE_DB_ENTRIES 16
53+
#define NVM_NUM_LINK_KEYS 16
54+
55+
// We don't give btstack a malloc, so use a fixed-size ATT DB.
56+
#define MAX_ATT_DB_SIZE 512
57+
58+
// BTstack HAL configuration
59+
#define HAVE_EMBEDDED_TIME_MS
60+
61+
// map btstack_assert onto Pico SDK assert()
62+
#define HAVE_ASSERT
63+
64+
// Some USB dongles take longer to respond to HCI reset (e.g. BCM20702A).
65+
#define HCI_RESET_RESEND_TIMEOUT_MS 1000
66+
67+
#define ENABLE_SOFTWARE_AES128
68+
#define ENABLE_MICRO_ECC_FOR_LE_SECURE_CONNECTIONS
69+
70+
#define HAVE_BTSTACK_STDIN
71+
72+
// To get the audio demos working even with HCI dump at 115200, this truncates long ACL packets
73+
//#define HCI_DUMP_STDOUT_MAX_SIZE_ACL 100
74+
75+
#ifdef ENABLE_CLASSIC
76+
#define ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE
77+
#endif
78+
79+
#endif // _PICO_BTSTACK_BTSTACK_CONFIG_H
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// AUTOGENERATED FROM PICO_CONFIG_HEADER_FILES and then PICO_<PLATFORM>_CONFIG_HEADER_FILES
2+
// DO NOT EDIT!
3+
4+
5+
// based on PICO_CONFIG_HEADER_FILES:
6+
7+
#include "../../pico-sdk/src/boards/include/boards/solderparty_rp2350_stamp_xl.h"
8+
9+
// based on PICO_RP2350_RISCV_CONFIG_HEADER_FILES:
Lines changed: 19 additions & 0 deletions
179B
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/*
2+
* Copyright (c) 2020 Raspberry Pi (Trading) Ltd.
3+
*
4+
* SPDX-License-Identifier: BSD-3-Clause
5+
*/
6+
7+
// ---------------------------------------
8+
// THIS FILE IS AUTOGENERATED; DO NOT EDIT
9+
// ---------------------------------------
10+
11+
#ifndef _PICO_VERSION_H
12+
#define _PICO_VERSION_H
13+
14+
#define PICO_SDK_VERSION_MAJOR 2
15+
#define PICO_SDK_VERSION_MINOR 1
16+
#define PICO_SDK_VERSION_REVISION 1
17+
#define PICO_SDK_VERSION_STRING "2.1.1"
18+
19+
#endif

include/rp2350-riscv/tusb_config.h

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
/*
2+
* The MIT License (MIT)
3+
*
4+
* Copyright (c) 2019 Ha Thach (tinyusb.org)
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*
24+
*/
25+
26+
#ifndef _TUSB_CONFIG_H_
27+
#define _TUSB_CONFIG_H_
28+
29+
#ifdef __cplusplus
30+
extern "C" {
31+
#endif
32+
33+
//--------------------------------------------------------------------
34+
// COMMON CONFIGURATION
35+
//--------------------------------------------------------------------
36+
37+
#ifndef CFG_TUSB_MCU
38+
#define CFG_TUSB_MCU OPT_MCU_RP2040
39+
#endif
40+
41+
#define CFG_TUSB_RHPORT0_MODE OPT_MODE_DEVICE
42+
#define CFG_TUSB_RHPORT1_MODE OPT_MODE_HOST
43+
#define CFG_TUSB_OS OPT_OS_PICO
44+
45+
#ifndef BOARD_TUH_MAX_SPEED
46+
#define BOARD_TUH_MAX_SPEED OPT_MODE_LOW_SPEED
47+
#endif
48+
#define CFG_TUH_RPI_PIO_USB 1
49+
// CFG_TUSB_DEBUG is defined by compiler in DEBUG build
50+
#ifndef CFG_TUSB_DEBUG
51+
#define CFG_TUSB_DEBUG 0
52+
#endif
53+
// #define CFG_TUSB_DEBUG 2
54+
/* USB DMA on some MCUs can only access a specific SRAM region with restriction on alignment.
55+
* Tinyusb use follows macros to declare transferring memory so that they can be put
56+
* into those specific section.
57+
* e.g
58+
* - CFG_TUSB_MEM SECTION : __attribute__ (( section(".usb_ram") ))
59+
* - CFG_TUSB_MEM_ALIGN : __attribute__ ((aligned(4)))
60+
*/
61+
#ifndef CFG_TUSB_MEM_SECTION
62+
#define CFG_TUSB_MEM_SECTION
63+
#endif
64+
65+
#ifndef CFG_TUSB_MEM_ALIGN
66+
#define CFG_TUSB_MEM_ALIGN __attribute__ ((aligned(4)))
67+
#endif
68+
69+
#define CFG_TUH_ENABLED 1
70+
#define CFG_TUH_HUB 2
71+
//--------------------------------------------------------------------
72+
// DEVICE CONFIGURATION
73+
//--------------------------------------------------------------------
74+
75+
#define CFG_TUH_ENUMERATION_BUFSIZE 512
76+
77+
#ifndef CFG_TUD_ENDPOINT0_SIZE
78+
#define CFG_TUD_ENDPOINT0_SIZE 64
79+
#endif
80+
81+
#define CFG_TUH_DEVICE_MAX 8
82+
#define CFG_TUH_ENDPOINT_MAX 8
83+
#define CFG_TUD_ENDPOINT_MAX 8
84+
85+
#ifdef __cplusplus
86+
}
87+
#endif
88+
89+
#endif /* _TUSB_CONFIG_H_ */
90+

include/rp2350/pico_base/pico/version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#define PICO_SDK_VERSION_MAJOR 2
1515
#define PICO_SDK_VERSION_MINOR 1
16-
#define PICO_SDK_VERSION_REVISION 0
17-
#define PICO_SDK_VERSION_STRING "2.1.0"
16+
#define PICO_SDK_VERSION_REVISION 1
17+
#define PICO_SDK_VERSION_STRING "2.1.1"
1818

1919
#endif

lib/rp2040/libipv4-big.a

1.71 KB
Binary file not shown.

lib/rp2040/libipv4-bt-big.a

201 KB
Binary file not shown.

lib/rp2040/libipv4-bt.a

201 KB
Binary file not shown.

lib/rp2040/libipv4-ipv6-big.a

1.71 KB
Binary file not shown.

lib/rp2040/libipv4-ipv6-bt-big.a

201 KB
Binary file not shown.

lib/rp2040/libipv4-ipv6-bt.a

201 KB
Binary file not shown.

lib/rp2040/libipv4-ipv6.a

1.71 KB
Binary file not shown.

lib/rp2040/libipv4.a

1.71 KB
Binary file not shown.

lib/rp2040/libpico.a

8.04 KB
Binary file not shown.

lib/rp2040/platform_inc.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
-iwithprefixbefore/pico-sdk/lib/btstack/src
1111
-iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/bluedroid/decoder/include
1212
-iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/bluedroid/encoder/include
13+
-iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/yxml
1314
-iwithprefixbefore/pico-sdk/lib/btstack/platform/embedded
1415
-iwithprefixbefore/pico-sdk/src/rp2_common/cmsis/stub/CMSIS/Device/RP2040/Include

0 commit comments

Comments
 (0)
0