1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-19 22:35:19 +03:00
Commit graph

11942 commits

Author SHA1 Message Date
Konstantin (DigitalEntity) Sharlaimov
a3e7e3cb15 [LAUNCH] Some readability refactoring; Fix bug with throttling up at zero throttle 2020-11-19 09:13:01 +01:00
Konstantin Sharlaimov
02e1fb8d13
Merge pull request #6318 from dragnea/autolaunch_no_control_during_finish
No control during Autolaunch FINISHING sequence
2020-11-19 09:09:07 +01:00
Mihai Dragnea
7df04133b6 No control during launch FINISHING 2020-11-19 09:47:35 +02:00
breadoven
011533be52 Update navigation.c
Fix tabs
2020-11-17 22:10:27 +00:00
breadoven
b91acef47e Update osd_dji_hd.c 2020-11-17 22:00:33 +00:00
breadoven
2d0c92b605 Merge branch 'master' into OSD-Nav-Message-Update 2020-11-17 21:47:14 +00:00
breadoven
8f2c2620ef Change Control to Pitch Stick
Override trigger changed from AlfHold mode to pitch stick input.
2020-11-17 21:15:37 +00:00
breadoven
43c170c981
Merge pull request #10 from iNavFlight/master
Update from IFlight master
2020-11-17 17:45:36 +00:00
Darren Lines
db8e8f5b6d
Merge pull request #5 from iNavFlight/master
Merge with master fork
2020-11-17 08:27:38 +00:00
Konstantin Sharlaimov
1a490f4d4d
Merge pull request #6307 from iNavFlight/de_move_rc_profile_adjustment
Remove ADJUSTMENT_PROFILE which was never functional
2020-11-17 08:27:55 +01:00
Konstantin (DigitalEntity) Sharlaimov
62374122f0 [RC] Remove ADJUSTMENT_PROFILE which was never functional 2020-11-17 08:13:54 +01:00
Konstantin Sharlaimov
7affe785c2
Merge pull request #6242 from Scavanger/TPA-Adjusment-V2
Add TPA to inflight adjustment (+ OSD element)
2020-11-17 08:09:27 +01:00
Konstantin Sharlaimov
efc1fa8ab0
Merge pull request #6306 from dragnea/add_manual_thr_increase_cms
Add Allow Manual Throttle Increase in the Fixed Wing/Cruise CMS menu
2020-11-17 08:06:29 +01:00
dragnea
7ca1dda83e Add Allow Manual Throttle Increase in the Fixed Wing/Cruise CMS menu 2020-11-16 23:31:01 +02:00
Konstantin Sharlaimov
b17d8a21a9
Merge pull request #6305 from iNavFlight/de_motor_status_refactor
[NAV/MIXER] Refactor getMotorStop() code for better readability
2020-11-16 21:28:25 +01:00
Konstantin (DigitalEntity) Sharlaimov
94332bc286 [NAV/MIXER] Refactor getMotorStop() code; Avoid recursion and crash when nav_overrides_motor_stop is set to NOMS_ALL_NAV 2020-11-16 20:46:50 +01:00
Konstantin Sharlaimov
4c483895cd
Merge pull request #6295 from nmaggioni/nm_gh_ci_deprecate_setenv
Migrate CI config from set-env to env files
2020-11-16 20:46:28 +01:00
Konstantin Sharlaimov
d753835cdf
Merge pull request #6304 from iNavFlight/revert-6299-revert-5988-dragnea_autolaunch_refactor
Unrevert "Autolaunch - Added a smooth end launch feature and code refactor"
2020-11-16 20:16:19 +01:00
Konstantin Sharlaimov
c1c5ed1500
Revert "Revert "Autolaunch - Added a smooth end launch feature and code refactor"" 2020-11-16 20:12:48 +01:00
Konstantin Sharlaimov
2543427966
Merge pull request #6300 from iNavFlight/de_update_cli_docs
Update CLI docs
2020-11-16 16:50:03 +01:00
Konstantin (DigitalEntity) Sharlaimov
41e721fed3 Update CLI docs 2020-11-16 15:06:10 +01:00
Konstantin Sharlaimov
65b71e0d89
Merge pull request #6299 from iNavFlight/revert-5988-dragnea_autolaunch_refactor
Revert "Autolaunch - Added a smooth end launch feature and code refactor"
2020-11-16 14:55:02 +01:00
Konstantin Sharlaimov
a9f5d3d5cd
Merge pull request #6298 from nmaggioni/nm_gh_ci_docs_workflow
Make CI check if Settings docs need to be updated
2020-11-16 14:24:42 +01:00
Konstantin Sharlaimov
d028b19ec7
Revert "Autolaunch - Added a smooth end launch feature and code refactor" 2020-11-16 14:04:13 +01:00
Niccolò Maggioni
cf4e2dced4
Make CI check if Settings docs need to be updated 2020-11-16 13:12:27 +01:00
Konstantin Sharlaimov
8fe6ec54fc
Merge pull request #6291 from nmaggioni/nm_2.6_rc1_settings_docs
Update Settings docs for 2.6.0 RC1
2020-11-16 11:40:23 +01:00
Niccolò Maggioni
e07cbeb49b
Migrate from set-env to env files 2020-11-16 11:37:13 +01:00
breadoven
181a1ce9e5 Fix Merge Correction Errors 2020-11-15 21:49:12 +00:00
Konstantin Sharlaimov
3ce5833f7c
Merge pull request #6162 from Airwide/aw-fix-osd-thr-output
Apply throttle curve/expo to OSD throttle value
2020-11-15 18:59:34 +01:00
Konstantin Sharlaimov
1a35957c16
Merge pull request #6292 from Airwide/aw-fix-smoothness-bug
Fix for control smoothness bug introduced in PR #6104
2020-11-15 18:56:21 +01:00
Konstantin Sharlaimov
311ff1220a
Merge pull request #6294 from iNavFlight/de_fix_dji_workaround_range
[DJI] Fix dji_worksrounds min/max range
2020-11-15 18:51:31 +01:00
Konstantin (DigitalEntity) Sharlaimov
27ed750e73 [DJI] Fix dji_worksrounds min/max range 2020-11-15 18:36:25 +01:00
Airwide
a3ada125d6 Fix for control smoothness bug introduced in PR #6104 2020-11-15 17:51:25 +01:00
Niccolò Maggioni
6285b7a929
Update Settings.md 2020-11-15 17:02:37 +01:00
Niccolò Maggioni
3747b1e434
Fix nav_overrides_motor_stop default docs value 2020-11-15 17:01:49 +01:00
Jonathan Hudson
ab60dfb0e2
[DOC] Cli.md: add missing 2.6 items (bind_rx, safehome), make references clickable. (#6290) 2020-11-15 12:31:38 +00:00
breadoven
efb31fcbde
Merge branch 'master' into RTH-Altitude-Override 2020-11-15 10:02:34 +00:00
breadoven
c0f5eee0b9
Merge pull request #6 from iNavFlight/master
Update Master
2020-11-15 09:57:22 +00:00
Konstantin Sharlaimov
efeefd9eb8
Merge pull request #6104 from Airwide/aw-fw-nav-smooth-throttle
Smooth throttle in navigation modes on FW
2020-11-15 08:36:42 +00:00
Konstantin Sharlaimov
b233eb6c27
Merge pull request #5988 from dragnea/dragnea_autolaunch_refactor
Autolaunch - Added a smooth end launch feature and code refactor
2020-11-15 08:27:11 +00:00
Airwide
1b44bd569c Changed limits for feature settings 2020-11-15 09:17:02 +01:00
DESKTOP-N53JVUO\mix
6d1a7f0f44 Merge branch 'master' of https://github.com/dragnea/inav into dragnea_autolaunch_refactor
# Conflicts:
#	src/main/io/beeper.c
#	src/main/io/beeper.h
#	src/main/navigation/navigation_fw_launch.c
2020-11-14 22:30:09 +02:00
dragnea
6d4c369d77 Add low throttle beeper 2020-11-14 22:19:50 +02:00
Konstantin Sharlaimov
7fd3f18484
Merge pull request #6287 from iNavFlight/de_dji_esc_temp
[DJI] Add ESC telemetry support and additional configuration parameters to DJI OSD
2020-11-14 19:53:55 +00:00
Konstantin Sharlaimov
9550e07c77
Merge pull request #6261 from shellixyz/improvement/fix_warnings
Fix a bunch more compilation warnings
2020-11-14 19:45:44 +00:00
Konstantin Sharlaimov
c7cbf4488f
Merge branch 'master' into de_dji_esc_temp 2020-11-14 17:41:52 +00:00
Konstantin Sharlaimov
c07386c3e0
Merge pull request #6067 from shellixyz/improvement/make_nav_overrides_motor_stop_tristate
Make nav_overrides_motor_stop tristate: OFF | AUTO_ONLY | ALL_NAV
2020-11-14 17:40:09 +00:00
Konstantin Sharlaimov
91a11c8b67
Merge pull request #5881 from iNavFlight/de_tf_lidar_fixes
Add Benewake TFmini initialization
2020-11-14 16:24:41 +00:00
Konstantin Sharlaimov
5d66d81a5a
Merge pull request #6086 from YuxinPan/patch-2
Return GCS waypoint in the case of waypoint 255 when GCS assist enabled
2020-11-14 16:24:18 +00:00
Konstantin Sharlaimov
d4a2971845
Merge pull request #6285 from MrD-RC/autolaunch-low-throttle-indication
Autolaunch low throttle indication
2020-11-14 16:22:50 +00:00