diff --git a/Marlin/.Marlin.vsarduino.h b/Marlin/.Marlin.vsarduino.h deleted file mode 100644 index d2925972bb..0000000000 --- a/Marlin/.Marlin.vsarduino.h +++ /dev/null @@ -1,58 +0,0 @@ -#define __AVR_ATmega2560__ -#define __cplusplus -#define __builtin_va_list int -#define __attribute__(x) -#define __inline__ -#define __asm__(x) -#define ARDUINO 23 -extern "C" void __cxa_pure_virtual() {} -#include "C:\arduino-0023\libraries\LiquidCrystal\LiquidCrystal.h" -#include "C:\arduino-0023\libraries\LiquidCrystal\LiquidCrystal.cpp" -void enquecommand(const char *cmd); -void setup_photpin(); -void setup_powerhold(); -void suicide(); -void setup(); -void loop(); -void get_command(); -float code_value(); -long code_value_long(); -bool code_seen(char code_string[]); -bool code_seen(char code); -void process_commands(); -void process_commands(); -void FlushSerialRequestResend(); -void ClearToSend(); -void get_coordinates(); -void get_arc_coordinates(); -void prepare_move(); -void prepare_arc_move(char isclockwise); -void manage_inactivity(byte debug); -void kill(); -void lcdProgMemprint(const char *str); -int intround(const float &x); -void lcd_status(const char* message); -void lcd_statuspgm(const char* message); -FORCE_INLINE void clear(); -void lcd_init(); -void beep(); -void beepshort(); -void lcd_status(); -void buttons_init(); -void buttons_check(); -char *ftostr3(const float &x); -char *itostr2(const uint8_t &x); -char *ftostr31(const float &x); -char *ftostr32(const float &x); -char *itostr31(const int &xx); -char *itostr3(const int &xx); -char *itostr4(const int &xx); -char *ftostr51(const float &x); -char *ftostr52(const float &x); -void wd_init(); -void wd_reset(); - -#include "C:\arduino-0023\hardware\arduino\cores\arduino\WProgram.h" -#include "C:\Users\Blair\Desktop\Marlin\Marlin\Marlin.pde" -#include "C:\Users\Blair\Desktop\Marlin\Marlin\ultralcd.pde" -#include "C:\Users\Blair\Desktop\Marlin\Marlin\watchdog.pde" diff --git a/Marlin/Marlin.sdf b/Marlin/Marlin.sdf deleted file mode 100644 index 206f25a8be..0000000000 Binary files a/Marlin/Marlin.sdf and /dev/null differ diff --git a/Marlin/Marlin.sln b/Marlin/Marlin.sln deleted file mode 100644 index fdca7e6e88..0000000000 --- a/Marlin/Marlin.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Marlin", "Marlin.vcxproj", "{A6365572-B176-4C2F-9B18-A75B62059578}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A6365572-B176-4C2F-9B18-A75B62059578}.Debug|Win32.ActiveCfg = Debug|Win32 - {A6365572-B176-4C2F-9B18-A75B62059578}.Debug|Win32.Build.0 = Debug|Win32 - {A6365572-B176-4C2F-9B18-A75B62059578}.Release|Win32.ActiveCfg = Release|Win32 - {A6365572-B176-4C2F-9B18-A75B62059578}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Marlin/Marlin.vcxproj b/Marlin/Marlin.vcxproj deleted file mode 100644 index 53f073d76e..0000000000 --- a/Marlin/Marlin.vcxproj +++ /dev/null @@ -1,117 +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>{A6365572-B176-4C2F-9B18-A75B62059578}</ProjectGuid> - <RootNamespace>Marlin</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</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'"> - <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> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <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> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <None Include="Marlin.pde" /> - <None Include="ultralcd.pde" /> - <None Include="watchdog.pde" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="cardreader.cpp" /> - <ClCompile Include="MarlinSerial.cpp" /> - <ClCompile Include="motion_control.cpp" /> - <ClCompile Include="planner.cpp" /> - <ClCompile Include="Sd2Card.cpp" /> - <ClCompile Include="SdBaseFile.cpp" /> - <ClCompile Include="SdFatUtil.cpp" /> - <ClCompile Include="SdFile.cpp" /> - <ClCompile Include="SdVolume.cpp" /> - <ClCompile Include="stepper.cpp" /> - <ClCompile Include="temperature.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="cardreader.h" /> - <ClInclude Include="Configuration.h" /> - <ClInclude Include="Configuration_adv.h" /> - <ClInclude Include="EEPROMwrite.h" /> - <ClInclude Include="fastio.h" /> - <ClInclude Include="language.h" /> - <ClInclude Include="Marlin.h" /> - <ClInclude Include="MarlinSerial.h" /> - <ClInclude Include="motion_control.h" /> - <ClInclude Include="pins.h" /> - <ClInclude Include="planner.h" /> - <ClInclude Include="Sd2Card.h" /> - <ClInclude Include="Sd2PinMap.h" /> - <ClInclude Include="SdBaseFile.h" /> - <ClInclude Include="SdFatConfig.h" /> - <ClInclude Include="SdFatStructs.h" /> - <ClInclude Include="SdFatUtil.h" /> - <ClInclude Include="SdFile.h" /> - <ClInclude Include="SdInfo.h" /> - <ClInclude Include="SdVolume.h" /> - <ClInclude Include="speed_lookuptable.h" /> - <ClInclude Include="stepper.h" /> - <ClInclude Include="temperature.h" /> - <ClInclude Include="thermistortables.h" /> - <ClInclude Include="ultralcd.h" /> - <ClInclude Include="watchdog.h" /> - <ClInclude Include="wiring.h" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> \ No newline at end of file diff --git a/Marlin/Marlin.vcxproj.filters b/Marlin/Marlin.vcxproj.filters deleted file mode 100644 index 4a0f873dbf..0000000000 --- a/Marlin/Marlin.vcxproj.filters +++ /dev/null @@ -1,140 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <None Include="Marlin.pde" /> - <None Include="ultralcd.pde" /> - <None Include="watchdog.pde" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="cardreader.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="MarlinSerial.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="motion_control.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="planner.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Sd2Card.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="SdBaseFile.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="SdFatUtil.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="SdFile.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="SdVolume.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="stepper.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="temperature.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="cardreader.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Configuration.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Configuration_adv.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="EEPROMwrite.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="fastio.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="language.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Marlin.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="MarlinSerial.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="motion_control.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="pins.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="planner.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Sd2Card.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Sd2PinMap.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="SdBaseFile.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="SdFatConfig.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="SdFatStructs.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="SdFatUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="SdFile.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="SdInfo.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="SdVolume.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="speed_lookuptable.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="stepper.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="temperature.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="thermistortables.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="ultralcd.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="watchdog.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="wiring.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> -</Project> \ No newline at end of file diff --git a/Marlin/Marlin.vcxproj.user b/Marlin/Marlin.vcxproj.user deleted file mode 100644 index ace9a86acb..0000000000 --- a/Marlin/Marlin.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -</Project> \ No newline at end of file