fixed conflicts

2022-02-27 16:19:57 +01:00
parent aaf8d12662 fd43ef0c8a
commit 85b5c756ea
2 changed files with 26 additions and 0 deletions
@@ -424,6 +424,8 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
            {OpCodeDictKeys.TIMEOUT: 2.0},
        ),
        "69": ("Star Tracker: Firmware update", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "70": ("Star Tracker: Disable timestamp generation", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "71": ("Star Tracker: Enable timestamp generation", {OpCodeDictKeys.TIMEOUT: 2.0}),
    }
    service_star_tracker_tuple = ("Star tracker", op_code_dict_srv_star_tracker)