SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1

Browse source
This commit is contained in:
Erik van der Zalm 2011-11-19 21:33:15 +01:00
commit 0e7fee9a9b
4 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Marlin/Configuration.h
View file

@ -90,6 +90,9 @@
#define PIDTEMP
#ifdef PIDTEMP
#if MOTHERBOARD == 62
#error Sanguinololu does not support PID, sorry. Please disable it.
#endif
//#define PID_DEBUG // Sends debug data to the serial port.
//#define PID_OPENLOOP 1 // Puts PID in open loop. M104 sets the output power in %
@ -195,7 +198,6 @@ const bool ENDSTOPS_INVERTING = true; // set to true to invert the logic of the
//// MOVEMENT SETTINGS
#define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E
//note: on bernhards ultimaker 200 200 12 are working well.
#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min)
#define AXIS_RELATIVE_MODES {false, false, false, false}
@ -205,7 +207,7 @@ const bool ENDSTOPS_INVERTING = true; // set to true to invert the logic of the
// default settings
#define DEFAULT_AXIS_STEPS_PER_UNIT {78.7402,78.7402,200*8/3,760*1.1} // default steps per unit for ultimaker
//#define DEFAULT_AXIS_STEPS_PER_UNIT {40, 40, 3333.92, 67}
//#define DEFAULT_AXIS_STEPS_PER_UNIT {40, 40, 3333.92, 67} //sells mendel with v9 extruder
#define DEFAULT_MAX_FEEDRATE {500, 500, 5, 200000} // (mm/sec)
#define DEFAULT_MAX_ACCELERATION {9000,9000,100,10000} // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
@ -239,7 +241,8 @@ const bool ENDSTOPS_INVERTING = true; // set to true to invert the logic of the
#define EEPROM_CHITCHAT
// The watchdog waits for the watchperiod in milliseconds whenever an M104 or M109 increases the target temperature
// The hardware watchdog should halt the Microcontroller, in case the firmware gets stuck somewhere. However:
// the Watchdog is not working well, so please only enable this for testing
// this enables the watchdog interrupt.
//#define USE_WATCHDOG
//#ifdef USE_WATCHDOG
@ -272,7 +275,7 @@ const bool ENDSTOPS_INVERTING = true; // set to true to invert the logic of the
//#define ULTRA_LCD //general lcd support, also 16x2
//#define SDSUPPORT // Enable SD Card Support in Hardware Console
#define ULTIPANEL
//#define ULTIPANEL
#ifdef ULTIPANEL
//#define NEWPANEL //enable this if you have a click-encoder panel
#define SDSUPPORT
@ -295,8 +298,13 @@ const bool ENDSTOPS_INVERTING = true; // set to true to invert the logic of the
#define N_ARC_CORRECTION 25
//automatic temperature: just for testing, this is very dangerous, keep disabled!
// not working yet.
//automatic temperature: The hot end target temperature is calculated by all the buffered lines of gcode.
//The maximum buffered steps/sec of the extruder motor are called "se".
//You enter the autotemp mode by a M109 S<mintemp> T<maxtemp> F<factor>
// the target temperature is set to mintemp+factor*se[steps/sec] and limited by mintemp and maxtemp
// you exit the value by any M109 without F*
// Also, if the temperature is set to a value <mintemp, it is not changed by autotemp.
// on an ultimaker, some initial testing worked with M109 S215 T260 F0.1 in the start.gcode
//#define AUTOTEMP
#ifdef AUTOTEMP
#define AUTOTEMP_OLDWEIGHT 0.98

11
Marlin/Marlin.pde
View file

@ -70,6 +70,8 @@
// M114 - Display current position
//Custom M Codes
// M17 - Enable/Power all stepper motors
// M18 - Disable all stepper motors; same as M84
// M20 - List SD card
// M21 - Init SD card
// M22 - Release SD card
@ -90,7 +92,9 @@
// or use S<seconds> to specify an inactivity timeout, after which the steppers will be disabled. S0 to disable the timeout.
// M85 - Set inactivity shutdown timer with parameter S<seconds>. To disable set zero (default)
// M92 - Set axis_steps_per_unit - same syntax as G92
// M114 - Output current position to serial port
// M115 - Capabilities string
// M119 - Output Endstop status to serial port
// M140 - Set bed target temp
// M190 - Wait for bed current temp to reach target temp.
// M200 - Set filament diameter
@ -569,6 +573,13 @@ inline void process_commands()
switch( (int)code_value() )
{
case 17:
LCD_MESSAGEPGM("No move.");
enable_x();
enable_y();
enable_z();
enable_e();
break;
#ifdef SDSUPPORT
case 20: // M20 - list SD card

14
Marlin/cardreader.h
View file

@ -20,17 +20,15 @@ public:
void closefile();
void release();
void startFileprint();
//void startFilewrite(char *name);
void pauseSDPrint();
void getStatus();
void cd(char * absolutPath);
//void selectFile(char* name);
void getfilename(const uint8_t nr);
uint16_t getnrfilenames();
void ls();
void lsDive(char *prepend,SdFile parent);
inline bool eof() { return sdpos>=filesize ;};
inline int16_t get() { sdpos = file.curPosition();return (int16_t)file.read();};
@ -57,10 +55,13 @@ private:
LsAction lsAction; //stored for recursion.
int16_t nrFiles; //counter for the files in the current directory and recycled as position counter for getting the nrFiles'th name in the directory.
char* diveDirName;
void lsDive(char *prepend,SdFile parent);
};
#else
#define dir_t bool
class CardReader
{
public:
@ -71,6 +72,7 @@ public:
inline static void checkautostart(bool x) {};
inline static void openFile(char* name,bool read){};
inline static void closefile() {};
inline static void release(){};
inline static void startFileprint(){};
@ -87,9 +89,7 @@ public:
inline static bool eof() {return true;};
inline static char get() {return 0;};
inline static void setIndex(){};
inline uint8_t percentDone(){return 0;};
};
#endif //SDSUPPORT
#endif

6
Marlin/cardreader.pde
View file

@ -1,5 +1,5 @@
#ifdef SDSUPPORT
#include "cardreader.h"
#ifdef SDSUPPORT
CardReader::CardReader()
{
@ -378,9 +378,5 @@ uint16_t CardReader::getnrfilenames()
return nrFiles;
}
void CardReader::cd(char * absolutPath)
{
}
#endif //SDSUPPORT