From 6860a572c2744a8f3519b470b3f86e0d98b90182 Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 23 Jul 2019 15:55:53 +0200 Subject: [PATCH 1/5] detection of faulty RAMBo (incorrect capacitor on fan tach pin) for MK3/S --- Firmware/Marlin_main.cpp | 52 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 7f2efe35..b5b0ad1e 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3274,6 +3274,56 @@ static void gcode_PRUSA_SN() puts_P(_N("Not in farm mode.")); } } +//! Detection of faulty RAMBo 1.1b boards equipped with bigger capacitors +//! at the TACH_1 pin, which causes bad detection of print fan speed. +//! Warning: This function is not to be used by ordinary users, it is here only for automated testing purposes, +//! it may even interfere with other functions of the printer! You have been warned! +//! The test idea is to measure the time necessary to charge the capacitor. +//! So the algorithm is as follows: +//! 1. Set TACH_1 pin to INPUT mode and LOW +//! 2. Wait a few ms +//! 3. disable interrupts and measure the time until the TACH_1 pin reaches HIGH +//! Repeat 1.-3. several times +//! Good RAMBo's times are in the range of approx. 260-320 us +//! Bad RAMBo's times are approx. 260-1200 us +//! So basically we are interested in maximum time, the minima are mostly the same. +//! May be that's why the bad RAMBo's still produce some fan RPM reading, but not corresponding to reality +static void gcode_PRUSA_BadRAMBoFanTest(){ + //printf_P(PSTR("Enter fan pin test\n")); +#if !defined(DEBUG_DISABLE_FANCHECK) && defined(FANCHECK) && defined(TACH_1) && TACH_1 >-1 + fan_measuring = false; // prevent EXTINT7 breaking into the measurement + unsigned long tach1max = 0; + uint8_t tach1cntr = 0; + for( /* nothing */; tach1cntr < 100; ++tach1cntr){ + //printf_P(PSTR("TACH_1: %d\n"), tach1cntr); + SET_OUTPUT(TACH_1); + WRITE(TACH_1, LOW); + delay2(20); // the delay may be lower + unsigned long tachMeasure = micros2(); + cli(); + SET_INPUT(TACH_1); + // just wait brutally in an endless cycle until we reach HIGH + // if this becomes a problem it may be improved to non-endless cycle + while( READ(TACH_1) == 0 ) ; + sei(); + tachMeasure = micros2() - tachMeasure; + if( tach1max < tachMeasure ) + tach1max = tachMeasure; + //printf_P(PSTR("TACH_1: %d: capacitor check time=%lu us\n"), (int)tach1cntr, tachMeasure); + } + //printf_P(PSTR("TACH_1: max=%lu us\n"), tach1max); + SERIAL_PROTOCOLPGM("RAMBo FAN "); + if( tach1max > 500 ){ + // bad RAMBo + SERIAL_PROTOCOLLNPGM("BAD"); + } else { + SERIAL_PROTOCOLLNPGM("OK"); + } + // cleanup after the test function + SET_INPUT(TACH_1); + WRITE(TACH_1, HIGH); +#endif +} #ifdef BACKLASH_X extern uint8_t st_backlash_x; @@ -3559,6 +3609,8 @@ void process_commands() else if (code_seen("PRN")) { //! PRUSA PRN printf_P(_N("%d"), status_number); + } else if( code_seen("FANPINTST") ){ + gcode_PRUSA_BadRAMBoFanTest(); }else if (code_seen("FAN")) { //! PRUSA FAN printf_P(_N("E0:%d RPM\nPRN0:%d RPM\n"), 60*fan_speed[0], 60*fan_speed[1]); }else if (code_seen("fn")) { //! PRUSA fn From 593675c667ea6075df27412977a1ce54d589e589 Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 23 Jul 2019 16:40:21 +0200 Subject: [PATCH 2/5] delay, micros for the 3.7.x branch --- Firmware/Marlin_main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index b5b0ad1e..bdfb29d2 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3298,15 +3298,15 @@ static void gcode_PRUSA_BadRAMBoFanTest(){ //printf_P(PSTR("TACH_1: %d\n"), tach1cntr); SET_OUTPUT(TACH_1); WRITE(TACH_1, LOW); - delay2(20); // the delay may be lower - unsigned long tachMeasure = micros2(); + delay(20); // the delay may be lower + unsigned long tachMeasure = micros(); cli(); SET_INPUT(TACH_1); // just wait brutally in an endless cycle until we reach HIGH // if this becomes a problem it may be improved to non-endless cycle while( READ(TACH_1) == 0 ) ; sei(); - tachMeasure = micros2() - tachMeasure; + tachMeasure = micros() - tachMeasure; if( tach1max < tachMeasure ) tach1max = tachMeasure; //printf_P(PSTR("TACH_1: %d: capacitor check time=%lu us\n"), (int)tach1cntr, tachMeasure); From 3e60cf453752bf40b291ca1d0a9bd6b28b3746a7 Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 23 Jul 2019 16:51:02 +0200 Subject: [PATCH 3/5] enable only for MK3S (out of FLASH on the MK3) --- Firmware/Marlin_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index bdfb29d2..16a1b66b 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3290,7 +3290,7 @@ static void gcode_PRUSA_SN() //! May be that's why the bad RAMBo's still produce some fan RPM reading, but not corresponding to reality static void gcode_PRUSA_BadRAMBoFanTest(){ //printf_P(PSTR("Enter fan pin test\n")); -#if !defined(DEBUG_DISABLE_FANCHECK) && defined(FANCHECK) && defined(TACH_1) && TACH_1 >-1 +#if !defined(DEBUG_DISABLE_FANCHECK) && defined(FANCHECK) && defined(TACH_1) && TACH_1 >-1 && defined(IR_SENSOR) fan_measuring = false; // prevent EXTINT7 breaking into the measurement unsigned long tach1max = 0; uint8_t tach1cntr = 0; From cb19f0958b5716f255c0a150b7e67a7673f48c80 Mon Sep 17 00:00:00 2001 From: DRracer Date: Mon, 5 Aug 2019 09:51:06 +0200 Subject: [PATCH 4/5] Use _delay() and _micros() for future compatibility --- Firmware/Marlin_main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 16a1b66b..0df61045 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3298,15 +3298,15 @@ static void gcode_PRUSA_BadRAMBoFanTest(){ //printf_P(PSTR("TACH_1: %d\n"), tach1cntr); SET_OUTPUT(TACH_1); WRITE(TACH_1, LOW); - delay(20); // the delay may be lower - unsigned long tachMeasure = micros(); + _delay(20); // the delay may be lower + unsigned long tachMeasure = _micros(); cli(); SET_INPUT(TACH_1); // just wait brutally in an endless cycle until we reach HIGH // if this becomes a problem it may be improved to non-endless cycle while( READ(TACH_1) == 0 ) ; sei(); - tachMeasure = micros() - tachMeasure; + tachMeasure = _micros() - tachMeasure; if( tach1max < tachMeasure ) tach1max = tachMeasure; //printf_P(PSTR("TACH_1: %d: capacitor check time=%lu us\n"), (int)tach1cntr, tachMeasure); From 7da2ee5fc3bd1e40847bbddbf101aff781637a5d Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Tue, 6 Aug 2019 15:37:23 +0200 Subject: [PATCH 5/5] Version changed (3.7.3 build 2370) --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index acdadfe7..4cd69697 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -7,8 +7,8 @@ #define STR(x) STR_HELPER(x) // Firmware version -#define FW_VERSION "3.7.2" -#define FW_COMMIT_NR 2363 +#define FW_VERSION "3.7.3" +#define FW_COMMIT_NR 2370 // FW_VERSION_UNKNOWN means this is an unofficial build. // The firmware should only be checked into github with this symbol. #define FW_DEV_VERSION FW_VERSION_UNKNOWN