mirror of
				https://github.com/esp8266/Arduino.git
				synced 2025-11-03 14:33:37 +03:00 
			
		
		
		
	Fixes #7043 Two slightly different custom routines were implemented by hand in dtostrf (an AVR-lib non-ISO function) and Print. This resulted in inconsistent output of float/double vars when rounding was needed. Replace them all with a call to sprintf(), removing the duplicated, not quite correct code. Print(String(float)) and Print(float) now generate the same output.
		
			
				
	
	
		
			274 lines
		
	
	
		
			6.4 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			274 lines
		
	
	
		
			6.4 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
/*
 | 
						|
 Print.cpp - Base class that provides print() and println()
 | 
						|
 Copyright (c) 2008 David A. Mellis.  All right reserved.
 | 
						|
 | 
						|
 This library is free software; you can redistribute it and/or
 | 
						|
 modify it under the terms of the GNU Lesser General Public
 | 
						|
 License as published by the Free Software Foundation; either
 | 
						|
 version 2.1 of the License, or (at your option) any later version.
 | 
						|
 | 
						|
 This library is distributed in the hope that it will be useful,
 | 
						|
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | 
						|
 Lesser General Public License for more details.
 | 
						|
 | 
						|
 You should have received a copy of the GNU Lesser General Public
 | 
						|
 License along with this library; if not, write to the Free Software
 | 
						|
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 | 
						|
 | 
						|
 Modified 23 November 2006 by David A. Mellis
 | 
						|
 Modified December 2014 by Ivan Grokhotkov
 | 
						|
 Modified May 2015 by Michael C. Miller - esp8266 progmem support
 | 
						|
 */
 | 
						|
 | 
						|
#include <stdlib.h>
 | 
						|
#include <stdio.h>
 | 
						|
#include <string.h>
 | 
						|
#include <math.h>
 | 
						|
#include <Arduino.h>
 | 
						|
 | 
						|
#include "Print.h"
 | 
						|
 | 
						|
// Public Methods //////////////////////////////////////////////////////////////
 | 
						|
 | 
						|
/* default implementation: may be overridden */
 | 
						|
size_t Print::write(const uint8_t *buffer, size_t size) {
 | 
						|
 | 
						|
#ifdef DEBUG_ESP_CORE
 | 
						|
    static char not_the_best_way [] PROGMEM STORE_ATTR = "Print::write(data,len) should be overridden for better efficiency\r\n";
 | 
						|
    static bool once = false;
 | 
						|
    if (!once) {
 | 
						|
        once = true;
 | 
						|
        os_printf_plus(not_the_best_way);
 | 
						|
    }
 | 
						|
#endif
 | 
						|
 | 
						|
    size_t n = 0;
 | 
						|
    while (size--) {
 | 
						|
        size_t ret = write(pgm_read_byte(buffer++));
 | 
						|
        if (ret == 0) {
 | 
						|
            // Write of last byte didn't complete, abort additional processing
 | 
						|
            break;
 | 
						|
        }
 | 
						|
        n += ret;
 | 
						|
    }
 | 
						|
    return n;
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::printf(const char *format, ...) {
 | 
						|
    va_list arg;
 | 
						|
    va_start(arg, format);
 | 
						|
    char temp[64];
 | 
						|
    char* buffer = temp;
 | 
						|
    size_t len = vsnprintf(temp, sizeof(temp), format, arg);
 | 
						|
    va_end(arg);
 | 
						|
    if (len > sizeof(temp) - 1) {
 | 
						|
        buffer = new char[len + 1];
 | 
						|
        if (!buffer) {
 | 
						|
            return 0;
 | 
						|
        }
 | 
						|
        va_start(arg, format);
 | 
						|
        vsnprintf(buffer, len + 1, format, arg);
 | 
						|
        va_end(arg);
 | 
						|
    }
 | 
						|
    len = write((const uint8_t*) buffer, len);
 | 
						|
    if (buffer != temp) {
 | 
						|
        delete[] buffer;
 | 
						|
    }
 | 
						|
    return len;
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::printf_P(PGM_P format, ...) {
 | 
						|
    va_list arg;
 | 
						|
    va_start(arg, format);
 | 
						|
    char temp[64];
 | 
						|
    char* buffer = temp;
 | 
						|
    size_t len = vsnprintf_P(temp, sizeof(temp), format, arg);
 | 
						|
    va_end(arg);
 | 
						|
    if (len > sizeof(temp) - 1) {
 | 
						|
        buffer = new char[len + 1];
 | 
						|
        if (!buffer) {
 | 
						|
            return 0;
 | 
						|
        }
 | 
						|
        va_start(arg, format);
 | 
						|
        vsnprintf_P(buffer, len + 1, format, arg);
 | 
						|
        va_end(arg);
 | 
						|
    }
 | 
						|
    len = write((const uint8_t*) buffer, len);
 | 
						|
    if (buffer != temp) {
 | 
						|
        delete[] buffer;
 | 
						|
    }
 | 
						|
    return len;
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::print(const __FlashStringHelper *ifsh) {
 | 
						|
    PGM_P p = reinterpret_cast<PGM_P>(ifsh);
 | 
						|
 | 
						|
    char buff[128] __attribute__ ((aligned(4)));
 | 
						|
    auto len = strlen_P(p);
 | 
						|
    size_t n = 0;
 | 
						|
    while (n < len) {
 | 
						|
        int to_write = std::min(sizeof(buff), len - n);
 | 
						|
        memcpy_P(buff, p, to_write);
 | 
						|
        auto written = write(buff, to_write);
 | 
						|
        n += written;
 | 
						|
        p += written;
 | 
						|
        if (!written) {
 | 
						|
            // Some error, write() should write at least 1 byte before returning
 | 
						|
            break;
 | 
						|
        }
 | 
						|
    }
 | 
						|
    return n;
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::print(const String &s) {
 | 
						|
    return write(s.c_str(), s.length());
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::print(const char str[]) {
 | 
						|
    return write(str);
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::print(char c) {
 | 
						|
    return write(c);
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::print(unsigned char b, int base) {
 | 
						|
    return print((unsigned long) b, base);
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::print(int n, int base) {
 | 
						|
    return print((long) n, base);
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::print(unsigned int n, int base) {
 | 
						|
    return print((unsigned long) n, base);
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::print(long n, int base) {
 | 
						|
    if(base == 0) {
 | 
						|
        return write(n);
 | 
						|
    } else if(base == 10) {
 | 
						|
        if(n < 0) {
 | 
						|
            int t = print('-');
 | 
						|
            n = -n;
 | 
						|
            return printNumber(n, 10) + t;
 | 
						|
        }
 | 
						|
        return printNumber(n, 10);
 | 
						|
    } else {
 | 
						|
        return printNumber(n, base);
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::print(unsigned long n, int base) {
 | 
						|
    if(base == 0)
 | 
						|
        return write(n);
 | 
						|
    else
 | 
						|
        return printNumber(n, base);
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::print(double n, int digits) {
 | 
						|
    return printFloat(n, digits);
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::println(const __FlashStringHelper *ifsh) {
 | 
						|
    size_t n = print(ifsh);
 | 
						|
    n += println();
 | 
						|
    return n;
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::print(const Printable& x) {
 | 
						|
    return x.printTo(*this);
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::println(void) {
 | 
						|
    return print("\r\n");
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::println(const String &s) {
 | 
						|
    size_t n = print(s);
 | 
						|
    n += println();
 | 
						|
    return n;
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::println(const char c[]) {
 | 
						|
    size_t n = print(c);
 | 
						|
    n += println();
 | 
						|
    return n;
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::println(char c) {
 | 
						|
    size_t n = print(c);
 | 
						|
    n += println();
 | 
						|
    return n;
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::println(unsigned char b, int base) {
 | 
						|
    size_t n = print(b, base);
 | 
						|
    n += println();
 | 
						|
    return n;
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::println(int num, int base) {
 | 
						|
    size_t n = print(num, base);
 | 
						|
    n += println();
 | 
						|
    return n;
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::println(unsigned int num, int base) {
 | 
						|
    size_t n = print(num, base);
 | 
						|
    n += println();
 | 
						|
    return n;
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::println(long num, int base) {
 | 
						|
    size_t n = print(num, base);
 | 
						|
    n += println();
 | 
						|
    return n;
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::println(unsigned long num, int base) {
 | 
						|
    size_t n = print(num, base);
 | 
						|
    n += println();
 | 
						|
    return n;
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::println(double num, int digits) {
 | 
						|
    size_t n = print(num, digits);
 | 
						|
    n += println();
 | 
						|
    return n;
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::println(const Printable& x) {
 | 
						|
    size_t n = print(x);
 | 
						|
    n += println();
 | 
						|
    return n;
 | 
						|
}
 | 
						|
 | 
						|
// Private Methods /////////////////////////////////////////////////////////////
 | 
						|
 | 
						|
size_t Print::printNumber(unsigned long n, uint8_t base) {
 | 
						|
    char buf[8 * sizeof(long) + 1]; // Assumes 8-bit chars plus zero byte.
 | 
						|
    char *str = &buf[sizeof(buf) - 1];
 | 
						|
 | 
						|
    *str = '\0';
 | 
						|
 | 
						|
    // prevent crash if called with base == 1
 | 
						|
    if(base < 2)
 | 
						|
        base = 10;
 | 
						|
 | 
						|
    do {
 | 
						|
        unsigned long m = n;
 | 
						|
        n /= base;
 | 
						|
        char c = m - base * n;
 | 
						|
        *--str = c < 10 ? c + '0' : c + 'A' - 10;
 | 
						|
    } while(n);
 | 
						|
 | 
						|
    return write(str);
 | 
						|
}
 | 
						|
 | 
						|
size_t Print::printFloat(double number, uint8_t digits) {
 | 
						|
    char buf[40];
 | 
						|
    return write(dtostrf(number, 0, digits, buf));
 | 
						|
}
 |