Merge usptream
Crashdetection fixed pl language removed (because of low flash capacity) build number = 110
This commit is contained in:
Robert Pelnar
parent
ee9936fa6c
commit
213ee43cc9
@ -9,7 +9,7 @@
|
||||
|
||||
// Firmware version
|
||||
#define FW_version "3.0.12-RC2"
|
||||
#define FW_build 109
|
||||
#define FW_build 110
|
||||
//#define FW_build --BUILD-NUMBER--
|
||||
#define FW_version_build FW_version " b" STR(FW_build)
|
||||
|
||||
|
||||
@ -99,7 +99,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o
|
||||
//#define DEBUG_DISABLE_SWLIMITS //sw limits ignored
|
||||
//#define DEBUG_DISABLE_LCD_STATUS_LINE //empty four lcd line
|
||||
//#define DEBUG_DISABLE_PREVENT_EXTRUDER //cold extrusion and long extrusion allowed
|
||||
#define DEBUG_DISABLE_PRUSA_STATISTICS //disable prusa_statistics() mesages
|
||||
//#define DEBUG_DISABLE_PRUSA_STATISTICS //disable prusa_statistics() mesages
|
||||
//#define DEBUG_XSTEP_DUP_PIN 21 //duplicate x-step output to pin 21 (SCL on P3)
|
||||
//#define DEBUG_YSTEP_DUP_PIN 21 //duplicate y-step output to pin 21 (SCL on P3)
|
||||
//#define DEBUG_BLINK_ACTIVE
|
||||
|
||||
@ -583,7 +583,6 @@ void restore_print_from_ram_and_continue(float e_move);
|
||||
|
||||
extern int8_t CrashDetectMenu;
|
||||
|
||||
|
||||
void crashdet_enable()
|
||||
{
|
||||
MYSERIAL.println("crashdet_enable");
|
||||
@ -623,6 +622,58 @@ void crashdet_stop_and_save_print2()
|
||||
sei();
|
||||
}
|
||||
|
||||
void crashdet_detected()
|
||||
{
|
||||
printf("CRASH_DETECTED");
|
||||
/* while (!is_buffer_empty())
|
||||
{
|
||||
process_commands();
|
||||
cmdqueue_pop_front();
|
||||
}*/
|
||||
st_synchronize();
|
||||
|
||||
lcd_update_enable(true);
|
||||
lcd_implementation_clear();
|
||||
lcd_update(2);
|
||||
|
||||
// Increment crash counter
|
||||
uint8_t crash_count = eeprom_read_byte((uint8_t*)EEPROM_CRASH_COUNT);
|
||||
crash_count++;
|
||||
eeprom_update_byte((uint8_t*)EEPROM_CRASH_COUNT, crash_count);
|
||||
|
||||
#ifdef AUTOMATIC_RECOVERY_AFTER_CRASH
|
||||
bool yesno = true;
|
||||
#else
|
||||
bool yesno = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_CRASH_DETECTED, false);
|
||||
#endif
|
||||
lcd_update_enable(true);
|
||||
lcd_update(2);
|
||||
lcd_setstatuspgm(WELCOME_MSG);
|
||||
if (yesno)
|
||||
{
|
||||
enquecommand_P(PSTR("G28 X"));
|
||||
enquecommand_P(PSTR("G28 Y"));
|
||||
enquecommand_P(PSTR("CRASH_RECOVER"));
|
||||
}
|
||||
else
|
||||
{
|
||||
enquecommand_P(PSTR("CRASH_CANCEL"));
|
||||
}
|
||||
}
|
||||
|
||||
void crashdet_recover()
|
||||
{
|
||||
crashdet_restore_print_and_continue();
|
||||
tmc2130_sg_stop_on_crash = true;
|
||||
}
|
||||
|
||||
void crashdet_cancel()
|
||||
{
|
||||
card.sdprinting = false;
|
||||
card.closefile();
|
||||
tmc2130_sg_stop_on_crash = true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#ifdef MESH_BED_LEVELING
|
||||
@ -1310,7 +1361,7 @@ void loop()
|
||||
{
|
||||
tmc2130_sg_crash = false;
|
||||
// crashdet_stop_and_save_print();
|
||||
enquecommand_P((PSTR("D999")));
|
||||
enquecommand_P((PSTR("CRASH_DETECTED")));
|
||||
}
|
||||
#endif //TMC2130
|
||||
|
||||
@ -2030,6 +2081,14 @@ void process_commands()
|
||||
*(starpos) = '\0';
|
||||
lcd_setstatus(strchr_pointer + 5);
|
||||
}
|
||||
|
||||
else if(code_seen("CRASH_DETECTED"))
|
||||
crashdet_detected();
|
||||
else if(code_seen("CRASH_RECOVER"))
|
||||
crashdet_recover();
|
||||
else if(code_seen("CRASH_CANCEL"))
|
||||
crashdet_cancel();
|
||||
|
||||
else if(code_seen("PRUSA")){
|
||||
if (code_seen("Ping")) { //PRUSA Ping
|
||||
if (farm_mode) {
|
||||
@ -5902,122 +5961,6 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
|
||||
dcode_2130(); break;
|
||||
case 9125: // D9125 - PAT9125
|
||||
dcode_9125(); break;
|
||||
|
||||
|
||||
case 999:
|
||||
{
|
||||
MYSERIAL.println("D999 - crash");
|
||||
|
||||
/* while (!is_buffer_empty())
|
||||
{
|
||||
process_commands();
|
||||
cmdqueue_pop_front();
|
||||
}*/
|
||||
st_synchronize();
|
||||
|
||||
lcd_update_enable(true);
|
||||
lcd_implementation_clear();
|
||||
lcd_update(2);
|
||||
|
||||
// Increment crash counter
|
||||
uint8_t crash_count = eeprom_read_byte((uint8_t*)EEPROM_CRASH_COUNT);
|
||||
crash_count++;
|
||||
eeprom_update_byte((uint8_t*)EEPROM_CRASH_COUNT, crash_count);
|
||||
|
||||
#ifdef AUTOMATIC_RECOVERY_AFTER_CRASH
|
||||
bool yesno = true;
|
||||
#else
|
||||
bool yesno = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_CRASH_DETECTED, false);
|
||||
#endif
|
||||
lcd_update_enable(true);
|
||||
lcd_update(2);
|
||||
lcd_setstatuspgm(WELCOME_MSG);
|
||||
if (yesno)
|
||||
{
|
||||
enquecommand_P(PSTR("G28 X"));
|
||||
enquecommand_P(PSTR("G28 Y"));
|
||||
enquecommand_P(PSTR("D1000"));
|
||||
}
|
||||
else
|
||||
{
|
||||
enquecommand_P(PSTR("D1001"));
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 1000:
|
||||
crashdet_restore_print_and_continue();
|
||||
tmc2130_sg_stop_on_crash = true;
|
||||
break;
|
||||
case 1001:
|
||||
card.sdprinting = false;
|
||||
card.closefile();
|
||||
tmc2130_sg_stop_on_crash = true;
|
||||
break;
|
||||
/* case 4:
|
||||
{
|
||||
MYSERIAL.println("D4 - Test");
|
||||
uint8_t data[16];
|
||||
int cnt = parse_hex(strchr_pointer + 2, data, 16);
|
||||
MYSERIAL.println(cnt, DEC);
|
||||
for (int i = 0; i < cnt; i++)
|
||||
{
|
||||
serial_print_hex_byte(data[i]);
|
||||
MYSERIAL.write(' ');
|
||||
}
|
||||
MYSERIAL.write('\n');
|
||||
}
|
||||
break;
|
||||
/* case 3:
|
||||
if (code_seen('L')) // lcd pwm (0-255)
|
||||
{
|
||||
lcdSoftPwm = (int)code_value();
|
||||
}
|
||||
if (code_seen('B')) // lcd blink delay (0-255)
|
||||
{
|
||||
lcdBlinkDelay = (int)code_value();
|
||||
}
|
||||
// calibrate_z_auto();
|
||||
/* MYSERIAL.print("fsensor_enable()");
|
||||
#ifdef PAT9125
|
||||
fsensor_enable();
|
||||
#endif*/
|
||||
break;
|
||||
// case 4:
|
||||
// lcdBlinkDelay = 10;
|
||||
/* MYSERIAL.print("fsensor_disable()");
|
||||
#ifdef PAT9125
|
||||
fsensor_disable();
|
||||
#endif
|
||||
break;*/
|
||||
// break;
|
||||
/* case 5:
|
||||
{
|
||||
MYSERIAL.print("tmc2130_rd_MSCNT(0)=");
|
||||
int val = tmc2130_rd_MSCNT(tmc2130_cs[0]);
|
||||
MYSERIAL.println(val);
|
||||
homeaxis(0);
|
||||
}
|
||||
break;*/
|
||||
/* case 6:
|
||||
{
|
||||
MYSERIAL.print("tmc2130_rd_MSCNT(1)=");
|
||||
int val = tmc2130_rd_MSCNT(tmc2130_cs[1]);
|
||||
MYSERIAL.println(val);
|
||||
homeaxis(1);
|
||||
}
|
||||
break;
|
||||
case 7:
|
||||
{
|
||||
MYSERIAL.print("pat9125_init=");
|
||||
MYSERIAL.println(pat9125_init(200, 200));
|
||||
}
|
||||
break;
|
||||
case 8:
|
||||
{
|
||||
MYSERIAL.print("swi2c_check=");
|
||||
MYSERIAL.println(swi2c_check(0x75));
|
||||
}
|
||||
break;*/
|
||||
}
|
||||
}
|
||||
#endif //DEBUG_DCODES
|
||||
|
||||
15740
Firmware/builds/1_75mm_MK3-EINY04-E3Dv6full/Firmware.ino.rambo_b110.hex
Normal file
15740
Firmware/builds/1_75mm_MK3-EINY04-E3Dv6full/Firmware.ino.rambo_b110.hex
Normal file
File diff suppressed because it is too large
Load Diff
@ -4,7 +4,7 @@
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
my @langs = ("en","cz","it","es","pl","de");
|
||||
my @langs = ("en","cz","it","es","de");
|
||||
|
||||
sub parselang
|
||||
{
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -7,8 +7,7 @@
|
||||
#define LANG_ID_CZ 1
|
||||
#define LANG_ID_IT 2
|
||||
#define LANG_ID_ES 3
|
||||
#define LANG_ID_PL 4
|
||||
#define LANG_ID_DE 5
|
||||
#define LANG_ID_DE 4
|
||||
// Language is not defined and it shall be selected from the menu.
|
||||
#define LANG_ID_FORCE_SELECTION 254
|
||||
// Language is not defined on a virgin RAMBo board.
|
||||
@ -18,7 +17,7 @@
|
||||
#define LANG_ID_DEFAULT LANG_ID_CZ
|
||||
|
||||
// Number of languages available in the language table.
|
||||
#define LANG_NUM 6
|
||||
#define LANG_NUM 5
|
||||
|
||||
// Currectly active language selection.
|
||||
extern unsigned char lang_selected;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user