- Add new mode

python/biopro/device/device_cc2650.py

@@ -494,7 +494,8 @@ class CC2650Device(Device):
 
     @property
     def battery(self) -> int:
-        self.update_battery_info()
+        if self._start_flag == False:
+            self.update_battery_info()
         return self._battery
 
     @property
@@ -2174,7 +2175,7 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
                 try:
                     connect_response = self._cc2650.recv_uart(2)
                 except RecvTimeout:
-                    self.log_verbose('[CC2650]', 'connect response timeout')
+                    # self.log_verbose('[CC2650]', 'connect response timeout')
                     if retry < 5:
                         self.log_verbose('[CC2650]', 'connect retry')
                         continue
@@ -2182,6 +2183,7 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
                     break
 
         if connect_response is None:
+            self.log_verbose('[CC2650]', 'connect response timeout')
             return False
 
         pack_len = connect_response[0]
@@ -2207,7 +2209,8 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
             self.log_verbose('[CC2650]', DEVICE_CONNECTED, address_s)
             return ret
 
-        self.log_verbose('[CC2650]', 'connect fail')
+        connect_response_hex = ''.join(format(i, '02X') for i in connect_response)
+        self.log_verbose('[CC2650]', 'connect fail', '0x'+connect_response_hex)
         return False
 
     @synchronized

python/res/devlib/json/Elite_TRIG_0.1.devlib.json

@@ -31,7 +31,7 @@
   },
   "parameters": {
     "USED": {
-      "initial": [false, false, false, false, false, false, false, false],
+      "initial": [true, true, true, false, false, false, false, false],
       "domain": {
         "list": [
           0, 2
@@ -40,7 +40,7 @@
       "value": "VALUE"
     },
     "T_EARLY": {
-      "initial": [0, 0, 0, 0, 0, 0, 0, 0],
+      "initial": [5000, 5000, 5000, 0, 0, 0, 0, 0],
       "domain": {
         "list": [
           0, 86400000
@@ -49,7 +49,7 @@
       "value": "VALUE"
     },
     "V_EARLY": {
-      "initial": [false, false, false, false, false, false, false, false],
+      "initial": [true, false, false, false, false, false, false, false],
       "domain": {
         "list": [
           0, 2
@@ -58,7 +58,7 @@
       "value": "VALUE"
     },
     "CYCLE": {
-      "initial": [1, 1, 1, 1, 1, 1, 1, 1],
+      "initial": [10, 10, 10, 1, 1, 1, 1, 1],
       "domain": {
         "list": [
           0, 65535
@@ -67,7 +67,7 @@
       "value": "VALUE"
     },
     "T_MID0": {
-      "initial": [0, 0, 0, 0, 0, 0, 0, 0],
+      "initial": [30000, 30000, 30000, 0, 0, 0, 0, 0],
       "domain": {
         "list": [
           0, 86400000
@@ -76,7 +76,7 @@
       "value": "VALUE"
     },
     "T_MID1": {
-      "initial": [0, 0, 0, 0, 0, 0, 0, 0],
+      "initial": [30000, 30000, 30000, 0, 0, 0, 0, 0],
       "domain": {
         "list": [
           0, 86400000
@@ -103,7 +103,7 @@
       "value": "VALUE"
     },
     "V_MID0": {
-      "initial": [false, false, false, false, false, false, false, false],
+      "initial": [true, true, false, false, false, false, false, false],
       "domain": {
         "list": [
           0, 2
@@ -112,7 +112,7 @@
       "value": "VALUE"
     },
     "V_MID1": {
-      "initial": [false, false, false, false, false, false, false, false],
+      "initial": [false, false, true, false, false, false, false, false],
       "domain": {
         "list": [
           0, 2
@@ -337,6 +337,8 @@
         "Analog Current Control (ACC)",
         "Idle",
         "Dev Mode",
+        "Protocal 1",
+        "Protocal 2",
         "Trigger"
       ]
     },
@@ -399,7 +401,9 @@
         "expression": "MODE",
         "when": {
           "0": "curve_acc",
-          "3": "trig_timer_mode"
+          "3": "trig_timer_mode",
+          "4": "trig_timer_mode",
+          "5": "trig_timer_mode"
         }
       },
       "_sync(True)",