Minor update to AK400 PRO, new release

Nortank12 · Dec 20, 2024 · f87d931 · f87d931
1 parent 7e9a5d2
commit f87d931
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 20 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deepcool-digital-linux"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2021"
 
 [dependencies]

diff --git a/README.md b/README.md
@@ -8,7 +8,6 @@
     - [Systemd](#systemd-arch-debian-ubuntu-fedora-etc)
     - [OpenRC](#openrc-gentoo-artix-linux-etc)
 - [Device List](#more-information)
-- [Contributions](#contributions)
 
 # About
 This program is meant to replicate the functionality of the original `DeepCool Digital`
@@ -107,7 +106,7 @@ sudo nixos-rebuild switch
     </tr>
     <tr>
         <td>AK400 DIGITAL PRO</td>
-        <td align="center">❓</td>
+        <td align="center">✅</td>
     </tr>
     <tr>
         <td>AK500 DIGITAL</td>
@@ -293,6 +292,3 @@ sudo rc-update add deepcool-digital default
 
 # More Information
 [Device List and USB Mapping Tables](device-list)
-
-# Contributions
-LD Series: [asdfzdfj](https://github.com/asdfzdfj) / [deepcool-ld-digital-hidapi](https://github.com/asdfzdfj/deepcool-ld-digital-hidapi)
diff --git a/device-list/README.md b/device-list/README.md
@@ -88,7 +88,7 @@
     </tr>
     <tr>
         <td>16</td>
-        <td>AK400 PRO</td>
+        <td>AK400 DIGITAL PRO</td>
         <td align="center">
             <a href="tables/ak400-pro.md">Mapping Table</a>
         </td>

diff --git a/src/devices/ak400_pro.rs b/src/devices/ak400_pro.rs
@@ -6,10 +6,10 @@ use std::{process::exit, thread::sleep, time::Duration};
 pub const DEFAULT_MODE: Mode = Mode::Auto;
 pub const POLLING_RATE: u64 = 750;
 // The temperature limits are hard-coded in the device
-// pub const TEMP_WARM_C: u8 = 80;
-// pub const TEMP_WARM_F: u8 = 176;
-pub const TEMP_HOT_C: u8 = 90;
-pub const TEMP_HOT_F: u8 = 194;
+pub const TEMP_WARNING_C: u8 = 80;
+pub const TEMP_WARNING_F: u8 = 176;
+pub const TEMP_LIMIT_C: u8 = 90;
+pub const TEMP_LIMIT_F: u8 = 194;
 
 
 pub struct Display {

diff --git a/src/main.rs b/src/main.rs
@@ -62,6 +62,7 @@ fn main() {
                     } else {
                         ak_series::TEMP_LIMIT_C
                     },
+                    temp_warning: 0,
                 },
                 ak_series::POLLING_RATE,
             );
@@ -84,6 +85,7 @@ fn main() {
                     } else {
                         ls_series::TEMP_LIMIT_C
                     },
+                    temp_warning: 0,
                 },
                 ls_series::POLLING_RATE,
             );
@@ -102,6 +104,7 @@ fn main() {
                 Alarm {
                     state: if args.alarm { AlarmState::On } else { AlarmState::Off },
                     temp_limit: ag_series::TEMP_LIMIT_C,
+                    temp_warning: 0,
                 },
                 ag_series::POLLING_RATE,
             );
@@ -127,6 +130,7 @@ fn main() {
                     } else {
                         ld_series::TEMP_LIMIT_C
                     },
+                    temp_warning: 0,
                 },
                 ld_series::POLLING_RATE,
             );
@@ -151,9 +155,14 @@ fn main() {
                     Alarm {
                         state: AlarmState::Auto,
                         temp_limit: if args.fahrenheit {
-                            ak400_pro::TEMP_HOT_F
+                            ak400_pro::TEMP_LIMIT_F
                         } else {
-                            ak400_pro::TEMP_HOT_C
+                            ak400_pro::TEMP_LIMIT_C
+                        },
+                        temp_warning: if args.fahrenheit {
+                            ak400_pro::TEMP_WARNING_F
+                        } else {
+                            ak400_pro::TEMP_WARNING_C
                         },
                     },
                     ak400_pro::POLLING_RATE,
@@ -176,7 +185,7 @@ fn main() {
             print_device_status(
                 if args.mode == Mode::Default { ch_series::DEFAULT_MODE } else { args.mode },
                 if args.fahrenheit { TemperatureUnit::Fahrenheit } else { TemperatureUnit::Celsius },
-                Alarm { state: AlarmState::NotSupported, temp_limit: 0 },
+                Alarm { state: AlarmState::NotSupported, temp_limit: 0, temp_warning: 0 },
                 ch_series::POLLING_RATE,
             );
             if args.alarm {
@@ -194,7 +203,7 @@ fn main() {
             print_device_status(
                 if args.mode == Mode::Default { ch510::DEFAULT_MODE } else { args.mode },
                 if args.fahrenheit { TemperatureUnit::Fahrenheit } else { TemperatureUnit::Celsius },
-                Alarm { state: AlarmState::NotSupported, temp_limit: 0 },
+                Alarm { state: AlarmState::NotSupported, temp_limit: 0, temp_warning: 0 },
                 ch510::POLLING_RATE,
             );
             if args.alarm {

diff --git a/src/utils/status.rs b/src/utils/status.rs
@@ -25,18 +25,30 @@ pub enum AlarmState {
 pub struct Alarm {
     pub state: AlarmState,
     pub temp_limit: u8,
+    pub temp_warning: u8,
 }
 
 pub fn print_device_status(mode: Mode, temp_unit: TemperatureUnit, alarm: Alarm, polling_rate: u64) {
     println!("-----");
     println!("DISP. MODE: {}", mode.symbol().bright_cyan());
     println!("TEMP. UNIT: {}", temp_unit.symbol().bright_cyan());
     match alarm.state {
-        AlarmState::Auto => println!(
-            "ALARM:      {} | {}",
-            "auto".bright_green(),
-            (alarm.temp_limit.to_string() + temp_unit.symbol()).bright_cyan()
-        ),
+        AlarmState::Auto => {
+            if alarm.temp_warning > 0 {
+                println!(
+                    "ALARM:      {} | {} [warning: {}]",
+                    "auto".bright_green(),
+                    (alarm.temp_limit.to_string() + temp_unit.symbol()).bright_cyan(),
+                    (alarm.temp_warning.to_string() + temp_unit.symbol()).bright_cyan()
+                );
+            } else {
+                println!(
+                    "ALARM:      {} | {}",
+                    "auto".bright_green(),
+                    (alarm.temp_limit.to_string() + temp_unit.symbol()).bright_cyan()
+                );
+            }
+        }
         AlarmState::On => println!(
             "ALARM:      {} | {}",
             "on".bright_green(),