abeck70
ddefd11b7f
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
2015-05-07 11:28:24 +10:00
James Duley
d39639ca68
Remove old pro.user file
2015-05-06 18:23:12 +12:00
abeck70
143f09d216
Merge remote-tracking branch 'origin/rel-15.02.02' into next
...
Conflicts:
flight/modules/Actuator/actuator.c
2015-05-06 08:35:21 +10:00
abeck70
48f3922a8d
OP-1848 altvario fix default stab page
2015-05-05 22:14:18 +10:00
RS2K
77eacb2294
OP-1835 - Motor Constraints 15.02.02 100% throttle curves default
2015-05-02 17:41:47 -05:00
Laurent Lalanne
93ff480b7a
15.02.02 hotfix for tricopter servo on wizard
2015-05-02 21:02:14 +02:00
abeck70
21c54c3a37
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
2015-05-01 22:59:36 +10:00
Alessio Morale
3be43d9c9e
Merge remote-tracking branch 'origin/samguns/OP-1821_Tricopter_wrong_servo_speed' into rel-15.02.02
2015-04-28 23:47:12 +02:00
Kevin Finisterre
d591ec7117
dissector_add() was depreciated and replaced with dissector_add_uint()
2015-04-28 14:49:30 -04:00
Kevin Finisterre
25a91bc5fc
Fix some minor issues with the old Wireshark Plugin. It won't compile past Wireshark 1.8 which is way outdated.
...
added void *data _U_ to the dissecor definition per - https://ask.wireshark.org/questions/22590/dissector-handle
2015-04-28 14:21:37 -04:00
Kevin Finisterre
7f2aeb371b
Cosmetic changes to get the X-Plane 10 plugin to compile
2015-04-27 16:10:33 -04:00
Kevin Finisterre
996d8a8f48
Change the plugin names to match inclusion of both X-Plane 9 & 10
2015-04-27 15:47:48 -04:00
Kevin Finisterre
0f9218d3af
X-Plane 10 HITL & SITL protocol changes that should have been in place long ago!
2015-04-27 15:45:45 -04:00
samguns
69b404daa1
OP-1821 Commit bug fix
2015-04-27 08:45:35 +08:00
Steve Evans
55f2b2fabb
OP-1849 Fix GCS HW Settings tab to only display receiver port com-bridge if available
2015-04-26 22:19:51 +01:00
m_thread
b0b1a42aec
OP-1837 This change adds support for the Multiplex SRXL v1 and v2 protocols.
...
Protocol version is autodetected and 12 or 16 channels are supported.
SRXL is available on Flexiport of Revolution board.
2015-04-26 15:04:52 +02:00
abeck70
45ceada471
OP-1848 altvario ui fixes
2015-04-24 23:34:03 +10:00
abeck70
b9a77d7e85
OP-1848 altvario ui scaling
2015-04-24 22:42:54 +10:00
m_thread
95574494af
OP-1848 Updated Ki ranges and scale.
2015-04-24 14:06:47 +02:00
abeck70
57ba5280ef
OP-1848 altvario
...
UI scaling fixes and help text edits.
2015-04-24 17:29:19 +10:00
abeck70
e36ab50040
OP-1838 altvario
...
Fixes and tidyup.
TODO:
1. Fix UI for sliders
2. Disable vtol tuning on stabi input
3. Altitude loss feedback
2015-04-23 22:49:12 +10:00
abeck70
443b3742cc
OP-1848 altvario
...
1. Build fixes
2. Additional UI components.
2015-04-23 21:54:20 +10:00
abeck70
0d77cd95d9
OP-1848 altvari0
...
1. build fixes
2. Updated ui to use updated uavo names in altitude settings that align to the naming in vtol settings
3. Moved call the thrust altvario to pre application of PIDs for 3d axes to allow for later coupling.
2015-04-23 21:13:00 +10:00
Steve Evans
79339d677f
Merge branch 'steve/OP-1803_s.bus_dropped_frames' into steve/OP-1849_update_minimosd_via_usb
2015-04-21 07:44:50 +01:00
Alessio Morale
2571db4d96
Merge remote-tracking branch 'origin/laurent/OP-1814_Battery_reset_mAh' into next
2015-04-20 14:29:16 +02:00
abeck70
1e9bd43871
Merge branch 'next' into abeck/OP-1760-autotakeoff-squashed
2015-04-19 17:52:35 +10:00
Philippe Renon
77dfff1dac
Merge remote-tracking branch 'origin/samguns/OP-1808_make_flight_mode_optional' into next
2015-04-18 20:13:09 +02:00
Laurent Lalanne
00ac0048ee
Merge remote-tracking branch 'origin/laurent/OP-1822_Heli_tab_refresh' into next
2015-04-18 11:33:42 +02:00
abeck70
71d1757bb0
OP-1760 autotakeoff
...
Fix the gcs defines for the pathaction modes.
2015-04-17 21:01:38 +10:00
m_thread
ddb2025108
Merge branch 'thread/OP-1777_Usage_statistics' into next
2015-04-17 08:26:02 +02:00
abeck70
a52969a76b
OP-1760 Autotakeoff
...
Squashed commit as code reviews impossible otherwise due to dependencing on OP-1696
2015-04-12 21:39:31 +10:00
James Duley
af06960482
OP-1792 Makefile tidy: set dependencies for copydata by using new
...
functions addCopyFileTarget and addCopyDirTarget
2015-04-09 13:01:22 +12:00
samguns
aaf635068d
OP-1808 Code change according to review results
2015-04-06 13:10:04 +08:00
Laurent Lalanne
da4dc0e935
OP-1814 Reset consumed energy from PFD
2015-04-05 00:37:20 +02:00
Laurent Lalanne
805ee4e9b5
OP-1822 Check visibility and avoid false error that skip Mixer table to populate
2015-04-04 17:21:38 +02:00
Steve Evans
a0f180d393
OP-1803 Initial commit
2015-04-02 19:09:58 +01:00
samguns
5b76f4f96b
OP-1808 1.Make flight mode stick identification to be optional. 2. Refine some code.
2015-03-31 22:54:25 +08:00
James Duley
3a08642b40
OP-1792 Makefile tidy: Fix up the 'copydata.pro's to depend on FORCE, not be FORCE, and be aux template, not subdirs template.
2015-03-31 14:57:43 +13:00
m_thread
81050f557c
Uncrustify
2015-03-29 10:51:03 +02:00
m_thread
62bd0115fe
OP-1809 Changed Min/Max limits
2015-03-28 15:31:05 +01:00
m_thread
4bd2e889ce
Merge remote-tracking branch 'origin/samguns/OP-1781_ground_input_channel_conf' into next
2015-03-28 12:33:24 +01:00
m_thread
32e670b8f0
Merge remote-tracking branch 'origin/next' into thread/OP-1763_CloudConfigs_outside_of_Wizard
2015-03-28 10:47:01 +01:00
Philippe Renon
009faf3559
Merge branch 'filnet/OP-1797_improve_gcs_workspace_layout_reactivity' into next
2015-03-26 21:57:46 +01:00
Philippe Renon
c84849fa4b
Merge branch 'filnet/OP_1798_gcs_ophid_is_too_verbose' into next
2015-03-26 21:57:18 +01:00
samguns
44ab63d696
OP-1781 Add the stash&restore operation vehicle type in systemsettings
2015-03-25 11:07:19 +08:00
Philippe Renon
859f601279
uncrustified
2015-03-22 23:16:17 +01:00
Philippe Renon
0cab4b0016
OP-1798 fixed recently converted OPHID_DEBUG taking argument
2015-03-22 21:04:50 +01:00
Alessio Morale
fbaf39229b
Merge remote-tracking branch 'origin/cyr/OP-1739_GNSS' into next
2015-03-22 20:25:51 +01:00
Philippe Renon
0236074de4
OP-1798 moved OPHID_DEBUG_ON define to ophid.pro
2015-03-22 15:47:03 +01:00
Philippe Renon
f8b3e6d3b1
OP-1798 cleaned up ophid.pro
2015-03-22 15:44:29 +01:00