thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

🚸 JyersUI updates (#24451)

Browse Source
This commit is contained in:
Meilleur Gars
2022-07-06 13:46:11 -07:00
committed by Scott Lahteine
parent 58048e7748
commit 509dfe92d0
32 changed files with 4336 additions and 984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/lcd/e3v2/proui/base64.hpp
View File

@@ -152,7 +152,7 @@ uint16_t encode_base64(unsigned char input[], uint16_t input_length, unsigned ch
output += 4;
}
switch(input_length % 3) {
switch (input_length % 3) {
case 0:
output[0] = '\0';
break;
@@ -192,7 +192,7 @@ uint16_t decode_base64(unsigned char input[], uint16_t input_length, unsigned ch
output += 3;
}
switch(output_length % 3) {
switch (output_length % 3) {
case 1:
output[0] = base64_to_binary(input[0]) << 2 | base64_to_binary(input[1]) >> 4;
break;
@@ -205,4 +205,4 @@ uint16_t decode_base64(unsigned char input[], uint16_t input_length, unsigned ch
return output_length;
}
#endif // ifndef
#endif // BASE64_H_INCLUDED

6
Marlin/src/lcd/e3v2/proui/gcode_preview.cpp
View File

@@ -21,7 +21,7 @@
*/
/**
* DWIN g-code thumbnail preview
* DWIN G-code thumbnail preview
* Author: Miguel A. Risco-Castillo
* version: 2.1
* Date: 2021/06/19
@@ -214,9 +214,7 @@ bool Has_Preview() {
void Preview_DrawFromSD() {
if (Has_Preview()) {
char buf[46];
char str_1[6] = "";
char str_2[6] = "";
char str_3[6] = "";
char str_1[6] = "", str_2[6] = "", str_3[6] = "";
DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 0, 0, DWIN_WIDTH, STATUS_Y - 1);
if (fileprop.time) {
sprintf_P(buf, PSTR("Estimated time: %i:%02i"), (uint16_t)fileprop.time / 3600, ((uint16_t)fileprop.time % 3600) / 60);

2
Marlin/src/lcd/e3v2/proui/gcode_preview.h
View File

@@ -1,5 +1,5 @@
/**
* DWIN g-code thumbnail preview
* DWIN G-code thumbnail preview
* Author: Miguel A. Risco-Castillo
* version: 2.1
* Date: 2021/06/19