Merge pull request #374 from HyperloopUPV-H8/develop

v2.3.2.11

Author: msanlli

common-front/lib/components/MessagesContainer/Messages/MessageView/Counter/Counter.module.scss

@@ -8,6 +8,6 @@
     font-size: 0.7rem;
     line-height: 90%;
 
-    color: white;
+    color: #333333; // Dark text color for better contrast on light background
     background-color: var(--light-color);
 }

common-front/lib/components/MessagesContainer/Messages/MessageView/InfoMessageView/InfoMessageView.module.scss

@@ -15,4 +15,5 @@
 
 .payload {
     font-size: 0.7rem;
+    color: #333333; // Dark text color for better contrast
 }

common-front/lib/components/MessagesContainer/Messages/MessageView/MessageView.module.scss

@@ -31,6 +31,7 @@
     border-radius: 0.5rem;
     filter: (--shadow);
     font-size: 0.8rem;
+    color: #333333; // Dark text color for better contrast
 }
 
 .icon {

common-front/lib/components/MessagesContainer/Messages/MessageView/ProtectionMessageView/ProtectionView/ProtectionView.module.scss

@@ -4,4 +4,5 @@
     column-gap: 1rem;
     font-size: 0.8rem;
     row-gap: 0.5rem;
+    color: #333333; // Dark text color for better contrast
 }

control-station/src/components/EnumIndicator/EnumIndicator.tsx

@@ -1,4 +1,4 @@
-import { useGlobalTicker, useMeasurementsStore } from "common";
+import { useGlobalTicker, useMeasurementsStore, usePodDataStore } from "common";
 import styles from "./EnumIndicator.module.scss";
 import { memo, useContext, useState } from "react";
 import { LostConnectionContext } from "services/connections";
@@ -13,15 +13,29 @@ export const EnumIndicator = memo(({ measurementId, icon }: Props) => {
     (state) => state.getEnumMeasurementInfo(measurementId).getUpdate,
   );
 
+  const podData = usePodDataStore((state) => state.podData);
   const lostConnection = useContext(LostConnectionContext);
 
+  const [hasReceivedData, setHasReceivedData] = useState(false);
   const [variant, setVariant] = useState(getValue());
-  const state = lostConnection ? "DISCONNECTED" : variant;
 
   useGlobalTicker(() => {
-    setVariant(getValue());
+    const boardName = measurementId.split('/')[0];
+    
+    const board = podData.boards.find(b => b.name === boardName);
+    const hasReceivedPackets = board?.packets.some(packet => packet.count > 0) || false;
+    
+    const currentValue = getValue();
+    setVariant(currentValue);
+
+    if (hasReceivedPackets && !hasReceivedData) {
+      setHasReceivedData(true);
+    }
   });
 
+  const showDisconnected = lostConnection || !hasReceivedData;
+  const state = showDisconnected ? "DISCONNECTED" : variant;
+
   return (
     <div
       className={styles.enum_indicator}
@@ -32,7 +46,7 @@ export const EnumIndicator = memo(({ measurementId, icon }: Props) => {
     >
       <img className={styles.icon} src={icon} />
 
-      <p className={styles.title}>{lostConnection ? "DISCONNECTED" : state.toUpperCase()}</p>
+      <p className={styles.title}>{showDisconnected ? "DISCONNECTED" : state.toUpperCase()}</p>
 
       <img className={styles.icon} src={icon} />
     </div>

control-station/src/components/EnumIndicator/VehicleState.tsx

@@ -1,4 +1,4 @@
-import { useGlobalTicker, useMeasurementsStore, VcuMeasurements } from 'common';
+import { useGlobalTicker, useMeasurementsStore, VcuMeasurements, usePodDataStore } from 'common';
 import styles from './EnumIndicator.module.scss';
 import { useContext, useState } from 'react';
 import { LostConnectionContext } from 'services/connections';
@@ -12,19 +12,33 @@ export const VehicleState = () => {
         (state) => state.getEnumMeasurementInfo(VcuMeasurements.operationalState).getUpdate
     );
 
+    const podData = usePodDataStore((state) => state.podData);
     const lostConnection = useContext(LostConnectionContext);
 
-    const [generalState, setGeneralState] = useState(generalStateMeasurement);
-    const [operationalState, setOperationalState] = useState(operationalStateMeasurement);
-    const state = lostConnection
-        ? 'DISCONNECTED'
-        : (generalState == 'OPERATIONAL') ? operationalState : generalState;
+    const [hasReceivedData, setHasReceivedData] = useState(false);
+    const [generalState, setGeneralState] = useState('FAULT');
+    const [operationalState, setOperationalState] = useState('FAULT');
 
     useGlobalTicker(() => {
-        setGeneralState(generalStateMeasurement);
-        setOperationalState(operationalStateMeasurement);
+        const vcuBoard = podData.boards.find(board => board.name === 'VCU');
+        const hasReceivedPackets = vcuBoard?.packets.some(packet => packet.count > 0) || false;
+        
+        const currentGeneralState = generalStateMeasurement();
+        const currentOperationalState = operationalStateMeasurement();
+        setGeneralState(currentGeneralState);
+        setOperationalState(currentOperationalState);
+        
+        if (hasReceivedPackets && !hasReceivedData) {
+            setHasReceivedData(true);
+        }
     });
 
+    const showDisconnected = lostConnection || !hasReceivedData;
+    
+    const state = showDisconnected
+        ? 'DISCONNECTED'
+        : (generalState == 'OPERATIONAL') ? operationalState : generalState;
+
     return (
         <div
             className={styles.enum_indicator}

control-station/src/components/ImdIndicator/ImdIndicator.tsx

@@ -1,36 +1,43 @@
-import { HvscuMeasurements, useGlobalTicker, useMeasurementsStore } from 'common';
+import { HvscuMeasurements, useGlobalTicker, useMeasurementsStore, usePodDataStore, getPacket } from 'common';
 import styles from './ImdIndicator.module.scss';
 import thunderIcon from 'assets/svg/thunder-filled.svg'
 import { memo, useContext, useState } from 'react';
 import { LostConnectionContext } from 'services/connections';
 
-interface Props {
-    measurementId: string;
-    icon: string;
-}
-
 export const ImdIndicator = () => {
     const getValue = useMeasurementsStore(
         (state) => state.getBooleanMeasurementInfo(HvscuMeasurements.IsImdOk).getUpdate
     );
 
+    const podData = usePodDataStore((state) => state.podData);
     const lostConnection = useContext(LostConnectionContext);
 
-    const [IsImdOk, setVariant] = useState(getValue());
+    const [hasReceivedData, setHasReceivedData] = useState(false);
+    const [IsImdOk, setVariant] = useState(true); 
 
     useGlobalTicker(() => {
-        setVariant(getValue());
+        const hvscuBoard = podData.boards.find(board => board.name === 'HVSCU');
+        const hasReceivedPackets = hvscuBoard?.packets.some(packet => packet.count > 0) || false;
+        
+        const currentValue = getValue();
+        setVariant(currentValue);
+        
+        if (hasReceivedPackets && !hasReceivedData) {
+            setHasReceivedData(true);
+        }
     });
 
+    const showDisconnected = lostConnection || !hasReceivedData;
+
     return (
         <div
             className={styles.state_indicator}
-            style={{ backgroundColor: lostConnection ? '#cccccc' : IsImdOk ? '#ACF293' : '#EF9A87' }}
+            style={{ backgroundColor: showDisconnected ? '#cccccc' : IsImdOk ? '#ACF293' : '#EF9A87' }}
         >
             <img className={styles.icon} src={thunderIcon} />
 
             <p className={styles.title}>
-                {lostConnection ? 'DISCONNECTED' : IsImdOk ? 'ISOLATED' : 'ISOLATION FAULT'}
+                {showDisconnected ? 'DISCONNECTED' : IsImdOk ? 'ISOLATED' : 'ISOLATION FAULT'}
             </p>
 
             <img className={styles.icon} src={thunderIcon} />

control-station/src/pages/VehiclePage/BoosterPage/BoosterPage.module.scss

@@ -25,6 +25,11 @@
   height: 100%;
 }
 
+.emergency_wrapper {
+    justify-content: center;
+    min-height: 0;
+    height: 3rem;
+}
 .statusIndicators {
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));

control-station/src/pages/VehiclePage/BoosterPage/BoosterPage.tsx

@@ -15,7 +15,7 @@ import {
 } from "common";
 import { OrdersContainer } from "components/OrdersContainer/OrdersContainer";
 import { Window } from "components/Window/Window";
-import { getHardcodedOrders } from "../BatteriesPage/FixedOrders";
+import { emergencyStopOrders, getHardcodedOrders } from "../BatteriesPage/FixedOrders";
 import { usePodDataUpdate } from "hooks/usePodDataUpdate";
 import { Connection, useConnections } from "common";
 import { LostConnectionContext } from "services/connections";
@@ -26,6 +26,7 @@ import thunder from "assets/svg/thunder-filled.svg";
 import thermometer from "assets/svg/thermometer-field.svg";
 import Contactors from "assets/svg/open-contactors-icon.svg";
 import teamLogo from "assets/svg/team_logo.svg";
+import { BigOrderButton } from "components/BigOrderButton";
 
 interface ModuleData {
   id: number | string;
@@ -153,6 +154,15 @@ export function BoosterPage() {
           <Window title="Messages" className={styles.messages}>
             <MessagesContainer />
           </Window>
+          <div className={styles.emergency_wrapper}>
+              <BigOrderButton
+                  orders={emergencyStopOrders}
+                  label="⚠️ EMERGENCY STOP"
+                  shortcut=" "
+                  className={`${styles.emergency_button} ${styles.emergency_stop}`}
+                  brightness={3}
+              />
+          </div>
           <Window title="Orders" className={styles.orders}>
             <div className={styles.order_column}>
               <OrdersContainer

control-station/src/pages/VehiclePage/MainPage/MainPage.tsx

@@ -50,7 +50,7 @@ export const MainPage = () => {
                         <HVSCU />
                         <LCU />
                     </div>
-                    <Pneumatic/>
+                    {/* <Pneumatic/> */}
 
                     <Batteries/>