Added Event LED + Portrait Mode for TFT24/TFT35 variants，TFT43/50/70 …

…still Not available because of menu layout (bigtreetech#2286)
kisslorand · Dec 24, 2021 · 99e230a · 99e230a
1 parent e069f7a
commit 99e230a
Show file tree

Hide file tree

Showing 143 changed files with 1,257 additions and 657 deletions.
diff --git a/.github/workflows/buildBinary.yml b/.github/workflows/buildBinary.yml
@@ -54,8 +54,6 @@ jobs:
         run: platformio run --environment BIGTREE_TFT28_V3_0
       - name: Build TFT24 V1.1
         run: platformio run --environment BIGTREE_TFT24_V1_1
-      - name: Build TFT24 V1.1 P
-        run: platformio run --environment BIGTREE_TFT24_V1_1_P
       - name: Build GD_TFT24 V1.1   
         run: platformio run --environment BIGTREE_GD_TFT24_V1_1
       - name: Build MKS TFT32 V1.3

diff --git a/.github/workflows/buildTest.yml b/.github/workflows/buildTest.yml
@@ -58,8 +58,6 @@ jobs:
         run: platformio run --environment BIGTREE_TFT28_V3_0
       - name: Build TFT24 V1.1
         run: platformio run --environment BIGTREE_TFT24_V1_1
-      - name: Build TFT24 V1.1 P
-        run: platformio run --environment BIGTREE_TFT24_V1_1_P
       - name: Build MKS TFT32 V1.3
         run: platformio run --environment MKS_TFT32_V1_3
       - name: Build MKS TFT32 V1.4

diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1_P.27.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1_P.27.x.bin
diff --git a/Copy to SD Card root directory to update/Language Packs/language_am.ini b/Copy to SD Card root directory to update/Language Packs/language_am.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:Emulated M600
 label_emulated_m109_m190:Emulated M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:File comment parsing
 label_rotated_ui:Rotate UI
 label_language:Հայերեն

diff --git a/Copy to SD Card root directory to update/Language Packs/language_ca.ini b/Copy to SD Card root directory to update/Language Packs/language_ca.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:Emulated M600
 label_emulated_m109_m190:Emulated M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:File comment parsing
 label_rotated_ui:Rotar
 label_language:Català

diff --git a/Copy to SD Card root directory to update/Language Packs/language_cn.ini b/Copy to SD Card root directory to update/Language Packs/language_cn.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:模拟M600
 label_emulated_m109_m190:Emulated M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:File comment parsing
 label_rotated_ui:旋转界面
 label_language:简体中文

diff --git a/Copy to SD Card root directory to update/Language Packs/language_cz.ini b/Copy to SD Card root directory to update/Language Packs/language_cz.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:Emulace M600
 label_emulated_m109_m190:Emulace M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:Analýzovat komentáře
 label_rotated_ui:Otočit UI
 label_language:Čeština

diff --git a/Copy to SD Card root directory to update/Language Packs/language_de.ini b/Copy to SD Card root directory to update/Language Packs/language_de.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:Emuliere M600
 label_emulated_m109_m190:Emulated M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:File comment parsing
 label_rotated_ui:UI drehen
 label_language:Deutsch

diff --git a/Copy to SD Card root directory to update/Language Packs/language_en.ini b/Copy to SD Card root directory to update/Language Packs/language_en.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:Emulated M600
 label_emulated_m109_m190:Emulated M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:File comment parsing
 label_rotated_ui:Rotate UI
 label_language:English

diff --git a/Copy to SD Card root directory to update/Language Packs/language_es.ini b/Copy to SD Card root directory to update/Language Packs/language_es.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:Emulated M600
 label_emulated_m109_m190:Emulated M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:File comment parsing
 label_rotated_ui:Rotar
 label_language:Español

diff --git a/Copy to SD Card root directory to update/Language Packs/language_fr.ini b/Copy to SD Card root directory to update/Language Packs/language_fr.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:Emuler M600
 label_emulated_m109_m190:Emulated M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:File comment parsing
 label_rotated_ui:Rotation
 label_language:Français

diff --git a/Copy to SD Card root directory to update/Language Packs/language_gr.ini b/Copy to SD Card root directory to update/Language Packs/language_gr.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:Emulated M600
 label_emulated_m109_m190:Emulated M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:File comment parsing
 label_rotated_ui:Περιστροφή UI
 label_language:Ελληνικά

diff --git a/Copy to SD Card root directory to update/Language Packs/language_hu.ini b/Copy to SD Card root directory to update/Language Packs/language_hu.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:Emulált M600
 label_emulated_m109_m190:Emulált M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:Fájl megjegyzés elemzése
 label_rotated_ui:Forgatás
 label_language:Magyar

diff --git a/Copy to SD Card root directory to update/Language Packs/language_it.ini b/Copy to SD Card root directory to update/Language Packs/language_it.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:M600 emulato
 label_emulated_m109_m190:M109 / M190 emulati
+label_event_led:LED evento
 label_file_comment_parsing:Analisi commenti su file
 label_rotated_ui:Ruota
 label_language:Italiano

diff --git a/Copy to SD Card root directory to update/Language Packs/language_jp.ini b/Copy to SD Card root directory to update/Language Packs/language_jp.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:Emulated M600
 label_emulated_m109_m190:Emulated M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:File comment parsing
 label_rotated_ui:回転UI
 label_language:日本語

diff --git a/Copy to SD Card root directory to update/Language Packs/language_nl.ini b/Copy to SD Card root directory to update/Language Packs/language_nl.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:Emulated M600
 label_emulated_m109_m190:Emulated M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:File comment parsing
 label_rotated_ui:Draai UI
 label_language:Dutch

diff --git a/Copy to SD Card root directory to update/Language Packs/language_pl.ini b/Copy to SD Card root directory to update/Language Packs/language_pl.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:Emulowane M600
 label_emulated_m109_m190:Emulowane M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:File comment parsing
 label_rotated_ui:Obrót
 label_language:Polski

diff --git a/Copy to SD Card root directory to update/Language Packs/language_pt.ini b/Copy to SD Card root directory to update/Language Packs/language_pt.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:Emulated M600
 label_emulated_m109_m190:Emulated M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:File comment parsing
 label_rotated_ui:Rodar
 label_language:Portugues

diff --git a/Copy to SD Card root directory to update/Language Packs/language_ru.ini b/Copy to SD Card root directory to update/Language Packs/language_ru.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:Эмуляция M600
 label_emulated_m109_m190:Emulated M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:File comment parsing
 label_rotated_ui:Переворот
 label_language:Русский

diff --git a/Copy to SD Card root directory to update/Language Packs/language_sk.ini b/Copy to SD Card root directory to update/Language Packs/language_sk.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:Emulated M600
 label_emulated_m109_m190:Emulated M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:File comment parsing
 label_rotated_ui:Otočiť
 label_language:Slovensky

diff --git a/Copy to SD Card root directory to update/Language Packs/language_sl.ini b/Copy to SD Card root directory to update/Language Packs/language_sl.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:Emulated M600
 label_emulated_m109_m190:Emulated M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:File comment parsing
 label_rotated_ui:Obrni UI
 label_language:Slovenski

diff --git a/Copy to SD Card root directory to update/Language Packs/language_tc.ini b/Copy to SD Card root directory to update/Language Packs/language_tc.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:Emulated M600
 label_emulated_m109_m190:Emulated M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:File comment parsing
 label_rotated_ui:顯示方向
 label_language:正體中文

diff --git a/Copy to SD Card root directory to update/Language Packs/language_tr.ini b/Copy to SD Card root directory to update/Language Packs/language_tr.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:Emulated M600
 label_emulated_m109_m190:Emulated M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:File comment parsing
 label_rotated_ui:Döndür
 label_language:Türkçe

diff --git a/Copy to SD Card root directory to update/Language Packs/language_uk.ini b/Copy to SD Card root directory to update/Language Packs/language_uk.ini
@@ -5,6 +5,7 @@
 
 label_emulated_m600:Emulated M600
 label_emulated_m109_m190:Emulated M109 / M190
+label_event_led:Event LED
 label_file_comment_parsing:File comment parsing
 label_rotated_ui:Повернути інтерфейс
 label_language:Українська

diff --git a/...oot directory to update/THEME_Hybrid Mono Menu Material theme/TFT24/bmp/logo_portrait.bmp b/...oot directory to update/THEME_Hybrid Mono Menu Material theme/TFT24/bmp/logo_portrait.bmp
diff --git a/...oot directory to update/THEME_Hybrid Mono Menu Material theme/TFT28/bmp/logo_portrait.bmp b/...oot directory to update/THEME_Hybrid Mono Menu Material theme/TFT28/bmp/logo_portrait.bmp
diff --git a/...oot directory to update/THEME_Hybrid Mono Menu Material theme/TFT35/bmp/logo_portrait.bmp b/...oot directory to update/THEME_Hybrid Mono Menu Material theme/TFT35/bmp/logo_portrait.bmp
diff --git a/...root directory to update/THEME_Hybrid Red Menu Material theme/TFT24/bmp/logo_portrait.bmp b/...root directory to update/THEME_Hybrid Red Menu Material theme/TFT24/bmp/logo_portrait.bmp
diff --git a/...root directory to update/THEME_Hybrid Red Menu Material theme/TFT28/bmp/logo_portrait.bmp b/...root directory to update/THEME_Hybrid Red Menu Material theme/TFT28/bmp/logo_portrait.bmp
diff --git a/...root directory to update/THEME_Hybrid Red Menu Material theme/TFT35/bmp/logo_portrait.bmp b/...root directory to update/THEME_Hybrid Red Menu Material theme/TFT35/bmp/logo_portrait.bmp
diff --git a/...rd root directory to update/THEME_Rep Rap Firmware Dark theme/TFT24/bmp/logo_portrait.bmp b/...rd root directory to update/THEME_Rep Rap Firmware Dark theme/TFT24/bmp/logo_portrait.bmp
diff --git a/...rd root directory to update/THEME_Rep Rap Firmware Dark theme/TFT28/bmp/logo_portrait.bmp b/...rd root directory to update/THEME_Rep Rap Firmware Dark theme/TFT28/bmp/logo_portrait.bmp
diff --git a/...rd root directory to update/THEME_Rep Rap Firmware Dark theme/TFT35/bmp/logo_portrait.bmp b/...rd root directory to update/THEME_Rep Rap Firmware Dark theme/TFT35/bmp/logo_portrait.bmp
diff --git a/...rectory to update/THEME_The Round Miracle Menu Material theme/TFT24/bmp/logo_portrait.bmp b/...rectory to update/THEME_The Round Miracle Menu Material theme/TFT24/bmp/logo_portrait.bmp
diff --git a/...rectory to update/THEME_The Round Miracle Menu Material theme/TFT28/bmp/logo_portrait.bmp b/...rectory to update/THEME_The Round Miracle Menu Material theme/TFT28/bmp/logo_portrait.bmp
diff --git a/...rectory to update/THEME_The Round Miracle Menu Material theme/TFT35/bmp/logo_portrait.bmp b/...rectory to update/THEME_The Round Miracle Menu Material theme/TFT35/bmp/logo_portrait.bmp
diff --git a/...rd root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/logo_portrait.bmp b/...rd root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/logo_portrait.bmp
diff --git a/...rd root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/logo_portrait.bmp b/...rd root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/logo_portrait.bmp
diff --git a/...rd root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/logo_portrait.bmp b/...rd root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/logo_portrait.bmp
diff --git a/Copy to SD Card root directory to update/config.ini b/Copy to SD Card root directory to update/config.ini
@@ -113,6 +113,16 @@ emulated_m600:1
 #   Options: [disable: 0, enable: 1]
 emulated_m109_m190:1
 
+#### Event LED
+# When printing from TFT SD / TFT U Disk, the TFT periodically sets the printer's (neopixel) LED color
+# and TFT's knob LED color, if any, according to the current nozzle and bed temperatures.
+#
+# NOTE: If "emulated_m109_m190" is disabled (heating controlled by printer), the TFT cannot control the
+#       printer's (neopixel) LED during heating. It will control only the TFT's knob LED, if any.
+#
+#   Options: [disable: 0, enable: 1]
+event_led:1
+
 #### G-code File Comment Parsing
 # The TFT parses and processes extra information provided by the slicer as comments in the G-code file.
 # If enabled, the current implementation parses and processes print time and print layer information

diff --git a/Copy to SD Card root directory to update/config_rrf.ini b/Copy to SD Card root directory to update/config_rrf.ini
@@ -86,6 +86,16 @@ emulated_m600:0
 #   Options: [disable: 0, enable: 1]
 emulated_m109_m190:0
 
+#### Event LED
+# When printing from TFT SD / TFT U Disk, the TFT periodically sets the printer's (neopixel) LED color
+# and TFT's knob LED color, if any, according to the current nozzle and bed temperatures.
+#
+# NOTE: If "emulated_m109_m190" is disabled (heating controlled by printer), the TFT cannot control the
+#       printer's (neopixel) LED during heating. It will control only the TFT's knob LED, if any.
+#
+#   Options: [disable: 0, enable: 1]
+event_led:1
+
 #### G-code File Comment Parsing
 # The TFT parses and processes extra information provided by the slicer as comments in the G-code file.
 # If enabled, the current implementation parses and processes print time and print layer information

diff --git a/TFT/src/User/API/FlashStore.c b/TFT/src/User/API/FlashStore.c
@@ -3,7 +3,7 @@
 #include <string.h>
 
 #define TSC_SIGN  0x20200512  // DO NOT MODIFY
-#define PARA_SIGN 0x20211210  // (YYYYMMDD) If a new setting parameter is added,
+#define PARA_SIGN 0x20211213  // (YYYYMMDD) If a new setting parameter is added,
                               // modify here and initialize the initial value
                               // in the "initSettings()" function
 enum
@@ -68,7 +68,7 @@ void readStoredPara(void)
   else
   {
     memcpy(&infoSettings, data + (index += 4), sizeof(SETTINGS));
-    // if ((paraStatus & PARA_TSC_EXIST) == 0) infoSettings.rotated_ui = DISABLED;  // Unecessarily rotates UI to Default??
+    //if ((paraStatus & PARA_TSC_EXIST) == 0) infoSettings.rotated_ui = DISABLED;  // unecessarily rotates UI to Default?
   }
 }
 

diff --git a/TFT/src/User/API/LCD_Dimming.c b/TFT/src/User/API/LCD_Dimming.c
@@ -134,4 +134,33 @@ void LCD_CheckDimming(void)
   }
 }
 
+#ifdef LED_COLOR_PIN
+
+bool knob_led_idle = false;
+
+void LCD_SetKnobLedIdle(bool enabled)
+{
+  if (!enabled)
+  { // set infoSettings.knob_led_idle temporary to OFF
+    if (infoSettings.knob_led_idle && !knob_led_idle)
+    {
+      knob_led_idle = true;
+      infoSettings.knob_led_idle = 0;  // turn knob_led_idle off
+    }
+  }
+  else
+  { // make sure that infoSettings.knob_led_idle is back in business
+    if (knob_led_idle)
+    {
+      knob_led_idle = false;
+      infoSettings.knob_led_idle = 1;  // turn knob_led_idle on
+    }
+
+    // always restore default knob LED color
+    Knob_LED_SetColor(led_colors[infoSettings.knob_led_color], infoSettings.neopixel_pixels);
+  }
+}
+
+#endif  // LED_COLOR_PIN
+
 #endif  // LCD_LED_PWM_CHANNEL
diff --git a/TFT/src/User/API/LCD_Dimming.h b/TFT/src/User/API/LCD_Dimming.h
@@ -79,6 +79,14 @@ extern "C" {
 
 #endif  // LCD_LED_PWM_CHANNEL
 
+#if defined(LCD_LED_PWM_CHANNEL) && defined(LED_COLOR_PIN)
+  void LCD_SetKnobLedIdle(bool enabled);
+
+  #define LCD_SET_KNOB_LED_IDLE(enabled) LCD_SetKnobLedIdle(enabled)
+#else
+  #define LCD_SET_KNOB_LED_IDLE(enabled)
+#endif  // LCD_LED_PWM_CHANNEL && LED_COLOR_PIN
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/TFT/src/User/API/LED_Colors.c b/TFT/src/User/API/LED_Colors.c
@@ -29,3 +29,24 @@ const LABEL led_color_names[LED_COLOR_COUNT] = {
 };
 
 #endif  // LED_COLOR_PIN
+
+void LED_SetColor(uint8_t r, uint8_t g, uint8_t b, bool skipPrinterLed)
+{
+  if (!skipPrinterLed)
+  {
+    if (infoMachineSettings.firmwareType != FW_REPRAPFW)
+      storeCmd("M150 R%i U%i B%i P255\n", r, g, b);
+    else
+      storeCmd("M150 X2 R%i U%i B%i P255\n", r, g, b);
+  }
+
+  #ifdef LED_COLOR_PIN
+    uint32_t knobLedColor = 0;  // GRB format
+
+    knobLedColor |= (uint32_t)(g) << 16;
+    knobLedColor |= (uint32_t)(r) << 8;
+    knobLedColor |= (uint32_t)(b);
+
+    KNOB_LED_SET_COLOR(knobLedColor, infoSettings.neopixel_pixels);
+  #endif
+}
diff --git a/TFT/src/User/API/LED_Colors.h b/TFT/src/User/API/LED_Colors.h
@@ -179,6 +179,8 @@ extern "C" {
 
 #endif  // LED_COLOR_PIN
 
+void LED_SetColor(uint8_t r, uint8_t g, uint8_t b, bool skipPrinterLed);
+
 #ifdef __cplusplus
 }
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -179,6 +179,8 @@ extern "C" { @@
     #endif  // LED_COLOR_PIN
+    void LED_SetColor(uint8_t r, uint8_t g, uint8_t b, bool skipPrinterLed);
     #ifdef __cplusplus
     }
     #endif
@@ Expand Down @@