0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

🎨 Whitespace in the rightplace

Browse source
This commit is contained in:
Scott Lahteine 2023-12-23 04:19:23 -06:00
parent 3029a6b1aa
commit 205b0a679e
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Marlin/src/module/ft_motion.cpp
View file

@ -324,7 +324,7 @@ void FTMotion::loop() {
x.Ai[1] = (0.5f - x.Ai[0]) * Kx; x.Ai[1] = (0.5f - x.Ai[0]) * Kx;
x.Ai[2] = x.Ai[1] * Kx; x.Ai[2] = x.Ai[1] * Kx;
x.Ai[3] = x.Ai[0] * cu(Kx); x.Ai[3] = x.Ai[0] * cu(Kx);
const float vtoly2 = sq(vtol[1]); const float vtoly2 = sq(vtol[1]);
const float Y = pow(vtoly2 * (sqrt(1.0f - vtoly2) + 1.0f), 1.0f / 3.0f); const float Y = pow(vtoly2 * (sqrt(1.0f - vtoly2) + 1.0f), 1.0f / 3.0f);
y.Ai[0] = (3.0f * sq(Y) + 2.0f * Y + 3.0f * vtoly2) / (16.0f * Y); y.Ai[0] = (3.0f * sq(Y) + 2.0f * Y + 3.0f * vtoly2) / (16.0f * Y);
@ -361,7 +361,7 @@ void FTMotion::loop() {
x.Ai[i] *= X_adj; x.Ai[i] *= X_adj;
y.Ai[i] *= Y_adj; y.Ai[i] *= Y_adj;
} }
} }
break; break;
case ftMotionMode_MZV: { case ftMotionMode_MZV: {
@ -375,7 +375,7 @@ void FTMotion::loop() {
y.Ai[0] = 1.0f / (1.0f + By + Ky2); y.Ai[0] = 1.0f / (1.0f + By + Ky2);
y.Ai[1] = y.Ai[0] * By; y.Ai[1] = y.Ai[0] * By;
y.Ai[2] = y.Ai[0] * Ky2; y.Ai[2] = y.Ai[0] * Ky2;
} }
break; break;
default: default:
@ -383,7 +383,7 @@ void FTMotion::loop() {
ZERO(y.Ai); ZERO(y.Ai);
max_i = 0; max_i = 0;
} }
} }
void FTMotion::updateShapingA(float zeta[]/*=cfg.zeta*/, float vtol[]/*=cfg.vtol*/) { void FTMotion::updateShapingA(float zeta[]/*=cfg.zeta*/, float vtol[]/*=cfg.vtol*/) {
@ -428,7 +428,7 @@ void FTMotion::loop() {
void FTMotion::updateShapingN(const_float_t xf OPTARG(HAS_Y_AXIS, const_float_t yf), float zeta[]/*=cfg.zeta*/) { void FTMotion::updateShapingN(const_float_t xf OPTARG(HAS_Y_AXIS, const_float_t yf), float zeta[]/*=cfg.zeta*/) {
const float xdf = sqrt(1.0f - sq(zeta[0])); const float xdf = sqrt(1.0f - sq(zeta[0]));
shaping.x.updateShapingN(xf, xdf); shaping.x.updateShapingN(xf, xdf);
#if HAS_Y_AXIS #if HAS_Y_AXIS
const float ydf = sqrt(1.0f - sq(zeta[1])); const float ydf = sqrt(1.0f - sq(zeta[1]));
shaping.y.updateShapingN(yf, ydf); shaping.y.updateShapingN(yf, ydf);

1
Marlin/src/module/ft_motion.h
View file

@ -44,7 +44,6 @@ typedef struct FTConfig {
#if HAS_X_AXIS #if HAS_X_AXIS
float baseFreq[1 + ENABLED(HAS_Y_AXIS)] = // Base frequency. [Hz] float baseFreq[1 + ENABLED(HAS_Y_AXIS)] = // Base frequency. [Hz]
{ FTM_SHAPING_DEFAULT_X_FREQ OPTARG(HAS_Y_AXIS, FTM_SHAPING_DEFAULT_Y_FREQ) }; { FTM_SHAPING_DEFAULT_X_FREQ OPTARG(HAS_Y_AXIS, FTM_SHAPING_DEFAULT_Y_FREQ) };
float zeta[1 + ENABLED(HAS_Y_AXIS)] = // Damping factor float zeta[1 + ENABLED(HAS_Y_AXIS)] = // Damping factor
{ FTM_SHAPING_ZETA_X OPTARG(HAS_Y_AXIS, FTM_SHAPING_ZETA_Y) }; { FTM_SHAPING_ZETA_X OPTARG(HAS_Y_AXIS, FTM_SHAPING_ZETA_Y) };
float vtol[1 + ENABLED(HAS_Y_AXIS)] = // Vibration Level float vtol[1 + ENABLED(HAS_Y_AXIS)] = // Vibration Level

2
Marlin/src/module/stepper.cpp
View file

@ -3552,7 +3552,7 @@ void Stepper::report_positions() {
// Sync block? Sync the stepper counts and return // Sync block? Sync the stepper counts and return
while (current_block->is_sync()) { while (current_block->is_sync()) {
TERN_(LASER_FEATURE, if (!(current_block->is_fan_sync() || current_block->is_pwr_sync()))) _set_position(current_block->position); TERN_(LASER_FEATURE, if (!(current_block->is_fan_sync() || current_block->is_pwr_sync()))) _set_position(current_block->position);
planner.release_current_block(); planner.release_current_block();
// Try to get a new block // Try to get a new block