Ender3V2S1 icon indicating copy to clipboard operation
Ender3V2S1 copied to clipboard

[FR] Add both (previous and new) boot displays & Option to pre - Set Live Movement

Open classicrocker883 opened this issue 1 year ago • 0 comments

keep HMI_Init() at the beginning of startup. this will leave the startup like it was, but also include the new popup of firmware information.

change

file --> lcd/e3v2/proui/dwin.cpp

void DWIN_InitScreen() {
  TERN_(DEBUG_DWIN, SERIAL_ECHOLNPGM("DWIN_InitScreen"));
  HMI_Init();
  #if ProUIex
    DWIN_UpdateLCD();
    ProEx.Init();
    safe_delay(2000);
  #endif

remove #if DISABLED(ProUIex) --> line 1150 remove #endif --> line 1162



the following adds the option to preset the move in the Prepare/Move menu and keep the Live Movement. this gives the ability to set the value of the position before any moving, as well as keeping the original that enables moving while turning the encoder knob.

change

line --> 2061-2-3

change each SetMove*

void SetMoveX() {
  if (!HMI_data.SetLiveMove) {
  HMI_value.axis = X_AXIS; SetPFloatOnClick(X_MIN_POS, X_MAX_POS, UNITFDIGITS, LiveMove); 
  }
  else {
  HMI_value.axis = X_AXIS; SetPFloatOnClick(X_MIN_POS, X_MAX_POS, UNITFDIGITS, planner.synchronize, LiveMove); 
  }
}
void SetMoveY() {
  if (!HMI_data.SetLiveMove) {
  HMI_value.axis = Y_AXIS; SetPFloatOnClick(Y_MIN_POS, Y_MAX_POS, UNITFDIGITS, LiveMove); 
  }
  else { 
  HMI_value.axis = Y_AXIS; SetPFloatOnClick(Y_MIN_POS, Y_MAX_POS, UNITFDIGITS, planner.synchronize, LiveMove); 
  }
}
void SetMoveZ() {
  if (!HMI_data.SetLiveMove) {
  HMI_value.axis = Z_AXIS; SetPFloatOnClick(Z_MIN_POS, Z_MAX_POS, UNITFDIGITS, LiveMove, planner.synchronize);
  }
  else {
  HMI_value.axis = Z_AXIS; SetPFloatOnClick(Z_MIN_POS, Z_MAX_POS, UNITFDIGITS, planner.synchronize, LiveMove); 
  }
}

add line --> 2695 (or anywhere else)

void SetLiveMove() {
HMI_data.SetLiveMove = !HMI_data.SetLiveMove;
Draw_Chkb_Line(CurrentMenu->line(), HMI_data.SetLiveMove);
}

add line --> 2859 under void Draw_Move_Menu()

    EDIT_ITEM_F(ICON_Version, "Live Adjustment", onDrawChkbMenu, SetLiveMove, &HMI_data.SetLiveMove);

add line --> 1648

  HMI_data.SetLiveMove = false;

file --> lcd/e3v2/proui/dwin.h

add line --> 153 bool SetLiveMove = false;

add line --> 257 void SetLiveMove();

classicrocker883 avatar Oct 08 '22 11:10 classicrocker883