From 02ccc50e6085a9d0a4f38f252960e2d14ffe4d1f Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Mar 2023 14:02:04 +1100 Subject: Remove more empty headers (#20155) --- keyboards/hhkb/ansi/ansi.c | 1 - keyboards/hhkb/jp/jp.c | 1 - 2 files changed, 2 deletions(-) delete mode 100644 keyboards/hhkb/ansi/ansi.c delete mode 100644 keyboards/hhkb/jp/jp.c (limited to 'keyboards/hhkb') diff --git a/keyboards/hhkb/ansi/ansi.c b/keyboards/hhkb/ansi/ansi.c deleted file mode 100644 index cefc4e0690..0000000000 --- a/keyboards/hhkb/ansi/ansi.c +++ /dev/null @@ -1 +0,0 @@ -#include "ansi.h" \ No newline at end of file diff --git a/keyboards/hhkb/jp/jp.c b/keyboards/hhkb/jp/jp.c deleted file mode 100644 index f1f1388c77..0000000000 --- a/keyboards/hhkb/jp/jp.c +++ /dev/null @@ -1 +0,0 @@ -#include "jp.h" \ No newline at end of file -- cgit v1.2.3 From 1e07ff1fb108a305feca659b17ec03ba3e750455 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 24 Mar 2023 04:21:37 +1100 Subject: Fix some more missing `#pragma once`s (#20241) --- keyboards/hhkb/rn42/suart.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'keyboards/hhkb') diff --git a/keyboards/hhkb/rn42/suart.h b/keyboards/hhkb/rn42/suart.h index 7d92be0692..40e40648c7 100644 --- a/keyboards/hhkb/rn42/suart.h +++ b/keyboards/hhkb/rn42/suart.h @@ -1,8 +1,5 @@ -#ifndef SUART -#define SUART +#pragma once void xmit(uint8_t); uint8_t rcvr(void); uint8_t recv(void); - -#endif /* SUART */ -- cgit v1.2.3 From 1899793f27c9b165b55b28b086bd989f12baf137 Mon Sep 17 00:00:00 2001 From: precondition <57645186+precondition@users.noreply.github.com> Date: Mon, 3 Apr 2023 07:32:47 +0200 Subject: Make IGNORE_MOD_TAP_INTERRUPT the default behaviour for mod-taps (#20211) --- keyboards/hhkb/ansi/keymaps/blakedietz/config.h | 4 ---- keyboards/hhkb/ansi/keymaps/brett/config.h | 3 --- 2 files changed, 7 deletions(-) (limited to 'keyboards/hhkb') diff --git a/keyboards/hhkb/ansi/keymaps/blakedietz/config.h b/keyboards/hhkb/ansi/keymaps/blakedietz/config.h index e0d2bce0f1..8d281f2604 100644 --- a/keyboards/hhkb/ansi/keymaps/blakedietz/config.h +++ b/keyboards/hhkb/ansi/keymaps/blakedietz/config.h @@ -17,8 +17,4 @@ //#define TAPPING_TOGGLE 1 // TAPPING_TERM is set in config.h this defaults to 200 -// This makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when -// you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) -#define IGNORE_MOD_TAP_INTERRUPT - #endif diff --git a/keyboards/hhkb/ansi/keymaps/brett/config.h b/keyboards/hhkb/ansi/keymaps/brett/config.h index 8f769d603f..0711122d74 100644 --- a/keyboards/hhkb/ansi/keymaps/brett/config.h +++ b/keyboards/hhkb/ansi/keymaps/brett/config.h @@ -12,6 +12,3 @@ #define LSPO_MOD KC_LSFT #define RSPC_MOD KC_RSFT -// This makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when -// you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) -#define IGNORE_MOD_TAP_INTERRUPT -- cgit v1.2.3 From 5bd68e3695a82ff504c358c33445b4530c2a327f Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 12 Apr 2023 13:42:51 +1000 Subject: Move single `LAYOUT`s to data driven (#20365) --- keyboards/hhkb/ansi/ansi.h | 23 -------- keyboards/hhkb/ansi/info.json | 127 ++++++++++++++++++++++-------------------- 2 files changed, 67 insertions(+), 83 deletions(-) delete mode 100644 keyboards/hhkb/ansi/ansi.h (limited to 'keyboards/hhkb') diff --git a/keyboards/hhkb/ansi/ansi.h b/keyboards/hhkb/ansi/ansi.h deleted file mode 100644 index 28e8d2fef8..0000000000 --- a/keyboards/hhkb/ansi/ansi.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K31, K30, K00, K10, K11, K20, K21, K40, K41, K60, K61, K70, K71, K50, K51, \ - K32, K01, K02, K13, K12, K23, K22, K42, K43, K62, K63, K73, K72, K52, \ - K33, K04, K03, K14, K15, K24, K25, K45, K44, K65, K64, K74, K53, \ - K34, K05, K06, K07, K16, K17, K26, K46, K66, K76, K75, K55, K54, \ - K35, K36, K37, K57, K56) \ - \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \ - { K30, K31, K32, K33, K34, K35, K36, K37 }, \ - { K40, K41, K42, K43, K44, K45, K46, KC_NO }, \ - { K50, K51, K52, K53, K54, K55, K56, K57 }, \ - { K60, K61, K62, K63, K64, K65, K66, KC_NO }, \ - { K70, K71, K72, K73, K74, K75, K76, KC_NO } \ -} - -#define LAYOUT_60_hhkb LAYOUT diff --git a/keyboards/hhkb/ansi/info.json b/keyboards/hhkb/ansi/info.json index c892d2b14b..16349fc6e2 100644 --- a/keyboards/hhkb/ansi/info.json +++ b/keyboards/hhkb/ansi/info.json @@ -9,69 +9,76 @@ "device_version": "1.0.4" }, "community_layouts": ["60_hhkb"], + "layout_aliases": { + "LAYOUT_60_hhkb": "LAYOUT" + }, "layouts": { "LAYOUT": { "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "!", "x": 1, "y": 0 }, - { "label": "@", "x": 2, "y": 0 }, - { "label": "#", "x": 3, "y": 0 }, - { "label": "$", "x": 4, "y": 0 }, - { "label": "%", "x": 5, "y": 0 }, - { "label": "^", "x": 6, "y": 0 }, - { "label": "&", "x": 7, "y": 0 }, - { "label": "*", "x": 8, "y": 0 }, - { "label": "(", "x": 9, "y": 0 }, - { "label": ")", "x": 10, "y": 0 }, - { "label": "_", "x": 11, "y": 0 }, - { "label": "+", "x": 12, "y": 0 }, - { "label": "|", "x": 13, "y": 0 }, - { "label": "~", "x": 14, "y": 0 }, - { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 1 }, - { "label": "W", "x": 2.5, "y": 1 }, - { "label": "E", "x": 3.5, "y": 1 }, - { "label": "R", "x": 4.5, "y": 1 }, - { "label": "T", "x": 5.5, "y": 1 }, - { "label": "Y", "x": 6.5, "y": 1 }, - { "label": "U", "x": 7.5, "y": 1 }, - { "label": "I", "x": 8.5, "y": 1 }, - { "label": "O", "x": 9.5, "y": 1 }, - { "label": "P", "x": 10.5, "y": 1 }, - { "label": "{", "x": 11.5, "y": 1 }, - { "label": "}", "x": 12.5, "y": 1 }, - { "label": "Delete", "x": 13.5, "y": 1, "w": 1.5 }, - { "label": "Control", "x": 0, "y": 2, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 2 }, - { "label": "S", "x": 2.75, "y": 2 }, - { "label": "D", "x": 3.75, "y": 2 }, - { "label": "F", "x": 4.75, "y": 2 }, - { "label": "G", "x": 5.75, "y": 2 }, - { "label": "H", "x": 6.75, "y": 2 }, - { "label": "J", "x": 7.75, "y": 2 }, - { "label": "K", "x": 8.75, "y": 2 }, - { "label": "L", "x": 9.75, "y": 2 }, - { "label": ":", "x": 10.75, "y": 2 }, - { "label": "\"", "x": 11.75, "y": 2 }, - { "label": "Return", "x": 12.75, "y": 2, "w": 2.25 }, - { "label": "Shift", "x": 0, "y": 3, "w": 2.25 }, - { "label": "Z", "x": 2.25, "y": 3 }, - { "label": "X", "x": 3.25, "y": 3 }, - { "label": "C", "x": 4.25, "y": 3 }, - { "label": "V", "x": 5.25, "y": 3 }, - { "label": "B", "x": 6.25, "y": 3 }, - { "label": "N", "x": 7.25, "y": 3 }, - { "label": "M", "x": 8.25, "y": 3 }, - { "label": "<", "x": 9.25, "y": 3 }, - { "label": ">", "x": 10.25, "y": 3 }, - { "label": "?", "x": 11.25, "y": 3 }, - { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 }, - { "label": "Fn", "x": 14, "y": 3 }, - { "label": "", "x": 1.5, "y": 4 }, - { "label": "", "x": 2.5, "y": 4, "w": 1.5 }, - { "x": 4, "y": 4, "w": 6 }, - { "label": "", "x": 10, "y": 4, "w": 1.5 }, - { "label": "", "x": 11.5, "y": 4 } + {"matrix": [3, 1], "x": 0, "y": 0}, + {"matrix": [3, 0], "x": 1, "y": 0}, + {"matrix": [0, 0], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 3, "y": 0}, + {"matrix": [1, 1], "x": 4, "y": 0}, + {"matrix": [2, 0], "x": 5, "y": 0}, + {"matrix": [2, 1], "x": 6, "y": 0}, + {"matrix": [4, 0], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0}, + {"matrix": [6, 0], "x": 9, "y": 0}, + {"matrix": [6, 1], "x": 10, "y": 0}, + {"matrix": [7, 0], "x": 11, "y": 0}, + {"matrix": [7, 1], "x": 12, "y": 0}, + {"matrix": [5, 0], "x": 13, "y": 0}, + {"matrix": [5, 1], "x": 14, "y": 0}, + + {"matrix": [3, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 1}, + {"matrix": [0, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [2, 2], "x": 6.5, "y": 1}, + {"matrix": [4, 2], "x": 7.5, "y": 1}, + {"matrix": [4, 3], "x": 8.5, "y": 1}, + {"matrix": [6, 2], "x": 9.5, "y": 1}, + {"matrix": [6, 3], "x": 10.5, "y": 1}, + {"matrix": [7, 3], "x": 11.5, "y": 1}, + {"matrix": [7, 2], "x": 12.5, "y": 1}, + {"matrix": [5, 2], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [3, 3], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 4], "x": 1.75, "y": 2}, + {"matrix": [0, 3], "x": 2.75, "y": 2}, + {"matrix": [1, 4], "x": 3.75, "y": 2}, + {"matrix": [1, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 4], "x": 5.75, "y": 2}, + {"matrix": [2, 5], "x": 6.75, "y": 2}, + {"matrix": [4, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [6, 5], "x": 9.75, "y": 2}, + {"matrix": [6, 4], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [5, 3], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 4], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [0, 5], "x": 2.25, "y": 3}, + {"matrix": [0, 6], "x": 3.25, "y": 3}, + {"matrix": [0, 7], "x": 4.25, "y": 3}, + {"matrix": [1, 6], "x": 5.25, "y": 3}, + {"matrix": [1, 7], "x": 6.25, "y": 3}, + {"matrix": [2, 6], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [6, 6], "x": 9.25, "y": 3}, + {"matrix": [7, 6], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, + {"matrix": [5, 5], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [5, 4], "x": 14, "y": 3}, + + {"matrix": [3, 5], "x": 1.5, "y": 4}, + {"matrix": [3, 6], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [3, 7], "x": 4, "y": 4, "w": 6}, + {"matrix": [5, 7], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [5, 6], "x": 11.5, "y": 4} ] } } -- cgit v1.2.3 From 0ddb7d7863d180c571091dd1fa154abb53de5a04 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 15 Apr 2023 21:09:08 +1000 Subject: Move single `60_ansi`, `60_hhkb` and `60_iso` layouts to data driven (#20438) --- keyboards/hhkb/yang/info.json | 124 ++++++++++++++++++++++-------------------- keyboards/hhkb/yang/yang.c | 2 +- keyboards/hhkb/yang/yang.h | 36 ------------ 3 files changed, 65 insertions(+), 97 deletions(-) delete mode 100644 keyboards/hhkb/yang/yang.h (limited to 'keyboards/hhkb') diff --git a/keyboards/hhkb/yang/info.json b/keyboards/hhkb/yang/info.json index dc465cea96..bfff105e90 100644 --- a/keyboards/hhkb/yang/info.json +++ b/keyboards/hhkb/yang/info.json @@ -18,66 +18,70 @@ "layouts": { "LAYOUT_60_hhkb": { "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "!", "x": 1, "y": 0 }, - { "label": "@", "x": 2, "y": 0 }, - { "label": "#", "x": 3, "y": 0 }, - { "label": "$", "x": 4, "y": 0 }, - { "label": "%", "x": 5, "y": 0 }, - { "label": "^", "x": 6, "y": 0 }, - { "label": "&", "x": 7, "y": 0 }, - { "label": "*", "x": 8, "y": 0 }, - { "label": "(", "x": 9, "y": 0 }, - { "label": ")", "x": 10, "y": 0 }, - { "label": "_", "x": 11, "y": 0 }, - { "label": "+", "x": 12, "y": 0 }, - { "label": "|", "x": 13, "y": 0 }, - { "label": "~", "x": 14, "y": 0 }, - { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 1 }, - { "label": "W", "x": 2.5, "y": 1 }, - { "label": "E", "x": 3.5, "y": 1 }, - { "label": "R", "x": 4.5, "y": 1 }, - { "label": "T", "x": 5.5, "y": 1 }, - { "label": "Y", "x": 6.5, "y": 1 }, - { "label": "U", "x": 7.5, "y": 1 }, - { "label": "I", "x": 8.5, "y": 1 }, - { "label": "O", "x": 9.5, "y": 1 }, - { "label": "P", "x": 10.5, "y": 1 }, - { "label": "{", "x": 11.5, "y": 1 }, - { "label": "}", "x": 12.5, "y": 1 }, - { "label": "Delete", "x": 13.5, "y": 1, "w": 1.5 }, - { "label": "Control", "x": 0, "y": 2, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 2 }, - { "label": "S", "x": 2.75, "y": 2 }, - { "label": "D", "x": 3.75, "y": 2 }, - { "label": "F", "x": 4.75, "y": 2 }, - { "label": "G", "x": 5.75, "y": 2 }, - { "label": "H", "x": 6.75, "y": 2 }, - { "label": "J", "x": 7.75, "y": 2 }, - { "label": "K", "x": 8.75, "y": 2 }, - { "label": "L", "x": 9.75, "y": 2 }, - { "label": ":", "x": 10.75, "y": 2 }, - { "label": "\"", "x": 11.75, "y": 2 }, - { "label": "Return", "x": 12.75, "y": 2, "w": 2.25 }, - { "label": "Shift", "x": 0, "y": 3, "w": 2.25 }, - { "label": "Z", "x": 2.25, "y": 3 }, - { "label": "X", "x": 3.25, "y": 3 }, - { "label": "C", "x": 4.25, "y": 3 }, - { "label": "V", "x": 5.25, "y": 3 }, - { "label": "B", "x": 6.25, "y": 3 }, - { "label": "N", "x": 7.25, "y": 3 }, - { "label": "M", "x": 8.25, "y": 3 }, - { "label": "<", "x": 9.25, "y": 3 }, - { "label": ">", "x": 10.25, "y": 3 }, - { "label": "?", "x": 11.25, "y": 3 }, - { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 }, - { "label": "Fn", "x": 14, "y": 3 }, - { "label": "", "x": 1.5, "y": 4 }, - { "label": "", "x": 2.5, "y": 4, "w": 1.5 }, - { "x": 4, "y": 4, "w": 6 }, - { "label": "", "x": 10, "y": 4, "w": 1.5 }, - { "label": "", "x": 11.5, "y": 4 } + {"matrix": [3, 1], "x": 0, "y": 0}, + {"matrix": [3, 0], "x": 1, "y": 0}, + {"matrix": [0, 0], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 3, "y": 0}, + {"matrix": [1, 1], "x": 4, "y": 0}, + {"matrix": [2, 0], "x": 5, "y": 0}, + {"matrix": [2, 1], "x": 6, "y": 0}, + {"matrix": [4, 0], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0}, + {"matrix": [6, 0], "x": 9, "y": 0}, + {"matrix": [6, 1], "x": 10, "y": 0}, + {"matrix": [7, 0], "x": 11, "y": 0}, + {"matrix": [7, 1], "x": 12, "y": 0}, + {"matrix": [5, 0], "x": 13, "y": 0}, + {"matrix": [5, 1], "x": 14, "y": 0}, + + {"matrix": [3, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 1}, + {"matrix": [0, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [2, 2], "x": 6.5, "y": 1}, + {"matrix": [4, 2], "x": 7.5, "y": 1}, + {"matrix": [4, 3], "x": 8.5, "y": 1}, + {"matrix": [6, 2], "x": 9.5, "y": 1}, + {"matrix": [6, 3], "x": 10.5, "y": 1}, + {"matrix": [7, 3], "x": 11.5, "y": 1}, + {"matrix": [7, 2], "x": 12.5, "y": 1}, + {"matrix": [5, 2], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [3, 3], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 4], "x": 1.75, "y": 2}, + {"matrix": [0, 3], "x": 2.75, "y": 2}, + {"matrix": [1, 4], "x": 3.75, "y": 2}, + {"matrix": [1, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 4], "x": 5.75, "y": 2}, + {"matrix": [2, 5], "x": 6.75, "y": 2}, + {"matrix": [4, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [6, 5], "x": 9.75, "y": 2}, + {"matrix": [6, 4], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [5, 3], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 4], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [0, 5], "x": 2.25, "y": 3}, + {"matrix": [0, 6], "x": 3.25, "y": 3}, + {"matrix": [0, 7], "x": 4.25, "y": 3}, + {"matrix": [1, 6], "x": 5.25, "y": 3}, + {"matrix": [1, 7], "x": 6.25, "y": 3}, + {"matrix": [2, 6], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [6, 6], "x": 9.25, "y": 3}, + {"matrix": [7, 6], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, + {"matrix": [5, 5], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [5, 4], "x": 14, "y": 3}, + + {"matrix": [3, 5], "x": 1.5, "y": 4}, + {"matrix": [3, 6], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [3, 7], "x": 4, "y": 4, "w": 6}, + {"matrix": [5, 7], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [5, 6], "x": 11.5, "y": 4} ] } } diff --git a/keyboards/hhkb/yang/yang.c b/keyboards/hhkb/yang/yang.c index 7ae0d76390..548f0dd734 100644 --- a/keyboards/hhkb/yang/yang.c +++ b/keyboards/hhkb/yang/yang.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "yang.h" +#include "quantum.h" extern uint8_t power_save_level; diff --git a/keyboards/hhkb/yang/yang.h b/keyboards/hhkb/yang/yang.h deleted file mode 100644 index 4858c18554..0000000000 --- a/keyboards/hhkb/yang/yang.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2021 Kan-Ru Chen - * - * 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 "quantum.h" - -#define LAYOUT_60_hhkb( \ - K31, K30, K00, K10, K11, K20, K21, K40, K41, K60, K61, K70, K71, K50, K51, \ - K32, K01, K02, K13, K12, K23, K22, K42, K43, K62, K63, K73, K72, K52, \ - K33, K04, K03, K14, K15, K24, K25, K45, K44, K65, K64, K74, K53, \ - K34, K05, K06, K07, K16, K17, K26, K46, K66, K76, K75, K55, K54, \ - K35, K36, K37, K57, K56) \ - \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \ - { K30, K31, K32, K33, K34, K35, K36, K37 }, \ - { K40, K41, K42, K43, K44, K45, K46, KC_NO }, \ - { K50, K51, K52, K53, K54, K55, K56, K57 }, \ - { K60, K61, K62, K63, K64, K65, K66, KC_NO }, \ - { K70, K71, K72, K73, K74, K75, K76, KC_NO } \ -} -- cgit v1.2.3 From f111bea3cda240b7c54bff2e12b5043b7b0797f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 25 Apr 2023 02:38:35 +1000 Subject: Move miscellaneous layouts to data driven (#20516) --- keyboards/hhkb/jp/info.json | 144 +++++++++++++++++++++++--------------------- keyboards/hhkb/jp/jp.h | 28 --------- 2 files changed, 75 insertions(+), 97 deletions(-) delete mode 100644 keyboards/hhkb/jp/jp.h (limited to 'keyboards/hhkb') diff --git a/keyboards/hhkb/jp/info.json b/keyboards/hhkb/jp/info.json index cc05d105bf..589cf98dde 100644 --- a/keyboards/hhkb/jp/info.json +++ b/keyboards/hhkb/jp/info.json @@ -13,75 +13,81 @@ "layouts": { "LAYOUT_jp": { "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "!", "x": 1, "y": 0 }, - { "label": "\"", "x": 2, "y": 0 }, - { "label": "#", "x": 3, "y": 0 }, - { "label": "$", "x": 4, "y": 0 }, - { "label": "%", "x": 5, "y": 0 }, - { "label": "&", "x": 6, "y": 0 }, - { "label": "'", "x": 7, "y": 0 }, - { "label": "(", "x": 8, "y": 0 }, - { "label": ")", "x": 9, "y": 0 }, - { "label": "", "x": 10, "y": 0 }, - { "label": "=", "x": 11, "y": 0 }, - { "label": "~", "x": 12, "y": 0 }, - { "label": "|", "x": 13, "y": 0 }, - { "label": "BS", "x": 14, "y": 0 }, - { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 1 }, - { "label": "W", "x": 2.5, "y": 1 }, - { "label": "E", "x": 3.5, "y": 1 }, - { "label": "R", "x": 4.5, "y": 1 }, - { "label": "T", "x": 5.5, "y": 1 }, - { "label": "Y", "x": 6.5, "y": 1 }, - { "label": "U", "x": 7.5, "y": 1 }, - { "label": "I", "x": 8.5, "y": 1 }, - { "label": "O", "x": 9.5, "y": 1 }, - { "label": "P", "x": 10.5, "y": 1 }, - { "label": "`", "x": 11.5, "y": 1 }, - { "label": "{", "x": 12.5, "y": 1 }, - { "label": "Enter", "x": 13.75, "y": 1, "w": 1.25, "h": 2 }, - { "label": "Control", "x": 0, "y": 2, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 2 }, - { "label": "S", "x": 2.75, "y": 2 }, - { "label": "D", "x": 3.75, "y": 2 }, - { "label": "F", "x": 4.75, "y": 2 }, - { "label": "G", "x": 5.75, "y": 2 }, - { "label": "H", "x": 6.75, "y": 2 }, - { "label": "J", "x": 7.75, "y": 2 }, - { "label": "K", "x": 8.75, "y": 2 }, - { "label": "L", "x": 9.75, "y": 2 }, - { "label": "+", "x": 10.75, "y": 2 }, - { "label": "*", "x": 11.75, "y": 2 }, - { "label": "}", "x": 12.75, "y": 2 }, - { "label": "Shift", "x": 0, "y": 3, "w": 2 }, - { "label": "Z", "x": 2, "y": 3 }, - { "label": "X", "x": 3, "y": 3 }, - { "label": "C", "x": 4, "y": 3 }, - { "label": "V", "x": 5, "y": 3 }, - { "label": "B", "x": 6, "y": 3 }, - { "label": "N", "x": 7, "y": 3 }, - { "label": "M", "x": 8, "y": 3 }, - { "label": "<", "x": 9, "y": 3 }, - { "label": ">", "x": 10, "y": 3 }, - { "label": "?", "x": 11, "y": 3 }, - { "label": "_", "x": 12, "y": 3 }, - { "label": "\u2191", "x": 13, "y": 3 }, - { "label": "Shift", "x": 14, "y": 3 }, - { "label": "Fn", "x": 0, "y": 4 }, - { "label": "HH", "x": 1.25, "y": 4 }, - { "label": "\u2662", "x": 2.25, "y": 4 }, - { "label": "", "x": 3.25, "y": 4 }, - { "label": "NN", "x": 4.25, "y": 4 }, - { "x": 5.25, "y": 4, "w": 2.5 }, - { "label": "\u25cc", "x": 7.75, "y": 4 }, - { "label": "Kana", "x": 8.75, "y": 4 }, - { "label": "", "x": 9.75, "y": 4 }, - { "label": "Fn", "x": 10.75, "y": 4 }, - { "label": "\u2190", "x": 12, "y": 4 }, - { "label": "\u2193", "x": 13, "y": 4 }, - { "label": "\u2192", "x": 14, "y": 4 } + {"matrix": [0, 2], "x": 0, "y": 0}, + {"matrix": [3, 2], "x": 1, "y": 0}, + {"matrix": [6, 2], "x": 2, "y": 0}, + {"matrix": [2, 2], "x": 3, "y": 0}, + {"matrix": [1, 2], "x": 4, "y": 0}, + {"matrix": [5, 2], "x": 5, "y": 0}, + {"matrix": [7, 2], "x": 6, "y": 0}, + {"matrix": [10, 2], "x": 7, "y": 0}, + {"matrix": [9, 2], "x": 8, "y": 0}, + {"matrix": [8, 2], "x": 9, "y": 0}, + {"matrix": [11, 2], "x": 10, "y": 0}, + {"matrix": [14, 2], "x": 11, "y": 0}, + {"matrix": [15, 2], "x": 12, "y": 0}, + {"matrix": [13, 2], "x": 13, "y": 0}, + {"matrix": [12, 2], "x": 14, "y": 0}, + + {"matrix": [0, 3], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [6, 3], "x": 1.5, "y": 1}, + {"matrix": [2, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [5, 3], "x": 4.5, "y": 1}, + {"matrix": [7, 3], "x": 5.5, "y": 1}, + {"matrix": [10, 3], "x": 6.5, "y": 1}, + {"matrix": [9, 3], "x": 7.5, "y": 1}, + {"matrix": [8, 3], "x": 8.5, "y": 1}, + {"matrix": [11, 3], "x": 9.5, "y": 1}, + {"matrix": [14, 3], "x": 10.5, "y": 1}, + {"matrix": [15, 3], "x": 11.5, "y": 1}, + {"matrix": [13, 3], "x": 12.5, "y": 1}, + {"matrix": [0, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [6, 6], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 6], "x": 1.75, "y": 2}, + {"matrix": [1, 6], "x": 2.75, "y": 2}, + {"matrix": [5, 6], "x": 3.75, "y": 2}, + {"matrix": [7, 6], "x": 4.75, "y": 2}, + {"matrix": [10, 6], "x": 5.75, "y": 2}, + {"matrix": [9, 6], "x": 6.75, "y": 2}, + {"matrix": [8, 6], "x": 7.75, "y": 2}, + {"matrix": [11, 6], "x": 8.75, "y": 2}, + {"matrix": [14, 6], "x": 9.75, "y": 2}, + {"matrix": [15, 6], "x": 10.75, "y": 2}, + {"matrix": [13, 6], "x": 11.75, "y": 2}, + {"matrix": [12, 6], "x": 12.75, "y": 2}, + + {"matrix": [0, 5], "x": 0, "y": 3, "w": 2}, + {"matrix": [6, 5], "x": 2, "y": 3}, + {"matrix": [2, 5], "x": 3, "y": 3}, + {"matrix": [1, 5], "x": 4, "y": 3}, + {"matrix": [5, 5], "x": 5, "y": 3}, + {"matrix": [7, 5], "x": 6, "y": 3}, + {"matrix": [10, 5], "x": 7, "y": 3}, + {"matrix": [9, 5], "x": 8, "y": 3}, + {"matrix": [8, 5], "x": 9, "y": 3}, + {"matrix": [11, 5], "x": 10, "y": 3}, + {"matrix": [14, 5], "x": 11, "y": 3}, + {"matrix": [15, 5], "x": 12, "y": 3}, + {"matrix": [13, 5], "x": 13, "y": 3}, + {"matrix": [12, 5], "x": 14, "y": 3}, + + {"matrix": [0, 4], "x": 0, "y": 4}, + + {"matrix": [3, 4], "x": 1.25, "y": 4}, + {"matrix": [6, 4], "x": 2.25, "y": 4}, + {"matrix": [2, 4], "x": 3.25, "y": 4}, + {"matrix": [1, 4], "x": 4.25, "y": 4}, + {"matrix": [7, 4], "x": 5.25, "y": 4, "w": 2.5}, + {"matrix": [9, 4], "x": 7.75, "y": 4}, + {"matrix": [8, 4], "x": 8.75, "y": 4}, + {"matrix": [11, 4], "x": 9.75, "y": 4}, + {"matrix": [14, 4], "x": 10.75, "y": 4}, + + {"matrix": [15, 4], "x": 12, "y": 4}, + {"matrix": [13, 4], "x": 13, "y": 4}, + {"matrix": [12, 4], "x": 14, "y": 4} ] } } diff --git a/keyboards/hhkb/jp/jp.h b/keyboards/hhkb/jp/jp.h deleted file mode 100644 index b243e5546c..0000000000 --- a/keyboards/hhkb/jp/jp.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_jp( \ - K02, K32, K62, K22, K12, K52, K72, KA2, K92, K82, KB2, KE2, KF2, KD2, KC2, \ - K03, K63, K23, K13, K53, K73, KA3, K93, K83, KB3, KE3, KF3, KD3, \ - K06, K66, K26, K16, K56, K76, KA6, K96, K86, KB6, KE6, KF6, KD6, KC6, \ - K05, K65, K25, K15, K55, K75, KA5, K95, K85, KB5, KE5, KF5, KD5, KC5, \ - K04, K34, K64, K24, K14, K74, K94, K84, KB4, KE4, KF4, KD4, KC4) \ -{ \ - { KC_NO, KC_NO, K02, K03, K04, K05, K06, KC_NO }, \ - { KC_NO, KC_NO, K12, K13, K14, K15, K16, KC_NO }, \ - { KC_NO, KC_NO, K22, K23, K24, K25, K26, KC_NO }, \ - { KC_NO, KC_NO, K32, KC_NO, K34, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, K52, K53, KC_NO, K55, K56, KC_NO }, \ - { KC_NO, KC_NO, K62, K63, K64, K65, K66, KC_NO }, \ - { KC_NO, KC_NO, K72, K73, K74, K75, K76, KC_NO }, \ - { KC_NO, KC_NO, K82, K83, K84, K85, K86, KC_NO }, \ - { KC_NO, KC_NO, K92, K93, K94, K95, K96, KC_NO }, \ - { KC_NO, KC_NO, KA2, KA3, KC_NO, KA5, KA6, KC_NO }, \ - { KC_NO, KC_NO, KB2, KB3, KB4, KB5, KB6, KC_NO }, \ - { KC_NO, KC_NO, KC2, KC_NO, KC4, KC5, KC6, KC_NO }, \ - { KC_NO, KC_NO, KD2, KD3, KD4, KD5, KD6, KC_NO }, \ - { KC_NO, KC_NO, KE2, KE3, KE4, KE5, KE6, KC_NO }, \ - { KC_NO, KC_NO, KF2, KF3, KF4, KF5, KF6, KC_NO } \ -} -- cgit v1.2.3 From 595f7db3840ab8155264e948d8ad5be5f8a1d0ed Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 22 May 2023 13:40:34 +1000 Subject: Remove HHKB RN42 code (#21007) --- keyboards/hhkb/ansi/config.h | 29 --- keyboards/hhkb/ansi/post_rules.mk | 18 -- keyboards/hhkb/ansi/rules.mk | 9 - keyboards/hhkb/jp/config.h | 29 --- keyboards/hhkb/jp/post_rules.mk | 18 -- keyboards/hhkb/jp/rules.mk | 9 - keyboards/hhkb/rn42/MEMO.txt | 262 --------------------- keyboards/hhkb/rn42/PowerSave.txt | 88 ------- keyboards/hhkb/rn42/RN42.txt | 408 --------------------------------- keyboards/hhkb/rn42/battery.c | 130 ----------- keyboards/hhkb/rn42/battery.h | 32 --- keyboards/hhkb/rn42/main.c | 106 --------- keyboards/hhkb/rn42/rn42.c | 253 --------------------- keyboards/hhkb/rn42/rn42.h | 27 --- keyboards/hhkb/rn42/rn42_task.c | 467 -------------------------------------- keyboards/hhkb/rn42/rn42_task.h | 11 - keyboards/hhkb/rn42/suart.S | 156 ------------- keyboards/hhkb/rn42/suart.h | 5 - keyboards/hhkb/serial.h | 46 ---- keyboards/hhkb/serial_uart.c | 133 ----------- keyboards/hhkb/yang/config.h | 34 --- 21 files changed, 2270 deletions(-) delete mode 100644 keyboards/hhkb/ansi/post_rules.mk delete mode 100644 keyboards/hhkb/jp/post_rules.mk delete mode 100644 keyboards/hhkb/rn42/MEMO.txt delete mode 100644 keyboards/hhkb/rn42/PowerSave.txt delete mode 100644 keyboards/hhkb/rn42/RN42.txt delete mode 100644 keyboards/hhkb/rn42/battery.c delete mode 100644 keyboards/hhkb/rn42/battery.h delete mode 100644 keyboards/hhkb/rn42/main.c delete mode 100644 keyboards/hhkb/rn42/rn42.c delete mode 100644 keyboards/hhkb/rn42/rn42.h delete mode 100644 keyboards/hhkb/rn42/rn42_task.c delete mode 100644 keyboards/hhkb/rn42/rn42_task.h delete mode 100644 keyboards/hhkb/rn42/suart.S delete mode 100644 keyboards/hhkb/rn42/suart.h delete mode 100644 keyboards/hhkb/serial.h delete mode 100644 keyboards/hhkb/serial_uart.c (limited to 'keyboards/hhkb') diff --git a/keyboards/hhkb/ansi/config.h b/keyboards/hhkb/ansi/config.h index 306b1df200..723fe29479 100644 --- a/keyboards/hhkb/ansi/config.h +++ b/keyboards/hhkb/ansi/config.h @@ -24,35 +24,6 @@ along with this program. If not, see . #define TAPPING_TERM 200 -#ifdef HHKB_RN42_ENABLE -// rn42 support -- acquired from the tmk repo. This is almost certainly not -// integrated with qmk in the correct way. - -#define SUART_OUT_PORT PORTD -#define SUART_OUT_BIT 0 -#define SUART_IN_PIN PIND -#define SUART_IN_BIT 1 - -#define SERIAL_UART_BAUD 115200 -#define SERIAL_UART_INIT_CUSTOM \ - /* RX interrupt, RX: enable */ \ - UCSR1B |= (1<. #define TAPPING_TERM 200 -#ifdef HHKB_RN42_ENABLE -// rn42 support -- acquired from the tmk repo. This is almost certainly not -// integrated with qmk in the correct way. - -#define SUART_OUT_PORT PORTD -#define SUART_OUT_BIT 0 -#define SUART_IN_PIN PIND -#define SUART_IN_BIT 1 - -#define SERIAL_UART_BAUD 115200 -#define SERIAL_UART_INIT_CUSTOM \ - /* RX interrupt, RX: enable */ \ - UCSR1B |= (1<46.0mA(WakeUp disabled DIPSW6) -- Pro current consumption - - active: 54.0mA - - suspended: 40.5mA(WakeUp enabled DIPSW6) - - suspended: 0.3mA(WakeUp disabled DIPSW6) - -- RN42 3.3V - - disconnected(Idle): 5mA (config mode) - - connected(Active): - SW,0000: 23-26mA - SW,0010: 27-29mA worse than 0000 for unknown reason - SW,0020: 17-19mA mouse NG - SW,0030: 13-16mA laggy mouse NG - SW,0050: 10-13mA laggy mouse NG - -- matrix power saving - - power saving while externally powered and not while unpluged -- confirm suspend mode lufa.c: matrix_power_*, suspend_wakeup_condition -- 8MHz clock -- When not connected in a few minutes get into deep sleep to save battery life -- CTS is needed for waking up from deep sleep? How deep sleep is activated? -- firmware controlled 3.3V DC converter to switch on/off BT module -- sleep MCU and BT module(keyboard is not used) -- deep sleep MCU and BT module(keyboard is not used for long time) -- deep sleep MCU and turn off BT module(keyboard is not used and not connected) -- Battery ADC; switching, high resistance - - switching gnd end of divider with PF4 - - high resistor 100K/1M? - capacitor 10nF - http://www.eevblog.com/forum/beginners/measuring-battery-voltage-without-consuming-current/ -- During USB suspend change clock source to internal RC from external Xtal(6.8) -- FRZCLK: you can freeze clock for power saving. still WAKEUPI and VBUSTI interrupts are available while freezing.(21.7.3) -- Suspend: Clear Suspend Bit, Freeze clock, disable PLL, MCU sleep(21.13) -- Voltage reference(8.1.1) - - to reduce power consumption while power down mode -- unset ADEN before sleep(24.7) - - - - - - - -Lipo ----- -850mA lasts around 9 hours(07/28) - -Sparkfun Polymer Lithium Ion Battery 850mAh: -https://www.sparkfun.com/products/341 -Lipo Cell spec: -https://www.sparkfun.com/datasheets/Batteries/063048%20Li-polymer.pdf -Protection spec: -http://dlnmh9ip6v2uc.cloudfront.net/datasheets/Prototyping/BatteryProtection.pdf - min typical max - over-charge 4.255 4.280 4.305 - over-charge discover? 4.030 4.080 4.130 - over-discharge 2.827 2.900 2.973 - over-discharge discover 3.022 3.100 3.178 - -ADC voltage monitor: voltage divider 10K+10K(0.5) - ADC=V*0.5/2.56*1024 - - V ADC - ------------------ - 4.20 0x347(839) - 3.10 0x26b(619) - - - - -TROUBLE SHOOT -------------- -07/16 After fix of voltage dividor on GPIO6, had a trouble that it could not send a char to BT module, though could receive. - Found R8 had wrong 1K resistor and changed to 10K, after that it can send to the module again. Not sure how it had sent with the wrong 1K before. - -07/18 On Linux, had an USB related trouble; keyboard or console didn't work for some reason. Changing PID cured this problem. Very annoying, took very long time before resolved it. - -12/07 rn42_rts() read 1 every time. R12 broke in open mode(no coductive), idk why, too much heat with soldering? and PF1 pin was not soldered. - It resolved with resoldering PF1 and new resistor on R12. - - - - -Done: -- low battery alert(solid light) 09/04 -- *** Rev.E BT test *** - DONE - - with MCP73832, new Schottky, tantalum caps - DONE 12/07 - * MCP73832 doesn't leak from Vcc pin when unpluged and battery powered - 34mV vs 2.07V(MCP73831) at Vcc pin - MCP73832 doesn't need revese protection diode D5 - * PMEG2010ER is very low VF while reverse current/voltage is high - VF=0.96 vs 1.98(RB160M-30TR)with Fluke 175 - Anode of D11 is 680mV vs 20mV(RB160M-30TR) - 780mV is still low < 1.4V VBUS plugin detection(21.11) - this doesn't cause false VBUS detect - and 780mV on MCP73832 Vcc pin is also no problem. - D5 can be removed. - - ADC divider switching - DONE 12/07 - * Drain and Source of Q4 Pch was reversed wrongly on Rev.E. - - - reverse current from Lipo charger - DONE 12/07 - * MCP73832 has no recverse current from Vcc pin unlike MCP73831 - - -- Rev.F design - DONE - - current measure point - DONE 12/08 - - change value of cap 68->47 - DONE 12/08 - - PPTC land pattern: no solder jumper, use 0Ohm resistor instead - CANCEL 12/08 - - Q4 Pch FET: wrong Drain and Source - DONE 12/08 - - D5 can be removed. - DONE 12/08 - - - -- BT_INDICATOR LED turns on wrongly when touching line or pin. -- pull-up enabled on PF6/GPIO2 08/30 -- Lipo charger configuration: fast charge time: USB charger spec? -- used 2kohm -- use LED of charger to alarm low battery. LED should be powered directly from Lipo? - cancel; powered from VUSB -- Use RTS in serial_uart.c to resolve missing chars from help message of RN-42 - done -- CTS/RTS lines are needed? just connect in loop back if no flow control is needed. - done -- add IO pin to charger status CHRG; LED control(low) and detect charge status(input HiZ) 07.24 -- LINKED: add trace on PIO2 to PF6 07.24 -- Lipo voltage ADC sensing -- Lipo charger MCP73831: needs capacitor 4.7uF *2 -- USB connection check - 07.01 -- BT on/off check: whether RX line is pulled up? - checking RTS 07.01 -- USB/BT switching BT is on -> BT, BT is off -> USB - 07.01 -- Under voltage lock out UVLO for protection of Lipo - Lipo has discharge protection at 3.100V 07.01 -- Power saving: HHKB scan, BT radio control - 9h with 850mAh, this is enough 07.01 -- Power selector doesn't work; Q4 MOSFET leaks from Lipo to USB power line. -- use Schottky instead 07/04 - -- wrongly suspended when powered from adapter without USB connection - DONE - - suspend event may occur when plug into adapter - - and never wake until conected to real USB line - - without debug print via USB no problem; CSW(wake just after suspend as real USB line) - - seems like USB print causes this problem after suspended - -- lose USB connection during power-down mode - DONE - - USB initialize code in main() causes this - WRONG - - Do not power-down during USB connection is active - DONE 11/11 - (USB_DeviceState == USB_DEVICE_Configured) is used to check USB connection - matrix_power_down() matrix.c - 11/23 - -- with Nexus5 keyboard and mouse are very laggy. - Not confirmed. 01/15 - -- switch BT host connections - CANCEL 01/15 - - switch next connection - cannot switch connection with version 6.15 at least - -- When given power only from wall wart adapter - DONE? not confirmed 01/15 - - it sleeps. it should not sleep - - Configured state without USB connection? - -- timer is slow while power down - DONE 11/26 - - time out interrupt is lost while power down? - - interrupt of watchdog timer compensates timer counter(avr/suspend.c) - -- repeated CHARGING/FULL_CHARGED - No longer problem 01/15 - - In LTC sharp pulses are observed. - - MCP has no pulse but still has a problem. - - needs more wait before read pin state? - NO - -- USB plug-in fails while BT - No longer problem 01/15 - - it ends in suspend state - - maybe, not responsive to host enumeration process due to power-down. - - matrix_power_down() only when state is unattached - 11/26 - - need to observe a while - diff --git a/keyboards/hhkb/rn42/PowerSave.txt b/keyboards/hhkb/rn42/PowerSave.txt deleted file mode 100644 index 4b9c8f415d..0000000000 --- a/keyboards/hhkb/rn42/PowerSave.txt +++ /dev/null @@ -1,88 +0,0 @@ -Power Saving -============ - - -MCU+HHKB Power Comsumption --------------------------- -Battery drive: - idle 18.9mA - active 35.8mA - -USB powered: - 40.0mA - 52mA 01/17 - -Other keyboards: -HHKB Pro 55mA -HHKB Pro2 140mA -HHKB Pro 42mA(Alt) -HHKB Pro2 52mA(Alt BT controller USB mode) -HHKB Pro2 88mA(Alt BT controller BT mode connected) -HHKB Pro2 68mA(Alt BT controller BT mode config mode) -Poker X 6mA -Infinity 24mA(TMK) - 65mA(kiibohd) - - -HHKB key switch power control ------------------------------ -MOS FET Nch: BSS138 or IRLML6344T, either works and no apparent difference. -Normally on(pull-up) or off(pull-down)? interms of power saving it prefers pull-down? - -Pull-down will be better for power saving, normally off. - - - -Used Timer ----------- - -8MHz clock ----------- -1) 16MHz xtal with system prescaler div2: F_CPU=8MHz, F_USB=16MHz -2) 8MHz xtal with div1: F_CPU=8MHz, F_USB=8MHz -Hardware USART doesn't work at 115200bps with 8MHz(F_CPU). - -workaround: -a) use Sotwre serial for communcation with RN-42 -b) reduce baud of RN-42 to lower rate;(factory default is 115200bps) -10/03 - - - -Slave mode ----------- -Discovery/Inquire -Connect/Page - -SI,0012 -SJ,0012 -InqWindw=0100 -PagWindw=0100 - - -Sniff mode ----------- -0.625ms * -SW,0320 Very sluggish. Type is not lost but very slow to register. -SW,0160 Still sluggish. may transposed? can type but ... - Mouse point move intermittently -SW,0020 feel a bit late like stumble(20ms) -SW,0010 feel no latency(10ms) - - -Deep sleep ----------- -SW,8010 - - -TX power --------- -SY,fff4 - - -IO pins -------- -S%,1000 status led and connection control don't work - GPIO5: status LED - GPIO6: Connection control - GPIO2: linked status diff --git a/keyboards/hhkb/rn42/RN42.txt b/keyboards/hhkb/rn42/RN42.txt deleted file mode 100644 index b30a0327d4..0000000000 --- a/keyboards/hhkb/rn42/RN42.txt +++ /dev/null @@ -1,408 +0,0 @@ -RN-42 Bluetooth Module Support -============================== -Bluetooth controller board works with HHKB Pro2, JP, Type-S and Type-S JP and it supports both USB and Bluetooth as keyboard output protocol. Bluetooth module Roving Networks/Microchip RN-42 is installed on the board. - - -RN-42: -http://www.microchip.com/wwwproducts/Devices.aspx?product=RN42 - - -Capabitlities: -- USB keyboard functions - completely equivarent to USB controller including mouse keys and NKRO. -- Switching between USB and Bluetooth - You can switch the two connections with BT switch or key combination. -- RN-42 config mode - You can change power/connection configuration of the module if needed. -- Low battery alert - Red LED turns on when low voltage. -- RN-42 status indicator - LED indicates status of Bluetooth connection. -- Pairing - The module stores up to 8 connections. -- Auto connect - The module connects the last connected device automatically. -- iOS support - works as keyboard with iPhone5. No tested completely. -- Android support - works as keyboard and mouse with Nexus5. No tested completely. -- Mouse keys over BT - Note that iOS doesn't accept mouse device. - - -Limitations: -- Short battery life - Around 12hr with 1000mAh -- No connection switching - RN-42 auto-connects to the last connected device. - Some of consumer products can switch between devices, for example Logitech K480. - http://www.logitech.com/en-us/product/multi-device-keyboard-k480?crid=26 -- HHKB JP requires case modification for BT switch and LEDs. - without switch power controlled by MCU? Probably using 3.3V regulator enable pin power of RN-42 can be controlled. - -NOTE: -- LIPO BATTERY IS VERY DANGEROUS, TAKE EXTRA CARE OF YOUR SAFETY AND PROPERTY. -- RN-42 version 6.15 is supported. -- No NKRO over Bluetooth -- Check you country's wiress regulation and certification of RN-42. - -Bugs: - -Todos: - - -Lipo Battery ------------- -You can use 3.7V Lithium Ion battery with JST PH 2pin connector and protection circuit. -Battery space inside HHKB is around 54mm x 50mm and its height is 7mm. - -Sparkfun 850mAh -https://www.sparkfun.com/products/341 -Sparkfun 1000mAh -https://www.sparkfun.com/products/339 - -Sparkfun 2000mAh battery won't fit due to its size. - -Learn about Lipo battery: -https://learn.adafruit.com/li-ion-and-lipoly-batteries - - - - - -LED Status ----------- -Configuring 10 times per sec -Startup/configuration timer 2 times per sec -Discoverable/Inquiring/Idle once per sec -Connected solid on - - -RN-42 Magic Command --------------------- -Magic key combination is 'LShift+RShift' by default in case of HHKB. - -Here is help. - - ----- Bluetooth RN-42 Help ----- - i: RN-42 info - b: battery voltage - Del: enter/exit RN-42 config mode - Slck: RN-42 initialize - p: pairing - u: toggle Force USB mode - - RN-42 info: displays information of the module on console. - battery voltage: displays current voltage of battery and uptime. - RN-42 initialize: does factory reset and configures RN-42 - pairing: enters Pairing mode. - toggle Force USB mode: switch between USB and Bluetooth - - -RN-42 Config mode ------------------ -You can tune/operate RN-42 yourself with config(command) mode. - -1. hook up USB cable -2. run `hid_listen` command in console -3. turn on Bluetooth switch -4. press LShift+RShift+Delete(Fn+~) you will see output like followings: - - Entering config mode ... - CMD - v - Ver 6.15 04/26/2013 - (c) Roving Networks - -5. do config with RN-42 commands. See documentations of RN-42. -6. to exit also press LShift+RShift+Delete(Fn+~) - - Exiting config mode ... - --- - END - - -RN-42 Initial Configuration ---------------------------- -RN-42 is configured as SPP device at factory reset, you need to configure it as HID device. This is needed just once first time. - -1. hook up USB cable -2. run `hid_listen` command in console -3. turn on Bluetooth switch -4. press LShift+RShift+ScrLk(Fn+O) you will see output like followings: - - Entering config mode ... - CMD - Ver 6.15 04/26/2013 - (c) Roving Networks - ECHO ON - SF,1 - AOK - S-,TmkBT - AOK - SS,Keyboard/Mouse - AOK - SM,4 - AOK - SW,8000 - AOK - S~,6 - AOK - SH,003C - AOK - SY,FFF4 - AOK - R,1 - Reboot! - Exiting config mode ... - -5. output of command 'X' after cofiguration - - Ver 6.15 04/26/2013 - (c) Roving Networks - ***Settings*** - BTA=00066667BBE9 - BTName=TmkBT-BBE9 - Baudrt(SW4)=115K - Mode =DTR - Authen=1 - PinCod=1234 - Bonded=0 - Rem=NONE SET - ***ADVANCED Settings*** - SrvName= Keyboard/Mouse - SrvClass=0000 - DevClass=1F00 - InqWindw=0100 - PagWindw=0100 - CfgTimer=255 - StatuStr=NULL - HidFlags=3c - DTRtimer=8 - KeySwapr=0 - ***OTHER Settings*** - Profile= HID - CfgChar= $ - SniffEna=8000 - LowPower=0 - TX Power=fff4 - IOPorts= 0 - IOValues=0 - Sleeptmr=0 - DebugMod=0 - RoleSwch=0 - - -Switch to USB mode ------------------- -You can switch between USB and Bluetooth with pressing 'LShift+RShift+u'. - - -Pairing mode ------------- -This disconnects current connect and enter pairing mode. - - - - -For deveropment -=============== - -RN-42 Serial Connection ------------------------ -UART: 115200bps, 8bit, 1-stopbit, non-parity, no flow control -SSP: 115200bps, 8bit, 1-stopbit, non-parity, no flow control(via Bluetooth) - -To enter command mode disconnect the module from host and type '$$$'.(you will see 'CMD') and type '+' to get local echo. To exit type '---'(you will see 'END'). - - -RN-42 Commands --------------- -S-,tmkBT // Device name -SS,keyboard/mouse // service name -SM,4 // Auto Connect DTR mode -SW,8010 // Sniff enable 0x10*0.625ms=10ms; 50ms is laggish and not much power save -S~,6 // HID profile -S~,0 // SPP profile -SH,003C // HID register -SY,0004 // Transmit power -SC,0000 // COD: 000005C0 (see HID spec/Bluegiga doc) -SD,05C0 // bit 12-8 7 6 5-0 - // 00101 1 1 0 - // peripheral pointing keybaord joystick, gamepad, ... -SM,6 // Pairing mode: auto connect -SM,4 // Master mode: Connection can be controled with GPIO6 -SF,1 // Factroy reset -R,1 // reboot -SR,Z // removes all remote addresses for reconnecting. - // can be used to connect another host -SR,I // registers last inquiry address - - -Operation Modes ---------------- -SM,3 Auto Connect Master mode -SM,4 Auto Connect DTR Mode uses GPIO6 to make and break connection(Mode =DTR) - confirm: auto connect works and control connection with GPIO6 -SM,5 Auto Connect ANY Mode (Mode =ANY) - each time GPIO is set, make inquiry and connect to the first found device -SM,6 automatically reconnect(Mode =Pair) - confirm: auto connect works well but difficult to enter command mode. - - -HID flag register ------------------ -SH,0200 -GH - -10 0000 0000(0200) default -00 0011 1000(0038) Combo -|| | | |\_\____ number of paired devices to which the module can reconnect -|| | | \_______ send out reports over UART (0xFF ) -|| \__\_________ descriptor type -|\______________ toggle virtual keyboard on iOS when first connected -\_______________ Force HID mode if GPIO11 is high on power-up - - Descriptor type: - 0000: keybaord - 0001: Game Pad - 0010: Mouse - 0011: Combo - 0100: Joystick - 1xxx: reserved - - -Out report - Indicator ----------------------- -0xFE 0x02 0x01 - - -Apple iOS ---------- -Keyboard can be used with iPhone, but mouse cannot. - - -Android -------- -3.7.1.5 Note: To connect with Android phone the modules must wake up 11ms every 2.5seconds. - - -Power Management ----------------- -Inquiry and Page window Idle or Active (3.1.1) - Downside: delay in discovery or connection time - SI, // set inquiry scan window(discovery) on/off duty? - SJ, // set page scan window(connection) - This reduces averaege power >20mA to 5mA(3mA in Sniff mode) - -Sniff mode Transmit - Sniff mode is disabled by default and radio is active continuously when connected.(25-30mA) - In Sniff mode the radio wakes up intermittently and sleeps in very low power mode.(2mA) - SW, // set interval timer(*0.625ms) 0000-7FFF - -Deep sleep Idle (3.1.2) - In this mode the module shuts down completly and only draws about 300uA. To enable this set the most signifant bit(0x8000) of Sniff interaval timer. - SW,8320 // deep sleep enable(interval=0x320*0.625=500ms) - In normal sleep the firmware is still running in idle mode, and wakes up about 20 times per second to check ports, update LEDs, etc. During deep sleep, the firmware actually stops runnig some tasks and the LEDs only update about once per second. - To wake from deep sleep there are three ways: (in worst case wake up takes 5ms) - *send a charactor to the UART(first charactor will be lost) - *toggle CTS low to high and wait 5ms - *wake automatically every slot time(*0.625ms) - Once the radio is awake it stay active for exactly 1 second of inactivity and then sleeps again. - Downside: latency and data loss - -Disable Output driver Idle or Active (3.1.3) - S%,1000 // set all GPIO pins(0-11) to inputs. - -Lower Transmit Power Idle or Active (3.1.4) - SY, // transmit power setting(takes effect after a power cycle and reboot) - Downside: reducing effective range - - -Optimizig for Latency ---------------------- -By default the firmware is optimized for throughput. -SQ,16 // set latency bit -SQ,0 // unset latency bit - - -Configuration timer settings ----------------------------- -Remote configuration is used for the module to be configured with various commands over Bluetooth(SPP profile only?). - -The module has remote configuration timer to allow remote configuration over Bluetooth after power up in Slave mode. In Master modes the remote configuration timer is set to 0(no remote configuration). (In Trigger Master mode the timer is used as an idle timer to break the connection after time expires with no charactors receive.) - ST,0 // no remote, no local when connected - ST,<1-252> // local and remote with timeout in seconds from power up - ST,253 // local only without timeout - ST,254 // remote only without timeout - ST,255 // local and remote without timeout - - -Commands --------- -S7, 7bit mode -SA, Authenticaiton -SB, Send break -SC, Service class -SD, Device class -SM, Operation mode -SP, Pin code(alpahnumeric) -SQ, Special configuration(GPIO, discovery mode, low latency, reboot, UART) -SR, Store remote address -SR,Z Erase all address -SS, Set service name(1-20)** -ST, Remote configuration timer(Master:0, Slave:0-255, Triger:as idle timer) -SU, UART baud rate -SW, low-power sniff mode** deep sleep and wake up every 625us * -SX,<0|1> bonding enable only acceps device that matches the stored address -SY, power setting** -SZ, non-standard raw baud rate =baud*0.004096 -S~, Profile 0:SPP, 5:APL, 6:HID -S-, Device name -15 alphanumeric charactors -S?,<0|1> role switch enable -S$, command mode char -$|, low-power connect mode deep sleep/active(discoverable and connectable) cycle -D display basic setting -E display extended setting -GB display the device's Bluetooth address -GF display Bluetooth address of connected device -GK show connection status -GR show remote address for reconnecting -G& show GPIO pin -G show stored setting -+ toggle local echo on/off -& show GPIO 3,4,6,7(DIP switch) -C connect to stored remote address -C,
connect last address -CFI connect and go into fast data mode -CFR connect and go into fast data mode -CT,
, connect to the address and disconnect after val? -F,1 fast data mod: -H display help -I,