Skip to content

Commit

Permalink
rgb type, some case fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@thinkyhead
thinkyhead committed Nov 21, 2023
1 parent 86819bb commit 6367f80
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 24 deletions.
34 changes: 16 additions & 18 deletions Marlin/src/lcd/e3v2/proui/dwin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -985,9 +985,8 @@ void drawPrintFileMenu() {
if (card.isMounted()) {
if (SET_MENU(fileMenu, MSG_MEDIA_MENU, nr_sd_menu_items() + 1)) {
BACK_ITEM(gotoMainMenu);
for (uint8_t i = 0; i < nr_sd_menu_items(); ++i) {
for (uint8_t i = 0; i < nr_sd_menu_items(); ++i)
menuItemAdd(onDrawFileName, onClickSDItem);
}
}
updateMenu(fileMenu);
TERN_(DASH_REDRAW, dwinRedrawDash());
Expand Down Expand Up @@ -1022,7 +1021,6 @@ void hmiSDCardUpdate() {
*/

void dwinDrawDashboard() {

dwinDrawRectangle(1, hmiData.colorBackground, 0, STATUS_Y + 21, DWIN_WIDTH, DWIN_HEIGHT - 1);
dwinDrawRectangle(1, hmiData.colorSplitLine, 0, 449, DWIN_WIDTH, 451);

Expand Down Expand Up @@ -1067,7 +1065,7 @@ void dwinDrawDashboard() {
void drawInfoMenu() {
DWINUI::clearMainArea();
if (hmiIsChinese())
title.frameCopy(30, 17, 28, 13); // "Info"
title.frameCopy(30, 17, 28, 13); // "Info"
else
title.showCaption(GET_TEXT_F(MSG_INFO_SCREEN));
drawMenuLine(0, ICON_Back, GET_TEXT_F(MSG_BACK), false, true);
Expand Down Expand Up @@ -1124,7 +1122,7 @@ void hmiMainMenu() {
if (hmiData.mediaAutoMount) {
card.mount();
safe_delay(800);
};
}
drawPrintFileMenu();
break;
case PAGE_PREPARE: drawPrepareMenu(); break;
Expand Down Expand Up @@ -2710,7 +2708,7 @@ void onDrawGetColorItem(MenuItem* menuitem, int8_t line) {
dwinDrawRectangle(0, hmiData.colorHighlight, ICOX + 1, MBASE(line) - 1 + 1, ICOX + 18, MBASE(line) - 1 + 18);
dwinDrawRectangle(1, color, ICOX + 2, MBASE(line) - 1 + 2, ICOX + 17, MBASE(line) - 1 + 17);
DWINUI::drawString(LBLX, MBASE(line) - 1, menuitem->caption);
drawMenuIntValue(hmiData.colorBackground, line, 4, hmiValue.Color[i]);
drawMenuIntValue(hmiData.colorBackground, line, 4, hmiValue.color[i]);
dwinDrawHLine(hmiData.colorSplitLine, 16, MYPOS(line + 1), 240);
}

Expand Down Expand Up @@ -3665,24 +3663,24 @@ void drawStepsMenu() {

void selColor() {
menuData.intPtr = (int16_t*)static_cast<MenuItemPtr*>(currentMenu->selectedItem())->value;
hmiValue.Color[0] = GetRColor(*menuData.intPtr); // Red
hmiValue.Color[1] = GetGColor(*menuData.intPtr); // Green
hmiValue.Color[2] = GetBColor(*menuData.intPtr); // Blue
hmiValue.color.r = GetRColor(*menuData.intPtr); // Red
hmiValue.color.g = GetGColor(*menuData.intPtr); // Green
hmiValue.color.b = GetBColor(*menuData.intPtr); // Blue
drawGetColorMenu();
}

void liveRGBColor() {
hmiValue.Color[currentMenu->line() - 2] = menuData.value;
uint16_t color = RGB(hmiValue.Color[0], hmiValue.Color[1], hmiValue.Color[2]);
hmiValue.color[currentMenu->line() - 2] = menuData.value;
uint16_t color = RGB(hmiValue.color.r, hmiValue.color.g, hmiValue.color.b);
dwinDrawRectangle(1, color, 20, 315, DWIN_WIDTH - 20, 335);
}
void setRGBColor() {
const uint8_t color = static_cast<MenuItem*>(currentMenu->selectedItem())->icon;
setIntOnClick(0, (color == 1) ? 63 : 31, hmiValue.Color[color], nullptr, liveRGBColor);
setIntOnClick(0, (color == 1) ? 63 : 31, hmiValue.color[color], nullptr, liveRGBColor);
}

void dwinApplyColor() {
*menuData.intPtr = RGB(hmiValue.Color[0], hmiValue.Color[1], hmiValue.Color[2]);
*menuData.intPtr = RGB(hmiValue.color.r, hmiValue.color.g, hmiValue.color.b);
DWINUI::setColors(hmiData.colorText, hmiData.colorBackground, hmiData.colorStatusBg);
drawSelectColorsMenu();
hash_changed = true;
Expand Down Expand Up @@ -3949,12 +3947,12 @@ void drawStepsMenu() {
#endif

#if ENABLED(PROUI_MESH_EDIT)
void LiveEditMesh() { ((MenuItemPtr*)editZValueItem)->value = &bedlevel.z_values[hmiValue.select ? bedLevelTools.mesh_x : menuData.value][hmiValue.select ? menuData.value : bedLevelTools.mesh_y]; editZValueItem->redraw(); }
void liveEditMesh() { ((MenuItemPtr*)editZValueItem)->value = &bedlevel.z_values[hmiValue.select ? bedLevelTools.mesh_x : menuData.value][hmiValue.select ? menuData.value : bedLevelTools.mesh_y]; editZValueItem->redraw(); }
void applyEditMeshX() { bedLevelTools.mesh_x = menuData.value; }
void applyEditMeshY() { bedLevelTools.mesh_y = menuData.value; }
void ResetMesh() { bedLevelTools.meshReset(); LCD_MESSAGE(MSG_MESH_RESET); }
void setEditMeshX() { hmiValue.select = 0; setIntOnClick(0, GRID_MAX_POINTS_X - 1, bedLevelTools.mesh_x, applyEditMeshX, LiveEditMesh); }
void setEditMeshY() { hmiValue.select = 1; setIntOnClick(0, GRID_MAX_POINTS_Y - 1, bedLevelTools.mesh_y, applyEditMeshY, LiveEditMesh); }
void resetMesh() { bedLevelTools.meshReset(); LCD_MESSAGE(MSG_MESH_RESET); }
void setEditMeshX() { hmiValue.select = 0; setIntOnClick(0, GRID_MAX_POINTS_X - 1, bedLevelTools.mesh_x, applyEditMeshX, liveEditMesh); }
void setEditMeshY() { hmiValue.select = 1; setIntOnClick(0, GRID_MAX_POINTS_Y - 1, bedLevelTools.mesh_y, applyEditMeshY, liveEditMesh); }
void setEditZValue() { setPFloatOnClick(Z_OFFSET_MIN, Z_OFFSET_MAX, 3); }
#endif

Expand Down Expand Up @@ -4023,7 +4021,7 @@ void drawStepsMenu() {
MENU_ITEM(ICON_UBLSmartFill, MSG_UBL_SMART_FILLIN, onDrawMenuItem, ublSmartFillMesh);
#endif
#if ENABLED(PROUI_MESH_EDIT)
MENU_ITEM(ICON_MeshReset, MSG_MESH_RESET, onDrawMenuItem, ResetMesh);
MENU_ITEM(ICON_MeshReset, MSG_MESH_RESET, onDrawMenuItem, resetMesh);
MENU_ITEM(ICON_MeshEdit, MSG_EDIT_MESH, onDrawSubMenu, drawEditMeshMenu);
#endif
MENU_ITEM(ICON_MeshViewer, MSG_MESH_VIEW, onDrawSubMenu, dwinMeshViewer);
Expand Down
18 changes: 15 additions & 3 deletions Marlin/src/lcd/e3v2/proui/dwin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,24 @@ extern hmi_data_t hmiData;
static constexpr size_t eeprom_data_size = sizeof(hmi_data_t);

typedef struct {
int8_t Color[3]; // Color components
int8_t r, g, b;
int8_t& operator[](const int i) {
switch (i) {
default:
case 0: return r;
case 1: return g;
case 2: return b;
}
}
} rgb_t;

typedef struct {
rgb_t color; // Color
#if ANY(PROUI_PID_TUNE, MPCTEMP)
tempcontrol_t tempControl = AUTOTUNE_DONE;
#endif
uint8_t select = 0; // Auxiliary selector variable
AxisEnum axis = X_AXIS; // Axis Select
uint8_t select = 0; // Auxiliary selector variable
AxisEnum axis = X_AXIS; // Axis Select
} hmi_value_t;

typedef struct {
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/lcd/e3v2/proui/dwin_popup.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ popupDrawFunc_t popupDraw = nullptr;
popupClickFunc_t popupClick = nullptr;
popupChangeFunc_t popupChange = nullptr;

uint16_t HighlightYPos = 280;
uint16_t highlightY = 280;

void drawSelectHighlight(const bool sel, const uint16_t ypos) {
HighlightYPos = ypos;
highlightY = ypos;
hmiFlag.select_flag = sel;
const uint16_t c1 = sel ? hmiData.colorHighlight : hmiData.colorPopupBg,
c2 = sel ? hmiData.colorPopupBg : hmiData.colorHighlight;
Expand Down Expand Up @@ -86,7 +86,7 @@ void hmiPopup() {
EncoderState encoder_diffState = get_encoder_state();
if (encoder_diffState == ENCODER_DIFF_CW || encoder_diffState == ENCODER_DIFF_CCW) {
const bool change = encoder_diffState != ENCODER_DIFF_CW;
if (popupChange) popupChange(change); else drawSelectHighlight(change, HighlightYPos);
if (popupChange) popupChange(change); else drawSelectHighlight(change, highlightY);
dwinUpdateLCD();
}
}
Expand Down

0 comments on commit 6367f80

Please sign in to comment.