PavelSindler 6 years ago
parent
commit
abf956b86f
4 changed files with 15 additions and 4 deletions
  1. 2 0
      Firmware/Configuration_prusa.h
  2. 4 2
      Firmware/Marlin_main.cpp
  3. 4 0
      Firmware/pins_Rambo_1_3.h
  4. 5 2
      Firmware/ultralcd.cpp

+ 2 - 0
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
  *------------------------------------*/

+ 4 - 2
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
 
 

+ 4 - 0
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

+ 5 - 2
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)