Merge pull request bigtreetech#51 from Msq001/master

fix color, default config

TFT/src/User/API/UI/ST7920_Simulator.c

@@ -129,9 +129,7 @@ void ST7920_ST7920_ParseWCmd(u8 cmd)
 
 void menuST7920(void)
 { 
-  GUI_Clear(BLACK);
-  GUI_SetColor(ST7920_FNCOLOR);
-  GUI_SetBkColor(ST7920_BKCOLOR);
+  GUI_Clear(ST7920_BKCOLOR);
   #ifndef ST7920_FULLSCREEN
     GUI_DispStringInRect(0, 0, LCD_WIDTH, SIMULATOR_YSTART, (u8*)ST7920_BANNER_TEXT, 0);
   #endif

TFT/src/User/Configuration.h

@@ -34,15 +34,15 @@
 
 //Specify a Pause position as { X, Y, Z_raise }
 #define NOZZLE_PAUSE_RETRACT_LENGTH 15   // (mm)
-#define NOZZLE_PAUSE_PURGE_LENGTH   20   // (mm)
+#define NOZZLE_PAUSE_PURGE_LENGTH   16   // (mm)
 #define NOZZLE_PAUSE_X_POSITION     (X_MIN_POS + 10)  // (mm) Must be an integer
 #define NOZZLE_PAUSE_Y_POSITION     (Y_MIN_POS + 10)  // (mm) Must be an integer
 #define NOZZLE_PAUSE_Z_RAISE        20   // (mm)
 #define NOZZLE_PAUSE_E_FEEDRATE     6000 // (mm/min) retract & purge feedrate
 #define NOZZLE_PAUSE_XY_FEEDRATE    6000 // (mm/min) X and Y axes feedrate
 #define NOZZLE_PAUSE_Z_FEEDRATE     600  // (mm/min) Z axis feedrate
 
-//#define AUTO_BED_LEVELING
+#define AUTO_BED_LEVELING
 //Move to four corner points to Leveling manually (Point 1, Point 2, Point 3, Point 4)
 #define LEVELING_POINT_1_X         (X_MIN_POS + 20)
 #define LEVELING_POINT_1_Y         (Y_MIN_POS + 20)
@@ -63,7 +63,7 @@
 
 //Filament run out detect
 #define FIL_RUNOUT_INVERTING true  // Set to false to invert the logic of the sensor.
-#define FIL_NOISE_THRESHOLD  10    // 10*10 = 100ms,  Pause print when filament runout is detected for 100ms.
+#define FIL_NOISE_THRESHOLD  5     // 5*10 = 50ms,  Pause print when filament runout is detected for 50ms.
 
 /**
  * 12864 Mode Background & Font Color Options
@@ -79,7 +79,7 @@
 #define ST7920_BANNER_TEXT "LCD12864 Simulator"
 
 // Make the simulator run fullscreen, Not recommended for TFT24
-#define ST7920_FULLSCREEN
+//#define ST7920_FULLSCREEN
 
 // Ability to print gcode from Board SD via Gcode functions.
 #define ONBOARD_SD_SUPPORT

TFT/src/User/Hal/stm32f2xx/lcd.h

@@ -24,6 +24,7 @@
 
 
 //
+
 #define WHITE                 0xFFFF
 #define BLACK                 0x0000    
 #define BLUE                  0x001F  

TFT/src/User/Menu/Mode.c

@@ -34,22 +34,27 @@ void infoMenuSelect(void)
     {
       Serial_ReSourceInit();
       scanUpdates();
-      u32 startUpTime = OS_GetTime();
-      heatSetUpdateTime(100);
+      GUI_SetColor(FK_COLOR);
+      GUI_SetBkColor(BK_COLOR);
       infoMenu.menu[infoMenu.cur] = menuMain;
+
       #ifdef SHOW_BTT_BOOTSCREEN
-      LOGO_ReadDisplay();
-      while(OS_GetTime() - startUpTime < 300)  //Display 3s logo
-      {                                                                                                                     
-        loopProcess();	
-      }
+        u32 startUpTime = OS_GetTime();
+        heatSetUpdateTime(100);
+        LOGO_ReadDisplay();
+        while(OS_GetTime() - startUpTime < 300)  //Display 3s logo
+        {                                                                                                                     
+          loopProcess();	
+        }
+        heatSetUpdateTime(300);
       #endif
-      heatSetUpdateTime(300);
       break;
     }
 
     #ifdef ST7920_SPI
     case LCD12864:
+      GUI_SetColor(ST7920_FNCOLOR);
+      GUI_SetBkColor(ST7920_BKCOLOR);
       infoMenu.menu[infoMenu.cur] = menuST7920;      
       break;
     #endif

TFT/src/User/Menu/menu.c

@@ -91,7 +91,7 @@ void busyIndicator(SYS_STATUS status)
   {
     GUI_SetColor(YELLOW);
     GUI_FillCircle(busySign.rect.x0, (busySign.rect.y1 - busySign.rect.y0) / 2, (busySign.rect.x1-busySign.rect.x0)/2);
-    GUI_SetColor(WHITE);
+    GUI_SetColor(FK_COLOR);
   }
   busySign.status = status;
   busySign.time = OS_GetTime();
@@ -179,7 +179,7 @@ void menuDrawTitle(const MENUITEMS * menuItems)
   if(reminder.status == STATUS_IDLE) return;
   GUI_SetColor(RED);
   GUI_DispStringInPrect(&reminder.rect, textSelect(reminder.inf), 1);
-  GUI_SetColor(WHITE);
+  GUI_SetColor(FK_COLOR);
 }
 
 //Draw the entire interface