Moved velocity calculations out of balancing loop so they always can be monitored
This commit is contained in:
parent
3343c2ac98
commit
1fa5f97b25
|
@ -65,13 +65,10 @@ void motors() {
|
|||
IMU.init();
|
||||
}
|
||||
|
||||
if (balancingOn) {
|
||||
|
||||
//Calculate wheel angular velocity
|
||||
motor_ang_vel[0][0] = encoderReaderAngVel(m1Raw, m1RawLast, motor_ang_vel[0][0], PULSES_PER_TURN, WHEEL_DIAMETER, dT_s, filter_gain);
|
||||
motor_ang_vel[1][0] = encoderReaderAngVel(m2Raw, m2RawLast, motor_ang_vel[1][0], PULSES_PER_TURN, WHEEL_DIAMETER, dT_s, filter_gain);
|
||||
|
||||
|
||||
//Calculate robot linear and angular velocity
|
||||
Matrix.Multiply((mtx_type*)inv_Kin, (mtx_type*)motor_ang_vel, 2, 2, 1, (mtx_type*)vel_Matrix);
|
||||
|
||||
|
@ -79,6 +76,9 @@ void motors() {
|
|||
rem_turn_speed_ref = floatMap(Ps3.data.analog.stick.ly, -128.0, 127.0, -3.75, 3.75);
|
||||
rem_speed_ref = floatMap(Ps3.data.analog.stick.ry, -128.0, 127.0, -0.35, 0.35);
|
||||
|
||||
if (balancingOn) {
|
||||
|
||||
|
||||
// Speed Controller
|
||||
SC_cont_out = PController(rem_speed_ref, vel_Matrix[0][0], K_SC);
|
||||
|
||||
|
|
Loading…
Reference in New Issue