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
 extern bool axis_relative_modes[];
269
 extern bool axis_relative_modes[];
270
 extern int feedrate_multiplier;
270
 extern int feedrate_multiplier;
271
 extern bool volumetric_enabled;
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
 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.
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
 extern float volumetric_multiplier[EXTRUDERS]; // reciprocal of cross-sectional area of filament (in square millimeters), stored this way to reduce computational burden in planner
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
 extern float current_position[NUM_AXIS];
275
 extern float current_position[NUM_AXIS];

+ 4
- 4
Marlin/Marlin_main.cpp View File

251
 bool axis_relative_modes[] = AXIS_RELATIVE_MODES;
251
 bool axis_relative_modes[] = AXIS_RELATIVE_MODES;
252
 int feedrate_multiplier = 100; //100->1 200->2
252
 int feedrate_multiplier = 100; //100->1 200->2
253
 int saved_feedrate_multiplier;
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
 bool volumetric_enabled = false;
255
 bool volumetric_enabled = false;
256
 float filament_size[EXTRUDERS] = ARRAY_BY_EXTRUDERS(DEFAULT_NOMINAL_FILAMENT_DIA, DEFAULT_NOMINAL_FILAMENT_DIA, DEFAULT_NOMINAL_FILAMENT_DIA, DEFAULT_NOMINAL_FILAMENT_DIA);
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
 float volumetric_multiplier[EXTRUDERS] = ARRAY_BY_EXTRUDERS(1.0, 1.0, 1.0, 1.0);
257
 float volumetric_multiplier[EXTRUDERS] = ARRAY_BY_EXTRUDERS(1.0, 1.0, 1.0, 1.0);
4187
     int sval = code_value();
4187
     int sval = code_value();
4188
     if (code_seen('T')) {
4188
     if (code_seen('T')) {
4189
       if (setTargetedHotend(221)) return;
4189
       if (setTargetedHotend(221)) return;
4190
-      extruder_multiply[target_extruder] = sval;
4190
+      extruder_multiplier[target_extruder] = sval;
4191
     }
4191
     }
4192
     else {
4192
     else {
4193
-      extruder_multiply[active_extruder] = sval;
4193
+      extruder_multiplier[active_extruder] = sval;
4194
     }
4194
     }
4195
   }
4195
   }
4196
 }
4196
 }
4637
     //SERIAL_PROTOCOLPGM("Filament dia (measured mm):");
4637
     //SERIAL_PROTOCOLPGM("Filament dia (measured mm):");
4638
     //SERIAL_PROTOCOL(filament_width_meas);
4638
     //SERIAL_PROTOCOL(filament_width_meas);
4639
     //SERIAL_PROTOCOLPGM("Extrusion ratio(%):");
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
   block->steps[Z_AXIS] = labs(dz);
540
   block->steps[Z_AXIS] = labs(dz);
541
   block->steps[E_AXIS] = labs(de);
541
   block->steps[E_AXIS] = labs(de);
542
   block->steps[E_AXIS] *= volumetric_multiplier[extruder];
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
   block->steps[E_AXIS] /= 100;
544
   block->steps[E_AXIS] /= 100;
545
   block->step_event_count = max(block->steps[X_AXIS], max(block->steps[Y_AXIS], max(block->steps[Z_AXIS], block->steps[E_AXIS])));
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
     delta_mm[Y_AXIS] = dy / axis_steps_per_unit[Y_AXIS];
674
     delta_mm[Y_AXIS] = dy / axis_steps_per_unit[Y_AXIS];
675
   #endif
675
   #endif
676
   delta_mm[Z_AXIS] = dz / axis_steps_per_unit[Z_AXIS];
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
   if (block->steps[X_AXIS] <= dropsegments && block->steps[Y_AXIS] <= dropsegments && block->steps[Z_AXIS] <= dropsegments) {
679
   if (block->steps[X_AXIS] <= dropsegments && block->steps[Y_AXIS] <= dropsegments && block->steps[Z_AXIS] <= dropsegments) {
680
     block->millimeters = fabs(delta_mm[E_AXIS]);
680
     block->millimeters = fabs(delta_mm[E_AXIS]);

+ 5
- 5
Marlin/ultralcd.cpp View File

488
     MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_BED, &target_temperature_bed, 0, BED_MAXTEMP - 15);
488
     MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_BED, &target_temperature_bed, 0, BED_MAXTEMP - 15);
489
   #endif
489
   #endif
490
   MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);
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
   #if TEMP_SENSOR_1 != 0
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
   #endif
495
   #endif
496
   #if TEMP_SENSOR_2 != 0
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
   #endif
498
   #endif
499
   #if TEMP_SENSOR_3 != 0
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
   #endif
501
   #endif
502
 
502
 
503
   #ifdef BABYSTEPPING
503
   #ifdef BABYSTEPPING

Loading…
Cancel
Save