Remove DSHOT900

This commit is contained in:
borisbstyle 2017-01-10 00:35:03 +01:00
parent 4c93e5fb83
commit 8303151a25
5 changed files with 3 additions and 9 deletions

View File

@ -224,7 +224,6 @@ void motorInit(const motorConfig_t *motorConfig, uint16_t idlePulse, uint8_t mot
break; break;
#ifdef USE_DSHOT #ifdef USE_DSHOT
case PWM_TYPE_DSHOT1200: case PWM_TYPE_DSHOT1200:
case PWM_TYPE_DSHOT900:
case PWM_TYPE_DSHOT600: case PWM_TYPE_DSHOT600:
case PWM_TYPE_DSHOT300: case PWM_TYPE_DSHOT300:
case PWM_TYPE_DSHOT150: case PWM_TYPE_DSHOT150:
@ -292,8 +291,6 @@ uint32_t getDshotHz(motorPwmProtocolTypes_e pwmProtocolType)
switch (pwmProtocolType) { switch (pwmProtocolType) {
case(PWM_TYPE_DSHOT1200): case(PWM_TYPE_DSHOT1200):
return MOTOR_DSHOT1200_MHZ * 1000000; return MOTOR_DSHOT1200_MHZ * 1000000;
case(PWM_TYPE_DSHOT900):
return MOTOR_DSHOT900_MHZ * 1000000;
case(PWM_TYPE_DSHOT600): case(PWM_TYPE_DSHOT600):
return MOTOR_DSHOT600_MHZ * 1000000; return MOTOR_DSHOT600_MHZ * 1000000;
case(PWM_TYPE_DSHOT300): case(PWM_TYPE_DSHOT300):

View File

@ -31,7 +31,6 @@ typedef enum {
PWM_TYPE_DSHOT150, PWM_TYPE_DSHOT150,
PWM_TYPE_DSHOT300, PWM_TYPE_DSHOT300,
PWM_TYPE_DSHOT600, PWM_TYPE_DSHOT600,
PWM_TYPE_DSHOT900,
PWM_TYPE_DSHOT1200, PWM_TYPE_DSHOT1200,
PWM_TYPE_MAX PWM_TYPE_MAX
} motorPwmProtocolTypes_e; } motorPwmProtocolTypes_e;
@ -42,7 +41,6 @@ typedef enum {
#define MAX_DMA_TIMERS 8 #define MAX_DMA_TIMERS 8
#define MOTOR_DSHOT1200_MHZ 24 #define MOTOR_DSHOT1200_MHZ 24
#define MOTOR_DSHOT900_MHZ 18
#define MOTOR_DSHOT600_MHZ 12 #define MOTOR_DSHOT600_MHZ 12
#define MOTOR_DSHOT300_MHZ 6 #define MOTOR_DSHOT300_MHZ 6
#define MOTOR_DSHOT150_MHZ 3 #define MOTOR_DSHOT150_MHZ 3

View File

@ -332,7 +332,7 @@ static const char * const lookupTableSuperExpoYaw[] = {
static const char * const lookupTablePwmProtocol[] = { static const char * const lookupTablePwmProtocol[] = {
"OFF", "ONESHOT125", "ONESHOT42", "MULTISHOT", "BRUSHED", "OFF", "ONESHOT125", "ONESHOT42", "MULTISHOT", "BRUSHED",
#ifdef USE_DSHOT #ifdef USE_DSHOT
"DSHOT150", "DSHOT300", "DSHOT600", "DSHOT900", "DSHOT1200", "DSHOT150", "DSHOT300", "DSHOT600", "DSHOT1200",
#endif #endif
}; };

View File

@ -249,7 +249,6 @@ bool isMotorProtocolDshot(void) {
#ifdef USE_DSHOT #ifdef USE_DSHOT
switch(motorConfig->motorPwmProtocol) { switch(motorConfig->motorPwmProtocol) {
case PWM_TYPE_DSHOT1200: case PWM_TYPE_DSHOT1200:
case PWM_TYPE_DSHOT900:
case PWM_TYPE_DSHOT600: case PWM_TYPE_DSHOT600:
case PWM_TYPE_DSHOT300: case PWM_TYPE_DSHOT300:
case PWM_TYPE_DSHOT150: case PWM_TYPE_DSHOT150:

View File

@ -180,8 +180,8 @@
#define CURRENT_METER_ADC_PIN PC1 #define CURRENT_METER_ADC_PIN PC1
#define VBAT_ADC_PIN PC2 #define VBAT_ADC_PIN PC2
#else #else
#define VBAT_ADC_PIN PC3 #define VBAT_ADC_PIN PC3
#define VBAT_ADC_CHANNEL ADC_Channel_13 #define VBAT_ADC_CHANNEL ADC_Channel_13
#endif #endif
#define LED_STRIP #define LED_STRIP