rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
Code Issues Releases Activity
7,776 Commits 5 Branches 8 Tags 266 MiB
90e0746ade
Commit Graph

110 Commits

Author SHA1 Message Date
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
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
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
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
James Cotton
5a6e02a688 Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into next 2012-05-25 20:37:23 -05:00
Corvus Corax
5727d5714e Created new "SimPosix" board and ported PiOS.posix to revolution API and more "standard like" configuration akin to other "boards" 2012-05-22 18:32:27 +02:00
Corvus Corax
414310fcba test add of SimPosix architecture - doesnt work yet 2012-05-22 18:28:42 +02:00
Brian Webb
6cb13aa2ba Fixed failed merge with next. 2012-05-20 18:36:08 -07:00
Stacey Sheldon
d4b0475f6a usb-descriptors: add +BL or +FW suffix to serial number string 
This makes the BL and FW images distinct devices with unique
serial numbers.

Windows (and maybe Mac) remembers the device descriptors and
the associated drivers based on this serial number.  Providing
unique serial numbers for the BL and FW images allows us to
provide different sets of descriptors for the BL and FW images
without confusing these OSes.

BL version number is now also bumped to reflect the new
serial number generation algorithm.
 2012-05-19 16:06:44 -04:00
Brian Webb
14bbd09c87 Reverted inadvertent checkin of firmware-defs.mk 2012-05-16 19:03:47 -07:00
Brian Webb
44a1663eb9 Fixed transparent comm on PipX. 2012-05-16 19:02:53 -07:00
Brian Webb
480371a43e Resolving merge with origin/next 2012-05-05 09:53:54 -07:00
Brian Webb
e83fec0463 Merged latest origin/next. 2012-05-05 09:40:44 -07:00
Brian Webb
d39e89a096 Reverted erroneous checkin of firmware-defs.mk 2012-04-07 19:16:50 -07:00
Brian Webb
7b49a6b820 Added watchdog to radio com bridge in PipXtreme. 2012-04-07 19:12:49 -07:00
Stacey Sheldon
eab923fee0 revo: move fw image into 128KB sectors 
This saves the more versatile 16KB and 64KB sectors
for other purposes.
 2012-03-28 21:52:43 -04:00
Sambas
4c6ee740e2 Merge remote-tracking branch 'remotes/origin/james/revolution' into osd_test_v1 2012-03-25 14:28:25 +03:00
James Cotton
2f8049e20a Update the bootloader hw version for the mpu6000 board and make the sensor code 
and initialization respond appropriately.  Enable hte L3GD20 and BMA180.
Let the board type determine which is used.
 2012-03-22 00:41:37 -05:00
Brian Webb
9032284f66 Reverted change to firmware-defs.mk 2012-03-18 10:32:26 -07:00
Sambas
7c06c0ed93 Merge remote-tracking branch 'remotes/origin/sambas/osd_test' into osd_test_v1 
Conflicts:
	flight/Modules/Osd/osdgen/osdgen.c
	flight/OSD/Makefile
	flight/OSD/System/pios_board.c
	flight/board_hw_defs/osd/board_hw_defs.c
	make/boards/osd/board-info.mk
 2012-03-11 11:58:06 +02:00
Sambas
addda5f29d USB and bootloader stuff, WORKS!! 2012-03-11 11:31:02 +02:00
Sambas
742f3ff24d Merge remote-tracking branch 'remotes/origin/james/revolution' into osd_test 
Conflicts:
	ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
 2012-03-11 09:39:51 +02:00
Sambas
ccf5c310c9 Updates 2012-03-11 09:27:38 +02:00
Sambas
ee2b12b917 Updates 2012-03-10 09:40:37 +02:00
Stacey Sheldon
50b74fa90c revo: increase FW_BANK_SIZE to be flash sector aligned 
The F4 CPUs have 16KB x 4, 64KB x 1 and 128KB x 7 sectors
of flash.  The FW image currently ends in the middle of a
128KB sector.  FW_BANK is now increased to end on a sector
boundary.
 2012-03-07 19:52:54 -05:00
Stacey Sheldon
e2ab662b5d sysclk: pass in correct definition for HSE_VALUE 
The code in RCC_GetClocksFreq() uses HSE_VALUE to determine
the tick rate of the SYSCLK.  This in turn is used by the
code in PIOS_DELAY_* to compute delays.

ST Library defaults this to 25MHz for the F4.  Our board
actually has an 8MHz oscillator so delays were way off.

Mostly affects the bootloaders since most FW code uses RTOS
delays rather than busy-waiting using PIOS_DELAY_*.
 2012-03-07 19:52:54 -05:00
Stacey Sheldon
0684a42fac 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-03-03 08:43:01 -05:00
Sambas
8e31f84058 V1 beta 2012-02-28 20:32:44 +02:00
Brian Webb
f0dfba6fc0 Re-baslined the PipX codebase using the experimental Transmitter codebase. 2012-02-21 20:29:06 -07:00
Sambas
ebd2ae7e59 Bootloader, copy from revo, not functional 2012-02-18 22:35:13 +02:00