Skip to content

Commit af41fe8

Browse files
author
Marcus Sonestedt
committed
Move servopid.ino to subfolder
1 parent e9076f1 commit af41fe8

File tree

4 files changed

+106
-3
lines changed

4 files changed

+106
-3
lines changed

‎ServoPID.sln‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1111
ProjectSection(SolutionItems) = preProject
1212
LICENSE = LICENSE
1313
README.md = README.md
14-
servopid.ino = servopid.ino
1514
EndProjectSection
1615
EndProject
1716
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Adafruit-PWM-Servo-Driver", "Adafruit-PWM-Servo-Driver", "{09887C7C-D3AA-455B-B617-DCAFE1D65349}"
@@ -22,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Adafruit-PWM-Servo-Driver",
2221
EndProject
2322
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ServoPidControlSetup", "ServoPidControlSetup\ServoPidControlSetup.wixproj", "{D6D93CD3-04CD-4E19-8242-EF0FF7ECFCD5}"
2423
EndProject
24+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ServoPid", "ServoPid\ServoPid.vcxproj", "{1FD10CE4-F14C-4475-AE3C-E64A7E7FF78B}"
25+
EndProject
2526
Global
2627
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2728
Debug|Any CPU = Debug|Any CPU
@@ -64,6 +65,16 @@ Global
6465
{D6D93CD3-04CD-4E19-8242-EF0FF7ECFCD5}.Release|x64.ActiveCfg = Release|x86
6566
{D6D93CD3-04CD-4E19-8242-EF0FF7ECFCD5}.Release|x86.ActiveCfg = Release|x86
6667
{D6D93CD3-04CD-4E19-8242-EF0FF7ECFCD5}.Release|x86.Build.0 = Release|x86
68+
{1FD10CE4-F14C-4475-AE3C-E64A7E7FF78B}.Debug|Any CPU.ActiveCfg = Debug|Win32
69+
{1FD10CE4-F14C-4475-AE3C-E64A7E7FF78B}.Debug|x64.ActiveCfg = Debug|x64
70+
{1FD10CE4-F14C-4475-AE3C-E64A7E7FF78B}.Debug|x64.Build.0 = Debug|x64
71+
{1FD10CE4-F14C-4475-AE3C-E64A7E7FF78B}.Debug|x86.ActiveCfg = Debug|Win32
72+
{1FD10CE4-F14C-4475-AE3C-E64A7E7FF78B}.Debug|x86.Build.0 = Debug|Win32
73+
{1FD10CE4-F14C-4475-AE3C-E64A7E7FF78B}.Release|Any CPU.ActiveCfg = Release|Win32
74+
{1FD10CE4-F14C-4475-AE3C-E64A7E7FF78B}.Release|x64.ActiveCfg = Release|x64
75+
{1FD10CE4-F14C-4475-AE3C-E64A7E7FF78B}.Release|x64.Build.0 = Release|x64
76+
{1FD10CE4-F14C-4475-AE3C-E64A7E7FF78B}.Release|x86.ActiveCfg = Release|Win32
77+
{1FD10CE4-F14C-4475-AE3C-E64A7E7FF78B}.Release|x86.Build.0 = Release|Win32
6778
EndGlobalSection
6879
GlobalSection(SolutionProperties) = preSolution
6980
HideSolutionNode = FALSE

‎ServoPid/ServoPid.vcxproj‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|x64">
13+
<Configuration>Debug</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<VCProjectVersion>16.0</VCProjectVersion>
23+
<ProjectGuid>{1FD10CE4-F14C-4475-AE3C-E64A7E7FF78B}</ProjectGuid>
24+
<Keyword>Win32Proj</Keyword>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
26+
</PropertyGroup>
27+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
28+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
29+
<ConfigurationType>Utility</ConfigurationType>
30+
<UseDebugLibraries>true</UseDebugLibraries>
31+
<PlatformToolset>v142</PlatformToolset>
32+
</PropertyGroup>
33+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
34+
<ConfigurationType>Utility</ConfigurationType>
35+
<UseDebugLibraries>false</UseDebugLibraries>
36+
<PlatformToolset>v142</PlatformToolset>
37+
</PropertyGroup>
38+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
39+
<ConfigurationType>Makefile</ConfigurationType>
40+
<UseDebugLibraries>true</UseDebugLibraries>
41+
<PlatformToolset>v142</PlatformToolset>
42+
</PropertyGroup>
43+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
44+
<ConfigurationType>Makefile</ConfigurationType>
45+
<UseDebugLibraries>false</UseDebugLibraries>
46+
<PlatformToolset>v142</PlatformToolset>
47+
</PropertyGroup>
48+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
49+
<ImportGroup Label="ExtensionSettings">
50+
</ImportGroup>
51+
<ImportGroup Label="Shared">
52+
</ImportGroup>
53+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
54+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
55+
</ImportGroup>
56+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
57+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
58+
</ImportGroup>
59+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
60+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
61+
</ImportGroup>
62+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
63+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
64+
</ImportGroup>
65+
<PropertyGroup Label="UserMacros" />
66+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
67+
<NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
68+
</PropertyGroup>
69+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
70+
<NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
71+
</PropertyGroup>
72+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
73+
<NMakePreprocessorDefinitions>_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
74+
</PropertyGroup>
75+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
76+
<NMakePreprocessorDefinitions>NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
77+
</PropertyGroup>
78+
<ItemDefinitionGroup>
79+
</ItemDefinitionGroup>
80+
<ItemGroup>
81+
<None Include="servopid.ino" />
82+
</ItemGroup>
83+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
84+
<ImportGroup Label="ExtensionTargets">
85+
</ImportGroup>
86+
</Project>

‎ServoPid/ServoPid.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<None Include="servopid.ino" />
5+
</ItemGroup>
6+
</Project>

servopid.ino renamed to ServoPid/servopid.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
#include <Servo.h>
99
#endif
1010
#else
11-
#include "TestServoPID/ArduinoMock.h"
11+
#include "../TestServoPID/ArduinoMock.h"
1212

1313
#if USE_PCA9685 == 1
14-
#include "TestServoPID/AdafruitPwmServoDriverMock.h"
14+
#include "../TestServoPID/AdafruitPwmServoDriverMock.h"
1515
#endif
1616

1717
namespace

0 commit comments

Comments
 (0)