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

Merge remote-tracking branch 'multiwii/master'

Browse source 
Conflicts:
	obj/baseflight.hex
	src/config.c
	src/main.c
	src/mw.c
	src/mw.h
	src/serial_cli.c
This commit is contained in:
Dominic Clifton 2014-04-23 02:38:39 +01:00
commit e4c9fb585c
6 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/config_master.h
View file

@ -9,7 +9,7 @@ typedef struct master_t {
uint8_t mixerConfiguration;
uint32_t enabledFeatures;
uint16_t looptime; // imu loop time in us
uint8_t emfAvoidance; // change pll settings to avoid noise in the uhf band
uint8_t emf_avoidance; // change pll settings to avoid noise in the uhf band
motorMixer_t customMixer[MAX_SUPPORTED_MOTORS]; // custom mixtable
// motor/esc/servo related stuff