Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-04 13:55:40 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

Fix ADC issue with Elle0 configs as well as update pwm servo and battery level values

Browse Source
This commit is contained in:
Richard A Burton
2016-02-22 01:48:17 -08:00
parent bf47ef1364
commit e35428fd25
6 changed files with 50 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/HOOPERFLY/hooperfly_racerpex_hexa_lisa_mx_20.xml
+9 -9
View File
@@ -55,12 +55,12 @@
<servos driver="Pwm"> <servos driver="Pwm">
<servo name="FRONT_LEFT" no="0" min="1000" neutral="1100" max="1900"/> <servo name="FRONT_LEFT" no="0" min="1000" neutral="1100" max="2000"/>
<servo name="FRONT_RIGHT" no="1" min="1000" neutral="1100" max="1900"/> <servo name="FRONT_RIGHT" no="1" min="1000" neutral="1100" max="2000"/>
<servo name="RIGHT" no="2" min="1000" neutral="1100" max="1900"/> <servo name="RIGHT" no="2" min="1000" neutral="1100" max="2000"/>
<servo name="BACK_RIGHT" no="3" min="1000" neutral="1100" max="1900"/> <servo name="BACK_RIGHT" no="3" min="1000" neutral="1100" max="2000"/>
<servo name="BACK_LEFT" no="4" min="1000" neutral="1100" max="1900"/> <servo name="BACK_LEFT" no="4" min="1000" neutral="1100" max="2000"/>
<servo name="LEFT" no="5" min="1000" neutral="1100" max="1900"/> <servo name="LEFT" no="5" min="1000" neutral="1100" max="2000"/>
</servos> </servos>
<commands> <commands>
@@ -214,9 +214,9 @@
<section name="BAT"> <section name="BAT">
<define name="MILLIAMP_AT_IDLE_THROTTLE" value="12000" /> <define name="MILLIAMP_AT_IDLE_THROTTLE" value="12000" />
<define name="MILLIAMP_AT_FULL_THROTTLE" value="120000"/> <define name="MILLIAMP_AT_FULL_THROTTLE" value="120000"/>
<define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/> <define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/>
<define name="CRITIC_BAT_LEVEL" value="9.9" unit="V"/> <define name="CRITIC_BAT_LEVEL" value="9.6" unit="V"/>
<define name="LOW_BAT_LEVEL" value="10.5" unit="V"/> <define name="LOW_BAT_LEVEL" value="10.1" unit="V"/>
<define name="MAX_BAT_LEVEL" value="12.4" unit="V"/> <define name="MAX_BAT_LEVEL" value="12.4" unit="V"/>
</section> </section>
conf/airframes/HOOPERFLY/hooperfly_racerpex_octo_lisa_mx_20.xml
+11 -11
View File
@@ -54,14 +54,14 @@
<servos driver="Pwm"> <servos driver="Pwm">
<servo name="FL_1" no="0" min="1000" neutral="1100" max="1900"/> <servo name="FL_1" no="0" min="1000" neutral="1100" max="2000"/>
<servo name="FR_2" no="1" min="1000" neutral="1100" max="1900"/> <servo name="FR_2" no="1" min="1000" neutral="1100" max="2000"/>
<servo name="FR_3" no="2" min="1000" neutral="1100" max="1900"/> <servo name="FR_3" no="2" min="1000" neutral="1100" max="2000"/>
<servo name="BR_4" no="3" min="1000" neutral="1100" max="1900"/> <servo name="BR_4" no="3" min="1000" neutral="1100" max="2000"/>
<servo name="BR_5" no="4" min="1000" neutral="1100" max="1900"/> <servo name="BR_5" no="4" min="1000" neutral="1100" max="2000"/>
<servo name="BL_6" no="5" min="1000" neutral="1100" max="1900"/> <servo name="BL_6" no="5" min="1000" neutral="1100" max="2000"/>
<servo name="BL_7" no="6" min="1000" neutral="1100" max="1900"/> <servo name="BL_7" no="6" min="1000" neutral="1100" max="2000"/>
<servo name="FL_8" no="7" min="1000" neutral="1100" max="1900"/> <servo name="FL_8" no="7" min="1000" neutral="1100" max="2000"/>
</servos> </servos>
<commands> <commands>
@@ -204,9 +204,9 @@
</section> </section>
<section name="BAT"> <section name="BAT">
<define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/> <define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/>
<define name="CRITIC_BAT_LEVEL" value="9.9" unit="V"/> <define name="CRITIC_BAT_LEVEL" value="9.6" unit="V"/>
<define name="LOW_BAT_LEVEL" value="10.5" unit="V"/> <define name="LOW_BAT_LEVEL" value="10.1" unit="V"/>
<define name="MAX_BAT_LEVEL" value="12.4" unit="V"/> <define name="MAX_BAT_LEVEL" value="12.4" unit="V"/>
</section> </section>
conf/airframes/HOOPERFLY/hooperfly_racerpex_quad_lisa_mx_20.xml
+7 -7
View File
@@ -55,10 +55,10 @@
<servos driver="Pwm"> <servos driver="Pwm">
<servo name="FRONT_LEFT" no="0" min="1000" neutral="1100" max="1900"/> <servo name="FRONT_LEFT" no="0" min="1000" neutral="1100" max="2000"/>
<servo name="FRONT_RIGHT" no="1" min="1000" neutral="1100" max="1900"/> <servo name="FRONT_RIGHT" no="1" min="1000" neutral="1100" max="2000"/>
<servo name="BACK_RIGHT" no="2" min="1000" neutral="1100" max="1900"/> <servo name="BACK_RIGHT" no="2" min="1000" neutral="1100" max="2000"/>
<servo name="BACK_LEFT" no="3" min="1000" neutral="1100" max="1900"/> <servo name="BACK_LEFT" no="3" min="1000" neutral="1100" max="2000"/>
</servos> </servos>
<commands> <commands>
@@ -210,9 +210,9 @@
<section name="BAT"> <section name="BAT">
<define name="MILLIAMP_AT_IDLE_THROTTLE" value="8000" /> <define name="MILLIAMP_AT_IDLE_THROTTLE" value="8000" />
<define name="MILLIAMP_AT_FULL_THROTTLE" value="80000"/> <define name="MILLIAMP_AT_FULL_THROTTLE" value="80000"/>
<define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/> <define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/>
<define name="CRITIC_BAT_LEVEL" value="9.9" unit="V"/> <define name="CRITIC_BAT_LEVEL" value="9.6" unit="V"/>
<define name="LOW_BAT_LEVEL" value="10.5" unit="V"/> <define name="LOW_BAT_LEVEL" value="10.1" unit="V"/>
<define name="MAX_BAT_LEVEL" value="12.4" unit="V"/> <define name="MAX_BAT_LEVEL" value="12.4" unit="V"/>
</section> </section>
conf/airframes/HOOPERFLY/hooperfly_teensyfly_quad_elle0.xml
+7 -11
View File
@@ -37,10 +37,6 @@
<module name="ins" type="hff"/> <module name="ins" type="hff"/>
<module name="send_imu_mag_current.xml"/> <module name="send_imu_mag_current.xml"/>
<module name="adc_generic.xml">
<configure name="ADC_CHANNEL_GENERIC1" value="ADC_1"/>
<configure name="ADC_CHANNEL_GENERIC2" value="ADC_2"/>
</module>
<module name="gps_ubx_ucenter.xml"/> <module name="gps_ubx_ucenter.xml"/>
<module name="geo_mag.xml"/> <module name="geo_mag.xml"/>
<module name="air_data.xml"/> <module name="air_data.xml"/>
@@ -53,10 +49,10 @@
<servos driver="Pwm"> <servos driver="Pwm">
<servo name="FRONT_LEFT" no="0" min="1000" neutral="1100" max="1900"/> <servo name="FRONT_LEFT" no="0" min="1000" neutral="1100" max="2000"/>
<servo name="FRONT_RIGHT" no="1" min="1000" neutral="1100" max="1900"/> <servo name="FRONT_RIGHT" no="1" min="1000" neutral="1100" max="2000"/>
<servo name="BACK_RIGHT" no="2" min="1000" neutral="1100" max="1900"/> <servo name="BACK_RIGHT" no="2" min="1000" neutral="1100" max="2000"/>
<servo name="BACK_LEFT" no="3" min="1000" neutral="1100" max="1900"/> <servo name="BACK_LEFT" no="3" min="1000" neutral="1100" max="2000"/>
</servos> </servos>
<commands> <commands>
@@ -209,9 +205,9 @@
<section name="BAT"> <section name="BAT">
<define name="MILLIAMP_AT_IDLE_THROTTLE" value="3920" /> <define name="MILLIAMP_AT_IDLE_THROTTLE" value="3920" />
<define name="MILLIAMP_AT_FULL_THROTTLE" value="39200"/> <define name="MILLIAMP_AT_FULL_THROTTLE" value="39200"/>
<define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/> <define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/>
<define name="CRITIC_BAT_LEVEL" value="9.9" unit="V"/> <define name="CRITIC_BAT_LEVEL" value="9.6" unit="V"/>
<define name="LOW_BAT_LEVEL" value="10.5" unit="V"/> <define name="LOW_BAT_LEVEL" value="10.1" unit="V"/>
<define name="MAX_BAT_LEVEL" value="12.4" unit="V"/> <define name="MAX_BAT_LEVEL" value="12.4" unit="V"/>
</section> </section>
conf/airframes/HOOPERFLY/hooperfly_teensyfly_quad_elle0_v1_2.xml
+9 -13
View File
@@ -8,7 +8,7 @@
* RC: two Spektrum sats http://wiki.paparazziuav.org/wiki/Subsystem/radio_control#Spektrum * RC: two Spektrum sats http://wiki.paparazziuav.org/wiki/Subsystem/radio_control#Spektrum
--> -->
<airframe name="TeensyFly Quad Elle0"> <airframe name="TeensyFly Quad Elle0 v1_2">
<firmware name="rotorcraft"> <firmware name="rotorcraft">
<target name="ap" board="elle0_1.2"> <target name="ap" board="elle0_1.2">
@@ -37,10 +37,6 @@
<module name="ins" type="hff"/> <module name="ins" type="hff"/>
<module name="send_imu_mag_current.xml"/> <module name="send_imu_mag_current.xml"/>
<module name="adc_generic.xml">
<configure name="ADC_CHANNEL_GENERIC1" value="ADC_1"/>
<configure name="ADC_CHANNEL_GENERIC2" value="ADC_2"/>
</module>
<module name="gps_ubx_ucenter.xml"/> <module name="gps_ubx_ucenter.xml"/>
<module name="geo_mag.xml"/> <module name="geo_mag.xml"/>
<module name="air_data.xml"/> <module name="air_data.xml"/>
@@ -53,10 +49,10 @@
<servos driver="Pwm"> <servos driver="Pwm">
<servo name="FRONT_LEFT" no="0" min="1000" neutral="1100" max="1900"/> <servo name="FRONT_LEFT" no="0" min="1000" neutral="1100" max="2000"/>
<servo name="FRONT_RIGHT" no="1" min="1000" neutral="1100" max="1900"/> <servo name="FRONT_RIGHT" no="1" min="1000" neutral="1100" max="2000"/>
<servo name="BACK_RIGHT" no="2" min="1000" neutral="1100" max="1900"/> <servo name="BACK_RIGHT" no="2" min="1000" neutral="1100" max="2000"/>
<servo name="BACK_LEFT" no="3" min="1000" neutral="1100" max="1900"/> <servo name="BACK_LEFT" no="3" min="1000" neutral="1100" max="2000"/>
</servos> </servos>
<commands> <commands>
@@ -209,9 +205,9 @@
<section name="BAT"> <section name="BAT">
<define name="MILLIAMP_AT_IDLE_THROTTLE" value="3920" /> <define name="MILLIAMP_AT_IDLE_THROTTLE" value="3920" />
<define name="MILLIAMP_AT_FULL_THROTTLE" value="39200"/> <define name="MILLIAMP_AT_FULL_THROTTLE" value="39200"/>
<define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/> <define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/>
<define name="CRITIC_BAT_LEVEL" value="9.9" unit="V"/> <define name="CRITIC_BAT_LEVEL" value="9.6" unit="V"/>
<define name="LOW_BAT_LEVEL" value="10.5" unit="V"/> <define name="LOW_BAT_LEVEL" value="10.1" unit="V"/>
<define name="MAX_BAT_LEVEL" value="12.4" unit="V"/> <define name="MAX_BAT_LEVEL" value="12.4" unit="V"/>
</section> </section>
@@ -220,7 +216,7 @@
<define name="ALT_SHIFT_PLUS_PLUS" value="30"/> <define name="ALT_SHIFT_PLUS_PLUS" value="30"/>
<define name="ALT_SHIFT_PLUS" value="10"/> <define name="ALT_SHIFT_PLUS" value="10"/>
<define name="ALT_SHIFT_MINUS" value="-10"/> <define name="ALT_SHIFT_MINUS" value="-10"/>
<define name="SPEECH_NAME" value="Teensy Fly Quad Elle0"/> <define name="SPEECH_NAME" value="Teensy Fly Quad Elle0 v1_2"/>
<define name="AC_ICON" value="quadrotor_x"/> <define name="AC_ICON" value="quadrotor_x"/>
</section> </section>
conf/airframes/HOOPERFLY/hooperfly_teensyfly_quad_lisa_mx_20.xml
+7 -7
View File
@@ -55,10 +55,10 @@
<servos driver="Pwm"> <servos driver="Pwm">
<servo name="FRONT_LEFT" no="0" min="1000" neutral="1100" max="1900"/> <servo name="FRONT_LEFT" no="0" min="1000" neutral="1100" max="2000"/>
<servo name="FRONT_RIGHT" no="1" min="1000" neutral="1100" max="1900"/> <servo name="FRONT_RIGHT" no="1" min="1000" neutral="1100" max="2000"/>
<servo name="BACK_RIGHT" no="2" min="1000" neutral="1100" max="1900"/> <servo name="BACK_RIGHT" no="2" min="1000" neutral="1100" max="2000"/>
<servo name="BACK_LEFT" no="3" min="1000" neutral="1100" max="1900"/> <servo name="BACK_LEFT" no="3" min="1000" neutral="1100" max="2000"/>
</servos> </servos>
<commands> <commands>
@@ -210,9 +210,9 @@
<section name="BAT"> <section name="BAT">
<define name="MILLIAMP_AT_IDLE_THROTTLE" value="3920" /> <define name="MILLIAMP_AT_IDLE_THROTTLE" value="3920" />
<define name="MILLIAMP_AT_FULL_THROTTLE" value="39200"/> <define name="MILLIAMP_AT_FULL_THROTTLE" value="39200"/>
<define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/> <define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/>
<define name="CRITIC_BAT_LEVEL" value="9.9" unit="V"/> <define name="CRITIC_BAT_LEVEL" value="9.6" unit="V"/>
<define name="LOW_BAT_LEVEL" value="10.5" unit="V"/> <define name="LOW_BAT_LEVEL" value="10.1" unit="V"/>
<define name="MAX_BAT_LEVEL" value="12.4" unit="V"/> <define name="MAX_BAT_LEVEL" value="12.4" unit="V"/>
</section> </section>