Skip to content

Commit

Permalink
naming conventions
Browse files Browse the repository at this point in the history
  • Loading branch information
CL16gtgh committed Jul 9, 2024
1 parent 9de510b commit ae4eb0c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions lib/systems/include/TorqueControllers.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class TorqueControllerSimple : public TorqueController<TC_SAFE_MODE>
float rearTorqueScale_ = 1.0;
float frontRegenTorqueScale_ = 1.0;
float rearRegenTorqueScale_ = 1.0;
float tc_rpm_;
float tcRPM_;

public:
/// @brief simple TC with tunable F/R torque balance. Accel torque balance can be tuned independently of regen torque balance
Expand All @@ -143,7 +143,7 @@ class TorqueControllerSimple : public TorqueController<TC_SAFE_MODE>
rearTorqueScale_(rearTorqueScale),
frontRegenTorqueScale_(regenTorqueScale),
rearRegenTorqueScale_(1.0 - regenTorqueScale),
tc_rpm_(mps * METERS_PER_SECOND_TO_RPM)
tcRPM_(mps * METERS_PER_SECOND_TO_RPM)
{
writeout_.command = TC_COMMAND_NO_TORQUE;
writeout_.ready = true;
Expand All @@ -154,7 +154,7 @@ class TorqueControllerSimple : public TorqueController<TC_SAFE_MODE>
rearTorqueScale_(rearTorqueScale),
frontRegenTorqueScale_(regenTorqueScale),
rearRegenTorqueScale_(1.0 - regenTorqueScale),
tc_rpm_(AMK_MAX_RPM)
tcRPM_(AMK_MAX_RPM)
{
writeout_.command = TC_COMMAND_NO_TORQUE;
writeout_.ready = true;
Expand Down
8 changes: 4 additions & 4 deletions lib/systems/src/TorqueControllers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ void TorqueControllerSimple::tick(const SysTick_s &tick, const PedalsSystemData_
// writeout_.command.speeds_rpm[FR] = accelRequest * AMK_MAX_RPM;pid_input_
// writeout_.command.speeds_rpm[RL] = accelRequest * AMK_MAX_RPM;
// writeout_.command.speeds_rpm[RR] = accelRequest * AMK_MAX_RPM;
writeout_.command.speeds_rpm[FL] = tc_rpm_;
writeout_.command.speeds_rpm[FR] = tc_rpm_;
writeout_.command.speeds_rpm[RL] = tc_rpm_;
writeout_.command.speeds_rpm[RR] = tc_rpm_;
writeout_.command.speeds_rpm[FL] = tcRPM_;
writeout_.command.speeds_rpm[FR] = tcRPM_;
writeout_.command.speeds_rpm[RL] = tcRPM_;
writeout_.command.speeds_rpm[RR] = tcRPM_;

writeout_.command.torqueSetpoints[FL] = torqueRequest * frontTorqueScale_;
writeout_.command.torqueSetpoints[FR] = torqueRequest * frontTorqueScale_;
Expand Down

0 comments on commit ae4eb0c

Please sign in to comment.