Skip to content

efiPrint NaN handling #4115 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rusefillc merged 2 commits into from
Sep 2, 2022
Merged

efiPrint NaN handling #4115 #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4de539
https://github.com/rusefi/rusefi/issues/4115
rusefillc Aug 31, 2022
1d3f108
https://github.com/rusefi/rusefi/issues/4115
rusefillc Sep 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions os/hal/lib/streams/chprintf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#define MAX_FILLER 11
#define FLOAT_PRECISION 9

// returns pointer behind produced string
static char *long_to_string_with_divisor(char *p,
long num,
unsigned radix,
Expand Down Expand Up @@ -79,9 +80,18 @@ static const long pow10[FLOAT_PRECISION] = {
10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000
};

static char *ftoa(char *p, double num, unsigned long precision) {
#define rusefi_cisnan(f) (*(((int*) (&f))) == 0x7FC00000)

static char *ftoa(char *p, float num, unsigned long precision) {
long l;

if (rusefi_cisnan(num)) {
*p ++ = 'N';
*p ++ = 'a';
*p ++ = 'N';
return p;
}

if ((precision == 0) || (precision > FLOAT_PRECISION)) {
precision = FLOAT_PRECISION;
}
Expand Down Expand Up @@ -140,13 +150,13 @@ int chvprintf(BaseSequentialStream *chp, const char *fmt, va_list ap) {
if (c == 0) {
return n;
}

if (c != '%') {
streamPut(chp, (uint8_t)c);
n++;
continue;
}

p = tmpbuf;
s = tmpbuf;

Expand All @@ -170,7 +180,7 @@ int chvprintf(BaseSequentialStream *chp, const char *fmt, va_list ap) {
fmt++;
filler = '0';
}

/* Width modifier.*/
if ( *fmt == '*') {
width = va_arg(ap, int);
Expand All @@ -193,7 +203,7 @@ int chvprintf(BaseSequentialStream *chp, const char *fmt, va_list ap) {
}
}
}

/* Precision modifier.*/
precision = 0;
if (c == '.') {
Expand All @@ -216,7 +226,7 @@ int chvprintf(BaseSequentialStream *chp, const char *fmt, va_list ap) {
}
}
}

/* Long modifier.*/
if (c == 'l' || c == 'L') {
is_long = true;
Expand Down