home_row_positions

spiderforrest · May 24, 2023 · 19a2b82 · 19a2b82
1 parent da2ab4e
commit 19a2b82
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 16 deletions.
diff --git a/config/keyboard/chocolad.yml b/config/keyboard/chocolad.yml
@@ -41,7 +41,7 @@ keyboard:
     - [22, 23, 24, 25, 26,           26, 25, 24, 23, 22]
     - [            27, 28, 29,   29, 28, 27            ]
 
-  home_row_positions:
+  finger_resting_positions:
     Left:
       Pinky: [50.5, 115.5]
       Ring: [100.5, 115.5]

diff --git a/config/keyboard/crkbd.yml b/config/keyboard/crkbd.yml
@@ -41,7 +41,7 @@ keyboard:
     - [ 21, 22, 23, 24, 25, 26,           26, 25, 24, 23, 22, 21]
     - [                 27, 28, 29,   29, 28, 27                ]
 
-  home_row_positions:
+  finger_resting_positions:
     Left:
       Pinky: [50.5, 115.5]
       Ring: [100.5, 115.5]

diff --git a/config/keyboard/hgi.yml b/config/keyboard/hgi.yml
@@ -34,7 +34,7 @@ keyboard:
     - [22, 23, 24, 25,           25, 24, 23, 22]
     - [                28, 29,   29, 28                ]
 
-  home_row_positions:
+  finger_resting_positions:
     Left:
       Pinky: [50.5,165.5]
       Ring: [100.5,155.5]

diff --git a/config/keyboard/moonlander.yml b/config/keyboard/moonlander.yml
@@ -48,7 +48,7 @@ keyboard:
     - [ 23, 24, 25, 26, 27, 28,                                 28, 27, 26, 25, 24, 23]
     - [ 29, 30, 31, 32, 33,     34, 35, 36, 37, 37, 36, 35, 34,     33, 32, 31, 30, 29]
 
-  home_row_positions:
+  finger_resting_positions:
     Left:
       Pinky: [50.5, 115.5]
       Ring: [100.5, 115.5]

diff --git a/config/keyboard/ortho.yml b/config/keyboard/ortho.yml
@@ -48,7 +48,7 @@ keyboard:
     - [ 21, 22, 23, 24, 25, 26,     26, 25, 24, 23, 22, 21]
     - [ 27, 28, 29, 30, 31, 32, 33, 32, 31, 30, 29, 28, 27]
 
-  home_row_positions:
+  finger_resting_positions:
     Left:
       Pinky: [50.5, 65.5]
       Ring: [100.5, 65.5]

diff --git a/config/keyboard/standard.yml b/config/keyboard/standard.yml
@@ -48,7 +48,7 @@ keyboard:
     - [ 24,      25,     26,  27,  28,  29,  30,     30,  29,  28,  27,  26,  24]
     - [ 31,  32,  33,                      34,                       35,  36,  37,  38]
 
-  home_row_positions:
+  finger_resting_positions:
     Left:
       Pinky: [114.5, 125.5]
       Ring: [164.5, 125.5]

diff --git a/config/keyboard/standard_diacritics.yml b/config/keyboard/standard_diacritics.yml
@@ -48,7 +48,7 @@ keyboard:
     - [ 24,      25,     26,  27,  28,  29,  30,     30,  29,  28,  27,  26,  24]
     - [ 31,  32,  33,                      34,                       35,  36,  37,  38]
 
-  home_row_positions:
+  finger_resting_positions:
     Left:
       Pinky: [114.5, 125.5]
       Ring: [164.5, 125.5]

diff --git a/config/keyboard/standard_qwerty_uk.yml b/config/keyboard/standard_qwerty_uk.yml
@@ -48,7 +48,7 @@ keyboard:
     - [ 24,      25,     26,  27,  28,  29,  30,     30,  29,  28,  27,  26,  24]
     - [ 31,  32,  33,                      34,                       35,  36,  37,  38]
 
-  home_row_positions:
+  finger_resting_positions:
     Left:
       Pinky: [114.5, 125.5]
       Ring: [164.5, 125.5]

diff --git a/config/keyboard/standard_qwerty_us.yml b/config/keyboard/standard_qwerty_us.yml
@@ -48,7 +48,7 @@ keyboard:
     - [ 24,              26,  27,  28,  29,  30,     30,  29,  28,  27,  26,  24]
     - [ 31,  32,  33,                      34,                       35,  36,  37,  38]
 
-  home_row_positions:
+  finger_resting_positions:
     Left:
       Pinky: [114.5, 125.5]
       Ring: [164.5, 125.5]

diff --git a/keyboard_layout/src/keyboard.rs b/keyboard_layout/src/keyboard.rs
@@ -26,7 +26,7 @@ pub type KeyIndex = u8;
 pub struct Keyboard {
     /// The keys of the keyboard
     pub keys: Vec<Key>,
-    pub home_row_positions: HandFingerMap<Position>,
+    pub finger_resting_positions: HandFingerMap<Position>,
     plot_template: String,
     plot_template_short: String,
 }
@@ -43,7 +43,7 @@ pub struct KeyboardYAML {
     key_costs: Vec<Vec<f64>>,
     symmetries: Vec<Vec<u8>>,
     unbalancing_positions: Vec<Vec<Position>>,
-    home_row_positions: AHashMap<Hand, AHashMap<Finger, Position>>,
+    finger_resting_positions: AHashMap<Hand, AHashMap<Finger, Position>>,
     plot_template: String,
     plot_template_short: String,
 }
@@ -126,8 +126,8 @@ impl Keyboard {
 
         Keyboard {
             keys,
-            home_row_positions: HandFingerMap::with_hashmap(
-                &k.home_row_positions,
+            finger_resting_positions: HandFingerMap::with_hashmap(
+                &k.finger_resting_positions,
                 Position::default(),
             ),
             plot_template: k.plot_template,

diff --git a/layout_evaluation/src/metrics/bigram_metrics/kla_distance.rs b/layout_evaluation/src/metrics/bigram_metrics/kla_distance.rs
@@ -84,11 +84,11 @@ impl BigramMetric for KLADistance {
     ) -> (f64, Option<String>) {
         let mut finger_values: HandFingerMap<f64> = HandFingerMap::with_default(0.0);
 
-        let home_row_positions = FingerStates::with_positions(&layout.keyboard.home_row_positions);
+        let finger_resting_positions = FingerStates::with_positions(&layout.keyboard.finger_resting_positions);
 
         bigrams.iter().for_each(|((prev_key, curr_key), weight)| {
             // collect used fingers and keys for previous symbol
-            let mut prev_used_keys = home_row_positions;
+            let mut prev_used_keys = finger_resting_positions;
             prev_used_keys.register_key(prev_key);
             if !self.ignore_modifiers {
                 prev_key.modifiers.layerkeys().iter().for_each(|k| {
@@ -97,7 +97,7 @@ impl BigramMetric for KLADistance {
             }
 
             // collect used fingers and keys for currend symbol
-            let mut curr_used_keys = home_row_positions;
+            let mut curr_used_keys = finger_resting_positions;
             curr_used_keys.register_key(curr_key);
             if !self.ignore_modifiers {
                 curr_key.modifiers.layerkeys().iter().for_each(|k| {