From abf956b86f331060ca6ee77090d94548db353670 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 6 Feb 2018 09:19:27 +0100 Subject: [PATCH] init --- Firmware/Configuration_prusa.h | 2 ++ Firmware/Marlin_main.cpp | 6 ++++-- Firmware/pins_Rambo_1_3.h | 4 ++++ Firmware/ultralcd.cpp | 7 +++++-- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Firmware/Configuration_prusa.h b/Firmware/Configuration_prusa.h index 18edb0f1..4529582f 100644 --- a/Firmware/Configuration_prusa.h +++ b/Firmware/Configuration_prusa.h @@ -237,6 +237,8 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define DEFAULT_PWM_MOTOR_CURRENT_LOUD {400, 750, 750} // {XY,Z,E} #endif +#define RPM_FANS + /*------------------------------------ PAT9125 SETTINGS *------------------------------------*/ diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4c53d285..195e2bb4 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5771,9 +5771,10 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp target[E_AXIS] -= FILAMENTCHANGE_FINALRETRACT; st_synchronize(); +#ifdef TMC2130 uint8_t tmc2130_current_r_bckp = tmc2130_current_r[E_AXIS]; tmc2130_set_current_r(E_AXIS, TMC2130_UNLOAD_CURRENT_R); - +#endif //TMC2130 target[E_AXIS] -= 45; plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 5200 / 60, active_extruder); st_synchronize(); @@ -5783,8 +5784,9 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp target[E_AXIS] -= 20; plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 1000 / 60, active_extruder); st_synchronize(); - +#ifdef TMC2130 tmc2130_set_current_r(E_AXIS, tmc2130_current_r_bckp); +#endif //TMC2130 #endif // SNMM diff --git a/Firmware/pins_Rambo_1_3.h b/Firmware/pins_Rambo_1_3.h index 314114c2..12f966dc 100644 --- a/Firmware/pins_Rambo_1_3.h +++ b/Firmware/pins_Rambo_1_3.h @@ -134,3 +134,7 @@ #define LOGIC_ANALYZER_CH5_ENABLE do { cbi(UCSR2B, TXEN2); cbi(UCSR2B, RXEN2); cbi(UCSR2B, RXCIE2); SET_OUTPUT(LOGIC_ANALYZER_CH5); } while (0) #define LOGIC_ANALYZER_CH6_ENABLE do { cbi(UCSR2B, TXEN2); cbi(UCSR2B, RXEN2); cbi(UCSR2B, RXCIE2); SET_OUTPUT(LOGIC_ANALYZER_CH6); } while (0) #define LOGIC_ANALYZER_CH7_ENABLE SET_OUTPUT(LOGIC_ANALYZER_CH7) + + +TACH_0 +TACH_1 \ No newline at end of file diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 97769154..57532570 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5635,8 +5635,11 @@ static bool lcd_selftest() if (_result) { _progress = lcd_selftest_screen(1, _progress, 3, true, 2000); - //_progress = lcd_selftest_screen(2, _progress, 3, true, 2000); - _result = true;// lcd_selfcheck_endstops(); +#ifndef TMC2130 + _result = lcd_selfcheck_endstops(); +#else + _result = true; +#endif } if (_result)