Skip to content

Commit e490b7f

Browse files
committed
Removed __init__.py, updated import method to resolve M0 mem issue
1 parent 70f673e commit e490b7f

12 files changed

+158
-137
lines changed

adafruit_character_lcd/__init__.py

Lines changed: 0 additions & 3 deletions
This file was deleted.

adafruit_character_lcd/character_lcd.py renamed to adafruit_character_lcd/character_lcd_mono.py

Lines changed: 44 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
__version__ = "0.0.0-auto.0"
5454
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_CharLCD.git"
5555

56-
#pylint: disable-msg=bad-whitespace
56+
# pylint: disable-msg=bad-whitespace
5757
# Commands
5858
_LCD_CLEARDISPLAY = const(0x01)
5959
_LCD_RETURNHOME = const(0x02)
@@ -91,6 +91,7 @@
9191

9292
# pylint: enable-msg=bad-whitespace
9393

94+
9495
def _set_bit(byte_value, position, val):
9596
# Given the specified byte_value set the bit at position to the provided
9697
# boolean value val and return the modified byte.
@@ -188,11 +189,11 @@ def clear(self):
188189
import time
189190
import board
190191
import busio
191-
import adafruit_character_lcd
192+
import adafruit_character_lcd.character_lcd_mono as character_lcd
192193
193194
i2c = busio.I2C(board.SCL, board.SDA)
194195
195-
lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
196+
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)
196197
197198
lcd.message = "Hello, world!"
198199
time.sleep(5)
@@ -212,11 +213,11 @@ def cursor(self):
212213
import time
213214
import board
214215
import busio
215-
import adafruit_character_lcd
216+
import adafruit_character_lcd.character_lcd_mono as character_lcd
216217
217218
i2c = busio.I2C(board.SCL, board.SDA)
218219
219-
lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
220+
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)
220221
221222
lcd.cursor = True
222223
lcd.message = "Cursor! "
@@ -257,11 +258,11 @@ def blink(self):
257258
import time
258259
import board
259260
import busio
260-
import adafruit_character_lcd
261+
import adafruit_character_lcd.character_lcd_mono as character_lcd
261262
262263
i2c = busio.I2C(board.SCL, board.SDA)
263264
264-
lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
265+
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)
265266
266267
lcd.blink = True
267268
lcd.message = "Blinky cursor!"
@@ -290,11 +291,11 @@ def display(self):
290291
import time
291292
import board
292293
import busio
293-
import adafruit_character_lcd
294+
import adafruit_character_lcd.character_lcd_mono as character_lcd
294295
295296
i2c = busio.I2C(board.SCL, board.SDA)
296297
297-
lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
298+
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)
298299
299300
lcd.message = "Hello, world!"
300301
time.sleep(5)
@@ -321,11 +322,11 @@ def message(self):
321322
import time
322323
import board
323324
import busio
324-
import adafruit_character_lcd
325+
import adafruit_character_lcd.character_lcd_mono as character_lcd
325326
326327
i2c = busio.I2C(board.SCL, board.SDA)
327328
328-
lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
329+
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)
329330
330331
lcd.message = "Hello, world!"
331332
time.sleep(5)
@@ -368,11 +369,11 @@ def move_left(self):
368369
import time
369370
import board
370371
import busio
371-
import adafruit_character_lcd
372+
import adafruit_character_lcd.character_lcd_mono as character_lcd
372373
373374
i2c = busio.I2C(board.SCL, board.SDA)
374375
375-
lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
376+
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)
376377
377378
scroll_message = "<-- Scroll"
378379
lcd.message = scroll_message
@@ -393,14 +394,14 @@ def move_right(self):
393394
import time
394395
import board
395396
import busio
396-
import adafruit_character_lcd
397+
import adafruit_character_lcd.character_lcd_mono as character_lcd
397398
398399
i2c = busio.I2C(board.SCL, board.SDA)
399400
400401
lcd_columns = 16
401402
lcd_rows = 2
402403
403-
lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, lcd_columns, lcd_rows)
404+
lcd = character_lcd.Character_LCD_I2C(i2c, lcd_columns, lcd_rows)
404405
405406
scroll_message = "Scroll -->"
406407
lcd.message = scroll_message
@@ -425,11 +426,11 @@ def text_direction(self):
425426
import time
426427
import board
427428
import busio
428-
import adafruit_character_lcd
429+
import adafruit_character_lcd.character_lcd_mono as character_lcd
429430
430431
i2c = busio.I2C(board.SCL, board.SDA)
431432
432-
lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
433+
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)
433434
434435
lcd.text_direction = lcd.RIGHT_TO_LEFT
435436
lcd.message = "Hello, world!"
@@ -467,11 +468,11 @@ def backlight(self):
467468
import time
468469
import board
469470
import busio
470-
import adafruit_character_lcd
471+
import adafruit_character_lcd.character_lcd_mono as character_lcd
471472
472473
i2c = busio.I2C(board.SCL, board.SDA)
473474
474-
lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
475+
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)
475476
476477
lcd.backlight = False
477478
lcd.message = "Hello, world?"
@@ -548,6 +549,17 @@ class Character_LCD_I2C(Character_LCD):
548549
"""Character LCD connected to I2C/SPI backpack using its I2C connection.
549550
This is a subclass of Character_LCD and implements all of the same
550551
functions and functionality.
552+
553+
To use, import and initialise as follows:
554+
555+
.. code-block:: python
556+
557+
import board
558+
import busio
559+
import adafruit_character_lcd.character_lcd_mono as character_lcd
560+
561+
i2c = busio.I2C(board.SCL, board.SDA)
562+
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)
551563
"""
552564
def __init__(self, i2c, columns, lines, backlight_inverted=False):
553565
"""Initialize character LCD connectedto backpack using I2C connection
@@ -572,6 +584,19 @@ class Character_LCD_SPI(Character_LCD):
572584
"""Character LCD connected to I2C/SPI backpack using its SPI connection.
573585
This is a subclass of Character_LCD and implements all of the same
574586
functions and functionality.
587+
588+
To use, import and initialise as follows:
589+
590+
.. code-block:: python
591+
592+
import board
593+
import busio
594+
import digitalio
595+
import adafruit_character_lcd.character_lcd_mono as character_lcd
596+
597+
spi = busio.SPI(board.SCK, MOSI=board.MOSI)
598+
latch = digitalio.DigitalInOut(board.D5)
599+
lcd = character_lcd.Character_LCD_SPI(spi, latch, 16, 2)
575600
"""
576601

577602
def __init__(self, spi, latch, columns, lines, backlight_inverted=False):

adafruit_character_lcd/character_lcd_rgb.py

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,11 @@ def clear(self):
202202
import time
203203
import board
204204
import busio
205-
import adafruit_character_lcd
205+
import adafruit_character_lcd.character_lcd_rgb as character_lcd
206206
207207
i2c = busio.I2C(board.SCL, board.SDA)
208208
209-
lcd = adafruit_character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)
209+
lcd = character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)
210210
211211
lcd.message = "Hello, world!"
212212
time.sleep(5)
@@ -226,11 +226,11 @@ def cursor(self):
226226
import time
227227
import board
228228
import busio
229-
import adafruit_character_lcd
229+
import adafruit_character_lcd.character_lcd_rgb as character_lcd
230230
231231
i2c = busio.I2C(board.SCL, board.SDA)
232232
233-
lcd = adafruit_character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)
233+
lcd = character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)
234234
235235
lcd.cursor = True
236236
lcd.message = "Cursor! "
@@ -271,11 +271,11 @@ def blink(self):
271271
import time
272272
import board
273273
import busio
274-
import adafruit_character_lcd
274+
import adafruit_character_lcd.character_lcd_rgb as character_lcd
275275
276276
i2c = busio.I2C(board.SCL, board.SDA)
277277
278-
lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
278+
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)
279279
280280
lcd.blink = True
281281
lcd.message = "Blinky cursor!"
@@ -309,11 +309,11 @@ def color(self):
309309
import time
310310
import board
311311
import busio
312-
import adafruit_character_lcd
312+
import adafruit_character_lcd.character_lcd_rgb as character_lcd
313313
314314
i2c = busio.I2C(board.SCL, board.SDA)
315315
316-
lcd = adafruit_character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)
316+
lcd = character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)
317317
318318
lcd.color = [100, 0, 0]
319319
lcd.message = "Hello, world!"
@@ -346,11 +346,11 @@ def display(self):
346346
import time
347347
import board
348348
import busio
349-
import adafruit_character_lcd
349+
import adafruit_character_lcd.character_lcd_rgb as character_lcd
350350
351351
i2c = busio.I2C(board.SCL, board.SDA)
352352
353-
lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
353+
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)
354354
355355
lcd.message = "Hello, world!"
356356
time.sleep(5)
@@ -377,11 +377,11 @@ def message(self):
377377
import time
378378
import board
379379
import busio
380-
import adafruit_character_lcd
380+
import adafruit_character_lcd.character_lcd_rgb as character_lcd
381381
382382
i2c = busio.I2C(board.SCL, board.SDA)
383383
384-
lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
384+
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)
385385
386386
lcd.message = "Hello, world!"
387387
time.sleep(5)
@@ -420,11 +420,11 @@ def move_left(self):
420420
import time
421421
import board
422422
import busio
423-
import adafruit_character_lcd
423+
import adafruit_character_lcd.character_lcd_rgb as character_lcd
424424
425425
i2c = busio.I2C(board.SCL, board.SDA)
426426
427-
lcd = adafruit_character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)
427+
lcd = character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)
428428
429429
scroll_message = "<-- Scroll"
430430
lcd.message = scroll_message
@@ -445,14 +445,11 @@ def move_right(self):
445445
import time
446446
import board
447447
import busio
448-
import adafruit_character_lcd
448+
import adafruit_character_lcd.character_lcd_rgb as character_lcd
449449
450450
i2c = busio.I2C(board.SCL, board.SDA)
451451
452-
lcd_columns = 16
453-
lcd_rows = 2
454-
455-
lcd = adafruit_character_lcd.Character_LCD_I2C_RGB(i2c, lcd_columns, lcd_rows)
452+
lcd = character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)
456453
457454
scroll_message = "Scroll -->"
458455
lcd.message = scroll_message
@@ -477,11 +474,11 @@ def text_direction(self):
477474
import time
478475
import board
479476
import busio
480-
import adafruit_character_lcd
477+
import adafruit_character_lcd.character_lcd_rgb as character_lcd
481478
482479
i2c = busio.I2C(board.SCL, board.SDA)
483480
484-
lcd = adafruit_character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)
481+
lcd = character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)
485482
486483
lcd.text_direction = lcd.RIGHT_TO_LEFT
487484
lcd.message = "Hello, world!"
@@ -565,6 +562,17 @@ class Character_LCD_I2C_RGB(Character_LCD_RGB):
565562
"""RGB Character LCD connected to I2C shield using I2C connection.
566563
This is a subclass of Character_LCD_RGB and implements all of the same
567564
functions and functionality.
565+
566+
To use, import and initialise as follows:
567+
568+
.. code-block:: python
569+
570+
import board
571+
import busio
572+
import adafruit_character_lcd.character_lcd_rgb as character_lcd
573+
574+
i2c = busio.I2C(board.SCL, board.SDA)
575+
lcd = character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)
568576
"""
569577
def __init__(self, i2c, columns, lines):
570578
"""Initialize RGB character LCD connected to shield using I2C connection

examples/charlcd_custom_character_nyan_cat.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import time
22
import board
33
import digitalio
4-
import adafruit_character_lcd
4+
import adafruit_character_lcd.character_lcd_mono as character_lcd
55

66
lcd_columns = 16
77
lcd_rows = 2
@@ -12,8 +12,8 @@
1212
lcd_d5 = digitalio.DigitalInOut(board.D10)
1313
lcd_d4 = digitalio.DigitalInOut(board.D9)
1414
lcd_backlight = digitalio.DigitalInOut(board.D13)
15-
lcd = adafruit_character_lcd.Character_LCD(lcd_rs, lcd_en, lcd_d4, lcd_d5, lcd_d6,
16-
lcd_d7, lcd_columns, lcd_rows, lcd_backlight)
15+
lcd = character_lcd.Character_LCD(lcd_rs, lcd_en, lcd_d4, lcd_d5, lcd_d6,
16+
lcd_d7, lcd_columns, lcd_rows, lcd_backlight)
1717

1818
head = [31, 17, 27, 17, 17, 21, 17, 31]
1919

examples/charlcd_customcharacter.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
import digitalio
22
import board
3-
import adafruit_character_lcd
4-
3+
import adafruit_character_lcd.character_lcd_mono as character_lcd
54

65
lcd_columns = 16
76
lcd_rows = 2
7+
88
lcd_rs = digitalio.DigitalInOut(board.D7)
99
lcd_en = digitalio.DigitalInOut(board.D8)
1010
lcd_d7 = digitalio.DigitalInOut(board.D12)
1111
lcd_d6 = digitalio.DigitalInOut(board.D11)
1212
lcd_d5 = digitalio.DigitalInOut(board.D10)
1313
lcd_d4 = digitalio.DigitalInOut(board.D9)
1414
lcd_backlight = digitalio.DigitalInOut(board.D13)
15-
lcd = adafruit_character_lcd.Character_LCD(lcd_rs, lcd_en, lcd_d4, lcd_d5, lcd_d6,
16-
lcd_d7, lcd_columns, lcd_rows, lcd_backlight)
15+
16+
lcd = character_lcd.Character_LCD(lcd_rs, lcd_en, lcd_d4, lcd_d5, lcd_d6,
17+
lcd_d7, lcd_columns, lcd_rows, lcd_backlight)
1718

1819
checkmark = bytes([0x0, 0x0, 0x1, 0x3, 0x16, 0x1c, 0x8, 0x0])
1920
lcd.clear()

0 commit comments

Comments
 (0)