zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[2.0.x] Fix compiler error when G26 is enabled (#9492)

Browse source
This commit is contained in:
GMagician 2018-02-05 21:27:39 +01:00 committed by Scott Lahteine
parent 4ddb6a3a1f
commit 338dac258b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Marlin/src/gcode/bedlevel/G26.cpp
View file

@ -726,14 +726,15 @@ void GcodeSuite::G26() {
* All angles are offset by 15 degrees to allow for a smaller table. * All angles are offset by 15 degrees to allow for a smaller table.
*/ */
#define A_CNT ((360 / 30) / 2) #define A_CNT ((360 / 30) / 2)
#define _COS(A) (trig_table[((N + A_CNT * 8) % A_CNT)] * (A >= A_CNT ? -1 : 1)) #define _COS(A) (trig_table[((A + A_CNT * 8) % A_CNT)] * (A >= A_CNT ? -1 : 1))
#define _SIN(A) (-_COS((A + A_CNT / 2) % (A_CNT * 2))) #define _SIN(A) (-_COS((A + A_CNT / 2) % (A_CNT * 2)))
float trig_table[A_CNT]; float trig_table[A_CNT];
for (uint8_t i = 0; i < A_CNT; i++) for (uint8_t i = 0; i < A_CNT; i++)
trig_table[i] = INTERSECTION_CIRCLE_RADIUS * cos(RADIANS(i * 30 + 15)); trig_table[i] = INTERSECTION_CIRCLE_RADIUS * cos(RADIANS(i * 30 + 15));
mesh_index_pair location;
do { do {
const mesh_index_pair location = g26_continue_with_closest location = g26_continue_with_closest
? find_closest_circle_to_print(current_position[X_AXIS], current_position[Y_AXIS]) ? find_closest_circle_to_print(current_position[X_AXIS], current_position[Y_AXIS])
: find_closest_circle_to_print(g26_x_pos, g26_y_pos); // Find the closest Mesh Intersection to where we are now. : find_closest_circle_to_print(g26_x_pos, g26_y_pos); // Find the closest Mesh Intersection to where we are now.