Skip to content

Commit 5987a54

Browse files
committed
🎨 Use float CEIL/FLOOR
1 parent 3a888e9 commit 5987a54

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Marlin/src/lcd/extui/ia_creality/ia_creality_rts.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1655,9 +1655,9 @@ void RTS::handleData() {
16551655

16561656
case AutolevelVal: {
16571657
uint8_t meshPoint = (recdat.addr - AutolevelVal) / 2,
1658-
yPnt = floor(meshPoint / GRID_MAX_POINTS_X),
1659-
xPnt = meshPoint - (yPnt * GRID_MAX_POINTS_X);
1660-
if (yPnt % 2 != 0) xPnt = (GRID_MAX_POINTS_X - 1) - xPnt; // zag row
1658+
yPnt = meshPoint / (GRID_MAX_POINTS_X),
1659+
xPnt = meshPoint - yPnt * (GRID_MAX_POINTS_X);
1660+
if (yPnt % 2 != 0) xPnt = (GRID_MAX_POINTS_X) - 1 - xPnt; // zag row
16611661

16621662
float meshVal = float(recdat.data[0] - (recdat.data[0] >= 32768 ? 65536 : 0)) / 1000;
16631663

Marlin/src/module/ft_motion.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -544,9 +544,9 @@ void FTMotion::loadBlockData(block_t * const current_block) {
544544
const float T1 = (F_n - f_s) * oneOverAccel,
545545
T3 = (F_n - f_e) * oneOverAccel;
546546

547-
N1 = ceil(T1 * (FTM_FS)); // Accel datapoints based on Hz frequency
548-
N2 = ceil(T2 * (FTM_FS)); // Coast
549-
N3 = ceil(T3 * (FTM_FS)); // Decel
547+
N1 = CEIL(T1 * (FTM_FS)); // Accel datapoints based on Hz frequency
548+
N2 = CEIL(T2 * (FTM_FS)); // Coast
549+
N3 = CEIL(T3 * (FTM_FS)); // Decel
550550

551551
const float T1_P = N1 * (FTM_TS), // (s) Accel datapoints x timestep resolution
552552
T2_P = N2 * (FTM_TS), // (s) Coast

Marlin/src/module/stepper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3161,7 +3161,7 @@ void Stepper::init() {
31613161
factor2 += -7.58095488 * zeta2;
31623162
const float zeta3 = zeta2 * zeta;
31633163
factor2 += 43.073216 * zeta3;
3164-
factor2 = floor(factor2);
3164+
factor2 = FLOOR(factor2);
31653165
}
31663166

31673167
const bool was_on = hal.isr_state();

0 commit comments

Comments
 (0)