further enhancements for activation

Author: winemug

omni.py

@@ -41,8 +41,11 @@ def read_pdm_address(args, pa):
 
 
 def new_pod(args, pa):
-    pa["id_lot"] = args.id_lot
-    pa["id_t"] = args.id_t
+
+    if args.id_lot is not None:
+        pa["id_lot"] = args.id_lot
+    if args.id_t is not None:
+        pa["id_t"] = args.id_t
     if args.radio_address is not None:
         if str(args.radio_address).lower().startswith("0x"):
             pa["radio_address"] = int(args.radio_address[2:], 16)
@@ -83,6 +86,10 @@ def activate(args, pa):
     call_api(args.url, REST_URL_ACTIVATE_POD, pa)
 
 
+def archive(args, pa):
+    call_api(args.url, REST_URL_ARCHIVE_POD, pa)
+
+
 def start(args, pa):
     for i in range(0,48):
         pa["h" + str(i)] = args.basalrate
@@ -107,8 +114,8 @@ def main():
     subparser.set_defaults(func=read_pdm_address)
 
     subparser = subparsers.add_parser("newpod", help="newpod -h")
-    subparser.add_argument("id_lot", type=int, help="Lot number of the pod")
-    subparser.add_argument("id_t", type=int, help="Serial number of the pod")
+    subparser.add_argument("id_lot", type=int, help="Lot number of the pod", default=None, nargs="?")
+    subparser.add_argument("id_t", type=int, help="Serial number of the pod", default=None, nargs="?")
     subparser.add_argument("radio_address", help="Radio radio_address of the pod", default=None, nargs="?")
     subparser.set_defaults(func=new_pod)
 
@@ -147,6 +154,9 @@ def main():
     subparser = subparsers.add_parser("restart", help="restart -h")
     subparser.set_defaults(func=restart)
 
+    subparser = subparsers.add_parser("archive", help="archive -h")
+    subparser.set_defaults(func=archive)
+
     args = parser.parse_args()
     pa = get_auth_params()
     args.func(args, pa)

podcomm/manchester.py

@@ -4,17 +4,19 @@
 def encodeSingleByte(d):
     e = 0
     for i in range(0, 8):
-        e = e << 2
+
+        e = e >> 2
         if d & 0x01 == 0:
-            e |= 2
+            e |= 0x8000
         else:
-            e |= 1
+            e |= 0x4000
         d = d >> 1
     return bytes([(e >> 8), e & 0xff])
 
 class ManchesterCodec:
     def __init__(self):
-        self.preamble = bytes([0x66,0x65]) * 200 + bytes([0xa5, 0x5a])
+        #self.preamble = bytes([0x65,0x66]) * 20 + bytes([0xa5, 0x5a])
+        self.preamble = bytes()
         self.decode_dict = dict()
         self.encode_dict = dict()
         for i in range(0, 256):
@@ -27,7 +29,7 @@ def __init__(self):
         self.noiseLines = []
         for x in range(0, 32):
             noiseLine = "f"
-            for i in range(0, 159):
+            for i in range(0, 79):
                 noiseLine += random.choice(noiseNibbles)
             self.noiseLines.append(bytearray.fromhex(noiseLine))
 
@@ -48,13 +50,5 @@ def encode(self, data):
         encoded += self.noiseLines[self.noiseSeq]
         self.noiseSeq += 1
         self.noiseSeq %= 32
-
-        minPreamble = 4
-        minNoise = 2
-        available = 512 - len(data) - minPreamble - minNoise
-        dataIndex = len(self.preamble)
-        portion = int(available / 2)
-        preambleIncluded = minPreamble + portion
-        noiseIncluded = minNoise + available - portion
-        return encoded[dataIndex - preambleIncluded: dataIndex + noiseIncluded]
+        return encoded[0:80]