Formatting

shepherd/control.py

@@ -16,34 +16,6 @@ import shepherd.plugin
 
 #Start new thread, and push ID and core config to api.shepherd.distreon.net/client/update
 
-class UpdateManager():
-    def __init__(self):
-        pass
-
-class SequenceUpdate():
-    Item = namedtuple('Item', ['sequence_number', 'content'])
-    def __init__(self):
-        self.items = []
-        self._sequence_count = 0
-        self._dirty = False
-
-    def _next_sequence_number(self):
-        # TODO: need to establish a max sequence number, so that it can be compared to half
-        # that range and wrap around.
-        self._sequence_count +=1
-        return self._sequence_count
-
-    def mark_as_dirty(self):
-        self._dirty = True
-
-    def add_item(self, item):
-        self.items.append(self.Item(self._next_sequence_number(), item))
-        self.mark_as_dirty()
-
-    def get_payload():
-        pass
-    def process_ack():
-        pass
 
 client_id = None
 control_url = None

shepherd/plugins/mothtrap.py

@@ -9,7 +9,6 @@ import time
 import argparse
 
 
-
 class MothtrapPlugin(shepherd.plugin.Plugin):
     @staticmethod
     def define_config(confdef):
@@ -30,18 +29,14 @@ class MothtrapPlugin(shepherd.plugin.Plugin):
         print("Mothtrap config:")
         print(self.config)
 
-        
-        
         #servo_max = self.config["servo_open_pulse"] / 1000000
         #servo_min = self.config["servo_closed_pulse"] / 1000000
 
-        #if servo_min > servo_max:
+        # if servo_min > servo_max:
         #    servo_min, servo_max = servo_max, servo_min
 
-
         #print(F"Supplied min: {servo_min}, max: {servo_max}")
 
-
         self.interface.attach_hook("usbcam", "pre_cam", self.led_on)
         self.interface.attach_hook("usbcam", "post_cam", self.led_off)
         self.interface.attach_hook("usbcam", "post_cam", self.run_servo)
@@ -50,28 +45,28 @@ class MothtrapPlugin(shepherd.plugin.Plugin):
 
     def led_on(self):
         self.plugins["scout"].set_out1(True)
-        #self.led_power.on()
+        # self.led_power.on()
 
     def led_off(self):
         self.plugins["scout"].set_out1(False)
-        #self.led_power.off()
+        # self.led_power.off()
 
     def run_servo(self):
         self.plugins["scout"].set_aux5v(True)
-        #self.door_servo_power.on()
+        # self.door_servo_power.on()
         time.sleep(0.5)
-        
+
         self.plugins["scout"].set_pwm1(True, self.config["servo_open_pulse"])
         #self.door_servo.pulse_width = self.config["servo_open_pulse"] / 1000000
         time.sleep(self.config["servo_open_time"])
-        
+
         self.plugins["scout"].set_pwm1(True, self.config["servo_closed_pulse"])
         #self.door_servo.pulse_width = self.config["servo_closed_pulse"] / 1000000
         time.sleep(self.config["servo_open_time"])
         self.plugins["scout"].set_pwm1(False, self.config["servo_closed_pulse"])
-        #self.door_servo.detach()
+        # self.door_servo.detach()
         self.plugins["scout"].set_aux5v(False)
-        #self.door_servo_power.off()
+        # self.door_servo_power.off()
 
     def test(self):
         self.led_on()