Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						f56838c680
					
				
					 6 changed files with 206 additions and 0 deletions
				
			
		
							
								
								
									
										123
									
								
								keyboards/handwired/iso85k/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										123
									
								
								keyboards/handwired/iso85k/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,123 @@
 | 
			
		|||
{
 | 
			
		||||
    "manufacturer": "Fredrik A. Kristiansen",
 | 
			
		||||
    "keyboard_name": "iso85k",
 | 
			
		||||
    "maintainer": "FredrikAleksander",
 | 
			
		||||
    "bootloader": "stm32-dfu",
 | 
			
		||||
    "diode_direction": "COL2ROW",
 | 
			
		||||
    "features": {
 | 
			
		||||
        "bootmagic": true,
 | 
			
		||||
        "command": false,
 | 
			
		||||
        "console": false,
 | 
			
		||||
        "extrakey": true,
 | 
			
		||||
        "mousekey": false,
 | 
			
		||||
        "nkro": true
 | 
			
		||||
    },
 | 
			
		||||
    "matrix_pins": {
 | 
			
		||||
        "cols": ["A7", "C4", "C5", "B0", "B1", "B2", "B10", "B11", "C10", "C11", "C12", "B3", "B4", "B5", "B8", "B9"],
 | 
			
		||||
        "rows": ["C7", "C6", "B15", "B14", "B13", "B12"]
 | 
			
		||||
    },
 | 
			
		||||
    "processor": "STM32F072",
 | 
			
		||||
    "url": "",
 | 
			
		||||
    "usb": {
 | 
			
		||||
        "device_version": "1.0.0",
 | 
			
		||||
        "pid": "0xCAFE",
 | 
			
		||||
        "vid": "0xD666"
 | 
			
		||||
    },
 | 
			
		||||
    "community_layouts": ["75_iso"],
 | 
			
		||||
    "layouts": {
 | 
			
		||||
        "LAYOUT_75_iso": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
                {"matrix": [0, 0], "x": 0, "y": 0},
 | 
			
		||||
                {"matrix": [0, 1], "x": 1, "y": 0},
 | 
			
		||||
                {"matrix": [0, 2], "x": 2, "y": 0},
 | 
			
		||||
                {"matrix": [0, 3], "x": 3, "y": 0},
 | 
			
		||||
                {"matrix": [0, 4], "x": 4, "y": 0},
 | 
			
		||||
                {"matrix": [0, 5], "x": 5, "y": 0},
 | 
			
		||||
                {"matrix": [0, 6], "x": 6, "y": 0},
 | 
			
		||||
                {"matrix": [0, 7], "x": 7, "y": 0},
 | 
			
		||||
                {"matrix": [0, 8], "x": 8, "y": 0},
 | 
			
		||||
                {"matrix": [0, 9], "x": 9, "y": 0},
 | 
			
		||||
                {"matrix": [0, 10], "x": 10, "y": 0},
 | 
			
		||||
                {"matrix": [0, 11], "x": 11, "y": 0},
 | 
			
		||||
                {"matrix": [0, 12], "x": 12, "y": 0},
 | 
			
		||||
                {"matrix": [0, 13], "x": 13, "y": 0},
 | 
			
		||||
                {"matrix": [0, 14], "x": 14, "y": 0},
 | 
			
		||||
                {"matrix": [0, 15], "x": 15, "y": 0},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [1, 0], "x": 0, "y": 1},
 | 
			
		||||
                {"matrix": [1, 1], "x": 1, "y": 1},
 | 
			
		||||
                {"matrix": [1, 2], "x": 2, "y": 1},
 | 
			
		||||
                {"matrix": [1, 3], "x": 3, "y": 1},
 | 
			
		||||
                {"matrix": [1, 4], "x": 4, "y": 1},
 | 
			
		||||
                {"matrix": [1, 5], "x": 5, "y": 1},
 | 
			
		||||
                {"matrix": [1, 6], "x": 6, "y": 1},
 | 
			
		||||
                {"matrix": [1, 7], "x": 7, "y": 1},
 | 
			
		||||
                {"matrix": [1, 8], "x": 8, "y": 1},
 | 
			
		||||
                {"matrix": [1, 9], "x": 9, "y": 1},
 | 
			
		||||
                {"matrix": [1, 10], "x": 10, "y": 1},
 | 
			
		||||
                {"matrix": [1, 11], "x": 11, "y": 1},
 | 
			
		||||
                {"matrix": [1, 12], "x": 12, "y": 1},
 | 
			
		||||
                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
 | 
			
		||||
                {"matrix": [1, 15], "x": 15, "y": 1},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
 | 
			
		||||
                {"matrix": [2, 1], "x": 1.5, "y": 2},
 | 
			
		||||
                {"matrix": [2, 2], "x": 2.5, "y": 2},
 | 
			
		||||
                {"matrix": [2, 3], "x": 3.5, "y": 2},
 | 
			
		||||
                {"matrix": [2, 4], "x": 4.5, "y": 2},
 | 
			
		||||
                {"matrix": [2, 5], "x": 5.5, "y": 2},
 | 
			
		||||
                {"matrix": [2, 6], "x": 6.5, "y": 2},
 | 
			
		||||
                {"matrix": [2, 7], "x": 7.5, "y": 2},
 | 
			
		||||
                {"matrix": [2, 8], "x": 8.5, "y": 2},
 | 
			
		||||
                {"matrix": [2, 9], "x": 9.5, "y": 2},
 | 
			
		||||
                {"matrix": [2, 10], "x": 10.5, "y": 2},
 | 
			
		||||
                {"matrix": [2, 11], "x": 11.5, "y": 2},
 | 
			
		||||
                {"matrix": [2, 12], "x": 12.5, "y": 2},
 | 
			
		||||
                {"matrix": [2, 15], "x": 15, "y": 2},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
 | 
			
		||||
                {"matrix": [3, 1], "x": 1.75, "y": 3},
 | 
			
		||||
                {"matrix": [3, 2], "x": 2.75, "y": 3},
 | 
			
		||||
                {"matrix": [3, 3], "x": 3.75, "y": 3},
 | 
			
		||||
                {"matrix": [3, 4], "x": 4.75, "y": 3},
 | 
			
		||||
                {"matrix": [3, 5], "x": 5.75, "y": 3},
 | 
			
		||||
                {"matrix": [3, 6], "x": 6.75, "y": 3},
 | 
			
		||||
                {"matrix": [3, 7], "x": 7.75, "y": 3},
 | 
			
		||||
                {"matrix": [3, 8], "x": 8.75, "y": 3},
 | 
			
		||||
                {"matrix": [3, 9], "x": 9.75, "y": 3},
 | 
			
		||||
                {"matrix": [3, 10], "x": 10.75, "y": 3},
 | 
			
		||||
                {"matrix": [3, 11], "x": 11.75, "y": 3},
 | 
			
		||||
                {"matrix": [3, 12], "x": 12.75, "y": 3},
 | 
			
		||||
                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
 | 
			
		||||
                {"matrix": [3, 15], "x": 15, "y": 3},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
 | 
			
		||||
                {"matrix": [4, 1], "x": 1.25, "y": 4},
 | 
			
		||||
                {"matrix": [4, 2], "x": 2.25, "y": 4},
 | 
			
		||||
                {"matrix": [4, 3], "x": 3.25, "y": 4},
 | 
			
		||||
                {"matrix": [4, 4], "x": 4.25, "y": 4},
 | 
			
		||||
                {"matrix": [4, 5], "x": 5.25, "y": 4},
 | 
			
		||||
                {"matrix": [4, 6], "x": 6.25, "y": 4},
 | 
			
		||||
                {"matrix": [4, 7], "x": 7.25, "y": 4},
 | 
			
		||||
                {"matrix": [4, 8], "x": 8.25, "y": 4},
 | 
			
		||||
                {"matrix": [4, 9], "x": 9.25, "y": 4},
 | 
			
		||||
                {"matrix": [4, 10], "x": 10.25, "y": 4},
 | 
			
		||||
                {"matrix": [4, 11], "x": 11.25, "y": 4},
 | 
			
		||||
                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
 | 
			
		||||
                {"matrix": [4, 14], "x": 14, "y": 4},
 | 
			
		||||
                {"matrix": [4, 15], "x": 15, "y": 4},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
 | 
			
		||||
                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
 | 
			
		||||
                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
 | 
			
		||||
                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
 | 
			
		||||
                {"matrix": [5, 10], "x": 10, "y": 5},
 | 
			
		||||
                {"matrix": [5, 11], "x": 11, "y": 5},
 | 
			
		||||
                {"matrix": [5, 12], "x": 12, "y": 5},
 | 
			
		||||
                {"matrix": [5, 13], "x": 13, "y": 5},
 | 
			
		||||
                {"matrix": [5, 14], "x": 14, "y": 5},
 | 
			
		||||
                {"matrix": [5, 15], "x": 15, "y": 5}
 | 
			
		||||
            ]
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										28
									
								
								keyboards/handwired/iso85k/keymaps/default/keymap.c
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										28
									
								
								keyboards/handwired/iso85k/keymaps/default/keymap.c
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,28 @@
 | 
			
		|||
// Copyright 2023 Fredrik A. Kristiansen (fredrikaxk@gmail.com)
 | 
			
		||||
// SPDX-License-Identifier: GPL-2.0-or-later
 | 
			
		||||
 | 
			
		||||
#include QMK_KEYBOARD_H
 | 
			
		||||
 | 
			
		||||
enum layers {
 | 
			
		||||
    _BL,
 | 
			
		||||
    _FL
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    [_BL] = LAYOUT_75_iso(
 | 
			
		||||
        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_PAUS, KC_DEL,
 | 
			
		||||
        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_HOME,
 | 
			
		||||
        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_PGUP,
 | 
			
		||||
        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_PGDN,
 | 
			
		||||
        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
 | 
			
		||||
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
 | 
			
		||||
    ),
 | 
			
		||||
    [_FL] = LAYOUT_75_iso(
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM,  KC_SCRL, KC_INS,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
 | 
			
		||||
        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
 | 
			
		||||
    )
 | 
			
		||||
};
 | 
			
		||||
							
								
								
									
										28
									
								
								keyboards/handwired/iso85k/keymaps/via/keymap.c
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										28
									
								
								keyboards/handwired/iso85k/keymaps/via/keymap.c
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,28 @@
 | 
			
		|||
// Copyright 2023 Fredrik A. Kristiansen (fredrikaxk@gmail.com)
 | 
			
		||||
// SPDX-License-Identifier: GPL-2.0-or-later
 | 
			
		||||
 | 
			
		||||
#include QMK_KEYBOARD_H
 | 
			
		||||
 | 
			
		||||
enum layers {
 | 
			
		||||
    _BL,
 | 
			
		||||
    _FL
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    [_BL] = LAYOUT_75_iso(
 | 
			
		||||
        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_PAUS, KC_DEL,
 | 
			
		||||
        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_HOME,
 | 
			
		||||
        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_PGUP,
 | 
			
		||||
        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_PGDN,
 | 
			
		||||
        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
 | 
			
		||||
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
 | 
			
		||||
    ),
 | 
			
		||||
    [_FL] = LAYOUT_75_iso(
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM,  KC_SCRL, KC_INS,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
 | 
			
		||||
        _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
 | 
			
		||||
        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
 | 
			
		||||
    )
 | 
			
		||||
};
 | 
			
		||||
							
								
								
									
										1
									
								
								keyboards/handwired/iso85k/keymaps/via/rules.mk
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								keyboards/handwired/iso85k/keymaps/via/rules.mk
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1 @@
 | 
			
		|||
VIA_ENABLE = yes
 | 
			
		||||
							
								
								
									
										25
									
								
								keyboards/handwired/iso85k/readme.md
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										25
									
								
								keyboards/handwired/iso85k/readme.md
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,25 @@
 | 
			
		|||
# iso85k
 | 
			
		||||
 | 
			
		||||
*A 85-key ISO keyboard*
 | 
			
		||||
 | 
			
		||||
* Keyboard Maintainer: [Fredrik A. Kristiansen](https://github.com/FredrikAleksander)
 | 
			
		||||
* Hardware Supported: Custom PCB using STM32F072
 | 
			
		||||
* Hardware Availability: PCB gerbers available upon request (fredrikaxk@gmail.com)
 | 
			
		||||
 | 
			
		||||
Make example for this keyboard (after setting up your build environment):
 | 
			
		||||
 | 
			
		||||
    make handwired/iso85k:via
 | 
			
		||||
 | 
			
		||||
Flashing example for this keyboard:
 | 
			
		||||
 | 
			
		||||
    make handwired/iso85k:via:flash
 | 
			
		||||
 | 
			
		||||
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 | 
			
		||||
 | 
			
		||||
## Bootloader
 | 
			
		||||
 | 
			
		||||
Enter the bootloader in 3 ways:
 | 
			
		||||
 | 
			
		||||
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 | 
			
		||||
* **Physical reset button**: Briefly press the button on the back of the PCB, while shorting the pins marked BOOT0
 | 
			
		||||
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
 | 
			
		||||
							
								
								
									
										1
									
								
								keyboards/handwired/iso85k/rules.mk
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								keyboards/handwired/iso85k/rules.mk
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1 @@
 | 
			
		|||
# This file intentionally left blank
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue