Merge branch 'public-export-build' into fmuv2_bringup_io2

src/modules/px4iofirmware/controls.c

@@ -288,8 +288,8 @@ controls_tick() {
 			r_status_flags |= PX4IO_P_STATUS_FLAGS_OVERRIDE;
 
 			/* mix new RC input control values to servos */
-			//if (dsm_updated || sbus_updated || ppm_updated)
+			if (dsm_updated || sbus_updated || ppm_updated)
-			//	mixer_tick();
+				mixer_tick();
 
 		} else {
 			r_status_flags &= ~PX4IO_P_STATUS_FLAGS_OVERRIDE;

src/modules/px4iofirmware/module.mk

@@ -10,10 +10,10 @@ SRCS		= adc.c \
 		  sbus.c \
 		  ../systemlib/up_cxxinitialize.c \
 		  ../systemlib/hx_stream.c \
-		  ../systemlib/perf_counter.c
+		  ../systemlib/perf_counter.c \
+		  mixer.cpp \
+		  ../systemlib/mixer/mixer.cpp \
+		  ../systemlib/mixer/mixer_group.cpp \
+		  ../systemlib/mixer/mixer_multirotor.cpp \
+		  ../systemlib/mixer/mixer_simple.cpp \
 		  
-#		  mixer.cpp \
-#		  ../systemlib/mixer/mixer.cpp \
-#		  ../systemlib/mixer/mixer_group.cpp \
-#		  ../systemlib/mixer/mixer_multirotor.cpp \
-#		  ../systemlib/mixer/mixer_simple.cpp \

src/modules/px4iofirmware/px4io.c

@@ -207,7 +207,7 @@ user_start(int argc, char *argv[])
 
 		/* kick the mixer */
 		perf_begin(mixer_perf);
-		// mixer_tick();
+		mixer_tick();
 		perf_end(mixer_perf);
 
 		/* kick the control inputs */

src/modules/px4iofirmware/px4io.h

@@ -148,8 +148,8 @@ extern struct sys_state_s system_state;
 /*
  * Mixer
  */
-//extern void	mixer_tick(void);
+extern void	mixer_tick(void);
-//extern void	mixer_handle_text(const void *buffer, size_t length);
+extern void	mixer_handle_text(const void *buffer, size_t length);
 
 /**
  * Safety switch/LED.

src/modules/px4iofirmware/registers.c

@@ -245,7 +245,7 @@ registers_set(uint8_t page, uint8_t offset, const uint16_t *values, unsigned num
 
 		/* handle text going to the mixer parser */
 	case PX4IO_PAGE_MIXERLOAD:
-		//mixer_handle_text(values, num_values * sizeof(*values));
+		mixer_handle_text(values, num_values * sizeof(*values));
 		break;
 
 	default: