X-Git-Url: https://defiant.homedns.org/gitweb/?p=ros_wild_thumper.git;a=blobdiff_plain;f=avr%2Fmotor_ctrl%2Fmain.c;h=9c6413cd8c414ca0563e18212e7e6a31a4601f72;hp=f8a5c34b95fbb81eebca2a3e7ea923610e661c19;hb=54239069f1fbc3ab2d38593454986c1a706c8b80;hpb=cb550b3db6e7e76adabc476ab9a3a2a8efe3ab82 diff --git a/avr/motor_ctrl/main.c b/avr/motor_ctrl/main.c index f8a5c34..9c6413c 100644 --- a/avr/motor_ctrl/main.c +++ b/avr/motor_ctrl/main.c @@ -14,10 +14,6 @@ * 0x02 Motor 1 PWM LSB * 0x03 Motor 2 PWM MSB * 0x04 Motor 2 PWM LSB - * 0x05 Motor 3 PWM MSB - * 0x06 Motor 3 PWM LSB - * 0x07 Motor 4 PWM MSB - * 0x08 Motor 4 PWM LSB * free * 0x10 Hall 1 MSB * 0x11 Hall 1 LSB @@ -32,10 +28,6 @@ * 0x21 Motor 1 speed wish LSB * 0x22 Motor 2 speed wish MSB * 0x23 Motor 2 speed wish LSB - * 0x24 Motor 3 speed wish MSB - * 0x25 Motor 3 speed wish LSB - * 0x26 Motor 4 speed wish MSB - * 0x27 Motor 4 speed wish LSB * 0x28 Left speed wish (m/s) MSB * 0x29 Left speed wish (m/s) * 0x2A Left speed wish (m/s) @@ -48,10 +40,6 @@ * 0x31 Motor 1 speed LSB * 0x32 Motor 2 speed MSB * 0x33 Motor 2 speed LSB - * 0x34 Motor 3 speed MSB - * 0x35 Motor 3 speed LSB - * 0x36 Motor 4 speed MSB - * 0x37 Motor 4 speed LSB * 0x38 Speed (m/s) MSB * 0x39 Speed (m/s) * 0x3A Speed (m/s) @@ -60,7 +48,6 @@ * 0x3D Angle (rad/s) * 0x3E Angle (rad/s) * 0x3F Angle (rad/s) LSB - * free * 0x40 Position x (m) MSB * 0x41 Position x (m) * 0x42 Position x (m) @@ -85,13 +72,9 @@ * free * 0x90 Motor 1 switch * 0x91 Motor 2 switch - * 0x92 Motor 3 switch - * 0x93 Motor 4 switch - * 0x94 Front Handicap - * 0x95 Aft Handicap * free * 0xA0 Reset reason - * 0xA1 TLE Error status + * 0xA1 Error status * 0xA2 count test * free * 0xff Bootloader @@ -102,12 +85,15 @@ #define TWI_RESET TWCR &= ~((1 << TWSTO) | (1 << TWEN)); TWI_ACK #define TWI_NAK TWCR = (1<>8; @@ -430,22 +349,6 @@ ISR(TWI_vect) TWDR = speed2_wish; TWI_ACK; break; - case 0x24: // Motor 3 speed wish MSB - TWDR = speed3_wish>>8; - TWI_ACK; - break; - case 0x25: // Motor 3 speed wish LSB - TWDR = speed3_wish; - TWI_ACK; - break; - case 0x26: // Motor 4 speed wish MSB - TWDR = speed4_wish>>8; - TWI_ACK; - break; - case 0x27: // Motor 4 speed wish LSB - TWDR = speed4_wish; - TWI_ACK; - break; case 0x30: // Motor 1 speed MSB TWDR = speed1>>8; TWI_ACK; @@ -545,19 +448,19 @@ ISR(TWI_vect) TWI_ACK; break; case 0x48: // Position angle MSB - TWDR = pos_y.i>>24; + TWDR = angle.i>>24; TWI_ACK; break; case 0x49: // Position angle - TWDR = pos_y.i>>16; + TWDR = angle.i>>16; TWI_ACK; break; case 0x4A: // Position angle - TWDR = pos_y.i>>8; + TWDR = angle.i>>8; TWI_ACK; break; case 0x4B: // Position angle LSB - TWDR = pos_y.i; + TWDR = angle.i; TWI_ACK; break; case 0xA0: // Reset reason @@ -566,7 +469,7 @@ ISR(TWI_vect) TWI_ACK; break; case 0xA1: // TLE Error status - TWDR = ~((PIND & 0x40)>>3 | (PINB & 0x07)) & 0xf; + TWDR = error_state; TWI_ACK; break; case 0xA2: // count test @@ -597,8 +500,8 @@ static void update_hall1(void) { diff = oldstatus - new; // difference last - new if (diff & 0x1) { // bit 0 = value (1) oldstatus = new; // store new as next last - if (motor1_switch) pos1 += (diff & 2) - 1; // bit 1 = direction (+/-) - else pos1 -= (diff & 2) - 1; + if (motor1_switch) pos1 -= (diff & 2) - 1; // bit 1 = direction (+/-) + else pos1 += (diff & 2) - 1; } } @@ -616,7 +519,7 @@ static void update_hall2(void) { diff = oldstatus - new; // difference last - new if (diff & 0x1) { // bit 0 = value (1) oldstatus = new; // store new as next last - if (motor2_switch) pos2 -= (diff & 2) - 1; // bit 1 = direction (+/-) + if (motor1_switch) pos2 -= (diff & 2) - 1; // bit 1 = direction (+/-) else pos2 += (diff & 2) - 1; } } @@ -635,8 +538,8 @@ static void update_hall3(void) { diff = oldstatus - new; // difference last - new if (diff & 0x1) { // bit 0 = value (1) oldstatus = new; // store new as next last - if (motor3_switch) pos3 -= (diff & 2) - 1; // bit 1 = direction (+/-) - else pos3 += (diff & 2) - 1; + if (motor2_switch) pos3 += (diff & 2) - 1; // bit 1 = direction (+/-) + else pos3 -= (diff & 2) - 1; } } @@ -654,8 +557,8 @@ static void update_hall4(void) { diff = oldstatus - new; // difference last - new if (diff & 0x1) { // bit 0 = value (1) oldstatus = new; // store new as next last - if (motor4_switch) pos4 += (diff & 2) - 1; // bit 1 = direction (+/-) - else pos4 -= (diff & 2) - 1; + if (motor2_switch) pos4 -= (diff & 2) - 1; // bit 1 = direction (+/-) + else pos4 += (diff & 2) - 1; } } @@ -663,16 +566,32 @@ static void update_hall4(void) { static void update_motor(void) { static int16_t m1_old=SHRT_MIN; static int16_t m2_old=SHRT_MIN; - static int16_t m3_old=SHRT_MIN; - static int16_t m4_old=SHRT_MIN; + + error_state = ~(PINB & 0x03); + + if (motor1_mode == MOTOR_PID && bit_is_set(error_state, 0)) { + // if error and running: stop + if (m1_old != 0) motor1 = 0; + // if we start motor in error state: start with full power + else if (motor1 > 0) motor1 = 255; + else if (motor1 < 0) motor1 = -255; + } + if (motor2_mode == MOTOR_PID && bit_is_set(error_state, 1)) { + // if error and running: stop + if (m2_old != 0) motor2 = 0; + // if we start motor in error state: start with full power + else if (motor2 > 0) motor2 = 255; + else if (motor2 < 0) motor2 = -255; + } if (m1_old != motor1) { // update only when changed if (motor1 == 0) { // stop - PORTC |= (1 << 3) | (1 << 2); + PORTC &= ~(1 << 3) & ~(1 << 2); } else if ((!motor1_switch && motor1 > 0) || (motor1_switch && motor1 < 0)) { // forward - PORTC &= ~(1 << 3) & ~(1 << 2); + PORTC |= (1 << 2); + PORTC &= ~(1 << 3); } else { // motor1 < 0 // backward PORTC &= ~(1 << 2); @@ -686,10 +605,11 @@ static void update_motor(void) { if (m2_old != motor2) { // update only when changed if (motor2 == 0) { // stop - PORTC |= (1 << 5) | (1 << 4); + PORTC &= ~(1 << 5) & ~(1 << 4); } else if ((!motor2_switch && motor2 > 0) || (motor2_switch && motor2 < 0)) { // forward - PORTC &= ~(1 << 5) & ~(1 << 4); + PORTC |= (1 << 4); + PORTC &= ~(1 << 5); } else { // motor2 < 0 // backward PORTC &= ~(1 << 4); @@ -699,40 +619,6 @@ static void update_motor(void) { m2_old = motor2; OCR1B = abs(motor2); } - - if (m3_old != motor3) { // update only when changed - if (motor3 == 0) { - // stop - PORTC |= (1 << 7) | (1 << 6); - } else if ((!motor3_switch && motor3 > 0) || (motor3_switch && motor3 < 0)) { - // forward - PORTC &= ~(1 << 7) & ~(1 << 6); - } else { // motor3 < 0 - // backward - PORTC &= ~(1 << 6); - PORTC |= (1 << 7); - } - - m3_old = motor3; - OCR2 = abs(motor3); - } - - if (m4_old != motor4) { // update only when changed - if (motor4 == 0) { - // stop - PORTD |= (1 << 3) | (1 << 2); - } else if ((!motor4_switch && motor4 > 0) || (motor4_switch && motor4 < 0)) { - // forward - PORTD &= ~(1 << 3) & ~(1 << 2); - } else { // motor4 < 0 - // backward - PORTD &= ~(1 << 2); - PORTD |= (1 << 3); - } - - m4_old = motor4; - OCR0 = abs(motor4); - } } @@ -747,7 +633,6 @@ static void update_pos(void) { int16_t pos4_diff; float diff_left_m, diff_right_m, angle_diff, translation; float pos_x_new, pos_y_new, angle_new; - int16_t speed_l, speed_r; float tmp_speed_lin, tmp_speed_rot; int16_t cur_pos1, cur_pos2, cur_pos3, cur_pos4; int16_t new_speed1, new_speed2, new_speed3, new_speed4; @@ -770,13 +655,13 @@ static void update_pos(void) { new_speed3 = pos3_diff/PID_T; new_speed4 = pos4_diff/PID_T; - diff_left_m = (pos1_diff + pos2_diff)/(2*STEP_PER_M); - diff_right_m = (pos3_diff + pos4_diff)/(2*STEP_PER_M); + diff_left_m = (pos1_diff + pos2_diff)/(2*STEP_PER_M_LEFT); + diff_right_m = (pos3_diff + pos4_diff)/(2*STEP_PER_M_RIGHT); angle_diff = (diff_right_m - diff_left_m) / WHEEL_DIST; angle_new = angle.f + angle_diff; if (angle_new > 2*M_PI) angle_new-=2*M_PI; - else if (angle_new < 2*M_PI) angle_new+=2*M_PI; + else if (angle_new < -2*M_PI) angle_new+=2*M_PI; translation = (diff_left_m + diff_right_m)/2.0; pos_x_new = pos_x.f + cos(angle_new)*translation; @@ -784,8 +669,8 @@ static void update_pos(void) { speed_l = (new_speed1+new_speed2)/2; speed_r = (new_speed3+new_speed4)/2; - tmp_speed_lin = (speed_l + speed_r)/(2.0*STEP_PER_M); - tmp_speed_rot = (speed_r - speed_l)/(M_PI*WHEEL_DIST*STEP_PER_M); + tmp_speed_lin = (speed_l + speed_r)/(2.0*STEP_PER_M_AVG); + tmp_speed_rot = (speed_r - speed_l)/(M_PI*WHEEL_DIST*STEP_PER_M_AVG); // copy from tmp cli(); @@ -810,12 +695,8 @@ static void update_pos(void) { static void update_pid(void) { static int16_t eold1=0; static int16_t eold2=0; - static int16_t eold3=0; - static int16_t eold4=0; static int32_t esum1=0; static int32_t esum2=0; - static int32_t esum3=0; - static int32_t esum4=0; if (motor1_mode == MOTOR_PID) { if (speed1_wish == 0) { @@ -823,9 +704,9 @@ static void update_pid(void) { eold1 = 0; esum1 = 0; } else { - int16_t e = speed1_wish - speed1; + int16_t e = speed1_wish - speed_l; esum1+=e; - motor1 += KP*e + KI*PID_T*esum1 + KD/PID_T*(e - eold1); + motor1 = KP*e + KI*PID_T*esum1 + KD/PID_T*(e - eold1); eold1 = e; if (motor1 > 255) motor1 = 255; @@ -838,45 +719,15 @@ static void update_pid(void) { eold2 = 0; esum2 = 0; } else { - int16_t e = speed2_wish - speed2; + int16_t e = speed2_wish - speed_r; esum2+=e; - motor2 += KP*e + KI*PID_T*esum2 + KD/PID_T*(e - eold2); + motor2 = KP*e + KI*PID_T*esum2 + KD/PID_T*(e - eold2); eold2 = e; if (motor2 > 255) motor2 = 255; else if (motor2 < -255) motor2 = -255; } } - if (motor3_mode == MOTOR_PID) { - if (speed3_wish == 0) { - motor3 = 0; - eold3 = 0; - esum3 = 0; - } else { - int16_t e = speed3_wish - speed3; - esum3+=e; - motor3 += KP*e + KI*PID_T*esum3 + KD/PID_T*(e - eold3); - eold3 = e; - - if (motor3 > 255) motor3 = 255; - else if (motor3 < -255) motor3 = -255; - } - } - if (motor4_mode == MOTOR_PID) { - if (speed4_wish == 0) { - motor4 = 0; - eold4 = 0; - esum4 = 0; - } else { - int16_t e = speed4_wish - speed4; - esum4+=e; - motor4 += KP*e + KI*PID_T*esum4 + KD/PID_T*(e - eold4); - eold4 = e; - - if (motor4 > 255) motor4 = 255; - else if (motor4 < -255) motor4 = -255; - } - } } @@ -905,25 +756,13 @@ int main(void) { TWI_RESET; // Motor 1 & 2 - // Timer 1: Fast PWM inverting mode, Top=256 => 15.625kHz + // Timer 1: Fast PWM non-inverting mode, Top=256 => 15.625kHz // Prescaler=1 - TCCR1A = (1 << COM1A1) | (1 << COM1B1) | (1 << COM1A0) | (1 << COM1B0) | (1 << WGM10); + TCCR1A = (1 << COM1A1) | (1 << COM1B1) | (1 << WGM10); TCCR1B = (1 << WGM12) | (1 << CS10); OCR1A = 0; OCR1B = 0; - // Motor 3 - // Timer 2: Fast PWM inverting mode, Top=256 - // Prescaler=1 - TCCR2 = (1 << WGM21) | (1 << WGM20) | (1 << COM21) | (1 << COM20) | (1 << CS20); - OCR2 = 0; - - // Motor 4 - // Timer 0: Fast PWM inverting mode, Top=256 - // Prescaler=1 - TCCR0 = (1 << WGM01) | (1 << WGM00) | (1 << COM01) | (1 << COM00) | (1 << CS00); - OCR0 = 0; - printf("\r\nStart\r\n"); set_sleep_mode(SLEEP_MODE_IDLE); @@ -957,17 +796,13 @@ int main(void) { speed_wish_right = angle*M_PI*WHEEL_DIST/2 + speed; speed_wish_left = speed*2-speed_wish_right; - speed_wish_left*=STEP_PER_M; - speed_wish_right*=STEP_PER_M; + speed_wish_left*=STEP_PER_M_LEFT; + speed_wish_right*=STEP_PER_M_RIGHT; - speed1_wish = speed_wish_left * (100-aft_handicap)/100.0; - speed2_wish = speed_wish_left * (100-front_handicap)/100.0; - speed3_wish = speed_wish_right * (100-front_handicap)/100.0; - speed4_wish = speed_wish_right * (100-aft_handicap)/100.0; + speed1_wish = speed_wish_left; + speed2_wish = speed_wish_right; motor1_mode = MOTOR_PID; motor2_mode = MOTOR_PID; - motor3_mode = MOTOR_PID; - motor4_mode = MOTOR_PID; } if (run_update >= 156) { // ~100Hz