diff --git a/CHIP_IO/OverlayManager.py b/CHIP_IO/OverlayManager.py index 821cd51..7815fbe 100644 --- a/CHIP_IO/OverlayManager.py +++ b/CHIP_IO/OverlayManager.py @@ -24,6 +24,7 @@ import time DEBUG = False OVERLAYINSTALLPATH = "/lib/firmware/chip_io" +SPIINSTALLPATH = "/lib/firmware/nextthingco/chip" OVERLAYCONFIGPATH = "/sys/kernel/config/device-tree/overlays" CUSTOMOVERLAYFILEPATH = "" @@ -41,7 +42,7 @@ _LOADED = { } _OVERLAYS = { - "SPI2" : "chip-spi2.dtbo", + "SPI2" : "sample-spi.dtbo", "PWM0" : "chip-pwm0.dtbo", "CUST" : "" } @@ -160,7 +161,11 @@ def load(overlay, path=""): # SET UP THE OVERLAY PATH FOR OUR USE if overlay.upper() != "CUST": - opath = OVERLAYINSTALLPATH + "/" + _OVERLAYS[overlay.upper()] + opath = OVERLAYINSTALLPATH + # IF THE OVERLAY IS SPI, USE THE NTC PATH + if overlay.upper() == "SPI2": + opath = SPIINSTALLPATH + opath += "/" + _OVERLAYS[overlay.upper()] else: opath = path if DEBUG: diff --git a/README.rst b/README.rst index a9d72f2..a1389aa 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,7 @@ Manual:: For Python2.7:: sudo apt-get update - sudo apt-get install git build-essential python-dev python-pip flex bison -y + sudo apt-get install git build-essential python-dev python-pip flex bison chip-dt-overlays -y git clone https://github.com/atenart/dtc cd dtc make @@ -24,7 +24,7 @@ For Python2.7:: For Python3:: sudo apt-get update - sudo apt-get install git build-essential python3-dev python3-pip flex bison -y + sudo apt-get install git build-essential python3-dev python3-pip flex bison chip-dt-overlays -y git clone https://github.com/atenart/dtc cd dtc make diff --git a/test/omtest.py b/test/omtest.py index c680ecb..25a0259 100644 --- a/test/omtest.py +++ b/test/omtest.py @@ -5,7 +5,7 @@ import os # ENABLE DEBUG print("ENABLING OVERLAY MANAGER DEBUG") -OM.enable_debug() +OM.toggle_debug() # **************** PWM ******************* print("\nIS PWM ENABLED: {0}".format(OM.get_pwm_loaded())) @@ -20,19 +20,6 @@ print("UNLOADING PWM0") OM.unload("PWM0") print("IS PWM ENABLED: {0}".format(OM.get_pwm_loaded())) -# **************** I2C-1 ******************* -print("\nIS I2C ENABLED: {0}".format(OM.get_i2c_loaded())) -OM.load("I2C1") -print("IS I2C ENABLED: {0}".format(OM.get_i2c_loaded())) -# VERIFY I2C-1 EXISTS -if os.path.exists('/sys/class/i2c-dev/i2c-1'): - print("I2C1 DEVICE EXISTS") -else: - print("I2C1 DEVICE DID NOT LOAD PROPERLY") -print("UNLOADING I2C1") -OM.unload("I2C1") -print("IS I2C ENABLED: {0}".format(OM.get_i2c_loaded())) - # **************** SPI2 ******************* print("\nIS SPI ENABLED: {0}".format(OM.get_spi_loaded())) OM.load("SPI2")