fix all dash unit mistakes hopefully?

Author: Bvngee

Telemetry-Main/BT817Q/layouts.cpp

@@ -207,11 +207,11 @@ void Layouts::drawStandardLayout2(
   drawFormattedText(70, 450, "STEER   %03.2f  ", 24, OPT_CENTER, steering_angle);
 
   drawRect(Point{614, 127}, Point{637, 310}, mid_gray);
-  uint16_t throttle_bar_h = (310 - floor(183 * throttle_demand));
+  uint16_t throttle_bar_h = 127 + 183*throttle_demand;
   drawRect(Point{614, throttle_bar_h}, Point{637, 310}, green);
 
   drawRect(Point{643, 127}, Point{666, 310}, mid_gray);
-  uint16_t brake_bar_h = (310 - floor(183 * brake_demand));
+  uint16_t brake_bar_h = 127 + 183*brake_demand;
   drawRect(Point{643, brake_bar_h}, Point{666, 310}, red);
   // drawRect(Point{643, static_cast<uint16_t>(brake_demand)}, Point{666, 310},
   // red);

Telemetry-Main/main.cpp

@@ -110,7 +110,7 @@ void update_dash() {
       .faults =
           Faults{false, static_cast<bool>(vsm_state.accStatus.PRECHARGE_DONE),
                  static_cast<bool>(!vsm_state.accStatus.SHUTDOWN_STATE)},
-      .speed = static_cast<uint8_t>(vsm_state.smeThrottleDemand.TORQUE_DEMAND / 327.68),
+      .speed = static_cast<uint8_t>(vsm_state.smeTrqSpd.SPEED * 112 / 7500),
       .soc = vsm_state.accPower.SOC,
       .acc_temp = max_temp,
       .ctrl_tmp = vsm_state.smeTemp.CONTROLLER_TEMP,
@@ -121,9 +121,9 @@ void update_dash() {
       .brake_balance = vsm_state.brake_sensor_f / (vsm_state.brake_sensor_f + vsm_state.brake_sensor_r),
       .brake_f = vsm_state.brake_sensor_f,
       .brake_r = vsm_state.brake_sensor_r,
-      // .throttle_demand = static_cast<float>(vsm_state.smeThrottleDemand.TORQUE_DEMAND/32768.0),
-      .throttle_demand = static_cast<float>(vsm_state.smeTrqSpd.SPEED) * 112/7500.0f,
-      .brake_demand = static_cast<float>(((vsm_state.etcStatus.BRAKE_SENSE_VOLTAGE / 1000.0) - 0.5) / 4),
+      .throttle_demand = static_cast<float>(vsm_state.smeThrottleDemand.TORQUE_DEMAND / 32768.0), // 0-1
+      // 0.33 - 1.65
+      .brake_demand = static_cast<float>(((vsm_state.etcStatus.BRAKE_SENSE_VOLTAGE / 32768.0)*3.3 - 0.33) / (1.65 - 0.33)),
       .time = chrono::milliseconds(0),
       .delta_time_seconds = 0.01,
       .rtds = static_cast<bool>(vsm_state.etcStatus.RTD),