Explorar el Código

Tweak some feedrate vars

Scott Lahteine hace 9 años
padre
commit
bb9c67b4b5
Se han modificado 4 ficheros con 13 adiciones y 13 borrados
  1. 1
    1
      Marlin/Marlin.h
  2. 6
    6
      Marlin/Marlin_main.cpp
  3. 5
    5
      Marlin/configuration_store.cpp
  4. 1
    1
      Marlin/ultralcd.cpp

+ 1
- 1
Marlin/Marlin.h Ver fichero

352
 #if ENABLED(FWRETRACT)
352
 #if ENABLED(FWRETRACT)
353
   extern bool autoretract_enabled;
353
   extern bool autoretract_enabled;
354
   extern bool retracted[EXTRUDERS]; // extruder[n].retracted
354
   extern bool retracted[EXTRUDERS]; // extruder[n].retracted
355
-  extern float retract_length, retract_length_swap, retract_feedrate, retract_zlift;
355
+  extern float retract_length, retract_length_swap, retract_feedrate_mm_s, retract_zlift;
356
   extern float retract_recover_length, retract_recover_length_swap, retract_recover_feedrate;
356
   extern float retract_recover_length, retract_recover_length_swap, retract_recover_feedrate;
357
 #endif
357
 #endif
358
 
358
 

+ 6
- 6
Marlin/Marlin_main.cpp Ver fichero

414
 
414
 
415
   float retract_length = RETRACT_LENGTH;
415
   float retract_length = RETRACT_LENGTH;
416
   float retract_length_swap = RETRACT_LENGTH_SWAP;
416
   float retract_length_swap = RETRACT_LENGTH_SWAP;
417
-  float retract_feedrate = RETRACT_FEEDRATE;
417
+  float retract_feedrate_mm_s = RETRACT_FEEDRATE;
418
   float retract_zlift = RETRACT_ZLIFT;
418
   float retract_zlift = RETRACT_ZLIFT;
419
   float retract_recover_length = RETRACT_RECOVER_LENGTH;
419
   float retract_recover_length = RETRACT_RECOVER_LENGTH;
420
   float retract_recover_length_swap = RETRACT_RECOVER_LENGTH_SWAP;
420
   float retract_recover_length_swap = RETRACT_RECOVER_LENGTH_SWAP;
2472
 
2472
 
2473
     if (retracting == retracted[active_extruder]) return;
2473
     if (retracting == retracted[active_extruder]) return;
2474
 
2474
 
2475
-    float oldFeedrate = feedrate;
2475
+    float old_feedrate = feedrate;
2476
 
2476
 
2477
     set_destination_to_current();
2477
     set_destination_to_current();
2478
 
2478
 
2479
     if (retracting) {
2479
     if (retracting) {
2480
 
2480
 
2481
-      feedrate = retract_feedrate * 60;
2481
+      feedrate = retract_feedrate_mm_s * 60;
2482
       current_position[E_AXIS] += (swapping ? retract_length_swap : retract_length) / volumetric_multiplier[active_extruder];
2482
       current_position[E_AXIS] += (swapping ? retract_length_swap : retract_length) / volumetric_multiplier[active_extruder];
2483
       sync_plan_position_e();
2483
       sync_plan_position_e();
2484
       prepare_move_to_destination();
2484
       prepare_move_to_destination();
2503
       prepare_move_to_destination();
2503
       prepare_move_to_destination();
2504
     }
2504
     }
2505
 
2505
 
2506
-    feedrate = oldFeedrate;
2506
+    feedrate = old_feedrate;
2507
     retracted[active_extruder] = retracting;
2507
     retracted[active_extruder] = retracting;
2508
 
2508
 
2509
   } // retract()
2509
   } // retract()
5452
    *
5452
    *
5453
    *   S[+mm]    retract_length
5453
    *   S[+mm]    retract_length
5454
    *   W[+mm]    retract_length_swap (multi-extruder)
5454
    *   W[+mm]    retract_length_swap (multi-extruder)
5455
-   *   F[mm/min] retract_feedrate
5455
+   *   F[mm/min] retract_feedrate_mm_s
5456
    *   Z[mm]     retract_zlift
5456
    *   Z[mm]     retract_zlift
5457
    */
5457
    */
5458
   inline void gcode_M207() {
5458
   inline void gcode_M207() {
5459
     if (code_seen('S')) retract_length = code_value_axis_units(E_AXIS);
5459
     if (code_seen('S')) retract_length = code_value_axis_units(E_AXIS);
5460
-    if (code_seen('F')) retract_feedrate = code_value_axis_units(E_AXIS) / 60;
5460
+    if (code_seen('F')) retract_feedrate_mm_s = code_value_axis_units(E_AXIS) / 60;
5461
     if (code_seen('Z')) retract_zlift = code_value_axis_units(Z_AXIS);
5461
     if (code_seen('Z')) retract_zlift = code_value_axis_units(Z_AXIS);
5462
     #if EXTRUDERS > 1
5462
     #if EXTRUDERS > 1
5463
       if (code_seen('W')) retract_length_swap = code_value_axis_units(E_AXIS);
5463
       if (code_seen('W')) retract_length_swap = code_value_axis_units(E_AXIS);

+ 5
- 5
Marlin/configuration_store.cpp Ver fichero

107
  *  391  M209 S    autoretract_enabled (bool)
107
  *  391  M209 S    autoretract_enabled (bool)
108
  *  392  M207 S    retract_length (float)
108
  *  392  M207 S    retract_length (float)
109
  *  396  M207 W    retract_length_swap (float)
109
  *  396  M207 W    retract_length_swap (float)
110
- *  400  M207 F    retract_feedrate (float)
110
+ *  400  M207 F    retract_feedrate_mm_s (float)
111
  *  404  M207 Z    retract_zlift (float)
111
  *  404  M207 Z    retract_zlift (float)
112
  *  408  M208 S    retract_recover_length (float)
112
  *  408  M208 S    retract_recover_length (float)
113
  *  412  M208 W    retract_recover_length_swap (float)
113
  *  412  M208 W    retract_recover_length_swap (float)
304
       dummy = 0.0f;
304
       dummy = 0.0f;
305
       EEPROM_WRITE_VAR(i, dummy);
305
       EEPROM_WRITE_VAR(i, dummy);
306
     #endif
306
     #endif
307
-    EEPROM_WRITE_VAR(i, retract_feedrate);
307
+    EEPROM_WRITE_VAR(i, retract_feedrate_mm_s);
308
     EEPROM_WRITE_VAR(i, retract_zlift);
308
     EEPROM_WRITE_VAR(i, retract_zlift);
309
     EEPROM_WRITE_VAR(i, retract_recover_length);
309
     EEPROM_WRITE_VAR(i, retract_recover_length);
310
     #if EXTRUDERS > 1
310
     #if EXTRUDERS > 1
482
       #else
482
       #else
483
         EEPROM_READ_VAR(i, dummy);
483
         EEPROM_READ_VAR(i, dummy);
484
       #endif
484
       #endif
485
-      EEPROM_READ_VAR(i, retract_feedrate);
485
+      EEPROM_READ_VAR(i, retract_feedrate_mm_s);
486
       EEPROM_READ_VAR(i, retract_zlift);
486
       EEPROM_READ_VAR(i, retract_zlift);
487
       EEPROM_READ_VAR(i, retract_recover_length);
487
       EEPROM_READ_VAR(i, retract_recover_length);
488
       #if EXTRUDERS > 1
488
       #if EXTRUDERS > 1
617
     #if EXTRUDERS > 1
617
     #if EXTRUDERS > 1
618
       retract_length_swap = RETRACT_LENGTH_SWAP;
618
       retract_length_swap = RETRACT_LENGTH_SWAP;
619
     #endif
619
     #endif
620
-    retract_feedrate = RETRACT_FEEDRATE;
620
+    retract_feedrate_mm_s = RETRACT_FEEDRATE;
621
     retract_zlift = RETRACT_ZLIFT;
621
     retract_zlift = RETRACT_ZLIFT;
622
     retract_recover_length = RETRACT_RECOVER_LENGTH;
622
     retract_recover_length = RETRACT_RECOVER_LENGTH;
623
     #if EXTRUDERS > 1
623
     #if EXTRUDERS > 1
864
     #if EXTRUDERS > 1
864
     #if EXTRUDERS > 1
865
       SERIAL_ECHOPAIR(" W", retract_length_swap);
865
       SERIAL_ECHOPAIR(" W", retract_length_swap);
866
     #endif
866
     #endif
867
-    SERIAL_ECHOPAIR(" F", retract_feedrate * 60);
867
+    SERIAL_ECHOPAIR(" F", retract_feedrate_mm_s * 60);
868
     SERIAL_ECHOPAIR(" Z", retract_zlift);
868
     SERIAL_ECHOPAIR(" Z", retract_zlift);
869
     SERIAL_EOL;
869
     SERIAL_EOL;
870
     CONFIG_ECHO_START;
870
     CONFIG_ECHO_START;

+ 1
- 1
Marlin/ultralcd.cpp Ver fichero

1797
       #if EXTRUDERS > 1
1797
       #if EXTRUDERS > 1
1798
         MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_SWAP, &retract_length_swap, 0, 100);
1798
         MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_SWAP, &retract_length_swap, 0, 100);
1799
       #endif
1799
       #endif
1800
-      MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACTF, &retract_feedrate, 1, 999);
1800
+      MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACTF, &retract_feedrate_mm_s, 1, 999);
1801
       MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_ZLIFT, &retract_zlift, 0, 999);
1801
       MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_ZLIFT, &retract_zlift, 0, 999);
1802
       MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER, &retract_recover_length, 0, 100);
1802
       MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER, &retract_recover_length, 0, 100);
1803
       #if EXTRUDERS > 1
1803
       #if EXTRUDERS > 1

Loading…
Cancelar
Guardar