svelte fixes

delft-hyperloop · Jul 2, 2024 · ef81440 · ef81440
1 parent 2c3372f
commit ef81440
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 15 deletions.
diff --git a/gs/src/lib/panels/tabs/LeviTab.svelte b/gs/src/lib/panels/tabs/LeviTab.svelte
@@ -22,12 +22,20 @@
     const leviVB = gdd.getStore("levi_volt_max");
     const leviVC = gdd.getStore("levi_volt_avg");
 
+    $: leviVolt = [
+        ["Min", $leviVA],
+        ["Max", $leviVB],
+        ["Avg", $leviVC],
+    ]
+
     const leviHemsAG = gdd.getStore("levi_hems_airgap");
     const leviHemsPT = gdd.getStore("levi_hems_pitch");
     const leviHemsRL = gdd.getStore("levi_hems_roll");
 
-    $: tableVoltages = [
-        [$leviVA, $leviVB, $leviVC]
+    $: leviHems = [
+        ["Air Gap", $leviHemsAG],
+        ["Pitch", $leviHemsPT],
+        ["Roll", $leviHemsRL],
     ]
 </script>
 
@@ -50,13 +58,12 @@
             <Table background="bg-surface-900" titles={["Gap", "EMS", "HEMS"]} tableArr={tableGaps} />
         </Tile>
         <Tile heading="Levi Voltages" insideClass="flex flex-col justify-center">
-            <p>Min: {$leviVA}</p>
-            <p>Max: {$leviVB}</p>
-            <p>Avg: {$leviVC}</p>
+            <Table background="bg-surface-900" titles={["Value", "V"]} tableArr={leviVolt} />
         </Tile>
         <Tile heading="Levi Rotation" insideClass="flex flex-col justify-center">
             <Table background="bg-surface-900" titles={["Axis", "Value"]} tableArr={leviHems} />
         </Tile>
     </TileGrid>
     <br>
 </div>
+
diff --git a/gs/src/routes/+layout.svelte b/gs/src/routes/+layout.svelte
@@ -16,11 +16,12 @@
     //////////////////////////////
     /////////// CHARTS ///////////
     //////////////////////////////
-    let emsTempChart = new PlotBuffer(500, 300000, [0, 120], true, "EMS 1");
+    let emsTempChart = new PlotBuffer(500, 60000, [0, 120], true, "EMS 1");
     emsTempChart.addSeries(StrokePresets.theoretical("EMS 2"))
     $chartStore.set("EMS Temperatures", emsTempChart);
 
-    let hemsTempChart = new PlotBuffer(500, 300000, [0, 120], true, "HEMS 1");
+    let hemsTempChart = new PlotBuffer(500, 60000, [0, 120], true, "HEMS 1");
+
     hemsTempChart.addSeries(StrokePresets.theoretical("HEMS 2"))
     hemsTempChart.addSeries(StrokePresets.yellow("HEMS 3"))
     hemsTempChart.addSeries(StrokePresets.blue("HEMS 4"))
@@ -40,9 +41,7 @@
     emsCurrentChart.addSeries(StrokePresets.theoretical("cd"))
     $chartStore.set("EMS Current", emsCurrentChart);
 
-    let voffChart = new PlotBuffer(500, 300000, [0, 100], false)
-
-    $chartStore.set('Offset Horizontal', hoffChart);
+    let voffChart = new PlotBuffer(500, 60000, [8, 25], false)
     $chartStore.set('Offset Vertical', voffChart);
 
     let rolPitchChart = new PlotBuffer(500, 60000, [-0.8, 0.8], true, "roll")
@@ -283,12 +282,20 @@
     gdd.stores.registerStore<number>("levi_ems_current_ab", 0.0, data => addEntryToChart(emsCurrentChart, data, 1))
     gdd.stores.registerStore<number>("levi_ems_current_cd", 0.0, data => addEntryToChart(emsCurrentChart, data, 2))
 
-    gdd.stores.registerStore<number>("levi_hems_airgap", 0.0, u64ToDouble)
-    gdd.stores.registerStore<number>("levi_hems_pitch", 0.0, u64ToDouble)
-    gdd.stores.registerStore<number>("levi_hems_roll", 0.0, u64ToDouble)
+    gdd.stores.registerStore<number>("levi_hems_airgap", 0.0, data => addEntryToChart(voffChart, data, 1))
+    gdd.stores.registerStore<number>("levi_hems_roll", 0.0, data => addEntryToChart(rolPitchChart, data, 1))
+    gdd.stores.registerStore<number>("levi_hems_pitch", 0.0, data => addEntryToChart(rolPitchChart, data, 2))
 
-    gdd.stores.registerStore<number>("levi_ems_offset_ab", 0.0, u64ToDouble)
-    gdd.stores.registerStore<number>("levi_ems_offset_cd", 0.0, u64ToDouble)
+    gdd.stores.registerStore<number>("levi_ems_offset_ab", 0.0, data => {
+        const curr: number = u64ToDouble(data);
+        hoffChart.addEntry(1, curr);
+        return curr;
+    })
+    gdd.stores.registerStore<number>("levi_ems_offset_cd", 0.0, data => {
+        const curr = u64ToDouble(data);
+        hoffChart.addEntry(2, curr);
+        return curr;
+    })
 
     gdd.stores.registerStore<number>("levi_hems_power", 0.0, u64ToDouble)
     gdd.stores.registerStore<number>("levi_ems_power", 0.0, u64ToDouble)
@@ -335,3 +342,4 @@
     <slot/>
     <BottomBar/>
 </div>
+