import stdlib noniso functions

try not to reinvent the wheel
solves print(*, BIN) returning "unsupported base"

Author: facchinm

cores/arduino/Arduino.h

@@ -27,7 +27,7 @@
 #include <math.h>
 
 #include "binary.h"
-#include "itoa.h"
+//#include "itoa.h"
 
 #ifdef __cplusplus
 extern "C"{

cores/arduino/WString.cpp

@@ -78,131 +78,74 @@ String::String(char c)
 	*this = buf;
 }
 
-static char * c_spec_signed[] = {
-		(char *) "%d",
-		(char *) "%ld",
-		(char *) "%o",
-		(char *) "%x",
-		(char *) "unsupported base",
-	};
-
-static char * c_spec_unsigned[] = {
-		(char *) "%u",
-		(char *) "%lu",
-		(char *) "%o",
-		(char *) "%x",
-		(char *) "unsupported base",
-	};
-
-
-char * String::getCSpec(int base, bool issigned, bool islong){
-	int int_idx = 0;
-
-	if(islong == true)
-		int_idx = 1;
-
-	switch(base){
-		case 8:
-			if(issigned == true)
-				return c_spec_signed[2];
-			else
-				return c_spec_unsigned[2];
-		case 10:
-			if(issigned == true)
-				return c_spec_signed[int_idx];
-			else
-				return c_spec_unsigned[int_idx];
-		case 16:
-			if(issigned == true)
-				return c_spec_signed[3];
-			else
-				return c_spec_unsigned[3];
-		default:
-			return c_spec_unsigned[4];
-	}
-};
-
 String::String(unsigned char value, unsigned char base)
 {
 	init();
 	char buf[1 + 8 * sizeof(unsigned char)];
-	//utoa(value, buf, base);
-	snprintf(buf, sizeof(buf), getCSpec(base, false, false), value);
+	utoa(value, buf, base);
 	*this = buf;
 }
 
 String::String(int value, unsigned char base)
 {
 	init();
 	char buf[2 + 8 * sizeof(int)];
-	//itoa(value, buf, base);
-	snprintf(buf, sizeof(buf), getCSpec(base, true, false), value);
+	itoa(value, buf, base);
 	*this = buf;
 }
 
 String::String(unsigned int value, unsigned char base)
 {
 	init();
 	char buf[1 + 8 * sizeof(unsigned int)];
-	//utoa(value, buf, base);
-	snprintf(buf, sizeof(buf), getCSpec(base, false, false), value);
+	utoa(value, buf, base);
 	*this = buf;
 }
 
 String::String(long value, unsigned char base)
 {
 	init();
 	char buf[2 + 8 * sizeof(long)];
-	//ltoa(value, buf, base);
-	snprintf(buf, sizeof(buf), getCSpec(base, true, true), value);
+	ltoa(value, buf, base);
 	*this = buf;
 }
 
 String::String(unsigned long value, unsigned char base)
 {
 	init();
 	char buf[1 + 8 * sizeof(unsigned long)];
-	//ultoa(value, buf, base);
-	snprintf(buf, sizeof(buf), getCSpec(base, false, true), value);
+	ultoa(value, buf, base);
 	*this = buf;
 }
 
 String::String(long long value, unsigned char base)
 {
 	init();
 	char buf[2 + 8 * sizeof(long long)];
-	//ltoa(value, buf, base);
-	snprintf(buf, sizeof(buf), getCSpec(base, true, true), value);
+	ltoa(value, buf, base);
 	*this = buf;
 }
 
 String::String(unsigned long long value, unsigned char base)
 {
 	init();
 	char buf[1 + 8 * sizeof(unsigned long long)];
-	//ultoa(value, buf, base);
-	snprintf(buf, sizeof(buf), getCSpec(base, false, true), value);
+	ultoa(value, buf, base);
 	*this = buf;
 }
 
 String::String(float value, unsigned char decimalPlaces)
 {
 	init();
 	char buf[33];
-	String dec(decimalPlaces);
-	String tmp = "%." + dec + "f";
-	snprintf(buf, sizeof(buf), tmp.c_str(), value);
-	*this = buf;
+	*this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf);
 }
 
 String::String(double value, unsigned char decimalPlaces)
 {
-        init();
-        char buf[33];
-        String dec(decimalPlaces);
-        String tmp = "%." + dec + "f";
-        snprintf(buf, sizeof(buf), tmp.c_str(), value);
-        *this = buf;
+	init();
+	char buf[33];
+	*this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf);
 }
 
 String::~String()
@@ -328,11 +271,11 @@ unsigned char String::concat(const String &s)
 	return concat(s.buffer, s.len);
 }
 
-unsigned char String::concat(const char *cstr, unsigned int _length)
+unsigned char String::concat(const char *cstr, unsigned int length)
 {
-	unsigned int newlen = len + _length;
+	unsigned int newlen = len + length;
 	if (!cstr) return 0;
-	if (_length == 0) return 1;
+	if (length == 0) return 1;
 	if (!reserve(newlen)) return 0;
 	strcpy(buffer + len, cstr);
 	len = newlen;
@@ -356,71 +299,64 @@ unsigned char String::concat(char c)
 unsigned char String::concat(unsigned char num)
 {
 	char buf[1 + 3 * sizeof(unsigned char)];
-	//itoa(num, buf, 10);
-	snprintf(buf, sizeof(buf), getCSpec(10, true, false), num);
+	itoa(num, buf, 10);
 	return concat(buf, strlen(buf));
 }
 
 unsigned char String::concat(int num)
 {
 	char buf[2 + 3 * sizeof(int)];
-	//itoa(num, buf, 10);
-	snprintf(buf, sizeof(buf), getCSpec(10, true, false), num);
+	itoa(num, buf, 10);
 	return concat(buf, strlen(buf));
 }
 
 unsigned char String::concat(unsigned int num)
 {
 	char buf[1 + 3 * sizeof(unsigned int)];
-	//utoa(num, buf, 10);
-	snprintf(buf, sizeof(buf), getCSpec(10, false, false), num);
+	utoa(num, buf, 10);
 	return concat(buf, strlen(buf));
 }
 
 unsigned char String::concat(long num)
 {
 	char buf[2 + 3 * sizeof(long)];
-	//ltoa(num, buf, 10);
-	snprintf(buf, sizeof(buf), getCSpec(10, true, true), num);
+	ltoa(num, buf, 10);
 	return concat(buf, strlen(buf));
 }
 
 unsigned char String::concat(unsigned long num)
 {
 	char buf[1 + 3 * sizeof(unsigned long)];
-	//ultoa(num, buf, 10);
-	snprintf(buf, sizeof(buf), getCSpec(10, false, true), num);
+	ultoa(num, buf, 10);
 	return concat(buf, strlen(buf));
 }
 
 unsigned char String::concat(long long num)
 {
-	char buf[12];
-	//ltoa(num, buf, 10);
-	snprintf(buf, sizeof(buf), getCSpec(10, true, true), num);
+	char buf[2 + 3 * sizeof(long long)];
+	ltoa(num, buf, 10);
 	return concat(buf, strlen(buf));
 }
 
 unsigned char String::concat(unsigned long long num)
 {
-	char buf[11];
-	//ultoa(num, buf, 10);
-	snprintf(buf, sizeof(buf), getCSpec(10, false, true), num);
+	char buf[1 + 3 * sizeof(unsigned long long)];
+	ultoa(num, buf, 10);
 	return concat(buf, strlen(buf));
 }
 
 unsigned char String::concat(float num)
 {
 	char buf[20];
-	snprintf(buf, sizeof(buf), "%f", num);
-	return concat(buf, strlen(buf));
+	char* string = dtostrf(num, 4, 2, buf);
+	return concat(string, strlen(string));
 }
 
 unsigned char String::concat(double num)
 {
-        char buf[20];
-        snprintf(buf, sizeof(buf), "%f", num);
-        return concat(buf, strlen(buf));
+	char buf[20];
+	char* string = dtostrf(num, 4, 2, buf);
+	return concat(string, strlen(string));
 }
 
 /*********************************************/

cores/arduino/WString.h

@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include "stdlib_noniso.h"
 //#include <avr/pgmspace.h>
 
 // When compiling programs with this class, the following gcc parameters