Sambas
019691e49d
Compile fixes
2012-10-30 20:50:58 +01:00
PT_Dreamer
fdd1b7a2a4
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-10-30 15:15:00 +00:00
PT_Dreamer
a01930b12f
GCS-PathPlanner
...
Fixes UAVO to DataModel convertion.
2012-10-30 15:13:52 +00:00
PT_Dreamer
06e56165c5
GCS-PathPlanner
...
Fixes loading path from file.
2012-10-30 13:48:02 +00:00
Stacey Sheldon
5aa3777078
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
flight/Modules/Telemetry/telemetry.c
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-10-30 00:41:35 -04:00
Stacey Sheldon
2119067722
Merge remote-tracking branch 'op-revo/james/revo' into revo-next
...
Conflicts:
Makefile
flight/Modules/Attitude/revolution/attitude.c
flight/Modules/Battery/battery.c
flight/Modules/FixedWingPathFollower/fixedwingpathfollower.c
flight/Modules/GPS/GPS.c
flight/Modules/ManualControl/inc/manualcontrol.h
flight/Modules/ManualControl/manualcontrol.c
flight/Modules/OveroSync/overosync.c
flight/Modules/PathPlanner/inc/pathplanner.h
flight/Modules/PathPlanner/pathplanner.c
flight/Modules/Sensors/sensors.c
flight/Modules/VtolPathFollower/vtolpathfollower.c
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/Boards/pios_board.h
flight/PiOS/STM32F4xx/library.mk
flight/PiOS/inc/pios_hmc5883.h
flight/PiOS/inc/pios_l3gd20.h
flight/PiOS/inc/pios_rfm22b_priv.h
flight/Revolution/Makefile
flight/Revolution/Makefile.osx
flight/Revolution/System/inc/pios_config.h
flight/Revolution/UAVObjects.inc
ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
ground/openpilotgcs/src/libs/utils/homelocationutil.h
ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/plugins.pro
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
package/Makefile
shared/uavobjectdefinition/fixedwingpathfollowersettings.xml
shared/uavobjectdefinition/fixedwingpathfollowerstatus.xml
shared/uavobjectdefinition/flightstatus.xml
shared/uavobjectdefinition/hwsettings.xml
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/pathdesired.xml
shared/uavobjectdefinition/vtolpathfollowersettings.xml
shared/uavobjectdefinition/waypoint.xml
2012-10-30 00:08:43 -04:00
David Ankers
23d4182351
Update milestones
2012-10-29 12:52:21 +11:00
Corvus Corax
6409dfb2df
Further cleanup in PathFollower. Should now be safe to fly again
2012-10-28 21:49:22 +01:00
PT_Dreamer
7a14b761ec
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-10-28 16:57:26 +00:00
PT_Dreamer
c31f08d350
GCS-PathPlanner
...
Fixes and enhancements.
2012-10-28 16:55:08 +00:00
Corvus Corax
f7dd5cc8ad
Refactored Airspeed and FixedWingPathFollowermodule to use AirspeedActual, which hitl writes to, too. Cleaned up both PathFollower and Airspeed a bit.
2012-10-28 17:45:40 +01:00
lilvinz
3db04ea174
pios_jedec: fixed usage of uninitialized memory
...
When reading the jedec device id the code only transfered one byte via spi leaving
the expected input buffer uninitialized. This may lead to the problem that flash
initialization fails because the expected input may be whatever the stack was set
when entering the function. The impact of the bug is somewhat limited tough as the
initialization usually takes place before starting up the rtos and thus is pretty
deterministic. So if the code passed init while testing it should pass init in
production as well.
2012-10-28 14:34:20 +01:00
Oleg Semyonov
245e1e36cb
Remove extra "Firmware tag" string from "On Device" uploader panel
2012-10-26 22:58:19 +03:00
PT_Dreamer
994b9d209a
Merge branch 'hyper/add-mode3-mode4-to-GCS-tx-input-wizard' of ssh://git.openpilot.org/OpenPilot into next
2012-10-26 19:46:04 +01:00
Oleg Semyonov
a17d0f8084
HotFix: temporary disable AutoTune UI until better tested
2012-10-26 16:14:36 +03:00
Stacey Sheldon
bc3a90c6a9
Merge branch 'one-way-telemetry' into next
2012-10-25 22:48:43 -04:00
Laura Sebesta
b84b8f656c
Brought out several air parameter functions from IL2 simulator and added them to the global simulator.cpp file.
2012-10-23 11:59:14 +02:00
Laura Sebesta
5e785d4524
Added body-frame acceleration to ground truth UAVO and to flight simulator output.
...
Conflicts:
shared/uavobjectdefinition/groundtruth.xml
2012-10-23 11:50:00 +02:00
Laura Sebesta
433d723251
Added groundtruth simulation support.
...
This new UAVO serves principally to log data for future comparison with
onboard estimation techniques.
Conflicts:
ground/openpilotgcs/src/plugins/hitl/il2simulator.cpp
ground/openpilotgcs/src/plugins/hitl/simulator.h
2012-10-23 11:47:58 +02:00
Oleg Semyonov
721cb16c2b
Adopt to the latest release policy
...
See http://wiki.openpilot.org/display/Doc/Release+policy
2012-10-22 23:44:01 +03:00
Oleg Semyonov
5184dc1087
Revert "Temporary fix for build label (until better system is implemented)"
...
This reverts commit 5c141d458d
2012-10-22 22:52:13 +03:00
Oleg Semyonov
73df01bce1
packaging: use release tag without date for tagged releases
2012-10-22 20:36:09 +03:00
Oleg Semyonov
46b6dad9f7
packaging: on Windows use package label passed by Makefile
2012-10-22 20:18:57 +03:00
Oleg Semyonov
2e69258ec5
version-info.py: add ${TAG} variable to the dictionary
2012-10-22 19:54:04 +03:00
Oleg Semyonov
8bfae017bd
version-info.py: ability to use positional arguments as extra dictionary keys
2012-10-22 19:52:13 +03:00
Kenz Dale
1ab1ea5899
Save ~150 bytes by moving GPSDataProtocol to SystemSettings.
...
All credit to Anstron.
2012-10-22 16:47:22 +02:00
Laura Sebesta
db15b01e35
Reenabled double-clicking on Home to set lat/lon/altitude.
...
Also reduced the size of the double-click sensitive area.
2012-10-22 10:54:13 +02:00
Stacey Sheldon
4892fdb33d
telemetry: allow telemetry to flow when not connected to GCS
...
Previously, when unconnected, only the flighttelemetrystats
UAVO was Tx'd. All other UAVOs were inhibited. This led to
zero telemetry data when the connection to the GCS was gone.
This precluded getting useful telemetry from a receive-only
station.
This commit changes two main areas.
First, UAVO updates are now allowed regardless of the "connected"
state between the GCS/FC.
Second, it makes both the flighttelemetrystats and gcstelemetrystats
UAVOs un-acked. This prevents these objects from blocking all
other UAVOs while they wait for their ack. This is OK since the
real "connection" negotiation happens via the states exchanged in
the Status field of these UAVOs.
2012-10-21 22:51:17 -04:00
Laura Sebesta
617196f106
Deleted last of the old HiTL files that didn't get automatically deleted in the merge.
2012-10-21 10:44:08 +02:00
Stacey Sheldon
4bf2db57ad
Merge remote-tracking branch 'op-public/next' into revo-next
2012-10-20 18:34:45 -04:00
Stacey Sheldon
98176d9829
makefile: include hint for enabling verbose build output
2012-10-20 15:06:18 -04:00
Stacey Sheldon
127ca1e7e1
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
ground/openpilotgcs/src/plugins/hitl/plugin.pro
ground/openpilotgcs/src/plugins/hitlnew/fgsimulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitlconfiguration.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/simulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/simulator.h
ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-10-20 13:56:18 -04:00
Stacey Sheldon
ebbefd6d54
makefile: quiet down the uavobjgenerator build output
2012-10-20 13:25:24 -04:00
Stacey Sheldon
db571d7a3c
makefile: quiet down the GCS build output
...
This removes the detailed output of the GCS build by
default so that warnings and errors become more evident.
Full output can be enabled by adding "V=1" to the make
command line. Same mechanism as is used for the firmware
builds.
2012-10-20 13:19:16 -04:00
Richard Flay (Hyper)
7b7bb0ff24
Added support for Mode 3 and Mode 4 to the TX Configuration Wizard. Fixed a number of bugs and issues in the wizard. Made some changes to wizard text and layouts as well.
2012-10-19 20:30:42 +10:30
James Cotton
aba5c65e93
GCS Config Gadget: Fix the file name for the pipx icons in the code and
...
name the icons correctly
2012-10-17 01:06:45 -05:00
James Cotton
298b052c7d
GCS Config: Crashing for an unknown board seems a bit harsh.
2012-10-17 00:57:28 -05:00
David Ankers
ec85cd7305
Spelling of Spectrum to Spektrum
2012-10-17 13:28:07 +11:00
James Cotton
b906169ac9
Merge remote-tracking branch 'origin/stac/android-build-fixes' into next
2012-10-16 14:27:20 -05:00
James Cotton
1c89b24329
Merge branch 'android-uavo-fix' into next
2012-10-16 14:27:01 -05:00
James Cotton
c1f9948a81
Merge branch 'master' into next
2012-10-16 14:26:35 -05:00
James Cotton
8fb0d70f51
AndroidGCS Telemetry: Make the connected signal only occur after all objects
...
are downloaded
In the case of a flaky connection this will render telemetry mostly masked
from the activities. However, it ensures that all the information is present
after a connection.
Some compromise is probably needed for using this in the field, such as a
tiered system:
1. Physical channel open (no idea about reception)
2. Link estabilished (at least some reception)
3. Full telemetry established (all objects synced up)
2012-10-16 12:33:06 -05:00
James Cotton
b0522a319f
AndroidGCS Telemetry: Sending an update could interrupt a pending transaction
...
We allow sending objects that don't create a transaction while waiting for one
to complete. However, this was overriding the pending transaction information
(when there wasn't a new transaction) and masking the transaction completed
message.
Note: I think this logical error can occur on the GCS side and might explain the
"transaction completed when not expected" messages.
2012-10-16 12:33:00 -05:00
David Ankers
93c76ec4bf
Update credits inside the GCS based on the project and not just code.
2012-10-17 03:27:12 +11:00
David Ankers
25cdd55cfa
Mention OGL bug with Intel 965 on out dated drivers
2012-10-17 00:13:41 +11:00
David Ankers
a20c524a84
Add MikeL
2012-10-16 23:18:19 +11:00
David Ankers
232cabd3d1
Add hardware files
2012-10-16 22:52:45 +11:00
David Ankers
0d5f6e0bd9
Add Andy
2012-10-16 22:45:00 +11:00
David Ankers
445eb20a85
one letter typeo
2012-10-16 22:16:33 +11:00
David Ankers
74bf1b10d6
Fuck, Kenn was missing, all I need.
2012-10-16 22:14:16 +11:00
