sambas
24f1362cfe
Merge remote-tracking branch 'origin/next' into sambas/diffnext
2013-04-07 18:21:59 +03:00
Oleg Semyonov
1eb6e3fd96
Merge remote-tracking branch 'origin/next-fixed-eol' into next
2013-04-07 15:41:26 +02:00
sambas
e87d7f2202
Merge branch 'sambas/diffnext' of ssh://git.openpilot.org/OpenPilot into sambas/diffnext
2013-04-07 14:57:21 +03:00
Fredrik Arvidsson
5dc467bda4
Fixed a copy&paste bug in configoutputwidget.cpp resulting in output rate for bank 5 & 6 not showing correctly in gui.
2013-04-07 11:15:24 +02:00
sambas
33bb918924
Merge remote-tracking branch 'origin/next' into sambas/diffnext
2013-04-07 09:51:18 +03:00
sambas
fb8273459f
Normalize line endings
2013-04-07 09:49:13 +03:00
Alessio Morale
b5426aa761
Merge remote-tracking branch 'origin/amorale/OP-871_gcs_revo_reset_fix' into next
2013-04-06 19:59:03 +02:00
Oleg Semyonov
5bb6b56b4a
OP-772: Normalize line endings
2013-04-05 23:46:56 +03:00
Oleg Semyonov
3bebec22f7
OP-772: Enforce line ending agreements (git 1.7.2+ required for this to work)
...
This is a part of OP-726, OP-727 tasks to normalize source code.
Use the following to normalise your local repository to be able to merge:
git rm --cached -r .
git diff --cached --name-only -z | xargs -0 git add
git commit -m "Normalise line endings"
git ls-files -z | xargs -0 rm
git checkout .
2013-04-05 23:43:58 +03:00
Oleg Semyonov
9b11ef2111
Merge remote-tracking branch 'origin/amedee/OP-888' into next
2013-04-05 19:38:17 +02:00
Oleg Semyonov
cab706125b
Merge remote-tracking branch 'origin/os/get-rid-of-build-ground-dir' into next
2013-04-05 17:07:34 +02:00
Oleg Semyonov
cd155dd349
FlightBatteryState.xml: add missing space
2013-04-05 12:44:05 +03:00
Oleg Semyonov
c1dc7ccde7
Move OPLicenseTemplate.txt from top directory to make/templates
...
It's just one step. See also OP-891 for further changes.
2013-04-05 01:03:25 +03:00
Oleg Semyonov
eb9c6e48f2
tools: now OPENPILOT_* environment variables can use Windows style slashes
2013-04-05 00:42:56 +03:00
Oleg Semyonov
f57610dc78
tools: Makefile and sh.cmd minor updates (mostly comments)
2013-04-04 23:57:43 +03:00
Oleg Semyonov
7a5c04034f
tools: update help message
2013-04-04 18:26:59 +03:00
Oleg Semyonov
cf110998a0
tools: fix MSYS tar problem with Windows path names with drive letter colon
2013-04-04 17:03:17 +02:00
Oleg Semyonov
f0780c96c6
tools: use global environment variables to set download and tools location
...
This allows to define OPENPILOT_DL_DIR and OPENPILOT_TOOLS_DIR to override
local tools download and installation directory. So the same toolchains
can be used for all working copies. Particularly useful for CI server
agents, but also for local installations.
Paths should use forward (unix-style) slashes.
If no OPENPILOT_* variables found, makefile internal DL_DIR and TOOLS_DIR
are used. They still can be overriden by the make command line parameters.
2013-04-04 16:33:19 +02:00
Philippe Vanhaesendonck
327b24c501
Tabs/Whitespaces cleanup - No code change
...
Jira OP-888 / OPReview-432
2013-04-04 14:52:16 +02:00
Oleg Semyonov
de4ca359dd
Merge remote-tracking branch 'origin/os/OP-719_arm-sdk-update' into next
2013-04-04 12:09:33 +02:00
Oleg Semyonov
f82d66d217
OP-719: fix curl "invalid time" error if target file is missing
...
+review OPReview-431
2013-04-04 13:08:48 +03:00
Philippe Vanhaesendonck
c538488294
OSX package makefile cleanup
...
Jira OP-888
Build without Nokia SDK
2013-04-03 17:41:30 +02:00
sambas
47a7659147
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
2013-04-02 20:40:41 +03:00
sambas
d776d82518
Does this fix simposix and make bamboo happy
2013-04-02 19:57:40 +03:00
Oleg Semyonov
e24b66897b
build: fix qmake ground/share copy commands for all platforms
...
Read share.pro comments for more details.
+review OPReview-429
2013-04-02 19:43:48 +03:00
sambas
4240cc9670
Flight battery to AerosimRC, needs option flag, currently linked to baroaltitude option
2013-04-02 19:29:07 +03:00
Oleg Semyonov
17a687e79d
Revert "Removed creation of extra directory level on Windows."
...
This reverts commit 7c85fa5885ed686920ca492b19186b6374711fc6.
2013-04-02 10:20:15 +02:00
Oleg Semyonov
a0e24a69aa
OP-719: upgrade ARM SDK to 4.7-2013q1 +review OPReview-431
2013-04-01 00:42:19 +03:00
Oleg Semyonov
03f7596689
OP-719: fix broken paths to other tools (still to be revised) +review OPReview-431
2013-03-31 21:52:58 +03:00
Alessio Morale
9264c8b4e2
Merge remote-tracking branch 'origin/amorale/OP-881_flashautodetect' into next
2013-03-31 18:06:52 +02:00
Oleg Semyonov
80e668411f
build: remove extra libs, they are not used de-facto
...
+review OPReview-429
2013-03-31 18:06:43 +02:00
Oleg Semyonov
b67ce783f5
OP-719: upgrade ARM SDK to 4.7-2012q4, use 'make arm_sdk_install' to install
...
+review OPReview
2013-03-31 16:59:00 +02:00
Oleg Semyonov
3e815ca8d5
build: get rid of build/ground subdirectory, fix qt-creator builds
...
This changeset:
- moves all ground targets one level up, under build directory. The
build/ground was created as a workaround, now unnecessary;
- fixes QtCreator builds, they are separated from command line builds;
- moves GCS autogenerated files into openpilotgcs-synthetics directory.
The resulting build subdirectory now looks like:
build
openpilotgcs <- Qt-Creator build directory
openpilotgcs-synthetics <- version-info and opfw_resource
openpilotgcs_debug
openpilotgcs_release <- Makefile build directory
uavobject-synthetics
uavobjgenerator
NOTE: you should update the shadow build path in QtCreator to build,
not build/ground as before.
+review OPReview
2013-03-30 17:33:38 +02:00
sambas
e43e5c5028
Add missing flightmodes into sanitycheck, pathfollower needs to be running before sanitycheck runs
2013-03-30 14:57:43 +02:00
Oleg Semyonov
ca0910370f
OP-881: flashfs: coding style fixes according to OPReview-423
...
+review OPReview-423
2013-03-29 11:26:56 +02:00
Oleg Semyonov
4be3cd4978
Merge remote-tracking branch 'origin/amedee/OP-882' into next
2013-03-29 10:44:47 +02:00
Alessio Morale
46e9e60e76
OP-881 fixed for stile compliance, added test and assertions on flash init for revolution and CC targets
...
+review OPReview-423
2013-03-29 00:30:28 +01:00
sambas
2557600257
uavobjects thing that fixes sdcard settings save on osd. Can be reverted when fix found.
2013-03-28 18:35:42 +02:00
sambas
4f7e37651c
F4 CPU temp fix(revo), I think rm still not working
2013-03-28 18:34:31 +02:00
sambas
1823135573
Android Map widget tests
...
gitignore eclipse .metadata
2013-03-28 18:32:25 +02:00
sambas
c60a750d96
AeroSimRC plugin fixes and updates
2013-03-28 18:30:14 +02:00
sambas
5ded8c6dfc
VTOL path fixes
...
Flight mode fixes
POI mode
AutoLand Tests
Simple stabilization Shortest way yaw fix
GCS map and pathplanner fixes
2013-03-28 18:29:26 +02:00
sambas
77cae9ffc3
MagBaro Extension board module
...
OSD update
OSD output module for FC
Sonar update
Flight mode fixes + poi
2013-03-28 18:20:50 +02:00
Oleg Semyonov
587b12dd3e
Makefile: using release build configuration for uavobjgenerator
2013-03-28 12:00:38 +02:00
Oleg Semyonov
beb13b32a9
OP-883: The 1st cleanup pass through PIOS and Makefiles system
2013-03-28 11:26:34 +02:00
Fredrik Arvidsson
c549218873
Fixed a bug related to the FusionAlgorithm selection in Revolution configuration.
2013-03-27 13:09:48 +01:00
Fredrik Arvidsson
0adb2b5b6f
Merge remote-tracking branch 'origin/filnet/OP-853_fix_HITL_Options_page' into next
2013-03-27 11:09:52 +01:00
Fredrik Arvidsson
0d87f7509f
Merge remote-tracking branch 'origin/filnet/OP-857_various_gcs_ui_polishing' into next
2013-03-27 11:08:52 +01:00
Fredrik Arvidsson
8423681d41
Merge remote-tracking branch 'origin/filnet/OP-833_gcs_options_dialog_ui_polishing' into next
2013-03-27 11:07:52 +01:00
Alessio Morale
e68aeb0c8e
OP-881 Make PIOS_Flash_Jedec_Init able to configure the flash chip based on Jedec Id returned using a catalog of known flash chips.
...
+review OPReview
2013-03-27 00:26:47 +01:00