Integrate latest centronic-py improvements

Author: Nicolas

pybecker/becker.py

@@ -1,13 +1,14 @@
 import logging
 import os
-import time
-import socket
+import re
 import serial
+import socket
+import time
 
-from .database import Database
 from .becker_helper import finalize_code
 from .becker_helper import generate_code
 from .becker_helper import BeckerConnectionError
+from .database import Database
 
 COMMAND_UP = 0x20
 COMMAND_UP2 = 0x21  # move up
@@ -102,6 +103,9 @@ async def run_codes(self, channel, unit, cmd, test):
             _LOGGER.error("The unit %s is not configured" % (unit[0]))
             return
 
+        # move up/down dependent on given time
+        mt = re.match(r"(DOWN|UP):(\d+)", cmd)
+
         codes = []
         if cmd == "UP":
             codes.append(generate_code(channel, unit, COMMAND_UP))
@@ -114,12 +118,8 @@ async def run_codes(self, channel, unit, cmd, test):
         elif cmd == "DOWN2":
             codes.append(generate_code(channel, unit, COMMAND_DOWN5))
         elif cmd == "TRAIN":
-            codes.append(generate_code(channel, unit, COMMAND_PAIR))
-            unit[1] += 1
             codes.append(generate_code(channel, unit, COMMAND_PAIR2))
             unit[1] += 1
-            codes.append(generate_code(channel, unit, COMMAND_PAIR))
-            unit[1] += 1
             codes.append(generate_code(channel, unit, COMMAND_PAIR2))
             # set unit as configured
             unit[2] = 1
@@ -134,24 +134,38 @@ async def run_codes(self, channel, unit, cmd, test):
             unit[1] += 1
             codes.append(generate_code(channel, unit, COMMAND_CLEARPOS4))
         elif cmd == "REMOVE":
-            codes.append(generate_code(channel, unit, COMMAND_PAIR))
-            unit[1] += 1
             codes.append(generate_code(channel, unit, COMMAND_PAIR2))
             unit[1] += 1
-            codes.append(generate_code(channel, unit, COMMAND_PAIR))
-            unit[1] += 1
             codes.append(generate_code(channel, unit, COMMAND_PAIR2))
             unit[1] += 1
             codes.append(generate_code(channel, unit, COMMAND_PAIR3))
             unit[1] += 1
             codes.append(generate_code(channel, unit, COMMAND_PAIR4))
+            unit[2] = 0
 
-        unit[1] += 1
+        if mt:
+            _LOGGER.INFO("Moving %s for %s seconds..." % (mt.group(1), mt.group(2)))
+            # move down/up for a specific time
+            if mt.group(1) == "UP":
+                code = generate_code(channel, unit, COMMAND_UP)
+            elif mt.group(1) == "DOWN":
+                code = generate_code(channel, unit, COMMAND_DOWN)
 
-        # append the release button code
-        codes.append(generate_code(channel, unit, 0))
+            unit[1] += 1
+            await self.write([code])
+
+            time.sleep(int(mt.group(2)))
 
-        unit[1] += 1
+            # stop moving
+            code = generate_code(channel, unit, COMMAND_HALT)
+            unit[1] += 1
+            await self.write([code])
+        else:
+            unit[1] += 1
+
+        # append the release button code
+        #codes.append(generate_code(channel, unit, 0))
+        #unit[1] += 1
 
         await self.write(codes)
         self.db.set_unit(unit, test)

pybecker/becker_helper.py

@@ -37,11 +37,15 @@ def generate_code(channel, unit, cmd_code, with_checksum=True):
     unit_id = unit[0]  # contains the unit code in hex (5 chars)
     unit_inc = unit[1]  # contains the next increment (required to convert into hex4)
 
-    code = CODE_PREFIX + hex4(unit_inc) + CODE_SUFFIX + unit_id + CODE_21 + CODE_REMOTE + hex2(channel) + '00' \
-        + hex2(cmd_code)
+    if channel == 0:
+        # channel 0 may be used for wall mounted sender (primary used as master sender)
+        code = CODE_PREFIX + hex4(unit_inc) + CODE_SUFFIX + unit_id + CODE_21 + "00" + hex2(channel) + '00' + hex2(
+            cmd_code)
+    else:
+        code = CODE_PREFIX + hex4(unit_inc) + CODE_SUFFIX + unit_id + CODE_21 + CODE_REMOTE + hex2(channel) + '00' \
+               + hex2(cmd_code)
     return checksum(code) if with_checksum else code
 
-
 def finalize_code(code):
     return b"".join([STX, code.encode(), ETX])
 

pybecker/database.py

@@ -3,6 +3,7 @@
 import time
 import sqlite3
 from random import randrange
+from .becker_helper import hex4
 
 NUMBER_FILE = "centronic-stick.num"
 
@@ -74,12 +75,14 @@ def output(self):
         c = self.conn.cursor()
         res = c.execute('SELECT * FROM unit')
         _LOGGER.info('%-10s%-10s%-12s%-15s' % ('code', 'increment', 'configured', 'last run'))
+        _LOGGER.info('%-10s%-18s%-12s%-15s' % ('code', 'increment (hex)', 'configured', 'last run'))
         for line in res.fetchall():
             last_run = '(unknown)'
 
             if line[3] > 0:
                 last_run = time.strftime('%Y-%m-%d %H:%M', time.localtime(line[3]))
             _LOGGER.info('%-10s%-10s%-12s%-15s' % (line[0], line[1], line[2], last_run))
+            _LOGGER.info('%-10s%-6s%-12s%-12s%-15s' % (line[0], line[1], "(0x" + hex4(line[1]) + ")", line[2], last_run))
 
     def get_unit(self, rowid):
         c = self.conn.cursor()
@@ -122,8 +125,17 @@ def set_unit(self, unit, test=False):
         c = self.conn.cursor()
         last_run = int(time.time())
 
-        c.execute('UPDATE unit SET increment = ?, configured = ?, executed = ? WHERE code = ?',
-                  (unit[1], unit[2], last_run, unit[0],))
+        #c.execute('UPDATE unit SET increment = ?, configured = ?, executed = ? WHERE code = ?',
+        #          (unit[1], unit[2], last_run, unit[0],))
+
+        if len(unit[0]) < 5:
+            # assume the index is given (and not the exact unit)
+            c.execute('UPDATE unit SET increment = ?, configured = ?, executed = ? '
+                      'WHERE code = (SELECT code FROM unit LIMIT 1 OFFSET ?)',
+                      (unit[1], unit[2], last_run, int(unit[0]) - 1,))
+        else:
+            c.execute('UPDATE unit SET increment = ?, configured = ?, executed = ? WHERE code = ?',
+                      (unit[1], unit[2], last_run, unit[0],))
 
         if test:
             self.conn.rollback()

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="pybecker",
-    version="1.0.4",
+    version="1.0.5",
     author="Nicolas Berthel",
     author_email="[email protected]",
     install_requires=['pyserial>=3.4'],