Heavy patches (#152)

13r0ck · web-flow · commit 40bb2792fb23 · 2022-11-11T17:25:08.000-07:00
* Remove Launch test 2 Production doesn't use it anymore. Test 3 has been renamed test 2. * Arrange Testing panel into 2 x 2 grid. A vertical list was just a lot to scroll through. Request of production. * Remove num_runs_spin_3 Forgot to remove in 95700a6 * Only read keys in layout during nelson test Other Launch keyboards used every key in the keymap, so it was fine to read any key in the matrix. Though, on launch heavy there are several unmapped keys, these ones obviously don't get pressed by nelson, because they don't physically exist. This ignores those extra keys by only checking for pressed keys that are in both the matrix and the layout.
diff --git a/backend/src/layout/mod.rs b/backend/src/layout/mod.rs
@@ -178,6 +178,10 @@ impl Layout {
             None
         })
     }
+
+    pub fn layout(&self) -> &HashMap<String, (u8, u8)> {
+        &self.layout
+    }
 }
 
 fn parse_keymap_json(keymap_json: &str) -> (HashMap<String, u16>, HashMap<u16, String>) {
diff --git a/backend/src/nelson.rs b/backend/src/nelson.rs
@@ -1,5 +1,6 @@
 use serde::{Deserialize, Serialize};
 use std::cmp;
+use std::collections::HashMap;
 
 use crate::Matrix;
 
@@ -31,13 +32,12 @@ impl Nelson {
         )
     }
 
-    pub fn success(&self) -> bool {
+    pub fn success(&self, layout: &HashMap<std::string::String, (u8, u8)>) -> bool {
+        let mut values: Vec<&(u8, u8)> = layout.values().collect();
         for matrix in &[&self.missing, &self.bouncing, &self.sticking] {
-            for row in 0..matrix.rows() {
-                for col in 0..matrix.cols() {
-                    if matrix.get(row, col).unwrap_or(false) {
-                        return false;
-                    }
+            for (row, col) in values.iter() {
+                if matrix.get(*row as usize, *col as usize).unwrap_or(false) {
+                    return false;
                 }
             }
         }
diff --git a/src/testing.rs b/src/testing.rs
@@ -58,8 +58,7 @@ pub struct TestingInner {
     bench_button: DerefCell<gtk::ToggleButton>,
     bench_labels: DerefCell<HashMap<&'static str, gtk::Label>>,
     num_runs_spin_2: DerefCell<gtk::SpinButton>,
-    num_runs_spin_3: DerefCell<gtk::SpinButton>,
-    test_buttons: DerefCell<[gtk::Button; 3]>,
+    test_buttons: DerefCell<[gtk::Button; 2]>,
     test_labels: DerefCell<[gtk::Label; 3]>,
     selma_start_button: DerefCell<gtk::Button>,
     selma_stop_button: DerefCell<gtk::Button>,
@@ -140,7 +139,7 @@ impl ObjectImpl for TestingInner {
 
         let bench_button = gtk::ToggleButton::with_label("Run USB test");
 
-        obj.add(&cascade! {
+        let usb_test = &cascade! {
             gtk::Box::new(gtk::Orientation::Vertical, 12);
             ..add(&gtk::Label::new(Some("USB Port Test")));
             ..add(&cascade! {
@@ -150,24 +149,22 @@ impl ObjectImpl for TestingInner {
                 ..add(&row(&bench_button));
                 ..set_header_func(Some(Box::new(header_func)));
             });
-        });
+        };
 
         let num_runs_spin_2 = gtk::SpinButton::with_range(1.0, 1000.0, 1.0);
-        let num_runs_spin_3 = gtk::SpinButton::with_range(1.0, 1000.0, 1.0);
-        num_runs_spin_3.set_value(100.0);
+        num_runs_spin_2.set_value(100.0);
 
         let test_buttons = [
             gtk::Button::with_label(&fl!("button-test")),
             gtk::Button::with_label(&fl!("button-test")),
-            gtk::Button::with_label(&fl!("button-test")),
         ];
         let test_labels = [
             gtk::Label::new(None),
             gtk::Label::new(None),
             gtk::Label::new(None),
         ];
 
-        obj.add(&cascade! {
+        let nelson_test_1 = &cascade! {
             gtk::Box::new(gtk::Orientation::Vertical, 12);
             ..add(&gtk::Label::new(Some("Nelson Test 1")));
             ..add(&cascade! {
@@ -180,46 +177,31 @@ impl ObjectImpl for TestingInner {
                 ..add(&label_row("Check key (sticking)", &color_box(0., 1., 0.)));
                 ..set_header_func(Some(Box::new(header_func)));
             });
-        });
+        };
 
-        obj.add(&cascade! {
+        let nelson_test_2 = &cascade! {
             gtk::Box::new(gtk::Orientation::Vertical, 12);
             ..add(&gtk::Label::new(Some("Nelson Test 2")));
             ..add(&cascade! {
                 gtk::ListBox::new();
                 ..set_valign(gtk::Align::Start);
                 ..style_context().add_class("frame");
-                ..add(&label_row("Number of runs", &num_runs_spin_2));
+                ..add(&label_row(&fl!("test-number-of-runs"), &num_runs_spin_2));
                 ..add(&row(&test_buttons[1]));
-                ..add(&row(&test_labels[1]));
-                ..add(&label_row("Replace switch (bouncing)", &color_box(0., 0., 1.)));
-                ..set_header_func(Some(Box::new(header_func)));
-            });
-        });
-
-        obj.add(&cascade! {
-            gtk::Box::new(gtk::Orientation::Vertical, 12);
-            ..add(&gtk::Label::new(Some("Nelson Test 3")));
-            ..add(&cascade! {
-                gtk::ListBox::new();
-                ..set_valign(gtk::Align::Start);
-                ..style_context().add_class("frame");
-                ..add(&label_row(&fl!("test-number-of-runs"), &num_runs_spin_3));
-                ..add(&row(&test_buttons[2]));
                 ..add(&row(&test_labels[2]));
                 ..add(&label_row(&fl!("test-check-pins"), &color_box(1., 0., 0.)));
                 ..add(&label_row(&fl!("test-check-key"), &color_box(0., 1., 0.)));
                 ..set_header_func(Some(Box::new(header_func)));
             });
-        });
+        };
 
         let selma_start_button = gtk::Button::with_label(&fl!("button-start"));
         let selma_stop_button = cascade! {
             gtk::Button::with_label(&fl!("button-stop"));
             ..set_sensitive(false);
         };
 
-        obj.add(&cascade! {
+        let selma_test = &cascade! {
             gtk::Box::new(gtk::Orientation::Vertical, 12);
             ..add(&gtk::Label::new(Some("Selma Test")));
             ..add(&cascade! {
@@ -235,13 +217,29 @@ impl ObjectImpl for TestingInner {
                 ..add(&label_row(&fl!("test-spurious-keypress"), &color_box(1., 0., 0.)));
                 ..set_header_func(Some(Box::new(header_func)));
             });
+        };
+
+        obj.add(&cascade! {
+            gtk::Box::new(gtk::Orientation::Horizontal, 18);
+            ..set_valign(gtk::Align::Start);
+            ..add(&cascade! {
+                gtk::Box::new(gtk::Orientation::Vertical, 18);
+                ..set_valign(gtk::Align::Start);
+                ..add(&row(usb_test));
+                ..add(&row(selma_test));
+            });
+            ..add(&cascade! {
+                gtk::Box::new(gtk::Orientation::Vertical, 18);
+                ..set_valign(gtk::Align::Start);
+                ..add(&row(nelson_test_1));
+                ..add(&row(nelson_test_2));
+            });
         });
 
         self.reset_button.set(reset_button);
         self.bench_button.set(bench_button);
         self.bench_labels.set(bench_labels);
         self.num_runs_spin_2.set(num_runs_spin_2);
-        self.num_runs_spin_3.set(num_runs_spin_3);
         self.test_buttons.set(test_buttons);
         self.test_labels.set(test_labels);
         self.selma_start_button.set(selma_start_button);
@@ -372,7 +370,7 @@ impl Testing {
     }
 
     fn test_buttons_sensitive(&self, sensitive: bool) {
-        for i in 0..3 {
+        for i in 0..2 {
             self.inner().test_buttons[i].set_sensitive(sensitive);
         }
         self.inner().selma_start_button.set_sensitive(sensitive);
@@ -435,7 +433,7 @@ impl Testing {
 
             self.notify("colors");
 
-            if nelson.success() {
+            if nelson.success(testing.board.layout().layout()) {
                 let message = format!("Test {}/{} successful", test_run, test_runs);
                 info!("{}", message);
                 test_label.set_text(&message);
@@ -467,18 +465,6 @@ impl Testing {
             glib::MainContext::default().spawn_local(clone!(@strong self_ => async move {
                 self_.nelson(
                     self_.inner().num_runs_spin_2.value_as_int(),
-                    1,
-                    NelsonKind::Bouncing,
-                ).await;
-            }));
-        }));
-    }
-
-    fn connect_test_button_3(&self) {
-        self.inner().test_buttons[2].connect_clicked(clone!(@strong self as self_ => move |_| {
-            glib::MainContext::default().spawn_local(clone!(@strong self_ => async move {
-                self_.nelson(
-                    self_.inner().num_runs_spin_3.value_as_int(),
                     2,
                     NelsonKind::Normal,
                 ).await;
@@ -569,7 +555,6 @@ impl Testing {
         obj.connect_bench_button();
         obj.connect_test_button_1();
         obj.connect_test_button_2();
-        obj.connect_test_button_3();
         obj.connect_selma_buttons();
         obj.connect_reset_button();
         obj.update_benchmarks();

Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,10 @@ impl Layout {`
`178`	`178`	`None`
`179`	`179`	`})`
`180`	`180`	`}`
	`181`	`+`
	`182`	`+ pub fn layout(&self) -> &HashMap<String, (u8, u8)> {`
	`183`	`+ &self.layout`
	`184`	`+ }`
`181`	`185`	`}`
`182`	`186`
`183`	`187`	`fn parse_keymap_json(keymap_json: &str) -> (HashMap<String, u16>, HashMap<u16, String>) {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`use serde::{Deserialize, Serialize};`
`2`	`2`	`use std::cmp;`
	`3`	`+use std::collections::HashMap;`
`3`	`4`
`4`	`5`	`use crate::Matrix;`
`5`	`6`
`@@ -31,13 +32,12 @@ impl Nelson {`
`31`	`32`	`)`
`32`	`33`	`}`
`33`	`34`
`34`		`- pub fn success(&self) -> bool {`
	`35`	`+ pub fn success(&self, layout: &HashMap<std::string::String, (u8, u8)>) -> bool {`
	`36`	`+ let mut values: Vec<&(u8, u8)> = layout.values().collect();`
`35`	`37`	`for matrix in &[&self.missing, &self.bouncing, &self.sticking] {`
`36`		`- for row in 0..matrix.rows() {`
`37`		`- for col in 0..matrix.cols() {`
`38`		`- if matrix.get(row, col).unwrap_or(false) {`
`39`		`- return false;`
`40`		`- }`
	`38`	`+ for (row, col) in values.iter() {`
	`39`	`+ if matrix.get(row as usize, col as usize).unwrap_or(false) {`
	`40`	`+ return false;`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`}`