Skip to content

Commit 5f1cef7

Browse files
peterharperukpeterharperuk
committed
rp2: Put cyw43 config in separate files.
Signed-off-by: Peter Harper <[email protected]>
1 parent 3df9576 commit 5f1cef7

File tree

6 files changed

+38
-49
lines changed

6 files changed

+38
-49
lines changed

‎ports/rp2/boards/RPI_PICO2_W/mpconfigboard.cmake

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@ set(PICO_BOARD "pico2_w")
55
# To change the gpio count for QFN-80
66
# set(PICO_NUM_GPIOS 48)
77

8-
set(MICROPY_PY_LWIP ON)
9-
set(MICROPY_PY_NETWORK_CYW43 ON)
10-
11-
# Bluetooth
12-
set(MICROPY_PY_BLUETOOTH ON)
13-
set(MICROPY_BLUETOOTH_BTSTACK ON)
14-
set(MICROPY_PY_BLUETOOTH_CYW43 ON)
8+
include(enable_cyw43.cmake)
159

1610
# Board specific version of the frozen manifest
1711
set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)

‎ports/rp2/boards/RPI_PICO2_W/mpconfigboard.h

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,6 @@
22
#define MICROPY_HW_BOARD_NAME "Raspberry Pi Pico 2 W"
33
#define MICROPY_HW_FLASH_STORAGE_BYTES (PICO_FLASH_SIZE_BYTES - 1024 * 1024)
44

5-
// Enable networking.
6-
#define MICROPY_PY_NETWORK 1
7-
#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "Pico2W"
5+
#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "Pico2W"
86

9-
// CYW43 driver configuration.
10-
#define CYW43_USE_SPI (1)
11-
#define CYW43_LWIP (1)
12-
#define CYW43_GPIO (1)
13-
#define CYW43_SPI_PIO (1)
14-
15-
// For debugging mbedtls - also set
16-
// Debug level (0-4) 1=warning, 2=info, 3=debug, 4=verbose
17-
// #define MODUSSL_MBEDTLS_DEBUG_LEVEL 1
18-
19-
#define MICROPY_HW_PIN_EXT_COUNT CYW43_WL_GPIO_COUNT
20-
21-
int mp_hal_is_pin_reserved(int n);
22-
#define MICROPY_HW_PIN_RESERVED(i) mp_hal_is_pin_reserved(i)
7+
#include "enable_cyw43.h"

‎ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22

33
set(PICO_BOARD "pico_w")
44

5-
set(MICROPY_PY_LWIP ON)
6-
set(MICROPY_PY_NETWORK_CYW43 ON)
7-
8-
# Bluetooth
9-
set(MICROPY_PY_BLUETOOTH ON)
10-
set(MICROPY_BLUETOOTH_BTSTACK ON)
11-
set(MICROPY_PY_BLUETOOTH_CYW43 ON)
5+
include(enable_cyw43.cmake)
126

137
# Board specific version of the frozen manifest
148
set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)

‎ports/rp2/boards/RPI_PICO_W/mpconfigboard.h

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,6 @@
44
// todo: We need something to check our binary size
55
#define MICROPY_HW_FLASH_STORAGE_BYTES (848 * 1024)
66

7-
// Enable networking.
8-
#define MICROPY_PY_NETWORK 1
9-
#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "PicoW"
7+
#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "PicoW"
108

11-
// CYW43 driver configuration.
12-
#define CYW43_USE_SPI (1)
13-
#define CYW43_LWIP (1)
14-
#define CYW43_GPIO (1)
15-
#define CYW43_SPI_PIO (1)
16-
17-
// For debugging mbedtls - also set
18-
// Debug level (0-4) 1=warning, 2=info, 3=debug, 4=verbose
19-
// #define MODUSSL_MBEDTLS_DEBUG_LEVEL 1
20-
21-
#define MICROPY_HW_PIN_EXT_COUNT CYW43_WL_GPIO_COUNT
22-
23-
// If this returns true for a pin then its irq will not be disabled on a soft reboot
24-
int mp_hal_is_pin_reserved(int n);
25-
#define MICROPY_HW_PIN_RESERVED(i) mp_hal_is_pin_reserved(i)
9+
#include "enable_cyw43.h"

‎ports/rp2/enable_cyw43.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
set(MICROPY_PY_LWIP ON)
2+
set(MICROPY_PY_NETWORK_CYW43 ON)
3+
4+
# Bluetooth
5+
set(MICROPY_PY_BLUETOOTH ON)
6+
set(MICROPY_BLUETOOTH_BTSTACK ON)
7+
set(MICROPY_PY_BLUETOOTH_CYW43 ON)

‎ports/rp2/enable_cyw43.h

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Enable networking.
2+
#define MICROPY_PY_NETWORK 1
3+
4+
#ifndef MICROPY_PY_NETWORK_HOSTNAME_DEFAULT
5+
#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "Pico"
6+
#endif
7+
8+
// CYW43 driver configuration.
9+
#define CYW43_USE_SPI (1)
10+
#define CYW43_LWIP (1)
11+
#define CYW43_GPIO (1)
12+
#define CYW43_SPI_PIO (1)
13+
14+
// For debugging mbedtls - also set
15+
// Debug level (0-4) 1=warning, 2=info, 3=debug, 4=verbose
16+
// #define MODUSSL_MBEDTLS_DEBUG_LEVEL 1
17+
18+
#ifndef CYW43_WL_GPIO_COUNT
19+
#define CYW43_WL_GPIO_COUNT 3
20+
#endif
21+
22+
#define MICROPY_HW_PIN_EXT_COUNT CYW43_WL_GPIO_COUNT
23+
24+
int mp_hal_is_pin_reserved(int n);
25+
#define MICROPY_HW_PIN_RESERVED(i) mp_hal_is_pin_reserved(i)

0 commit comments

Comments
 (0)