Skip to content

Commit

Permalink
[Keyboard] Added support for a new keyboard - Ishi 80 Mk0 (#19195)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jasonj2232
jasonj2232 authored Dec 30, 2022
1 parent e08debb commit 6b50b1b
Show file tree
Hide file tree
Showing 18 changed files with 796 additions and 0 deletions.
25 changes: 25 additions & 0 deletions keyboards/argo_works/ishi/80/mk0_avr/config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Copyright 2022 Jason Devadoss (@jasonj2232)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

#include "config_common.h"

#define BOOTMAGIC_LITE_ROW 1
#define BOOTMAGIC_LITE_COLUMN 0

/*
* 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
111 changes: 111 additions & 0 deletions keyboards/argo_works/ishi/80/mk0_avr/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
{
"manufacturer": "Argo Works",
"keyboard_name": "Ishi 80 Mk 0",
"maintainer": "jasonj2232",
"development_board": "promicro",
"diode_direction": "COL2ROW",
"url": "https://qmk.fm/keyboards/",
"usb": {
"device_version": "0.0.1",
"pid": "0x4930",
"vid": "0x4157"
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true,
"encoder": false
},
"matrix_pins": {
"cols": ["D3", "F4", "F5", "F6", "F7", "D7", "C6", "D4", "D2"],
"rows": ["B3", "B1", "B6", "B2", "D1", "D0", "B5", "B4", "E6"]
},
"layouts": {
"LAYOUT": {
"layout": [
{ "matrix": [1, 0], "x": 0, "y": 0 },
{ "matrix": [0, 0], "x": 1, "y": 0 },
{ "matrix": [1, 1], "x": 2, "y": 0 },
{ "matrix": [0, 1], "x": 3, "y": 0 },
{ "matrix": [1, 2], "x": 5.25, "y": 0 },
{ "matrix": [0, 2], "x": 6.25, "y": 0 },
{ "matrix": [1, 3], "x": 7.25, "y": 0 },
{ "matrix": [0, 3], "x": 8.25, "y": 0 },
{ "matrix": [1, 4], "x": 9.25, "y": 0 },
{ "matrix": [0, 4], "x": 10.25, "y": 0 },
{ "matrix": [1, 5], "x": 11.25, "y": 0 },
{ "matrix": [0, 5], "x": 12.25, "y": 0 },
{ "matrix": [1, 6], "x": 13.25, "y": 0 },
{ "matrix": [0, 6], "x": 14.25, "y": 0 },
{ "matrix": [1, 7], "x": 15.25, "y": 0 },
{ "matrix": [0, 7], "x": 16.25, "y": 0 },
{ "matrix": [1, 8], "x": 17.25, "y": 0 },
{ "matrix": [0, 8], "x": 18.25, "y": 0, "w": 2 },
{ "matrix": [3, 0], "x": 0, "y": 1, "h": 2 },
{ "matrix": [2, 0], "x": 1, "y": 1 },
{ "matrix": [3, 1], "x": 2, "y": 1 },
{ "matrix": [2, 1], "x": 3, "y": 1 },
{ "matrix": [3, 2], "x": 5.25, "y": 1, "w": 1.5 },
{ "matrix": [2, 2], "x": 6.75, "y": 1 },
{ "matrix": [3, 3], "x": 7.75, "y": 1 },
{ "matrix": [2, 3], "x": 8.75, "y": 1 },
{ "matrix": [3, 4], "x": 9.75, "y": 1 },
{ "matrix": [2, 4], "x": 10.75, "y": 1 },
{ "matrix": [3, 5], "x": 11.75, "y": 1 },
{ "matrix": [2, 5], "x": 12.75, "y": 1 },
{ "matrix": [3, 6], "x": 13.75, "y": 1 },
{ "matrix": [2, 6], "x": 14.75, "y": 1 },
{ "matrix": [3, 7], "x": 15.75, "y": 1 },
{ "matrix": [2, 7], "x": 16.75, "y": 1 },
{ "matrix": [3, 8], "x": 17.75, "y": 1 },
{ "matrix": [2, 8], "x": 18.75, "y": 1, "w": 1.5 },
{ "matrix": [4, 0], "x": 1, "y": 2 },
{ "matrix": [5, 1], "x": 2, "y": 2 },
{ "matrix": [4, 1], "x": 3, "y": 2 },
{ "matrix": [5, 2], "x": 5.25, "y": 2, "w": 1.75 },
{ "matrix": [4, 2], "x": 7, "y": 2 },
{ "matrix": [5, 3], "x": 8, "y": 2 },
{ "matrix": [4, 3], "x": 9, "y": 2 },
{ "matrix": [5, 4], "x": 10, "y": 2 },
{ "matrix": [4, 4], "x": 11, "y": 2 },
{ "matrix": [5, 5], "x": 12, "y": 2 },
{ "matrix": [4, 5], "x": 13, "y": 2 },
{ "matrix": [5, 6], "x": 14, "y": 2 },
{ "matrix": [4, 6], "x": 15, "y": 2 },
{ "matrix": [5, 7], "x": 16, "y": 2 },
{ "matrix": [4, 7], "x": 17, "y": 2 },
{ "matrix": [4, 8], "x": 18, "y": 2, "w": 2.25 },
{ "matrix": [7, 0], "x": 0, "y": 3, "h": 2 },
{ "matrix": [6, 0], "x": 1, "y": 3 },
{ "matrix": [7, 1], "x": 2, "y": 3 },
{ "matrix": [6, 1], "x": 3, "y": 3 },
{ "matrix": [7, 2], "x": 5.25, "y": 3, "w": 2.25 },
{ "matrix": [7, 3], "x": 7.5, "y": 3 },
{ "matrix": [6, 3], "x": 8.5, "y": 3 },
{ "matrix": [7, 4], "x": 9.5, "y": 3 },
{ "matrix": [6, 4], "x": 10.5, "y": 3 },
{ "matrix": [7, 5], "x": 11.5, "y": 3 },
{ "matrix": [6, 5], "x": 12.5, "y": 3 },
{ "matrix": [7, 6], "x": 13.5, "y": 3 },
{ "matrix": [6, 6], "x": 14.5, "y": 3 },
{ "matrix": [7, 7], "x": 15.5, "y": 3 },
{ "matrix": [6, 7], "x": 16.5, "y": 3 },
{ "matrix": [6, 8], "x": 17.5, "y": 3, "w": 2.75 },
{ "matrix": [8, 0], "x": 1, "y": 4 },
{ "matrix": [8, 1], "x": 2, "y": 4, "w": 2 },
{ "matrix": [8, 2], "x": 5.25, "y": 4, "w": 1.25 },
{ "matrix": [6, 2], "x": 6.5, "y": 4, "w": 1.25 },
{ "matrix": [8, 3], "x": 7.75, "y": 4, "w": 1.25 },
{ "matrix": [8, 4], "x": 9, "y": 4, "w": 6.25 },
{ "matrix": [8, 5], "x": 15.25, "y": 4, "w": 1.25 },
{ "matrix": [8, 6], "x": 16.5, "y": 4, "w": 1.25 },
{ "matrix": [8, 7], "x": 17.75, "y": 4, "w": 1.25 },
{ "matrix": [7, 8], "x": 19, "y": 4, "w": 1.25 },
{ "matrix": [8, 8], "x": 21.5, "y": 4 }
]
}
}
}
42 changes: 42 additions & 0 deletions keyboards/argo_works/ishi/80/mk0_avr/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/* Copyright 2022 Jason Devadoss (@jasonj2232)
*
* 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/>.
*/

#include QMK_KEYBOARD_H

enum custom_layers {
BL,
UL,
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[BL] = LAYOUT(
KC_PMNS, KC_PAST, KC_PSLS, KC_NUM, KC_ESC, 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_PPLS, KC_P9, KC_P8, KC_P7, 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_BSLS,
KC_P6, KC_P5, KC_P4, KC_CAPS_LOCK, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_PENT, KC_P3, KC_P2, KC_P1, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_PDOT, KC_P0, KC_LCTL, KC_LGUI, LT(1, KC_LALT), KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_AUDIO_MUTE

),

[UL] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_GRAVE, 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_DEL,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,
KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT,KC_DOWN, KC_DOWN, KC_MPLY
),
};
60 changes: 60 additions & 0 deletions keyboards/argo_works/ishi/80/mk0_avr/keymaps/via/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/* Copyright 2022 Jason Devadoss (@jasonj2232)
*
* 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/>.
*/

#include QMK_KEYBOARD_H

enum custom_layers {
BL,
UL,
TL,
FL,
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[BL] = LAYOUT(
KC_PMNS, KC_PAST, KC_PSLS, KC_NUM, KC_ESC, 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_PPLS, KC_P9, KC_P8, KC_P7, 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_BSLS,
KC_P6, KC_P5, KC_P4, KC_CAPS_LOCK, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_PENT, KC_P3, KC_P2, KC_P1, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_PDOT, KC_P0, KC_LCTL, KC_LGUI, LT(1, KC_LALT), KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_AUDIO_MUTE

),

[UL] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_GRAVE, 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_DEL,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,
KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT,KC_DOWN, KC_DOWN, KC_MPLY
),

[TL] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS
),

[FL] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS
),
};
1 change: 1 addition & 0 deletions keyboards/argo_works/ishi/80/mk0_avr/keymaps/via/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VIA_ENABLE = yes
29 changes: 29 additions & 0 deletions keyboards/argo_works/ishi/80/mk0_avr/readme.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Ishi 80 Mk 0

![argo_works/ishi/80/mk0_avr](https://i.imgur.com/TVn6zeqh.jpeg)

Ishi 80 is a 60% keyboard with a SouthPaw, Mirrored Numpad.

Note: This firmware is for ATMega32U4 based daughterboards with the standard Pro-Micro footprint. It does not support the Encoder and OLED display functionality.

* Keyboard Maintainer: [Jason Devadoss](https://github.com/jasonj2232)
* Hardware Supported: Ishi80 Mk 0 with standard Pro Micro footprint daughterboards
* Hardware Availability: -

Make example for this keyboard (after setting up your build environment):

make argo_works/ishi/80/mk0_avr:default

Flashing example for this keyboard:

make argo_works/ishi/80/mk0_avr:default: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 - some may have pads you must short instead
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
1 change: 1 addition & 0 deletions keyboards/argo_works/ishi/80/mk0_avr/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# This file intentionally left blank
29 changes: 29 additions & 0 deletions keyboards/argo_works/ishi/80/mk0_avr_extra/config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// Copyright 2022 Jason Devadoss (@jasonj2232)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

#include "config_common.h"

#define BOOTMAGIC_LITE_ROW 1
#define BOOTMAGIC_LITE_COLUMN 0

//Uncomment the below if the encoder direction is flipped/opposite to what is expected

//#define ENCODER_DIRECTION_FLIP

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

0 comments on commit 6b50b1b

Please sign in to comment.