Skip to content

Refactor complete! #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kattni merged 17 commits into from
Nov 21, 2018
Merged

Refactor complete! #19

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3e6a1a6
I2C working, SPI needs testing
kattni Nov 13, 2018
9027f16
SPI pin change.
kattni Nov 13, 2018
7fa1519
Add I2C to RGB, get_pin() to 74HC595
kattni Nov 14, 2018
287864b
Current status: functional.
kattni Nov 17, 2018
de93de2
Backlight now a property.
kattni Nov 17, 2018
b5adf5e
Needs test: RPi, M0, standalone LCDs
kattni Nov 19, 2018
80f8222
Example rename for rpi
kattni Nov 19, 2018
97a57fe
Updated example named, added RGB I2C
kattni Nov 19, 2018
645da5f
Update package init
kattni Nov 19, 2018
70f673e
Moved imports to speed up on M0
kattni Nov 19, 2018
e490b7f
Removed __init__.py, updated import method to resolve M0 mem issue
kattni Nov 20, 2018
ee9544a
RGB subclass currently functional.
kattni Nov 20, 2018
6e064f9
I2C not currently functional.
kattni Nov 20, 2018
95a9f14
SPI working, I2C not.
kattni Nov 20, 2018
8fe9cf2
Removing superfluous rgb.py file
kattni Nov 20, 2018
1258c47
Refactored, updated examples, appeased Sphinx.
kattni Nov 21, 2018
af6e023
Remove self.backlight_inverted, use property
kattni Nov 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Removed __init__.py, updated import method to resolve M0 mem issue
  • Loading branch information
@kattni
kattni committed Nov 20, 2018
commit e490b7fd1c62e48e907d6c9009a0a21d76caea0e
3 changes: 0 additions & 3 deletions adafruit_character_lcd/__init__.py
View file
Open in desktop

This file was deleted.

63 changes: 44 additions & 19 deletions adafruit_character_lcd/character_lcd.py → adafruit_character_lcd/character_lcd_mono.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
__version__ = "0.0.0-auto.0"
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_CharLCD.git"

#pylint: disable-msg=bad-whitespace
# pylint: disable-msg=bad-whitespace
# Commands
_LCD_CLEARDISPLAY = const(0x01)
_LCD_RETURNHOME = const(0x02)
Expand Down Expand Up @@ -91,6 +91,7 @@

# pylint: enable-msg=bad-whitespace


def _set_bit(byte_value, position, val):
# Given the specified byte_value set the bit at position to the provided
# boolean value val and return the modified byte.
Expand Down Expand Up @@ -188,11 +189,11 @@ def clear(self):
import time
import board
import busio
import adafruit_character_lcd
import adafruit_character_lcd.character_lcd_mono as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)

lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)

lcd.message = "Hello, world!"
time.sleep(5)
Expand All @@ -212,11 +213,11 @@ def cursor(self):
import time
import board
import busio
import adafruit_character_lcd
import adafruit_character_lcd.character_lcd_mono as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)

lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)

lcd.cursor = True
lcd.message = "Cursor! "
Expand Down Expand Up @@ -257,11 +258,11 @@ def blink(self):
import time
import board
import busio
import adafruit_character_lcd
import adafruit_character_lcd.character_lcd_mono as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)

lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)

lcd.blink = True
lcd.message = "Blinky cursor!"
Expand Down Expand Up @@ -290,11 +291,11 @@ def display(self):
import time
import board
import busio
import adafruit_character_lcd
import adafruit_character_lcd.character_lcd_mono as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)

lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)

lcd.message = "Hello, world!"
time.sleep(5)
Expand All @@ -321,11 +322,11 @@ def message(self):
import time
import board
import busio
import adafruit_character_lcd
import adafruit_character_lcd.character_lcd_mono as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)

lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)

lcd.message = "Hello, world!"
time.sleep(5)
Expand Down Expand Up @@ -368,11 +369,11 @@ def move_left(self):
import time
import board
import busio
import adafruit_character_lcd
import adafruit_character_lcd.character_lcd_mono as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)

lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)

scroll_message = "<-- Scroll"
lcd.message = scroll_message
Expand All @@ -393,14 +394,14 @@ def move_right(self):
import time
import board
import busio
import adafruit_character_lcd
import adafruit_character_lcd.character_lcd_mono as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)

lcd_columns = 16
lcd_rows = 2

lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, lcd_columns, lcd_rows)
lcd = character_lcd.Character_LCD_I2C(i2c, lcd_columns, lcd_rows)

scroll_message = "Scroll -->"
lcd.message = scroll_message
Expand All @@ -425,11 +426,11 @@ def text_direction(self):
import time
import board
import busio
import adafruit_character_lcd
import adafruit_character_lcd.character_lcd_mono as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)

lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)

lcd.text_direction = lcd.RIGHT_TO_LEFT
lcd.message = "Hello, world!"
Expand Down Expand Up @@ -467,11 +468,11 @@ def backlight(self):
import time
import board
import busio
import adafruit_character_lcd
import adafruit_character_lcd.character_lcd_mono as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)

lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)

lcd.backlight = False
lcd.message = "Hello, world?"
Expand Down Expand Up @@ -548,6 +549,17 @@ class Character_LCD_I2C(Character_LCD):
"""Character LCD connected to I2C/SPI backpack using its I2C connection.
This is a subclass of Character_LCD and implements all of the same
functions and functionality.

To use, import and initialise as follows:

.. code-block:: python

import board
import busio
import adafruit_character_lcd.character_lcd_mono as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)
"""
def __init__(self, i2c, columns, lines, backlight_inverted=False):
"""Initialize character LCD connectedto backpack using I2C connection
Expand All @@ -572,6 +584,19 @@ class Character_LCD_SPI(Character_LCD):
"""Character LCD connected to I2C/SPI backpack using its SPI connection.
This is a subclass of Character_LCD and implements all of the same
functions and functionality.

To use, import and initialise as follows:

.. code-block:: python

import board
import busio
import digitalio
import adafruit_character_lcd.character_lcd_mono as character_lcd

spi = busio.SPI(board.SCK, MOSI=board.MOSI)
latch = digitalio.DigitalInOut(board.D5)
lcd = character_lcd.Character_LCD_SPI(spi, latch, 16, 2)
"""

def __init__(self, spi, latch, columns, lines, backlight_inverted=False):
Expand Down
50 changes: 29 additions & 21 deletions adafruit_character_lcd/character_lcd_rgb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,11 @@ def clear(self):
import time
import board
import busio
import adafruit_character_lcd
import adafruit_character_lcd.character_lcd_rgb as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)

lcd = adafruit_character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)
lcd = character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)

lcd.message = "Hello, world!"
time.sleep(5)
Expand All @@ -226,11 +226,11 @@ def cursor(self):
import time
import board
import busio
import adafruit_character_lcd
import adafruit_character_lcd.character_lcd_rgb as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)

lcd = adafruit_character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)
lcd = character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)

lcd.cursor = True
lcd.message = "Cursor! "
Expand Down Expand Up @@ -271,11 +271,11 @@ def blink(self):
import time
import board
import busio
import adafruit_character_lcd
import adafruit_character_lcd.character_lcd_rgb as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)

lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)

lcd.blink = True
lcd.message = "Blinky cursor!"
Expand Down Expand Up @@ -309,11 +309,11 @@ def color(self):
import time
import board
import busio
import adafruit_character_lcd
import adafruit_character_lcd.character_lcd_rgb as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)

lcd = adafruit_character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)
lcd = character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)

lcd.color = [100, 0, 0]
lcd.message = "Hello, world!"
Expand Down Expand Up @@ -346,11 +346,11 @@ def display(self):
import time
import board
import busio
import adafruit_character_lcd
import adafruit_character_lcd.character_lcd_rgb as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)

lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)

lcd.message = "Hello, world!"
time.sleep(5)
Expand All @@ -377,11 +377,11 @@ def message(self):
import time
import board
import busio
import adafruit_character_lcd
import adafruit_character_lcd.character_lcd_rgb as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)

lcd = adafruit_character_lcd.Character_LCD_I2C(i2c, 16, 2)
lcd = character_lcd.Character_LCD_I2C(i2c, 16, 2)

lcd.message = "Hello, world!"
time.sleep(5)
Expand Down Expand Up @@ -420,11 +420,11 @@ def move_left(self):
import time
import board
import busio
import adafruit_character_lcd
import adafruit_character_lcd.character_lcd_rgb as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)

lcd = adafruit_character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)
lcd = character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)

scroll_message = "<-- Scroll"
lcd.message = scroll_message
Expand All @@ -445,14 +445,11 @@ def move_right(self):
import time
import board
import busio
import adafruit_character_lcd
import adafruit_character_lcd.character_lcd_rgb as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)

lcd_columns = 16
lcd_rows = 2

lcd = adafruit_character_lcd.Character_LCD_I2C_RGB(i2c, lcd_columns, lcd_rows)
lcd = character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)

scroll_message = "Scroll -->"
lcd.message = scroll_message
Expand All @@ -477,11 +474,11 @@ def text_direction(self):
import time
import board
import busio
import adafruit_character_lcd
import adafruit_character_lcd.character_lcd_rgb as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)

lcd = adafruit_character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)
lcd = character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)

lcd.text_direction = lcd.RIGHT_TO_LEFT
lcd.message = "Hello, world!"
Expand Down Expand Up @@ -565,6 +562,17 @@ class Character_LCD_I2C_RGB(Character_LCD_RGB):
"""RGB Character LCD connected to I2C shield using I2C connection.
This is a subclass of Character_LCD_RGB and implements all of the same
functions and functionality.

To use, import and initialise as follows:

.. code-block:: python

import board
import busio
import adafruit_character_lcd.character_lcd_rgb as character_lcd

i2c = busio.I2C(board.SCL, board.SDA)
lcd = character_lcd.Character_LCD_I2C_RGB(i2c, 16, 2)
"""
def __init__(self, i2c, columns, lines):
"""Initialize RGB character LCD connected to shield using I2C connection
Expand Down
6 changes: 3 additions & 3 deletions examples/charlcd_custom_character_nyan_cat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import time
import board
import digitalio
import adafruit_character_lcd
import adafruit_character_lcd.character_lcd_mono as character_lcd

lcd_columns = 16
lcd_rows = 2
Expand All @@ -12,8 +12,8 @@
lcd_d5 = digitalio.DigitalInOut(board.D10)
lcd_d4 = digitalio.DigitalInOut(board.D9)
lcd_backlight = digitalio.DigitalInOut(board.D13)
lcd = adafruit_character_lcd.Character_LCD(lcd_rs, lcd_en, lcd_d4, lcd_d5, lcd_d6,
lcd_d7, lcd_columns, lcd_rows, lcd_backlight)
lcd = character_lcd.Character_LCD(lcd_rs, lcd_en, lcd_d4, lcd_d5, lcd_d6,
lcd_d7, lcd_columns, lcd_rows, lcd_backlight)

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

Expand Down
9 changes: 5 additions & 4 deletions examples/charlcd_customcharacter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
import digitalio
import board
import adafruit_character_lcd

import adafruit_character_lcd.character_lcd_mono as character_lcd

lcd_columns = 16
lcd_rows = 2

lcd_rs = digitalio.DigitalInOut(board.D7)
lcd_en = digitalio.DigitalInOut(board.D8)
lcd_d7 = digitalio.DigitalInOut(board.D12)
lcd_d6 = digitalio.DigitalInOut(board.D11)
lcd_d5 = digitalio.DigitalInOut(board.D10)
lcd_d4 = digitalio.DigitalInOut(board.D9)
lcd_backlight = digitalio.DigitalInOut(board.D13)
lcd = adafruit_character_lcd.Character_LCD(lcd_rs, lcd_en, lcd_d4, lcd_d5, lcd_d6,
lcd_d7, lcd_columns, lcd_rows, lcd_backlight)

lcd = character_lcd.Character_LCD(lcd_rs, lcd_en, lcd_d4, lcd_d5, lcd_d6,
lcd_d7, lcd_columns, lcd_rows, lcd_backlight)

checkmark = bytes([0x0, 0x0, 0x1, 0x3, 0x16, 0x1c, 0x8, 0x0])
lcd.clear()
Expand Down
Loading