Boomark--working

Author: Juliana Mashon

functions/basic_commands.py

@@ -17,7 +17,13 @@ def __init__(self, state):
         self.broker = BrokerConnect(state)
 
     def wait(self, duration):
-        # Tell bot to wait for some time
+        verbosity_level = {
+            1: lambda: print("`wait` called"),
+            2: lambda: print(f"Waiting for {duration} milliseconds...")
+        }
+
+        verbosity_level[self.broker.state.verbosity]()
+
         wait_message = {
             "kind": "rpc_request",
             "args": {
@@ -31,13 +37,17 @@ def wait(self, duration):
                 }
             }]
         }
-        self.broker.publish(wait_message)
 
-        # No inherent return value
-        return print("Waiting for "+str(duration)+" milliseconds...")
+        self.broker.publish(wait_message)
 
     def e_stop(self):
-        # Tell bot to emergency stop
+        verbosity_level = {
+            1: lambda: print("`e_stop` called"),
+            2: lambda: print(f"Triggered device emergency stop at: {datetime.now()}")
+        }
+
+        verbosity_level[self.broker.state.verbosity]()
+
         stop_message = {
             "kind": "rpc_request",
             "args": {
@@ -49,13 +59,17 @@ def e_stop(self):
                 "args": {}
             }]
         }
-        self.broker.publish(stop_message)
 
-        # No inherent return value
-        return print("Triggered device emergency stop.")
+        self.broker.publish(stop_message)
 
     def unlock(self):
-        # Tell bot to unlock
+        verbosity_level = {
+            1: lambda: print("`unlock` called"),
+            2: lambda: print(f"Triggered device unlock at: {datetime.now()}")
+        }
+
+        verbosity_level[self.broker.state.verbosity]()
+
         unlock_message = {
             "kind": "rpc_request",
             "args": {
@@ -67,14 +81,17 @@ def unlock(self):
                 "args": {}
             }]
         }
-        self.broker.publish(unlock_message)
 
-        # No inherent return value
-        return print("Triggered device unlock.")
+        self.broker.publish(unlock_message)
 
     def reboot(self):
-        # Tell bot to reboot
-        # No inherent return value
+        verbosity_level = {
+            1: lambda: print("`reboot` called"),
+            2: lambda: print(f"Triggered device reboot at: {datetime.now()}")
+        }
+
+        verbosity_level[self.broker.state.verbosity]()
+
         reboot_message = {
             **RPC_REQUEST,
             "body": [{
@@ -86,11 +103,15 @@ def reboot(self):
         }
 
         self.broker.publish(reboot_message)
-        return print("Triggered device reboot.")
 
     def shutdown(self):
-        # Tell bot to shutdown
-        # No inherent return value
+        verbosity_level = {
+            1: lambda: print("`shutdown` called"),
+            2: lambda: print(f"Triggered device shutdown at: {datetime.now()}")
+        }
+
+        verbosity_level[self.broker.state.verbosity]()
+
         shutdown_message = {
             **RPC_REQUEST,
             "body": [{
@@ -100,4 +121,3 @@ def shutdown(self):
         }
 
         self.broker.publish(shutdown_message)
-        return print("Triggered device shutdown.")

functions/broker.py

@@ -18,17 +18,6 @@ def __init__(self, state):
         self.state = state
         self.client = None
 
-    # def connect() --> connect to message broker to send messages
-    # def disconnect() --> disconnect from message broker
-
-    # def publish() --> send message via message broker
-
-    # def on_connect() --> subscribe to messages from specific broker channel
-    # def on_message() --> update message queue with latest response
-
-    # def start_listen() --> start listening to broker channel (print each message if echo == true)
-    # def stop_listen() --> stop listening to broker channel
-
     def connect(self):
         self.client = mqtt.Client()
         self.client.username_pw_set(

functions/camera.py

@@ -15,8 +15,13 @@ def __init__(self, state):
         self.broker = BrokerConnect(state)
 
     def calibrate_camera(self):
-        # Execute calibrate camera script
-        # No inherent return value
+        verbosity_level = {
+            1: lambda: print("`calibrate_camera` called"),
+            2: lambda: print(f"Triggered camera calibration at: {datetime.now()}")
+        }
+
+        verbosity_level[self.broker.state.verbosity]()
+
         calibrate_message = {
             **RPC_REQUEST,
             "body": [{
@@ -30,16 +35,21 @@ def calibrate_camera(self):
         self.broker.publish(calibrate_message)
 
     def take_photo(self):
-        # Take single photo
-        # No inherent return value
-        take_photo_message = {
+        verbosity_level = {
+            1: lambda: print("`take_photo` called"),
+            2: lambda: print(f"Took a photo at: {datetime.now()}")
+        }
+
+        verbosity_level[self.broker.state.verbosity]()
+
+        photo_message = {
             **RPC_REQUEST,
             "body": [{
                 "kind": "take_photo",
                 "args": {}
             }]
         }
 
-        self.broker.publish(take_photo_message)
+        self.broker.publish(photo_message)
 
     # TODO: photo_grid()

functions/imports.py

@@ -9,6 +9,7 @@
 import requests
 
 import time
+import datetime
 from datetime import datetime
 
 import paho.mqtt.client as mqtt

functions/information.py

@@ -23,21 +23,28 @@ def __init__(self, state):
         self.auth = Authentication(state)
 
     def get_info(self, endpoint, id=None):
-        # Get endpoint info
         endpoint_data = self.auth.request('GET', endpoint, id)
-        # Return endpoint info as json object: endpoint[""]
+
+        verbosity_level = {
+            1: lambda: print("`get_info` called"),
+            2: lambda: (
+                print(json.dumps(endpoint_data[f"{id}"], indent=4)) if id else None,
+                print(json.dumps(endpoint_data, indent=4))
+            )
+        }
+
+        verbosity_level[self.auth.state.verbosity]()
+
         return endpoint_data
 
     def set_info(self, endpoint, field, value, id=None):
-        # Edit endpoint info
         new_value = {
             field: value
         }
+
         self.auth.request('PATCH', endpoint, id, new_value)
 
-        # Return endpoint info as json object: endpoint[""]
-        new_endpoint_data = self.auth.request('GET', endpoint, id)
-        return new_endpoint_data
+        return self.get_info(endpoint, id)
 
     def safe_z(self):
         # Get safe z height via get_info()

main.py

@@ -9,7 +9,7 @@ def __init__(self):
         self.token = None
         self.error = None
         self.last_message = None
-        self.verbosity = 1
+        self.verbosity = 2
 
 class Farmbot():
     def __init__(self):