Merge branch 'mixer-scheduler-squash-rebase' into 3djc/2.3-synced

This commit is contained in:
3djc
2020-12-21 19:33:07 +01:00
37 changed files with 739 additions and 351 deletions
+2 -1
View File
@@ -111,6 +111,7 @@ void boardInit()
AUX_SERIAL_RCC_APB1Periph |
INTMODULE_RCC_APB1Periph |
TRAINER_MODULE_RCC_APB1Periph |
MIXER_SCHEDULER_TIMER_RCC_APB1Periph |
BT_RCC_APB1Periph |
GYRO_RCC_APB1Periph,
ENABLE);
@@ -344,4 +345,4 @@ void initJackDetect(void)
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
GPIO_Init(JACK_DETECT_GPIO, &GPIO_InitStructure);
}
#endif
#endif