Merge pull request #2084 from blckmn/patch

Update to ensure serial_cli list matches enum for PWM protocols
This commit is contained in:
J Blackman 2017-01-11 12:15:39 +11:00 committed by GitHub
commit 979ecd3fa8
2 changed files with 4 additions and 0 deletions

View File

@ -28,10 +28,12 @@ typedef enum {
PWM_TYPE_ONESHOT42, PWM_TYPE_ONESHOT42,
PWM_TYPE_MULTISHOT, PWM_TYPE_MULTISHOT,
PWM_TYPE_BRUSHED, PWM_TYPE_BRUSHED,
#ifdef USE_DSHOT
PWM_TYPE_DSHOT150, PWM_TYPE_DSHOT150,
PWM_TYPE_DSHOT300, PWM_TYPE_DSHOT300,
PWM_TYPE_DSHOT600, PWM_TYPE_DSHOT600,
PWM_TYPE_DSHOT1200, PWM_TYPE_DSHOT1200,
#endif
PWM_TYPE_MAX PWM_TYPE_MAX
} motorPwmProtocolTypes_e; } motorPwmProtocolTypes_e;

View File

@ -1079,12 +1079,14 @@ void validateAndFixGyroConfig(void)
case (PWM_TYPE_ONESHOT42): case (PWM_TYPE_ONESHOT42):
motorUpdateRestriction = 0.0001f; motorUpdateRestriction = 0.0001f;
break; break;
#ifdef USE_DSHOT
case (PWM_TYPE_DSHOT150): case (PWM_TYPE_DSHOT150):
motorUpdateRestriction = 0.000250f; motorUpdateRestriction = 0.000250f;
break; break;
case (PWM_TYPE_DSHOT300): case (PWM_TYPE_DSHOT300):
motorUpdateRestriction = 0.0001f; motorUpdateRestriction = 0.0001f;
break; break;
#endif
default: default:
motorUpdateRestriction = 0.00003125f; motorUpdateRestriction = 0.00003125f;
} }