1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 01:35:41 +03:00

Merge branch 'master' into autotune

Conflicts:
	obj/cleanflight_CHEBUZZF3.hex
	obj/cleanflight_NAZE.hex
	obj/cleanflight_OLIMEXINO.hex
This commit is contained in:
Dominic Clifton 2014-05-28 13:37:40 +01:00
commit d0ec7e25ce
18 changed files with 13905 additions and 13977 deletions

View file

@ -341,7 +341,7 @@ void loop(void)
mwDisarm();
}
updateRSSI();
updateRSSI(currentTime);
if (feature(FEATURE_FAILSAFE)) {