mirror of
https://github.com/paparazzi/paparazzi.git
synced 2026-06-04 05:42:49 +08:00
fedec54d6f
Conflicts: sw/airborne/arch/lpc21/servos_csc.h sw/airborne/csc/arm7/props_csc.h sw/airborne/csc/csc_adc.c sw/airborne/csc/csc_ap_main.c sw/airborne/csc/csc_baro.c sw/airborne/csc/csc_main.c sw/airborne/csc/csc_protocol.c sw/airborne/csc/csc_servos.c sw/airborne/csc/mercury_csc_main.c sw/airborne/csc/mercury_main.c sw/airborne/csc/ppm_bridge_main.c sw/airborne/lisa/test_csc_servo.c