diff --git a/Marlin/.Marlin.vsarduino.h b/Marlin/.Marlin.vsarduino.h deleted file mode 100644 index 76011adc3c..0000000000 --- a/Marlin/.Marlin.vsarduino.h +++ /dev/null @@ -1,60 +0,0 @@ -#define __AVR_ATmega2560__ -#define __cplusplus -#define __builtin_va_list int -#define __attribute__(x) -#define __inline__ -#define __asm__(x) -#define ARDUINO 100 -extern "C" void __cxa_pure_virtual() {} -#include "C:\arduino-1.0\libraries\LiquidCrystal\LiquidCrystal.h" -#include "C:\arduino-1.0\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(); -char *createFilename(char *buffer,const dir_t &p); -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); -void wd_init(); -void wd_reset(); - -#include "C:\arduino-1.0\hardware\arduino\variants\mega\pins_arduino.h" -#include "C:\arduino-1.0\hardware\arduino\cores\arduino\Arduino.h" -#include "C:\Users\Blair\Desktop\Marlin_v1\Marlin\Marlin.pde" -#include "C:\Users\Blair\Desktop\Marlin_v1\Marlin\cardreader.pde" -#include "C:\Users\Blair\Desktop\Marlin_v1\Marlin\ultralcd.pde" -#include "C:\Users\Blair\Desktop\Marlin_v1\Marlin\watchdog.pde" diff --git a/Marlin/Marlin.sdf b/Marlin/Marlin.sdf deleted file mode 100644 index 12025ee6a0..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 e37befabaa..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", "{510EF280-9617-4F04-86F4-19F7E48C6FC1}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {510EF280-9617-4F04-86F4-19F7E48C6FC1}.Debug|Win32.ActiveCfg = Debug|Win32 - {510EF280-9617-4F04-86F4-19F7E48C6FC1}.Debug|Win32.Build.0 = Debug|Win32 - {510EF280-9617-4F04-86F4-19F7E48C6FC1}.Release|Win32.ActiveCfg = Release|Win32 - {510EF280-9617-4F04-86F4-19F7E48C6FC1}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Marlin/Marlin.suo b/Marlin/Marlin.suo deleted file mode 100644 index 4b65c2829c..0000000000 Binary files a/Marlin/Marlin.suo and /dev/null differ diff --git a/Marlin/Marlin.vcxproj b/Marlin/Marlin.vcxproj deleted file mode 100644 index f16ea5d8a9..0000000000 --- a/Marlin/Marlin.vcxproj +++ /dev/null @@ -1,118 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {510EF280-9617-4F04-86F4-19F7E48C6FC1} - Marlin - - - - Application - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - - - - - C:\arduino-1.0\hardware\arduino\cores\arduino;C:\arduino-1.0\hardware\arduino\variants\mega;c:\arduino-1.0\hardware\tools\avr\avr\include\;c:\arduino-1.0\hardware\tools\avr\avr\include\avr\;c:\arduino-1.0\hardware\tools\avr\avr\;c:\arduino-1.0\hardware\tools\avr\lib\gcc\avr\4.3.2\include\;C:\arduino-1.0\libraries\LiquidCrystal;C:\arduino-1.0\libraries\LiquidCrystal\utility; - - - C:\arduino-1.0\hardware\arduino\cores\arduino;C:\arduino-1.0\hardware\arduino\variants\mega;c:\arduino-1.0\hardware\tools\avr\avr\include\;c:\arduino-1.0\hardware\tools\avr\avr\include\avr\;c:\arduino-1.0\hardware\tools\avr\avr\;c:\arduino-1.0\hardware\tools\avr\lib\gcc\avr\4.3.2\include\;C:\arduino-1.0\libraries\LiquidCrystal;C:\arduino-1.0\libraries\LiquidCrystal\utility; - - - - Level3 - Disabled - - - true - - - - - Level3 - MaxSpeed - true - true - - - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Marlin/Marlin.vcxproj.filters b/Marlin/Marlin.vcxproj.filters deleted file mode 100644 index 475ca8dd99..0000000000 --- a/Marlin/Marlin.vcxproj.filters +++ /dev/null @@ -1,141 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - - - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ 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 @@ - - - \ No newline at end of file