Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-04 22:17:01 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

fix kill switch, RADIO_CONTROL_KILL_SWITCH is now named RADIO_KILL_SWITCH

Browse Source
This commit is contained in:
Felix Ruess
2010-11-16 14:03:30 +01:00
parent e336ae184b
commit 6d10bdcb37
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/UofAdelaide/A1000_BOOZ.xml
+2 -2
View File
@@ -273,7 +273,7 @@ second attempt
<firmware name="rotorcraft"> <firmware name="rotorcraft">
<target name="ap" board="booz_1.0"> <target name="ap" board="booz_1.0">
<param name="FLASH_MODE" value="IAP"/> <!-- default for the board but putting it here as example--> <param name="FLASH_MODE" value="IAP"/> <!-- default for the board but putting it here as example-->
<define name="RADIO_CONTROL_KILL_SWITCH" value="RADIO_CONTROL_SWITCH1"/> <define name="RADIO_KILL_SWITCH" value="RADIO_CONTROL_SWITCH1"/>
<define name="MODEM_BAUD" value = "B57600"/> <define name="MODEM_BAUD" value = "B57600"/>
<define name="GPS_LAG" value = "0.8"/> <define name="GPS_LAG" value = "0.8"/>
<define name="BOOZ_START_DELAY" value = "3"/> <define name="BOOZ_START_DELAY" value = "3"/>
@@ -323,7 +323,7 @@ ap.CFLAGS += -DMODEM_BAUD=B57600
#ap.CFLAGS += -DGPS_USE_LATLONG now included in NOVA section, include if NOVA section removed #ap.CFLAGS += -DGPS_USE_LATLONG now included in NOVA section, include if NOVA section removed
#throttle killswitch #throttle killswitch
ap.CFLAGS += -DRADIO_CONTROL_KILL_SWITCH=RADIO_CONTROL_SWITCH1 ap.CFLAGS += -DRADIO_KILL_SWITCH=RADIO_CONTROL_SWITCH1
include $(PAPARAZZI_SRC)/conf/autopilot/booz2_common.makefile include $(PAPARAZZI_SRC)/conf/autopilot/booz2_common.makefile
include $(CFG_BOOZ)/booz2_autopilot.makefile include $(CFG_BOOZ)/booz2_autopilot.makefile
conf/airframes/UofAdelaide/A1000_LISA.xml
+1 -1
View File
@@ -189,7 +189,7 @@
<firmware name="rotorcraft"> <firmware name="rotorcraft">
<target name="ap" board="lisa_l_1.0"> <target name="ap" board="lisa_l_1.0">
<define name = "RADIO_CONTROL_MODE" value = "RADIO_CONTROL_AUX1"/> <define name = "RADIO_CONTROL_MODE" value = "RADIO_CONTROL_AUX1"/>
<define name = "RADIO_CONTROL_KILL_SWITCH" value = "RADIO_CONTROL_GEAR"/> <define name = "RADIO_KILL_SWITCH" value = "RADIO_CONTROL_GEAR"/>
<define name = "HELI"/> <define name = "HELI"/>
<!-- <define name = "KILL_MOTORS" />--> <!-- <define name = "KILL_MOTORS" />-->
<!-- if we want a secondary spektrum reciever we need to set the board to be <!-- if we want a secondary spektrum reciever we need to set the board to be
conf/airframes/UofAdelaide/A1000_NOVA.xml
+2 -2
View File
@@ -233,7 +233,7 @@
<firmware name="rotorcraft"> <firmware name="rotorcraft">
<target name="ap" board="booz_1.0"> <target name="ap" board="booz_1.0">
<param name="FLASH_MODE" value="IAP"/> <!-- default for the board but putting it here as example--> <param name="FLASH_MODE" value="IAP"/> <!-- default for the board but putting it here as example-->
<define name="RADIO_CONTROL_KILL_SWITCH" value="RADIO_CONTROL_SWITCH1"/> <define name="RADIO_KILL_SWITCH" value="RADIO_CONTROL_SWITCH1"/>
<define name="MODEM_BAUD" value = "B57600"/> <define name="MODEM_BAUD" value = "B57600"/>
<define name="BOOZ_START_DELAY" value = "3"/> <define name="BOOZ_START_DELAY" value = "3"/>
<define name="GPS_LAG" value = "0.8"/> <define name="GPS_LAG" value = "0.8"/>
@@ -279,7 +279,7 @@ include $(CFG_BOOZ)/booz2_test_progs.makefile
ap.CFLAGS += -DFAILSAFE_GROUND_DETECT ap.CFLAGS += -DFAILSAFE_GROUND_DETECT
# radio killswitch # radio killswitch
ap.CFLAGS += -DRADIO_CONTROL_KILL_SWITCH=RADIO_CONTROL_SWITCH1 ap.CFLAGS += -DRADIO_KILL_SWITCH=RADIO_CONTROL_SWITCH1
ap.CFLAGS += -DMODEM_BAUD=B57600 ap.CFLAGS += -DMODEM_BAUD=B57600
conf/airframes/UofAdelaide/booz2_NoVa_001_1000.xml
+1 -1
View File
@@ -235,7 +235,7 @@ include $(CFG_BOOZ)/booz2_test_progs.makefile
ap.CFLAGS += -DFAILSAFE_GROUND_DETECT ap.CFLAGS += -DFAILSAFE_GROUND_DETECT
# radio killswitch # radio killswitch
ap.CFLAGS += -DRADIO_CONTROL_KILL_SWITCH=RADIO_CONTROL_SWITCH1 ap.CFLAGS += -DRADIO_KILL_SWITCH=RADIO_CONTROL_SWITCH1
ap.CFLAGS += -DMODEM_BAUD=B57600 ap.CFLAGS += -DMODEM_BAUD=B57600
conf/airframes/UofAdelaide/booz2_a1000.xml
+1 -1
View File
@@ -284,7 +284,7 @@ ap.CFLAGS += -DMODEM_BAUD=B57600
#ap.CFLAGS += -DGPS_USE_LATLONG now included in NOVA section, include if NOVA section removed #ap.CFLAGS += -DGPS_USE_LATLONG now included in NOVA section, include if NOVA section removed
#throttle killswitch #throttle killswitch
ap.CFLAGS += -DRADIO_CONTROL_KILL_SWITCH=RADIO_CONTROL_SWITCH1 ap.CFLAGS += -DRADIO_KILL_SWITCH=RADIO_CONTROL_SWITCH1
include $(PAPARAZZI_SRC)/conf/autopilot/booz2_common.makefile include $(PAPARAZZI_SRC)/conf/autopilot/booz2_common.makefile
include $(CFG_BOOZ)/booz2_autopilot.makefile include $(CFG_BOOZ)/booz2_autopilot.makefile
conf/airframes/booz2_flixr.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<firmware name="rotorcraft"> <firmware name="rotorcraft">
<target name="ap" board="booz_1.0"> <target name="ap" board="booz_1.0">
<!--<define name="KILL_MOTORS"/>--> <!-- prevent motors from ever starting --> <!--<define name="KILL_MOTORS"/>--> <!-- prevent motors from ever starting -->
<!--<define name="RADIO_CONTROL_KILL_SWITCH" value="RADIO_CONTROL_SWITCH1"/>--> <!--<define name="RADIO_KILL_SWITCH" value="RADIO_CONTROL_SWITCH1"/>-->
<define name="USE_GPS_ACC4R"/> <define name="USE_GPS_ACC4R"/>
<define name="USE_INS_NAV_INIT"/> <define name="USE_INS_NAV_INIT"/>
</target> </target>
sw/airborne/firmwares/rotorcraft/autopilot.c
+1 -1
View File
@@ -242,7 +242,7 @@ void autopilot_on_rc_frame(void) {
AP_MODE_OF_PPRZ(radio_control.values[RADIO_MODE], new_autopilot_mode); AP_MODE_OF_PPRZ(radio_control.values[RADIO_MODE], new_autopilot_mode);
autopilot_set_mode(new_autopilot_mode); autopilot_set_mode(new_autopilot_mode);
#ifdef RADIO_CONTROL_KILL_SWITCH #ifdef RADIO_KILL_SWITCH
if (radio_control.values[RADIO_KILL_SWITCH] < 0) if (radio_control.values[RADIO_KILL_SWITCH] < 0)
autopilot_set_mode(AP_MODE_KILL); autopilot_set_mode(AP_MODE_KILL);
#endif #endif
sw/airborne/firmwares/rotorcraft/telemetry.h
+3 -3
View File
@@ -96,14 +96,14 @@ extern uint8_t telemetry_mode_Main_DefaultChannel;
#ifdef RADIO_CONTROL #ifdef RADIO_CONTROL
#define PERIODIC_SEND_RC(_chan) DOWNLINK_SEND_RC(_chan, RADIO_CONTROL_NB_CHANNEL, radio_control.values) #define PERIODIC_SEND_RC(_chan) DOWNLINK_SEND_RC(_chan, RADIO_CONTROL_NB_CHANNEL, radio_control.values)
#if defined RADIO_CONTROL_KILL_SWITCH #if defined RADIO_KILL_SWITCH
#define PERIODIC_SEND_BOOZ2_RADIO_CONTROL(_chan) SEND_BOOZ2_RADIO_CONTROL( _chan, &radio_control.values[RADIO_KILL_SWITCH]) #define PERIODIC_SEND_BOOZ2_RADIO_CONTROL(_chan) SEND_BOOZ2_RADIO_CONTROL( _chan, &radio_control.values[RADIO_KILL_SWITCH])
#else /* ! RADIO_CONTROL_KILL_SWITCH */ #else /* ! RADIO_KILL_SWITCH */
#define PERIODIC_SEND_BOOZ2_RADIO_CONTROL(_chan) { \ #define PERIODIC_SEND_BOOZ2_RADIO_CONTROL(_chan) { \
int16_t foo = -42; \ int16_t foo = -42; \
SEND_BOOZ2_RADIO_CONTROL( _chan, &foo) \ SEND_BOOZ2_RADIO_CONTROL( _chan, &foo) \
} }
#endif /* !RADIO_CONTROL_KILL_SWITCH */ #endif /* !RADIO_KILL_SWITCH */
#define SEND_BOOZ2_RADIO_CONTROL(_chan, _kill_switch) { \ #define SEND_BOOZ2_RADIO_CONTROL(_chan, _kill_switch) { \
DOWNLINK_SEND_BOOZ2_RADIO_CONTROL(_chan, \ DOWNLINK_SEND_BOOZ2_RADIO_CONTROL(_chan, \
&radio_control.values[RADIO_ROLL], \ &radio_control.values[RADIO_ROLL], \