Brian Webb
948038f655
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-04-06 01:32:36 +01:00
Brian Webb
c330db3a28
Added setting of min/max frequencies on OPLink coordinator.
2013-04-06 01:32:15 +01: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
Brian Webb
61712be03d
Added 57600 kbps air datarate mode, and added setting of registers 69 and 58.
2013-04-03 02:05:51 +01: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
Oleg Semyonov
17a687e79d
Revert "Removed creation of extra directory level on Windows."
...
This reverts commit 7c85fa5885
.
2013-04-02 10:20:15 +02:00
Brian Webb
4778a12070
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-04-01 14:30:46 +01: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
Brian Webb
538d854627
Changed test for GCSRECEIVER in OPLink to PIOS_INCLUDE_GCSRCVR to match new define in pios_config.
2013-03-31 16:37:14 +01: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
Brian Webb
2568f41cf3
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-03-30 01:18:37 +01:00
Brian Webb
1cac81b3e8
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
...
Conflicts:
flight/targets/PipXtreme/System/inc/pios_config.h
flight/targets/RevoMini/System/inc/pios_config.h
2013-03-29 17:17:55 -07: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
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
Philippe Vanhaesendonck
8625eba054
Fix for OSX Lions compiler
...
OSX 10.7 and above will need the -fpermissive flag to compile
2013-03-26 22:57:08 +01:00
Philippe Renon
caa9964fe5
OP-857 OP-876 made default Options dialog size even bigger
2013-03-26 00:37:39 +01:00
Oleg Semyonov
927977216b
Revert "Makefile: better solution for MODULE_MODULENAME_BUILTIN name conversion"
...
The problem is that we have modules defined as:
Airspeed
or
Airspeed/revolution
or
Extensions/MagBaro
and, probably
Extensions/MagBaro/revolution
can be expected too.
It is impossible to get module name from such mixed cases.
So the better solution does not work for MagBaro, reverted.
This reverts commit 5d760d20fa
.
+review OPReview-422
2013-03-25 17:27:47 +02:00
Oleg Semyonov
5d760d20fa
Makefile: better solution for MODULE_MODULENAME_BUILTIN name conversion
...
Now it does not depend on board-specific part and uses module canonical name.
+review OPReview-422
2013-03-25 17:07:04 +02:00
Oleg Semyonov
9424be584c
Makefile: fix MODULE_MODULENAME_BUILTIN generation bug for revo modules
...
This converts 'ModuleName/revolution' into 'ModuleName' for macro.
+review OPReview-422
2013-03-25 16:35:20 +02:00
Oleg Semyonov
9335a50b18
Makefile: use upper case for MODULE_MODULENAME_BUILTIN macros
...
+review OPReview-422
2013-03-25 16:02:16 +02:00
Oleg Semyonov
17600ed09f
PyMite: remove from simposix Makefile and use library instead
2013-03-25 02:59:40 +02:00
Oleg Semyonov
8e7712a13f
PyMite: fix nasty build bug with open file problem on Windows
...
In fact, the cause of that error was badly written makefile rule which
generated 5 same files 5 times. If used with make -j, it tried to open
the same files for writing at the same time. Windows doesn't like this.
This is fixed now.
2013-03-25 02:03:35 +02:00
Philippe Renon
f00a972e0e
OP-833 cleaned up individual gadget options pages: dial and linear dial
2013-03-24 17:09:59 +01:00
Brian Webb
1979e8b57f
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-03-24 16:57:59 +01:00
Philippe Renon
eef25f4e9d
OP-857 OP-876 fixed regression introduced while fixing this issue
...
(settings were not handled well anymore)
- added timing debug messages
- minor cleanups
2013-03-24 16:50:17 +01:00
Oleg Semyonov
9f0710f9d5
Makefile: add comment about Android GCS compatible version hashes
2013-03-24 17:00:15 +02:00