浏览代码

Use configuration website, fix edit color

InsanityAutomation 4 年前
父节点
当前提交
b2f77bb050
共有 1 个文件被更改,包括 7 次插入11 次删除
  1. 7
    11
      Marlin/src/lcd/dwin/e3v2/dwin.cpp

+ 7
- 11
Marlin/src/lcd/dwin/e3v2/dwin.cpp 查看文件

88
 #ifndef MACHINE_SIZE
88
 #ifndef MACHINE_SIZE
89
   #define MACHINE_SIZE STRINGIFY(X_BED_SIZE) "x" STRINGIFY(Y_BED_SIZE) "x" STRINGIFY(Z_MAX_POS)
89
   #define MACHINE_SIZE STRINGIFY(X_BED_SIZE) "x" STRINGIFY(Y_BED_SIZE) "x" STRINGIFY(Z_MAX_POS)
90
 #endif
90
 #endif
91
-#ifndef CORP_WEBSITE_C
92
-  #define CORP_WEBSITE_C "www.cxsw3d.com"
93
-#endif
94
-#ifndef CORP_WEBSITE_E
95
-  #define CORP_WEBSITE_E "www.creality.com"
91
+#ifndef CORP_WEBSITE
92
+  #define CORP_WEBSITE WEBSITE_URL
96
 #endif
93
 #endif
97
 
94
 
98
 #define PAUSE_HEAT
95
 #define PAUSE_HEAT
1232
     }
1229
     }
1233
     LIMIT(HMI_ValueStruct.Move_X_scaled, (X_MIN_POS) * MINUNITMULT, (X_MAX_POS) * MINUNITMULT);
1230
     LIMIT(HMI_ValueStruct.Move_X_scaled, (X_MIN_POS) * MINUNITMULT, (X_MAX_POS) * MINUNITMULT);
1234
     current_position.x = HMI_ValueStruct.Move_X_scaled / MINUNITMULT;
1231
     current_position.x = HMI_ValueStruct.Move_X_scaled / MINUNITMULT;
1235
-    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 216, MBASE(1), HMI_ValueStruct.Move_X_scaled);
1232
+    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(1), HMI_ValueStruct.Move_X_scaled);
1236
     DWIN_UpdateLCD();
1233
     DWIN_UpdateLCD();
1237
   }
1234
   }
1238
 }
1235
 }
1254
     }
1251
     }
1255
     LIMIT(HMI_ValueStruct.Move_Y_scaled, (Y_MIN_POS) * MINUNITMULT, (Y_MAX_POS) * MINUNITMULT);
1252
     LIMIT(HMI_ValueStruct.Move_Y_scaled, (Y_MIN_POS) * MINUNITMULT, (Y_MAX_POS) * MINUNITMULT);
1256
     current_position.y = HMI_ValueStruct.Move_Y_scaled / MINUNITMULT;
1253
     current_position.y = HMI_ValueStruct.Move_Y_scaled / MINUNITMULT;
1257
-    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 216, MBASE(2), HMI_ValueStruct.Move_Y_scaled);
1254
+    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(2), HMI_ValueStruct.Move_Y_scaled);
1258
     DWIN_UpdateLCD();
1255
     DWIN_UpdateLCD();
1259
   }
1256
   }
1260
 }
1257
 }
1276
     }
1273
     }
1277
     LIMIT(HMI_ValueStruct.Move_Z_scaled, Z_MIN_POS * MINUNITMULT, Z_MAX_POS * MINUNITMULT);
1274
     LIMIT(HMI_ValueStruct.Move_Z_scaled, Z_MIN_POS * MINUNITMULT, Z_MAX_POS * MINUNITMULT);
1278
     current_position.z = HMI_ValueStruct.Move_Z_scaled / MINUNITMULT;
1275
     current_position.z = HMI_ValueStruct.Move_Z_scaled / MINUNITMULT;
1279
-    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 216, MBASE(3), HMI_ValueStruct.Move_Z_scaled);
1276
+    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(3), HMI_ValueStruct.Move_Z_scaled);
1280
     DWIN_UpdateLCD();
1277
     DWIN_UpdateLCD();
1281
   }
1278
   }
1282
 }
1279
 }
1304
       else if ((last_E_scaled - HMI_ValueStruct.Move_E_scaled) > (EXTRUDE_MAXLENGTH) * MINUNITMULT)
1301
       else if ((last_E_scaled - HMI_ValueStruct.Move_E_scaled) > (EXTRUDE_MAXLENGTH) * MINUNITMULT)
1305
         HMI_ValueStruct.Move_E_scaled = last_E_scaled - (EXTRUDE_MAXLENGTH) * MINUNITMULT;
1302
         HMI_ValueStruct.Move_E_scaled = last_E_scaled - (EXTRUDE_MAXLENGTH) * MINUNITMULT;
1306
       current_position.e = HMI_ValueStruct.Move_E_scaled / MINUNITMULT;
1303
       current_position.e = HMI_ValueStruct.Move_E_scaled / MINUNITMULT;
1307
-      DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 216, MBASE(4), HMI_ValueStruct.Move_E_scaled);
1304
+      DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(4), HMI_ValueStruct.Move_E_scaled);
1308
       DWIN_UpdateLCD();
1305
       DWIN_UpdateLCD();
1309
     }
1306
     }
1310
   }
1307
   }
1983
     DWIN_Frame_AreaCopy(1, 197, 149, 252, 161, 108, 102);
1980
     DWIN_Frame_AreaCopy(1, 197, 149, 252, 161, 108, 102);
1984
     DWIN_Frame_AreaCopy(1, 1, 164, 56, 176, 108, 175);
1981
     DWIN_Frame_AreaCopy(1, 1, 164, 56, 176, 108, 175);
1985
     DWIN_Frame_AreaCopy(1, 58, 164, 113, 176, 105, 248);
1982
     DWIN_Frame_AreaCopy(1, 58, 164, 113, 176, 105, 248);
1986
-    DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Black, (DWIN_WIDTH - strlen(CORP_WEBSITE_C) * MENU_CHR_W) / 2, 268, F(CORP_WEBSITE_C));
1987
   }
1983
   }
1988
   else {
1984
   else {
1989
     #ifdef USE_STRING_HEADINGS
1985
     #ifdef USE_STRING_HEADINGS
1995
     DWIN_Frame_AreaCopy(1, 120, 150, 146, 161, 124, 102);
1991
     DWIN_Frame_AreaCopy(1, 120, 150, 146, 161, 124, 102);
1996
     DWIN_Frame_AreaCopy(1, 146, 151, 254, 161, 82, 175);
1992
     DWIN_Frame_AreaCopy(1, 146, 151, 254, 161, 82, 175);
1997
     DWIN_Frame_AreaCopy(1, 0, 165, 94, 175, 89, 248);
1993
     DWIN_Frame_AreaCopy(1, 0, 165, 94, 175, 89, 248);
1998
-    DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Black, (DWIN_WIDTH - strlen(CORP_WEBSITE_E) * MENU_CHR_W) / 2, 268, F(CORP_WEBSITE_E));
1999
   }
1994
   }
1995
+  DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Black, (DWIN_WIDTH - strlen(CORP_WEBSITE) * MENU_CHR_W) / 2, 268, F(CORP_WEBSITE));
2000
 
1996
 
2001
   Draw_Back_First();
1997
   Draw_Back_First();
2002
   LOOP_L_N(i, 3) {
1998
   LOOP_L_N(i, 3) {

正在加载...
取消
保存