Browse Source

Fixed timeout. Now it is usable for other input methods than nunchuck.

Cosmetical cleanup in motor-test.
master
larsm 3 years ago
parent
commit
3e2cfe973a
  1. 2
      Src/control.c
  2. 10
      Src/main.c

2
Src/control.c

@ -105,8 +105,6 @@ void Nunchuck_Read() {
HAL_Delay(5);
if (HAL_I2C_Master_Receive(&hi2c2,0xA4,(uint8_t*)nunchuck_data, 6, 100) == HAL_OK) {
timeout = 0;
} else {
timeout++;
}
if (timeout > 3) {

10
Src/main.c

@ -226,11 +226,10 @@ int main(void) {
#endif
#ifdef CONTROL_MOTOR_TEST
// if (main_loop_counter % 2 == 0) {
if (motor_test_direction == 1) cmd2 += 1;
else cmd2 -= 1;
if (abs(cmd2) > CONTROL_MOTOR_TEST_MAX_SPEED) motor_test_direction = -motor_test_direction;
// }
if (motor_test_direction == 1) cmd2 += 1;
else cmd2 -= 1;
if (abs(cmd2) > CONTROL_MOTOR_TEST_MAX_SPEED) motor_test_direction = -motor_test_direction;
timeout = 0;
#endif
@ -327,6 +326,7 @@ int main(void) {
}
main_loop_counter += 1;
timeout++;
}
}

Loading…
Cancel
Save