Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 09:45:37 +03:00
Code Issues Wiki Activity

Merge branch 'master' of https://github.com/betaflight/betaflight

Browse source
This commit is contained in:
Alex Wolf 2018-08-13 18:27:44 -04:00
commit 031ea3ea94
29 changed files with 205 additions and 863 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/interface/cli.c
View file

@ -3722,8 +3722,10 @@ const cliResourceValue_t resourceTable[] = {
#ifdef USE_SERVOS
DEFA( OWNER_SERVO, PG_SERVO_CONFIG, servoConfig_t, dev.ioTags[0], MAX_SUPPORTED_SERVOS ),
#endif
#if defined(USE_PWM) || defined(USE_PPM)
#if defined(USE_PPM)
DEFS( OWNER_PPMINPUT, PG_PPM_CONFIG, ppmConfig_t, ioTag ),
#endif
#if defined(USE_PWM)
DEFA( OWNER_PWMINPUT, PG_PWM_CONFIG, pwmConfig_t, ioTags[0], PWM_INPUT_PORT_COUNT ),
#endif
#ifdef USE_RANGEFINDER_HCSR04

1
src/main/interface/msp.c
View file

@ -87,7 +87,6 @@
#include "io/ledstrip.h"
#include "io/motors.h"
#include "io/osd.h"
#include "io/osd_slave.h"
#include "io/serial.h"
#include "io/serial_4way.h"
#include "io/servos.h"