jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update rev number and upstream merge revisions

Browse Source
This commit is contained in:
InsanityAutomation
2022-07-17 20:40:27 -04:00
parent 775850a245
commit 5111e8d3a3
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+1 -1
View File
@@ -110,7 +110,7 @@ void MarlinUI::clear_lcd() {
#define VERSION_Y 84
#endif
DWIN_JPG_ShowAndCache(0); // Ensure DACAI stays on boot screen
DWIN_Draw_String(false, font10x20, Color_Yellow, Color_Bg_Black, INFO_CENTER - (dwin_string.length() * 10) / 2, 230, S(dwin_string.string()));
DWIN_Draw_String(false, font10x20, Color_Yellow, Color_Bg_Black, INFO_CENTER - (dwin_string.length * 10) / 2, 230, S(dwin_string.string()));
TERN_(SHOW_CUSTOM_BOOTSCREEN, safe_delay(CUSTOM_BOOTSCREEN_TIMEOUT));
clear_lcd();
Marlin/src/lcd/extui/dgus_creality/DGUSScreenHandler.cpp
+8 -8
View File
@@ -932,15 +932,15 @@ uint16_t CreateRgb(double h, double s, double v) {
#if HAS_BED_PROBE
void DGUSScreenHandler::UpdateMeshValue(const int8_t x, const int8_t y, const float z) {
SERIAL_ECHOPGM("X", x);
SERIAL_ECHOPGM(" Y", y);
SERIAL_ECHO(" Z");
SERIAL_ECHO_F(z, 4);
//SERIAL_ECHOPGM("X", x);
//SERIAL_ECHOPGM(" Y", y);
//SERIAL_ECHO(" Z");
//SERIAL_ECHO_F(z, 4);
// Determine the screen X and Y value
if (x % SkipMeshPoint != 0 || y % SkipMeshPoint != 0) {
// Skip this point
SERIAL_ECHOLN("");
//SERIAL_ECHOLN("");
return;
}
@@ -961,12 +961,12 @@ uint16_t CreateRgb(double h, double s, double v) {
// If we don't accidently overshoot to the next number, trick the display by upping the number 0.0001 💩
displayZ += correctionFactor;
SERIAL_ECHO(" displayZ: ");
SERIAL_ECHO_F(z, 4);
//SERIAL_ECHO(" displayZ: ");
//SERIAL_ECHO_F(z, 4);
}
}
SERIAL_ECHOLN("");
//SERIAL_ECHOLN("");
dgusdisplay.WriteVariable(vpAddr, displayZ);
buildroot/share/PlatformIO/scripts/common-cxxflags.py
+1 -1
View File
@@ -6,7 +6,7 @@ import pioutil
if pioutil.is_pio_build():
Import("env")
env.Replace(PROGNAME="%s_DW7.4.6" % (str(env["PIOENV"])))
env.Replace(PROGNAME="%s_DW7.4.7" % (str(env["PIOENV"])))
cxxflags = [
#"-Wno-incompatible-pointer-types",
buildroot/share/PlatformIO/scripts/random-bin.py
+1 -1
View File
@@ -7,5 +7,5 @@ if pioutil.is_pio_build():
from datetime import datetime
Import("env")
env_name = str(env["PIOENV"])
env['PROGNAME'] = "firmware_%s_DW7.4.6" % (env_name)
env['PROGNAME'] = "firmware_%s_DW7.4.7" % (env_name)
#env['PROGNAME'] = datetime.now().strftime("firmware-%Y%m%d-%H%M%S")