Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-27 17:06:31 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

fix downlink_send calls

Browse Source
This commit is contained in:
Martin Mueller
2009-09-04 18:31:05 +00:00
parent 7a6180db88
commit b3eb8121b2
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/funjetmm.xml
+4 -2
View File
@@ -83,7 +83,9 @@
</section> </section>
<section name="BAT"> <section name="BAT">
<define name="MILLIAMP_AT_FULL_THROTTLE" value="10000."/> <!--define name="MILLIAMP_AT_FULL_THROTTLE" value="10000."/-->
<define name="ADC_CHANNEL_CURRENT" value="ADC_4"/>
<define name="MilliAmpereOfAdc(adc)" value="(88*adc)"/>
<define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/> <define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/>
<!-- 0.0247311828 --> <!-- 0.0247311828 -->
<!-- 0.02432905 --> <!-- 0.02432905 -->
@@ -233,7 +235,7 @@ ap.srcs += downlink.c $(SRC_ARCH)/uart_hw.c datalink.c xbee.c
ap.CFLAGS += -DINTER_MCU ap.CFLAGS += -DINTER_MCU
ap.srcs += inter_mcu.c ap.srcs += inter_mcu.c
ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_4
ap.srcs += $(SRC_ARCH)/adc_hw.c ap.srcs += $(SRC_ARCH)/adc_hw.c
ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
conf/airframes/twinstarmm.xml
+1 -1
View File
@@ -16,7 +16,7 @@
<servo name="MOTOR" no="0" min="1000" neutral="1000" max="2000"/> <servo name="MOTOR" no="0" min="1000" neutral="1000" max="2000"/>
<servo name="AILERON_LEFT" no="1" min="1900" neutral="1480" max="1050"/> <servo name="AILERON_LEFT" no="1" min="1900" neutral="1480" max="1050"/>
<servo name="ELEVATOR" no="2" min="1750" neutral="1530" max="1250"/> <servo name="ELEVATOR" no="2" min="1750" neutral="1530" max="1250"/>
<servo name="RUDDER" no="3" min="1150" neutral="1430" max="1710"/> <servo name="RUDDER" no="3" min="1100" neutral="1500" max="1900"/>
<servo name="AILERON_RIGHT" no="4" min="2000" neutral="1610" max="1200"/> <servo name="AILERON_RIGHT" no="4" min="2000" neutral="1610" max="1200"/>
<servo name="FWHEEL" no="5" min="1900" neutral="1470" max="1100"/> <servo name="FWHEEL" no="5" min="1900" neutral="1470" max="1100"/>
<servo name="HATCH" no="6" min="1000" neutral="1500" max="2000"/> <servo name="HATCH" no="6" min="1000" neutral="1500" max="2000"/>
sw/airborne/main_ap.c
+6 -6
View File
@@ -509,7 +509,7 @@ void periodic_task_ap( void ) {
case 4: case 4:
enose_periodic(); enose_periodic();
chemo_periodic(); chemo_periodic();
DOWNLINK_SEND_ENOSE_STATUS(&enose_val[0], &enose_val[1], &enose_val[2], &enose_PID_val, 3, enose_heat); DOWNLINK_SEND_ENOSE_STATUS(DefaultChannel, &enose_val[0], &enose_val[1], &enose_val[2], &enose_PID_val, 3, enose_heat);
break; break;
#endif #endif
@@ -518,14 +518,14 @@ void periodic_task_ap( void ) {
dpicco_periodic(); dpicco_periodic();
dpicco_humid = (dpicco_val[0] * DPICCO_HUMID_RANGE) / DPICCO_HUMID_MAX; dpicco_humid = (dpicco_val[0] * DPICCO_HUMID_RANGE) / DPICCO_HUMID_MAX;
dpicco_temp = ((dpicco_val[1] * DPICCO_TEMP_RANGE) / DPICCO_TEMP_MAX) + DPICCO_TEMP_OFFS; dpicco_temp = ((dpicco_val[1] * DPICCO_TEMP_RANGE) / DPICCO_TEMP_MAX) + DPICCO_TEMP_OFFS;
DOWNLINK_SEND_DPICCO_STATUS(&dpicco_val[0], &dpicco_val[1], &dpicco_humid, &dpicco_temp); DOWNLINK_SEND_DPICCO_STATUS(DefaultChannel, &dpicco_val[0], &dpicco_val[1], &dpicco_humid, &dpicco_temp);
break; break;
#endif #endif
#ifdef USE_ADC_GENERIC #ifdef USE_ADC_GENERIC
case 6: case 6:
adc_generic_periodic(); adc_generic_periodic();
DOWNLINK_SEND_ADC_GENERIC(&adc_generic_val1, &adc_generic_val2); DOWNLINK_SEND_ADC_GENERIC(DefaultChannel, &adc_generic_val1, &adc_generic_val2);
break; break;
#endif #endif
@@ -533,7 +533,7 @@ void periodic_task_ap( void ) {
case 8: case 8:
humid_sht_periodic(); humid_sht_periodic();
if (humid_sht_available == TRUE) { if (humid_sht_available == TRUE) {
DOWNLINK_SEND_SHT_STATUS(&humidsht, &tempsht, &fhumidsht, &ftempsht); DOWNLINK_SEND_SHT_STATUS(DefaultChannel, &humidsht, &tempsht, &fhumidsht, &ftempsht);
humid_sht_available = FALSE; humid_sht_available = FALSE;
} }
break; break;
@@ -543,7 +543,7 @@ void periodic_task_ap( void ) {
case 9: case 9:
baro_scp_periodic(); baro_scp_periodic();
if (baro_scp_available == TRUE) { if (baro_scp_available == TRUE) {
DOWNLINK_SEND_SCP_STATUS(&baro_scp_pressure, &baro_scp_temperature); DOWNLINK_SEND_SCP_STATUS(DefaultChannel, &baro_scp_pressure, &baro_scp_temperature);
baro_scp_available = FALSE; baro_scp_available = FALSE;
} }
break; break;
@@ -848,7 +848,7 @@ void event_task_ap( void ) {
if (srf08_got) { if (srf08_got) {
srf08_got = FALSE; srf08_got = FALSE;
srf08_copy(); srf08_copy();
DOWNLINK_SEND_RANGEFINDER(&srf08_range); DOWNLINK_SEND_RANGEFINDER(DefaultChannel, &srf08_range);
} }
#endif #endif