max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'tmk/master'

Browse source
This commit is contained in:
Mark Sikora 2024-04-09 13:33:19 -04:00
commit 1538390c0f
15 changed files with 12559 additions and 13057 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2753
converter/usb_usb/binary/usb_usb_debug.hex
View file

File diff suppressed because it is too large Load diff

3103
converter/usb_usb/binary/usb_usb_unimap.hex
View file

File diff suppressed because it is too large Load diff

3114
converter/usb_usb/binary/usb_usb_unimap_TaranVH_F22.hex
View file

File diff suppressed because it is too large Load diff

3114
converter/usb_usb/binary/usb_usb_unimap_TaranVH_F23.hex
View file

File diff suppressed because it is too large Load diff

3114
converter/usb_usb/binary/usb_usb_unimap_TaranVH_F24.hex
View file

File diff suppressed because it is too large Load diff

2898
keyboard/hhkb/binary/hhkb_jp_rn42_unimap.hex
View file

File diff suppressed because it is too large Load diff

2300
keyboard/hhkb/binary/hhkb_jp_unimap.hex
View file

File diff suppressed because it is too large Load diff

2891
keyboard/hhkb/binary/hhkb_rn42_unimap.hex
View file

File diff suppressed because it is too large Load diff

2292
keyboard/hhkb/binary/hhkb_unimap.hex
View file

File diff suppressed because it is too large Load diff

4
keyboard/hhkb/doc/HHKB.txt
View file

@ -9,6 +9,10 @@ Controller PCB
(HHKB_controller.jpg) (HHKB_controller.jpg)
6MHz crystal Kyocera(KSS) CX1255CA
https://ele.kyocera.com/sites/default/files/assets/static/discontinued/cx1255ca_2013_e.pdf
Keyswitch PCB Keyswitch PCB
------------- -------------
HC4051 Analog Multiplexer: select a row line. HC4051 Analog Multiplexer: select a row line.

2
keyboard/hhkb/unimap_hasu.c
View file

@ -62,7 +62,7 @@ const action_t actionmaps[][UNIMAP_ROWS][UNIMAP_COLS] PROGMEM = {
[1] = UNIMAP_HHKB( [1] = UNIMAP_HHKB(
PWR, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, PWR, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL,
CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS,UP, TRNS, TRNS, CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS,UP, TRNS, TRNS,
TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,PAST,PSLS,HOME,PGUP,LEFT,RGHT, PENT, TRNS,VOLD,VOLU,MUTE,EJCT,TRNS,PAST,PSLS,HOME,PGUP,LEFT,RGHT, PENT,
TRNS, BRTD,BRTI,SLEP,WAKE,TRNS,PPLS,PMNS,END, PGDN,DOWN, TRNS,TRNS, TRNS, BRTD,BRTI,SLEP,WAKE,TRNS,PPLS,PMNS,END, PGDN,DOWN, TRNS,TRNS,
TRNS,TRNS, TRNS, TRNS,TRNS), TRNS,TRNS, TRNS, TRNS,TRNS),

2
keyboard/hhkb/unimap_hhkb.c
View file

@ -35,7 +35,7 @@ const action_t actionmaps[][UNIMAP_ROWS][UNIMAP_COLS] PROGMEM = {
[1] = UNIMAP_HHKB( [1] = UNIMAP_HHKB(
PWR, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, PWR, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL,
CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS,UP, TRNS, TRNS, CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS,UP, TRNS, TRNS,
TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,PAST,PSLS,HOME,PGUP,LEFT,RGHT, PENT, TRNS,VOLD,VOLU,MUTE,EJCT,TRNS,PAST,PSLS,HOME,PGUP,LEFT,RGHT, PENT,
TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,PPLS,PMNS,END, PGDN,DOWN, TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,PPLS,PMNS,END, PGDN,DOWN, TRNS,TRNS,
TRNS,TRNS, TRNS, TRNS,TRNS), TRNS,TRNS, TRNS, TRNS,TRNS),
}; };

6
tmk_core/common/actionmap.h
View file

@ -271,7 +271,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define AC_MEDIA_REWIND ACTION_USAGE_CONSUMER(TRANSPORT_REWIND) #define AC_MEDIA_REWIND ACTION_USAGE_CONSUMER(TRANSPORT_REWIND)
#define AC_MEDIA_STOP ACTION_USAGE_CONSUMER(TRANSPORT_STOP) #define AC_MEDIA_STOP ACTION_USAGE_CONSUMER(TRANSPORT_STOP)
#define AC_MEDIA_PLAY_PAUSE ACTION_USAGE_CONSUMER(TRANSPORT_PLAY_PAUSE) #define AC_MEDIA_PLAY_PAUSE ACTION_USAGE_CONSUMER(TRANSPORT_PLAY_PAUSE)
#define AC_MEDIA_EJECT ACTION_USAGE_CONSUMER(TRANSPORT_STOP_EJECT) #define AC_MEDIA_EJECT ACTION_USAGE_CONSUMER(TRANSPORT_EJECT)
#define AC_MEDIA_SELECT ACTION_USAGE_CONSUMER(APPLAUNCH_CC_CONFIG) #define AC_MEDIA_SELECT ACTION_USAGE_CONSUMER(APPLAUNCH_CC_CONFIG)
#define AC_MAIL ACTION_USAGE_CONSUMER(APPLAUNCH_EMAIL) #define AC_MAIL ACTION_USAGE_CONSUMER(APPLAUNCH_EMAIL)
#define AC_CALCULATOR ACTION_USAGE_CONSUMER(APPLAUNCH_CALCULATOR) #define AC_CALCULATOR ACTION_USAGE_CONSUMER(APPLAUNCH_CALCULATOR)
@ -285,6 +285,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define AC_WWW_FAVORITES ACTION_USAGE_CONSUMER(APPCONTROL_BOOKMARKS) #define AC_WWW_FAVORITES ACTION_USAGE_CONSUMER(APPCONTROL_BOOKMARKS)
#define AC_BRIGHTNESS_INC ACTION_USAGE_CONSUMER(BRIGHTNESS_INCREMENT) #define AC_BRIGHTNESS_INC ACTION_USAGE_CONSUMER(BRIGHTNESS_INCREMENT)
#define AC_BRIGHTNESS_DEC ACTION_USAGE_CONSUMER(BRIGHTNESS_DECREMENT) #define AC_BRIGHTNESS_DEC ACTION_USAGE_CONSUMER(BRIGHTNESS_DECREMENT)
#define AC_MEDIA_STOP_EJECT ACTION_USAGE_CONSUMER(TRANSPORT_STOP_EJECT)
/* Mousekey */ /* Mousekey */
#define AC_MS_UP ACTION_KEY(KC_MS_UP) #define AC_MS_UP ACTION_KEY(KC_MS_UP)
@ -418,7 +419,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define AC_MRWD ACTION_USAGE_CONSUMER(TRANSPORT_REWIND) #define AC_MRWD ACTION_USAGE_CONSUMER(TRANSPORT_REWIND)
#define AC_MSTP ACTION_USAGE_CONSUMER(TRANSPORT_STOP) #define AC_MSTP ACTION_USAGE_CONSUMER(TRANSPORT_STOP)
#define AC_MPLY ACTION_USAGE_CONSUMER(TRANSPORT_PLAY_PAUSE) #define AC_MPLY ACTION_USAGE_CONSUMER(TRANSPORT_PLAY_PAUSE)
#define AC_EJCT ACTION_USAGE_CONSUMER(TRANSPORT_STOP_EJECT) #define AC_EJCT ACTION_USAGE_CONSUMER(TRANSPORT_EJECT)
#define AC_MSEL ACTION_USAGE_CONSUMER(APPLAUNCH_CC_CONFIG) #define AC_MSEL ACTION_USAGE_CONSUMER(APPLAUNCH_CC_CONFIG)
#define AC_MAIL ACTION_USAGE_CONSUMER(APPLAUNCH_EMAIL) #define AC_MAIL ACTION_USAGE_CONSUMER(APPLAUNCH_EMAIL)
#define AC_CALC ACTION_USAGE_CONSUMER(APPLAUNCH_CALCULATOR) #define AC_CALC ACTION_USAGE_CONSUMER(APPLAUNCH_CALCULATOR)
@ -432,6 +433,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define AC_WFAV ACTION_USAGE_CONSUMER(APPCONTROL_BOOKMARKS) #define AC_WFAV ACTION_USAGE_CONSUMER(APPCONTROL_BOOKMARKS)
#define AC_BRTI ACTION_USAGE_CONSUMER(BRIGHTNESS_INCREMENT) #define AC_BRTI ACTION_USAGE_CONSUMER(BRIGHTNESS_INCREMENT)
#define AC_BRTD ACTION_USAGE_CONSUMER(BRIGHTNESS_DECREMENT) #define AC_BRTD ACTION_USAGE_CONSUMER(BRIGHTNESS_DECREMENT)
#define AC_STEJ ACTION_USAGE_CONSUMER(TRANSPORT_STOP_EJECT)
/* Transparent */ /* Transparent */
#define AC_TRNS ACTION_KEY(KC_TRANSPARENT) #define AC_TRNS ACTION_KEY(KC_TRANSPARENT)

20
tmk_core/common/report.h
View file

@ -47,14 +47,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* Consumer Page(0x0C) * Consumer Page(0x0C)
* https://github.com/tmk/tmk_keyboard/issues/370 * https://github.com/tmk/tmk_keyboard/issues/370
*/ */
#define AUDIO_MUTE 0x00E2 /* Display Brightness Controls https://www.usb.org/sites/default/files/hutrr41_0.pdf */
#define AUDIO_VOL_UP 0x00E9 #define BRIGHTNESS_INCREMENT 0x006F
#define AUDIO_VOL_DOWN 0x00EA #define BRIGHTNESS_DECREMENT 0x0070
#define TRANSPORT_FAST_FORWARD 0x00B3
#define TRANSPORT_REWIND 0x00B4
#define TRANSPORT_NEXT_TRACK 0x00B5 #define TRANSPORT_NEXT_TRACK 0x00B5
#define TRANSPORT_PREV_TRACK 0x00B6 #define TRANSPORT_PREV_TRACK 0x00B6
#define TRANSPORT_STOP 0x00B7 #define TRANSPORT_STOP 0x00B7
#define TRANSPORT_EJECT 0x00B8
#define TRANSPORT_STOP_EJECT 0x00CC #define TRANSPORT_STOP_EJECT 0x00CC
#define TRANSPORT_PLAY_PAUSE 0x00CD #define TRANSPORT_PLAY_PAUSE 0x00CD
#define AUDIO_MUTE 0x00E2
#define AUDIO_VOL_UP 0x00E9
#define AUDIO_VOL_DOWN 0x00EA
/* application launch */ /* application launch */
#define APPLAUNCH_CC_CONFIG 0x0183 #define APPLAUNCH_CC_CONFIG 0x0183
#define APPLAUNCH_EMAIL 0x018A #define APPLAUNCH_EMAIL 0x018A
@ -71,13 +77,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* supplement for Bluegiga iWRAP HID(not supported by Windows?) */ /* supplement for Bluegiga iWRAP HID(not supported by Windows?) */
#define APPLAUNCH_LOCK 0x019E #define APPLAUNCH_LOCK 0x019E
#define TRANSPORT_RECORD 0x00B2 #define TRANSPORT_RECORD 0x00B2
#define TRANSPORT_FAST_FORWARD 0x00B3
#define TRANSPORT_REWIND 0x00B4
#define TRANSPORT_EJECT 0x00B8
#define APPCONTROL_MINIMIZE 0x0206 #define APPCONTROL_MINIMIZE 0x0206
/* Display Brightness Controls https://www.usb.org/sites/default/files/hutrr41_0.pdf */
#define BRIGHTNESS_INCREMENT 0x006F
#define BRIGHTNESS_DECREMENT 0x0070
/* /*
* Generic Desktop Page(0x01) - system power control * Generic Desktop Page(0x01) - system power control
@ -189,7 +189,7 @@ typedef struct {
(key == KC_MEDIA_FAST_FORWARD ? TRANSPORT_FAST_FORWARD : \ (key == KC_MEDIA_FAST_FORWARD ? TRANSPORT_FAST_FORWARD : \
(key == KC_MEDIA_REWIND ? TRANSPORT_REWIND : \ (key == KC_MEDIA_REWIND ? TRANSPORT_REWIND : \
(key == KC_MEDIA_STOP ? TRANSPORT_STOP : \ (key == KC_MEDIA_STOP ? TRANSPORT_STOP : \
(key == KC_MEDIA_EJECT ? TRANSPORT_STOP_EJECT : \ (key == KC_MEDIA_EJECT ? TRANSPORT_EJECT : \
(key == KC_MEDIA_PLAY_PAUSE ? TRANSPORT_PLAY_PAUSE : \ (key == KC_MEDIA_PLAY_PAUSE ? TRANSPORT_PLAY_PAUSE : \
(key == KC_MEDIA_SELECT ? APPLAUNCH_CC_CONFIG : \ (key == KC_MEDIA_SELECT ? APPLAUNCH_CC_CONFIG : \
(key == KC_MAIL ? APPLAUNCH_EMAIL : \ (key == KC_MAIL ? APPLAUNCH_EMAIL : \

3
tmk_core/protocol/usb_hid/parser.cpp
View file

@ -12,11 +12,14 @@ void KBDReportParser::Parse(USBHID *hid, bool is_rpt_id, uint8_t len, uint8_t *b
} }
xprintf("\r\n"); xprintf("\r\n");
/* Keyboard can send report in size other than 8 bytes
* https://github.com/tmk/tmk_keyboard/issues/773
// boot keyboard report length should be 8 // boot keyboard report length should be 8
if (len != 8) { if (len != 8) {
xprintf(" ignored\r\n"); xprintf(" ignored\r\n");
return; return;
} }
*/
// Rollover error // Rollover error
// Cherry: 0101010101010101 // Cherry: 0101010101010101