|
@@ -117,11 +117,14 @@ long Stepper::counter_X = 0,
|
117
|
117
|
volatile uint32_t Stepper::step_events_completed = 0; // The number of step events executed in the current block
|
118
|
118
|
|
119
|
119
|
#if ENABLED(BEZIER_JERK_CONTROL)
|
120
|
|
- int32_t Stepper::bezier_A, // A coefficient in Bézier speed curve
|
121
|
|
- Stepper::bezier_B, // B coefficient in Bézier speed curve
|
122
|
|
- Stepper::bezier_C, // C coefficient in Bézier speed curve
|
123
|
|
- Stepper::bezier_F; // F coefficient in Bézier speed curve
|
124
|
|
- uint32_t Stepper::bezier_AV; // AV coefficient in Bézier speed curve
|
|
120
|
+ int32_t __attribute__((used)) Stepper::bezier_A __asm__("bezier_A"); // A coefficient in Bézier speed curve with alias for assembler
|
|
121
|
+ int32_t __attribute__((used)) Stepper::bezier_B __asm__("bezier_B"); // B coefficient in Bézier speed curve with alias for assembler
|
|
122
|
+ int32_t __attribute__((used)) Stepper::bezier_C __asm__("bezier_C"); // C coefficient in Bézier speed curve with alias for assembler
|
|
123
|
+ uint32_t __attribute__((used)) Stepper::bezier_F __asm__("bezier_F"); // F coefficient in Bézier speed curve with alias for assembler
|
|
124
|
+ uint32_t __attribute__((used)) Stepper::bezier_AV __asm__("bezier_AV"); // AV coefficient in Bézier speed curve with alias for assembler
|
|
125
|
+ #ifdef __AVR__
|
|
126
|
+ bool __attribute__((used)) Stepper::A_negative __asm__("A_negative"); // If A coefficient was negative
|
|
127
|
+ #endif
|
125
|
128
|
bool Stepper::bezier_2nd_half; // =false If Bézier curve has been initialized or not
|
126
|
129
|
#endif
|
127
|
130
|
|
|
@@ -391,130 +394,735 @@ void Stepper::set_directions() {
|
391
|
394
|
*
|
392
|
395
|
* Note the abbreviations we use in the following formulae are between []s
|
393
|
396
|
*
|
394
|
|
- * At the start of each trapezoid, we calculate the coefficients A,B,C,F and Advance [AV], as follows:
|
|
397
|
+ * For Any 32bit CPU:
|
|
398
|
+ *
|
|
399
|
+ * At the start of each trapezoid, we calculate the coefficients A,B,C,F and Advance [AV], as follows:
|
|
400
|
+ *
|
|
401
|
+ * A = 6*128*(VF - VI) = 768*(VF - VI)
|
|
402
|
+ * B = 15*128*(VI - VF) = 1920*(VI - VF)
|
|
403
|
+ * C = 10*128*(VF - VI) = 1280*(VF - VI)
|
|
404
|
+ * F = 128*VI = 128*VI
|
|
405
|
+ * AV = (1<<32)/TS ~= 0xFFFFFFFF / TS (To use ARM UDIV, that is 32 bits) (this is computed at the planner, to offload expensive calculations from the ISR)
|
|
406
|
+ *
|
|
407
|
+ * And for each point, we will evaluate the curve with the following sequence:
|
|
408
|
+ *
|
|
409
|
+ * void lsrs(uint32_t& d, uint32_t s, int cnt) {
|
|
410
|
+ * d = s >> cnt;
|
|
411
|
+ * }
|
|
412
|
+ * void lsls(uint32_t& d, uint32_t s, int cnt) {
|
|
413
|
+ * d = s << cnt;
|
|
414
|
+ * }
|
|
415
|
+ * void lsrs(int32_t& d, uint32_t s, int cnt) {
|
|
416
|
+ * d = uint32_t(s) >> cnt;
|
|
417
|
+ * }
|
|
418
|
+ * void lsls(int32_t& d, uint32_t s, int cnt) {
|
|
419
|
+ * d = uint32_t(s) << cnt;
|
|
420
|
+ * }
|
|
421
|
+ * void umull(uint32_t& rlo, uint32_t& rhi, uint32_t op1, uint32_t op2) {
|
|
422
|
+ * uint64_t res = uint64_t(op1) * op2;
|
|
423
|
+ * rlo = uint32_t(res & 0xFFFFFFFF);
|
|
424
|
+ * rhi = uint32_t((res >> 32) & 0xFFFFFFFF);
|
|
425
|
+ * }
|
|
426
|
+ * void smlal(int32_t& rlo, int32_t& rhi, int32_t op1, int32_t op2) {
|
|
427
|
+ * int64_t mul = int64_t(op1) * op2;
|
|
428
|
+ * int64_t s = int64_t(uint32_t(rlo) | ((uint64_t(uint32_t(rhi)) << 32U)));
|
|
429
|
+ * mul += s;
|
|
430
|
+ * rlo = int32_t(mul & 0xFFFFFFFF);
|
|
431
|
+ * rhi = int32_t((mul >> 32) & 0xFFFFFFFF);
|
|
432
|
+ * }
|
|
433
|
+ * int32_t _eval_bezier_curve_arm(uint32_t curr_step) {
|
|
434
|
+ * register uint32_t flo = 0;
|
|
435
|
+ * register uint32_t fhi = bezier_AV * curr_step;
|
|
436
|
+ * register uint32_t t = fhi;
|
|
437
|
+ * register int32_t alo = bezier_F;
|
|
438
|
+ * register int32_t ahi = 0;
|
|
439
|
+ * register int32_t A = bezier_A;
|
|
440
|
+ * register int32_t B = bezier_B;
|
|
441
|
+ * register int32_t C = bezier_C;
|
|
442
|
+ *
|
|
443
|
+ * lsrs(ahi, alo, 1); // a = F << 31
|
|
444
|
+ * lsls(alo, alo, 31); //
|
|
445
|
+ * umull(flo, fhi, fhi, t); // f *= t
|
|
446
|
+ * umull(flo, fhi, fhi, t); // f>>=32; f*=t
|
|
447
|
+ * lsrs(flo, fhi, 1); //
|
|
448
|
+ * smlal(alo, ahi, flo, C); // a+=(f>>33)*C
|
|
449
|
+ * umull(flo, fhi, fhi, t); // f>>=32; f*=t
|
|
450
|
+ * lsrs(flo, fhi, 1); //
|
|
451
|
+ * smlal(alo, ahi, flo, B); // a+=(f>>33)*B
|
|
452
|
+ * umull(flo, fhi, fhi, t); // f>>=32; f*=t
|
|
453
|
+ * lsrs(flo, fhi, 1); // f>>=33;
|
|
454
|
+ * smlal(alo, ahi, flo, A); // a+=(f>>33)*A;
|
|
455
|
+ * lsrs(alo, ahi, 6); // a>>=38
|
|
456
|
+ *
|
|
457
|
+ * return alo;
|
|
458
|
+ * }
|
|
459
|
+ *
|
|
460
|
+ * This will be rewritten in ARM assembly to get peak performance and will take 43 cycles to execute
|
395
|
461
|
*
|
396
|
|
- * A = 6*128*(VF - VI) = 768*(VF - VI)
|
397
|
|
- * B = 15*128*(VI - VF) = 1920*(VI - VF)
|
398
|
|
- * C = 10*128*(VF - VI) = 1280*(VF - VI)
|
399
|
|
- * F = 128*VI = 128*VI
|
400
|
|
- * AV = (1<<32)/TS ~= 0xFFFFFFFF / TS (To use ARM UDIV, that is 32 bits)
|
|
462
|
+ * For AVR, we scale precision of coefficients to make it possible to evaluate the Bézier curve in
|
|
463
|
+ * realtime: Let's reduce precision as much as possible. After some experimentation we found that:
|
401
|
464
|
*
|
402
|
|
- * And for each point, we will evaluate the curve with the following sequence:
|
|
465
|
+ * Assume t and AV with 24 bits is enough
|
|
466
|
+ * A = 6*(VF - VI)
|
|
467
|
+ * B = 15*(VI - VF)
|
|
468
|
+ * C = 10*(VF - VI)
|
|
469
|
+ * F = VI
|
|
470
|
+ * AV = (1<<24)/TS (this is computed at the planner, to offload expensive calculations from the ISR)
|
403
|
471
|
*
|
404
|
|
- * uint32_t t = bezier_AV * curr_step; // t: Range 0 - 1^32 = 32 bits
|
405
|
|
- * uint64_t f = t;
|
406
|
|
- * f *= t; // Range 32*2 = 64 bits (unsigned)
|
407
|
|
- * f >>= 32; // Range 32 bits (unsigned)
|
408
|
|
- * f *= t; // Range 32*2 = 64 bits (unsigned)
|
409
|
|
- * f >>= 32; // Range 32 bits : f = t^3 (unsigned)
|
410
|
|
- * int64_t acc = (int64_t) bezier_F << 31; // Range 63 bits (signed)
|
411
|
|
- * acc += ((uint32_t) f >> 1) * (int64_t) bezier_C; // Range 29bits + 31 = 60bits (plus sign)
|
412
|
|
- * f *= t; // Range 32*2 = 64 bits
|
413
|
|
- * f >>= 32; // Range 32 bits : f = t^3 (unsigned)
|
414
|
|
- * acc += ((uint32_t) f >> 1) * (int64_t) bezier_B; // Range 29bits + 31 = 60bits (plus sign)
|
415
|
|
- * f *= t; // Range 32*2 = 64 bits
|
416
|
|
- * f >>= 32; // Range 32 bits : f = t^3 (unsigned)
|
417
|
|
- * acc += ((uint32_t) f >> 1) * (int64_t) bezier_A; // Range 28bits + 31 = 59bits (plus sign)
|
418
|
|
- * acc >>= (31 + 7); // Range 24bits (plus sign)
|
|
472
|
+ * Instead of storing sign for each coefficient, we will store its absolute value,
|
|
473
|
+ * and flag the sign of the A coefficient, so we can save to store the sign bit.
|
|
474
|
+ * It always holds that sign(A) = - sign(B) = sign(C)
|
419
|
475
|
*
|
420
|
|
- * This can be translated to the following ARM assembly sequence:
|
|
476
|
+ * So, the resulting range of the coefficients are:
|
421
|
477
|
*
|
422
|
|
- * At start:
|
423
|
|
- * fhi = AV, flo = CS, alo = F
|
|
478
|
+ * t: unsigned (0 <= t < 1) |range 0 to 0xFFFFFF unsigned
|
|
479
|
+ * A: signed Q24 , range = 250000 * 6 = 1500000 = 0x16E360 | 21 bits
|
|
480
|
+ * B: signed Q24 , range = 250000 *15 = 3750000 = 0x393870 | 22 bits
|
|
481
|
+ * C: signed Q24 , range = 250000 *10 = 2500000 = 0x1312D0 | 21 bits
|
|
482
|
+ * F: signed Q24 , range = 250000 = 250000 = 0x0ED090 | 20 bits
|
|
483
|
+ *
|
|
484
|
+ * And for each curve, we estimate its coefficients with:
|
|
485
|
+ *
|
|
486
|
+ * void _calc_bezier_curve_coeffs(int32_t v0, int32_t v1, uint32_t av) {
|
|
487
|
+ * // Calculate the Bézier coefficients
|
|
488
|
+ * if (v1 < v0) {
|
|
489
|
+ * A_negative = true;
|
|
490
|
+ * bezier_A = 6 * (v0 - v1);
|
|
491
|
+ * bezier_B = 15 * (v0 - v1);
|
|
492
|
+ * bezier_C = 10 * (v0 - v1);
|
|
493
|
+ * }
|
|
494
|
+ * else {
|
|
495
|
+ * A_negative = false;
|
|
496
|
+ * bezier_A = 6 * (v1 - v0);
|
|
497
|
+ * bezier_B = 15 * (v1 - v0);
|
|
498
|
+ * bezier_C = 10 * (v1 - v0);
|
|
499
|
+ * }
|
|
500
|
+ * bezier_F = v0;
|
|
501
|
+ * }
|
|
502
|
+ *
|
|
503
|
+ * And for each point, we will evaluate the curve with the following sequence:
|
|
504
|
+ *
|
|
505
|
+ * // unsigned multiplication of 24 bits x 24bits, return upper 16 bits
|
|
506
|
+ * void umul24x24to16hi(uint16_t& r, uint24_t op1, uint24_t op2) {
|
|
507
|
+ * r = (uint64_t(op1) * op2) >> 8;
|
|
508
|
+ * }
|
|
509
|
+ * // unsigned multiplication of 16 bits x 16bits, return upper 16 bits
|
|
510
|
+ * void umul16x16to16hi(uint16_t& r, uint16_t op1, uint16_t op2) {
|
|
511
|
+ * r = (uint32_t(op1) * op2) >> 16;
|
|
512
|
+ * }
|
|
513
|
+ * // unsigned multiplication of 16 bits x 24bits, return upper 24 bits
|
|
514
|
+ * void umul16x24to24hi(uint24_t& r, uint16_t op1, uint24_t op2) {
|
|
515
|
+ * r = uint24_t((uint64_t(op1) * op2) >> 16);
|
|
516
|
+ * }
|
|
517
|
+ *
|
|
518
|
+ * int32_t _eval_bezier_curve(uint32_t curr_step) {
|
|
519
|
+ * // To save computing, the first step is always the initial speed
|
|
520
|
+ * if (!curr_step)
|
|
521
|
+ * return bezier_F;
|
|
522
|
+ *
|
|
523
|
+ * uint16_t t;
|
|
524
|
+ * umul24x24to16hi(t, bezier_AV, curr_step); // t: Range 0 - 1^16 = 16 bits
|
|
525
|
+ * uint16_t f = t;
|
|
526
|
+ * umul16x16to16hi(f, f, t); // Range 16 bits (unsigned)
|
|
527
|
+ * umul16x16to16hi(f, f, t); // Range 16 bits : f = t^3 (unsigned)
|
|
528
|
+ * uint24_t acc = bezier_F; // Range 20 bits (unsigned)
|
|
529
|
+ * if (A_negative) {
|
|
530
|
+ * uint24_t v;
|
|
531
|
+ * umul16x24to24hi(v, f, bezier_C); // Range 21bits
|
|
532
|
+ * acc -= v;
|
|
533
|
+ * umul16x16to16hi(f, f, t); // Range 16 bits : f = t^4 (unsigned)
|
|
534
|
+ * umul16x24to24hi(v, f, bezier_B); // Range 22bits
|
|
535
|
+ * acc += v;
|
|
536
|
+ * umul16x16to16hi(f, f, t); // Range 16 bits : f = t^5 (unsigned)
|
|
537
|
+ * umul16x24to24hi(v, f, bezier_A); // Range 21bits + 15 = 36bits (plus sign)
|
|
538
|
+ * acc -= v;
|
|
539
|
+ * }
|
|
540
|
+ * else {
|
|
541
|
+ * uint24_t v;
|
|
542
|
+ * umul16x24to24hi(v, f, bezier_C); // Range 21bits
|
|
543
|
+ * acc += v;
|
|
544
|
+ * umul16x16to16hi(f, f, t); // Range 16 bits : f = t^4 (unsigned)
|
|
545
|
+ * umul16x24to24hi(v, f, bezier_B); // Range 22bits
|
|
546
|
+ * acc -= v;
|
|
547
|
+ * umul16x16to16hi(f, f, t); // Range 16 bits : f = t^5 (unsigned)
|
|
548
|
+ * umul16x24to24hi(v, f, bezier_A); // Range 21bits + 15 = 36bits (plus sign)
|
|
549
|
+ * acc += v;
|
|
550
|
+ * }
|
|
551
|
+ * return acc;
|
|
552
|
+ * }
|
|
553
|
+ * Those functions will be translated into assembler to get peak performance. coefficient calculations takes 70 cycles,
|
|
554
|
+ * Bezier point evaluation takes 150 cycles
|
424
|
555
|
*
|
425
|
|
- * muls fhi,flo | f = AV * CS 1 cycles
|
426
|
|
- * mov t,fhi | t = AV * CS 1 cycles
|
427
|
|
- * lsrs ahi,alo,#1 | a = F << 31 1 cycles
|
428
|
|
- * lsls alo,alo,#31 | 1 cycles
|
429
|
|
- * umull flo,fhi,fhi,t | f *= t 5 cycles [fhi:flo=64bits
|
430
|
|
- * umull flo,fhi,fhi,t | f>>=32; f*=t 5 cycles [fhi:flo=64bits
|
431
|
|
- * lsrs flo,fhi,#1 | 1 cycles [31bits
|
432
|
|
- * smlal alo,ahi,flo,C | a+=(f>>33)*C; 5 cycles
|
433
|
|
- * umull flo,fhi,fhi,t | f>>=32; f*=t 5 cycles [fhi:flo=64bits
|
434
|
|
- * lsrs flo,fhi,#1 | 1 cycles [31bits
|
435
|
|
- * smlal alo,ahi,flo,B | a+=(f>>33)*B; 5 cycles
|
436
|
|
- * umull flo,fhi,fhi,t | f>>=32; f*=t 5 cycles [fhi:flo=64bits
|
437
|
|
- * lsrs flo,fhi,#1 | f>>=33; 1 cycles [31bits
|
438
|
|
- * smlal alo,ahi,flo,A | a+=(f>>33)*A; 5 cycles
|
439
|
|
- * lsrs alo,ahi,#6 | a>>=38 1 cycles
|
440
|
|
- * 43 cycles total
|
441
|
556
|
*/
|
442
|
557
|
|
443
|
|
- FORCE_INLINE void Stepper::_calc_bezier_curve_coeffs(const int32_t v0, const int32_t v1, const uint32_t interval) {
|
444
|
|
- // Calculate the Bézier coefficients
|
445
|
|
- bezier_A = 768 * (v1 - v0);
|
446
|
|
- bezier_B = 1920 * (v0 - v1);
|
447
|
|
- bezier_C = 1280 * (v1 - v0);
|
448
|
|
- bezier_F = 128 * v0;
|
449
|
|
- bezier_AV = 0xFFFFFFFF / interval;
|
450
|
|
- }
|
|
558
|
+ #ifdef __AVR__
|
451
|
559
|
|
452
|
|
- FORCE_INLINE int32_t Stepper::_eval_bezier_curve(const uint32_t curr_step) {
|
453
|
|
- #if defined(__ARM__) || defined(__thumb__)
|
454
|
|
-
|
455
|
|
- // For ARM CORTEX M3/M4 CPUs, we have the optimized assembler version, that takes 43 cycles to execute
|
456
|
|
- register uint32_t flo = 0;
|
457
|
|
- register uint32_t fhi = bezier_AV * curr_step;
|
458
|
|
- register uint32_t t = fhi;
|
459
|
|
- register int32_t alo = bezier_F;
|
460
|
|
- register int32_t ahi = 0;
|
461
|
|
- register int32_t A = bezier_A;
|
462
|
|
- register int32_t B = bezier_B;
|
463
|
|
- register int32_t C = bezier_C;
|
464
|
|
-
|
465
|
|
- __asm__ __volatile__(
|
466
|
|
- ".syntax unified" "\n\t" // is to prevent CM0,CM1 non-unified syntax
|
467
|
|
- " lsrs %[ahi],%[alo],#1" "\n\t" // a = F << 31 1 cycles
|
468
|
|
- " lsls %[alo],%[alo],#31" "\n\t" // 1 cycles
|
469
|
|
- " umull %[flo],%[fhi],%[fhi],%[t]" "\n\t" // f *= t 5 cycles [fhi:flo=64bits]
|
470
|
|
- " umull %[flo],%[fhi],%[fhi],%[t]" "\n\t" // f>>=32; f*=t 5 cycles [fhi:flo=64bits]
|
471
|
|
- " lsrs %[flo],%[fhi],#1" "\n\t" // 1 cycles [31bits]
|
472
|
|
- " smlal %[alo],%[ahi],%[flo],%[C]" "\n\t" // a+=(f>>33)*C; 5 cycles
|
473
|
|
- " umull %[flo],%[fhi],%[fhi],%[t]" "\n\t" // f>>=32; f*=t 5 cycles [fhi:flo=64bits]
|
474
|
|
- " lsrs %[flo],%[fhi],#1" "\n\t" // 1 cycles [31bits]
|
475
|
|
- " smlal %[alo],%[ahi],%[flo],%[B]" "\n\t" // a+=(f>>33)*B; 5 cycles
|
476
|
|
- " umull %[flo],%[fhi],%[fhi],%[t]" "\n\t" // f>>=32; f*=t 5 cycles [fhi:flo=64bits]
|
477
|
|
- " lsrs %[flo],%[fhi],#1" "\n\t" // f>>=33; 1 cycles [31bits]
|
478
|
|
- " smlal %[alo],%[ahi],%[flo],%[A]" "\n\t" // a+=(f>>33)*A; 5 cycles
|
479
|
|
- " lsrs %[alo],%[ahi],#6" "\n\t" // a>>=38 1 cycles
|
480
|
|
- : [alo]"+r"( alo ) ,
|
481
|
|
- [flo]"+r"( flo ) ,
|
482
|
|
- [fhi]"+r"( fhi ) ,
|
483
|
|
- [ahi]"+r"( ahi ) ,
|
484
|
|
- [A]"+r"( A ) , // <== Note: Even if A, B, C, and t registers are INPUT ONLY
|
485
|
|
- [B]"+r"( B ) , // GCC does bad optimizations on the code if we list them as
|
486
|
|
- [C]"+r"( C ) , // such, breaking this function. So, to avoid that problem,
|
487
|
|
- [t]"+r"( t ) // we list all registers as input-outputs.
|
|
560
|
+ // For AVR we use assembly to maximize speed
|
|
561
|
+ void Stepper::_calc_bezier_curve_coeffs(const int32_t v0, const int32_t v1, const uint32_t av) {
|
|
562
|
+
|
|
563
|
+ // Store advance
|
|
564
|
+ bezier_AV = av;
|
|
565
|
+
|
|
566
|
+ // Calculate the rest of the coefficients
|
|
567
|
+ register uint8_t r2 = v0 & 0xFF;
|
|
568
|
+ register uint8_t r3 = (v0 >> 8) & 0xFF;
|
|
569
|
+ register uint8_t r12 = (v0 >> 16) & 0xFF;
|
|
570
|
+ register uint8_t r5 = v1 & 0xFF;
|
|
571
|
+ register uint8_t r6 = (v1 >> 8) & 0xFF;
|
|
572
|
+ register uint8_t r7 = (v1 >> 16) & 0xFF;
|
|
573
|
+ register uint8_t r4,r8,r9,r10,r11;
|
|
574
|
+
|
|
575
|
+ __asm__ __volatile__(
|
|
576
|
+ /* Calculate the Bézier coefficients */
|
|
577
|
+ /* %10:%1:%0 = v0*/
|
|
578
|
+ /* %5:%4:%3 = v1*/
|
|
579
|
+ /* %7:%6:%10 = temporary*/
|
|
580
|
+ /* %9 = val (must be high register!)*/
|
|
581
|
+ /* %10 (must be high register!)*/
|
|
582
|
+
|
|
583
|
+ /* Store initial velocity*/
|
|
584
|
+ " sts bezier_F, %0" "\n\t"
|
|
585
|
+ " sts bezier_F+1, %1" "\n\t"
|
|
586
|
+ " sts bezier_F+2, %10" "\n\t" /* bezier_F = %10:%1:%0 = v0 */
|
|
587
|
+
|
|
588
|
+ /* Get delta speed */
|
|
589
|
+ " ldi %2,-1" "\n\t" /* %2 = 0xff, means A_negative = true */
|
|
590
|
+ " clr %8" "\n\t" /* %8 = 0 */
|
|
591
|
+ " sub %0,%3" "\n\t"
|
|
592
|
+ " sbc %1,%4" "\n\t"
|
|
593
|
+ " sbc %10,%5" "\n\t" /* v0 -= v1, C=1 if result is negative */
|
|
594
|
+ " brcc 1f" "\n\t" /* branch if result is positive (C=0), that means v0 >= v1 */
|
|
595
|
+
|
|
596
|
+ /* Result was negative, get the absolute value*/
|
|
597
|
+ " com %10" "\n\t"
|
|
598
|
+ " com %1" "\n\t"
|
|
599
|
+ " neg %0" "\n\t"
|
|
600
|
+ " sbc %1,%2" "\n\t"
|
|
601
|
+ " sbc %10,%2" "\n\t" /* %10:%1:%0 +1 -> %10:%1:%0 = -(v0 - v1) = (v1 - v0) */
|
|
602
|
+ " clr %2" "\n\t" /* %2 = 0, means A_negative = false */
|
|
603
|
+
|
|
604
|
+ /* Store negative flag*/
|
|
605
|
+ "1:" "\n\t"
|
|
606
|
+ " sts A_negative, %2" "\n\t" /* Store negative flag */
|
|
607
|
+
|
|
608
|
+ /* Compute coefficients A,B and C [20 cycles worst case]*/
|
|
609
|
+ " ldi %9,6" "\n\t" /* %9 = 6 */
|
|
610
|
+ " mul %0,%9" "\n\t" /* r1:r0 = 6*LO(v0-v1) */
|
|
611
|
+ " sts bezier_A, r0" "\n\t"
|
|
612
|
+ " mov %6,r1" "\n\t"
|
|
613
|
+ " clr %7" "\n\t" /* %7:%6:r0 = 6*LO(v0-v1) */
|
|
614
|
+ " mul %1,%9" "\n\t" /* r1:r0 = 6*MI(v0-v1) */
|
|
615
|
+ " add %6,r0" "\n\t"
|
|
616
|
+ " adc %7,r1" "\n\t" /* %7:%6:?? += 6*MI(v0-v1) << 8 */
|
|
617
|
+ " mul %10,%9" "\n\t" /* r1:r0 = 6*HI(v0-v1) */
|
|
618
|
+ " add %7,r0" "\n\t" /* %7:%6:?? += 6*HI(v0-v1) << 16 */
|
|
619
|
+ " sts bezier_A+1, %6" "\n\t"
|
|
620
|
+ " sts bezier_A+2, %7" "\n\t" /* bezier_A = %7:%6:?? = 6*(v0-v1) [35 cycles worst] */
|
|
621
|
+
|
|
622
|
+ " ldi %9,15" "\n\t" /* %9 = 15 */
|
|
623
|
+ " mul %0,%9" "\n\t" /* r1:r0 = 5*LO(v0-v1) */
|
|
624
|
+ " sts bezier_B, r0" "\n\t"
|
|
625
|
+ " mov %6,r1" "\n\t"
|
|
626
|
+ " clr %7" "\n\t" /* %7:%6:?? = 5*LO(v0-v1) */
|
|
627
|
+ " mul %1,%9" "\n\t" /* r1:r0 = 5*MI(v0-v1) */
|
|
628
|
+ " add %6,r0" "\n\t"
|
|
629
|
+ " adc %7,r1" "\n\t" /* %7:%6:?? += 5*MI(v0-v1) << 8 */
|
|
630
|
+ " mul %10,%9" "\n\t" /* r1:r0 = 5*HI(v0-v1) */
|
|
631
|
+ " add %7,r0" "\n\t" /* %7:%6:?? += 5*HI(v0-v1) << 16 */
|
|
632
|
+ " sts bezier_B+1, %6" "\n\t"
|
|
633
|
+ " sts bezier_B+2, %7" "\n\t" /* bezier_B = %7:%6:?? = 5*(v0-v1) [50 cycles worst] */
|
|
634
|
+
|
|
635
|
+ " ldi %9,10" "\n\t" /* %9 = 10 */
|
|
636
|
+ " mul %0,%9" "\n\t" /* r1:r0 = 10*LO(v0-v1) */
|
|
637
|
+ " sts bezier_C, r0" "\n\t"
|
|
638
|
+ " mov %6,r1" "\n\t"
|
|
639
|
+ " clr %7" "\n\t" /* %7:%6:?? = 10*LO(v0-v1) */
|
|
640
|
+ " mul %1,%9" "\n\t" /* r1:r0 = 10*MI(v0-v1) */
|
|
641
|
+ " add %6,r0" "\n\t"
|
|
642
|
+ " adc %7,r1" "\n\t" /* %7:%6:?? += 10*MI(v0-v1) << 8 */
|
|
643
|
+ " mul %10,%9" "\n\t" /* r1:r0 = 10*HI(v0-v1) */
|
|
644
|
+ " add %7,r0" "\n\t" /* %7:%6:?? += 10*HI(v0-v1) << 16 */
|
|
645
|
+ " sts bezier_C+1, %6" "\n\t"
|
|
646
|
+ " sts bezier_C+2, %7" /* bezier_C = %7:%6:?? = 10*(v0-v1) [65 cycles worst] */
|
|
647
|
+ : "+r" (r2),
|
|
648
|
+ "+d" (r3),
|
|
649
|
+ "=r" (r4),
|
|
650
|
+ "+r" (r5),
|
|
651
|
+ "+r" (r6),
|
|
652
|
+ "+r" (r7),
|
|
653
|
+ "=r" (r8),
|
|
654
|
+ "=r" (r9),
|
|
655
|
+ "=r" (r10),
|
|
656
|
+ "=d" (r11),
|
|
657
|
+ "+r" (r12)
|
488
|
658
|
:
|
489
|
|
- : "cc"
|
|
659
|
+ : "r0", "r1", "cc", "memory"
|
490
|
660
|
);
|
491
|
|
- return alo;
|
|
661
|
+ }
|
492
|
662
|
|
493
|
|
- #else
|
|
663
|
+ FORCE_INLINE int32_t Stepper::_eval_bezier_curve(const uint32_t curr_step) {
|
|
664
|
+
|
|
665
|
+ // If dealing with the first step, save expensive computing and return the initial speed
|
|
666
|
+ if (!curr_step)
|
|
667
|
+ return bezier_F;
|
|
668
|
+
|
|
669
|
+ register uint8_t r0 = 0; /* Zero register */
|
|
670
|
+ register uint8_t r2 = (curr_step) & 0xFF;
|
|
671
|
+ register uint8_t r3 = (curr_step >> 8) & 0xFF;
|
|
672
|
+ register uint8_t r4 = (curr_step >> 16) & 0xFF;
|
|
673
|
+ register uint8_t r1,r5,r6,r7,r8,r9,r10,r11; /* Temporary registers */
|
|
674
|
+
|
|
675
|
+ __asm__ __volatile(
|
|
676
|
+ /* umul24x24to16hi(t, bezier_AV, curr_step); t: Range 0 - 1^16 = 16 bits*/
|
|
677
|
+ " lds %9,bezier_AV" "\n\t" /* %9 = LO(AV)*/
|
|
678
|
+ " mul %9,%2" "\n\t" /* r1:r0 = LO(bezier_AV)*LO(curr_step)*/
|
|
679
|
+ " mov %7,r1" "\n\t" /* %7 = LO(bezier_AV)*LO(curr_step) >> 8*/
|
|
680
|
+ " clr %8" "\n\t" /* %8:%7 = LO(bezier_AV)*LO(curr_step) >> 8*/
|
|
681
|
+ " lds %10,bezier_AV+1" "\n\t" /* %10 = MI(AV)*/
|
|
682
|
+ " mul %10,%2" "\n\t" /* r1:r0 = MI(bezier_AV)*LO(curr_step)*/
|
|
683
|
+ " add %7,r0" "\n\t"
|
|
684
|
+ " adc %8,r1" "\n\t" /* %8:%7 += MI(bezier_AV)*LO(curr_step)*/
|
|
685
|
+ " lds r1,bezier_AV+2" "\n\t" /* r11 = HI(AV)*/
|
|
686
|
+ " mul r1,%2" "\n\t" /* r1:r0 = HI(bezier_AV)*LO(curr_step)*/
|
|
687
|
+ " add %8,r0" "\n\t" /* %8:%7 += HI(bezier_AV)*LO(curr_step) << 8*/
|
|
688
|
+ " mul %9,%3" "\n\t" /* r1:r0 = LO(bezier_AV)*MI(curr_step)*/
|
|
689
|
+ " add %7,r0" "\n\t"
|
|
690
|
+ " adc %8,r1" "\n\t" /* %8:%7 += LO(bezier_AV)*MI(curr_step)*/
|
|
691
|
+ " mul %10,%3" "\n\t" /* r1:r0 = MI(bezier_AV)*MI(curr_step)*/
|
|
692
|
+ " add %8,r0" "\n\t" /* %8:%7 += LO(bezier_AV)*MI(curr_step) << 8*/
|
|
693
|
+ " mul %9,%4" "\n\t" /* r1:r0 = LO(bezier_AV)*HI(curr_step)*/
|
|
694
|
+ " add %8,r0" "\n\t" /* %8:%7 += LO(bezier_AV)*HI(curr_step) << 8*/
|
|
695
|
+ /* %8:%7 = t*/
|
|
696
|
+
|
|
697
|
+ /* uint16_t f = t;*/
|
|
698
|
+ " mov %5,%7" "\n\t" /* %6:%5 = f*/
|
|
699
|
+ " mov %6,%8" "\n\t"
|
|
700
|
+ /* %6:%5 = f*/
|
|
701
|
+
|
|
702
|
+ /* umul16x16to16hi(f, f, t); / Range 16 bits (unsigned) [17] */
|
|
703
|
+ " mul %5,%7" "\n\t" /* r1:r0 = LO(f) * LO(t)*/
|
|
704
|
+ " mov %9,r1" "\n\t" /* store MIL(LO(f) * LO(t)) in %9, we need it for rounding*/
|
|
705
|
+ " clr %10" "\n\t" /* %10 = 0*/
|
|
706
|
+ " clr %11" "\n\t" /* %11 = 0*/
|
|
707
|
+ " mul %5,%8" "\n\t" /* r1:r0 = LO(f) * HI(t)*/
|
|
708
|
+ " add %9,r0" "\n\t" /* %9 += LO(LO(f) * HI(t))*/
|
|
709
|
+ " adc %10,r1" "\n\t" /* %10 = HI(LO(f) * HI(t))*/
|
|
710
|
+ " adc %11,%0" "\n\t" /* %11 += carry*/
|
|
711
|
+ " mul %6,%7" "\n\t" /* r1:r0 = HI(f) * LO(t)*/
|
|
712
|
+ " add %9,r0" "\n\t" /* %9 += LO(HI(f) * LO(t))*/
|
|
713
|
+ " adc %10,r1" "\n\t" /* %10 += HI(HI(f) * LO(t)) */
|
|
714
|
+ " adc %11,%0" "\n\t" /* %11 += carry*/
|
|
715
|
+ " mul %6,%8" "\n\t" /* r1:r0 = HI(f) * HI(t)*/
|
|
716
|
+ " add %10,r0" "\n\t" /* %10 += LO(HI(f) * HI(t))*/
|
|
717
|
+ " adc %11,r1" "\n\t" /* %11 += HI(HI(f) * HI(t))*/
|
|
718
|
+ " mov %5,%10" "\n\t" /* %6:%5 = */
|
|
719
|
+ " mov %6,%11" "\n\t" /* f = %10:%11*/
|
|
720
|
+
|
|
721
|
+ /* umul16x16to16hi(f, f, t); / Range 16 bits : f = t^3 (unsigned) [17]*/
|
|
722
|
+ " mul %5,%7" "\n\t" /* r1:r0 = LO(f) * LO(t)*/
|
|
723
|
+ " mov %1,r1" "\n\t" /* store MIL(LO(f) * LO(t)) in %1, we need it for rounding*/
|
|
724
|
+ " clr %10" "\n\t" /* %10 = 0*/
|
|
725
|
+ " clr %11" "\n\t" /* %11 = 0*/
|
|
726
|
+ " mul %5,%8" "\n\t" /* r1:r0 = LO(f) * HI(t)*/
|
|
727
|
+ " add %1,r0" "\n\t" /* %1 += LO(LO(f) * HI(t))*/
|
|
728
|
+ " adc %10,r1" "\n\t" /* %10 = HI(LO(f) * HI(t))*/
|
|
729
|
+ " adc %11,%0" "\n\t" /* %11 += carry*/
|
|
730
|
+ " mul %6,%7" "\n\t" /* r1:r0 = HI(f) * LO(t)*/
|
|
731
|
+ " add %1,r0" "\n\t" /* %1 += LO(HI(f) * LO(t))*/
|
|
732
|
+ " adc %10,r1" "\n\t" /* %10 += HI(HI(f) * LO(t))*/
|
|
733
|
+ " adc %11,%0" "\n\t" /* %11 += carry*/
|
|
734
|
+ " mul %6,%8" "\n\t" /* r1:r0 = HI(f) * HI(t)*/
|
|
735
|
+ " add %10,r0" "\n\t" /* %10 += LO(HI(f) * HI(t))*/
|
|
736
|
+ " adc %11,r1" "\n\t" /* %11 += HI(HI(f) * HI(t))*/
|
|
737
|
+ " mov %5,%10" "\n\t" /* %6:%5 =*/
|
|
738
|
+ " mov %6,%11" "\n\t" /* f = %10:%11*/
|
|
739
|
+ /* [15 +17*2] = [49]*/
|
|
740
|
+
|
|
741
|
+ /* %4:%3:%2 will be acc from now on*/
|
|
742
|
+
|
|
743
|
+ /* uint24_t acc = bezier_F; / Range 20 bits (unsigned)*/
|
|
744
|
+ " clr %9" "\n\t" /* "decimal place we get for free"*/
|
|
745
|
+ " lds %2,bezier_F" "\n\t"
|
|
746
|
+ " lds %3,bezier_F+1" "\n\t"
|
|
747
|
+ " lds %4,bezier_F+2" "\n\t" /* %4:%3:%2 = acc*/
|
|
748
|
+
|
|
749
|
+ /* if (A_negative) {*/
|
|
750
|
+ " lds r0,A_negative" "\n\t"
|
|
751
|
+ " or r0,%0" "\n\t" /* Is flag signalling negative? */
|
|
752
|
+ " brne 3f" "\n\t" /* If yes, Skip next instruction if A was negative*/
|
|
753
|
+ " rjmp 1f" "\n\t" /* Otherwise, jump */
|
|
754
|
+
|
|
755
|
+ /* uint24_t v; */
|
|
756
|
+ /* umul16x24to24hi(v, f, bezier_C); / Range 21bits [29] */
|
|
757
|
+ /* acc -= v; */
|
|
758
|
+ "3:" "\n\t"
|
|
759
|
+ " lds %10, bezier_C" "\n\t" /* %10 = LO(bezier_C)*/
|
|
760
|
+ " mul %10,%5" "\n\t" /* r1:r0 = LO(bezier_C) * LO(f)*/
|
|
761
|
+ " sub %9,r1" "\n\t"
|
|
762
|
+ " sbc %2,%0" "\n\t"
|
|
763
|
+ " sbc %3,%0" "\n\t"
|
|
764
|
+ " sbc %4,%0" "\n\t" /* %4:%3:%2:%9 -= HI(LO(bezier_C) * LO(f))*/
|
|
765
|
+ " lds %11, bezier_C+1" "\n\t" /* %11 = MI(bezier_C)*/
|
|
766
|
+ " mul %11,%5" "\n\t" /* r1:r0 = MI(bezier_C) * LO(f)*/
|
|
767
|
+ " sub %9,r0" "\n\t"
|
|
768
|
+ " sbc %2,r1" "\n\t"
|
|
769
|
+ " sbc %3,%0" "\n\t"
|
|
770
|
+ " sbc %4,%0" "\n\t" /* %4:%3:%2:%9 -= MI(bezier_C) * LO(f)*/
|
|
771
|
+ " lds %1, bezier_C+2" "\n\t" /* %1 = HI(bezier_C)*/
|
|
772
|
+ " mul %1,%5" "\n\t" /* r1:r0 = MI(bezier_C) * LO(f)*/
|
|
773
|
+ " sub %2,r0" "\n\t"
|
|
774
|
+ " sbc %3,r1" "\n\t"
|
|
775
|
+ " sbc %4,%0" "\n\t" /* %4:%3:%2:%9 -= HI(bezier_C) * LO(f) << 8*/
|
|
776
|
+ " mul %10,%6" "\n\t" /* r1:r0 = LO(bezier_C) * MI(f)*/
|
|
777
|
+ " sub %9,r0" "\n\t"
|
|
778
|
+ " sbc %2,r1" "\n\t"
|
|
779
|
+ " sbc %3,%0" "\n\t"
|
|
780
|
+ " sbc %4,%0" "\n\t" /* %4:%3:%2:%9 -= LO(bezier_C) * MI(f)*/
|
|
781
|
+ " mul %11,%6" "\n\t" /* r1:r0 = MI(bezier_C) * MI(f)*/
|
|
782
|
+ " sub %2,r0" "\n\t"
|
|
783
|
+ " sbc %3,r1" "\n\t"
|
|
784
|
+ " sbc %4,%0" "\n\t" /* %4:%3:%2:%9 -= MI(bezier_C) * MI(f) << 8*/
|
|
785
|
+ " mul %1,%6" "\n\t" /* r1:r0 = HI(bezier_C) * LO(f)*/
|
|
786
|
+ " sub %3,r0" "\n\t"
|
|
787
|
+ " sbc %4,r1" "\n\t" /* %4:%3:%2:%9 -= HI(bezier_C) * LO(f) << 16*/
|
|
788
|
+
|
|
789
|
+ /* umul16x16to16hi(f, f, t); / Range 16 bits : f = t^3 (unsigned) [17]*/
|
|
790
|
+ " mul %5,%7" "\n\t" /* r1:r0 = LO(f) * LO(t)*/
|
|
791
|
+ " mov %1,r1" "\n\t" /* store MIL(LO(f) * LO(t)) in %1, we need it for rounding*/
|
|
792
|
+ " clr %10" "\n\t" /* %10 = 0*/
|
|
793
|
+ " clr %11" "\n\t" /* %11 = 0*/
|
|
794
|
+ " mul %5,%8" "\n\t" /* r1:r0 = LO(f) * HI(t)*/
|
|
795
|
+ " add %1,r0" "\n\t" /* %1 += LO(LO(f) * HI(t))*/
|
|
796
|
+ " adc %10,r1" "\n\t" /* %10 = HI(LO(f) * HI(t))*/
|
|
797
|
+ " adc %11,%0" "\n\t" /* %11 += carry*/
|
|
798
|
+ " mul %6,%7" "\n\t" /* r1:r0 = HI(f) * LO(t)*/
|
|
799
|
+ " add %1,r0" "\n\t" /* %1 += LO(HI(f) * LO(t))*/
|
|
800
|
+ " adc %10,r1" "\n\t" /* %10 += HI(HI(f) * LO(t))*/
|
|
801
|
+ " adc %11,%0" "\n\t" /* %11 += carry*/
|
|
802
|
+ " mul %6,%8" "\n\t" /* r1:r0 = HI(f) * HI(t)*/
|
|
803
|
+ " add %10,r0" "\n\t" /* %10 += LO(HI(f) * HI(t))*/
|
|
804
|
+ " adc %11,r1" "\n\t" /* %11 += HI(HI(f) * HI(t))*/
|
|
805
|
+ " mov %5,%10" "\n\t" /* %6:%5 =*/
|
|
806
|
+ " mov %6,%11" "\n\t" /* f = %10:%11*/
|
|
807
|
+
|
|
808
|
+ /* umul16x24to24hi(v, f, bezier_B); / Range 22bits [29]*/
|
|
809
|
+ /* acc += v; */
|
|
810
|
+ " lds %10, bezier_B" "\n\t" /* %10 = LO(bezier_B)*/
|
|
811
|
+ " mul %10,%5" "\n\t" /* r1:r0 = LO(bezier_B) * LO(f)*/
|
|
812
|
+ " add %9,r1" "\n\t"
|
|
813
|
+ " adc %2,%0" "\n\t"
|
|
814
|
+ " adc %3,%0" "\n\t"
|
|
815
|
+ " adc %4,%0" "\n\t" /* %4:%3:%2:%9 += HI(LO(bezier_B) * LO(f))*/
|
|
816
|
+ " lds %11, bezier_B+1" "\n\t" /* %11 = MI(bezier_B)*/
|
|
817
|
+ " mul %11,%5" "\n\t" /* r1:r0 = MI(bezier_B) * LO(f)*/
|
|
818
|
+ " add %9,r0" "\n\t"
|
|
819
|
+ " adc %2,r1" "\n\t"
|
|
820
|
+ " adc %3,%0" "\n\t"
|
|
821
|
+ " adc %4,%0" "\n\t" /* %4:%3:%2:%9 += MI(bezier_B) * LO(f)*/
|
|
822
|
+ " lds %1, bezier_B+2" "\n\t" /* %1 = HI(bezier_B)*/
|
|
823
|
+ " mul %1,%5" "\n\t" /* r1:r0 = MI(bezier_B) * LO(f)*/
|
|
824
|
+ " add %2,r0" "\n\t"
|
|
825
|
+ " adc %3,r1" "\n\t"
|
|
826
|
+ " adc %4,%0" "\n\t" /* %4:%3:%2:%9 += HI(bezier_B) * LO(f) << 8*/
|
|
827
|
+ " mul %10,%6" "\n\t" /* r1:r0 = LO(bezier_B) * MI(f)*/
|
|
828
|
+ " add %9,r0" "\n\t"
|
|
829
|
+ " adc %2,r1" "\n\t"
|
|
830
|
+ " adc %3,%0" "\n\t"
|
|
831
|
+ " adc %4,%0" "\n\t" /* %4:%3:%2:%9 += LO(bezier_B) * MI(f)*/
|
|
832
|
+ " mul %11,%6" "\n\t" /* r1:r0 = MI(bezier_B) * MI(f)*/
|
|
833
|
+ " add %2,r0" "\n\t"
|
|
834
|
+ " adc %3,r1" "\n\t"
|
|
835
|
+ " adc %4,%0" "\n\t" /* %4:%3:%2:%9 += MI(bezier_B) * MI(f) << 8*/
|
|
836
|
+ " mul %1,%6" "\n\t" /* r1:r0 = HI(bezier_B) * LO(f)*/
|
|
837
|
+ " add %3,r0" "\n\t"
|
|
838
|
+ " adc %4,r1" "\n\t" /* %4:%3:%2:%9 += HI(bezier_B) * LO(f) << 16*/
|
|
839
|
+
|
|
840
|
+ /* umul16x16to16hi(f, f, t); / Range 16 bits : f = t^5 (unsigned) [17]*/
|
|
841
|
+ " mul %5,%7" "\n\t" /* r1:r0 = LO(f) * LO(t)*/
|
|
842
|
+ " mov %1,r1" "\n\t" /* store MIL(LO(f) * LO(t)) in %1, we need it for rounding*/
|
|
843
|
+ " clr %10" "\n\t" /* %10 = 0*/
|
|
844
|
+ " clr %11" "\n\t" /* %11 = 0*/
|
|
845
|
+ " mul %5,%8" "\n\t" /* r1:r0 = LO(f) * HI(t)*/
|
|
846
|
+ " add %1,r0" "\n\t" /* %1 += LO(LO(f) * HI(t))*/
|
|
847
|
+ " adc %10,r1" "\n\t" /* %10 = HI(LO(f) * HI(t))*/
|
|
848
|
+ " adc %11,%0" "\n\t" /* %11 += carry*/
|
|
849
|
+ " mul %6,%7" "\n\t" /* r1:r0 = HI(f) * LO(t)*/
|
|
850
|
+ " add %1,r0" "\n\t" /* %1 += LO(HI(f) * LO(t))*/
|
|
851
|
+ " adc %10,r1" "\n\t" /* %10 += HI(HI(f) * LO(t))*/
|
|
852
|
+ " adc %11,%0" "\n\t" /* %11 += carry*/
|
|
853
|
+ " mul %6,%8" "\n\t" /* r1:r0 = HI(f) * HI(t)*/
|
|
854
|
+ " add %10,r0" "\n\t" /* %10 += LO(HI(f) * HI(t))*/
|
|
855
|
+ " adc %11,r1" "\n\t" /* %11 += HI(HI(f) * HI(t))*/
|
|
856
|
+ " mov %5,%10" "\n\t" /* %6:%5 =*/
|
|
857
|
+ " mov %6,%11" "\n\t" /* f = %10:%11*/
|
|
858
|
+
|
|
859
|
+ /* umul16x24to24hi(v, f, bezier_A); / Range 21bits [29]*/
|
|
860
|
+ /* acc -= v; */
|
|
861
|
+ " lds %10, bezier_A" "\n\t" /* %10 = LO(bezier_A)*/
|
|
862
|
+ " mul %10,%5" "\n\t" /* r1:r0 = LO(bezier_A) * LO(f)*/
|
|
863
|
+ " sub %9,r1" "\n\t"
|
|
864
|
+ " sbc %2,%0" "\n\t"
|
|
865
|
+ " sbc %3,%0" "\n\t"
|
|
866
|
+ " sbc %4,%0" "\n\t" /* %4:%3:%2:%9 -= HI(LO(bezier_A) * LO(f))*/
|
|
867
|
+ " lds %11, bezier_A+1" "\n\t" /* %11 = MI(bezier_A)*/
|
|
868
|
+ " mul %11,%5" "\n\t" /* r1:r0 = MI(bezier_A) * LO(f)*/
|
|
869
|
+ " sub %9,r0" "\n\t"
|
|
870
|
+ " sbc %2,r1" "\n\t"
|
|
871
|
+ " sbc %3,%0" "\n\t"
|
|
872
|
+ " sbc %4,%0" "\n\t" /* %4:%3:%2:%9 -= MI(bezier_A) * LO(f)*/
|
|
873
|
+ " lds %1, bezier_A+2" "\n\t" /* %1 = HI(bezier_A)*/
|
|
874
|
+ " mul %1,%5" "\n\t" /* r1:r0 = MI(bezier_A) * LO(f)*/
|
|
875
|
+ " sub %2,r0" "\n\t"
|
|
876
|
+ " sbc %3,r1" "\n\t"
|
|
877
|
+ " sbc %4,%0" "\n\t" /* %4:%3:%2:%9 -= HI(bezier_A) * LO(f) << 8*/
|
|
878
|
+ " mul %10,%6" "\n\t" /* r1:r0 = LO(bezier_A) * MI(f)*/
|
|
879
|
+ " sub %9,r0" "\n\t"
|
|
880
|
+ " sbc %2,r1" "\n\t"
|
|
881
|
+ " sbc %3,%0" "\n\t"
|
|
882
|
+ " sbc %4,%0" "\n\t" /* %4:%3:%2:%9 -= LO(bezier_A) * MI(f)*/
|
|
883
|
+ " mul %11,%6" "\n\t" /* r1:r0 = MI(bezier_A) * MI(f)*/
|
|
884
|
+ " sub %2,r0" "\n\t"
|
|
885
|
+ " sbc %3,r1" "\n\t"
|
|
886
|
+ " sbc %4,%0" "\n\t" /* %4:%3:%2:%9 -= MI(bezier_A) * MI(f) << 8*/
|
|
887
|
+ " mul %1,%6" "\n\t" /* r1:r0 = HI(bezier_A) * LO(f)*/
|
|
888
|
+ " sub %3,r0" "\n\t"
|
|
889
|
+ " sbc %4,r1" "\n\t" /* %4:%3:%2:%9 -= HI(bezier_A) * LO(f) << 16*/
|
|
890
|
+ " jmp 2f" "\n\t" /* Done!*/
|
|
891
|
+
|
|
892
|
+ "1:" "\n\t"
|
|
893
|
+
|
|
894
|
+ /* uint24_t v; */
|
|
895
|
+ /* umul16x24to24hi(v, f, bezier_C); / Range 21bits [29]*/
|
|
896
|
+ /* acc += v; */
|
|
897
|
+ " lds %10, bezier_C" "\n\t" /* %10 = LO(bezier_C)*/
|
|
898
|
+ " mul %10,%5" "\n\t" /* r1:r0 = LO(bezier_C) * LO(f)*/
|
|
899
|
+ " add %9,r1" "\n\t"
|
|
900
|
+ " adc %2,%0" "\n\t"
|
|
901
|
+ " adc %3,%0" "\n\t"
|
|
902
|
+ " adc %4,%0" "\n\t" /* %4:%3:%2:%9 += HI(LO(bezier_C) * LO(f))*/
|
|
903
|
+ " lds %11, bezier_C+1" "\n\t" /* %11 = MI(bezier_C)*/
|
|
904
|
+ " mul %11,%5" "\n\t" /* r1:r0 = MI(bezier_C) * LO(f)*/
|
|
905
|
+ " add %9,r0" "\n\t"
|
|
906
|
+ " adc %2,r1" "\n\t"
|
|
907
|
+ " adc %3,%0" "\n\t"
|
|
908
|
+ " adc %4,%0" "\n\t" /* %4:%3:%2:%9 += MI(bezier_C) * LO(f)*/
|
|
909
|
+ " lds %1, bezier_C+2" "\n\t" /* %1 = HI(bezier_C)*/
|
|
910
|
+ " mul %1,%5" "\n\t" /* r1:r0 = MI(bezier_C) * LO(f)*/
|
|
911
|
+ " add %2,r0" "\n\t"
|
|
912
|
+ " adc %3,r1" "\n\t"
|
|
913
|
+ " adc %4,%0" "\n\t" /* %4:%3:%2:%9 += HI(bezier_C) * LO(f) << 8*/
|
|
914
|
+ " mul %10,%6" "\n\t" /* r1:r0 = LO(bezier_C) * MI(f)*/
|
|
915
|
+ " add %9,r0" "\n\t"
|
|
916
|
+ " adc %2,r1" "\n\t"
|
|
917
|
+ " adc %3,%0" "\n\t"
|
|
918
|
+ " adc %4,%0" "\n\t" /* %4:%3:%2:%9 += LO(bezier_C) * MI(f)*/
|
|
919
|
+ " mul %11,%6" "\n\t" /* r1:r0 = MI(bezier_C) * MI(f)*/
|
|
920
|
+ " add %2,r0" "\n\t"
|
|
921
|
+ " adc %3,r1" "\n\t"
|
|
922
|
+ " adc %4,%0" "\n\t" /* %4:%3:%2:%9 += MI(bezier_C) * MI(f) << 8*/
|
|
923
|
+ " mul %1,%6" "\n\t" /* r1:r0 = HI(bezier_C) * LO(f)*/
|
|
924
|
+ " add %3,r0" "\n\t"
|
|
925
|
+ " adc %4,r1" "\n\t" /* %4:%3:%2:%9 += HI(bezier_C) * LO(f) << 16*/
|
|
926
|
+
|
|
927
|
+ /* umul16x16to16hi(f, f, t); / Range 16 bits : f = t^3 (unsigned) [17]*/
|
|
928
|
+ " mul %5,%7" "\n\t" /* r1:r0 = LO(f) * LO(t)*/
|
|
929
|
+ " mov %1,r1" "\n\t" /* store MIL(LO(f) * LO(t)) in %1, we need it for rounding*/
|
|
930
|
+ " clr %10" "\n\t" /* %10 = 0*/
|
|
931
|
+ " clr %11" "\n\t" /* %11 = 0*/
|
|
932
|
+ " mul %5,%8" "\n\t" /* r1:r0 = LO(f) * HI(t)*/
|
|
933
|
+ " add %1,r0" "\n\t" /* %1 += LO(LO(f) * HI(t))*/
|
|
934
|
+ " adc %10,r1" "\n\t" /* %10 = HI(LO(f) * HI(t))*/
|
|
935
|
+ " adc %11,%0" "\n\t" /* %11 += carry*/
|
|
936
|
+ " mul %6,%7" "\n\t" /* r1:r0 = HI(f) * LO(t)*/
|
|
937
|
+ " add %1,r0" "\n\t" /* %1 += LO(HI(f) * LO(t))*/
|
|
938
|
+ " adc %10,r1" "\n\t" /* %10 += HI(HI(f) * LO(t))*/
|
|
939
|
+ " adc %11,%0" "\n\t" /* %11 += carry*/
|
|
940
|
+ " mul %6,%8" "\n\t" /* r1:r0 = HI(f) * HI(t)*/
|
|
941
|
+ " add %10,r0" "\n\t" /* %10 += LO(HI(f) * HI(t))*/
|
|
942
|
+ " adc %11,r1" "\n\t" /* %11 += HI(HI(f) * HI(t))*/
|
|
943
|
+ " mov %5,%10" "\n\t" /* %6:%5 =*/
|
|
944
|
+ " mov %6,%11" "\n\t" /* f = %10:%11*/
|
|
945
|
+
|
|
946
|
+ /* umul16x24to24hi(v, f, bezier_B); / Range 22bits [29]*/
|
|
947
|
+ /* acc -= v;*/
|
|
948
|
+ " lds %10, bezier_B" "\n\t" /* %10 = LO(bezier_B)*/
|
|
949
|
+ " mul %10,%5" "\n\t" /* r1:r0 = LO(bezier_B) * LO(f)*/
|
|
950
|
+ " sub %9,r1" "\n\t"
|
|
951
|
+ " sbc %2,%0" "\n\t"
|
|
952
|
+ " sbc %3,%0" "\n\t"
|
|
953
|
+ " sbc %4,%0" "\n\t" /* %4:%3:%2:%9 -= HI(LO(bezier_B) * LO(f))*/
|
|
954
|
+ " lds %11, bezier_B+1" "\n\t" /* %11 = MI(bezier_B)*/
|
|
955
|
+ " mul %11,%5" "\n\t" /* r1:r0 = MI(bezier_B) * LO(f)*/
|
|
956
|
+ " sub %9,r0" "\n\t"
|
|
957
|
+ " sbc %2,r1" "\n\t"
|
|
958
|
+ " sbc %3,%0" "\n\t"
|
|
959
|
+ " sbc %4,%0" "\n\t" /* %4:%3:%2:%9 -= MI(bezier_B) * LO(f)*/
|
|
960
|
+ " lds %1, bezier_B+2" "\n\t" /* %1 = HI(bezier_B)*/
|
|
961
|
+ " mul %1,%5" "\n\t" /* r1:r0 = MI(bezier_B) * LO(f)*/
|
|
962
|
+ " sub %2,r0" "\n\t"
|
|
963
|
+ " sbc %3,r1" "\n\t"
|
|
964
|
+ " sbc %4,%0" "\n\t" /* %4:%3:%2:%9 -= HI(bezier_B) * LO(f) << 8*/
|
|
965
|
+ " mul %10,%6" "\n\t" /* r1:r0 = LO(bezier_B) * MI(f)*/
|
|
966
|
+ " sub %9,r0" "\n\t"
|
|
967
|
+ " sbc %2,r1" "\n\t"
|
|
968
|
+ " sbc %3,%0" "\n\t"
|
|
969
|
+ " sbc %4,%0" "\n\t" /* %4:%3:%2:%9 -= LO(bezier_B) * MI(f)*/
|
|
970
|
+ " mul %11,%6" "\n\t" /* r1:r0 = MI(bezier_B) * MI(f)*/
|
|
971
|
+ " sub %2,r0" "\n\t"
|
|
972
|
+ " sbc %3,r1" "\n\t"
|
|
973
|
+ " sbc %4,%0" "\n\t" /* %4:%3:%2:%9 -= MI(bezier_B) * MI(f) << 8*/
|
|
974
|
+ " mul %1,%6" "\n\t" /* r1:r0 = HI(bezier_B) * LO(f)*/
|
|
975
|
+ " sub %3,r0" "\n\t"
|
|
976
|
+ " sbc %4,r1" "\n\t" /* %4:%3:%2:%9 -= HI(bezier_B) * LO(f) << 16*/
|
|
977
|
+
|
|
978
|
+ /* umul16x16to16hi(f, f, t); / Range 16 bits : f = t^5 (unsigned) [17]*/
|
|
979
|
+ " mul %5,%7" "\n\t" /* r1:r0 = LO(f) * LO(t)*/
|
|
980
|
+ " mov %1,r1" "\n\t" /* store MIL(LO(f) * LO(t)) in %1, we need it for rounding*/
|
|
981
|
+ " clr %10" "\n\t" /* %10 = 0*/
|
|
982
|
+ " clr %11" "\n\t" /* %11 = 0*/
|
|
983
|
+ " mul %5,%8" "\n\t" /* r1:r0 = LO(f) * HI(t)*/
|
|
984
|
+ " add %1,r0" "\n\t" /* %1 += LO(LO(f) * HI(t))*/
|
|
985
|
+ " adc %10,r1" "\n\t" /* %10 = HI(LO(f) * HI(t))*/
|
|
986
|
+ " adc %11,%0" "\n\t" /* %11 += carry*/
|
|
987
|
+ " mul %6,%7" "\n\t" /* r1:r0 = HI(f) * LO(t)*/
|
|
988
|
+ " add %1,r0" "\n\t" /* %1 += LO(HI(f) * LO(t))*/
|
|
989
|
+ " adc %10,r1" "\n\t" /* %10 += HI(HI(f) * LO(t))*/
|
|
990
|
+ " adc %11,%0" "\n\t" /* %11 += carry*/
|
|
991
|
+ " mul %6,%8" "\n\t" /* r1:r0 = HI(f) * HI(t)*/
|
|
992
|
+ " add %10,r0" "\n\t" /* %10 += LO(HI(f) * HI(t))*/
|
|
993
|
+ " adc %11,r1" "\n\t" /* %11 += HI(HI(f) * HI(t))*/
|
|
994
|
+ " mov %5,%10" "\n\t" /* %6:%5 =*/
|
|
995
|
+ " mov %6,%11" "\n\t" /* f = %10:%11*/
|
|
996
|
+
|
|
997
|
+ /* umul16x24to24hi(v, f, bezier_A); / Range 21bits [29]*/
|
|
998
|
+ /* acc += v; */
|
|
999
|
+ " lds %10, bezier_A" "\n\t" /* %10 = LO(bezier_A)*/
|
|
1000
|
+ " mul %10,%5" "\n\t" /* r1:r0 = LO(bezier_A) * LO(f)*/
|
|
1001
|
+ " add %9,r1" "\n\t"
|
|
1002
|
+ " adc %2,%0" "\n\t"
|
|
1003
|
+ " adc %3,%0" "\n\t"
|
|
1004
|
+ " adc %4,%0" "\n\t" /* %4:%3:%2:%9 += HI(LO(bezier_A) * LO(f))*/
|
|
1005
|
+ " lds %11, bezier_A+1" "\n\t" /* %11 = MI(bezier_A)*/
|
|
1006
|
+ " mul %11,%5" "\n\t" /* r1:r0 = MI(bezier_A) * LO(f)*/
|
|
1007
|
+ " add %9,r0" "\n\t"
|
|
1008
|
+ " adc %2,r1" "\n\t"
|
|
1009
|
+ " adc %3,%0" "\n\t"
|
|
1010
|
+ " adc %4,%0" "\n\t" /* %4:%3:%2:%9 += MI(bezier_A) * LO(f)*/
|
|
1011
|
+ " lds %1, bezier_A+2" "\n\t" /* %1 = HI(bezier_A)*/
|
|
1012
|
+ " mul %1,%5" "\n\t" /* r1:r0 = MI(bezier_A) * LO(f)*/
|
|
1013
|
+ " add %2,r0" "\n\t"
|
|
1014
|
+ " adc %3,r1" "\n\t"
|
|
1015
|
+ " adc %4,%0" "\n\t" /* %4:%3:%2:%9 += HI(bezier_A) * LO(f) << 8*/
|
|
1016
|
+ " mul %10,%6" "\n\t" /* r1:r0 = LO(bezier_A) * MI(f)*/
|
|
1017
|
+ " add %9,r0" "\n\t"
|
|
1018
|
+ " adc %2,r1" "\n\t"
|
|
1019
|
+ " adc %3,%0" "\n\t"
|
|
1020
|
+ " adc %4,%0" "\n\t" /* %4:%3:%2:%9 += LO(bezier_A) * MI(f)*/
|
|
1021
|
+ " mul %11,%6" "\n\t" /* r1:r0 = MI(bezier_A) * MI(f)*/
|
|
1022
|
+ " add %2,r0" "\n\t"
|
|
1023
|
+ " adc %3,r1" "\n\t"
|
|
1024
|
+ " adc %4,%0" "\n\t" /* %4:%3:%2:%9 += MI(bezier_A) * MI(f) << 8*/
|
|
1025
|
+ " mul %1,%6" "\n\t" /* r1:r0 = HI(bezier_A) * LO(f)*/
|
|
1026
|
+ " add %3,r0" "\n\t"
|
|
1027
|
+ " adc %4,r1" "\n\t" /* %4:%3:%2:%9 += HI(bezier_A) * LO(f) << 16*/
|
|
1028
|
+ "2:" "\n\t"
|
|
1029
|
+ " clr __zero_reg__" /* C runtime expects r1 = __zero_reg__ = 0 */
|
|
1030
|
+ : "+r"(r0),
|
|
1031
|
+ "+r"(r1),
|
|
1032
|
+ "+r"(r2),
|
|
1033
|
+ "+r"(r3),
|
|
1034
|
+ "+r"(r4),
|
|
1035
|
+ "+r"(r5),
|
|
1036
|
+ "+r"(r6),
|
|
1037
|
+ "+r"(r7),
|
|
1038
|
+ "+r"(r8),
|
|
1039
|
+ "+r"(r9),
|
|
1040
|
+ "+r"(r10),
|
|
1041
|
+ "+r"(r11)
|
|
1042
|
+ :
|
|
1043
|
+ :"cc","r0","r1"
|
|
1044
|
+ );
|
|
1045
|
+ return (r2 | (uint16_t(r3) << 8)) | (uint32_t(r4) << 16);
|
|
1046
|
+ }
|
494
|
1047
|
|
495
|
|
- // For non ARM targets, we provide a fallback implementation. Really doubt it
|
496
|
|
- // will be useful, unless the processor is extremely fast.
|
497
|
|
-
|
498
|
|
- uint32_t t = bezier_AV * curr_step; // t: Range 0 - 1^32 = 32 bits
|
499
|
|
- uint64_t f = t;
|
500
|
|
- f *= t; // Range 32*2 = 64 bits (unsigned)
|
501
|
|
- f >>= 32; // Range 32 bits (unsigned)
|
502
|
|
- f *= t; // Range 32*2 = 64 bits (unsigned)
|
503
|
|
- f >>= 32; // Range 32 bits : f = t^3 (unsigned)
|
504
|
|
- int64_t acc = (int64_t) bezier_F << 31; // Range 63 bits (signed)
|
505
|
|
- acc += ((uint32_t) f >> 1) * (int64_t) bezier_C; // Range 29bits + 31 = 60bits (plus sign)
|
506
|
|
- f *= t; // Range 32*2 = 64 bits
|
507
|
|
- f >>= 32; // Range 32 bits : f = t^3 (unsigned)
|
508
|
|
- acc += ((uint32_t) f >> 1) * (int64_t) bezier_B; // Range 29bits + 31 = 60bits (plus sign)
|
509
|
|
- f *= t; // Range 32*2 = 64 bits
|
510
|
|
- f >>= 32; // Range 32 bits : f = t^3 (unsigned)
|
511
|
|
- acc += ((uint32_t) f >> 1) * (int64_t) bezier_A; // Range 28bits + 31 = 59bits (plus sign)
|
512
|
|
- acc >>= (31 + 7); // Range 24bits (plus sign)
|
513
|
|
- return (int32_t) acc;
|
|
1048
|
+ #else
|
514
|
1049
|
|
515
|
|
- #endif
|
516
|
|
- }
|
|
1050
|
+ // For all the other 32bit CPUs
|
|
1051
|
+ FORCE_INLINE void Stepper::_calc_bezier_curve_coeffs(const int32_t v0, const int32_t v1, const uint32_t av) {
|
|
1052
|
+ // Calculate the Bézier coefficients
|
|
1053
|
+ bezier_A = 768 * (v1 - v0);
|
|
1054
|
+ bezier_B = 1920 * (v0 - v1);
|
|
1055
|
+ bezier_C = 1280 * (v1 - v0);
|
|
1056
|
+ bezier_F = 128 * v0;
|
|
1057
|
+ bezier_AV = av;
|
|
1058
|
+ }
|
|
1059
|
+
|
|
1060
|
+ FORCE_INLINE int32_t Stepper::_eval_bezier_curve(const uint32_t curr_step) {
|
|
1061
|
+ #if defined(__ARM__) || defined(__thumb__)
|
|
1062
|
+
|
|
1063
|
+ // For ARM Cortex M3/M4 CPUs, we have the optimized assembler version, that takes 43 cycles to execute
|
|
1064
|
+ register uint32_t flo = 0;
|
|
1065
|
+ register uint32_t fhi = bezier_AV * curr_step;
|
|
1066
|
+ register uint32_t t = fhi;
|
|
1067
|
+ register int32_t alo = bezier_F;
|
|
1068
|
+ register int32_t ahi = 0;
|
|
1069
|
+ register int32_t A = bezier_A;
|
|
1070
|
+ register int32_t B = bezier_B;
|
|
1071
|
+ register int32_t C = bezier_C;
|
|
1072
|
+
|
|
1073
|
+ __asm__ __volatile__(
|
|
1074
|
+ ".syntax unified" "\n\t" // is to prevent CM0,CM1 non-unified syntax
|
|
1075
|
+ " lsrs %[ahi],%[alo],#1" "\n\t" // a = F << 31 1 cycles
|
|
1076
|
+ " lsls %[alo],%[alo],#31" "\n\t" // 1 cycles
|
|
1077
|
+ " umull %[flo],%[fhi],%[fhi],%[t]" "\n\t" // f *= t 5 cycles [fhi:flo=64bits]
|
|
1078
|
+ " umull %[flo],%[fhi],%[fhi],%[t]" "\n\t" // f>>=32; f*=t 5 cycles [fhi:flo=64bits]
|
|
1079
|
+ " lsrs %[flo],%[fhi],#1" "\n\t" // 1 cycles [31bits]
|
|
1080
|
+ " smlal %[alo],%[ahi],%[flo],%[C]" "\n\t" // a+=(f>>33)*C; 5 cycles
|
|
1081
|
+ " umull %[flo],%[fhi],%[fhi],%[t]" "\n\t" // f>>=32; f*=t 5 cycles [fhi:flo=64bits]
|
|
1082
|
+ " lsrs %[flo],%[fhi],#1" "\n\t" // 1 cycles [31bits]
|
|
1083
|
+ " smlal %[alo],%[ahi],%[flo],%[B]" "\n\t" // a+=(f>>33)*B; 5 cycles
|
|
1084
|
+ " umull %[flo],%[fhi],%[fhi],%[t]" "\n\t" // f>>=32; f*=t 5 cycles [fhi:flo=64bits]
|
|
1085
|
+ " lsrs %[flo],%[fhi],#1" "\n\t" // f>>=33; 1 cycles [31bits]
|
|
1086
|
+ " smlal %[alo],%[ahi],%[flo],%[A]" "\n\t" // a+=(f>>33)*A; 5 cycles
|
|
1087
|
+ " lsrs %[alo],%[ahi],#6" "\n\t" // a>>=38 1 cycles
|
|
1088
|
+ : [alo]"+r"( alo ) ,
|
|
1089
|
+ [flo]"+r"( flo ) ,
|
|
1090
|
+ [fhi]"+r"( fhi ) ,
|
|
1091
|
+ [ahi]"+r"( ahi ) ,
|
|
1092
|
+ [A]"+r"( A ) , // <== Note: Even if A, B, C, and t registers are INPUT ONLY
|
|
1093
|
+ [B]"+r"( B ) , // GCC does bad optimizations on the code if we list them as
|
|
1094
|
+ [C]"+r"( C ) , // such, breaking this function. So, to avoid that problem,
|
|
1095
|
+ [t]"+r"( t ) // we list all registers as input-outputs.
|
|
1096
|
+ :
|
|
1097
|
+ : "cc"
|
|
1098
|
+ );
|
|
1099
|
+ return alo;
|
|
1100
|
+
|
|
1101
|
+ #else
|
517
|
1102
|
|
|
1103
|
+ // For non ARM targets, we provide a fallback implementation. Really doubt it
|
|
1104
|
+ // will be useful, unless the processor is fast and 32bit
|
|
1105
|
+
|
|
1106
|
+ uint32_t t = bezier_AV * curr_step; // t: Range 0 - 1^32 = 32 bits
|
|
1107
|
+ uint64_t f = t;
|
|
1108
|
+ f *= t; // Range 32*2 = 64 bits (unsigned)
|
|
1109
|
+ f >>= 32; // Range 32 bits (unsigned)
|
|
1110
|
+ f *= t; // Range 32*2 = 64 bits (unsigned)
|
|
1111
|
+ f >>= 32; // Range 32 bits : f = t^3 (unsigned)
|
|
1112
|
+ int64_t acc = (int64_t) bezier_F << 31; // Range 63 bits (signed)
|
|
1113
|
+ acc += ((uint32_t) f >> 1) * (int64_t) bezier_C; // Range 29bits + 31 = 60bits (plus sign)
|
|
1114
|
+ f *= t; // Range 32*2 = 64 bits
|
|
1115
|
+ f >>= 32; // Range 32 bits : f = t^3 (unsigned)
|
|
1116
|
+ acc += ((uint32_t) f >> 1) * (int64_t) bezier_B; // Range 29bits + 31 = 60bits (plus sign)
|
|
1117
|
+ f *= t; // Range 32*2 = 64 bits
|
|
1118
|
+ f >>= 32; // Range 32 bits : f = t^3 (unsigned)
|
|
1119
|
+ acc += ((uint32_t) f >> 1) * (int64_t) bezier_A; // Range 28bits + 31 = 59bits (plus sign)
|
|
1120
|
+ acc >>= (31 + 7); // Range 24bits (plus sign)
|
|
1121
|
+ return (int32_t) acc;
|
|
1122
|
+
|
|
1123
|
+ #endif
|
|
1124
|
+ }
|
|
1125
|
+ #endif
|
518
|
1126
|
#endif // BEZIER_JERK_CONTROL
|
519
|
1127
|
|
520
|
1128
|
/**
|
|
@@ -660,7 +1268,7 @@ void Stepper::isr() {
|
660
|
1268
|
|
661
|
1269
|
#if ENABLED(BEZIER_JERK_CONTROL)
|
662
|
1270
|
// Initialize the Bézier speed curve
|
663
|
|
- _calc_bezier_curve_coeffs(current_block->initial_rate, current_block->cruise_rate, current_block->acceleration_time);
|
|
1271
|
+ _calc_bezier_curve_coeffs(current_block->initial_rate, current_block->cruise_rate, current_block->acceleration_time_inverse);
|
664
|
1272
|
|
665
|
1273
|
// We have not started the 2nd half of the trapezoid
|
666
|
1274
|
bezier_2nd_half = false;
|
|
@@ -953,7 +1561,7 @@ void Stepper::isr() {
|
953
|
1561
|
if (!bezier_2nd_half) {
|
954
|
1562
|
|
955
|
1563
|
// Initialize the Bézier speed curve
|
956
|
|
- _calc_bezier_curve_coeffs(current_block->cruise_rate, current_block->final_rate, current_block->deceleration_time);
|
|
1564
|
+ _calc_bezier_curve_coeffs(current_block->cruise_rate, current_block->final_rate, current_block->deceleration_time_inverse);
|
957
|
1565
|
bezier_2nd_half = true;
|
958
|
1566
|
}
|
959
|
1567
|
|