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

Merge branch 'farm-patch1' of github.com:DRracer/Prusa-Firmware into farm-patch1

Browse Source
This commit is contained in:
D.R.racer 2021-01-25 08:39:20 +01:00
commit 98a4da571d
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Firmware/Marlin_main.cpp
View File

@ -1056,7 +1056,9 @@ void setup()
no_response = true; //we need confirmation by recieving PRUSA thx no_response = true; //we need confirmation by recieving PRUSA thx
important_status = 8; important_status = 8;
prusa_statistics(8); prusa_statistics(8);
#ifdef HAS_SECOND_SERIAL_PORT
selectedSerialPort = 1; selectedSerialPort = 1;
#endif //HAS_SECOND_SERIAL_PORT
MYSERIAL.begin(BAUDRATE); MYSERIAL.begin(BAUDRATE);
#ifdef TMC2130 #ifdef TMC2130
//increased extruder current (PFW363) //increased extruder current (PFW363)
@ -3901,19 +3903,19 @@ void process_commands()
mmu_reset(); mmu_reset();
} }
else if (code_seen("RESET")) { // PRUSA RESET else if (code_seen("RESET")) { // PRUSA RESET
// careful! #ifdef WATCHDOG
if (farm_mode) { #if defined(W25X20CL) && defined(BOOTAPP)
#if (defined(WATCHDOG) && (MOTHERBOARD == BOARD_EINSY_1_0a)) boot_app_magic = BOOT_APP_MAGIC;
boot_app_magic = BOOT_APP_MAGIC; boot_app_flags = BOOT_APP_FLG_RUN;
boot_app_flags = BOOT_APP_FLG_RUN; #endif //defined(W25X20CL) && defined(BOOTAPP)
softReset(); softReset();
#else //WATCHDOG #else //WATCHDOG
// careful!
if (farm_mode)
asm volatile("jmp 0x3E000"); asm volatile("jmp 0x3E000");
else
puts_P(PSTR("Not in farm mode."));
#endif //WATCHDOG #endif //WATCHDOG
}
else {
MYSERIAL.println("Not in farm mode.");
}
}else if (code_seen("fv")) { // PRUSA fv }else if (code_seen("fv")) { // PRUSA fv
// get file version // get file version
#ifdef SDSUPPORT #ifdef SDSUPPORT

7
Firmware/ultralcd.cpp
View File

@ -669,7 +669,7 @@ void lcdui_print_extruder(void)
// Print farm number (5 chars total) // Print farm number (5 chars total)
void lcdui_print_farm(void) void lcdui_print_farm(void)
{ {
lcd_printf_P(_N(" F0 ")); lcd_printf_P(_N(" FRM "));
} }
#ifdef CMD_DIAGNOSTICS #ifdef CMD_DIAGNOSTICS
@ -6705,6 +6705,8 @@ static void lcd_main_menu()
if ( ( IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal)) && (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU) && !homing_flag && !mesh_bed_leveling_flag) if ( ( IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal)) && (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU) && !homing_flag && !mesh_bed_leveling_flag)
{ {
if (farm_mode)
MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//8
MENU_ITEM_SUBMENU_P(_T(MSG_BABYSTEP_Z), lcd_babystep_z);//8 MENU_ITEM_SUBMENU_P(_T(MSG_BABYSTEP_Z), lcd_babystep_z);//8
} }
@ -6984,7 +6986,8 @@ static void lcd_tune_menu()
MENU_ITEM_EDIT_advance_K();//7 MENU_ITEM_EDIT_advance_K();//7
#endif #endif
#ifdef FILAMENTCHANGEENABLE #ifdef FILAMENTCHANGEENABLE
MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//8 if (!farm_mode)
MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//8
#endif #endif
#ifdef FILAMENT_SENSOR #ifdef FILAMENT_SENSOR