From 112cd4a95b0b0c5920b68e8c8db1e83b72e14fa8 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Thu, 23 Aug 2012 16:57:42 +0200
Subject: Updated to MAVLink v1.0.9, deleted v0.9 messages (anyway unsupported)

---
 .../share/pyshared/pymavlink/APM_Mavtest/Makefile  |  10 ---
 .../pymavlink/generator/C/test/posix/Makefile      |  31 -------
 .../pymavlink/generator/C/test/windows/testmav.sln |  20 -----
 .../pymavlink/generator/C/test/windows/testmav.suo | Bin 15872 -> 0 bytes
 .../generator/C/test/windows/testmav.vcxproj       |  91 ---------------------
 .../share/pyshared/pymavlink/tools/mavplayback.py  |   2 +-
 6 files changed, 1 insertion(+), 153 deletions(-)
 delete mode 100644 mavlink/share/pyshared/pymavlink/APM_Mavtest/Makefile
 delete mode 100644 mavlink/share/pyshared/pymavlink/generator/C/test/posix/Makefile
 delete mode 100644 mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.sln
 delete mode 100644 mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.suo
 delete mode 100644 mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.vcxproj

(limited to 'mavlink/share/pyshared/pymavlink')

diff --git a/mavlink/share/pyshared/pymavlink/APM_Mavtest/Makefile b/mavlink/share/pyshared/pymavlink/APM_Mavtest/Makefile
deleted file mode 100644
index 7ca38b1a2..000000000
--- a/mavlink/share/pyshared/pymavlink/APM_Mavtest/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Trivial makefile for building APM
-#
-
-#
-# Select 'mega' for the original APM, or 'mega2560' for the V2 APM.
-#
-BOARD	=	mega2560
-
-include ../libraries/AP_Common/Arduino.mk
diff --git a/mavlink/share/pyshared/pymavlink/generator/C/test/posix/Makefile b/mavlink/share/pyshared/pymavlink/generator/C/test/posix/Makefile
deleted file mode 100644
index 693150fb7..000000000
--- a/mavlink/share/pyshared/pymavlink/generator/C/test/posix/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-CFLAGS = -g -Wall -Werror -Os
-TESTPROTOCOL = common
-ALLPROTOCOLS = minimal test common pixhawk ardupilotmega slugs ualberta
-
-all: 
-	for p in ${ALLPROTOCOLS}; do make -f Makefile build TESTPROTOCOL=$$p; done
-
-test:
-	for p in ${ALLPROTOCOLS}; do make -f Makefile testprogs TESTPROTOCOL=$$p || exit 1; done
-
-valgrindtest:
-	for p in ${ALLPROTOCOLS}; do make -f Makefile valgrindprogs TESTPROTOCOL=$$p || exit 1; done
-
-build: testmav0.9_${TESTPROTOCOL} testmav1.0_${TESTPROTOCOL}
-
-testprogs: testmav0.9_${TESTPROTOCOL} testmav1.0_${TESTPROTOCOL}
-	./testmav0.9_${TESTPROTOCOL}
-	./testmav1.0_${TESTPROTOCOL}
-
-valgrindprogs: testmav0.9_${TESTPROTOCOL} testmav1.0_${TESTPROTOCOL}
-	valgrind -q ./testmav0.9_${TESTPROTOCOL}
-	valgrind -q ./testmav1.0_${TESTPROTOCOL}
-
-clean:
-	rm -rf *.o *~ testmav1.0* testmav0.9*
-
-testmav1.0_${TESTPROTOCOL}: testmav.c
-	$(CC) $(CFLAGS) -I../../include_v1.0 -I../../include_v1.0/${TESTPROTOCOL} -o $@ testmav.c
-
-testmav0.9_${TESTPROTOCOL}: testmav.c
-	$(CC) $(CFLAGS) -I../../include_v0.9 -I../../include_v0.9/${TESTPROTOCOL} -o $@ testmav.c
diff --git a/mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.sln b/mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.sln
deleted file mode 100644
index 37a305697..000000000
--- a/mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testmav", "testmav\testmav.vcxproj", "{02C30EBC-DF41-4C36-B2F3-79BED7E6EF9F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{02C30EBC-DF41-4C36-B2F3-79BED7E6EF9F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{02C30EBC-DF41-4C36-B2F3-79BED7E6EF9F}.Debug|Win32.Build.0 = Debug|Win32
-		{02C30EBC-DF41-4C36-B2F3-79BED7E6EF9F}.Release|Win32.ActiveCfg = Release|Win32
-		{02C30EBC-DF41-4C36-B2F3-79BED7E6EF9F}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.suo b/mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.suo
deleted file mode 100644
index 9b2e18cff..000000000
Binary files a/mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.suo and /dev/null differ
diff --git a/mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.vcxproj b/mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.vcxproj
deleted file mode 100644
index 7181b3a41..000000000
--- a/mavlink/share/pyshared/pymavlink/generator/C/test/windows/testmav.vcxproj
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{02C30EBC-DF41-4C36-B2F3-79BED7E6EF9F}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>testmav</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>E:\pymavlink\generator\C\include_v1.0</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="targetver.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="stdafx.cpp" />
-    <ClCompile Include="testmav.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/mavlink/share/pyshared/pymavlink/tools/mavplayback.py b/mavlink/share/pyshared/pymavlink/tools/mavplayback.py
index 50a6fd45d..033746697 100644
--- a/mavlink/share/pyshared/pymavlink/tools/mavplayback.py
+++ b/mavlink/share/pyshared/pymavlink/tools/mavplayback.py
@@ -43,7 +43,7 @@ filename = args[0]
 def LoadImage(filename):
     '''return an image from the images/ directory'''
     app_dir = os.path.dirname(os.path.realpath(__file__))
-    path = os.path.join(app_dir, 'images', filename)
+    path = os.path.join(app_dir, 'files/images', filename)
     return Tkinter.PhotoImage(file=path)
 
 
-- 
cgit v1.2.3