summaryrefslogtreecommitdiffstats
path: root/src/app/data_harvester/temperature
diff options
context:
space:
mode:
Diffstat (limited to 'src/app/data_harvester/temperature')
-rw-r--r--src/app/data_harvester/temperature/linux.rs18
-rw-r--r--src/app/data_harvester/temperature/nvidia.rs40
-rw-r--r--src/app/data_harvester/temperature/sysinfo.rs5
3 files changed, 1 insertions, 62 deletions
diff --git a/src/app/data_harvester/temperature/linux.rs b/src/app/data_harvester/temperature/linux.rs
index 72ca9eef..5b6fbbb0 100644
--- a/src/app/data_harvester/temperature/linux.rs
+++ b/src/app/data_harvester/temperature/linux.rs
@@ -9,10 +9,7 @@ use anyhow::Result;
use hashbrown::{HashMap, HashSet};
use super::{is_temp_filtered, TempHarvest, TemperatureType};
-use crate::app::{
- data_harvester::temperature::{convert_celsius_to_fahrenheit, convert_celsius_to_kelvin},
- Filter,
-};
+use crate::app::{data_harvester::temperature::convert_temp_unit, Filter};
const EMPTY_NAME: &str = "Unknown";
@@ -31,14 +28,6 @@ fn read_temp(path: &Path) -> Result<f32> {
/ 1_000.0)
}
-fn convert_temp_unit(temp: f32, temp_type: &TemperatureType) -> f32 {
- match temp_type {
- TemperatureType::Celsius => temp,
- TemperatureType::Kelvin => convert_celsius_to_kelvin(temp),
- TemperatureType::Fahrenheit => convert_celsius_to_fahrenheit(temp),
- }
-}
-
/// Get all candidates from hwmon and coretemp. It will also return the number of entries from hwmon.
fn get_hwmon_candidates() -> (HashSet<PathBuf>, usize) {
let mut dirs = HashSet::default();
@@ -359,11 +348,6 @@ pub fn get_temperature_data(
add_thermal_zone_temperatures(&mut results.temperatures, temp_type, filter);
}
- #[cfg(feature = "nvidia")]
- {
- super::nvidia::add_nvidia_data(&mut results.temperatures, temp_type, filter)?;
- }
-
Ok(Some(results.temperatures))
}
diff --git a/src/app/data_harvester/temperature/nvidia.rs b/src/app/data_harvester/temperature/nvidia.rs
deleted file mode 100644
index 00368157..00000000
--- a/src/app/data_harvester/temperature/nvidia.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use nvml_wrapper::enum_wrappers::device::TemperatureSensor;
-
-use super::{
- convert_celsius_to_fahrenheit, convert_celsius_to_kelvin, is_temp_filtered, TempHarvest,
- TemperatureType,
-};
-use crate::app::Filter;
-use crate::data_harvester::nvidia::NVML_DATA;
-use crate::utils::error;
-
-pub fn add_nvidia_data(
- temperature_vec: &mut Vec<TempHarvest>, temp_type: &TemperatureType, filter: &Option<Filter>,
-) -> error::Result<()> {
- if let Ok(nvml) = &*NVML_DATA {
- if let Ok(gpu_num) = nvml.device_count() {
- for i in 0..gpu_num {
- if let Ok(device) = nvml.device_by_index(i) {
- if let (Ok(name), Ok(temperature)) =
- (device.name(), device.temperature(TemperatureSensor::Gpu))
- {
- if is_temp_filtered(filter, &name) {
- let temperature = temperature as f32;
- let temperature = match temp_type {
- TemperatureType::Celsius => temperature,
- TemperatureType::Kelvin => convert_celsius_to_kelvin(temperature),
- TemperatureType::Fahrenheit => {
- convert_celsius_to_fahrenheit(temperature)
- }
- };
-
- temperature_vec.push(TempHarvest { name, temperature });
- }
- }
- }
- }
- }
- }
-
- Ok(())
-}
diff --git a/src/app/data_harvester/temperature/sysinfo.rs b/src/app/data_harvester/temperature/sysinfo.rs
index d72901aa..908ff736 100644
--- a/src/app/data_harvester/temperature/sysinfo.rs
+++ b/src/app/data_harvester/temperature/sysinfo.rs
@@ -33,11 +33,6 @@ pub fn get_temperature_data(
}
}
- #[cfg(feature = "nvidia")]
- {
- super::nvidia::add_nvidia_data(&mut temperature_vec, temp_type, filter)?;
- }
-
// For RockPro64 boards on FreeBSD, they apparently use "hw.temperature" for sensors.
#[cfg(target_os = "freebsd")]
{