Skip to content

Commit 74fa90f

Browse files
mathoudebinemathoudebine
authored
Merge pull request #540 from mathoudebine/fix/disable-unused-hardware-monitoring
2 parents 6ccb06f + 99eac93 commit 74fa90f

File tree

5 files changed

+48
-33
lines changed

5 files changed

+48
-33
lines changed

‎library/scheduler.py‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ def wrap(
6969
**kwargs
7070
):
7171
""" Wrapper to create our schedule and run it at the appropriate time """
72+
if interval == 0:
73+
return
7274
scheduler = sched.scheduler(time.time, time.sleep)
7375
periodic(scheduler, interval, func)
7476
scheduler.run()
@@ -79,83 +81,83 @@ def wrap(
7981

8082

8183
@async_job("CPU_Percentage")
82-
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['CPU']['PERCENTAGE'].get("INTERVAL", None)).total_seconds())
84+
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['CPU']['PERCENTAGE'].get("INTERVAL", 0)).total_seconds())
8385
def CPUPercentage():
8486
""" Refresh the CPU Percentage """
8587
# logger.debug("Refresh CPU Percentage")
8688
stats.CPU.percentage()
8789

8890

8991
@async_job("CPU_Frequency")
90-
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['CPU']['FREQUENCY'].get("INTERVAL", None)).total_seconds())
92+
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['CPU']['FREQUENCY'].get("INTERVAL", 0)).total_seconds())
9193
def CPUFrequency():
9294
""" Refresh the CPU Frequency """
9395
# logger.debug("Refresh CPU Frequency")
9496
stats.CPU.frequency()
9597

9698

9799
@async_job("CPU_Load")
98-
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['CPU']['LOAD'].get("INTERVAL", None)).total_seconds())
100+
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['CPU']['LOAD'].get("INTERVAL", 0)).total_seconds())
99101
def CPULoad():
100102
""" Refresh the CPU Load """
101103
# logger.debug("Refresh CPU Load")
102104
stats.CPU.load()
103105

104106

105107
@async_job("CPU_Load")
106-
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['CPU']['TEMPERATURE'].get("INTERVAL", None)).total_seconds())
108+
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['CPU']['TEMPERATURE'].get("INTERVAL", 0)).total_seconds())
107109
def CPUTemperature():
108110
""" Refresh the CPU Temperature """
109111
# logger.debug("Refresh CPU Temperature")
110112
stats.CPU.temperature()
111113

112114

113115
@async_job("CPU_FanSpeed")
114-
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['CPU']['FAN_SPEED'].get("INTERVAL", None)).total_seconds())
116+
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['CPU']['FAN_SPEED'].get("INTERVAL", 0)).total_seconds())
115117
def CPUFanSpeed():
116118
""" Refresh the CPU Fan Speed """
117119
# logger.debug("Refresh CPU Fan Speed")
118120
stats.CPU.fan_speed()
119121

120122

121123
@async_job("GPU_Stats")
122-
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['GPU'].get("INTERVAL", None)).total_seconds())
124+
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['GPU'].get("INTERVAL", 0)).total_seconds())
123125
def GpuStats():
124126
""" Refresh the GPU Stats """
125127
# logger.debug("Refresh GPU Stats")
126128
stats.Gpu.stats()
127129

128130

129131
@async_job("Memory_Stats")
130-
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['MEMORY'].get("INTERVAL", None)).total_seconds())
132+
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['MEMORY'].get("INTERVAL", 0)).total_seconds())
131133
def MemoryStats():
132134
# logger.debug("Refresh memory stats")
133135
stats.Memory.stats()
134136

135137

136138
@async_job("Disk_Stats")
137-
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['DISK'].get("INTERVAL", None)).total_seconds())
139+
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['DISK'].get("INTERVAL", 0)).total_seconds())
138140
def DiskStats():
139141
# logger.debug("Refresh disk stats")
140142
stats.Disk.stats()
141143

142144

143145
@async_job("Net_Stats")
144-
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['NET'].get("INTERVAL", None)).total_seconds())
146+
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['NET'].get("INTERVAL", 0)).total_seconds())
145147
def NetStats():
146148
# logger.debug("Refresh net stats")
147149
stats.Net.stats()
148150

149151

150152
@async_job("Date_Stats")
151-
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['DATE'].get("INTERVAL", None)).total_seconds())
153+
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['DATE'].get("INTERVAL", 0)).total_seconds())
152154
def DateStats():
153155
# logger.debug("Refresh date stats")
154156
stats.Date.stats()
155157

156158

157159
@async_job("Custom_Stats")
158-
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['CUSTOM'].get("INTERVAL", None)).total_seconds())
160+
@schedule(timedelta(seconds=config.THEME_DATA['STATS']['CUSTOM'].get("INTERVAL", 0)).total_seconds())
159161
def CustomStats():
160162
# print("Refresh custom stats")
161163
stats.Custom.stats()

‎res/themes/Cyberdeck/theme.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ STATS:
5757
# BACKGROUND_COLOR: 132, 154, 165
5858
BACKGROUND_IMAGE: background.png
5959
FAN_SPEED:
60+
INTERVAL: 5
6061
RADIAL:
6162
SHOW: True
6263
X: 170

‎res/themes/default.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
STATS:
44
CPU:
55
PERCENTAGE:
6-
INTERVAL: 100
6+
INTERVAL: 0
77
TEXT:
88
SHOW: False
99
GRAPH:
@@ -13,7 +13,7 @@ STATS:
1313
LINE_GRAPH:
1414
SHOW: False
1515
FREQUENCY:
16-
INTERVAL: 100
16+
INTERVAL: 0
1717
TEXT:
1818
SHOW: False
1919
GRAPH:
@@ -23,7 +23,7 @@ STATS:
2323
LINE_GRAPH:
2424
SHOW: False
2525
LOAD:
26-
INTERVAL: 100
26+
INTERVAL: 0
2727
ONE:
2828
TEXT:
2929
SHOW: False
@@ -34,7 +34,7 @@ STATS:
3434
TEXT:
3535
SHOW: False
3636
TEMPERATURE:
37-
INTERVAL: 100
37+
INTERVAL: 0
3838
TEXT:
3939
SHOW: False
4040
GRAPH:
@@ -44,7 +44,7 @@ STATS:
4444
LINE_GRAPH:
4545
SHOW: False
4646
FAN_SPEED:
47-
INTERVAL: 100
47+
INTERVAL: 0
4848
TEXT:
4949
SHOW: False
5050
GRAPH:
@@ -54,7 +54,7 @@ STATS:
5454
LINE_GRAPH:
5555
SHOW: False
5656
GPU:
57-
INTERVAL: 100
57+
INTERVAL: 0
5858
PERCENTAGE:
5959
GRAPH:
6060
SHOW: False
@@ -120,7 +120,7 @@ STATS:
120120
LINE_GRAPH:
121121
SHOW: False
122122
MEMORY:
123-
INTERVAL: 100
123+
INTERVAL: 0
124124
SWAP:
125125
GRAPH:
126126
SHOW: False
@@ -144,7 +144,7 @@ STATS:
144144
PERCENT_TEXT:
145145
SHOW: False
146146
DISK:
147-
INTERVAL: 100
147+
INTERVAL: 0
148148
USED:
149149
GRAPH:
150150
SHOW: False
@@ -163,7 +163,7 @@ STATS:
163163
TEXT:
164164
SHOW: False
165165
NET:
166-
INTERVAL: 100
166+
INTERVAL: 0
167167
WLO:
168168
UPLOAD:
169169
TEXT:
@@ -199,12 +199,12 @@ STATS:
199199
TEXT:
200200
SHOW: False
201201
DATE:
202-
INTERVAL: 100
202+
INTERVAL: 0
203203
DAY:
204204
TEXT:
205205
SHOW: False
206206
HOUR:
207207
TEXT:
208208
SHOW: False
209209
CUSTOM:
210-
INTERVAL: 100
210+
INTERVAL: 0

‎res/themes/theme_example.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,7 @@ STATS:
423423
# In seconds. Longer intervals cause this to refresh more slowly.
424424
# Setting to lower values will display near real time data,
425425
# but may cause significant CPU usage or the display not to update properly
426+
# Note: refresh interval is common to all GPU sensors
426427
INTERVAL: 1
427428
PERCENTAGE:
428429
GRAPH:

‎theme-editor.py‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,28 @@ def refresh_theme():
101101

102102
# Display all data on screen once
103103
import library.stats as stats
104-
stats.CPU.percentage()
105-
stats.CPU.frequency()
106-
stats.CPU.load()
107-
stats.CPU.temperature()
108-
stats.CPU.fan_speed()
109-
stats.Gpu.stats()
110-
stats.Memory.stats()
111-
stats.Disk.stats()
112-
stats.Net.stats()
113-
stats.Date.stats()
114-
stats.Custom.stats()
104+
if config.THEME_DATA['STATS']['CPU']['PERCENTAGE'].get("INTERVAL", 0) > 0:
105+
stats.CPU.percentage()
106+
if config.THEME_DATA['STATS']['CPU']['FREQUENCY'].get("INTERVAL", 0) > 0:
107+
stats.CPU.frequency()
108+
if config.THEME_DATA['STATS']['CPU']['LOAD'].get("INTERVAL", 0) > 0:
109+
stats.CPU.load()
110+
if config.THEME_DATA['STATS']['CPU']['TEMPERATURE'].get("INTERVAL", 0) > 0:
111+
stats.CPU.temperature()
112+
if config.THEME_DATA['STATS']['CPU']['FAN_SPEED'].get("INTERVAL", 0) > 0:
113+
stats.CPU.fan_speed()
114+
if config.THEME_DATA['STATS']['GPU'].get("INTERVAL", 0) > 0:
115+
stats.Gpu.stats()
116+
if config.THEME_DATA['STATS']['MEMORY'].get("INTERVAL", 0) > 0:
117+
stats.Memory.stats()
118+
if config.THEME_DATA['STATS']['DISK'].get("INTERVAL", 0) > 0:
119+
stats.Disk.stats()
120+
if config.THEME_DATA['STATS']['NET'].get("INTERVAL", 0) > 0:
121+
stats.Net.stats()
122+
if config.THEME_DATA['STATS']['DATE'].get("INTERVAL", 0) > 0:
123+
stats.Date.stats()
124+
if config.THEME_DATA['STATS']['CUSTOM'].get("INTERVAL", 0) > 0:
125+
stats.Custom.stats()
115126

116127

117128
if __name__ == "__main__":

0 commit comments

Comments
 (0)