Various fixes and improvements (#435)

- Fix for `sdkconfig` generation: the keys that contained the MCU type in its name weren't properly upper-cased.
- Moved WiFi configuration property files to the user data path of the app instead of a fixed location.
- Moved more properties from `device.py` to `sdkconfig/default.properties`
- Fix for `device.cmake` device id parsing: separate basic property parsing from device id validation
- Created internal `tt::service::wifi::findServiceContext()`
- Changed Wi-Fi service id to lowercase (will change it for other services later)
This commit is contained in:
Ken Van Hoeylandt
2025-12-25 15:41:39 +01:00
committed by GitHub
parent 261796068e
commit f48654d3dc
10 changed files with 91 additions and 34 deletions
@@ -1,10 +1,11 @@
#include "Tactility/service/wifi/WifiApSettings.h"
#include "Tactility/file/PropertiesFile.h"
#include <Tactility/service/wifi/WifiPrivate.h>
#include <Tactility/service/wifi/WifiApSettings.h>
#include <Tactility/file/PropertiesFile.h>
#include <Tactility/crypt/Crypt.h>
#include <Tactility/file/File.h>
#include <cstring>
#include <Tactility/service/ServicePaths.h>
#include <format>
#include <iomanip>
#include <ranges>
@@ -15,14 +16,13 @@ namespace tt::service::wifi::settings {
constexpr auto* TAG = "WifiApSettings";
constexpr auto* AP_SETTINGS_FORMAT = "/data/settings/{}.ap.properties";
constexpr auto* AP_SETTINGS_FORMAT = "{}/{}.ap.properties";
constexpr auto* AP_PROPERTIES_KEY_SSID = "ssid";
constexpr auto* AP_PROPERTIES_KEY_PASSWORD = "password";
constexpr auto* AP_PROPERTIES_KEY_AUTO_CONNECT = "autoConnect";
constexpr auto* AP_PROPERTIES_KEY_CHANNEL = "channel";
std::string toHexString(const uint8_t *data, int length) {
std::stringstream stream;
stream << std::hex;
@@ -48,8 +48,9 @@ bool readHex(const std::string& input, uint8_t* buffer, int length) {
return true;
}
static std::string getApPropertiesFilePath(const std::string& ssid) {
return std::format(AP_SETTINGS_FORMAT, ssid);
// TODO: The SSID could contain invalid filename characters (e.g. "/", "\" and more) so we have to refactor this.
static std::string getApPropertiesFilePath(std::shared_ptr<ServicePaths> paths, const std::string& ssid) {
return std::format(AP_SETTINGS_FORMAT, paths->getUserDataDirectory(), ssid);
}
static bool encrypt(const std::string& ssidInput, std::string& ssidOutput) {
@@ -111,12 +112,20 @@ static bool decrypt(const std::string& ssidInput, std::string& ssidOutput) {
}
bool contains(const std::string& ssid) {
const auto file_path = getApPropertiesFilePath(ssid);
auto service_context = findServiceContext();
if (service_context == nullptr) {
return false;
}
const auto file_path = getApPropertiesFilePath(service_context->getPaths(), ssid);
return file::isFile(file_path);
}
bool load(const std::string& ssid, WifiApSettings& apSettings) {
const auto file_path = getApPropertiesFilePath(ssid);
auto service_context = findServiceContext();
if (service_context == nullptr) {
return false;
}
const auto file_path = getApPropertiesFilePath(service_context->getPaths(), ssid);
std::map<std::string, std::string> map;
if (!file::loadPropertiesFile(file_path, map)) {
return false;
@@ -165,7 +174,12 @@ bool save(const WifiApSettings& apSettings) {
return false;
}
const auto file_path = getApPropertiesFilePath(apSettings.ssid);
auto service_context = findServiceContext();
if (service_context == nullptr) {
return false;
}
const auto file_path = getApPropertiesFilePath(service_context->getPaths(), apSettings.ssid);
std::map<std::string, std::string> map;
@@ -187,7 +201,12 @@ bool save(const WifiApSettings& apSettings) {
}
bool remove(const std::string& ssid) {
const auto path = getApPropertiesFilePath(ssid);
auto service_context = findServiceContext();
if (service_context == nullptr) {
return false;
}
const auto path = getApPropertiesFilePath(service_context->getPaths(), ssid);
if (!file::isFile(path)) {
return false;
}