Northeastern-Electric-Racing · RChandler234 · Aug 19, 2024 · Sep 21, 2024 · Sep 21, 2024 · Sep 22, 2024
diff --git a/README.md b/README.md
@@ -1,17 +1,13 @@
 # Argos
 
-### Initializing Submodule
-
-To initialize the odyssey submodule run `git submodule update --init`
-
 ## Local Development
 
 Setup angular-client and scylla-server:
 
 [Angular Client](./angular-client/README.md)\
 [Scylla Server](./scylla-server/README.md)
 
-Once you've sucessfully setup Scylla and the Client, you can either run them separately, or follow the docker commands below to run them together.
+Once you've sucessfully setup Scylla and the Client, you can either run them separately, use `npm run start` from the root directory to run them together, or follow the docker commands below to run them together.
 
 ## Production
 

diff --git a/angular-client/src/api/data.api.ts b/angular-client/src/api/data.api.ts
@@ -3,3 +3,7 @@ import { urls } from './urls';
 export const getDataByDataTypeNameAndRunId = (dataTypeName: string, runId: number): Promise<Response> => {
   return fetch(urls.getDataByDataTypeNameAndRunId(dataTypeName, runId));
 };
+
+export const getDataByDatetime = (dateTime: string): Promise<Response> => {
+  return fetch(urls.getDataByDatetime(dateTime));
+};
diff --git a/angular-client/src/api/urls.ts b/angular-client/src/api/urls.ts
@@ -10,6 +10,7 @@ const getAllSystems = () => `${baseURL}/systems`;
 
 /* Data */
 const getDataByDataTypeNameAndRunId = (dataTypeName: string, runId: number) => `${baseURL}/data/${dataTypeName}/${runId}`;
+const getDataByDatetime = (dateTime: string) => `${baseURL}/dataByDatetime/${dateTime}`;
 
 /* Runs */
 const getRunById = (id: number) => `${baseURL}/runs/${id}`;
@@ -22,6 +23,7 @@ export const urls = {
   getAllSystems,
 
   getDataByDataTypeNameAndRunId,
+  getDataByDatetime,
 
   getAllRuns,
   getRunById,

diff --git a/angular-client/src/app/app-routing.module.ts b/angular-client/src/app/app-routing.module.ts
@@ -1,6 +1,7 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import ChargingPage from 'src/pages/charging-page/charging-page.component';
+import FaultPage from 'src/pages/fault-page/fault-page.component';
 import GraphPage from 'src/pages/graph-page/graph-page.component';
 import LandingPage from 'src/pages/landing-page/landing-page.component';
 import Map from 'src/pages/map/map.component';
@@ -10,7 +11,8 @@ const routes: Routes = [
   { path: 'graph', component: GraphPage },
   { path: '', redirectTo: '/landing', pathMatch: 'full' },
   { path: 'map', component: Map },
-  { path: 'charging', component: ChargingPage }
+  { path: 'charging', component: ChargingPage },
+  { path: 'fault', component: FaultPage }
 ];
 
 @NgModule({

diff --git a/angular-client/src/app/app-sidebar/app-sidebar.component.html b/angular-client/src/app/app-sidebar/app-sidebar.component.html
@@ -7,5 +7,6 @@
     <sidebar-chip icon="ev_station" value="Charging" (click)="navigateTo('/charging')" />
     <sidebar-chip icon="bar_chart" value="Graph" (click)="navigateTo('/graph')" />
     <sidebar-chip icon="map" value="Map" (click)="navigateTo('/map')" />
+    <sidebar-chip icon="warning" value="Fault" (click)="navigateTo('/fault')" />
   </ng-template>
 </p-sidebar>
diff --git a/angular-client/src/app/app.module.ts b/angular-client/src/app/app.module.ts
@@ -104,11 +104,15 @@ import CombinedStatusMobile from 'src/pages/charging-page/components/combined-st
 import PackVoltageMobileDisplay from 'src/pages/charging-page/components/pack-voltage/pack-voltage-display/pack-voltage-mobile/pack-voltage-mobile.component';
 import HighLowCellMobile from 'src/pages/charging-page/components/high-low-cell/high-low-cell-display/high-low-cell-mobile/high-low-cell-mobile.component';
 import CellTempMobile from 'src/pages/charging-page/components/cell-temp/cell-temp-display/cell-temp-mobile/cell-temp-mobile.component';
+import FaultPage from 'src/pages/fault-page/fault-page.component';
+import FaultLog from 'src/pages/fault-page/components/fault-log/fault-log.component';
+import FaultBox from 'src/pages/fault-page/components/fault-display/fault-box.component';
 
 @NgModule({
   declarations: [
     AppContext,
     LandingPage,
+    FaultPage,
     ChargingPage,
     ChargingPageMobile,
     GraphPage,
@@ -175,6 +179,8 @@ import CellTempMobile from 'src/pages/charging-page/components/cell-temp/cell-te
     CellTempGraph,
     CurrentDisplay,
     FaultDisplay,
+    FaultLog,
+    FaultBox,
     SwitchComponent,
     BMSModeDisplay,
     DoubleLineGraphComponent,

diff --git a/angular-client/src/pages/fault-page/components/fault-display/fault-box.component.css b/angular-client/src/pages/fault-page/components/fault-display/fault-box.component.css
@@ -0,0 +1,7 @@
+.fault-box-body {
+  height: 95%;
+  display: flex;
+  align-items: left;
+  justify-content: left;
+  overflow-y: auto;
+}
diff --git a/angular-client/src/pages/fault-page/components/fault-display/fault-box.component.html b/angular-client/src/pages/fault-page/components/fault-display/fault-box.component.html
@@ -0,0 +1,3 @@
+<info-background title="Current Fault">
+  <div style="width: 100%; padding-right: 5px; padding-left: 0px" class="fault-text-body"></div>
+</info-background>
diff --git a/angular-client/src/pages/fault-page/components/fault-display/fault-box.component.ts b/angular-client/src/pages/fault-page/components/fault-display/fault-box.component.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+import Storage from 'src/services/storage.service';
+import { IdentifierDataType } from 'src/utils/enumerations/identifier-data-type';
+
+@Component({
+  selector: 'fault-box',
+  templateUrl: './fault-box.component.html',
+  styleUrls: ['./fault-box.component.css']
+})
+export default class FaultBox {
+  constructor(private storage: Storage) {}
+
+  ngOnInit() {}
+}
diff --git a/angular-client/src/pages/fault-page/components/fault-log/fault-log.component.css b/angular-client/src/pages/fault-page/components/fault-log/fault-log.component.css
@@ -0,0 +1,7 @@
+.fault-text-body {
+  height: 95%;
+  display: flex;
+  align-items: left;
+  justify-content: left;
+  overflow-y: auto;
+}
diff --git a/angular-client/src/pages/fault-page/components/fault-log/fault-log.component.html b/angular-client/src/pages/fault-page/components/fault-log/fault-log.component.html
@@ -0,0 +1,30 @@
+<info-background title="Fault Log" svgIcon="warning" [button]="resetButton">
+  <div style="width: 100%; padding-right: 5px; padding-left: 0px" class="fault-text-body">
+    <vstack style="width: 100%">
+      <div style="height: 10px"></div>
+      <ng-container *ngFor="let fault of faults; index as i">
+        <div
+          [style]="
+            (i % 2 == 0) === faultsShifted
+              ? 'background-color: #d4760b	; width: 100%; border-radius: 2px'
+              : 'background-color: #4d453c; width: 100%; border-radius: 2px'
+          "
+          (click)="setSelectedFault(fault)"
+        >
+          <div style="display: flex; flex-direction: row; justify-content: space-between; height: 45px; padding: 10px">
+            <typography variant="info-subtitle" [content]="fault.type" style="align-self: center"></typography>
+            <typography
+              variant="info-subtitle"
+              [content]="fault.name"
+              additionalStyles="font-weight: bold;"
+              style="align-self: center; padding-left: 5px"
+            ></typography>
+            <typography variant="info-subtitle" [content]="fault.displayTime" style="align-self: center"></typography>
+          </div>
+        </div>
+        <div style="height: 2px"></div>
+      </ng-container>
+      <div style="height: 50px"></div>
+    </vstack>
+  </div>
+</info-background>
diff --git a/angular-client/src/pages/fault-page/components/fault-log/fault-log.component.ts b/angular-client/src/pages/fault-page/components/fault-log/fault-log.component.ts
@@ -0,0 +1,159 @@
+import { Component, Input } from '@angular/core';
+import Storage from 'src/services/storage.service';
+import { IdentifierDataType } from 'src/utils/enumerations/identifier-data-type';
+
+enum BMS_FAULTS_TYPES {
+  CELLS_NOT_BALANCING = 1,
+  CELL_VOLTAGE_TOO_LOW = 2,
+  CELL_VOLTAGE_TOO_HIGH = 4,
+  PACK_TOO_HOT = 8,
+  OPEN_WIRING_FAULT = 16,
+  INTERNAL_SOFTWARE_FAULT = 32,
+  INTERNAL_THERMAL_ERROR = 64,
+  INTERNAL_CELL_COMM_FAULT = 128,
+  CURRENT_SENSOR_FAULT = 256,
+  CHARGE_READING_MISMATCH = 512,
+  LOW_CELL_VOLTAGE = 1024,
+  WEAK_PACK_FAULT = 2048,
+  EXTERNAL_CAN_FAULT = 4096,
+  DISCHARGE_LIMIT_ENFORCEMENT_FAULT = 8192,
+  CHARGER_SAFETY_RELAY = 16384,
+  BATTERY_THERMISTOR = 32768,
+  CHARGER_CAN_FAULT = 65536,
+  CHARGER_LIMIT_ENFORCEMENT_FAULT = 131072
+}
+
+enum FaultType {
+  BMS = 'BMS',
+  Charger = 'Charger'
+}
+
+@Component({
+  selector: 'fault-log',
+  templateUrl: './fault-log.component.html',
+  styleUrls: ['./fault-log.component.css']
+})
+export default class FaultLog {
+  @Input() setSelectedFault!: (fault: { type: string; name: string; time: string; displayTime: string }) => void;
+  faults: { type: string; name: string; time: string; displayTime: string }[] = [];
+  faultsShifted: boolean = false;
+  resetButton = {
+    onClick: () => {
+      this.faults = [];
+    },
+    icon: 'restart_alt'
+  };
+  constructor(private storage: Storage) {}
+
+  ngOnInit() {
+    this.storage.get(IdentifierDataType.COMM_TIMEOUT_FAULT).subscribe((value) => {
+      this.addFault(parseInt(value.values[0]), 'Comm Timeout', FaultType.Charger, value.time);
+    });
+
+    this.storage.get(IdentifierDataType.HARDWARE_FAILURE_FAULT).subscribe((value) => {
+      this.addFault(parseInt(value.values[0]), 'Hardware Failure', FaultType.Charger, value.time);
+    });
+
+    this.storage.get(IdentifierDataType.OVER_TEMP_FAULT).subscribe((value) => {
+      this.addFault(parseInt(value.values[0]), 'Over Temp', FaultType.Charger, value.time);
+    });
+
+    this.storage.get(IdentifierDataType.VOLTAGE_WRONG_FAULT).subscribe((value) => {
+      this.addFault(parseInt(value.values[0]), 'Voltage Wrong', FaultType.Charger, value.time);
+    });
+
+    this.storage.get(IdentifierDataType.WRONG_BAT_CONNECT_FAULT).subscribe((value) => {
+      this.addFault(parseInt(value.values[0]), 'Wrong Battery Connect', FaultType.Charger, value.time);
+    });
+
+    this.storage.get(IdentifierDataType.BMS_FAULTS).subscribe((value) => {
+      const bmsFaultID = parseInt(value.values[0]);
+      this.addFault(bmsFaultID, this.getBMSFaultName(bmsFaultID), FaultType.BMS, value.time);
+    });
+  }
+
+  /**
+   * Adds the fault name, with the current time to the faults array, if the faultValue is NOT 0.
+   * Shifts through the fault array to keep only the most recent 50 faults.
+   *
+   * @param faultValue an string with an integer value.
+   * @param faultName the name of the fault, to be displayed.
+   */
+  addFault(faultValue: number, faultName: string, faultType: FaultType, time: string) {
+    if (faultValue !== 0) {
+      if (this.faults.length >= 50) {
+        this.faults.pop();
+      }
+      this.faultsShifted = !this.faultsShifted;
+
+      this.faults.unshift({ type: faultType, name: faultName, displayTime: new Date(+time).toLocaleTimeString(), time });
+    }
+  }
+
+  /**
+   * This is based on the shepard enum for faults:
+   * https://github.com/Northeastern-Electric-Racing/ShepherdBMS-2/blob/6eb3f863ed131a15bdf98665532cb7807bbd2920/Core/Inc/datastructs.h#L39
+   */
+  getBMSFaultName(faultValue: number): string {
+    let faultName = '';
+    switch (faultValue) {
+      case 0:
+        break;
+      case BMS_FAULTS_TYPES.CELLS_NOT_BALANCING:
+        faultName = 'Cells Not Balancing';
+        break;
+      case BMS_FAULTS_TYPES.CELL_VOLTAGE_TOO_LOW:
+        faultName = 'Cell Voltage too Low';
+        break;
+      case BMS_FAULTS_TYPES.CELL_VOLTAGE_TOO_HIGH:
+        faultName = 'Cell Voltage too High';
+        break;
+      case BMS_FAULTS_TYPES.PACK_TOO_HOT:
+        faultName = ' Pack too Hot';
+        break;
+      case BMS_FAULTS_TYPES.OPEN_WIRING_FAULT:
+        faultName = 'Open Wiring Fault';
+        break;
+      case BMS_FAULTS_TYPES.INTERNAL_SOFTWARE_FAULT:
+        faultName = 'Internal Software Fault';
+        break;
+      case BMS_FAULTS_TYPES.INTERNAL_THERMAL_ERROR:
+        faultName = 'Internal Thermal Error';
+        break;
+      case BMS_FAULTS_TYPES.INTERNAL_CELL_COMM_FAULT:
+        faultName = 'Internal Cell Comm Fault';
+        break;
+      case BMS_FAULTS_TYPES.CURRENT_SENSOR_FAULT:
+        faultName = 'Current Sensor Fault';
+        break;
+      case BMS_FAULTS_TYPES.CHARGE_READING_MISMATCH:
+        faultName = 'Charge Reading Mismatch';
+        break;
+      case BMS_FAULTS_TYPES.LOW_CELL_VOLTAGE:
+        faultName = 'Low Cell Voltage';
+        break;
+      case BMS_FAULTS_TYPES.WEAK_PACK_FAULT:
+        faultName = 'Weak Pack Fault';
+        break;
+      case BMS_FAULTS_TYPES.EXTERNAL_CAN_FAULT:
+        faultName = 'External Can Fault';
+        break;
+      case BMS_FAULTS_TYPES.DISCHARGE_LIMIT_ENFORCEMENT_FAULT:
+        faultName = 'Discharge Limit Enforcement Fault';
+        break;
+      case BMS_FAULTS_TYPES.CHARGER_SAFETY_RELAY:
+        faultName = 'Charger Safety Relay';
+        break;
+      case BMS_FAULTS_TYPES.BATTERY_THERMISTOR:
+        faultName = 'Battery Thermistor';
+        break;
+      case BMS_FAULTS_TYPES.CHARGER_CAN_FAULT:
+        faultName = 'Charger Can Fault';
+        break;
+      case BMS_FAULTS_TYPES.CHARGER_LIMIT_ENFORCEMENT_FAULT:
+        faultName = 'Charger Limit Enforcement Fault';
+        break;
+    }
+    return faultName;
+  }
+}
diff --git a/angular-client/src/pages/fault-page/fault-page.component.css b/angular-client/src/pages/fault-page/fault-page.component.css
@@ -0,0 +1,6 @@
+.image-container {
+  /* background-image: url(../../assets/images/NERO.jpeg); */
+  background-size: cover;
+  background-position: center;
+  height: 100%;
+}
diff --git a/angular-client/src/pages/fault-page/fault-page.component.html b/angular-client/src/pages/fault-page/fault-page.component.html
@@ -0,0 +1,29 @@
+<div class="image-container" style="margin-right: 16px; margin-left: 16px">
+  <sidebar-toggle style="position: absolute; margin-top: 16px; margin-left: 16px" />
+
+  <div *ngIf="isMobile; else isDesktop">
+    <typography style="margin-bottom: -30px; margin-top: -10px" variant="large-header" content="Fault Page Mobile View" />
+  </div>
+  <ng-template #isDesktop>
+    <vstack style="width: 100%" spacing="15px">
+      <div style="align-self: end; width: 100%; display: flex; justify-content: space-around">
+        <typography
+          style="margin-bottom: -30px; margin-top: -10px"
+          variant="large-header"
+          [content]="time | date: 'HH:mm:ss'"
+        />
+        <typography
+          style="margin-bottom: -30px; margin-top: -10px"
+          variant="large-header"
+          content="{{ time | date: 'MM/dd/yyyy' }} | {{ location }} "
+        />
+        <latency-display style="margin-bottom: -30px; margin-top: -10px" />
+      </div>
+      <div style="align-self: end; width: 100%; display: flex; justify-content: space-around">
+        <fault-log style="width: 30%" [setSelectedFault]="setSelectedFault" />
+        <fault-box style="width: 35%" />
+        <graph-sidebar-desktop style="width: 30%" [nodes]="[]" [selectDataType]="onSelectDataType" />
+      </div>
+    </vstack>
+  </ng-template>
+</div>