ergodox_ez: Update my keymap to v1.3
This updates my ErgoDox EZ layout to v1.3, which has the following noteworthy changes: * Added support for logging keys, by pressing `LEAD d`. Also included is a tool to generate a **heatmap** out of the logs. * The arrow and navigation keys were rearranged again, and now require an additional key being held to activate. See the **base layer** for an image that shows where arrows are. * The **experimental** layer has been redone, and is now called **ADORE**, and as such, can be enabled by `LEAD a` now. * Switching between Dvorak and ADORE is now persisted into EEPROM, and survives a reboot. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
This commit is contained in:
		
							parent
							
								
									9ecf9073b9
								
							
						
					
					
						commit
						53eb36c085
					
				
					 9 changed files with 855 additions and 214 deletions
				
			
		
							
								
								
									
										145
									
								
								keyboards/ergodox_ez/keymaps/algernon/tools/log-to-heatmap.py
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										145
									
								
								keyboards/ergodox_ez/keymaps/algernon/tools/log-to-heatmap.py
									
										
									
									
									
										Executable file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,145 @@
 | 
			
		|||
#! /usr/bin/env python
 | 
			
		||||
import json
 | 
			
		||||
import os
 | 
			
		||||
import sys
 | 
			
		||||
import re
 | 
			
		||||
 | 
			
		||||
from math import floor
 | 
			
		||||
 | 
			
		||||
cr_coord_map = [
 | 
			
		||||
    [
 | 
			
		||||
        # Row 0
 | 
			
		||||
        [ 4,  0], [ 4,  2], [ 2,  0], [ 1,  0], [ 2,  2], [ 3,  0], [ 3,  2],
 | 
			
		||||
        [ 3,  4], [ 3,  6], [ 2,  4], [ 1,  2], [ 2,  6], [ 4,  4], [ 4,  6],
 | 
			
		||||
    ],
 | 
			
		||||
    [
 | 
			
		||||
        # Row 1
 | 
			
		||||
        [ 8,  0], [ 8,  2], [ 6,  0], [ 5,  0], [ 6,  2], [ 7,  0], [ 7,  2],
 | 
			
		||||
        [ 7,  4], [ 7,  6], [ 6,  4], [ 5,  2], [ 6,  6], [ 8,  4], [ 8,  6],
 | 
			
		||||
    ],
 | 
			
		||||
    [
 | 
			
		||||
        # Row 2
 | 
			
		||||
        [12,  0], [12,  2], [10,  0], [ 9,  0], [10,  2], [11, 0], [     ],
 | 
			
		||||
        [      ], [11,  2], [10,  4], [ 9,  2], [10,  6], [12, 4], [12, 6],
 | 
			
		||||
    ],
 | 
			
		||||
    [
 | 
			
		||||
        # Row 3
 | 
			
		||||
        [17,  0], [17,  2], [15,  0], [14,  0], [15,  2], [16,  0], [13,  0],
 | 
			
		||||
        [13,  2], [16,  2], [15,  4], [14,  2], [15,  6], [17,  4], [17,  6],
 | 
			
		||||
    ],
 | 
			
		||||
    [
 | 
			
		||||
        # Row 4
 | 
			
		||||
        [20,  0], [20,  2], [19,  0], [18,  0], [19,  2], [], [], [], [],
 | 
			
		||||
        [19,  4], [18,  2], [19,  6], [20,  4], [20,  6],
 | 
			
		||||
    ],
 | 
			
		||||
    [
 | 
			
		||||
        # Row 5
 | 
			
		||||
        [     ], [23,  0], [22,  2], [22,  0], [22,  4], [21,  0], [21,  2],
 | 
			
		||||
        [24, 0], [24,  2], [25,  0], [25,  4], [25,  2], [26,  0], [      ],
 | 
			
		||||
    ],
 | 
			
		||||
]
 | 
			
		||||
 | 
			
		||||
def set_attr_at(j, b, n, attr, fn, val):
 | 
			
		||||
    blk = j[b][n]
 | 
			
		||||
    if attr in blk:
 | 
			
		||||
        blk[attr] = fn(blk[attr], val)
 | 
			
		||||
    else:
 | 
			
		||||
        blk[attr] = fn(None, val)
 | 
			
		||||
 | 
			
		||||
def coord(col, row):
 | 
			
		||||
    return cr_coord_map[row][col]
 | 
			
		||||
 | 
			
		||||
def set_attr(orig, new):
 | 
			
		||||
    return new
 | 
			
		||||
 | 
			
		||||
def set_bg(j, (b, n), color):
 | 
			
		||||
    set_attr_at(j, b, n, "c", set_attr, color)
 | 
			
		||||
    #set_attr_at(j, b, n, "g", set_attr, False)
 | 
			
		||||
 | 
			
		||||
def _set_tap_info(o, count, cap):
 | 
			
		||||
    ns = 4 - o.count ("\n")
 | 
			
		||||
    return o + "\n" * ns + "%.02f%%" % (float(count) / float(cap) * 100)
 | 
			
		||||
 | 
			
		||||
def set_tap_info(j, (b, n), count, cap):
 | 
			
		||||
    j[b][n + 1] = _set_tap_info (j[b][n + 1], count, cap)
 | 
			
		||||
 | 
			
		||||
def heatmap_color (v):
 | 
			
		||||
    colors = [ [0.3, 0.3, 1], [0.3, 1, 0.3], [1, 1, 0.3], [1, 0.3, 0.3]]
 | 
			
		||||
    fb = 0
 | 
			
		||||
    if v <= 0:
 | 
			
		||||
        idx1, idx2 = 0, 0
 | 
			
		||||
    elif v >= 1:
 | 
			
		||||
        idx1, idx2 = len(colors) - 1, len(colors) - 1
 | 
			
		||||
    else:
 | 
			
		||||
        val = v * (len(colors) - 1)
 | 
			
		||||
        idx1 = int(floor(val))
 | 
			
		||||
        idx2 = idx1 + 1
 | 
			
		||||
        fb = val - float(idx1)
 | 
			
		||||
 | 
			
		||||
    r = (colors[idx2][0] - colors[idx1][0]) * fb + colors[idx1][0]
 | 
			
		||||
    g = (colors[idx2][1] - colors[idx1][1]) * fb + colors[idx1][1]
 | 
			
		||||
    b = (colors[idx2][2] - colors[idx1][2]) * fb + colors[idx1][2]
 | 
			
		||||
 | 
			
		||||
    r, g, b = [x * 255 for x in r, g, b]
 | 
			
		||||
    return "#%02x%02x%02x" % (r, g, b)
 | 
			
		||||
 | 
			
		||||
# Load the keylog
 | 
			
		||||
def load_keylog(fname, restrict_row):
 | 
			
		||||
    keylog = {}
 | 
			
		||||
    total = 0
 | 
			
		||||
    with open(fname, "r") as f:
 | 
			
		||||
        lines = f.readlines()
 | 
			
		||||
    for line in lines:
 | 
			
		||||
        m = re.search ('KL: col=(\d+), row=(\d+)', line)
 | 
			
		||||
        if not m:
 | 
			
		||||
            continue
 | 
			
		||||
        (c, r) = (int(m.group (2)), int(m.group (1)))
 | 
			
		||||
        if restrict_row != None and r != int(restrict_row):
 | 
			
		||||
            continue
 | 
			
		||||
        if (c, r) in keylog:
 | 
			
		||||
            keylog[(c, r)] = keylog[(c, r)] + 1
 | 
			
		||||
        else:
 | 
			
		||||
            keylog[(c, r)] = 1
 | 
			
		||||
        total = total + 1
 | 
			
		||||
    return total / 2, keylog
 | 
			
		||||
 | 
			
		||||
def l_flat(s):
 | 
			
		||||
    f = s.split("\n")
 | 
			
		||||
    return ", ".join (f)
 | 
			
		||||
 | 
			
		||||
def main(base_fn, log_fn, restrict_row = None):
 | 
			
		||||
 | 
			
		||||
    with open(base_fn, "r") as f:
 | 
			
		||||
        layout = json.load (f)
 | 
			
		||||
 | 
			
		||||
    ## Reset colors
 | 
			
		||||
    for row in cr_coord_map:
 | 
			
		||||
        for col in row:
 | 
			
		||||
            if col != []:
 | 
			
		||||
                set_bg (layout, col, "#d9dae0")
 | 
			
		||||
                #set_attr_at (layout, col[0], col[1], "g", set_attr, True)
 | 
			
		||||
 | 
			
		||||
    total, log = load_keylog (log_fn, restrict_row)
 | 
			
		||||
    max_cnt = 0
 | 
			
		||||
    for (c, r) in log:
 | 
			
		||||
        max_cnt = max(max_cnt, log[(c, r)])
 | 
			
		||||
 | 
			
		||||
    # Create the heatmap
 | 
			
		||||
    for (c, r) in log:
 | 
			
		||||
        coords = coord(c, r)
 | 
			
		||||
        b, n = coords
 | 
			
		||||
        cap = max_cnt
 | 
			
		||||
        v = float(log[(c, r)]) / cap
 | 
			
		||||
        print >> sys.stderr, "%s => %d/%d => %f = %s" % (l_flat(layout[b][n+1]), log[(c,r)], cap, v, heatmap_color(v))
 | 
			
		||||
        set_bg (layout, coord(c, r), heatmap_color (v))
 | 
			
		||||
        set_tap_info (layout, coord (c, r), log[(c, r)], total)
 | 
			
		||||
 | 
			
		||||
    print json.dumps(layout)
 | 
			
		||||
 | 
			
		||||
if __name__ == "__main__":
 | 
			
		||||
    if len(sys.argv) < 3:
 | 
			
		||||
        print """Log to Heatmap -- creates a heatmap out of keyboard logs
 | 
			
		||||
 | 
			
		||||
Usage: log-to-heatmap.py base-layout.json logfile [row] >layout.json"""
 | 
			
		||||
        sys.exit (1)
 | 
			
		||||
    main(*sys.argv[1:])
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue