Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New keyboard: Model H controller for IBM Model M #20625

Merged
merged 17 commits into from
Jul 11, 2023
Merged

New keyboard: Model H controller for IBM Model M #20625

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ed648ba
added modelh keyboard
jberclaz Apr 29, 2023
4d2456f
cleanup
jberclaz Apr 29, 2023
ed07e9e
cleanup
jberclaz Apr 29, 2023
99d37e5
cleanup
jberclaz Apr 29, 2023
890da33
Update keyboards/modelh/rules.mk
jberclaz May 3, 2023
509b448
Addressed reviewer's comments
jberclaz May 3, 2023
de8fddc
Additional reviewer's comments
jberclaz May 4, 2023
2405ca4
Update keyboards/modelh/info.json
jberclaz May 5, 2023
9770828
Update keyboards/modelh/info.json
jberclaz May 5, 2023
7785f03
fixed lock lights behavior
jberclaz Jun 25, 2023
b4ecc70
Changed the hosting to imgur
hcbille Jul 4, 2023
f888bee
Merge pull request #1 from hcbille/patch-1
jberclaz Jul 6, 2023
095c73a
addressed reviewer's comments
jberclaz Jul 6, 2023
388637d
adding back mcuconf.h
jberclaz Jul 6, 2023
b7a4057
removed entry from rules.mk
jberclaz Jul 6, 2023
5705bb4
removed mcuconf.h
jberclaz Jul 6, 2023
0705f9a
removed chibios config files
jberclaz Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions keyboards/modelh/chconf.h
View file
Open in desktop
drashna marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/* Copyright 2020 QMK
*
* 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 <http://www.gnu.org/licenses/>.
*/

#pragma once

#define CH_CFG_ST_TIMEDELTA 0
#define CH_CFG_USE_TM TRUE
#define CH_CFG_USE_REGISTRY TRUE
#define CH_CFG_USE_WAITEXIT TRUE
#define CH_CFG_USE_CONDVARS TRUE
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
#define CH_CFG_USE_MESSAGES TRUE
#define CH_CFG_USE_MAILBOXES TRUE
#define CH_CFG_USE_HEAP TRUE
#define CH_CFG_USE_OBJ_CACHES TRUE
#define CH_CFG_USE_DELEGATES TRUE
fauxpark marked this conversation as resolved.
Show resolved Hide resolved

#include_next <chconf.h>
45 changes: 45 additions & 0 deletions keyboards/modelh/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
Copyright 2020 John Hawthorn

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 <http://www.gnu.org/licenses/>.
*/

#pragma once


/* Model H customizations */

#define MODELH_STATUS_LED C13

/* 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


/*
* 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
23 changes: 23 additions & 0 deletions keyboards/modelh/halconf.h
View file
Open in desktop
drashna marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/* Copyright 2020 QMK
*
* 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 <http://www.gnu.org/licenses/>.
*/

#pragma once


#define HAL_USE_PWM TRUE
#define SERIAL_BUFFERS_SIZE 16

#include_next <halconf.h>
282 changes: 282 additions & 0 deletions keyboards/modelh/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,282 @@
{
"manufacturer": "IBM",
"keyboard_name": "Model M",
"maintainer": "jhawthorn",
"bootloader": "stm32duino",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": false,
"command": false,
"console": false,
"extrakey": true,
"mousekey": false,
"nkro": false
},
"indicators": {
"caps_lock": "B8",
"num_lock": "B7",
"scroll_lock": "B9",
"on_state": 0
},
"matrix_pins": {
"cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
"rows": ["B6", "B5", "B4", "A15", "B3", "A0", "A2", "A1"]
},
"processor": "STM32F103",
"url": "modelh.club",
"usb": {
"device_version": "1.0.0",
"max_power": 100,
"pid": "0xB155",
"vid": "0xFEED"
},
"layouts": {
"LAYOUT_fullsize_ansi_wkl": {
"layout": [
{"matrix": [0, 2], "x": 0, "y": 0},

{"matrix": [2, 3], "x": 2, "y": 0},
{"matrix": [2, 4], "x": 3, "y": 0},
{"matrix": [1, 4], "x": 4, "y": 0},
{"matrix": [0, 4], "x": 5, "y": 0},

{"matrix": [0, 6], "x": 6.5, "y": 0},
{"matrix": [0, 8], "x": 7.5, "y": 0},
{"matrix": [1, 9], "x": 8.5, "y": 0},
{"matrix": [2, 9], "x": 9.5, "y": 0},

{"matrix": [2, 6], "x": 11, "y": 0},
{"matrix": [3, 6], "x": 12, "y": 0},
{"matrix": [3, 11], "x": 13, "y": 0},
{"matrix": [3, 12], "x": 14, "y": 0},

{"matrix": [3, 15], "x": 15.25, "y": 0},
{"matrix": [4, 15], "x": 16.25, "y": 0},
{"matrix": [6, 14], "x": 17.25, "y": 0},

{"matrix": [2, 2], "x": 0, "y": 1.5},
{"matrix": [3, 2], "x": 1, "y": 1.5},
{"matrix": [3, 3], "x": 2, "y": 1.5},
{"matrix": [3, 4], "x": 3, "y": 1.5},
{"matrix": [3, 5], "x": 4, "y": 1.5},
{"matrix": [2, 5], "x": 5, "y": 1.5},
{"matrix": [2, 7], "x": 6, "y": 1.5},
{"matrix": [3, 7], "x": 7, "y": 1.5},
{"matrix": [3, 8], "x": 8, "y": 1.5},
{"matrix": [3, 9], "x": 9, "y": 1.5},
{"matrix": [3, 10], "x": 10, "y": 1.5},
{"matrix": [2, 10], "x": 11, "y": 1.5},
{"matrix": [2, 8], "x": 12, "y": 1.5},
{"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2},

{"matrix": [2, 12], "x": 15.25, "y": 1.5},
{"matrix": [2, 14], "x": 16.25, "y": 1.5},
{"matrix": [2, 13], "x": 17.25, "y": 1.5},

{"matrix": [6, 11], "x": 18.5, "y": 1.5},
{"matrix": [6, 12], "x": 19.5, "y": 1.5},
{"matrix": [6, 13], "x": 20.5, "y": 1.5},
{"matrix": [7, 13], "x": 21.5, "y": 1.5},

{"matrix": [1, 2], "x": 0, "y": 2.5, "w": 1.5},
{"matrix": [4, 2], "x": 1.5, "y": 2.5},
{"matrix": [4, 3], "x": 2.5, "y": 2.5},
{"matrix": [4, 4], "x": 3.5, "y": 2.5},
{"matrix": [4, 5], "x": 4.5, "y": 2.5},
{"matrix": [1, 5], "x": 5.5, "y": 2.5},
{"matrix": [1, 7], "x": 6.5, "y": 2.5},
{"matrix": [4, 7], "x": 7.5, "y": 2.5},
{"matrix": [4, 8], "x": 8.5, "y": 2.5},
{"matrix": [4, 9], "x": 9.5, "y": 2.5},
{"matrix": [4, 10], "x": 10.5, "y": 2.5},
{"matrix": [1, 10], "x": 11.5, "y": 2.5},
{"matrix": [1, 8], "x": 12.5, "y": 2.5},
{"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},

{"matrix": [2, 11], "x": 15.25, "y": 2.5},
{"matrix": [3, 14], "x": 16.25, "y": 2.5},
{"matrix": [3, 13], "x": 17.25, "y": 2.5},

{"matrix": [4, 11], "x": 18.5, "y": 2.5},
{"matrix": [4, 12], "x": 19.5, "y": 2.5},
{"matrix": [4, 13], "x": 20.5, "y": 2.5},
{"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},

{"matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.5},
{"matrix": [5, 2], "x": 1.75, "y": 3.5},
{"matrix": [5, 3], "x": 2.75, "y": 3.5},
{"matrix": [5, 4], "x": 3.75, "y": 3.5},
{"matrix": [5, 5], "x": 4.75, "y": 3.5},
{"matrix": [0, 5], "x": 5.75, "y": 3.5},
{"matrix": [0, 7], "x": 6.75, "y": 3.5},
{"matrix": [5, 7], "x": 7.75, "y": 3.5},
{"matrix": [5, 8], "x": 8.75, "y": 3.5},
{"matrix": [5, 9], "x": 9.75, "y": 3.5},
{"matrix": [5, 10], "x": 10.75, "y": 3.5},
{"matrix": [0, 10], "x": 11.75, "y": 3.5},
{"matrix": [6, 6], "x": 12.75, "y": 3.5, "w": 2.25},

{"matrix": [1, 11], "x": 18.5, "y": 3.5},
{"matrix": [1, 12], "x": 19.5, "y": 3.5},
{"matrix": [1, 13], "x": 20.5, "y": 3.5},

{"matrix": [1, 1], "x": 0, "y": 4.5, "w": 2.25},
{"matrix": [6, 2], "x": 2.25, "y": 4.5},
{"matrix": [6, 3], "x": 3.25, "y": 4.5},
{"matrix": [6, 4], "x": 4.25, "y": 4.5},
{"matrix": [6, 5], "x": 5.25, "y": 4.5},
{"matrix": [7, 5], "x": 6.25, "y": 4.5},
{"matrix": [7, 7], "x": 7.25, "y": 4.5},
{"matrix": [6, 7], "x": 8.25, "y": 4.5},
{"matrix": [6, 8], "x": 9.25, "y": 4.5},
{"matrix": [6, 9], "x": 10.25, "y": 4.5},
{"matrix": [7, 10], "x": 11.25, "y": 4.5},
{"matrix": [6, 1], "x": 12.25, "y": 4.5, "w": 2.75},

{"matrix": [0, 14], "x": 16.25, "y": 4.5},

{"matrix": [5, 11], "x": 18.5, "y": 4.5},
{"matrix": [5, 12], "x": 19.5, "y": 4.5},
{"matrix": [5, 13], "x": 20.5, "y": 4.5},
{"matrix": [5, 14], "x": 21.5, "y": 4.5, "h": 2},

{"matrix": [2, 0], "x": 0, "y": 5.5, "w": 1.5},
{"matrix": [0, 15], "x": 2.5, "y": 5.5, "w": 1.5},
{"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7},
{"matrix": [7, 15], "x": 11, "y": 5.5, "w": 1.5},
{"matrix": [6, 0], "x": 13.5, "y": 5.5, "w": 1.5},

{"matrix": [7, 14], "x": 15.25, "y": 5.5},
{"matrix": [7, 11], "x": 16.25, "y": 5.5},
{"matrix": [7, 12], "x": 17.25, "y": 5.5},

{"matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2},
{"matrix": [0, 13], "x": 20.5, "y": 5.5}
]
},
"LAYOUT_fullsize_iso_wkl": {
"layout": [
{"matrix": [0, 2], "x": 0, "y": 0},

{"matrix": [2, 3], "x": 2, "y": 0},
{"matrix": [2, 4], "x": 3, "y": 0},
{"matrix": [1, 4], "x": 4, "y": 0},
{"matrix": [0, 4], "x": 5, "y": 0},

{"matrix": [0, 6], "x": 6.5, "y": 0},
{"matrix": [0, 8], "x": 7.5, "y": 0},
{"matrix": [1, 9], "x": 8.5, "y": 0},
{"matrix": [2, 9], "x": 9.5, "y": 0},

{"matrix": [2, 6], "x": 11, "y": 0},
{"matrix": [3, 6], "x": 12, "y": 0},
{"matrix": [3, 11], "x": 13, "y": 0},
{"matrix": [3, 12], "x": 14, "y": 0},

{"matrix": [3, 15], "x": 15.25, "y": 0},
{"matrix": [4, 15], "x": 16.25, "y": 0},
{"matrix": [6, 14], "x": 17.25, "y": 0},

{"matrix": [2, 2], "x": 0, "y": 1.5},
{"matrix": [3, 2], "x": 1, "y": 1.5},
{"matrix": [3, 3], "x": 2, "y": 1.5},
{"matrix": [3, 4], "x": 3, "y": 1.5},
{"matrix": [3, 5], "x": 4, "y": 1.5},
{"matrix": [2, 5], "x": 5, "y": 1.5},
{"matrix": [2, 7], "x": 6, "y": 1.5},
{"matrix": [3, 7], "x": 7, "y": 1.5},
{"matrix": [3, 8], "x": 8, "y": 1.5},
{"matrix": [3, 9], "x": 9, "y": 1.5},
{"matrix": [3, 10], "x": 10, "y": 1.5},
{"matrix": [2, 10], "x": 11, "y": 1.5},
{"matrix": [2, 8], "x": 12, "y": 1.5},
{"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2},

{"matrix": [2, 12], "x": 15.25, "y": 1.5},
{"matrix": [2, 14], "x": 16.25, "y": 1.5},
{"matrix": [2, 13], "x": 17.25, "y": 1.5},

{"matrix": [6, 11], "x": 18.5, "y": 1.5},
{"matrix": [6, 12], "x": 19.5, "y": 1.5},
{"matrix": [6, 13], "x": 20.5, "y": 1.5},
{"matrix": [7, 13], "x": 21.5, "y": 1.5},

{"matrix": [1, 2], "x": 0, "y": 2.5, "w": 1.5},
{"matrix": [4, 2], "x": 1.5, "y": 2.5},
{"matrix": [4, 3], "x": 2.5, "y": 2.5},
{"matrix": [4, 4], "x": 3.5, "y": 2.5},
{"matrix": [4, 5], "x": 4.5, "y": 2.5},
{"matrix": [1, 5], "x": 5.5, "y": 2.5},
{"matrix": [1, 7], "x": 6.5, "y": 2.5},
{"matrix": [4, 7], "x": 7.5, "y": 2.5},
{"matrix": [4, 8], "x": 8.5, "y": 2.5},
{"matrix": [4, 9], "x": 9.5, "y": 2.5},
{"matrix": [4, 10], "x": 10.5, "y": 2.5},
{"matrix": [1, 10], "x": 11.5, "y": 2.5},
{"matrix": [1, 8], "x": 12.5, "y": 2.5},

{"matrix": [2, 11], "x": 15.25, "y": 2.5},
{"matrix": [3, 14], "x": 16.25, "y": 2.5},
{"matrix": [3, 13], "x": 17.25, "y": 2.5},

{"matrix": [4, 11], "x": 18.5, "y": 2.5},
{"matrix": [4, 12], "x": 19.5, "y": 2.5},
{"matrix": [4, 13], "x": 20.5, "y": 2.5},
{"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},

{"matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.5},
{"matrix": [5, 2], "x": 1.75, "y": 3.5},
{"matrix": [5, 3], "x": 2.75, "y": 3.5},
{"matrix": [5, 4], "x": 3.75, "y": 3.5},
{"matrix": [5, 5], "x": 4.75, "y": 3.5},
{"matrix": [0, 5], "x": 5.75, "y": 3.5},
{"matrix": [0, 7], "x": 6.75, "y": 3.5},
{"matrix": [5, 7], "x": 7.75, "y": 3.5},
{"matrix": [5, 8], "x": 8.75, "y": 3.5},
{"matrix": [5, 9], "x": 9.75, "y": 3.5},
{"matrix": [5, 10], "x": 10.75, "y": 3.5},
{"matrix": [0, 10], "x": 11.75, "y": 3.5},
{"matrix": [6, 10], "x": 12.75, "y": 3.5},
{"matrix": [6, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},

{"matrix": [1, 11], "x": 18.5, "y": 3.5},
{"matrix": [1, 12], "x": 19.5, "y": 3.5},
{"matrix": [1, 13], "x": 20.5, "y": 3.5},

{"matrix": [1, 1], "x": 0, "y": 4.5, "w": 1.25},
{"matrix": [0, 3], "x": 1.25, "y": 4.5},
{"matrix": [6, 2], "x": 2.25, "y": 4.5},
{"matrix": [6, 3], "x": 3.25, "y": 4.5},
{"matrix": [6, 4], "x": 4.25, "y": 4.5},
{"matrix": [6, 5], "x": 5.25, "y": 4.5},
{"matrix": [7, 5], "x": 6.25, "y": 4.5},
{"matrix": [7, 7], "x": 7.25, "y": 4.5},
{"matrix": [6, 7], "x": 8.25, "y": 4.5},
{"matrix": [6, 8], "x": 9.25, "y": 4.5},
{"matrix": [6, 9], "x": 10.25, "y": 4.5},
{"matrix": [7, 10], "x": 11.25, "y": 4.5},
{"matrix": [6, 1], "x": 12.25, "y": 4.5, "w": 2.75},

{"matrix": [0, 14], "x": 16.25, "y": 4.5},

{"matrix": [5, 11], "x": 18.5, "y": 4.5},
{"matrix": [5, 12], "x": 19.5, "y": 4.5},
{"matrix": [5, 13], "x": 20.5, "y": 4.5},
{"matrix": [5, 14], "x": 21.5, "y": 4.5, "h": 2},

{"matrix": [2, 0], "x": 0, "y": 5.5, "w": 1.5},
{"matrix": [0, 15], "x": 2.5, "y": 5.5, "w": 1.5},
{"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7},
{"matrix": [7, 15], "x": 11, "y": 5.5, "w": 1.5},
{"matrix": [6, 0], "x": 13.5, "y": 5.5, "w": 1.5},

{"matrix": [7, 14], "x": 15.25, "y": 5.5},
{"matrix": [7, 11], "x": 16.25, "y": 5.5},
{"matrix": [7, 12], "x": 17.25, "y": 5.5},

{"matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2},
{"matrix": [0, 13], "x": 20.5, "y": 5.5}
]
}
}
}
Loading