Skip to content

Commit

Permalink
Merge pull request #5584 from gamblor21/is31
Browse files Browse the repository at this point in the history
IS31FL3741 Framebuffer Driver
  • Loading branch information
tannewt authored Nov 24, 2021
2 parents af2ac0a + 97032fd commit b09c777
Show file tree
Hide file tree
Showing 20 changed files with 949 additions and 2 deletions.
12 changes: 11 additions & 1 deletion locale/circuitpython.pot
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,7 @@ msgstr ""

#: shared-bindings/displayio/Display.c
#: shared-bindings/framebufferio/FramebufferDisplay.c
#: shared-bindings/is31fl3741/is31fl3741.c
#: shared-bindings/rgbmatrix/RGBMatrix.c
msgid "Brightness must be 0-1.0"
msgstr ""
Expand Down Expand Up @@ -1457,6 +1458,10 @@ msgstr ""
msgid "Key must be 16, 24, or 32 bytes long"
msgstr ""

#: shared-module/is31fl3741/is31fl3741.c
msgid "LED mappings must match display size"
msgstr ""

#: py/compile.c
msgid "LHS of keyword arg must be an id"
msgstr ""
Expand Down Expand Up @@ -2081,6 +2086,10 @@ msgstr ""
msgid "Sample rate too high. It must be less than %d"
msgstr ""

#: shared-bindings/is31fl3741/is31fl3741.c
msgid "Scale dimensions must divide by 3"
msgstr ""

#: ports/nrf/common-hal/_bleio/Adapter.c
msgid "Scan already in progess. Stop with stop_scan."
msgstr ""
Expand Down Expand Up @@ -2342,7 +2351,7 @@ msgstr ""
msgid "Unable to create lock"
msgstr ""

#: shared-module/displayio/I2CDisplay.c
#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/is31fl3741.c
#, c-format
msgid "Unable to find I2C Display at %x"
msgstr ""
Expand Down Expand Up @@ -4453,6 +4462,7 @@ msgstr ""
msgid "width must be from 2 to 8 (inclusive), not %d"
msgstr ""

#: shared-bindings/is31fl3741/is31fl3741.c
#: shared-bindings/rgbmatrix/RGBMatrix.c
msgid "width must be greater than zero"
msgstr ""
Expand Down
1 change: 1 addition & 0 deletions ports/nrf/boards/microbit_v2/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ CIRCUITPY_BUILTINS_POW3=0
CIRCUITPY_BUSDEVICE = 0
CIRCUITPY_COUNTIO = 0
CIRCUITPY_DISPLAYIO = 0
CIRCUITPY_IS31FL3741 = 0
CIRCUITPY_FRAMEBUFFERIO = 0
CIRCUITPY_FREQUENCYIO = 0
CIRCUITPY_I2CPERIPHERAL = 0
Expand Down
1 change: 1 addition & 0 deletions ports/nrf/boards/pca10100/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ CIRCUITPY_DISPLAYIO = 0
CIRCUITPY_FRAMEBUFFERIO = 0
CIRCUITPY_FREQUENCYIO = 0
CIRCUITPY_I2CPERIPHERAL = 0
CIRCUITPY_IS31FL3741 = 0
CIRCUITPY_JSON = 0
CIRCUITPY_KEYPAD = 0
CIRCUITPY_MSGPACK = 0
Expand Down
1 change: 1 addition & 0 deletions ports/nrf/boards/simmel/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ CIRCUITPY_DISPLAYIO = 0
CIRCUITPY_ERRNO = 0
CIRCUITPY_FRAMEBUFFERIO = 0
CIRCUITPY_GETPASS = 0
CIRCUITPY_IS31FL3741 = 0
CIRCUITPY_KEYPAD = 0
CIRCUITPY_MSGPACK = 0
CIRCUITPY_NEOPIXEL_WRITE = 0
Expand Down
2 changes: 2 additions & 0 deletions ports/nrf/mpconfigport.mk
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ CIRCUITPY_BLEIO ?= 1
# No I2CPeripheral implementation
CIRCUITPY_I2CPERIPHERAL = 0

CIRCUITPY_IS31FL3741 ?= 1

CIRCUITPY_RTC ?= 1

# frequencyio not yet implemented
Expand Down
5 changes: 5 additions & 0 deletions py/circuitpy_defns.mk
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,9 @@ endif
ifeq ($(CIRCUITPY_IPADDRESS),1)
SRC_PATTERNS += ipaddress/%
endif
ifeq ($(CIRCUITPY_IS31FL3741),1)
SRC_PATTERNS += is31fl3741/%
endif
ifeq ($(CIRCUITPY_KEYPAD),1)
SRC_PATTERNS += keypad/%
endif
Expand Down Expand Up @@ -548,6 +551,8 @@ SRC_SHARED_MODULE_ALL = \
imagecapture/ParallelImageCapture.c \
ipaddress/IPv4Address.c \
ipaddress/__init__.c \
is31fl3741/IS31FL3741.c \
is31fl3741/__init__.c \
keypad/__init__.c \
keypad/Event.c \
keypad/EventQueue.c \
Expand Down
1 change: 1 addition & 0 deletions py/circuitpy_mpconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ extern const struct _mp_obj_module_t nvm_module;
// CIRCUITPY_I2CPERIPHERAL
// CIRCUITPY_IMAGECAPTURE
// CIRCUITPY_IPADDRESS
// CIRCUITPY_IS31FL3741
// CIRCUITPY_KEYPAD
// CIRCUITPY_MATH
// CIRCUITPY_MEMORYMONITOR
Expand Down
3 changes: 3 additions & 0 deletions py/circuitpy_mpconfig.mk
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,9 @@ CFLAGS += -DCIRCUITPY_IMAGECAPTURE=$(CIRCUITPY_IMAGECAPTURE)
CIRCUITPY_IPADDRESS ?= $(CIRCUITPY_WIFI)
CFLAGS += -DCIRCUITPY_IPADDRESS=$(CIRCUITPY_IPADDRESS)

CIRCUITPY_IS31FL3741 ?= 0
CFLAGS += -DCIRCUITPY_IS31FL3741=$(CIRCUITPY_IS31FL3741)

CIRCUITPY_JSON ?= $(CIRCUITPY_FULL_BUILD)
CFLAGS += -DCIRCUITPY_JSON=$(CIRCUITPY_JSON)

Expand Down
Loading

0 comments on commit b09c777

Please sign in to comment.