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

Merge branch 'quat_fsm_vfm_clean_yaw_hack_squash' into betaflight

Browse source 
Conflicts:
	src/main/mw.c
	src/main/target/CC3D/target.h
This commit is contained in:
ProDrone 2015-09-19 14:59:47 +02:00
commit 47afa51bd7
21 changed files with 806 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/main.c
View file

@ -115,13 +115,13 @@ void mixerUsePWMOutputConfiguration(pwmOutputConfiguration_t *pwmOutputConfigura
void rxInit(rxConfig_t *rxConfig);
void gpsInit(serialConfig_t *serialConfig, gpsConfig_t *initialGpsConfig);
void navigationInit(gpsProfile_t *initialGpsProfile, pidProfile_t *pidProfile);
void imuInit(void);
void displayInit(rxConfig_t *intialRxConfig);
void ledStripInit(ledConfig_t *ledConfigsToUse, hsvColor_t *colorsToUse);
void loop(void);
void spektrumBind(rxConfig_t *rxConfig);
const sonarHardware_t *sonarGetHardwareConfiguration(batteryConfig_t *batteryConfig);
void sonarInit(const sonarHardware_t *sonarHardware);
void qimuInit(void);
#ifdef STM32F303xC
// from system_stm32f30x.c
@ -396,8 +396,7 @@ void init(void)
compassInit();
#endif
imuInit();
qimuInit();
mspInit(&masterConfig.serialConfig);
#ifdef USE_CLI