Merge remote-tracking branch 'origin/master' into dev

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;
 

flix/flix.ino

@@ -39,7 +39,7 @@ void loop() {
 	estimate();
 	control();
 	sendMotors();
-	handleInput();
+	handleConsole();
 	processMavlink();
 	readVoltage();
 	loopLog();

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();

gazebo/simulator.cpp

@@ -84,7 +84,7 @@ public:
 		attitude.setYaw(this->model->WorldPose().Yaw());
 
 		control();
-		handleInput();
+		handleConsole();
 		processMavlink();
 
 		applyMotorForces();