Included pull request advices.

paparazzi · Mar 31, 2016 · bbfea9b · bbfea9b
2 parents 047586e + 4649e4a
commit bbfea9b
Show file tree

Hide file tree

Showing 599 changed files with 4,601 additions and 4,773 deletions.
diff --git a/conf/HB/hb_conf_speedy_opticflow.xml b/conf/HB/hb_conf_speedy_opticflow.xml
diff --git a/conf/HB/hb_control_panel_speedy_opticflow.xml b/conf/HB/hb_control_panel_speedy_opticflow.xml
diff --git a/conf/airframes/CDW/cdw_classix.xml b/conf/airframes/CDW/cdw_classix.xml
@@ -216,9 +216,9 @@
       <configure name="MODEM_BAUD" value="B9600"/>
     </subsystem>
 
-    <subsystem name="ins" type="xsens">
-      <configure name="XSENS_UART_NR" value="1"/>
-    </subsystem>
+    <module name="ins" type="xsens">
+      <configure name="XSENS_PORT" value="uart1"/>
+    </module>
 
   </firmware>
 

diff --git a/conf/airframes/CDW/cdw_twoseastwenty.xml b/conf/airframes/CDW/cdw_twoseastwenty.xml
@@ -36,10 +36,10 @@
         <configure name="MODEM_BAUD" value="B9600"/>
         <configure name="MODEM_PORT" value="UART3"/>
       </subsystem>
-      <subsystem name="ins" type="xsens700">
-        <configure name="XSENS_UART_NR" value="1"/>
-        <configure name="XSENS_UART_BAUD" value="B230400"/>
-      </subsystem>
+      <module name="ins" type="xsens700">
+        <configure name="XSENS_PORT" value="uart1"/>
+        <configure name="XSENS_BAUD" value="B230400"/>
+      </module>
     </target>
     <target name="fbw" board="lisa_m_2.0">
       <configure name="SEPARATE_FBW" value="1"/>
@@ -70,10 +70,10 @@
         <configure name="MODEM_BAUD" value="B9600"/>
         <configure name="MODEM_PORT" value="UART3"/>
       </subsystem>
-      <subsystem name="ins" type="xsens700">
-        <configure name="XSENS_UART_NR" value="1"/>
-        <configure name="XSENS_UART_BAUD" value="B230400"/>
-      </subsystem>
+      <module name="ins" type="xsens700">
+        <configure name="XSENS_PORT" value="uart1"/>
+        <configure name="XSENS_BAUD" value="B230400"/>
+      </module>
     </target>
     <define name="AGR_CLIMB"/>
     <define name="LOITER_TRIM"/>

diff --git a/conf/airframes/CDW/cdw_yapa_xsens.xml b/conf/airframes/CDW/cdw_yapa_xsens.xml
@@ -25,10 +25,10 @@
     <subsystem name="control"/>
     <!-- Sensors -->
     <subsystem name="navigation"/>
-    <subsystem name="ins" type="xsens">
-      <configure name="XSENS_UART_NR" value="0"/>
-      <configure name="XSENS_UART_BAUD" value="B230400"/>
-    </subsystem>
+    <module name="ins" type="xsens">
+      <configure name="XSENS_PORT" value="uart0"/>
+      <configure name="XSENS_BAUD" value="B230400"/>
+    </module>
   </firmware>
 
   <!-- ************************* MODULES ************************* -->

diff --git a/conf/airframes/FLIXR/flixr_lisa_mx.xml b/conf/airframes/FLIXR/flixr_lisa_mx.xml
@@ -96,6 +96,7 @@
       <module name="ahrs" type="int_cmpl_quat"/>
     </target>
     <target name="test_module" board="lisa_mx_2.0">
+      <module name="usb_serial_stm32_example1"/>
     </target>
   </firmware>