Skip to content

Commit 1130b80

Browse files
tannewttannewt
authored
Merge pull request adafruit#3612 from gamblor21/bus_device
Moving Adafruit_CircuitPython_BusDevice to core
2 parents 348392f + cb863e4 commit 1130b80

37 files changed

Lines changed: 885 additions & 14 deletions

File tree

‎locale/circuitpython.pot‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,8 @@ msgstr ""
498498
msgid "Buffer must be a multiple of 512 bytes"
499499
msgstr ""
500500

501-
#: shared-bindings/bitbangio/I2C.c shared-bindings/busio/I2C.c
501+
#: shared-bindings/bitbangio/I2C.c shared-bindings/busdevice/I2CDevice.c
502+
#: shared-bindings/busio/I2C.c
502503
msgid "Buffer must be at least length 1"
503504
msgstr ""
504505

@@ -1295,6 +1296,11 @@ msgstr ""
12951296
msgid "No DMA channel found"
12961297
msgstr ""
12971298

1299+
#: shared-module/busdevice/I2CDevice.c
1300+
#, c-format
1301+
msgid "No I2C device at address: %x"
1302+
msgstr ""
1303+
12981304
#: ports/esp32s2/common-hal/busio/SPI.c ports/mimxrt10xx/common-hal/busio/SPI.c
12991305
#: ports/stm/common-hal/busio/SPI.c
13001306
msgid "No MISO Pin"

‎ports/atmel-samd/boards/8086_commander/mpconfigboard.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ SUPEROPT_GC = 0
1919
CFLAGS_INLINE_LIMIT = 60
2020

2121
CIRCUITPY_GAMEPAD = 1
22+
CIRCUITPY_BUSDEVICE = 1
2223

2324
# Include these Python libraries in firmware.
24-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
2525
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
2626
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
2727
#FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ADXL34x

‎ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ CIRCUITPY_BITBANGIO = 0
1515
CIRCUITPY_COUNTIO = 0
1616
CIRCUITPY_I2CPERIPHERAL = 0
1717
CIRCUITPY_VECTORIO = 0
18+
CIRCUITPY_BUSDEVICE = 0
1819

1920
CFLAGS_INLINE_LIMIT = 60
2021
SUPEROPT_GC = 0

‎ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ SUPEROPT_GC = 0
2121
CFLAGS_INLINE_LIMIT = 55
2222

2323
# Include these Python libraries in firmware.
24-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
2524
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
2625
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
2726
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH

‎ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ CFLAGS_INLINE_LIMIT = 50
2525

2626

2727
# Include these Python libraries in firmware.
28-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
2928
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
3029
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Crickit
3130
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH

‎ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ SUPEROPT_GC = 0
2626
CFLAGS_INLINE_LIMIT = 55
2727

2828
# Include these Python libraries in firmware.
29-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
3029
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
3130
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH
3231
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

‎ports/atmel-samd/boards/dynossat_edu_eps/mpconfigboard.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ CIRCUITPY_FREQUENCYIO = 0
1818
CIRCUITPY_COUNTIO = 0
1919
CIRCUITPY_I2CPERIPHERAL = 1
2020
CIRCUITPY_VECTORIO = 0
21+
CIRCUITPY_BUSDEVICE = 0
2122
CIRCUITPY_DISPLAYIO = 0
2223
CIRCUITPY_TOUCHIO = 0
2324
CIRCUITPY_ROTARYIO = 0

‎ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ CIRCUITPY_FREQUENCYIO = 0
1616
CIRCUITPY_COUNTIO = 0
1717
CIRCUITPY_I2CPERIPHERAL = 0
1818
CIRCUITPY_VECTORIO = 0
19+
CIRCUITPY_BUSDEVICE = 0
1920

2021
CFLAGS_INLINE_LIMIT = 60
2122
SUPEROPT_GC = 0

‎ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ CIRCUITPY_GAMEPAD = 0
2020
CFLAGS_INLINE_LIMIT = 50
2121

2222
# Include these Python libraries in firmware.
23-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
2423
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Crickit
2524
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Motor
2625
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

‎ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ CIRCUITPY_SAMD = 0
2121
CIRCUITPY_USB_MIDI = 0
2222
CIRCUITPY_USB_HID = 0
2323
CIRCUITPY_TOUCHIO = 0
24+
CIRCUITPY_BUSDEVICE = 1
2425
CFLAGS_INLINE_LIMIT = 35
2526

2627
# Make more room.
2728
SUPEROPT_GC = 0
2829

2930
# Include these Python libraries in firmware.
30-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
3131
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_RFM69

0 commit comments

Comments
 (0)