Bump boards, use std::string_view instead of full strings

Author: SeongGino

OpenFIREmain/OpenFIREprefs.cpp

@@ -76,13 +76,13 @@ int OF_Prefs::SaveProfiles()
                 if(pair.second == OF_Const::profCurrent) {
                     if(!currentProfLogged) {
                         // only write string and profile num
-                        prefsFile.write((const uint8_t*)pair.first.c_str(), pair.first.length()+1);
+                        prefsFile.write((const uint8_t*)pair.first.data(), pair.first.length()+1);
                         prefsFile.write((uint8_t)currentProfile);
                         currentProfLogged = true;
                     }
                 } else {
                     // write data type:
-                    prefsFile.write((const uint8_t*)pair.first.c_str(), pair.first.length()+1);
+                    prefsFile.write((const uint8_t*)pair.first.data(), pair.first.length()+1);
                     // Append profile number:
                     prefsFile.write((uint8_t*)&i, 1);
 
@@ -108,12 +108,12 @@ int OF_Prefs::SaveProfiles()
     } else return Error_Write;
 }
 
-int OF_Prefs::SaveToPtr(File prefsFile, void *dataPtr, const std::unordered_map<std::string, int> &mapPtr, const size_t &dataSize)
+int OF_Prefs::SaveToPtr(File prefsFile, void *dataPtr, const std::unordered_map<std::string_view, int> &mapPtr, const size_t &dataSize)
 {
     if(prefsFile) {
         for(auto &pair : mapPtr) {
             if((pair.second >= 0 && dataPtr != backupButtonDesc) || dataPtr == backupButtonDesc && pair.second >= 0 && pair.second < ButtonCount) {
-                prefsFile.write((const uint8_t*)pair.first.c_str(), pair.first.length()+1);
+                prefsFile.write((const uint8_t*)pair.first.data(), pair.first.length()+1);
                 prefsFile.write((uint8_t)dataSize);
                 prefsFile.write((uint8_t*)dataPtr + (dataSize * pair.second), dataSize);
             }
@@ -124,7 +124,7 @@ int OF_Prefs::SaveToPtr(File prefsFile, void *dataPtr, const std::unordered_map<
     } else return Error_NoData;
 }
 
-int OF_Prefs::LoadToPtr(File prefsFile, void *dataPtr, const std::unordered_map<std::string, int> &mapPtr)
+int OF_Prefs::LoadToPtr(File prefsFile, void *dataPtr, const std::unordered_map<std::string_view, int> &mapPtr)
 {
     if(prefsFile) {
         char buf[32];

OpenFIREmain/OpenFIREprefs.h

@@ -140,11 +140,11 @@ class OF_Prefs
 
     /// @brief Generic saving method using provided pointers to a block of data and its associated string map for lookups
     /// @return An error code from Errors_e
-    static int SaveToPtr(File, void*, const std::unordered_map<std::string, int>&, const size_t&);
+    static int SaveToPtr(File, void*, const std::unordered_map<std::string_view, int>&, const size_t&);
 
     /// @brief Generic loading method using provided pointers to a block of data and its associated string map for lookups
     /// @return An error code from Errors_e
-    static int LoadToPtr(File, void*, const std::unordered_map<std::string, int>&);
+    static int LoadToPtr(File, void*, const std::unordered_map<std::string_view, int>&);
 
     /// @brief Load preferences
     /// @return An error code from Errors_e

OpenFIREmain/OpenFIREserial.cpp

@@ -1125,14 +1125,14 @@ void OF_Serial::SerialProcessingDocked()
     }
 }
 
-void OF_Serial::SerialBatchSend(void *dataPtr, const std::unordered_map<std::string, int> &mapPtr, const size_t &dataSize, const int &profNum)
+void OF_Serial::SerialBatchSend(void *dataPtr, const std::unordered_map<std::string_view, int> &mapPtr, const size_t &dataSize, const int &profNum)
 {
     size_t pos;
     bool profNumSent = false;
     for(auto &pair : mapPtr) {
         if(pair.second >= 0) {
             pos = 0;
-            strcpy(&TXbuf[pos], pair.first.c_str());
+            strcpy(&TXbuf[pos], pair.first.data());
             pos += pair.first.length()+1;
             if(&mapPtr == &OF_Prefs::OFPresets.profSettingTypes_Strings) {
                 if(pair.second == OF_Const::profCurrent) {
@@ -1184,7 +1184,7 @@ void OF_Serial::SerialBatchSend(void *dataPtr, const std::unordered_map<std::str
     }
 }
 
-void OF_Serial::SerialBatchRecv(const char *bufPtr, void *dataPtr, const std::unordered_map<std::string, int> &mapPtr, const size_t &dataSize, const size_t &rxDatSize, const size_t &rxBufSize)
+void OF_Serial::SerialBatchRecv(const char *bufPtr, void *dataPtr, const std::unordered_map<std::string_view, int> &mapPtr, const size_t &dataSize, const size_t &rxDatSize, const size_t &rxBufSize)
 {
     if(mapPtr.count(bufPtr)) {
         if(&mapPtr == &OF_Prefs::OFPresets.profSettingTypes_Strings && mapPtr.at(bufPtr) == OF_Const::profCurrent) {

OpenFIREmain/OpenFIREserial.h

@@ -23,10 +23,10 @@ class OF_Serial
     static void SerialProcessingDocked();
 
     /// @brief    Generic method for sending data over Serial to connected host
-    static void SerialBatchSend(void*, const std::unordered_map<std::string, int> &, const size_t&, const int& = -1);
+    static void SerialBatchSend(void*, const std::unordered_map<std::string_view, int> &, const size_t&, const int& = -1);
 
     /// @brief    Generic method for reading commit data over Serial from connected host
-    static void SerialBatchRecv(const char*, void*, const std::unordered_map<std::string, int> &, const size_t&, const size_t&, const size_t&);
+    static void SerialBatchRecv(const char*, void*, const std::unordered_map<std::string_view, int> &, const size_t&, const size_t&, const size_t&);
 
     // Main routine that prints information to connected serial monitor when the gun enters Pause Mode.
     static void PrintResults();