J Blackman
c69c7a0710
Merge pull request #1272 from martinbudden/bf_mw_tasks
...
Reorganisation of tasks into fc_tasks.c
2016-10-11 14:55:18 +11:00
Michael Keller
30f4a1aa13
Merge pull request #1199 from martinbudden/bf_serialize_flash
...
Added serialized flash compression format
2016-10-11 10:28:34 +13:00
borisbstyle
f3c1e954db
Merge branch 'development' of https://github.com/borisbstyle/betaflight into development
2016-10-10 01:10:19 +02:00
borisbstyle
b168141b67
Fix OSD menu for d setpoint transition
2016-10-10 01:09:56 +02:00
Anders Höglund
517f92f06c
Merge pull request #1256 from AndersHoglund/refactor_includes
...
Clean up vtx.c includes, move all not directly used to where they belong.
2016-10-09 21:50:02 +02:00
Anders Hoglund
a1599d0c18
Re-add some of the prev removed export symbols in imu.h
2016-10-09 21:26:17 +02:00
Anders Hoglund
15e24e2015
Removed not needed fwd declaraions and includes.
2016-10-09 21:26:17 +02:00
Anders Hoglund
44abc8f2e4
Clean up vtx.c includes, move all not directly used to where they belong.
2016-10-09 21:26:17 +02:00
Martin Budden
3f5393e201
Fixup after rebase
2016-10-09 18:01:20 +01:00
Martin Budden
0ccb7040f0
Reorganisation of tasks into fc_tasks.c
2016-10-09 17:43:29 +01:00
borisbstyle
92d2e3ae91
Merge branch 'development' of https://github.com/borisbstyle/betaflight into development
2016-10-09 01:11:48 +02:00
borisbstyle
fa6748b49a
Fix merge issues // Free some space on NAZE and CC3D
2016-10-09 01:11:20 +02:00
borisbstyle
e289f354a6
Merge pull request #1264 from jflyper/fix-micros-final
...
Fix micros using COUNTFLAG
2016-10-09 00:52:44 +02:00
borisbstyle
70cca63875
Cleanup // Fix some filter inits // More space Naze target
2016-10-09 00:47:50 +02:00
borisbstyle
81623d4ac7
Merge branch 'master' into development
2016-10-08 02:00:08 +02:00
borisbstyle
b168b33448
Cleanup Denoise Code
2016-10-08 01:49:26 +02:00
borisbstyle
e7bd930ff5
Merge branch 'master' into development
2016-10-08 01:17:07 +02:00
borisbstyle
8dd8e3969f
Add PIDsum limit
2016-10-08 01:14:17 +02:00
jflyper
76392c2da7
Travis kick
2016-10-08 07:20:40 +09:00
borisbstyle
72a357a812
Merge pull request #1270 from martinbudden/bf_msp_include_tidy
...
Tidy up msp related #includes
2016-10-08 00:17:18 +02:00
borisbstyle
e3825fddb9
Merge pull request #1273 from atomiclama/removeFile-dev
...
Remove a superfluous file
2016-10-08 00:15:03 +02:00
borisbstyle
29733a2424
Fix gyro pt1
2016-10-08 00:11:08 +02:00
borisbstyle
0313cd846c
Merge branch 'development' of https://github.com/borisbstyle/betaflight into development
2016-10-08 00:10:04 +02:00
borisbstyle
48ab3ca0b2
Fix gyro pt1
2016-10-08 00:09:30 +02:00
Anders Höglund
022e44d34b
Merge pull request #1278 from AndersHoglund/fix_func_proto
...
OMNIBUS build failed. OSD func prototype fixed.
2016-10-07 16:13:15 +02:00
Anders Hoglund
ff69a0c409
OMNIBUS build failed. OSD fumc prototype fixed.
2016-10-07 16:11:48 +02:00
jflyper
e948498695
atomic.h inclusion path fixed for development branch
2016-10-07 20:22:12 +09:00
borisbstyle
bd2ded600c
Merge branch 'master' into development
2016-10-07 02:44:21 +02:00
borisbstyle
fc480fab5b
Default adjustments // Cleanups
2016-10-07 02:24:22 +02:00
borisbstyle
09d16bd0cb
Merge branch 'master' into development
2016-10-07 01:41:55 +02:00
borisbstyle
d434430eac
Merge pull request #1268 from digitalentity/airf3-vbat-fix
...
Fix VBAT for AIRHEROF3 target
2016-10-06 23:59:12 +02:00
atomiclama
c8ddaa5f92
Removed superflous file
2016-10-05 13:44:16 +01:00
Martin Budden
ea6b459ead
Tidy up msp related #includes
2016-10-05 08:33:35 +01:00
Dan Nixon
9d4c240671
New OSD features ( #1263 )
...
* Add max. alt to stats
* Allow toggle of crosshair separate from AH
2016-10-04 22:50:59 -07:00
jflyper
2a0e22f8b4
Travis, what did you do with common/atomic.h?
2016-10-05 02:00:02 +09:00
Konstantin Sharlaimov (DigitalEntity)
62cbb2faa5
Fix VBAT for AIRHEROF3 target
2016-10-04 22:06:16 +10:00
Martin Budden
4baa995ebc
Merge pull request #1267 from martinbudden/bf_serial_const_correctness2
...
Further improvements to serial const correctness
2016-10-04 12:31:07 +01:00
Martin Budden
4cd61f08b5
Further improvements to serial const correctness
2016-10-04 09:01:28 +01:00
J Blackman
63ae7a26b6
Merge pull request #1262 from digitalentity/air3-baro-fix
...
Fix missing baro support for AIRHEROF3 target
2016-10-04 10:39:58 +11:00
J Blackman
fdb4a3653e
Merge pull request #1266 from martinbudden/bf_serial_const_correctness
...
Made serial const correct
2016-10-04 10:39:09 +11:00
borisbstyle
989af08c10
Lower PID limit
2016-10-04 00:50:04 +02:00
Martin Budden
661aa7469d
Made serial const correct
2016-10-03 23:00:16 +01:00
borisbstyle
ce2067ae94
Merge pull request #1265 from DemonRC/master
...
Added Demon SOULF4 target
2016-10-03 23:45:06 +02:00
Adam Tusk
e2e206cfe3
Added LED stip, change board name to SOUL
2016-10-03 21:17:47 +02:00
jflyper
a89c36b5e1
Cache sysTickPending inside ATOMIC_BLOCK
2016-10-04 03:53:59 +09:00
Adam Tusk
42859b47f7
Added Demon SOULF4 target
2016-10-03 19:42:00 +02:00
jflyper
59e78fcd8e
Fix micros using COUNTFLAG
...
Current micros() may return past time when called from ISR or elevated BASEPRI context. This is because a call to the SysTick interrupt handler sysTick_Hanlder(), which is responsible for 1ms rollover is blocked in these contexts.
This PR introduces microsISR() that is guranteed to return correct time in these contexts. Legacy micros() was also modified to call microISR() in these contexts.
The microISR() uses SysTick's COUNTFLAG to detect a pending rollover and use it to compensate the return value on its own. Actual rollover to sysTickUptime variable is still handled in the sysTick_Hanlder().
2016-10-04 01:45:23 +09:00
Konstantin Sharlaimov (DigitalEntity)
b0b987c313
Fix missing baro support for AIRHEROF3 target
2016-10-04 00:04:17 +10:00
borisbstyle
4e73f82170
Merge pull request #1261 from mmiers/soft-ser1-fix
...
X-Racer SPI: Update soft serial 1 timer hardware indices
2016-10-03 15:22:50 +02:00
Mitch Miers
123771c710
Update soft serial 1 timer hardware indices
2016-10-02 23:51:16 -04:00
