Darkages/SpotMicroESP32-Leika
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🚩 Expands feature flag handling with persistence

Browse Source
This commit is contained in:
Rune Harlyk
2025-07-11 12:34:53 +02:00
committed by Rune Harlyk
parent a3be035f98
commit 2eab893dd7
3 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/lib/stores/featureFlags.ts
+10 -9
View File
@@ -1,20 +1,21 @@
import { api } from '$lib/api'; import { api } from '$lib/api'
import { notifications } from '$lib/components/toasts/notifications'; import { notifications } from '$lib/components/toasts/notifications'
import { writable, type Writable } from 'svelte/store'; import { persistentStore } from '$lib/utilities'
import { type Writable } from 'svelte/store'
let featureFlagsStore: Writable<Record<string, boolean | string>>; let featureFlagsStore: Writable<Record<string, boolean | string>>
export function useFeatureFlags() { export function useFeatureFlags() {
if (!featureFlagsStore) { if (!featureFlagsStore) {
featureFlagsStore = writable<Record<string, boolean | string>>({}); featureFlagsStore = persistentStore<Record<string, boolean | string>>('FeatureFlags', {})
api.get<Record<string, boolean>>('/api/features').then(result => { api.get<Record<string, boolean>>('/api/features').then(result => {
if (result.isOk()) featureFlagsStore.set(result.inner); if (result.isOk()) featureFlagsStore.set(result.inner)
else { else {
notifications.error('Feature flag could not be fetched', 2500); notifications.error('Feature flag could not be fetched', 2500)
} }
}); })
} }
return featureFlagsStore; return featureFlagsStore
} }
esp32/include/features.h
+16
View File
@@ -79,6 +79,22 @@
static_assert(!(USE_JSON == 1 && USE_MSGPACK == 1), "Cannot set both USE_JSON and USE_MSGPACK to 1 simultaneously"); static_assert(!(USE_JSON == 1 && USE_MSGPACK == 1), "Cannot set both USE_JSON and USE_MSGPACK to 1 simultaneously");
#if defined(SPOTMICRO_ESP32) && defined(SPOTMICRO_YERTLE)
#error "Only one kinematics variant must be defined"
#endif
#if !defined(SPOTMICRO_ESP32) && !defined(SPOTMICRO_YERTLE)
#error "You must define one kinematics variant"
#endif
#if defined(SPOTMICRO_ESP32)
#define KINEMATICS_VARIANT_STR "SPOTMICRO_ESP32"
#elif defined(SPOTMICRO_YERTLE)
#define KINEMATICS_VARIANT_STR "SPOTMICRO_YERTLE"
#else
#define KINEMATICS_VARIANT_STR "UNKNOWN"
#endif
namespace feature_service { namespace feature_service {
void printFeatureConfiguration(); void printFeatureConfiguration();
esp32/src/features.cpp
+17 -15
View File
@@ -31,28 +31,30 @@ void printFeatureConfiguration() {
ESP_LOGI("Features", "EMBED_WWW: %s", EMBED_WWW ? "enabled" : "disabled"); ESP_LOGI("Features", "EMBED_WWW: %s", EMBED_WWW ? "enabled" : "disabled");
ESP_LOGI("Features", "ENABLE_CORS: %s", ENABLE_CORS ? "enabled" : "disabled"); ESP_LOGI("Features", "ENABLE_CORS: %s", ENABLE_CORS ? "enabled" : "disabled");
ESP_LOGI("Features", "SERVE_CONFIG_FILES: %s", SERVE_CONFIG_FILES ? "enabled" : "disabled"); ESP_LOGI("Features", "SERVE_CONFIG_FILES: %s", SERVE_CONFIG_FILES ? "enabled" : "disabled");
ESP_LOGI("Features", "KINEMATICS_VARIANT: %s", KINEMATICS_VARIANT_STR);
ESP_LOGI("Features", "=========================================================="); ESP_LOGI("Features", "==========================================================");
} }
void features(JsonObject &root) { void features(JsonObject &root) {
root["upload_firmware"] = USE_UPLOAD_FIRMWARE; root["upload_firmware"] = USE_UPLOAD_FIRMWARE ? true : false;
root["download_firmware"] = USE_DOWNLOAD_FIRMWARE; root["download_firmware"] = USE_DOWNLOAD_FIRMWARE ? true : false;
root["sleep"] = USE_SLEEP; root["sleep"] = USE_SLEEP ? true : false;
root["camera"] = USE_CAMERA; root["camera"] = USE_CAMERA ? true : false;
root["imu"] = USE_MPU6050 || USE_BNO055; root["imu"] = (USE_MPU6050 || USE_BNO055) ? true : false;
root["mag"] = USE_HMC5883 || USE_BNO055; root["mag"] = (USE_HMC5883 || USE_BNO055) ? true : false;
root["bmp"] = USE_BMP180; root["bmp"] = USE_BMP180 ? true : false;
root["sonar"] = USE_USS; root["sonar"] = USE_USS ? true : false;
root["motion"] = USE_MOTION; root["motion"] = USE_MOTION ? true : false;
root["servo"] = USE_PCA9685; root["servo"] = USE_PCA9685 ? true : false;
root["ws2812"] = USE_WS2812; root["ws2812"] = USE_WS2812 ? true : false;
root["mdns"] = USE_MDNS; root["mdns"] = USE_MDNS ? true : false;
root["embed_www"] = EMBED_WWW; root["embed_www"] = EMBED_WWW ? true : false;
root["enable_cors"] = ENABLE_CORS; root["enable_cors"] = ENABLE_CORS ? true : false;
root["serve_config_files"] = SERVE_CONFIG_FILES; root["serve_config_files"] = SERVE_CONFIG_FILES ? true : false;
root["firmware_version"] = APP_VERSION; root["firmware_version"] = APP_VERSION;
root["firmware_name"] = APP_NAME; root["firmware_name"] = APP_NAME;
root["firmware_built_target"] = BUILD_TARGET; root["firmware_built_target"] = BUILD_TARGET;
root["variant"] = KINEMATICS_VARIANT_STR;
} }
esp_err_t getFeatures(PsychicRequest *request) { esp_err_t getFeatures(PsychicRequest *request) {