Skip to content

Commit 4c93db3

Browse files
gamblor21gamblor21
committed
Renamed to adafruit_bus_device
1 parent 197539b commit 4c93db3

14 files changed

Lines changed: 115 additions & 115 deletions

File tree

‎py/circuitpy_defns.mk‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ ifeq ($(CIRCUITPY_BOARD),1)
134134
SRC_PATTERNS += board/%
135135
endif
136136
ifeq ($(CIRCUITPY_BUSDEVICE),1)
137-
SRC_PATTERNS += busdevice/%
137+
SRC_PATTERNS += adafruit_bus_device/%
138138
endif
139139
ifeq ($(CIRCUITPY_BUSIO),1)
140140
SRC_PATTERNS += busio/% bitbangio/OneWire.%
@@ -435,9 +435,9 @@ SRC_SHARED_MODULE_ALL = \
435435
bitbangio/SPI.c \
436436
bitbangio/__init__.c \
437437
board/__init__.c \
438-
busdevice/__init__.c \
439-
busdevice/I2CDevice.c \
440-
busdevice/SPIDevice.c \
438+
adafruit_bus_device/__init__.c \
439+
adafruit_bus_device/I2CDevice.c \
440+
adafruit_bus_device/SPIDevice.c \
441441
busio/OneWire.c \
442442
displayio/Bitmap.c \
443443
displayio/ColorConverter.c \

‎py/circuitpy_mpconfig.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,8 @@ extern const struct _mp_obj_module_t board_module;
325325
#endif
326326

327327
#if CIRCUITPY_BUSDEVICE
328-
extern const struct _mp_obj_module_t busdevice_module;
329-
#define BUSDEVICE_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_busdevice), (mp_obj_t)&busdevice_module },
328+
extern const struct _mp_obj_module_t adafruit_bus_device_module;
329+
#define BUSDEVICE_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_adafruit_bus_device), (mp_obj_t)&adafruit_bus_device_module },
330330
#else
331331
#define BUSDEVICE_MODULE
332332
#endif

‎py/circuitpy_mpconfig.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ CFLAGS += -DCIRCUITPY_BLEIO=$(CIRCUITPY_BLEIO)
9090
CIRCUITPY_BOARD ?= 1
9191
CFLAGS += -DCIRCUITPY_BOARD=$(CIRCUITPY_BOARD)
9292

93-
CIRCUITPY_BUSDEVICE ?= 1
93+
CIRCUITPY_BUSDEVICE ?= $(CIRCUITPY_FULL_BUILD)
9494
CFLAGS += -DCIRCUITPY_BUSDEVICE=$(CIRCUITPY_BUSDEVICE)
9595

9696
CIRCUITPY_BUSIO ?= 1

shared-bindings/busdevice/I2CDevice.c renamed to shared-bindings/adafruit_bus_device/I2CDevice.c

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
// busio.I2C class.
2929

3030
#include "shared-bindings/microcontroller/Pin.h"
31-
#include "shared-bindings/busdevice/I2CDevice.h"
31+
#include "shared-bindings/adafruit_bus_device/I2CDevice.h"
3232
#include "shared-bindings/util.h"
33-
#include "shared-module/busdevice/I2CDevice.h"
33+
#include "shared-module/adafruit_bus_device/I2CDevice.h"
3434

3535
#include "lib/utils/buffer_helper.h"
3636
#include "lib/utils/context_manager_helpers.h"
@@ -64,9 +64,9 @@
6464
//| device.write(bytes_read)"""
6565
//| ...
6666
//|
67-
STATIC mp_obj_t busdevice_i2cdevice_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
68-
busdevice_i2cdevice_obj_t *self = m_new_obj(busdevice_i2cdevice_obj_t);
69-
self->base.type = &busdevice_i2cdevice_type;
67+
STATIC mp_obj_t adafruit_bus_device_i2cdevice_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
68+
adafruit_bus_device_i2cdevice_obj_t *self = m_new_obj(adafruit_bus_device_i2cdevice_obj_t);
69+
self->base.type = &adafruit_bus_device_i2cdevice_type;
7070
enum { ARG_i2c, ARG_device_address, ARG_probe };
7171
static const mp_arg_t allowed_args[] = {
7272
{ MP_QSTR_i2c, MP_ARG_REQUIRED | MP_ARG_OBJ },
@@ -78,9 +78,9 @@ STATIC mp_obj_t busdevice_i2cdevice_make_new(const mp_obj_type_t *type, size_t n
7878

7979
busio_i2c_obj_t* i2c = args[ARG_i2c].u_obj;
8080

81-
common_hal_busdevice_i2cdevice_construct(MP_OBJ_TO_PTR(self), i2c, args[ARG_device_address].u_int);
81+
common_hal_adafruit_bus_device_i2cdevice_construct(MP_OBJ_TO_PTR(self), i2c, args[ARG_device_address].u_int);
8282
if (args[ARG_probe].u_bool == true) {
83-
common_hal_busdevice_i2cdevice_probe_for_device(self);
83+
common_hal_adafruit_bus_device_i2cdevice_probe_for_device(self);
8484
}
8585

8686
return (mp_obj_t)self;
@@ -90,22 +90,22 @@ STATIC mp_obj_t busdevice_i2cdevice_make_new(const mp_obj_type_t *type, size_t n
9090
//| """Context manager entry to lock bus."""
9191
//| ...
9292
//|
93-
STATIC mp_obj_t busdevice_i2cdevice_obj___enter__(mp_obj_t self_in) {
94-
busdevice_i2cdevice_obj_t *self = MP_OBJ_TO_PTR(self_in);
95-
common_hal_busdevice_i2cdevice_lock(self);
93+
STATIC mp_obj_t adafruit_bus_device_i2cdevice_obj___enter__(mp_obj_t self_in) {
94+
adafruit_bus_device_i2cdevice_obj_t *self = MP_OBJ_TO_PTR(self_in);
95+
common_hal_adafruit_bus_device_i2cdevice_lock(self);
9696
return self;
9797
}
98-
STATIC MP_DEFINE_CONST_FUN_OBJ_1(busdevice_i2cdevice___enter___obj, busdevice_i2cdevice_obj___enter__);
98+
STATIC MP_DEFINE_CONST_FUN_OBJ_1(adafruit_bus_device_i2cdevice___enter___obj, adafruit_bus_device_i2cdevice_obj___enter__);
9999

100100
//| def __exit__(self) -> None:
101101
//| """Automatically unlocks the bus on exit."""
102102
//| ...
103103
//|
104-
STATIC mp_obj_t busdevice_i2cdevice_obj___exit__(size_t n_args, const mp_obj_t *args) {
105-
common_hal_busdevice_i2cdevice_unlock(MP_OBJ_TO_PTR(args[0]));
104+
STATIC mp_obj_t adafruit_bus_device_i2cdevice_obj___exit__(size_t n_args, const mp_obj_t *args) {
105+
common_hal_adafruit_bus_device_i2cdevice_unlock(MP_OBJ_TO_PTR(args[0]));
106106
return mp_const_none;
107107
}
108-
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(busdevice_i2cdevice___exit___obj, 4, 4, busdevice_i2cdevice_obj___exit__);
108+
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(adafruit_bus_device_i2cdevice___exit___obj, 4, 4, adafruit_bus_device_i2cdevice_obj___exit__);
109109

110110
//| def readinto(self, buf, *, start=0, end=None) -> None:
111111
//| """
@@ -119,7 +119,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(busdevice_i2cdevice___exit___obj, 4,
119119
//| :param int end: Index to write up to but not include; if None, use ``len(buf)``"""
120120
//| ...
121121
//|
122-
STATIC void readinto(busdevice_i2cdevice_obj_t *self, mp_obj_t buffer, int32_t start, mp_int_t end) {
122+
STATIC void readinto(adafruit_bus_device_i2cdevice_obj_t *self, mp_obj_t buffer, int32_t start, mp_int_t end) {
123123
mp_buffer_info_t bufinfo;
124124
mp_get_buffer_raise(buffer, &bufinfo, MP_BUFFER_WRITE);
125125

@@ -129,29 +129,29 @@ STATIC void readinto(busdevice_i2cdevice_obj_t *self, mp_obj_t buffer, int32_t s
129129
mp_raise_ValueError(translate("Buffer must be at least length 1"));
130130
}
131131

132-
uint8_t status = common_hal_busdevice_i2cdevice_readinto(MP_OBJ_TO_PTR(self), ((uint8_t*)bufinfo.buf) + start, length);
132+
uint8_t status = common_hal_adafruit_bus_device_i2cdevice_readinto(MP_OBJ_TO_PTR(self), ((uint8_t*)bufinfo.buf) + start, length);
133133
if (status != 0) {
134134
mp_raise_OSError(status);
135135
}
136136
}
137137

138-
STATIC mp_obj_t busdevice_i2cdevice_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
138+
STATIC mp_obj_t adafruit_bus_device_i2cdevice_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
139139
enum { ARG_buffer, ARG_start, ARG_end };
140140
static const mp_arg_t allowed_args[] = {
141141
{ MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ },
142142
{ MP_QSTR_start, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
143143
{ MP_QSTR_end, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = INT_MAX} },
144144
};
145145

146-
busdevice_i2cdevice_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
146+
adafruit_bus_device_i2cdevice_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
147147

148148
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
149149
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
150150

151151
readinto(self, args[ARG_buffer].u_obj, args[ARG_start].u_int, args[ARG_end].u_int);
152152
return mp_const_none;
153153
}
154-
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(busdevice_i2cdevice_readinto_obj, 2, busdevice_i2cdevice_readinto);
154+
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(adafruit_bus_device_i2cdevice_readinto_obj, 2, adafruit_bus_device_i2cdevice_readinto);
155155

156156
//| def write(self, buf, *, start=0, end=None) -> None:
157157
//| """
@@ -165,7 +165,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(busdevice_i2cdevice_readinto_obj, 2, busdevice
165165
//| """
166166
//| ...
167167
//|
168-
STATIC void write(busdevice_i2cdevice_obj_t *self, mp_obj_t buffer, int32_t start, mp_int_t end) {
168+
STATIC void write(adafruit_bus_device_i2cdevice_obj_t *self, mp_obj_t buffer, int32_t start, mp_int_t end) {
169169
mp_buffer_info_t bufinfo;
170170
mp_get_buffer_raise(buffer, &bufinfo, MP_BUFFER_READ);
171171

@@ -175,28 +175,28 @@ STATIC void write(busdevice_i2cdevice_obj_t *self, mp_obj_t buffer, int32_t star
175175
mp_raise_ValueError(translate("Buffer must be at least length 1"));
176176
}
177177

178-
uint8_t status = common_hal_busdevice_i2cdevice_write(MP_OBJ_TO_PTR(self), ((uint8_t*)bufinfo.buf) + start, length);
178+
uint8_t status = common_hal_adafruit_bus_device_i2cdevice_write(MP_OBJ_TO_PTR(self), ((uint8_t*)bufinfo.buf) + start, length);
179179
if (status != 0) {
180180
mp_raise_OSError(status);
181181
}
182182
}
183183

184-
STATIC mp_obj_t busdevice_i2cdevice_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
184+
STATIC mp_obj_t adafruit_bus_device_i2cdevice_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
185185
enum { ARG_buffer, ARG_start, ARG_end };
186186
static const mp_arg_t allowed_args[] = {
187187
{ MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ },
188188
{ MP_QSTR_start, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
189189
{ MP_QSTR_end, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = INT_MAX} },
190190
};
191-
busdevice_i2cdevice_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
191+
adafruit_bus_device_i2cdevice_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
192192

193193
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
194194
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
195195

196196
write(self, args[ARG_buffer].u_obj, args[ARG_start].u_int, args[ARG_end].u_int);
197197
return mp_const_none;
198198
}
199-
MP_DEFINE_CONST_FUN_OBJ_KW(busdevice_i2cdevice_write_obj, 2, busdevice_i2cdevice_write);
199+
MP_DEFINE_CONST_FUN_OBJ_KW(adafruit_bus_device_i2cdevice_write_obj, 2, adafruit_bus_device_i2cdevice_write);
200200

201201

202202
//| def write_then_readinto(self, out_buffer, in_buffer, *, out_start=0, out_end=None, in_start=0, in_end=None) -> None:
@@ -221,7 +221,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(busdevice_i2cdevice_write_obj, 2, busdevice_i2cdevice
221221
//| """
222222
//| ...
223223
//|
224-
STATIC mp_obj_t busdevice_i2cdevice_write_then_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
224+
STATIC mp_obj_t adafruit_bus_device_i2cdevice_write_then_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
225225
enum { ARG_out_buffer, ARG_in_buffer, ARG_out_start, ARG_out_end, ARG_in_start, ARG_in_end };
226226
static const mp_arg_t allowed_args[] = {
227227
{ MP_QSTR_out_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ },
@@ -231,7 +231,7 @@ STATIC mp_obj_t busdevice_i2cdevice_write_then_readinto(size_t n_args, const mp_
231231
{ MP_QSTR_in_start, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
232232
{ MP_QSTR_in_end, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = INT_MAX} },
233233
};
234-
busdevice_i2cdevice_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
234+
adafruit_bus_device_i2cdevice_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
235235

236236
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
237237
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -242,21 +242,21 @@ STATIC mp_obj_t busdevice_i2cdevice_write_then_readinto(size_t n_args, const mp_
242242

243243
return mp_const_none;
244244
}
245-
MP_DEFINE_CONST_FUN_OBJ_KW(busdevice_i2cdevice_write_then_readinto_obj, 3, busdevice_i2cdevice_write_then_readinto);
246-
247-
STATIC const mp_rom_map_elem_t busdevice_i2cdevice_locals_dict_table[] = {
248-
{ MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&busdevice_i2cdevice___enter___obj) },
249-
{ MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&busdevice_i2cdevice___exit___obj) },
250-
{ MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&busdevice_i2cdevice_readinto_obj) },
251-
{ MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&busdevice_i2cdevice_write_obj) },
252-
{ MP_ROM_QSTR(MP_QSTR_write_then_readinto), MP_ROM_PTR(&busdevice_i2cdevice_write_then_readinto_obj) },
245+
MP_DEFINE_CONST_FUN_OBJ_KW(adafruit_bus_device_i2cdevice_write_then_readinto_obj, 3, adafruit_bus_device_i2cdevice_write_then_readinto);
246+
247+
STATIC const mp_rom_map_elem_t adafruit_bus_device_i2cdevice_locals_dict_table[] = {
248+
{ MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&adafruit_bus_device_i2cdevice___enter___obj) },
249+
{ MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&adafruit_bus_device_i2cdevice___exit___obj) },
250+
{ MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&adafruit_bus_device_i2cdevice_readinto_obj) },
251+
{ MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&adafruit_bus_device_i2cdevice_write_obj) },
252+
{ MP_ROM_QSTR(MP_QSTR_write_then_readinto), MP_ROM_PTR(&adafruit_bus_device_i2cdevice_write_then_readinto_obj) },
253253
};
254254

255-
STATIC MP_DEFINE_CONST_DICT(busdevice_i2cdevice_locals_dict, busdevice_i2cdevice_locals_dict_table);
255+
STATIC MP_DEFINE_CONST_DICT(adafruit_bus_device_i2cdevice_locals_dict, adafruit_bus_device_i2cdevice_locals_dict_table);
256256

257-
const mp_obj_type_t busdevice_i2cdevice_type = {
257+
const mp_obj_type_t adafruit_bus_device_i2cdevice_type = {
258258
{ &mp_type_type },
259259
.name = MP_QSTR_I2CDevice,
260-
.make_new = busdevice_i2cdevice_make_new,
261-
.locals_dict = (mp_obj_dict_t*)&busdevice_i2cdevice_locals_dict,
260+
.make_new = adafruit_bus_device_i2cdevice_make_new,
261+
.locals_dict = (mp_obj_dict_t*)&adafruit_bus_device_i2cdevice_locals_dict,
262262
};

shared-bindings/busdevice/I2CDevice.h renamed to shared-bindings/adafruit_bus_device/I2CDevice.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,18 @@
3636

3737
#include "py/obj.h"
3838

39-
#include "shared-module/busdevice/I2CDevice.h"
39+
#include "shared-module/adafruit_bus_device/I2CDevice.h"
4040
//#include "shared-bindings/busio/I2C.h"
4141

4242
// Type object used in Python. Should be shared between ports.
43-
extern const mp_obj_type_t busdevice_i2cdevice_type;
43+
extern const mp_obj_type_t adafruit_bus_device_i2cdevice_type;
4444

4545
// Initializes the hardware peripheral.
46-
extern void common_hal_busdevice_i2cdevice_construct(busdevice_i2cdevice_obj_t *self, busio_i2c_obj_t *i2c, uint8_t device_address);
47-
extern uint8_t common_hal_busdevice_i2cdevice_readinto(busdevice_i2cdevice_obj_t *self, mp_obj_t buffer, size_t length);
48-
extern uint8_t common_hal_busdevice_i2cdevice_write(busdevice_i2cdevice_obj_t *self, mp_obj_t buffer, size_t length);
49-
extern void common_hal_busdevice_i2cdevice_lock(busdevice_i2cdevice_obj_t *self);
50-
extern void common_hal_busdevice_i2cdevice_unlock(busdevice_i2cdevice_obj_t *self);
51-
extern void common_hal_busdevice_i2cdevice_probe_for_device(busdevice_i2cdevice_obj_t *self);
46+
extern void common_hal_adafruit_bus_device_i2cdevice_construct(adafruit_bus_device_i2cdevice_obj_t *self, busio_i2c_obj_t *i2c, uint8_t device_address);
47+
extern uint8_t common_hal_adafruit_bus_device_i2cdevice_readinto(adafruit_bus_device_i2cdevice_obj_t *self, mp_obj_t buffer, size_t length);
48+
extern uint8_t common_hal_adafruit_bus_device_i2cdevice_write(adafruit_bus_device_i2cdevice_obj_t *self, mp_obj_t buffer, size_t length);
49+
extern void common_hal_adafruit_bus_device_i2cdevice_lock(adafruit_bus_device_i2cdevice_obj_t *self);
50+
extern void common_hal_adafruit_bus_device_i2cdevice_unlock(adafruit_bus_device_i2cdevice_obj_t *self);
51+
extern void common_hal_adafruit_bus_device_i2cdevice_probe_for_device(adafruit_bus_device_i2cdevice_obj_t *self);
5252

5353
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_BUSDEVICE_I2CDEVICE_H

shared-bindings/busdevice/SPIDevice.c renamed to shared-bindings/adafruit_bus_device/SPIDevice.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
*/
2626

2727
#include "shared-bindings/microcontroller/Pin.h"
28-
#include "shared-bindings/busdevice/SPIDevice.h"
28+
#include "shared-bindings/adafruit_bus_device/SPIDevice.h"
2929
#include "shared-bindings/util.h"
30-
#include "shared-module/busdevice/SPIDevice.h"
30+
#include "shared-module/adafruit_bus_device/SPIDevice.h"
3131
#include "common-hal/digitalio/DigitalInOut.h"
3232
#include "shared-bindings/digitalio/DigitalInOut.h"
3333

@@ -69,9 +69,9 @@
6969
//| spi.write(bytes_read)"""
7070
//| ...
7171
//|
72-
STATIC mp_obj_t busdevice_spidevice_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
73-
busdevice_spidevice_obj_t *self = m_new_obj(busdevice_spidevice_obj_t);
74-
self->base.type = &busdevice_spidevice_type;
72+
STATIC mp_obj_t adafruit_bus_device_spidevice_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
73+
adafruit_bus_device_spidevice_obj_t *self = m_new_obj(adafruit_bus_device_spidevice_obj_t);
74+
self->base.type = &adafruit_bus_device_spidevice_type;
7575
enum { ARG_spi, ARG_chip_select, ARG_baudrate, ARG_polarity, ARG_phase, ARG_extra_clocks };
7676
static const mp_arg_t allowed_args[] = {
7777
{ MP_QSTR_spi, MP_ARG_REQUIRED | MP_ARG_OBJ },
@@ -86,7 +86,7 @@ STATIC mp_obj_t busdevice_spidevice_make_new(const mp_obj_type_t *type, size_t n
8686

8787
busio_spi_obj_t* spi = args[ARG_spi].u_obj;
8888

89-
common_hal_busdevice_spidevice_construct(MP_OBJ_TO_PTR(self), spi, args[ARG_chip_select].u_obj, args[ARG_baudrate].u_int, args[ARG_polarity].u_int,
89+
common_hal_adafruit_bus_device_spidevice_construct(MP_OBJ_TO_PTR(self), spi, args[ARG_chip_select].u_obj, args[ARG_baudrate].u_int, args[ARG_polarity].u_int,
9090
args[ARG_phase].u_int, args[ARG_extra_clocks].u_int);
9191

9292
if (args[ARG_chip_select].u_obj != MP_OBJ_NULL) {
@@ -100,29 +100,29 @@ STATIC mp_obj_t busdevice_spidevice_make_new(const mp_obj_type_t *type, size_t n
100100
return (mp_obj_t)self;
101101
}
102102

103-
STATIC mp_obj_t busdevice_spidevice_obj___enter__(mp_obj_t self_in) {
104-
busdevice_spidevice_obj_t *self = MP_OBJ_TO_PTR(self_in);
105-
common_hal_busdevice_spidevice_enter(self);
103+
STATIC mp_obj_t adafruit_bus_device_spidevice_obj___enter__(mp_obj_t self_in) {
104+
adafruit_bus_device_spidevice_obj_t *self = MP_OBJ_TO_PTR(self_in);
105+
common_hal_adafruit_bus_device_spidevice_enter(self);
106106
return self->spi;
107107
}
108-
STATIC MP_DEFINE_CONST_FUN_OBJ_1(busdevice_spidevice___enter___obj, busdevice_spidevice_obj___enter__);
108+
STATIC MP_DEFINE_CONST_FUN_OBJ_1(adafruit_bus_device_spidevice___enter___obj, adafruit_bus_device_spidevice_obj___enter__);
109109

110-
STATIC mp_obj_t busdevice_spidevice_obj___exit__(size_t n_args, const mp_obj_t *args) {
111-
common_hal_busdevice_spidevice_exit(MP_OBJ_TO_PTR(args[0]));
110+
STATIC mp_obj_t adafruit_bus_device_spidevice_obj___exit__(size_t n_args, const mp_obj_t *args) {
111+
common_hal_adafruit_bus_device_spidevice_exit(MP_OBJ_TO_PTR(args[0]));
112112
return mp_const_none;
113113
}
114-
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(busdevice_spidevice___exit___obj, 4, 4, busdevice_spidevice_obj___exit__);
114+
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(adafruit_bus_device_spidevice___exit___obj, 4, 4, adafruit_bus_device_spidevice_obj___exit__);
115115

116-
STATIC const mp_rom_map_elem_t busdevice_spidevice_locals_dict_table[] = {
117-
{ MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&busdevice_spidevice___enter___obj) },
118-
{ MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&busdevice_spidevice___exit___obj) },
116+
STATIC const mp_rom_map_elem_t adafruit_bus_device_spidevice_locals_dict_table[] = {
117+
{ MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&adafruit_bus_device_spidevice___enter___obj) },
118+
{ MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&adafruit_bus_device_spidevice___exit___obj) },
119119
};
120120

121-
STATIC MP_DEFINE_CONST_DICT(busdevice_spidevice_locals_dict, busdevice_spidevice_locals_dict_table);
121+
STATIC MP_DEFINE_CONST_DICT(adafruit_bus_device_spidevice_locals_dict, adafruit_bus_device_spidevice_locals_dict_table);
122122

123-
const mp_obj_type_t busdevice_spidevice_type = {
123+
const mp_obj_type_t adafruit_bus_device_spidevice_type = {
124124
{ &mp_type_type },
125125
.name = MP_QSTR_SPIDevice,
126-
.make_new = busdevice_spidevice_make_new,
127-
.locals_dict = (mp_obj_dict_t*)&busdevice_spidevice_locals_dict,
126+
.make_new = adafruit_bus_device_spidevice_make_new,
127+
.locals_dict = (mp_obj_dict_t*)&adafruit_bus_device_spidevice_locals_dict,
128128
};

shared-bindings/busdevice/SPIDevice.h renamed to shared-bindings/adafruit_bus_device/SPIDevice.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@
3636

3737
#include "py/obj.h"
3838

39-
#include "shared-module/busdevice/SPIDevice.h"
39+
#include "shared-module/adafruit_bus_device/SPIDevice.h"
4040

4141
// Type object used in Python. Should be shared between ports.
42-
extern const mp_obj_type_t busdevice_spidevice_type;
42+
extern const mp_obj_type_t adafruit_bus_device_spidevice_type;
4343

4444
// Initializes the hardware peripheral.
45-
extern void common_hal_busdevice_spidevice_construct(busdevice_spidevice_obj_t *self, busio_spi_obj_t *spi, digitalio_digitalinout_obj_t *cs,
45+
extern void common_hal_adafruit_bus_device_spidevice_construct(adafruit_bus_device_spidevice_obj_t *self, busio_spi_obj_t *spi, digitalio_digitalinout_obj_t *cs,
4646
uint32_t baudrate, uint8_t polarity, uint8_t phase, uint8_t extra_clocks);
47-
extern void common_hal_busdevice_spidevice_enter(busdevice_spidevice_obj_t *self);
48-
extern void common_hal_busdevice_spidevice_exit(busdevice_spidevice_obj_t *self);
47+
extern void common_hal_adafruit_bus_device_spidevice_enter(adafruit_bus_device_spidevice_obj_t *self);
48+
extern void common_hal_adafruit_bus_device_spidevice_exit(adafruit_bus_device_spidevice_obj_t *self);
4949

5050
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_BUSDEVICE_SPIDEVICE_H

0 commit comments

Comments
 (0)