bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge pull request #1974 from thinkyhead/eeprom_in_gcode

Browse Source 
Make EEPROM reproducible in GCode
This commit is contained in:
Scott Lahteine
2015-04-27 22:35:41 -07:00
parent c1fbef1722 0f687b5dda
commit 3688256f86
20 changed files with 467 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
Marlin/Marlin_main.cpp
View File

@ -151,6 +151,7 @@
* M128 - EtoP Open (BariCUDA EtoP = electricity to air pressure transducer by jmil)
* M129 - EtoP Closed (BariCUDA EtoP = electricity to air pressure transducer by jmil)
* M140 - Set bed target temp
* M145 - Set the heatup state H<hotend> B<bed> F<fan speed> for S<material> (0=PLA, 1=ABS)
* M150 - Set BlinkM Color Output R: Red<0-255> U(!): Green<0-255> B: Blue<0-255> over i2c, G for green does not work.
* M190 - Sxxx Wait for bed current temp to reach target temp. Waits only when heating
* Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling
@ -186,6 +187,8 @@
* M406 - Turn off Filament Sensor extrusion control
* M407 - Display measured filament diameter
* M410 - Quickstop. Abort all the planned moves
* M420 - Enable/Disable Mesh Leveling (with current values) S1=enable S0=disable
* M421 - Set a single Z coordinate in the Mesh Leveling grid. X<mm> Y<mm> Z<mm>
* M500 - Store parameters in EEPROM
* M501 - Read parameters from EEPROM (if you need reset them after you changed them temporarily).
* M502 - Revert to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
@ -3399,6 +3402,62 @@ inline void gcode_M140() {
if (code_seen('S')) setTargetBed(code_value());
}
#ifdef ULTIPANEL
/**
* M145: Set the heatup state for a material in the LCD menu
* S<material> (0=PLA, 1=ABS)
* H<hotend temp>
* B<bed temp>
* F<fan speed>
*/
inline void gcode_M145() {
uint8_t material = code_seen('S') ? code_value_short() : 0;
if (material < 0 || material > 1) {
SERIAL_ERROR_START;
SERIAL_ERRORLNPGM(MSG_ERR_MATERIAL_INDEX);
}
else {
int v;
switch (material) {
case 0:
if (code_seen('H')) {
v = code_value_short();
plaPreheatHotendTemp = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP - 15);
}
if (code_seen('F')) {
v = code_value_short();
plaPreheatFanSpeed = constrain(v, 0, 255);
}
#if TEMP_SENSOR_BED != 0
if (code_seen('B')) {
v = code_value_short();
plaPreheatHPBTemp = constrain(v, BED_MINTEMP, BED_MAXTEMP - 15);
}
#endif
break;
case 1:
if (code_seen('H')) {
v = code_value_short();
absPreheatHotendTemp = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP - 15);
}
if (code_seen('F')) {
v = code_value_short();
absPreheatFanSpeed = constrain(v, 0, 255);
}
#if TEMP_SENSOR_BED != 0
if (code_seen('B')) {
v = code_value_short();
absPreheatHPBTemp = constrain(v, BED_MINTEMP, BED_MAXTEMP - 15);
}
#endif
break;
}
}
}
#endif
#if HAS_POWER_SWITCH
/**
@ -3506,7 +3565,8 @@ inline void gcode_M85() {
}
/**
* M92: Set inactivity shutdown timer with parameter S<seconds>. To disable set zero (default)
* M92: Set axis steps-per-unit for one or more axes, X, Y, Z, and E.
* (Follows the same syntax as G92)
*/
inline void gcode_M92() {
for(int8_t i=0; i < NUM_AXIS; i++) {
@ -3828,20 +3888,35 @@ inline void gcode_M206() {
#ifdef FWRETRACT
/**
* M207: Set retract length S[positive mm] F[feedrate mm/min] Z[additional zlift/hop]
* M207: Set firmware retraction values
*
* S[+mm] retract_length
* W[+mm] retract_length_swap (multi-extruder)
* F[mm/min] retract_feedrate
* Z[mm] retract_zlift
*/
inline void gcode_M207() {
if (code_seen('S')) retract_length = code_value();
if (code_seen('F')) retract_feedrate = code_value() / 60;
if (code_seen('Z')) retract_zlift = code_value();
#if EXTRUDERS > 1
if (code_seen('W')) retract_length_swap = code_value();
#endif
}
/**
* M208: Set retract recover length S[positive mm surplus to the M207 S*] F[feedrate mm/min]
* M208: Set firmware un-retraction values
*
* S[+mm] retract_recover_length (in addition to M207 S*)
* W[+mm] retract_recover_length_swap (multi-extruder)
* F[mm/min] retract_recover_feedrate
*/
inline void gcode_M208() {
if (code_seen('S')) retract_recover_length = code_value();
if (code_seen('F')) retract_recover_feedrate = code_value() / 60;
#if EXTRUDERS > 1
if (code_seen('W')) retract_recover_length_swap = code_value();
#endif
}
/**
@ -4394,6 +4469,41 @@ inline void gcode_M400() { st_synchronize(); }
*/
inline void gcode_M410() { quickStop(); }
#ifdef MESH_BED_LEVELING
/**
* M420: Enable/Disable Mesh Bed Leveling
*/
inline void gcode_M420() { if (code_seen('S') && code_has_value()) mbl.active = !!code_value_short(); }
/**
* M421: Set a single Mesh Bed Leveling Z coordinate
*/
inline void gcode_M421() {
float x, y, z;
bool err = false, hasX, hasY, hasZ;
if ((hasX = code_seen('X'))) x = code_value();
if ((hasY = code_seen('Y'))) y = code_value();
if ((hasZ = code_seen('Z'))) z = code_value();
if (!hasX || !hasY || !hasZ) {
SERIAL_ERROR_START;
SERIAL_ERRORLNPGM(MSG_ERR_M421_REQUIRES_XYZ);
err = true;
}
if (x >= MESH_NUM_X_POINTS || y >= MESH_NUM_Y_POINTS) {
SERIAL_ERROR_START;
SERIAL_ERRORLNPGM(MSG_ERR_MESH_INDEX_OOB);
err = true;
}
if (!err) mbl.set_z(select_x_index(x), select_y_index(y), z);
}
#endif
/**
* M500: Store settings in EEPROM
*/
@ -4948,11 +5058,11 @@ void process_commands() {
gcode_M104();
break;
case 111: // M111: Set debug level
case 111: // M111: Set debug level
gcode_M111();
break;
case 112: // M112: Emergency Stop
case 112: // M112: Emergency Stop
gcode_M112();
break;
@ -5031,28 +5141,35 @@ void process_commands() {
case 85: // M85
gcode_M85();
break;
case 92: // M92
case 92: // M92: Set the steps-per-unit for one or more axes
gcode_M92();
break;
case 115: // M115
case 115: // M115: Report capabilities
gcode_M115();
break;
case 117: // M117 display message
case 117: // M117: Set LCD message text
gcode_M117();
break;
case 114: // M114
case 114: // M114: Report current position
gcode_M114();
break;
case 120: // M120
case 120: // M120: Enable endstops
gcode_M120();
break;
case 121: // M121
case 121: // M121: Disable endstops
gcode_M121();
break;
case 119: // M119
case 119: // M119: Report endstop states
gcode_M119();
break;
//TODO: update for all axis, use for loop
#ifdef ULTIPANEL
case 145: // M145: Set material heatup parameters
gcode_M145();
break;
#endif
#ifdef BLINKM
@ -5227,6 +5344,15 @@ void process_commands() {
gcode_M410();
break;
#ifdef MESH_BED_LEVELING
case 420: // M420 Enable/Disable Mesh Bed Leveling
gcode_M420();
break;
case 421: // M421 Set a Mesh Bed Leveling Z coordinate
gcode_M421();
break;
#endif
case 500: // M500 Store settings in EEPROM
gcode_M500();
break;