Skip to content

Commit 5ebcac0

Browse files
committed
added prints
1 parent a050e66 commit 5ebcac0

File tree

3 files changed

+33
-19
lines changed

3 files changed

+33
-19
lines changed

lib/systems/include/controllers/SimpleController.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ struct TorqueControllerSimpleParams_s
2323
torque_nm amk_max_torque = {};
2424
torque_nm amk_max_regen_torque = {};
2525
TorqueControllerSimpleParams_s()
26-
: rear_torque_scale(1.3f),
27-
rear_regen_torque_scale(0.2f),
26+
: rear_torque_scale(0.7f),
27+
rear_regen_torque_scale(1.8f),
2828
amk_max_rpm(_amk_max_rpm_default),
2929
amk_max_torque(_amk_max_torque),
3030
amk_max_regen_torque(_amk_max_regen_torque) {}

src/controls.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void VCRControls::handle_drivetrain_command(bool wanting_ready_to_drive, bool re
2929

3030
if (ready_to_drive) {
3131
auto dt_command = _tc_mux.get_drivetrain_command(mode, _torque_limit, vcr_data);
32-
// _debug_dt_command = dt_command;
32+
_debug_dt_command = dt_command;
3333
drivetrain_status = _dt_system->evaluate_drivetrain(dt_command);
3434
} else if (wanting_ready_to_drive) {
3535
DrivetrainInit_s dt_command = {

src/main.cpp

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -140,14 +140,7 @@ HT_TASK::TaskResponse debug_print(const unsigned long& sysMicros, const HT_TASK:
140140

141141

142142
Serial.println();
143-
Serial.println();
144-
145-
// Serial.println("state machine state");
146-
147-
// Serial.println(vcr_data.system_data.vehicle_state_machine_state);
148-
// Serial.println("desired speeds, torq lim");
149-
// Serial.println(VCRControlsInstance::instance()._debug_dt_command.desired_speeds.FL);
150-
// Serial.println(VCRControlsInstance::instance()._debug_dt_command.torque_limits.FL);
143+
Serial.println();
151144

152145
Serial.print("Drivetrain system state: ");
153146
Serial.println(static_cast<int>(DrivetrainInstance::instance().get_state()));
@@ -209,14 +202,35 @@ HT_TASK::TaskResponse debug_print(const unsigned long& sysMicros, const HT_TASK:
209202
// Serial.println(vcr_data.interface_data.rear_suspot_data.RL_sus_pot_analog);
210203

211204
// /* Drivebrain data */
212-
// // Serial.print("Latest Drivebrain data: ");
213-
// // Serial.print(vcr_data.interface_data.latest_drivebrain_command.torque_limits.veh_vec_data.FL);
214-
// // Serial.print(" ");
215-
// // Serial.print(vcr_data.interface_data.latest_drivebrain_command.torque_limits.veh_vec_data.FR);
216-
// // Serial.print(" ");
217-
// // Serial.print(vcr_data.interface_data.latest_drivebrain_command.torque_limits.veh_vec_data.RL);
218-
// // Serial.print(" ");
219-
// // Serial.println(vcr_data.interface_data.latest_drivebrain_command.torque_limits.veh_vec_data.FL);
205+
// Serial.print("Latest Drivebrain data: ");
206+
// Serial.print(vcr_data.interface_data.inverter_data.FL.commanded_torque);
207+
// Serial.print(" ");
208+
// Serial.print(vcr_data.interface_data.inverter_data.FR.commanded_torque);
209+
// Serial.print(" ");
210+
// Serial.print(vcr_data.interface_data.inverter_data.RL.commanded_torque);
211+
// Serial.print(" ");
212+
// Serial.println(vcr_data.interface_data.inverter_data.RR.commanded_torque);
213+
214+
Serial.println("desired speeds, torq lim");
215+
Serial.print("FL: ");
216+
Serial.print(VCRControlsInstance::instance()._debug_dt_command.desired_speeds.FL); Serial.print(" ");
217+
Serial.println(VCRControlsInstance::instance()._debug_dt_command.torque_limits.FL);
218+
219+
Serial.print("FR: ");
220+
Serial.print(VCRControlsInstance::instance()._debug_dt_command.desired_speeds.FR); Serial.print(" ");
221+
Serial.println(VCRControlsInstance::instance()._debug_dt_command.torque_limits.FR);
222+
223+
Serial.print("RL: ");
224+
Serial.print(VCRControlsInstance::instance()._debug_dt_command.desired_speeds.RL); Serial.print(" ");
225+
Serial.println(VCRControlsInstance::instance()._debug_dt_command.torque_limits.RL);
226+
227+
Serial.print("RR: ");
228+
Serial.print(VCRControlsInstance::instance()._debug_dt_command.desired_speeds.RR); Serial.print(" ");
229+
Serial.println(VCRControlsInstance::instance()._debug_dt_command.torque_limits.RR);
230+
231+
232+
Serial.print("Current Controller Mode: ");
233+
Serial.println(static_cast<uint8_t>(vcr_data.interface_data.dash_input_state.dial_state));
220234

221235
/* Thermistor Data */
222236
// Serial.print("Thermistor 0 Analog: ");

0 commit comments

Comments
 (0)