Kaynağa Gözat

number of Z-probes defualt value changed from 4 to 3, mmu stealth mode switch in settings menu

PavelSindler 5 yıl önce
ebeveyn
işleme
141b78c048

+ 6 - 1
Firmware/Marlin_main.cpp

@@ -167,7 +167,7 @@ CardReader card;
 unsigned long PingTime = _millis();
 unsigned long NcTime;
 
-int mbl_z_probe_nr = 4; //numer of Z measurements for each point in mesh bed leveling calibration
+int mbl_z_probe_nr = 3; //numer of Z measurements for each point in mesh bed leveling calibration
 
 //used for PINDA temp calibration and pause print
 #define DEFAULT_RETRACTION    1
@@ -1468,6 +1468,11 @@ void setup()
 	}
 	//mbl_mode_init();
 	mbl_settings_init();
+	SilentModeMenu_MMU = eeprom_read_byte((uint8_t*)EEPROM_MMU_STEALTH);
+	if (SilentModeMenu_MMU == 255) {
+		SilentModeMenu_MMU = 1;
+		eeprom_write_byte((uint8_t*)EEPROM_MMU_STEALTH, SilentModeMenu_MMU);
+	}
 	check_babystep(); //checking if Z babystep is in allowed range
 
 #ifdef UVLO_SUPPORT

+ 1 - 0
Firmware/eeprom.h

@@ -159,6 +159,7 @@
 #define EEPROM_MBL_MAGNET_ELIMINATION (EEPROM_MBL_TYPE -1)  
 #define EEPROM_MBL_POINTS_NR (EEPROM_MBL_MAGNET_ELIMINATION -1) //uint8_t number of points in one exis for mesh bed leveling
 #define EEPROM_MBL_PROBE_NR (EEPROM_MBL_POINTS_NR-1)
+#define EEPROM_MMU_STEALTH (EEPROM_MBL_PROBE_NR-1)
 // !!!!!
 // !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!!
 // !!!!!

+ 1 - 1
Firmware/mesh_bed_calibration.cpp

@@ -3093,7 +3093,7 @@ void mbl_settings_init() {
 	}
 	mbl_z_probe_nr = eeprom_read_byte((uint8_t*)EEPROM_MBL_POINTS_NR);
 	if (mbl_z_probe_nr == 0xFF) {
-		mbl_z_probe_nr = 4;
+		mbl_z_probe_nr = 3;
 		eeprom_update_byte((uint8_t*)EEPROM_MBL_POINTS_NR, mbl_z_probe_nr);
 	}
 	

+ 2 - 4
Firmware/mmu.cpp

@@ -185,10 +185,8 @@ static bool activate_stealth_mode()
 {
 #if defined (MMU_FORCE_STEALTH_MODE)
 	return true;
-#elif defined (SILENT_MODE_STEALTH)
-	return (eeprom_read_byte((uint8_t*)EEPROM_SILENT) == SILENT_MODE_STEALTH);
-#else
-	return false;
+#elif
+	return (eeprom_read_byte((uint8_t*)EEPROM_MMU_STEALTH) == 1);
 #endif
 }
 

+ 14 - 0
Firmware/ultralcd.cpp

@@ -53,6 +53,7 @@ int8_t ReInitLCD = 0;
 
 
 int8_t SilentModeMenu = SILENT_MODE_OFF;
+uint8_t SilentModeMenu_MMU = 1; //activate mmu unit stealth mode
 
 int8_t FSensorStateMenu = 1;
 
@@ -4515,6 +4516,12 @@ static void lcd_sound_state_set(void)
 Sound_CycleState();
 }
 
+static void lcd_silent_mode_mmu_set() {
+	if (SilentModeMenu_MMU == 1) SilentModeMenu_MMU = 0;
+	else SilentModeMenu_MMU = 1;
+	eeprom_update_byte((uint8_t*)EEPROM_MMU_STEALTH, SilentModeMenu_MMU);
+}
+
 static void lcd_silent_mode_set() {
 	switch (SilentModeMenu) {
 #ifdef TMC2130
@@ -5288,6 +5295,13 @@ do\
             break; /* (probably) not needed*/\
         }\
     }\
+#ifndef MMU_FORCE_STEALTH_MODE
+	if(mmu_enabled)\
+	{\
+		if (SilentModeMenu_MMU == 0) MENU_ITEM_FUNCTION_P(_i("MMU Mode [Fast]"), lcd_silent_mode_mmu_set);\
+		else MENU_ITEM_FUNCTION_P(_i("MMU Mode [Stealth]"), lcd_silent_mode_mmu_set);\
+	}\
+#endif //MMU_FORCE_STEALTH_MODE
 }\
 while (0)
 #endif //TMC2130