Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 06:15:16 +03:00
Code Issues Wiki Activity

Merge remote-tracking branch 'henn1001/FastPWM' into betaflight

Browse source 
Conflicts:
	src/main/drivers/pwm_mapping.c
This commit is contained in:
borisbstyle 2015-10-01 16:01:15 +02:00
commit 77534ed6f6
7 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/io/serial_cli.c
View file

@ -175,7 +175,7 @@ static const char * const featureNames[] = {
"SERVO_TILT", "SOFTSERIAL", "GPS", "FAILSAFE",
"SONAR", "TELEMETRY", "CURRENT_METER", "3D", "RX_PARALLEL_PWM",
"RX_MSP", "RSSI_ADC", "LED_STRIP", "DISPLAY", "ONESHOT125",
"BLACKBOX", "CHANNEL_FORWARDING", NULL
"BLACKBOX", "CHANNEL_FORWARDING","FASTPWM", NULL
};
// sync this with rxFailsafeChannelMode_e