Merged in upstream master

src/modules/uORB/topics/manual_control_setpoint.h

@@ -78,7 +78,11 @@ struct manual_control_setpoint_s {
 
 	switch_pos_t mode_switch;			/**< mode 3 position switch (mandatory): manual, assisted, auto */
 	switch_pos_t return_switch;			/**< land 2 position switch (mandatory): land, no effect */
+<<<<<<< HEAD
 	switch_pos_t easy_switch;			/**< assisted 2 position switch (optional): seatbelt, simple */
+=======
+	switch_pos_t assisted_switch;			/**< assisted 2 position switch (optional): seatbelt, simple */
+>>>>>>> ad77ba26427aa9a2d8b8241fc95271667a1c0863
 	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,11 @@ enum RC_CHANNELS_FUNCTION {
 	YAW      = 3,
 	MODE = 4,
 	RETURN = 5,
+<<<<<<< HEAD
 	EASY = 6,
+=======
+	ASSISTED = 6,
+>>>>>>> ad77ba26427aa9a2d8b8241fc95271667a1c0863
 	LOITER = 7,
 	OFFBOARD_MODE = 8,
 	FLAPS   = 9,

src/modules/uORB/topics/vehicle_status.h

@@ -69,6 +69,8 @@ typedef enum {
 	MAIN_STATE_MAX
 } main_state_t;
 
+// If you change the order, add or remove arming_state_t states make sure to update the arrays
+// in state_machine_helper.cpp as well.
 typedef enum {
 	ARMING_STATE_INIT = 0,
 	ARMING_STATE_STANDBY,