Syntax change to improve readability; output scalers are now labelled O: instead of looking like control scalers.

Make mixer terminology more consistent; mixer inputs are 'controls'.

1 files changed, 5 insertions, 5 deletions

diff --git a/apps/drivers/drv_mixer.h b/apps/drivers/drv_mixer.h
index daa79c265..125b0d28a 100644
--- a/apps/drivers/drv_mixer.h
+++ b/apps/drivers/drv_mixer.h
@@ -81,7 +81,7 @@ struct mixer_scaler_s
 };
 
 /** mixer input */
-struct mixer_input_s
+struct mixer_control_s
 {
 	uint8_t			control_group;	/**< group from which the input reads */
 	uint8_t			control_index;	/**< index within the control group */
@@ -91,12 +91,12 @@ struct mixer_input_s
 /** simple mixer */
 struct mixer_simple_s
 {
-	uint8_t			input_count;	/**< number of inputs */
+	uint8_t			control_count;	/**< number of inputs */
 	struct mixer_scaler_s	output_scaler;	/**< scaling for the output */
-	struct mixer_input_s	inputs[0];	/**< actual size of the array is set by input_count */
+	struct mixer_control_s	controls[0];	/**< actual size of the array is set by control_count */
 };
 
-#define MIXER_SIMPLE_SIZE(_icount)	(sizeof(struct mixer_simple_s) + (_icount) * sizeof(struct mixer_input_s))
+#define MIXER_SIMPLE_SIZE(_icount)	(sizeof(struct mixer_simple_s) + (_icount) * sizeof(struct mixer_control_s))
 
 /**
  * add a simple mixer in (struct mixer_simple_s *)arg 
@@ -114,7 +114,7 @@ struct mixer_rotor_output_s
 struct mixer_multirotor_s
 {
 	uint8_t			rotor_count;
-	struct mixer_input_s	inputs[4];	/**< inputs are roll, pitch, yaw, thrust */
+	struct mixer_control_s	controls[4];	/**< controls are roll, pitch, yaw, thrust */
 	struct mixer_rotor_output_s rotors[0];	/**< actual size of the array is set by rotor_count */
 };