diff --git a/bin/config_tool.py b/bin/config_tool.py index 1372f56..4a4f7ad 100755 --- a/bin/config_tool.py +++ b/bin/config_tool.py @@ -1249,7 +1249,7 @@ def main(): help = 'The secondary (auxiliary) GNSS antenna lever arm (in meters).' param_parser.add_parser('gnss_aux', help=help, description=help) - gnss_parser = apply_param_parser.add_parser('gnss', help=help, description=help) + gnss_parser = apply_param_parser.add_parser('gnss_aux', help=help, description=help) gnss_parser.add_argument('x', type=float, help='The X offset with respect to the vehicle body (in meters).') gnss_parser.add_argument('y', type=float, help='The Y offset with respect to the vehicle body (in meters).') gnss_parser.add_argument('z', type=float, help='The Z offset with respect to the vehicle body (in meters).') diff --git a/p1_runner/log_manifest.py b/p1_runner/log_manifest.py index a466c62..34aab63 100644 --- a/p1_runner/log_manifest.py +++ b/p1_runner/log_manifest.py @@ -24,11 +24,16 @@ def __init__(self): self.device_id = None self.device_type = None self.device_version = None - self.system_config_path = None self.sw_version = None + self.system_config_path = None + self.base_path = None + self.ephemeris_path = None + self.channels = [] + self.metadata = {} + def to_json(self, pretty=True): data = copy.deepcopy(self.__dict__) @@ -76,12 +81,15 @@ def from_json(cls, contents): result.device_id = data.get('device_id', None) result.device_type = DeviceType.from_string(data.get('device_type', None)) - result.device_version = data.get('device_version', None) - result.system_config_path = data.get('system_config_path', None) result.sw_version = data.get('sw_version', None) + result.system_config_path = data.get('system_config_path', None) + result.base_path = data.get('base_path', None) + result.ephemeris_path = data.get('ephemeris_path', None) + result.channels = data.get('channels', []) + result.metadata = data.get('metadata', {}) return result