Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-26 17:55:28 +03:00
Code Issues Wiki Activity

Drop DSHOT1200

Browse source
This commit is contained in:
Pawel Spychalski (DzikuVx) 2021-07-23 07:13:16 +02:00
parent 4713d5861b
commit d42e5ad75c
5 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/drivers/pwm_mapping.c
View file

@ -74,7 +74,6 @@ static const motorProtocolProperties_t motorProtocolProperties[] = {
[PWM_TYPE_DSHOT150] = { .usesHwTimer = true, .isDSHOT = true, .isSerialShot = false }, [PWM_TYPE_DSHOT150] = { .usesHwTimer = true, .isDSHOT = true, .isSerialShot = false },
[PWM_TYPE_DSHOT300] = { .usesHwTimer = true, .isDSHOT = true, .isSerialShot = false }, [PWM_TYPE_DSHOT300] = { .usesHwTimer = true, .isDSHOT = true, .isSerialShot = false },
[PWM_TYPE_DSHOT600] = { .usesHwTimer = true, .isDSHOT = true, .isSerialShot = false }, [PWM_TYPE_DSHOT600] = { .usesHwTimer = true, .isDSHOT = true, .isSerialShot = false },
[PWM_TYPE_DSHOT1200] = { .usesHwTimer = true, .isDSHOT = true, .isSerialShot = false },
[PWM_TYPE_SERIALSHOT] = { .usesHwTimer = false, .isDSHOT = false, .isSerialShot = true }, [PWM_TYPE_SERIALSHOT] = { .usesHwTimer = false, .isDSHOT = false, .isSerialShot = true },
}; };

1
src/main/drivers/pwm_mapping.h
View file

@ -44,7 +44,6 @@ typedef enum {
PWM_TYPE_DSHOT150, PWM_TYPE_DSHOT150,
PWM_TYPE_DSHOT300, PWM_TYPE_DSHOT300,
PWM_TYPE_DSHOT600, PWM_TYPE_DSHOT600,
PWM_TYPE_DSHOT1200,
PWM_TYPE_SERIALSHOT, PWM_TYPE_SERIALSHOT,
} motorPwmProtocolTypes_e; } motorPwmProtocolTypes_e;

5
src/main/drivers/pwm_output.c
View file

@ -50,7 +50,6 @@ FILE_COMPILE_FOR_SPEED
#define MULTISHOT_20US_MULT (MULTISHOT_TIMER_HZ * 20 / 1000000.0f / 1000.0f) #define MULTISHOT_20US_MULT (MULTISHOT_TIMER_HZ * 20 / 1000000.0f / 1000.0f)
#ifdef USE_DSHOT #ifdef USE_DSHOT
#define MOTOR_DSHOT1200_HZ 24000000
#define MOTOR_DSHOT600_HZ 12000000 #define MOTOR_DSHOT600_HZ 12000000
#define MOTOR_DSHOT300_HZ 6000000 #define MOTOR_DSHOT300_HZ 6000000
#define MOTOR_DSHOT150_HZ 3000000 #define MOTOR_DSHOT150_HZ 3000000
@ -245,8 +244,6 @@ static pwmOutputPort_t * motorConfigPwm(const timerHardware_t *timerHardware, fl
uint32_t getDshotHz(motorPwmProtocolTypes_e pwmProtocolType) uint32_t getDshotHz(motorPwmProtocolTypes_e pwmProtocolType)
{ {
switch (pwmProtocolType) { switch (pwmProtocolType) {
case(PWM_TYPE_DSHOT1200):
return MOTOR_DSHOT1200_HZ;
case(PWM_TYPE_DSHOT600): case(PWM_TYPE_DSHOT600):
return MOTOR_DSHOT600_HZ; return MOTOR_DSHOT600_HZ;
case(PWM_TYPE_DSHOT300): case(PWM_TYPE_DSHOT300):
@ -486,7 +483,6 @@ void pwmMotorPreconfigure(void)
break; break;
#ifdef USE_DSHOT #ifdef USE_DSHOT
case PWM_TYPE_DSHOT1200:
case PWM_TYPE_DSHOT600: case PWM_TYPE_DSHOT600:
case PWM_TYPE_DSHOT300: case PWM_TYPE_DSHOT300:
case PWM_TYPE_DSHOT150: case PWM_TYPE_DSHOT150:
@ -522,7 +518,6 @@ bool pwmMotorConfig(const timerHardware_t *timerHardware, uint8_t motorIndex, bo
break; break;
#ifdef USE_DSHOT #ifdef USE_DSHOT
case PWM_TYPE_DSHOT1200:
case PWM_TYPE_DSHOT600: case PWM_TYPE_DSHOT600:
case PWM_TYPE_DSHOT300: case PWM_TYPE_DSHOT300:
case PWM_TYPE_DSHOT150: case PWM_TYPE_DSHOT150:

3
src/main/fc/config.c
View file

@ -284,9 +284,6 @@ void validateAndFixConfig(void)
case PWM_TYPE_DSHOT600: case PWM_TYPE_DSHOT600:
motorConfigMutable()->motorPwmRate = MIN(motorConfig()->motorPwmRate, 16000); motorConfigMutable()->motorPwmRate = MIN(motorConfig()->motorPwmRate, 16000);
break; break;
case PWM_TYPE_DSHOT1200:
motorConfigMutable()->motorPwmRate = MIN(motorConfig()->motorPwmRate, 32000);
break;
#endif #endif
#ifdef USE_SERIALSHOT #ifdef USE_SERIALSHOT
case PWM_TYPE_SERIALSHOT: // 2-4 kHz case PWM_TYPE_SERIALSHOT: // 2-4 kHz

2
src/main/fc/settings.yaml
View file

@ -35,7 +35,7 @@ tables:
- name: blackbox_device - name: blackbox_device
values: ["SERIAL", "SPIFLASH", "SDCARD"] values: ["SERIAL", "SPIFLASH", "SDCARD"]
- name: motor_pwm_protocol - name: motor_pwm_protocol
values: ["STANDARD", "ONESHOT125", "MULTISHOT", "BRUSHED", "DSHOT150", "DSHOT300", "DSHOT600", "DSHOT1200", "SERIALSHOT"] values: ["STANDARD", "ONESHOT125", "MULTISHOT", "BRUSHED", "DSHOT150", "DSHOT300", "DSHOT600", "SERIALSHOT"]
- name: servo_protocol - name: servo_protocol
values: ["PWM", "SERVO_DRIVER", "SBUS", "SBUS_PWM"] values: ["PWM", "SERVO_DRIVER", "SBUS", "SBUS_PWM"]
- name: failsafe_procedure - name: failsafe_procedure