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

Fix duplicate MSP codes.

Browse source
This commit is contained in:
Dominic Clifton 2015-03-29 14:23:12 +01:00
parent 16fda38eba
commit f24782b961
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main/io/serial_msp.c
View file

@ -218,11 +218,15 @@ const char *boardIdentifier = TARGET_BOARD_IDENTIFIER;
#define MSP_PID_CONTROLLER 59 #define MSP_PID_CONTROLLER 59
#define MSP_SET_PID_CONTROLLER 60 #define MSP_SET_PID_CONTROLLER 60
#define MSP_ARMING_CONFIG 61 //out message Returns auto_disarm_delay and disarm_kill_switch parameters #define MSP_ARMING_CONFIG 61 //out message Returns auto_disarm_delay and disarm_kill_switch parameters
#define MSP_SET_ARMING_CONFIG 62 //in message Sets auto_disarm_delay and disarm_kill_switch parameters #define MSP_SET_ARMING_CONFIG 62 //in message Sets auto_disarm_delay and disarm_kill_switch parameters
#define MSP_LOOP_TIME 63 //out message Returns FC cycle time i.e looptime parameter #define MSP_DATAFLASH_SUMMARY 70 //out message - get description of dataflash chip
#define MSP_SET_LOOP_TIME 64 //in message Sets FC cycle time i.e looptime parameter #define MSP_DATAFLASH_READ 71 //out message - get content of dataflash chip
#define MSP_DATAFLASH_ERASE 72 //in message - erase dataflash chip
#define MSP_LOOP_TIME 73 //out message Returns FC cycle time i.e looptime parameter
#define MSP_SET_LOOP_TIME 74 //in message Sets FC cycle time i.e looptime parameter
// //
// Baseflight MSP commands (if enabled they exist in Cleanflight) // Baseflight MSP commands (if enabled they exist in Cleanflight)
@ -232,18 +236,14 @@ const char *boardIdentifier = TARGET_BOARD_IDENTIFIER;
// FIXME - Provided for backwards compatibility with configurator code until configurator is updated. // FIXME - Provided for backwards compatibility with configurator code until configurator is updated.
// DEPRECATED - DO NOT USE "MSP_BF_CONFIG" and MSP_SET_BF_CONFIG. In Cleanflight, isolated commands already exist and should be used instead. // DEPRECATED - DO NOT USE "MSP_BF_CONFIG" and MSP_SET_BF_CONFIG. In Cleanflight, isolated commands already exist and should be used instead.
#define MSP_BF_CONFIG 66 //out message baseflight-specific settings that aren't covered elsewhere #define MSP_BF_CONFIG 66 //out message baseflight-specific settings that aren't covered elsewhere
#define MSP_SET_BF_CONFIG 67 //in message baseflight-specific settings save #define MSP_SET_BF_CONFIG 67 //in message baseflight-specific settings save
#define MSP_REBOOT 68 //in message reboot settings #define MSP_REBOOT 68 //in message reboot settings
// DEPRECATED - Use MSP_BUILD_INFO instead // DEPRECATED - Use MSP_BUILD_INFO instead
#define MSP_BF_BUILD_INFO 69 //out message build date as well as some space for future expansion #define MSP_BF_BUILD_INFO 69 //out message build date as well as some space for future expansion
#define MSP_DATAFLASH_SUMMARY 70 //out message - get description of dataflash chip
#define MSP_DATAFLASH_READ 71 //out message - get content of dataflash chip
#define MSP_DATAFLASH_ERASE 72 //in message - erase dataflash chip
// //
// Multwii original MSP commands // Multwii original MSP commands
// //
@ -1278,7 +1278,7 @@ static bool processInCommand(void)
masterConfig.disarm_kill_switch = read8(); masterConfig.disarm_kill_switch = read8();
break; break;
case MSP_SET_LOOP_TIME: case MSP_SET_LOOP_TIME:
masterConfig.looptime = read16(); masterConfig.looptime = read16();
break; break;
case MSP_SET_PID_CONTROLLER: case MSP_SET_PID_CONTROLLER:
currentProfile->pidProfile.pidController = read8(); currentProfile->pidProfile.pidController = read8();