#172 - minor changes

Northeastern-Electric-Racing · Sep 14, 2024 · a5418e7 · a5418e7
1 parent aaaaf16
commit a5418e7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 18 deletions.
diff --git a/...ges/charging-page/components/cell-temp/cell-temp-display/cell-temp-display.component.html b/...ges/charging-page/components/cell-temp/cell-temp-display/cell-temp-display.component.html
@@ -1,24 +1,20 @@
 <info-background svgIcon="thermostat" title="Cell Temp" [button]="resetGraphButton">
   <hstack>
-    <vstack style="width: 10%">
-      <hstack>
-        <typography variant="info-value" [content]="avgTemp.toString() + '°'" />
-      </hstack>
+    <vstack style="width: 10%; padding-bottom: 30px">
+      <typography variant="info-value" [content]="avgTemp.toString() + '°'" />
       <typography variant="info-subtitle" content="Avg. Temp" />
     </vstack>
 
     <!--TODO: temp fix for divider setting pixel height: is only way for divider to show-->
     <divider style="height: 100px"></divider>
 
-    <vstack style="width: 10%">
-      <hstack>
-        <typography variant="info-value" [content]="maxTemp.toString() + '°'" />
-      </hstack>
+    <vstack style="width: 10%; padding-bottom: 30px">
+      <typography variant="info-value" [content]="maxTemp.toString() + '°'" />
       <typography variant="info-subtitle" content="Max. Temp" />
     </vstack>
     <!--TODO: (temp fix: padding-bottom) temp fix for voltage graph being centered (and not all the way on bottom of comp)-->
     <!--if it is not desktop, we want to show graph seperately... TODO: need to figure out best logic for enforcing that this is done... 
     or just don't enforce -->
-    <cell-temp-graph style="width: 80%; padding-bottom: 35px" [resetGraph]="resetGraph"></cell-temp-graph>
+    <cell-temp-graph style="width: 85%; padding-bottom: 30px" [resetGraph]="resetGraph"></cell-temp-graph>
   </hstack>
 </info-background>
diff --git a/...c/pages/charging-page/components/cell-temp/cell-temp-graph/cell-temp-graph.component.html b/...c/pages/charging-page/components/cell-temp/cell-temp-graph/cell-temp-graph.component.html
@@ -1,8 +1,2 @@
-<graph-component
-  [data]="cellTempData"
-  graphContainerId="cellTempGraph"
-  icon="speed"
-  title="Voltage Over Time"
-  color="#ffffff"
->
+<graph-component [data]="cellTempData" graphContainerId="cellTempGraph" icon="speed" title="Cell Temp" color="#ffffff">
 </graph-component>
diff --git a/angular-client/src/pages/charging-page/components/fault-display/fault-display.component.ts b/angular-client/src/pages/charging-page/components/fault-display/fault-display.component.ts
@@ -38,7 +38,7 @@ export default class FaultDisplay {
   faultsShifted: boolean = false;
   resetButton = {
     onClick: () => {
-      this.faults.shift();
+      this.faults = [];
     },
     icon: 'restart_alt'
   };

diff --git a/scylla-server/src/socket/mock-proxy-client.ts b/scylla-server/src/socket/mock-proxy-client.ts
@@ -285,7 +285,7 @@ export default class MockProxyClient implements ProxyClient {
     return new Promise((resolve) =>
       setTimeout(() => {
         resolve('loop');
-      }, 10)
+      }, 1)
     );
   };