dominic/Tactility
1
0
Fork 0
mirror of https://github.com/ByteWelder/Tactility.git synced 2026-02-18 19:03:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Wi-Fi provisioning from /data (#428)

Browse Source 
- Import from `/data/settings` instead of `/data`
- Removed unnecessary functions
- Header syntax cleanup
This commit is contained in:
Ken Van Hoeylandt 2025-12-17 14:38:29 +01:00 committed by GitHub
parent 76686e5c90
commit 776e3cd4c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Tactility/Source/service/wifi/WifiBootSplashInit.cpp
View File

@ -1,5 +1,5 @@
#include "Tactility/service/wifi/WifiBootSplashInit.h" #include <Tactility/service/wifi/WifiBootSplashInit.h>
#include "Tactility/file/PropertiesFile.h" #include <Tactility/file/PropertiesFile.h>
#include <Tactility/MountPoints.h> #include <Tactility/MountPoints.h>
#include <Tactility/file/File.h> #include <Tactility/file/File.h>
@ -115,25 +115,18 @@ static void importWifiApSettingsFromDir(const std::string& path) {
} }
} }
static void importWifiApSettings(std::shared_ptr<hal::sdcard::SdCardDevice> 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() { void bootSplashInit() {
getMainDispatcher().dispatch([] { getMainDispatcher().dispatch([] {
// First import any provisioning files placed on the system data partition. // 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. // Then scan attached SD cards as before.
const auto sdcards = hal::findDevices<hal::sdcard::SdCardDevice>(hal::Device::Type::SdCard); const auto sdcards = hal::findDevices<hal::sdcard::SdCardDevice>(hal::Device::Type::SdCard);
for (auto& sdcard : sdcards) { for (auto& sdcard : sdcards) {
if (sdcard->isMounted()) { if (sdcard->isMounted()) {
importWifiApSettings(sdcard); const std::string settings_path = file::getChildPath(sdcard->getMountPath(), "settings");
importWifiApSettingsFromDir(settings_path);
} else { } else {
TT_LOG_W(TAG, "Skipping unmounted SD card %s", sdcard->getMountPath().c_str()); TT_LOG_W(TAG, "Skipping unmounted SD card %s", sdcard->getMountPath().c_str());
} }