chore(normalization): move repeated normalization functions to src/input/event/value.rs

Author: blakesmittty

src/input/event/value.rs

@@ -60,6 +60,73 @@ pub enum InputValue {
     },
 }
 
+/// Returns a value between -1.0 and 1.0 based on the given value with its
+/// minimum and maximum values.
+pub fn normalize_signed_value(raw_value: f64, min: f64, max: f64) -> f64 {
+    let mid = (max + min) / 2.0;
+    let event_value = raw_value - mid;
+
+    // Normalize the value
+    if event_value >= 0.0 {
+        let maximum = max - mid;
+        event_value / maximum
+    } else {
+        let minimum = min - mid;
+        let value = event_value / minimum;
+        -value
+    }
+}
+
+/// Convert the given normalized signed value to the real value based on the given
+/// minimum and maximum axis range.
+pub fn denormalize_signed_value_i16(normal_value: f64, min: f64, max: f64) -> i16 {
+    let mid = (max + min) / 2.0;
+    let normal_value_abs = normal_value.abs();
+    if normal_value >= 0.0 {
+        let maximum = max - mid;
+        let value = normal_value * maximum + mid;
+        value as i16
+    } else {
+        let minimum = min - mid;
+        let value = normal_value_abs * minimum + mid;
+        value as i16
+    }
+}
+
+/// Convert the given normalized signed value to the real value based on the given
+/// minimum and maximum axis range.
+pub fn denormalize_signed_value_u8(normal_value: f64, min: f64, max: f64) -> u8 {
+    let mid = (max + min) / 2.0;
+    let normal_value_abs = normal_value.abs();
+    if normal_value >= 0.0 {
+        let maximum = max - mid;
+        let value = normal_value * maximum + mid;
+        value as u8
+    } else {
+        let minimum = min - mid;
+        let value = normal_value_abs * minimum + mid;
+        value as u8
+    }
+}
+
+// Returns a value between 0.0 and 1.0 based on the given value with its
+// maximum.
+pub fn normalize_unsigned_value(raw_value: f64, max: f64) -> f64 {
+    raw_value / max
+}
+
+/// De-normalizes the given value from 0.0 - 1.0 into a real value based on
+/// the maximum axis range.
+pub fn denormalize_unsigned_value_u16(normal_value: f64, max: f64) -> u16 {
+    (normal_value * max).round() as u16
+}
+
+/// De-normalizes the given value from 0.0 - 1.0 into a real value based on
+/// the maximum axis range.
+pub fn denormalize_unsigned_value_u8(normal_value: f64, max: f64) -> u8 {
+    (normal_value * max).round() as u8
+}
+
 impl InputValue {
     /// Returns whether or not the value is "pressed"
     pub fn pressed(&self) -> bool {

src/input/source/hidraw/dualsense.rs

@@ -14,7 +14,11 @@ use crate::{
             Capability, Gamepad, GamepadAxis, GamepadButton, GamepadTrigger, Touch, TouchButton,
             Touchpad,
         },
-        event::{native::NativeEvent, value::InputValue},
+        event::{
+            native::NativeEvent,
+            value::InputValue,
+            value::{normalize_signed_value, normalize_unsigned_value},
+        },
         output_event::OutputEvent,
         source::{InputError, OutputError, SourceInputDevice, SourceOutputDevice},
     },
@@ -368,29 +372,6 @@ fn translate_event(event: dualsense::event::Event) -> NativeEvent {
     }
 }
 
-/// Returns a value between -1.0 and 1.0 based on the given value with its
-/// minimum and maximum values.
-fn normalize_signed_value(raw_value: f64, min: f64, max: f64) -> f64 {
-    let mid = (max + min) / 2.0;
-    let event_value = raw_value - mid;
-
-    // Normalize the value
-    if event_value >= 0.0 {
-        let maximum = max - mid;
-        event_value / maximum
-    } else {
-        let minimum = min - mid;
-        let value = event_value / minimum;
-        -value
-    }
-}
-
-// Returns a value between 0.0 and 1.0 based on the given value with its
-// maximum.
-fn normalize_unsigned_value(raw_value: f64, max: f64) -> f64 {
-    raw_value / max
-}
-
 /// Normalize the value to something between -1.0 and 1.0 based on the DualSense's
 /// minimum and maximum axis ranges.
 fn normalize_axis_value(event: &dualsense::event::AxisEvent) -> InputValue {

src/input/source/hidraw/flydigi_vader_4_pro.rs

@@ -7,7 +7,11 @@ use crate::{
     },
     input::{
         capability::{Capability, Gamepad, GamepadAxis, GamepadButton, GamepadTrigger},
-        event::{native::NativeEvent, value::InputValue},
+        event::{
+            native::NativeEvent,
+            value::InputValue,
+            value::{normalize_signed_value, normalize_unsigned_value},
+        },
         source::{InputError, SourceInputDevice, SourceOutputDevice},
     },
     udev::device::UdevDevice,
@@ -55,29 +59,6 @@ impl Debug for Vader4Pro {
     }
 }
 
-/// Returns a value between -1.0 and 1.0 based on the given value with its
-/// minimum and maximum values.
-fn normalize_signed_value(raw_value: f64, min: f64, max: f64) -> f64 {
-    let mid = (max + min) / 2.0;
-    let event_value = raw_value - mid;
-
-    // Normalize the value
-    if event_value >= 0.0 {
-        let maximum = max - mid;
-        event_value / maximum
-    } else {
-        let minimum = min - mid;
-        let value = event_value / minimum;
-        -value
-    }
-}
-
-// Returns a value between 0.0 and 1.0 based on the given value with its
-// maximum.
-fn normalize_unsigned_value(raw_value: f64, max: f64) -> f64 {
-    raw_value / max
-}
-
 /// Normalize the value to something between -1.0 and 1.0 based on the
 /// minimum and maximum axis ranges.
 fn normalize_axis_value(event: event::JoystickEvent) -> InputValue {

src/input/source/hidraw/fts3528.rs

@@ -9,7 +9,7 @@ use crate::{
     },
     input::{
         capability::{Capability, Touch},
-        event::{native::NativeEvent, value::InputValue},
+        event::{native::NativeEvent, value::normalize_unsigned_value, value::InputValue},
         source::{InputError, SourceInputDevice, SourceOutputDevice},
     },
     udev::device::UdevDevice,
@@ -51,20 +51,14 @@ impl Debug for Fts3528Touchscreen {
     }
 }
 
-// Returns a value between 0.0 and 1.0 based on the given value with its
-// maximum.
-fn normalize_unsigned_value(raw_value: u16, max: u16) -> f64 {
-    raw_value as f64 / max as f64
-}
-
 /// Normalizes the given input into an input value
 fn normalize_axis_value(touch: TouchAxisInput) -> InputValue {
     // Normalize the x, y values if touching
     let (x, y) = match touch.is_touching {
         true => {
             // NOTE: X and Y are flipped due to panel rotation.
-            let x = normalize_unsigned_value(touch.y, TOUCHSCREEN_Y_MAX);
-            let y = 1.0 - normalize_unsigned_value(touch.x, TOUCHSCREEN_X_MAX);
+            let x = normalize_unsigned_value(touch.y as f64, TOUCHSCREEN_Y_MAX as f64);
+            let y = 1.0 - normalize_unsigned_value(touch.x as f64, TOUCHSCREEN_X_MAX as f64);
             (Some(x), Some(y))
         }
         false => (None, None),

src/input/source/hidraw/horipad_steam.rs

@@ -7,7 +7,11 @@ use crate::{
     },
     input::{
         capability::{Capability, Gamepad, GamepadAxis, GamepadButton, GamepadTrigger},
-        event::{native::NativeEvent, value::InputValue},
+        event::{
+            native::NativeEvent,
+            value::InputValue,
+            value::{normalize_signed_value, normalize_unsigned_value},
+        },
         source::{InputError, SourceInputDevice, SourceOutputDevice},
     },
     udev::device::UdevDevice,
@@ -49,29 +53,6 @@ impl Debug for HoripadSteam {
     }
 }
 
-/// Returns a value between -1.0 and 1.0 based on the given value with its
-/// minimum and maximum values.
-fn normalize_signed_value(raw_value: f64, min: f64, max: f64) -> f64 {
-    let mid = (max + min) / 2.0;
-    let event_value = raw_value - mid;
-
-    // Normalize the value
-    if event_value >= 0.0 {
-        let maximum = max - mid;
-        event_value / maximum
-    } else {
-        let minimum = min - mid;
-        let value = event_value / minimum;
-        -value
-    }
-}
-
-// Returns a value between 0.0 and 1.0 based on the given value with its
-// maximum.
-fn normalize_unsigned_value(raw_value: f64, max: f64) -> f64 {
-    raw_value / max
-}
-
 /// Normalize the value to something between -1.0 and 1.0 based on the
 /// minimum and maximum axis ranges.
 fn normalize_axis_value(event: event::JoystickEvent) -> InputValue {

src/input/source/hidraw/legion_go.rs

@@ -13,7 +13,11 @@ use crate::{
             Capability, Gamepad, GamepadAxis, GamepadButton, GamepadTrigger, Mouse, MouseButton,
             Source, Touch, TouchButton, Touchpad,
         },
-        event::{native::NativeEvent, value::InputValue},
+        event::{
+            native::NativeEvent,
+            value::InputValue,
+            value::{normalize_signed_value, normalize_unsigned_value},
+        },
         source::{InputError, SourceInputDevice, SourceOutputDevice},
     },
     udev::device::UdevDevice,
@@ -262,29 +266,6 @@ impl Debug for LegionGoController {
     }
 }
 
-/// Returns a value between -1.0 and 1.0 based on the given value with its
-/// minimum and maximum values.
-fn normalize_signed_value(raw_value: f64, min: f64, max: f64) -> f64 {
-    let mid = (max + min) / 2.0;
-    let event_value = raw_value - mid;
-
-    // Normalize the value
-    if event_value >= 0.0 {
-        let maximum = max - mid;
-        event_value / maximum
-    } else {
-        let minimum = min - mid;
-        let value = event_value / minimum;
-        -value
-    }
-}
-
-// Returns a value between 0.0 and 1.0 based on the given value with its
-// maximum.
-fn normalize_unsigned_value(raw_value: f64, max: f64) -> f64 {
-    raw_value / max
-}
-
 /// Normalize the value to something between -1.0 and 1.0 based on the
 /// minimum and maximum axis ranges.
 fn normalize_axis_value(event: AxisEvent) -> InputValue {

src/input/source/hidraw/legos_touchpad.rs

@@ -4,7 +4,7 @@ use crate::{
     drivers::legos::{event, touchpad_driver::TouchpadDriver, PAD_FORCE_MAX, PAD_MOTION_MAX},
     input::{
         capability::{Capability, Gamepad, GamepadTrigger, Touch, TouchButton, Touchpad},
-        event::{native::NativeEvent, value::InputValue},
+        event::{native::NativeEvent, value::normalize_unsigned_value, value::InputValue},
         output_event::OutputEvent,
         source::{InputError, OutputError, SourceInputDevice, SourceOutputDevice},
     },
@@ -54,12 +54,6 @@ impl Debug for LegionSTouchpadController {
     }
 }
 
-// Returns a value between 0.0 and 1.0 based on the given value with its
-// maximum.
-fn normalize_unsigned_value(raw_value: f64, max: f64) -> f64 {
-    raw_value / max
-}
-
 /// Normalize the value to something between -1.0 and 1.0 based on the
 /// minimum and maximum axis ranges.
 fn normalize_axis_value(event: event::AxisEvent) -> InputValue {

src/input/source/hidraw/legos_xinput.rs

@@ -14,7 +14,11 @@ use crate::{
     },
     input::{
         capability::{Capability, Gamepad, GamepadAxis, GamepadButton, GamepadTrigger},
-        event::{native::NativeEvent, value::InputValue},
+        event::{
+            native::NativeEvent,
+            value::InputValue,
+            value::{normalize_signed_value, normalize_unsigned_value},
+        },
         output_event::OutputEvent,
         source::{InputError, OutputError, SourceInputDevice, SourceOutputDevice},
     },
@@ -193,29 +197,6 @@ impl Debug for LegionSXInputController {
     }
 }
 
-/// Returns a value between -1.0 and 1.0 based on the given value with its
-/// minimum and maximum values.
-fn normalize_signed_value(raw_value: f64, min: f64, max: f64) -> f64 {
-    let mid = (max + min) / 2.0;
-    let event_value = raw_value - mid;
-
-    // Normalize the value
-    if event_value >= 0.0 {
-        let maximum = max - mid;
-        event_value / maximum
-    } else {
-        let minimum = min - mid;
-        let value = event_value / minimum;
-        -value
-    }
-}
-
-// Returns a value between 0.0 and 1.0 based on the given value with its
-// maximum.
-fn normalize_unsigned_value(raw_value: f64, max: f64) -> f64 {
-    raw_value / max
-}
-
 /// Normalize the value to something between -1.0 and 1.0 based on the Deck's
 /// minimum and maximum axis ranges.
 fn normalize_axis_value(event: event::AxisEvent) -> InputValue {

src/input/source/hidraw/opineo.rs

@@ -7,7 +7,7 @@ use crate::{
     },
     input::{
         capability::{Capability, Gamepad, GamepadTrigger, Touch, TouchButton, Touchpad},
-        event::{native::NativeEvent, value::InputValue},
+        event::{native::NativeEvent, value::normalize_unsigned_value, value::InputValue},
         output_capability::OutputCapability,
         source::{InputError, OutputError, SourceInputDevice, SourceOutputDevice},
     },
@@ -85,12 +85,6 @@ impl Debug for OrangePiNeoTouchpad {
     }
 }
 
-// Returns a value between 0.0 and 1.0 based on the given value with its
-// maximum.
-fn normalize_unsigned_value(raw_value: f64, max: f64) -> f64 {
-    raw_value / max
-}
-
 /// Normalize the value to something between -1.0 and 1.0 based on the Deck's
 /// minimum and maximum axis ranges.
 fn normalize_axis_value(event: event::TouchAxisEvent) -> InputValue {