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

Fix repeated fan error checking

This commit is contained in:
DRracer 2019-05-31 11:29:11 +02:00
parent adb5baa12b
commit 6755791778
3 changed files with 67 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/Marlin_main.cpp Normal file → Executable file
View File

@ -3391,8 +3391,10 @@ void process_commands()
{
#ifdef FANCHECK
if (fan_check_error){
fan_check_error = false;
lcd_pause_print();
if( fan_check_error == EFCE_DETECTED ){
fan_check_error = EFCE_REPORTED;
lcd_pause_print();
} // otherwise it has already been reported, so just ignore further processing
return;
}
#endif

82
Firmware/temperature.cpp
View File

@ -95,7 +95,7 @@ float current_temperature_bed = 0.0;
#endif
#ifdef FANCHECK
volatile bool fan_check_error = false;
volatile uint8_t fan_check_error = EFCE_OK;
#endif
unsigned char soft_pwm_bed;
@ -489,6 +489,38 @@ void countFanSpeed()
fan_edge_counter[1] = 0;
}
//#define SIMULATE_FAN_ERRORS
#ifdef SIMULATE_FAN_ERRORS
struct FanSpeedErrorSimulator {
unsigned long lastMillis = 0;
bool state = false; // zatim mam 0 - klid, 1 reportuju chybu
//! @return pocet simulovanych chyb
inline uint8_t step(){
unsigned long ms = _millis();
switch(state){
case false:
if( (ms - lastMillis) > 120000UL ){ // funkcni ventilator chci 2 minuty
state = true;
lastMillis = ms;
SERIAL_ECHOLNPGM("SIM Fan error");
}
break;
case true:
if( (ms - lastMillis) > 20000UL ){ // vypadek ventilatoru chci uz 20s,
//abych stihl udelat pokusnej resume print, kdyz jeste jsou rozbity vetraky
state = false;
lastMillis = ms;
SERIAL_ECHOLNPGM("SIM Fan ok");
}
break;
}
return state ? 20 : 0;
}
};
static FanSpeedErrorSimulator fanSpeedErrorSimulator;
#endif
void checkFanSpeed()
{
uint8_t max_print_fan_errors = 0;
@ -512,6 +544,16 @@ void checkFanSpeed()
else fan_speed_errors[1] = 0;
#endif
#ifdef SIMULATE_FAN_ERRORS
fan_speed_errors[0] = fanSpeedErrorSimulator.step();
#endif
// drop the fan_check_error flag when both fans are ok
if( fan_speed_errors[0] == 0 && fan_speed_errors[1] == 0 && fan_check_error == EFCE_REPORTED){
// we may even send some info to the LCD from here
fan_check_error = EFCE_OK;
}
if ((fan_speed_errors[0] > max_extruder_fan_errors) && fans_check_enabled) {
fan_speed_errors[0] = 0;
fanSpeedError(0); //extruder fan
@ -522,6 +564,19 @@ void checkFanSpeed()
}
}
void fanSpeedErrorBeep(const char *serialMsg, const char *lcdMsg){
SERIAL_ECHOLNRPGM(serialMsg);
if (get_message_level() == 0) {
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)||(eSoundMode==e_SOUND_MODE_SILENT)){
WRITE(BEEPER, HIGH);
delayMicroseconds(200);
WRITE(BEEPER, LOW);
delayMicroseconds(100); // what is this wait for?
}
LCD_ALERTMESSAGERPGM(lcdMsg);
}
}
void fanSpeedError(unsigned char _fan) {
if (get_message_level() != 0 && isPrintPaused) return;
//to ensure that target temp. is not set to zero in case taht we are resuming print
@ -530,7 +585,8 @@ void fanSpeedError(unsigned char _fan) {
lcd_print_stop();
}
else {
fan_check_error = true;
fan_check_error = EFCE_DETECTED;
}
}
else {
@ -538,27 +594,11 @@ void fanSpeedError(unsigned char _fan) {
SERIAL_ECHOLNPGM("// action:pause"); //for octoprint
}
switch (_fan) {
case 0:
SERIAL_ECHOLNPGM("Extruder fan speed is lower then expected");
if (get_message_level() == 0) {
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)||(eSoundMode==e_SOUND_MODE_SILENT))
WRITE(BEEPER, HIGH);
delayMicroseconds(200);
WRITE(BEEPER, LOW);
delayMicroseconds(100);
LCD_ALERTMESSAGEPGM("Err: EXTR. FAN ERROR");
}
case 0: // extracting the same code from case 0 and case 1 into a function saves 72B
fanSpeedErrorBeep(PSTR("Extruder fan speed is lower than expected"), PSTR("Err: EXTR. FAN ERROR") );
break;
case 1:
SERIAL_ECHOLNPGM("Print fan speed is lower then expected");
if (get_message_level() == 0) {
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)||(eSoundMode==e_SOUND_MODE_SILENT))
WRITE(BEEPER, HIGH);
delayMicroseconds(200);
WRITE(BEEPER, LOW);
delayMicroseconds(100);
LCD_ALERTMESSAGEPGM("Err: PRINT FAN ERROR");
}
fanSpeedErrorBeep(PSTR("Print fan speed is lower than expected"), PSTR("Err: PRINT FAN ERROR") );
break;
}
}

3
Firmware/temperature.h
View File

@ -238,7 +238,8 @@ void checkExtruderAutoFans();
#if (defined(FANCHECK) && defined(TACH_0) && (TACH_0 > -1))
extern volatile bool fan_check_error;
enum { EFCE_OK = 0, EFCE_DETECTED, EFCE_REPORTED };
extern volatile uint8_t fan_check_error;
void countFanSpeed();
void checkFanSpeed();