thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

[2.0.x] Followup to IDEX changes (#11707)

Scott Lahteine 7 years ago
parent
d62f4df0b7
commit
d1ceaf5550
No account linked to committer's email address
13 changed files with 250 additions and 273 deletions
Split View Show Diff Stats
  1. 3
    3
      Marlin/src/config/examples/Formbot/T-Rex_2+/Configuration.h
  2. 23
    16
      Marlin/src/config/examples/Formbot/T-Rex_2+/Configuration_adv.h
  3. 134
    134
      Marlin/src/config/examples/Formbot/T-Rex_2+/_Bootscreen.h
  4. 8
    8
      Marlin/src/config/examples/Formbot/T-Rex_2+/_Statusscreen.h
  5. 23
    25
      Marlin/src/gcode/calibrate/G28.cpp
  6. 34
    59
      Marlin/src/gcode/control/M605.cpp
  7. 7
    8
      Marlin/src/gcode/queue.cpp
  8. 4
    4
      Marlin/src/lcd/language/language_en.h
  9. 1
    1
      Marlin/src/lcd/ultralcd.cpp
  10. 6
    6
      Marlin/src/module/motion.cpp
  11. 3
    3
      Marlin/src/module/motion.h
  12. 1
    4
      Marlin/src/module/stepper.cpp
  13. 3
    2
      Marlin/src/module/tool_change.cpp

+ 3
- 3
Marlin/src/config/examples/Formbot/T-Rex_2+/Configuration.h View File 

@@ -23,7 +23,7 @@
23 23 
 //#define TREX3              // Turn this on for T-Rex 3 features like dual filament run out sensors
24 24
25 25 
 #define ROXYs_TRex           // Turn this on to get customizations only available on Roxy's T-Rex 2+
26 
-                             // Marlin controlled heat bed, Max7219 debug LED's, less bright LED light level
26 
+                             // Marlin controlled heat bed, Max7219 debug LED's, less bright LED light level
27 27 
                              // More aggressive PID numbers for hotends (due to double fans)
28 28 
 /**
29 29 
  * Configuration.h
 
@@ -144,7 +144,7 @@
144 144
145 145 
 // Optional custom name for your RepStrap or other custom machine
146 146 
 // Displayed in the LCD "Ready" message
147 
-#ifdef TREX3
147 
+#ifdef TREX3
148 148 
   #define CUSTOM_MACHINE_NAME "T-Rex 3"
149 149 
 #else
150 150 
   #define CUSTOM_MACHINE_NAME "T-Rex 2+"
 
@@ -993,7 +993,7 @@
993 993 
  * By default the firmware assumes HIGH=FILAMENT PRESENT.
994 994 
  */
995 995
996 
-#ifdef TREX3
996 
+#ifdef TREX3
997 997 
   #define FILAMENT_RUNOUT_SENSOR
998 998 
   #define NUM_RUNOUT_SENSORS   2     // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
999 999 
 #else

+ 23
- 16
Marlin/src/config/examples/Formbot/T-Rex_2+/Configuration_adv.h View File 

@@ -335,10 +335,16 @@
335 335 
   #endif
336 336 
 #endif
337 337
338 
-// Enable this for dual x-carriage printers.
339 
-// A dual x-carriage design has the advantage that the inactive extruder can be parked which
340 
-// prevents hot-end ooze contaminating the print. It also reduces the weight of each x-carriage
341 
-// allowing faster printing speeds. Connect your X2 stepper to the first unused E plug.
338 
+/**
339 
+ * Dual X Carriage
340 
+ *
341 
+ * This setup has two X carriages that can move independently, each with its own hotend.
342 
+ * The carriages can be used to print an object with two colors or materials, or in
343 
+ * "duplication mode" it can print two identical or X-mirrored objects simultaneously.
344 
+ * The inactive carriage is parked automatically to prevent oozing.
345 
+ * X1 is the left carriage, X2 the right. They park and home at opposite ends of the X axis.
346 
+ * By default the X2 stepper is assigned to the first unused E plug on the board.
347 
+ */
342 348 
 #define DUAL_X_CARRIAGE
343 349 
 #if ENABLED(DUAL_X_CARRIAGE)
344 350 
   // Configuration for second X-carriage
 
@@ -356,13 +362,13 @@
356 362 
       // Remember: you should set the second extruder x-offset to 0 in your slicer.
357 363
358 364 
   // There are a few selectable movement modes for dual x-carriages using M605 S<mode>
359 
-  //    Mode 0 (DXC_FULL_CONTROL_MODE):           Full control. The slicer has full control over both x-carriages and can achieve optimal travel results
360 
-  //                                              as long as it supports dual x-carriages. (M605 S0)
361 
-  //    Mode 1 (DXC_AUTO_PARK_MODE)   :           Auto-park mode. The firmware will automatically park and unpark the x-carriages on tool changes so
362 
-  //                                              that additional slicer support is not required. (M605 S1)
363 
-  //    Mode 2 (DXC_DUPLICATION_MODE) :           Duplication mode. The firmware will transparently make the second x-carriage and extruder copy all
364 
-  //                                              actions of the first x-carriage. This allows the printer to print 2 arbitrary items at
365 
-  //                                              once. (2nd extruder x offset and temp offset are set using: M605 S2 [Xnnn] [Rmmm])
365 
+  //    Mode 0 (DXC_FULL_CONTROL_MODE): Full control. The slicer has full control over both x-carriages and can achieve optimal travel results
366 
+  //                                    as long as it supports dual x-carriages. (M605 S0)
367 
+  //    Mode 1 (DXC_AUTO_PARK_MODE)   : Auto-park mode. The firmware will automatically park and unpark the x-carriages on tool changes so
368 
+  //                                    that additional slicer support is not required. (M605 S1)
369 
+  //    Mode 2 (DXC_DUPLICATION_MODE) : Duplication mode. The firmware will transparently make the second x-carriage and extruder copy all
370 
+  //                                    actions of the first x-carriage. This allows the printer to print 2 arbitrary items at
371 
+  //                                    once. (2nd extruder x offset and temp offset are set using: M605 S2 [Xnnn] [Rmmm])
366 372
367 373 
   // This is the default power-up mode which can be later using M605.
368 374 
   #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_AUTO_PARK_MODE
 
@@ -478,7 +484,7 @@
478 484 
  *                         known compatible chips: AD5206
479 485 
  *    DAC_MOTOR_CURRENT_DEFAULT - used by PRINTRBOARD_REVF & RIGIDBOARD_V2
480 486 
  *                         known compatible chips: MCP4728
481 
- *    DIGIPOT_I2C_MOTOR_CURRENTS - used by 5DPRINT, AZTEEG_X3_PRO, MIGHTYBOARD_REVE
487 
+ *    DIGIPOT_I2C_MOTOR_CURRENTS - used by 5DPRINT, AZTEEG_X3_PRO, AZTEEG_X5_MINI_WIFI, MIGHTYBOARD_REVE
482 488 
  *                         known compatible chips: MCP4451, MCP4018
483 489 
  *
484 490 
  *  Motor currents can also be set by M907 - M910 and by the LCD.
 
@@ -496,10 +502,11 @@
496 502 
   /**
497 503 
    * Common slave addresses:
498 504 
    *
499 
-   *                    A   (A shifted)   B   (B shifted)  IC
500 
-   * Smoothie          0x2C (0x58)       0x2D (0x5A)       MCP4451
501 
-   * AZTEEG_X3_PRO     0x2C (0x58)       0x2E (0x5C)       MCP4451
502 
-   * MIGHTYBOARD_REVE  0x2F (0x5E)                         MCP4018
505 
+   *                        A   (A shifted)   B   (B shifted)  IC
506 
+   * Smoothie              0x2C (0x58)       0x2D (0x5A)       MCP4451
507 
+   * AZTEEG_X3_PRO         0x2C (0x58)       0x2E (0x5C)       MCP4451
508 
+   * AZTEEG_X5_MINI_WIFI         0x58              0x5C        MCP4451
509 
+   * MIGHTYBOARD_REVE      0x2F (0x5E)                         MCP4018
503 510 
    */
504 511 
   #define DIGIPOT_I2C_ADDRESS_A 0x2C  // unshifted slave address for first DIGIPOT
505 512 
   #define DIGIPOT_I2C_ADDRESS_B 0x2D  // unshifted slave address for second DIGIPOT

+ 134
- 134
Marlin/src/config/examples/Formbot/T-Rex_2+/_Bootscreen.h View File 

@@ -36,142 +36,142 @@
36 36 
 #define CUSTOM_BOOTSCREEN_BMPWIDTH  128
37 37 
 #define CUSTOM_BOOTSCREEN_BMPHEIGHT 64
38 38
39 
-#ifdef TREX3
40 
-const unsigned char custom_start_bmp[] PROGMEM = {
41 
-B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,  // 0
42 
-B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,
43 
-B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,
44 
-B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,
45 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111111,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 4
46 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
47 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
48 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111111,B11111111,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
49 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 8
50 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
51 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
52 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
53 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 12
54 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00011111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
55 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
56 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
57 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 16
58 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
59 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
60 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
61 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 20
62 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
63 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
64 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
65 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 24
66 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
67 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
68 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00011111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
69 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 28
70 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
71 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
72 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
73 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 32
74 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
75 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
76 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11100000,B00111111,B11111111,B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,
77 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11100000,B00111111,B11111111,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 36
78 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11100000,B00111111,B11111111,B11111111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
79 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11100000,B00111111,B11111111,B11111110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
80 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00100000,B00111111,B11111111,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
81 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 40
82 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
83 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
84 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 44
85 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
86 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
87 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11111110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
88 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
89 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 48
90 
-B00000000,B11111111,B11111111,B00000000,B01111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11100000,B00000000,B00000000,
91 
-B00000000,B11111111,B11111111,B00000000,B01111111,B11111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11110000,B00000000,B00000000,
92 
-B00000000,B10000011,B11000001,B00000000,B01110000,B00111100,B00000000,B00111000,B00000011,B11000000,B01111000,B00000000,B00001100,B00011000,B00000000,B00000000,
93 
-B00000000,B00000011,B11000000,B00000000,B01110000,B00011110,B00000001,B11111110,B00000000,B11000000,B01100000,B00000000,B00000000,B00001100,B00000000,B00000000,  // 52
94 
-B00000000,B00000011,B11000000,B00000000,B01110000,B00111100,B00000011,B11000111,B00000000,B01100000,B11000000,B00000000,B00000000,B00001100,B00000000,B00000000,
95 
-B00000000,B00000011,B11000000,B00000000,B01111110,B01111000,B00000110,B00000001,B10000000,B00110001,B10000000,B00000000,B00000000,B00011100,B00000000,B00000000,
96 
-B00000000,B00000011,B11000000,B11111111,B01111111,B11100000,B00000110,B00000001,B11000000,B00011011,B00000000,B00000000,B00000011,B11111000,B00000000,B00000000,
97 
-B00000000,B00000011,B11000000,B11111111,B01110000,B11100000,B00001111,B11111111,B11000000,B00001111,B00000000,B00000000,B00000011,B11111000,B00000000,B00000000,  // 56
98 
-B00000000,B00000011,B11000000,B00000000,B01110000,B01111000,B00001100,B00000000,B00000000,B00001111,B00000000,B00000000,B00000000,B00011100,B00000000,B00000000,
99 
-B00000000,B00000011,B11000000,B00000000,B01110000,B00111100,B00000110,B00000000,B00000000,B00011001,B10000000,B00000000,B00000000,B00001100,B00000000,B00000000,
100 
-B00000000,B00000011,B11000000,B00000000,B01110000,B00011110,B00000110,B00000000,B11000000,B00110000,B11000000,B00000000,B00000000,B00001100,B00000000,B00000000,
101 
-B10000000,B00000011,B11000000,B00000000,B01110000,B00011110,B00000011,B10000001,B10000000,B01100000,B01100000,B00000000,B00001100,B00011000,B00000000,B00000001,  // 60
102 
-B10000000,B00000011,B11000000,B00000000,B01110000,B00001110,B10000001,B11111111,B10000000,B11000000,B00110000,B00000000,B00000111,B11110000,B00000000,B00000001,
103 
-B10000000,B00000011,B11000000,B00000000,B01110000,B00000111,B00000000,B01111100,B00000011,B10000000,B00011100,B00000000,B00000001,B11100000,B00000000,B00000001,
104 
-B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001111
105 
-};
106 
-
107 
-  #else
39 
+#ifdef TREX3
40 
+
108 41 
 const unsigned char custom_start_bmp[] PROGMEM = {
109 
-B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,  // 0
110 
-B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,
111 
-B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,
112 
-B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,
113 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111111,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 4
114 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
115 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
116 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111111,B11111111,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
117 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 8
118 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
119 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
120 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
121 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 12
122 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00011111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
123 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
124 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
125 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 16
126 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
127 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
128 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
129 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 20
130 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
131 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
132 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
133 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 24
134 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
135 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
136 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00011111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
137 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 28
138 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
139 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
140 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
141 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 32
142 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
143 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
144 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11100000,B00111111,B11111111,B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,
145 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11100000,B00111111,B11111111,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 36
146 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11100000,B00111111,B11111111,B11111111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
147 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11100000,B00111111,B11111111,B11111110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
148 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00100000,B00111111,B11111111,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
149 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 40
150 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
151 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
152 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 44
153 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
154 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
155 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11111110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
156 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
157 
-B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,  // 48
158 
-B00000000,B11111111,B11111111,B00000000,B01111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11100000,B00000000,B00000000,
159 
-B00000000,B11111111,B11111111,B00000000,B01111111,B11111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11110000,B00000000,B00000000,
160 
-B00000000,B10000011,B11000001,B00000000,B01110000,B00111100,B00000000,B00111000,B00000011,B11000000,B01111000,B00000000,B00000111,B00111000,B00000000,B00000000,
161 
-B00000000,B00000011,B11000000,B00000000,B01110000,B00011110,B00000001,B11111110,B00000000,B11000000,B01100000,B00000000,B00001110,B00011100,B00000110,B00000000,  // 52
162 
-B00000000,B00000011,B11000000,B00000000,B01110000,B00111100,B00000011,B11000111,B00000000,B01100000,B11000000,B00000000,B00001100,B00001100,B00000110,B00000000,
163 
-B00000000,B00000011,B11000000,B00000000,B01111110,B01111000,B00000110,B00000001,B10000000,B00110001,B10000000,B00000000,B00000000,B00001100,B00000110,B00000000,
164 
-B00000000,B00000011,B11000000,B11111111,B01111111,B11100000,B00000110,B00000001,B11000000,B00011011,B00000000,B00000000,B00000000,B00011100,B00111111,B11000000,
165 
-B00000000,B00000011,B11000000,B11111111,B01110000,B11100000,B00001111,B11111111,B11000000,B00001111,B00000000,B00000000,B00000000,B00111000,B00111111,B11000000,  // 56
166 
-B00000000,B00000011,B11000000,B00000000,B01110000,B01111000,B00001100,B00000000,B00000000,B00001111,B00000000,B00000000,B00000000,B01110000,B00000110,B00000000,
167 
-B00000000,B00000011,B11000000,B00000000,B01110000,B00111100,B00000110,B00000000,B00000000,B00011001,B10000000,B00000000,B00000000,B01100000,B00000110,B00000000,
168 
-B00000000,B00000011,B11000000,B00000000,B01110000,B00011110,B00000110,B00000000,B11000000,B00110000,B11000000,B00000000,B00000001,B11000000,B00000110,B00000000,
169 
-B10000000,B00000011,B11000000,B00000000,B01110000,B00011110,B00000011,B10000001,B10000000,B01100000,B01100000,B00000000,B00000011,B10000000,B00000000,B00000001,  // 60
170 
-B10000000,B00000011,B11000000,B00000000,B01110000,B00001110,B10000001,B11111111,B10000000,B11000000,B00110000,B00000000,B00001111,B11111100,B00000000,B00000001,
171 
-B10000000,B00000011,B11000000,B00000000,B01110000,B00000111,B00000000,B01111100,B00000011,B10000000,B00011100,B00000000,B00011111,B11111100,B00000000,B00000001,
172 
-B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001111
42 
+  B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,
43 
+  B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,
44 
+  B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,
45 
+  B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,
46 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111111,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
47 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
48 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
49 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111111,B11111111,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
50 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
51 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
52 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
53 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
54 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
55 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00011111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
56 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
57 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
58 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
59 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
60 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
61 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
62 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
63 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
64 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
65 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
66 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
67 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
68 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
69 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00011111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
70 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
71 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
72 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
73 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
74 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
75 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
76 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
77 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11100000,B00111111,B11111111,B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,
78 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11100000,B00111111,B11111111,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,
79 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11100000,B00111111,B11111111,B11111111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
80 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11100000,B00111111,B11111111,B11111110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
81 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00100000,B00111111,B11111111,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
82 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
83 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
84 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
85 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
86 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
87 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
88 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11111110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
89 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
90 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
91 
+  B00000000,B11111111,B11111111,B00000000,B01111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11100000,B00000000,B00000000,
92 
+  B00000000,B11111111,B11111111,B00000000,B01111111,B11111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11110000,B00000000,B00000000,
93 
+  B00000000,B10000011,B11000001,B00000000,B01110000,B00111100,B00000000,B00111000,B00000011,B11000000,B01111000,B00000000,B00001100,B00011000,B00000000,B00000000,
94 
+  B00000000,B00000011,B11000000,B00000000,B01110000,B00011110,B00000001,B11111110,B00000000,B11000000,B01100000,B00000000,B00000000,B00001100,B00000000,B00000000,
95 
+  B00000000,B00000011,B11000000,B00000000,B01110000,B00111100,B00000011,B11000111,B00000000,B01100000,B11000000,B00000000,B00000000,B00001100,B00000000,B00000000,
96 
+  B00000000,B00000011,B11000000,B00000000,B01111110,B01111000,B00000110,B00000001,B10000000,B00110001,B10000000,B00000000,B00000000,B00011100,B00000000,B00000000,
97 
+  B00000000,B00000011,B11000000,B11111111,B01111111,B11100000,B00000110,B00000001,B11000000,B00011011,B00000000,B00000000,B00000011,B11111000,B00000000,B00000000,
98 
+  B00000000,B00000011,B11000000,B11111111,B01110000,B11100000,B00001111,B11111111,B11000000,B00001111,B00000000,B00000000,B00000011,B11111000,B00000000,B00000000,
99 
+  B00000000,B00000011,B11000000,B00000000,B01110000,B01111000,B00001100,B00000000,B00000000,B00001111,B00000000,B00000000,B00000000,B00011100,B00000000,B00000000,
100 
+  B00000000,B00000011,B11000000,B00000000,B01110000,B00111100,B00000110,B00000000,B00000000,B00011001,B10000000,B00000000,B00000000,B00001100,B00000000,B00000000,
101 
+  B00000000,B00000011,B11000000,B00000000,B01110000,B00011110,B00000110,B00000000,B11000000,B00110000,B11000000,B00000000,B00000000,B00001100,B00000000,B00000000,
102 
+  B10000000,B00000011,B11000000,B00000000,B01110000,B00011110,B00000011,B10000001,B10000000,B01100000,B01100000,B00000000,B00001100,B00011000,B00000000,B00000001,
103 
+  B10000000,B00000011,B11000000,B00000000,B01110000,B00001110,B10000001,B11111111,B10000000,B11000000,B00110000,B00000000,B00000111,B11110000,B00000000,B00000001,
104 
+  B10000000,B00000011,B11000000,B00000000,B01110000,B00000111,B00000000,B01111100,B00000011,B10000000,B00011100,B00000000,B00000001,B11100000,B00000000,B00000001,
105 
+  B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001111
173 106 
 };
174 
-#endif
175 107
108 
+#else
176 109
110 
+const unsigned char custom_start_bmp[] PROGMEM = {
111 
+  B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,
112 
+  B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,
113 
+  B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,
114 
+  B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,
115 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111111,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
116 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
117 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
118 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111111,B11111111,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
119 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
120 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
121 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
122 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
123 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
124 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00011111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
125 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
126 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
127 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
128 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
129 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
130 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
131 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
132 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
133 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
134 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
135 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
136 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
137 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
138 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00011111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
139 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
140 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
141 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
142 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
143 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
144 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
145 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00001111,B11100000,B00111111,B11111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,
146 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11100000,B00111111,B11111111,B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,
147 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11100000,B00111111,B11111111,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,
148 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11100000,B00111111,B11111111,B11111111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
149 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11100000,B00111111,B11111111,B11111110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
150 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00100000,B00111111,B11111111,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
151 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
152 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
153 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
154 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
155 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
156 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
157 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,B11111110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
158 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
159 
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
160 
+  B00000000,B11111111,B11111111,B00000000,B01111111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11100000,B00000000,B00000000,
161 
+  B00000000,B11111111,B11111111,B00000000,B01111111,B11111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11110000,B00000000,B00000000,
162 
+  B00000000,B10000011,B11000001,B00000000,B01110000,B00111100,B00000000,B00111000,B00000011,B11000000,B01111000,B00000000,B00000111,B00111000,B00000000,B00000000,
163 
+  B00000000,B00000011,B11000000,B00000000,B01110000,B00011110,B00000001,B11111110,B00000000,B11000000,B01100000,B00000000,B00001110,B00011100,B00000110,B00000000,
164 
+  B00000000,B00000011,B11000000,B00000000,B01110000,B00111100,B00000011,B11000111,B00000000,B01100000,B11000000,B00000000,B00001100,B00001100,B00000110,B00000000,
165 
+  B00000000,B00000011,B11000000,B00000000,B01111110,B01111000,B00000110,B00000001,B10000000,B00110001,B10000000,B00000000,B00000000,B00001100,B00000110,B00000000,
166 
+  B00000000,B00000011,B11000000,B11111111,B01111111,B11100000,B00000110,B00000001,B11000000,B00011011,B00000000,B00000000,B00000000,B00011100,B00111111,B11000000,
167 
+  B00000000,B00000011,B11000000,B11111111,B01110000,B11100000,B00001111,B11111111,B11000000,B00001111,B00000000,B00000000,B00000000,B00111000,B00111111,B11000000,
168 
+  B00000000,B00000011,B11000000,B00000000,B01110000,B01111000,B00001100,B00000000,B00000000,B00001111,B00000000,B00000000,B00000000,B01110000,B00000110,B00000000,
169 
+  B00000000,B00000011,B11000000,B00000000,B01110000,B00111100,B00000110,B00000000,B00000000,B00011001,B10000000,B00000000,B00000000,B01100000,B00000110,B00000000,
170 
+  B00000000,B00000011,B11000000,B00000000,B01110000,B00011110,B00000110,B00000000,B11000000,B00110000,B11000000,B00000000,B00000001,B11000000,B00000110,B00000000,
171 
+  B10000000,B00000011,B11000000,B00000000,B01110000,B00011110,B00000011,B10000001,B10000000,B01100000,B01100000,B00000000,B00000011,B10000000,B00000000,B00000001,
172 
+  B10000000,B00000011,B11000000,B00000000,B01110000,B00001110,B10000001,B11111111,B10000000,B11000000,B00110000,B00000000,B00001111,B11111100,B00000000,B00000001,
173 
+  B10000000,B00000011,B11000000,B00000000,B01110000,B00000111,B00000000,B01111100,B00000011,B10000000,B00011100,B00000000,B00011111,B11111100,B00000000,B00000001,
174 
+  B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001111
175 
+};
177 176
177 
+#endif

Marlin/src/config/examples/Formbot/T-Rex_2+/_statusscreen.h → Marlin/src/config/examples/Formbot/T-Rex_2+/_Statusscreen.h View File 

@@ -46,16 +46,17 @@
46 46 
 //============================================
47 47
48 48 
 #if HOTENDS < 2
49 
-  #if FAN_ANIM_FRAMES <= 2
50 
-  #elif FAN_ANIM_FRAMES == 3
51 
-  #elif FAN_ANIM_FRAMES == 4
52 
-  #endif
49 
+
50 
+    #error "Single hotend bitmap not available."
53 51
54 52 
 #else // HOTENDS >= 2
55 53
56 54 
   #if FAN_ANIM_FRAMES <= 2
57 55
56 
+    #error "Under 3 FAN_ANIM_FRAMES not available."
57 
+
58 58 
   #elif FAN_ANIM_FRAMES == 3
59 
+
59 60 
     const unsigned char status_screen0_bmp[] PROGMEM = {
60 61 
       B00000000,B00001111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111111,B11111111,
61 62 
       B00000000,B01111111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11000000,B00011111,
 
@@ -78,7 +79,6 @@
78 79 
       B00000000,B00000000,B00000000,B00000000,B00011000,B00000000,B00000000,B00001100,B00000000,B00000000,B11111111,B11111111,B11000000,B00000111,B11111111,B11111111
79 80 
     };
80 81 
     const unsigned char status_screen1_bmp[] PROGMEM = {
81 
-
82 82 
       B00000000,B00001111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111111,B11111111,
83 83 
       B00000000,B01111111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11000110,B00011111,
84 84 
       B00000000,B11111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B00111110,B00000111,
 
@@ -100,7 +100,6 @@
100 100 
       B00000000,B00000000,B00000000,B00000000,B00011000,B00000000,B00000000,B00001100,B00000000,B00000000,B11111111,B11111111,B11000000,B00000111,B11111111,B11111111
101 101 
     };
102 102 
     const unsigned char status_screen2_bmp[] PROGMEM = {
103 
-
104 103 
       B00000000,B00001111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111111,B11111111,
105 104 
       B00000000,B01111111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11000011,B00011111,
106 105 
       B00000000,B11111111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B00000011,B11100111,
 
@@ -123,8 +122,9 @@
123 122 
     };
124 123
125 124 
   #elif FAN_ANIM_FRAMES == 4
126 
-/*
127 
-*/
125 
+
126 
+    #error "4 FAN_ANIM_FRAMES not available."
127 
+
128 128 
   #endif
129 129
130 130 
 #endif // HOTENDS >= 2

+ 23
- 25
Marlin/src/gcode/calibrate/G28.cpp View File 

@@ -359,38 +359,36 @@ void GcodeSuite::G28(const bool always_home_all) {
359 359
360 360 
   #endif // !DELTA (G28)
361 361
362 
-/**
363 
- *
364 
- * This code block allows the DXC mode to survive (and function) across a G28 if it is an IDEX
365 
- * machine and the printer is currently in DXC_DUPLICATION_MODE.
366 
- * This is important because it lets a user use the LCD Panel to set an IDEX Duplication mode, and
367 
- * then print a standard GCode file that contains a single print that does a G28 and has no other
368 
- * IDEX specific commands in it.
369 
- *
370 
- **/
371 
-
362 
+  /**
363 
+   * Preserve DXC mode across a G28 for IDEX printers in DXC_DUPLICATION_MODE.
364 
+   * This is important because it lets a user use the LCD Panel to set an IDEX Duplication mode, and
365 
+   * then print a standard GCode file that contains a single print that does a G28 and has no other
366 
+   * IDEX specific commands in it.
367 
+   */
372 368 
   #if ENABLED(DUAL_X_CARRIAGE)
369 
+
373 370 
     if (dual_x_carriage_mode == DXC_DUPLICATION_MODE) {
374 371
375 
-        // Always home the 2nd (right) extruder first
376 
-        active_extruder = 1;
377 
-        homeaxis(X_AXIS);
372 
+      // Always home the 2nd (right) extruder first
373 
+      active_extruder = 1;
374 
+      homeaxis(X_AXIS);
378 375
379 
-        // Remember this extruder's position for later tool change
380 
-        inactive_extruder_x_pos = current_position[X_AXIS];
376 
+      // Remember this extruder's position for later tool change
377 
+      inactive_extruder_x_pos = current_position[X_AXIS];
381 378
382 
-        // Home the 1st (left) extruder
383 
-        active_extruder = 0;
384 
-        homeaxis(X_AXIS);
379 
+      // Home the 1st (left) extruder
380 
+      active_extruder = 0;
381 
+      homeaxis(X_AXIS);
385 382
386 
-        // Consider the active extruder to be parked
387 
-        COPY(raised_parked_position, current_position);
388 
-        delayed_move_time = 0;
389 
-        active_extruder_parked = true;
390 
-        extruder_duplication_enabled = IDEX_saved_duplication_state;
391 
-        dual_x_carriage_mode         = IDEX_saved_mode;
383 
+      // Consider the active extruder to be parked
384 
+      COPY(raised_parked_position, current_position);
385 
+      delayed_move_time = 0;
386 
+      active_extruder_parked = true;
387 
+      extruder_duplication_enabled = IDEX_saved_duplication_state;
388 
+      dual_x_carriage_mode         = IDEX_saved_mode;
392 389 
     }
393 
-  #endif
390 
+
391 
+  #endif // DUAL_X_CARRIAGE
394 392
395 393 
   endstops.not_homing();
396 394

+ 34
- 59
Marlin/src/gcode/control/M605.cpp View File 

@@ -22,6 +22,8 @@
22 22
23 23 
 #include "../../inc/MarlinConfig.h"
24 24
25 
+#define DEBUG_DXC_MODE
26 
+
25 27 
 #if ENABLED(DUAL_X_CARRIAGE) || ENABLED(DUAL_NOZZLE_DUPLICATION_MODE)
26 28
27 29 
 #include "../gcode.h"
 
@@ -53,75 +55,48 @@
53 55 
   void GcodeSuite::M605() {
54 56 
     planner.synchronize();
55 57
56 
-    if (parser.seen('S')) {
57 
-      DualXMode  previous_mode, requested_mode = (DualXMode)parser.value_byte();
58 
-      previous_mode = dual_x_carriage_mode;
58 
+    if (parser.seen('S')) {
59 59 
       dual_x_carriage_mode = (DualXMode)parser.value_byte();
60 60
61 
-    switch (dual_x_carriage_mode) {
62 
-      case DXC_FULL_CONTROL_MODE:
63 
-      case DXC_AUTO_PARK_MODE:
64 
-        break;
65 
-      case DXC_DUPLICATION_MODE:
66 
-        if (parser.seen('X')) duplicate_extruder_x_offset = MAX(parser.value_linear_units(), X2_MIN_POS - x_home_pos(0));
67 
-        if (parser.seen('R')) duplicate_extruder_temp_offset = parser.value_celsius_diff();
68 
-          if (active_extruder != 0) tool_change(0);
69 
-        break;
70 
-      default:
71 
-        dual_x_carriage_mode = DEFAULT_DUAL_X_CARRIAGE_MODE;
72 
-        break;
73 
-    }
74 
-    active_extruder_parked = false;
75 
-    extruder_duplication_enabled = false;
76 
-    delayed_move_time = 0;
77 
-    } else
78 
-      if (!parser.seen('W'))  // if no S or W parameter, the DXC mode gets reset to the user's default
79 
-        dual_x_carriage_mode = DEFAULT_DUAL_X_CARRIAGE_MODE;
80 
-
81 
-    if (parser.seen('W')) {
82 
-      SERIAL_ECHO_START();
83 
-      SERIAL_ECHOPGM("IDEX mode: ");
84 61 
       switch (dual_x_carriage_mode) {
85 62 
         case DXC_FULL_CONTROL_MODE:
86 
-          SERIAL_ECHOPGM("DXC_FULL_CONTROL_MODE\n");
87 
-          break;
88 63 
         case DXC_AUTO_PARK_MODE:
89 
-          SERIAL_ECHOPGM("DXC_AUTO_PARK_MODE\n");
90 64 
           break;
91 65 
         case DXC_DUPLICATION_MODE:
92 
-          SERIAL_ECHOPGM("DXC_DUPLICATION_MODE\n");
66 
+          if (parser.seen('X')) duplicate_extruder_x_offset = MAX(parser.value_linear_units(), X2_MIN_POS - x_home_pos(0));
67 
+          if (parser.seen('R')) duplicate_extruder_temp_offset = parser.value_celsius_diff();
68 
+          if (active_extruder != 0) tool_change(0);
69 
+          break;
70 
+        default:
71 
+          dual_x_carriage_mode = DEFAULT_DUAL_X_CARRIAGE_MODE;
93 72 
           break;
94 73 
       }
95 
-      SERIAL_ECHOPGM("Active Ext: ");
96 
-      SERIAL_ECHO((int) active_extruder);
97 
-
98 
-      if (active_extruder_parked == false)
99 
-        SERIAL_ECHOPGM(" NOT ");
100 
-      SERIAL_ECHOPGM(" parked.\n");
101 
-
102 
-      SERIAL_ECHOPGM("active_extruder_x_pos: ");
103 
-      SERIAL_ECHO( current_position[X_AXIS]);
104 
-
105 
-      SERIAL_ECHOPGM("   inactive_extruder_x_pos: ");
106 
-      SERIAL_ECHO( inactive_extruder_x_pos);
107 
-
108 
-      SERIAL_ECHOPGM("\n1st extruder x_home_pos(): ");
109 
-      SERIAL_ECHO(x_home_pos(0));
110 
-      SERIAL_ECHOPGM("\n2nd extruder x_home_pos(): ");
111 
-      SERIAL_ECHO(x_home_pos(1));
112 
-
113 
-      SERIAL_ECHOPGM("\nextruder_duplication_enabled: ");
114 
-      SERIAL_ECHO(extruder_duplication_enabled);
115 
-
116 
-      SERIAL_ECHOPGM("\nduplicate_extruder_x_offset: ");
117 
-      SERIAL_ECHO(duplicate_extruder_x_offset);
118 
-
119 
-      SERIAL_ECHOPGM("\nduplicate_extruder_temp_offset: ");
120 
-      SERIAL_ECHO(duplicate_extruder_temp_offset);
74 
+      active_extruder_parked = false;
75 
+      extruder_duplication_enabled = false;
76 
+      delayed_move_time = 0;
77 
+    }
78 
+    else if (!parser.seen('W'))  // if no S or W parameter, the DXC mode gets reset to the user's default
79 
+      dual_x_carriage_mode = DEFAULT_DUAL_X_CARRIAGE_MODE;
121 80
122 
-      SERIAL_ECHOPGM("\ndelayed_move_time: ");
123 
-      SERIAL_ECHO(delayed_move_time);
124 
-      SERIAL_ECHOPGM("\n");
81 
+    if (parser.seen('W')) {
82 
+      SERIAL_ECHO_START();
83 
+      SERIAL_ECHOPGM("IDEX mode: ");
84 
+      switch (dual_x_carriage_mode) {
85 
+        case DXC_FULL_CONTROL_MODE: SERIAL_ECHOPGM("DXC_FULL_CONTROL_MODE"); break;
86 
+        case DXC_AUTO_PARK_MODE:    SERIAL_ECHOPGM("DXC_AUTO_PARK_MODE");    break;
87 
+        case DXC_DUPLICATION_MODE:  SERIAL_ECHOPGM("DXC_DUPLICATION_MODE");  break;
88 
+      }
89 
+      SERIAL_ECHOPAIR("\nActive Ext: ", int(active_extruder));
90 
+      if (!active_extruder_parked) SERIAL_ECHOPGM(" NOT ");
91 
+      SERIAL_ECHOLNPGM(" parked.");
92 
+      SERIAL_ECHOPAIR("active_extruder_x_pos: ", current_position[X_AXIS]);
93 
+      SERIAL_ECHOPAIR("   inactive_extruder_x_pos: ", inactive_extruder_x_pos);
94 
+      SERIAL_ECHOPAIR("\nT0 Home X: ", x_home_pos(0));
95 
+      SERIAL_ECHOPAIR("\nT1 Home X: ", x_home_pos(1));
96 
+      SERIAL_ECHOPAIR("\nextruder_duplication_enabled: ", int(extruder_duplication_enabled));
97 
+      SERIAL_ECHOPAIR("\nduplicate_extruder_x_offset: ", duplicate_extruder_x_offset);
98 
+      SERIAL_ECHOPAIR("\nduplicate_extruder_temp_offset: ", duplicate_extruder_temp_offset);
99 
+      SERIAL_ECHOPAIR("\ndelayed_move_time: ", delayed_move_time);
125 100 
     }
126 101 
   }
127 102

+ 7
- 8
Marlin/src/gcode/queue.cpp View File 

@@ -139,15 +139,14 @@ inline bool _enqueuecommand(const char* cmd, bool say_ok=false
139 139 
  */
140 140 
 bool enqueue_and_echo_command(const char* cmd) {
141 141
142 
-//SERIAL_ECHO("enqueue_and_echo_command(\"");
143 
-//SERIAL_ECHO(cmd);
144 
-//SERIAL_ECHO("\") \n");
145 
-//
146 
-  if ( *cmd == 0 || *cmd == '\n' || *cmd == 'r')
147 
-//{
148 
-//SERIAL_ECHO("Null command found...   Did not queue!\n");
142 
+  //SERIAL_ECHO("enqueue_and_echo_command(\"");
143 
+  //SERIAL_ECHO(cmd);
144 
+  //SERIAL_ECHO("\") \n");
145 
+
146 
+  if (*cmd == 0 || *cmd == '\n' || *cmd == 'r') {
147 
+    //SERIAL_ECHO("Null command found...   Did not queue!\n");
149 148 
     return true;
150 
-//}
149 
+  }
151 150
152 151 
   if (_enqueuecommand(cmd)) {
153 152 
     SERIAL_ECHO_START();

+ 4
- 4
Marlin/src/lcd/language/language_en.h View File 

@@ -203,16 +203,16 @@
203 203 
   #define MSG_UBL_LEVEL_BED                   _UxGT("Unified Bed Leveling")
204 204 
 #endif
205 205 
 #ifndef MSG_IDEX_MENU
206 
-  #define MSG_IDEX_MENU                       _UxGT("IDEX Mode Selection")
206 
+  #define MSG_IDEX_MENU                       _UxGT("IDEX Mode")
207 207 
 #endif
208 208 
 #ifndef MSG_IDEX_MODE_AUTOPARK
209 
-  #define MSG_IDEX_MODE_AUTOPARK              _UxGT("DXC Auto-Park mode")
209 
+  #define MSG_IDEX_MODE_AUTOPARK              _UxGT("Auto-Park")
210 210 
 #endif
211 211 
 #ifndef MSG_IDEX_MODE_DUPLICATE
212 
-  #define MSG_IDEX_MODE_DUPLICATE             _UxGT("DXC Duplication mode")
212 
+  #define MSG_IDEX_MODE_DUPLICATE             _UxGT("Duplication")
213 213 
 #endif
214 214 
 #ifndef MSG_IDEX_MODE_FULL_CTRL
215 
-  #define MSG_IDEX_MODE_FULL_CTRL             _UxGT("DXC Full control mode")
215 
+  #define MSG_IDEX_MODE_FULL_CTRL             _UxGT("Full control")
216 216 
 #endif
217 217 
 #ifndef MSG_UBL_MANUAL_MESH
218 218 
   #define MSG_UBL_MANUAL_MESH                 _UxGT("Manually Build Mesh")

+ 1
- 1
Marlin/src/lcd/ultralcd.cpp View File 

@@ -1040,7 +1040,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
1040 1040 
       MENU_ITEM(gcode, MSG_IDEX_MODE_AUTOPARK,  PSTR("M605 S1\nG28 X\nG1 X100\n"));
1041 1041 
       if (!TEST(axis_known_position, Y_AXIS) || !TEST(axis_known_position, Z_AXIS))
1042 1042 
         MENU_ITEM(gcode, MSG_IDEX_MODE_DUPLICATE, PSTR("T0\nG28\nM605 S2 X200\nG28 X\nG1 X100\n"));  // If Y or Z is not homed, a full G28 is done first.
1043 
-      else
1043 
+      else
1044 1044 
         MENU_ITEM(gcode, MSG_IDEX_MODE_DUPLICATE, PSTR("T0\nM605 S2 X200\nG28 X\nG1 X100\n"));       // If Y and Z is homed, a full G28 is not needed first.
1045 1045 
       MENU_ITEM(gcode, MSG_IDEX_MODE_FULL_CTRL, PSTR("M605 S0\nG28 X\n"));
1046 1046 
       END_MENU();

+ 6
- 6
Marlin/src/module/motion.cpp View File 

@@ -835,8 +835,8 @@ float soft_endstop_min[XYZ] = { X_MIN_BED, Y_MIN_BED, Z_MIN_POS },
835 835 
 #endif // !UBL_SEGMENTED
836 836
837 837 
 #if ENABLED(DUAL_X_CARRIAGE) || ENABLED(DUAL_NOZZLE_DUPLICATION_MODE)
838 
-  bool extruder_duplication_enabled = false;                              // Used in Dual X mode 2 & 3
839 
-  bool symmetric_duplication_mode   = false;                              // Used in Dual X mode 2 & 3
838 
+  bool extruder_duplication_enabled = false,                              // Used in Dual X mode 2 & 3
839 
+       symmetric_duplication_mode   = false;                              // Used in Dual X mode 2 & 3
840 840 
 #endif
841 841
842 842 
 #if ENABLED(DUAL_X_CARRIAGE)
 
@@ -894,11 +894,11 @@ float soft_endstop_min[XYZ] = { X_MIN_BED, Y_MIN_BED, Z_MIN_POS },
894 894 
             #define RAISED_Y raised_parked_position[Y_AXIS]
895 895 
             #define RAISED_Z raised_parked_position[Z_AXIS]
896 896
897 
-SERIAL_ECHOLNPGM("dual_x_carriage_unpark()\n");
897 
+            //SERIAL_ECHOLNPGM("dual_x_carriage_unpark()\n");
898 898
899 
-            if (planner.buffer_line(RAISED_X, RAISED_Y, RAISED_Z, CUR_E, planner.max_feedrate_mm_s[Z_AXIS], active_extruder))
900 
-              if (planner.buffer_line( CUR_X,    CUR_Y, RAISED_Z, CUR_E, PLANNER_XY_FEEDRATE(),             active_extruder))
901 
-                  planner.buffer_line( CUR_X,    CUR_Y,    CUR_Z, CUR_E, planner.max_feedrate_mm_s[Z_AXIS], active_extruder);
899 
+            if (  planner.buffer_line(RAISED_X, RAISED_Y, RAISED_Z, CUR_E, planner.max_feedrate_mm_s[Z_AXIS], active_extruder))
900 
+              if (planner.buffer_line(   CUR_X,    CUR_Y, RAISED_Z, CUR_E, PLANNER_XY_FEEDRATE(),             active_extruder))
901 
+                  planner.buffer_line(   CUR_X,    CUR_Y,    CUR_Z, CUR_E, planner.max_feedrate_mm_s[Z_AXIS], active_extruder);
902 902 
           delayed_move_time = 0;
903 903 
           active_extruder_parked = false;
904 904 
           #if ENABLED(DEBUG_LEVELING_FEATURE)

+ 3
- 3
Marlin/src/module/motion.h View File 

@@ -306,8 +306,8 @@ void homeaxis(const AxisEnum axis);
306 306 
  * Dual X Carriage / Dual Nozzle
307 307 
  */
308 308 
 #if ENABLED(DUAL_X_CARRIAGE) || ENABLED(DUAL_NOZZLE_DUPLICATION_MODE)
309 
-  extern bool extruder_duplication_enabled;       // Used in Dual X mode 2
310 
-  extern bool symmetric_duplication_mode;         // Used in Dual X mode 2
309 
+  extern bool extruder_duplication_enabled,       // Used in Dual X mode 2
310 
+              symmetric_duplication_mode;         // Used in Dual X mode 2
311 311 
 #endif
312 312
313 313 
 /**
 
@@ -318,7 +318,7 @@ void homeaxis(const AxisEnum axis);
318 318 
   enum DualXMode : char {
319 319 
     DXC_FULL_CONTROL_MODE,  // DUAL_X_CARRIAGE only
320 320 
     DXC_AUTO_PARK_MODE,     // DUAL_X_CARRIAGE only
321 
-    DXC_DUPLICATION_MODE,
321 
+    DXC_DUPLICATION_MODE
322 322 
   };
323 323
324 324 
   extern DualXMode dual_x_carriage_mode;

+ 1
- 4
Marlin/src/module/stepper.cpp View File 

@@ -231,10 +231,7 @@ int8_t Stepper::count_direction[NUM_AXIS] = { 0, 0, 0, 0 };
231 231 
   #define X_APPLY_DIR(v,ALWAYS) \
232 232 
     if (extruder_duplication_enabled || ALWAYS) { \
233 233 
       X_DIR_WRITE(v); \
234 
-      if (symmetric_duplication_mode) \
235 
-        X2_DIR_WRITE(!v); \
236 
-      else \
237 
-      X2_DIR_WRITE(v); \
234 
+      X2_DIR_WRITE(bool(v)); \
238 235 
     } \
239 236 
     else { \
240 237 
       if (movement_extruder()) X2_DIR_WRITE(v); else X_DIR_WRITE(v); \

+ 3
- 2
Marlin/src/module/tool_change.cpp View File 

@@ -332,9 +332,10 @@ inline void invalid_extruder_error(const uint8_t e) {
332 332 
 void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool no_move/*=false*/) {
333 333 
   planner.synchronize();
334 334
335 
-  #if ENABLED(DUAL_X_CARRIAGE)  // Only T0 allowed if the Printer is in DXC_DUPLICATION_MODE
335 
+  #if ENABLED(DUAL_X_CARRIAGE)
336 
+    // Only T0 allowed in DXC_DUPLICATION_MODE
336 337 
     if (tmp_extruder != 0 && dual_x_carriage_mode == DXC_DUPLICATION_MODE)
337 
-       return invalid_extruder_error(tmp_extruder);
338 
+       return invalid_extruder_error(tmp_extruder);
338 339 
   #endif
339 340
340 341 
   #if HAS_LEVELING

Write Preview
Loading…
Cancel
Save