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

fan error changes

Browse Source
This commit is contained in:
PavelSindler 2017-09-22 19:31:52 +02:00
parent b87dc69042
commit 13f45adb13
4 changed files with 346 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

658
Firmware/language_all.cpp
View File

File diff suppressed because it is too large Load Diff

20
Firmware/language_all.h
View File

@ -4,25 +4,22 @@
#include <avr/pgmspace.h>
// Language indices into their particular symbol tables.
#define LANG_ID_EN 0
#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
// 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.
#define LANG_ID_UNDEFINED 255
// Default language ID, if no language is selected.
#define LANG_ID_DEFAULT LANG_ID_CZ
#define LANG_ID_DEFAULT LANG_ID_EN
// Number of languages available in the language table.
#define LANG_NUM 6
#define LANG_NUM 1
// Currectly active language selection.
extern unsigned char lang_selected;
#define MSG_LANGUAGE_NAME_EXPLICIT(LANG) "EN"
#define LANG_TABLE_SELECT_EXPLICIT(TABLE, LANG) ((const char*)(pgm_read_ptr(TABLE + (LANG))))
#define LANG_TABLE_SELECT(TABLE) LANG_TABLE_SELECT_EXPLICIT(TABLE, lang_selected)
@ -146,6 +143,10 @@ extern const char* const MSG_CORRECTLY_LANG_TABLE[1];
#define MSG_CORRECTLY LANG_TABLE_SELECT_EXPLICIT(MSG_CORRECTLY_LANG_TABLE, 0)
extern const char* const MSG_COUNT_X_LANG_TABLE[1];
#define MSG_COUNT_X LANG_TABLE_SELECT_EXPLICIT(MSG_COUNT_X_LANG_TABLE, 0)
extern const char* const MSG_CRASHDETECT_OFF_LANG_TABLE[1];
#define MSG_CRASHDETECT_OFF LANG_TABLE_SELECT_EXPLICIT(MSG_CRASHDETECT_OFF_LANG_TABLE, 0)
extern const char* const MSG_CRASHDETECT_ON_LANG_TABLE[1];
#define MSG_CRASHDETECT_ON LANG_TABLE_SELECT_EXPLICIT(MSG_CRASHDETECT_ON_LANG_TABLE, 0)
extern const char* const MSG_CURRENT_LANG_TABLE[1];
#define MSG_CURRENT LANG_TABLE_SELECT_EXPLICIT(MSG_CURRENT_LANG_TABLE, 0)
extern const char* const MSG_DISABLE_STEPPERS_LANG_TABLE[1];
@ -278,9 +279,8 @@ extern const char* const MSG_INVALID_EXTRUDER_LANG_TABLE[1];
#define MSG_INVALID_EXTRUDER LANG_TABLE_SELECT_EXPLICIT(MSG_INVALID_EXTRUDER_LANG_TABLE, 0)
extern const char* const MSG_KILLED_LANG_TABLE[1];
#define MSG_KILLED LANG_TABLE_SELECT_EXPLICIT(MSG_KILLED_LANG_TABLE, 0)
extern const char* const MSG_LANGUAGE_NAME_LANG_TABLE[LANG_NUM];
#define MSG_LANGUAGE_NAME LANG_TABLE_SELECT(MSG_LANGUAGE_NAME_LANG_TABLE)
#define MSG_LANGUAGE_NAME_EXPLICIT(LANG) LANG_TABLE_SELECT_EXPLICIT(MSG_LANGUAGE_NAME_LANG_TABLE, LANG)
extern const char* const MSG_LANGUAGE_NAME_LANG_TABLE[1];
#define MSG_LANGUAGE_NAME LANG_TABLE_SELECT_EXPLICIT(MSG_LANGUAGE_NAME_LANG_TABLE, 0)
extern const char* const MSG_LANGUAGE_SELECT_LANG_TABLE[1];
#define MSG_LANGUAGE_SELECT LANG_TABLE_SELECT_EXPLICIT(MSG_LANGUAGE_SELECT_LANG_TABLE, 0)
extern const char* const MSG_LOADING_COLOR_LANG_TABLE[1];

12
Firmware/temperature.cpp
View File

@ -463,22 +463,22 @@ void fanSpeedError(unsigned char _fan) {
if (card.sdprinting) {
if(heating_status != 0) lcd_print_stop();
//card.pauseSDPrint();
lcd_sdcard_pause();
else lcd_sdcard_pause();
}
setTargetHotend0(0);
/*lcd_update();
//lcd_update();
WRITE(BEEPER, HIGH);
delayMicroseconds(500);
delayMicroseconds(2000);
WRITE(BEEPER, LOW);
delayMicroseconds(100);*/
delayMicroseconds(100);
SERIAL_ERROR_START;
switch (_fan) {
case 0:
fanSpeed = 255;
//lcd_print_stop();
SERIAL_ERRORLNPGM("ERROR: Extruder fan speed is lower then expected");
LCD_ALERTMESSAGEPGM("Err: EXTR. FAN ERROR");

2
Firmware/ultralcd.cpp
View File

@ -2855,7 +2855,7 @@ void lcd_mylang_drawmenu(int cursor) {
}
*/
void lcd_mylang_drawmenu(int cursor) {SG_LANGUAGE_NAME_EXPLICIT
void lcd_mylang_drawmenu(int cursor) {
int first = 0;
if (cursor>3) first = cursor-3;
if (cursor==LANG_NUM && LANG_NUM>4) first = LANG_NUM-4;