From 92a029d6f39e2086ec6e5261c42925eeb0e93bc2 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 12 Jul 2021 23:44:56 -0700 Subject: Ergonomic Vertical Keyboard (EVK) handwired info.json touch-up (#13527) * scale layout data Seems the KLE data that was imported to make the original file was scaled 1.25x. This commit removes the scaling. * human-friendly formatting Insert line breaks between physical layout rows. * remove instances where width or height is set to 1 The width and height of a key is defaulted to 1 if not provided by the JSON data, so there's no reason to set it manually. --- keyboards/handwired/evk/v1_3/info.json | 189 +++++++++++++++++---------------- 1 file changed, 97 insertions(+), 92 deletions(-) (limited to 'keyboards/handwired') diff --git a/keyboards/handwired/evk/v1_3/info.json b/keyboards/handwired/evk/v1_3/info.json index 65000a97b2..745a72ed3c 100644 --- a/keyboards/handwired/evk/v1_3/info.json +++ b/keyboards/handwired/evk/v1_3/info.json @@ -2,101 +2,106 @@ "keyboard_name": "Ergonomic Vertical Keyboard (EVK) version 1.3 with Teensy 2.0", "url": "https://github.com/YangPiCui/ErgonomicVerticalKeyboard", "maintainer": "YangPiCui", - "width": 22.75, - "height": 8, + "width": 18.2, + "height": 6.4, "layouts": { "LAYOUT": { "layout": [ - {"label":"k0A", "x":0, "y":0.5, "w":1.25, "h":1.25}, - {"label":"k0B", "x":1.25, "y":0.25, "w":1.25, "h":1.25}, - {"label":"k0C", "x":2.5, "y":0, "w":1.25, "h":1.25}, - {"label":"k0D", "x":3.75, "y":0.25, "w":1.25, "h":1.25}, - {"label":"k0E", "x":5, "y":0.25, "w":1.25, "h":1.25}, - {"label":"k0F", "x":6.25, "y":0.25, "w":1.25, "h":1.25}, - {"label":"k0G", "x":8.75, "y":0.25, "w":1.25, "h":1.25}, - {"label":"k0H", "x":10, "y":0.25, "w":1.25, "h":1.25}, - {"label":"k0I", "x":11.25, "y":0.25, "w":1.25, "h":1.25}, - {"label":"k0J", "x":12.5, "y":0.25, "w":1.25, "h":1.25}, - {"label":"k0K", "x":15.25, "y":0.25, "w":1.25, "h":1.25}, - {"label":"k0L", "x":16.5, "y":0.25, "w":1.25, "h":1.25}, - {"label":"k0M", "x":17.75, "y":0.25, "w":1.25, "h":1.25}, - {"label":"k0N", "x":19, "y":0, "w":1.25, "h":1.25}, - {"label":"k0O", "x":20.25, "y":0.25, "w":1.25, "h":1.25}, - {"label":"k0P", "x":21.5, "y":0.5, "w":1.25, "h":1.25}, - {"label":"k1A", "x":0, "y":1.75, "w":1.25, "h":1.25}, - {"label":"k1B", "x":1.25, "y":1.5, "w":1.25, "h":1.25}, - {"label":"k1C", "x":2.5, "y":1.25, "w":1.25, "h":1.25}, - {"label":"k1D", "x":3.75, "y":1.5, "w":1.25, "h":1.25}, - {"label":"k1E", "x":5, "y":1.5, "w":1.25, "h":1.25}, - {"label":"k1F", "x":6.25, "y":1.5, "w":1.25, "h":1.25}, - {"label":"k1G", "x":8.75, "y":1.5, "w":1.25, "h":1.25}, - {"label":"k1H", "x":10, "y":1.5, "w":1.25, "h":1.25}, - {"label":"k1I", "x":11.25, "y":1.5, "w":1.25, "h":1.25}, - {"label":"k1J", "x":12.5, "y":1.5, "w":1.25, "h":1.25}, - {"label":"k1K", "x":15.25, "y":1.5, "w":1.25, "h":1.25}, - {"label":"k1L", "x":16.5, "y":1.5, "w":1.25, "h":1.25}, - {"label":"k1M", "x":17.75, "y":1.5, "w":1.25, "h":1.25}, - {"label":"k1N", "x":19, "y":1.25, "w":1.25, "h":1.25}, - {"label":"k1O", "x":20.25, "y":1.5, "w":1.25, "h":1.25}, - {"label":"k1P", "x":21.5, "y":1.75, "w":1.25, "h":1.25}, - {"label":"k2A", "x":0, "y":3, "w":1.25, "h":1.25}, - {"label":"k2B", "x":1.25, "y":2.75, "w":1.25, "h":1.25}, - {"label":"k2C", "x":2.5, "y":2.5, "w":1.25, "h":1.25}, - {"label":"k2D", "x":3.75, "y":2.75, "w":1.25, "h":1.25}, - {"label":"k2E", "x":5, "y":2.75, "w":1.25, "h":1.25}, - {"label":"k2F", "x":6.25, "y":2.75, "w":1.25, "h":1.25}, - {"label":"k2G", "x":8.75, "y":2.75, "w":1.25, "h":1.25}, - {"label":"k2H", "x":10, "y":2.75, "w":1.25, "h":1.25}, - {"label":"k2I", "x":11.25, "y":2.75, "w":1.25, "h":1.25}, - {"label":"k2J", "x":12.5, "y":2.75, "w":1.25, "h":1.25}, - {"label":"k2K", "x":15.25, "y":2.75, "w":1.25, "h":1.25}, - {"label":"k2L", "x":16.5, "y":2.75, "w":1.25, "h":1.25}, - {"label":"k2M", "x":17.75, "y":2.75, "w":1.25, "h":1.25}, - {"label":"k2N", "x":19, "y":2.5, "w":1.25, "h":1.25}, - {"label":"k2O", "x":20.25, "y":2.75, "w":1.25, "h":1.25}, - {"label":"k2P", "x":21.5, "y":3, "w":1.25, "h":1.25}, - {"label":"k3A", "x":0, "y":4.25, "w":1.25, "h":1.25}, - {"label":"k3B", "x":1.25, "y":4, "w":1.25, "h":1.25}, - {"label":"k3C", "x":2.5, "y":3.75, "w":1.25, "h":1.25}, - {"label":"k3D", "x":3.75, "y":4, "w":1.25, "h":1.25}, - {"label":"k3E", "x":5, "y":4, "w":1.25, "h":1.25}, - {"label":"k3G", "x":8.75, "y":4, "w":1.25, "h":1.25}, - {"label":"k3H", "x":10, "y":4, "w":1.25, "h":1.25}, - {"label":"k3I", "x":11.25, "y":4, "w":1.25, "h":1.25}, - {"label":"k3J", "x":12.5, "y":4, "w":1.25, "h":1.25}, - {"label":"k3L", "x":16.5, "y":4, "w":1.25, "h":1.25}, - {"label":"k3M", "x":17.75, "y":4, "w":1.25, "h":1.25}, - {"label":"k3N", "x":19, "y":3.75, "w":1.25, "h":1.25}, - {"label":"k3O", "x":20.25, "y":4, "w":1.25, "h":1.25}, - {"label":"k3P", "x":21.5, "y":4.25, "w":1.25, "h":1.25}, - {"label":"k4A", "x":0, "y":5.5, "w":1.25, "h":1.25}, - {"label":"k4B", "x":1.25, "y":5.25, "w":1.25, "h":1.25}, - {"label":"k4C", "x":2.5, "y":5, "w":1.25, "h":1.25}, - {"label":"k4D", "x":3.75, "y":5.25, "w":1.25, "h":1.25}, - {"label":"k4E", "x":5, "y":5.25, "w":1.25, "h":1.25}, - {"label":"k4F", "x":6.5, "y":5.5, "w":1.25, "h":1.25}, - {"label":"k4G", "x":8.75, "y":5.25, "w":1.25, "h":1.25}, - {"label":"k4H", "x":10, "y":5.25, "w":1.25, "h":1.25}, - {"label":"k4I", "x":11.25, "y":5.25, "w":1.25, "h":1.25}, - {"label":"k4J", "x":12.5, "y":5.25, "w":1.25, "h":1.25}, - {"label":"k4K", "x":15, "y":5.5, "w":1.25, "h":1.25}, - {"label":"k4L", "x":16.5, "y":5.25, "w":1.25, "h":1.25}, - {"label":"k4M", "x":17.75, "y":5.25, "w":1.25, "h":1.25}, - {"label":"k4N", "x":19, "y":5, "w":1.25, "h":1.25}, - {"label":"k4O", "x":20.25, "y":5.25, "w":1.25, "h":1.25}, - {"label":"k4P", "x":21.5, "y":5.5, "w":1.25, "h":1.25}, - {"label":"k5B", "x":1.25, "y":6.5, "w":1.25, "h":1.25}, - {"label":"k5C", "x":2.5, "y":6.25, "w":1.25, "h":1.25}, - {"label":"k5E", "x":5.25, "y":6.75, "w":1.25, "h":1.25}, - {"label":"k5F", "x":6.55, "y":6.75, "w":1.25, "h":1.25}, - {"label":"k5G", "x":8.75, "y":6.5, "w":1.25, "h":1.25}, - {"label":"k5H", "x":10, "y":6.5, "w":1.25, "h":1.25}, - {"label":"k5I", "x":11.25, "y":6.5, "w":1.25, "h":1.25}, - {"label":"k5J", "x":12.5, "y":6.5, "w":1.25, "h":1.25}, - {"label":"k5K", "x":15, "y":6.75, "w":1.25, "h":1.25}, - {"label":"k5L", "x":16.25, "y":6.75, "w":1.25, "h":1.25}, - {"label":"k5N", "x":19, "y":6.25, "w":1.25, "h":1.25}, - {"label":"k5O", "x":20.25, "y":6.5, "w":1.25, "h":1.25} + {"label":"k0A", "x":0, "y":0.4}, + {"label":"k0B", "x":1, "y":0.2}, + {"label":"k0C", "x":2, "y":0}, + {"label":"k0D", "x":3, "y":0.2}, + {"label":"k0E", "x":4, "y":0.2}, + {"label":"k0F", "x":5, "y":0.2}, + {"label":"k0G", "x":7, "y":0.2}, + {"label":"k0H", "x":8, "y":0.2}, + {"label":"k0I", "x":9, "y":0.2}, + {"label":"k0J", "x":10, "y":0.2}, + {"label":"k0K", "x":12.2, "y":0.2}, + {"label":"k0L", "x":13.2, "y":0.2}, + {"label":"k0M", "x":14.2, "y":0.2}, + {"label":"k0N", "x":15.2, "y":0}, + {"label":"k0O", "x":16.2, "y":0.2}, + {"label":"k0P", "x":17.2, "y":0.4}, + + {"label":"k1A", "x":0, "y":1.4}, + {"label":"k1B", "x":1, "y":1.2}, + {"label":"k1C", "x":2, "y":1}, + {"label":"k1D", "x":3, "y":1.2}, + {"label":"k1E", "x":4, "y":1.2}, + {"label":"k1F", "x":5, "y":1.2}, + {"label":"k1G", "x":7, "y":1.2}, + {"label":"k1H", "x":8, "y":1.2}, + {"label":"k1I", "x":9, "y":1.2}, + {"label":"k1J", "x":10, "y":1.2}, + {"label":"k1K", "x":12.2, "y":1.2}, + {"label":"k1L", "x":13.2, "y":1.2}, + {"label":"k1M", "x":14.2, "y":1.2}, + {"label":"k1N", "x":15.2, "y":1}, + {"label":"k1O", "x":16.2, "y":1.2}, + {"label":"k1P", "x":17.2, "y":1.4}, + + {"label":"k2A", "x":0, "y":2.4}, + {"label":"k2B", "x":1, "y":2.2}, + {"label":"k2C", "x":2, "y":2}, + {"label":"k2D", "x":3, "y":2.2}, + {"label":"k2E", "x":4, "y":2.2}, + {"label":"k2F", "x":5, "y":2.2}, + {"label":"k2G", "x":7, "y":2.2}, + {"label":"k2H", "x":8, "y":2.2}, + {"label":"k2I", "x":9, "y":2.2}, + {"label":"k2J", "x":10, "y":2.2}, + {"label":"k2K", "x":12.2, "y":2.2}, + {"label":"k2L", "x":13.2, "y":2.2}, + {"label":"k2M", "x":14.2, "y":2.2}, + {"label":"k2N", "x":15.2, "y":2}, + {"label":"k2O", "x":16.2, "y":2.2}, + {"label":"k2P", "x":17.2, "y":2.4}, + + {"label":"k3A", "x":0, "y":3.4}, + {"label":"k3B", "x":1, "y":3.2}, + {"label":"k3C", "x":2, "y":3}, + {"label":"k3D", "x":3, "y":3.2}, + {"label":"k3E", "x":4, "y":3.2}, + {"label":"k3G", "x":7, "y":3.2}, + {"label":"k3H", "x":8, "y":3.2}, + {"label":"k3I", "x":9, "y":3.2}, + {"label":"k3J", "x":10, "y":3.2}, + {"label":"k3L", "x":13.2, "y":3.2}, + {"label":"k3M", "x":14.2, "y":3.2}, + {"label":"k3N", "x":15.2, "y":3}, + {"label":"k3O", "x":16.2, "y":3.2}, + {"label":"k3P", "x":17.2, "y":3.4}, + + {"label":"k4A", "x":0, "y":4.4}, + {"label":"k4B", "x":1, "y":4.2}, + {"label":"k4C", "x":2, "y":4}, + {"label":"k4D", "x":3, "y":4.2}, + {"label":"k4E", "x":4, "y":4.2}, + {"label":"k4F", "x":5.2, "y":4.4}, + {"label":"k4G", "x":7, "y":4.2}, + {"label":"k4H", "x":8, "y":4.2}, + {"label":"k4I", "x":9, "y":4.2}, + {"label":"k4J", "x":10, "y":4.2}, + {"label":"k4K", "x":12, "y":4.4}, + {"label":"k4L", "x":13.2, "y":4.2}, + {"label":"k4M", "x":14.2, "y":4.2}, + {"label":"k4N", "x":15.2, "y":4}, + {"label":"k4O", "x":16.2, "y":4.2}, + {"label":"k4P", "x":17.2, "y":4.4}, + + {"label":"k5B", "x":1, "y":5.2}, + {"label":"k5C", "x":2, "y":5}, + {"label":"k5E", "x":4.2, "y":5.4}, + {"label":"k5F", "x":5.24, "y":5.4}, + {"label":"k5G", "x":7, "y":5.2}, + {"label":"k5H", "x":8, "y":5.2}, + {"label":"k5I", "x":9, "y":5.2}, + {"label":"k5J", "x":10, "y":5.2}, + {"label":"k5K", "x":12, "y":5.4}, + {"label":"k5L", "x":13, "y":5.4}, + {"label":"k5N", "x":15.2, "y":5}, + {"label":"k5O", "x":16.2, "y":5.2} ] } } -- cgit v1.2.3 From b89abc402bdc70362dbb6d938eafaa8716b5d4ac Mon Sep 17 00:00:00 2001 From: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Date: Tue, 13 Jul 2021 18:14:27 +0900 Subject: [Keyboard] Update Symmetric70 keyboard prototype (#12707) * update handwired/symmetric70_proto/matrix.c * make keyboards/handwired/symmetric70_proto/promicro/ * add symmetric70_proto/debug_config.h, update symmetric70_proto/local_features.mk etc. set MATRIX_IO_DELAY macro make MTEST=mdelay0 symmetric70_proto/promicro:default:flash make MTEST=mdelay1 symmetric70_proto/promicro:default:flash make MTEST=mdelay10 symmetric70_proto/promicro:default:flash make MTEST=mdelay30 symmetric70_proto/promicro:default:flash set DEBUG_MATRIX_SCAN_RATE_ENABLE yes make MTEST=scan symmetric70_proto/promicro:default:flash set MATRIX_DEBUG_DELAY and MATRIX_IO_DELAY macro make MTEST=matrix_debug_delay,mdelay0 symmetric70_proto/promicro:default:flash set MATRIX_DEBUG_SCAN make MTEST=matrix_debug_scan symmetric70_proto/promicro:default:flash * add symmetric70_proto/matrix_debug/readme.md * update symmetric70_proto/matrix_debug/readme.md * update handwired/symmetric70_proto/readme.md * update handwired/symmetric70_proto/readme.md * update handwired/symmetric70_proto/*/readme.md * add handwired/symmetric70_proto/matrix_fast/ * update handwired/symmetric70_proto/matrix_fast/readme.md * fix typo in handwired/symmetric70_proto/matrix_fast/readme.md * update config.h under handwired/symmetric70_proto/promicro * add Proton C support to handwired/symmetric70_proto * add handwired/symmetric70_proto/proton_c/readme.md * add promicro/*/readme.md proton_c/*/readme.md * update handwired/symmetric70_proto/proton_c/proton_c.c support MATRIX_IO_DELAY_DEFAULT for testing. * Added another implementation of 'adaptive_delay'. * update symmetric70_proto/local_features.mk * update symmetric70_proto/matrix_fast/gpio_extr.h * add matrix_output_unselect_delay_ports() * add MTEST=adaptive_delay_fast option * update symmetric70_proto/matrix_debug/readme.md * update symmetric70_proto/matrix_fast/readme.md * update symmetric70_proto/matrix_debug/readme.md * Erase garbage * fix symmetric70_proto/proton_c/proton_c.c * improve adaptive_delay_fast in symmetric70_proto/matrix_debug/matrix.c * update symmetric70_proto/matrix_debug/readme.md * fix symmetric70_proto/matrix_debug/readme.md * Update keyboards/handwired/symmetric70_proto/proton_c/rules.mk Co-authored-by: Ryan * Update keyboards/handwired/symmetric70_proto/proton_c/rules.mk Co-authored-by: Ryan * Update keyboards/handwired/symmetric70_proto/local_features.mk Co-authored-by: Nick Brassel * Update keyboards/handwired/symmetric70_proto/local_features.mk Co-authored-by: Nick Brassel * Update keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c Co-authored-by: Nick Brassel * Update keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c Co-authored-by: Nick Brassel * Update keyboards/handwired/symmetric70_proto/local_features.mk Co-authored-by: Nick Brassel * Update keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c Co-authored-by: Nick Brassel * Update keyboards/handwired/symmetric70_proto/matrix_debug/readme.md Co-authored-by: Nick Brassel * Update keyboards/handwired/symmetric70_proto/matrix_debug/readme.md Co-authored-by: Nick Brassel * Update keyboards/handwired/symmetric70_proto/matrix_debug/readme.md Co-authored-by: Nick Brassel * Update keyboards/handwired/symmetric70_proto/matrix_fast/matrix_config_expand.c Co-authored-by: Nick Brassel Co-authored-by: Ryan Co-authored-by: Nick Brassel --- keyboards/handwired/symmetric70_proto/config.h | 150 ---------- .../handwired/symmetric70_proto/debug_config.h | 33 +++ .../handwired/symmetric70_proto/local_features.mk | 108 +++++++ keyboards/handwired/symmetric70_proto/matrix.c | 226 -------------- .../symmetric70_proto/matrix_debug/gpio_extr.h | 10 + .../symmetric70_proto/matrix_debug/matrix.c | 324 +++++++++++++++++++++ .../symmetric70_proto/matrix_debug/readme.md | 200 +++++++++++++ .../symmetric70_proto/matrix_fast/cpp_map.h | 53 ++++ .../symmetric70_proto/matrix_fast/gpio_extr.h | 28 ++ .../symmetric70_proto/matrix_fast/matrix.c | 234 +++++++++++++++ .../matrix_fast/matrix_config_expand.c | 234 +++++++++++++++ .../matrix_fast/matrix_extension_74hc15x.c | 72 +++++ .../symmetric70_proto/matrix_fast/matrix_extr.h | 36 +++ .../symmetric70_proto/matrix_fast/readme.md | 168 +++++++++++ .../symmetric70_proto/matrix_fast/test_config.h | 21 ++ .../matrix_fast/test_config_74hc157.h | 28 ++ .../matrix_fast/test_config_direct.h | 34 +++ .../handwired/symmetric70_proto/promicro/config.h | 157 ++++++++++ .../symmetric70_proto/promicro/fast/config.h | 52 ++++ .../symmetric70_proto/promicro/fast/readme.md | 1 + .../symmetric70_proto/promicro/fast/rules.mk | 6 + .../symmetric70_proto/promicro/normal/config.h | 41 +++ .../symmetric70_proto/promicro/normal/readme.md | 1 + .../symmetric70_proto/promicro/normal/rules.mk | 6 + .../handwired/symmetric70_proto/promicro/readme.md | 27 ++ .../handwired/symmetric70_proto/promicro/rules.mk | 22 ++ .../handwired/symmetric70_proto/proton_c/config.h | 165 +++++++++++ .../symmetric70_proto/proton_c/fast/config.h | 44 +++ .../symmetric70_proto/proton_c/fast/readme.md | 1 + .../symmetric70_proto/proton_c/fast/rules.mk | 6 + .../symmetric70_proto/proton_c/normal/config.h | 36 +++ .../symmetric70_proto/proton_c/normal/readme.md | 1 + .../symmetric70_proto/proton_c/normal/rules.mk | 6 + .../symmetric70_proto/proton_c/proton_c.c | 12 + .../handwired/symmetric70_proto/proton_c/readme.md | 26 ++ .../handwired/symmetric70_proto/proton_c/rules.mk | 23 ++ keyboards/handwired/symmetric70_proto/readme.md | 16 +- keyboards/handwired/symmetric70_proto/rules.mk | 27 -- 38 files changed, 2218 insertions(+), 417 deletions(-) delete mode 100644 keyboards/handwired/symmetric70_proto/config.h create mode 100644 keyboards/handwired/symmetric70_proto/debug_config.h create mode 100644 keyboards/handwired/symmetric70_proto/local_features.mk delete mode 100644 keyboards/handwired/symmetric70_proto/matrix.c create mode 100644 keyboards/handwired/symmetric70_proto/matrix_debug/gpio_extr.h create mode 100644 keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c create mode 100644 keyboards/handwired/symmetric70_proto/matrix_debug/readme.md create mode 100644 keyboards/handwired/symmetric70_proto/matrix_fast/cpp_map.h create mode 100644 keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h create mode 100644 keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c create mode 100644 keyboards/handwired/symmetric70_proto/matrix_fast/matrix_config_expand.c create mode 100644 keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c create mode 100644 keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extr.h create mode 100644 keyboards/handwired/symmetric70_proto/matrix_fast/readme.md create mode 100644 keyboards/handwired/symmetric70_proto/matrix_fast/test_config.h create mode 100644 keyboards/handwired/symmetric70_proto/matrix_fast/test_config_74hc157.h create mode 100644 keyboards/handwired/symmetric70_proto/matrix_fast/test_config_direct.h create mode 100644 keyboards/handwired/symmetric70_proto/promicro/config.h create mode 100644 keyboards/handwired/symmetric70_proto/promicro/fast/config.h create mode 100644 keyboards/handwired/symmetric70_proto/promicro/fast/readme.md create mode 100644 keyboards/handwired/symmetric70_proto/promicro/fast/rules.mk create mode 100644 keyboards/handwired/symmetric70_proto/promicro/normal/config.h create mode 100644 keyboards/handwired/symmetric70_proto/promicro/normal/readme.md create mode 100644 keyboards/handwired/symmetric70_proto/promicro/normal/rules.mk create mode 100644 keyboards/handwired/symmetric70_proto/promicro/readme.md create mode 100644 keyboards/handwired/symmetric70_proto/promicro/rules.mk create mode 100644 keyboards/handwired/symmetric70_proto/proton_c/config.h create mode 100644 keyboards/handwired/symmetric70_proto/proton_c/fast/config.h create mode 100644 keyboards/handwired/symmetric70_proto/proton_c/fast/readme.md create mode 100644 keyboards/handwired/symmetric70_proto/proton_c/fast/rules.mk create mode 100644 keyboards/handwired/symmetric70_proto/proton_c/normal/config.h create mode 100644 keyboards/handwired/symmetric70_proto/proton_c/normal/readme.md create mode 100644 keyboards/handwired/symmetric70_proto/proton_c/normal/rules.mk create mode 100644 keyboards/handwired/symmetric70_proto/proton_c/proton_c.c create mode 100644 keyboards/handwired/symmetric70_proto/proton_c/readme.md create mode 100644 keyboards/handwired/symmetric70_proto/proton_c/rules.mk delete mode 100644 keyboards/handwired/symmetric70_proto/rules.mk (limited to 'keyboards/handwired') diff --git a/keyboards/handwired/symmetric70_proto/config.h b/keyboards/handwired/symmetric70_proto/config.h deleted file mode 100644 index 2cdce5802c..0000000000 --- a/keyboards/handwired/symmetric70_proto/config.h +++ /dev/null @@ -1,150 +0,0 @@ -/* -Copyright 2020 mtei - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x2BE5 -#define DEVICE_VER 0x0001 -#define MANUFACTURER mtei -#define PRODUCT Symmetric70 prototype - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 16 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4,F4,F5,F5, F6,F6,F7,F7, B6,B6,B2,B2, B3,B3,B1,B1 } -#define UNUSED_PINS - -#define MATRIX_MUL_SEL { 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0 } -/* use 74HC157: quadruple 2-line to 1-line data selectors / multiplexers */ -#define MATRIX_MUL_SELECT B5 /* 74HC157 pin1:~A/B */ - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 - -//#define BACKLIGHT_PIN B7 -//#define BACKLIGHT_LEVELS 3 -//#define BACKLIGHT_BREATHING - -//#define RGB_DI_PIN E2 -//#ifdef RGB_DI_PIN -//# define RGBLED_NUM 16 -//# define RGBLIGHT_HUE_STEP 8 -//# define RGBLIGHT_SAT_STEP 8 -//# define RGBLIGHT_VAL_STEP 8 -//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -/*== all animations enable ==*/ -//# define RGBLIGHT_ANIMATIONS -/*== or choose animations ==*/ -//# define RGBLIGHT_EFFECT_BREATHING -//# define RGBLIGHT_EFFECT_RAINBOW_MOOD -//# define RGBLIGHT_EFFECT_RAINBOW_SWIRL -//# define RGBLIGHT_EFFECT_SNAKE -//# define RGBLIGHT_EFFECT_KNIGHT -//# define RGBLIGHT_EFFECT_CHRISTMAS -//# define RGBLIGHT_EFFECT_STATIC_GRADIENT -//# define RGBLIGHT_EFFECT_RGB_TEST -//# define RGBLIGHT_EFFECT_ALTERNATING -/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -/*==== use exp() and sin() ====*/ -//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -//#endif - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is useful for the Windows task manager shortcut (ctrl+shift+esc). - */ -//#define GRAVE_ESC_CTRL_OVERRIDE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT - -/* disable these deprecated features by default */ -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION - -/* Bootmagic Lite key configuration */ -//#define BOOTMAGIC_LITE_ROW 0 -//#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/handwired/symmetric70_proto/debug_config.h b/keyboards/handwired/symmetric70_proto/debug_config.h new file mode 100644 index 0000000000..cba99e402f --- /dev/null +++ b/keyboards/handwired/symmetric70_proto/debug_config.h @@ -0,0 +1,33 @@ +/* + * matrix.c testing macros + * MATRIX_DEBUG_SCAN: Measuring execution time of `matrix_scan()` + * MATRIX_DEBUG_DELAY: Observation of delay after `unselect_row()` + */ +#pragma once +#ifndef __ASSEMBLER__ +#include + +static inline void setDebugPinOutput_Low(void) { + setPinOutput(MATRIX_DEBUG_PIN); + writePinLow(MATRIX_DEBUG_PIN); +} + +#define MATRIX_DEBUG_PIN_INIT() setDebugPinOutput_Low() + +#ifdef MATRIX_DEBUG_SCAN +# define MATRIX_DEBUG_SCAN_START() writePinHigh(MATRIX_DEBUG_PIN) +# define MATRIX_DEBUG_SCAN_END() writePinLow(MATRIX_DEBUG_PIN) +#else +# define MATRIX_DEBUG_SCAN_START() +# define MATRIX_DEBUG_SCAN_END() +#endif + +#ifdef MATRIX_DEBUG_DELAY +# define MATRIX_DEBUG_DELAY_START() writePinHigh(MATRIX_DEBUG_PIN) +# define MATRIX_DEBUG_DELAY_END() writePinLow(MATRIX_DEBUG_PIN) +#else +# define MATRIX_DEBUG_DELAY_START() +# define MATRIX_DEBUG_DELAY_END() +#endif + +#endif // __ASSEMBLER__ diff --git a/keyboards/handwired/symmetric70_proto/local_features.mk b/keyboards/handwired/symmetric70_proto/local_features.mk new file mode 100644 index 0000000000..e5cd31a615 --- /dev/null +++ b/keyboards/handwired/symmetric70_proto/local_features.mk @@ -0,0 +1,108 @@ +# matrix.c testing options +# set MATRIX_IO_DELAY macro +# make MTEST=mdelay0 symmetric70_proto/{promicro|proton_c}/{fast|normal}:default:flash +# make MTEST=mdelay=1 symmetric70_proto/{promicro|proton_c}/{fast|normal}:default:flash +# make MTEST=mdelay=10 symmetric70_proto/{promicro|proton_c}/{fast|normal}:default:flash +# set DEBUG_MATRIX_SCAN_RATE_ENABLE yes +# make MTEST=scan symmetric70_proto/{promicro|proton_c}/{fast|normal}:default:flash +# set MATRIX_DEBUG_DELAY and MATRIX_IO_DELAY macro +# make MTEST=matrix_debug_delay,mdelay0 symmetric70_proto/{promicro|proton_c}/{fast|normal}:default:flash +# set MATRIX_DEBUG_SCAN +# make MTEST=matrix_debug_scan symmetric70_proto/{promicro|proton_c}/{fast|normal}:default:flash + +ifneq ($(strip $(MTEST)),) + define KEYBOARD_OPTION_PARSE + # parse 'consle', 'scan', 'no-scan', 'mdelay=?', 'mdelay0', + # 'adaptive_delay', 'always_delay', 'matrix_debug_delay', 'matrix_debug_scan' + $(if $(SHOW_PARSE),$(info parse .$1.)) #for debug 'make SHOW_PARSE=y ...' + ifeq ($(strip $1),console) + CONSOLE_ENABLE = yes + endif + ifeq ($(strip $1),scan) + DEBUG_MATRIX_SCAN_RATE_ENABLE = yes + endif + ifeq ($(strip $1),no-scan) + DEBUG_MATRIX_SCAN_RATE_ENABLE = no + endif + ifneq ($(filter mdelay=%,$1),) + MDELAY = $(patsubst mdelay=%,%,$1) + endif + ifeq ($(strip $1),mdelay0) + MDELAY = 0 + endif + ifeq ($(strip $1),common_delay) + MATRIX_COMMON_DELAY = yes + endif + ifeq ($(strip $1),adaptive_delay) + ADAPTIVE_DELAY = yes + endif + ifeq ($(strip $1),adaptive_delay2) + ADAPTIVE_DELAY2 = yes + endif + ifeq ($(strip $1),adaptive_delay_fast) + ADAPTIVE_DELAY_FAST = yes + endif + ifeq ($(strip $1),always_delay) + ALWAYS_DELAY = yes + endif + ifeq ($(strip $1),matrix_debug_delay) + MATRIX_DEBUG_DELAY = yes + MATRIX_DEBUG_SCAN = no + endif + ifeq ($(strip $1),matrix_debug_scan) + MATRIX_DEBUG_DELAY = no + MATRIX_DEBUG_SCAN = yes + endif + endef # end of KEYMAP_OPTION_PARSE + + COMMA=, + $(eval $(foreach A_OPTION_NAME,$(subst $(COMMA), ,$(MTEST)), \ + $(call KEYBOARD_OPTION_PARSE,$(A_OPTION_NAME)))) +endif + +ifneq ($(strip $(MDELAY)),) + OPT_DEFS += -DMATRIX_IO_DELAY=$(strip $(MDELAY)) +endif + +ifeq ($(strip $(ADAPTIVE_DELAY)),yes) + OPT_DEFS += -DMATRIX_IO_DELAY_ADAPTIVE +endif + +ifeq ($(strip $(ADAPTIVE_DELAY2)),yes) + OPT_DEFS += -DMATRIX_IO_DELAY_ADAPTIVE2 +endif + +ifeq ($(strip $(ADAPTIVE_DELAY_FAST)),yes) + OPT_DEFS += -DMATRIX_IO_DELAY_ADAPTIVE_FAST +endif + +ifeq ($(strip $(ALWAYS_DELAY)),yes) + OPT_DEFS += -DMATRIX_IO_DELAY_ALWAYS +endif + +ifeq ($(strip $(MATRIX_DEBUG_DELAY)),yes) + OPT_DEFS += -DMATRIX_DEBUG_DELAY + DEBUG_CONFIG = yes +endif + +ifeq ($(strip $(MATRIX_DEBUG_SCAN)),yes) + OPT_DEFS += -DMATRIX_DEBUG_SCAN + DEBUG_CONFIG = yes +endif + +ifeq ($(strip $(DEBUG_CONFIG)),yes) + # include "debug_config.h" from {promicro|proton_c}/config.h + OPT_DEFS += -DDEBUG_CONFIG +endif + +ifeq ($(strip $(MATRIX_COMMON_DELAY)),yes) + # use matrix_output_unselect_delay() in matrix_common.c + OPT_DEFS += -DMATRIX_IO_DELAY_DEFAULT +endif + +$(info -) +$(info - DEBUG_MATRIX_SCAN_RATE_ENABLE = $(DEBUG_MATRIX_SCAN_RATE_ENABLE)) +$(info - CONSOLE_ENABLE = $(CONSOLE_ENABLE)) +$(info - MDELAY = $(MDELAY)) +$(info - MATRIX_COMMON_DELAY = $(MATRIX_COMMON_DELAY)) +$(info - OPT_DEFS = $(OPT_DEFS)) diff --git a/keyboards/handwired/symmetric70_proto/matrix.c b/keyboards/handwired/symmetric70_proto/matrix.c deleted file mode 100644 index c016120737..0000000000 --- a/keyboards/handwired/symmetric70_proto/matrix.c +++ /dev/null @@ -1,226 +0,0 @@ -/* -Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ -#include -#include -#include "util.h" -#include "matrix.h" -#include "debounce.h" -#include "quantum.h" - -#ifdef DIRECT_PINS -static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS; -#elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW) -static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; -static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; -# ifdef MATRIX_MUL_SELECT -static const pin_t col_sel[MATRIX_COLS] = MATRIX_MUL_SEL; -# ifndef MATRIX_MUL_SELECT_DELAY -# define MATRIX_MUL_SELECT_DELAY 1 -# endif -# endif -#endif - -/* matrix state(1:on, 0:off) */ -extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values -extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values - -// matrix code - -#ifdef DIRECT_PINS - -static void init_pins(void) { - for (int row = 0; row < MATRIX_ROWS; row++) { - for (int col = 0; col < MATRIX_COLS; col++) { - pin_t pin = direct_pins[row][col]; - if (pin != NO_PIN) { - setPinInputHigh(pin); - } - } - } -} - -static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) { - // Start with a clear matrix row - matrix_row_t current_row_value = 0; - - for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { - pin_t pin = direct_pins[current_row][col_index]; - if (pin != NO_PIN) { - current_row_value |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index); - } - } - - // If the row has changed, store the row and return the changed flag. - if (current_matrix[current_row] != current_row_value) { - current_matrix[current_row] = current_row_value; - return true; - } - return false; -} - -#elif defined(DIODE_DIRECTION) -# if (DIODE_DIRECTION == COL2ROW) - -static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); -} - -static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); } - -static void unselect_rows(void) { - for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); - } -} - -static void init_pins(void) { -#ifdef MATRIX_MUL_SELECT - setPinOutput(MATRIX_MUL_SELECT); - writePinLow(MATRIX_MUL_SELECT); -#endif - unselect_rows(); - for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); - } -} - -static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) { - // Start with a clear matrix row - matrix_row_t current_row_value = 0; - - // Select row and wait for row selecton to stabilize - select_row(current_row); - matrix_io_delay(); - - // For each col... - for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { - // Select the col pin to read (active low) -#ifdef MATRIX_MUL_SELECT - writePin(MATRIX_MUL_SELECT,col_sel[col_index]); - __builtin_avr_delay_cycles(MATRIX_MUL_SELECT_DELAY); -#endif - uint8_t pin_state = readPin(col_pins[col_index]); - - // Populate the matrix row with the state of the col pin - current_row_value |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); - } - - // Unselect row - unselect_row(current_row); - - // If the row has changed, store the row and return the changed flag. - if (current_matrix[current_row] != current_row_value) { - current_matrix[current_row] = current_row_value; - return true; - } - return false; -} - -# elif (DIODE_DIRECTION == ROW2COL) - -static void select_col(uint8_t col) { - setPinOutput(col_pins[col]); - writePinLow(col_pins[col]); -} - -static void unselect_col(uint8_t col) { setPinInputHigh(col_pins[col]); } - -static void unselect_cols(void) { - for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); - } -} - -static void init_pins(void) { - unselect_cols(); - for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); - } -} - -static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { - bool matrix_changed = false; - - // Select col and wait for col selecton to stabilize - select_col(current_col); - matrix_io_delay(); - - // For each row... - for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { - // Store last value of row prior to reading - matrix_row_t last_row_value = current_matrix[row_index]; - matrix_row_t current_row_value = last_row_value; - - // Check row pin state - if (readPin(row_pins[row_index]) == 0) { - // Pin LO, set col bit - current_row_value |= (MATRIX_ROW_SHIFTER << current_col); - } else { - // Pin HI, clear col bit - current_row_value &= ~(MATRIX_ROW_SHIFTER << current_col); - } - - // Determine if the matrix changed state - if ((last_row_value != current_row_value)) { - matrix_changed |= true; - current_matrix[row_index] = current_row_value; - } - } - - // Unselect col - unselect_col(current_col); - - return matrix_changed; -} - -# else -# error DIODE_DIRECTION must be one of COL2ROW or ROW2COL! -# endif -#else -# error DIODE_DIRECTION is not defined! -#endif - -void matrix_init_custom(void) { - // initialize key pins - init_pins(); - - // initialize matrix state: all keys off - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - raw_matrix[i] = 0; - matrix[i] = 0; - } - -} - -bool matrix_scan_custom(matrix_row_t current_matrix[]) { - bool changed = false; - -#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW) - // Set row, read cols - for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) { - changed |= read_cols_on_row(current_matrix, current_row); - } -#elif (DIODE_DIRECTION == ROW2COL) - // Set col, read rows - for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) { - changed |= read_rows_on_col(current_matrix, current_col); - } -#endif - - return changed; -} diff --git a/keyboards/handwired/symmetric70_proto/matrix_debug/gpio_extr.h b/keyboards/handwired/symmetric70_proto/matrix_debug/gpio_extr.h new file mode 100644 index 0000000000..c7d08309d0 --- /dev/null +++ b/keyboards/handwired/symmetric70_proto/matrix_debug/gpio_extr.h @@ -0,0 +1,10 @@ +#pragma once +// clang-format off + +#if defined(__AVR__) +# define readPort(port) PINx_ADDRESS(port) +typedef uint8_t port_data_t; +#else +# define readPort(qmk_pin) palReadPort(PAL_PORT(qmk_pin)) +typedef uint16_t port_data_t; +#endif diff --git a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c new file mode 100644 index 0000000000..c84efe2915 --- /dev/null +++ b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c @@ -0,0 +1,324 @@ +/* +Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ +#include +#include +#include "util.h" +#include "matrix.h" +#include "debounce.h" +#include "quantum.h" +#ifndef readPort +# include "gpio_extr.h" +#endif + +#ifndef MATRIX_DEBUG_PIN +# define MATRIX_DEBUG_PIN_INIT() +# define MATRIX_DEBUG_SCAN_START() +# define MATRIX_DEBUG_SCAN_END() +# define MATRIX_DEBUG_DELAY_START() +# define MATRIX_DEBUG_DELAY_END() +# define MATRIX_DEBUG_GAP() +#else +# define MATRIX_DEBUG_GAP() asm volatile("nop \n nop":::"memory") +#endif + +#ifndef MATRIX_IO_DELAY_ALWAYS +# define MATRIX_IO_DELAY_ALWAYS 0 +#endif + +#ifdef DIRECT_PINS +static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS; +#elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW) +static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; +static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; +# ifdef MATRIX_MUL_SELECT +static const pin_t col_sel[MATRIX_COLS] = MATRIX_MUL_SEL; +# endif +#endif + +#ifdef MATRIX_IO_DELAY_PORTS +static const pin_t delay_ports[] = { MATRIX_IO_DELAY_PORTS }; +static const port_data_t delay_masks[] = { MATRIX_IO_DELAY_MASKS }; +# ifdef MATRIX_IO_DELAY_MULSEL +static const uint8_t delay_sel[] = { MATRIX_IO_DELAY_MULSEL }; +# endif +#endif + +/* matrix state(1:on, 0:off) */ +extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values +extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values + +static inline void setPinOutput_writeLow(pin_t pin) { + ATOMIC_BLOCK_FORCEON { + setPinOutput(pin); + writePinLow(pin); + } +} + +static inline void setPinInputHigh_atomic(pin_t pin) { + ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); } +} + +// matrix code + +#ifdef DIRECT_PINS + +static void init_pins(void) { + for (int row = 0; row < MATRIX_ROWS; row++) { + for (int col = 0; col < MATRIX_COLS; col++) { + pin_t pin = direct_pins[row][col]; + if (pin != NO_PIN) { + setPinInputHigh(pin); + } + } + } +} + +static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) { + // Start with a clear matrix row + matrix_row_t current_row_value = 0; + + for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { + pin_t pin = direct_pins[current_row][col_index]; + if (pin != NO_PIN) { + current_row_value |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index); + } + } + + // If the row has changed, store the row and return the changed flag. + if (current_matrix[current_row] != current_row_value) { + current_matrix[current_row] = current_row_value; + return true; + } + return false; +} + +#elif defined(DIODE_DIRECTION) +# if (DIODE_DIRECTION == COL2ROW) + +static void select_row(uint8_t row) { setPinOutput_writeLow(row_pins[row]); } + +static void unselect_row(uint8_t row) { setPinInputHigh_atomic(row_pins[row]); } + +static void unselect_rows(void) { + for (uint8_t x = 0; x < MATRIX_ROWS; x++) { + setPinInputHigh_atomic(row_pins[x]); + } +} + +static void init_pins(void) { +#ifdef MATRIX_MUL_SELECT + setPinOutput(MATRIX_MUL_SELECT); + writePinLow(MATRIX_MUL_SELECT); +#endif + unselect_rows(); + for (uint8_t x = 0; x < MATRIX_COLS; x++) { + setPinInputHigh_atomic(col_pins[x]); + } +} + +static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) { + // Start with a clear matrix row + matrix_row_t current_row_value = 0; + + // Select row + select_row(current_row); + matrix_output_select_delay(); + + // For each col... + for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { + // Select the col pin to read (active low) +#ifdef MATRIX_MUL_SELECT + writePin(MATRIX_MUL_SELECT,col_sel[col_index]); + waitInputPinDelay(); +#endif + uint8_t pin_state = readPin(col_pins[col_index]); + + // Populate the matrix row with the state of the col pin + current_row_value |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); + } + + // Unselect row + unselect_row(current_row); +#ifdef MATRIX_IO_DELAY_PORTS + if (current_row_value) { // wait for col signal to go HIGH + bool is_pressed; + do { + MATRIX_DEBUG_DELAY_START(); + is_pressed = false; + for (uint8_t i = 0; i < sizeof(delay_ports)/sizeof(pin_t); i++ ) { +# ifdef MATRIX_IO_DELAY_MULSEL + writePin(MATRIX_MUL_SELECT, delay_sel[i]); + waitInputPinDelay(); +# endif + is_pressed |= ( (readPort(delay_ports[i]) & delay_masks[i]) != delay_masks[i] ); + } + MATRIX_DEBUG_DELAY_END(); + } while (is_pressed); + } +#endif +#ifdef MATRIX_IO_DELAY_ADAPTIVE + if (current_row_value) { // wait for col signal to go HIGH + for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { + MATRIX_DEBUG_DELAY_START(); +#ifdef MATRIX_MUL_SELECT + writePin(MATRIX_MUL_SELECT,col_sel[col_index]); + waitInputPinDelay(); +#endif + while (readPin(col_pins[col_index]) == 0) {} + MATRIX_DEBUG_DELAY_END(); + } + } +#endif +#ifdef MATRIX_IO_DELAY_ADAPTIVE2 + if (current_row_value) { // wait for col signal to go HIGH + pin_t state; + do { + MATRIX_DEBUG_DELAY_START(); + state = 0; + for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { + MATRIX_DEBUG_DELAY_END(); + MATRIX_DEBUG_DELAY_START(); +#ifdef MATRIX_MUL_SELECT + writePin(MATRIX_MUL_SELECT,col_sel[col_index]); + waitInputPinDelay(); +#endif + state |= (readPin(col_pins[col_index]) == 0); + } + MATRIX_DEBUG_DELAY_END(); + } while (state); + } +#endif + if (MATRIX_IO_DELAY_ALWAYS || current_row + 1 < MATRIX_ROWS) { + MATRIX_DEBUG_DELAY_START(); + matrix_output_unselect_delay(); // wait for col signal to go HIGH + MATRIX_DEBUG_DELAY_END(); + } + + // If the row has changed, store the row and return the changed flag. + if (current_matrix[current_row] != current_row_value) { + current_matrix[current_row] = current_row_value; + return true; + } + return false; +} + +# elif (DIODE_DIRECTION == ROW2COL) + +static void select_col(uint8_t col) { setPinOutput_writeLow(col_pins[col]); } + +static void unselect_col(uint8_t col) { setPinInputHigh_atomic(col_pins[col]); } + +static void unselect_cols(void) { + for (uint8_t x = 0; x < MATRIX_COLS; x++) { + setPinInputHigh_atomic(col_pins[x]); + } +} + +static void init_pins(void) { + unselect_cols(); + for (uint8_t x = 0; x < MATRIX_ROWS; x++) { + setPinInputHigh_atomic(row_pins[x]); + } +} + +static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { + bool matrix_changed = false; + + // Select col + select_col(current_col); + matrix_output_select_delay(); + + // For each row... + for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { + // Store last value of row prior to reading + matrix_row_t last_row_value = current_matrix[row_index]; + matrix_row_t current_row_value = last_row_value; + + // Check row pin state + if (readPin(row_pins[row_index]) == 0) { + // Pin LO, set col bit + current_row_value |= (MATRIX_ROW_SHIFTER << current_col); + } else { + // Pin HI, clear col bit + current_row_value &= ~(MATRIX_ROW_SHIFTER << current_col); + } + + // Determine if the matrix changed state + if ((last_row_value != current_row_value)) { + matrix_changed |= true; + current_matrix[row_index] = current_row_value; + } + } + + // Unselect col + unselect_col(current_col); + if (MATRIX_IO_DELAY_ALWAYS || current_col + 1 < MATRIX_COLS) { + matrix_output_unselect_delay(); // wait for col signal to go HIGH + } + + return matrix_changed; +} + +# else +# error DIODE_DIRECTION must be one of COL2ROW or ROW2COL! +# endif +#else +# error DIODE_DIRECTION is not defined! +#endif + +void matrix_init(void) { + // initialize key pins + init_pins(); + + // initialize matrix state: all keys off + for (uint8_t i = 0; i < MATRIX_ROWS; i++) { + raw_matrix[i] = 0; + matrix[i] = 0; + } + + debounce_init(MATRIX_ROWS); + + matrix_init_quantum(); +} + +uint8_t matrix_scan(void) { + bool changed = false; + MATRIX_DEBUG_PIN_INIT(); + + MATRIX_DEBUG_SCAN_START(); +#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW) + // Set row, read cols + for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) { + changed |= read_cols_on_row(raw_matrix, current_row); + } +#elif (DIODE_DIRECTION == ROW2COL) + // Set col, read rows + for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) { + changed |= read_rows_on_col(raw_matrix, current_col); + } +#endif + MATRIX_DEBUG_SCAN_END(); MATRIX_DEBUG_GAP(); + + MATRIX_DEBUG_SCAN_START(); + debounce(raw_matrix, matrix, MATRIX_ROWS, changed); + MATRIX_DEBUG_SCAN_END(); MATRIX_DEBUG_GAP(); + + MATRIX_DEBUG_SCAN_START(); + matrix_scan_quantum(); + MATRIX_DEBUG_SCAN_END(); + return (uint8_t)changed; +} diff --git a/keyboards/handwired/symmetric70_proto/matrix_debug/readme.md b/keyboards/handwired/symmetric70_proto/matrix_debug/readme.md new file mode 100644 index 0000000000..3e45db87e9 --- /dev/null +++ b/keyboards/handwired/symmetric70_proto/matrix_debug/readme.md @@ -0,0 +1,200 @@ +# Debug version matrix.c + +This matrix.c is quantum/matrix.c with the following additions: + +* Added the MATRIX_DEBUG_SCAN_{START/END} macro to measure the execution time of matrix_scan(). +* Added the MATRIX_DEBUG_DELAY_{START/END} macro to measure delay time. +* Added the MATRIX_MUL_SELECT handling for symmetric70_proto. + +## Compile + +* Set MATRIX_IO_DELAY value + * `make MTEST=mdelay0 handwired/symmetric70_proto/promicro/normal:default:flash` + * `make MTEST=mdelay=1 handwired/symmetric70_proto/promicro/normal:default:flash` + * `make MTEST=mdelay=2 handwired/symmetric70_proto/promicro/normal:default:flash` + * `make MTEST=mdelay=3 handwired/symmetric70_proto/promicro/normal:default:flash` + * `make MTEST=mdelay=4 handwired/symmetric70_proto/promicro/normal:default:flash` + * `make MTEST=mdelay=5 handwired/symmetric70_proto/promicro/normal:default:flash` + * `make MTEST=mdelay=10 handwired/symmetric70_proto/promicro/normal:default:flash` + * `make MTEST=mdelay=20 handwired/symmetric70_proto/promicro/normal:default:flash` + * `make MTEST=mdelay=30 handwired/symmetric70_proto/promicro/normal:default:flash` +* Measure the execution time of matrix_scan() + * `make MTEST=matrix_debug_scan[,..] handwired/symmetric70_proto/promicro/normal:default:flash` +* Measure delay time. + * `make MTEST=matrix_debug_delay[,..] handwired/symmetric70_proto/promicro/normal:default:flash` +* Change the behavior of delay + * `make MTEST=matrix_debug_delay,always_delay handwired/symmetric70_proto/promicro/normal:default:flash` + * `make MTEST=matrix_debug_delay,adaptive_delay,mdelay0 handwired/symmetric70_proto/promicro/normal:default:flash` + * `make MTEST=matrix_debug_delay,adaptive_delay_fast,mdelay0 handwired/symmetric70_proto/promicro/normal:default:flash` + +## Measurement result +### Pro Micro (ATmega32u4 16Mhz) +#### Default setting (show `matrix_scan()` time) + - `make MTEST=matrix_debug_scan handwired/symmetric70_proto/promicro/normal:default:flash` + - CH1: Row 0 + - CH2: Row 1 + - CH3: Row 4 + - CH4: matrix_scan() + - Execution time of matrix_scan() 503us + - Frequency of matrix scan 1.81kHz (551.0us) + ![DS1Z_QuickPrint2](https://user-images.githubusercontent.com/2170248/115994477-0ba64400-a612-11eb-98ba-b8cc362f26ac.png) + +#### Always call `matrix_output_unselect_delay()` (show `matrix_scan()` time, default MATRIX_IO_DELAY) + - `make MTEST=matrix_debug_scan,always_delay handwired/symmetric70_proto/promicro/normal:default:flash` + - CH1: Row 0 + - CH2: Row 1 + - CH3: Row 4 + - CH4: matrix_scan() + - Execution time of matrix_scan() 521us + - Frequency of matrix scan 1.76kHz (568.5us) + ![DS1Z_QuickPrint1](https://user-images.githubusercontent.com/2170248/115994488-1660d900-a612-11eb-83b1-cd820607db03.png) + +#### Adaptive delay (show `matrix_scan()` time, MATRIX_IO_DELAY = 0) + - `make MTEST=matrix_debug_scan,mdelay0,adaptive_delay handwired/symmetric70_proto/promicro/normal:default:flash` + - CH1: Row 0 + - CH2: Row 1 + - CH3: Row 4 + - CH4: matrix_scan() + - Execution time of matrix_scan() 383us + - Frequency of matrix scan 2.32kHz (431us) + ![DS1Z_QuickPrint3](https://user-images.githubusercontent.com/2170248/115994939-034f0880-a614-11eb-861f-b83a31efa51a.png) + +#### Adaptive delay (show delay time, MATRIX_IO_DELAY = 0) + - `make MTEST=matrix_debug_delay,mdelay0,adaptive_delay handwired/symmetric70_proto/promicro/normal:default:flash` + +##### Press R0C1, R1C1 key + - CH1: Row 0 + - CH2: Row 1 + - CH3: Row 4 + - CH4: delay time + - Delay time 68us + - Frequency of matrix scan 1.77kHz (565us) + ![DS1Z_QuickPrint55](https://user-images.githubusercontent.com/2170248/119561268-ead33900-bddf-11eb-9cc4-7e04826486cf.png) + +#### Fast adaptive delay (show `matrix_scan()` time, MATRIX_IO_DELAY = 0) + - `make MTEST=matrix_debug_scan,mdelay0,adaptive_delay_fast handwired/symmetric70_proto/promicro/normal:default:flash` + - CH1: Row 0 + - CH2: Row 1 + - CH3: Row 4 + - CH4: matrix_scan() + - Execution time of matrix_scan() 382us + - Frequency of matrix scan 2.33kHz (428us) + ![DS1Z_QuickPrint56](https://user-images.githubusercontent.com/2170248/119561280-eeff5680-bddf-11eb-9576-e4cf64751955.png) + +#### Fast adaptive delay (show delay time, MATRIX_IO_DELAY = 0) + - `make MTEST=matrix_debug_delay,mdelay0,adaptive_delay_fast handwired/symmetric70_proto/promicro/normal:default:flash` + +##### Press R0C1, R1C1 key + - CH1: Row 0 + - CH2: Row 1 + - CH3: Row 4 + - CH4: delay time + - Delay time 11us + - Frequency of matrix scan 2.21kHz (452us) + ![DS1Z_QuickPrint57](https://user-images.githubusercontent.com/2170248/119561318-faeb1880-bddf-11eb-8592-694f9ecb2248.png) + +### Proton C (STM32F303 72MHz) +#### Default setting (show `matrix_scan()` time) + - `make MTEST=matrix_debug_scan handwired/symmetric70_proto/proton_c/normal:default:flash` + - CH1: Row 0 + - CH2: Row 1 + - CH3: Row 4 + - CH4: matrix_scan() + - Execution time of matrix_scan() 210us + - Frequency of matrix scan 4.35kHz (230.0us) + ![DS1Z_QuickPrint16](https://user-images.githubusercontent.com/2170248/116131295-2ad2cd80-a707-11eb-8d0a-6f7912456e03.png) + +#### Always call `matrix_output_unselect_delay()` (show `matrix_scan()` time, default MATRIX_IO_DELAY) + - `make MTEST=matrix_debug_scan,always_delay handwired/symmetric70_proto/proton_c/normal:default:flash` + - CH1: Row 0 + - CH2: Row 1 + - CH3: Row 4 + - CH4: matrix_scan() + - Execution time of matrix_scan() 242us + - Frequency of matrix scan 3.85kHz (260.0us) + ![DS1Z_QuickPrint17](https://user-images.githubusercontent.com/2170248/116131308-31f9db80-a707-11eb-8db7-d1960fa7b068.png) + +#### Adaptive delay (show `matrix_scan()` time, MATRIX_IO_DELAY = 0) + - `make MTEST=matrix_debug_scan,mdelay0,adaptive_delay handwired/symmetric70_proto/proton_c/normal:default:flash` + - CH1: Row 0 + - CH2: Row 1 + - CH3: Row 4 + - CH4: matrix_scan() + - Execution time of matrix_scan() 76.4us + - Frequency of matrix scan 10.6kHz (94.4us) + ![DS1Z_QuickPrint18](https://user-images.githubusercontent.com/2170248/116131369-44741500-a707-11eb-9c74-fa39d9e80947.png) + +#### Adaptive delay (show delay time, MATRIX_IO_DELAY = 0) + - `make MTEST=matrix_debug_delay,mdelay0,adaptive_delay handwired/symmetric70_proto/proton_c/normal:default:flash` + +##### Press R0C1, R1C1 key + - CH1: Row 0 + - CH2: Row 1 + - CH3: Row 4 + - CH4: delay time + - Delay time 7.6us + - Frequency of matrix scan 9.47kHz (105.6us) + ![DS1Z_QuickPrint58](https://user-images.githubusercontent.com/2170248/119666783-a3e15400-be70-11eb-9a58-220032117efd.png) + +##### Connect a 500pF capacitor between C2 line and GND, Press R0C2, R1C2, R2C2, R3C2, R4C2 keys + - CH1: Row 0 + - CH2: Row 1 + - CH3: Col 2 + - CH4: delay time + - Delay time 12us + alpha + - Frequency of matrix scan 5.45kHz (183us) + - Threshold Voltage 1.9V + ![DS1Z_QuickPrint59](https://user-images.githubusercontent.com/2170248/119666946-cc694e00-be70-11eb-9b97-4c500416d774.png) + +##### Connect a 1000pF capacitor between C2 line and GND, Press R0C2, R1C2, R2C2, R3C2, R4C2 keys + - CH1: Row 0 + - CH2: Row 1 + - CH3: Col 2 + - CH4: delay time + - Delay time 20us + alpha + - Frequency of matrix scan 4.48kHz (223us) + - Threshold Voltage 1.9V + ![DS1Z_QuickPrint60](https://user-images.githubusercontent.com/2170248/119667127-f3c01b00-be70-11eb-8e7f-6f0a81f95e97.png) + +#### Fast adaptive delay (show `matrix_scan()` time, MATRIX_IO_DELAY = 0) + - `make MTEST=matrix_debug_scan,mdelay0,adaptive_delay_fast handwired/symmetric70_proto/proton_c/normal:default:flash` + - CH1: Row 0 + - CH2: Row 1 + - CH3: Row 4 + - CH4: matrix_scan() + - Execution time of matrix_scan() 75.6us + - Frequency of matrix scan 10.8kHz (92.2us) + ![DS1Z_QuickPrint62](https://user-images.githubusercontent.com/2170248/119667218-0b979f00-be71-11eb-946c-16f0a0454056.png) + +#### Fast adaptive delay (show delay time, MATRIX_IO_DELAY = 0) + - `make MTEST=matrix_debug_delay,mdelay0,adaptive_delay_fast handwired/symmetric70_proto/proton_c/normal:default:flash` + +##### Press R0C1, R1C1 key + - CH1: Row 0 + - CH2: Row 1 + - CH3: Row 4 + - CH4: delay time + - Delay time 1.6us + - Frequency of matrix scan 10.6kHz (94.4us) + ![DS1Z_QuickPrint63](https://user-images.githubusercontent.com/2170248/119667378-33870280-be71-11eb-95aa-64213138ddac.png) + ![DS1Z_QuickPrint64](https://user-images.githubusercontent.com/2170248/119667504-52859480-be71-11eb-963e-eebc6e3da9dc.png) + +##### Connect a 500pF capacitor between C2 line and GND, Press R0C2, R1C2, R2C2, R3C2, R4C2 keys + - CH1: Row 0 + - CH2: Row 1 + - CH3: Col 2 + - CH4: delay time + - Delay time 13.2us + - Frequency of matrix scan 6.58kHz (152.6us) + - Threshold Voltage 1.9V + ![DS1Z_QuickPrint65](https://user-images.githubusercontent.com/2170248/119667644-72b55380-be71-11eb-8030-854de1900408.png) + +##### Connect a 1000pF capacitor between C2 line and GND, Press R0C2, R1C2, R2C2, R3C2, R4C2 keys + - CH1: Row 0 + - CH2: Row 1 + - CH3: Col 2 + - CH4: delay time + - Delay time 20us + - Frequency of matrix scan 5.30kHz (188.8us) + - Threshold Voltage 1.9V + ![DS1Z_QuickPrint66](https://user-images.githubusercontent.com/2170248/119667785-8f518b80-be71-11eb-8d40-fc3293aa072b.png) diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/cpp_map.h b/keyboards/handwired/symmetric70_proto/matrix_fast/cpp_map.h new file mode 100644 index 0000000000..d197be6d9f --- /dev/null +++ b/keyboards/handwired/symmetric70_proto/matrix_fast/cpp_map.h @@ -0,0 +1,53 @@ +/* Copyright 2021 mtei + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#pragma once +// clang-format off + +#define _MAP1(E, _1) E(_1) +#define _MAP2(E, _1,_2) E(_1) E(_2) +#define _MAP3(E, _1,_2,_3) E(_1) E(_2) E(_3) +#define _MAP4(E, _1,_2,_3,_4) E(_1) E(_2) E(_3) E(_4) +#define _MAP5(E, _1,_2,_3,_4,_5) E(_1) E(_2) E(_3) E(_4) E(_5) +#define _MAP6(E, _1,_2,_3,_4,_5,_6) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) +#define _MAP7(E, _1,_2,_3,_4,_5,_6,_7) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) +#define _MAP8(E, _1,_2,_3,_4,_5,_6,_7,_8) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) E(_8) +#define _MAP9(E, _1,_2,_3,_4,_5,_6,_7,_8,_9) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) E(_8) E(_9) +#define _MAP10(E, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) E(_8) E(_9) E(_10) +#define _MAP11(E, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) E(_8) E(_9) E(_10) E(_11) +#define _MAP12(E, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) E(_8) E(_9) E(_10) E(_11) E(_12) +#define _MAP13(E, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,_13) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) E(_8) E(_9) E(_10) E(_11) E(_12) E(_13) +#define _MAP14(E, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,_13,_14) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) E(_8) E(_9) E(_10) E(_11) E(_12) E(_13) E(_14) +#define _MAP15(E, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,_13,_14,_15) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) E(_8) E(_9) E(_10) E(_11) E(_12) E(_13) E(_14) E(_15) +#define _MAP16(E, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,_13,_14,_15,_16) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) E(_8) E(_9) E(_10) E(_11) E(_12) E(_13) E(_14) E(_15) E(_16) +#define _MAP17(E, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,_13,_14,_15,_16,_17) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) E(_8) E(_9) E(_10) E(_11) E(_12) E(_13) E(_14) E(_15) E(_16) E(_17) +#define _MAP18(E, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,_13,_14,_15,_16,_17,_18) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) E(_8) E(_9) E(_10) E(_11) E(_12) E(_13) E(_14) E(_15) E(_16) E(_17) E(_18) +#define _MAP19(E, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,_13,_14,_15,_16,_17,_18,_19) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) E(_8) E(_9) E(_10) E(_11) E(_12) E(_13) E(_14) E(_15) E(_16) E(_17) E(_18) E(_19) +#define _MAP20(E, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,_13,_14,_15,_16,_17,_18,_19,_20) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) E(_8) E(_9) E(_10) E(_11) E(_12) E(_13) E(_14) E(_15) E(_16) E(_17) E(_18) E(_19) E(_20) +#define _MAP21(E, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,_13,_14,_15,_16,_17,_18,_19,_20,_21) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) E(_8) E(_9) E(_10) E(_11) E(_12) E(_13) E(_14) E(_15) E(_16) E(_17) E(_18) E(_19) E(_20) E(_21) +#define _MAP22(E, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,_13,_14,_15,_16,_17,_18,_19,_20,_21,_22) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) E(_8) E(_9) E(_10) E(_11) E(_12) E(_13) E(_14) E(_15) E(_16) E(_17) E(_18) E(_19) E(_20) E(_21) E(_22) +#define _MAP23(E, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,_13,_14,_15,_16,_17,_18,_19,_20,_21,_22,_23) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) E(_8) E(_9) E(_10) E(_11) E(_12) E(_13) E(_14) E(_15) E(_16) E(_17) E(_18) E(_19) E(_20) E(_21) E(_22) E(_23) +#define _MAP24(E, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,_13,_14,_15,_16,_17,_18,_19,_20,_21,_22,_23,_24) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) E(_8) E(_9) E(_10) E(_11) E(_12) E(_13) E(_14) E(_15) E(_16) E(_17) E(_18) E(_19) E(_20) E(_21) E(_22) E(_23) E(_24) +#define _MAP25(E, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,_13,_14,_15,_16,_17,_18,_19,_20,_21,_22,_23,_24,_25) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) E(_8) E(_9) E(_10) E(_11) E(_12) E(_13) E(_14) E(_15) E(_16) E(_17) E(_18) E(_19) E(_20) E(_21) E(_22) E(_23) E(_24) E(_25) +#define _MAP26(E, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,_13,_14,_15,_16,_17,_18,_19,_20,_21,_22,_23,_24,_25,_26) E(_1) E(_2) E(_3) E(_4) E(_5) E(_6) E(_7) E(_8) E(_9) E(_10) E(_11) E(_12) E(_13) E(_14) E(_15) E(_16) E(_17) E(_18) E(_19) E(_20) E(_21) E(_22) E(_23) E(_24) E(_25) E(_26) +#define _MAP27(E, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,_13,_14,_15,_16,_17,_18,_19,_20,_21,_22,_23,_24,_