|
@@ -634,8 +634,8 @@ static bool send_ok[BUFSIZE];
|
634
|
634
|
static inline type pgm_read_any(const type *p) \
|
635
|
635
|
{ return pgm_read_##reader##_near(p); }
|
636
|
636
|
|
637
|
|
-DEFINE_PGM_READ_ANY(float, float);
|
638
|
|
-DEFINE_PGM_READ_ANY(signed char, byte);
|
|
637
|
+DEFINE_PGM_READ_ANY(float, float)
|
|
638
|
+DEFINE_PGM_READ_ANY(signed char, byte)
|
639
|
639
|
|
640
|
640
|
#define XYZ_CONSTS_FROM_CONFIG(type, array, CONFIG) \
|
641
|
641
|
static const PROGMEM type array##_P[XYZ] = \
|
|
@@ -643,12 +643,12 @@ DEFINE_PGM_READ_ANY(signed char, byte);
|
643
|
643
|
static inline type array(int axis) \
|
644
|
644
|
{ return pgm_read_any(&array##_P[axis]); }
|
645
|
645
|
|
646
|
|
-XYZ_CONSTS_FROM_CONFIG(float, base_min_pos, MIN_POS);
|
647
|
|
-XYZ_CONSTS_FROM_CONFIG(float, base_max_pos, MAX_POS);
|
648
|
|
-XYZ_CONSTS_FROM_CONFIG(float, base_home_pos, HOME_POS);
|
649
|
|
-XYZ_CONSTS_FROM_CONFIG(float, max_length, MAX_LENGTH);
|
650
|
|
-XYZ_CONSTS_FROM_CONFIG(float, home_bump_mm, HOME_BUMP_MM);
|
651
|
|
-XYZ_CONSTS_FROM_CONFIG(signed char, home_dir, HOME_DIR);
|
|
646
|
+XYZ_CONSTS_FROM_CONFIG(float, base_min_pos, MIN_POS)
|
|
647
|
+XYZ_CONSTS_FROM_CONFIG(float, base_max_pos, MAX_POS)
|
|
648
|
+XYZ_CONSTS_FROM_CONFIG(float, base_home_pos, HOME_POS)
|
|
649
|
+XYZ_CONSTS_FROM_CONFIG(float, max_length, MAX_LENGTH)
|
|
650
|
+XYZ_CONSTS_FROM_CONFIG(float, home_bump_mm, HOME_BUMP_MM)
|
|
651
|
+XYZ_CONSTS_FROM_CONFIG(signed char, home_dir, HOME_DIR)
|
652
|
652
|
|
653
|
653
|
/**
|
654
|
654
|
* ***************************************************************************
|
|
@@ -8542,7 +8542,7 @@ void ok_to_send() {
|
8542
|
8542
|
cartes[X_AXIS] = delta_tower1_x + ex[0] * Xnew + ey[0] * Ynew - ez[0] * Znew;
|
8543
|
8543
|
cartes[Y_AXIS] = delta_tower1_y + ex[1] * Xnew + ey[1] * Ynew - ez[1] * Znew;
|
8544
|
8544
|
cartes[Z_AXIS] = z1 + ex[2] * Xnew + ey[2] * Ynew - ez[2] * Znew;
|
8545
|
|
- };
|
|
8545
|
+ }
|
8546
|
8546
|
|
8547
|
8547
|
void forward_kinematics_DELTA(float point[ABC]) {
|
8548
|
8548
|
forward_kinematics_DELTA(point[A_AXIS], point[B_AXIS], point[C_AXIS]);
|