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

Color UI Move Screen for 320x240 TFT (#21708)

Browse Source
This commit is contained in:
David
2021-04-28 11:08:21 +02:00
committed by GitHub
parent f7f88b7187
commit 2e0a1f1aff
11 changed files with 526 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Marlin/src/lcd/marlinui.h
View File

@@ -155,13 +155,34 @@
current_position.set(dest);
#endif
}
float axis_value(const AxisEnum axis) {
return NATIVE_TO_LOGICAL(processing ? destination[axis] : SUM_TERN(IS_KINEMATIC, current_position[axis], offset), axis);
}
bool apply_diff(const AxisEnum axis, const_float_t diff, const_float_t min, const_float_t max) {
#if IS_KINEMATIC
float &valref = offset;
const float rmin = min - current_position[axis], rmax = max - current_position[axis];
#else
float &valref = current_position[axis];
const float rmin = min, rmax = max;
#endif
valref += diff;
const float pre = valref;
if (min != max) {
if (diff < 0)
NOLESS(valref, rmin);
else
NOMORE(valref, rmax);
}
return pre != valref;
}
#if IS_KINEMATIC
static bool processing;
#else
static bool constexpr processing = false;
#endif
static void task();
static void soon(AxisEnum axis
static void soon(const AxisEnum axis
#if MULTI_MANUAL
, const int8_t eindex=-1
#endif