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

Merge pull request #353 from XPila/MK3 

Mk3
This commit is contained in:
XPila 2017-12-28 02:59:04 +01:00 committed by GitHub
parent e00ac9566e bd58718d9d
commit a7bc1688e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14988 additions and 14902 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/Configuration.h
View File

@ -8,10 +8,10 @@
#define STR(x) STR_HELPER(x) #define STR(x) STR_HELPER(x)
// Firmware version // Firmware version
#define FW_version "3.1.1-RC3" #define FW_version "3.1.1-RC4"
#define FW_build 138 #define FW_build 139
//#define FW_build --BUILD-NUMBER-- //#define FW_build --BUILD-NUMBER--
#define FW_version_build FW_version " b" STR(FW_build) "b" #define FW_version_build FW_version " b" STR(FW_build)
#define FW_PRUSA3D_MAGIC "PRUSA3DFW" #define FW_PRUSA3D_MAGIC "PRUSA3DFW"

29864
Firmware/Firmware.ino.rambo.hex
View File

File diff suppressed because it is too large Load Diff

1
Firmware/Marlin_main.cpp
View File

@ -7762,6 +7762,7 @@ void restore_print_from_ram_and_continue(float e_move)
sdpos_atomic = saved_sdpos; sdpos_atomic = saved_sdpos;
card.sdprinting = true; card.sdprinting = true;
saved_printing = false; saved_printing = false;
printf_P(PSTR("ok\n")); //dummy response because of octoprint is waiting for this
} }
void print_world_coordinates() void print_world_coordinates()

5
Firmware/language_all.cpp
View File

@ -34,6 +34,11 @@ const char * const MSG_AUTHOR_LANG_TABLE[1] PROGMEM = {
MSG_AUTHOR_EN MSG_AUTHOR_EN
}; };
const char MSG_AUTOLOAD_FILAMENT_EN[] PROGMEM = "AUTOLoad filament";
const char * const MSG_AUTOLOAD_FILAMENT_LANG_TABLE[1] PROGMEM = {
MSG_AUTOLOAD_FILAMENT_EN
};
const char MSG_AUTO_HOME_EN[] PROGMEM = "Auto home"; const char MSG_AUTO_HOME_EN[] PROGMEM = "Auto home";
const char * const MSG_AUTO_HOME_LANG_TABLE[1] PROGMEM = { const char * const MSG_AUTO_HOME_LANG_TABLE[1] PROGMEM = {
MSG_AUTO_HOME_EN MSG_AUTO_HOME_EN

2
Firmware/language_all.h
View File

@ -32,6 +32,8 @@ extern const char* const MSG_AMAX_LANG_TABLE[1];
#define MSG_AMAX LANG_TABLE_SELECT_EXPLICIT(MSG_AMAX_LANG_TABLE, 0) #define MSG_AMAX LANG_TABLE_SELECT_EXPLICIT(MSG_AMAX_LANG_TABLE, 0)
extern const char* const MSG_AUTHOR_LANG_TABLE[1]; extern const char* const MSG_AUTHOR_LANG_TABLE[1];
#define MSG_AUTHOR LANG_TABLE_SELECT_EXPLICIT(MSG_AUTHOR_LANG_TABLE, 0) #define MSG_AUTHOR LANG_TABLE_SELECT_EXPLICIT(MSG_AUTHOR_LANG_TABLE, 0)
extern const char* const MSG_AUTOLOAD_FILAMENT_LANG_TABLE[1];
#define MSG_AUTOLOAD_FILAMENT LANG_TABLE_SELECT_EXPLICIT(MSG_AUTOLOAD_FILAMENT_LANG_TABLE, 0)
extern const char* const MSG_AUTO_HOME_LANG_TABLE[1]; extern const char* const MSG_AUTO_HOME_LANG_TABLE[1];
#define MSG_AUTO_HOME LANG_TABLE_SELECT_EXPLICIT(MSG_AUTO_HOME_LANG_TABLE, 0) #define MSG_AUTO_HOME LANG_TABLE_SELECT_EXPLICIT(MSG_AUTO_HOME_LANG_TABLE, 0)
extern const char* const MSG_A_RETRACT_LANG_TABLE[1]; extern const char* const MSG_A_RETRACT_LANG_TABLE[1];

1
Firmware/language_en.h
View File

@ -70,6 +70,7 @@
#define MSG_SETTINGS "Settings" #define MSG_SETTINGS "Settings"
#define MSG_PREHEAT "Preheat" #define MSG_PREHEAT "Preheat"
#define(length=17) MSG_UNLOAD_FILAMENT "Unload filament" #define(length=17) MSG_UNLOAD_FILAMENT "Unload filament"
#define(length=17) MSG_AUTOLOAD_FILAMENT "AUTOLoad filament"
#define(length=17) MSG_LOAD_FILAMENT "Load filament" #define(length=17) MSG_LOAD_FILAMENT "Load filament"
#define(length=17) MSG_LOAD_FILAMENT_1 "Load filament 1" #define(length=17) MSG_LOAD_FILAMENT_1 "Load filament 1"
#define(length=17) MSG_LOAD_FILAMENT_2 "Load filament 2" #define(length=17) MSG_LOAD_FILAMENT_2 "Load filament 2"

11
Firmware/ultralcd.cpp
View File

@ -1930,11 +1930,16 @@ void lcd_LoadFilament()
{ {
if (degHotend0() > EXTRUDE_MINTEMP) if (degHotend0() > EXTRUDE_MINTEMP)
{ {
if (filament_autoload_enabled)
{
lcd_show_fullscreen_message_and_wait_P(PSTR("Autoloading filament is active, just insert filament..."));
return;
}
custom_message = true; custom_message = true;
loading_flag = true; loading_flag = true;
enquecommand_P(PSTR("M701")); //load filament enquecommand_P(PSTR("M701")); //load filament
SERIAL_ECHOLN("Loading filament"); SERIAL_ECHOLN("Loading filament");
} }
else else
{ {
@ -5034,9 +5039,9 @@ static void lcd_main_menu()
{ {
#ifndef SNMM #ifndef SNMM
if (!filament_autoload_enabled) if (!filament_autoload_enabled)
{
MENU_ITEM(function, MSG_LOAD_FILAMENT, lcd_LoadFilament); MENU_ITEM(function, MSG_LOAD_FILAMENT, lcd_LoadFilament);
} else
MENU_ITEM(function, MSG_AUTOLOAD_FILAMENT, lcd_LoadFilament);
MENU_ITEM(function, MSG_UNLOAD_FILAMENT, lcd_unLoadFilament); MENU_ITEM(function, MSG_UNLOAD_FILAMENT, lcd_unLoadFilament);
#endif #endif
#ifdef SNMM #ifdef SNMM