moving imports trough die gegend
This commit is contained in:
@@ -505,9 +505,6 @@ use widestring::U16CString;
|
|||||||
use winapi::shared::wtypes::VT_I4;
|
use winapi::shared::wtypes::VT_I4;
|
||||||
use winapi::um::oaidl::VARIANT;
|
use winapi::um::oaidl::VARIANT;
|
||||||
use winapi::um::{combaseapi, wbemcli};
|
use winapi::um::{combaseapi, wbemcli};
|
||||||
|
|
||||||
#[cfg(target_os = "windows")]
|
|
||||||
|
|
||||||
fn get_cpu_temp_wmi() -> Option<f32> {
|
fn get_cpu_temp_wmi() -> Option<f32> {
|
||||||
init_runtime().ok()?;
|
init_runtime().ok()?;
|
||||||
|
|
||||||
@@ -559,7 +556,6 @@ fn get_cpu_temp_wmi() -> Option<f32> {
|
|||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut temp_celsius = None;
|
|
||||||
loop {
|
loop {
|
||||||
let mut obj: *mut wbemcli::IWbemClassObject = std::ptr::null_mut();
|
let mut obj: *mut wbemcli::IWbemClassObject = std::ptr::null_mut();
|
||||||
let mut returned = 0;
|
let mut returned = 0;
|
||||||
@@ -591,7 +587,7 @@ fn get_cpu_temp_wmi() -> Option<f32> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
temp_celsius
|
None
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -599,7 +595,7 @@ fn get_cpu_temp_wmi() -> Option<f32> {
|
|||||||
fn get_cpu_temp_ohm() -> Option<f32> {
|
fn get_cpu_temp_ohm() -> Option<f32> {
|
||||||
// Open Hardware Monitor HTTP API fallback
|
// Open Hardware Monitor HTTP API fallback
|
||||||
let output = Command::new("curl")
|
let output = Command::new("curl")
|
||||||
.args(&["-s", "http://localhost:8085/data.json"])
|
.args(&["-s", "http://localhost:5000/data.json"])
|
||||||
.output()
|
.output()
|
||||||
.ok()?;
|
.ok()?;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user