Migrate to using the cpp-misc library (#1152)

Author: johnboiles

.gitmodules

@@ -22,3 +22,6 @@
 [submodule "components/tiny-font"]
 	path = components/tiny-font
 	url = git@github.com:sindarin-inc/tiny-font.git
+[submodule "components/cpp-misc"]
+	path = components/cpp-misc
+	url = git@github.com:sindarin-inc/cpp-misc.git

components/cpp-misc

@@ -43,6 +43,15 @@ add_subdirectory(${REPO_ROOT_DIR}/components/miniz ${CMAKE_CURRENT_BINARY_DIR}/m
 
 add_subdirectory(${REPO_ROOT_DIR}/components/Adafruit-GFX-Library ${CMAKE_CURRENT_BINARY_DIR}/Adafruit-GFX-Library)
 
+add_subdirectory("${REPO_ROOT_DIR}/components/cpp-misc/defer" ${CMAKE_CURRENT_BINARY_DIR}/defer)
+
+add_subdirectory("${REPO_ROOT_DIR}/components/cpp-misc/spiram-cpp" ${CMAKE_CURRENT_BINARY_DIR}/spiram-cpp)
+# Have spiram-cpp use our esp-idf stubs
+target_include_directories(spiram-cpp PUBLIC ${REPO_ROOT_DIR}/lib/Simulator/stubs/esp-idf)
+target_compile_definitions(spiram-cpp PUBLIC ESP_PLATFORM=1)
+
+add_subdirectory("${REPO_ROOT_DIR}/components/cpp-misc/stringutil" ${CMAKE_CURRENT_BINARY_DIR}/stringutil)
+
 add_subdirectory(${REPO_ROOT_DIR}/components/tiny-font ${CMAKE_CURRENT_BINARY_DIR}/tiny-font)
 
 # Conditionally link freetype if we're using 8-bit or 16-bit display
@@ -81,7 +90,7 @@ endif()
 
 add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HTTP_CLIENT_SOURCE})
 
-target_link_libraries(${PROJECT_NAME} PUBLIC pugixml ArduinoJson miniz astubs esp-idf-stubs nvs_flash Adafruit-GFX-Library tiny-font mbedtls mbedx509 mbedcrypto esp_ringbuf)
+target_link_libraries(${PROJECT_NAME} PUBLIC pugixml ArduinoJson miniz astubs esp-idf-stubs nvs_flash Adafruit-GFX-Library tiny-font mbedtls mbedx509 mbedcrypto esp_ringbuf defer spiram-cpp stringutil)
 
 target_include_directories(${PROJECT_NAME} PUBLIC
     "${REPO_ROOT_DIR}/src"

lib/Simulator/Common/CMakeLists.txt

@@ -7,10 +7,10 @@
 #define STB_IMAGE_IMPLEMENTATION
 #include <stb_image.h>
 #pragma clang diagnostic pop
+#include <Defer/Defer.hpp>
 #include <unistd.h>
 
 #include "Inputs/RemoteInput.hpp"
-#include "Misc/Defer.hpp"
 #include "Misc/Dispatch.hpp"
 #include "UI/ReadableScreen.hpp"
 #include "UI/Screen.hpp"

lib/Simulator/SimAutomation.cpp

@@ -2,14 +2,14 @@
 
 #include "Communications/BLEHttpClient.hpp"
 
+#include <Defer/Defer.hpp>
 #include <cstddef>
 #include <cstdlib>
 #include <esp_debug_helpers.h>
 #include <esp_timer.h>
 #include <utility>
 
 #include "Communications/SindarinAPI.hpp"
-#include "Misc/Defer.hpp"
 #include "Misc/RateLimiter.hpp"
 
 BLEHttpClient::BLEHttpClient(const char *url, std::shared_ptr<CancelFlag> cancelFlag,

src/Communications/BLEHttpClient.cpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <StringUtil/StringUtil.hpp>
 #include <map>
 #include <memory>
 
@@ -13,7 +14,6 @@
 #include "Communications/HttpClient.hpp"
 #include "Misc/CircBuffer.hpp"
 #include "Misc/Dispatch.hpp"
-#include "Misc/StringUtil.hpp"
 
 #define MAX_BUFFER_SIZE (1 * 1024 * 1024) // 1MB
 

src/Communications/BLEHttpClient.hpp

@@ -2,11 +2,11 @@
 
 #include "BLEProxy.hpp"
 
+#include <StringUtil/StringUtil.hpp>
 #include <utility>
 
 #include "Misc/Dispatch.hpp"
 #include "Misc/Platform.hpp"
-#include "Misc/StringUtil.hpp"
 #include "sindarin-debug.h"
 
 #define BLEPROXY_CHARACTERISTIC_UUID "611f68af-5ffe-4944-9b8f-c0f4f5a623ee"

src/Communications/BLEProxy.cpp

@@ -2,11 +2,11 @@
 
 #include <NimBLEClient.h>
 #include <NimBLEDevice.h>
+#include <StringUtil/StringUtil.hpp>
 #include <esp_wifi.h>
 
 #include "Communications/BLEAbstractions.hpp"
 #include "Communications/BLEManager.hpp"
-#include "Misc/StringUtil.hpp"
 #include "Storage/PreferencesStore.hpp"
 #include "sindarin-debug.h"
 

src/Communications/BLEProxy.hpp

@@ -2,12 +2,12 @@
 
 #include "BLESettings.hpp"
 
+#include <StringUtil/StringUtil.hpp>
 #include <driver/gpio.h>
 #include <utility>
 
 #include "Misc/Dispatch.hpp"
 #include "Misc/Platform.hpp"
-#include "Misc/StringUtil.hpp"
 #include "Version.hpp"
 #include "WiFi.hpp"
 #include "sindarin-debug.h"

src/Communications/BLESettings.cpp

@@ -2,14 +2,15 @@
 
 #include <NimBLEClient.h>
 #include <NimBLEDevice.h>
+#include <StringUtil/StringUtil.hpp>
 #include <esp_wifi.h>
 
 #include "BLEAbstractions.hpp"
 #include "Communications/BLEManager.hpp"
 #if CONFIG_USE_TURN_TOUCH_REMOTE
 #include "Inputs/TTRemoteInput.hpp"
 #endif
-#include "Misc/StringUtil.hpp"
+
 #include "Storage/PreferencesStore.hpp"
 #include "sindarin-debug.h"