|

sri-server-bg02/lib/MessageListenerC001.py

@@ -31,7 +31,6 @@ def method_c001(client, userdata, message):
             'travelMode': 0,
             'vehicleHorn': 0
         },
-        'cockpitID': 'Cop001',
         'driverControl': {
             'accPedal': '0 AND 0 || 0 AND -1',
             'brakePedal': '2 AND 2',
@@ -66,6 +65,7 @@ def method_c001(client, userdata, message):
         },
         'timeStamp': 576301601,
         'userID': 'Ego',
+        'cockpitID': 'Cop001',
         'vehicleID': '0538'
     }
     """
@@ -84,16 +84,53 @@ def method_c001(client, userdata, message):
     log_dict = json.loads(message.payload)
     log_list = [
 
-        f"timeStamp: {methods.ts_to_string(int(log_dict.get('timeStamp')) / 1000)}",  # 时间
+        # f"timeStamp: {methods.ts_to_string(int(log_dict.get('timeStamp')) / 1000)}",  # 时间
         f"userID: {log_dict.get('userID')}",  # 用户id
         f"vehicleID: {log_dict.get('vehicleID')}",  # 车id
-
-        
+        f"cockpitID: {log_dict.get('cockpitID')}",  # 舱id
+
+        f"directSwitch: {log_dict.get('basControl').get('directSwitch')}",
+        f"eStop: {log_dict.get('basControl').get('eStop')}",
+        f"gearControl: {log_dict.get('basControl').get('gearControl')}",
+        f"hazardLight: {log_dict.get('basControl').get('hazardLight')}",
+        f"keyStatus: {log_dict.get('basControl').get('keyStatus')}",
+        f"parkControl: {log_dict.get('basControl').get('parkControl')}",
+        f"silencedAlarm: {log_dict.get('basControl').get('silencedAlarm')}",
+        f"travelLight: {log_dict.get('basControl').get('travelLight')}",
+        f"travelMode: {log_dict.get('basControl').get('travelMode')}",
+        f"vehicleHorn: {log_dict.get('basControl').get('vehicleHorn')}",
+
+        f"accPedal: {log_dict.get('driverControl').get('accPedal').replace('||', 'OR')}",
+        f"brakePedal: {log_dict.get('driverControl').get('brakePedal')}",
+        f"steeringWheel: {log_dict.get('driverControl').get('steeringWheel')}",
+        f"turnMode: {log_dict.get('driverControl').get('turnMode')}",
+        f"turnSignal: {log_dict.get('driverControl').get('turnSignal')}",
+
+        f"errAccPedal: {log_dict.get('errCode').get('errAccPedal')}",
+        f"errBasOperation: {log_dict.get('errCode').get('errBasOperation')}",
+        f"errBrakePedal: {log_dict.get('errCode').get('errBrakePedal')}",
+        f"errEndTool: {log_dict.get('errCode').get('errEndTool')}",
+        f"errHandle: {log_dict.get('errCode').get('errHandle')}",
+        f"errOther: {log_dict.get('errCode').get('errOther')}",
+        f"errSteeringWheel: {log_dict.get('errCode').get('errSteeringWheel')}",
+
+        f"baseLegControl: {log_dict.get('taskControl').get('baseLegControl')}",
+        f"baseLegSwitch: {log_dict.get('taskControl').get('baseLegSwitch')}",
+        f"bypassSwitch: {log_dict.get('taskControl').get('bypassSwitch')}",
+        f"cabLift: {log_dict.get('taskControl').get('cabLift')}",
+        f"coopSignal: {log_dict.get('taskControl').get('coopSignal')}",
+        f"enableHydraulic: {log_dict.get('taskControl').get('enableHydraulic')}",
+        f"endJoint: {log_dict.get('taskControl').get('endJoint')}",
+        f"esCabLift: {log_dict.get('taskControl').get('esCabLift')}",
+        f"suckerSelect: {log_dict.get('taskControl').get('suckerSelect')}",
+        f"taskJoint_1: {log_dict.get('taskControl').get('taskJoint_1')}",
+        f"taskJoint_2: {log_dict.get('taskControl').get('taskJoint_2')}",
+        f"taskJoint_3: {log_dict.get('taskControl').get('taskJoint_3')}",
+        f"toolControl: {log_dict.get('taskControl').get('toolControl')}",
+        f"workLight: {log_dict.get('taskControl').get('workLight')}",
 
     ]
 
-
-
     # --- check ---
     log_key = '-'.join(log_list[1:])
     if LocalClass.last_log_key and LocalClass.last_log_key == log_key: