mh
/
qmk_firmware
mirror of https://github.com/qmk/qmk_firmware/
1
0
Fork 0
Code Issues 0 Projects 0 Releases 1.6k Wiki Activity
Browse Source

[Keyboard] Add maJIStic keyboard (#10258) 

* add maJIStic

* fix for format

* fix directory name

* rm old directory of maJIStic

* fix for comment

* ISO/JIS Enter move to the home row.
pull/10361/head
yossiyossy 3 years ago
committed by GitHub
parent
f079dd90ed
commit
9eeb6048ff
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 301 additions and 0 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +57
    -0
      keyboards/majistic/config.h
  2. +78
    -0
      keyboards/majistic/info.json
  3. +17
    -0
      keyboards/majistic/keymaps/default/config.h
  4. +45
    -0
      keyboards/majistic/keymaps/default/keymap.c
  5. +1
    -0
      keyboards/majistic/keymaps/default/readme.md
  6. +17
    -0
      keyboards/majistic/majistic.c
  7. +47
    -0
      keyboards/majistic/majistic.h
  8. +15
    -0
      keyboards/majistic/readme.md
  9. +24
    -0
      keyboards/majistic/rules.mk

+ 57
- 0
keyboards/majistic/config.h View File

@ -0,0 +1,57 @@
/*
Copyright 2020 yossiyossy
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
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6E55
#define DEVICE_VER 0x0001
#define MANUFACTURER yossiyossy
#define PRODUCT maJIStic
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 8
#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2 }
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, F4, F5 } // F4, F5 is dummy
#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B4 }
#define MATRIX_COL_PINS_RIGHT { B6, B2, B3, B1, F7, F6, F5, F4 }
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
/*
* Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
*/
#define SOFT_SERIAL_PIN D2 // or D1, D2, D3, E6
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5
/* 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
/* disable these deprecated features by default */
#define NO_ACTION_MACRO
#define NO_ACTION_FUNCTION

+ 78
- 0
keyboards/majistic/info.json View File

@ -0,0 +1,78 @@
{
"keyboard_name": "maJIStic",
"url": "https://github.com/yossiyossy/maJIStic",
"maintainer": "yossiyossy",
"width": 15.5,
"height": 5,
"layouts": {
"LAYOUT": {
"layout": [
{"label":"1", "x":0, "y":0, "w":1.5},
{"label":"2", "x":1.5, "y":0},
{"label":"3", "x":2.5, "y":0},
{"label":"4", "x":3.5, "y":0},
{"label":"5", "x":4.5, "y":0},
{"label":"6", "x":5.5, "y":0},
{"label":"7", "x":7.5, "y":0},
{"label":"8", "x":8.5, "y":0},
{"label":"9", "x":9.5, "y":0},
{"label":"0", "x":10.5, "y":0},
{"label":"-", "x":11.5, "y":0},
{"label":"^", "x":12.5, "y":0},
{"label":"\\", "x":13.5, "y":0},
{"label":"BS", "x":14.5, "y":0},
{"label":"Tab", "x":0, "y":1},
{"label":"Q", "x":1, "y":1},
{"label":"W", "x":2, "y":1},
{"label":"E", "x":3, "y":1},
{"label":"R", "x":4, "y":1},
{"label":"T", "x":5, "y":1},
{"label":"Y", "x":7, "y":1},
{"label":"U", "x":8, "y":1},
{"label":"I", "x":9, "y":1},
{"label":"O", "x":10, "y":1},
{"label":"P", "x":11, "y":1},
{"label":"@", "x":12, "y":1},
{"label":"[", "x":13, "y":1},
{"label":"Caps Lock", "x":0, "y":2, "w":1.25},
{"label":"A", "x":1.25, "y":2},
{"label":"S", "x":2.25, "y":2},
{"label":"D", "x":3.25, "y":2},
{"label":"F", "x":4.25, "y":2},
{"label":"G", "x":5.25, "y":2},
{"label":"H", "x":7.25, "y":2},
{"label":"J", "x":8.25, "y":2},
{"label":"K", "x":9.25, "y":2},
{"label":"L", "x":10.25, "y":2},
{"label":";", "x":11.25, "y":2},
{"label":":", "x":12.25, "y":2},
{"label":"]", "x":13.25, "y":2},
{"label":"Enter", "x":14.25, "y":1, "w":1.25, "h":2},
{"label":"Shift", "x":0, "y":3, "w":1.75},
{"label":"Z", "x":1.75, "y":3},
{"label":"X", "x":2.75, "y":3},
{"label":"C", "x":3.75, "y":3},
{"label":"V", "x":4.75, "y":3},
{"label":"B", "x":5.75, "y":3},
{"label":"N", "x":7.75, "y":3},
{"label":"M", "x":8.75, "y":3},
{"label":",", "x":9.75, "y":3},
{"label":".", "x":10.75, "y":3},
{"label":"/", "x":11.75, "y":3},
{"label":"up", "x":12.75, "y":3},
{"label":"Shift", "x":13.75, "y":3, "w":1.75},
{"label":"Ctrl", "x":0, "y":4},
{"label":"Alt", "x":1, "y":4},
{"label":"command", "x":2, "y":4, "w":1.25},
{"label":"EISU", "x":3.25, "y":4, "w":1.25},
{"label":"", "x":4.5, "y":4, "w":1.75},
{"label":"", "x":7.25, "y":4, "w":1.5},
{"label":"KANA", "x":8.75, "y":4, "w":1.5},
{"label":"command", "x":10.25, "y":4, "w":1.5},
{"label":"left", "x":11.75, "y":4},
{"label":"down", "x":12.75, "y":4},
{"label":"right", "x":13.75, "y":4}
]
}
}
}

+ 17
- 0
keyboards/majistic/keymaps/default/config.h View File

@ -0,0 +1,17 @@
/* Copyright 2020 yossiyossy
*
* 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

+ 45
- 0
keyboards/majistic/keymaps/default/keymap.c View File

@ -0,0 +1,45 @@
/* Copyright 2020 yossiyossy
*
* 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
#include "keymap_jp.h"
// Defines names for use in layer keycodes and the keymap
enum layer_names {
_BASE,
_LOWER,
};
enum custom_keycodes {
L_SPC = SAFE_RANGE,
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[_BASE] = LAYOUT(
JP_1, JP_2, JP_3, JP_4, JP_5, JP_6, JP_7, JP_8, JP_9, JP_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPC, \
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_AT, JP_LBRC, \
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_SCLN, JP_COLN, JP_RBRC, KC_ENT , \
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, KC_UP, KC_RSFT, \
KC_LCTL, KC_LALT, KC_LGUI, KC_LANG2, LT(_LOWER, KC_SPC), LT(_LOWER, KC_SPC), KC_LANG1, KC_RGUI, KC_LEFT, KC_DOWN, KC_RIGHT \
),
[_LOWER] = LAYOUT(
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_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, JP_UNDS, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRMU, KC_VOLU, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, KC_BRMD, KC_VOLD, _______ \
),
};

+ 1
- 0
keyboards/majistic/keymaps/default/readme.md View File

@ -0,0 +1 @@
# The default keymap for maJIStic

+ 17
- 0
keyboards/majistic/majistic.c View File

@ -0,0 +1,17 @@
/* Copyright 2020 yossiyossy
*
* 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 "majistic.h"

+ 47
- 0
keyboards/majistic/majistic.h View File

@ -0,0 +1,47 @@
/* Copyright 2020 yossiyossy
*
* 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
#include "quantum.h"
/* This is a shortcut to help you visually see your layout.
*
* The first section contains all of the arguments representing the physical
* layout of the board and position of the keys.
*
* The second converts the arguments into a two-dimensional array which
* represents the switch matrix.
*/
#define LAYOUT(\
l00, l01, l02, l03, l04, l05, r00, r01, r02, r03, r04, r05, r06, r07, \
l10, l11, l12, l13, l14, l15, r10, r11, r12, r13, r14, r15, r16, \
l20, l21, l22, l23, l24, l25, r20, r21, r22, r23, r24, r25, r26, r17, \
l30, l31, l32, l33, l34, l35, r30, r31, r32, r33, r34, r35, r36, \
l40, l41, l42, l43, l44, r40, r41, r42, r43, r44, r45 \
) {\
{ l00, l01, l02, l03, l04, l05, KC_NO, KC_NO }, \
{ l10, l11, l12, l13, l14, l15, KC_NO, KC_NO }, \
{ l20, l21, l22, l23, l24, l25, KC_NO, KC_NO}, \
{ l30, l31, l32, l33, l34, l35, KC_NO, KC_NO}, \
{ l40, l41, l42, l43, l44, KC_NO, KC_NO, KC_NO}, \
{ r00, r01, r02, r03, r04, r05, r06, r07 }, \
{ r10, r11, r12, r13, r14, r15, r16, r17 }, \
{ r20, r21, r22, r23, r24, r25, r26, KC_NO }, \
{ r30, r31, r32, r33, r34, r35, r36, KC_NO }, \
{ r40, r41, r42, r43, r44, r45, KC_NO, KC_NO } \
}

+ 15
- 0
keyboards/majistic/readme.md View File

@ -0,0 +1,15 @@
# maJIStic
![maJIStic](https://raw.githubusercontent.com/yossiyossy/maJIStic/master/images/main_image.jpg)
maJIStic is a split, JIS, magic keyboard like, hot-swappable keybaord!
* Keyboard Maintainer: [yossiyossy](https://github.com/yossiyossy)
* Hardware Supported: [pcb](https://github.com/yossiyossy/maJIStic/tree/master/pcb), [case](https://github.com/yossiyossy/maJIStic/tree/master/case/dxf)
* Hardware Availability: [booth](https://yossiyossy.booth.pm/items/2325429)
Make example for this keyboard (after setting up your build environment):
make majistic:default
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).

+ 24
- 0
keyboards/majistic/rules.mk View File

@ -0,0 +1,24 @@
# MCU name
MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE = no # USB Nkey Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output
SPLIT_KEYBOARD = yes

Write Preview
Loading…
Cancel
Save