Scott Lahteine пре 9 година
родитељ
комит
27b2e2e786
1 измењених фајлова са 20 додато и 3 уклоњено
  1. 20
    3
      Marlin/Marlin_main.cpp

+ 20
- 3
Marlin/Marlin_main.cpp Прегледај датотеку

284
 float filament_size[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(DEFAULT_NOMINAL_FILAMENT_DIA);
284
 float filament_size[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(DEFAULT_NOMINAL_FILAMENT_DIA);
285
 float volumetric_multiplier[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(1.0);
285
 float volumetric_multiplier[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(1.0);
286
 
286
 
287
+// The distance that XYZ has been offset by G92. Reset by G28.
287
 float position_shift[3] = { 0 };
288
 float position_shift[3] = { 0 };
289
+
290
+// This offset is added to the configured home position.
291
+// Set by M206, M428, or menu item. Saved to EEPROM.
288
 float home_offset[3] = { 0 };
292
 float home_offset[3] = { 0 };
289
 
293
 
290
 // Software Endstops. Default to configured limits.
294
 // Software Endstops. Default to configured limits.
295
   int fanSpeeds[FAN_COUNT] = { 0 };
299
   int fanSpeeds[FAN_COUNT] = { 0 };
296
 #endif
300
 #endif
297
 
301
 
302
+// The active extruder (tool). Set with T<extruder> command.
298
 uint8_t active_extruder = 0;
303
 uint8_t active_extruder = 0;
304
+
305
+// Relative Mode. Enable with G91, disable with G90.
306
+static bool relative_mode = false;
307
+
299
 bool cancel_heatup = false;
308
 bool cancel_heatup = false;
300
 
309
 
301
 const char errormagic[] PROGMEM = "Error:";
310
 const char errormagic[] PROGMEM = "Error:";
302
 const char echomagic[] PROGMEM = "echo:";
311
 const char echomagic[] PROGMEM = "echo:";
303
 const char axis_codes[NUM_AXIS] = {'X', 'Y', 'Z', 'E'};
312
 const char axis_codes[NUM_AXIS] = {'X', 'Y', 'Z', 'E'};
304
 
313
 
305
-static bool relative_mode = false;  //Determines Absolute or Relative Coordinates
306
 static int serial_count = 0;
314
 static int serial_count = 0;
307
-static char* seen_pointer; ///< A pointer to find chars in the command string (X, Y, Z, E, etc.)
308
-const char* queued_commands_P = NULL; /* pointer to the current line in the active sequence of commands, or NULL when none */
315
+
316
+// GCode parameter pointer used by code_seen(), code_value(), etc.
317
+static char* seen_pointer;
318
+
319
+// Next Immediate GCode Command pointer. NULL if none.
320
+const char* queued_commands_P = NULL;
321
+
309
 const int sensitive_pins[] = SENSITIVE_PINS; ///< Sensitive pin list for M42
322
 const int sensitive_pins[] = SENSITIVE_PINS; ///< Sensitive pin list for M42
323
+
310
 // Inactivity shutdown
324
 // Inactivity shutdown
311
 millis_t previous_cmd_ms = 0;
325
 millis_t previous_cmd_ms = 0;
312
 static millis_t max_inactive_time = 0;
326
 static millis_t max_inactive_time = 0;
313
 static millis_t stepper_inactive_time = (DEFAULT_STEPPER_DEACTIVE_TIME) * 1000UL;
327
 static millis_t stepper_inactive_time = (DEFAULT_STEPPER_DEACTIVE_TIME) * 1000UL;
328
+
329
+// Print Job Timer
314
 Stopwatch print_job_timer = Stopwatch();
330
 Stopwatch print_job_timer = Stopwatch();
331
+
315
 static uint8_t target_extruder;
332
 static uint8_t target_extruder;
316
 
333
 
317
 #if ENABLED(AUTO_BED_LEVELING_FEATURE)
334
 #if ENABLED(AUTO_BED_LEVELING_FEATURE)

Loading…
Откажи
Сачувај