Skip to content

Commit 2c4e3aa

Browse files
authored
Merge pull request #5786 from prplz/fix-busdevice-stub-path
Fix busdevice stub path
2 parents 6ca957e + fe71ee0 commit 2c4e3aa

File tree

10 files changed

+12
-12
lines changed

10 files changed

+12
-12
lines changed

py/circuitpy_defns.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,8 +524,8 @@ SRC_SHARED_MODULE_ALL = \
524524
bitops/__init__.c \
525525
board/__init__.c \
526526
adafruit_bus_device/__init__.c \
527-
adafruit_bus_device/I2CDevice.c \
528-
adafruit_bus_device/SPIDevice.c \
527+
adafruit_bus_device/i2c_device/I2CDevice.c \
528+
adafruit_bus_device/spi_device/SPIDevice.c \
529529
canio/Match.c \
530530
canio/Message.c \
531531
canio/RemoteTransmissionRequest.c \

shared-bindings/adafruit_bus_device/__init__.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
#include "py/objproperty.h"
3333

3434
#include "shared-bindings/adafruit_bus_device/__init__.h"
35-
#include "shared-bindings/adafruit_bus_device/I2CDevice.h"
36-
#include "shared-bindings/adafruit_bus_device/SPIDevice.h"
35+
#include "shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.h"
36+
#include "shared-bindings/adafruit_bus_device/spi_device/SPIDevice.h"
3737

3838
STATIC const mp_rom_map_elem_t adafruit_bus_device_i2c_device_globals_table[] = {
3939
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_i2c_device) },

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

Lines changed: 2 additions & 2 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/adafruit_bus_device/I2CDevice.h"
31+
#include "shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.h"
3232
#include "shared-bindings/util.h"
33-
#include "shared-module/adafruit_bus_device/I2CDevice.h"
33+
#include "shared-module/adafruit_bus_device/i2c_device/I2CDevice.h"
3434

3535
#include "shared/runtime/buffer_helper.h"
3636
#include "shared/runtime/context_manager_helpers.h"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
#include "py/obj.h"
3838

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

4242
// Type object used in Python. Should be shared between ports.

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

Lines changed: 2 additions & 2 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/adafruit_bus_device/SPIDevice.h"
28+
#include "shared-bindings/adafruit_bus_device/spi_device/SPIDevice.h"
2929
#include "shared-bindings/util.h"
30-
#include "shared-module/adafruit_bus_device/SPIDevice.h"
30+
#include "shared-module/adafruit_bus_device/spi_device/SPIDevice.h"
3131
#include "common-hal/digitalio/DigitalInOut.h"
3232
#include "shared-bindings/digitalio/DigitalInOut.h"
3333

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
#include "py/obj.h"
3838

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

4141
// Type object used in Python. Should be shared between ports.
4242
extern const mp_obj_type_t adafruit_bus_device_spidevice_type;

shared-module/adafruit_bus_device/I2CDevice.c renamed to shared-module/adafruit_bus_device/i2c_device/I2CDevice.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
#include "shared-bindings/adafruit_bus_device/I2CDevice.h"
27+
#include "shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.h"
2828
#include "shared-bindings/busio/I2C.h"
2929
#include "py/mperrno.h"
3030
#include "py/nlr.h"

shared-module/adafruit_bus_device/SPIDevice.c renamed to shared-module/adafruit_bus_device/spi_device/SPIDevice.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
#include "shared-bindings/adafruit_bus_device/SPIDevice.h"
27+
#include "shared-bindings/adafruit_bus_device/spi_device/SPIDevice.h"
2828
#include "shared-bindings/busio/SPI.h"
2929
#include "shared-bindings/digitalio/DigitalInOut.h"
3030
#include "py/mperrno.h"

0 commit comments

Comments
 (0)