浏览代码

G-code unification

"FSENSOR_RECOVER" ->-> "PRUSA fsensor_recover"
MRprusa3d 5 年之前
父节点
当前提交
20a03d703d
共有 3 个文件被更改,包括 9 次插入8 次删除
  1. 6 5
      Firmware/Marlin_main.cpp
  2. 2 2
      Firmware/fsensor.cpp
  3. 1 1
      Firmware/mmu.cpp

+ 6 - 5
Firmware/Marlin_main.cpp

@@ -3463,11 +3463,6 @@ void process_commands()
 	}
 #endif //BACKLASH_Y
 #endif //TMC2130
-#ifdef FILAMENT_SENSOR
-	else if (code_seen("FSENSOR_RECOVER")) { //! FSENSOR_RECOVER
-		fsensor_restore_print_and_continue();
-  }
-#endif //FILAMENT_SENSOR
   else if(code_seen("PRUSA")){
 		if (code_seen("Ping")) {  //! PRUSA Ping
 			if (farm_mode) {
@@ -3498,6 +3493,12 @@ void process_commands()
                eeprom_update_byte((uint8_t*)EEPROM_UVLO,0); 
                enquecommand_P(PSTR("M24")); 
 		}	
+#ifdef FILAMENT_SENSOR
+		else if (code_seen("fsensor_recover")) //! PRUSA fsensor_recover
+		{
+               fsensor_restore_print_and_continue();
+		}	
+#endif //FILAMENT_SENSOR
 		else if (code_seen("MMURES")) //! PRUSA MMURES
 		{
 			mmu_reset();

+ 2 - 2
Firmware/fsensor.cpp

@@ -567,7 +567,7 @@ void fsensor_update(void)
 				printf_P(PSTR("fsensor_update - M600\n"));
 				eeprom_update_byte((uint8_t*)EEPROM_FERROR_COUNT, eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT) + 1);
 				eeprom_update_word((uint16_t*)EEPROM_FERROR_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) + 1);
-				enquecommand_front_P(PSTR("FSENSOR_RECOVER"));
+				enquecommand_front_P(PSTR("PRUSA fsensor_recover"));
 				enquecommand_front_P((PSTR("M600")));
 				fsensor_watch_runout = false;
 			}
@@ -581,7 +581,7 @@ void fsensor_update(void)
 			printf_P(PSTR("fsensor_update - M600\n"));
 			eeprom_update_byte((uint8_t*)EEPROM_FERROR_COUNT, eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT) + 1);
 			eeprom_update_word((uint16_t*)EEPROM_FERROR_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) + 1);
-			enquecommand_front_P(PSTR("FSENSOR_RECOVER"));
+			enquecommand_front_P(PSTR("PRUSA fsensor_recover"));
 			enquecommand_front_P((PSTR("M600")));
 		}
 #endif //PAT9125

+ 1 - 1
Firmware/mmu.cpp

@@ -358,7 +358,7 @@ void mmu_loop(void)
 			//printf_P(PSTR("Eact: %d\n"), int(e_active()));
 			if (!mmu_finda && CHECK_FSENSOR && fsensor_enabled) {
 				fsensor_stop_and_save_print();
-				enquecommand_front_P(PSTR("FSENSOR_RECOVER")); //then recover
+				enquecommand_front_P(PSTR("PRUSA fsensor_recover")); //then recover
 				ad_markDepleted(mmu_extruder);
 				if (lcd_autoDepleteEnabled() && !ad_allDepleted())
 				{