Skip to content

Commit

Permalink
[cron] Bump distribution date (2021-07-24)
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Jul 24, 2021
1 parent b925130 commit aa605a7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Marlin/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
//#define STRING_DISTRIBUTION_DATE "2021-07-23"
//#define STRING_DISTRIBUTION_DATE "2021-07-24"

/**
* Defines a generic printer name to be output to the LCD after booting Marlin.
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/inc/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2021-07-23"
#define STRING_DISTRIBUTION_DATE "2021-07-24"
#endif

/**
Expand Down
10 changes: 9 additions & 1 deletion Marlin/src/lcd/dwin/e3v2/dwin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,15 @@ void Draw_Back_First(const bool is_sel=true) {
if (is_sel) Draw_Menu_Cursor(0);
}

inline bool Apply_Encoder(const ENCODER_DiffState &encoder_diffState, auto &valref) {
inline bool Apply_Encoder(const ENCODER_DiffState &encoder_diffState, float &valref) {
if (encoder_diffState == ENCODER_DIFF_CW)
valref += EncoderRate.encoderMoveValue;
else if (encoder_diffState == ENCODER_DIFF_CCW)
valref -= EncoderRate.encoderMoveValue;
return encoder_diffState == ENCODER_DIFF_ENTER;
}

inline bool Apply_Encoder(const ENCODER_DiffState &encoder_diffState, int16_t &valref) {
if (encoder_diffState == ENCODER_DIFF_CW)
valref += EncoderRate.encoderMoveValue;
else if (encoder_diffState == ENCODER_DIFF_CCW)
Expand Down

0 comments on commit aa605a7

Please sign in to comment.