PT_Dreamer
dfa60f16b3
Revert "Changed UAVO browser erase icon to reset icon."
...
This reverts commit 85ed1c364d
.
Change voted against by 2 lead devs on the review.
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
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
chris pember
c6c8ff9487
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-09-27 20:41:33 -07:00
chris pember
5306b2cb71
fixed the stylesheets so the vertical sliders arent broken looking anymore
2012-09-27 20:41:01 -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
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
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
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
chris pember
ee801431d6
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-09-24 19:41:59 -07:00
PT_Dreamer
3d5381893b
GCS-Changed relaytuning uavo to gcs readOnly
2012-09-24 22:47:18 +01:00
Laura Sebesta
2caf635acd
A couple artwork fixes for reversed motors.
2012-09-24 22:36:39 +02:00
Laura Sebesta
9d5d67a45a
Added swapping of artwork when multirotor direction reversed.
2012-09-24 22:01:19 +02:00
PT_Dreamer
af36409e80
Merge branch 'dmytro/pfd_qml' of ssh://git.openpilot.org/OpenPilot into next
2012-09-24 19:02:51 +01:00
Laura Sebesta
c3a402e52f
Add support for coaxial helicopter.
...
Untested.
2012-09-24 19:17:38 +02:00
PT_Dreamer
c04318493a
GCS- Fixes compile error
2012-09-24 13:38:14 +01:00
PT_Dreamer
8b91e19733
GCS/Telemetry Fixes reconnection loop
...
This fixes a situation where the telemetry would keep looping from the
connected to the reconnecting state. One of the situations this was
happening was going from "halt" to "boot"
2012-09-24 12:32:46 +01:00
PT_Dreamer
c8de27cbaf
GCS/Uploader Changes acording to review
...
Changed template comments.
Added UAVO hash to the GCS help dialog
2012-09-24 12:17:32 +01:00
PT_Dreamer
4e08fa548f
GCS/Uploader- Added leading zeros to git hash
2012-09-24 11:50:15 +01:00
Laura Sebesta
85ed1c364d
Changed UAVO browser erase icon to reset icon.
2012-09-24 10:24:37 +02:00
chris pember
616a27ca82
fixed that path error PT brought up in forum i hope
2012-09-23 22:34:40 -07:00
Stacey Sheldon
215ff56fe8
usbcdc: fix handling of CDC SET_LINE_CODING request
...
The SET_LINE_CODING request contains data and must be
handled as such.
Previously, the only requests that had data were IN
requests. SET_LINE_CODING is an OUT request so it
required additional changes to support a new type of
data request.
2012-09-24 00:56:25 -04:00
Stacey Sheldon
5e37448814
usb: correct enum for CDC SET_CONTROL_LINE_STATE request
2012-09-24 00:53:52 -04:00
Stacey Sheldon
c056ac5261
usbcdc: don't assert on calls when CDC is not initialized
...
The CDC interface is always advertised in the FW USB
descriptors. It is NOT always enabled/initialized at
runtime. Specifically, it can be Disabled in HwSettings.
Previously, any CDC-related query that the host would send
resulted in an assert and a watchdog.
Now, a suitable return code indicating that the request is
unsupported is returned in this scenario.
2012-09-24 00:53:12 -04:00
Stacey Sheldon
6b2d1e3d6f
uavo hash: ensure that uavo hash is stable across OSes
...
In python, os.walk() is not sorted. This can result in the
hash being computed over the files in different orders on
different OSes, or even after touching a directory.
This ensures that the files are considered in lexical order
so that the hash is stable.
2012-09-23 20:45:06 -04:00