X-Git-Url: https://defiant.homedns.org/gitweb/?p=ros_wild_thumper.git;a=blobdiff_plain;f=avr%2Fmotor_ctrl%2Fmain.c;h=7781fb4af01654b33ea2a53df04a1bbaf63b7967;hp=6d9f620c672151732547f12d40e904319c4134a3;hb=d55fc1ff8c77515d29610d3940f35965ff202a90;hpb=581514e44d63392698ca47b9e50d0288e3fadbdb;ds=sidebyside diff --git a/avr/motor_ctrl/main.c b/avr/motor_ctrl/main.c index 6d9f620..7781fb4 100644 --- a/avr/motor_ctrl/main.c +++ b/avr/motor_ctrl/main.c @@ -97,19 +97,32 @@ */ -#define TWI_ACK TWCR = (1< 0) || (motor1_switch && motor1 < 0)) { // forward uint8_t tmp=PORTC; tmp &= ~(1 << 3); tmp |= (1 << 2); PORTC = tmp; + ENABLE_PWM_MOTOR1; } else { // motor1 < 0 // backward uint8_t tmp=PORTC; tmp &= ~(1 << 2); tmp |= (1 << 3); PORTC = tmp; + ENABLE_PWM_MOTOR1; } m1_old = motor1; @@ -720,18 +739,24 @@ static void update_motor(void) { if (motor2 == 0) { // stop PORTC &= ~(1 << 5) & ~(1 << 4); + DISABLE_PWM_MOTOR2; + } else if (motor2 == PWM_BREAK) { + PORTC |= (1 << 5) | (1 << 4); + ENABLE_PWM_MOTOR2; } else if ((!motor2_switch && motor2 > 0) || (motor2_switch && motor2 < 0)) { // forward uint8_t tmp=PORTC; tmp &= ~(1 << 5); tmp |= (1 << 4); PORTC = tmp; + ENABLE_PWM_MOTOR2; } else { // motor2 < 0 // backward uint8_t tmp=PORTC; tmp &= ~(1 << 4); tmp |= (1 << 5); PORTC = tmp; + ENABLE_PWM_MOTOR2; } m2_old = motor2; @@ -742,18 +767,24 @@ static void update_motor(void) { if (motor3 == 0) { // stop PORTC &= ~(1 << 7) & ~(1 << 6); + DISABLE_PWM_MOTOR3; + } else if (motor3 == PWM_BREAK) { + PORTC |= (1 << 7) | (1 << 6); + ENABLE_PWM_MOTOR3; } else if ((!motor3_switch && motor3 > 0) || (motor3_switch && motor3 < 0)) { // forward uint8_t tmp=PORTC; tmp &= ~(1 << 7); tmp |= (1 << 6); PORTC = tmp; + ENABLE_PWM_MOTOR3; } else { // motor3 < 0 // backward uint8_t tmp=PORTC; tmp &= ~(1 << 6); tmp |= (1 << 7); PORTC = tmp; + ENABLE_PWM_MOTOR3; } m3_old = motor3; @@ -764,18 +795,24 @@ static void update_motor(void) { if (motor4 == 0) { // stop PORTD &= ~(1 << 3) & ~(1 << 2); + DISABLE_PWM_MOTOR4; + } else if (motor4 == PWM_BREAK) { + PORTD |= (1 << 3) | (1 << 2); + ENABLE_PWM_MOTOR4; } else if ((!motor4_switch && motor4 > 0) || (motor4_switch && motor4 < 0)) { // forward uint8_t tmp=PORTD; tmp &= ~(1 << 3); tmp |= (1 << 2); PORTD = tmp; + ENABLE_PWM_MOTOR4; } else { // motor4 < 0 // backward uint8_t tmp=PORTD; tmp &= ~(1 << 2); tmp |= (1 << 3); PORTD = tmp; + ENABLE_PWM_MOTOR4; } m4_old = motor4; @@ -863,26 +900,25 @@ static void update_pid(void) { static int32_t esum4=0; // protect motors from damage if stalling - if (labs(esum1) > 120000 && speed1 == 0) { + if (labs(esum1) > STALL_LIMIT && speed1 == 0) { motor1 = 0; motor1_mode = MOTOR_MANUAL; error_state |= (1<<4); esum1 = 0; } - if (labs(esum2) > 120000 && speed2 == 0) { + if (labs(esum2) > STALL_LIMIT && speed2 == 0) { motor2 = 0; motor2_mode = MOTOR_MANUAL; error_state |= (1<<5); esum2 = 0; } - if (labs(esum3) > 120000 && speed3 == 0) { + if (labs(esum3) > STALL_LIMIT && speed3 == 0) { motor3 = 0; motor3_mode = MOTOR_MANUAL; error_state |= (1<<6); esum3 = 0; } - // protect motors from damage if stalling - if (labs(esum4) > 120000 && speed4 == 0) { + if (labs(esum4) > STALL_LIMIT && speed4 == 0) { motor4 = 0; motor4_mode = MOTOR_MANUAL; error_state |= (1<<7); @@ -891,7 +927,7 @@ static void update_pid(void) { if (motor1_mode == MOTOR_PID) { if (speed1_wish != speed1_wish_old) { - esum1 = 0; + if (abs(speed1_wish - speed1_wish_old) > 500) esum1 = 0; speed1_wish_old = speed1_wish; } @@ -905,15 +941,15 @@ static void update_pid(void) { motor1 = KP*e + KI*PID_T*esum1 + KD/PID_T*(e - eold1); eold1 = e; - if (motor1 > 0 && speed1_wish < 0) motor1=0; - else if (motor1 < 0 && speed1_wish > 0) motor1=0; + if (motor1 > 0 && speed1_wish < 0) motor1=PWM_BREAK; + else if (motor1 < 0 && speed1_wish > 0) motor1=PWM_BREAK; else if (motor1 > 255) motor1 = 255; else if (motor1 < -255) motor1 = -255; } } if (motor2_mode == MOTOR_PID) { if (speed2_wish != speed2_wish_old) { - esum2 = 0; + if (abs(speed2_wish - speed2_wish_old) > 500) esum2 = 0; speed2_wish_old = speed2_wish; } @@ -927,15 +963,15 @@ static void update_pid(void) { motor2 = KP*e + KI*PID_T*esum2 + KD/PID_T*(e - eold2); eold2 = e; - if (motor2 > 0 && speed2_wish < 0) motor2=0; - else if (motor2 < 0 && speed2_wish > 0) motor2=0; + if (motor2 > 0 && speed2_wish < 0) motor2=PWM_BREAK; + else if (motor2 < 0 && speed2_wish > 0) motor2=PWM_BREAK; else if (motor2 > 255) motor2 = 255; else if (motor2 < -255) motor2 = -255; } } if (motor3_mode == MOTOR_PID) { if (speed3_wish != speed3_wish_old) { - esum3 = 0; + if (abs(speed3_wish - speed3_wish_old) > 500) esum3 = 0; speed3_wish_old = speed3_wish; } @@ -949,15 +985,15 @@ static void update_pid(void) { motor3 = KP*e + KI*PID_T*esum3 + KD/PID_T*(e - eold3); eold3 = e; - if (motor3 > 0 && speed3_wish < 0) motor3=0; - else if (motor3 < 0 && speed3_wish > 0) motor3=0; + if (motor3 > 0 && speed3_wish < 0) motor3=PWM_BREAK; + else if (motor3 < 0 && speed3_wish > 0) motor3=PWM_BREAK; else if (motor3 > 255) motor3 = 255; else if (motor3 < -255) motor3 = -255; } } if (motor4_mode == MOTOR_PID) { if (speed4_wish != speed4_wish_old) { - esum4 = 0; + if (abs(speed4_wish - speed4_wish_old) > 500) esum4 = 0; speed4_wish_old = speed4_wish; } @@ -971,8 +1007,8 @@ static void update_pid(void) { motor4 = KP*e + KI*PID_T*esum4 + KD/PID_T*(e - eold4); eold4 = e; - if (motor4 > 0 && speed4_wish < 0) motor4=0; - else if (motor4 < 0 && speed4_wish > 0) motor4=0; + if (motor4 > 0 && speed4_wish < 0) motor4=PWM_BREAK; + else if (motor4 < 0 && speed4_wish > 0) motor4=PWM_BREAK; else if (motor4 > 255) motor4 = 255; else if (motor4 < -255) motor4 = -255; } @@ -1008,9 +1044,12 @@ int main(void) { TWI_RESET; // Motor 1 & 2 - // Timer 1: Fast PWM non-inverting mode, Top=255 => 15.625kHz + // Also used for PWM frequency TIMER1_FREQ (F_CPU/256) + // Timer 1: Fast PWM non-inverting mode, Top=255 => 19.531kHz // Prescaler=1 - TCCR1A = (1 << COM1A1) | (1 << COM1B1) | (1 << WGM10); + //TCCR1A = (1 << COM1A1) | (1 << COM1B1) | (1 << WGM10); + // Avoid narrow spike on extreme pwm value 0 by not setting COM1*1 + TCCR1A = (1 << WGM10); TCCR1B = (1 << WGM12) | (1 << CS10); OCR1A = 0; OCR1B = 0; @@ -1018,13 +1057,17 @@ int main(void) { // Motor 3 // Timer 2: Fast PWM non-inverting mode, Top=255 // Prescaler=1 - TCCR2 = (1 << WGM21) | (1 << WGM20) | (1 << COM21) | (1 << CS20); + //TCCR2 = (1 << WGM21) | (1 << WGM20) | (1 << COM21) | (1 << CS20); + // Avoid narrow spike on extreme pwm value 0 by not setting COM21 + TCCR2 = (1 << WGM21) | (1 << WGM20) | (1 << CS20); OCR2 = 0; // Motor 4 // Timer 0: Fast PWM non-inverting mode, Top=255 // Prescaler=1 - TCCR0 = (1 << WGM01) | (1 << WGM00) | (1 << COM01) | (1 << CS00); + //TCCR0 = (1 << WGM01) | (1 << WGM00) | (1 << COM01) | (1 << CS00); + // Avoid narrow spike on extreme pwm value 0 by not setting COM01 + TCCR0 = (1 << WGM01) | (1 << WGM00) | (1 << CS00); OCR0 = 0; printf("\r\nStart\r\n"); @@ -1083,7 +1126,7 @@ int main(void) { motor4_mode = MOTOR_PID; } - if (run_update >= 156) { // ~100Hz + if (run_update >= 195) { // TIMER1_FREQ/195 = ~100Hz run_update=0; update_pos();