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

Revert "v2 jyers update"

Browse Source 
This reverts commit a3e960c251.
This commit is contained in:
InsanityAutomation
2021-11-14 12:15:11 -05:00
parent 4b767d7623
commit a67b346523
2 changed files with 158 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+157 -565
View File
File diff suppressed because it is too large Load Diff
Marlin/src/lcd/e3v2/jyersui/dwin.h
+1 -16
View File
@@ -37,7 +37,7 @@
//#define DWIN_CREALITY_LCD_CUSTOM_ICONS
enum processID : uint8_t {
Main, Print, Menu, Value, Option, File, Popup, Confirm, Keyboard, Wait
Main, Print, Menu, Value, Option, File, Popup, Confirm, Wait
};
enum PopupID : uint8_t {
@@ -55,7 +55,6 @@ enum menuID : uint8_t {
ZOffset,
Preheat,
ChangeFilament,
HostActions,
Control,
TempMenu,
PID,
@@ -74,8 +73,6 @@ enum menuID : uint8_t {
Steps,
Visual,
ColorSettings,
HostSettings,
ActionCommands,
Advanced,
ProbeMenu,
Info,
@@ -167,11 +164,6 @@ public:
uint8_t status_area_text : 4;
uint8_t coordinates_text : 4;
uint8_t coordinates_split_line : 4;
#if ENABLED(HOST_ACTION_COMMANDS)
uint64_t host_action_label_1 : 48;
uint64_t host_action_label_2 : 48;
uint64_t host_action_label_3 : 48;
#endif
} eeprom_settings;
static constexpr const char * const color_names[11] = { "Default", "White", "Green", "Cyan", "Blue", "Magenta", "Red", "Orange", "Yellow", "Brown", "Black" };
@@ -180,9 +172,6 @@ public:
static void Clear_Screen(uint8_t e=3);
static void Draw_Float(float value, uint8_t row, bool selected=false, uint8_t minunit=10);
static void Draw_Option(uint8_t value, const char * const * options, uint8_t row, bool selected=false, bool color=false);
static void Draw_String(char * string, uint8_t row, bool selected=false, bool below=false);
static const uint64_t Encode_String(const char * string);
static void Decode_String(const uint64_t num, char string[8]);
static uint16_t GetColor(uint8_t color, uint16_t original, bool light=false);
static void Draw_Checkbox(uint8_t row, bool value);
static void Draw_Title(const char * title);
@@ -210,8 +199,6 @@ public:
static void Draw_Popup(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, uint8_t mode, uint8_t icon=0);
static void Popup_Select();
static void Update_Status_Bar(bool refresh=false);
static void Draw_Keyboard(bool restrict, bool numeric, uint8_t selected=0, bool uppercase=false, bool lock=false);
static void Draw_Keys(uint8_t index, bool selected, bool uppercase=false, bool lock=false);
#if ENABLED(AUTO_BED_LEVELING_UBL)
static void Draw_Bed_Mesh(int16_t selected = -1, uint8_t gridline_width = 1, uint16_t padding_x = 8, uint16_t padding_y_top = 40 + 53 - 7);
@@ -233,7 +220,6 @@ public:
static void Print_Screen_Control();
static void Popup_Control();
static void Confirm_Control();
static void Keyboard_Control();
static void Setup_Value(float value, float min, float max, float unit, uint8_t type);
static void Modify_Value(float &value, float min, float max, float unit, void (*f)()=nullptr);
@@ -243,7 +229,6 @@ public:
static void Modify_Value(uint32_t &value, float min, float max, float unit, void (*f)()=nullptr);
static void Modify_Value(int8_t &value, float min, float max, float unit, void (*f)()=nullptr);
static void Modify_Option(uint8_t value, const char * const * options, uint8_t max);
static void Modify_String(char * string, uint8_t maxlength, bool restrict);
static void Update_Status(const char * const text);
static void Start_Print(bool sd);