Browse Source

consistency name for multiplier

replace extruder_multiply with extruder_multiplier
like feedrate_multiplier or volumetric_multiplier
wurstnase 9 years ago
parent
commit
e7e964432b
4 changed files with 12 additions and 12 deletions
  1. 1
    1
      Marlin/Marlin.h
  2. 4
    4
      Marlin/Marlin_main.cpp
  3. 2
    2
      Marlin/planner.cpp
  4. 5
    5
      Marlin/ultralcd.cpp

+ 1
- 1
Marlin/Marlin.h View File

@@ -269,7 +269,7 @@ extern float homing_feedrate[];
269 269
 extern bool axis_relative_modes[];
270 270
 extern int feedrate_multiplier;
271 271
 extern bool volumetric_enabled;
272
-extern int extruder_multiply[EXTRUDERS]; // sets extrude multiply factor (in percent) for each extruder individually
272
+extern int extruder_multiplier[EXTRUDERS]; // sets extrude multiply factor (in percent) for each extruder individually
273 273
 extern float filament_size[EXTRUDERS]; // cross-sectional area of filament (in millimeters), typically around 1.75 or 2.85, 0 disables the volumetric calculations for the extruder.
274 274
 extern float volumetric_multiplier[EXTRUDERS]; // reciprocal of cross-sectional area of filament (in square millimeters), stored this way to reduce computational burden in planner
275 275
 extern float current_position[NUM_AXIS];

+ 4
- 4
Marlin/Marlin_main.cpp View File

@@ -251,7 +251,7 @@ float homing_feedrate[] = HOMING_FEEDRATE;
251 251
 bool axis_relative_modes[] = AXIS_RELATIVE_MODES;
252 252
 int feedrate_multiplier = 100; //100->1 200->2
253 253
 int saved_feedrate_multiplier;
254
-int extruder_multiply[EXTRUDERS] = ARRAY_BY_EXTRUDERS(100, 100, 100, 100);
254
+int extruder_multiplier[EXTRUDERS] = ARRAY_BY_EXTRUDERS(100, 100, 100, 100);
255 255
 bool volumetric_enabled = false;
256 256
 float filament_size[EXTRUDERS] = ARRAY_BY_EXTRUDERS(DEFAULT_NOMINAL_FILAMENT_DIA, DEFAULT_NOMINAL_FILAMENT_DIA, DEFAULT_NOMINAL_FILAMENT_DIA, DEFAULT_NOMINAL_FILAMENT_DIA);
257 257
 float volumetric_multiplier[EXTRUDERS] = ARRAY_BY_EXTRUDERS(1.0, 1.0, 1.0, 1.0);
@@ -4187,10 +4187,10 @@ inline void gcode_M221() {
4187 4187
     int sval = code_value();
4188 4188
     if (code_seen('T')) {
4189 4189
       if (setTargetedHotend(221)) return;
4190
-      extruder_multiply[target_extruder] = sval;
4190
+      extruder_multiplier[target_extruder] = sval;
4191 4191
     }
4192 4192
     else {
4193
-      extruder_multiply[active_extruder] = sval;
4193
+      extruder_multiplier[active_extruder] = sval;
4194 4194
     }
4195 4195
   }
4196 4196
 }
@@ -4637,7 +4637,7 @@ inline void gcode_M400() { st_synchronize(); }
4637 4637
     //SERIAL_PROTOCOLPGM("Filament dia (measured mm):");
4638 4638
     //SERIAL_PROTOCOL(filament_width_meas);
4639 4639
     //SERIAL_PROTOCOLPGM("Extrusion ratio(%):");
4640
-    //SERIAL_PROTOCOL(extruder_multiply[active_extruder]);
4640
+    //SERIAL_PROTOCOL(extruder_multiplier[active_extruder]);
4641 4641
   }
4642 4642
 
4643 4643
   /**

+ 2
- 2
Marlin/planner.cpp View File

@@ -540,7 +540,7 @@ float junction_deviation = 0.1;
540 540
   block->steps[Z_AXIS] = labs(dz);
541 541
   block->steps[E_AXIS] = labs(de);
542 542
   block->steps[E_AXIS] *= volumetric_multiplier[extruder];
543
-  block->steps[E_AXIS] *= extruder_multiply[extruder];
543
+  block->steps[E_AXIS] *= extruder_multiplier[extruder];
544 544
   block->steps[E_AXIS] /= 100;
545 545
   block->step_event_count = max(block->steps[X_AXIS], max(block->steps[Y_AXIS], max(block->steps[Z_AXIS], block->steps[E_AXIS])));
546 546
 
@@ -674,7 +674,7 @@ float junction_deviation = 0.1;
674 674
     delta_mm[Y_AXIS] = dy / axis_steps_per_unit[Y_AXIS];
675 675
   #endif
676 676
   delta_mm[Z_AXIS] = dz / axis_steps_per_unit[Z_AXIS];
677
-  delta_mm[E_AXIS] = (de / axis_steps_per_unit[E_AXIS]) * volumetric_multiplier[extruder] * extruder_multiply[extruder] / 100.0;
677
+  delta_mm[E_AXIS] = (de / axis_steps_per_unit[E_AXIS]) * volumetric_multiplier[extruder] * extruder_multiplier[extruder] / 100.0;
678 678
 
679 679
   if (block->steps[X_AXIS] <= dropsegments && block->steps[Y_AXIS] <= dropsegments && block->steps[Z_AXIS] <= dropsegments) {
680 680
     block->millimeters = fabs(delta_mm[E_AXIS]);

+ 5
- 5
Marlin/ultralcd.cpp View File

@@ -488,16 +488,16 @@ static void lcd_tune_menu() {
488 488
     MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_BED, &target_temperature_bed, 0, BED_MAXTEMP - 15);
489 489
   #endif
490 490
   MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);
491
-  MENU_ITEM_EDIT(int3, MSG_FLOW, &extruder_multiply[active_extruder], 10, 999);
492
-  MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N0, &extruder_multiply[0], 10, 999);
491
+  MENU_ITEM_EDIT(int3, MSG_FLOW, &extruder_multiplier[active_extruder], 10, 999);
492
+  MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N0, &extruder_multiplier[0], 10, 999);
493 493
   #if TEMP_SENSOR_1 != 0
494
-    MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N1, &extruder_multiply[1], 10, 999);
494
+    MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N1, &extruder_multiplier[1], 10, 999);
495 495
   #endif
496 496
   #if TEMP_SENSOR_2 != 0
497
-    MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N2, &extruder_multiply[2], 10, 999);
497
+    MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N2, &extruder_multiplier[2], 10, 999);
498 498
   #endif
499 499
   #if TEMP_SENSOR_3 != 0
500
-    MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N3, &extruder_multiply[3], 10, 999);
500
+    MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N3, &extruder_multiplier[3], 10, 999);
501 501
   #endif
502 502
 
503 503
   #ifdef BABYSTEPPING

Loading…
Cancel
Save