bugfix: fix profile fan modes and creating

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+# [3.6.1] - 2021-05-25
+### Changed
+- Bugfix: write correct fan modes for profiles
+- Bugfix: apply created profiles
+
 # [3.6.1] - 2021-05-25
 ### Changed
 - Bugfix for cycling through profiles

Cargo.lock

@@ -207,7 +207,7 @@ dependencies = [
 
 [[package]]
 name = "daemon"
-version = "3.6.1"
+version = "3.6.2"
 dependencies = [
  "env_logger",
  "log",

asusctl/src/main.rs

@@ -473,8 +473,8 @@ fn handle_profile(
     }
     if cmd.profiles_data {
         println!("Profiles:");
-        for s in dbus.proxies().profile().all_profile_data()?.lines() {
+        for s in dbus.proxies().profile().all_profile_data()? {
-            println!("{}", s);
+            println!("{:?}", s);
         }
     }
 

daemon/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "daemon"
-version = "3.6.1"
+version = "3.6.2"
 license = "MPL-2.0"
 readme = "README.md"
 authors = ["Luke <luke@ljones.dev>"]

daemon/src/ctrl_profiles/controller.rs

@@ -69,12 +69,12 @@ impl CtrlFanAndCpu {
     }
 
     pub(super) fn set_active(&mut self, profile: &str) -> Result<(), RogError> {
-        if let Ok(mut cfg) = self.config.clone().try_lock() {
+        if let Ok(mut config) = self.config.clone().try_lock() {
-            cfg.read();
+            config.read();
-            if let Some(existing) = cfg.power_profiles.get(profile) {
+            if let Some(existing) = config.power_profiles.get(profile) {
                 existing.set_system_all()?;
-                cfg.active_profile = existing.name.clone();
+                config.active_profile = existing.name.clone();
-                cfg.write();
+                config.write();
                 info!("Profile was changed to: {}", profile);
             }
         }
@@ -82,18 +82,20 @@ impl CtrlFanAndCpu {
     }
 
     pub(super) fn new_or_modify(&mut self, profile: &Profile) -> Result<(), RogError> {
-        if let Ok(mut cfg) = self.config.clone().try_lock() {
+        if let Ok(mut config) = self.config.clone().try_lock() {
-            cfg.read();
+            config.read();
 
-            if let Some(existing) = cfg.power_profiles.get_mut(&profile.name) {
+            if let Some(existing) = config.power_profiles.get_mut(&profile.name) {
                 *existing = profile.clone();
                 existing.set_system_all()?;
             } else {
-                cfg.power_profiles
+                config.power_profiles
                     .insert(profile.name.clone(), profile.clone());
+                profile.set_system_all()?;
             }
-            cfg.active_profile = profile.name.clone();
+            
-            cfg.write();
+            config.active_profile = profile.name.clone();
+            config.write();
         }
         Ok(())
     }

rog-dbus/src/zbus_profile.rs

@@ -39,7 +39,7 @@ trait Daemon {
     fn active_data(&self) -> zbus::Result<Profile>;
 
     /// Profiles method
-    fn profiles(&self) -> zbus::Result<String>;
+    fn profiles(&self) -> zbus::Result<Vec<Profile>>;
 
     /// ProfileNames method
     fn profile_names(&self) -> zbus::Result<Vec<String>>;
@@ -78,7 +78,7 @@ impl<'a> ProfileProxy<'a> {
     }
 
     #[inline]
-    pub fn all_profile_data(&self) -> Result<String> {
+    pub fn all_profile_data(&self) -> Result<Vec<Profile>> {
         self.0.profiles()
     }
 

rog-profiles/src/profiles.rs

@@ -112,7 +112,7 @@ impl Profile {
 
     pub fn set_system_all(&self) -> Result<(), ProfileError> {
         self.set_system_pstate()?;
-        if !self.fan_curve.is_empty() {
+        if self.fan_curve.is_empty() {
             self.set_system_fan_mode()?;
         } else {
             self.set_system_fan_curve()?;