Merge branch 'master' of github.com:PX4/Firmware into power_enforce

src/modules/systemlib/hx_stream.c

@@ -63,7 +63,7 @@ struct hx_stream {
 	/* TX state */
 	int			fd;
 	bool			tx_error;
-	uint8_t			*tx_buf;
+	const uint8_t		*tx_buf;
 	unsigned		tx_resid;
 	uint32_t		tx_crc;
 	enum {

src/modules/systemlib/mixer/mixer_multirotor.cpp

@@ -208,7 +208,6 @@ MultirotorMixer::from_text(Mixer::ControlCallback control_cb, uintptr_t cb_handl
 	char geomname[8];
 	int s[4];
 	int used;
-	const char *end = buf + buflen;
 
 	/* enforce that the mixer ends with space or a new line */
 	for (int i = buflen - 1; i >= 0; i--) {
@@ -302,7 +301,6 @@ MultirotorMixer::mix(float *outputs, unsigned space)
 	//lowsyslog("thrust: %d, get_control3: %d\n", (int)(thrust), (int)(get_control(0, 3)));
 	float		min_out = 0.0f;
 	float		max_out = 0.0f;
-	float		scale_yaw = 1.0f;
 
 	/* perform initial mix pass yielding unbounded outputs, ignore yaw */
 	for (unsigned i = 0; i < _rotor_count; i++) {
@@ -327,7 +325,7 @@ MultirotorMixer::mix(float *outputs, unsigned space)
 	}
 
 	/* scale down roll/pitch controls if some outputs are negative, don't add yaw, keep total thrust */
-	if (min_out < 0.0) {
+	if (min_out < 0.0f) {
 		float scale_in = thrust / (thrust - min_out);
 
 		/* mix again with adjusted controls */

src/modules/systemlib/otp.c

@@ -133,7 +133,7 @@ int lock_otp(void)
 
 
 // COMPLETE, BUSY, or other flash error?
-int F_GetStatus(void)
+static int F_GetStatus(void)
 {
 	int fs = F_COMPLETE;
 

src/modules/systemlib/param/param.c

@@ -96,8 +96,6 @@ ORB_DEFINE(parameter_update, struct parameter_update_s);
 /** parameter update topic handle */
 static orb_advert_t param_topic = -1;
 
-static sem_t param_sem = { .semcount = 1 };
-
 /** lock the parameter store */
 static void
 param_lock(void)

src/modules/systemlib/pwm_limit/pwm_limit.c

@@ -97,7 +97,6 @@ void pwm_limit_calc(const bool armed, const unsigned num_channels, const uint16_
 	}
 
 	unsigned progress;
-	uint16_t temp_pwm;
 
 	/* then set effective_pwm based on state */
 	switch (limit->state) {