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

Overclock F1 targets by default (CC3D excluded) // Fix timer scaling for oneshot125 / oneshot42

This commit is contained in:
borisbstyle 2016-02-28 23:23:01 +01:00
parent 6e96adff0d
commit 0de34f14fe
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/config/config.c
View File

@ -500,7 +500,11 @@ static void resetConf(void)
resetSerialConfig(&masterConfig.serialConfig); resetSerialConfig(&masterConfig.serialConfig);
#if defined(STM32F10X) && !defined(CC3D)
masterConfig.emf_avoidance = 1;
#else
masterConfig.emf_avoidance = 0; masterConfig.emf_avoidance = 0;
#endif
resetPidProfile(&currentProfile->pidProfile); resetPidProfile(&currentProfile->pidProfile);

11
src/main/drivers/pwm_output.c
View File

@ -134,7 +134,17 @@ static void pwmWriteStandard(uint8_t index, uint16_t value)
{ {
*motors[index]->ccr = value; *motors[index]->ccr = value;
} }
#if defined(STM32F10X) && !defined(CC3D)
static void pwmWriteOneshot125(uint8_t index, uint16_t value)
{
*motors[index]->ccr = value * 21 / 6; // 24Mhz -> 8Mhz
}
static void pwmWriteOneshot42(uint8_t index, uint16_t value)
{
*motors[index]->ccr = value * 7 / 6;
}
#else
static void pwmWriteOneshot125(uint8_t index, uint16_t value) static void pwmWriteOneshot125(uint8_t index, uint16_t value)
{ {
*motors[index]->ccr = value * 3; // 24Mhz -> 8Mhz *motors[index]->ccr = value * 3; // 24Mhz -> 8Mhz
@ -144,6 +154,7 @@ static void pwmWriteOneshot42(uint8_t index, uint16_t value)
{ {
*motors[index]->ccr = value; *motors[index]->ccr = value;
} }
#endif
static void pwmWriteMultiShot(uint8_t index, uint16_t value) static void pwmWriteMultiShot(uint8_t index, uint16_t value)
{ {

2
src/main/io/serial_cli.c
View File

@ -526,7 +526,7 @@ typedef struct {
} clivalue_t; } clivalue_t;
const clivalue_t valueTable[] = { const clivalue_t valueTable[] = {
{ "emf_avoidance", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.emf_avoidance, .config.lookup = { TABLE_OFF_ON } }, // { "emf_avoidance", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.emf_avoidance, .config.lookup = { TABLE_OFF_ON } },
{ "mid_rc", VAR_UINT16 | MASTER_VALUE, &masterConfig.rxConfig.midrc, .config.minmax = { 1200, 1700 } }, { "mid_rc", VAR_UINT16 | MASTER_VALUE, &masterConfig.rxConfig.midrc, .config.minmax = { 1200, 1700 } },
{ "min_check", VAR_UINT16 | MASTER_VALUE, &masterConfig.rxConfig.mincheck, .config.minmax = { PWM_RANGE_ZERO, PWM_RANGE_MAX } }, { "min_check", VAR_UINT16 | MASTER_VALUE, &masterConfig.rxConfig.mincheck, .config.minmax = { PWM_RANGE_ZERO, PWM_RANGE_MAX } },