Enable new telecommands

nunorc · nunorc · commit ed78bee3abb6 · 2024-07-02T18:15:59.000+02:00
diff --git a/sim-ops-lib/so-master.py b/sim-ops-lib/so-master.py
@@ -134,7 +134,7 @@ def control_loop():
             # need at least ground station U/L carrier enabled to send command
             if _admin is False and (GS_SIM is None or GS_SIM.state.carrier_ul is None or GS_SIM.state.carrier_ul == Status.off):
                 result = { 'status': 'r:REL r:ACC r:FAIL'}
-                _ts = -1
+                _ts = GS_SIM.state.ts
             elif GS_SIM.state.power_ul < 50:
                 result = { 'status': 'g:REL r:ACC r:FAIL'}
                 _ts = GS_SIM.state.ts
diff --git a/sim-ops-lib/so/spacecraft.py b/sim-ops-lib/so/spacecraft.py
@@ -295,7 +295,7 @@ def _calc_net_power(self, _state: SpacecraftState) -> float:
         if _state.pts_sol_array[1] == Status.nominal:
             _power += 5 * int(_state.is_sunlit)
         if _state.pl_gps_status == Status.on:
-            _power -= 3
+            _power -= 0.5
         if _state.pl_camera_status == Status.on:
             _power -= 4
         if _state.ttc_tx_status == Status.on:
@@ -448,6 +448,12 @@ def control(self, data, ov_state=None, admin=False):
                 return _ok
             else:
                 return _fail
+        if data['control'] == 'aocs_valid':
+            if data['value'] in ['valid', 'not_valid', 'unknown']:
+                self._set_state([('aocs_valid', data['value'])])
+                return _ok
+            else:
+                return _fail
 
         # TTC
         if data['control'] == 'ttc_mode':
diff --git a/sim-ops-mcs/src/views/AOCS.vue b/sim-ops-mcs/src/views/AOCS.vue
@@ -158,7 +158,7 @@ export default {
 			<card class="mb-3">
 				<card-header class="card-header fw-bold small text-center p-1">AOCS Valid</card-header>
 				<card-body class="p-2 mx-2">
-					<span v-if="state" class="badge rounded-0 app-w-100 text-uppercase bg-dark">{{ state.aocs_valid }}</span>
+					<span v-if="state" class="badge rounded-0 app-w-100 text-uppercase" :class="{ 'text-bg-danger': state.aocs_valid==='not_valid', 'text-bg-dark': state.aocs_valid==='unkown', 'text-bg-theme': state.aocs_valid==='valid' }">{{ state.aocs_valid }}</span>
 					<span v-else>_</span>
 				</card-body>
 			</card>
diff --git a/sim-ops-mcs/src/views/Commands.vue b/sim-ops-mcs/src/views/Commands.vue
@@ -23,6 +23,7 @@ export default {
 				// { 'sub': 'AOCS', 'desc': 'Set AOCS mode MONITORING', 'tc': 'TC_AOCS_005', 'tm': 'AOCS > AOCS Mode' },
 				{ 'sub': 'AOCS', 'desc': 'Set AOCS chain A', 'tc': 'TC_AOCS_011', 'tm': 'AOCS > AOCS Chain' },
 				{ 'sub': 'AOCS', 'desc': 'Set AOCS chain B', 'tc': 'TC_AOCS_012', 'tm': 'AOCS > AOCS Chain' },
+				{ 'sub': 'AOCS', 'desc': 'Calibrate AOCS sensors', 'tc': 'TC_AOCS_021', 'tm': 'AOCS > AOCS Valid' },
 
 				{ 'sub': 'TTC', 'desc': 'Set TTC mode SLBR', 'tc': 'TC_TTC_001', 'tm': 'TTC > TTC Mode' },
 				{ 'sub': 'TTC', 'desc': 'Set TTC mode SHBR', 'tc': 'TC_TTC_002', 'tm': 'TTC > TTC Mode' },
diff --git a/sim-ops-mcs/src/views/SpaCon.vue b/sim-ops-mcs/src/views/SpaCon.vue
@@ -311,6 +311,7 @@ export default {
 							<button @click="addStack('TC_AOCS_002', 'aocs_mode', 'NADIR', $event)" type="button" class="btn btn-sm btn-outline-theme me-2 mt-2" title="Set AOCS Mode NADIR">TC_AOCS_002</button>
 							<button @click="addStack('TC_AOCS_011', 'aocs_chain', 'A', $event)" type="button" class="btn btn-sm btn-outline-theme me-2 mt-2" title="Set AOCS Chain A">TC_AOCS_011</button>
 							<button @click="addStack('TC_AOCS_012', 'aocs_chain', 'B', $event)" type="button" class="btn btn-sm btn-outline-theme me-2 mt-2" title="Set AOCS Chain B">TC_AOCS_012</button>
+							<button @click="addStack('TC_AOCS_021', 'aocs_valid', 'valid', $event)" type="button" class="btn btn-sm btn-outline-theme me-2 mt-2" title="Calibrate AOCS sensors">TC_AOCS_021</button>
 						</div>
 						<div class="col">
 							<h6 class="mt-2 mb-0">TTC</h6>
