abeck70
869bfaaee5
Merge branch 'rel-15.05' into next
2015-05-19 18:20:06 +10:00
abeck70
053bd9ebb7
Map update code review comments
2015-05-19 18:17:21 +10:00
Alessio Morale
0034dbf2d2
REVONANO - Fix a missing wizard include file
2015-05-18 22:14:45 +02:00
Laurent Lalanne
7df64ada76
REVONANO - Again with Input 2 - *** PIN4 ***
2015-05-18 21:30:05 +02:00
m_thread
6bc338885e
REVONANO Fixed hardware page falsely reporting that it was changed.
2015-05-18 21:30:03 +02:00
m_thread
1e7da5a0e1
REVONANO - Added nano support for bankmodes and rates.
2015-05-18 21:30:03 +02:00
m_thread
300a2c38ca
REVONANO - Added limits for receiver port enum on nano.
2015-05-18 21:30:02 +02:00
m_thread
8dfbe69900
REVONANO - Fixed timer bank assignments and labels.
2015-05-18 21:30:02 +02:00
Laurent Lalanne
3acc4243a5
Uncrustify ground
2015-05-18 21:30:00 +02:00
m_thread
a0c82d340b
OP-1617 PlotPicker configuration change.
2015-05-18 21:30:00 +02:00
m_thread
4f1ae4c25d
OP-1617 Added PlotPicker to get readings in numbers out of scope graphs.
2015-05-18 21:30:00 +02:00
m_thread
28c257292f
OP-1659 Added HW config page.
2015-05-18 21:30:00 +02:00
m_thread
bbb0c34411
OP-1659 Updated uploader image
2015-05-18 21:29:59 +02:00
Stefan Karlsson
532b93ddbf
REVONANO - Use Nano picture on the uploader page
2015-05-18 21:29:58 +02:00
Stefan Karlsson
7877798015
REVONANO - Add missing setupwizard setup wizard support of the Nano
2015-05-18 21:29:58 +02:00
Stefan Karlsson
7252fb4207
REVONANO - Fix Auto Upload
2015-05-18 21:29:58 +02:00
Alessio Morale
15e7286078
MPU9K - merge 9k and 6k settings into a single uavo
2015-05-18 21:29:56 +02:00
Mathieu Rondonneau
66b06e4c9a
REVONANO - Add MPU9250 support
2015-05-18 21:29:42 +02:00
abeck70
9bfc68ca62
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into kfinisterre/WiresharkPlugin
2015-05-18 23:00:29 +10:00
James Duley
5048ece1b7
Merge remote-tracking branch 'dev/next' into parched/OP-1853_Ground_build_tidy_TEST
2015-05-17 22:52:01 +01:00
James Duley
28a42dade6
OP-1853 Ground build tidy: Make consistent uavobjgenerator output dir.
...
Because on windows its normally different for release and debug
2015-05-17 21:27:16 +01:00
Laurent Lalanne
888df0cb30
OP-1887 Add Receiver quality
2015-05-14 14:16:42 +02:00
Laurent Lalanne
76b8450333
Merge branch 'next' into laurent/OP-1887_PFD_update
2015-05-14 13:25:24 +02:00
abeck70
f74300c96d
Merge branch 'next' into kfinisterre/Xplane10_plugin
2015-05-14 20:46:44 +10:00
Laurent Lalanne
08536f3a01
Merge branch 'next' into laurent/OP-1887_PFD_update
2015-05-14 11:31:37 +02:00
Laurent Lalanne
10aba62bc8
OP-1887 Add tooltips over links, extended GPS info
2015-05-14 02:48:08 +02:00
Steve Evans
1771d347bb
Merge branch 'steve/OP-1803_s.bus_dropped_frames' into steve/OP-1849_flexio_com_bridge
2015-05-13 20:36:06 +01:00
Steve Evans
fd00cd8210
Merge branch 'next' into steve/OP-1803_s.bus_dropped_frames
2015-05-13 20:29:54 +01:00
James Duley
2610a4c463
OP-1853 Ground build tidy: make the gcs build handle generating its own
...
UAVOs.
This removes warnings and better handles dependencies to speed up rebuilds
New file uavobjgenerator.pri define a qmake compiler of the
uavobjgenerator
2015-05-13 12:47:28 +01:00
James Duley
9d31ca939c
OP-1853 Ground build tidy: remove targetPath as not needed.
...
Could be replaced with builtin $$shell_path but that appears
to be buggy on windows git bash
2015-05-13 12:46:04 +01:00
abeck70
e8c948c45b
Merge branch 'next' into kfinisterre/GMapsAndGeoCodeSearchFix
2015-05-13 17:46:05 +10:00
abeck70
3784357a18
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
2015-05-13 17:33:11 +10:00
abeck70
92e50c2ead
OP-1810 FOC
...
Squashed commit for clean commit as discussed in code review
Uncrustify
2015-05-13 17:19:51 +10:00
abeck70
3367313432
OP-1848 altvario gcs fix ranges
2015-05-12 22:48:49 +10:00
abeck70
65ecec8af8
OP-1848 altvario ui fix for Ki on altvario
2015-05-12 22:34:18 +10:00
Kevin Finisterre
390a8cccb5
Add search coloring back to the location search. Google Maps should be functional again. Some locations on the extents of map do not render 'North Pole, South Pole, Antarctica, etc.' currently a *non issue*
2015-05-10 16:36:01 -04:00
abeck70
d6123c018d
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
2015-05-09 14:31:57 +10:00
abeck70
78acf10f6b
OP-1791 updated warning message
2015-05-08 21:36:39 +10:00
Daniël Koek
549f0c2f60
OP-1852
2015-05-08 21:31:03 +10:00
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