Skip to content

Commit 04bb793

Browse files
committed
Merge remote-tracking branch 'Meha/master'
1 parent 5688f8e commit 04bb793

File tree

10 files changed

+8
-70
lines changed

10 files changed

+8
-70
lines changed

config/status-monitor/config.ini

-55
This file was deleted.

config/status-monitor/config.ini.template

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[status-monitor]
2-
key_combo = L+R+DRIGHT
2+
key_combo=L+R+DUP
33

44
[full]
55
refresh_rate=1
@@ -13,7 +13,7 @@ handheld_font_size=15
1313
docked_font_size=15
1414
real_freqs=true
1515
real_volts=true
16-
show=CPU+GPU+RAM+DRAW+TEMP+FAN++FPS
16+
show=CPU+GPU+RAM+DRAW+TEMP+FAN+FPS
1717
replace_MB_with_RAM_load=true
1818
background_color=#1117
1919
cat_color=#CDEF
@@ -22,16 +22,16 @@ text_color=#FFFF
2222
[micro]
2323
refresh_rate=1
2424
layer_height_align=top
25-
handheld_font_size=15
26-
docked_font_size=15
25+
handheld_font_size=17
26+
docked_font_size=17
2727
text_align=left
2828
real_freqs=true
29-
real_volts=true
30-
show=CPU+GPU+RAM+BRDB+FPSEND
29+
real_volts=false
30+
show=CPUB+GPU+RAM+BRDB+BATB+FPSE
3131
replace_GB_with_RAM_load=true
3232
background_color=#1117
33-
cat_color=#BDFF
34-
text_color=#FFFF
33+
cat_color=#CCCC
34+
text_color=#FFFD
3535

3636
[fps-counter]
3737
layer_width_align=left

source/common.hpp

-7
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)