1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 08:15:30 +03:00

Merge remote-tracking branch 'multiwii/master'

Conflicts:
	obj/baseflight.hex
	src/main/io/serial_msp.c
	src/mw.c
	src/mw.h
This commit is contained in:
Dominic Clifton 2014-06-01 16:54:54 +01:00
commit 3f7960849a
5 changed files with 11 additions and 5411 deletions

View file

@ -160,7 +160,7 @@ void annexCode(void)
static uint8_t batteryWarningEnabled = false;
static uint8_t vbatTimer = 0;
static uint32_t vbatCycleTime = 0;
static int32_t vbatCycleTime = 0;
// PITCH & ROLL only dynamic PID adjustemnt, depending on throttle value
if (rcData[THROTTLE] < currentProfile.tpa_breakpoint) {