rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-10 18:24:11 +01:00
Code Issues Releases Activity
14,802 Commits 5 Branches 8 Tags 266 MiB
0e7010e67e
Commit Graph

536 Commits

Author SHA1 Message Date
m_thread
2e7eea7383 Merge remote-tracking branch 'origin/next' into thread/OP-1400_Qt_5.3.1_Upgrade 2014-08-12 10:37:15 +02:00
Alessio Morale
1f74977472 OP-1379 add base types for colour, Initial ext rgb led api definition 2014-08-12 09:44:44 +02:00
Fredrik Arvidsson
61d45181a6 OP-1398 OP-1399 OP-1400 OP-1401 Qt 5.3.1 upgrade. Cleaning up merge artifacts committed by mistake. 2014-08-12 07:37:23 +02:00
Fredrik Arvidsson
1558c6d735 Merge remote-tracking branch 'origin/shared/OP-1398_qt531_upgrade' into thread/OP-1400_Qt_5.3.1_Upgrade 
Conflicts:
	make/tools.mk
 2014-08-11 23:25:37 +02:00
Corvus Corax
c5fae5ee84 Merge branch 'next' into andrecillo/OP-1317_IMU_wind_estimation 2014-08-09 10:43:48 +02:00
m_thread
717de29648 OP-1400 Upgraded make and copydata files to use Qt 5.3.1 Opensource. 2014-08-08 13:48:36 +02:00
Alessio Morale
57a43a5587 OP-1403 - Migrate to new HMC5x83 driver and remove old HMC5883 one 2014-08-02 20:48:34 +02:00
Corvus Corax
5edb2dbae3 Merge branch 'andrecillo/OP-1317_IMU_wind_estimation' into corvuscorax/OP-1317_IMU_wind_estimation 2014-07-26 17:01:03 +02:00
Andres
ffabbc577c OP-1317 moved Butterworth filter code into flight/libraries/math/butterworth.* 2014-07-22 20:03:43 +02:00
Philippe Renon
5ee35cdd75 OP-1398 OP-1399 Windows Qt 5.3.1 upgrade - upgraded qt_sdk_install to install Qt 5.3.1 2014-07-14 18:26:25 +02:00
Laurent Lalanne
db63158bc6 OP-1390 Updated wiki link for download, removed extra space added. 2014-07-04 18:36:43 +02:00
Laurent Lalanne
99db0c5025 OP-1390 First commit - Need valid download link 2014-07-04 17:21:39 +02:00
James Duley
455c33fb29 check whether python is python 2 use python2 if not 2014-07-04 14:43:15 +12:00
Alessio Morale
c6a773363f Merge branch 'amorale/OP-943_add_malloc_for_ccsram' into next 
Conflicts:
	flight/pios/common/pios_adxl345.c
	make/apps-defs.mk
 2014-06-22 19:31:03 +02:00
Alessio Morale
a03ad41bab Merge branch 'amorale/OP-1365_pios_instrumentation' into next 
Conflicts:
	flight/modules/Attitude/attitude.c
 2014-06-22 19:13:46 +02:00
Alessio Morale
f30dd414ac Merge branch 'amorale/OP-1227_cc_high_cpu_utilization' into next 2014-06-22 16:06:08 +02:00
Alessio Morale
b3b90f1f66 OP-943 inline pios_mem function have issues with simposix. 2014-06-11 22:15:40 +02:00
Alessio Morale
613910e7cb OP-1365 fix some indentation 2014-06-11 18:57:19 +02:00
Alessio Morale
88e392260c OP-1365 Flight code instrumentation API: Allow to pass DIAG_INSTRUMENTATION=YES option to make to enable instrumentation without changing board level settings 2014-06-10 21:49:30 +02:00
Alessio Morale
520e721bdd OP-1365 Flight code instrumentation API: PiOS Implementation 2014-06-06 22:15:18 +02:00
Alessio Morale
f1923c2361 OP-1258 fix an issue with all_sdk_install on windows (still pointing to deprecated targets) 2014-05-11 13:26:36 +02:00
Alessio Morale
f9f7b62f9d OP-1258 fix an issue with Windows package (root folder is missing in the zip file) 2014-05-11 13:26:36 +02:00
Alessio Morale
858d81d501 OP-1258 make TOOL_INSTALL_TEMPLATE md5 url optional so that it defaults to fileurl.md5 2014-05-11 13:26:35 +02:00
Alessio Morale
a1afa6e889 OP-1258 updated to 2014q1, also allow to manually specify MD5 file url 
Conflicts:
	make/tools.mk
 2014-05-11 13:26:35 +02:00
Alessio Morale
7cc47e4cdc OP-1258 update toolchain installer for Linux to 4.8-2013q4, change ARM_SDK_DIR accordingly 2014-05-11 13:26:35 +02:00
Alessio Morale
3c5a41049b Merge branch 'amorale/OP-1302_updated_led_behaviour' into next 2014-05-11 12:01:53 +02:00
Alessio Morale
16df6bc58c Merge branch 'amorale/OP-1307_discovery_f4_bare' into next 2014-05-08 22:56:03 +02:00
Alessio Morale
e5d6726bb6 Merge remote-tracking branch 'origin/next' into amorale/OP-1302_updated_led_behaviour 2014-05-08 22:27:08 +02:00
Corvus Corax
e9d1a2af4b OP-1309 get rid of this horrible bound() function code duplication throughout entire flight code and put it into libraries/math 2014-04-26 17:48:54 +02:00
Alessio Morale
0aa9ef4b57 OP-1307 Bare f4 discovery platform with no sensor, for development pourpose 2014-04-22 23:46:27 +02:00
Alessio Morale
299f388245 OP-1302 Add a stub pios_notify API for user interaction/notifications 
right now all notifications produces the same output, the DRAW_ATTENTION sequence
 2014-04-13 17:42:57 +02:00
Alessio Morale
10a0f69c82 OP-1255 Win:Fixed 7z detection when it is not in path but under tools/bin 
Lin:Switch from 7zr to 7za due to wider availability
 2014-04-08 14:11:17 +02:00
Alessio Morale
c83284b21e Merge remote-tracking branch 'origin/next' into shared/OP-1252_update_to_qt521 2014-04-08 11:31:23 +02:00
Andrés Chavarría Krauser
f8f53d8801 OP-1273 Adaptations to include MS4525DO PixHawk speed sensor 2014-03-25 09:18:25 +01:00
Philippe Renon
eed38b7f35 OP-1255 removed mingw_install and python_install make targets (obsolete since Qt 5.1.1. upgrade) 2014-03-21 18:53:16 +01:00
Philippe Renon
93cb920cef OP-1255 Qt 5.2.1 upgrade : put back qt.conf generation to work around QTBUG-33254 2014-03-21 18:30:39 +01:00
Philippe Renon
40f648eab1 OP-1255 Windows toolchain : upgraded Qt from version 5.1.1 to version 5.2.1 
- Qt installer is now downloaded from official web site
- Qt is not anymore tweaked to contain the SDL SDK (see OP-1263)
- Installing Qt now requires 7-Zip to be available (run "./make/scripts/win_sdk_install.sh [<OpenPilot tools dir>]" to get it)
- SLD needs to be installed with "make sdl_sdk_install"
KNOWN ISSUE : GCS build fails unless V=1 command line arg is provided
 2014-03-20 00:46:05 +01:00
Philippe Renon
2ee3780d08 OP-1263 SDL is now downloaded and installed independently and is not added to Qt anymore 2014-03-17 20:43:38 +01:00
Alessio Morale
d778e2612c OP-1254 fix md5 url 2014-03-08 15:06:17 +01:00
Alessio Morale
b1f1c4cd0f OP-1254 Hide 7z check command line from output 2014-03-08 14:23:15 +01:00
Alessio Morale
a600ed93dc OP-1254 Check if p7zip is installed, use 7zr rather than 7z 2014-03-08 14:19:24 +01:00
Alessio Morale
0dff941cbe OP-1254 update toolchain installer to support Qt 5.2.1 2014-03-08 14:18:45 +01:00
Corvus Corax
9a6072d58c Merge branch 'next' into corvuscorax/OP-942_task-diagnostics-for-callbacks 
Conflicts:
	flight/targets/boards/simposix/firmware/Makefile
 2014-02-07 00:31:32 +01:00
Corvus Corax
723e22aa1a OP-1211 time_measurement_helper 2014-02-04 19:05:17 +01:00
Corvus Corax
5b9a17f630 OP-942 moved DelayedCallbackScheduler into pios/common 2014-02-02 20:31:37 +01:00
Alessio Morale
98076fb194 OP-1160: fixes from review 2014-01-15 11:19:35 +01:00
Alessio Morale
eeec9db3b4 OP-1160 fix openssl, missing _version receipt 2014-01-14 15:06:36 +01:00
Alessio Morale
0423d4ce99 OP-1160 Copydata was pointing to OPENSSL instead of OPENSSL_DIR, added related 
export in tool.mk
 2014-01-14 12:50:31 +01:00
Alessio Morale
1efefbd586 Fix an isssue with OpenSSL installation that was causing all_sdk_install 
to fail on windows.
 2014-01-14 11:05:16 +01:00
Alessio Morale
c9fad94b51 OP-1160 use commit.template config instead of a hook. 
Added also a _clean target to unset that config

+review OPReview-611
 2014-01-14 09:42:04 +01:00
Alessio Morale
6a3c5d05c7 OP-1160 fix +x attribute for prepare commit hook, force overwrite of destination during prepare 2014-01-13 22:04:49 +01:00
Alessio Morale
18e0269dc6 OP-1160 Fix uncrustify to automatically run twice for each file 2014-01-13 21:58:33 +01:00
Alessio Morale
ad8f4fe41c OP-1160 Add a prepare make target that installs a prepare-commit-msg hook and 
a text file containing the commit message template addition.
 2014-01-13 12:31:28 +01:00
Corvus Corax
e8150399f6 Merge branch 'corvuscorax/onboardlogging' into next OP-56 OPReview-586 OPReview-587 OPReview-585 2013-12-07 15:21:10 +01:00
Philippe Renon
56c404e778 OP-1132 added new openssl-install that downloads and install the required SSL libraries for Windows 
the missing SSLEAY32.DLL and LIBEAY32.DLL are copied to GCS bin dir
OpenSSL version 1.0.1e was downloaded from http://slproweb.com/products/Win32OpenSSL.html
 2013-12-01 23:17:48 +01:00
Corvus Corax
be9faabe92 Merge branch 'next' into corvuscorax/onboardlogging 2013-11-26 00:34:01 +01:00
Alessio Morale
bacc4d3d79 Merge branch 'master' into next 
Conflicts:
	flight/targets/boards/oplinkmini/firmware/pios_board.c
	ground/openpilotgcs/copydata.pro
 2013-11-25 01:12:10 +01:00
Corvus Corax
9dbac5d060 Enabled printf-stdarg on all targets, implemented vsnprintf() (needed for logging) 2013-11-17 18:49:50 +01:00
Corvus Corax
6031200aea Some fixes in debuglog to compile and run on all firmware platforms 2013-11-17 18:04:47 +01:00
Alessio Morale
69372ea62a OP-835 Linux SDK Installer: md5 url changed to OP ones 2013-11-03 14:31:28 +01:00
a*morale
4be59a01f1 OP-1101 Linux SDK Installer: fixed missing tabs causing issues in OSX 2013-11-02 17:08:12 +01:00
Alessio Morale
d2355c665d Merge branch 'amorale/OP-835_linux_sdk_installer' into next 2013-11-02 12:16:23 +01:00
Alessio Morale
8fca8122f4 OP-835 Linux SDK Installer: fix "non conformant" installation paths 
+review OPReview-577
 2013-10-27 13:58:32 +01:00
Alessio Morale
cbb7fcfa9d OP-835 Linux SDK installer: fixes for readmes and some cleanup 2013-10-26 16:39:31 +02:00
Alessio Morale
e331d6e8ad OP-835 Fixes for Linux32, remove duplicated file 2013-10-26 16:28:52 +02:00
Alessio Morale
ff8031d469 OP-835 Add +x attribute to downloaded QT installer 2013-10-26 15:45:33 +02:00
Alessio Morale
7b95bf75a3 OP-835 Add -L parameter to Curl to handle redirects 2013-10-26 15:12:34 +02:00
Alessio Morale
0e35fd15cb OP-835 enable qt_sdk_install target for Linux64 target 2013-10-26 15:07:49 +02:00
Philippe Renon
d08445f0b5 [OP-1085][OP-1094] Turn on Progress for large SDK downloads / remove for MD5 files 
This commit removes progress when downloading md5, adding progress for big
files was committed as part of OP-1085
 2013-10-26 11:56:56 +02:00
Philippe Renon
6bfef53b81 [OP-1085] Qt5.1.1 - made curl report progress by default (can be switched off by adding BATCH=1 on make command line) 2013-10-24 00:11:58 +02:00
Philippe Renon
0aad8afc90 [OP-1085] upgraded to Qt 5.1.1 2013-10-21 23:59:23 +02:00
Philippe Renon
2d3076e9b8 [OP-835] Upgrade toolchain system to Qt 5.1 (Windows only, use packages for Linux and OSX) 2013-09-15 23:24:13 +02:00
David
86a02d693e Update copy data for ssl, readme is way out of date, changed one 
line but on a read through, it's very out of date now as things
are easier now. Might be best to link to the Wiki...
 2013-08-17 00:51:09 +10:00
Brian Webb
e246ecf536 Moves pios_led functionality to pios_gpio and makes pios_led a thin layer over pios_gpio. Supports configuring multiple sets of GPIOs. 2013-07-28 07:01:08 -07:00
Brian Webb
774a74884a OP-932 Replaces the RFM22B PPM/receiver code with an OPLinkReceiver UAVObject. This object is generated on a coordinator OPLink, and is used by both the OPLink to generate PPM output, and the OPLinkReceiver on the Revo. 2013-06-26 17:57:11 -07:00
Brian Webb
08efc8d152 OP-932: Adds an oplink receiver device, which is based on the gcs receiver device, but uses the OPLinkReceiver UAVObject. The OPLinkReceiver packets are generated on the OPLink modem. 2013-06-26 17:56:20 -07:00
Oleg Semyonov
b6312b3faa OP-910: update python path comment in make/tools.mk to keep in sync 2013-06-06 11:12:21 +03:00
Oleg Semyonov
b5711b8835 Change build-info.txt format from DOS to Unix 
It is used by Bamboo server shell scripts, and being CRLF terminated,
this sometimes results in broken file names, for example, of Android
package.
 2013-05-29 16:38:36 +03:00
Oleg Semyonov
444431579e OP-770: add/rename some version-info.py template variables 2013-05-25 23:02:29 +02:00
Oleg Semyonov
0798d8e330 OP-891: move firmware_info template under flight directory 2013-05-20 01:12:45 +03:00
Oleg Semyonov
97b4433a36 Merge remote-tracking branch 'origin/thread/OP-955_Version_Info_Improvements' into next 2013-05-19 15:22:55 +02:00
Oleg Semyonov
4a93e739de OP-955: remove old copy of moved file 2013-05-19 00:11:27 +03:00
Alessio Morale
c1f767b12d Merge remote-tracking branch 'origin/amorale/OP-954_logfs_settings_in_internal_flash' into next 
Conflicts:
	flight/pios/common/pios_flashfs_logfs.c
 2013-05-18 15:53:25 +02:00
Alessio Morale
6ba15ebc53 OP-954 Fixes from review: 
- CopterControl target fix
- tabs in Nakefiles
- Removed duplicate stale settings and clean empty lines in osd Makefile
+review OPReview-470
 2013-05-15 23:18:50 +02:00
Richard Flay (Hyper)
ed68fbe68d OP-951: Adds -Wshadow to flight CFLAGS and fixes resulting compilation breakage. 
+review OPReview
 2013-05-14 07:01:45 +09:30
Alessio Morale
d555bd0673 Uses Internal flash for system settings storage repourposing external flash for "User" storage 2013-05-11 22:06:30 +02:00
Richard Flay (Hyper)
cf14608ebe Merge branch 'next' into hyper/OP-936_task-monitor-rework 2013-05-09 19:25:02 +09:30
Alessio Morale
93bad2e8c2 Merge branch 'amorale/OP-917_f4_bootloader_updater' into next 
***** PLEASE NOTE  ***** From this revision all F4 based boards (Revolution/OSD) needs bootloader version  5 to boot properly

Conflicts:
	flight/pios/stm32f4xx/libraries/CMSIS2/Device/ST/STM32F4xx/Source/osd/system_stm32f4xx.c
	flight/targets/boards/osd/board-info.mk
	make/boot-defs.mk
	make/common-defs.mk
 2013-05-07 21:02:41 +02:00
Richard Flay (Hyper)
fbc8bc698f OP-936: Merges branch 'next' into hyper/OP-936_task-monitor-rework, fixes damage/conflicts, 
and brings the callback scheduler into the fold.

+review OPReview-461
 2013-05-06 19:11:14 +09:30
Richard Flay (Hyper)
a2d8544931 OP-931: adds -Wextra compiler option for the flight code, and makes the bazillion code changes required 
to make the flight code compile again. Needs careful review, particularly all the fixes for the
signed vs unsigned comparisons.

+review OPReview-459
 2013-05-05 16:32:24 +09:30
Richard Flay (Hyper)
5b61466259 OP-931: Adds -Wdouble-promotion compiler option and fixes problems that the compiler then identifies. 
+review OPReview-459
 2013-05-04 19:24:01 +09:30
Richard Flay (Hyper)
87fcf9fa8b Merge branch 'next' into hyper/OP-931_extra_compiler_warnings and update as necessary. 
Hopefully properly fixes conflicts:
	flight/modules/Attitude/attitude.c
	flight/modules/ManualControl/manualcontrol.c
	flight/modules/Osd/WavPlayer/wavplayer.c
	flight/modules/Osd/osdgen/osdgen.c
	flight/modules/System/systemmod.c
	ground/uavobjgenerator/generators/flight/uavobjectgeneratorflight.cpp
 2013-05-04 11:12:44 +09:30
Oleg Semyonov
137ddbf73a Fix broken unit tests 2013-05-03 20:27:03 +02:00
Oleg Semyonov
ee1a149888 tools: add gtest_install and build_sdk_* 2013-05-03 20:26:44 +02:00
Sambas
4d19fd5989 Merge remote-tracking branch 'remotes/origin/sambas/diffnext' into next 2013-05-03 07:58:17 +03:00
Richard Flay (Hyper)
84e1a81f8b OP-936: Moves the task monitor code out of the flight library and into PiOS. 
This move and rework also breaks the dependency of the task monitor on the UAVO subsystem,
and pushes the responsibility for updating the TaskInfo UAVO into the System module.

+review OPReview
 2013-05-03 07:01:14 +09:30
Oleg Semyonov
dd181904fc Fix version-info.py utility to back off gracefully if no git in the PATH 2013-05-02 19:05:00 +02:00
Sambas
f7b9223827 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 
Conflicts:
	flight/modules/System/systemmod.c
	shared/uavobjectdefinition/taskinfo.xml
 2013-05-02 09:00:12 +03:00
Oleg Semyonov
a5d63eb452 tools: make nsis_install (Windows only) 2013-05-01 22:44:11 +03:00
Oleg Semyonov
b30385d4fa uncrustify: use no spaces in empty for statements: for ( ; ;) -> for (;;) 
It can be rolled back and a space after last semicolon could be added
if desired: for ( ; ; ). But it looks not nice in ~20 files where
this statement is used.
 2013-05-01 12:01:51 +03:00
Oleg Semyonov
363e1705cf uncrustify: update configuration (EOL comment and class indents, extra ';' removals) 2013-04-30 16:54:28 +02:00
Oleg Semyonov
0394a3511c Rename template files to *.template to screen from uncrustify processing 2013-04-30 16:54:27 +02:00
Richard Flay (Hyper)
742058da8c Merge branch 'next' into hyper/OP-931_extra_compiler_warnings 2013-04-30 20:44:49 +09:30
Richard Flay (Hyper)
7937ae6296 OP-931: Makes flight code compile with -Wfloat-equal and -Wunsuffixed-float-constants enabled. 
Also fixes warnings (and bugs) in F4 STM32_USB_OTG_Driver code, allowing -Werror to be enabled for all flight code.
Fixes all other compiler warnings that would otherwise cause the flight code to not compile with -Werror enabled.
Along the way, this also adds some uses of isnan() to various places rather than questionable tests for x != x and
x == x to check for NaNs.

+review OPReview
 2013-04-30 20:36:42 +09:30
Oleg Semyonov
55c406066d tools: add doxygen_install and docs_* targets 2013-04-29 02:05:15 +02:00
sambas
9fec3f5567 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 2013-04-27 13:39:58 +03:00
Alessio Morale
2e6835a2a3 Merge remote-tracking branch 'origin/next' into amorale/OP-917_f4_bootloader_updater 2013-04-27 12:25:54 +02:00
Richard Flay (Hyper)
fd1181959c Merge branch 'hyper/OP-913-flight-uavo-alignment' into next 2013-04-27 18:19:01 +09:30
Alessio Morale
b21146b8e3 OP-917 bootloader updater for F4 targets. Initial commit 2013-04-27 00:56:47 +02:00
Oleg Semyonov
fa8c2f239c Merge remote-tracking branch 'origin/amedee/OP-921' into next 2013-04-26 17:43:26 +03:00
Oleg Semyonov
e2fd821e97 Merge remote-tracking branch 'origin/next' into sambas/diffnext 
Conflicts:
	make/common-defs.mk
 2013-04-26 16:31:19 +03:00
sambas
abe3742217 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 
Conflicts:
	flight/Libraries/CoordinateConversions.c
	flight/Libraries/paths.c
	flight/Modules/System/systemmod.c
	flight/PiOS/STM32F4xx/pios_sys.c
	flight/targets/boards/coptercontrol/pios_board.h
	flight/targets/boards/revolution/pios_board.h
	flight/targets/boards/revoproto/pios_board.h
 2013-04-25 17:26:49 +03:00
Oleg Semyonov
25d0e8fcab Rename PiOS/STM32F10x->PiOS/stm32f10x, PiOS/STM32F4xx->PiOS/stm32f4xx 2013-04-25 13:13:39 +03:00
Oleg Semyonov
f20f89da35 Rename PiOS/Common->PiOS/common 2013-04-25 13:13:39 +03:00
Oleg Semyonov
66db978244 Rename Libraries->libraries, Modules->modules 2013-04-25 13:13:36 +03:00
Philippe Vanhaesendonck
b3de04d09f Handle Mach-o object format for UAVOs 
Jira OP-921
 2013-04-24 22:39:39 +02:00
Oleg Semyonov
0414231408 Move uncrustify config from flight to make/uncrustify/ 2013-04-24 22:49:17 +03:00
Oleg Semyonov
748b28f4f4 Move doxygen config from flight to make/doxygen/ 2013-04-24 22:44:40 +03:00
Oleg Semyonov
33ed88e696 Merge remote-tracking branch 'origin/next' into os/OP-899_board-rename-and-config-rework 2013-04-24 21:28:33 +02:00
Oleg Semyonov
15fd460275 Normalize line endings for *.sh after .gitattributes update 2013-04-24 20:09:38 +02:00
Oleg Semyonov
0bff67822b tools: yet another fix for md5 calculation 2013-04-24 16:42:47 +03:00
Oleg Semyonov
f283b66a2f uncrustify: add config comment for "don't indent this section" option 2013-04-24 12:52:36 +03:00
Oleg Semyonov
21e7e95f87 Merge remote-tracking branch 'origin/os/add-uncrustify' into next 2013-04-24 02:31:41 +02:00
Oleg Semyonov
406339eb49 Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3 
Conflicts:
	flight/Libraries/inc/op_dfu.h
	flight/Libraries/op_dfu.c
	flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
	flight/targets/Bootloaders/OSD/op_dfu.c
	flight/targets/boards/coptercontrol/bootloader/inc/op_dfu.h
	flight/targets/boards/coptercontrol/bootloader/op_dfu.c
	flight/targets/boards/oplinkmini/bootloader/inc/op_dfu.h
	flight/targets/boards/oplinkmini/bootloader/op_dfu.c
	flight/targets/boards/osd/bootloader/inc/op_dfu.h
	flight/targets/boards/osd/bootloader/op_dfu.c
	flight/targets/boards/revolution/bootloader/inc/op_dfu.h
	flight/targets/boards/revolution/bootloader/op_dfu.c
	flight/targets/boards/sensortest/bootloader/inc/op_dfu.h
	flight/targets/boards/sensortest/bootloader/op_dfu.c
	make/boot-defs.mk
 2013-04-24 00:37:39 +03:00
Alessio Morale
57ca1639cc Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next 
Conflicts:
	flight/Libraries/op_dfu.c
	flight/PiOS/STM32F10x/pios_iap.c
	flight/PiOS/inc/pios_iap.h
	flight/targets/BootloaderUpdater/main.c
	flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
	flight/targets/Bootloaders/CopterControl/op_dfu.c
	flight/targets/Bootloaders/OSD/inc/op_dfu.h
	flight/targets/Bootloaders/PipXtreme/op_dfu.c
	flight/targets/Bootloaders/RevoMini/inc/op_dfu.h
	flight/targets/Bootloaders/RevoMini/op_dfu.c
	flight/targets/Bootloaders/Revolution/inc/op_dfu.h
	flight/targets/Bootloaders/Revolution/op_dfu.c
	ground/openpilotgcs/src/plugins/uploader/uploader.ui
	make/apps-defs.mk
	make/boot-defs.mk
 2013-04-23 23:14:11 +02:00
Oleg Semyonov
3f2431c04f OP-899: move board-specific pios_board.h files into board directories 2013-04-24 00:07:06 +03:00
Oleg Semyonov
f7332f6905 OP-899: remove extra copy of pios_usb_data.c and move it level up 2013-04-24 00:07:06 +03:00
Oleg Semyonov
1dd20eca33 OP-899: move board_hw_defs.c under board directories and fix some includes 2013-04-24 00:07:06 +03:00
Oleg Semyonov
393b37fa7a OP-899: move board-info.mk from make/boards to board directories 2013-04-24 00:07:06 +03:00
Oleg Semyonov
f7f842687a OP-899: rename System to firmware and move Makefile into it 2013-04-24 00:07:06 +03:00
Oleg Semyonov
399cafe7d7 OP-896: rename RevoMini to Revolution 2013-04-24 00:07:05 +03:00
Oleg Semyonov
6afbef01eb OP-896: rename Revo to SensorTest 2013-04-24 00:07:04 +03:00
Oleg Semyonov
fdd0ed39e0 OP-896: remove old board configs (ESC, INS, OpenPilot) 2013-04-24 00:07:04 +03:00
Oleg Semyonov
1ded536056 OP-896: rename OPLink to OPLinkMini 2013-04-24 00:07:04 +03:00
Brian Webb
ba7b712cf1 Changed all references to PipXtreme on flight side to OPLink. 2013-04-24 00:07:03 +03:00
Richard Flay (Hyper)
146e082e74 OP-913: ensured that UAVO data structs in .bss/.data sections and on the stack have 4 byte alignment. Also changed linker options to sort common and sort sections by alignment, which reduces the amount of fill/padding in the .bss and .data sections. 
+review OPReview-444
 2013-04-23 22:34:58 +09:30
Oleg Semyonov
f9816175d0 tools: replace md5sum by openssl (now works on Windows/Linux/OSX) 
See also: OP-719, OPReview-441
 2013-04-22 21:37:34 +02:00
Oleg Semyonov
34983fa643 uncrustify: add some alignments to the configuration 
See also: OPIN-3
 2013-04-22 21:35:45 +02:00
Oleg Semyonov
8d1e1fdbc0 tools: make uncrustify_install target, script and base config file 
See also: OPIN-3
 2013-04-22 21:35:25 +02:00
sambas
8aa5748a8c Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 2013-04-20 10:59:00 +03:00
Oleg Semyonov
491e89b165 make: sort wildcard sources to make binaries identical on all platforms 
Thanks to Amedee for finding the cause of the difference and CorvusCorax
for participating in the discussion.
 2013-04-19 20:43:31 +02:00
Oleg Semyonov
f15249ff07 make: fix bu_* targets 2013-04-18 17:50:34 +03:00
Oleg Semyonov
509a1b4fe1 make: fix *_program targets (were broken for firmware) 2013-04-18 17:37:12 +03:00
Oleg Semyonov
b7de3c99d8 tools: fix typo in comments 2013-04-18 16:03:05 +02:00
Oleg Semyonov
f7236eb180 tools: add Linux 64bit native ARM toolchain 2013-04-18 15:45:38 +03:00
Oleg Semyonov
61bb82ca15 gcs: find python in tools building with Qt-Creator 
This fix uses the same approach as OpenPilot toolchain system,
but for build started from Qt-Creator.
 2013-04-17 19:08:02 +02:00
Oleg Semyonov
59f8a99ab7 make: warn users about old ARM toolchain instead of cryptic 'no such file' error 2013-04-16 21:26:36 +02:00
sambas
ab8ab4bcc6 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 2013-04-15 17:41:06 +03:00
Oleg Semyonov
354924deed OP-719: suggest to use native Qt 4.8.x package on Linux and OSX 
+review OPReview-441
 2013-04-14 23:46:15 +02:00
Oleg Semyonov
d3ad4d3106 OP-719: provide pre-fetch and post-extract options to install template 
+review OPReview-441
 2013-04-14 23:46:14 +02:00
sambas
388489226d typo fix, fix EE_BANK usage 2013-04-14 13:08:09 +03:00
sambas
bb4aa08a15 Merge remote-tracking branch 'origin/sambas/diffnext' into amorale/osd_settings_on_flash 2013-04-14 12:32:26 +03:00
sambas
589290dbd7 POI orbit + some code run thru code formatter 2013-04-14 12:23:47 +03:00
Oleg Semyonov
159dae9c9b OP-719: print error message if curl is not available and stop 
+review OPReview-441
 2013-04-14 04:17:10 +03:00
Oleg Semyonov
28314ec170 OP-719: add linux x64 version of qt-4.8.4 
It seems we must ship GCS with all Qt libs like we do for Windows.
On Ubuntu x64 the GCS built with this crashes using system libs.

But since it's possible to build GCS using natively installed
Qt SDK, it is not a problem for now. Something is better than
nothing, and two ways of building are better then just one.

+review OPReview-441
 2013-04-13 22:51:33 +03:00
Oleg Semyonov
5be0a1919e OP-719: add md5 checksumming 2013-04-12 10:56:12 +02:00
Oleg Semyonov
3967874996 OP-719: use common tool install template 2013-04-12 10:56:11 +02:00
Oleg Semyonov
34b15fedaf OP-719: make python_install (Windows) 2013-04-12 10:56:10 +02:00
Oleg Semyonov
c0878f290d OP-719: make qt_sdk_install (Linux) 2013-04-12 10:56:08 +02:00
Oleg Semyonov
e4d91218b6 OP-719: make qt_sdk_install mingw_install (Windows) 2013-04-12 10:56:07 +02:00
Oleg Semyonov
ea06337573 OP-719: make/scripts/win_sdk_install.sh 2013-04-12 10:56:06 +02:00
Alessio Morale
09d2ba1d25 OP-874 merge of amorale/OP-874_gcs_rescue_erase_settings in next. 
+review OPReview-421
 2013-04-08 01:10:37 +02:00
sambas
fb8273459f Normalize line endings 2013-04-07 09:49:13 +03: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
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
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
f57610dc78 tools: Makefile and sh.cmd minor updates (mostly comments) 2013-04-04 23:57:43 +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
f82d66d217 OP-719: fix curl "invalid time" error if target file is missing 
+review OPReview-431
 2013-04-04 13:08:48 +03: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
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
Alessio Morale
8698bcfb84 Moved OSD settings from SDCard to mcu internal flash memory 2013-03-30 15:47:22 +01: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
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
8f977a4411 Final step: lot of small fixes, last commit in this commit series 
This is the first cleanup pass through makefiles and pios.
Probably it is difficult to track changes due to the nature of them.
I would recommend to look at resulting files and compiled code instead.

NOTE: original branch was rebased and lot of conflicts were fixed on
the way. So do not expect that every commit in this series will be
buildable (unlike original branch). Only final result was tested.

The main goal was to remove as much duplication of code (and copy/paste
errors) as possible, moving common parts out of Makefiles. It still is
not perfect, and mostly no code changes made - Makefiles and #ifdefs only.
But please while testing make sure that all code works as before, and no
modules/options are missed by accident.

Brief list of changes:
- Moved common parts of Makefiles into the set of *.mk files.
- Changed method of passing common vars from top Makefile to lower ones.
- Some pios cleanup, mostly #ifdefs, and all pios_config.h files.
- Many obsolete files removed (for instance, AHRS files, op_config.h).
- Many obsolete or unused macros removed or fixed/renamed (ALL_DIGNOSTICS).
- Unified pios_config.h template. Please don't remove lines for board
  configs, only comment/uncomment them. Adding new PIOS options, please
  propagate them to all board files keeping the same order.
- Some formatting, spacing, indentation (no line endings change yet).
- Some cosmetic fixes (no more C:\X\Y\filename.c printings on Windows).
- Added some library.mk files to move libs into AR achives later.
- EntireFlash target now uses cross-platform python script to generate bin
  files. So it works on all supported platforms: Linux, OSX, Windows.
- Top level packaging is completely rewritten. Now it is a part of top
  Makefile. As such, all dependencies are checked and accounted, no
  more 'make -j' problems should occur.
- Default GCS_BUILD_CONF is release now, may be changed if necessary
  using 'make GCS_BUILD_CONF=debug gcs'.
- GCS build paths are separated into debug and release, so no more obj
  file clashes. Packaging system supports only release builds.
- New target is introduced: 'clean_package'. Now 'make package' does not
  clean build directory. Use clean_package instead for distributable builds.
- Targets like 'all', 'opfw_resource', etc now will print extra contex
  in parallel builds too.
- If any of 'package', 'clean_package', 'opfw_resource' targets are given
  on command line, GCS build will depend on the resource, so all fw_*.opfw
  targets will be built and embedded into GCS. By default GCS does not
  depend on resource, and will be built w/o firmware (unless the resource
  files already exist and the Qt resource file is generated).
- fw_simposix (ELF executable) is now packaged for linux. Run'n'play!
- Make help is refined and is now up to date.

Still broken:
- UnitTests, should be fixed
- SimPosix: buildable, but should be reworked.

Next planned passes to do:
- toolchain bootstrapping and packaging (including windows - WIP)
- CMSIS/StdPeriph lib cleanup
- more PIOS cleanup
- move libs into AR archives to save build time
- sim targets refactir and cleanup
- move android-related directories under <top>/android
- unit test targets fix
- source code line ending changes (there are many different, were not changed)
- coding style

Merging this, please use --no-ff git option to make it the real commit point

Conflicts:
	A lot of... :-)
 2013-03-24 13:06:24 +02:00
Oleg Semyonov
7e02642b01 Move 3rd party printf formatter functions from PiOS to Libraries folder 
They are not a PiOS, but 3rd party libraries. They even should not
be placed to the same (PiOS) library directory due to the printf symbol
clashes (if all *.c from the folder are built). So they are moved, and
each target can include that one which is necessary/desired.
 2013-03-24 13:06:06 +02:00
Oleg Semyonov
f3d587ad12 Makefile: better options sequence in common-defs.mk 2013-03-24 13:06:01 +02:00
Oleg Semyonov
5c13162824 Makefile: some rearrangements between apps-defs.mk and target Makefiles 
Conflicts:
	flight/targets/PipXtreme/Makefile
	make/apps-defs.mk
 2013-03-24 13:06:00 +02:00
Oleg Semyonov
9b3d3e62ab Makefile: fix Makefile for BootloaderUpdater (STM32F10x only targets) 
Conflicts:
	flight/targets/Bootloaders/BootloaderUpdater/Makefile
 2013-03-24 13:05:52 +02:00
Oleg Semyonov
91f14768db Makefile: fix mk files, now both CC and PipX are buildable using common defs 
Conflicts:
	make/apps-defs.mk
 2013-03-24 13:05:50 +02:00
Oleg Semyonov
f65ff0585f Makefile: add make/common-defs.mk and use it to build bootloaders (STM32F10x) 
Conflicts:
	make/boot-defs.mk
 2013-03-24 13:04:15 +02:00
Oleg Semyonov
b7545c6f57 Makefile: add --warn-common and --fatal-warnings to identify name clashes 
This will stop builds if few same symbols are found when linking.
It should not be the case, but possible and may give unpredicted results.
 2013-03-24 13:04:13 +02:00
Oleg Semyonov
db0cdc6a0c Remove (almost) exact copy of dosfs from F1-specific directory 
The difference was in dfs_sdcard.c, line 107:

-if((status = PIOS_SDCARD_SectorRead(sector, buffer)) < 0) {
+if((status = PIOS_SDCARD_SectorRead(sector, buffer)) != 0) {

Currenly unused, kept as is.
 2013-03-24 13:04:11 +02:00
Oleg Semyonov
27822d0cd4 Makefile and pios_config.h cleanup for PipXtreme 
Now PipXtreme uses the same apps-defs.mk file as CopterControl.
Next steps are F4 boards.

Conflicts:
	flight/targets/PipXtreme/Makefile
	flight/targets/PipXtreme/System/inc/pios_config.h
 2013-03-24 13:04:08 +02:00
Oleg Semyonov
7e4596ff35 Makefile: fix some MODULE_Name_BUILTIN checks and Makefile 
These names are automatically generated by make using the list
of mandatory (always started) modules. Wrong names mean they can
be disabled, fixed now.

Conflicts:
	flight/Modules/Radio/radio.c
 2013-03-24 13:04:06 +02:00
Oleg Semyonov
a1e17eccf3 pios: fix packet handler #ifdef guards and Makefile 
Conflicts:
	flight/Libraries/packet_handler.c
	flight/targets/CopterControl/System/inc/pios_config.h
 2013-03-24 13:04:04 +02:00
Oleg Semyonov
f7bdcdb782 Makefile: firmware makefiles cleanup (CC) 
Conflicts:
	flight/targets/CopterControl/Makefile
 2013-03-24 13:04:03 +02:00
Oleg Semyonov
75ef685c6e Makefile: bootloader makefiles cleanup 
Conflicts:
	flight/targets/Bootloaders/CopterControl/Makefile
	flight/targets/Bootloaders/OSD/Makefile
	flight/targets/Bootloaders/PipXtreme/Makefile
	flight/targets/Bootloaders/RevoMini/Makefile
	flight/targets/Bootloaders/Revolution/Makefile
 2013-03-24 13:04:01 +02:00
Oleg Semyonov
8a98920f3d Makefile: use exported variables in firmware-defs.mk 
Note that $(QUOTE) variable is uppercased. Windows make does not
export lowercased variables with export keyword (even if must do).

Conflicts:
	make/firmware-defs.mk
 2013-03-24 13:04:00 +02:00
Oleg Semyonov
23c605ffba Makefile: indents, comments, spacing, $(CMDS) variables, etc. 
How to invoke external command instead of shell builtin on Windows:
ECHO := /bin/echo

Conflicts:
	Makefile
 2013-03-24 13:03:58 +02:00
Oleg Semyonov
304f366338 Remove discontinued AHRS files 2013-03-24 13:03:50 +02:00
Oleg Semyonov
8c6f24afef version-info.py: fix coding style 2013-03-24 13:03:49 +02:00
Alessio Morale
1a38b7eb46 Merge remote-tracking branch 'origin/amorale/02_os-stac_logfs-unittests' into next 
Conflicts:
	flight/targets/RevoMini/Makefile
	flight/targets/Revolution/Makefile
 2013-03-23 15:13:05 +01:00
Alessio Morale
e06ab7f706 Merge remote-tracking branch 'origin/amorale/01-directory_move_sanity_simposix' into next 
Conflicts:
	Makefile
	flight/PiOS.posix/inc/pios_com.h
	flight/targets/RevoMini/UAVObjects.inc
	flight/targets/Revolution/Makefile
 2013-03-23 14:37:19 +01:00
Oleg Semyonov
14db5c80f1 ut: change xml output directory to make Bamboo a bit happier 2013-03-03 14:33:04 +01:00
Stacey Sheldon
67de4f0e0c ut: drop dependency on C++0x 2013-03-03 14:33:04 +01:00
Stacey Sheldon
ea09a53adc unittest: build gtest-all and gtest_main directly 
Conflicts:
	make/unittest.mk
 2013-03-03 14:33:03 +01:00
Stacey Sheldon
9b94eeb745 ut: convert logfs unit test to gtest 
Conflicts:
	Makefile
	make/unittest.mk
 2013-03-03 14:33:03 +01:00
Stacey Sheldon
fb4a1d7b1b gtest: stop compiling gtest libraries on installation 2013-03-03 14:33:03 +01:00
Stacey Sheldon
14c5af6148 ut: convert make rules to template and add TAP file generation 
Make targets changed to:
 make ut_<test>
 make ut_<test>_tap
 make ut_<test>_run
 make ut_<test>_clean
 make all_ut
 make all_ut_tap
 make all_ut_run
 make all_ut_clean

Conflicts:
	Makefile
 2013-03-03 14:33:03 +01:00
Stacey Sheldon
06f805b00e ut: add googletest (gtest) install rules 
See: http://code.google.com/p/googletest/
 2013-03-03 14:33:03 +01:00
Stacey Sheldon
264d76382b makefile: allow arch-specific path to qmake 
This will be required once we move to Qt5.
 2013-03-03 14:33:03 +01:00
Stacey Sheldon
e05ec8ed27 ut: drop dependency on C++0x 
Conflicts:
	make/unittest.mk
 2013-03-03 14:33:03 +01:00
Stacey Sheldon
60c06b8c4b ut: add unit test build infrastructure 
New build targets:
  make ut_all
  make ut_clean

to build (or clean) all unit tests.
 2013-03-03 14:33:02 +01:00
Oleg Semyonov
97436166e3 Merge remote-tracking branch 'origin/next' into os/OP-775_arm-dsplib 2013-02-06 12:55:14 +02:00
Oleg Semyonov
17a9c7c1de build-info.txt: minor text fix 
This template will be used to comment auto builds created with Bamboo.
Currently it is emulated by Bamboo build agents using build scripts,
but should be generated using Makefile. As soon as majority of branches
will be updated to this next, those scripts will be removed and this
template used.
 2013-02-06 00:51:38 +02:00
Oleg Semyonov
e09705d604 Makefile: add build-info target (for CI builds) 2013-02-04 15:56:11 +02:00
Corvus Corax
7642f44cad Merge remote branch 'origin/corvuscorax/sanity_additions' into corvus/directory_and_sanity 
Conflicts:
	flight/Modules/FirmwareIAP/firmwareiap.c
	flight/Modules/ManualControl/manualcontrol.c
	flight/targets/SimPosix/Makefile
	shared/uavobjectdefinition/systemalarms.xml
 2013-02-03 14:57:54 +01:00
Stacey Sheldon
e55519b1e2 makefile: split tool install rules into separate makefile 
The rules for downloading/building/installing the various
tools were cluttering the top-level makefile.

Conflicts:

	Makefile
 2013-01-28 02:29:08 +02:00
Alessio Morale
f293298118 Merge remote-tracking branch 'origin/revo-fixes' into amorale/revo-merge 
Conflicts:
	flight/Modules/ManualControl/manualcontrol.c
	make/scripts/version-info.py
	package/Makefile.linux
 2013-01-19 20:23:48 +01:00
Oleg Semyonov
2328469e71 [OP-775] Update link template and makefiles to include optional $(ALLLIB) depenencies 2012-12-30 21:53:24 +02:00
Oleg Semyonov
b616c33903 [OP-775] Add create library template 2012-12-30 21:53:23 +02:00
Oleg Semyonov
1e3c47dffa version-info.py: reformat source according to python style guide 
http://www.python.org/dev/peps/pep-0008/#indentation
"Use 4 spaces per indentation level."
 2012-12-14 03:10:33 +02:00
Oleg Semyonov
58e62d4f86 [OP-703] Add default string as a source origin when using build servers 
Bamboo does not preserve git repository origin when making builds, and
it is shown later in About dialog as "Built from None". This patch fixes
that providing more accurate source description.
 2012-12-14 03:08:20 +02:00
Oleg Semyonov
a2d94ec4fd [OP-703] Add new variables to version-info.py and use them in Makefiles 
${REVISION} - revision info string (tag or branch:hash date time)
${LABEL} - package label string (tag or date-hash)
${DAY} - day of last commit
${MONTH} - month of last commit
${YEAR} - year of last commit

Conflicts:

	package/Makefile
 2012-12-11 19:55:12 +02:00
Oleg Semyonov
97f5f87d48 version-info.py: add ${TAG} variable to the dictionary 2012-12-11 19:55:11 +02:00
Oleg Semyonov
ae70d0167d version-info.py: ability to use positional arguments as extra dictionary keys 2012-12-11 19:55:10 +02:00
Oleg Semyonov
8079c669f7 [OP-703] Fix for missing ")" in a comment 2012-12-04 02:34:39 +02:00
Oleg Semyonov
2d938eaaa3 [OP-703] Rework GCS About dialog to remove 1.0.0 and show more repository info 2012-12-04 00:46:50 +02:00
Oleg Semyonov
3668ecede3 [OP-703] Add new variables to version-info.py and use them in Makefiles 
${REVISION} - revision info string (tag or branch:hash date time)
${LABEL} - package label string (tag or date-hash)
${DAY} - day of last commit
${MONTH} - month of last commit
${YEAR} - year of last commit
 2012-12-04 00:46:49 +02: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
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
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
Corvus Corax
898292fcdb added (fake) firmware version information to simposix 2012-10-20 15:22:54 +02:00
Stacey Sheldon
bc13c20bf3 uavohash: normalize line endings before computing hash 
Line endings in the UAVO XML files differ from file to file
and this results in different SHA1 sums being computed on
Windows vs. Linux/Mac.

This normalizes the line endings to LF (python native) while
processing the XML files.
 2012-10-14 13:33:58 -04:00
James Cotton
3110678321 Merge branch 'dynamic_uavo_next' into revo 
Conflicts:
	androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatterySettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatteryState.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightStatus.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/HomeLocation.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/HwSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncStats.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXStatus.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/RelayTuning.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoCalibration.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemAlarms.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/TaskInfo.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/UAVObjectsInitialize.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/Waypoint.java
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
 2012-10-10 08:27:11 -05:00
Stacey Sheldon
6da6274543 version-info: add subst for text version of UAVO sha1sum 2012-10-10 00:35:13 -04:00
Stacey Sheldon
9896a0d416 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.h
	ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
	shared/uavobjectdefinition/taskinfo.xml
 2012-09-27 22:42:44 -04: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
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
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
PT_Dreamer
fb073059ad GCS-Use uavo definition hash to check for compatability 
Unfortunately had to change the iap object.
 2012-09-17 17:08:15 +01:00
PT_Dreamer
fa2aa81079 First pass on using the uavo hash to check compatability between GCS and FW 2012-09-15 23:02:45 +01:00
PT_Dreamer
6d7fa8a083 Flight-Added sha1 uavo directory calculation to fw_version_info struct. 2012-09-14 23:31:13 +01:00
James Cotton
b9050809cc Add a board info file for revo mini. However it was to remap the define MAINADAPTER for the HMC5883 driver which needs rewriting not to need this. 2012-08-25 12:57:50 -05:00
Stacey Sheldon
1f1b240b2a Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/taskinfo.xml
 2012-08-20 21:22:02 -04:00
Stacey Sheldon
4d73c1e2c2 makefile: fix clobbered JTAG macro in firmware-defs.mk 
JTAG rules got clobbered at some point.  This should
fix:
   make fw_coptercontrol_program
and others like it.
 2012-08-11 22:28:43 -04:00
Oleg Semyonov
1273a58d9f Windows packaging: update sh.cmd script for QtSDK 1.2.1 2012-07-29 23:59:58 +03:00
Stacey Sheldon
b7e9c2ee2a build: use board-specific JTAG interface for openocd 
Removes hard-coding of JTAG interface config in the
<board>_program make macros.

This allows the use of STLINKv2 for F4 boards while
continuing to use the FOSS JTAG revB on F1 boards.
 2012-06-21 23:32:04 -04:00
Stacey Sheldon
384305d8ee makefile: add additional context to output when building all_* targets 
When building the various all_* targets, it was hard to tell which
board/build-type that each line of output applied to.  Now, the
all_* target types will include something like:
 CC        [fw|cc  ]  flight/PiOS/STM32F10x/pios_gpio.c
which includes the necessary additional context.

This will help with identifying the context for warnings and errors
when building a group of targets.

Conflicts:

	Makefile
 2012-06-20 23:38:21 -04:00
Stacey Sheldon
e3393bb255 makefile: add additional context to output when building all_* targets 
When building the various all_* targets, it was hard to tell which
board/build-type that each line of output applied to.  Now, the
all_* target types will include something like:
 CC        [fw|cc  ]  flight/PiOS/STM32F10x/pios_gpio.c
which includes the necessary additional context.

This will help with identifying the context for warnings and errors
when building a group of targets.
 2012-06-03 17:43:14 -04:00
Sambas
147100bc2f Merge remote-tracking branch 'remotes/origin/revo-next' into osd_test_v1 
Conflicts:
	Makefile
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
 2012-05-28 19:06:25 +03:00