Merge pull request #5 from TcMenu/main-mbed-fix

#3 clean up and remove the use of min/max that conflict with std lib.…

Author: davetcc

src/TextUtilities.cpp

@@ -113,19 +113,26 @@ char hexChar(uint8_t val) {
 
 
 void intToHexString(char* buffer, size_t bufferSize, unsigned int input, int digits, bool with0x) {
+    buffer[0] = 0;
     if(with0x) {
+        if(bufferSize < (digits + 3)) {
+            return;
+        }
         buffer[0] = '0';
         buffer[1] = 'x';
         bufferSize -= 2;
         buffer += 2;
+    } else if(bufferSize < digits) {
+        return;
     }
 
     if(digits >= bufferSize) {
         digits = bufferSize - 1;
     }
 
-    int i = 0;
-    while(bufferSize && i < digits) {
+    size_t i = 0;
+    bufferSize--;
+    while(i < bufferSize && i < digits) {
         buffer[(digits-1) - i] = hexChar(input & 0x0f);
         input = input >> 4;
         i++;

src/TextUtilities.h

@@ -125,23 +125,21 @@ void intToHexString(char* buffer, size_t bufferSize, unsigned int input, int dig
 inline float tcFltAbs(float f1) {
     return f1 > 0.0F ? f1 : -f1;
 }
-
-#if defined(IOA_USE_MBED) || defined(BUILD_FOR_PICO_CMAKE)
+#if (defined(__MBED__) && !defined(ARDUINO_ARCH_MBED)) || defined(BUILD_FOR_PICO_CMAKE)
 #define strcmp_P(x,y) strcmp(x,y)
 #define strncpy_P(x,y,z) strncpy(x,y,z)
 #define strcpy_P(x,y) strcpy(x,y)
 #define strlen_P(x) strlen(x)
 #define highByte(x) ((x) >> 8)
 #define lowByte(x) ((x) & 0xff)
-#define ltoa(a,b,c) itoa(a,b,c)
-# ifndef min
-template<class T> void min(T x, T y) { return (((x) < (y))?(x):(y)); }
-template<class T> void max(T x, T y) { return (((x) > (y))?(x):(y)); }
-# endif //TCMENU_MBED_NO_MINMAX
-#endif // IOA_USE_MBED
-
-#ifdef IOA_ARDUINO_MBED
-#define ltoa(a,b,c) itoa(a,b,c)
-#endif
+#endif // MBED OR PICO
+
+#ifndef internal_min
+#define internal_min(a, b)  ((a) > (b) ? (b) : (a));
+#endif // internal_min
+
+#ifndef internal_max
+#define internal_max(a, b)  ((a) < (b) ? (b) : (a));
+#endif // internal_max
 
 #endif //IOABSTRACTION_TEXTUTILITIES_H

test/test_text_utils/test_text_utils.cpp

@@ -54,12 +54,6 @@ void testTcUtilHexCoversions() {
 
     intToHexString(szBuffer, sizeof szBuffer, 0x0000, 4, true);
     TEST_ASSERT_EQUAL_STRING("0x0000", szBuffer);
-
-    intToHexString(szBuffer, 6, 0xFFFF, 4, true);
-    TEST_ASSERT_EQUAL_STRING("0xFFF", szBuffer);
-
-    intToHexString(szBuffer, 3, 0xFFFF, 4, false);
-    TEST_ASSERT_EQUAL_STRING("FF", szBuffer);
 }
 
 void testTcUtilFloatConversions() {
@@ -73,11 +67,41 @@ void testTcUtilFloatConversions() {
     TEST_ASSERT_EQUAL_STRING("-10.3", szBuffer);
 }
 
+void testTcUtilLimits() {
+    char szBuffer[20];
+
+    // Test very large value
+    szBuffer[0]=0;
+    intToHexString(szBuffer, sizeof szBuffer, 0xFFF0FF0F, 8, true);
+    TEST_ASSERT_EQUAL_STRING("0xFFF0FF0F", szBuffer);
+
+    // test very small value with large number of places
+    intToHexString(szBuffer, sizeof szBuffer, 0x1, 8, true);
+    TEST_ASSERT_EQUAL_STRING("0x00000001", szBuffer);
+
+    // test limits - method does nothing when buffer too small.
+    intToHexString(szBuffer, 5, 0xFFF00000, 8, true);
+    TEST_ASSERT_EQUAL_STRING("", szBuffer);
+
+    // test large integers
+    ltoaClrBuff(szBuffer, 147483647, 9, NOT_PADDED, sizeof szBuffer);
+    TEST_ASSERT_EQUAL_STRING("147483647", szBuffer);
+    ltoaClrBuff(szBuffer, -147483647, 9, NOT_PADDED, sizeof szBuffer);
+    TEST_ASSERT_EQUAL_STRING("-147483647", szBuffer);
+
+
+    ltoaClrBuff(szBuffer, -2147483647, 9, NOT_PADDED, 5);
+    TEST_ASSERT_EQUAL_STRING("-147", szBuffer);
+
+}
+
+
 void setup() {
     UNITY_BEGIN();
     RUN_TEST(testTcUtilHexCoversions);
     RUN_TEST(testTcUtilIntegerConversions);
     RUN_TEST(testTcUtilFloatConversions);
+    RUN_TEST(testTcUtilLimits);
     UNITY_END();
 }