TastyPancakes
/
rot8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20 from Vassili-Dev/variable_normalization_factor 

Move normalization factor to cli argument
This commit is contained in:
Esra Fernau 2021-08-17 21:17:12 +02:00 committed by GitHub
parent b7b42d95a9 9e0d2f986f
commit 80431661d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.rs
View File

@ -176,6 +176,13 @@ fn main() -> Result<(), String> {
.value_name("THRESHOLD") .value_name("THRESHOLD")
.help("Set a rotation threshold between 0 and 1") .help("Set a rotation threshold between 0 and 1")
.takes_value(true), .takes_value(true),
Arg::with_name("normalization-factor")
.default_value("1e6")
.long("normalization-factor")
.short("n")
.value_name("NORMALIZATION_FACTOR")
.help("Set factor for sensor value normalization")
.takes_value(true),
]; ];
match backend { match backend {
@ -203,6 +210,9 @@ fn main() -> Result<(), String> {
let old_state_owned = get_window_server_rotation_state(display, &backend)?; let old_state_owned = get_window_server_rotation_state(display, &backend)?;
let mut old_state = old_state_owned.as_str(); let mut old_state = old_state_owned.as_str();
let normalization_factor = matches.value_of("normalization-factor").unwrap_or("1e6");
let normalization_factor = normalization_factor.parse::<f32>().unwrap_or(1e6);
let keyboards = get_keyboards(&backend)?; let keyboards = get_keyboards(&backend)?;
for entry in glob("/sys/bus/iio/devices/iio:device*/in_accel_*_raw").unwrap() { for entry in glob("/sys/bus/iio/devices/iio:device*/in_accel_*_raw").unwrap() {
@ -258,8 +268,8 @@ fn main() -> Result<(), String> {
let y_clean = y_raw.trim_end_matches('\n').parse::<i32>().unwrap_or(0); let y_clean = y_raw.trim_end_matches('\n').parse::<i32>().unwrap_or(0);
// Normalize vectors // Normalize vectors
let x: f32 = (x_clean as f32) / 1e6; let x: f32 = (x_clean as f32) / normalization_factor;
let y: f32 = (y_clean as f32) / 1e6; let y: f32 = (y_clean as f32) / normalization_factor;
for (_i, orient) in orientations.iter().enumerate() { for (_i, orient) in orientations.iter().enumerate() {
let d = (x - orient.vector.0).powf(2.0) + (y - orient.vector.1).powf(2.0); let d = (x - orient.vector.0).powf(2.0) + (y - orient.vector.1).powf(2.0);