From 7cc05ebb10aaf86e8d3ccc547d95750e2b0da700 Mon Sep 17 00:00:00 2001 From: mikeller Date: Mon, 9 Jan 2017 23:41:40 +1300 Subject: [PATCH 1/3] Increase MSP API version in preparation for the next release. --- src/main/msp/msp_protocol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/msp/msp_protocol.h b/src/main/msp/msp_protocol.h index 64c85896eb..64d0a0cd40 100644 --- a/src/main/msp/msp_protocol.h +++ b/src/main/msp/msp_protocol.h @@ -59,7 +59,7 @@ #define MSP_PROTOCOL_VERSION 0 #define API_VERSION_MAJOR 1 // increment when major changes are made -#define API_VERSION_MINOR 25 // increment after a release, to set the version for all changes to go into the following release (if no changes to MSP are made between the releases, this can be reverted before the release) +#define API_VERSION_MINOR 26 // increment after a release, to set the version for all changes to go into the following release (if no changes to MSP are made between the releases, this can be reverted before the release) #define API_VERSION_LENGTH 2 From 60c433d56805b1cfd8953be23d8f77e93689db5d Mon Sep 17 00:00:00 2001 From: Michael Keller Date: Tue, 10 Jan 2017 07:09:57 +1300 Subject: [PATCH 2/3] Revert "Reordered DShot protocols to be in ascending order." --- src/main/drivers/pwm_output.h | 4 ++-- src/main/fc/serial_cli.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/drivers/pwm_output.h b/src/main/drivers/pwm_output.h index f054affd3a..fae54bb157 100644 --- a/src/main/drivers/pwm_output.h +++ b/src/main/drivers/pwm_output.h @@ -28,9 +28,9 @@ typedef enum { PWM_TYPE_ONESHOT42, PWM_TYPE_MULTISHOT, PWM_TYPE_BRUSHED, - PWM_TYPE_DSHOT150, - PWM_TYPE_DSHOT300, PWM_TYPE_DSHOT600, + PWM_TYPE_DSHOT300, + PWM_TYPE_DSHOT150, PWM_TYPE_DSHOT900, PWM_TYPE_DSHOT1200, PWM_TYPE_MAX diff --git a/src/main/fc/serial_cli.c b/src/main/fc/serial_cli.c index 057b8dcec7..a0fb115402 100755 --- a/src/main/fc/serial_cli.c +++ b/src/main/fc/serial_cli.c @@ -332,7 +332,7 @@ static const char * const lookupTableSuperExpoYaw[] = { static const char * const lookupTablePwmProtocol[] = { "OFF", "ONESHOT125", "ONESHOT42", "MULTISHOT", "BRUSHED", #ifdef USE_DSHOT - "DSHOT150", "DSHOT300", "DSHOT600", "DSHOT900", "DSHOT1200", + "DSHOT600", "DSHOT300", "DSHOT150", "DSHOT900", "DSHOT1200", #endif }; From 44fc111a80d624978f9f560cb9a6737d1d60f25c Mon Sep 17 00:00:00 2001 From: Michael Keller Date: Tue, 10 Jan 2017 12:08:27 +1300 Subject: [PATCH 3/3] Reordered DShot protols. --- src/main/drivers/pwm_output.h | 4 ++-- src/main/fc/serial_cli.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/drivers/pwm_output.h b/src/main/drivers/pwm_output.h index fae54bb157..f054affd3a 100644 --- a/src/main/drivers/pwm_output.h +++ b/src/main/drivers/pwm_output.h @@ -28,9 +28,9 @@ typedef enum { PWM_TYPE_ONESHOT42, PWM_TYPE_MULTISHOT, PWM_TYPE_BRUSHED, - PWM_TYPE_DSHOT600, - PWM_TYPE_DSHOT300, PWM_TYPE_DSHOT150, + PWM_TYPE_DSHOT300, + PWM_TYPE_DSHOT600, PWM_TYPE_DSHOT900, PWM_TYPE_DSHOT1200, PWM_TYPE_MAX diff --git a/src/main/fc/serial_cli.c b/src/main/fc/serial_cli.c index d097f6cff4..6004bab77f 100755 --- a/src/main/fc/serial_cli.c +++ b/src/main/fc/serial_cli.c @@ -332,7 +332,7 @@ static const char * const lookupTableSuperExpoYaw[] = { static const char * const lookupTablePwmProtocol[] = { "OFF", "ONESHOT125", "ONESHOT42", "MULTISHOT", "BRUSHED", #ifdef USE_DSHOT - "DSHOT600", "DSHOT300", "DSHOT150", "DSHOT900", "DSHOT1200", + "DSHOT150", "DSHOT300", "DSHOT600", "DSHOT900", "DSHOT1200", #endif };