josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2134 from mkbel/fix_power_panic 

Fix repeated power panic restarted print from beginning or jumped at …
This commit is contained in:
DRracer 2019-08-27 08:13:26 +02:00 committed by GitHub
parent a1e68c3d7f 159a1a70d8
commit 6aaa40b9a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Firmware/Marlin_main.cpp
View File

@ -5339,11 +5339,18 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
card.pauseSDPrint(); card.pauseSDPrint();
break; break;
//! ### M26 - Set SD index //! ### M26 S\<index\> - Set SD index
//! Set position in SD card file to index in bytes.
//! This command is expected to be called after M23 and before M24.
//! Otherwise effect of this command is undefined.
// ---------------------------------- // ----------------------------------
case 26: case 26:
if(card.cardOK && code_seen('S')) { if(card.cardOK && code_seen('S')) {
card.setIndex(code_value_long()); long index = code_value_long();
card.setIndex(index);
// We don't disable interrupt during update of sdpos_atomic
// as we expect, that SD card print is not active in this moment
sdpos_atomic = index;
} }
break; break;
@ -9497,7 +9504,7 @@ void serialecho_temperatures() {
SERIAL_PROTOCOL_F(degBed(), 1); SERIAL_PROTOCOL_F(degBed(), 1);
SERIAL_PROTOCOLLN(""); SERIAL_PROTOCOLLN("");
} }
extern uint32_t sdpos_atomic;
#ifdef UVLO_SUPPORT #ifdef UVLO_SUPPORT
void uvlo_() void uvlo_()

2
Firmware/cmdqueue.h
View File

@ -45,6 +45,8 @@ extern bool cmdbuffer_front_already_processed;
// Debugging information will be sent to serial line. // Debugging information will be sent to serial line.
//#define CMDBUFFER_DEBUG //#define CMDBUFFER_DEBUG
extern uint32_t sdpos_atomic;
extern int serial_count; extern int serial_count;
extern boolean comment_mode; extern boolean comment_mode;
extern char *strchr_pointer; extern char *strchr_pointer;