[Lisa/S] Renamed Lisa/S V0.1 to V1.0.

The boards are software compatible, and as probably more people will have the V1.0 it will decrease confusion. Those that have V0.1 will much more likely know that they can use V1.0 board file anyways. :)
FlyTheThings · May 26, 2014 · 77b9f1c · 77b9f1c
1 parent 6e159ef
commit 77b9f1c
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 31 deletions.
diff --git a/conf/airframes/TUDelft/IMAV2013/chouchou_lisa_s.xml b/conf/airframes/TUDelft/IMAV2013/chouchou_lisa_s.xml
@@ -1,4 +1,5 @@
 <!-- this is a quadrocopter frame equiped with Lisa/S 0.1 and generic china pwm motor controllers -->
+<!-- Using Lisa/S V1.0 board file as it is software compatible. -->
 
 <!--
      Applicable configuration:
@@ -183,7 +184,7 @@
  </modules>
 
   <firmware name="rotorcraft">
-    <target name="ap" board="lisa_s_0.1">
+    <target name="ap" board="lisa_s_1.0">
       <subsystem name="radio_control" type="superbitrf_rc">
         <define name="RADIO_TRANSMITTER_ID" value="2008496626"/> <!-- TUDelft Dx6i: TX 4 -->
         <define name="RADIO_TRANSMITTER_CHAN" value="6"/>
@@ -205,7 +206,7 @@
     </subsystem>
 
     <subsystem name="telemetry" type="superbitrf"/>
-    <subsystem name="imu" type="lisa_s_v0.1"/>
+    <subsystem name="imu" type="lisa_s_v1.0"/>
     <subsystem name="gps" type="ublox"/>
     <subsystem name="stabilization" type="int_quat"/>
     <subsystem name="ahrs" type="int_cmpl_quat"/>

diff --git a/conf/airframes/TUDelft/IMAV2013/mavrick_lisa_s.xml b/conf/airframes/TUDelft/IMAV2013/mavrick_lisa_s.xml
@@ -1,4 +1,5 @@
 <!-- this is a tiny MavRick fixedwing frame equiped with Lisa/S 0.1 -->
+<!-- Using Lisa/S V1.0 board file as it is software compatible. -->
 
 <!--
      Applicable configuration:
@@ -13,7 +14,7 @@
 
   <firmware name="fixedwing">
     <define name="AGR_CLIMB" />
-    <target name="ap" board="lisa_s_0.1"/>
+    <target name="ap" board="lisa_s_1.0"/>
 
     <subsystem name="radio_control" type="superbitrf_rc">
       <define name="RADIO_TRANSMITTER_ID" value="2008496626"/> <!-- TUDelft Dx6i: TX 4 -->
@@ -26,7 +27,7 @@
     <subsystem name="telemetry" type="superbitrf"/>
 
     <!-- Actuators are automatically chosen according to board-->
-    <subsystem name="imu"     type="lisa_s_v0.1"/>
+    <subsystem name="imu"     type="lisa_s_v1.0"/>
     <subsystem name="ahrs"    type="float_dcm"/>
       <define name="LISA_S_UPSIDE_DOWN"/>
     <subsystem name="control"/>

diff --git a/conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml b/conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml
@@ -1,4 +1,5 @@
 <!-- this is a quadrocopter frame equiped with Lisa/S 0.1 and generic china pwm motor controllers -->
+<!-- Using Lisa/S 1.0 board file as it is software compatible. -->
 
 <!--
      Applicable configuration:
@@ -185,7 +186,7 @@
  </modules>
 
   <firmware name="rotorcraft">
-    <target name="ap" board="lisa_s_0.1">
+    <target name="ap" board="lisa_s_1.0">
       <subsystem name="radio_control" type="superbitrf_rc">
         <define name="RADIO_TRANSMITTER_ID" value="2008496626"/>  <!-- 425044546 -->
         <define name="RADIO_TRANSMITTER_CHAN" value="6"/> <!-- 9 -->
@@ -208,7 +209,7 @@
     </subsystem>
 
     <subsystem name="telemetry" type="superbitrf"/>
-    <subsystem name="imu" type="lisa_s_v0.1"/>
+    <subsystem name="imu" type="lisa_s_v1.0"/>
     <subsystem name="gps" type="ublox"/>
     <subsystem name="stabilization" type="int_quat"/>
     <subsystem name="ahrs" type="int_cmpl_quat"/>
@@ -217,11 +218,11 @@
 
 
   <firmware name="test_progs">
-    <target name="test_sys_time_timer" board="lisa_s_0.1">
+    <target name="test_sys_time_timer" board="lisa_s_1.0">
         <configure name="SYS_TIME_LED" value="none"/>
     </target>
-    <target name="test_telemetry" board="lisa_s_0.1"/>
-    <target name="test_baro_board" board="lisa_s_0.1"/>
-    <target name="test_can" board="lisa_s_0.1"/>
+    <target name="test_telemetry" board="lisa_s_1.0"/>
+    <target name="test_baro_board" board="lisa_s_1.0"/>
+    <target name="test_can" board="lisa_s_1.0"/>
   </firmware>
 </airframe>
diff --git a/conf/airframes/TUDelft/IMAV2013/walkera_V120D02S.xml b/conf/airframes/TUDelft/IMAV2013/walkera_V120D02S.xml
@@ -1,4 +1,5 @@
 <!-- this is a default Walkera V120D02S frame equiped with Lisa/S 0.1 -->
+<!-- Using Lisa/S V1.0 as it is software compatible. -->
 
 <!--
      Applicable configuration:
@@ -160,7 +161,7 @@
  </modules>
 
   <firmware name="rotorcraft">
-    <target name="ap" board="lisa_s_0.1">
+    <target name="ap" board="lisa_s_1.0">
       <subsystem name="radio_control" type="superbitrf_rc">
         <define name="RADIO_TRANSMITTER_ID" value="2008496626"/> <!-- TUDelft Dx6i: TX 4 -->
         <define name="RADIO_TRANSMITTER_CHAN" value="6"/>
@@ -177,7 +178,7 @@
     </subsystem>
 
     <subsystem name="telemetry" type="superbitrf"/>
-    <subsystem name="imu" type="lisa_s_v0.1"/>
+    <subsystem name="imu" type="lisa_s_v1.0"/>
     <subsystem name="gps" type="ublox"/>
     <subsystem name="stabilization" type="int_quat"/>
     <subsystem name="ahrs" type="int_cmpl_quat"/>

diff --git a/conf/airframes/TUDelft/IMAV2013/walkera_genius_v1.xml b/conf/airframes/TUDelft/IMAV2013/walkera_genius_v1.xml
@@ -1,4 +1,5 @@
 <!-- this is a Walkera Genius V1 frame equiped with Lisa/S 0.1 with brushless main rotor -->
+<!-- Using Lisa/S V1.0 board file as it is software compatible. -->
 
 <!--
      Applicable configuration:
@@ -166,7 +167,7 @@
  </modules>
 
   <firmware name="rotorcraft">
-    <target name="ap" board="lisa_s_0.1">
+    <target name="ap" board="lisa_s_1.0">
       <subsystem name="radio_control" type="superbitrf_rc">
         <define name="RADIO_TRANSMITTER_ID" value="2008496626"/>   <!-- TUDelft Dx6i: TX 4 -->
         <define name="RADIO_TRANSMITTER_CHAN" value="6"/>
@@ -183,7 +184,7 @@
     </subsystem>
 
     <subsystem name="telemetry" type="superbitrf"/>
-    <subsystem name="imu" type="lisa_s_v0.1"/>
+    <subsystem name="imu" type="lisa_s_v1.0"/>
     <subsystem name="gps" type="ublox"/>
     <subsystem name="stabilization" type="int_quat"/>
     <subsystem name="ahrs" type="int_cmpl_quat"/>

diff --git a/conf/airframes/TUDelft/delfly.xml b/conf/airframes/TUDelft/delfly.xml
@@ -1,13 +1,14 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <!-- Delfly (http://www.delfly.nl/home.html)
-     Lisa/S v1.0 board (http://wiki.paparazziuav.org/wiki/Lisa/S)
+     Lisa/S v0.1 board (http://wiki.paparazziuav.org/wiki/Lisa/S)
+     Using Lisa/S V1.0 board file as it is software compatible.
 -->
 
 <airframe name="Delfly Lisa/S 0.1">
 
   <firmware name="fixedwing">
-    <target name="ap"   board="lisa_s_0.1">
+    <target name="ap"   board="lisa_s_1.0">
       <subsystem name="radio_control" type="spektrum">
         <define name="RADIO_MODE" value="RADIO_FLAP"/>
         <define name="RADIO_KILL_SWITCH" value="RADIO_GEAR"/>
@@ -30,7 +31,7 @@
     </subsystem>
 
     <!-- Sensors -->
-    <subsystem name="imu"           type="lisa_s_v0.1"/>
+    <subsystem name="imu"           type="lisa_s_v1.0"/>
     <subsystem name="gps"           type="ublox"/>
 
     <subsystem name="actuators" type="pwm">

diff --git a/conf/airframes/esden/calib/ls01-default.xml → conf/airframes/esden/calib/ls10-default.xml b/conf/airframes/esden/calib/ls01-default.xml → conf/airframes/esden/calib/ls10-default.xml
diff --git a/conf/airframes/esden/quady_ls01pwm.xml → conf/airframes/esden/quady_ls10pwm.xml b/conf/airframes/esden/quady_ls01pwm.xml → conf/airframes/esden/quady_ls10pwm.xml
@@ -1,15 +1,15 @@
-<!-- this is a quadrocopter frame equiped with Lisa/S 0.1 and generic china pwm motor controllers -->
+<!-- this is a quadrocopter frame equiped with Lisa/S 1.0 and generic china pwm motor controllers -->
 
 <!--
      Applicable configuration:
-     airframe="airframes/esden/quady_ls01pwm.xml"
+     airframe="airframes/esden/quady_ls10pwm.xml"
      radio="radios/cockpitSX.xml"
      telemetry="telemetry/default_rotorcraft.xml"
      flight_plan="flight_plans/dummy.xml"
      settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml"
 -->
 
-<airframe name="quady_lm2a2pwm">
+<airframe name="quady_ls10pwm">
 
   <servos driver="Pwm">
     <servo name="FRONT" no="0" min="1000" neutral="1100" max="1950"/>
@@ -45,7 +45,7 @@
     <define name="THRUST_COEF" value="{  256,  256,  256,  256 }"/>
   </section>
 
-  <include href="conf/airframes/esden/calib/ls01-default.xml"/>
+  <include href="conf/airframes/esden/calib/ls10-default.xml"/>
 
   <section name="IMU" prefix="IMU_">
     <define name="BODY_TO_IMU_PHI"   value="0." unit="deg"/>
@@ -164,7 +164,7 @@
  </modules>
 
   <firmware name="rotorcraft">
-    <target name="ap" board="lisa_s_0.1">
+    <target name="ap" board="lisa_s_1.0">
       <subsystem name="radio_control" type="spektrum">
         <define name="RADIO_MODE" value="RADIO_FLAP"/>
         <define name="RADIO_KILL_SWITCH" value="RADIO_GEAR"/>
@@ -186,7 +186,7 @@
     </subsystem>
 
     <subsystem name="telemetry"     type="transparent"/>
-    <subsystem name="imu"           type="lisa_s_v0.1"/>
+    <subsystem name="imu"           type="lisa_s_v1.0"/>
     <subsystem name="gps"           type="ublox"/>
     <subsystem name="stabilization" type="int_quat"/>
     <subsystem name="ahrs"          type="int_cmpl_quat"/>

diff --git a/conf/airframes/examples/quadrotor_lisa_s.xml b/conf/airframes/examples/quadrotor_lisa_s.xml
@@ -1,4 +1,4 @@
-<!-- this is a quadrocopter frame equiped with Lisa/S 0.1 and generic china pwm motor controllers -->
+<!-- this is a quadrocopter frame equiped with Lisa/S 1.0 and generic china pwm motor controllers -->
 
 <!--
      Applicable configuration:
@@ -186,7 +186,7 @@
  </modules>
 
   <firmware name="rotorcraft">
-    <target name="ap" board="lisa_s_0.1">
+    <target name="ap" board="lisa_s_1.0">
       <subsystem name="radio_control" type="superbitrf_rc">
         <define name="RADIO_TRANSMITTER_ID" value="2008496626"/> <!-- TUDelft Dx6i: TX 4 -->
         <define name="RADIO_TRANSMITTER_CHAN" value="6"/>
@@ -209,7 +209,7 @@
     </subsystem>
 
     <subsystem name="telemetry" type="superbitrf"/>
-    <subsystem name="imu" type="lisa_s_v0.1"/>
+    <subsystem name="imu" type="lisa_s_v1.0"/>
     <subsystem name="gps" type="ublox"/>
     <subsystem name="stabilization" type="int_quat"/>
     <subsystem name="ahrs" type="int_cmpl_quat"/>

diff --git a/conf/boards/lisa_s_0.1.makefile → conf/boards/lisa_s_1.0.makefile b/conf/boards/lisa_s_0.1.makefile → conf/boards/lisa_s_1.0.makefile
@@ -1,12 +1,12 @@
 # Hey Emacs, this is a -*- makefile -*-
 #
-# lisa_s_0.1.makefile
+# lisa_s_1.0.makefile
 #
 # http://paparazzi.enac.fr/wiki/Lisa/S
 #
 
 BOARD=lisa_s
-BOARD_VERSION=0.1
+BOARD_VERSION=1.0
 BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
 
 ARCH=stm32

diff --git a/...ubsystems/shared/imu_lisa_s_v0.1.makefile → ...ubsystems/shared/imu_lisa_s_v1.0.makefile b/...ubsystems/shared/imu_lisa_s_v0.1.makefile → ...ubsystems/shared/imu_lisa_s_v1.0.makefile
diff --git a/sw/airborne/boards/lisa_s_0.1.h → sw/airborne/boards/lisa_s_1.0.h b/sw/airborne/boards/lisa_s_0.1.h → sw/airborne/boards/lisa_s_1.0.h
@@ -1,5 +1,5 @@
-#ifndef CONFIG_LISA_S_0_1_H
-#define CONFIG_LISA_S_0_1_H
+#ifndef CONFIG_LISA_S_1_0_H
+#define CONFIG_LISA_S_1_0_H
 
 #define BOARD_LISA_S
 
@@ -428,4 +428,4 @@
 #define SUPERBITRF_DRDY_PIN GPIO6
 #define SUPERBITRF_FORCE_DSM2 FALSE
 
-#endif /* CONFIG_LISA_S_0_1_H */
+#endif /* CONFIG_LISA_S_1_0_H */