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

Merge pull request #870 from XPila/MK3

Browse source 
Mk3
This commit is contained in:
PavelSindler 2018-06-25 17:36:22 +02:00 committed by GitHub
commit 0fccf5a737
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Firmware/Marlin_main.cpp
View file

@ -1174,11 +1174,17 @@ void setup()
selectedSerialPort = eeprom_read_byte((uint8_t*)EEPROM_SECOND_SERIAL_ACTIVE); selectedSerialPort = eeprom_read_byte((uint8_t*)EEPROM_SECOND_SERIAL_ACTIVE);
if (selectedSerialPort == 0xFF) selectedSerialPort = 0; if (selectedSerialPort == 0xFF) selectedSerialPort = 0;
if (farm_mode) if (farm_mode)
{ {
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);
selectedSerialPort = 1; selectedSerialPort = 1;
//increased extruder current (PFW363)
tmc2130_current_h[E_AXIS] = 36;
tmc2130_current_r[E_AXIS] = 36;
//disabled filament autoload (PFW360)
filament_autoload_enabled = false;
eeprom_update_byte((uint8_t*)EEPROM_FSENS_AUTOLOAD_ENABLED, 0);
} }
MYSERIAL.begin(BAUDRATE); MYSERIAL.begin(BAUDRATE);
fdev_setup_stream(uartout, uart_putchar, NULL, _FDEV_SETUP_WRITE); //setup uart out stream fdev_setup_stream(uartout, uart_putchar, NULL, _FDEV_SETUP_WRITE); //setup uart out stream
@ -3274,7 +3280,13 @@ void process_commands()
} else if (code_seen("RESET")) { } else if (code_seen("RESET")) {
// careful! // careful!
if (farm_mode) { if (farm_mode) {
asm volatile(" jmp 0x3E000"); #ifdef WATCHDOG
wdt_enable(WDTO_15MS);
cli();
while(1);
#else //WATCHDOG
asm volatile("jmp 0x3E000");
#endif //WATCHDOG
} }
else { else {
MYSERIAL.println("Not in farm mode."); MYSERIAL.println("Not in farm mode.");

2
Firmware/ultralcd.cpp
View file

@ -7451,7 +7451,9 @@ static void lcd_send_status() {
//send important status messages periodicaly //send important status messages periodicaly
prusa_statistics(important_status, saved_filament_type); prusa_statistics(important_status, saved_filament_type);
NcTime = millis(); NcTime = millis();
#ifdef FARM_CONNECT_MESSAGE
lcd_connect_printer(); lcd_connect_printer();
#endif //FARM_CONNECT_MESSAGE
} }
} }

2
Firmware/ultralcd_implementation_hitachi_HD44780.h
View file

@ -828,7 +828,7 @@ if (print_sd_status)
// Farm number display // Farm number display
if (farm_mode) if (farm_mode)
{ {
lcd.setCursor(0, 6); lcd.setCursor(6, 2);
lcd_printPGM(PSTR(" F")); lcd_printPGM(PSTR(" F"));
lcd.print(farm_no); lcd.print(farm_no);
lcd_printPGM(PSTR(" ")); lcd_printPGM(PSTR(" "));

2
Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h
View file

@ -468,6 +468,8 @@
// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
#endif // PIDTEMPBED #endif // PIDTEMPBED
//connect message when communication with monitoring broken
//#define FARM_CONNECT_MESSAGE
/*----------------------------------- /*-----------------------------------
PREHEAT SETTINGS PREHEAT SETTINGS