File tree Expand file tree Collapse file tree 3 files changed +6
-7
lines changed Expand file tree Collapse file tree 3 files changed +6
-7
lines changed Original file line number Diff line number Diff line change @@ -324,7 +324,7 @@ void FTMotion::loop() {
324
324
x.Ai [1 ] = (0 .5f - x.Ai [0 ]) * Kx;
325
325
x.Ai [2 ] = x.Ai [1 ] * Kx;
326
326
x.Ai [3 ] = x.Ai [0 ] * cu (Kx);
327
-
327
+
328
328
const float vtoly2 = sq (vtol[1 ]);
329
329
const float Y = pow (vtoly2 * (sqrt (1 .0f - vtoly2) + 1 .0f ), 1 .0f / 3 .0f );
330
330
y.Ai [0 ] = (3 .0f * sq (Y) + 2 .0f * Y + 3 .0f * vtoly2) / (16 .0f * Y);
@@ -361,7 +361,7 @@ void FTMotion::loop() {
361
361
x.Ai [i] *= X_adj;
362
362
y.Ai [i] *= Y_adj;
363
363
}
364
- }
364
+ }
365
365
break ;
366
366
367
367
case ftMotionMode_MZV: {
@@ -375,15 +375,15 @@ void FTMotion::loop() {
375
375
y.Ai [0 ] = 1 .0f / (1 .0f + By + Ky2);
376
376
y.Ai [1 ] = y.Ai [0 ] * By;
377
377
y.Ai [2 ] = y.Ai [0 ] * Ky2;
378
- }
378
+ }
379
379
break ;
380
380
381
381
default :
382
382
ZERO (x.Ai );
383
383
ZERO (y.Ai );
384
384
max_i = 0 ;
385
385
}
386
-
386
+
387
387
}
388
388
389
389
void FTMotion::updateShapingA (float zeta[]/* =cfg.zeta*/ , float vtol[]/* =cfg.vtol*/ ) {
@@ -428,7 +428,7 @@ void FTMotion::loop() {
428
428
void FTMotion::updateShapingN (const_float_t xf OPTARG (HAS_Y_AXIS, const_float_t yf), float zeta[]/* =cfg.zeta*/ ) {
429
429
const float xdf = sqrt (1 .0f - sq (zeta[0 ]));
430
430
shaping.x .updateShapingN (xf, xdf);
431
-
431
+
432
432
#if HAS_Y_AXIS
433
433
const float ydf = sqrt (1 .0f - sq (zeta[1 ]));
434
434
shaping.y .updateShapingN (yf, ydf);
Original file line number Diff line number Diff line change @@ -44,7 +44,6 @@ typedef struct FTConfig {
44
44
#if HAS_X_AXIS
45
45
float baseFreq[1 + ENABLED(HAS_Y_AXIS)] = // Base frequency. [Hz]
46
46
{ FTM_SHAPING_DEFAULT_X_FREQ OPTARG (HAS_Y_AXIS, FTM_SHAPING_DEFAULT_Y_FREQ) };
47
-
48
47
float zeta[1 + ENABLED(HAS_Y_AXIS)] = // Damping factor
49
48
{ FTM_SHAPING_ZETA_X OPTARG (HAS_Y_AXIS, FTM_SHAPING_ZETA_Y) };
50
49
float vtol[1 + ENABLED(HAS_Y_AXIS)] = // Vibration Level
Original file line number Diff line number Diff line change @@ -3552,7 +3552,7 @@ void Stepper::report_positions() {
3552
3552
// Sync block? Sync the stepper counts and return
3553
3553
while (current_block->is_sync ()) {
3554
3554
TERN_ (LASER_FEATURE, if (!(current_block->is_fan_sync () || current_block->is_pwr_sync ()))) _set_position (current_block->position );
3555
-
3555
+
3556
3556
planner.release_current_block ();
3557
3557
3558
3558
// Try to get a new block
You can’t perform that action at this time.
0 commit comments