Merge remote-tracking branch 'refs/remotes/origin/master' into dev

Documentation/changelog.md

 ### Version 4.2.8
 * Add board folder with files of various board containing the pins
+* Add End time on Graphics display when SD print
 * Rewrite macros
 * Fix M109 so it won't wait for cooling
 * Clear code

MK/module/lcd/dogm_bitmaps.h

@@ -38,6 +38,62 @@
 // be displayed.
 
 #if HOTENDS == 1
+  #ifdef COLOR_MIXING_EXTRUDER
+  	#define STATUS_SCREENWIDTH     115 //Width in pixels
+    #define STATUS_SCREENHEIGHT     19 //Height in pixels
+    #define STATUS_SCREENBYTEWIDTH  15 //Width in bytes
+    const unsigned char status_screen0_bmp[] PROGMEM = {
+      0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 127, 255, 224,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112, 0, 224, 0,
+      0, 0, 0, 0, 0, 	0, 0, 0, 0, 0, 0, 99, 252, 96, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 67, 252, 32, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 240, 32, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 64, 96, 32, 31, 192, 15, 224,
+      7, 240, 3, 248, 0, 0, 0, 0, 88, 1, 160, 249, 240, 124,
+      120, 61, 220, 30, 238, 0, 65, 4, 0, 92, 99, 160, 246,
+      240, 123, 248, 60, 156, 31, 94, 0, 32, 130, 0, 94, 247,
+      160, 246, 240, 123, 248, 61, 92, 31, 190, 0, 32, 130,
+      0, 94, 247, 160, 49, 192, 27, 224, 13, 208, 7, 184, 0,
+      65, 4, 0, 92, 99, 160, 54, 192, 27, 224, 13, 208, 7,
+      184, 0, 130, 8, 0, 88,1, 160, 246, 240, 123, 248, 61,
+      220, 31, 190, 1, 4, 16, 0, 64, 96, 32, 241, 240, 124,
+      120, 61, 220, 31, 190, 1, 4, 16, 0, 64, 240, 32, 255,
+      240, 127, 248, 63, 252, 31, 254, 0, 130, 8, 0, 65, 248,
+      32, 31, 192, 15, 224, 7, 240, 3, 248, 0, 65, 4, 0, 97,
+      248, 96, 15, 128, 7, 192, 3, 224, 1, 240, 0, 0, 0, 0,
+      112, 0, 224, 7, 0, 3, 128, 1, 192, 0, 224, 1, 255, 255,
+      128, 127, 255, 224, 0, 0, 0, 0, 0, 0, 0, 0, 1, 255,
+      255, 128, 0, 0, 0
+    };
+
+    #define STATUS_SCREENWIDTH     115 //Width in pixels
+    #define STATUS_SCREENHEIGHT     19 //Height in pixels
+    #define STATUS_SCREENBYTEWIDTH  15 //Width in bytes
+    const unsigned char status_screen1_bmp[] PROGMEM = {
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 255, 224,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112, 0, 224, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 103, 14, 96, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 79, 15, 32, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 95, 15, 160, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 95, 15, 160, 31, 192, 15,
+      224, 7, 240, 3, 248, 0, 0, 0, 0, 95, 15, 160, 249,
+      240, 124, 120, 61, 220, 30, 238, 0, 65, 4, 0, 64,
+      240, 32, 246, 240, 123, 248, 60, 156, 31, 94, 0, 32,
+      130, 0, 64, 240, 32, 246, 240, 123, 248, 61, 92, 31,
+      190, 0, 32, 130, 0, 64, 240, 32, 49, 192, 27, 224,
+      13, 208, 7, 184, 0, 65, 4, 0, 64, 240, 32, 54, 192,
+      27, 224, 13, 208, 7, 184, 0, 130, 8, 0, 95, 15, 160,
+      246, 240, 123, 248, 61, 220, 31, 190, 1, 4, 16, 0, 95,
+      15, 160, 241, 240, 124, 120, 61, 220, 31, 190, 1, 4,
+      16, 0, 95, 15, 160, 255, 240, 127, 248, 63, 252, 31,
+      254, 0, 130, 8, 0, 79, 15, 32, 31, 192, 15, 224, 7,
+      240, 3, 248, 0, 65, 4, 0, 103, 14, 96, 15, 128, 7,
+      192, 3, 224, 1, 240, 0, 0, 0, 0, 112, 0, 224, 7, 0,
+      3, 128, 1, 192, 0, 224, 1, 255, 255, 128, 127, 255,
+      224, 0, 0, 0, 0, 0, 0, 0, 0, 1, 255, 255, 128, 0,
+      0, 0
+    };
+  #else // no COLOR_MIXING_EXTRUDER
     #define STATUS_SCREENWIDTH     115 //Width in pixels
     #define STATUS_SCREENHEIGHT     19 //Height in pixels
     #define STATUS_SCREENBYTEWIDTH  15 //Width in bytes
@@ -87,6 +143,7 @@
       0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0x80, 0x7F, 0xFF, 0xE0,
       0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0x80, 0x00, 0x00, 0x00
     };
+  #endif // no COLOR_MIXING_EXTRUDER
 #elif HOTENDS == 2
   #define STATUS_SCREENWIDTH     115 //Width in pixels
   #define STATUS_SCREENHEIGHT     19 //Height in pixels

MK/module/lcd/dogm_lcd_implementation.h

@@ -308,28 +308,56 @@ static void lcd_implementation_status_screen() {
       u8g.drawBox(55, 50, (unsigned int)(71.f * card.percentDone() / 100.f), 2 - TALL_FONT_CORRECTION);
     }
 
-    u8g.setPrintPos(80, 48);
+    u8g.setPrintPos(53, 47);
     if (print_job_start_ms != 0) {
       #if HAS(LCD_POWER_SENSOR)
         if (millis() < print_millis + 1000) {
           uint16_t time = (millis() - print_job_start_ms) / 60000;
+          uint16_t end_time = (time * (100 - card.percentDone())) / card.percentDone();
+          lcd_print('S');
           lcd_print(itostr2(time/60));
           lcd_print(':');
           lcd_print(itostr2(time%60));
+
+          u8g.setPrintPos(90,47);
+
+          if (end_time > 1380 || end_time == 0)
+            u8g.print('E--:--');
+          else if (end_time > 0) {
+            u8g.print('E');
+            u8g.print(itostr2(end_time / 60));
+            u8g.print(':');
+            u8g.print(itostr2(end_time %60));
+          }
         }
         else {
-          lcd_print(itostr4(power_consumption_hour-startpower));
+          lcd_print(itostr4(power_consumption_hour - startpower));
           lcd_print((char*)"Wh");
         }
       #else
         uint16_t time = (millis() - print_job_start_ms) / 60000;
+        uint16_t end_time = (time * (100 - card.percentDone())) / card.percentDone();
+        lcd_print('S');
         lcd_print(itostr2(time / 60));
         lcd_print(':');
-        lcd_print(itostr2(time % 60));
+        lcd_print(itostr2(time %60));
+
+        u8g.setPrintPos(90,47);
+
+        if (end_time > (60 * 23))
+          u8g.print('E--:--');
+        else if (end_time >= 0) {
+          u8g.print('E');
+          u8g.print(itostr2(end_time / 60));
+          u8g.print(':');
+          u8g.print(itostr2(end_time %60));
+        }
       #endif
     }
     else {
-      lcd_printPGM(PSTR("--:--"));
+      lcd_printPGM(PSTR("S--:--"));
+      u8g.setPrintPos(90,47);
+      lcd_printPGM(PSTR("E--:--"));
     }
   #endif
 

MK/module/motion/planner.cpp

@@ -614,7 +614,7 @@ float junction_deviation = 0.1;
   // For a mixing extruder, get steps for each
   #if ENABLED(COLOR_MIXING_EXTRUDER)
     for (uint8_t i = 0; i < DRIVER_EXTRUDERS; i++)
-      block->mix_steps[i] = block->steps[E_AXIS] * mixing_factor[i];
+      block->mix_event_count[i] = block->step_event_count / mixing_factor[i];
   #endif
 
   // Add update block variables for LASER BEAM control 

MK/module/motion/planner.h

@@ -31,7 +31,7 @@ typedef struct {
   long steps[NUM_AXIS];                     // Step count along each axis
 
   #if ENABLED(COLOR_MIXING_EXTRUDER)
-    float mix_steps[DRIVER_EXTRUDERS];      // Step count for each stepper in a mixing extruder
+    unsigned long mix_event_count[DRIVER_EXTRUDERS];  // Step count for each stepper in a mixing extruder
   #endif
 
   unsigned long step_event_count;           // The number of step events required to complete this block

MK/module/motion/stepper.cpp

@@ -658,7 +658,8 @@ ISR(TIMER1_COMPA_vect) {
       counter_x = counter_y = counter_z = counter_e = new_count;
 
       #if ENABLED(COLOR_MIXING_EXTRUDER)
-        for (int8_t i = 0; i < DRIVER_EXTRUDERS; i++) counter_m[i] = new_count;
+        for (uint8_t i = 0; i < DRIVER_EXTRUDERS; i++)
+          counter_m[i] = -(current_block->mix_event_count[i] >> 1);
       #endif
 
       step_events_completed = 0;
@@ -703,9 +704,9 @@ ISR(TIMER1_COMPA_vect) {
         #if ENABLED(COLOR_MIXING_EXTRUDER)
           long dir = TEST(out_bits, E_AXIS) ? -1 : 1;
           for (uint8_t j = 0; j < DRIVER_EXTRUDERS; j++) {
-            counter_m[j] += current_block->mix_steps[j];
+            counter_m[j] += current_block->steps[E_AXIS];
             if (counter_m[j] > 0) {
-              counter_m[j] -= current_block->step_event_count;
+              counter_m[j] -= current_block->mix_event_count[j];
               e_steps[j] += dir;
             }
           }
@@ -726,14 +727,10 @@ ISR(TIMER1_COMPA_vect) {
       #if DISABLED(ADVANCE)
         #if ENABLED(COLOR_MIXING_EXTRUDER)
           counter_e += current_block->steps[E_AXIS];
-          if (counter_e > 0) {
           for (uint8_t j = 0; j < DRIVER_EXTRUDERS; j++) {
-              counter_m[j] += current_block->mix_steps[j];
+            counter_m[j] += current_block->steps[E_AXIS];
             if (counter_m[j] > 0) En_STEP_WRITE(j, !INVERT_E_STEP_PIN);
           }
-            counter_e -= current_block->step_event_count;
-            count_position[E_AXIS] += count_direction[E_AXIS];
-          }
         #else
           STEP_START(e, E);
         #endif
@@ -755,6 +752,11 @@ ISR(TIMER1_COMPA_vect) {
       STEP_END(z, Z);
       #if DISABLED(ADVANCE)
         #if ENABLED(COLOR_MIXING_EXTRUDER)
+          // Always count the single E axis
+          if (counter_e > 0) {
+            counter_e -= current_block->step_event_count;
+            count_position[E_AXIS] += count_direction[E_AXIS];
+          }
           for (uint8_t j = 0; j < DRIVER_EXTRUDERS; j++) {
             if (counter_m[j] > 0) {
               counter_m[j] -= current_block->step_event_count;
@@ -791,7 +793,14 @@ ISR(TIMER1_COMPA_vect) {
         //NOLESS(advance, current_block->advance);
 
         // Do E steps + advance steps
+        #if ENABLED(COLOR_MIXING_EXTRUDER)
+          // Move mixing steppers proportionally
+          for (uint8_t j = 0; j < DRIVER_EXTRUDERS; j++)
+            e_steps[j] += ((advance >> 8) - old_advance) * current_block->step_event_count / current_block->mix_event_count[j];
+        #else
           e_steps[current_block->active_driver] += ((advance >> 8) - old_advance);
+        #endif
+
         old_advance = advance >> 8;
 
       #endif // ADVANCE
@@ -819,7 +828,14 @@ ISR(TIMER1_COMPA_vect) {
 
         // Do E steps + advance steps
         uint32_t advance_whole = advance >> 8;
+
+        #if ENABLED(MIXING_EXTRUDER_FEATURE)
+          for (uint8_t j = 0; j < DRIVER_EXTRUDERS; j++)
+            e_steps[current_block->active_driver] += (advance_whole - old_advance) * current_block->mix_factor[j];
+        #else
           e_steps[current_block->active_driver] += advance_whole - old_advance;
+        #endif
+
         old_advance = advance_whole;
       #endif //ADVANCE
     }

MK/module/nextion/NexObject.cpp

@@ -55,4 +55,3 @@ void NexObject::printObjInfo(void)
     }
     dbSerialPrintln("]");
 }
-

MK/module/nextion/NexPicture.cpp

@@ -43,3 +43,22 @@ bool NexPicture::setPic(uint32_t number)
     return recvRetCommandFinished();
 }
 
+bool NexPicture::setHide()
+{
+    String cmd;
+    cmd += "vis ";
+    cmd += getObjName();
+    cmd += ",0";
+    sendCommand(cmd.c_str());
+    return recvRetCommandFinished();
+}
+
+bool NexPicture::setShow()
+{
+    String cmd;
+    cmd += "vis ";
+    cmd += getObjName();
+    cmd += ",1";
+    sendCommand(cmd.c_str());
+    return recvRetCommandFinished();
+}

MK/module/nextion/NexPicture.h

@@ -54,6 +54,14 @@ public: /* methods */
      * @retval false - failed.
      */
     bool setPic(uint32_t number);
+
+    /**
+     * Set Hide / Show component
+     *
+     * @return true if success, false for failure.
+     */
+    bool setHide();
+    bool setShow();
 };
 
 /**

MK/module/nextion/NexText.cpp

@@ -53,3 +53,23 @@ bool NexText::setColor(uint32_t value)
     sendCommand(cmd.c_str());
     return recvRetCommandFinished();
 }
+
+bool NexText::setHide()
+{
+    String cmd;
+    cmd += "vis ";
+    cmd += getObjName();
+    cmd += ",0";
+    sendCommand(cmd.c_str());
+    return recvRetCommandFinished();
+}
+
+bool NexText::setShow()
+{
+    String cmd;
+    cmd += "vis ";
+    cmd += getObjName();
+    cmd += ",1";
+    sendCommand(cmd.c_str());
+    return recvRetCommandFinished();
+}

MK/module/nextion/NexText.h

@@ -52,6 +52,14 @@ public: /* methods */
      */
     bool setText(const char *buffer);
     bool setColor(uint32_t value);
+
+    /**
+     * Set Hide / Show component
+     *
+     * @return true if success, false for failure.
+     */
+    bool setHide();
+    bool setShow();
 };
 
 /**

MK/module/nextion/NexTouch.cpp

@@ -92,4 +92,3 @@ void NexTouch::iterate(NexTouch **list, uint8_t pid, uint8_t cid, int32_t event)
         }
     }
 }
-

MK/module/nextion/Nextion_lcd.h

@@ -2,7 +2,7 @@
   #define NEXTIONLCD_H
 
   #if ENABLED(NEXTION)
-    #define LCD_UPDATE_INTERVAL 5000
+    #define LCD_UPDATE_INTERVAL 4000
 
     void ExitPopCallback(void *ptr);
     void setpagePopCallback(void *ptr);
@@ -25,6 +25,7 @@
     #endif
 
     #if ENABLED(SDSUPPORT)
+      void setpageSDPopCallback(void *ptr);
       void sdlistPopCallback(void *ptr);
       void sdfilePopCallback(void *ptr);
       void sdfolderPopCallback(void *ptr);