From 776e3cd4c0fb72c20ac89e4a3e73a27e8e3df36b Mon Sep 17 00:00:00 2001 From: Ken Van Hoeylandt Date: Wed, 17 Dec 2025 14:38:29 +0100 Subject: [PATCH] Fix Wi-Fi provisioning from /data (#428) - Import from `/data/settings` instead of `/data` - Removed unnecessary functions - Header syntax cleanup --- .../service/wifi/WifiBootSplashInit.cpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/Tactility/Source/service/wifi/WifiBootSplashInit.cpp b/Tactility/Source/service/wifi/WifiBootSplashInit.cpp index 9a3d30f5..250158bc 100644 --- a/Tactility/Source/service/wifi/WifiBootSplashInit.cpp +++ b/Tactility/Source/service/wifi/WifiBootSplashInit.cpp @@ -1,5 +1,5 @@ -#include "Tactility/service/wifi/WifiBootSplashInit.h" -#include "Tactility/file/PropertiesFile.h" +#include +#include #include #include @@ -115,25 +115,18 @@ static void importWifiApSettingsFromDir(const std::string& path) { } } -static void importWifiApSettings(std::shared_ptr sdcard) { - const std::string settings_path = file::getChildPath(sdcard->getMountPath(), "settings"); - importWifiApSettingsFromDir(settings_path); -} - -static void importWifiApSettingsFromData() { - importWifiApSettingsFromDir(tt::file::MOUNT_POINT_DATA); -} - void bootSplashInit() { getMainDispatcher().dispatch([] { // First import any provisioning files placed on the system data partition. - importWifiApSettingsFromData(); + const std::string settings_path = file::getChildPath(file::MOUNT_POINT_DATA, "settings"); + importWifiApSettingsFromDir(settings_path); // Then scan attached SD cards as before. const auto sdcards = hal::findDevices(hal::Device::Type::SdCard); for (auto& sdcard : sdcards) { if (sdcard->isMounted()) { - importWifiApSettings(sdcard); + const std::string settings_path = file::getChildPath(sdcard->getMountPath(), "settings"); + importWifiApSettingsFromDir(settings_path); } else { TT_LOG_W(TAG, "Skipping unmounted SD card %s", sdcard->getMountPath().c_str()); }