added command line options

added reset and pwm frequency methods

ledd/controller.py

@@ -15,6 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from json import JSONEncoder
+import logging
+import time
 
 import smbus
 
@@ -27,7 +29,6 @@ PCA9685_SUBADR3 = 0x4
 PCA9685_MODE1 = 0x00
 PCA9685_MODE2 = 0x01
 PCA9685_PRESCALE = 0xFE
-PCA9685_RESET = 0xFE
 
 LED0_ON_L = 0x06
 LED0_ON_H = 0x07
@@ -56,7 +57,8 @@ class Controller:
         l = []
         cur = db.cursor()
         for row in cur.execute("select * from controller"):
-            l.append(Controller.from_row(db, row))
+            c = Controller.from_row(db, row)
+            l.append(c)
         cur.close()
         return l
 
@@ -64,24 +66,27 @@ class Controller:
         cur = self.db.cursor()
         if self.id == -1:
             cur.execute("INSERT INTO controller (pwm_freq, channels, i2c_device, address) VALUES (?,?,?,?)",
-                        (self.pwm_freq, self.channels, self.i2c_device, self.address))
+                        (self._pwm_freq, self.channels, self.i2c_device, self.address))
             self.id = cur.lastrowid
         else:
             cur.execute("UPDATE controller SET pwm_freq=?, channels=?, i2c_device=?, address=? WHERE id = ?",
-                        (self.pwm_freq, self.channels, self.i2c_device, self.address, self.id))
+                        (self._pwm_freq, self.channels, self.i2c_device, self.address, self.id))
         cur.close()
         self.db.commit()
 
-    def __init__(self, db, channels, i2c_device, address, pwm_freq=-1, cid=-1, from_db=False):
-        self.pwm_freq = pwm_freq
+    def __init__(self, db, channels, i2c_device, address, pwm_freq=1526, cid=-1, from_db=False):
+        self._mode = None
         self.channels = channels
         self.i2c_device = i2c_device
         self.bus = smbus.SMBus(i2c_device)
         self.address = address
+        self._address = int(address, 16)
         self.id = cid
         self.db = db
         self.stripes = []
         self.load_stripes()
+        self._pwm_freq = None
+        self.pwm_freq = pwm_freq
         if not from_db:
             self.save_to_db()
 
@@ -89,21 +94,56 @@ class Controller:
         cur = self.db.cursor()
         for stripe in cur.execute("select * from stripes where controller_id = ?", (self.id,)):
             self.stripes.append(Stripe.from_db(self, stripe))
+        logging.getLogger(__name__).debug("Loaded %s stripes for controller %s", len(self.stripes), self.id)
         cur.close()
 
     def __repr__(self):
         return "<Controller stripes={} cid={}>".format(len(self.stripes), self.id)
 
     def set_channel(self, channel, val):
-        self.bus.write_word_data(int(self.address, 16), LED0_OFF_L + 4 * channel, int(val * 4095))
-        self.bus.write_word_data(int(self.address, 16), LED0_ON_L + 4 * channel, 0)
+        self.bus.write_word_data(self._address, LED0_OFF_L + 4 * channel, int(val * 4095))
+        self.bus.write_word_data(self._address, LED0_ON_L + 4 * channel, 0)
 
     def get_channel(self, channel):
-        return self.bus.read_word_data(int(self.address, 16), LED0_OFF_L + 4 * channel) / 4095
+        return self.bus.read_word_data(self._address, LED0_OFF_L + 4 * channel) / 4095
 
     def add_stripe(self, stripe):
         self.stripes.append(stripe)
 
+    def reset(self):
+        self.mode = int("0b00100001", 2)  # MODE1 -> 0b00000001
+        time.sleep(0.015)
+        self.mode = int("0b10100001", 2)
+
+    @property
+    def mode(self):
+        self._mode = self.bus.read_byte_data(self._address, PCA9685_MODE1)
+        logging.getLogger(__name__).debug("Controller mode: %s", bin(self._mode))
+        return self._mode
+
+    @mode.setter
+    def mode(self, mode):
+        self.bus.write_byte_data(self._address, PCA9685_MODE1, mode)
+        self._mode = mode
+        logging.getLogger(__name__).debug("Controller mode: %s", bin(self._mode))
+
+    @property
+    def pwm_freq(self):
+        self._pwm_freq = (self.bus.read_byte_data(self._address, PCA9685_PRESCALE) + 1) / 4096 * 25000000
+        return self._pwm_freq
+
+    @pwm_freq.setter
+    def pwm_freq(self, value):
+        if value < 24 or value > 1526:
+            raise ValueError("PWM frequency must be 24Hz <= pwm_freq <= 1526Hz: {}".format(value))
+        prescal = round((25000000.0 / (4096.0 * value))) - 1
+        logging.getLogger(__name__).debug("Presacle value: %s", prescal)
+
+        self.mode = int("0b00110001", 2)
+        self.bus.write_byte_data(self._address, PCA9685_PRESCALE, prescal)
+        self.reset()
+        self._pwm_freq = value
+
 
 class ControllerEncoder(JSONEncoder):
     def default(self, o):
@@ -114,5 +154,14 @@ class ControllerEncoder(JSONEncoder):
                 'channel': o.channels,
                 'address': o.address,
                 'stripes': o.stripes,
-                'i2c_device': o.i2c_device
+                'cstripes': len(o.stripes),
+                'i2c_device': o.i2c_device,
+                'mode': o.mode
+            }
+        elif isinstance(o, Stripe):
+            return {
+                'id': o.id,
+                'name': o.name,
+                'rgb': o.rgb,
+                'channel': o.channels
             }