Skip to content

Commit 6b7466e

Browse files
committed
some layout fixes
1 parent e19ca9c commit 6b7466e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Telemetry-Main/BT817Q/layouts.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ void Layouts::drawStandardLayout2(
193193
drawText(36, 36, "FANS", 23);
194194
drawText(110, 36, "PCHG", 23);
195195
drawText(36, 110, "SHTD", 23);
196-
drawText(110, 110, "RTDS", 23);
196+
drawText(110, 110, "RTD", 23);
197197

198198
drawFormattedText(70, 180, "FAN %03d", 24, OPT_CENTER, acc_temp);
199199
drawFormattedText(70, 210, "ACC %03dC", 24, OPT_CENTER, acc_temp);

Telemetry-Main/main.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void update_dash() {
109109
params = {
110110
.faults =
111111
Faults{false, static_cast<bool>(vsm_state.accStatus.PRECHARGE_DONE),
112-
static_cast<bool>(vsm_state.accStatus.SHUTDOWN_STATE)},
112+
static_cast<bool>(!vsm_state.accStatus.SHUTDOWN_STATE)},
113113
.speed = static_cast<uint8_t>(vsm_state.smeThrottleDemand.TORQUE_DEMAND / 327.68),
114114
.soc = vsm_state.accPower.SOC,
115115
.acc_temp = max_temp,
@@ -121,12 +121,12 @@ void update_dash() {
121121
.brake_balance = vsm_state.brake_sensor_f / (vsm_state.brake_sensor_f + vsm_state.brake_sensor_r),
122122
.brake_f = vsm_state.brake_sensor_f,
123123
.brake_r = vsm_state.brake_sensor_r,
124-
.throttle_demand = static_cast<float>(vsm_state.smeThrottleDemand.TORQUE_DEMAND/32768.0),
125-
// .throttle_demand = static_cast<float>(vsm_state.etcStatus.PEDAL_TRAVEL),
124+
// .throttle_demand = static_cast<float>(vsm_state.smeThrottleDemand.TORQUE_DEMAND/32768.0),
125+
.throttle_demand = static_cast<float>(vsm_state.smeTrqSpd.SPEED) * 112/7500.0f,
126126
.brake_demand = static_cast<float>(((vsm_state.etcStatus.BRAKE_SENSE_VOLTAGE / 1000.0) - 0.5) / 4),
127127
.time = chrono::milliseconds(0),
128128
.delta_time_seconds = 0.01,
129-
.rtds = static_cast<bool>(vsm_state.etcStatus.RTDS),
129+
.rtds = static_cast<bool>(vsm_state.etcStatus.RTD),
130130
.rpm = vsm_state.smeTrqSpd.SPEED,
131131
};
132132
printf("%f %f\n", params.brake_f, params.brake_r);

0 commit comments

Comments
 (0)