Added more defines to the language.h file so that nowe most of the text strings are now configured via this file. Still got some hunting down to do to complete this task.
Blair Thompson
13 years ago
parent
b4833d55c2
commit
046a8e0039
@ -0,0 +1,58 @@
|
|||||||
|
#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"
|
||||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,140 @@
|
|||||||
|
<?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>
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
</Project>
|
||||||
Loading…
Reference in new issue