Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-26 08:22:43 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

rename BOOZ_INS to INS, still a double message name to resolve

Browse Source
This commit is contained in:
Felix Ruess
2010-09-28 19:01:59 +00:00
parent 6455ef20e7
commit 76059b923f
34 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/ENAC/quadrotor/blender.xml
+1 -1
View File
@@ -150,7 +150,7 @@
<define name="HACK_45" value="1"/>
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="16.5" integer="16"/>
</section>
conf/airframes/ENAC/quadrotor/booz2_g1.xml
+1 -1
View File
@@ -139,7 +139,7 @@
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="15." integer="16"/>
<define name="UNTILT_ACCEL" value="1"/>
<define name="SONAR_SENS" value="2.146" integer="16"/>
conf/airframes/ENAC/quadrotor/mkk1.xml
+1 -1
View File
@@ -190,7 +190,7 @@
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="15." integer="16"/>
<define name="UNTILT_ACCEL" value="1"/>
</section>
conf/airframes/PPZUAV/quadrotor/ppzuav_booz2_asctec_example.xml
+1 -1
View File
@@ -148,7 +148,7 @@
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="14.9" integer="16"/>
</section>
conf/airframes/PPZUAV/quadrotor/ppzuav_booz2_mkk_example.xml
+1 -1
View File
@@ -165,7 +165,7 @@
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="14.9" integer="16"/>
</section>
conf/airframes/Poine/booz2_a1.xml
+1 -1
View File
@@ -141,7 +141,7 @@
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="15." integer="16"/>
</section>
conf/airframes/Poine/booz2_a1p.xml
+1 -1
View File
@@ -145,7 +145,7 @@
<define name="H_Z" value="0.8624"/>
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="15." integer="16"/>
</section>
conf/airframes/Poine/booz2_a2.xml
+1 -1
View File
@@ -133,7 +133,7 @@
<define name="TRIM_R" value="0"/>
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="14.9" integer="16"/>
</section>
conf/airframes/Poine/booz2_a3.xml
+1 -1
View File
@@ -120,7 +120,7 @@
<define name="TRIM_R" value="0"/>
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="14.9" integer="16"/>
</section>
conf/airframes/Poine/booz2_a4.xml
+1 -1
View File
@@ -98,7 +98,7 @@
<define name="HACK_45" value="1"/>
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="14.9" integer="16"/>
</section>
conf/airframes/Poine/booz2_a5.xml
+1 -1
View File
@@ -137,7 +137,7 @@
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="15." integer="16"/>
</section>
conf/airframes/Poine/booz2_a6.xml
+1 -1
View File
@@ -138,7 +138,7 @@
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="15." integer="16"/>
</section>
conf/airframes/Poine/booz2_a7.xml
+1 -1
View File
@@ -137,7 +137,7 @@
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<!-- <define name="BARO_SENS" value="15." integer="16"/> -->
<define name="BARO_SENS" value="10." integer="16"/>
</section>
conf/airframes/UofAdelaide/A1000_BOOZ.xml
+1 -1
View File
@@ -215,7 +215,7 @@ second attempt
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="14.9" integer="16"/>
</section>
conf/airframes/UofAdelaide/A1000_LISA.xml
+1 -1
View File
@@ -125,7 +125,7 @@
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="15." integer="16"/>
</section>
conf/airframes/UofAdelaide/A1000_NOVA.xml
+1 -1
View File
@@ -170,7 +170,7 @@
<define name="ADDR" value="{ 0x52, 0x58, 0x54, 0x56 }" />
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="14.9" integer="16"/>
</section>
conf/airframes/UofAdelaide/booz2_NoVa_001_1000.xml
+1 -1
View File
@@ -170,7 +170,7 @@
<define name="ADDR" value="{ 0x52, 0x58, 0x54, 0x56 }" />
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="14.9" integer="16"/>
</section>
conf/airframes/UofAdelaide/booz2_a1000.xml
+1 -1
View File
@@ -216,7 +216,7 @@ second attempt
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="14.9" integer="16"/>
</section>
conf/airframes/UofAdelaide/lisa_a1000.xml
+1 -1
View File
@@ -133,7 +133,7 @@
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="15." integer="16"/>
</section>
conf/airframes/booz2_Aron.xml
+1 -1
View File
@@ -133,7 +133,7 @@
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="14.9" integer="16"/>
</section>
conf/airframes/booz2_NoVa.xml
+1 -1
View File
@@ -170,7 +170,7 @@
<define name="ADDR" value="{ 0x52, 0x56, 0x54, 0x58 }" />
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="14.9" integer="16"/>
</section>
conf/airframes/booz2_NoVa_001.xml
+1 -1
View File
@@ -170,7 +170,7 @@
<define name="ADDR" value="{ 0x52, 0x58, 0x54, 0x56 }" />
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="14.9" integer="16"/>
</section>
conf/airframes/booz2_NoVa_002.xml
+1 -1
View File
@@ -170,7 +170,7 @@
<define name="ADDR" value="{ 0x54, 0x58, 0x56, 0x52 }" />
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="14.9" integer="16"/>
</section>
conf/airframes/booz2_flixr.xml
+1 -1
View File
@@ -160,7 +160,7 @@
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="15." integer="16" />
</section>
conf/airframes/booz2_ppzuav.xml
+1 -1
View File
@@ -191,7 +191,7 @@
<define name="MODE_AUTO2" value="AP_MODE_NAV"/>
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="14.9" integer="16"/>
</section>
conf/airframes/booz2_s1.xml
+1 -1
View File
@@ -129,7 +129,7 @@
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="15." integer="16"/>
</section>
conf/airframes/booz2_x1.xml
+1 -1
View File
@@ -140,7 +140,7 @@
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="19." integer="16"/>
</section>
conf/airframes/esden/lisa_asctec.xml
+1 -1
View File
@@ -133,7 +133,7 @@
</section>
<section name="INS" prefix="BOOZ_INS_">
<section name="INS" prefix="INS_">
<define name="BARO_SENS" value="15." integer="16"/>
</section>
conf/messages.xml
+1 -1
View File
@@ -1470,7 +1470,7 @@
<field name="mag_z" type="float" />
</message>
<message name="BOOZ_INS" id="198">
<message name="INS" id="198">
<field name="ins_x" type="int32" alt_unit="m" alt_unit_coef="0.0039063"/>
<field name="ins_y" type="int32" alt_unit="m" alt_unit_coef="0.0039063"/>
<field name="ins_z" type="int32" alt_unit="m" alt_unit_coef="0.0039063"/>
conf/telemetry/booz_minimal.xml
+1 -1
View File
@@ -25,7 +25,7 @@
<message name="WP_MOVED" period="1.3"/>
<message name="BOOZ2_CAM" period="1."/>
<message name="BOOZ2_GPS" period=".25"/>
<message name="BOOZ_INS" period=".25"/>
<message name="INS" period=".25"/>
</mode>
conf/telemetry/telemetry_booz2.xml
+1 -1
View File
@@ -15,7 +15,7 @@
<message name="WP_MOVED" period="1.3"/>
<message name="BOOZ2_CAM" period="1."/>
<message name="BOOZ2_GPS" period=".25"/>
<message name="BOOZ_INS" period=".25"/>
<message name="INS" period=".25"/>
</mode>
<mode name="ppm">
conf/telemetry/telemetry_booz2_flixr.xml
+1 -1
View File
@@ -15,7 +15,7 @@
<message name="WP_MOVED" period="1.3"/>
<message name="BOOZ2_CAM" period="1."/>
<message name="BOOZ2_GPS" period=".25"/>
<message name="BOOZ_INS" period=".25"/>
<message name="INS" period=".25"/>
</mode>
<mode name="ppm">
sw/airborne/firmwares/rotorcraft/ins.c
+3 -3
View File
@@ -188,7 +188,7 @@ void ins_update_baro() {
ins_qfe = baro.absolute;
ins_baro_initialised = TRUE;
}
ins_baro_alt = ((baro.absolute - ins_qfe) * BOOZ_INS_BARO_SENS_NUM)/BOOZ_INS_BARO_SENS_DEN;
ins_baro_alt = ((baro.absolute - ins_qfe) * INS_BARO_SENS_NUM)/INS_BARO_SENS_DEN;
float alt_float = POS_FLOAT_OF_BFP(ins_baro_alt);
if (ins_vf_realign) {
ins_vf_realign = FALSE;
@@ -275,8 +275,8 @@ void ins_update_sonar() {
sonar_filtered = (sonar_meas + 2*sonar_filtered) / 3;
/* update baro_qfe assuming a flat ground */
if (ins_update_on_agl && booz2_analog_baro_status == BOOZ2_ANALOG_BARO_RUNNING) {
int32_t d_sonar = (((int32_t)sonar_filtered - ins_sonar_offset) * BOOZ_INS_SONAR_SENS_NUM) / BOOZ_INS_SONAR_SENS_DEN;
ins_qfe = (int32_t)booz2_analog_baro_value + (d_sonar * (BOOZ_INS_BARO_SENS_DEN))/BOOZ_INS_BARO_SENS_NUM;
int32_t d_sonar = (((int32_t)sonar_filtered - ins_sonar_offset) * INS_SONAR_SENS_NUM) / INS_SONAR_SENS_DEN;
ins_qfe = (int32_t)booz2_analog_baro_value + (d_sonar * (INS_BARO_SENS_DEN))/INS_BARO_SENS_NUM;
}
#endif
}
sw/airborne/firmwares/rotorcraft/telemetry.h
+2 -2
View File
@@ -576,8 +576,8 @@ extern uint8_t telemetry_mode_Main_DefaultChannel;
#define PERIODIC_SEND_INS3(_chan) {}
#endif /* USE_GPS */
#define PERIODIC_SEND_BOOZ_INS(_chan) { \
DOWNLINK_SEND_BOOZ_INS(_chan, \
#define PERIODIC_SEND_INS(_chan) { \
DOWNLINK_SEND_INS(_chan, \
&ins_ltp_pos.x, \
&ins_ltp_pos.y, \
&ins_ltp_pos.z, \