diff --git a/src/oled_monitor/rascsi_oled_monitor.py b/src/oled_monitor/rascsi_oled_monitor.py index b2e3a639..35dad3db 100755 --- a/src/oled_monitor/rascsi_oled_monitor.py +++ b/src/oled_monitor/rascsi_oled_monitor.py @@ -29,92 +29,57 @@ # THE SOFTWARE. import time import os +import sys import datetime - -#import Adafruit_GPIO.SPI as SPI -import Adafruit_SSD1306 - -from PIL import Image -from PIL import ImageDraw -from PIL import ImageFont - +import board +import busio +import adafruit_ssd1306 +from PIL import Image, ImageDraw, ImageFont import subprocess +WIDTH = 128 +HEIGHT = 32 # Change to 64 if needed +BORDER = 5 + # How long to delay between each update delay_time_ms = 250 -# Raspberry Pi pin configuration: -RST = None # on the PiOLED this pin isnt used -# Note the following are only used with SPI: -DC = 23 -SPI_PORT = 0 -SPI_DEVICE = 0 +# Define the Reset Pin +oled_reset = None -# Beaglebone Black pin configuration: -# RST = 'P9_12' -# Note the following are only used with SPI: -# DC = 'P9_15' -# SPI_PORT = 1 -# SPI_DEVICE = 0 +# init i2c +i2c = board.I2C() # 128x32 display with hardware I2C: -disp = Adafruit_SSD1306.SSD1306_128_32(rst=RST) +oled = adafruit_ssd1306.SSD1306_I2C(WIDTH, HEIGHT, i2c, addr=0x3C, reset=oled_reset) -# 128x64 display with hardware I2C: -# disp = Adafruit_SSD1306.SSD1306_128_64(rst=RST) - -# Note you can change the I2C address by passing an i2c_address parameter like: -# disp = Adafruit_SSD1306.SSD1306_128_64(rst=RST, i2c_address=0x3C) - -# Alternatively you can specify an explicit I2C bus number, for example -# with the 128x32 display you would use: -# disp = Adafruit_SSD1306.SSD1306_128_32(rst=RST, i2c_bus=2) - -# 128x32 display with hardware SPI: -# disp = Adafruit_SSD1306.SSD1306_128_32(rst=RST, dc=DC, spi=SPI.SpiDev(SPI_PORT, SPI_DEVICE, max_speed_hz=8000000)) - -# 128x64 display with hardware SPI: -# disp = Adafruit_SSD1306.SSD1306_128_64(rst=RST, dc=DC, spi=SPI.SpiDev(SPI_PORT, SPI_DEVICE, max_speed_hz=8000000)) - -# Alternatively you can specify a software SPI implementation by providing -# digital GPIO pin numbers for all the required display pins. For example -# on a Raspberry Pi with the 128x32 display you might use: -# disp = Adafruit_SSD1306.SSD1306_128_32(rst=RST, dc=DC, sclk=18, din=25, cs=22) - -print "Running with the following display:" -print disp -print -print "Will update the OLED display every " + str(delay_time_ms) + "ms (approximately)" - - -# Initialize library. -disp.begin() +print ("Running with the following display:") +print (oled) +print () +print ("Will update the OLED display every " + str(delay_time_ms) + "ms (approximately)") # Clear display. -disp.clear() -disp.display() +oled.fill(0) +oled.show() # Create blank image for drawing. # Make sure to create image with mode '1' for 1-bit color. -width = disp.width -height = disp.height -image = Image.new('1', (width, height)) +image = Image.new("1", (oled.width, oled.height)) # Get drawing object to draw on image. draw = ImageDraw.Draw(image) # Draw a black filled box to clear the image. -draw.rectangle((0,0,width,height), outline=0, fill=0) +draw.rectangle((0,0,WIDTH,HEIGHT), outline=0, fill=0) # Draw some shapes. # First define some constants to allow easy resizing of shapes. padding = -2 top = padding -bottom = height-padding +bottom = HEIGHT-padding # Move left to right keeping track of the current x position for drawing shapes. x = 0 - # Load default font. font = ImageFont.load_default() @@ -125,10 +90,10 @@ font = ImageFont.load_default() while True: # Draw a black filled box to clear the image. - draw.rectangle((0,0,width,height), outline=0, fill=0) + draw.rectangle((0,0,WIDTH,HEIGHT), outline=0, fill=0) cmd = "rasctl -l" - rascsi_list = subprocess.check_output(cmd, shell=True) + rascsi_list = subprocess.check_output(cmd, shell=True).decode(sys.stdout.encoding) y_pos = top # Draw all of the meaningful data to the 'image' @@ -146,19 +111,20 @@ while True: for line in rascsi_list.split('\n'): # Skip empty strings, divider lines and the header line... if (len(line) == 0) or line.startswith("+---") or line.startswith("| ID | UN"): - continue - else: - if line.startswith("| "): - fields = line.split('|') - output = str.strip(fields[1]) + " " + str.strip(fields[3]) + " " + os.path.basename(str.strip(fields[4])) - else: - output = "No image mounted!" - draw.text((x, y_pos), output, font=font, fill=255) - y_pos = y_pos + 8 + continue + else: + if line.startswith("| "): + fields = line.split('|') + output = str.strip(fields[1]) + " " + str.strip(fields[3]) + " " + os.path.basename(str.strip(fields[4])) + else: + output = "No image mounted!" + draw.text((x, y_pos), output, font=font, fill=255) + y_pos += 8 + # If there is still room on the screen, we'll display the time. If there's not room it will just be clipped draw.text((x, y_pos), datetime.datetime.now().strftime("%d/%m/%Y %H:%M:%S"), font=font, fill=255) # Display image. - disp.image(image) - disp.display() + oled.image(image) + oled.show() time.sleep(1/delay_time_ms)