From 5be6584c0e26c328c88c73910bace45f87666204 Mon Sep 17 00:00:00 2001 From: Kate Alhola Date: Thu, 27 Jan 2011 15:07:11 +0200 Subject: [PATCH] ADRrone SDK diff added --- mardrone/ARDrone_SDK_1_5_Version_20101004.diff | 158 ++++++++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100644 mardrone/ARDrone_SDK_1_5_Version_20101004.diff diff --git a/mardrone/ARDrone_SDK_1_5_Version_20101004.diff b/mardrone/ARDrone_SDK_1_5_Version_20101004.diff new file mode 100644 index 0000000..82b7c29 --- /dev/null +++ b/mardrone/ARDrone_SDK_1_5_Version_20101004.diff @@ -0,0 +1,158 @@ +diff -rc ARDrone_SDK_1_5_Version_20101004//ARDroneLib/Soft/Build/config.makefile~ ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/Soft/Build/config.makefile~ +*** ARDrone_SDK_1_5_Version_20101004//ARDroneLib/Soft/Build/config.makefile~ 2010-10-26 14:41:56.000000000 +0300 +--- ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/Soft/Build/config.makefile~ 2010-10-25 14:44:12.000000000 +0300 +*************** +*** 107,113 **** + SDK_FLAGS+="USE_LINUX=no" + endif + +! SDK_FLAGS+="USE_ELINUX=yes" + + ifneq ($(findstring iphone,$(ARDRONE_TARGET_OS)),) + SDK_FLAGS+="USE_IPHONE=yes" +--- 107,113 ---- + SDK_FLAGS+="USE_LINUX=no" + endif + +! SDK_FLAGS+="USE_ELINUX=no" + + ifneq ($(findstring iphone,$(ARDRONE_TARGET_OS)),) + SDK_FLAGS+="USE_IPHONE=yes" +diff -rc ARDrone_SDK_1_5_Version_20101004//ARDroneLib/Soft/Common/generated_custom.h ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/Soft/Common/generated_custom.h +*** ARDrone_SDK_1_5_Version_20101004//ARDroneLib/Soft/Common/generated_custom.h 2010-10-25 15:33:57.000000000 +0300 +--- ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/Soft/Common/generated_custom.h 2010-10-25 14:44:16.000000000 +0300 +*************** +*** 7,13 **** + # define STA + #endif + #define CURRENT_NUM_VERSION_SOFT "0.0.0" +! #define CURRENT_BUILD_DATE "2010-10-25 15:33" + + #define USE_VIDEO_YUV + +--- 7,13 ---- + # define STA + #endif + #define CURRENT_NUM_VERSION_SOFT "0.0.0" +! #define CURRENT_BUILD_DATE "2010-10-25 14:44" + + #define USE_VIDEO_YUV + +diff -rc ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/Build/sysvar.makefile ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/Build/sysvar.makefile +*** ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/Build/sysvar.makefile 2010-10-26 14:43:27.000000000 +0300 +--- ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/Build/sysvar.makefile 2010-09-10 16:35:13.000000000 +0300 +*************** +*** 305,312 **** + TARGET_CPU_X86=1 + endif + else +! TARGET_CPU_ARM=1 +! TARGET_CPU_X86=0 + endif + endif + endif +--- 305,312 ---- + TARGET_CPU_X86=1 + endif + else +! TARGET_CPU_ARM=0 +! TARGET_CPU_X86=1 + endif + endif + endif +diff -rc ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/VP_Com/vp_com.h ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/VP_Com/vp_com.h +*** ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/VP_Com/vp_com.h 2010-08-03 11:39:45.000000000 +0300 +--- ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/VP_Com/vp_com.h 2010-10-25 14:36:13.000000000 +0300 +*************** +*** 143,149 **** + char passkey[VP_COM_MAX_PINCODE_SIZE]; /// passkey to use for futur connection + } vp_com_bluetooth_config_t; + +! #if defined(__LINUX__) || defined(__ELINUX__) + typedef struct _vp_com_serial_config_t + { + char itfName[VP_COM_NAME_MAXSIZE]; /// /dev/ser0, /dev/ttyS0, /dev/ttyUSB0, etc. +--- 143,149 ---- + char passkey[VP_COM_MAX_PINCODE_SIZE]; /// passkey to use for futur connection + } vp_com_bluetooth_config_t; + +! #if defined(__LINUX__) || defined(__ELINUX__) || defined(__linux__) + typedef struct _vp_com_serial_config_t + { + char itfName[VP_COM_NAME_MAXSIZE]; /// /dev/ser0, /dev/ttyS0, /dev/ttyUSB0, etc. +diff -rc ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/VP_Stages/vp_stages_yuv2rgb.c ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/VP_Stages/vp_stages_yuv2rgb.c +*** ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/VP_Stages/vp_stages_yuv2rgb.c 2010-12-03 18:19:05.000000000 +0200 +--- ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/VP_Stages/vp_stages_yuv2rgb.c 2010-07-21 19:39:19.000000000 +0300 +*************** +*** 107,115 **** + #ifndef QCIF_TO_QVGA + /** YUV to RGB conversion functions + */ +! void vp_stages_YUV420P_to_RGB565(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes); +! void vp_stages_YUV420P_to_RGB24(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes); +! void vp_stages_YUV420P_to_ARGB32(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes); + #else // ! QCIF_TO_QVGA + /** YUV to RGB conversion + resizing + */ +--- 107,115 ---- + #ifndef QCIF_TO_QVGA + /** YUV to RGB conversion functions + */ +! static void vp_stages_YUV420P_to_RGB565(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes); +! static void vp_stages_YUV420P_to_RGB24(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes); +! static void vp_stages_YUV420P_to_ARGB32(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes); + #else // ! QCIF_TO_QVGA + /** YUV to RGB conversion + resizing + */ +*************** +*** 124,131 **** + + + #ifndef QCIF_TO_QVGA +! +! void vp_stages_YUV420P_to_RGB565(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes) + { + uint32_t w, width; + uint32_t h, height; +--- 124,130 ---- + + + #ifndef QCIF_TO_QVGA +! static void vp_stages_YUV420P_to_RGB565(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes) + { + uint32_t w, width; + uint32_t h, height; +*************** +*** 193,199 **** + + + #ifndef QCIF_TO_QVGA +! void vp_stages_YUV420P_to_RGB24(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes) + { + uint32_t width, height; + int32_t line, col, linewidth; +--- 192,198 ---- + + + #ifndef QCIF_TO_QVGA +! static void vp_stages_YUV420P_to_RGB24(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes) + { + uint32_t width, height; + int32_t line, col, linewidth; +*************** +*** 311,317 **** + + + #ifndef QCIF_TO_QVGA +! void vp_stages_YUV420P_to_ARGB32(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes) + { + uint32_t width, height; + int32_t line, col, linewidth; +--- 310,316 ---- + + + #ifndef QCIF_TO_QVGA +! static void vp_stages_YUV420P_to_ARGB32(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes) + { + uint32_t width, height; + int32_t line, col, linewidth; -- 1.7.9.5