瀏覽代碼

Clean up TFT comments (#21723)

Keith Bennett 3 年之前
父節點
當前提交
f04b2a9390
沒有連結到貢獻者的電子郵件帳戶。
共有 2 個檔案被更改,包括 9 行新增7 行删除
  1. 3
    2
      Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
  2. 6
    5
      Marlin/src/lcd/tft/tft_color.h

+ 3
- 2
Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp 查看文件

@@ -83,7 +83,8 @@ TFT_IO tftio;
83 83
 #define X_HI (UPSCALE(TFT_PIXEL_OFFSET_X, WIDTH) - 1)
84 84
 #define Y_HI (UPSCALE(TFT_PIXEL_OFFSET_Y, HEIGHT) - 1)
85 85
 
86
-// see https://ee-programming-notepad.blogspot.com/2016/10/16-bit-color-generator-picker.html
86
+// 16 bit color generator: https://ee-programming-notepad.blogspot.com/2016/10/16-bit-color-generator-picker.html
87
+// RGB565 color picker:  https://trolsoft.ru/en/articles/rgb565-color-picker
87 88
 
88 89
 #define COLOR_BLACK       0x0000  // #000000
89 90
 #define COLOR_WHITE       0xFFFF  // #FFFFFF
@@ -91,7 +92,7 @@ TFT_IO tftio;
91 92
 #define COLOR_GREY        0x7BEF  // #808080
92 93
 #define COLOR_DARKGREY    0x4208  // #404040
93 94
 #define COLOR_DARKGREY2   0x39E7  // #303030
94
-#define COLOR_DARK        0x0003  // Some dark color
95
+#define COLOR_DARK        0x0003  // #000019
95 96
 
96 97
 #define COLOR_RED         0xF800  // #FF0000
97 98
 #define COLOR_LIME        0x7E00  // #00FF00

+ 6
- 5
Marlin/src/lcd/tft/tft_color.h 查看文件

@@ -30,7 +30,8 @@
30 30
 #define COLOR(color)          RGB(((color >> 16) & 0xFF), ((color >> 8) & 0xFF), (color & 0xFF))
31 31
 #define HALF(color)           RGB(RED(color) >> 1, GREEN(color) >> 1, BLUE(color) >> 1)
32 32
 
33
-// see https://ee-programming-notepad.blogspot.com/2016/10/16-bit-color-generator-picker.html
33
+// 16 bit color generator: https://ee-programming-notepad.blogspot.com/2016/10/16-bit-color-generator-picker.html
34
+// RGB565 color picker:  https://trolsoft.ru/en/articles/rgb565-color-picker
34 35
 
35 36
 #define COLOR_BLACK           0x0000  // #000000
36 37
 #define COLOR_WHITE           0xFFFF  // #FFFFFF
@@ -38,7 +39,7 @@
38 39
 #define COLOR_GREY            0x7BEF  // #808080
39 40
 #define COLOR_DARKGREY        0x4208  // #404040
40 41
 #define COLOR_DARKGREY2       0x39E7  // #303030
41
-#define COLOR_DARK            0x0003  // Some dark color
42
+#define COLOR_DARK            0x0003  // #000019
42 43
 
43 44
 #define COLOR_RED             0xF800  // #FF0000
44 45
 #define COLOR_SCARLET         0xF904  // #FF2020
@@ -51,7 +52,7 @@
51 52
 #define COLOR_CYAN            0x07FF  // #00FFFF
52 53
 #define COLOR_AQUA            0x07FF  // #00FFFF
53 54
 #define COLOR_DODGER_BLUE     0x041F  // #0080FF
54
-#define COLOR_VIVID_VIOLET    0x7933 // #772399
55
+#define COLOR_VIVID_VIOLET    0x7933  // #772399
55 56
 
56 57
 #define COLOR_DARK_PURPLE     0x9930  // #992380
57 58
 
@@ -73,10 +74,10 @@
73 74
   #define COLOR_BACKGROUND    0x20AC  // #1E156E
74 75
 #endif
75 76
 #ifndef COLOR_SELECTION_BG
76
-  #define COLOR_SELECTION_BG    0x9930  // #992380
77
+  #define COLOR_SELECTION_BG  0x9930  // #992380
77 78
 #endif
78 79
 #ifndef COLOR_WEBSITE_URL
79
-  #define COLOR_WEBSITE_URL     0x03B7
80
+  #define COLOR_WEBSITE_URL   0x03B7  // #0075BD
80 81
 #endif
81 82
 
82 83
 #ifndef COLOR_INACTIVE

Loading…
取消
儲存