zrzk
/
ardupilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

AP_HAL_AVR: vprintf implementation exists outside of class hierchary. 

* Makes it easier to mix into other classes.
mission-4.1.18
Pat Hickey 13 years ago committed by Andrew Tridgell
parent
36154559fc
commit
a3a6482fd3
4 changed files with 44 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      libraries/AP_HAL_AVR/UARTDriver.cpp
  2. 4
      libraries/AP_HAL_AVR/UARTDriver.h
  3. 62
      libraries/AP_HAL_AVR/utility/vprintf.cpp
  4. 10
      libraries/AP_HAL_AVR/utility/vprintf.h

6
libraries/AP_HAL_AVR/UARTDriver.cpp
Unescape View File

@ -10,12 +10,14 @@ @@ -10,12 +10,14 @@
#include <limits.h>
#include <stdlib.h>
#include <stdarg.h>
#include <avr/pgmspace.h>
#include <AP_Common.h>
#include <AP_HAL.h>
#include "vprintf.h"
#include "UARTDriver.h"
using namespace AP_HAL_AVR;
@ -268,13 +270,13 @@ void AVRUARTDriver::println_P(const prog_char_t *s) { @@ -268,13 +270,13 @@ void AVRUARTDriver::println_P(const prog_char_t *s) {
void AVRUARTDriver::printf(const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
_vprintf(0, fmt, ap);
vprintf((AP_HAL::Print*)this, 0, fmt, ap);
va_end(ap);
}
void AVRUARTDriver::_printf_P(const prog_char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
_vprintf(1, fmt, ap);
vprintf((AP_HAL::Print*)this, 1, fmt, ap);
va_end(ap);
}

4
libraries/AP_HAL_AVR/UARTDriver.h
Unescape View File

@ -65,10 +65,6 @@ public: @@ -65,10 +65,6 @@ public:
uint8_t *bytes; ///< pointer to allocated buffer
};
private:
/* Helper function _vprintf for implementing BetterStream's printfs */
void _vprintf(unsigned char, const char *, va_list)
__attribute__((format(__printf__,3,0)));
/* Instance Variables */
bool _initialized;

62
libraries/AP_HAL_AVR/utility/vprintf.cpp
Unescape View File

@ -41,15 +41,14 @@ @@ -41,15 +41,14 @@
#include <avr/pgmspace.h>
#include <stdarg.h>
#include <string.h>
extern "C" {
#include "ftoa_engine.h"
#include "ntz.h"
#include "xtoa_fast.h"
}
#include <AP_HAL.h>
#include "../UARTDriver.h"
using namespace AP_HAL_AVR;
#include "vprintf.h"
// workaround for GCC bug c++/34734
#undef PROGMEM
@ -94,8 +93,7 @@ using namespace AP_HAL_AVR; @@ -94,8 +93,7 @@ using namespace AP_HAL_AVR;
#define FL_FLTEXP FL_PREC
#define FL_FLTFIX FL_LONG
void
AVRUARTDriver::_vprintf (unsigned char in_progmem, const char *fmt, va_list ap)
void vprintf (AP_HAL::Print *s, unsigned char in_progmem, const char *fmt, va_list ap)
{
unsigned char c; /* holds a char from the format string */
unsigned char flags;
@ -117,8 +115,8 @@ AVRUARTDriver::_vprintf (unsigned char in_progmem, const char *fmt, va_list ap) @@ -117,8 +115,8 @@ AVRUARTDriver::_vprintf (unsigned char in_progmem, const char *fmt, va_list ap)
}
/* emit cr before lf to make most terminals happy */
if (c == '\n')
write('\r');
write(c);
s->write('\r');
s->write(c);
}
flags = 0;
@ -232,21 +230,21 @@ AVRUARTDriver::_vprintf (unsigned char in_progmem, const char *fmt, va_list ap) @@ -232,21 +230,21 @@ AVRUARTDriver::_vprintf (unsigned char in_progmem, const char *fmt, va_list ap)
width -= ndigs;
if (!(flags & FL_LPAD)) {
do {
write(' ');
s->write(' ');
} while (--width);
}
} else {
width = 0;
}
if (sign)
write(sign);
s->write(sign);
p = PSTR("inf");
if (vtype & FTOA_NAN)
p = PSTR("nan");
while ( (ndigs = pgm_read_byte((const prog_char *)p)) != 0) {
if (flags & FL_FLTUPP)
ndigs += 'I' - 'i';
write(ndigs);
s->write(ndigs);
p++;
}
goto tail;
@ -285,14 +283,14 @@ AVRUARTDriver::_vprintf (unsigned char in_progmem, const char *fmt, va_list ap) @@ -285,14 +283,14 @@ AVRUARTDriver::_vprintf (unsigned char in_progmem, const char *fmt, va_list ap)
/* Output before first digit */
if (!(flags & (FL_LPAD | FL_ZFILL))) {
while (width) {
write(' ');
s->write(' ');
width--;
}
}
if (sign) write(sign);
if (sign) s->write(sign);
if (!(flags & FL_LPAD)) {
while (width) {
write('0');
s->write('0');
width--;
}
}
@ -302,12 +300,12 @@ AVRUARTDriver::_vprintf (unsigned char in_progmem, const char *fmt, va_list ap) @@ -302,12 +300,12 @@ AVRUARTDriver::_vprintf (unsigned char in_progmem, const char *fmt, va_list ap)
n = exp > 0 ? exp : 0; /* exponent of left digit */
do {
if (n == -1)
write('.');
s->write('.');
flags = (n <= exp && n > exp - ndigs)
? buf[exp - n + 1] : '0';
if (--n < -prec)
break;
write(flags);
s->write(flags);
} while (1);
if (n == exp
&& (buf[1] > '5'
@ -315,34 +313,34 @@ AVRUARTDriver::_vprintf (unsigned char in_progmem, const char *fmt, va_list ap) @@ -315,34 +313,34 @@ AVRUARTDriver::_vprintf (unsigned char in_progmem, const char *fmt, va_list ap)
{
flags = '1';
}
write(flags);
s->write(flags);
} else { /* 'e(E)' format */
/* mantissa */
if (buf[1] != '1')
vtype &= ~FTOA_CARRY;
write(buf[1]);
s->write(buf[1]);
if (prec) {
write('.');
s->write('.');
sign = 2;
do {
write(buf[sign++]);
s->write(buf[sign++]);
} while (--prec);
}
/* exponent */
write(flags & FL_FLTUPP ? 'E' : 'e');
s->write(flags & FL_FLTUPP ? 'E' : 'e');
ndigs = '+';
if (exp < 0 || (exp == 0 && (vtype & FTOA_CARRY) != 0)) {
exp = -exp;
ndigs = '-';
}
write(ndigs);
s->write(ndigs);
for (ndigs = '0'; exp >= 10; exp -= 10)
ndigs += 1;
write(ndigs);
write('0' + exp);
s->write(ndigs);
s->write('0' + exp);
}
goto tail;
@ -379,12 +377,12 @@ AVRUARTDriver::_vprintf (unsigned char in_progmem, const char *fmt, va_list ap) @@ -379,12 +377,12 @@ AVRUARTDriver::_vprintf (unsigned char in_progmem, const char *fmt, va_list ap)
str_lpad:
if (!(flags & FL_LPAD)) {
while (size < width) {
write(' ');
s->write(' ');
width--;
}
}
while (size) {
write(GETBYTE (flags, FL_PGMSTRING, pnt));
s->write(GETBYTE (flags, FL_PGMSTRING, pnt));
if (width) width -= 1;
size -= 1;
}
@ -480,7 +478,7 @@ AVRUARTDriver::_vprintf (unsigned char in_progmem, const char *fmt, va_list ap) @@ -480,7 +478,7 @@ AVRUARTDriver::_vprintf (unsigned char in_progmem, const char *fmt, va_list ap)
}
}
while (len < width) {
write(' ');
s->write(' ');
len++;
}
}
@ -488,30 +486,30 @@ AVRUARTDriver::_vprintf (unsigned char in_progmem, const char *fmt, va_list ap) @@ -488,30 +486,30 @@ AVRUARTDriver::_vprintf (unsigned char in_progmem, const char *fmt, va_list ap)
width = (len < width) ? width - len : 0;
if (flags & FL_ALT) {
write('0');
s->write('0');
if (flags & FL_ALTHEX)
write(flags & FL_ALTUPP ? 'X' : 'x');
s->write(flags & FL_ALTUPP ? 'X' : 'x');
} else if (flags & (FL_NEGATIVE | FL_PLUS | FL_SPACE)) {
unsigned char z = ' ';
if (flags & FL_PLUS) z = '+';
if (flags & FL_NEGATIVE) z = '-';
write(z);
s->write(z);
}
while (prec > c) {
write('0');
s->write('0');
prec--;
}
do {
write(buf[--c]);
s->write(buf[--c]);
} while (c);
}
tail:
/* Tail is possible. */
while (width) {
write(' ');
s->write(' ');
width--;
}
} /* for (;;) */

10
libraries/AP_HAL_AVR/utility/vprintf.h
Unescape View File

@ -0,0 +1,10 @@ @@ -0,0 +1,10 @@
#ifndef __AP_HAL_AVR_UTILITY_VPRINTF_H__
#define __AP_HAL_AVR_UTILITY_VPRINTF_H__
#include <AP_HAL.h>
void vprintf (AP_HAL::Print *s, unsigned char in_progmem, const char *fmt, va_list ap);
#endif //__AP_HAL_AVR_UTILITY_VPRINTF_H__
Write Preview
Loading…
Cancel
Save