rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard

Browse Source
This commit is contained in:
m_thread 2014-09-15 22:55:19 +02:00
commit 46b95ee7d1
10 changed files with 105 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CREDITS.txt
View File

@ -1,23 +1,27 @@
Connor Abbott
Connor Abbott
Sergiy Anikeyev
David Ankers
Fredrik Arvidsson
Pedro Assuncao
Werner Backes
Jose Barros
Alex Beck
Andre Bernet
Mikael Blomqvist
Pete Boehl
Berkely Brown
Joel Brueziere
Thierry Bugeat
Samuel Brugger
Glenn Campigli
David Carlson
Mike Carr
Stefan Cenkov
Andrés Chavarría Krauser
Cosimo Corrado
James Cotton
Steve Doll
James Duley
Piotr Esden-Tempski
Peter Farnworth
Ed Faulkner
@ -25,6 +29,7 @@ Andrew Finegan
Kevin Finisterre
Richard Flay
Darren Furniss
Oliver Gaste
Cliff Geerdes
Frederic Goddeeris
Daniel Godin
@ -41,8 +46,10 @@ Patrick Huebner
Ryan Hunt
Mark James
Michael Johnston
Stefan Karlsson
Ricky King
Thorsten Klose
Karl Knutsson
Sami Korhonen
Hallvard Kristiansen
Alan Krum
@ -63,6 +70,7 @@ Gary Mortimer
Cathy Moss
Les Newell
Ken Northup
Craig Nuttall
Bertrand Oresve
Angus Peart
John Pike
@ -93,6 +101,7 @@ Alex Sowa
Pete Stapley
Vova Starikh
Rowan Taubitz
Jim Allen Thibodaux
Andrew Thoms
Vladimir Timofeev
Jasper Van Loenen

60
MILESTONES.txt
View File

@ -177,15 +177,56 @@ C: Eric Price (Corvus Corax)
D: March 2012
V:
M: First Revo 20km Navigated flight on a FixedWing
C: Eric Price / Team OP
D: Greece 2013
V: https://vimeo.com/71956880
M: First Auto spot landing on a fixed Wing using Revo
C: Eric Price (Corvus Corax)
D: Greece 2013
V:
M: First Revo Navigated flight on a MultiRotor
C: It got done somewhere along the line, James or Sami
M: First Revo 1km Navigated flight on a MultiRotor
C: Jackson Russell
D: Greece 2013
V:
M: First Revo 5km Navigated flight on a MultiRotor
C: Rodney Grainger (roddersNZ)
D: September 2014
V: https://www.youtube.com/watch?v=DYawRGz5KYM
M: First Revo 6km Navigated flight on a MultiRotor
C:
D:
V:
M: First Revo 5km Navigated flight on a MultiRotor
M: First Revo 7km Navigated flight on a MultiRotor
C:
D:
V:
M: First Revo 8km Navigated flight on a MultiRotor
C: Jim Allen Thibodaux
D: September 2014
V: http://www.youtube.com/watch?v=oeJF8U2k9FA
M: First Revo 9km Navigated flight on a MultiRotor
C:
D:
V:
M: First Revo 10km Navigated flight on a MultiRotor
C:
D:
V:
M: First Revo Position Hold on a Heli
C:
D:
V:
@ -205,23 +246,8 @@ C:
D:
V:
M: First Auto spot landing on a fixed Wing using Revo
C:
D:
V:
M: First Auto take-off on a MultiRotor using Revo
C:
D:
V:
M: First Auto landing on a MultiRotor using Revo
C: Sami (please complete details)
D:
V:
M: First Auto take-off on a Heli using Revo
C:
C: Sami
D:
V:

2
flight/targets/boards/revoproto/firmware/pios_board.c
View File

@ -946,7 +946,7 @@ void PIOS_Board_Init(void)
#endif
#if defined(PIOS_INCLUDE_HMC5X83)
onboard_mag = PIOS_HMC5x83_Init(&pios_hmc5x83_cfg, pios_i2c_pressure_adapter_id, 0);
onboard_mag = PIOS_HMC5x83_Init(&pios_hmc5x83_cfg, pios_i2c_mag_adapter_id, 0);
#endif
#if defined(PIOS_INCLUDE_MS5611)

4
ground/openpilotgcs/copydata.pro
View File

@ -233,14 +233,14 @@ GCS_LIBRARY_PATH
ssleay32.dll \
libeay32.dll
for(dll, OPENSSL_DLLS) {
data_copy.commands += $(COPY_FILE) $$targetPath(\"$$(OPENSSL_DIR)/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline()
data_copy.commands += $(COPY_FILE) $$targetPath(\"$${OPENSSL_DIR}/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline()
}
# copy OpenGL DLL
OPENGL_DLLS = \
opengl32_32/opengl32.dll
for(dll, OPENGL_DLLS) {
data_copy.commands += $(COPY_FILE) $$targetPath(\"$$(MESAWIN_DIR)/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline()
data_copy.commands += $(COPY_FILE) $$targetPath(\"$${MESAWIN_DIR}/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline()
}
data_copy.target = FORCE

22
ground/openpilotgcs/openpilotgcs.pri
View File

@ -72,6 +72,17 @@ isEmpty(GCS_BUILD_TREE) {
GCS_BUILD_TREE = $$cleanPath($$OUT_PWD)
GCS_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,,
}
# Find the tools directory,
# try from Makefile (not run by Qt Creator),
TOOLS_DIR = $$(TOOLS_DIR)
isEmpty(TOOLS_DIR) {
# check for custom enviroment variable,
TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR)
# fallback to default location.
isEmpty(TOOLS_DIR):TOOLS_DIR = $$clean_path($$GCS_SOURCE_TREE/../../tools)
}
GCS_APP_PATH = $$GCS_BUILD_TREE/bin
macx {
GCS_APP_TARGET = "OpenPilot GCS"
@ -87,6 +98,15 @@ macx {
} else {
!isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1
win32 {
SDL_DIR = $$(SDL_DIR)
isEmpty(SDL_DIR):SDL_DIR = $${TOOLS_DIR}/SDL-1.2.15
OPENSSL_DIR = $$(OPENSSL_DIR)
isEmpty(OPENSSL_DIR):OPENSSL_DIR = $${TOOLS_DIR}/openssl-1.0.1e-win32
MESAWIN_DIR = $$(MESAWIN_DIR)
isEmpty(MESAWIN_DIR):MESAWIN_DIR = $${TOOLS_DIR}/mesawin
contains(TEMPLATE, vc.*)|contains(TEMPLATE_PREFIX, vc):vcproj = 1
GCS_APP_TARGET = openpilotgcs
copyqt = $$copydata
@ -97,8 +117,6 @@ macx {
GCS_QT_PLUGINS_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/plugins
GCS_QT_QML_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/qml
TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR)
isEmpty(TOOLS_DIR):TOOLS_DIR = $$clean_path($$GCS_SOURCE_TREE/../../tools)
QT_INSTALL_DIR = $$clean_path($$[QT_INSTALL_LIBS]/../../../..)
equals(QT_INSTALL_DIR, $$TOOLS_DIR) {
copyqt = 1

2
ground/openpilotgcs/src/libs/juavobjects/templates/uavobject.java.template
View File

@ -80,7 +80,7 @@ $(FIELDSINIT)
$(FLIGHTTELEM_ACKED) << UAVOBJ_TELEMETRY_ACKED_SHIFT |
$(GCSTELEM_ACKED) << UAVOBJ_GCS_TELEMETRY_ACKED_SHIFT |
UAVObject.Metadata.UpdateModeNum(UAVObject.UpdateMode.$(FLIGHTTELEM_UPDATEMODE)) << UAVOBJ_TELEMETRY_UPDATE_MODE_SHIFT |
UAVObject.Metadata.UpdateModeNum(UAVObject.UpdateMode.$(GCSTELEM_UPDATEMODE)) << UAVOBJ_GCS_TELEMETRY_UPDATE_MODE_SHIFT;
UAVObject.Metadata.UpdateModeNum(UAVObject.UpdateMode.$(GCSTELEM_UPDATEMODE)) << UAVOBJ_GCS_TELEMETRY_UPDATE_MODE_SHIFT |
UAVObject.Metadata.UpdateModeNum(UAVObject.UpdateMode.$(LOGGING_UPDATEMODE)) << UAVOBJ_LOGGING_UPDATE_MODE_SHIFT;
metadata.flightTelemetryUpdatePeriod = $(FLIGHTTELEM_UPDATEPERIOD);
metadata.gcsTelemetryUpdatePeriod = $(GCSTELEM_UPDATEPERIOD);

2
ground/openpilotgcs/src/libs/sdlgamepad/copydata.pro
View File

@ -5,7 +5,7 @@ equals(copydata, 1) {
SDL_DLLS = \
SDL.dll
for(dll, SDL_DLLS) {
data_copy.commands += $(COPY_FILE) $$targetPath(\"$$(SDL_DIR)/bin/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline()
data_copy.commands += $(COPY_FILE) $$targetPath(\"$${SDL_DIR}/bin/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline()
}
# add make target

4
ground/openpilotgcs/src/libs/sdlgamepad/sdlgamepad.pro
View File

@ -37,8 +37,8 @@ macx {
}
win32 {
INCLUDEPATH += $(SDL_DIR)/include
LIBS += -L$(SDL_DIR)/lib
INCLUDEPATH += $${SDL_DIR}/include
LIBS += -L$${SDL_DIR}/lib
}
!mac:LIBS += -lSDL

30
make/tools.mk
View File

@ -100,7 +100,8 @@ endif
GTEST_URL := http://wiki.openpilot.org/download/attachments/18612236/gtest-1.6.0.zip
# Changing PYTHON_DIR, also update it in ground/openpilotgcs/src/python.pri
# When changing PYTHON_DIR, you must also update it in ground/openpilotgcs/src/python.pri
# When changing SDL_DIR or OPENSSL_DIR, you must also update them in ground/openpilotgcs/openpilotgcs.pri
ARM_SDK_DIR := $(TOOLS_DIR)/gcc-arm-none-eabi-4_8-2014q1
QT_SDK_DIR := $(TOOLS_DIR)/qt-5.3.1
MINGW_DIR := $(QT_SDK_DIR)/Tools/mingw48_32
@ -1093,23 +1094,30 @@ openocd_clean:
$(V1) [ ! -d "$(OPENOCD_DIR)" ] || $(RM) -r "$(OPENOCD_DIR)"
STM32FLASH_DIR := $(TOOLS_DIR)/stm32flash
ifeq ($(UNAME), Windows)
STM32FLASH_BUILD_OPTIONS := "CC=GCC"
endif
.PHONY: stm32flash_install
stm32flash_install: STM32FLASH_URL := http://stm32flash.googlecode.com/svn/trunk
stm32flash_install: STM32FLASH_REV := 61
stm32flash_install: STM32FLASH_URL := https://code.google.com/p/stm32flash/
stm32flash_install: STM32FLASH_REV := a358bd1f025d
stm32flash_install: stm32flash_clean
# download the source
$(V0) @echo " DOWNLOAD $(STM32FLASH_URL) @ r$(STM32FLASH_REV)"
$(V1) svn export -q -r "$(STM32FLASH_REV)" "$(STM32FLASH_URL)" "$(STM32FLASH_DIR)"
$(V0) @$(ECHO) " DOWNLOAD $(STM32FLASH_URL) @ r$(STM32FLASH_REV)"
$(V1) [ ! -d "$(STM32FLASH_DIR)" ] || $(RM) -rf "$(STM32FLASH_DIR)"
$(V1) $(MKDIR) -p "$(STM32FLASH_DIR)"
$(V1) $(GIT) clone --no-checkout $(STM32FLASH_URL) "$(STM32FLASH_DIR)"
$(V1) ( \
$(CD) $(STM32FLASH_DIR) ; \
$(GIT) checkout -q $(STM32FLASH_REV) ; \
)
# build
$(V0) @echo " BUILD $(STM32FLASH_DIR)"
$(V1) $(MAKE) --silent -C $(STM32FLASH_DIR) all
$(V0) @$(ECHO) " BUILD $(STM32FLASH_DIR)"
$(V1) $(MAKE) --silent -C $(STM32FLASH_DIR) all $(STM32FLASH_BUILD_OPTIONS)
.PHONY: stm32flash_clean
stm32flash_clean:
$(V0) @echo " CLEAN $(STM32FLASH_DIR)"
$(V1) [ ! -d "$(STM32FLASH_DIR)" ] || $(RM) -r "$(STM32FLASH_DIR)"
$(V0) @$(ECHO) " CLEAN $(STM32FLASH_DIR)"
$(V1) [ ! -d "$(STM32FLASH_DIR)" ] || $(RM) -rf "$(STM32FLASH_DIR)"
DFUUTIL_DIR := $(TOOLS_DIR)/dfu-util

12
shared/uavobjectdefinition/ekfconfiguration.xml
View File

@ -24,8 +24,8 @@
</field>
<field name="Q" units="1^2" type="float" defaultvalue="
0.01, 0.01, 0.01,
0.1, 0.1, 0.1,
0.0000001, 0.0000001, 0.0000001">
0.01, 0.01, 0.01,
0.000001, 0.000001, 0.000001">
<elementnames>
<elementname>GyroX</elementname>
<elementname>GyroY</elementname>
@ -39,10 +39,10 @@
</elementnames>
</field>
<field name="R" units="1^2" type="float" defaultvalue="
10, 10, 1000,
1, 1, 1,
5000, 5000, 5000,
1">
1, 1, 1000000,
0.001, 0.001, 0.001,
10, 10, 10,
0.01">
<elementnames>
<elementname>GPSPosNorth</elementname>
<elementname>GPSPosEast</elementname>