Permalink
Browse files

- Integrated connection state "connecting" to drone control

- Updated readme
- Integrated firmware switch in the drone config
- Integrated new firmware specification
- Integrated Play LED command
- Integrated drone config dialog
- Some bugfixes
- Integrated a way to save the current config
- Deleted deprecated projects
- Updated licenses - Updated IP discovery
  • Loading branch information...
1 parent 097bfd1 commit 1dc7c66e7c3a73503bd8b67d37b5386d78c6cd40 @theone1984 theone1984 committed May 21, 2011
Showing 597 changed files with 2,407 additions and 67,021 deletions.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
- <TestList name="Testlisten" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
- <RunConfiguration id="06501fb1-75c1-473f-859d-3977e4e58930" name="Auswirkung nachverfolgen und testen" storage="traceandtestimpact.testsettings" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- </TestList>
-</TestLists>

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
@@ -1,104 +0,0 @@
-
-GEN_CUSTOM_HEADER:=../Common/generated_custom.h
-
-include custom.makefile
-include config.makefile
-
-GNUTOOLS_PATH=/usr/local/$(GNUTOOLS_VERSION)/bin
-ifeq ("$(QUIET_BUILD)","yes")
- MAKE:=@PATH=$(GNUTOOLS_PATH):$(PATH) make -s
-else
- MAKE:=PATH=$(GNUTOOLS_PATH):$(PATH) make
-endif
-
-define ADD_RULE_TEMPLATE
- TO_BUILD+=build_$(1)
-endef
-
-# Add rule for each target
-$(foreach target,$(TARGETS),$(eval $(call ADD_RULE_TEMPLATE,$(target))))
-
-.PHONY: linux_sample svn_update $(TO_BUILD) build_libs $(MAKECMDGOALS)
-
-all: $(GEN_CUSTOM_HEADER) build_libs $(TO_BUILD)
-
-$(GEN_CUSTOM_HEADER): custom.makefile
- @echo "#ifndef _GENERATED_CUSTOM_CONFIGURATION_H_" > $@
- @echo "#define _GENERATED_CUSTOM_CONFIGURATION_H_" >> $@
- @echo >> $@
- @echo "#if defined(BR2_PACKAGE_BCM4318_AP)" >> $@
- @echo "# define AP" >> $@
- @echo "#else" >> $@
- @echo "# define STA" >> $@
- @echo "#endif" >> $@
- @echo "#define CURRENT_NUM_VERSION_SOFT \"$(MAJOR_VERSION).$(MINOR_VERSION).$(MODIF_VERSION)\"" >> $@
- @echo "#define CURRENT_BUILD_DATE \"$(shell date +%F\ %H:%M)\"" >> $@
- @echo >> $@
-ifeq ("$(VIDEO_YUV)","yes")
- @echo "#define USE_VIDEO_YUV" >> $@
-endif
-ifeq ("$(RECORD_VISION_DATA)","yes")
- @echo "#define RECORD_VISION_DATA" >> $@
-endif
- @echo >> $@
- @echo "#define WIFI_NETWORK_NAME \"$(WIFI_NETWORK_NAME)\"" >> $@
- @echo "#define WIFI_BROADCAST \"$(WIFI_BROADCAST)\"" >> $@
- @echo "#define WIFI_ARDRONE_IP \"$(WIFI_ARDRONE_IP)\"" >> $@
- @echo >> $@
- @echo "#if defined(__linux__) || defined(USE_MINGW32)" >> $@
- @echo "# define WIFI_MOBILE_IP \"$(WIFI_MOBILE_IP)\"" >> $@
- @echo "# define WIRED_ITFNAME \"$(WIRED_ITFNAME)\"" >> $@
- @echo "#endif // ! __linux__" >> $@
- @echo >> $@
- @echo >> $@
- @echo "#endif // ! _GENERATED_CUSTOM_CONFIGURATION_H_" >> $@
-
-ifneq "$(MAKECMDGOALS)" ""
- ifneq "$(MAKECMDGOALS)" "clean"
- ifneq "$(MAKECMDGOALS)" "update"
- $(MAKECMDGOALS):
- @echo -e "\nCannot make what you ask me to do :-("
- else
- $(MAKECMDGOALS): svn_update
- endif
- endif
-endif
-
-$(MAKECMDGOALS): build_libs $(TO_BUILD)
-
-define GENERIC_RULES_TEMPLATE
-build_$(1):
- @$(MAKE) -C $(1) $(MAKECMDGOALS)
-endef
-
-$(foreach target,$(TARGETS),$(eval $(call GENERIC_RULES_TEMPLATE,$(target))))
-
-build_libs:
- @$(MAKE) PC_TARGET=yes USE_ARDRONE_TOOL=yes TARGET=pc_ USE_MINGW32=no -C ../Lib/Build $(MAKECMDGOALS)
-
-ifeq ("$(MINGW32_MODE)","yes")
-ifeq ($(shell which i586-mingw32msvc-gcc 2> /dev/null),)
- $(warning You need MinGW32 to compile My Ardrone lib for Windows if you want. (under Debian: apt-get install mingw32))
-else
-# @$(MAKE) PC_TARGET=yes TARGET=mingw32_ USE_MINGW32=yes TMP_SDK_FLAGS="USE_MINGW32=yes NO_COM=yes USE_BLUEZ=no" -C ../Lib/Build $(MAKECMDGOALS)
-# @$(MAKE) PC_TARGET=yes TARGET=emb_mingw32_ USE_MINGW32=yes CONTROL_DLL=yes TMP_SDK_FLAGS="USE_MINGW32=yes NO_COM=yes USE_BLUEZ=no" -C ../Lib/Build $(MAKECMDGOALS)
-endif
-endif
-ifeq ($(WIIMOTE_SUPPORT),yes)
-# @$(MAKE) PC_TARGET=yes TARGET=pc_ TMP_SDK_FLAGS="USE_BLUEZ=yes" -C ../Lib/libcwiid $(MAKECMDGOALS)
-endif
-
-define svn_update_template
- cd ../.. ; \
- echo "Checking out tag $(1) of $(2) ..." ; \
- if [ $(1) != head ] ; then \
- svn co -r $(1) https://svn.ardrone.org/repo/ARDrone_API/$(2) ; \
- else \
- svn co https://svn.ardrone.org/repo/ARDrone_API/$(2) ; \
- fi ; \
- cd Soft/Build ;
-endef
-
-svn_update:
- @-$(call svn_update_template,$(SDK_VERSION),ARDroneLib)
-
@@ -1,161 +0,0 @@
-
-#########################################################
-# Common build definitions (CUSTOM)
-#########################################################
-
-RELEASE_BUILD = yes
-QUIET_BUILD = yes
-
-#########################################################
-# System utility definitions (STATIC)
-#########################################################
-define CHECK_UNDEFINITION
- ifdef $(1)
- $$(warning ERROR : $(1) defined $(2))
- ERROR=1
- endif
-endef
-
-define EXIT_IF_ERROR
- ifeq "$$(ERROR)" "1"
- $$(error There has been some errors)
- endif
-endef
-
-
-#########################################################
-# Validity control (STATIC)
-#########################################################
-
-ifdef PC_TARGET
- $(eval $(call CHECK_UNDEFINITION,CONSOLE_TARGET,(should not be defined when PC_TARGET is defined)))
-endif
-
-$(eval $(call EXIT_IF_ERROR))
-
-
-#########################################################
-# Common definitions (STATIC)
-#########################################################
-
-ifeq "$(QUIET_BUILD)" "yes"
- MAKE=@make -s
-else
- MAKE=make
-endif
-
-COMMON_DIR:=../Common
-
-SDK_FLAGS:="NO_EXAMPLES=yes"
-SDK_FLAGS+="USE_SDK=yes"
-SDK_FLAGS+="QUIET_BUILD=$(QUIET_BUILD)"
-SDK_FLAGS+="RELEASE_BUILD=$(RELEASE_BUILD)"
-SDK_FLAGS+="SDK_VERSION=$(SDK_VERSION)"
-
-ifeq ($(filter NO_COM=%,$(TMP_SDK_FLAGS)),)
- SDK_FLAGS+="NO_COM=no"
-endif
-
-#########################################################
-# PC_TARGET specific definitions (STATIC)
-#########################################################
-ifdef PC_TARGET
- SDK_FLAGS+="NO_COM=no"
-
- ifeq ($(ARDRONE_TARGET_OS),Linux)
- OS_DEFINE=GNU_LINUX
- else
- ifeq ($(ARDRONE_TARGET_OS),iphoneos)
- OS_DEFINE=GNU_LINUX
- else
- ifeq ($(ARDRONE_TARGET_OS),iphonesimulator)
- OS_DEFINE=GNU_LINUX
- else
- TARGET:=$(TARGET).exe
- OS_DEFINE=WINDOW
- endif
- endif
- endif
-
- GENERIC_CFLAGS+=-D_MOBILE
-
- ifeq ("$(PC_USE_TABLE_PILOTAGE)","yes")
- GENERIC_CFLAGS+=-DUSE_TABLE_PILOTAGE
- endif
-
- ifeq ("$(RECORD_VIDEO)","yes")
- GENERIC_CFLAGS+=-DRECORD_VIDEO
- endif
-
- GENERIC_CFLAGS+=-D$(OS_DEFINE)
- ifeq ($(IPHONE_MODE),yes)
- ifeq ($(ARDRONE_TARGET_OS),iphoneos)
- GENERIC_CFLAGS+=-DTARGET_OS_IPHONE
- else
- GENERIC_CFLAGS+=-DTARGET_IPHONE_SIMULATOR
- endif
- endif
-
- ifneq ("$(USE_MINGW32)","yes")
- GENERIC_CFLAGS+=$(shell pkg-config --cflags gtk+-2.0)
- GENERIC_LIBS+=$(shell pkg-config --libs gtk+-2.0)
- endif
-
- ifeq ("$(USE_LINUX)","yes")
- SDK_FLAGS+="USE_LINUX=yes"
- else
- SDK_FLAGS+="USE_LINUX=no"
- endif
-
- SDK_FLAGS+="USE_ELINUX=no"
-
- ifneq ($(findstring iphone,$(ARDRONE_TARGET_OS)),)
- SDK_FLAGS+="USE_IPHONE=yes"
- SDK_FLAGS+="IPHONE_PLATFORM=$(ARDRONE_TARGET_OS)"
- else
- SDK_FLAGS+="USE_IPHONE=no"
- endif
- SDK_FLAGS+="IPHONE_SDK_PATH=$(IPHONE_SDK_PATH)"
-
- ifeq ("$(USE_NDS)","yes")
- SDK_FLAGS+="USE_NDS=yes"
- SDK_FLAGS+="NDS_CPU=ARM7"
- else
- SDK_FLAGS+="USE_NDS=no"
- endif
-
- ifeq ("$(USE_ANDROID)","yes")
- SDK_FLAGS+="USE_ANDROID=yes"
- SDK_FLAGS+="TOOLCHAIN_VERSION=arm-eabi-4.4.0"
- SDK_FLAGS+="NDK_PLATFORM_VERSION=android-5"
- else
- SDK_FLAGS+="USE_ANDROID=no"
- endif
-
- ifeq ($(filter USE_BLUEZ=%,$(TMP_SDK_FLAGS)),)
- SDK_FLAGS+="USE_BLUEZ=no"
- endif
-
- SDK_FLAGS+="USE_VLIB=yes"
- SDK_FLAGS+="USE_BONJOUR=no"
- SDK_FLAGS+="USE_WIFI=yes"
-
- SDK_FLAGS+="USE_BROADCOM=no"
- SDK_FLAGS+="USE_IWLIB=no"
-
- SDK_FLAGS+="FF_ARCH=Intel"
-
- SDK_FLAGS+="USE_PARROTOS_CORE=no"
- SDK_FLAGS+="USE_PARROTOS_DRIVERS=no"
- SDK_FLAGS+="USE_PARROTOS_DEVS=no"
- SDK_FLAGS+="USE_PARROTOS_CODEC=no"
-
-
- SDK_FLAGS+="USE_ARDRONELIB=yes"
- SDK_FLAGS+="USE_ARDRONE_VISION=yes"
- SDK_FLAGS+="USE_ARDRONE_POLARIS=no"
- SDK_FLAGS+="USE_ARDRONE_TEST_BENCHS=no"
- SDK_FLAGS+="USE_ARDRONE_CALIBRATION=no"
-
-endif
-
@@ -1,55 +0,0 @@
-#########################################################
-# Common definitions (CUSTOM)
-#########################################################
-IPHONE_MODE = no
-MINGW32_MODE = no
-USE_NDS = no
-USE_ANDROID = no
-USE_LINUX = no
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-MODIF_VERSION = 0
-
-#########################################################
-# ARDroneTool options definitions
-#########################################################
-USE_ARDRONE_MAINLOOP=yes
-USE_CHECK_WIFI_CONFIG=no
-
-ifeq ($(IPHONE_MODE),yes)
-USE_ARDRONE_MAINLOOP=no
-IPHONE_SDK_PATH=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS3.0
-# iphoneos or iphonesimulator
-ARDRONE_TARGET_OS=iphoneos
-else
- ifeq ($(USE_ANDROID),yes)
- USE_ARDRONE_MAINLOOP=no
- endif
-ARDRONE_TARGET_OS=Linux
-endif
-
-################## Wifi Options ##################
-# Name of the network you want to join or create
-WIFI_NETWORK_NAME = "ardronenetwork"
-WIFI_BROADCAST = "192.168.1.255"
-
-################## Video Options ##################
-# Tells if we want to record video on pc side
-RECORD_VIDEO = no
-# Tells if we want to add vision data to video stream (in raw mode)
-# Vision data are saved into file only if we define RECORD_VIDEO too
-RECORD_VISION_DATA = no
-# If the yuv mode is choosen then video is displayed & recorded in color
-# Otherwise only luminances are displayed & recorded
-VIDEO_YUV = yes
-
-#########################################################
-# Embedded definitions (CUSTOM)
-#########################################################
-WIFI_ARDRONE_IP = "192.168.1.1"
-
-#########################################################
-# Linux definitions (CUSTOM)
-#########################################################
-WIFI_MOBILE_IP = "192.168.1.2"
-
Oops, something went wrong.

0 comments on commit 1dc7c66

Please sign in to comment.