[paparazzi-commits] [6402] fix kill switch, RADIO_CONTROL_KILL

paparazzi-commits

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[paparazzi-commits] [6402] fix kill switch, RADIO_CONTROL_KILL_SWITCH is

From:	Felix Ruess
Subject:	[paparazzi-commits] [6402] fix kill switch, RADIO_CONTROL_KILL_SWITCH is now named RADIO_KILL_SWITCH
Date:	Tue, 16 Nov 2010 13:05:42 +0000

Revision: 6402
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6402
Author:   flixr
Date:     2010-11-16 13:05:42 +0000 (Tue, 16 Nov 2010)
Log Message:
-----------
fix kill switch, RADIO_CONTROL_KILL_SWITCH is now named RADIO_KILL_SWITCH

Modified Paths:
--------------
    paparazzi-software/trunk/conf/airframes/UofAdelaide/A1000_BOOZ.xml
    paparazzi-software/trunk/conf/airframes/UofAdelaide/A1000_LISA.xml
    paparazzi-software/trunk/conf/airframes/UofAdelaide/A1000_NOVA.xml
    paparazzi-software/trunk/conf/airframes/UofAdelaide/booz2_NoVa_001_1000.xml
    paparazzi-software/trunk/conf/airframes/UofAdelaide/booz2_a1000.xml
    paparazzi-software/trunk/conf/airframes/booz2_flixr.xml
    paparazzi-software/trunk/sw/airborne/firmwares/rotorcraft/autopilot.c
    paparazzi-software/trunk/sw/airborne/firmwares/rotorcraft/telemetry.h

Modified: paparazzi-software/trunk/conf/airframes/UofAdelaide/A1000_BOOZ.xml
===================================================================
--- paparazzi-software/trunk/conf/airframes/UofAdelaide/A1000_BOOZ.xml  
2010-11-12 14:09:24 UTC (rev 6401)
+++ paparazzi-software/trunk/conf/airframes/UofAdelaide/A1000_BOOZ.xml  
2010-11-16 13:05:42 UTC (rev 6402)
@@ -273,7 +273,7 @@
  <firmware name="rotorcraft">
        <target name="ap" board="booz_1.0">
          <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="GPS_LAG" value = "0.8"/>
          <define name="BOOZ_START_DELAY" value = "3"/>
@@ -323,7 +323,7 @@
 #ap.CFLAGS += -DGPS_USE_LATLONG now included in NOVA section, include if NOVA 
section removed
 
 #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 $(CFG_BOOZ)/booz2_autopilot.makefile

Modified: paparazzi-software/trunk/conf/airframes/UofAdelaide/A1000_LISA.xml
===================================================================
--- paparazzi-software/trunk/conf/airframes/UofAdelaide/A1000_LISA.xml  
2010-11-12 14:09:24 UTC (rev 6401)
+++ paparazzi-software/trunk/conf/airframes/UofAdelaide/A1000_LISA.xml  
2010-11-16 13:05:42 UTC (rev 6402)
@@ -189,7 +189,7 @@
   <firmware name="rotorcraft">
     <target name="ap" board="lisa_l_1.0">
       <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 = "KILL_MOTORS" />--> 
  <!-- if we want a secondary spektrum reciever we need to set the board to be 

Modified: paparazzi-software/trunk/conf/airframes/UofAdelaide/A1000_NOVA.xml
===================================================================
--- paparazzi-software/trunk/conf/airframes/UofAdelaide/A1000_NOVA.xml  
2010-11-12 14:09:24 UTC (rev 6401)
+++ paparazzi-software/trunk/conf/airframes/UofAdelaide/A1000_NOVA.xml  
2010-11-16 13:05:42 UTC (rev 6402)
@@ -233,7 +233,7 @@
  <firmware name="rotorcraft">
        <target name="ap" board="booz_1.0">
          <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="BOOZ_START_DELAY" value = "3"/>
          <define name="GPS_LAG" value = "0.8"/>
@@ -279,7 +279,7 @@
 ap.CFLAGS += -DFAILSAFE_GROUND_DETECT
 
 # radio killswitch
-ap.CFLAGS += -DRADIO_CONTROL_KILL_SWITCH=RADIO_CONTROL_SWITCH1
+ap.CFLAGS += -DRADIO_KILL_SWITCH=RADIO_CONTROL_SWITCH1
 
 
 ap.CFLAGS += -DMODEM_BAUD=B57600

Modified: 
paparazzi-software/trunk/conf/airframes/UofAdelaide/booz2_NoVa_001_1000.xml
===================================================================
--- paparazzi-software/trunk/conf/airframes/UofAdelaide/booz2_NoVa_001_1000.xml 
2010-11-12 14:09:24 UTC (rev 6401)
+++ paparazzi-software/trunk/conf/airframes/UofAdelaide/booz2_NoVa_001_1000.xml 
2010-11-16 13:05:42 UTC (rev 6402)
@@ -235,7 +235,7 @@
 ap.CFLAGS += -DFAILSAFE_GROUND_DETECT
 
 # radio killswitch
-ap.CFLAGS += -DRADIO_CONTROL_KILL_SWITCH=RADIO_CONTROL_SWITCH1
+ap.CFLAGS += -DRADIO_KILL_SWITCH=RADIO_CONTROL_SWITCH1
 
 
 ap.CFLAGS += -DMODEM_BAUD=B57600

Modified: paparazzi-software/trunk/conf/airframes/UofAdelaide/booz2_a1000.xml
===================================================================
--- paparazzi-software/trunk/conf/airframes/UofAdelaide/booz2_a1000.xml 
2010-11-12 14:09:24 UTC (rev 6401)
+++ paparazzi-software/trunk/conf/airframes/UofAdelaide/booz2_a1000.xml 
2010-11-16 13:05:42 UTC (rev 6402)
@@ -284,7 +284,7 @@
 #ap.CFLAGS += -DGPS_USE_LATLONG now included in NOVA section, include if NOVA 
section removed
 
 #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 $(CFG_BOOZ)/booz2_autopilot.makefile

Modified: paparazzi-software/trunk/conf/airframes/booz2_flixr.xml
===================================================================
--- paparazzi-software/trunk/conf/airframes/booz2_flixr.xml     2010-11-12 
14:09:24 UTC (rev 6401)
+++ paparazzi-software/trunk/conf/airframes/booz2_flixr.xml     2010-11-16 
13:05:42 UTC (rev 6402)
@@ -3,7 +3,7 @@
   <firmware name="rotorcraft">
     <target name="ap" board="booz_1.0">
       <!--<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_INS_NAV_INIT"/>
     </target>

Modified: paparazzi-software/trunk/sw/airborne/firmwares/rotorcraft/autopilot.c
===================================================================
--- paparazzi-software/trunk/sw/airborne/firmwares/rotorcraft/autopilot.c       
2010-11-12 14:09:24 UTC (rev 6401)
+++ paparazzi-software/trunk/sw/airborne/firmwares/rotorcraft/autopilot.c       
2010-11-16 13:05:42 UTC (rev 6402)
@@ -242,7 +242,7 @@
   AP_MODE_OF_PPRZ(radio_control.values[RADIO_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)
     autopilot_set_mode(AP_MODE_KILL);
 #endif

Modified: paparazzi-software/trunk/sw/airborne/firmwares/rotorcraft/telemetry.h
===================================================================
--- paparazzi-software/trunk/sw/airborne/firmwares/rotorcraft/telemetry.h       
2010-11-12 14:09:24 UTC (rev 6401)
+++ paparazzi-software/trunk/sw/airborne/firmwares/rotorcraft/telemetry.h       
2010-11-16 13:05:42 UTC (rev 6402)
@@ -96,14 +96,14 @@
 
 #ifdef RADIO_CONTROL
 #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])
-#else /* ! RADIO_CONTROL_KILL_SWITCH */
+#else /* ! RADIO_KILL_SWITCH */
 #define PERIODIC_SEND_BOOZ2_RADIO_CONTROL(_chan) {                             
            \
     int16_t foo = -42;                                                         
            \
     SEND_BOOZ2_RADIO_CONTROL( _chan, &foo)                                     
            \
 }
-#endif /* !RADIO_CONTROL_KILL_SWITCH */
+#endif /* !RADIO_KILL_SWITCH */
 #define SEND_BOOZ2_RADIO_CONTROL(_chan, _kill_switch) {                        
                    \
     DOWNLINK_SEND_BOOZ2_RADIO_CONTROL(_chan,                                   
            \
                                      &radio_control.values[RADIO_ROLL],        
    \

[Prev in Thread]

Current Thread

[Next in Thread]

[paparazzi-commits] [6402] fix kill switch, RADIO_CONTROL_KILL_SWITCH is now named RADIO_KILL_SWITCH, Felix Ruess <=

Prev by Date: [paparazzi-commits] [6401] correct line endings, CRLF to LF only
Next by Date: [paparazzi-commits] [6403] fixedwing firmware now working on LIsa
Previous by thread: [paparazzi-commits] [6401] correct line endings, CRLF to LF only
Next by thread: [paparazzi-commits] [6403] fixedwing firmware now working on LIsa
Index(es):
- Date
- Thread