CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix G26 circles (#9627)

Browse Source 
Easier to configure. Catch an odd divisor.
This commit is contained in:
Scott Lahteine 2018-02-15 22:11:26 -06:00 committed by GitHub
parent 4ea7e723fe
commit 6a70a4fbb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Marlin/src/gcode/bedlevel/G26.cpp
View File

@ -738,14 +738,18 @@ void GcodeSuite::G26() {
/** /**
* Pre-generate radius offset values at 30 degree intervals to reduce CPU load. * Pre-generate radius offset values at 30 degree intervals to reduce CPU load.
*/ */
#define A_INT 30
#define A_CNT ((360 / 30) / 2) // must be a multiple of 2 for _COS() and _SIN() macro to work correctly! #define _ANGS (360 / A_INT)
#define NEGATION_of_COS_TABLE(A) (((A + A_CNT * 16) % (A_CNT * 2)) >= A_CNT ? -1 : 1) #define A_CNT (_ANGS / 2)
#define _COS(A) (trig_table[(A + A_CNT * 16) % A_CNT] * NEGATION_of_COS_TABLE(A)) #define _IND(A) ((A + _ANGS * 8) % _ANGS)
#define _SIN(A) (-_COS((A + A_CNT / 2) % (A_CNT * 2))) #define _COS(A) (trig_table[_IND(A) % A_CNT] * (_IND(A) >= A_CNT ? -1 : 1))
#define _SIN(A) (-_COS((A + A_CNT / 2) % _ANGS))
#if A_CNT & 1
#error "A_CNT must be a positive value. Please change A_INT."
#endif
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)); trig_table[i] = INTERSECTION_CIRCLE_RADIUS * cos(RADIANS(i * A_INT));
mesh_index_pair location; mesh_index_pair location;
do { do {