From d9eccd70ed6fa7a1b277a1894501be8d3293d73e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 29 Apr 2026 18:54:18 +0800 Subject: [PATCH] Battery (Windows): removes option `useSetupApi` --- doc/json_schema.json | 5 ----- src/modules/battery/battery.c | 15 --------------- src/modules/battery/option.h | 4 ---- 3 files changed, 24 deletions(-) diff --git a/doc/json_schema.json b/doc/json_schema.json index 8d1d168be..95224cced 100644 --- a/doc/json_schema.json +++ b/doc/json_schema.json @@ -1540,11 +1540,6 @@ "const": "battery", "description": "Print battery information" }, - "useSetupApi": { - "description": "Whether to use the `CM API` on Windows to detect battery information. Supports multiple batteries, but is slower (Windows only)", - "type": "boolean", - "default": false - }, "temp": { "$ref": "#/$defs/temperature" }, diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c index 70ec61139..f59375c9c 100644 --- a/src/modules/battery/battery.c +++ b/src/modules/battery/battery.c @@ -202,13 +202,6 @@ void ffParseBatteryJsonObject(FFBatteryOptions* options, yyjson_val* module) { continue; } -#ifdef _WIN32 - if (unsafe_yyjson_equals_str(key, "useSetupApi")) { - options->useSetupApi = yyjson_get_bool(val); - continue; - } -#endif - if (ffTempsParseJsonObject(key, val, &options->temp, &options->tempConfig)) { continue; } @@ -224,10 +217,6 @@ void ffParseBatteryJsonObject(FFBatteryOptions* options, yyjson_val* module) { void ffGenerateBatteryJsonConfig(FFBatteryOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module) { ffJsonConfigGenerateModuleArgsConfig(doc, module, &options->moduleArgs); -#ifdef _WIN32 - yyjson_mut_obj_add_bool(doc, module, "useSetupApi", options->useSetupApi); -#endif - ffTempsGenerateJsonConfig(doc, module, options->temp, options->tempConfig); ffPercentGenerateJsonConfig(doc, module, options->percent); } @@ -302,10 +291,6 @@ void ffInitBatteryOptions(FFBatteryOptions* options) { options->temp = false; options->tempConfig = (FFColorRangeConfig) { 60, 80 }; options->percent = (FFPercentageModuleConfig) { 50, 20, 0 }; - -#ifdef _WIN32 - options->useSetupApi = false; -#endif } void ffDestroyBatteryOptions(FFBatteryOptions* options) { diff --git a/src/modules/battery/option.h b/src/modules/battery/option.h index 9f01ffb66..d65fd1fa4 100644 --- a/src/modules/battery/option.h +++ b/src/modules/battery/option.h @@ -9,10 +9,6 @@ typedef struct FFBatteryOptions { bool temp; FFColorRangeConfig tempConfig; FFPercentageModuleConfig percent; - -#ifdef _WIN32 - bool useSetupApi; -#endif } FFBatteryOptions; static_assert(sizeof(FFBatteryOptions) <= FF_OPTION_MAX_SIZE, "FFBatteryOptions size exceeds maximum allowed size");