Browse Source

MK2 variants compilable

Robert Pelnar 5 years ago
parent
commit
9a68501039

+ 2 - 0
Firmware/Marlin_main.cpp

@@ -3423,9 +3423,11 @@ void process_commands()
 	}
 #endif //BACKLASH_Y
 #endif //TMC2130
+#ifdef PAT9125
 	else if (code_seen("FSENSOR_RECOVER")) { //! FSENSOR_RECOVER
 		fsensor_restore_print_and_continue();
   }
+#endif //PAT9125
   else if(code_seen("PRUSA")){
 		if (code_seen("Ping")) {  //! PRUSA Ping
 			if (farm_mode) {

+ 2 - 1
Firmware/mesh_bed_calibration.cpp

@@ -2490,7 +2490,8 @@ BedSkewOffsetDetectionResultType improve_bed_offset_and_skew(int8_t method, int8
         refresh_cmd_timeout();
         // Print the decrasing ID of the measurement point.
 #ifdef MESH_BED_CALIBRATION_SHOW_LCD
-        lcd_print_at(0, next_line, mesh_point+1);
+        lcd_set_cursor(0, next_line);
+		lcd_print(mesh_point+1);
         lcd_puts_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE2));////MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0
 #endif /* MESH_BED_CALIBRATION_SHOW_LCD */
 

+ 5 - 1
Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h

@@ -81,7 +81,9 @@ AXIS SETTINGS
 #define HOMING_FEEDRATE {3000, 3000, 800, 0}  // set the homing speeds (mm/min)
 
 #define DEFAULT_MAX_FEEDRATE          {500, 500, 12, 120}    // (mm/sec)
+#define DEFAULT_MAX_FEEDRATE_SILENT         {172, 172, 12, 120}      // (mm/sec)   max feedrate (M203), silent mode
 #define DEFAULT_MAX_ACCELERATION      {9000,9000,500,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
+#define DEFAULT_MAX_ACCELERATION_SILENT     {960, 960, 200, 5000}    // (mm/sec^2) max acceleration (M201), silent mode
 
 #define DEFAULT_ACCELERATION          1500    // X, Y, Z and E max acceleration in mm/s^2 for printing moves
 #define DEFAULT_RETRACT_ACCELERATION  1500   // X, Y, Z and E max acceleration in mm/s^2 for retracts
@@ -423,8 +425,10 @@ THERMISTORS SETTINGS
 
 #define M600_TIMEOUT 600  //seconds
 
+#define MMU_REQUIRED_FW_BUILDNR 132
+
 #ifndef SNMM
-#define SUPPORT_VERBOSITY
+//#define SUPPORT_VERBOSITY
 #endif
 
 #endif //__CONFIGURATION_PRUSA_H

+ 5 - 1
Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h

@@ -81,7 +81,9 @@ AXIS SETTINGS
 #define HOMING_FEEDRATE {3000, 3000, 800, 0}  // set the homing speeds (mm/min)
 
 #define DEFAULT_MAX_FEEDRATE          {500, 500, 12, 120}    // (mm/sec)
+#define DEFAULT_MAX_FEEDRATE_SILENT         {172, 172, 12, 120}      // (mm/sec)   max feedrate (M203), silent mode
 #define DEFAULT_MAX_ACCELERATION      {9000,9000,500,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
+#define DEFAULT_MAX_ACCELERATION_SILENT     {960, 960, 200, 5000}    // (mm/sec^2) max acceleration (M201), silent mode
 
 #define DEFAULT_ACCELERATION          1500    // X, Y, Z and E max acceleration in mm/s^2 for printing moves
 #define DEFAULT_RETRACT_ACCELERATION  1500   // X, Y, Z and E max acceleration in mm/s^2 for retracts
@@ -423,8 +425,10 @@ THERMISTORS SETTINGS
 
 #define M600_TIMEOUT 600  //seconds
 
+#define MMU_REQUIRED_FW_BUILDNR 132
+
 #ifndef SNMM
-#define SUPPORT_VERBOSITY
+//#define SUPPORT_VERBOSITY
 #endif
 
 #endif //__CONFIGURATION_PRUSA_H