Browse Source

Simplify init with ARRAY_BY_EXTRUDERS1 macro (PR#2507)

Scott Lahteine 10 years ago
parent
commit
e4c01f1c7e
3 changed files with 10 additions and 8 deletions
  1. 2
    0
      Marlin/Conditionals.h
  2. 3
    3
      Marlin/Marlin_main.cpp
  3. 5
    5
      Marlin/temperature.cpp

+ 2
- 0
Marlin/Conditionals.h View File

406
     #define ARRAY_BY_EXTRUDERS(v1, v2, v3, v4) { v1 }
406
     #define ARRAY_BY_EXTRUDERS(v1, v2, v3, v4) { v1 }
407
   #endif
407
   #endif
408
 
408
 
409
+  #define ARRAY_BY_EXTRUDERS1(v1) ARRAY_BY_EXTRUDERS(v1, v1, v1, v1)
410
+
409
   /**
411
   /**
410
    * Shorthand for pin tests, used wherever needed
412
    * Shorthand for pin tests, used wherever needed
411
    */
413
    */

+ 3
- 3
Marlin/Marlin_main.cpp View File

250
 bool axis_relative_modes[] = AXIS_RELATIVE_MODES;
250
 bool axis_relative_modes[] = AXIS_RELATIVE_MODES;
251
 int feedrate_multiplier = 100; //100->1 200->2
251
 int feedrate_multiplier = 100; //100->1 200->2
252
 int saved_feedrate_multiplier;
252
 int saved_feedrate_multiplier;
253
-int extruder_multiplier[EXTRUDERS] = ARRAY_BY_EXTRUDERS(100, 100, 100, 100);
253
+int extruder_multiplier[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(100);
254
 bool volumetric_enabled = false;
254
 bool volumetric_enabled = false;
255
-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 volumetric_multiplier[EXTRUDERS] = ARRAY_BY_EXTRUDERS(1.0, 1.0, 1.0, 1.0);
255
+float filament_size[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(DEFAULT_NOMINAL_FILAMENT_DIA);
256
+float volumetric_multiplier[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(1.0);
257
 float home_offset[3] = { 0 };
257
 float home_offset[3] = { 0 };
258
 float min_pos[3] = { X_MIN_POS, Y_MIN_POS, Z_MIN_POS };
258
 float min_pos[3] = { X_MIN_POS, Y_MIN_POS, Z_MIN_POS };
259
 float max_pos[3] = { X_MAX_POS, Y_MAX_POS, Z_MAX_POS };
259
 float max_pos[3] = { X_MAX_POS, Y_MAX_POS, Z_MAX_POS };

+ 5
- 5
Marlin/temperature.cpp View File

130
 
130
 
131
 #ifdef PIDTEMP
131
 #ifdef PIDTEMP
132
   #ifdef PID_PARAMS_PER_EXTRUDER
132
   #ifdef PID_PARAMS_PER_EXTRUDER
133
-    float Kp[EXTRUDERS] = ARRAY_BY_EXTRUDERS(DEFAULT_Kp, DEFAULT_Kp, DEFAULT_Kp, DEFAULT_Kp);
134
-    float Ki[EXTRUDERS] = ARRAY_BY_EXTRUDERS(DEFAULT_Ki*PID_dT, DEFAULT_Ki*PID_dT, DEFAULT_Ki*PID_dT, DEFAULT_Ki*PID_dT);
135
-    float Kd[EXTRUDERS] = ARRAY_BY_EXTRUDERS(DEFAULT_Kd / PID_dT, DEFAULT_Kd / PID_dT, DEFAULT_Kd / PID_dT, DEFAULT_Kd / PID_dT);
133
+    float Kp[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(DEFAULT_Kp);
134
+    float Ki[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(DEFAULT_Ki*PID_dT);
135
+    float Kd[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(DEFAULT_Kd / PID_dT);
136
     #ifdef PID_ADD_EXTRUSION_RATE
136
     #ifdef PID_ADD_EXTRUSION_RATE
137
-      float Kc[EXTRUDERS] = ARRAY_BY_EXTRUDERS(DEFAULT_Kc, DEFAULT_Kc, DEFAULT_Kc, DEFAULT_Kc);
137
+      float Kc[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(DEFAULT_Kc);
138
     #endif // PID_ADD_EXTRUSION_RATE
138
     #endif // PID_ADD_EXTRUSION_RATE
139
   #else //PID_PARAMS_PER_EXTRUDER
139
   #else //PID_PARAMS_PER_EXTRUDER
140
     float Kp = DEFAULT_Kp;
140
     float Kp = DEFAULT_Kp;
150
 static int minttemp_raw[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_RAW_LO_TEMP , HEATER_1_RAW_LO_TEMP , HEATER_2_RAW_LO_TEMP, HEATER_3_RAW_LO_TEMP);
150
 static int minttemp_raw[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_RAW_LO_TEMP , HEATER_1_RAW_LO_TEMP , HEATER_2_RAW_LO_TEMP, HEATER_3_RAW_LO_TEMP);
151
 static int maxttemp_raw[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_RAW_HI_TEMP , HEATER_1_RAW_HI_TEMP , HEATER_2_RAW_HI_TEMP, HEATER_3_RAW_HI_TEMP);
151
 static int maxttemp_raw[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_RAW_HI_TEMP , HEATER_1_RAW_HI_TEMP , HEATER_2_RAW_HI_TEMP, HEATER_3_RAW_HI_TEMP);
152
 static int minttemp[EXTRUDERS] = { 0 };
152
 static int minttemp[EXTRUDERS] = { 0 };
153
-static int maxttemp[EXTRUDERS] = ARRAY_BY_EXTRUDERS( 16383, 16383, 16383, 16383 );
153
+static int maxttemp[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(16383);
154
 #ifdef BED_MINTEMP
154
 #ifdef BED_MINTEMP
155
 static int bed_minttemp_raw = HEATER_BED_RAW_LO_TEMP;
155
 static int bed_minttemp_raw = HEATER_BED_RAW_LO_TEMP;
156
 #endif
156
 #endif

Loading…
Cancel
Save