PT_Dreamer
4edf78d1cd
GCS-No more hidden settings.
2012-09-29 22:44:52 +01:00
Fredrik Arvidsson
fdec9ce149
OP-39 Fixed a lot of textual stuff.
...
Changed layout on some pages to make room for longer texts.
Changed default neutral value for output from 1080 to 1000.
Renamed 'Hexacopter H' to 'Hexacopter X'
2012-09-29 11:47:16 +02:00
Fredrik Arvidsson
3b9e50ad51
Merge branch 'next' into thread/OP-39
2012-09-29 09:43:50 +02:00
PT_Dreamer
b637bfaca9
Revert "Changed UAVO browser erase icon to reset icon."
...
This reverts commit 85ed1c364d
2012-09-28 19:36:46 +01:00
PT_Dreamer
399fc7fe85
Merge branch 'cp/extraGUIchanges' of ssh://git.openpilot.org/OpenPilot into next
2012-09-28 11:55:33 +01:00
PT_Dreamer
dfa60f16b3
Revert "Changed UAVO browser erase icon to reset icon."
...
This reverts commit 85ed1c364d
2012-09-28 11:53:19 +01:00
James Cotton
b0d8487e27
PIOS_RFM22: Make the irq return false for the exti changes
2012-09-28 02:14:15 -05:00
James Cotton
e4faece356
Merge remote-tracking branch 'origin/cp/extraGUIchanges' into next
2012-09-28 01:12:46 -05:00
James Cotton
6add7cc4d2
Fix HMC5883 driver after Vinz' changes to PIOS_EXTI
2012-09-28 01:10:46 -05:00
James Cotton
61f1140645
Merge branch 'revo' into rm2
2012-09-28 01:01:35 -05:00
James Cotton
5c13c31c08
Merge branch 'next' into revo
...
Conflicts:
ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
ground/openpilotgcs/src/libs/utils/homelocationutil.h
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
2012-09-28 01:00:10 -05:00
James Cotton
8979c00fba
Merge branch 'exti_end_switching_isr' into next
2012-09-28 00:41:08 -05:00
James Cotton
519e3e2e3a
PIOS_EXTI: Make the line task macro now take in the xHigherTaskPriority variable name
2012-09-28 00:40:36 -05:00
chris pember
e2389af30d
fixed the stylesheets vertical sliders. pushing to correct branch
2012-09-27 21:06:19 -07:00
James Cotton
f12d5c04fb
Merge remote-tracking branch 'origin/lilvinz/mpu6000_masked_locals_fix' into next
2012-09-27 14:43:54 -05:00
James Cotton
1ba40ee9b0
PIOS_EXTI: Make sure to use pdTRUE instead of true where appropriate.
2012-09-27 14:41:38 -05:00
James Cotton
1721479a12
Fix for vinz' merge to pios_mpu6000 exti changes
2012-09-27 14:34:11 -05:00
James Cotton
a021659b75
Merge remote-tracking branch 'origin/lilvinz/exti_end_switching_isr' into next
2012-09-27 14:31:16 -05:00
James Cotton
29a970564f
Merge remote-tracking branch 'origin/kenz/uavo_util_fixes' into next
2012-09-27 14:07:47 -05:00
James Cotton
303fe17969
Merge remote-tracking branch 'revo/brian/rfm22_refactor' into revo
2012-09-27 14:04:48 -05:00
James Cotton
6e114360f4
Merge branch 'next' into revo
...
Conflicts:
shared/uavobjectdefinition/taskinfo.xml
2012-09-27 14:04:44 -05:00
James Cotton
684620dce6
Merge remote-tracking branch 'origin/hyper/uavobjectparser-tweaks' into next
...
Conflicts:
shared/uavobjectdefinition/taskinfo.xml
2012-09-27 13:49:34 -05:00
Laura Sebesta
8997df2438
Merge branch 'next' into kenz/diag_stack_split
...
Conflicts:
flight/Modules/Stabilization/stabilization.c
2012-09-27 19:29:23 +02:00
Laura Sebesta
a899c87c56
Remove superflous UAVO update call.
...
Add documentation.
Remove commented code.
2012-09-27 19:21:00 +02:00
James Cotton
5326d26487
Merge remote-tracking branch 'origin/stac/usb-cdc-fixes' into next
2012-09-27 12:16:16 -05:00
Laura Sebesta
4923655cd3
Added global flag for enabling all diagnostic tools.
2012-09-27 18:51:12 +02:00
Laura Sebesta
09b8980881
Fixed copy-pasta error.
2012-09-27 18:06:48 +02:00
Laura Sebesta
9ec05d8928
Added dialog to request altitude when settings HomeLocation via the map.
...
Fixed bug in setHomeLocation, by which altitude was scaled inappropriately.
2012-09-27 14:44:26 +02:00
Laura Sebesta
f532f3cda5
Rewrote uavobjectutilmanager.cpp, such that upon UAVO changes it returns com
...
Updated homelocationutil to remove references to ECEF and RNE.
2012-09-27 11:45:59 +02:00
Fredrik Arvidsson
efd953b00c
OP-39 Fixed a bug in Welcome page button.
2012-09-27 08:18:50 +02:00
James Cotton
26408e286f
GCS Stabilization: Force the apply button to always be there as I can't find expert mode
2012-09-26 09:49:33 -05:00
James Cotton
d2842169ee
Sensors: Need to support MPU6000 for revision 3
2012-09-26 04:04:48 -05:00
James Cotton
93c44f2a4e
RM2 Temporary patch: Swap the GPIO pins and the VSense pins. This needs to be based on the hardware revision later.
2012-09-26 03:02:25 -05:00
James Cotton
333a96516c
Merge remote-tracking branch 'revo/brian/rfm22_refactor' into rm2
2012-09-26 01:40:23 -05:00
James Cotton
dadc38d82d
Revo Mini 2: Get basic LED working. Board revision is actually 3 since right now it masquerades as Revo.
2012-09-26 01:17:32 -05:00
James Cotton
0fa4b062a4
Merge branch 'next' into revo
2012-09-26 00:43:02 -05:00
Brian Webb
6972c29813
RFM22B: Added check for timeout wating for sync on receive. This virtually eliminates the number of timeouts.
2012-09-25 18:10:15 -07:00
Fredrik Arvidsson
f42085f6ac
Merge branch 'next' into thread/OP-39
2012-09-26 00:44:34 +02:00
Fredrik Arvidsson
e7e95412e8
OP-39 Fixed Wizard Style so that it looks ok on Mac and Windows
...
Changed the output calibration part of the wizard so that it is a part of the wizard flow instead of a separate flow inside one page.
2012-09-26 00:42:17 +02:00
James Cotton
f77df97699
OSGEarth: Remove function definition without implementation.
2012-09-25 13:24:08 -05:00
James Cotton
7d8c61d33d
OSGEarth: Remove reference to caching. Uses old API.
2012-09-25 13:19:18 -05:00
PT_Dreamer
43f85d9617
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-09-25 10:44:32 +01:00
PT_Dreamer
551c56f3c0
Merge branch 'pt/UAVO_Hash' of ssh://git.openpilot.org/OpenPilot into next
2012-09-25 10:43:59 +01:00
chris pember
b09041cb9f
moved the autotune checkbox up top like the other modules
2012-09-25 00:16:31 -07:00
chris pember
b4ac6a0b86
couple little tweaks, is perfect on linux and windows, close enough on osx
2012-09-24 23:46:34 -07:00
chris pember
36f830e4d3
couple little tweaks, ys, this is endless
2012-09-24 23:28:43 -07:00
chris pember
fc55a52ff4
merged kens branches, changed the wording a little on the pre-autotune page, just need someone to look at one small bit of oddness with the save and apply buttons on autotune page
2012-09-24 21:41:41 -07:00
Brian Webb
88be2ddf1e
RFM22B: Added a message timeout event to the RFM22B state machine that will fire if a packet takes too long to transmit / receive.
2012-09-24 20:51:34 -07:00
chris pember
d7eb662761
Merge branch 'kenz/erase2reset' of ssh://git.openpilot.org/OpenPilot into cp/extraGUIchanges
2012-09-24 20:26:30 -07:00
chris pember
086232406d
Merge branch 'kenz/extraGUIchanges' of ssh://git.openpilot.org/OpenPilot into cp/extraGUIchanges
2012-09-24 20:26:04 -07:00
