|
@@ -88,11 +88,8 @@
|
88
|
88
|
#ifndef MACHINE_SIZE
|
89
|
89
|
#define MACHINE_SIZE STRINGIFY(X_BED_SIZE) "x" STRINGIFY(Y_BED_SIZE) "x" STRINGIFY(Z_MAX_POS)
|
90
|
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
|
93
|
#endif
|
97
|
94
|
|
98
|
95
|
#define PAUSE_HEAT
|
|
@@ -1232,7 +1229,7 @@ void HMI_Move_X() {
|
1232
|
1229
|
}
|
1233
|
1230
|
LIMIT(HMI_ValueStruct.Move_X_scaled, (X_MIN_POS) * MINUNITMULT, (X_MAX_POS) * MINUNITMULT);
|
1234
|
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
|
1233
|
DWIN_UpdateLCD();
|
1237
|
1234
|
}
|
1238
|
1235
|
}
|
|
@@ -1254,7 +1251,7 @@ void HMI_Move_Y() {
|
1254
|
1251
|
}
|
1255
|
1252
|
LIMIT(HMI_ValueStruct.Move_Y_scaled, (Y_MIN_POS) * MINUNITMULT, (Y_MAX_POS) * MINUNITMULT);
|
1256
|
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
|
1255
|
DWIN_UpdateLCD();
|
1259
|
1256
|
}
|
1260
|
1257
|
}
|
|
@@ -1276,7 +1273,7 @@ void HMI_Move_Z() {
|
1276
|
1273
|
}
|
1277
|
1274
|
LIMIT(HMI_ValueStruct.Move_Z_scaled, Z_MIN_POS * MINUNITMULT, Z_MAX_POS * MINUNITMULT);
|
1278
|
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
|
1277
|
DWIN_UpdateLCD();
|
1281
|
1278
|
}
|
1282
|
1279
|
}
|
|
@@ -1304,7 +1301,7 @@ void HMI_Move_Z() {
|
1304
|
1301
|
else if ((last_E_scaled - HMI_ValueStruct.Move_E_scaled) > (EXTRUDE_MAXLENGTH) * MINUNITMULT)
|
1305
|
1302
|
HMI_ValueStruct.Move_E_scaled = last_E_scaled - (EXTRUDE_MAXLENGTH) * MINUNITMULT;
|
1306
|
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
|
1305
|
DWIN_UpdateLCD();
|
1309
|
1306
|
}
|
1310
|
1307
|
}
|
|
@@ -1983,7 +1980,6 @@ void Draw_Info_Menu() {
|
1983
|
1980
|
DWIN_Frame_AreaCopy(1, 197, 149, 252, 161, 108, 102);
|
1984
|
1981
|
DWIN_Frame_AreaCopy(1, 1, 164, 56, 176, 108, 175);
|
1985
|
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
|
1984
|
else {
|
1989
|
1985
|
#ifdef USE_STRING_HEADINGS
|
|
@@ -1995,8 +1991,8 @@ void Draw_Info_Menu() {
|
1995
|
1991
|
DWIN_Frame_AreaCopy(1, 120, 150, 146, 161, 124, 102);
|
1996
|
1992
|
DWIN_Frame_AreaCopy(1, 146, 151, 254, 161, 82, 175);
|
1997
|
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
|
1997
|
Draw_Back_First();
|
2002
|
1998
|
LOOP_L_N(i, 3) {
|