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

Merge pull request #6431 from thinkyhead/rc_bilinear_super_optimize

Browse source 
Minor cleanup, optimize number-to-string
This commit is contained in:
Scott Lahteine 2017-04-22 17:05:24 -05:00 committed by GitHub
parent 830851df13 87d240042a
commit d5ec34e7ed
28 changed files with 115 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Configuration.h
View file

@ -164,7 +164,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/Cartesio/Configuration.h
View file

@ -165,7 +165,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/Felix/Configuration.h
View file

@ -164,7 +164,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/Felix/DUAL/Configuration.h
View file

@ -164,7 +164,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/Hephestos/Configuration.h
View file

@ -167,7 +167,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/Hephestos_2/Configuration.h
View file

@ -164,7 +164,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/K8200/Configuration.h
View file

@ -184,7 +184,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/K8400/Configuration.h
View file

@ -164,7 +164,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/K8400/Dual-head/Configuration.h
View file

@ -164,7 +164,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View file

@ -164,7 +164,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/RigidBot/Configuration.h
View file

@ -167,7 +167,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/SCARA/Configuration.h
View file

@ -196,7 +196,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/TAZ4/Configuration.h
View file

@ -164,7 +164,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/TinyBoy2/Configuration.h
View file

@ -186,7 +186,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/WITBOX/Configuration.h
View file

@ -167,7 +167,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/adafruit/ST7565/Configuration.h
View file

@ -164,7 +164,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
View file

@ -164,7 +164,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
View file

@ -164,7 +164,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/delta/generic/Configuration.h
View file

@ -164,7 +164,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View file

@ -164,7 +164,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View file

@ -168,7 +168,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/delta/kossel_xl/Configuration.h
View file

@ -164,7 +164,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/makibox/Configuration.h
View file

@ -164,7 +164,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View file

@ -164,7 +164,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

2
Marlin/example_configurations/wt150/Configuration.h
View file

@ -164,7 +164,7 @@
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix. * - Extends the stepping routines to move multiple steppers in proportion to the mix.
* - Optional support for Repetier Host M163, M164, and virtual extruder. * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
* - This implementation supports only a single extruder. * - This implementation supports only a single extruder.
* - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/ */

6
Marlin/ubl_G29.cpp
View file

@ -250,9 +250,9 @@
* for subsequent Load and Store operations. It will also store the current state of * for subsequent Load and Store operations. It will also store the current state of
* the Unified Bed Leveling system in the EEPROM. * the Unified Bed Leveling system in the EEPROM.
* *
* S -1 Store Store the current Mesh as a print out that is suitable to be feed back into * S -1 Store Store the current Mesh as a print out that is suitable to be feed back into the system
* the system at a later date. The text generated can be saved and later sent by PronterFace or * at a later date. The GCode output can be saved and later replayed by the host software
* Repetier Host to reconstruct the current mesh on another machine. * to reconstruct the current mesh on another machine.
* *
* T 3-Point Perform a 3 Point Bed Leveling on the current Mesh * T 3-Point Perform a 3 Point Bed Leveling on the current Mesh
* *

14
Marlin/ultralcd_impl_DOGM.h
View file

@ -422,17 +422,17 @@ static void lcd_implementation_status_screen() {
_draw_heater_status(81, -1); _draw_heater_status(81, -1);
#endif #endif
if (PAGE_CONTAINS(20, 27)) { #if HAS_FAN0
// Fan if (PAGE_CONTAINS(20, 27)) {
u8g.setPrintPos(104, 27); // Fan
#if HAS_FAN0 const int per = ((fanSpeeds[0] + 1) * 100) / 256;
int per = ((fanSpeeds[0] + 1) * 100) / 256;
if (per) { if (per) {
u8g.setPrintPos(104, 27);
lcd_print(itostr3(per)); lcd_print(itostr3(per));
u8g.print('%'); u8g.print('%');
} }
#endif }
} #endif
} }
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)

173
Marlin/utility.cpp
View file

@ -35,7 +35,7 @@ void safe_delay(millis_t ms) {
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
char conv[9]; char conv[8] = { 0 };
#define DIGIT(n) ('0' + (n)) #define DIGIT(n) ('0' + (n))
#define DIGIMOD(n, f) DIGIT((n)/(f) % 10) #define DIGIMOD(n, f) DIGIT((n)/(f) % 10)
@ -43,29 +43,25 @@ void safe_delay(millis_t ms) {
#define MINUSOR(n, alt) (n >= 0 ? (alt) : (n = -n, '-')) #define MINUSOR(n, alt) (n >= 0 ? (alt) : (n = -n, '-'))
// Convert unsigned int to string with 12 format // Convert unsigned int to string with 12 format
char* itostr2(const uint8_t& x) { char* itostr2(const uint8_t& xx) {
int xx = x; conv[5] = DIGIMOD(xx, 10);
conv[0] = DIGIMOD(xx, 10); conv[6] = DIGIMOD(xx, 1);
conv[1] = DIGIMOD(xx, 1); return &conv[5];
conv[2] = '\0';
return conv;
} }
// Convert signed int to rj string with 123 or -12 format // Convert signed int to rj string with 123 or -12 format
char* itostr3(const int& x) { char* itostr3(const int& x) {
int xx = x; int xx = x;
conv[0] = MINUSOR(xx, RJDIGIT(xx, 100)); conv[4] = MINUSOR(xx, RJDIGIT(xx, 100));
conv[1] = RJDIGIT(xx, 10); conv[5] = RJDIGIT(xx, 10);
conv[2] = DIGIMOD(xx, 1); conv[6] = DIGIMOD(xx, 1);
conv[3] = '\0'; return &conv[4];
return conv;
} }
// Convert unsigned int to lj string with 123 format // Convert unsigned int to lj string with 123 format
char* itostr3left(const int& xx) { char* itostr3left(const int& xx) {
char *str = &conv[3]; char *str = &conv[6];
*str = '\0'; *str = DIGIMOD(xx, 1);
*(--str) = DIGIMOD(xx, 1);
if (xx >= 10) { if (xx >= 10) {
*(--str) = DIGIMOD(xx, 10); *(--str) = DIGIMOD(xx, 10);
if (xx >= 100) if (xx >= 100)
@ -76,72 +72,70 @@ void safe_delay(millis_t ms) {
// Convert signed int to rj string with 1234, _123, -123, _-12, or __-1 format // Convert signed int to rj string with 1234, _123, -123, _-12, or __-1 format
char *itostr4sign(const int& x) { char *itostr4sign(const int& x) {
int xx = abs(x); const bool neg = x < 0;
const int xx = neg ? -x : x;
if (x >= 1000) { if (x >= 1000) {
conv[0] = DIGIMOD(xx, 1000); conv[3] = DIGIMOD(xx, 1000);
conv[1] = DIGIMOD(xx, 100); conv[4] = DIGIMOD(xx, 100);
conv[2] = DIGIMOD(xx, 10); conv[5] = DIGIMOD(xx, 10);
} }
else { else {
if (xx >= 100) { if (xx >= 100) {
conv[0] = x < 0 ? '-' : ' '; conv[3] = neg ? '-' : ' ';
conv[1] = DIGIMOD(xx, 100); conv[4] = DIGIMOD(xx, 100);
conv[2] = DIGIMOD(xx, 10); conv[5] = DIGIMOD(xx, 10);
} }
else { else {
conv[0] = ' '; conv[4] = ' ';
if (xx >= 10) { if (xx >= 10) {
conv[1] = x < 0 ? '-' : ' '; conv[4] = neg ? '-' : ' ';
conv[2] = DIGIMOD(xx, 10); conv[5] = DIGIMOD(xx, 10);
} }
else { else {
conv[1] = ' '; conv[4] = ' ';
conv[2] = x < 0 ? '-' : ' '; conv[5] = neg ? '-' : ' ';
} }
} }
} }
conv[3] = DIGIMOD(xx, 1); conv[6] = DIGIMOD(xx, 1);
conv[4] = '\0'; return &conv[3];
return conv;
} }
// Convert unsigned float to string with 1.23 format // Convert unsigned float to string with 1.23 format
char* ftostr12ns(const float& x) { char* ftostr12ns(const float& x) {
long xx = abs(x * 100); const long xx = (x < 0 ? -x : x) * 100;
conv[0] = DIGIMOD(xx, 100); conv[3] = DIGIMOD(xx, 100);
conv[1] = '.'; conv[4] = '.';
conv[2] = DIGIMOD(xx, 10); conv[5] = DIGIMOD(xx, 10);
conv[3] = DIGIMOD(xx, 1); conv[6] = DIGIMOD(xx, 1);
conv[4] = '\0'; return &conv[3];
return conv;
} }
// Convert signed float to fixed-length string with 023.45 / -23.45 format // Convert signed float to fixed-length string with 023.45 / -23.45 format
char *ftostr32(const float& x) { char *ftostr32(const float& x) {
long xx = x * 100; long xx = x * 100;
conv[0] = MINUSOR(xx, DIGIMOD(xx, 10000)); conv[1] = MINUSOR(xx, DIGIMOD(xx, 10000));
conv[1] = DIGIMOD(xx, 1000); conv[2] = DIGIMOD(xx, 1000);
conv[2] = DIGIMOD(xx, 100); conv[3] = DIGIMOD(xx, 100);
conv[3] = '.'; conv[4] = '.';
conv[4] = DIGIMOD(xx, 10); conv[5] = DIGIMOD(xx, 10);
conv[5] = DIGIMOD(xx, 1); conv[6] = DIGIMOD(xx, 1);
conv[6] = '\0'; return &conv[1];
return conv;
} }
#if ENABLED(LCD_DECIMAL_SMALL_XY) #if ENABLED(LCD_DECIMAL_SMALL_XY)
// Convert float to rj string with 1234, _123, -123, _-12, 12.3, _1.2, or -1.2 format // Convert float to rj string with 1234, _123, -123, _-12, 12.3, _1.2, or -1.2 format
char *ftostr4sign(const float& fx) { char *ftostr4sign(const float& fx) {
int x = fx * 10; const int x = fx * 10;
if (!WITHIN(x, -99, 999)) return itostr4sign((int)fx); if (!WITHIN(x, -99, 999)) return itostr4sign((int)fx);
int xx = abs(x); const bool neg = x < 0;
conv[0] = x < 0 ? '-' : (xx >= 100 ? DIGIMOD(xx, 100) : ' '); const int xx = neg ? -x : x;
conv[1] = DIGIMOD(xx, 10); conv[3] = neg ? '-' : (xx >= 100 ? DIGIMOD(xx, 100) : ' ');
conv[2] = '.'; conv[4] = DIGIMOD(xx, 10);
conv[3] = DIGIMOD(xx, 1); conv[5] = '.';
conv[4] = '\0'; conv[6] = DIGIMOD(xx, 1);
return conv; return &conv[3];
} }
#endif // LCD_DECIMAL_SMALL_XY #endif // LCD_DECIMAL_SMALL_XY
@ -149,39 +143,36 @@ void safe_delay(millis_t ms) {
// Convert float to fixed-length string with +123.4 / -123.4 format // Convert float to fixed-length string with +123.4 / -123.4 format
char* ftostr41sign(const float& x) { char* ftostr41sign(const float& x) {
int xx = x * 10; int xx = x * 10;
conv[0] = MINUSOR(xx, '+'); conv[1] = MINUSOR(xx, '+');
conv[1] = DIGIMOD(xx, 1000); conv[2] = DIGIMOD(xx, 1000);
conv[2] = DIGIMOD(xx, 100); conv[3] = DIGIMOD(xx, 100);
conv[3] = DIGIMOD(xx, 10); conv[4] = DIGIMOD(xx, 10);
conv[4] = '.'; conv[5] = '.';
conv[5] = DIGIMOD(xx, 1); conv[6] = DIGIMOD(xx, 1);
conv[6] = '\0'; return &conv[1];
return conv;
} }
// Convert signed float to string (6 digit) with -1.234 / _0.000 / +1.234 format // Convert signed float to string (6 digit) with -1.234 / _0.000 / +1.234 format
char* ftostr43sign(const float& x, char plus/*=' '*/) { char* ftostr43sign(const float& x, char plus/*=' '*/) {
long xx = x * 1000; long xx = x * 1000;
conv[0] = xx ? MINUSOR(xx, plus) : ' '; conv[1] = xx ? MINUSOR(xx, plus) : ' ';
conv[1] = DIGIMOD(xx, 1000); conv[2] = DIGIMOD(xx, 1000);
conv[2] = '.'; conv[3] = '.';
conv[3] = DIGIMOD(xx, 100); conv[4] = DIGIMOD(xx, 100);
conv[4] = DIGIMOD(xx, 10); conv[5] = DIGIMOD(xx, 10);
conv[5] = DIGIMOD(xx, 1); conv[6] = DIGIMOD(xx, 1);
conv[6] = '\0'; return &conv[1];
return conv;
} }
// Convert unsigned float to rj string with 12345 format // Convert unsigned float to rj string with 12345 format
char* ftostr5rj(const float& x) { char* ftostr5rj(const float& x) {
long xx = abs(x); const long xx = x < 0 ? -x : x;
conv[0] = RJDIGIT(xx, 10000); conv[2] = RJDIGIT(xx, 10000);
conv[1] = RJDIGIT(xx, 1000); conv[3] = RJDIGIT(xx, 1000);
conv[2] = RJDIGIT(xx, 100); conv[4] = RJDIGIT(xx, 100);
conv[3] = RJDIGIT(xx, 10); conv[5] = RJDIGIT(xx, 10);
conv[4] = DIGIMOD(xx, 1); conv[6] = DIGIMOD(xx, 1);
conv[5] = '\0'; return &conv[2];
return conv;
} }
// Convert signed float to string with +1234.5 format // Convert signed float to string with +1234.5 format
@ -194,7 +185,6 @@ void safe_delay(millis_t ms) {
conv[4] = DIGIMOD(xx, 10); conv[4] = DIGIMOD(xx, 10);
conv[5] = '.'; conv[5] = '.';
conv[6] = DIGIMOD(xx, 1); conv[6] = DIGIMOD(xx, 1);
conv[7] = '\0';
return conv; return conv;
} }
@ -208,13 +198,12 @@ void safe_delay(millis_t ms) {
conv[4] = '.'; conv[4] = '.';
conv[5] = DIGIMOD(xx, 10); conv[5] = DIGIMOD(xx, 10);
conv[6] = DIGIMOD(xx, 1); conv[6] = DIGIMOD(xx, 1);
conv[7] = '\0';
return conv; return conv;
} }
// Convert unsigned float to string with 1234.56 format omitting trailing zeros // Convert unsigned float to string with 1234.56 format omitting trailing zeros
char* ftostr62rj(const float& x) { char* ftostr62rj(const float& x) {
long xx = abs(x * 100); const long xx = (x < 0 ? -x : x) * 100;
conv[0] = RJDIGIT(xx, 100000); conv[0] = RJDIGIT(xx, 100000);
conv[1] = RJDIGIT(xx, 10000); conv[1] = RJDIGIT(xx, 10000);
conv[2] = RJDIGIT(xx, 1000); conv[2] = RJDIGIT(xx, 1000);
@ -222,7 +211,6 @@ void safe_delay(millis_t ms) {
conv[4] = '.'; conv[4] = '.';
conv[5] = DIGIMOD(xx, 10); conv[5] = DIGIMOD(xx, 10);
conv[6] = DIGIMOD(xx, 1); conv[6] = DIGIMOD(xx, 1);
conv[7] = '\0';
return conv; return conv;
} }
@ -230,26 +218,25 @@ void safe_delay(millis_t ms) {
char* ftostr52sp(const float& x) { char* ftostr52sp(const float& x) {
long xx = x * 100; long xx = x * 100;
uint8_t dig; uint8_t dig;
conv[0] = MINUSOR(xx, RJDIGIT(xx, 10000)); conv[1] = MINUSOR(xx, RJDIGIT(xx, 10000));
conv[1] = RJDIGIT(xx, 1000); conv[2] = RJDIGIT(xx, 1000);
conv[2] = DIGIMOD(xx, 100); conv[3] = DIGIMOD(xx, 100);
if ((dig = xx % 10)) { // second digit after decimal point? if ((dig = xx % 10)) { // second digit after decimal point?
conv[3] = '.'; conv[4] = '.';
conv[4] = DIGIMOD(xx, 10); conv[5] = DIGIMOD(xx, 10);
conv[5] = DIGIT(dig); conv[6] = DIGIT(dig);
} }
else { else {
if ((dig = (xx / 10) % 10)) { // first digit after decimal point? if ((dig = (xx / 10) % 10)) { // first digit after decimal point?
conv[3] = '.'; conv[4] = '.';
conv[4] = DIGIT(dig); conv[5] = DIGIT(dig);
} }
else // nothing after decimal point else // nothing after decimal point
conv[3] = conv[4] = ' '; conv[4] = conv[5] = ' ';
conv[5] = ' '; conv[6] = ' ';
} }
conv[6] = '\0'; return &conv[1];
return conv;
} }
#endif // ULTRA_LCD #endif // ULTRA_LCD