From 81da3040a254ac824306855e827ceda325bd0c98 Mon Sep 17 00:00:00 2001 From: blckmn Date: Sat, 7 Jan 2017 09:56:40 +1100 Subject: [PATCH] re-ordered based on review - requires co-ordination with configurator --- src/main/config/config_eeprom.h | 2 +- src/main/drivers/pwm_output.h | 4 ++-- src/main/fc/serial_cli.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/config/config_eeprom.h b/src/main/config/config_eeprom.h index 179eed363..a012ae9db 100644 --- a/src/main/config/config_eeprom.h +++ b/src/main/config/config_eeprom.h @@ -17,7 +17,7 @@ #pragma once -#define EEPROM_CONF_VERSION 148 +#define EEPROM_CONF_VERSION 149 void initEEPROM(void); void writeEEPROM(); diff --git a/src/main/drivers/pwm_output.h b/src/main/drivers/pwm_output.h index 64c31292c..0a61d9155 100644 --- a/src/main/drivers/pwm_output.h +++ b/src/main/drivers/pwm_output.h @@ -27,11 +27,11 @@ typedef enum { PWM_TYPE_ONESHOT42, PWM_TYPE_MULTISHOT, PWM_TYPE_BRUSHED, + PWM_TYPE_DSHOT1200, + PWM_TYPE_DSHOT900, PWM_TYPE_DSHOT600, PWM_TYPE_DSHOT300, PWM_TYPE_DSHOT150, - PWM_TYPE_DSHOT900, - PWM_TYPE_DSHOT1200, PWM_TYPE_MAX } motorPwmProtocolTypes_e; diff --git a/src/main/fc/serial_cli.c b/src/main/fc/serial_cli.c index 0df34424d..2df3d2a4d 100755 --- a/src/main/fc/serial_cli.c +++ b/src/main/fc/serial_cli.c @@ -334,7 +334,7 @@ static const char * const lookupTableSuperExpoYaw[] = { static const char * const lookupTablePwmProtocol[] = { "OFF", "ONESHOT125", "ONESHOT42", "MULTISHOT", "BRUSHED", #ifdef USE_DSHOT - "DSHOT600", "DSHOT300", "DSHOT150", "DSHOT900", "DSHOT1200", + "DSHOT1200", "DSHOT900", "DSHOT600", "DSHOT300", "DSHOT150", #endif };