except ValueError:
continue
+ del json_message['timestamp']
+
+ message = openxc_pb2.VehicleMessage()
+
if 'id' and 'data' in json_message:
# rough approx. that CAN messages are 10 bytes - they could be less
# but most of ours are full 64+11 bits
total_raw_can_size += 10
- total_raw_json_size += len(line)
- binary_message = openxc_pb2.RawMessage()
- binary_message.message_id = json_message['id']
- binary_message.data = int(json_message['data'], 0)
- total_raw_binary_size += len(binary_message.SerializeToString())
+ total_raw_json_size += len(json.dumps(json_message))
+ message.type = openxc_pb2.VehicleMessage.RAW
+ message.raw_message.message_id = json_message['id']
+ message.raw_message.data = int(json_message['data'], 0)
+ total_raw_binary_size += len(message.SerializeToString())
else:
- if isinstance(json_message['value'], bool):
- binary_message = openxc_pb2.TranslatedBooleanMessage()
- elif isinstance(json_message['value'], numbers.Number):
- binary_message = openxc_pb2.TranslatedNumericMessage()
+ message.type = openxc_pb2.VehicleMessage.TRANSLATED
+ message.translated_message.name = json_message['name']
+ if 'event' in json_message:
+ message.translated_message.string_value = json_message['value']
+ if isinstance(json_message['event'], bool):
+ message.translated_message.type = openxc_pb2.TranslatedMessage.EVENTED_BOOL
+ message.translated_message.boolean_event = json_message['event']
+ elif isinstance(json_message['event'], numbers.Number):
+ message.translated_message.type = openxc_pb2.TranslatedMessage.EVENTED_NUM
+ message.translated_message.numeric_value = json_message['event']
+ else:
+ message.translated_message.type = openxc_pb2.TranslatedMessage.EVENTED_STRING
+ message.translated_message.string_value = json_message['event']
else:
- binary_message = openxc_pb2.TranslatedStringMessage()
- binary_message.name = json_message['name']
- binary_message.value = json_message['value']
- total_translated_json_size += len(line)
- total_translated_binary_size += len(binary_message.SerializeToString())
+ if isinstance(json_message['value'], bool):
+ message.translated_message.type = openxc_pb2.TranslatedMessage.BOOL
+ message.translated_message.boolean_value = json_message['value']
+ elif isinstance(json_message['value'], numbers.Number):
+ message.translated_message.type = openxc_pb2.TranslatedMessage.NUM
+ message.translated_message.numeric_value = json_message['value']
+ else:
+ message.translated_message.type = openxc_pb2.TranslatedMessage.STRING
+ message.translated_message.string_value = json_message['value']
+ total_translated_json_size += len(json.dumps(json_message))
+ total_translated_binary_size += len(message.SerializeToString())
print("For the %d trace files given..." % len(sys.argv[1:]))