瀏覽代碼

started implementing armbandinterface

videowall-pc-user 5 年之前
父節點
當前提交
a78e2c9468

+ 2 - 5
SketchAssistant/SketchAssistant.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2050
+# Blend for Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SketchAssistantWPF", "SketchAssistantWPF\SketchAssistantWPF.csproj", "{EE53AE79-2AA0-4F43-9638-1789B189D5C3}"
 EndProject
@@ -15,9 +15,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StaticLibMotors", "StaticLib1\StaticLib1.vcxproj", "{9ED853D5-40BD-40EB-9F8F-228EE11319A1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E6A97527-65BD-4D20-BA9C-19F2F84B2D13}"
-	ProjectSection(SolutionItems) = preProject
-		..\..\BPMotoren\out\BodyActuator.dll = ..\..\BPMotoren\out\BodyActuator.dll
-	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+ 3 - 2
SketchAssistant/StaticLib1/Motorheader/Actuator.h

@@ -14,13 +14,14 @@
 #pragma once
 #include <stdbool.h>
 #include <stdint.h>
-#include <time.h>
+#include <ctime>
+//#include <time.h>
 
 typedef struct Actuator
 {
     bool active;
     bool continuous;
-    clock_t endTime;
+	clock_t endTime;
     float intensity;
     float minIntensity; // Cut off values under threshold (default: 0)
     float maxIntensity; // Cut off values over threshold  (default: 1)

+ 2 - 2
SketchAssistant/StaticLib1/Motorheader/ArduinoHub.h

@@ -16,8 +16,8 @@
 #include <pthread.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <time.h>
-#include <windows.h>
+#include <ctime>
+//#include <windows.h>
 #include "Serial.h"
 #include "Actuator.h"
 

+ 1 - 1
SketchAssistant/StaticLib1/Motorheader/EAIHub.h

@@ -15,7 +15,7 @@
 #pragma once
 #include <stdbool.h>
 #include <stdint.h>
-#include <time.h>
+#include <ctime>
 #include <pthread.h>
 #include "Actuator.h"
 

+ 1 - 1
SketchAssistant/StaticLib1/Motorheader/Serial.h

@@ -15,7 +15,7 @@
 #pragma once
 #include <stdbool.h>
 #include <stdint.h>
-#include <windows.h>
+//#include <windows.h>
 
 typedef struct Serial
 {

+ 22 - 5
SketchAssistant/StaticLib1/StaticLib1.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -91,6 +91,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -148,10 +149,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\BPMotoren\Actuator.h" />
-    <ClInclude Include="..\..\..\BPMotoren\ArduinoHub.h" />
-    <ClInclude Include="..\..\..\BPMotoren\EAIHub.h" />
-    <ClInclude Include="..\..\..\BPMotoren\Serial.h" />
+    <ClInclude Include="Motorheader\Actuator.h" />
+    <ClInclude Include="Motorheader\ArduinoHub.h" />
+    <ClInclude Include="Motorheader\EAIHub.h" />
+    <ClInclude Include="Motorheader\Serial.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
   </ItemGroup>
@@ -162,8 +163,24 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="UnitTest1.cpp">
+      <SubType>
+      </SubType>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\packages\pthreads.redist.2.9.1.4\build\native\pthreads.redist.targets" Condition="Exists('..\packages\pthreads.redist.2.9.1.4\build\native\pthreads.redist.targets')" />
+    <Import Project="..\packages\pthreads.2.9.1.4\build\native\pthreads.targets" Condition="Exists('..\packages\pthreads.2.9.1.4\build\native\pthreads.targets')" />
   </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\pthreads.redist.2.9.1.4\build\native\pthreads.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\pthreads.redist.2.9.1.4\build\native\pthreads.redist.targets'))" />
+    <Error Condition="!Exists('..\packages\pthreads.2.9.1.4\build\native\pthreads.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\pthreads.2.9.1.4\build\native\pthreads.targets'))" />
+  </Target>
 </Project>

+ 10 - 4
SketchAssistant/StaticLib1/StaticLib1.vcxproj.filters

@@ -21,16 +21,16 @@
     <ClInclude Include="targetver.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\BPMotoren\Actuator.h">
+    <ClInclude Include="Motorheader\Actuator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\BPMotoren\ArduinoHub.h">
+    <ClInclude Include="Motorheader\ArduinoHub.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\BPMotoren\EAIHub.h">
+    <ClInclude Include="Motorheader\EAIHub.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\BPMotoren\Serial.h">
+    <ClInclude Include="Motorheader\Serial.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -38,5 +38,11 @@
     <ClCompile Include="stdafx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="UnitTest1.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
   </ItemGroup>
 </Project>