bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

[2.0] Fix up G33, LPC1768 + SDCARD_SORT_ALPHA (#8250)

Browse Source 
* Update Conditionals_post.h

* Add a cast to round() to convert to a unsigned int

Add's a cast to round() so that it will compile properly. round() returns a float which must be cast to a integer for the following % operation. Use a unsigned int as a negative index to an array is wrong. Should never be more than 255 points allowing us to use a 8 bit cast.

* Update G33.cpp
This commit is contained in:
Colten Edwards
2017-11-04 17:04:18 -06:00
committed by Scott Lahteine
parent 46c0b73578
commit e0a6ee8da5
2 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/src/inc/Conditionals_post.h
View File

@ -1079,10 +1079,6 @@
#undef MOTOR_CURRENT
#endif
#if ENABLED(SDCARD_SORT_ALPHA)
#define HAS_FOLDER_SORTING (FOLDER_SORTING || ENABLED(SDSORT_GCODE))
#endif
// Updated G92 behavior shifts the workspace
#define HAS_POSITION_SHIFT DISABLED(NO_WORKSPACE_OFFSETS)
// The home offset also shifts the coordinate space
@ -1197,4 +1193,9 @@
#endif
#endif
// needs to be here so that we catch the above changes to our defines
#if ENABLED(SDCARD_SORT_ALPHA)
#define HAS_FOLDER_SORTING (FOLDER_SORTING || ENABLED(SDSORT_GCODE))
#endif
#endif // CONDITIONALS_POST_H