Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bug…

…fix-ColorUI
effgarces · Sep 1, 2020 · daf5ed2 · daf5ed2
2 parents 8672e36 + 2979da7
commit daf5ed2
Show file tree

Hide file tree

Showing 12 changed files with 134 additions and 38 deletions.
diff --git a/Marlin/src/feature/leds/neopixel.h b/Marlin/src/feature/leds/neopixel.h
@@ -110,7 +110,7 @@ class Marlin_NeoPixel {
  #if CONJOINED_NEOPIXEL
  adaneo2.show();
  #else
- adaneo1.setPin(NEOPIXEL2_PIN);
+ TERN_(NEOPIXEL2_SEPARATE,,adaneo1.setPin(NEOPIXEL2_PIN));
  adaneo1.show();
  adaneo1.setPin(NEOPIXEL_PIN);
  #endif
@@ -133,7 +133,7 @@ extern Marlin_NeoPixel neo;
 
 // Neo pixel channel 2
 #if ENABLED(NEOPIXEL2_SEPARATE)
- 
+
  #if NEOPIXEL2_TYPE == NEO_RGB || NEOPIXEL2_TYPE == NEO_RBG || NEOPIXEL2_TYPE == NEO_GRB || NEOPIXEL2_TYPE == NEO_GBR || NEOPIXEL2_TYPE == NEO_BRG || NEOPIXEL2_TYPE == NEO_BGR
  #define NEOPIXEL2_IS_RGB 1
  #else
@@ -161,7 +161,10 @@ extern Marlin_NeoPixel neo;
  static inline void begin() { adaneo.begin(); }
  static inline void set_pixel_color(const uint16_t n, const uint32_t c) { adaneo.setPixelColor(n, c); }
  static inline void set_brightness(const uint8_t b) { adaneo.setBrightness(b); }
- static inline void show() { adaneo.show(); }
+ static inline void show() {
+ adaneo.show();
+ adaneo.setPin(NEOPIXEL2_PIN);
+ }
 
  // Accessors
  static inline uint16_t pixels() { return adaneo.numPixels();}

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
@@ -780,8 +780,3 @@
 #ifndef EXTRUDE_MINTEMP
  #define EXTRUDE_MINTEMP 170
 #endif
-
-// This flag indicates if Neopixel pins are shared or separated 
-#if EITHER(MULTIPLE_NEOPIXEL_TYPES, NEOPIXEL2_INSERIES)
- #define CONJOINED_NEOPIXEL 1
-#endif
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
- #define STRING_DISTRIBUTION_DATE "2020-08-28"
+ #define STRING_DISTRIBUTION_DATE "2020-09-01"
 #endif
 
 /**

diff --git a/Marlin/src/lcd/extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.cpp b/Marlin/src/lcd/extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.cpp
@@ -28,6 +28,7 @@
 #include "../../../../inc/MarlinConfig.h"
 #include "../../ui_api.h"
 #include "../../../../MarlinCore.h" // for quickstop_stepper and disable_steppers
+#include "../../../../module/motion.h" // for A20 read printing speed feedrate_percentage
 
 // command sending macro's with debugging capability
 #define SEND_PGM(x) send_P(PSTR(x))
@@ -412,6 +413,7 @@ void AnycubicTFTClass::RenderCurrentFileList() {
  uint16_t selectedNumber = 0;
  SelectedDirectory[0] = 0;
  SelectedFile[0] = 0;
+ ExtUI::FileList currentFileList; 
 
  SENDLINE_PGM("FN "); // Filelist start
 
@@ -427,7 +429,7 @@ void AnycubicTFTClass::RenderCurrentFileList() {
 
  if (SpecialMenu)
  RenderSpecialMenu(selectedNumber);
- else
+ else if (selectedNumber <= currentFileList.count())
  RenderCurrentFolder(selectedNumber);
  }
  SENDLINE_PGM("END"); // Filelist stop
@@ -804,7 +806,6 @@ void AnycubicTFTClass::GetCommandFromTFT() {
  break;
 
  case 20: { // A20 read printing speed
- int16_t feedrate_percentage = 100;
 
  if (CodeSeen('S'))
  feedrate_percentage = constrain(CodeValue(), 40, 999);

diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
@@ -527,7 +527,7 @@ namespace Language_cz {
  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER = _UxGT("Vytáhněte, klikněte");
 
  PROGMEM Language_Str MSG_MIX = _UxGT("Mix");
- PROGMEM Language_Str MSG_MIX_COMPONENT_N = _UxGT("Komponenta ~");
+ PROGMEM Language_Str MSG_MIX_COMPONENT_N = _UxGT("Komponenta =");
  PROGMEM Language_Str MSG_MIXER = _UxGT("Mixér");
  PROGMEM Language_Str MSG_GRADIENT = _UxGT("Přechod");
  PROGMEM Language_Str MSG_FULL_GRADIENT = _UxGT("Celý přechod");

diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
@@ -508,7 +508,7 @@ namespace Language_fr {
  PROGMEM Language_Str MSG_MMU2_RESETTING = _UxGT("Réinit. MMU...");
  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER = _UxGT("Retrait, click");
 
- PROGMEM Language_Str MSG_MIX_COMPONENT_N = _UxGT("Composante ~");
+ PROGMEM Language_Str MSG_MIX_COMPONENT_N = _UxGT("Composante =");
  PROGMEM Language_Str MSG_MIXER = _UxGT("Mixeur");
  PROGMEM Language_Str MSG_GRADIENT = _UxGT("Dégradé");
  PROGMEM Language_Str MSG_FULL_GRADIENT = _UxGT("Dégradé complet");

diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
@@ -561,7 +561,7 @@ namespace Language_it {
  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER = _UxGT("Rimuovi, click");
 
  PROGMEM Language_Str MSG_MIX = _UxGT("Miscela");
- PROGMEM Language_Str MSG_MIX_COMPONENT_N = _UxGT("Componente ~");
+ PROGMEM Language_Str MSG_MIX_COMPONENT_N = _UxGT("Componente =");
  PROGMEM Language_Str MSG_MIXER = _UxGT("Miscelatore");
  PROGMEM Language_Str MSG_GRADIENT = _UxGT("Gradiente");
  PROGMEM Language_Str MSG_FULL_GRADIENT = _UxGT("Gradiente pieno");

diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
@@ -500,7 +500,7 @@ namespace Language_pl {
  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER = _UxGT("Usuń, kliknij");
 
  PROGMEM Language_Str MSG_MIX = _UxGT("Miks");
- PROGMEM Language_Str MSG_MIX_COMPONENT_N = _UxGT("Komponent ~");
+ PROGMEM Language_Str MSG_MIX_COMPONENT_N = _UxGT("Komponent =");
  PROGMEM Language_Str MSG_MIXER = _UxGT("Mikser");
  PROGMEM Language_Str MSG_GRADIENT = _UxGT("Gradient");
  PROGMEM Language_Str MSG_FULL_GRADIENT = _UxGT("Pełny gradient");

diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
@@ -551,7 +551,7 @@ namespace Language_sk {
  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER = _UxGT("Odstráňte, kliknite");
 
  PROGMEM Language_Str MSG_MIX = _UxGT("Mix");
- PROGMEM Language_Str MSG_MIX_COMPONENT_N = _UxGT("Zložka ~");
+ PROGMEM Language_Str MSG_MIX_COMPONENT_N = _UxGT("Zložka =");
  PROGMEM Language_Str MSG_MIXER = _UxGT("Mixér");
  PROGMEM Language_Str MSG_GRADIENT = _UxGT("Gradient");
  PROGMEM Language_Str MSG_FULL_GRADIENT = _UxGT("Plný gradient");

diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -138,8 +138,9 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
  SUBMENU_N_P(s, msg, []{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, MenuItemBase::itemIndex); });
  else {
  ACTION_ITEM_N_P(s, msg, []{
- char cmd[13];
- sprintf_P(cmd, PSTR("M600 B0 T%i"), int(MenuItemBase::itemIndex));
+ PGM_P const cmdpstr = PSTR("M600 B0 T%i");
+ char cmd[strlen_P(cmdpstr) + 3 + 1];
+ sprintf_P(cmd, cmdpstr, int(MenuItemBase::itemIndex));
  queue.inject(cmd);
  });
  }

diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -194,10 +194,18 @@
 // LVGL Configs
 #if ENABLED(TFT_LVGL_UI_FSMC)
 
- #define XPT2046_X_CALIBRATION 17880
- #define XPT2046_Y_CALIBRATION -12234
- #define XPT2046_X_OFFSET -45
- #define XPT2046_Y_OFFSET 349
+ #ifndef XPT2046_X_CALIBRATION
+ #define XPT2046_X_CALIBRATION 17880
+ #endif
+ #ifndef XPT2046_Y_CALIBRATION
+ #define XPT2046_Y_CALIBRATION -12234
+ #endif
+ #ifndef XPT2046_X_OFFSET
+ #define XPT2046_X_OFFSET -45
+ #endif
+ #ifndef XPT2046_Y_OFFSET
+ #define XPT2046_Y_OFFSET 349
+ #endif
 
 // Emulated DOGM Configs
 #elif ENABLED(FSMC_GRAPHICAL_TFT)
@@ -244,10 +252,18 @@
  #define FSMC_DMA_DEV DMA2
  #define FSMC_DMA_CHANNEL DMA_CH5
 
- #define XPT2046_X_CALIBRATION -12246
- #define XPT2046_Y_CALIBRATION 9453
- #define XPT2046_X_OFFSET 360
- #define XPT2046_Y_OFFSET -22
+ #ifndef XPT2046_X_CALIBRATION
+ #define XPT2046_X_CALIBRATION -12246
+ #endif
+ #ifndef XPT2046_Y_CALIBRATION
+ #define XPT2046_Y_CALIBRATION 9453
+ #endif
+ #ifndef XPT2046_X_OFFSET
+ #define XPT2046_X_OFFSET 360
+ #endif
+ #ifndef XPT2046_Y_OFFSET
+ #define XPT2046_Y_OFFSET -22
+ #endif
 
  #define TOUCH_CS_PIN PA7 // SPI2_NSS
  #define TOUCH_SCK_PIN PB13 // SPI2_SCK
@@ -265,11 +281,19 @@
  #define ILI9341_COLOR_RGB
 
 #elif ENABLED(TFT_480x320)
- #define XPT2046_X_CALIBRATION 17880
- #define XPT2046_Y_CALIBRATION -12234
- #define XPT2046_X_OFFSET -45
- #define XPT2046_Y_OFFSET 349
-
+ #ifndef XPT2046_X_CALIBRATION
+ #define XPT2046_X_CALIBRATION 17880
+ #endif
+ #ifndef XPT2046_Y_CALIBRATION
+ #define XPT2046_Y_CALIBRATION -12234
+ #endif
+ #ifndef XPT2046_X_OFFSET
+ #define XPT2046_X_OFFSET -45
+ #endif
+ #ifndef XPT2046_Y_OFFSET
+ #define XPT2046_Y_OFFSET 349
+ #endif
+
  #define TFT_DRIVER ILI9488
  #define TFT_BUFFER_SIZE 14400
  #define ILI9488_ORIENTATION ILI9488_MADCTL_MX | ILI9488_MADCTL_MV