Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 13:25:30 +03:00
Code Issues Wiki Activity

Merge pull request #2068 from betaflight/revert-2059-reorder_dshot_protocols

Browse source 
Revert "Reordered DShot protocols to be in ascending order."
This commit is contained in:
Michael Keller 2017-01-10 12:01:03 +13:00 • committed by GitHub
commit b01faa0101
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/drivers/pwm_output.h
View file

@ -28,9 +28,9 @@ typedef enum {
PWM_TYPE_ONESHOT42, PWM_TYPE_ONESHOT42,
PWM_TYPE_MULTISHOT, PWM_TYPE_MULTISHOT,
PWM_TYPE_BRUSHED, PWM_TYPE_BRUSHED,
PWM_TYPE_DSHOT150,
PWM_TYPE_DSHOT300,
PWM_TYPE_DSHOT600, PWM_TYPE_DSHOT600,
PWM_TYPE_DSHOT300,
PWM_TYPE_DSHOT150,
PWM_TYPE_DSHOT900, PWM_TYPE_DSHOT900,
PWM_TYPE_DSHOT1200, PWM_TYPE_DSHOT1200,
PWM_TYPE_MAX PWM_TYPE_MAX

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

@ -332,7 +332,7 @@ static const char * const lookupTableSuperExpoYaw[] = {
static const char * const lookupTablePwmProtocol[] = { static const char * const lookupTablePwmProtocol[] = {
"OFF", "ONESHOT125", "ONESHOT42", "MULTISHOT", "BRUSHED", "OFF", "ONESHOT125", "ONESHOT42", "MULTISHOT", "BRUSHED",
#ifdef USE_DSHOT #ifdef USE_DSHOT
"DSHOT150", "DSHOT300", "DSHOT600", "DSHOT900", "DSHOT1200", "DSHOT600", "DSHOT300", "DSHOT150", "DSHOT900", "DSHOT1200",
#endif #endif
}; };