UPS 제거 상태에 맞춘 배터리 기능 정리

2026-07-03 14:18:05 +09:00
parent 6fceae0c01
commit 1bbbe5b694
5 changed files with 106 additions and 91 deletions
@@ -3219,8 +3219,10 @@ function collect_snapshot(bool $applyFan = true): array
        'watts' => isset($latest['cpu_watts']) ? (float)$latest['cpu_watts'] : null,
    ];
    $battery = $applyFan ? battery_status() : [
-        'voltage' => isset($latest['battery_voltage']) ? (float)$latest['battery_voltage'] : null,
-        'percent' => isset($latest['battery_percent']) ? (float)$latest['battery_percent'] : null,
+        'enabled' => CONTROL_BATTERY_ENABLED,
+        'removed' => !CONTROL_BATTERY_ENABLED,
+        'voltage' => CONTROL_BATTERY_ENABLED && isset($latest['battery_voltage']) ? (float)$latest['battery_voltage'] : null,
+        'percent' => CONTROL_BATTERY_ENABLED && isset($latest['battery_percent']) ? (float)$latest['battery_percent'] : null,
    ];

    if ($applyFan) {
@@ -3231,8 +3233,8 @@ function collect_snapshot(bool $applyFan = true): array
            'rp1_temp_c' => $rp1Temp,
            'cpu_voltage' => $cpuPower['voltage'],
            'cpu_watts' => $cpuPower['watts'],
-            'battery_voltage' => $battery['voltage'],
-            'battery_percent' => $battery['percent'],
+            'battery_voltage' => CONTROL_BATTERY_ENABLED ? $battery['voltage'] : null,
+            'battery_percent' => CONTROL_BATTERY_ENABLED ? $battery['percent'] : null,
            'pwm_value' => $pwm,
            'pwm_percent' => round($pwm / 255 * 100, 2),
            'pwm_mode' => $policy['mode'],
@@ -3278,34 +3280,43 @@ function collect_snapshot(bool $applyFan = true): array
        'throttling' => $throttledStatuses['throttling'],
    ]);

-    $history = add_battery_remaining_history(sensor_history((int)setting_value('battery.history_chart_limit')));
-    $batteryTrend = battery_trend_history((int)setting_value('battery.trend_hours'));
-    $batteryProfile = battery_profile_history((int)setting_value('battery.profile_days'));
-    $battery['remaining'] = battery_remaining_estimate($battery, $history, $batteryTrend, $batteryProfile);
-    $history = sync_current_battery_remaining_history($history, [
-        'time' => date('Y-m-d H:i:s'),
-        'temp_c' => $temp,
-        'fan_rpm' => $rpm,
-        'fan_efficiency' => fan_efficiency($rpm, $temp, $cpuPower['watts'] ?? null),
-        'rp1_temp_c' => $rp1Temp,
-        'cpu_voltage' => $cpuPower['voltage'],
-        'cpu_watts' => $cpuPower['watts'],
-        'battery_voltage' => $battery['voltage'],
-        'battery_percent' => $battery['percent'],
-        'fan_pwm' => $pwm,
-        'pwm_percent' => round($pwm / 255 * 100, 2),
-        'pwm_mode' => $policy['mode'],
-        'cpu_load_1' => round((float)$load[0], 2),
-        'cpu_load_5' => round((float)$load[1], 2),
-        'cpu_load_15' => round((float)$load[2], 2),
-        'disk_total_kb' => $disk['total_kb'],
-        'disk_used_kb' => $disk['used_kb'],
-        'disk_free_kb' => $disk['free_kb'],
-        'mem_total_mb' => $mem['total_mb'],
-        'mem_used_mb' => $mem['used_mb'],
-        'mem_percent' => $mem['total_mb'] > 0 ? round($mem['used_mb'] / $mem['total_mb'] * 100, 1) : 0,
-    ], $battery['remaining']['seconds'] ?? null);
-    $history = array_slice($history, -(int)setting_value('battery.history_sync_limit'));
+    if (CONTROL_BATTERY_ENABLED) {
+        $history = add_battery_remaining_history(sensor_history((int)setting_value('battery.history_chart_limit')));
+        $batteryTrend = battery_trend_history((int)setting_value('battery.trend_hours'));
+        $batteryProfile = battery_profile_history((int)setting_value('battery.profile_days'));
+        $battery['remaining'] = battery_remaining_estimate($battery, $history, $batteryTrend, $batteryProfile);
+        $history = sync_current_battery_remaining_history($history, [
+            'time' => date('Y-m-d H:i:s'),
+            'temp_c' => $temp,
+            'fan_rpm' => $rpm,
+            'fan_efficiency' => fan_efficiency($rpm, $temp, $cpuPower['watts'] ?? null),
+            'rp1_temp_c' => $rp1Temp,
+            'cpu_voltage' => $cpuPower['voltage'],
+            'cpu_watts' => $cpuPower['watts'],
+            'battery_voltage' => $battery['voltage'],
+            'battery_percent' => $battery['percent'],
+            'fan_pwm' => $pwm,
+            'pwm_percent' => round($pwm / 255 * 100, 2),
+            'pwm_mode' => $policy['mode'],
+            'cpu_load_1' => round((float)$load[0], 2),
+            'cpu_load_5' => round((float)$load[1], 2),
+            'cpu_load_15' => round((float)$load[2], 2),
+            'disk_total_kb' => $disk['total_kb'],
+            'disk_used_kb' => $disk['used_kb'],
+            'disk_free_kb' => $disk['free_kb'],
+            'mem_total_mb' => $mem['total_mb'],
+            'mem_used_mb' => $mem['used_mb'],
+            'mem_percent' => $mem['total_mb'] > 0 ? round($mem['used_mb'] / $mem['total_mb'] * 100, 1) : 0,
+        ], $battery['remaining']['seconds'] ?? null);
+        $history = array_slice($history, -(int)setting_value('battery.history_sync_limit'));
+    } else {
+        $history = sensor_history(240);
+        $battery['remaining'] = [
+            'display' => 'UPS 제거됨',
+            'seconds' => null,
+            'source' => 'battery_removed',
+        ];
+    }

    $processes = process_resource_data((int)setting_value('display.process_limit'));
    $fanSpike = fan_spike_analysis($history, $fan, $system, $processes);
@@ -1444,10 +1444,14 @@
        setText(els.statusThrottlingLast, throttling.last_detected_at || '-');
        setText(els.statusThrottlingDuration, eventDurationText(throttling));
        setText(els.statusThrottlingRecent, eventRecentText(throttling));
-        setText(els.statusBatteryVoltage, battery.voltage === null || battery.voltage === undefined ? '-' : `${Number(battery.voltage).toFixed(3)} V`);
-        setText(els.statusBatterySoc, battery.percent === null || battery.percent === undefined ? '-' : `${Number(battery.percent).toFixed(2)}%`);
-        setText(els.statusBatteryRemaining, battery.remaining?.display || '-');
+        if (els.statusBatteryVoltage) {
+            setText(els.statusBatteryVoltage, battery.voltage === null || battery.voltage === undefined ? '-' : `${Number(battery.voltage).toFixed(3)} V`);
+        }
+        if (els.statusBatterySoc) {
+            setText(els.statusBatterySoc, battery.percent === null || battery.percent === undefined ? '-' : `${Number(battery.percent).toFixed(2)}%`);
+        }
        if (els.statusBatteryRemaining) {
+            setText(els.statusBatteryRemaining, battery.remaining?.display || '-');
            els.statusBatteryRemaining.removeAttribute('title');
            updateBatteryTooltip(batteryRemainingTitle(battery.remaining));
        }
@@ -1952,9 +1956,15 @@
        chart('fanRpmChart', 'RPM', rows, 'fan_rpm', '#3b82f6', ' RPM', dynamicScale(rows, 'fan_rpm', { minSpan: 1000, padding: 400 }));
        chart('fanEfficiencyChart', 'FANEFF', rows, 'fan_efficiency', '#84cc16', '', dynamicScale(rows, 'fan_efficiency', { minSpan: 20, ceiling: 100 }));
        chart('cpuWattChart', 'CPUW', rows, 'cpu_watts', '#a855f7', 'W', dynamicScale(rows, 'cpu_watts', { minSpan: 1, padding: 0.4 }, cpuWattSmoothing), { transform: cpuWattSmoothing });
-        chart('batterySocChart', 'BATTERYSOC', rows, 'battery_percent', '#f59e0b', '%', dynamicScale(rows, 'battery_percent', { minSpan: 10, ceiling: 110 }));
-        chart('remainingChart', 'REMAINING', rows, 'battery_remaining_seconds', '#06b6d4', 's', dynamicScale(rows, 'battery_remaining_seconds', { minSpan: 1800, padding: 600 }), { tooltipFormat: formatDurationSeconds });
-        chart('batteryVoltageChart', 'BATTERYV', rows, 'battery_voltage', '#14b8a6', 'V', dynamicScale(rows, 'battery_voltage', { minSpan: 0.2, padding: 0.06 }));
+        if (document.getElementById('batterySocChart')) {
+            chart('batterySocChart', 'BATTERYSOC', rows, 'battery_percent', '#f59e0b', '%', dynamicScale(rows, 'battery_percent', { minSpan: 10, ceiling: 110 }));
+        }
+        if (document.getElementById('remainingChart')) {
+            chart('remainingChart', 'REMAINING', rows, 'battery_remaining_seconds', '#06b6d4', 's', dynamicScale(rows, 'battery_remaining_seconds', { minSpan: 1800, padding: 600 }), { tooltipFormat: formatDurationSeconds });
+        }
+        if (document.getElementById('batteryVoltageChart')) {
+            chart('batteryVoltageChart', 'BATTERYV', rows, 'battery_voltage', '#14b8a6', 'V', dynamicScale(rows, 'battery_voltage', { minSpan: 0.2, padding: 0.06 }));
+        }
    }

    function resizeChartsSoon() {
@@ -222,9 +222,6 @@ html[data-theme="light"] .details-panel{background:#edf3fa;border-color:#b8c7da}
                    <div class="status-row"><div class="status-key" data-i18n="throttlingLast">Last Throttling</div><div class="status-value" id="statusThrottlingLast">-</div></div>
                    <div class="status-row"><div class="status-key" data-i18n="throttlingDuration">Throttle Duration</div><div class="status-value" id="statusThrottlingDuration">-</div></div>
                    <div class="status-row"><div class="status-key" data-i18n="throttlingRecent">Throttle 10m</div><div class="status-value" id="statusThrottlingRecent">-</div></div>
-                    <div class="status-row"><div class="status-key" data-i18n="batteryV">Battery V</div><div class="status-value" id="statusBatteryVoltage">-</div></div>
-                    <div class="status-row"><div class="status-key" data-i18n="batterySoc">Battery SOC</div><div class="status-value" id="statusBatterySoc">-</div></div>
-                    <div class="status-row"><div class="status-key" data-i18n="remaining">Remaining</div><div class="status-value interactive" id="statusBatteryRemaining" tabindex="0" aria-describedby="batteryRuntimeTooltip">-</div></div>
                </div>
            </div>

@@ -236,8 +233,6 @@ html[data-theme="light"] .details-panel{background:#edf3fa;border-color:#b8c7da}
                <div class="chart-grid">
                    <div class="chart-box"><h3 data-i18n="temperature">Temperature</h3><div class="chart-canvas"><canvas id="tempChart"></canvas></div></div>
                    <div class="chart-box"><h3 data-i18n="fanRpm">Fan RPM</h3><div class="chart-canvas"><canvas id="fanRpmChart"></canvas></div></div>
-                    <div class="chart-box"><h3 data-i18n="batterySoc">Battery SOC</h3><div class="chart-canvas"><canvas id="batterySocChart"></canvas></div></div>
-                    <div class="chart-box"><h3 data-i18n="batteryVoltage">Battery Voltage</h3><div class="chart-canvas"><canvas id="batteryVoltageChart"></canvas></div></div>
                </div>
                <details class="details-panel" id="secondaryChartDetails">
                    <summary data-i18n="detailCharts">Detail Charts</summary>
@@ -246,7 +241,6 @@ html[data-theme="light"] .details-panel{background:#edf3fa;border-color:#b8c7da}
                            <div class="chart-box"><h3 data-i18n="rp1Temp">RP1 Temp</h3><div class="chart-canvas"><canvas id="rp1TempChart"></canvas></div></div>
                            <div class="chart-box"><h3 data-i18n="fanEfficiency">Fan Efficiency</h3><div class="chart-canvas"><canvas id="fanEfficiencyChart"></canvas></div></div>
                            <div class="chart-box"><h3 data-i18n="cpuWatt">CPU Watt</h3><div class="chart-canvas"><canvas id="cpuWattChart"></canvas></div></div>
-                            <div class="chart-box"><h3 data-i18n="remaining">Remaining</h3><div class="chart-canvas"><canvas id="remainingChart"></canvas></div></div>
                        </div>
                    </div>
                </details>