#543 transition DataTypeEnum to topic.utils.ts

angular-client/src/components/acceleration-graphs/acceleration-graphs.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnDestroy, OnInit, inject } from '@angular/core';
 import Storage from 'src/services/storage.service';
-import { DataTypeEnum } from 'src/data-type.enum';
+import { topics } from 'src/utils/topic.utils';
 import { decimalPipe } from 'src/utils/pipes.utils';
 import { GraphData } from 'src/utils/types.utils';
 import { InfoBackgroundComponent } from '../info-background/info-background.component';
@@ -36,7 +36,7 @@ export class AccelerationGraphsComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.subscriptions.push(
-      this.storage.get(DataTypeEnum.XYZAccel).subscribe((value) => {
+      this.storage.get(topics.xyzAcceleration()).subscribe((value) => {
         const x1 = decimalPipe(value.values[0]);
         const y1 = decimalPipe(value.values[1]);
         const time = +value.time;

angular-client/src/components/acceleration-over-time-display/acceleration-over-time-display.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, inject } from '@angular/core';
 import Storage from 'src/services/storage.service';
-import { DataTypeEnum } from 'src/data-type.enum';
+import { topics } from 'src/utils/topic.utils';
 import { GraphData } from 'src/utils/types.utils';
 import { InfoGraphComponent } from '../info-graph/info-graph.component';
 
@@ -16,7 +16,7 @@ export default class AccelerationOverTimeDisplayComponent implements OnInit {
   data: GraphData[] = [];
 
   ngOnInit() {
-    this.storage.get(DataTypeEnum.ACCELERATION).subscribe((value) => {
+    this.storage.get(topics.acceleration()).subscribe((value) => {
       this.data.push({ x: new Date().getTime(), y: parseInt(value.values[0]) });
     });
   }

angular-client/src/components/brake-pressure-display/brake-pressure-display.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, inject } from '@angular/core';
 import Storage from 'src/services/storage.service';
-import { DataTypeEnum } from 'src/data-type.enum';
+import { topics } from 'src/utils/topic.utils';
 import { InfoBackgroundComponent } from '../info-background/info-background.component';
 import TypographyComponent from '../typography/typography.component';
 
@@ -16,7 +16,7 @@ export default class BrakePressureDisplayComponent implements OnInit {
   brakePressure: number = 0;
 
   ngOnInit() {
-    this.storage.get(DataTypeEnum.BRAKE_PRESSURE).subscribe((value) => {
+    this.storage.get(topics.brakePressure()).subscribe((value) => {
       this.brakePressure = parseInt(value.values[0]);
     });
   }

angular-client/src/components/driver-component/driver-component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, inject } from '@angular/core';
 import { getLatestRun } from 'src/api/run.api';
-import { DataTypeEnum } from 'src/data-type.enum';
+import { topics } from 'src/utils/topic.utils';
 import APIService from 'src/services/api.service';
 import Storage from 'src/services/storage.service';
 import { Run } from 'src/utils/types.utils';
@@ -21,7 +21,7 @@ export class DriverComponent implements OnInit {
   apiService = inject(APIService);
 
   ngOnInit() {
-    this.storage.get(DataTypeEnum.DRIVER).subscribe((value) => {
+    this.storage.get(topics.driver()).subscribe((value) => {
       [this.driver] = value.values || ['No Driver'];
     });
   }

angular-client/src/components/latency-display/latency-display.ts

@@ -1,6 +1,6 @@
 import { Component, Input, OnInit, inject } from '@angular/core';
 import Storage from 'src/services/storage.service';
-import { DataTypeEnum } from 'src/data-type.enum';
+import { topics } from 'src/utils/topic.utils';
 import { InfoBackgroundComponent } from '../info-background/info-background.component';
 
 import { DividerComponent } from '../divider/divider';
@@ -24,10 +24,10 @@ export default class LatencyDisplayComponent implements OnInit {
   newLatency: number = 0;
 
   ngOnInit(): void {
-    this.storage.get(DataTypeEnum.LATENCY).subscribe((value) => {
+    this.storage.get(topics.latency()).subscribe((value) => {
       this.latency = parseInt(value.values[0]);
     });
-    this.storage.get(DataTypeEnum.NEW_LATENCY).subscribe((value) => {
+    this.storage.get(topics.newLatency()).subscribe((value) => {
       this.newLatency = parseInt(value.values[0]);
     });
   }

angular-client/src/components/motor-info/motor-info.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnDestroy, OnInit, inject } from '@angular/core';
 import Storage from 'src/services/storage.service';
-import { DataTypeEnum } from 'src/data-type.enum';
+import { topics } from 'src/utils/topic.utils';
 import { floatPipe } from 'src/utils/pipes.utils';
 import { InfoBackgroundComponent } from '../info-background/info-background.component';
 
@@ -42,31 +42,31 @@ export default class MotorInfoComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.subscriptions.push(
-      this.storage.get(DataTypeEnum.MOTOR_TEMP).subscribe((value) => {
+      this.storage.get(topics.motorTemp()).subscribe((value) => {
         this.motorTemp = floatPipe(value.values[0]);
         this.updatePieChart();
       }),
-      this.storage.get(DataTypeEnum.MOTOR_USAGE).subscribe((value) => {
+      this.storage.get(topics.motorUsage()).subscribe((value) => {
         this.motorUsage = floatPipe(value.values[0]);
         this.updatePieChart();
       }),
-      this.storage.get(DataTypeEnum.COOL_USAGE).subscribe((value) => {
+      this.storage.get(topics.coolingUsage()).subscribe((value) => {
         this.coolUsage = floatPipe(value.values[0]);
         this.updatePieChart();
       }),
-      this.storage.get(DataTypeEnum.BATTBOX_FANS).subscribe((value) => {
+      this.storage.get(topics.battboxFans()).subscribe((value) => {
         this.battboxFans = floatPipe(value.values[0]);
         this.updatePieChart();
       }),
-      this.storage.get(DataTypeEnum.PUMPS).subscribe((value) => {
+      this.storage.get(topics.pumps()).subscribe((value) => {
         this.pumps = floatPipe(value.values[0]);
         this.updatePieChart();
       }),
-      this.storage.get(DataTypeEnum.MOTOR_CONTROLLER).subscribe((value) => {
+      this.storage.get(topics.motorController()).subscribe((value) => {
         this.motorController = floatPipe(value.values[0]);
         this.updatePieChart();
       }),
-      this.storage.get(DataTypeEnum.LV_BOARDS).subscribe((value) => {
+      this.storage.get(topics.lvBoards()).subscribe((value) => {
         this.lvBoards = floatPipe(value.values[0]);
         this.updatePieChart();
       })
@@ -76,9 +76,7 @@ export default class MotorInfoComponent implements OnInit, OnDestroy {
   }
 
   updatePieChart() {
-    // Calculate total usage of the four components
     const totalUsed = this.motorController + this.battboxFans + this.pumps + this.lvBoards;
-    // Calculate the remaining unused portion out of 20
     const remainingUnused = Math.max(0, 20 - totalUsed);
 
     this.piechartData = [

angular-client/src/components/raspberry-pi/raspberry-pi.component.ts

@@ -1,6 +1,6 @@
 import { Component, HostListener, OnInit, inject } from '@angular/core';
 import Storage from 'src/services/storage.service';
-import { DataTypeEnum } from 'src/data-type.enum';
+import { topics } from 'src/utils/topic.utils';
 import { floatPipe } from 'src/utils/pipes.utils';
 import { InfoBackgroundComponent } from '../info-background/info-background.component';
 import RaspberryPiDesktopComponent from './raspberry-pi-desktop-content/raspberry-pi-desktop.component';
@@ -25,19 +25,19 @@ export default class RasberryPiComponent implements OnInit {
   isMobile = window.innerWidth < this.mobileThreshold;
 
   ngOnInit() {
-    this.storage.get(DataTypeEnum.CPUUsage).subscribe((value) => {
+    this.storage.get(topics.cpuUsage()).subscribe((value) => {
       this.cpuUsage = floatPipe(value.values[0]);
     });
-    this.storage.get(DataTypeEnum.CPUTemp).subscribe((value) => {
+    this.storage.get(topics.cpuTemp()).subscribe((value) => {
       this.cpuTemp = floatPipe(value.values[0]);
     });
-    this.storage.get(DataTypeEnum.RAMUsage).subscribe((value) => {
+    this.storage.get(topics.ramUsage()).subscribe((value) => {
       this.ramUsage = Math.round((1 - floatPipe(value.values[0]) / 8000) * 100);
     });
-    this.storage.get(DataTypeEnum.WIFIRSSI).subscribe((value) => {
+    this.storage.get(topics.wifiRSSI()).subscribe((value) => {
       this.wifiRSSI = floatPipe(value.values[0]);
     });
-    this.storage.get(DataTypeEnum.MCS).subscribe((value) => {
+    this.storage.get(topics.mcs()).subscribe((value) => {
       this.mcs = floatPipe(value.values[0]);
     });
   }

angular-client/src/components/speed-display/speed-display.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, inject } from '@angular/core';
 import Storage from 'src/services/storage.service';
-import { DataTypeEnum } from 'src/data-type.enum';
+import { topics } from 'src/utils/topic.utils';
 import { InfoBackgroundComponent } from '../info-background/info-background.component';
 import HalfGaugeComponent from '../half-gauge/half-gauge.component';
 
@@ -16,7 +16,7 @@ export default class SpeedDisplayComponent implements OnInit {
   speed: number = 0;
 
   ngOnInit() {
-    this.storage.get(DataTypeEnum.SPEED).subscribe((value) => {
+    this.storage.get(topics.speed()).subscribe((value) => {
       this.speed = parseInt(value.values[0]);
     });
   }

angular-client/src/components/speed-over-time-display/speed-over-time-display.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnDestroy, OnInit, inject } from '@angular/core';
 import { Subscription } from 'rxjs';
 import Storage from 'src/services/storage.service';
-import { DataTypeEnum } from 'src/data-type.enum';
+import { topics } from 'src/utils/topic.utils';
 import { GraphData } from 'src/utils/types.utils';
 import { InfoGraphComponent } from '../info-graph/info-graph.component';
 
@@ -19,7 +19,7 @@ export default class SpeedOverTimeDisplayComponent implements OnInit, OnDestroy
 
   ngOnInit() {
     this.subscriptions.push(
-      this.storage.get(DataTypeEnum.SPEED).subscribe((value) => {
+      this.storage.get(topics.speed()).subscribe((value) => {
         this.data.push({ x: new Date().getTime(), y: parseInt(value.values[0]) });
       })
     );

angular-client/src/components/steering-angle-display/steering-angle-display.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, inject } from '@angular/core';
 import Storage from 'src/services/storage.service';
-import { DataTypeEnum } from 'src/data-type.enum';
+import { topics } from 'src/utils/topic.utils';
 import { floatPipe } from 'src/utils/pipes.utils';
 import { InfoBackgroundComponent } from '../info-background/info-background.component';
 import TypographyComponent from '../typography/typography.component';
@@ -22,7 +22,7 @@ export class SteeringAngleDisplayComponent implements OnInit {
   steeringAngle: number = 0;
 
   ngOnInit() {
-    this.storage.get(DataTypeEnum.STEERING_ANGLE).subscribe((value) => {
+    this.storage.get(topics.steeringAngle()).subscribe((value) => {
       this.steeringAngle = floatPipe(value.values[0]);
     });
   }

angular-client/src/components/torque-display/torque-display.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, inject } from '@angular/core';
 import Storage from 'src/services/storage.service';
-import { DataTypeEnum } from 'src/data-type.enum';
+import { topics } from 'src/utils/topic.utils';
 import { InfoBackgroundComponent } from '../info-background/info-background.component';
 import TypographyComponent from '../typography/typography.component';
 import HStackComponent from '../hstack/hstack.component';
@@ -17,7 +17,7 @@ export default class TorqueDisplayComponent implements OnInit {
   torque: number = 0;
 
   ngOnInit() {
-    this.storage.get(DataTypeEnum.TORQUE).subscribe((value) => {
+    this.storage.get(topics.torque()).subscribe((value) => {
       this.torque = parseInt(value.values[0]);
     });
   }

angular-client/src/pages/bms-debug-page/components/bms-at-a-glance/bms-at-a-glance.component.ts

@@ -1,6 +1,5 @@
 import { Component, HostListener, inject, OnDestroy, OnInit } from '@angular/core';
 import { Subscription } from 'rxjs';
-import { DataTypeEnum } from 'src/data-type.enum';
 import Storage from 'src/services/storage.service';
 import { Chip, chipToString, getConnectionDotStatusColor } from 'src/utils/bms.utils';
 import { topics } from 'src/utils/topic.utils';
@@ -114,13 +113,13 @@ export class BmsAtAGlanceComponent implements OnInit, OnDestroy {
 
   ngOnInit(): void {
     this.subscriptions.push(
-      this.storage.get(DataTypeEnum.PACK_VOLTAGE).subscribe((value) => {
+      this.storage.get(topics.packVoltage()).subscribe((value) => {
         this.voltage = parseInt(value.values[0]);
       }),
-      this.storage.get(DataTypeEnum.PACK_TEMP).subscribe((value) => {
+      this.storage.get(topics.packTemp()).subscribe((value) => {
         this.temperature = parseInt(value.values[0]);
       }),
-      this.storage.get(DataTypeEnum.STATE_OF_CHARGE).subscribe((value) => {
+      this.storage.get(topics.stateOfCharge()).subscribe((value) => {
         this.chargeState = parseInt(value.values[0]);
       }),
       this.storage.get(topics.accCCL()).subscribe((value) => {

angular-client/src/pages/bms-debug-page/components/bms-overflow/bms-overflow.component.ts

@@ -1,9 +1,8 @@
 import { Component, inject, OnDestroy, OnInit } from '@angular/core';
 import { Subscription } from 'rxjs';
-import { DataTypeEnum } from 'src/data-type.enum';
 import Storage from 'src/services/storage.service';
+import { topics } from 'src/utils/topic.utils';
 import { InfoBackgroundComponent } from '../../../../components/info-background/info-background.component';
-
 import { ConnectionDotWithMessageComponent } from '../../../../components/connection-dot-with-message/connection-dot-with-message.component';
 import TypographyComponent from 'src/components/typography/typography.component';
 import VStackComponent from 'src/components/vstack/vstack.component';
@@ -22,7 +21,7 @@ export class BmsOverflowComponent implements OnInit, OnDestroy {
 
   ngOnInit(): void {
     this.subscriptions.push(
-      this.storage.get(DataTypeEnum.PER_CELL_OVERFLOWID).subscribe((value) => {
+      this.storage.get(topics.perCellOverflowId()).subscribe((value) => {
         if (parseFloat(value.time) > Date.now() - 4000) {
           this.overflowID = parseInt(value.values[0]);
         } else {