linting!

Author: brentru

PyPortal_GCP_IOT_Planter/code.py

@@ -8,21 +8,19 @@
 """
 import time
 import json
-import adafruit_esp32spi.adafruit_esp32spi_socket as socket
 import board
 import busio
-import digitalio
 import gcp_gfx_helper
 import neopixel
 from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager
+import adafruit_esp32spi.adafruit_esp32spi_socket as socket
 from adafruit_gc_iot_core import MQTT_API, Cloud_Core
 from adafruit_minimqtt import MQTT
 from adafruit_seesaw.seesaw import Seesaw
-from digitalio import DigitalInOut
+import digitalio
 
 # Delay before reading the sensors, in minutes
-# TODO: switch to 10min
-SENSOR_DELAY = 1
+SENSOR_DELAY = 10
 
 # Get wifi details and more from a secrets.py file
 try:
@@ -32,15 +30,20 @@
     raise
 
 # PyPortal ESP32 Setup
-esp32_cs = DigitalInOut(board.ESP_CS)
-esp32_ready = DigitalInOut(board.ESP_BUSY)
-esp32_reset = DigitalInOut(board.ESP_RESET)
+esp32_cs = digitalio.DigitalInOut(board.ESP_CS)
+esp32_ready = digitalio.DigitalInOut(board.ESP_BUSY)
+esp32_reset = digitalio.DigitalInOut(board.ESP_RESET)
 spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
 esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
 status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2)
 wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(
     esp, secrets, status_light)
 
+# Connect to WiFi
+print("Connecting to WiFi...")
+wifi.connect()
+print("Connected!")
+
 # Soil Sensor Setup
 i2c_bus = busio.I2C(board.SCL, board.SDA)
 ss = Seesaw(i2c_bus, addr=0x36)
@@ -54,15 +57,9 @@
 gfx = gcp_gfx_helper.Google_GFX()
 print("Graphics loaded!")
 
-# Connect to WiFi
-print("Connecting to WiFi...")
-wifi.connect()
-print("Connected!")
 
 # Define callback methods which are called when events occur
 # pylint: disable=unused-argument, redefined-outer-name
-
-
 def connect(client, userdata, flags, rc):
     # This function will be called when the client is connected
     # successfully to the broker.
@@ -96,12 +93,12 @@ def publish(client, userdata, topic, pid):
 def message(client, topic, msg):
     # This method is called when the client receives data from a topic.
     try:
-        # Attempt to load a JSON command
+        # Attempt to decode a JSON command
         msg_dict = json.loads(msg)
         # Handle water-pump commands
         if msg_dict['pump_time']:
             handle_pump(msg_dict)
-    except:
+    except TypeError:
         # Non-JSON command, print normally
         print("Message from {}: {}".format(topic, msg))
 
@@ -135,16 +132,16 @@ def handle_pump(command):
 # Initialize Google Cloud IoT Core interface
 google_iot = Cloud_Core(esp, secrets)
 
-# Optional JSON-Web-Token (JWT) Generation
-# print("Generating JWT...")
-# jwt = google_iot.generate_jwt()
-# print("Your JWT is: ", jwt)
+# JSON-Web-Token (JWT) Generation
+print("Generating JWT...")
+jwt = google_iot.generate_jwt()
+print("Your JWT is: ", jwt)
 
 # Set up a new MiniMQTT Client
 client = MQTT(socket,
               broker=google_iot.broker,
               username=google_iot.username,
-              password=secrets['jwt'],
+              password=jwt,
               client_id=google_iot.cid,
               network_manager=wifi)
 

PyPortal_GCP_IOT_Planter/gcp_gfx_helper.py

@@ -1,10 +1,9 @@
 """
-GFX Helper for PyPortal Azure IoT Plant Monitor
+GFX Helper for PyPortal GCP IoT Plant Monitor
 """
 import board
 import displayio
 import terminalio
-from adafruit_bitmap_font import bitmap_font
 from adafruit_display_text.label import Label
 
  # the current working directory (where this file is)