Commit Graph

8406 Commits

Author SHA1 Message Date
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
MJ666 9e547d4d9f Merge pull request #3109 from AlienWiiBF/AF_Serial_Fix
Fix UART4 assignments for AlienFlight F4/F7
2017-05-17 21:40:43 +02:00
Michael Jakob 75483def67 Fix UART4 assignments for AlienFlight F4/F7 2017-05-17 21:02:03 +02:00
borisbstyle a5f57b64dc Merge pull request #3099 from mikeller/add_filtering_below_nyquist_frequency
Added filtering for parts of the notch filter that are below the nyquist frequency.
2017-05-17 14:04:38 +02:00
Martin Budden a452b21a59 Merge pull request #3107 from martinbudden/bf_servo_build_fix
Fix servo build
2017-05-17 07:04:27 +01:00
Martin Budden 123f927409 Fix servo build 2017-05-17 06:01:06 +01:00
Martin Budden e5ef8cdb6a Merge pull request #3106 from mikeller/add_passthru_mode_for_custom_airplane
Added PASSTHRU_MODE mode for MIXER_CUSTOM_AIRPLANE.
2017-05-17 05:47:40 +01:00
Martin Budden 212298b780 Merge pull request #3104 from martinbudden/bf_mixer_servo_tidy
Tidy of mixer and servo code
2017-05-17 05:45:33 +01:00
Martin Budden 90c4815801 Merge pull request #3101 from ledvinap/fix-sitl-warnings2
Fix warnings
2017-05-17 05:44:06 +01:00
MJ666 3026260ca2 Merge pull request #3105 from AlienWiiBF/DMA_updates
AlienFlight F4/F7 DMA updates
2017-05-17 00:13:33 +02:00
Michael Keller 8b35949e9a Added PASSTHRU_MODE mode for MIXER_CUSTOM_AIRPLANE. 2017-05-17 10:11:13 +12:00
Michael Jakob b8e35bbf3a AlienFlight F4/F7 DMA updates 2017-05-16 23:58:07 +02:00
Martin Budden 6645d43949 Tidy of mixer and servo code 2017-05-16 20:13:14 +01:00
Petr Ledvina 099bd97f0a Optional -static SITL
Use OPTION=SITL_STATIC if static SITL build is necessary
2017-05-16 15:28:07 +02:00
Petr Ledvina a8c8a413aa Select proper core for STM32F7 2017-05-16 15:27:25 +02:00
Andrey Mironov d8c4953bb5 Merge pull request #3100 from mikeller/mop_up_inverter_pin_uart_rename_leftovers
Mopped up leftovers from the INVERTER_PIN_USART => INVERTER_PIN_UART rename.
2017-05-16 15:24:25 +03:00
mikeller 9de89cd464 Added filtering for parts of the notch filter that are below the nyquist frequency. 2017-05-17 00:17:57 +12:00
mikeller ca60aac034 Mopped up leftovers from the INVERTER_PIN_USART => INVERTER_PIN_UART rename. 2017-05-16 23:59:41 +12:00
Anders Hoglund 5b17de7424 Travis update to Ubuntu 14.04 (Trusty Thar). 2017-05-16 11:22:51 +02:00
Anders Höglund 2463d5164e Merge pull request #3072 from ledvinap/fix-sitl-warnings
Fix SITL warnings
2017-05-16 11:18:10 +02:00