Merge pull request #8 from wiiznokes/auroburos

Auroburos

.config/config3.toml

@@ -0,0 +1,32 @@
+[[Control]]
+name = "control1"
+input = "linear1"
+auto = false
+
+[[Linear]]
+name = "linear1"
+minTemp = 10
+minSpeed = 10
+maxTemp = 70
+maxSpeed = 100
+input = "custom_temp"
+
+[[CustomTemp]]
+name = "custom_temp"
+kind = "Average"
+input = [
+    "temp1",
+    "temp2",
+]
+
+
+
+
+
+[[Temp]]
+name = "temp1"
+id = "/intelcpu/0/temperature/1"
+
+[[Temp]]
+name = "temp2"
+id = "/intelcpu/0/temperature/2"

.config/config4.toml

@@ -0,0 +1,28 @@
+[[Control]]
+name = "control1"
+input = "linear1"
+auto = false
+
+[[Linear]]
+name = "linear1"
+minTemp = 10
+minSpeed = 10
+maxTemp = 70
+maxSpeed = 100
+input = "custom_temp"
+
+[[CustomTemp]]
+name = "custom_temp"
+kind = "Average"
+input = [
+    "temp1",
+    "temp2",
+]
+
+[[Temp]]
+name = "temp1"
+id = "coretemp-isa-0000-temp3_input"
+
+[[Temp]]
+name = "temp2"
+id = "coretemp-isa-0000-temp2_input"

.config/settings.toml

@@ -1,4 +1,4 @@
 unit = "Celsius"
 update_delay = 0
 disable_pwm_value = 0
-current_config = "config2.toml"
+current_config = "config4.toml"

.gitignore

@@ -11,4 +11,5 @@ target/
 .vscode/*
 !.vscode/launch.json
 bin/
-obj/
+obj/
+.config/hardware.toml

Makefile

@@ -18,7 +18,7 @@ fix:
 	cargo clippy --all --fix --allow-dirty --allow-staged
 	cargo fmt --all
 
-clean-git:
+git-cache:
 	git rm -rf --cached .
 	git add .
 
@@ -35,6 +35,9 @@ clean-libsensors:
 lhm:
 	dotnet build ./hardware/LibreHardwareMonitorWrapper/ -c release
 
+run-lhm:
+	dotnet run --project ./hardware/LibreHardwareMonitorWrapper/ -c release
+
 test:
 	cargo test --all --all-features
 

data/src/config/control.rs

@@ -1,6 +1,6 @@
 use std::rc::Rc;
 
-use hardware::{ControlH, Hardware, Value};
+use hardware::{ControlH, Hardware, HardwareBridgeT, Value};
 use serde::{Deserialize, Serialize};
 
 use crate::{
@@ -42,26 +42,32 @@ impl Control {
         }
     }
 
-    pub fn set_value(&mut self, value: Value) -> Result<Value, UpdateError> {
+    pub fn set_value(
+        &mut self,
+        value: Value,
+        bridge: &mut HardwareBridgeT,
+    ) -> Result<Value, UpdateError> {
         if !self.manual_has_been_set {
-            self.set_mode(false)?;
+            self.set_mode(false, bridge)?;
         }
 
         match &self.control_h {
-            Some(control_h) => control_h
-                .bridge
-                .set_value(value)
+            Some(control_h) => bridge
+                .set_value(&control_h.internal_index, value)
                 .map(|_| value)
                 .map_err(UpdateError::Hardware),
             None => Err(UpdateError::NodeIsInvalid),
         }
     }
 
-    pub fn set_mode(&mut self, auto: bool) -> Result<(), UpdateError> {
+    pub fn set_mode(
+        &mut self,
+        auto: bool,
+        bridge: &mut HardwareBridgeT,
+    ) -> Result<(), UpdateError> {
         let res = match &self.control_h {
-            Some(control_h) => control_h
-                .bridge
-                .set_mode(!auto as i32)
+            Some(control_h) => bridge
+                .set_mode(&control_h.internal_index, !auto as i32)
                 .map_err(UpdateError::Hardware),
             None => Err(UpdateError::NodeIsInvalid),
         };

data/src/config/fan.rs

@@ -1,6 +1,6 @@
 use std::rc::Rc;
 
-use hardware::{FanH, Hardware, Value};
+use hardware::{FanH, Hardware, HardwareBridgeT, Value};
 use serde::{Deserialize, Serialize};
 
 use crate::{
@@ -20,9 +20,11 @@ pub struct Fan {
 }
 
 impl Fan {
-    pub fn get_value(&self) -> Result<Value, UpdateError> {
+    pub fn get_value(&self, bridge: &mut HardwareBridgeT) -> Result<Value, UpdateError> {
         match &self.fan_h {
-            Some(fan_h) => fan_h.bridge.get_value().map_err(UpdateError::Hardware),
+            Some(fan_h) => bridge
+                .get_value(&fan_h.internal_index)
+                .map_err(UpdateError::Hardware),
             None => Err(UpdateError::NodeIsInvalid),
         }
     }

data/src/config/serde_test.rs

@@ -1,5 +1,5 @@
 use const_format::formatcp;
-use hardware::{ControlH, FanH, Hardware, HardwareItem, TempH};
+use hardware::{ControlH, FanH, Hardware, TempH};
 use serial_test::serial;
 use std::fmt::Debug;
 use std::fs::{self, File};
@@ -95,44 +95,27 @@ fn write_file<E: Debug>(path: &str, content_generation: impl Fn() -> Result<Stri
     println!("file {} succesfully writed!", path);
 }
 
-#[derive(Debug)]
-struct T {}
-
-impl HardwareItem for T {
-    fn get_value(&self) -> Result<hardware::Value, hardware::HardwareError> {
-        todo!()
-    }
-
-    fn set_value(&self, _value: hardware::Value) -> Result<(), hardware::HardwareError> {
-        todo!()
-    }
-
-    fn set_mode(&self, _value: hardware::Value) -> Result<(), hardware::HardwareError> {
-        todo!()
-    }
-}
-
 fn hardware1() -> Hardware {
     Hardware {
         controls: vec![ControlH {
             name: "ControlH".into(),
             hardware_id: "ControlH".into(),
             info: "ControlH".into(),
-            bridge: Box::new(T {}),
+            internal_index: 0,
         }
         .into()],
         temps: vec![TempH {
             name: "TempH".into(),
             hardware_id: "TempH".into(),
             info: "TempH".into(),
-            bridge: Box::new(T {}),
+            internal_index: 0,
         }
         .into()],
         fans: vec![FanH {
             name: "FanH".into(),
             hardware_id: "FanH".into(),
             info: "FanH".into(),
-            bridge: Box::new(T {}),
+            internal_index: 0,
         }
         .into()],
     }

data/src/config/temp.rs

@@ -1,6 +1,6 @@
 use std::rc::Rc;
 
-use hardware::{Hardware, TempH, Value};
+use hardware::{Hardware, HardwareBridgeT, TempH, Value};
 use serde::{Deserialize, Serialize};
 
 use crate::{
@@ -20,9 +20,11 @@ pub struct Temp {
 }
 
 impl Temp {
-    pub fn get_value(&self) -> Result<Value, UpdateError> {
+    pub fn get_value(&self, bridge: &mut HardwareBridgeT) -> Result<Value, UpdateError> {
         match &self.temp_h {
-            Some(temp_h) => temp_h.bridge.get_value().map_err(UpdateError::Hardware),
+            Some(temp_h) => bridge
+                .get_value(&temp_h.internal_index)
+                .map_err(UpdateError::Hardware),
             None => Err(UpdateError::NodeIsInvalid),
         }
     }

data/src/lib.rs

@@ -13,7 +13,7 @@ pub mod node;
 pub mod settings;
 pub mod update;
 
-use hardware::{Hardware, HardwareBridge};
+use hardware::{Hardware, HardwareBridge, HardwareBridgeT};
 use node::AppGraph;
 use update::Update;
 
@@ -25,6 +25,7 @@ pub struct AppState {
     pub dir_manager: DirManager,
     pub settings: Settings,
     pub hardware: Hardware,
+    pub bridge: HardwareBridgeT,
     pub app_graph: AppGraph,
     pub update: Update,
 }