diff --git a/flix/console.ino b/flix/console.ino index 8551538..026a35d 100644 --- a/flix/console.ino +++ b/flix/console.ino @@ -89,7 +89,7 @@ void pause(float duration) { float start = t; while (t - start < duration) { step(); - handleInput(); + handleConsole(); processMavlink(); delay(50); } @@ -232,7 +232,7 @@ void doCommand(String str, bool echo = false) { } } -void handleInput() { +void handleConsole() { static bool showMotd = true; static String input; diff --git a/flix/flix.ino b/flix/flix.ino index ac0b037..8de7757 100644 --- a/flix/flix.ino +++ b/flix/flix.ino @@ -39,7 +39,7 @@ void loop() { estimate(); control(); sendMotors(); - handleInput(); + handleConsole(); processMavlink(); readVoltage(); loopLog(); diff --git a/gazebo/flix.h b/gazebo/flix.h index f8c6a52..7874d61 100644 --- a/gazebo/flix.h +++ b/gazebo/flix.h @@ -45,7 +45,7 @@ void testMotor(int, float); void print(const char* format, ...); void pause(float duration); void doCommand(String str, bool echo); -void handleInput(); +void handleConsole(); void setupRC(); void normalizeRC(); void calibrateRC(); diff --git a/gazebo/simulator.cpp b/gazebo/simulator.cpp index 9cf3e86..0ffcf9a 100644 --- a/gazebo/simulator.cpp +++ b/gazebo/simulator.cpp @@ -84,7 +84,7 @@ public: attitude.setYaw(this->model->WorldPose().Yaw()); control(); - handleInput(); + handleConsole(); processMavlink(); applyMotorForces();