commit 287fe7bb5213be190326b651677d585772fccd63
author Sabina Leaver <100027607@mvla.net> Wed Dec 01 21:02:42 2021 -0800
committer Sabina Leaver <100027607@mvla.net> Wed Dec 01 21:02:42 2021 -0800
tree a53ae7654c22f0a9618c30076821dd4b3e8b894b
parent 58f04b719b09697b8c93688c41e4a1e36357e66c

Fixing the 2021 bot3 superstructure plotter

Resolving the logical merge conflict between two commits to make it build.

Signed-off-by: Sabina Leaver <100027607@mvla.net>
Change-Id: Id27ff8f623b18c5ce4acc14d98410e06b085d917

y2021_bot3/control_loops/superstructure/superstructure_plotter.ts

diff --git a/y2021_bot3/control_loops/superstructure/superstructure_plotter.ts b/y2021_bot3/control_loops/superstructure/superstructure_plotter.ts
index 0ceafae..f453d64 100644
--- a/y2021_bot3/control_loops/superstructure/superstructure_plotter.ts
+++ b/y2021_bot3/control_loops/superstructure/superstructure_plotter.ts
@@ -17,11 +17,8 @@
   const position = aosPlotter.addMessageSource('/superstructure', 'y2021_bot3.control_loops.superstructure.Position');
   const robotState = aosPlotter.addMessageSource('/aos', 'aos.RobotState');
 
-  var currentTop = 0;
-
   const intakePlot =
-      aosPlotter.addPlot(element, [0, currentTop], [DEFAULT_WIDTH, DEFAULT_HEIGHT / 2]);
-  currentTop += DEFAULT_HEIGHT / 2;
+      aosPlotter.addPlot(element, [DEFAULT_WIDTH, DEFAULT_HEIGHT / 2]);
   intakePlot.plot.getAxisLabels().setTitle('Intake');
   intakePlot.plot.getAxisLabels().setXLabel(TIME);
   intakePlot.plot.getAxisLabels().setYLabel('Volts');
@@ -32,8 +29,7 @@
   intakePlot.addMessageLine(status, ['intake_speed']).setColor(RED);
 
   const outtakePlot =
-      aosPlotter.addPlot(element, [0, currentTop], [DEFAULT_WIDTH, DEFAULT_HEIGHT / 2]);
-  currentTop += DEFAULT_HEIGHT / 2;
+      aosPlotter.addPlot(element, [DEFAULT_WIDTH, DEFAULT_HEIGHT / 2]);
   outtakePlot.plot.getAxisLabels().setTitle('Outtake');
   outtakePlot.plot.getAxisLabels().setXLabel(TIME);
   outtakePlot.plot.getAxisLabels().setYLabel('Volts');