3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'MK3' into preheat_menu

Browse source
This commit is contained in:
Marek Běl 2019-08-27 22:20:23 +02:00 committed by GitHub
commit 3f04c4db87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Firmware/Configuration.h
View file

@ -16,8 +16,8 @@ extern uint16_t nPrinterType;
extern PGM_P sPrinterName; extern PGM_P sPrinterName;
// Firmware version // Firmware version
#define FW_VERSION "3.8.0" #define FW_VERSION "3.8.0-RC2"
#define FW_COMMIT_NR 2608 #define FW_COMMIT_NR 2639
// FW_VERSION_UNKNOWN means this is an unofficial build. // FW_VERSION_UNKNOWN means this is an unofficial build.
// The firmware should only be checked into github with this symbol. // The firmware should only be checked into github with this symbol.
#define FW_DEV_VERSION FW_VERSION_UNKNOWN #define FW_DEV_VERSION FW_VERSION_UNKNOWN

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;
@ -9495,7 +9502,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;

6
Firmware/ultralcd.cpp
View file

@ -2305,6 +2305,12 @@ static void mFilamentItem_ASA()
mFilamentItem(ASA_PREHEAT_HOTEND_TEMP, ASA_PREHEAT_HPB_TEMP); mFilamentItem(ASA_PREHEAT_HOTEND_TEMP, ASA_PREHEAT_HPB_TEMP);
} }
static void mFilamentItem_ASA()
{
bFilamentPreheatState=false;
mFilamentItem(ASA_PREHEAT_HOTEND_TEMP,ASA_PREHEAT_HPB_TEMP);
}
static void mFilamentItem_ABS() static void mFilamentItem_ABS()
{ {
bFilamentPreheatState = false; bFilamentPreheatState = false;