Mike LaBranche
|
0ba8345c51
|
Merge branch 'next' into MikeL
Conflicts:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/STM32F4xx/pios_iap.c
flight/Revolution/System/inc/pios_config.h
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
|
2012-06-04 16:59:31 -07:00 |
|
Mike LaBranche
|
bf591ebe45
|
Merge branch 'next' into MikeL
Conflicts:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/STM32F4xx/pios_iap.c
flight/Revolution/System/inc/pios_config.h
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
|
2012-06-04 15:38:57 -07:00 |
|
James Cotton
|
0b828fbdd0
|
Merge branch 'next' into revo
Conflicts:
Makefile
|
2012-06-04 14:12:19 -05:00 |
|
James Cotton
|
ff0a3a156e
|
Merge remote-tracking branch 'origin/os/AeroSimRC' into next
|
2012-06-04 12:25:59 -05:00 |
|
James Cotton
|
71e14a691e
|
Merge branch 'next' into revo
|
2012-06-03 19:00:51 -05:00 |
|
Sambas
|
eb4f90f188
|
Check if Homelocation is set before calibration
|
2012-06-03 18:25:22 -05:00 |
|
Sambas
|
2ec8423334
|
Mag calibration, does this make any sense?
|
2012-06-03 18:25:22 -05:00 |
|
James Cotton
|
4d75718347
|
While change the util manager make a few other methods use static accessors.
|
2012-06-03 18:16:21 -05:00 |
|
James Cotton
|
2d80d59e93
|
Make the uavobjectutilmanager handle the error condition on saving and not
segfault when a save fails.
|
2012-06-03 17:41:51 -05:00 |
|
a*morale
|
37e5e0d2a2
|
Fixes a problem in OSX that prevent to use two serial ports with the same displayed name (for example from USB multiple serial adapter)
Now serial ports are internally referred using their physName instead of friendName
|
2012-06-03 20:31:48 +02:00 |
|
PT_Dreamer
|
08040ab5cf
|
GCS/MapLib - massive cleaning of the plugin
|
2012-06-03 19:19:00 +01:00 |
|
Sambas
|
978aba4e91
|
Check if Homelocation is set before calibration
|
2012-06-03 20:25:17 +03:00 |
|
Sambas
|
75bc00c534
|
Mag calibration, does this make any sense?
|
2012-06-03 20:25:05 +03:00 |
|
Laura Sebesta
|
054f15c529
|
Added digital RSSI output to GUI.
|
2012-06-03 12:06:07 +03:00 |
|
James Cotton
|
e82621cbeb
|
Fix waypoint deletion
|
2012-06-02 18:40:55 -05:00 |
|
James Cotton
|
0a842ac639
|
After deleting a waypoint (which really sets the last one to stop and shifts
the rest) any added waypoints were invisible. This puts the new one after the
first stop and removes the stop.
|
2012-06-02 18:40:54 -05:00 |
|
James Cotton
|
39657af8db
|
More work on deleting waypoints
|
2012-06-02 18:40:54 -05:00 |
|
James Cotton
|
e686ac0b1d
|
Start adding the ability to delete a waypoint
|
2012-06-02 18:40:53 -05:00 |
|
James Cotton
|
64ba15cf07
|
Add the ability to add waypoints via OPMap
|
2012-06-02 18:40:53 -05:00 |
|
James Cotton
|
f7e0fc1065
|
Add a long comment describing pathcompiler and store the index for each
waypoint in their description.
|
2012-06-02 18:40:52 -05:00 |
|
James Cotton
|
7492c8fec8
|
UI Fix: Remove unnecessary spacer (that triggered a warning) from input page
|
2012-06-02 18:40:52 -05:00 |
|
James Cotton
|
6b662f9b9e
|
Connect OPMapGadget to the PathCompiler so any changes in UAVOs are reflected
on the map
|
2012-06-02 18:40:52 -05:00 |
|
James Cotton
|
e348a1a582
|
Get the waypoints from UAVO, format them into LLA and emit the signal
|
2012-06-02 18:40:49 -05:00 |
|
James Cotton
|
6f6fdbe3e4
|
Finish stubbing out the path compiler class.
|
2012-06-02 18:40:41 -05:00 |
|
James Cotton
|
0f526fe67e
|
Initial commit of pathcompiler stub
|
2012-06-02 18:40:19 -05:00 |
|
James Cotton
|
f3e3a2f16b
|
Enable waypoints on the map again
|
2012-06-02 18:40:01 -05:00 |
|
PT_Dreamer
|
d0e012cbdb
|
GCS/MapLib - Added path plan manager.
|
2012-06-02 22:32:56 +01:00 |
|
Corvus Corax
|
ab28686976
|
Merge branch 'corvuscorax/new_navigation' into revo-next
|
2012-06-02 22:30:44 +02:00 |
|
PT_Dreamer
|
ed92edc421
|
GCS - Should fix crashes when opening and closing settings page
|
2012-06-02 01:12:55 +01:00 |
|
PT_Dreamer
|
3b8ca57eef
|
GCS/MapLib - added pathplanmanager class
|
2012-06-01 22:13:29 +01:00 |
|
PT_Dreamer
|
40cfe0f4d9
|
GCS/MapLib - Cleaned unused functions, added new UAVOs to objects.pro
|
2012-06-01 19:46:04 +01:00 |
|
PT_Dreamer
|
78db6d9853
|
GCS/MapLib-Added lines and circles between WPs overlay.
|
2012-06-01 15:28:35 +01:00 |
|
Corvus Corax
|
2fcbb4ee8e
|
Disabled OpenSceneGraph plugin per default. It doesn't compile without loads of extra work.
|
2012-05-31 16:49:24 +02:00 |
|
Corvus Corax
|
a2d6cb8314
|
PathAction editor: make easy selection of actions per waypoint
|
2012-05-31 04:11:13 +02:00 |
|
Corvus Corax
|
df67a3e631
|
PathActionEditor: added more buttons, always highlight active waypoint and pathaction
|
2012-05-30 18:23:10 +02:00 |
|
PT_Dreamer
|
ab78e1aca3
|
GCS - Make the welcome plugin use the workspace names instead
of the mode names.
|
2012-05-30 16:46:45 +01:00 |
|
PT_Dreamer
|
f7f6ffcab1
|
GCS/MapLib - Work continues on the future pathplaner
|
2012-05-30 16:19:36 +01:00 |
|
Sambas
|
ed1a4dada6
|
Merge remote-tracking branch 'remotes/origin/sambas/osd_test_v1' into revo-next
Conflicts:
flight/PiOS/STM32F4xx/pios_adc.c
|
2012-05-30 16:30:09 +03:00 |
|
James Cotton
|
252f61bb8e
|
A bit of preliminary cleanup and removing unused code to map gadget
|
2012-05-29 18:31:12 -05:00 |
|
James Cotton
|
fa20b0de63
|
Fix indentation in the map gadget widget before starting work on waypoints
|
2012-05-29 18:31:11 -05:00 |
|
jb
|
c95eeb92bb
|
GCS some improvements to the ripping function of the map library.
|
2012-05-29 18:31:10 -05:00 |
|
jb
|
25456e3b80
|
GCS - Added support for map ripping
|
2012-05-29 18:31:09 -05:00 |
|
Corvus Corax
|
298b6233ed
|
Merge branch 'revo-next' into corvuscorax/new_navigation
Conflicts:
flight/Libraries/paths.c
flight/Modules/ManualControl/manualcontrol.c
flight/Revolution/Makefile
shared/uavobjectdefinition/taskinfo.xml
|
2012-05-30 00:51:52 +02:00 |
|
Corvus Corax
|
7586a55fd6
|
Added an editor gadget for pathactions and waypoints - based on James
waypointeditor - no storing or loading yet
|
2012-05-29 22:48:17 +02:00 |
|
James Cotton
|
1a9e0806c1
|
Merge branch 'next' into revo-next
|
2012-05-28 22:07:29 -05:00 |
|
James Cotton
|
1e8db9f7e7
|
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2-wheel' into next
|
2012-05-28 17:51:55 -05:00 |
|
James Cotton
|
1934752d50
|
Merge branch 'revo-next' into revo
|
2012-05-28 15:23:14 -05:00 |
|
James Cotton
|
f64adcfa58
|
Merge branch 'next' into revo-next
|
2012-05-28 15:17:13 -05:00 |
|
James Cotton
|
a6e9235888
|
Make the connections in the config gadget unique and add a flag to make sure
the refreshWidgetValues is never caleld after disabling updates
|
2012-05-28 14:11:29 -05:00 |
|
James Cotton
|
52a3d0079e
|
Clean up the output widget a bit with whole it interfaces to the
configTaskWidget. Uses more of the parent functionality.
|
2012-05-28 14:11:25 -05:00 |
|