Browse Source

Removed vc files

Erik van der Zalm 13 years ago
parent
commit
f598077af3
6 changed files with 0 additions and 338 deletions
  1. 0
    58
      Marlin/.Marlin.vsarduino.h
  2. BIN
      Marlin/Marlin.sdf
  3. 0
    20
      Marlin/Marlin.sln
  4. 0
    117
      Marlin/Marlin.vcxproj
  5. 0
    140
      Marlin/Marlin.vcxproj.filters
  6. 0
    3
      Marlin/Marlin.vcxproj.user

+ 0
- 58
Marlin/.Marlin.vsarduino.h View File

@@ -1,58 +0,0 @@
1
-#define __AVR_ATmega2560__
2
-#define __cplusplus
3
-#define __builtin_va_list int
4
-#define __attribute__(x)
5
-#define __inline__
6
-#define __asm__(x)
7
-#define ARDUINO 23
8
-extern "C" void __cxa_pure_virtual() {}
9
-#include "C:\arduino-0023\libraries\LiquidCrystal\LiquidCrystal.h"
10
-#include "C:\arduino-0023\libraries\LiquidCrystal\LiquidCrystal.cpp"
11
-void enquecommand(const char *cmd);
12
-void setup_photpin();
13
-void setup_powerhold();
14
-void suicide();
15
-void setup();
16
-void loop();
17
-void get_command();
18
-float code_value();
19
-long code_value_long();
20
-bool code_seen(char code_string[]);
21
-bool code_seen(char code);
22
-void process_commands();
23
-void process_commands();
24
-void FlushSerialRequestResend();
25
-void ClearToSend();
26
-void get_coordinates();
27
-void get_arc_coordinates();
28
-void prepare_move();
29
-void prepare_arc_move(char isclockwise);
30
-void manage_inactivity(byte debug);
31
-void kill();
32
-void lcdProgMemprint(const char *str);
33
-int intround(const float &x);
34
-void lcd_status(const char* message);
35
-void lcd_statuspgm(const char* message);
36
-FORCE_INLINE void clear();
37
-void lcd_init();
38
-void beep();
39
-void beepshort();
40
-void lcd_status();
41
-void buttons_init();
42
-void buttons_check();
43
-char *ftostr3(const float &x);
44
-char *itostr2(const uint8_t &x);
45
-char *ftostr31(const float &x);
46
-char *ftostr32(const float &x);
47
-char *itostr31(const int &xx);
48
-char *itostr3(const int &xx);
49
-char *itostr4(const int &xx);
50
-char *ftostr51(const float &x);
51
-char *ftostr52(const float &x);
52
-void wd_init();
53
-void wd_reset();
54
-
55
-#include "C:\arduino-0023\hardware\arduino\cores\arduino\WProgram.h"
56
-#include "C:\Users\Blair\Desktop\Marlin\Marlin\Marlin.pde" 
57
-#include "C:\Users\Blair\Desktop\Marlin\Marlin\ultralcd.pde"
58
-#include "C:\Users\Blair\Desktop\Marlin\Marlin\watchdog.pde"

BIN
Marlin/Marlin.sdf View File


+ 0
- 20
Marlin/Marlin.sln View File

@@ -1,20 +0,0 @@
1
-
2
-Microsoft Visual Studio Solution File, Format Version 11.00
3
-# Visual Studio 2010
4
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Marlin", "Marlin.vcxproj", "{A6365572-B176-4C2F-9B18-A75B62059578}"
5
-EndProject
6
-Global
7
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
8
-		Debug|Win32 = Debug|Win32
9
-		Release|Win32 = Release|Win32
10
-	EndGlobalSection
11
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
12
-		{A6365572-B176-4C2F-9B18-A75B62059578}.Debug|Win32.ActiveCfg = Debug|Win32
13
-		{A6365572-B176-4C2F-9B18-A75B62059578}.Debug|Win32.Build.0 = Debug|Win32
14
-		{A6365572-B176-4C2F-9B18-A75B62059578}.Release|Win32.ActiveCfg = Release|Win32
15
-		{A6365572-B176-4C2F-9B18-A75B62059578}.Release|Win32.Build.0 = Release|Win32
16
-	EndGlobalSection
17
-	GlobalSection(SolutionProperties) = preSolution
18
-		HideSolutionNode = FALSE
19
-	EndGlobalSection
20
-EndGlobal

+ 0
- 117
Marlin/Marlin.vcxproj View File

@@ -1,117 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Project DefaultTargets="Build" ToolsVersion="4.0" 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
-  </ItemGroup>
13
-  <PropertyGroup Label="Globals">
14
-    <ProjectGuid>{A6365572-B176-4C2F-9B18-A75B62059578}</ProjectGuid>
15
-    <RootNamespace>Marlin</RootNamespace>
16
-  </PropertyGroup>
17
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
18
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
19
-    <ConfigurationType>Application</ConfigurationType>
20
-    <UseDebugLibraries>true</UseDebugLibraries>
21
-    <CharacterSet>MultiByte</CharacterSet>
22
-  </PropertyGroup>
23
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
24
-    <ConfigurationType>Application</ConfigurationType>
25
-    <UseDebugLibraries>false</UseDebugLibraries>
26
-    <WholeProgramOptimization>true</WholeProgramOptimization>
27
-    <CharacterSet>MultiByte</CharacterSet>
28
-  </PropertyGroup>
29
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
30
-  <ImportGroup Label="ExtensionSettings">
31
-  </ImportGroup>
32
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
33
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
34
-  </ImportGroup>
35
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
36
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
37
-  </ImportGroup>
38
-  <PropertyGroup Label="UserMacros" />
39
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
40
-    <IncludePath>C:\arduino-0023\hardware\arduino\cores\arduino;c:\arduino-0023\hardware\tools\avr\avr\include\;c:\arduino-0023\hardware\tools\avr\avr\include\avr\;c:\arduino-0023\hardware\tools\avr\avr\;c:\arduino-0023\hardware\tools\avr\lib\gcc\avr\4.3.2\include\;C:\arduino-0023\libraries\LiquidCrystal;C:\arduino-0023\libraries\LiquidCrystal\utility;</IncludePath>
41
-  </PropertyGroup>
42
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
43
-    <IncludePath>C:\arduino-0023\hardware\arduino\cores\arduino;c:\arduino-0023\hardware\tools\avr\avr\include\;c:\arduino-0023\hardware\tools\avr\avr\include\avr\;c:\arduino-0023\hardware\tools\avr\avr\;c:\arduino-0023\hardware\tools\avr\lib\gcc\avr\4.3.2\include\;C:\arduino-0023\libraries\LiquidCrystal;C:\arduino-0023\libraries\LiquidCrystal\utility;</IncludePath>
44
-  </PropertyGroup>
45
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
46
-    <ClCompile>
47
-      <WarningLevel>Level3</WarningLevel>
48
-      <Optimization>Disabled</Optimization>
49
-    </ClCompile>
50
-    <Link>
51
-      <GenerateDebugInformation>true</GenerateDebugInformation>
52
-    </Link>
53
-  </ItemDefinitionGroup>
54
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
55
-    <ClCompile>
56
-      <WarningLevel>Level3</WarningLevel>
57
-      <Optimization>MaxSpeed</Optimization>
58
-      <FunctionLevelLinking>true</FunctionLevelLinking>
59
-      <IntrinsicFunctions>true</IntrinsicFunctions>
60
-    </ClCompile>
61
-    <Link>
62
-      <GenerateDebugInformation>true</GenerateDebugInformation>
63
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
64
-      <OptimizeReferences>true</OptimizeReferences>
65
-    </Link>
66
-  </ItemDefinitionGroup>
67
-  <ItemGroup>
68
-    <None Include="Marlin.pde" />
69
-    <None Include="ultralcd.pde" />
70
-    <None Include="watchdog.pde" />
71
-  </ItemGroup>
72
-  <ItemGroup>
73
-    <ClCompile Include="cardreader.cpp" />
74
-    <ClCompile Include="MarlinSerial.cpp" />
75
-    <ClCompile Include="motion_control.cpp" />
76
-    <ClCompile Include="planner.cpp" />
77
-    <ClCompile Include="Sd2Card.cpp" />
78
-    <ClCompile Include="SdBaseFile.cpp" />
79
-    <ClCompile Include="SdFatUtil.cpp" />
80
-    <ClCompile Include="SdFile.cpp" />
81
-    <ClCompile Include="SdVolume.cpp" />
82
-    <ClCompile Include="stepper.cpp" />
83
-    <ClCompile Include="temperature.cpp" />
84
-  </ItemGroup>
85
-  <ItemGroup>
86
-    <ClInclude Include="cardreader.h" />
87
-    <ClInclude Include="Configuration.h" />
88
-    <ClInclude Include="Configuration_adv.h" />
89
-    <ClInclude Include="EEPROMwrite.h" />
90
-    <ClInclude Include="fastio.h" />
91
-    <ClInclude Include="language.h" />
92
-    <ClInclude Include="Marlin.h" />
93
-    <ClInclude Include="MarlinSerial.h" />
94
-    <ClInclude Include="motion_control.h" />
95
-    <ClInclude Include="pins.h" />
96
-    <ClInclude Include="planner.h" />
97
-    <ClInclude Include="Sd2Card.h" />
98
-    <ClInclude Include="Sd2PinMap.h" />
99
-    <ClInclude Include="SdBaseFile.h" />
100
-    <ClInclude Include="SdFatConfig.h" />
101
-    <ClInclude Include="SdFatStructs.h" />
102
-    <ClInclude Include="SdFatUtil.h" />
103
-    <ClInclude Include="SdFile.h" />
104
-    <ClInclude Include="SdInfo.h" />
105
-    <ClInclude Include="SdVolume.h" />
106
-    <ClInclude Include="speed_lookuptable.h" />
107
-    <ClInclude Include="stepper.h" />
108
-    <ClInclude Include="temperature.h" />
109
-    <ClInclude Include="thermistortables.h" />
110
-    <ClInclude Include="ultralcd.h" />
111
-    <ClInclude Include="watchdog.h" />
112
-    <ClInclude Include="wiring.h" />
113
-  </ItemGroup>
114
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
115
-  <ImportGroup Label="ExtensionTargets">
116
-  </ImportGroup>
117
-</Project>

+ 0
- 140
Marlin/Marlin.vcxproj.filters View File

@@ -1,140 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
-  <ItemGroup>
4
-    <Filter Include="Source Files">
5
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7
-    </Filter>
8
-    <Filter Include="Header Files">
9
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
11
-    </Filter>
12
-    <Filter Include="Resource Files">
13
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15
-    </Filter>
16
-  </ItemGroup>
17
-  <ItemGroup>
18
-    <None Include="Marlin.pde" />
19
-    <None Include="ultralcd.pde" />
20
-    <None Include="watchdog.pde" />
21
-  </ItemGroup>
22
-  <ItemGroup>
23
-    <ClCompile Include="cardreader.cpp">
24
-      <Filter>Source Files</Filter>
25
-    </ClCompile>
26
-    <ClCompile Include="MarlinSerial.cpp">
27
-      <Filter>Source Files</Filter>
28
-    </ClCompile>
29
-    <ClCompile Include="motion_control.cpp">
30
-      <Filter>Source Files</Filter>
31
-    </ClCompile>
32
-    <ClCompile Include="planner.cpp">
33
-      <Filter>Source Files</Filter>
34
-    </ClCompile>
35
-    <ClCompile Include="Sd2Card.cpp">
36
-      <Filter>Source Files</Filter>
37
-    </ClCompile>
38
-    <ClCompile Include="SdBaseFile.cpp">
39
-      <Filter>Source Files</Filter>
40
-    </ClCompile>
41
-    <ClCompile Include="SdFatUtil.cpp">
42
-      <Filter>Source Files</Filter>
43
-    </ClCompile>
44
-    <ClCompile Include="SdFile.cpp">
45
-      <Filter>Source Files</Filter>
46
-    </ClCompile>
47
-    <ClCompile Include="SdVolume.cpp">
48
-      <Filter>Source Files</Filter>
49
-    </ClCompile>
50
-    <ClCompile Include="stepper.cpp">
51
-      <Filter>Source Files</Filter>
52
-    </ClCompile>
53
-    <ClCompile Include="temperature.cpp">
54
-      <Filter>Source Files</Filter>
55
-    </ClCompile>
56
-  </ItemGroup>
57
-  <ItemGroup>
58
-    <ClInclude Include="cardreader.h">
59
-      <Filter>Header Files</Filter>
60
-    </ClInclude>
61
-    <ClInclude Include="Configuration.h">
62
-      <Filter>Header Files</Filter>
63
-    </ClInclude>
64
-    <ClInclude Include="Configuration_adv.h">
65
-      <Filter>Header Files</Filter>
66
-    </ClInclude>
67
-    <ClInclude Include="EEPROMwrite.h">
68
-      <Filter>Header Files</Filter>
69
-    </ClInclude>
70
-    <ClInclude Include="fastio.h">
71
-      <Filter>Header Files</Filter>
72
-    </ClInclude>
73
-    <ClInclude Include="language.h">
74
-      <Filter>Header Files</Filter>
75
-    </ClInclude>
76
-    <ClInclude Include="Marlin.h">
77
-      <Filter>Header Files</Filter>
78
-    </ClInclude>
79
-    <ClInclude Include="MarlinSerial.h">
80
-      <Filter>Header Files</Filter>
81
-    </ClInclude>
82
-    <ClInclude Include="motion_control.h">
83
-      <Filter>Header Files</Filter>
84
-    </ClInclude>
85
-    <ClInclude Include="pins.h">
86
-      <Filter>Header Files</Filter>
87
-    </ClInclude>
88
-    <ClInclude Include="planner.h">
89
-      <Filter>Header Files</Filter>
90
-    </ClInclude>
91
-    <ClInclude Include="Sd2Card.h">
92
-      <Filter>Header Files</Filter>
93
-    </ClInclude>
94
-    <ClInclude Include="Sd2PinMap.h">
95
-      <Filter>Header Files</Filter>
96
-    </ClInclude>
97
-    <ClInclude Include="SdBaseFile.h">
98
-      <Filter>Header Files</Filter>
99
-    </ClInclude>
100
-    <ClInclude Include="SdFatConfig.h">
101
-      <Filter>Header Files</Filter>
102
-    </ClInclude>
103
-    <ClInclude Include="SdFatStructs.h">
104
-      <Filter>Header Files</Filter>
105
-    </ClInclude>
106
-    <ClInclude Include="SdFatUtil.h">
107
-      <Filter>Header Files</Filter>
108
-    </ClInclude>
109
-    <ClInclude Include="SdFile.h">
110
-      <Filter>Header Files</Filter>
111
-    </ClInclude>
112
-    <ClInclude Include="SdInfo.h">
113
-      <Filter>Header Files</Filter>
114
-    </ClInclude>
115
-    <ClInclude Include="SdVolume.h">
116
-      <Filter>Header Files</Filter>
117
-    </ClInclude>
118
-    <ClInclude Include="speed_lookuptable.h">
119
-      <Filter>Header Files</Filter>
120
-    </ClInclude>
121
-    <ClInclude Include="stepper.h">
122
-      <Filter>Header Files</Filter>
123
-    </ClInclude>
124
-    <ClInclude Include="temperature.h">
125
-      <Filter>Header Files</Filter>
126
-    </ClInclude>
127
-    <ClInclude Include="thermistortables.h">
128
-      <Filter>Header Files</Filter>
129
-    </ClInclude>
130
-    <ClInclude Include="ultralcd.h">
131
-      <Filter>Header Files</Filter>
132
-    </ClInclude>
133
-    <ClInclude Include="watchdog.h">
134
-      <Filter>Header Files</Filter>
135
-    </ClInclude>
136
-    <ClInclude Include="wiring.h">
137
-      <Filter>Header Files</Filter>
138
-    </ClInclude>
139
-  </ItemGroup>
140
-</Project>

+ 0
- 3
Marlin/Marlin.vcxproj.user View File

@@ -1,3 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
-</Project>

Loading…
Cancel
Save