WIP

Author: Bergmann89

protocol/SPECIFICATION

@@ -11,12 +11,7 @@
     0x0004  uint8       Flow Unit
                             0x00 Liter
                             0x02 Gallons
-    0x0005  uint8       Display Flags
-                            0x01 Rotate
-                            0x04 Invert
-                            0x08 Auto Invert
-                            0x10 Disable Device Buttons
-                            0x20 Lock Menu
+    0x0005  uint8       <constant 00>
     0x0006  uint8       Next Page Interval
                             [3..60] Interval in Seconds
                             61: Disable Automatic Page Change
@@ -48,7 +43,14 @@
                             0x01 Medium
                             0x02 Low
                             0x03 Off
-    0x0011  uint8[6]    <contant 02 BC 02 58 00 00>
+    0x0011  uint8[6]    <contant 02 BC 02 58>
+    0x0015  uint8       Display Flags
+                            0x01 Rotate
+                            0x04 Invert
+                            0x08 Auto Invert
+                            0x10 Disable Device Buttons
+                            0x20 Lock Menu
+    0x0016  uint8       <contant 00>
     0x0017  uint8       Chart 1 Source
                             0x00 Flow
                             0x01 Water Temperature
@@ -288,7 +290,7 @@
                                                                 [1..5]
                                 Effect Specific Flags:
                                     0x02 Reverse Direction
-                                    0x04 Fade
+                                    0x08 Random Color
                                     0x80 Circular
                             11 Color Sequence
                                 Color 0-5: User Defined Color

src/protocol/sensor_values.rs

@@ -3,7 +3,7 @@
 use std::{array::from_fn, ops::BitAnd};
 
 use bitflags::bitflags;
-use color_space::Hsv;
+use color_space::{FromRgb, Hsv, Rgb};
 use smallvec::SmallVec;
 
 use crate::{
@@ -103,14 +103,15 @@ impl BinaryRead for DisplaySettings {
     fn decode<R: Reader>(reader: &mut R) -> Result<ReaderOutput<R, Self>, BinaryIoError> {
         let temperature_unit = TemperatureUnit::decode(reader)?;
         let flow_unit = FlowUnit::decode(reader)?;
-        let display_flags = DisplayFlags::decode(reader)?;
+        reader.skip::<1>()?;
         let next_page_interval = Option::<NextPageInteral>::decode(reader)?;
         reader.skip::<2>()?;
         let page_flags = PageFlags::decode(reader)?;
         reader.skip::<4>()?;
         let display_brightness = DisplayBrightness::decode(reader)?;
         let idle_display_brightness = Option::<DisplayBrightness>::decode(reader)?;
-        reader.skip::<5>()?;
+        reader.skip::<4>()?;
+        let display_flags = DisplayFlags::decode(reader)?;
         let charts = <[Chart; 4] as BinaryRead>::decode(reader)?;
 
         Ok(R::guard(|x| Self {
@@ -345,7 +346,7 @@ pub struct EffectWave {
     pub width: EffectWidth,
 
     pub reverse_direction: bool,
-    pub fade: bool,
+    pub random_color: bool,
     pub circular: bool,
 
     pub source_control_speed: Option<SourceControl>,
@@ -593,7 +594,7 @@ impl BinaryRead for Option<Controller> {
                         smoothness: x.extract(smoothness),
                         width: x.extract(width),
                         reverse_direction: flag_set(effect_flags, 0x02),
-                        fade: flag_set(effect_flags, 0x04),
+                        random_color: flag_set(effect_flags, 0x04),
                         circular: flag_set(effect_flags, 0x80),
                         source_control_speed: x.extract(source_control_speed),
                         source_control_brightness: x.extract(source_control_brightness),
@@ -671,6 +672,39 @@ impl BinaryRead for SourceControl {
 #[derive(Debug, Clone)]
 pub struct Color(pub Hsv);
 
+impl Color {
+    #[must_use]
+    pub fn from_hsv(h: f64, s: f64, v: f64) -> Self {
+        Self(Hsv::new(h, s, v))
+    }
+
+    #[must_use]
+    pub fn from_rgb(r: u8, g: u8, b: u8) -> Self {
+        Self(Hsv::from_rgb(&Rgb::new(
+            f64::from(r),
+            f64::from(g),
+            f64::from(b),
+        )))
+    }
+
+    #[must_use]
+    pub fn from_rgb_hex(hex: u32) -> Self {
+        Self(Hsv::from_rgb(&Rgb::from_hex(hex)))
+    }
+}
+
+impl From<Hsv> for Color {
+    fn from(value: Hsv) -> Self {
+        Self(value)
+    }
+}
+
+impl From<Color> for Hsv {
+    fn from(value: Color) -> Self {
+        value.0
+    }
+}
+
 impl Eq for Color {}
 
 impl PartialEq for Color {
@@ -687,7 +721,11 @@ impl BinaryRead for Color {
         let v = f64::from(reader.read_u8()?);
 
         Ok(R::guard(|_| {
-            Self(Hsv::new(60.0 * h_section + 60.0 * h_offset / 255.0, s, v))
+            Self(Hsv::new(
+                60.0 * h_section + 60.0 * h_offset / 255.0,
+                s / 255.0,
+                v / 255.0,
+            ))
         }))
     }
 }
@@ -1037,10 +1075,10 @@ bitflags! {
         const COND_QUALITY = 0x0200;
         const TEMPERATURE = 0x0400;
         const FLOW_VOLUME = 0x0800;
-        const CHAR1 = 0x1000;
-        const CHAR2 = 0x2000;
-        const CHAR3 = 0x4000;
-        const CHAR4 = 0x8000;
+        const CHART1 = 0x1000;
+        const CHART2 = 0x2000;
+        const CHART3 = 0x4000;
+        const CHART4 = 0x8000;
     }
 }