From 3919b9a91a7d926f6233de1b3628aab04c9b9fff Mon Sep 17 00:00:00 2001 From: gaoyang3513 Date: Sat, 1 Jul 2023 22:37:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pioneer600/Led/LED.py | 10 +++++++++- Pioneer600/Oled/oled.py | 14 +++++++++++--- main.py | 21 ++++++++------------- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/Pioneer600/Led/LED.py b/Pioneer600/Led/LED.py index d868f31..71314e3 100644 --- a/Pioneer600/Led/LED.py +++ b/Pioneer600/Led/LED.py @@ -5,7 +5,7 @@ import RPi.GPIO as GPIO import time class LED(object): - """class for SSD1306 128*64 0.96inch OLED displays.""" + """class for LED.""" def __init__(self, led): LED = led @@ -25,3 +25,11 @@ class LED(object): GPIO.output(LED,GPIO.HIGH) GPIO.cleanup() +LED_GPIO_RED = 26 + +def main(): + # 128x64 display with hardware SPI: + led = LED.LED(LED_GPIO_RED) + +if __name__=='__main__': + main() diff --git a/Pioneer600/Oled/oled.py b/Pioneer600/Oled/oled.py index dc569f9..4d2c500 100644 --- a/Pioneer600/Oled/oled.py +++ b/Pioneer600/Oled/oled.py @@ -1,14 +1,22 @@ +#!/usr/bin/python +# -*- coding:utf-8 -*- + import spidev as SPI import SSD1306 -import time from PIL import Image,ImageDraw,ImageFont +# Raspberry Pi pin configuration: +OLED_GPIO_RST = 19 +OLED_GPIO_DC = 16 +OLED_SPI_BUS = 0 +OLED_SPI_CS = 0 + # Raspberry Pi pin configuration: GPIO_RST = 19 GPIO_DC = 16 -SPI_BUS = 0 -SPI_CS = 0 +SPI_BUS = 0 +SPI_CS = 0 # 128x64 display with hardware SPI: disp = SSD1306.SSD1306(GPIO_RST, GPIO_DC, SPI.SpiDev(SPI_BUS, SPI_CS)) diff --git a/main.py b/main.py index 3f2790d..3d5ecb4 100644 --- a/main.py +++ b/main.py @@ -1,31 +1,28 @@ +#!/usr/bin/python +# -*- coding:utf-8 -*- + import os import sys import time import RPi.GPIO as GPIO import spidev as SPI -sys.path.append(os.path.join(os.path.dirname(__file__),'Led')) -sys.path.append(os.path.join(os.path.dirname(__file__),'Oled')) import Pioneer600.Led.LED as LED import Pioneer600.Oled.SSD1306 as SSD1306 - from PIL import Image,ImageDraw,ImageFont # Raspberry Pi pin configuration: +LED_GPIO_RED = 26 + OLED_GPIO_RST = 19 OLED_GPIO_DC = 16 OLED_SPI_BUS = 0 OLED_SPI_CS = 0 -LED_GPIO_RED = 26 - -# 128x64 display with hardware SPI: -disp = SSD1306.SSD1306(OLED_GPIO_RST, OLED_GPIO_DC, SPI.SpiDev(OLED_SPI_BUS, OLED_SPI_CS)) - -# 128x64 display with hardware SPI: -led = LED.LED(LED_GPIO_RED) - def main(): + # 128x64 display with hardware SPI: + led = LED.LED(LED_GPIO_RED) + try: while True: time.sleep(1) @@ -34,5 +31,3 @@ def main(): if __name__=='__main__': main() - -