rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #767 from betaflight/revert-738-CF-catchup-MSP17_move-deadband3d_throttle-from-MSP_3D-to-MSP_RC_DEADBAND 

Revert "Move deadband3d_throttle from MSP_3D to MSP_RC_DEADBAND"
This commit is contained in:
borisbstyle 2016-07-16 11:26:08 +02:00 committed by GitHub
parent a5a0024fbd 25f8c2fc59
commit 6a3c15b54b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/io/serial_msp.c
View File

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