fix: annoying memory leak bug

Author: arcbtc

.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+    "files.associations": {
+        "array": "cpp",
+        "deque": "cpp",
+        "string": "cpp",
+        "unordered_map": "cpp",
+        "vector": "cpp",
+        "string_view": "cpp",
+        "initializer_list": "cpp"
+    }
+}

fossa/100_config.ino

@@ -91,8 +91,8 @@ void printDefaultValues() {
   Serial.println("Charge: " + String(charge) + "%");
   Serial.println("Max amount: " + String(maxAmount));
   Serial.println("Max before reset: " + String(maxBeforeReset));
-  convertStringToFloatArray(coinAmounts.c_str(), coinAmountFloat);
-  convertStringToIntArray(billAmounts.c_str(), billAmountInt);
+  convertToFloatArray(coinAmounts.c_str(), coinAmountFloat);
+  convertToFloatArray(billAmounts.c_str(), billAmountFloat);
   Serial.println("Coin amounts: " + String(coinAmounts));
   Serial.println("Bill amounts: " + String(billAmounts));
 }
@@ -157,10 +157,12 @@ void readFiles() {
   }
 
   billAmounts = getJsonValue(doc, "config_bill_ints");
-  convertStringToIntArray(billAmounts.c_str(), billAmountInt);
+  convertToFloatArray(billAmounts.c_str(), billAmountFloat);
+  Serial.println(billAmountFloat[0]);
 
   coinAmounts = getJsonValue(doc, "config_coin_floats");
-  convertStringToFloatArray(coinAmounts.c_str(), coinAmountFloat);
+  convertToFloatArray(coinAmounts.c_str(), coinAmountFloat);
+  Serial.println(billAmountFloat[0]);
 
   String langConfig = getJsonValue(doc, "config_lang");
   if (langConfig != "") {

fossa/102_helpers.ino

@@ -48,44 +48,16 @@ void splitSettings(String str) {
   Serial.println("currencyATM: " + currencyATM);
 }
 
-void convertStringToFloatArray(const char* str, float* floatArray) {
-  char buffer[30];  // Temporary buffer to hold each substring
-  int index = 0;  // Index for the float array
-  int bufferIndex = 0;  // Index for the buffer
+void convertToFloatArray(const char* str, float* floatArray) {
+  char temp[50];
+  strncpy(temp, str, sizeof(temp));   // copy input to mutable buffer
+  temp[sizeof(temp) - 1] = '\0';      // ensure null-termination
 
-  for (int i = 0; str[i] != '\0'; i++) {
-    if (str[i] == ',') {  // When a comma is found
-      buffer[bufferIndex] = '\0';  // Null-terminate the buffer string
-      floatArray[index] = atof(buffer);  // Convert buffer to float and store in array
-      index++;  // Move to the next position in float array
-      bufferIndex = 0;  // Reset buffer index
-    } else {
-      buffer[bufferIndex++] = str[i];  // Copy characters to buffer
-    }
-  }
-
-  // Don't forget to convert the last number in the string
-  buffer[bufferIndex] = '\0';  // Null-terminate the buffer
-  floatArray[index] = atof(buffer);  // Convert buffer to float
-}
+  int index = 0;
+  char* token = strtok(temp, ",");
 
-void convertStringToIntArray(const char* str, int* intArray) {
-  char buffer[20];  // Temporary buffer to hold each substring
-  int index = 0;    // Index for the integer array
-  int bufferIndex = 0;  // Index for the buffer
-
-  for (int i = 0; str[i] != '\0'; i++) {
-    if (str[i] == ',') {  // When a comma is found
-      buffer[bufferIndex] = '\0';  // Null-terminate the buffer string
-      intArray[index] = atoi(buffer);  // Convert buffer to int and store in array
-      index++;  // Move to the next position in integer array
-      bufferIndex = 0;  // Reset buffer index
-    } else {
-      buffer[bufferIndex++] = str[i];  // Copy characters to buffer
-    }
+  while (token != NULL && index < 10) {
+    floatArray[index++] = strtof(token, NULL);  // convert substring to float
+    token = strtok(NULL, ",");
   }
-
-  // Don't forget to convert the last number in the string
-  buffer[bufferIndex] = '\0';  // Null-terminate the buffer
-  intArray[index] = atoi(buffer);  // Convert buffer to int
-}
+}

fossa/fossa.ino

@@ -32,8 +32,8 @@
 
 bool hardcoded = HARDCODED; // set to true if you want to use the above hardcoded settings
 bool printerBool = false;
-int billAmountInt[10];
-float coinAmountFloat[6];
+float billAmountFloat[10];
+float coinAmountFloat[10];
 
 ///////////////////////////////////////////////////
 ///////////////////////////////////////////////////
@@ -60,7 +60,7 @@ int maxBeforeResetTally;
 int bills;
 float coins;
 float total;
-int billAmountSize = sizeof(billAmountInt) / sizeof(int);
+float billAmountSize = sizeof(billAmountFloat) / sizeof(float);
 float coinAmountSize = sizeof(coinAmountFloat) / sizeof(float);
 int moneyTimer = 0;
 bool waitForTap = true;
@@ -92,6 +92,7 @@ void setup() {
   tft.setRotation(1);
   tft.invertDisplay(false);
   printMessage("", "Loading..", "", TFT_WHITE, TFT_BLACK);
+  printMessage("", "Loading..", "", TFT_BLACK, TFT_WHITE);
 
   // wait few secods for tap to start config mode
   while (waitForTap && total < 100) {
@@ -117,21 +118,6 @@ void setup() {
   SerialPort1.begin(300, SERIAL_8N2, BILL_TX, BILL_RX);
   SerialPort2.begin(4800, SERIAL_8N1, COIN_TX);
   printerSerial.begin(9600);
-  printer.begin();
-  printer.wake();
-  printer.setDefault();
-  printer.justify('C');
-  printer.feed(3);
-  printer.boldOn();
-  printer.setSize('L');
-  printer.println("Printer Connected :)");
-  printer.println("");
-  printer.println("");
-  printer.println("");
-  printer.println("");
-  printer.println("");
-  printer.sleep();
-
   pinMode(COIN_INHIBIT, OUTPUT);
 }
 
@@ -153,10 +139,10 @@ void loop() {
       Serial.println("Coin acceptor connected");
     }
     moneyTimerFun();
-    Serial.println(total);
-    Serial.println(maxBeforeResetTally);
+    Serial.println("total" + String(total));
+    Serial.println("maxBeforeResetTally" + String(maxBeforeResetTally));
     maxBeforeResetTally = maxBeforeResetTally + (total / 100);
-    Serial.println(maxBeforeResetTally);
+    Serial.println("maxBeforeResetTally" + String(maxBeforeResetTally));
     makeLNURL();
     qrShowCodeLNURL(scanMeT);
   }
@@ -180,9 +166,9 @@ void moneyTimerFun() {
       int x = SerialPort1.read();
       for (int i = 0; i < billAmountSize; i++) {
         if ((i + 1) == x) {
-          bills = bills + billAmountInt[i];
+          bills = bills + billAmountFloat[i];
           total = (coins + bills);
-          printMessage(billAmountInt[i] + currencyATM, totalT + String(total) + currencyATM, tapScreenT, TFT_WHITE, TFT_BLACK);
+          printMessage(billAmountFloat[i] + currencyATM, totalT + String(total) + currencyATM, tapScreenT, TFT_WHITE, TFT_BLACK);
         }
       }
     }