From 95c3126773d0d73103fbddc3b3f13fe28f856df5 Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
Date: Sat, 30 Jul 2022 06:26:27 +0800
Subject: [PATCH] Revert "Update 10_system.js"

This reverts commit dbcc6ca09d45d82cb68392a6a76df1e4997be888.
---
 files/generic/10_system.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/files/generic/10_system.js b/files/generic/10_system.js
index c83f186..aa1bc64 100644
--- a/files/generic/10_system.js
+++ b/files/generic/10_system.js
@@ -23,6 +23,11 @@ var callCPUInfo = rpc.declare({
 	method: 'getCPUInfo'
 });
 
+var callCPUUsage = rpc.declare({
+	object: 'luci',
+	method: 'getCPUUsage'
+});
+
 var callTempInfo = rpc.declare({
 	object: 'luci',
 	method: 'getTempInfo'
@@ -37,6 +42,7 @@ return baseclass.extend({
 			L.resolveDefault(callSystemInfo(), {}),
 			L.resolveDefault(callCPUBench(), {}),
 			L.resolveDefault(callCPUInfo(), {}),
+			L.resolveDefault(callCPUUsage(), {}),
 			L.resolveDefault(callTempInfo(), {}),
 			fs.lines('/usr/lib/lua/luci/version.lua')
 		]);
@@ -47,8 +53,9 @@ return baseclass.extend({
 		    systeminfo  = data[1],
 		    cpubench    = data[2],
 		    cpuinfo     = data[3],
-		    tempinfo    = data[4],
-		    luciversion = data[5];
+		    cpuusage    = data[4],
+		    tempinfo    = data[5],
+		    luciversion = data[6];
 
 		luciversion = luciversion.filter(function(l) {
 			return l.match(/^\s*(luciname|luciversion)\s*=/);
@@ -84,7 +91,8 @@ return baseclass.extend({
 				systeminfo.load[0] / 65535.0,
 				systeminfo.load[1] / 65535.0,
 				systeminfo.load[2] / 65535.0
-			) : null
+			) : null,
+			_('CPU usage'),    cpuusage.cpuusage
 		];
 
 		if (tempinfo.tempinfo) {