Replaces poshold/althold with posctrl/altctrl

src/modules/uORB/topics/manual_control_setpoint.h

@@ -78,7 +78,7 @@ struct manual_control_setpoint_s {
 
 	switch_pos_t mode_switch;			/**< mode 3 position switch (mandatory): manual, assisted, auto */
 	switch_pos_t return_switch;			/**< rturn to launch 2 position switch (mandatory): no effect, return */
-	switch_pos_t poshold_switch;			/**< poshold 2 position switch (optional): althold, poshold */
+	switch_pos_t posctrl_switch;			/**< posctrl 2 position switch (optional): altctrl, posctrl */
 	switch_pos_t loiter_switch;		/**< mission 2 position switch (optional): mission, loiter */
 }; /**< manual control inputs */
 

src/modules/uORB/topics/rc_channels.h

@@ -64,7 +64,7 @@ enum RC_CHANNELS_FUNCTION {
 	YAW      = 3,
 	MODE = 4,
 	RETURN = 5,
-	POSHOLD = 6,
+	POSCTRL = 6,
 	LOITER = 7,
 	OFFBOARD_MODE = 8,
 	FLAPS   = 9,

src/modules/uORB/topics/vehicle_status.h

@@ -63,8 +63,8 @@
 /* main state machine */
 typedef enum {
 	MAIN_STATE_MANUAL = 0,
-	MAIN_STATE_ALTHOLD,
-	MAIN_STATE_POSHOLD,
+	MAIN_STATE_ALTCTRL,
+	MAIN_STATE_POSCTRL,
 	MAIN_STATE_AUTO,
 	MAIN_STATE_MAX
 } main_state_t;