Merge pull request #738 from gaelj/CF-catchup-MSP17_move-deadband3d_throttle-from-MSP_3D-to-MSP_RC_DEADBAND

Move deadband3d_throttle from MSP_3D to MSP_RC_DEADBAND
This commit is contained in:
borisbstyle 2016-07-16 10:34:31 +02:00 committed by GitHub
commit a203693f95
1 changed files with 2 additions and 2 deletions

View File

@ -1262,7 +1262,6 @@ static bool processOutCommand(uint8_t cmdMSP)
serialize16(masterConfig.flight3DConfig.deadband3d_low);
serialize16(masterConfig.flight3DConfig.deadband3d_high);
serialize16(masterConfig.flight3DConfig.neutral3d);
serialize16(masterConfig.flight3DConfig.deadband3d_throttle);
break;
case MSP_RC_DEADBAND:
@ -1270,6 +1269,7 @@ static bool processOutCommand(uint8_t cmdMSP)
serialize8(masterConfig.rcControlsConfig.deadband);
serialize8(masterConfig.rcControlsConfig.yaw_deadband);
serialize8(masterConfig.rcControlsConfig.alt_hold_deadband);
serialize16(masterConfig.flight3DConfig.deadband3d_throttle);
break;
case MSP_SENSOR_ALIGNMENT:
headSerialReply(3);
@ -1525,13 +1525,13 @@ static bool processInCommand(void)
masterConfig.flight3DConfig.deadband3d_low = read16();
masterConfig.flight3DConfig.deadband3d_high = read16();
masterConfig.flight3DConfig.neutral3d = read16();
masterConfig.flight3DConfig.deadband3d_throttle = read16();
break;
case MSP_SET_RC_DEADBAND:
masterConfig.rcControlsConfig.deadband = read8();
masterConfig.rcControlsConfig.yaw_deadband = read8();
masterConfig.rcControlsConfig.alt_hold_deadband = read8();
masterConfig.flight3DConfig.deadband3d_throttle = read16();
break;
case MSP_SET_RESET_CURR_PID: