rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity
8,194 Commits 5 Branches 8 Tags 266 MiB
27822d0cd4
Commit Graph

147 Commits

Author SHA1 Message Date
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