Commit Graph

8425 Commits

Author SHA1 Message Date
Martin Budden f3502662b9 Merge pull request #3156 from martinbudden/bf_driver_time_header
Moved time functions out of system.h into time.h
2017-05-26 14:44:41 +01:00
Martin Budden 4820d5951e Merge pull request #3137 from DanNixon/osd_cleanup
OSD tidy
2017-05-26 14:40:13 +01:00
Martin Budden 23f158913e Moved time functions out of system.h into time.h 2017-05-26 14:03:28 +01:00
Dan Nixon 79a0f9738c Correct switch indentation in osd.c 2017-05-26 09:21:27 +01:00
Martin Budden 08638f1245 Merge pull request #3154 from jflyper/bfdev-nucleof7-add-portg
[NUCLEOF7] Add TARGET_IO_PORTG
2017-05-26 09:18:41 +01:00
jflyper 37607ce6b7 Add TARGET_IO_PORTG 2017-05-26 16:11:23 +09:00
MJ666 9b03b52004 Merge pull request #3150 from AlienWiiBF/AFF3_whoop
Adding AlienFlightNG Whoop support
2017-05-25 21:37:28 +02:00
Michael Jakob fe6642a7f9 Adding AlienFlightNG Whoop support
Some general AlienFlight target updates
2017-05-25 19:28:54 +02:00
Michael Keller 4cc5b9bb69 Merge pull request #3144 from jflyper/bfdev-fix-non-stop-beeping-on-omnibusf4
[OMNIBUSF4/OMNIBUSF4SD] Protect non-CL_RACINGF4 targets from using PWM beeper
2017-05-25 08:20:19 +12:00
jflyper df83cb3f38 Protect non-CL_RACINGF4 targets from using PWM beeper 2017-05-25 02:33:06 +09:00
Anders Höglund 329c149fbb Merge pull request #3141 from AndersHoglund/vagrant_compiler_update
Update vagrant env, gcc-arm 6-2017q1-1~trusty3
2017-05-24 13:12:24 +02:00
Anders Höglund fc08691d38 Update vagrant env, gcc-arm 6-2017q1-1~trusty3 2017-05-24 12:23:28 +02:00
Martin Budden 7cf5a0e684 Merge pull request #3052 from AndersHoglund/ban_compiler_warnings
Disallow any compiler warnings by turning them into hard errors by the -Werror option.
2017-05-24 10:14:52 +01:00
Anders Hoglund 4e8a4a29b5 Run compiler with -Werror only on Travis. 2017-05-24 01:07:13 +02:00
Anders Hoglund 32b4693a50 Disallow any compiler warnings warnings by turning them into hard errors by the -Werror option. 2017-05-23 23:42:53 +02:00
Dan Nixon 36b1b581fa Further tidy up in osd.c 2017-05-23 18:17:56 +01:00
Dan Nixon 06dd634464 Reset the time since last armed counter just after stats screen display
This ensures that the time since last armed is zero when exiting the
stats display and returning to "main" OSD screen
2017-05-23 17:10:52 +01:00
Dan Nixon 4c47e2e972 Tidy formatting in osd.c 2017-05-23 17:07:56 +01:00
Dan Nixon 7b6dc1b005 Small fixes from #3133 2017-05-23 17:07:18 +01:00
borisbstyle f4e4e45aa2 Merge pull request #3135 from mikeller/fix_convert_motor_to_external
Fixed inconsistency introduced by #2880.
2017-05-23 15:17:43 +02:00
borisbstyle 29917db6f2 Merge pull request #3133 from DanNixon/osd_stats
Allow customisation of the OSD stats screen
2017-05-23 14:07:19 +02:00
Dan Nixon 562ffbdbc4 Reduce flash usage in OSD stats screen 2017-05-23 12:48:41 +01:00
Dan Nixon 5f4a72ad5b Add MSP API features for OSD stat screen toggling 2017-05-23 12:44:55 +01:00
U-DESKTOP-12PPI61\boris.bozic e6b49247f0 Merge branch 'master' of https://github.com/betaflight/betaflight 2017-05-23 13:31:15 +02:00
U-DESKTOP-12PPI61\boris.bozic 41d8455b53 Fix issue with no airmode and full throttle destabilisation 2017-05-23 13:18:42 +02:00
Michael Keller 468217c7e8 Merge pull request #3115 from ledvinap/fix-SITL
Fix SITL
2017-05-23 23:00:54 +12:00
Michael Keller 3170a88d1d Merge pull request #3098 from AndersHoglund/update_travis_env
Travis update to Ubuntu 14.04 (Trusty Thar).
2017-05-23 22:59:51 +12:00
Michael Keller 8a5a0a0543 Merge pull request #3127 from mikeller/added_esc_sensor_halfduplex_setting
Added 'esc_sensor_halfduplex' setting to enable KISSFC owners to use 'TLM' pads for ESC stelemetry lines.
2017-05-23 22:57:11 +12:00
Michael Keller f6c224bc15 Merge pull request #3125 from mikeller/fix_build_error_quad_only_and_servos
Fixed build error if USE_QUAD_MIXER_ONLY and USE_SERVOS are defined.
2017-05-23 22:54:47 +12:00
Michael Keller a1c2f79dcd Merge pull request #3113 from mikeller/reduce_ublox_firmware_size
Reduce firmware footprint of uBlox code.
2017-05-23 22:45:52 +12:00
Michael Keller 8438697955 Fixed inconsistency introducec by #2880. 2017-05-23 14:23:35 +12:00
Dan Nixon d83f0ddf5e Add fly timers to stats, add armed time OSD elem.
Added:
- Fly time stat (total time armed)
- Armed time stat (time since last arming)
- Armed time OSD element (time since last arming)
2017-05-22 18:24:11 +01:00
Petr Ledvina 9c40903713 Fix spelling 2017-05-22 14:48:29 +02:00
Petr Ledvina 919f0caa6b Fix SITL on Cygwin + minor cleanup 2017-05-22 13:25:45 +02:00
U-DESKTOP-12PPI61\boris.bozic dbdbd8724a Rename VGOODDHF4 to LUXF4OSD (agreed with target owner) 2017-05-22 10:24:30 +02:00
Michael Keller 45a8248f62 Merge pull request #3114 from theseankelly/cf2_bf_bq
Support for BigQuad deck as a CRAZYFLIE2 variant
2017-05-22 10:27:11 +12:00
Sean Kelly 5d646717fe Support for BigQuad deck as a CRAZYFLIE2 variant
Supported features in this commit:
- Mag enabled (both CRAZYFLIE2 and CRAZYFLIE2BQ)
- Brushless motors
- ESC passthrough for BLHeli programming
- CPPM Rx input
- VBat sensor
- Current sensor
- GPS Tx/Rx pins enabled
- I2C SDA/SCL enabled as UART1 (SDA = Rx, SCL = Tx)
2017-05-21 07:06:57 -07:00
Michael Keller f48d92e475 Merge pull request #3126 from McGiverGim/fix_cli_gps_lon_lat_osd_commands
Fix typo in CLI commands for OSD GPS LAT and LON
2017-05-22 00:02:41 +12:00
mikeller 6165ef6f9c Added 'esc_sensor_halfduplex' setting to enable KISSFC owners to use 'TLM' pads for ESC stelemetry lines. 2017-05-21 23:46:44 +12:00
Miguel Angel Mulero Martinez d2ea278274 Fix typo in CLI commands for OSD GPS LAT and LON 2017-05-21 13:15:32 +02:00
mikeller f15c329be3 Fixed build error if USE_QUAD_MIXER_ONLY and USE_SERVOS are defined. 2017-05-21 22:54:40 +12:00
Martin Budden b069e011fe Merge pull request #3119 from mikeller/use_targeted_optimisation_f4_f7
Switched F4 / F7 targets to use targeted optimisation as well.
2017-05-21 10:06:09 +01:00
mikeller 77907b5c1d Switched F4 / F7 targets to use targeted optimisation as well. 2017-05-21 00:22:31 +12:00
Petr Ledvina 00bd8d91d5 Fix SITL
uartOpen signature got changed, breaking SITL (hard way)

This cleans up serial_tcp a bit and uses new function name.
2017-05-19 23:19:46 +02:00
Michael Keller a3a65e1c67 Reduce firmware footprint of uBlox code. 2017-05-19 20:03:57 +12:00
Michael Keller defd35cc61 Merge pull request #3112 from flyinglemonfpv/master
Removed SDCard detection pin from KIWI
2017-05-19 12:57:37 +12:00
MARTINKOWALSKY\Martin Kowalsky f784148f2e Removed SDCard detection pin from KIWI 2017-05-18 11:54:46 +02:00
Martin Budden 1c1cebc448 Merge pull request #3111 from nathantsoi/obf7-cleanup
[obf7] a couple updates and cleanups. good eye mikeller!
2017-05-18 08:21:05 +01:00
nathan 1262317715 [obf7] whitespace tabbing for pins that arent sdcard related. remove uart comment, the code is self explanatory 2017-05-17 23:46:57 -07:00
nathan aaa72f2d68 [obf7] a couple updates and cleanups. good eye mikeller! 2017-05-17 21:11:04 -07:00