mirror of
https://github.com/riptidewave93/UNVR-NAS.git
synced 2025-03-09 15:40:13 +00:00
fix: improvements across the board
* Update README.md, make sure the disclaimer is seen before install instructions. * update ustorage to have temp readings on some samsung ssds (stupid samsung) * Patch and support ulcmd relying on output from ubnteeprom * Move away from ubnthal FINALLY now that we patched ulcmd (hacky but works!) * added README.md to ubnteeprom, since I expect at somepoint folks will fork/use it for other projects. * Added our own kernel module to force mtd's RO, which does a better job than ubnthal did :)
This commit is contained in:
parent
7858593f11
commit
116b6591a9
11 changed files with 173 additions and 18 deletions
|
@ -125,12 +125,22 @@ class UNVRDiskInfo:
|
|||
|
||||
def __parse_disk_temp(self):
|
||||
try:
|
||||
return int(
|
||||
self.__parse_smartctl(
|
||||
self.__smartctl_output,
|
||||
r"^194 [\w-]+\s+0x\d+\s+\d+\s+\d+\s+\d+\s+[\w-]+\s+\w+\s+\S+\s+(\d+)(?:\s[\(][^)]*[\)])?$",
|
||||
try:
|
||||
# First try the expected 194
|
||||
return int(
|
||||
self.__parse_smartctl(
|
||||
self.__smartctl_output,
|
||||
r"^194 [\w-]+\s+0x\d+\s+\d+\s+\d+\s+\d+\s+[\w-]+\s+\w+\s+\S+\s+(\d+)(?:\s[\(][^)]*[\)])?$",
|
||||
)
|
||||
)
|
||||
except:
|
||||
# Some other SSDs (cough, samsung) use 190 for airflow temp -_-
|
||||
return int(
|
||||
self.__parse_smartctl(
|
||||
self.__smartctl_output,
|
||||
r"^190 [\w-]+\s+0x\d+\s+\d+\s+\d+\s+\d+\s+[\w-]+\s+\w+\s+\S+\s+(\d+)(?:\s[\(][^)]*[\)])?$",
|
||||
)
|
||||
)
|
||||
)
|
||||
except:
|
||||
return None
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue