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

Failstat couters initialization 

build number = 131
This commit is contained in:
Robert Pelnar 2017-12-12 23:37:31 +01:00
parent bbd8dc3191
commit cdeb835b5d
3 changed files with 14961 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/Configuration.h
View File

@ -9,9 +9,9 @@
// Firmware version // Firmware version
#define FW_version "3.1.1-RC1" #define FW_version "3.1.1-RC1"
#define FW_build 130 #define FW_build 131
//#define FW_build --BUILD-NUMBER-- //#define FW_build --BUILD-NUMBER--
#define FW_version_build FW_version " b" STR(FW_build) "a" #define FW_version_build FW_version " b" STR(FW_build)
#define FW_PRUSA3D_MAGIC "PRUSA3DFW" #define FW_PRUSA3D_MAGIC "PRUSA3DFW"

14946
Firmware/Firmware.ino.rambo.hex Normal file
View File

File diff suppressed because it is too large Load Diff

14
Firmware/Marlin_main.cpp
View File

@ -630,7 +630,7 @@ void crashdet_stop_and_save_print2()
void crashdet_detected() void crashdet_detected()
{ {
printf("CRASH_DETECTED"); // printf("CRASH_DETECTED");
/* while (!is_buffer_empty()) /* while (!is_buffer_empty())
{ {
process_commands(); process_commands();
@ -714,6 +714,11 @@ void factory_reset(char level, bool quiet)
WRITE(BEEPER, LOW); WRITE(BEEPER, LOW);
eeprom_update_dword((uint32_t *)EEPROM_TOTALTIME, 0); eeprom_update_dword((uint32_t *)EEPROM_TOTALTIME, 0);
eeprom_update_dword((uint32_t *)EEPROM_FILAMENTUSED, 0); eeprom_update_dword((uint32_t *)EEPROM_FILAMENTUSED, 0);
eeprom_update_byte((uint8_t *)EEPROM_POWER_COUNT, 0);
eeprom_update_byte((uint8_t *)EEPROM_CRASH_COUNT, 0);
eeprom_update_byte((uint8_t *)EEPROM_FERROR_COUNT, 0);
lcd_menu_statistics(); lcd_menu_statistics();
break; break;
@ -1071,7 +1076,14 @@ void setup()
// 1) Set a high power mode. // 1) Set a high power mode.
eeprom_write_byte((uint8_t*)EEPROM_SILENT, 0); eeprom_write_byte((uint8_t*)EEPROM_SILENT, 0);
eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); //run wizard eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); //run wizard
} }
if (eeprom_read_byte((uint8_t*)EEPROM_POWER_COUNT) == 0xff)
eeprom_write_byte((uint8_t*)EEPROM_POWER_COUNT, 0);
if (eeprom_read_byte((uint8_t*)EEPROM_CRASH_COUNT) == 0xff)
eeprom_write_byte((uint8_t*)EEPROM_CRASH_COUNT, 0);
if (eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT) == 0xff)
eeprom_write_byte((uint8_t*)EEPROM_FERROR_COUNT, 0);
#ifdef SNMM #ifdef SNMM
if (eeprom_read_dword((uint32_t*)EEPROM_BOWDEN_LENGTH) == 0x0ffffffff) { //bowden length used for SNMM if (eeprom_read_dword((uint32_t*)EEPROM_BOWDEN_LENGTH) == 0x0ffffffff) { //bowden length used for SNMM
int _z = BOWDEN_LENGTH; int _z = BOWDEN_LENGTH;