Skip to content

Commit 7a64af9

Browse files
dhalbertdhalbert
committed
rename bleio module to _bleio
1 parent b11b791 commit 7a64af9

Some content is hidden

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

60 files changed

+217
-214
lines changed

‎ports/nrf/bluetooth/ble_uart.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
#include "py/mphal.h"
3535
#include "py/runtime.h"
3636
#include "lib/utils/interrupt_char.h"
37-
#include "shared-bindings/bleio/Adapter.h"
38-
#include "shared-bindings/bleio/Characteristic.h"
39-
#include "shared-bindings/bleio/Device.h"
40-
#include "shared-bindings/bleio/Service.h"
41-
#include "shared-bindings/bleio/UUID.h"
37+
#include "shared-bindings/_bleio/Adapter.h"
38+
#include "shared-bindings/_bleio/Characteristic.h"
39+
#include "shared-bindings/_bleio/Device.h"
40+
#include "shared-bindings/_bleio/Service.h"
41+
#include "shared-bindings/_bleio/UUID.h"
4242

4343
#if (MICROPY_PY_BLE_NUS == 1)
4444

‎ports/nrf/common-hal/bleio/Adapter.c renamed to ‎ports/nrf/common-hal/_bleio/Adapter.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
#include "py/objstr.h"
3838
#include "py/runtime.h"
3939
#include "supervisor/usb.h"
40-
#include "shared-bindings/bleio/Adapter.h"
41-
#include "shared-bindings/bleio/Address.h"
40+
#include "shared-bindings/_bleio/Adapter.h"
41+
#include "shared-bindings/_bleio/Address.h"
4242

4343
#define BLE_MIN_CONN_INTERVAL MSEC_TO_UNITS(15, UNIT_0_625_MS)
4444
#define BLE_MAX_CONN_INTERVAL MSEC_TO_UNITS(15, UNIT_0_625_MS)

‎ports/nrf/common-hal/bleio/Adapter.h renamed to ‎ports/nrf/common-hal/_bleio/Adapter.h

File renamed without changes.

‎ports/nrf/common-hal/bleio/Attribute.c renamed to ‎ports/nrf/common-hal/_bleio/Attribute.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
#include "shared-bindings/bleio/Attribute.h"
27+
#include "shared-bindings/_bleio/Attribute.h"
2828

29-
// Convert a bleio security mode to a ble_gap_conn_sec_mode_t setting.
29+
// Convert a _bleio security mode to a ble_gap_conn_sec_mode_t setting.
3030
void bleio_attribute_gatts_set_security_mode(ble_gap_conn_sec_mode_t *perm, bleio_attribute_security_mode_t security_mode) {
3131
switch (security_mode) {
3232
case SECURITY_MODE_NO_ACCESS:

‎ports/nrf/common-hal/bleio/Attribute.h renamed to ‎ports/nrf/common-hal/_bleio/Attribute.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_BLEIO_ATTRIBUTE_H
2828
#define MICROPY_INCLUDED_NRF_COMMON_HAL_BLEIO_ATTRIBUTE_H
2929

30-
#include "shared-module/bleio/Attribute.h"
30+
#include "shared-module/_bleio/Attribute.h"
3131

3232
extern void bleio_attribute_gatts_set_security_mode(ble_gap_conn_sec_mode_t *perm, bleio_attribute_security_mode_t security_mode);
3333

‎ports/nrf/common-hal/bleio/Central.c renamed to ‎ports/nrf/common-hal/_bleio/Central.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
#include "nrf_soc.h"
3535
#include "py/objstr.h"
3636
#include "py/runtime.h"
37-
#include "shared-bindings/bleio/__init__.h"
38-
#include "shared-bindings/bleio/Adapter.h"
39-
#include "shared-bindings/bleio/Central.h"
37+
#include "shared-bindings/_bleio/__init__.h"
38+
#include "shared-bindings/_bleio/Adapter.h"
39+
#include "shared-bindings/_bleio/Central.h"
4040

4141
STATIC void central_on_ble_evt(ble_evt_t *ble_evt, void *central_in) {
4242
bleio_central_obj_t *central = (bleio_central_obj_t*)central_in;

‎ports/nrf/common-hal/bleio/Central.h renamed to ‎ports/nrf/common-hal/_bleio/Central.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <stdbool.h>
3232

3333
#include "py/objlist.h"
34-
#include "shared-module/bleio/Address.h"
34+
#include "shared-module/_bleio/Address.h"
3535

3636
typedef struct {
3737
mp_obj_base_t base;

‎ports/nrf/common-hal/bleio/Characteristic.c renamed to ‎ports/nrf/common-hal/_bleio/Characteristic.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727

2828
#include "py/runtime.h"
2929

30-
#include "shared-bindings/bleio/__init__.h"
31-
#include "shared-bindings/bleio/Characteristic.h"
32-
#include "shared-bindings/bleio/Descriptor.h"
33-
#include "shared-bindings/bleio/Service.h"
30+
#include "shared-bindings/_bleio/__init__.h"
31+
#include "shared-bindings/_bleio/Characteristic.h"
32+
#include "shared-bindings/_bleio/Descriptor.h"
33+
#include "shared-bindings/_bleio/Service.h"
3434

3535
static volatile bleio_characteristic_obj_t *m_read_characteristic;
3636

‎ports/nrf/common-hal/bleio/Characteristic.h renamed to ‎ports/nrf/common-hal/_bleio/Characteristic.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
#ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_BLEIO_CHARACTERISTIC_H
2929
#define MICROPY_INCLUDED_NRF_COMMON_HAL_BLEIO_CHARACTERISTIC_H
3030

31-
#include "shared-bindings/bleio/Attribute.h"
32-
#include "shared-module/bleio/Characteristic.h"
33-
#include "common-hal/bleio/Service.h"
34-
#include "common-hal/bleio/UUID.h"
31+
#include "shared-bindings/_bleio/Attribute.h"
32+
#include "shared-module/_bleio/Characteristic.h"
33+
#include "common-hal/_bleio/Service.h"
34+
#include "common-hal/_bleio/UUID.h"
3535

3636
typedef struct {
3737
mp_obj_base_t base;

‎ports/nrf/common-hal/bleio/CharacteristicBuffer.c renamed to ‎ports/nrf/common-hal/_bleio/CharacteristicBuffer.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737

3838
#include "tick.h"
3939

40-
#include "shared-bindings/bleio/__init__.h"
41-
#include "common-hal/bleio/CharacteristicBuffer.h"
40+
#include "shared-bindings/_bleio/__init__.h"
41+
#include "common-hal/_bleio/CharacteristicBuffer.h"
4242

4343
STATIC void write_to_ringbuf(bleio_characteristic_buffer_obj_t *self, uint8_t *data, uint16_t len) {
4444
// Push all the data onto the ring buffer.

‎ports/nrf/common-hal/bleio/CharacteristicBuffer.h renamed to ‎ports/nrf/common-hal/_bleio/CharacteristicBuffer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "nrf_soc.h"
3131

3232
#include "py/ringbuf.h"
33-
#include "shared-bindings/bleio/Characteristic.h"
33+
#include "shared-bindings/_bleio/Characteristic.h"
3434

3535
typedef struct {
3636
mp_obj_base_t base;

‎ports/nrf/common-hal/bleio/Descriptor.c renamed to ‎ports/nrf/common-hal/_bleio/Descriptor.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828

2929
#include "py/runtime.h"
3030

31-
#include "shared-bindings/bleio/__init__.h"
32-
#include "shared-bindings/bleio/Descriptor.h"
33-
#include "shared-bindings/bleio/Service.h"
34-
#include "shared-bindings/bleio/UUID.h"
31+
#include "shared-bindings/_bleio/__init__.h"
32+
#include "shared-bindings/_bleio/Descriptor.h"
33+
#include "shared-bindings/_bleio/Service.h"
34+
#include "shared-bindings/_bleio/UUID.h"
3535

3636
static volatile bleio_descriptor_obj_t *m_read_descriptor;
3737

‎ports/nrf/common-hal/bleio/Descriptor.h renamed to ‎ports/nrf/common-hal/_bleio/Descriptor.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
#include "py/obj.h"
3333

34-
#include "common-hal/bleio/Characteristic.h"
35-
#include "common-hal/bleio/UUID.h"
34+
#include "common-hal/_bleio/Characteristic.h"
35+
#include "common-hal/_bleio/UUID.h"
3636

3737
typedef struct {
3838
mp_obj_base_t base;

‎ports/nrf/common-hal/bleio/Peripheral.c renamed to ‎ports/nrf/common-hal/_bleio/Peripheral.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
#include "py/objlist.h"
3737
#include "py/objstr.h"
3838
#include "py/runtime.h"
39-
#include "shared-bindings/bleio/__init__.h"
40-
#include "shared-bindings/bleio/Adapter.h"
41-
#include "shared-bindings/bleio/Attribute.h"
42-
#include "shared-bindings/bleio/Characteristic.h"
43-
#include "shared-bindings/bleio/Peripheral.h"
44-
#include "shared-bindings/bleio/Service.h"
45-
#include "shared-bindings/bleio/UUID.h"
39+
#include "shared-bindings/_bleio/__init__.h"
40+
#include "shared-bindings/_bleio/Adapter.h"
41+
#include "shared-bindings/_bleio/Attribute.h"
42+
#include "shared-bindings/_bleio/Characteristic.h"
43+
#include "shared-bindings/_bleio/Peripheral.h"
44+
#include "shared-bindings/_bleio/Service.h"
45+
#include "shared-bindings/_bleio/UUID.h"
4646

4747
#define BLE_ADV_LENGTH_FIELD_SIZE 1
4848
#define BLE_ADV_AD_TYPE_FIELD_SIZE 1

‎ports/nrf/common-hal/bleio/Peripheral.h renamed to ‎ports/nrf/common-hal/_bleio/Peripheral.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
#include "py/obj.h"
3636
#include "py/objlist.h"
3737

38-
#include "common-hal/bleio/__init__.h"
39-
#include "shared-module/bleio/Address.h"
38+
#include "common-hal/_bleio/__init__.h"
39+
#include "shared-module/_bleio/Address.h"
4040

4141
typedef enum {
4242
PAIR_NOT_PAIRED,

‎ports/nrf/common-hal/bleio/Scanner.c renamed to ‎ports/nrf/common-hal/_bleio/Scanner.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
#include "py/mphal.h"
3434
#include "py/objlist.h"
3535
#include "py/runtime.h"
36-
#include "shared-bindings/bleio/Adapter.h"
37-
#include "shared-bindings/bleio/ScanEntry.h"
38-
#include "shared-bindings/bleio/Scanner.h"
39-
#include "shared-module/bleio/ScanEntry.h"
36+
#include "shared-bindings/_bleio/Adapter.h"
37+
#include "shared-bindings/_bleio/ScanEntry.h"
38+
#include "shared-bindings/_bleio/Scanner.h"
39+
#include "shared-module/_bleio/ScanEntry.h"
4040

4141
static uint8_t m_scan_buffer_data[BLE_GAP_SCAN_BUFFER_MIN];
4242

‎ports/nrf/common-hal/bleio/Scanner.h renamed to ‎ports/nrf/common-hal/_bleio/Scanner.h

File renamed without changes.

‎ports/nrf/common-hal/bleio/Service.c renamed to ‎ports/nrf/common-hal/_bleio/Service.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
#include "ble_drv.h"
2929
#include "ble.h"
3030
#include "py/runtime.h"
31-
#include "common-hal/bleio/__init__.h"
32-
#include "shared-bindings/bleio/Characteristic.h"
33-
#include "shared-bindings/bleio/Descriptor.h"
34-
#include "shared-bindings/bleio/Peripheral.h"
35-
#include "shared-bindings/bleio/Service.h"
36-
#include "shared-bindings/bleio/Adapter.h"
31+
#include "common-hal/_bleio/__init__.h"
32+
#include "shared-bindings/_bleio/Characteristic.h"
33+
#include "shared-bindings/_bleio/Descriptor.h"
34+
#include "shared-bindings/_bleio/Peripheral.h"
35+
#include "shared-bindings/_bleio/Service.h"
36+
#include "shared-bindings/_bleio/Adapter.h"
3737

3838
void common_hal_bleio_service_construct(bleio_service_obj_t *self, bleio_peripheral_obj_t *peripheral, bleio_uuid_obj_t *uuid, bool is_secondary) {
3939
self->device = MP_OBJ_FROM_PTR(peripheral);

‎ports/nrf/common-hal/bleio/Service.h renamed to ‎ports/nrf/common-hal/_bleio/Service.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#define MICROPY_INCLUDED_NRF_COMMON_HAL_BLEIO_SERVICE_H
3030

3131
#include "py/objlist.h"
32-
#include "common-hal/bleio/UUID.h"
32+
#include "common-hal/_bleio/UUID.h"
3333

3434
typedef struct {
3535
mp_obj_base_t base;

‎ports/nrf/common-hal/bleio/UUID.c renamed to ‎ports/nrf/common-hal/_bleio/UUID.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#include <string.h>
3030

3131
#include "py/runtime.h"
32-
#include "common-hal/bleio/UUID.h"
33-
#include "shared-bindings/bleio/Adapter.h"
32+
#include "common-hal/_bleio/UUID.h"
33+
#include "shared-bindings/_bleio/Adapter.h"
3434

3535
#include "ble.h"
3636
#include "ble_drv.h"

‎ports/nrf/common-hal/bleio/UUID.h renamed to ‎ports/nrf/common-hal/_bleio/UUID.h

File renamed without changes.

‎ports/nrf/common-hal/bleio/__init__.c renamed to ‎ports/nrf/common-hal/_bleio/__init__.c

+10-10
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
*/
2828

2929
#include "py/runtime.h"
30-
#include "shared-bindings/bleio/__init__.h"
31-
#include "shared-bindings/bleio/Adapter.h"
32-
#include "shared-bindings/bleio/Central.h"
33-
#include "shared-bindings/bleio/Characteristic.h"
34-
#include "shared-bindings/bleio/Descriptor.h"
35-
#include "shared-bindings/bleio/Peripheral.h"
36-
#include "shared-bindings/bleio/Service.h"
37-
#include "shared-bindings/bleio/UUID.h"
30+
#include "shared-bindings/_bleio/__init__.h"
31+
#include "shared-bindings/_bleio/Adapter.h"
32+
#include "shared-bindings/_bleio/Central.h"
33+
#include "shared-bindings/_bleio/Characteristic.h"
34+
#include "shared-bindings/_bleio/Descriptor.h"
35+
#include "shared-bindings/_bleio/Peripheral.h"
36+
#include "shared-bindings/_bleio/Service.h"
37+
#include "shared-bindings/_bleio/UUID.h"
3838

39-
#include "common-hal/bleio/__init__.h"
39+
#include "common-hal/_bleio/__init__.h"
4040

4141
static volatile bool m_discovery_in_process;
4242
static volatile bool m_discovery_successful;
@@ -51,7 +51,7 @@ void bleio_reset() {
5151
}
5252
}
5353

54-
// The singleton bleio.Adapter object, bound to bleio.adapter
54+
// The singleton _bleio.Adapter object, bound to _bleio.adapter
5555
// It currently only has properties and no state
5656
const super_adapter_obj_t common_hal_bleio_adapter_obj = {
5757
.base = {

‎ports/nrf/common-hal/bleio/__init__.h renamed to ‎ports/nrf/common-hal/_bleio/__init__.h

File renamed without changes.

‎ports/nrf/supervisor/port.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
#include "shared-module/gamepad/__init__.h"
4040
#include "common-hal/microcontroller/Pin.h"
41-
#include "common-hal/bleio/__init__.h"
41+
#include "common-hal/_bleio/__init__.h"
4242
#include "common-hal/busio/I2C.h"
4343
#include "common-hal/busio/SPI.h"
4444
#include "common-hal/busio/UART.h"

‎py/circuitpy_defns.mk

+18-18
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ ifeq ($(CIRCUITPY_BITBANG_APA102),1)
122122
SRC_PATTERNS += bitbangio/SPI%
123123
endif
124124
ifeq ($(CIRCUITPY_BLEIO),1)
125-
SRC_PATTERNS += bleio/%
125+
SRC_PATTERNS += _bleio/%
126126
endif
127127
ifeq ($(CIRCUITPY_BOARD),1)
128128
SRC_PATTERNS += board/%
@@ -223,6 +223,17 @@ endif
223223

224224
# All possible sources are listed here, and are filtered by SRC_PATTERNS in SRC_COMMON_HAL
225225
SRC_COMMON_HAL_ALL = \
226+
_bleio/__init__.c \
227+
_bleio/Adapter.c \
228+
_bleio/Attribute.c \
229+
_bleio/Central.c \
230+
_bleio/Characteristic.c \
231+
_bleio/CharacteristicBuffer.c \
232+
_bleio/Descriptor.c \
233+
_bleio/Peripheral.c \
234+
_bleio/Scanner.c \
235+
_bleio/Service.c \
236+
_bleio/UUID.c \
226237
analogio/AnalogIn.c \
227238
analogio/AnalogOut.c \
228239
analogio/__init__.c \
@@ -233,17 +244,6 @@ SRC_COMMON_HAL_ALL = \
233244
audiopwmio/PWMAudioOut.c \
234245
audioio/__init__.c \
235246
audioio/AudioOut.c \
236-
bleio/__init__.c \
237-
bleio/Adapter.c \
238-
bleio/Attribute.c \
239-
bleio/Central.c \
240-
bleio/Characteristic.c \
241-
bleio/CharacteristicBuffer.c \
242-
bleio/Descriptor.c \
243-
bleio/Peripheral.c \
244-
bleio/Scanner.c \
245-
bleio/Service.c \
246-
bleio/UUID.c \
247247
board/__init__.c \
248248
busio/I2C.c \
249249
busio/SPI.c \
@@ -284,9 +284,9 @@ SRC_COMMON_HAL = $(filter $(SRC_PATTERNS), $(SRC_COMMON_HAL_ALL))
284284
# All possible sources are listed here, and are filtered by SRC_PATTERNS.
285285
SRC_BINDINGS_ENUMS = \
286286
$(filter $(SRC_PATTERNS), \
287-
bleio/Address.c \
288-
bleio/Attribute.c \
289-
bleio/ScanEntry.c \
287+
_bleio/Address.c \
288+
_bleio/Attribute.c \
289+
_bleio/ScanEntry.c \
290290
digitalio/Direction.c \
291291
digitalio/DriveMode.c \
292292
digitalio/Pull.c \
@@ -301,6 +301,9 @@ SRC_BINDINGS_ENUMS += \
301301
util.c
302302

303303
SRC_SHARED_MODULE_ALL = \
304+
_bleio/Address.c \
305+
_bleio/Attribute.c \
306+
_bleio/ScanEntry.c \
304307
_pixelbuf/PixelBuf.c \
305308
_pixelbuf/__init__.c \
306309
_stage/Layer.c \
@@ -317,9 +320,6 @@ SRC_SHARED_MODULE_ALL = \
317320
bitbangio/SPI.c \
318321
bitbangio/__init__.c \
319322
board/__init__.c \
320-
bleio/Address.c \
321-
bleio/Attribute.c \
322-
bleio/ScanEntry.c \
323323
busio/OneWire.c \
324324
displayio/Bitmap.c \
325325
displayio/ColorConverter.c \

‎py/circuitpy_mpconfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ extern const struct _mp_obj_module_t bitbangio_module;
259259
#endif
260260

261261
#if CIRCUITPY_BLEIO
262-
#define BLEIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_bleio), (mp_obj_t)&bleio_module },
262+
#define BLEIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR__bleio), (mp_obj_t)&bleio_module },
263263
extern const struct _mp_obj_module_t bleio_module;
264264
#else
265265
#define BLEIO_MODULE

‎py/circuitpy_mpconfig.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ CIRCUITPY_BITBANGIO = $(CIRCUITPY_FULL_BUILD)
9999
endif
100100
CFLAGS += -DCIRCUITPY_BITBANGIO=$(CIRCUITPY_BITBANGIO)
101101

102-
# Explicitly enabled for boards that support bleio.
102+
# Explicitly enabled for boards that support _bleio.
103103
ifndef CIRCUITPY_BLEIO
104104
CIRCUITPY_BLEIO = 0
105105
endif

0 commit comments

Comments
 (0)