Merge pull request #1752 from makermelissa/main

Last minute fixes for MacroPad RPC Home Assistant Code

Author: makermelissa

MacroPad_RPC_Home_Assistant/boot.py

@@ -0,0 +1,3 @@
+import usb_cdc
+
+usb_cdc.enable(console=True, data=True)

MacroPad_RPC_Home_Assistant/code.py

@@ -48,7 +48,7 @@ class MqttError(Exception):
 def rpc_call(function, *args, **kwargs):
     response = rpc.call(function, *args, **kwargs)
     if response["error"]:
-        if response["error_type"]:
+        if response["error_type"] == "mqtt":
             raise MqttError(response["message"])
         raise RpcError(response["message"])
     return response["return_val"]
@@ -62,7 +62,16 @@ def update_key(key_number):
     if switch_state is not None:
         macropad.pixels[key_number] = NEOPIXEL_COLORS[switch_state]
     else:
-        macropad.pixels[key_number] = None
+        macropad.pixels[key_number] = 0
+
+server_is_running = False
+print("Waiting for server...")
+while not server_is_running:
+    try:
+        server_is_running = rpc_call("is_running")
+        print("Connected")
+    except RpcError:
+        pass
 
 mqtt_init()
 last_macropad_encoder_value = macropad.encoder
@@ -92,6 +101,8 @@ def update_key(key_number):
             if "key_number" in output:
                 time.sleep(UPDATE_DELAY)
                 update_key(output["key_number"])
+            elif ENCODER_ITEM is not None:
+                update_key(ENCODER_ITEM)
         except MqttError:
             mqtt_init()
         except RpcError as err_msg:

MacroPad_RPC_Home_Assistant/rpc.py

@@ -15,8 +15,8 @@
     import usb_cdc as serial
     json_decode_exception = ValueError
 
-RESPONSE_TIMEOUT=1
-DATA_TIMEOUT=0.2
+RESPONSE_TIMEOUT=5
+DATA_TIMEOUT=0.5
 
 class RpcError(Exception):
     """For RPC Specific Errors"""

MacroPad_RPC_Home_Assistant/rpc_ha_server.py

@@ -68,10 +68,14 @@ def mqtt_get_last_value(topic):
         return last_mqtt_messages[topic]
     return None
 
+def is_running():
+    return True
+
 def handle_rpc(packet):
     """This function will verify good data in packet,
     call the method with parameters, and generate a response
     packet as the return value"""
+    print("Received packet")
     func_name = packet['function']
     if func_name in PROTECTED_FUNCTIONS:
         return rpc.create_response_packet(error=True, message=f"{func_name}'() is a protected function and can not be called.")