Move MqttError to rpc and import

Author: makermelissa

MacroPad_RPC_Home_Assistant/code.py

@@ -11,7 +11,7 @@
 from adafruit_display_shapes.rect import Rect
 from adafruit_display_text import label
 from adafruit_macropad import MacroPad
-from rpc import RpcClient, RpcError
+from rpc import RpcClient, RpcError, MqttError
 
 macropad = MacroPad()
 rpc = RpcClient()
@@ -26,9 +26,6 @@
     "ON": 0x00FF00,
 }
 
-class MqttError(Exception):
-    """For MQTT Specific Errors"""
-
 # Set up displayio group with all the labels
 group = displayio.Group()
 for key_index in range(12):

MacroPad_RPC_Home_Assistant/rpc.py

@@ -25,6 +25,9 @@
 class RpcError(Exception):
     """For RPC Specific Errors"""
 
+class MqttError(Exception):
+    """For MQTT Specific Errors"""
+
 class _Rpc:
     def __init__(self):
         self._serial = None

MacroPad_RPC_Home_Assistant/rpc_ha_server.py

@@ -7,7 +7,7 @@
 import ssl
 import socket
 import adafruit_minimqtt.adafruit_minimqtt as MQTT
-from rpc import RpcServer
+from rpc import RpcServer, MqttError
 
 mqtt_status = {
     "connected": False,
@@ -27,9 +27,6 @@ def disconnect(_mqtt_client, _userdata, _rc):
 def message(_client, topic, payload):
     last_mqtt_messages[topic] = payload
 
-class MqttError(Exception):
-    """For MQTT Specific Errors"""
-
 # Default to 1883 since SSL on CPython is not currently supported
 def mqtt_init(broker, port=1883, username=None, password=None):
     mqtt_status["client"] = MQTT.MQTT(