Bläddra i källkod

Merge pull request #837 from whosawhatsis/fwretract

FWRETRACT in mm/s
nothinman 10 år sedan
förälder
incheckning
c23376f2e7
3 ändrade filer med 26 tillägg och 26 borttagningar
  1. 2
    2
      Marlin/Configuration_adv.h
  2. 6
    6
      Marlin/Marlin_main.cpp
  3. 18
    18
      Marlin/language.h

+ 2
- 2
Marlin/Configuration_adv.h Visa fil

@@ -410,10 +410,10 @@ const unsigned int dropsegments=5; //everything with less than this number of st
410 410
 #ifdef FWRETRACT
411 411
   #define MIN_RETRACT 0.1                //minimum extruded mm to accept a automatic gcode retraction attempt
412 412
   #define RETRACT_LENGTH 3               //default retract length (positive mm)
413
-  #define RETRACT_FEEDRATE 80*60         //default feedrate for retracting
413
+  #define RETRACT_FEEDRATE 45            //default feedrate for retracting (mm/s)
414 414
   #define RETRACT_ZLIFT 0                //default retract Z-lift
415 415
   #define RETRACT_RECOVER_LENGTH 0       //default additional recover length (mm, added to retract length when recovering)
416
-  #define RETRACT_RECOVER_FEEDRATE 8*60  //default feedrate for recovering from retraction
416
+  #define RETRACT_RECOVER_FEEDRATE 8     //default feedrate for recovering from retraction (mm/s)
417 417
 #endif
418 418
 
419 419
 //adds support for experimental filament exchange support M600; requires display

+ 6
- 6
Marlin/Marlin_main.cpp Visa fil

@@ -1119,7 +1119,7 @@ void refresh_cmd_timeout(void)
1119 1119
       current_position[E_AXIS]+=retract_length/volumetric_multiplier[active_extruder];
1120 1120
       plan_set_e_position(current_position[E_AXIS]);
1121 1121
       float oldFeedrate = feedrate;
1122
-      feedrate=retract_feedrate;
1122
+      feedrate=retract_feedrate*60;
1123 1123
       retracted=true;
1124 1124
       prepare_move();
1125 1125
       current_position[Z_AXIS]-=retract_zlift;
@@ -1137,7 +1137,7 @@ void refresh_cmd_timeout(void)
1137 1137
       current_position[E_AXIS]-=(retract_length+retract_recover_length)/volumetric_multiplier[active_extruder]; 
1138 1138
       plan_set_e_position(current_position[E_AXIS]);
1139 1139
       float oldFeedrate = feedrate;
1140
-      feedrate=retract_recover_feedrate;
1140
+      feedrate=retract_recover_feedrate*60;
1141 1141
       retracted=false;
1142 1142
       prepare_move();
1143 1143
       feedrate = oldFeedrate;
@@ -2339,7 +2339,7 @@ void process_commands()
2339 2339
       break;
2340 2340
     #endif
2341 2341
     #ifdef FWRETRACT
2342
-    case 207: //M207 - set retract length S[positive mm] F[feedrate mm/sec] Z[additional zlift/hop]
2342
+    case 207: //M207 - set retract length S[positive mm] F[feedrate mm/min] Z[additional zlift/hop]
2343 2343
     {
2344 2344
       if(code_seen('S'))
2345 2345
       {
@@ -2347,14 +2347,14 @@ void process_commands()
2347 2347
       }
2348 2348
       if(code_seen('F'))
2349 2349
       {
2350
-        retract_feedrate = code_value() ;
2350
+        retract_feedrate = code_value()/60 ;
2351 2351
       }
2352 2352
       if(code_seen('Z'))
2353 2353
       {
2354 2354
         retract_zlift = code_value() ;
2355 2355
       }
2356 2356
     }break;
2357
-    case 208: // M208 - set retract recover length S[positive mm surplus to the M207 S*] F[feedrate mm/sec]
2357
+    case 208: // M208 - set retract recover length S[positive mm surplus to the M207 S*] F[feedrate mm/min]
2358 2358
     {
2359 2359
       if(code_seen('S'))
2360 2360
       {
@@ -2362,7 +2362,7 @@ void process_commands()
2362 2362
       }
2363 2363
       if(code_seen('F'))
2364 2364
       {
2365
-        retract_recover_feedrate = code_value() ;
2365
+        retract_recover_feedrate = code_value()/60 ;
2366 2366
       }
2367 2367
     }break;
2368 2368
     case 209: // M209 - S<1=true/0=false> enable automatic retract detect if the slicer did not support G10/11: every normal extrude-only move will be classified as retract depending on the direction.

+ 18
- 18
Marlin/language.h Visa fil

@@ -164,10 +164,10 @@
164 164
 	#define MSG_KILLED "KILLED. "
165 165
 	#define MSG_STOPPED "STOPPED. "
166 166
 	#define MSG_CONTROL_RETRACT  "Retract mm"
167
-	#define MSG_CONTROL_RETRACTF "Retract  F"
167
+	#define MSG_CONTROL_RETRACTF "Retract  V"
168 168
 	#define MSG_CONTROL_RETRACT_ZLIFT "Hop mm"
169 169
 	#define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm"
170
-	#define MSG_CONTROL_RETRACT_RECOVERF "UnRet  F"
170
+	#define MSG_CONTROL_RETRACT_RECOVERF "UnRet  V"
171 171
 	#define MSG_AUTORETRACT "AutoRetr."
172 172
 	#define MSG_FILAMENTCHANGE "Change filament"
173 173
 	#define MSG_INIT_SDCARD "Init. SD card"
@@ -362,10 +362,10 @@
362 362
 	#define MSG_STOPPED "Zatrzymany. "
363 363
 	#define MSG_STEPPER_RELEASED "Zwolniony."
364 364
 	#define MSG_CONTROL_RETRACT  "Wycofaj mm"
365
-	#define MSG_CONTROL_RETRACTF "Wycofaj  F"
365
+	#define MSG_CONTROL_RETRACTF "Wycofaj  V"
366 366
 	#define MSG_CONTROL_RETRACT_ZLIFT "Skok Z mm:"
367 367
 	#define MSG_CONTROL_RETRACT_RECOVER "Cof. wycof. +mm"
368
-	#define MSG_CONTROL_RETRACT_RECOVERF "Cof. wycof.  F"
368
+	#define MSG_CONTROL_RETRACT_RECOVERF "Cof. wycof.  V"
369 369
 	#define MSG_AUTORETRACT "Auto. wycofanie"
370 370
 	#define MSG_FILAMENTCHANGE "Zmien filament"
371 371
 	#define MSG_INIT_SDCARD "Inicjal. karty SD"
@@ -561,10 +561,10 @@
561 561
 	#define MSG_STOPPED "STOPPE."
562 562
 	#define MSG_STEPPER_RELEASED "RELACHE."
563 563
 	#define MSG_CONTROL_RETRACT "Retraction mm"
564
-	#define MSG_CONTROL_RETRACTF "Retraction F"
564
+	#define MSG_CONTROL_RETRACTF "Retraction V"
565 565
 	#define MSG_CONTROL_RETRACT_ZLIFT "Hop mm"
566 566
 	#define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm"
567
-	#define MSG_CONTROL_RETRACT_RECOVERF "UnRet F"
567
+	#define MSG_CONTROL_RETRACT_RECOVERF "UnRet V"
568 568
 	#define MSG_AUTORETRACT "Retract. Auto."
569 569
 	#define MSG_FILAMENTCHANGE "Changer filament"
570 570
 	#define MSG_INIT_SDCARD "Init. la carte SD"
@@ -761,10 +761,10 @@
761 761
 	#define MSG_STOPPED          "GESTOPPT"
762 762
 	#define MSG_STEPPER_RELEASED "Stepper frei"
763 763
 	#define MSG_CONTROL_RETRACT  "Retract mm"
764
-	#define MSG_CONTROL_RETRACTF "Retract  F"
764
+	#define MSG_CONTROL_RETRACTF "Retract  V"
765 765
 	#define MSG_CONTROL_RETRACT_ZLIFT "Hop mm"
766 766
 	#define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm"
767
-	#define MSG_CONTROL_RETRACT_RECOVERF "UnRet  F"
767
+	#define MSG_CONTROL_RETRACT_RECOVERF "UnRet  V"
768 768
 	#define MSG_AUTORETRACT      "AutoRetr."
769 769
 	#define MSG_FILAMENTCHANGE "Filament wechseln"
770 770
 	#define MSG_INIT_SDCARD "Init. SD-Card"
@@ -957,10 +957,10 @@
957 957
 	#define MSG_KILLED "PARADA DE EMERG."
958 958
 	#define MSG_STOPPED "PARADA"
959 959
 	#define MSG_CONTROL_RETRACT  "Retraer mm"
960
-	#define MSG_CONTROL_RETRACTF "Retraer  F"
960
+	#define MSG_CONTROL_RETRACTF "Retraer  V"
961 961
 	#define MSG_CONTROL_RETRACT_ZLIFT "Levantar mm"
962 962
 	#define MSG_CONTROL_RETRACT_RECOVER "DesRet +mm"
963
-	#define MSG_CONTROL_RETRACT_RECOVERF "DesRet F"
963
+	#define MSG_CONTROL_RETRACT_RECOVERF "DesRet V"
964 964
 	#define MSG_AUTORETRACT "AutoRetr."
965 965
 	#define MSG_FILAMENTCHANGE "Change filament"
966 966
 	#define MSG_INIT_SDCARD "Iniciando tarjeta"
@@ -1162,10 +1162,10 @@
1162 1162
 	#define MSG_KILLED							"УБИТО."
1163 1163
 	#define MSG_STOPPED							"ОСТАНОВЛЕНО."
1164 1164
 	#define MSG_CONTROL_RETRACT					"Откат mm:"
1165
-	#define MSG_CONTROL_RETRACTF				"Откат  F:"
1165
+	#define MSG_CONTROL_RETRACTF				"Откат  V:"
1166 1166
 	#define MSG_CONTROL_RETRACT_ZLIFT			"Прыжок mm:"
1167 1167
 	#define MSG_CONTROL_RETRACT_RECOVER			"Возврат +mm:"
1168
-	#define MSG_CONTROL_RETRACT_RECOVERF		"Возврат  F:"
1168
+	#define MSG_CONTROL_RETRACT_RECOVERF		"Возврат  V:"
1169 1169
 	#define MSG_AUTORETRACT						"АвтоОткат:"
1170 1170
 	#define MSG_FILAMENTCHANGE 					"Change filament"
1171 1171
 	#define MSG_INIT_SDCARD 					"Init. SD-Card"
@@ -1357,10 +1357,10 @@
1357 1357
 	#define MSG_KILLED               "UCCISO. "
1358 1358
 	#define MSG_STOPPED              "ARRESTATO. "
1359 1359
 	#define MSG_CONTROL_RETRACT      "Ritrai mm"
1360
-	#define MSG_CONTROL_RETRACTF     "Ritrai  F"
1360
+	#define MSG_CONTROL_RETRACTF     "Ritrai  V"
1361 1361
 	#define MSG_CONTROL_RETRACT_ZLIFT "Salta mm"
1362 1362
 	#define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm"
1363
-	#define MSG_CONTROL_RETRACT_RECOVERF "UnRet  F"
1363
+	#define MSG_CONTROL_RETRACT_RECOVERF "UnRet  V"
1364 1364
 	#define MSG_AUTORETRACT          "AutoArretramento"
1365 1365
 	#define MSG_FILAMENTCHANGE       "Cambia filamento"
1366 1366
 	#define MSG_INIT_SDCARD          "Iniz. SD-Card"
@@ -1560,10 +1560,10 @@
1560 1560
 	#define MSG_STOPPED "PARADA. "
1561 1561
 	#define MSG_STEPPER_RELEASED "Lancado."
1562 1562
 	#define MSG_CONTROL_RETRACT  " Retrair mm:"
1563
-	#define MSG_CONTROL_RETRACTF " Retrair  F:"
1563
+	#define MSG_CONTROL_RETRACTF " Retrair  V:"
1564 1564
 	#define MSG_CONTROL_RETRACT_ZLIFT " Levantar mm:"
1565 1565
 	#define MSG_CONTROL_RETRACT_RECOVER " DesRet +mm:"
1566
-	#define MSG_CONTROL_RETRACT_RECOVERF " DesRet  F:"
1566
+	#define MSG_CONTROL_RETRACT_RECOVERF " DesRet  V:"
1567 1567
 	#define MSG_AUTORETRACT " AutoRetr.:"
1568 1568
 	#define MSG_FILAMENTCHANGE "Change filament"
1569 1569
 	#define MSG_INIT_SDCARD "Init. SD-Card"
@@ -1758,10 +1758,10 @@
1758 1758
 	#define MSG_KILLED "KILLED. "
1759 1759
 	#define MSG_STOPPED "STOPPED. "
1760 1760
 	#define MSG_CONTROL_RETRACT  "Veda mm"
1761
-	#define MSG_CONTROL_RETRACTF "Veda F"
1761
+	#define MSG_CONTROL_RETRACTF "Veda V"
1762 1762
 	#define MSG_CONTROL_RETRACT_ZLIFT "Z mm"
1763 1763
 	#define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm"
1764
-	#define MSG_CONTROL_RETRACT_RECOVERF "UnRet  F"
1764
+	#define MSG_CONTROL_RETRACT_RECOVERF "UnRet  V"
1765 1765
 	#define MSG_AUTORETRACT "AutoVeto."
1766 1766
 	#define MSG_FILAMENTCHANGE "Change filament"
1767 1767
 	#define MSG_INIT_SDCARD "Init. SD-Card"

Laddar…
Avbryt
Spara