diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0c2aacd..4ca1d95b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,7 @@ set(TEST_SOURCES
Tests/Example_test.cpp
Tests/Timer_test.cpp
Tests/AutoDeplete_test.cpp
+ Tests/PrusaStatistics_test.cpp
Firmware/Timer.cpp
Firmware/AutoDeplete.cpp
)
diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h
index c42bfca0..582cea34 100755
--- a/Firmware/Marlin.h
+++ b/Firmware/Marlin.h
@@ -79,9 +79,9 @@ extern FILE _uartout;
#define SERIAL_PROTOCOL_F(x,y) (MYSERIAL.print(x,y))
#define SERIAL_PROTOCOLPGM(x) (serialprintPGM(PSTR(x)))
#define SERIAL_PROTOCOLRPGM(x) (serialprintPGM((x)))
-#define SERIAL_PROTOCOLLN(x) (MYSERIAL.print(x),MYSERIAL.write('\n'))
-#define SERIAL_PROTOCOLLNPGM(x) (serialprintPGM(PSTR(x)),MYSERIAL.write('\n'))
-#define SERIAL_PROTOCOLLNRPGM(x) (serialprintPGM((x)),MYSERIAL.write('\n'))
+#define SERIAL_PROTOCOLLN(x) (MYSERIAL.println(x)/*,MYSERIAL.write('\n')*/)
+#define SERIAL_PROTOCOLLNPGM(x) (serialprintPGM(PSTR(x)),MYSERIAL.println()/*write('\n')*/)
+#define SERIAL_PROTOCOLLNRPGM(x) (serialprintPGM((x)),MYSERIAL.println()/*write('\n')*/)
extern const char errormagic[] PROGMEM;
@@ -111,15 +111,9 @@ void serial_echopair_P(const char *s_P, unsigned long v);
//Things to write to serial from Program memory. Saves 400 to 2k of RAM.
-FORCE_INLINE void serialprintPGM(const char *str)
-{
- char ch=pgm_read_byte(str);
- while(ch)
- {
- MYSERIAL.write(ch);
- ch=pgm_read_byte(++str);
- }
-}
+// Making this FORCE_INLINE is not a good idea when running out of FLASH
+// I'd rather skip a few CPU ticks than 5.5KB (!!) of FLASH
+void serialprintPGM(const char *str);
bool is_buffer_empty();
void get_command();
@@ -408,6 +402,7 @@ extern LongTimer safetyTimer;
#define PRINT_PERCENT_DONE_INIT 0xff
#define PRINTER_ACTIVE (IS_SD_PRINTING || is_usb_printing || isPrintPaused || (custom_message_type == CustomMsg::TempCal) || saved_printing || (lcd_commands_type == LcdCommands::Layer1Cal) || card.paused || mmu_print_saved)
+
//! Beware - mcode_in_progress is set as soon as the command gets really processed,
//! which is not the same as posting the M600 command into the command queue
//! There can be a considerable lag between posting M600 and its real processing which might result
diff --git a/Firmware/MarlinSerial.h b/Firmware/MarlinSerial.h
index d596708e..27e722bc 100644
--- a/Firmware/MarlinSerial.h
+++ b/Firmware/MarlinSerial.h
@@ -96,7 +96,7 @@ class MarlinSerial //: public Stream
static int read(void);
static void flush(void);
- static FORCE_INLINE int available(void)
+ static /*FORCE_INLINE*/ int available(void)
{
return (unsigned int)(RX_BUFFER_SIZE + rx_buffer.head - rx_buffer.tail) % RX_BUFFER_SIZE;
}
@@ -184,14 +184,14 @@ class MarlinSerial //: public Stream
public:
- static FORCE_INLINE void write(const char *str)
+ static /*FORCE_INLINE*/ void write(const char *str)
{
while (*str)
write(*str++);
}
- static FORCE_INLINE void write(const uint8_t *buffer, size_t size)
+ static /*FORCE_INLINE*/ void write(const uint8_t *buffer, size_t size)
{
while (size--)
write(*buffer++);
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 8c91f4bb..35722679 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -411,6 +411,24 @@ void serial_echopair_P(const char *s_P, double v)
void serial_echopair_P(const char *s_P, unsigned long v)
{ serialprintPGM(s_P); SERIAL_ECHO(v); }
+/*FORCE_INLINE*/ void serialprintPGM(const char *str)
+{
+#if 0
+ char ch=pgm_read_byte(str);
+ while(ch)
+ {
+ MYSERIAL.write(ch);
+ ch=pgm_read_byte(++str);
+ }
+#else
+ // hmm, same size as the above version, the compiler did a good job optimizing the above
+ while( uint8_t ch = pgm_read_byte(str) ){
+ MYSERIAL.write((char)ch);
+ ++str;
+ }
+#endif
+}
+
#ifdef SDSUPPORT
#include "SdFatUtil.h"
int freeMemory() { return SdFatUtil::FreeRam(); }
@@ -3256,14 +3274,19 @@ extern uint8_t st_backlash_x;
extern uint8_t st_backlash_y;
#endif //BACKLASH_Y
+//! \ingroup marlin_main
+
//! @brief Parse and process commands
//!
//! look here for descriptions of G-codes: http://linuxcnc.org/handbook/gcode/g-code.html
//! http://objects.reprap.org/wiki/Mendel_User_Manual:_RepRapGCodes
//!
-//! Implemented Codes
+//!
+//! Implemented Codes
//! -------------------
//!
+//! * _This list is not updated. Current documentation is maintained inside the process_cmd function._
+//!
//!@n PRUSA CODES
//!@n P F - Returns FW versions
//!@n P R - Returns revision of printer
@@ -3386,14 +3409,30 @@ extern uint8_t st_backlash_y;
//!
//!@n M928 - Start SD logging (M928 filename.g) - ended by M29
//!@n M999 - Restart after being stopped by error
+//!
+
+/** @defgroup marlin_main Marlin main */
+
+/** \ingroup GCodes */
+
+//! _This is a list of currently implemented G Codes in Prusa firmware (dynamically generated from doxygen)_
+
+
void process_commands()
{
#ifdef FANCHECK
if (fan_check_error){
if( fan_check_error == EFCE_DETECTED ){
fan_check_error = EFCE_REPORTED;
- lcd_pause_print();
- } // otherwise it has already been reported, so just ignore further processing
+
+ if(is_usb_printing){
+ SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSE);
+ }
+ else{
+ lcd_pause_print();
+ }
+
+ } // otherwise it has already been reported, so just ignore further processing
return;
}
#endif
@@ -3437,21 +3476,33 @@ void process_commands()
#ifdef TMC2130
else if (strncmp_P(CMDBUFFER_CURRENT_STRING, PSTR("CRASH_"), 6) == 0)
{
- if(code_seen("CRASH_DETECTED")) //! CRASH_DETECTED
+
+ //! ### CRASH_DETECTED - TMC2130
+ // ---------------------------------
+ if(code_seen("CRASH_DETECTED"))
{
uint8_t mask = 0;
if (code_seen('X')) mask |= X_AXIS_MASK;
if (code_seen('Y')) mask |= Y_AXIS_MASK;
crashdet_detected(mask);
}
- else if(code_seen("CRASH_RECOVER")) //! CRASH_RECOVER
+
+ //! ### CRASH_RECOVER - TMC2130
+ // ----------------------------------
+ else if(code_seen("CRASH_RECOVER"))
crashdet_recover();
- else if(code_seen("CRASH_CANCEL")) //! CRASH_CANCEL
+
+ //! ### CRASH_CANCEL - TMC2130
+ // ----------------------------------
+ else if(code_seen("CRASH_CANCEL"))
crashdet_cancel();
}
else if (strncmp_P(CMDBUFFER_CURRENT_STRING, PSTR("TMC_"), 4) == 0)
{
- if (strncmp_P(CMDBUFFER_CURRENT_STRING + 4, PSTR("SET_WAVE_"), 9) == 0) //! TMC_SET_WAVE_
+
+ //! ### TMC_SET_WAVE_
+ // --------------------
+ if (strncmp_P(CMDBUFFER_CURRENT_STRING + 4, PSTR("SET_WAVE_"), 9) == 0)
{
uint8_t axis = *(CMDBUFFER_CURRENT_STRING + 13);
axis = (axis == 'E')?3:(axis - 'X');
@@ -3461,7 +3512,10 @@ void process_commands()
tmc2130_set_wave(axis, 247, fac);
}
}
- else if (strncmp_P(CMDBUFFER_CURRENT_STRING + 4, PSTR("SET_STEP_"), 9) == 0) //! TMC_SET_STEP_
+
+ //! ### TMC_SET_STEP_
+ // ------------------
+ else if (strncmp_P(CMDBUFFER_CURRENT_STRING + 4, PSTR("SET_STEP_"), 9) == 0)
{
uint8_t axis = *(CMDBUFFER_CURRENT_STRING + 13);
axis = (axis == 'E')?3:(axis - 'X');
@@ -3472,7 +3526,10 @@ void process_commands()
tmc2130_goto_step(axis, step & (4*res - 1), 2, 1000, res);
}
}
- else if (strncmp_P(CMDBUFFER_CURRENT_STRING + 4, PSTR("SET_CHOP_"), 9) == 0) //! TMC_SET_CHOP_
+
+ //! ### TMC_SET_CHOP_
+ // -------------------
+ else if (strncmp_P(CMDBUFFER_CURRENT_STRING + 4, PSTR("SET_CHOP_"), 9) == 0)
{
uint8_t axis = *(CMDBUFFER_CURRENT_STRING + 13);
axis = (axis == 'E')?3:(axis - 'X');
@@ -3523,19 +3580,50 @@ void process_commands()
}
#endif //BACKLASH_Y
#endif //TMC2130
- else if(code_seen("PRUSA")){
- if (code_seen("Ping")) { //! PRUSA Ping
+ else if(code_seen("PRUSA")){
+ /*!
+ *
+ ### PRUSA - Internal command set
+
+ Set of internal PRUSA commands
+
+ PRUSA [ Ping | PRN | FAN | fn | thx | uvlo | fsensor_recover | MMURES | RESET | fv | M28 | SN | Fir | Rev | Lang | Lz | Beat | FR ]
+
+ - `Ping`
+ - `PRN` - Prints revision of the printer
+ - `FAN` - Prints fan details
+ - `fn` - Prints farm no.
+ - `thx`
+ - `uvlo`
+ - `fsensor_recover` - Filament sensor recover - restore print and continue
+ - `MMURES` - Reset MMU
+ - `RESET` - (Careful!)
+ - `fv` - ?
+ - `M28`
+ - `SN`
+ - `Fir` - Prints firmware version
+ - `Rev`- Prints filament size, elelectronics, nozzle type
+ - `Lang` - Reset the language
+ - `Lz`
+ - `Beat` - Kick farm link timer
+ - `FR` - Full factory reset
+ - `nozzle D G1
case 1: // G1
if(Stopped == false) {
@@ -3900,19 +3991,30 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
//ClearToSend();
}
break;
- case 2: // G2 - CW ARC
+
+ //! ### G2 - CW ARC
+ // ------------------------------
+ case 2:
if(Stopped == false) {
get_arc_coordinates();
prepare_arc_move(true);
}
break;
- case 3: // G3 - CCW ARC
+
+
+ //! ### G3 - CCW ARC
+ // -------------------------------
+ case 3:
if(Stopped == false) {
get_arc_coordinates();
prepare_arc_move(false);
}
break;
- case 4: // G4 dwell
+
+
+ //! ### G4 - Dwell
+ // -------------------------------
+ case 4:
codenum = 0;
if(code_seen('P')) codenum = code_value(); // milliseconds to wait
if(code_seen('S')) codenum = code_value() * 1000; // seconds to wait
@@ -3927,7 +4029,11 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
}
break;
#ifdef FWRETRACT
- case 10: // G10 retract
+
+
+ //! ### G10 Retract
+ // ------------------------------
+ case 10:
#if EXTRUDERS > 1
retracted_swap[active_extruder]=(code_seen('S') && code_value_long() == 1); // checks for swap retract argument
retract(true,retracted_swap[active_extruder]);
@@ -3935,7 +4041,11 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
retract(true);
#endif
break;
- case 11: // G11 retract_recover
+
+
+ //! ### G11 - Retract recover
+ // -----------------------------
+ case 11:
#if EXTRUDERS > 1
retract(false,retracted_swap[active_extruder]);
#else
@@ -3943,7 +4053,11 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
#endif
break;
#endif //FWRETRACT
- case 28: //G28 Home all Axis one at a time
+
+
+ //! ### G28 - Home all Axis one at a time
+ // --------------------------------------------
+ case 28:
{
long home_x_value = 0;
long home_y_value = 0;
@@ -3970,8 +4084,13 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
}
break;
}
+
#ifdef ENABLE_AUTO_BED_LEVELING
- case 29: // G29 Detailed Z-Probe, probes the bed at 3 or more points.
+
+
+ //! ### G29 - Detailed Z-Probe
+ // --------------------------------
+ case 29:
{
#if Z_MIN_PIN == -1
#error "You must have a Z_MIN endstop in order to enable Auto Bed Leveling feature! Z_MIN_PIN must point to a valid hardware pin."
@@ -4114,7 +4233,10 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
}
break;
#ifndef Z_PROBE_SLED
- case 30: // G30 Single Z Probe
+
+ //! ### G30 - Single Z Probe
+ // ------------------------------------
+ case 30:
{
st_synchronize();
// TODO: make sure the bed_level_rotation_matrix is identity or the planner will get set incorectly
@@ -4136,17 +4258,27 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
}
break;
#else
- case 31: // dock the sled
+
+ //! ### G31 - Dock the sled
+ // ---------------------------
+ case 31:
dock_sled(true);
break;
- case 32: // undock the sled
+
+
+ //! ### G32 - Undock the sled
+ // ----------------------------
+ case 32:
dock_sled(false);
break;
#endif // Z_PROBE_SLED
#endif // ENABLE_AUTO_BED_LEVELING
#ifdef MESH_BED_LEVELING
- case 30: // G30 Single Z Probe
+
+ //! ### G30 - Single Z Probe
+ // ----------------------------
+ case 30:
{
st_synchronize();
// TODO: make sure the bed_level_rotation_matrix is identity or the planner will get set incorectly
@@ -4162,7 +4294,8 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
}
break;
-
+ //! ### G75 - Print temperature interpolation
+ // ---------------------------------------------
case 75:
{
for (int i = 40; i <= 110; i++)
@@ -4170,7 +4303,9 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
}
break;
- case 76: //! G76 - PINDA probe temperature calibration
+ //! ### G76 - PINDA probe temperature calibration
+ // ------------------------------------------------
+ case 76:
{
#ifdef PINDA_THERMISTOR
if (true)
@@ -4427,18 +4562,16 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
break;
-
- /**
- * G80: Mesh-based Z probe, probes a grid and produces a
- * mesh to compensate for variable bed height
- *
+ //! ### G80 - Mesh-based Z probe
+ // -----------------------------------
+
+ /*
+ * Probes a grid and produces a mesh to compensate for variable bed height
* The S0 report the points as below
- * @code{.unparsed}
* +----> X-axis
* |
* |
* v Y-axis
- * @endcode
*/
case 80:
@@ -4862,8 +4995,11 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
}
break;
- /**
- * G81: Print mesh bed leveling status and bed profile if activated
+ //! ### G81 - Mesh bed leveling status
+ // -----------------------------------------
+
+ /*
+ * Prints mesh bed leveling status and bed profile if activated
*/
case 81:
if (mbl.active) {
@@ -4887,7 +5023,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
break;
#if 0
- /**
+ /*
* G82: Single Z probe at current location
*
* WARNING! USE WITH CAUTION! If you'll try to probe where is no leveling pad, nasty things can happen!
@@ -4903,7 +5039,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
SERIAL_PROTOCOLPGM("\n");
break;
- /**
+ /*
* G83: Prusa3D specific: Babystep in Z and store to EEPROM
*/
case 83:
@@ -4928,7 +5064,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
}
break;
- /**
+ /*
* G84: Prusa3D specific: UNDO Babystep Z (move Z axis back)
*/
case 84:
@@ -4936,7 +5072,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
// babystepLoadZ = 0;
break;
- /**
+ /*
* G85: Prusa3D specific: Pick best babystep
*/
case 85:
@@ -4944,38 +5080,58 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
break;
#endif
- /**
- * G86: Prusa3D specific: Disable babystep correction after home.
- * This G-code will be performed at the start of a calibration script.
- */
+ /**
+ * ### G86 - Disable babystep correction after home
+ *
+ * This G-code will be performed at the start of a calibration script.
+ * (Prusa3D specific)
+ */
case 86:
calibration_status_store(CALIBRATION_STATUS_LIVE_ADJUST);
break;
- /**
- * G87: Prusa3D specific: Enable babystep correction after home
- * This G-code will be performed at the end of a calibration script.
- */
+
+
+ /**
+ * ### G87 - Enable babystep correction after home
+ *
+ *
+ * This G-code will be performed at the end of a calibration script.
+ * (Prusa3D specific)
+ */
case 87:
calibration_status_store(CALIBRATION_STATUS_CALIBRATED);
break;
- /**
- * G88: Prusa3D specific: Don't know what it is for, it is in V2Calibration.gcode
- */
+
+ /**
+ * ### G88 - Reserved
+ *
+ * Currently has no effect.
+ */
+
+ // Prusa3D specific: Don't know what it is for, it is in V2Calibration.gcode
+
case 88:
break;
#endif // ENABLE_MESH_BED_LEVELING
-
- case 90: // G90
+ //! ### G90 - Switch off relative mode
+ // -------------------------------
+ case 90:
relative_mode = false;
break;
- case 91: // G91
+
+ //! ### G91 - Switch on relative mode
+ // -------------------------------
+ case 91:
relative_mode = true;
break;
- case 92: // G92
+
+ //! ### G92 - Set position
+ // -----------------------------
+ case 92:
if(!code_seen(axis_codes[E_AXIS]))
st_synchronize();
for(int8_t i=0; i < NUM_AXIS; i++) {
@@ -4992,7 +5148,10 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
}
break;
- case 98: //! G98 (activate farm mode)
+
+ //! ### G98 - Activate farm mode
+ // -----------------------------------
+ case 98:
farm_mode = 1;
PingTime = _millis();
eeprom_update_byte((unsigned char *)EEPROM_FARM_MODE, farm_mode);
@@ -5002,7 +5161,9 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
fCheckModeInit(); // alternatively invoke printer reset
break;
- case 99: //! G99 (deactivate farm mode)
+ //! ### G99 - Deactivate farm mode
+ // -------------------------------------
+ case 99:
farm_mode = 0;
lcd_printer_connected();
eeprom_update_byte((unsigned char *)EEPROM_FARM_MODE, farm_mode);
@@ -5016,6 +5177,9 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
gcode_in_progress = 0;
} // end if(code_seen('G'))
+
+ //! ---------------------------------------------------------------------------------
+
else if(code_seen('M'))
{
@@ -5034,6 +5198,8 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
switch(mcode_in_progress)
{
+ //! ### M0, M1 - Stop the printer
+ // ---------------------------------------------------------------
case 0: // M0 - Unconditional stop - Wait for user button press on LCD
case 1: // M1 - Conditional stop - Wait for user button press on LCD
{
@@ -5081,6 +5247,9 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
LCD_MESSAGERPGM(_T(WELCOME_MSG));
}
break;
+
+ //! ### M17 - Enable axes
+ // ---------------------------------
case 17:
LCD_MESSAGERPGM(_i("No move."));////MSG_NO_MOVE
enable_x();
@@ -5092,44 +5261,68 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
break;
#ifdef SDSUPPORT
- case 20: // M20 - list SD card
+
+ //! ### M20 - SD Card file list
+ // -----------------------------------
+ case 20:
SERIAL_PROTOCOLLNRPGM(_N("Begin file list"));////MSG_BEGIN_FILE_LIST
card.ls();
SERIAL_PROTOCOLLNRPGM(_N("End file list"));////MSG_END_FILE_LIST
break;
- case 21: // M21 - init SD card
+ //! ### M21 - Init SD card
+ // ------------------------------------
+ case 21:
card.initsd();
-
break;
- case 22: //M22 - release SD card
+
+ //! ### M22 - Release SD card
+ // -----------------------------------
+ case 22:
card.release();
-
break;
- case 23: //M23 - Select file
+
+ //! ### M23 - Select file
+ // -----------------------------------
+ case 23:
starpos = (strchr(strchr_pointer + 4,'*'));
if(starpos!=NULL)
*(starpos)='\0';
card.openFile(strchr_pointer + 4,true);
break;
- case 24: //M24 - Start SD print
+
+ //! ### M24 - Start SD print
+ // ----------------------------------
+ case 24:
if (!card.paused)
failstats_reset_print();
card.startFileprint();
starttime=_millis();
break;
- case 25: //M25 - Pause SD print
+
+ //! ### M25 - Pause SD print
+ // ----------------------------------
+ case 25:
card.pauseSDPrint();
break;
- case 26: //M26 - Set SD index
+
+ //! ### M26 - Set SD index
+ // ----------------------------------
+ case 26:
if(card.cardOK && code_seen('S')) {
card.setIndex(code_value_long());
}
break;
- case 27: //M27 - Get SD status
+
+ //! ### M27 - Get SD status
+ // ----------------------------------
+ case 27:
card.getStatus();
break;
- case 28: //M28 - Start SD write
+
+ //! ### M28 - Start SD write
+ // ---------------------------------
+ case 28:
starpos = (strchr(strchr_pointer + 4,'*'));
if(starpos != NULL){
char* npos = strchr(CMDBUFFER_CURRENT_STRING, 'N');
@@ -5138,11 +5331,18 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
}
card.openFile(strchr_pointer+4,false);
break;
- case 29: //M29 - Stop SD write
+
+ //! ### M29 - Stop SD write
+ // -------------------------------------
+ //! Currently has no effect.
+ case 29:
//processed in write to file routine above
//card,saving = false;
break;
- case 30: //M30 Delete File
+
+ //! ### M30 - Delete file
+ // ----------------------------------
+ case 30:
if (card.cardOK){
card.closefile();
starpos = (strchr(strchr_pointer + 4,'*'));
@@ -5154,7 +5354,10 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
card.removeFile(strchr_pointer + 4);
}
break;
- case 32: //M32 - Select file and start SD print
+
+ //! ### M32 - Select file and start SD print
+ // ------------------------------------
+ case 32:
{
if(card.sdprinting) {
st_synchronize();
@@ -5189,7 +5392,10 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
starttime=_millis(); //procedure calls count as normal print time.
}
} break;
- case 928: //M928 - Start SD write
+
+ //! ### M982 - Start SD write
+ // ---------------------------------
+ case 928:
starpos = (strchr(strchr_pointer + 5,'*'));
if(starpos != NULL){
char* npos = strchr(CMDBUFFER_CURRENT_STRING, 'N');
@@ -5201,6 +5407,8 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
#endif //SDSUPPORT
+ //! ### M31 - Report current print time
+ // --------------------------------------------------
case 31: //M31 take time since the start of the SD print or an M109 command
{
stoptime=_millis();
@@ -5216,7 +5424,10 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
autotempShutdown();
}
break;
- case 42: //M42 -Change pin status via gcode
+
+ //! ### M42 - Set pin state
+ // -----------------------------
+ case 42:
if (code_seen('S'))
{
int pin_status = code_value();
@@ -5243,7 +5454,11 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
}
}
break;
- case 44: //! M44: Prusa3D: Reset the bed skew and offset calibration.
+
+
+ //! ### M44 - Reset the bed skew and offset calibration (Prusa specific)
+ // --------------------------------------------------------------------
+ case 44: // M44: Prusa3D: Reset the bed skew and offset calibration.
// Reset the baby step value and the baby step applied flag.
calibration_status_store(CALIBRATION_STATUS_ASSEMBLED);
@@ -5257,7 +5472,9 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
world2machine_revert_to_uncorrected();
break;
- case 45: //! M45: Prusa3D: bed skew and offset with manual Z up
+ //! ### M45 - Bed skew and offset with manual Z up (Prusa specific)
+ // ------------------------------------------------------
+ case 45: // M45: Prusa3D: bed skew and offset with manual Z up
{
int8_t verbosity_level = 0;
bool only_Z = code_seen('Z');
@@ -5296,15 +5513,17 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
}
*/
+ //! ### M47 - Show end stops dialog on the display (Prusa specific)
+ // ----------------------------------------------------
case 47:
- //! M47: Prusa3D: Show end stops dialog on the display.
+
KEEPALIVE_STATE(PAUSED_FOR_USER);
lcd_diag_show_end_stops();
KEEPALIVE_STATE(IN_HANDLER);
break;
#if 0
- case 48: //! M48: scan the bed induction sensor points, print the sensor trigger coordinates to the serial line for visualization on the PC.
+ case 48: // M48: scan the bed induction sensor points, print the sensor trigger coordinates to the serial line for visualization on the PC.
{
// Disable the default update procedure of the display. We will do a modal dialog.
lcd_update_enable(false);
@@ -5342,11 +5561,15 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
#ifdef ENABLE_AUTO_BED_LEVELING
#ifdef Z_PROBE_REPEATABILITY_TEST
- //! M48 Z-Probe repeatability measurement function.
+
+ //! ### M48 - Z-Probe repeatability measurement function.
+ // ------------------------------------------------------
//!
- //! Usage: M48
- //!
- //! This function assumes the bed has been homed. Specificaly, that a G28 command
+ //! _Usage:_
+ //!
+ //! M48
+ //!
+ //! This function assumes the bed has been homed. Specifically, that a G28 command
//! as been issued prior to invoking the M48 Z-Probe repeatability measurement function.
//! Any information generated by a prior G29 Bed leveling command will be lost and need to be
//! regenerated.
@@ -5592,6 +5815,13 @@ Sigma_Exit:
}
#endif // Z_PROBE_REPEATABILITY_TEST
#endif // ENABLE_AUTO_BED_LEVELING
+
+ //! ### M73 - Set/get print progress
+ // -------------------------------------
+ //! _Usage:_
+ //!
+ //! M73 P R Q S
+ //!
case 73: //M73 show percent done and time remaining
if(code_seen('P')) print_percent_done_normal = code_value();
if(code_seen('R')) print_time_remaining_normal = code_value();
@@ -5605,6 +5835,8 @@ Sigma_Exit:
}
break;
+ //! ### M104 - Set hotend temperature
+ // -----------------------------------------
case 104: // M104
{
uint8_t extruder;
@@ -5618,13 +5850,22 @@ Sigma_Exit:
setWatch();
break;
}
- case 112: // M112 -Emergency Stop
+
+ //! ### M112 - Emergency stop
+ // -----------------------------------------
+ case 112:
kill(_n(""), 3);
break;
- case 140: // M140 set bed temp
+
+ //! ### M140 - Set bed temperature
+ // -----------------------------------------
+ case 140:
if (code_seen('S')) setTargetBed(code_value());
break;
- case 105 : // M105
+
+ //! ### M105 - Report temperatures
+ // -----------------------------------------
+ case 105:
{
uint8_t extruder;
if(setTargetedHotend(105, extruder)){
@@ -5718,8 +5959,11 @@ Sigma_Exit:
return;
break;
}
+
+ //! ### M109 - Wait for extruder temperature
+ // -------------------------------------------------
case 109:
- {// M109 - Wait for extruder heater to reach target.
+ {
uint8_t extruder;
if(setTargetedHotend(109, extruder)){
break;
@@ -5769,7 +6013,10 @@ Sigma_Exit:
previous_millis_cmd = _millis();
}
break;
- case 190: // M190 - Wait for bed heater to reach target.
+
+ //! ### M190 - Wait for bed temperature
+ // ---------------------------------------
+ case 190:
#if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1
LCD_MESSAGERPGM(_T(MSG_BED_HEATING));
heating_status = 3;
@@ -5820,7 +6067,10 @@ Sigma_Exit:
break;
#if defined(FAN_PIN) && FAN_PIN > -1
- case 106: //!M106 Sxxx Fan On S 0 .. 255
+
+ //! ### M106 - Set fan speed
+ // -------------------------------------------
+ case 106: // M106 Sxxx Fan On S 0 .. 255
if (code_seen('S')){
fanSpeed=constrain(code_value(),0,255);
}
@@ -5828,13 +6078,19 @@ Sigma_Exit:
fanSpeed=255;
}
break;
- case 107: //M107 Fan Off
+
+ //! ### M107 - Fan off
+ // -------------------------------
+ case 107:
fanSpeed = 0;
break;
#endif //FAN_PIN
#if defined(PS_ON_PIN) && PS_ON_PIN > -1
- case 80: // M80 - Turn on Power Supply
+
+ //! ### M80 - Turn on the Power Supply
+ // -------------------------------
+ case 80:
SET_OUTPUT(PS_ON_PIN); //GND
WRITE(PS_ON_PIN, PS_ON_AWAKE);
@@ -5852,7 +6108,9 @@ Sigma_Exit:
break;
#endif
- case 81: // M81 - Turn off Power Supply
+ //! ### M81 - Turn off Power Supply
+ // --------------------------------------
+ case 81:
disable_heater();
st_synchronize();
disable_e0();
@@ -5873,12 +6131,24 @@ Sigma_Exit:
lcd_update(0);
break;
+ //! ### M82 - Set E axis to absolute mode
+ // ---------------------------------------
case 82:
axis_relative_modes[3] = false;
break;
+
+ //! ### M83 - Set E axis to relative mode
+ // ---------------------------------------
case 83:
axis_relative_modes[3] = true;
break;
+
+ //! ### M84, M18 - Disable steppers
+ //---------------------------------------
+ //! This command can be used to set the stepper inactivity timeout (`S`) or to disable steppers (`X`,`Y`,`Z`,`E`)
+ //!
+ //! M84 [E] [S] [X] [Y] [Z]
+ //!
case 18: //compatibility
case 84: // M84
if(code_seen('S')){
@@ -5914,21 +6184,35 @@ Sigma_Exit:
print_time_remaining_init();
snmm_filaments_used = 0;
break;
+
+ //! ### M85 - Set max inactive time
+ // ---------------------------------------
case 85: // M85
if(code_seen('S')) {
max_inactive_time = code_value() * 1000;
}
break;
#ifdef SAFETYTIMER
- case 86: // M86 - set safety timer expiration time in seconds; M86 S0 will disable safety timer
- //when safety timer expires heatbed and nozzle target temperatures are set to zero
+
+ //! ### M86 - Set safety timer expiration time
+ //!
+ //! _Usage:_
+ //! M86 S
+ //!
+ //! Sets the safety timer expiration time in seconds. M86 S0 will disable safety timer.
+ //! When safety timer expires, heatbed and nozzle target temperatures are set to zero.
+ case 86:
if (code_seen('S')) {
safetytimer_inactive_time = code_value() * 1000;
safetyTimer.start();
}
break;
#endif
- case 92: // M92
+
+ //! ### M92 Set Axis steps-per-unit
+ // ---------------------------------------
+ //! Same syntax as G92
+ case 92:
for(int8_t i=0; i < NUM_AXIS; i++)
{
if(code_seen(axis_codes[i]))
@@ -5949,11 +6233,17 @@ Sigma_Exit:
}
}
break;
- case 110: //! M110 N - reset line pos
+
+ //! ### M110 - Set Line number
+ // ---------------------------------------
+ case 110:
if (code_seen('N'))
gcode_LastN = code_value_long();
break;
- case 113: // M113 - Get or set Host Keepalive interval
+
+ //! ### M113 - Get or set host keep-alive interval
+ // ------------------------------------------
+ case 113:
if (code_seen('S')) {
host_keepalive_interval = (uint8_t)code_value_short();
// NOMORE(host_keepalive_interval, 60);
@@ -5964,6 +6254,16 @@ Sigma_Exit:
SERIAL_PROTOCOLLN("");
}
break;
+
+ //! ### M115 - Firmware info
+ // --------------------------------------
+ //! Print the firmware info and capabilities
+ //!
+ //! M115 [V] [U]
+ //!
+ //! Without any arguments, prints Prusa firmware version number, machine type, extruder count and UUID.
+ //! `M115 U` Checks the firmware version provided. If the firmware version provided by the U code is higher than the currently running firmware,
+ //! pause the print for 30s and ask the user to upgrade the firmware.
case 115: // M115
if (code_seen('V')) {
// Report the Prusa version number.
@@ -5985,22 +6285,43 @@ Sigma_Exit:
SERIAL_ECHOLNPGM(MACHINE_UUID);
}
break;
-/* case 117: // M117 display message
+
+ //! ### M114 - Get current position
+ // -------------------------------------
+ case 114:
+ gcode_M114();
+ break;
+
+
+
+ //! ### M117 - Set LCD Message
+ // --------------------------------------
+
+ /*
+ M117 moved up to get the high priority
+
+ case 117: // M117 display message
starpos = (strchr(strchr_pointer + 5,'*'));
if(starpos!=NULL)
*(starpos)='\0';
lcd_setstatus(strchr_pointer + 5);
break;*/
- case 114: // M114
- gcode_M114();
- break;
- case 120: //! M120 - Disable endstops
+
+ //! ### M120 - Disable endstops
+ // ----------------------------------------
+ case 120:
enable_endstops(false) ;
break;
- case 121: //! M121 - Enable endstops
+
+ //! ### M121 - Enable endstops
+ // ----------------------------------------
+ case 121:
enable_endstops(true) ;
break;
- case 119: // M119
+
+ //! ### M119 - Get endstop states
+ // ----------------------------------------
+ case 119:
SERIAL_PROTOCOLRPGM(_N("Reporting endstop status"));////MSG_M119_REPORT
SERIAL_PROTOCOLLN("");
#if defined(X_MIN_PIN) && X_MIN_PIN > -1
@@ -6059,8 +6380,12 @@ Sigma_Exit:
#endif
break;
//TODO: update for all axis, use for loop
+
#ifdef BLINKM
- case 150: // M150
+
+ //! ### M150 - Set RGB(W) Color
+ // -------------------------------------------
+ case 150:
{
byte red;
byte grn;
@@ -6074,6 +6399,9 @@ Sigma_Exit:
}
break;
#endif //BLINKM
+
+ //! ### M200 - Set filament diameter
+ // ----------------------------------------
case 200: // M200 D set filament diameter and set E axis units to cubic millimeters (use S0 to set back to millimeters).
{
@@ -6112,7 +6440,10 @@ Sigma_Exit:
calculate_extruder_multipliers();
}
break;
- case 201: // M201
+
+ //! ### M201 - Set Print Max Acceleration
+ // -------------------------------------------
+ case 201:
for (int8_t i = 0; i < NUM_AXIS; i++)
{
if (code_seen(axis_codes[i]))
@@ -6144,6 +6475,9 @@ Sigma_Exit:
}
break;
#endif
+
+ //! ### M203 - Set Max Feedrate
+ // ---------------------------------------
case 203: // M203 max feedrate mm/sec
for (int8_t i = 0; i < NUM_AXIS; i++)
{
@@ -6167,10 +6501,17 @@ Sigma_Exit:
}
}
break;
+
+ //! ### M204 - Acceleration settings
+ // ------------------------------------------
+ //! Supporting old format:
+ //!
+ //! M204 S[normal moves] T[filmanent only moves]
+ //!
+ //! and new format:
+ //!
+ //! M204 P[printing moves] R[filmanent only moves] T[travel moves] (as of now T is ignored)
case 204:
- //! M204 acclereration settings.
- //!@n Supporting old format: M204 S[normal moves] T[filmanent only moves]
- //!@n and new format: M204 P[printing moves] R[filmanent only moves] T[travel moves] (as of now T is ignored)
{
if(code_seen('S')) {
// Legacy acceleration format. This format is used by the legacy Marlin, MK2 or MK3 firmware,
@@ -6194,7 +6535,19 @@ Sigma_Exit:
}
}
break;
- case 205: //M205 advanced settings: minimum travel speed S=while printing T=travel only, B=minimum segment time X= maximum xy jerk, Z=maximum Z jerk
+
+ //! ### M205 - Set advanced settings
+ // ---------------------------------------------
+ //! Set some advanced settings related to movement.
+ //!
+ //! M205 [S] [T] [B] [X] [Y] [Z] [E]
+ /*!
+ - `S` - Minimum feedrate for print moves (unit/s)
+ - `T` - Minimum feedrate for travel moves (units/s)
+ - `B` - Minimum segment time (us)
+ - `X` - Maximum X jerk (units/s), similarly for other axes
+ */
+ case 205:
{
if(code_seen('S')) cs.minimumfeedrate = code_value();
if(code_seen('T')) cs.mintravelfeedrate = code_value();
@@ -6207,13 +6560,19 @@ Sigma_Exit:
if (cs.max_jerk[Y_AXIS] > DEFAULT_YJERK) cs.max_jerk[Y_AXIS] = DEFAULT_YJERK;
}
break;
- case 206: // M206 additional homing offset
+
+ //! ### M206 - Set additional homing offsets
+ // ----------------------------------------------
+ case 206:
for(int8_t i=0; i < 3; i++)
{
if(code_seen(axis_codes[i])) cs.add_homing[i] = code_value();
}
break;
#ifdef FWRETRACT
+
+ //! ### M207 - Set firmware retraction
+ // --------------------------------------------------
case 207: //M207 - set retract length S[positive mm] F[feedrate mm/min] Z[additional zlift/hop]
{
if(code_seen('S'))
@@ -6229,6 +6588,9 @@ Sigma_Exit:
cs.retract_zlift = code_value() ;
}
}break;
+
+ //! ### M208 - Set retract recover length
+ // --------------------------------------------
case 208: // M208 - set retract recover length S[positive mm surplus to the M207 S*] F[feedrate mm/min]
{
if(code_seen('S'))
@@ -6240,6 +6602,9 @@ Sigma_Exit:
cs.retract_recover_feedrate = code_value()/60 ;
}
}break;
+
+ //! ### M209 - Enable/disable automatict retract
+ // ---------------------------------------------
case 209: // M209 - S<1=true/0=false> enable automatic retract detect if the slicer did not support G10/11: every normal extrude-only move will be classified as retract depending on the direction.
{
if(code_seen('S'))
@@ -6280,6 +6645,9 @@ Sigma_Exit:
}break;
#endif // FWRETRACT
#if EXTRUDERS > 1
+
+ // ### M218 - Set hotend offset
+ // ----------------------------------------
case 218: // M218 - set hotend offset (in mm), T X Y
{
uint8_t extruder;
@@ -6307,6 +6675,8 @@ Sigma_Exit:
}break;
#endif
+ //! ### M220 Set feedrate percentage
+ // -----------------------------------------------
case 220: // M220 S- set speed factor override percentage
{
if (code_seen('B')) //backup current speed factor
@@ -6322,6 +6692,9 @@ Sigma_Exit:
}
}
break;
+
+ //! ### M221 - Set extrude factor override percentage
+ // ----------------------------------------------------
case 221: // M221 S- set extrude factor override percentage
{
if(code_seen('S'))
@@ -6344,6 +6717,8 @@ Sigma_Exit:
}
break;
+ //! ### M226 - Wait for Pin state
+ // ------------------------------------------
case 226: // M226 P S- Wait until the specified pin reaches the state required
{
if(code_seen('P')){
@@ -6397,6 +6772,9 @@ Sigma_Exit:
break;
#if NUM_SERVOS > 0
+
+ //! ### M280 - Set/Get servo position
+ // --------------------------------------------
case 280: // M280 - set servo position absolute. P: servo index, S: angle or microseconds
{
int servo_index = -1;
@@ -6435,6 +6813,9 @@ Sigma_Exit:
#endif // NUM_SERVOS > 0
#if (LARGE_FLASH == true && ( BEEPER > 0 || defined(ULTRALCD) || defined(LCD_USE_I2C_BUZZER)))
+
+ //! ### M300 - Play tone
+ // -----------------------
case 300: // M300
{
int beepS = code_seen('S') ? code_value() : 110;
@@ -6454,7 +6835,10 @@ Sigma_Exit:
#endif // M300
#ifdef PIDTEMP
- case 301: // M301
+
+ //! ### M301 - Set hotend PID
+ // ---------------------------------------
+ case 301:
{
if(code_seen('P')) cs.Kp = code_value();
if(code_seen('I')) cs.Ki = scalePID_i(code_value());
@@ -6482,7 +6866,10 @@ Sigma_Exit:
break;
#endif //PIDTEMP
#ifdef PIDTEMPBED
- case 304: // M304
+
+ //! ### M304 - Set bed PID
+ // --------------------------------------
+ case 304:
{
if(code_seen('P')) cs.bedKp = code_value();
if(code_seen('I')) cs.bedKi = scalePID_i(code_value());
@@ -6500,6 +6887,9 @@ Sigma_Exit:
}
break;
#endif //PIDTEMP
+
+ //! ### M240 - Trigger camera
+ // --------------------------------------------
case 240: // M240 Triggers a camera by emulating a Canon RC-1 : http://www.doc-diy.net/photo/rc-1_hacked/
{
#ifdef CHDK
@@ -6532,7 +6922,10 @@ Sigma_Exit:
}
break;
#ifdef PREVENT_DANGEROUS_EXTRUDE
- case 302: // allow cold extrudes, or set the minimum extrude temperature
+
+ //! ### M302 - Allow cold extrude, or set minimum extrude temperature
+ // -------------------------------------------------------------------
+ case 302:
{
float temp = .0;
if (code_seen('S')) temp=code_value();
@@ -6540,7 +6933,10 @@ Sigma_Exit:
}
break;
#endif
- case 303: // M303 PID autotune
+
+ //! ### M303 - PID autotune
+ // -------------------------------------
+ case 303:
{
float temp = 150.0;
int e=0;
@@ -6553,17 +6949,22 @@ Sigma_Exit:
PID_autotune(temp, e, c);
}
break;
- case 400: // M400 finish all moves
+
+ //! ### M400 - Wait for all moves to finish
+ // -----------------------------------------
+ case 400:
{
st_synchronize();
}
break;
- case 403: //! M403 set filament type (material) for particular extruder and send this information to mmu
+ //! ### M403 - Set filament type (material) for particular extruder and notify the MMU
+ // ----------------------------------------------
+ case 403:
{
- //! currently three different materials are needed (default, flex and PVA)
- //! add storing this information for different load/unload profiles etc. in the future
- //!firmware does not wait for "ok" from mmu
+ // currently three different materials are needed (default, flex and PVA)
+ // add storing this information for different load/unload profiles etc. in the future
+ // firmware does not wait for "ok" from mmu
if (mmu_enabled)
{
uint8_t extruder = 255;
@@ -6575,27 +6976,41 @@ Sigma_Exit:
}
break;
- case 500: // M500 Store settings in EEPROM
+ //! ### M500 - Store settings in EEPROM
+ // -----------------------------------------
+ case 500:
{
Config_StoreSettings();
}
break;
- case 501: // M501 Read settings from EEPROM
+
+ //! ### M501 - Read settings from EEPROM
+ // ----------------------------------------
+ case 501:
{
Config_RetrieveSettings();
}
break;
- case 502: // M502 Revert to default settings
+
+ //! ### M502 - Revert all settings to factory default
+ // -------------------------------------------------
+ case 502:
{
Config_ResetDefault();
}
break;
- case 503: // M503 print settings currently in memory
+
+ //! ### M503 - Repport all settings currently in memory
+ // -------------------------------------------------
+ case 503:
{
Config_PrintSettings();
}
break;
- case 509: //M509 Force language selection
+
+ //! ### M509 - Force language selection
+ // ------------------------------------------------
+ case 509:
{
lang_reset();
SERIAL_ECHO_START;
@@ -6603,6 +7018,9 @@ Sigma_Exit:
}
break;
#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
+
+ //! ### M540 - Abort print on endstop hit (enable/disable)
+ // -----------------------------------------------------
case 540:
{
if(code_seen('S')) abort_on_endstop_hit = code_value() > 0;
@@ -6647,6 +7065,9 @@ Sigma_Exit:
#endif // CUSTOM_M_CODE_SET_Z_PROBE_OFFSET
#ifdef FILAMENTCHANGEENABLE
+
+ //! ### M600 - Initiate Filament change procedure
+ // --------------------------------------
case 600: //Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]
{
st_synchronize();
@@ -6721,20 +7142,39 @@ Sigma_Exit:
}
break;
#endif //FILAMENTCHANGEENABLE
- case 601: //! M601 - Pause print
+
+ //! ### M601 - Pause print
+ // -------------------------------
+ case 601:
{
cmdqueue_pop_front(); //trick because we want skip this command (M601) after restore
lcd_pause_print();
}
break;
- case 602: { //! M602 - Resume print
+ //! ### M602 - Resume print
+ // -------------------------------
+ case 602: {
lcd_resume_print();
}
break;
+ //! ### M603 - Stop print
+ // -------------------------------
+ case 603: {
+ lcd_print_stop();
+ }
+
#ifdef PINDA_THERMISTOR
- case 860: // M860 - Wait for PINDA thermistor to reach target temperature.
+ //! ### M860 - Wait for extruder temperature (PINDA)
+ // --------------------------------------------------------------
+ /*!
+ Wait for PINDA thermistor to reach target temperature
+
+ M860 [S]
+
+ */
+ case 860:
{
int set_target_pinda = 0;
@@ -6778,7 +7218,18 @@ Sigma_Exit:
break;
}
- case 861: // M861 - Set/Read PINDA temperature compensation offsets
+ //! ### M861 - Set/Get PINDA temperature compensation offsets
+ // -----------------------------------------------------------
+ /*!
+
+ M861 [ ? | ! | Z | S [I] ]
+
+ - `?` - Print current EEPROM offset values
+ - `!` - Set factory default values
+ - `Z` - Set all values to 0 (effectively disabling PINDA temperature compensation)
+ - `S` `I` - Set compensation ustep value S for compensation table index I
+ */
+ case 861:
if (code_seen('?')) { // ? - Print out current EEPROM offset values
uint8_t cal_status = calibration_status_pinda();
int16_t usteps = 0;
@@ -6849,7 +7300,27 @@ Sigma_Exit:
break;
#endif //PINDA_THERMISTOR
+
+ //! ### M862 - Print checking
+ // ----------------------------------------------
+ /*!
+ Checks the parameters of the printer and gcode and performs compatibility check
+ - M862.1 [ P | Q ]
+
+ - M862.2 [ P | Q ]
+
+ - M862.3 [ P | Q ]
+
+ - M862.4 [ P | Q]
+
+ - M862.5 [ P | Q]
+
+
+ When run with P<> argument, the check is performed against the input value.
+ When run with Q argument, the current value is shown.
+
+ */
case 862: // M862: print checking
float nDummy;
uint8_t nCommand;
@@ -6910,12 +7381,16 @@ Sigma_Exit:
break;
#ifdef LIN_ADVANCE
- case 900: // M900: Set LIN_ADVANCE options.
+ //! ### M900 - Set Linear advance options
+ // ----------------------------------------------
+ case 900:
gcode_M900();
break;
#endif
- case 907: // M907 Set digital trimpot motor current using axis codes.
+ //! ### M907 - Set digital trimpot motor current using axis codes
+ // ---------------------------------------------------------------
+ case 907:
{
#ifdef TMC2130
for (int i = 0; i < NUM_AXIS; i++)
@@ -6946,7 +7421,10 @@ Sigma_Exit:
#endif //TMC2130
}
break;
- case 908: // M908 Control digital trimpot directly.
+
+ //! ### M908 - Control digital trimpot directly
+ // ---------------------------------------------------------
+ case 908:
{
#if defined(DIGIPOTSS_PIN) && DIGIPOTSS_PIN > -1
uint8_t channel,current;
@@ -6959,13 +7437,17 @@ Sigma_Exit:
#ifdef TMC2130_SERVICE_CODES_M910_M918
- case 910: //! M910 - TMC2130 init
+ //! ### M910 - TMC2130 init
+ // -----------------------------------------------
+ case 910:
{
tmc2130_init();
}
break;
- case 911: //! M911 - Set TMC2130 holding currents
+ //! ### M911 - Set TMC2130 holding currents
+ // -------------------------------------------------
+ case 911:
{
if (code_seen('X')) tmc2130_set_current_h(0, code_value());
if (code_seen('Y')) tmc2130_set_current_h(1, code_value());
@@ -6974,7 +7456,9 @@ Sigma_Exit:
}
break;
- case 912: //! M912 - Set TMC2130 running currents
+ //! ### M912 - Set TMC2130 running currents
+ // -----------------------------------------------
+ case 912:
{
if (code_seen('X')) tmc2130_set_current_r(0, code_value());
if (code_seen('Y')) tmc2130_set_current_r(1, code_value());
@@ -6982,13 +7466,18 @@ Sigma_Exit:
if (code_seen('E')) tmc2130_set_current_r(3, code_value());
}
break;
- case 913: //! M913 - Print TMC2130 currents
+
+ //! ### M913 - Print TMC2130 currents
+ // -----------------------------
+ case 913:
{
tmc2130_print_currents();
}
break;
- case 914: //! M914 - Set normal mode
+ //! ### M914 - Set TMC2130 normal mode
+ // ------------------------------
+ case 914:
{
tmc2130_mode = TMC2130_MODE_NORMAL;
update_mode_profile();
@@ -6996,7 +7485,9 @@ Sigma_Exit:
}
break;
- case 915: //! M915 - Set silent mode
+ //! ### M95 - Set TMC2130 silent mode
+ // ------------------------------
+ case 915:
{
tmc2130_mode = TMC2130_MODE_SILENT;
update_mode_profile();
@@ -7004,7 +7495,9 @@ Sigma_Exit:
}
break;
- case 916: //! M916 - Set sg_thrs
+ //! ### M916 - Set TMC2130 Stallguard sensitivity threshold
+ // -------------------------------------------------------
+ case 916:
{
if (code_seen('X')) tmc2130_sg_thr[X_AXIS] = code_value();
if (code_seen('Y')) tmc2130_sg_thr[Y_AXIS] = code_value();
@@ -7015,7 +7508,9 @@ Sigma_Exit:
}
break;
- case 917: //! M917 - Set TMC2130 pwm_ampl
+ //! ### M917 - Set TMC2130 PWM amplitude offset (pwm_ampl)
+ // --------------------------------------------------------------
+ case 917:
{
if (code_seen('X')) tmc2130_set_pwm_ampl(0, code_value());
if (code_seen('Y')) tmc2130_set_pwm_ampl(1, code_value());
@@ -7024,7 +7519,9 @@ Sigma_Exit:
}
break;
- case 918: //! M918 - Set TMC2130 pwm_grad
+ //! ### M918 - Set TMC2130 PWM amplitude gradient (pwm_grad)
+ // -------------------------------------------------------------
+ case 918:
{
if (code_seen('X')) tmc2130_set_pwm_grad(0, code_value());
if (code_seen('Y')) tmc2130_set_pwm_grad(1, code_value());
@@ -7035,7 +7532,10 @@ Sigma_Exit:
#endif //TMC2130_SERVICE_CODES_M910_M918
- case 350: //! M350 - Set microstepping mode. Warning: Steps per unit remains unchanged. S code sets stepping mode for all drivers.
+ //! ### M350 - Set microstepping mode
+ // ---------------------------------------------------
+ //! Warning: Steps per unit remains unchanged. S code sets stepping mode for all drivers.
+ case 350:
{
#ifdef TMC2130
if(code_seen('E'))
@@ -7072,7 +7572,13 @@ Sigma_Exit:
#endif //TMC2130
}
break;
- case 351: //! M351 - Toggle MS1 MS2 pins directly, S# determines MS1 or MS2, X# sets the pin high/low.
+
+ //! ### M351 - Toggle Microstep Pins
+ // -----------------------------------
+ //! Toggle MS1 MS2 pins directly, S# determines MS1 or MS2, X# sets the pin high/low.
+ //!
+ //! M351 [B<0|1>] [E<0|1>] S<1|2> [X<0|1>] [Y<0|1>] [Z<0|1>]
+ case 351:
{
#if defined(X_MS1_PIN) && X_MS1_PIN > -1
if(code_seen('S')) switch((int)code_value())
@@ -7090,14 +7596,28 @@ Sigma_Exit:
#endif
}
break;
- case 701: //! M701 - load filament
+
+ //! ### M701 - Load filament
+ // -------------------------
+ case 701:
{
if (mmu_enabled && code_seen('E'))
tmp_extruder = code_value();
gcode_M701();
}
break;
- case 702: //! M702 [U C] -
+
+ //! ### M702 - Unload filament
+ // ------------------------
+ /*!
+
+ M702 [U C]
+
+ - `U` Unload all filaments used in current print
+ - `C` Unload just current filament
+ - without any parameters unload all filaments
+ */
+ case 702:
{
#ifdef SNMM
if (code_seen('U'))
@@ -7119,7 +7639,9 @@ Sigma_Exit:
}
break;
- case 999: // M999: Restart after being stopped
+ //! ### M999 - Restart after being stopped
+ // ------------------------------------
+ case 999:
Stopped = false;
lcd_reset_alert_level();
gcode_LastN = Stopped_gcode_LastN;
@@ -7133,6 +7655,10 @@ Sigma_Exit:
}
}
// end if(code_seen('M')) (end of M codes)
+
+ //! -----------------------------------------------------------------------------------------
+ //! T Codes
+ //!
//! T - select extruder in case of multi extruder printer
//! select filament in case of MMU_V2
//! if extruder is "?", open menu to let the user select extruder/filament
@@ -7326,46 +7852,95 @@ Sigma_Exit:
}
} // end if(code_seen('T')) (end of T codes)
+ //! ----------------------------------------------------------------------------------------------
+
else if (code_seen('D')) // D codes (debug)
{
switch((int)code_value())
{
- case -1: //! D-1 - Endless loop
+
+ //! ### D-1 - Endless loop
+ // -------------------
+ case -1:
dcode__1(); break;
#ifdef DEBUG_DCODES
- case 0: //! D0 - Reset
+
+ //! ### D0 - Reset
+ // --------------
+ case 0:
dcode_0(); break;
- case 1: //! D1 - Clear EEPROM
+
+ //! ### D1 - Clear EEPROM
+ // ------------------
+ case 1:
dcode_1(); break;
- case 2: //! D2 - Read/Write RAM
+
+ //! ### D2 - Read/Write RAM
+ // --------------------
+ case 2:
dcode_2(); break;
#endif //DEBUG_DCODES
#ifdef DEBUG_DCODE3
- case 3: //! D3 - Read/Write EEPROM
+
+ //! ### D3 - Read/Write EEPROM
+ // -----------------------
+ case 3:
dcode_3(); break;
#endif //DEBUG_DCODE3
#ifdef DEBUG_DCODES
- case 4: //! D4 - Read/Write PIN
+
+ //! ### D4 - Read/Write PIN
+ // ---------------------
+ case 4:
dcode_4(); break;
#endif //DEBUG_DCODES
#ifdef DEBUG_DCODE5
- case 5: // D5 - Read/Write FLASH
+
+ //! ### D5 - Read/Write FLASH
+ // ------------------------
+ case 5:
dcode_5(); break;
break;
#endif //DEBUG_DCODE5
#ifdef DEBUG_DCODES
- case 6: // D6 - Read/Write external FLASH
+
+ //! ### D6 - Read/Write external FLASH
+ // ---------------------------------------
+ case 6:
dcode_6(); break;
- case 7: //! D7 - Read/Write Bootloader
+
+ //! ### D7 - Read/Write Bootloader
+ // -------------------------------
+ case 7:
dcode_7(); break;
- case 8: //! D8 - Read/Write PINDA
+
+ //! ### D8 - Read/Write PINDA
+ // ---------------------------
+ case 8:
dcode_8(); break;
- case 9: //! D9 - Read/Write ADC
+
+ // ### D9 - Read/Write ADC
+ // ------------------------
+ case 9:
dcode_9(); break;
- case 10: //! D10 - XYZ calibration = OK
+
+ //! ### D10 - XYZ calibration = OK
+ // ------------------------------
+ case 10:
dcode_10(); break;
#endif //DEBUG_DCODES
#ifdef HEATBED_ANALYSIS
+
+ //! ### D80 - Bed check
+ // ---------------------
+ /*!
+ - `E` - dimension x
+ - `F` - dimention y
+ - `G` - points_x
+ - `H` - points_y
+ - `I` - offset_x
+ - `J` - offset_y
+ */
case 80:
{
float dimension_x = 40;
@@ -7390,6 +7965,16 @@ Sigma_Exit:
bed_check(dimension_x,dimension_y,points_x,points_y,offset_x,offset_y);
}break;
+ //! ### D81 - Bed analysis
+ // -----------------------------
+ /*!
+ - `E` - dimension x
+ - `F` - dimention y
+ - `G` - points_x
+ - `H` - points_y
+ - `I` - offset_x
+ - `J` - offset_y
+ */
case 81:
{
float dimension_x = 40;
@@ -7412,7 +7997,10 @@ Sigma_Exit:
#endif //HEATBED_ANALYSIS
#ifdef DEBUG_DCODES
- case 106: //D106 print measured fan speed for different pwm values
+
+ //! ### D106 print measured fan speed for different pwm values
+ // --------------------------------------------------------------
+ case 106:
{
for (int i = 255; i > 0; i = i - 5) {
fanSpeed = i;
@@ -7426,12 +8014,52 @@ Sigma_Exit:
}break;
#ifdef TMC2130
- case 2130: //! D2130 - TMC2130
+ //! ### D2130 - TMC2130 Trinamic stepper controller
+ // ---------------------------
+
+
+ /*!
+
+
+ D2130[subcommand][value]
+
+ - :
+ - '0' current off
+ - '1' current on
+ - '+' single step
+ - * value sereval steps
+ - '-' dtto oposite direction
+ - '?' read register
+ - * "mres"
+ - * "step"
+ - * "mscnt"
+ - * "mscuract"
+ - * "wave"
+ - '!' set register
+ - * "mres"
+ - * "step"
+ - * "wave"
+ - '@' home calibrate axis
+
+ Example:
+
+ D2130E?wave ... print extruder microstep linearity compensation curve
+
+ D2130E!wave0 ... disable extruder linearity compensation curve, (sine curve is used)
+
+ D2130E!wave220 ... (sin(x))^1.1 extruder microstep compensation curve used
+ */
+
+
+ case 2130:
dcode_2130(); break;
#endif //TMC2130
#if (defined (FILAMENT_SENSOR) && defined(PAT9125))
- case 9125: //! D9125 - FILAMENT_SENSOR
+
+ //! ### D9125 - FILAMENT_SENSOR
+ // ---------------------------------
+ case 9125:
dcode_9125(); break;
#endif //FILAMENT_SENSOR
@@ -7450,6 +8078,13 @@ Sigma_Exit:
ClearToSend();
}
+
+
+ /** @defgroup GCodes G-Code List
+ */
+
+// ---------------------------------------------------
+
void FlushSerialRequestResend()
{
//char cmdbuffer[bufindr][100]="Resend:";
@@ -9427,7 +10062,6 @@ void stop_and_save_print_to_ram(float z_move, float e_move)
if(!saved_extruder_relative_mode){
enquecommand(PSTR("M83"), true);
}
-
//retract 45mm/s
// A single sprintf may not be faster, but is definitely 20B shorter
// than a sequence of commands building the string piece by piece
@@ -9511,7 +10145,6 @@ void restore_print_from_ram_and_continue(float e_move)
card.setIndex(saved_sdpos);
sdpos_atomic = saved_sdpos;
card.sdprinting = true;
- printf_P(PSTR("ok\n")); //dummy response because of octoprint is waiting for this
}
else if (saved_printing_type == PRINTING_TYPE_USB) { //was usb printing
gcode_LastN = saved_sdpos; //saved_sdpos was reused for storing line number when usb printing
@@ -9521,6 +10154,7 @@ void restore_print_from_ram_and_continue(float e_move)
else {
//not sd printing nor usb printing
}
+ printf_P(PSTR("ok\n")); //dummy response because of octoprint is waiting for this
lcd_setstatuspgm(_T(WELCOME_MSG));
saved_printing = false;
}
diff --git a/Firmware/doxyfile b/Firmware/doxyfile
index 9c2d550c..346ce604 100644
--- a/Firmware/doxyfile
+++ b/Firmware/doxyfile
@@ -2050,7 +2050,7 @@ PERLMOD_MAKEVAR_PREFIX =
# C-preprocessor directives found in the sources and include files.
# The default value is: YES.
-ENABLE_PREPROCESSING = YES
+ENABLE_PREPROCESSING = NO
# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
# in the source code. If set to NO, only conditional compilation will be
diff --git a/Firmware/eeprom.cpp b/Firmware/eeprom.cpp
index c5faec41..94314ddd 100644
--- a/Firmware/eeprom.cpp
+++ b/Firmware/eeprom.cpp
@@ -72,11 +72,19 @@ void eeprom_init()
}
if(is_uninitialized)
{
+
char sheet_PROGMEM_buffer[8];
strcpy_P(sheet_PROGMEM_buffer, (char *)pgm_read_word(&(defaultSheetNames[i])));
for (uint_least8_t a = 0; a < sizeof(Sheet::name); ++a){
eeprom_write(&(EEPROM_Sheets_base->s[i].name[a]), sheet_PROGMEM_buffer[a]);
}
+
+ // When upgrading from version older version (before multiple sheets were implemented in v3.8.0)
+ // Sheet 1 uses the previous Live adjust Z (@EEPROM_BABYSTEP_Z)
+ if(i == 0){
+ int last_babystep = eeprom_read_word((uint16_t *)EEPROM_BABYSTEP_Z);
+ eeprom_write_word(reinterpret_cast(&(EEPROM_Sheets_base->s[i].z_offset)), last_babystep);
+ }
}
}
check_babystep();
diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp
index b2f90c6c..1f4e6e2f 100644
--- a/Firmware/lcd.cpp
+++ b/Firmware/lcd.cpp
@@ -196,8 +196,21 @@ static void lcd_putchar(char c, FILE *)
void lcd_init(void)
{
+ WRITE(LCD_PINS_ENABLE,LOW);
SET_OUTPUT(LCD_PINS_RS);
SET_OUTPUT(LCD_PINS_ENABLE);
+
+#ifdef LCD_8BIT
+ SET_OUTPUT(LCD_PINS_D0);
+ SET_OUTPUT(LCD_PINS_D1);
+ SET_OUTPUT(LCD_PINS_D2);
+ SET_OUTPUT(LCD_PINS_D3);
+#endif
+ SET_OUTPUT(LCD_PINS_D4);
+ SET_OUTPUT(LCD_PINS_D5);
+ SET_OUTPUT(LCD_PINS_D6);
+ SET_OUTPUT(LCD_PINS_D7);
+
#ifdef LCD_8BIT
lcd_displayfunction |= LCD_8BITMODE;
#endif
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 463e87eb..1c36e43c 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -129,3 +129,4 @@ const char MSG_ENDSTOP_OPEN[] PROGMEM_N1 = "open"; ////
const char MSG_POWERUP[] PROGMEM_N1 = "PowerUp"; ////
const char MSG_ERR_STOPPED[] PROGMEM_N1 = "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"; ////
const char MSG_ENDSTOP_HIT[] PROGMEM_N1 = "TRIGGERED"; ////
+const char MSG_OCTOPRINT_PAUSE[] PROGMEM_N1 = "// action:pause"; ////
diff --git a/Firmware/messages.h b/Firmware/messages.h
index 5ea90238..b48337ef 100644
--- a/Firmware/messages.h
+++ b/Firmware/messages.h
@@ -130,6 +130,7 @@ extern const char MSG_ERR_STOPPED[];
extern const char MSG_ENDSTOP_HIT[];
extern const char MSG_EJECT_FILAMENT[];
extern const char MSG_CUT_FILAMENT[];
+extern const char MSG_OCTOPRINT_PAUSE[];
#if defined(__cplusplus)
}
diff --git a/Firmware/sound.cpp b/Firmware/sound.cpp
index 7b965a2d..b01285a5 100644
--- a/Firmware/sound.cpp
+++ b/Firmware/sound.cpp
@@ -61,17 +61,18 @@ switch(eSoundMode)
Sound_SaveMode();
}
+//if critical is true then silend and once mode is ignored
void Sound_MakeCustom(uint16_t ms,uint16_t tone_,bool critical){
if (!critical){
if (eSoundMode != e_SOUND_MODE_SILENT){
if(!tone_){
WRITE(BEEPER, HIGH);
- delayMicroseconds(ms);
+ _delay(ms);
WRITE(BEEPER, LOW);
}
else{
_tone(BEEPER, tone_);
- delayMicroseconds(ms);
+ _delay(ms);
_noTone(BEEPER);
}
}
@@ -79,13 +80,13 @@ void Sound_MakeCustom(uint16_t ms,uint16_t tone_,bool critical){
else{
if(!tone_){
WRITE(BEEPER, HIGH);
- delayMicroseconds(ms);
+ _delay(ms);
WRITE(BEEPER, LOW);
- delayMicroseconds(100);
+ _delay(ms);
}
else{
_tone(BEEPER, tone_);
- delayMicroseconds(ms);
+ _delay(ms);
_noTone(BEEPER);
}
}
@@ -134,10 +135,10 @@ switch(eSoundMode)
static void Sound_DoSound_Blind_Alert(void)
{
- _tone(BEEPER,100);
- delayMicroseconds(50);
+ _tone(BEEPER,300);
+ _delay_ms(75);
_noTone(BEEPER);
- delayMicroseconds(200);
+ _delay_ms(75);
}
static void Sound_DoSound_Encoder_Move(void)
@@ -169,7 +170,7 @@ for(nI=0;nI<10;nI++)
static void Sound_DoSound_Prompt(void)
{
WRITE(BEEPER,HIGH);
-delayMicroseconds(500);
+_delay_ms(500);
WRITE(BEEPER,LOW);
}
diff --git a/Firmware/sound.h b/Firmware/sound.h
index 2c14dfee..bdd32ec8 100644
--- a/Firmware/sound.h
+++ b/Firmware/sound.h
@@ -6,7 +6,7 @@
#define MSG_SOUND_MODE_LOUD "Sound [loud]"
#define MSG_SOUND_MODE_ONCE "Sound [once]"
#define MSG_SOUND_MODE_SILENT "Sound [silent]"
-#define MSG_SOUND_MODE_BLIND "Sound [blind]"
+#define MSG_SOUND_MODE_BLIND "Sound [blind]"
#define e_SOUND_MODE_NULL 0xFF
diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp
index 70cf0eac..42d294c4 100755
--- a/Firmware/temperature.cpp
+++ b/Firmware/temperature.cpp
@@ -40,7 +40,7 @@
#include
#include "adc.h"
#include "ConfigurationStore.h"
-
+#include "messages.h"
#include "Timer.h"
#include "Configuration_prusa.h"
@@ -525,6 +525,8 @@ void checkFanSpeed()
fan_speed_errors[1] = 0;
fanSpeedError(1); //print fan
}
+
+ SERIAL_PROTOCOLLNRPGM(MSG_OK); //for octoprint
}
//! Prints serialMsg to serial port, displays lcdMsg onto the LCD and beeps.
@@ -542,18 +544,17 @@ static void fanSpeedErrorBeep(const char *serialMsg, const char *lcdMsg){
void fanSpeedError(unsigned char _fan) {
if (get_message_level() != 0 && isPrintPaused) return;
//to ensure that target temp. is not set to zero in case taht we are resuming print
- if (card.sdprinting) {
+ if (card.sdprinting || is_usb_printing) {
if (heating_status != 0) {
lcd_print_stop();
}
else {
fan_check_error = EFCE_DETECTED;
-
}
}
else {
+ SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSE); //for octoprint
setTargetHotend0(0);
- SERIAL_ECHOLNPGM("// action:pause"); //for octoprint
heating_status = 0;
fan_check_error = EFCE_REPORTED;
}
@@ -565,6 +566,7 @@ void fanSpeedError(unsigned char _fan) {
fanSpeedErrorBeep(PSTR("Print fan speed is lower than expected"), PSTR("Err: PRINT FAN ERROR") );
break;
}
+ SERIAL_PROTOCOLLNRPGM(MSG_OK);
}
#endif //(defined(TACH_0) && TACH_0 >-1) || (defined(TACH_1) && TACH_1 > -1)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 4e36c3f7..c1d944a5 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1072,7 +1072,7 @@ static void lcd_status_screen()
}
void lcd_commands()
-{
+{
if (lcd_commands_type == LcdCommands::LongPause)
{
if (!blocks_queued() && !homing_flag)
@@ -1456,9 +1456,9 @@ void lcd_commands()
lcd_wizard(WizState::RepeatLay1Cal);
}
break;
- }
- }
- }
+ }
+ }
+ }
#endif // not SNMM
@@ -1665,6 +1665,7 @@ void lcd_pause_print()
{
lcd_commands_type = LcdCommands::LongPause;
}
+ SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSE); //pause for octoprint
}
@@ -1972,7 +1973,6 @@ static void lcd_menu_debug()
static void lcd_menu_temperatures()
{
lcd_timeoutToStatus.stop(); //infinite timeout
-
lcd_home();
lcd_printf_P(PSTR(" %S: %d%c \n" " %S: %d%c \n"), _i("Nozzle"), (int)current_temperature[0], '\x01', _i("Bed"), (int)current_temperature_bed, '\x01');
#ifdef AMBIENT_THERMISTOR
@@ -2587,7 +2587,7 @@ void lcd_change_success() {
}
static void lcd_loading_progress_bar(uint16_t loading_time_ms) {
-
+
for (uint_least8_t i = 0; i < 20; i++) {
lcd_set_cursor(i, 3);
lcd_print(".");
@@ -2836,7 +2836,6 @@ void lcd_menu_statistics()
"%S:\n"
"%2dh %02dm %02ds"
),_i("Filament used"), _met, _i("Print time"), _h, _m, _s);
-
menu_back_if_clicked_fb();
}
else
@@ -2859,7 +2858,6 @@ void lcd_menu_statistics()
"%S:\n"
"%7ldd :%2hhdh :%02hhdm"
), _i("Total filament"), _filament_m, _i("Total print time"), _days, _hours, _minutes);
-
KEEPALIVE_STATE(PAUSED_FOR_USER);
while (!lcd_clicked())
{
@@ -3962,6 +3960,20 @@ void lcd_menu_show_sensors_state() // NOT static due to using ins
}
}
+void prusa_statistics_err(char c){
+ SERIAL_ECHO("{[ERR:");
+ SERIAL_ECHO(c);
+ SERIAL_ECHO(']');
+ prusa_stat_farm_number();
+}
+
+static void prusa_statistics_case0(uint8_t statnr){
+ SERIAL_ECHO("{");
+ prusa_stat_printerstatus(statnr);
+ prusa_stat_farm_number();
+ prusa_stat_printinfo();
+}
+
void prusa_statistics(int _message, uint8_t _fil_nr) {
#ifdef DEBUG_DISABLE_PRUSA_STATISTICS
return;
@@ -3971,31 +3983,16 @@ void prusa_statistics(int _message, uint8_t _fil_nr) {
case 0: // default message
if (busy_state == PAUSED_FOR_USER)
- {
- SERIAL_ECHO("{");
- prusa_stat_printerstatus(15);
- prusa_stat_farm_number();
- prusa_stat_printinfo();
- SERIAL_ECHOLN("}");
- status_number = 15;
+ {
+ prusa_statistics_case0(15);
}
else if (isPrintPaused || card.paused)
{
- SERIAL_ECHO("{");
- prusa_stat_printerstatus(14);
- prusa_stat_farm_number();
- prusa_stat_printinfo();
- SERIAL_ECHOLN("}");
- status_number = 14;
+ prusa_statistics_case0(14);
}
else if (IS_SD_PRINTING || loading_flag)
{
- SERIAL_ECHO("{");
- prusa_stat_printerstatus(4);
- prusa_stat_farm_number();
- prusa_stat_printinfo();
- SERIAL_ECHOLN("}");
- status_number = 4;
+ prusa_statistics_case0(4);
}
else
{
@@ -4003,82 +4000,76 @@ void prusa_statistics(int _message, uint8_t _fil_nr) {
prusa_stat_printerstatus(1);
prusa_stat_farm_number();
prusa_stat_diameter();
- SERIAL_ECHOLN("}");
status_number = 1;
}
break;
case 1: // 1 heating
farm_status = 2;
- SERIAL_ECHO("{");
+ SERIAL_ECHO('{');
prusa_stat_printerstatus(2);
prusa_stat_farm_number();
- SERIAL_ECHOLN("}");
status_number = 2;
farm_timer = 1;
break;
case 2: // heating done
farm_status = 3;
- SERIAL_ECHO("{");
+ SERIAL_ECHO('{');
prusa_stat_printerstatus(3);
prusa_stat_farm_number();
- SERIAL_ECHOLN("}");
+ SERIAL_ECHOLN('}');
status_number = 3;
farm_timer = 1;
if (IS_SD_PRINTING || loading_flag)
{
farm_status = 4;
- SERIAL_ECHO("{");
+ SERIAL_ECHO('{');
prusa_stat_printerstatus(4);
prusa_stat_farm_number();
- SERIAL_ECHOLN("}");
status_number = 4;
}
else
{
- SERIAL_ECHO("{");
+ SERIAL_ECHO('{');
prusa_stat_printerstatus(3);
prusa_stat_farm_number();
- SERIAL_ECHOLN("}");
status_number = 3;
}
farm_timer = 1;
break;
case 3: // filament change
-
+ // must do a return here to prevent doing SERIAL_ECHOLN("}") at the very end of this function
+ // saved a considerable amount of FLASH
+ return;
break;
case 4: // print succesfull
SERIAL_ECHO("{[RES:1][FIL:");
MYSERIAL.print(int(_fil_nr));
- SERIAL_ECHO("]");
+ SERIAL_ECHO(']');
prusa_stat_printerstatus(status_number);
prusa_stat_farm_number();
- SERIAL_ECHOLN("}");
farm_timer = 2;
break;
case 5: // print not succesfull
SERIAL_ECHO("{[RES:0][FIL:");
MYSERIAL.print(int(_fil_nr));
- SERIAL_ECHO("]");
+ SERIAL_ECHO(']');
prusa_stat_printerstatus(status_number);
prusa_stat_farm_number();
- SERIAL_ECHOLN("}");
farm_timer = 2;
break;
case 6: // print done
SERIAL_ECHO("{[PRN:8]");
prusa_stat_farm_number();
- SERIAL_ECHOLN("}");
status_number = 8;
farm_timer = 2;
break;
case 7: // print done - stopped
SERIAL_ECHO("{[PRN:9]");
prusa_stat_farm_number();
- SERIAL_ECHOLN("}");
status_number = 9;
farm_timer = 2;
break;
@@ -4086,49 +4077,38 @@ void prusa_statistics(int _message, uint8_t _fil_nr) {
SERIAL_ECHO("{[PRN:0][PFN:");
status_number = 0;
SERIAL_ECHO(farm_no);
- SERIAL_ECHOLN("]}");
+ SERIAL_ECHO(']');
farm_timer = 2;
break;
case 20: // echo farm no
- SERIAL_ECHO("{");
+ SERIAL_ECHO('{');
prusa_stat_printerstatus(status_number);
prusa_stat_farm_number();
- SERIAL_ECHOLN("}");
farm_timer = 4;
break;
case 21: // temperatures
- SERIAL_ECHO("{");
+ SERIAL_ECHO('{');
prusa_stat_temperatures();
prusa_stat_farm_number();
prusa_stat_printerstatus(status_number);
- SERIAL_ECHOLN("}");
break;
case 22: // waiting for filament change
SERIAL_ECHO("{[PRN:5]");
prusa_stat_farm_number();
- SERIAL_ECHOLN("}");
status_number = 5;
break;
case 90: // Error - Thermal Runaway
- SERIAL_ECHO("{[ERR:1]");
- prusa_stat_farm_number();
- SERIAL_ECHOLN("}");
+ prusa_statistics_err('1');
break;
case 91: // Error - Thermal Runaway Preheat
- SERIAL_ECHO("{[ERR:2]");
- prusa_stat_farm_number();
- SERIAL_ECHOLN("}");
+ prusa_statistics_err('2');
break;
case 92: // Error - Min temp
- SERIAL_ECHO("{[ERR:3]");
- prusa_stat_farm_number();
- SERIAL_ECHOLN("}");
+ prusa_statistics_err('3');
break;
case 93: // Error - Max temp
- SERIAL_ECHO("{[ERR:4]");
- prusa_stat_farm_number();
- SERIAL_ECHOLN("}");
+ prusa_statistics_err('4');
break;
case 99: // heartbeat
@@ -4136,11 +4116,11 @@ void prusa_statistics(int _message, uint8_t _fil_nr) {
prusa_stat_temperatures();
SERIAL_ECHO("[PFN:");
SERIAL_ECHO(farm_no);
- SERIAL_ECHO("]");
- SERIAL_ECHOLN("}");
+ SERIAL_ECHO(']');
break;
}
+ SERIAL_ECHOLN('}');
}
@@ -4148,19 +4128,19 @@ static void prusa_stat_printerstatus(int _status)
{
SERIAL_ECHO("[PRN:");
SERIAL_ECHO(_status);
- SERIAL_ECHO("]");
+ SERIAL_ECHO(']');
}
static void prusa_stat_farm_number() {
SERIAL_ECHO("[PFN:");
SERIAL_ECHO(farm_no);
- SERIAL_ECHO("]");
+ SERIAL_ECHO(']');
}
static void prusa_stat_diameter() {
SERIAL_ECHO("[DIA:");
SERIAL_ECHO(eeprom_read_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM));
- SERIAL_ECHO("]");
+ SERIAL_ECHO(']');
}
static void prusa_stat_temperatures()
@@ -4173,7 +4153,7 @@ static void prusa_stat_temperatures()
SERIAL_ECHO(current_temperature[0]);
SERIAL_ECHO("][ATB:");
SERIAL_ECHO(current_temperature_bed);
- SERIAL_ECHO("]");
+ SERIAL_ECHO(']');
}
static void prusa_stat_printinfo()
@@ -4197,7 +4177,7 @@ static void prusa_stat_printinfo()
}
SERIAL_ECHO("][FWR:");
SERIAL_ECHO(FW_VERSION);
- SERIAL_ECHO("]");
+ SERIAL_ECHO(']');
prusa_stat_diameter();
}
@@ -6810,7 +6790,7 @@ void stepper_timer_overflow() {
static void lcd_colorprint_change() {
enquecommand_P(PSTR("M600"));
-
+
custom_message_type = CustomMsg::FilamentLoading; //just print status message
lcd_setstatuspgm(_T(MSG_FINISHING_MOVEMENTS));
lcd_return_to_status();
@@ -7027,7 +7007,6 @@ void lcd_print_stop()
if(!card.sdprinting)
{
SERIAL_ECHOLNPGM("// action:cancel"); // for Octoprint
- return;
}
saved_printing = false;
cancel_heatup = true;
@@ -8335,7 +8314,7 @@ static void menu_action_sdfile(const char* filename)
//we are storing just first 8 characters of 8.3 filename assuming that extension is always ".gco"
for (uint_least8_t i = 0; i < 8; i++) {
- if (strcmp((cmd + i + 4), end) == 0) {
+ if (strcmp((cmd + i + 4), end) == 0) {
//filename is shorter then 8.3, store '\0' character on position where ".gco" string was found to terminate stored string properly
eeprom_write_byte((uint8_t*)EEPROM_FILENAME + i, '\0');
break;
diff --git a/README.md b/README.md
index 765204a5..c44983ba 100644
--- a/README.md
+++ b/README.md
@@ -14,11 +14,24 @@
# Build
## Linux
-Run shell script build.sh to build for MK3 and flash with Slic3er.
-If you have a different printer model, follow step [2.b](#2b) from Windows build first.
-If you wish to flash from Arduino, follow step [2.c](#2c) from Windows build first.
-The script downloads Arduino with our modifications and Rambo board support installed, unpacks it into folder PF-build-env-\ on the same level, as your Prusa-Firmware folder is located, builds firmware for MK3 using that Arduino in Prusa-Firmware-build folder on the same level as Prusa-Firmware, runs secondary language support scripts. Firmware with secondary language support is generated in lang subfolder. Use firmware.hex for MK3 variant. Use firmware_\.hex for other printers. Don't forget to follow step [2.b](#2b) first for non-MK3 printers.
+1. Clone this repository and checkout the correct branch for your desired release version.
+
+2. Set your printer model.
+ - For MK3 --> skip to step 3.
+ - If you have a different printer model, follow step [2.b](#2b) from Windows build
+
+3. Run `sudo ./build.sh`
+ - Output hex file is at `"PrusaFirmware/lang/firmware.hex"` . In the same folder you can hex files for other languages as well.
+
+4. Connect your printer and flash with PrusaSlicer ( Configuration --> Flash printer firmware ) or Slic3r PE.
+ - If you wish to flash from Arduino, follow step [2.c](#2c) from Windows build first.
+
+
+_Notes:_
+
+The script downloads Arduino with our modifications and Rambo board support installed, unpacks it into folder `PF-build-env-\` on the same level, as your Prusa-Firmware folder is located, builds firmware for MK3 using that Arduino in Prusa-Firmware-build folder on the same level as Prusa-Firmware, runs secondary language support scripts. Firmware with secondary language support is generated in lang subfolder. Use firmware.hex for MK3 variant. Use `firmware_\.hex` for other printers. Don't forget to follow step [2.b](#2b) first for non-MK3 printers.
+
## Windows
### Using Arduino
note: Multi language build is not supported.
diff --git a/Tests/PrusaStatistics_test.cpp b/Tests/PrusaStatistics_test.cpp
new file mode 100644
index 00000000..587a3fb0
--- /dev/null
+++ b/Tests/PrusaStatistics_test.cpp
@@ -0,0 +1,793 @@
+/**
+ * @file
+ * @author Marek Kuhn
+ */
+
+// For now the functions are just COPIED (lots of depencendies in ultralcd.h)
+
+#include "catch.hpp"
+#include
+
+
+std::string itostr3(int i){
+ return std::to_string(i);
+}
+
+std::string eeprom_read_word(uint16_t* /*i*/){
+ return "eeprom_read";
+}
+
+int _millis(){return 10000;}
+
+static int farm_no;
+static int busy_state;
+static int PAUSED_FOR_USER;
+static int status_number;
+static int total_filament_used;
+static int feedmultiply;
+static int longFilenameOLD;
+static int starttime;
+static int isPrintPaused;
+static int IS_SD_PRINTING;
+static int farm_status;
+static int farm_timer;
+static int loading_flag;
+
+static int target_temperature[1];
+static int current_temperature[1];
+static int target_temperature_bed;
+static int current_temperature_bed;
+
+static uint16_t nozzle_diameter;
+static uint16_t* EEPROM_NOZZLE_DIAMETER_uM;
+
+static std::string FW_VERSION;
+
+struct Card {
+ int paused = 0;
+ int percentDone(){ return 50; }
+};
+
+static Card card;
+
+void setup_mockups(){
+ farm_no = 0;
+
+ busy_state = 0;
+ status_number = 0;
+ PAUSED_FOR_USER = 0;
+
+ total_filament_used = 0;
+ feedmultiply = 0;
+ longFilenameOLD = 0;
+ starttime = 0;
+
+ FW_VERSION = "3.8.0";
+
+ isPrintPaused = 0;
+ IS_SD_PRINTING = 0;
+ farm_status = 0;
+ farm_timer = 1;
+ loading_flag = 0;
+
+ target_temperature[0] = {215};
+ current_temperature[0] = {204};
+ target_temperature_bed = 60;
+ current_temperature_bed = 55;
+
+ nozzle_diameter = 400;
+ EEPROM_NOZZLE_DIAMETER_uM = &nozzle_diameter;
+
+}
+
+
+// Copy of pre 3.8 version set of functions
+namespace old_code
+{
+
+// Mocking Serial line
+static std::string SERIAL_BUFFER = "";
+
+void SERIAL_ECHO(std::string s){
+ SERIAL_BUFFER += s;
+}
+
+void SERIAL_ECHO(int i){
+ SERIAL_BUFFER += std::to_string(i);
+}
+
+void SERIAL_ECHO(char c){
+ SERIAL_BUFFER += char(c);
+}
+
+void SERIAL_ECHOLN(std::string s){
+ SERIAL_BUFFER += s + "\n";
+}
+
+void SERIAL_ECHOLN(char c){
+ SERIAL_BUFFER += char(c);
+}
+
+void SERIAL_RESET(){
+ SERIAL_BUFFER.clear();
+}
+
+struct MySerial {
+ void print(int i){
+ SERIAL_ECHO(i);
+ }
+ void println(){
+ SERIAL_ECHO("\n");
+ }
+};
+
+static MySerial MYSERIAL;
+
+static void prusa_stat_printerstatus(int _status)
+{
+ SERIAL_ECHO("[PRN:");
+ SERIAL_ECHO(_status);
+ SERIAL_ECHO("]");
+}
+
+static void prusa_stat_farm_number() {
+ SERIAL_ECHO("[PFN:");
+ SERIAL_ECHO(farm_no);
+ SERIAL_ECHO("]");
+}
+
+static void prusa_stat_diameter() {
+ SERIAL_ECHO("[DIA:");
+ SERIAL_ECHO(eeprom_read_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM));
+ SERIAL_ECHO("]");
+}
+
+static void prusa_stat_temperatures()
+{
+ SERIAL_ECHO("[ST0:");
+ SERIAL_ECHO(target_temperature[0]);
+ SERIAL_ECHO("][STB:");
+ SERIAL_ECHO(target_temperature_bed);
+ SERIAL_ECHO("][AT0:");
+ SERIAL_ECHO(current_temperature[0]);
+ SERIAL_ECHO("][ATB:");
+ SERIAL_ECHO(current_temperature_bed);
+ SERIAL_ECHO("]");
+}
+
+static void prusa_stat_printinfo()
+{
+ SERIAL_ECHO("[TFU:");
+ SERIAL_ECHO(total_filament_used);
+ SERIAL_ECHO("][PCD:");
+ SERIAL_ECHO(itostr3(card.percentDone()));
+ SERIAL_ECHO("][FEM:");
+ SERIAL_ECHO(itostr3(feedmultiply));
+ SERIAL_ECHO("][FNM:");
+ SERIAL_ECHO(longFilenameOLD);
+ SERIAL_ECHO("][TIM:");
+ if (starttime != 0)
+ {
+ SERIAL_ECHO(_millis() / 1000 - starttime / 1000);
+ }
+ else
+ {
+ SERIAL_ECHO(0);
+ }
+ SERIAL_ECHO("][FWR:");
+ SERIAL_ECHO(FW_VERSION);
+ SERIAL_ECHO("]");
+ prusa_stat_diameter();
+}
+
+void prusa_statistics(int _message, uint8_t _fil_nr) {
+#ifdef DEBUG_DISABLE_PRUSA_STATISTICS
+ return;
+#endif //DEBUG_DISABLE_PRUSA_STATISTICS
+ switch (_message)
+ {
+
+ case 0: // default message
+ if (busy_state == PAUSED_FOR_USER)
+ {
+ SERIAL_ECHO("{");
+ prusa_stat_printerstatus(15);
+ prusa_stat_farm_number();
+ prusa_stat_printinfo();
+ SERIAL_ECHOLN("}");
+ status_number = 15;
+ }
+ else if (isPrintPaused || card.paused)
+ {
+ SERIAL_ECHO("{");
+ prusa_stat_printerstatus(14);
+ prusa_stat_farm_number();
+ prusa_stat_printinfo();
+ SERIAL_ECHOLN("}");
+ status_number = 14;
+ }
+ else if (IS_SD_PRINTING || loading_flag)
+ {
+ SERIAL_ECHO("{");
+ prusa_stat_printerstatus(4);
+ prusa_stat_farm_number();
+ prusa_stat_printinfo();
+ SERIAL_ECHOLN("}");
+ status_number = 4;
+ }
+ else
+ {
+ SERIAL_ECHO("{");
+ prusa_stat_printerstatus(1);
+ prusa_stat_farm_number();
+ prusa_stat_diameter();
+ SERIAL_ECHOLN("}");
+ status_number = 1;
+ }
+ break;
+
+ case 1: // 1 heating
+ farm_status = 2;
+ SERIAL_ECHO("{");
+ prusa_stat_printerstatus(2);
+ prusa_stat_farm_number();
+ SERIAL_ECHOLN("}");
+ status_number = 2;
+ farm_timer = 1;
+ break;
+
+ case 2: // heating done
+ farm_status = 3;
+ SERIAL_ECHO("{");
+ prusa_stat_printerstatus(3);
+ prusa_stat_farm_number();
+ SERIAL_ECHOLN("}");
+ status_number = 3;
+ farm_timer = 1;
+
+ if (IS_SD_PRINTING || loading_flag)
+ {
+ farm_status = 4;
+ SERIAL_ECHO("{");
+ prusa_stat_printerstatus(4);
+ prusa_stat_farm_number();
+ SERIAL_ECHOLN("}");
+ status_number = 4;
+ }
+ else
+ {
+ SERIAL_ECHO("{");
+ prusa_stat_printerstatus(3);
+ prusa_stat_farm_number();
+ SERIAL_ECHOLN("}");
+ status_number = 3;
+ }
+ farm_timer = 1;
+ break;
+
+ case 3: // filament change
+
+ break;
+ case 4: // print succesfull
+ SERIAL_ECHO("{[RES:1][FIL:");
+ MYSERIAL.print(int(_fil_nr));
+ SERIAL_ECHO("]");
+ prusa_stat_printerstatus(status_number);
+ prusa_stat_farm_number();
+ SERIAL_ECHOLN("}");
+ farm_timer = 2;
+ break;
+ case 5: // print not succesfull
+ SERIAL_ECHO("{[RES:0][FIL:");
+ MYSERIAL.print(int(_fil_nr));
+ SERIAL_ECHO("]");
+ prusa_stat_printerstatus(status_number);
+ prusa_stat_farm_number();
+ SERIAL_ECHOLN("}");
+ farm_timer = 2;
+ break;
+ case 6: // print done
+ SERIAL_ECHO("{[PRN:8]");
+ prusa_stat_farm_number();
+ SERIAL_ECHOLN("}");
+ status_number = 8;
+ farm_timer = 2;
+ break;
+ case 7: // print done - stopped
+ SERIAL_ECHO("{[PRN:9]");
+ prusa_stat_farm_number();
+ SERIAL_ECHOLN("}");
+ status_number = 9;
+ farm_timer = 2;
+ break;
+ case 8: // printer started
+ SERIAL_ECHO("{[PRN:0][PFN:");
+ status_number = 0;
+ SERIAL_ECHO(farm_no);
+ SERIAL_ECHOLN("]}");
+ farm_timer = 2;
+ break;
+ case 20: // echo farm no
+ SERIAL_ECHO("{");
+ prusa_stat_printerstatus(status_number);
+ prusa_stat_farm_number();
+ SERIAL_ECHOLN("}");
+ farm_timer = 4;
+ break;
+ case 21: // temperatures
+ SERIAL_ECHO("{");
+ prusa_stat_temperatures();
+ prusa_stat_farm_number();
+ prusa_stat_printerstatus(status_number);
+ SERIAL_ECHOLN("}");
+ break;
+ case 22: // waiting for filament change
+ SERIAL_ECHO("{[PRN:5]");
+ prusa_stat_farm_number();
+ SERIAL_ECHOLN("}");
+ status_number = 5;
+ break;
+
+ case 90: // Error - Thermal Runaway
+ SERIAL_ECHO("{[ERR:1]");
+ prusa_stat_farm_number();
+ SERIAL_ECHOLN("}");
+ break;
+ case 91: // Error - Thermal Runaway Preheat
+ SERIAL_ECHO("{[ERR:2]");
+ prusa_stat_farm_number();
+ SERIAL_ECHOLN("}");
+ break;
+ case 92: // Error - Min temp
+ SERIAL_ECHO("{[ERR:3]");
+ prusa_stat_farm_number();
+ SERIAL_ECHOLN("}");
+ break;
+ case 93: // Error - Max temp
+ SERIAL_ECHO("{[ERR:4]");
+ prusa_stat_farm_number();
+ SERIAL_ECHOLN("}");
+ break;
+
+ case 99: // heartbeat
+ SERIAL_ECHO("{[PRN:99]");
+ prusa_stat_temperatures();
+ SERIAL_ECHO("[PFN:");
+ SERIAL_ECHO(farm_no);
+ SERIAL_ECHO("]");
+ SERIAL_ECHOLN("}");
+
+ break;
+ }
+
+}
+}
+
+// Copy of 3.8 version of functions
+namespace new_code
+{
+
+// Mocking Serial line
+static std::string SERIAL_BUFFER = "";
+
+void SERIAL_ECHO(std::string s){
+ SERIAL_BUFFER += s;
+}
+
+void SERIAL_ECHO(int i){
+ SERIAL_BUFFER += std::to_string(i);
+}
+
+void SERIAL_ECHO(char c){
+ SERIAL_BUFFER += char(c);
+}
+
+void SERIAL_ECHOLN(std::string s){
+ SERIAL_BUFFER += s + "\n";
+}
+
+void SERIAL_ECHOLN(char c){
+ SERIAL_BUFFER += char(c);
+ SERIAL_BUFFER += "\n";
+}
+
+void SERIAL_RESET(){
+ SERIAL_BUFFER.clear();
+}
+
+struct MySerial {
+ void print(int i){
+ SERIAL_ECHO(i);
+ }
+ void println(){
+ SERIAL_ECHO("\n");
+ }
+};
+
+static MySerial MYSERIAL;
+
+static void prusa_stat_printerstatus(int _status)
+{
+ SERIAL_ECHO("[PRN:");
+ SERIAL_ECHO(_status);
+ SERIAL_ECHO(']');
+}
+
+static void prusa_stat_farm_number() {
+ SERIAL_ECHO("[PFN:");
+ SERIAL_ECHO(farm_no);
+ SERIAL_ECHO(']');
+}
+
+static void prusa_stat_diameter() {
+ SERIAL_ECHO("[DIA:");
+ SERIAL_ECHO(eeprom_read_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM));
+ SERIAL_ECHO(']');
+}
+
+static void prusa_stat_temperatures()
+{
+ SERIAL_ECHO("[ST0:");
+ SERIAL_ECHO(target_temperature[0]);
+ SERIAL_ECHO("][STB:");
+ SERIAL_ECHO(target_temperature_bed);
+ SERIAL_ECHO("][AT0:");
+ SERIAL_ECHO(current_temperature[0]);
+ SERIAL_ECHO("][ATB:");
+ SERIAL_ECHO(current_temperature_bed);
+ SERIAL_ECHO(']');
+}
+
+static void prusa_stat_printinfo()
+{
+ SERIAL_ECHO("[TFU:");
+ SERIAL_ECHO(total_filament_used);
+ SERIAL_ECHO("][PCD:");
+ SERIAL_ECHO(itostr3(card.percentDone()));
+ SERIAL_ECHO("][FEM:");
+ SERIAL_ECHO(itostr3(feedmultiply));
+ SERIAL_ECHO("][FNM:");
+ SERIAL_ECHO(longFilenameOLD);
+ SERIAL_ECHO("][TIM:");
+ if (starttime != 0)
+ {
+ SERIAL_ECHO(_millis() / 1000 - starttime / 1000);
+ }
+ else
+ {
+ SERIAL_ECHO(0);
+ }
+ SERIAL_ECHO("][FWR:");
+ SERIAL_ECHO(FW_VERSION);
+ SERIAL_ECHO(']');
+ prusa_stat_diameter();
+}
+
+void prusa_statistics_err(char c){
+ SERIAL_ECHO("{[ERR:");
+ SERIAL_ECHO(c);
+ SERIAL_ECHO(']');
+ prusa_stat_farm_number();
+}
+
+void prusa_statistics_case0(uint8_t statnr){
+ SERIAL_ECHO("{");
+ prusa_stat_printerstatus(statnr);
+ prusa_stat_farm_number();
+ prusa_stat_printinfo();
+}
+
+void prusa_statistics(int _message, uint8_t _fil_nr) {
+#ifdef DEBUG_DISABLE_PRUSA_STATISTICS
+ return;
+#endif //DEBUG_DISABLE_PRUSA_STATISTICS
+ switch (_message)
+ {
+
+ case 0: // default message
+ if (busy_state == PAUSED_FOR_USER)
+ {
+ prusa_statistics_case0(15);
+ }
+ else if (isPrintPaused || card.paused)
+ {
+ prusa_statistics_case0(14);
+ }
+ else if (IS_SD_PRINTING || loading_flag)
+ {
+ prusa_statistics_case0(4);
+ }
+ else
+ {
+ SERIAL_ECHO("{");
+ prusa_stat_printerstatus(1);
+ prusa_stat_farm_number();
+ prusa_stat_diameter();
+ status_number = 1;
+ }
+ break;
+
+ case 1: // 1 heating
+ farm_status = 2;
+ SERIAL_ECHO('{');
+ prusa_stat_printerstatus(2);
+ prusa_stat_farm_number();
+ status_number = 2;
+ farm_timer = 1;
+ break;
+
+ case 2: // heating done
+ farm_status = 3;
+ SERIAL_ECHO('{');
+ prusa_stat_printerstatus(3);
+ prusa_stat_farm_number();
+ SERIAL_ECHOLN('}');
+ status_number = 3;
+ farm_timer = 1;
+
+ if (IS_SD_PRINTING || loading_flag)
+ {
+ farm_status = 4;
+ SERIAL_ECHO('{');
+ prusa_stat_printerstatus(4);
+ prusa_stat_farm_number();
+ status_number = 4;
+ }
+ else
+ {
+ SERIAL_ECHO('{');
+ prusa_stat_printerstatus(3);
+ prusa_stat_farm_number();
+ status_number = 3;
+ }
+ farm_timer = 1;
+ break;
+
+ case 3: // filament change
+ // must do a return here to prevent doing SERIAL_ECHOLN("}") at the very end of this function
+ // saved a considerable amount of FLASH
+ return;
+ case 4: // print succesfull
+ SERIAL_ECHO("{[RES:1][FIL:");
+ MYSERIAL.print(int(_fil_nr));
+ SERIAL_ECHO(']');
+ prusa_stat_printerstatus(status_number);
+ prusa_stat_farm_number();
+ farm_timer = 2;
+ break;
+ case 5: // print not succesfull
+ SERIAL_ECHO("{[RES:0][FIL:");
+ MYSERIAL.print(int(_fil_nr));
+ SERIAL_ECHO(']');
+ prusa_stat_printerstatus(status_number);
+ prusa_stat_farm_number();
+ farm_timer = 2;
+ break;
+ case 6: // print done
+ SERIAL_ECHO("{[PRN:8]");
+ prusa_stat_farm_number();
+ status_number = 8;
+ farm_timer = 2;
+ break;
+ case 7: // print done - stopped
+ SERIAL_ECHO("{[PRN:9]");
+ prusa_stat_farm_number();
+ status_number = 9;
+ farm_timer = 2;
+ break;
+ case 8: // printer started
+ SERIAL_ECHO("{[PRN:0][PFN:");
+ status_number = 0;
+ SERIAL_ECHO(farm_no);
+ SERIAL_ECHO(']');
+ farm_timer = 2;
+ break;
+ case 20: // echo farm no
+ SERIAL_ECHO('{');
+ prusa_stat_printerstatus(status_number);
+ prusa_stat_farm_number();
+ farm_timer = 4;
+ break;
+ case 21: // temperatures
+ SERIAL_ECHO('{');
+ prusa_stat_temperatures();
+ prusa_stat_farm_number();
+ prusa_stat_printerstatus(status_number);
+ break;
+ case 22: // waiting for filament change
+ SERIAL_ECHO("{[PRN:5]");
+ prusa_stat_farm_number();
+ status_number = 5;
+ break;
+
+ case 90: // Error - Thermal Runaway
+ prusa_statistics_err('1');
+ break;
+ case 91: // Error - Thermal Runaway Preheat
+ prusa_statistics_err('2');
+ break;
+ case 92: // Error - Min temp
+ prusa_statistics_err('3');
+ break;
+ case 93: // Error - Max temp
+ prusa_statistics_err('4');
+ break;
+
+ case 99: // heartbeat
+ SERIAL_ECHO("{[PRN:99]");
+ prusa_stat_temperatures();
+ SERIAL_ECHO("[PFN:");
+ SERIAL_ECHO(farm_no);
+ SERIAL_ECHO(']');
+
+ break;
+ }
+ SERIAL_ECHOLN('}');
+
+}
+
+} // end namespace new
+
+void SERIALS_RESET(){
+ old_code::SERIAL_RESET();
+ new_code::SERIAL_RESET();
+}
+
+std::string SERIALS_SERIALIZE(){
+ return old_code::SERIAL_BUFFER + "\n" + new_code::SERIAL_BUFFER;
+}
+void SERIALS_PRINT(){
+ std::cout << "[Printing buffers...] \n";
+ std::cout << old_code::SERIAL_BUFFER << "\n";
+ std::cout << new_code::SERIAL_BUFFER << "\n";
+}
+
+int SERIALS_COMPARE(){
+ // Trim the newline at the end
+
+ if(old_code::SERIAL_BUFFER.back() == '\n'){
+ old_code::SERIAL_BUFFER.pop_back();
+ }
+ if(new_code::SERIAL_BUFFER.back() == '\n'){
+ new_code::SERIAL_BUFFER.pop_back();
+ }
+
+ std::cout << "Comparing: \n";
+ std::cout << old_code::SERIAL_BUFFER << "\n";
+ std::cout << new_code::SERIAL_BUFFER << "\n";
+
+ return old_code::SERIAL_BUFFER.compare(new_code::SERIAL_BUFFER);
+}
+
+
+// --------------- TEST CASES ---------------- //
+
+TEST_CASE("Serials compare ignore newline at the end", "[helper]")
+{
+ SERIALS_RESET();
+ old_code::SERIAL_BUFFER = "Hello compare me.";
+ new_code::SERIAL_BUFFER = "Hello compare me.";
+ CHECK(SERIALS_COMPARE() == 0);
+
+ SERIALS_RESET();
+ old_code::SERIAL_BUFFER = "Hello compare me.\n";
+ new_code::SERIAL_BUFFER = "Hello compare me.";
+ CHECK(SERIALS_COMPARE() == 0);
+
+ SERIALS_RESET();
+ old_code::SERIAL_BUFFER = "Hello compare me.";
+ new_code::SERIAL_BUFFER = "Hello compare me.\n";
+ CHECK(SERIALS_COMPARE() == 0);
+}
+
+TEST_CASE("Printer status is shown", "[prusa_stats]")
+{
+ SERIALS_RESET();
+ setup_mockups();
+
+ old_code::prusa_stat_printerstatus(1);
+ new_code::prusa_stat_printerstatus(1);
+
+ INFO(SERIALS_SERIALIZE());
+ CHECK(SERIALS_COMPARE() == 0);
+}
+
+
+TEST_CASE("Printer info is shown", "[prusa_stats]")
+{
+ SERIALS_RESET();
+ setup_mockups();
+
+ old_code::prusa_stat_printinfo();
+ new_code::prusa_stat_printinfo();
+
+ INFO(SERIALS_SERIALIZE());
+ CHECK(SERIALS_COMPARE() == 0);
+}
+
+TEST_CASE("Printer temperatures are shown", "[prusa_stats]")
+{
+ SERIALS_RESET();
+ setup_mockups();
+
+ old_code::prusa_stat_temperatures();
+ new_code::prusa_stat_temperatures();
+
+ INFO(SERIALS_SERIALIZE());
+ CHECK(SERIALS_COMPARE() == 0);
+}
+
+TEST_CASE("Prusa_statistics test", "[prusa_stats]")
+{
+ SERIALS_RESET();
+ setup_mockups();
+
+ int test_codes[] = {0,1,2,3,4,5,6,7,8,20,21,22,90,91,92,93,99};
+ int size = sizeof(test_codes)/sizeof(test_codes[0]);
+
+ for(int i = 0; i < size; i++){
+ std::cout << "Testing prusa_statistics(" << std::to_string(i) << ")\n";
+
+ switch(i)
+ {
+ case 0: {
+ busy_state = 0;
+ PAUSED_FOR_USER = 0;
+ old_code::prusa_statistics(test_codes[i],0);
+ new_code::prusa_statistics(test_codes[i],0);
+ CHECK(SERIALS_COMPARE() == 0);
+ SERIALS_RESET();
+
+ busy_state = 1;
+ PAUSED_FOR_USER = 0;
+ isPrintPaused = 1;
+ old_code::prusa_statistics(test_codes[i],0);
+ new_code::prusa_statistics(test_codes[i],0);
+ CHECK(SERIALS_COMPARE() == 0);
+ SERIALS_RESET();
+
+ isPrintPaused = 0;
+ card.paused = 0;
+ IS_SD_PRINTING = 1;
+ old_code::prusa_statistics(test_codes[i],0);
+ new_code::prusa_statistics(test_codes[i],0);
+ CHECK(SERIALS_COMPARE() == 0);
+ SERIALS_RESET();
+
+ busy_state = 1;
+ PAUSED_FOR_USER = 0;
+ isPrintPaused = 0;
+ IS_SD_PRINTING = 0;
+ loading_flag = 0;
+ old_code::prusa_statistics(test_codes[i],0);
+ new_code::prusa_statistics(test_codes[i],0);
+ CHECK(SERIALS_COMPARE() == 0);
+ SERIALS_RESET();
+ break;
+ }
+ case 2: {
+ IS_SD_PRINTING = 1;
+ old_code::prusa_statistics(test_codes[i],0);
+ new_code::prusa_statistics(test_codes[i],0);
+ CHECK(SERIALS_COMPARE() == 0);
+ SERIALS_RESET();
+
+ IS_SD_PRINTING = 0;
+ loading_flag = 0;
+ old_code::prusa_statistics(test_codes[i],0);
+ new_code::prusa_statistics(test_codes[i],0);
+ CHECK(SERIALS_COMPARE() == 0);
+ SERIALS_RESET();
+
+ break;
+ }
+ default:{
+
+ old_code::prusa_statistics(test_codes[i],0);
+ new_code::prusa_statistics(test_codes[i],0);
+ CHECK(SERIALS_COMPARE() == 0);
+ SERIALS_RESET();
+ }
+ }
+ }
+}
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 74bf63d0..d4606d56 100755
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -828,7 +828,7 @@
#
"Press the knob"
-"Stisknete hl. tlacitko"
+"Stisknete tlacitko"
#MSG_PRINT_PAUSED c=20 r=1
"Print paused"