From 13e3385b1d8f3f24ebd541bcca245d2afe26de1f Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Fri, 1 Jul 2022 02:25:10 +0900 Subject: [PATCH 01/30] add new keyboard first upload fungo split keyboard --- keyboards/fungo/fungo.c | 18 +++ keyboards/fungo/fungo.h | 23 ++++ keyboards/fungo/keymaps/default/keymap.c | 164 +++++++++++++++++++++++ keyboards/fungo/readme.md | 23 ++++ keyboards/fungo/rev1/config.h | 103 ++++++++++++++ keyboards/fungo/rev1/info.json | 105 +++++++++++++++ keyboards/fungo/rev1/rev1.c | 17 +++ keyboards/fungo/rev1/rev1.h | 79 +++++++++++ keyboards/fungo/rev1/rules.mk | 40 ++++++ keyboards/fungo/rules.mk | 40 ++++++ 10 files changed, 612 insertions(+) create mode 100644 keyboards/fungo/fungo.c create mode 100644 keyboards/fungo/fungo.h create mode 100644 keyboards/fungo/keymaps/default/keymap.c create mode 100644 keyboards/fungo/readme.md create mode 100644 keyboards/fungo/rev1/config.h create mode 100644 keyboards/fungo/rev1/info.json create mode 100644 keyboards/fungo/rev1/rev1.c create mode 100644 keyboards/fungo/rev1/rev1.h create mode 100644 keyboards/fungo/rev1/rules.mk create mode 100644 keyboards/fungo/rules.mk diff --git a/keyboards/fungo/fungo.c b/keyboards/fungo/fungo.c new file mode 100644 index 000000000000..1446234b3619 --- /dev/null +++ b/keyboards/fungo/fungo.c @@ -0,0 +1,18 @@ +/* Copyright 2022 bojiguard (@bojiguard) + * + * 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 . + */ + + #include "fungo.h" + diff --git a/keyboards/fungo/fungo.h b/keyboards/fungo/fungo.h new file mode 100644 index 000000000000..dd267c346361 --- /dev/null +++ b/keyboards/fungo/fungo.h @@ -0,0 +1,23 @@ +/* Copyright 2022 bojiguard (@bojiguard) + * + * 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 . + */ + +#pragma once + +#include "quantum.h" + +#ifdef KEYBOARD_fungo_rev1 + #include "rev1.h" +#endif diff --git a/keyboards/fungo/keymaps/default/keymap.c b/keyboards/fungo/keymaps/default/keymap.c new file mode 100644 index 000000000000..fb798296f087 --- /dev/null +++ b/keyboards/fungo/keymaps/default/keymap.c @@ -0,0 +1,164 @@ +/* Copyright 2022 bojiguard (@bojiguard) + * + * 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 . + */ + +#include QMK_KEYBOARD_H + + +enum layer_names { + SAM1, + SAM2, + SAM3, + SAM4, + BASE, + F3LAY, + F4LAY, +}; + + + + + +#define SFCTLNO MT(MOD_LCTL|MOD_LSFT,KC_NO) + +#define SFCT_S MT(MOD_LCTL|MOD_LSFT,KC_S) +#define CT_D MT(MOD_LCTL,KC_D) +#define SF_F MT(MOD_LSFT,KC_F) + +#define SF_J MT(MOD_RSFT,KC_J) +#define CT_K MT(MOD_RCTL,KC_K) + +#define MTC_F7 MT(MOD_LCTL|MOD_LSFT, KC_F7) +#define MTC_F8 MT(MOD_LCTL, KC_F8) +#define MTC_F9 MT(MOD_LSFT, KC_F9) + +#define MTC_K MT(MOD_RCTL, KC_K) +#define MTC_J MT(MOD_RSFT, KC_J) + +#define MTC_8 MT(MOD_RCTL, KC_8) +#define MTC_7 MT(MOD_RSFT, KC_7) + +//#define MTLC_8 MT(MOD_LCTL, KC_8) +#define MTLC_9 MT(MOD_LSFT, KC_9) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* BASE + * ,------------------------------------------------. ,------------------------------------------------. + * | ~ | 1 | 2 | 3 | 4 | 5 | ESC | | BS | 6 | 7 | 8 | 9 | [ | \ | + * |------+------+------+------+------+------+------| |-------------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | ` | | \ | Y | U | I | O | P | Tab | + * |------+------+------+------+------+------+------| |-------------+------+------+------+------+------| + * | ctrl | A | S | D | F | G | [ | | ] | H | J | K | L | ; | ctrl | + * |------+------+------+------+------+------+------| |------|------+------+------+------+------+------| + * | shift| Z | X | C | V | B | 3 | - | 7 || 1 | 2 | = | 4 | N | M | , | . |shift | + * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| + * | 1 | 2 | 3 | 4 | alt | spc | MO(1) |enter ||enter | MO(0) | spc | alt | 1 | 2 | 3 | 4 | + * `------------------------------------------------' ------------------------------------------------' + */ + + [BASE] = LAYOUT_fungo_split_num( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, KC_BSPC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_MINS, KC_EQL, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_TAB, + KC_NO, KC_A, SFCT_S, CT_D, SF_F, KC_G, KC_LBRC, KC_RBRC, KC_H, MTC_J, MTC_K, KC_L, KC_SCLN, KC_NO, + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_BSLS, LM(F3LAY, MOD_LSFT), KC_NO, KC_NO, LM(F3LAY, MOD_RSFT), KC_QUOT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, + KC_NO, TT(SAM1), KC_NO, KC_LALT, KC_LSHIFT, KC_SPC, MO(F3LAY), KC_ENT, KC_ENT, TT(F3LAY), KC_SPC, KC_RSHIFT, KC_RALT, KC_NO, TT(SAM1),TG(F4LAY) + ), + + /* BASE + * ,------------------------------------------------. ,------------------------------------------------. + * | ~ | 1 | 2 | 3 | 4 | 5 | ESC | | BS | 6 | 7 | 8 | 9 | [ | \ | + * |------+------+------+------+------+------+------| |-------------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | ` | | DEL | HOME | UP | END | O | P | Tab | + * |------+------+------+------+------+------+------| |-------------+------+------+------+------+------| + * | ctrl | A | S | D | F | G | [ | | INS | LEFT | DOWN | RIGHT| L | ; | ctrl | + * |------+------+------+------+------+------+------| |------|------+------+------+------+------+------| + * | shift| Z | X | ctr+C|ctr+V | B | 3 | - | 7 || 1 | 2 | NO | PGUP | NO | PGDN | , | . |shift | + * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| + * | 1 | 2 | 3 | 4 | alt | spc | MO(1) |enter ||enter | MO(0) | spc | alt | 1 | 2 | 3 | 4 | + * `------------------------------------------------' ------------------------------------------------' + */ + + [F3LAY] = LAYOUT_fungo_split_num( + KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_ESC, KC_BSPC, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, + KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_CAPS, KC_CAPS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TAB, + KC_NO, KC_NO, SFCTLNO, KC_LCTL, KC_LSFT, KC_PAUS, KC_PSCR, KC_BSPC, KC_DEL, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_NO, + KC_LCTL, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_NO, KC_NO, LM(F3LAY, MOD_LSFT), KC_NO, KC_NO, LM(F3LAY, MOD_RSFT), KC_NO, KC_INS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_RCTL, + KC_NO, KC_NO, KC_NO, KC_LALT, KC_LSHIFT, KC_SPC, MO(F3LAY), KC_ENT, KC_ENT, TT(F3LAY), KC_SPC, KC_RSHIFT, KC_RALT, KC_NO, KC_NO, TG(F4LAY) + ), + + + [F4LAY] = LAYOUT_fungo_split_num( + KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_ESC, KC_BSPC, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, + KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_CAPS, KC_CAPS, KC_DEL, KC_HOME, KC_UP, KC_END, KC_NO, KC_TAB, + KC_NO, KC_NO, SFCTLNO, KC_LCTL, KC_LSFT, KC_PAUS, KC_PSCR, KC_BSPC, KC_INS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO, KC_NO, + KC_LCTL, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_NO, KC_NO, LM(F3LAY, MOD_LSFT), KC_NO, KC_NO, LM(F3LAY, MOD_RSFT), KC_NO, KC_INS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_RCTL, + KC_NO, KC_NO, KC_NO, KC_LALT, KC_LSHIFT, KC_SPC, MO(F3LAY), KC_ENT, KC_ENT, TT(F3LAY), KC_SPC, KC_RSHIFT, KC_RALT, KC_NO, KC_NO, TG(F4LAY) + ), + + /* + [TEST] = LAYOUT_fungo_split_num( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, KC_BSPC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_MINS, KC_EQL, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_TAB, + KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LBRC, KC_RBRC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_RSFT, + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_BSLS, KC_LCTL, KC_NO, KC_NO, TG(F4LAY), KC_QUOT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, + KC_NO, KC_NO, KC_NO, KC_LALT, KC_LSHIFT, KC_SPC, MO(F3LAY), KC_ENT, KC_ENT, TT(F3LAY), KC_SPC, KC_RSHIFT, KC_RALT, KC_NO, KC_NO, KC_NO + ), + */ + + //--------------------------------------------------------NEW----------------------------------------------- + //SAM1을 기반으로 새로운 모드 + [SAM1] = LAYOUT_fungo_split_num( + KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, + KC_NO, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_BSPC, KC_BSPC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_NO, + KC_TAB, KC_A, SFCT_S, CT_D, SF_F, KC_G, KC_CAPS, KC_CAPS, KC_H, MTC_J, MTC_K, KC_L, KC_SCLN, KC_TAB, + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, TT(SAM3), KC_NO, KC_NO, TT(SAM2), KC_NO, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, + KC_NO, TT(SAM1), KC_NO, KC_LALT, KC_SPC, TT(SAM2), KC_ENT, MO(SAM4), KC_NO, KC_ENT, TT(SAM3), KC_SPC, KC_RALT, KC_NO, TT(SAM1), KC_NO + ), + + [SAM3] = LAYOUT_fungo_split_num( + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ESC, KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_BSPC, KC_BSPC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_NO, + KC_TAB, KC_6, KC_7, KC_8, MTLC_9, KC_0, KC_CAPS, KC_CAPS, KC_6, MTC_7, MTC_8, KC_9, KC_0, KC_TAB, + KC_LCTL, KC_PSLS, KC_PAST, KC_MINS, KC_PPLS, KC_EQL, KC_DOT, TT(SAM3), KC_NO, KC_NO, TT(SAM2), KC_DOT, KC_EQL, KC_PPLS, KC_PMNS, KC_PAST, KC_PSLS, KC_RCTL, + KC_NO, TT(SAM1), KC_NO, KC_LALT, KC_SPC, TT(SAM2), KC_ENT, MO(SAM4), KC_NO, KC_ENT, TT(SAM3), KC_SPC, KC_RALT, KC_NO, TT(SAM1), KC_NO + ), + + [SAM2] = LAYOUT_fungo_split_num( + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ESC, KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_BSPC, KC_DEL, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_NO, + KC_TAB, KC_F6, MTC_F7, MTC_F8, MTC_F9, KC_F10, KC_F12, KC_CAPS, KC_INS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_TAB, + KC_LCTL, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_NO, KC_NO, TT(SAM3), KC_NO, KC_NO, TT(SAM2), KC_NO, KC_BSLS, KC_QUOT, KC_LBRC, KC_RBRC, KC_GRV, KC_RCTL, + KC_NO, TT(SAM1), KC_NO, KC_LALT, KC_SPC, TT(SAM2), KC_ENT, MO(SAM4), KC_NO, KC_ENT, TT(SAM3), KC_SPC, KC_RALT, KC_NO, TT(SAM1), KC_NO + ), + [SAM4] = LAYOUT_fungo_split_num( + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ESC, KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_BSPC, KC_ACL0, KC_BTN1, KC_MS_U, KC_BTN2, KC_NO, KC_NO, + KC_TAB, KC_F6, MTC_F7, MTC_F8, MTC_F9, KC_F10, KC_F12, KC_CAPS, KC_ACL1, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_TAB, + KC_NO, KC_NO, KC_ACL0, KC_ACL1, KC_ACL2, KC_NO, KC_NO, TT(SAM3), KC_NO, KC_NO, TT(SAM2), KC_NO, KC_ACL2, KC_WH_L, KC_WH_U, KC_WH_D, KC_WH_R, KC_RCTL, + KC_NO, TT(SAM1), KC_NO, KC_LALT, KC_SPC, TT(SAM2), KC_ENT, MO(SAM4), KC_NO, KC_ENT, TT(SAM3), KC_SPC, KC_RALT, KC_NO, TT(SAM1), KC_NO + ), +}; + + + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + // If console is enabled, it will print the matrix position and status of each key pressed +#ifdef CONSOLE_ENABLE +// uprintf("KL: kc: 0x%04X, col: %u, row: %u, pressed: %b, time: %u, interrupt: %b, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count); +#endif + return true; +} + diff --git a/keyboards/fungo/readme.md b/keyboards/fungo/readme.md new file mode 100644 index 000000000000..68a0e35cf3b2 --- /dev/null +++ b/keyboards/fungo/readme.md @@ -0,0 +1,23 @@ +# fungo split keyboard (fungo) + +![fungo](https://github.com/bojiguard/fungo-split-keyboard/blob/master/picture/full%20cover.jpg) + +A split keyboard for my hands. + +Keyboard Maintainer: [bojiguard](https://github.com/bojiguard/) +Hardware Supported: Pro Micro, elite-c, nicenano +Hardware Availability: [fungo split keyboard](https://github.com/bojiguard/fungo-split-keyboard) + +Make example for this keyboard (after setting up your build environment): + + make fungo/rev1: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). + +# Characteristics + +Hardware Information: [Document](https://github.com/bojiguard/fungo-split-keyboard) +matrix: 5x7+3 +left : support oled +right: support external spi connection +all: battery switch, battery jack for nicenano diff --git a/keyboards/fungo/rev1/config.h b/keyboards/fungo/rev1/config.h new file mode 100644 index 000000000000..914181dbdab1 --- /dev/null +++ b/keyboards/fungo/rev1/config.h @@ -0,0 +1,103 @@ +/* Copyright 2022 bojiguard (@bojiguard) + * + * 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 . + */ + +#pragma once + + + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x1818 +#define PRODUCT_ID 0x1233 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Fungo +#define PRODUCT FungoSplit + + + + +/* Use I2C or Serial, not both */ +#define USE_SERIAL + +#define SOFT_SERIAL_PIN D3 // RX8 + +/* select main board - usb를 박을 곳 지정*/ +#define MASTER_RIGHT + + +/* key matrix size */ +// Rows are doubled-up +#define MATRIX_ROWS 12 +#define MATRIX_COLS 7 + +// wiring of each half +#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2} +#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5} + +#define MATRIX_COL_PINS_RIGHT {F7, F6, F5, F4, B5, B4, E6} +#define MATRIX_ROW_PINS_RIGHT { D1, D0, D4, C6, D7, D3} // TX + + + + + + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + + + +/*************************************/ +/** public parameter **/ +/*************************************/ + +#define MATRIX_IO_DELAY 15 // default 30 +//#define QMK_KEYS_PER_SCAN 4 +#define TAP_CODE_DELAY 50 // default 100 +#define USB_POLLING_INTERVAL_MS 5 // default 10 + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 3 + +/* 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 + +//지정된 횟수로 눌러야 토글됨 +#define TAPPING_TOGGLE 3 + +//tap or holding +#define TAPPING_TERM 200 +//#define HOLD_ON_OTHER_KEY_PRESS +//#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY +#define IGNORE_MOD_TAP_INTERRUPT // ROLLING PRESS? +//#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY +//#define TAPPING_FORCE_HOLD +//#define TAPPING_FORCE_HOLD_PER_KEY +//#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY +//#define HOLD_ON_OTHER_KEY_PRESS +//#define PERMISSIVE_HOLD +//#define DEBUG_MATRIX_SCAN_RATE + + + +#define MK_3_SPEED +#define MOUSEKEY_INTERVAL 3 +#define MOUSEKEY_INITIAL_SPEED 20 + diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/info.json new file mode 100644 index 000000000000..bc74da55a645 --- /dev/null +++ b/keyboards/fungo/rev1/info.json @@ -0,0 +1,105 @@ +{ + "keyboard_name": "fungo", + "url": "https://github.com/bojiguard/", + "maintainer": "@bojiguard", + "layouts": { + "LAYOUT_fungo_split_num": { + "layout": [ + {"x": 0, "y": 0.375}, + {"x": 1, "y": 0.375}, + {"x": 2, "y": 0.125}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0.125}, + {"x": 5, "y": 0.25}, + {"x": 6, "y": 0.5}, + + {"x": 12, "y": 0.5}, + {"x": 13, "y": 0.25}, + {"x": 14, "y": 0.125}, + {"x": 15, "y": 0}, + {"x": 16, "y": 0.125}, + {"x": 17, "y": 0.375}, + {"x": 18, "y": 0.375}, + + + {"x": 0, "y": 1.375}, + {"x": 1, "y": 1.375}, + {"x": 2, "y": 1.125}, + {"x": 3, "y": 1}, + {"x": 4, "y": 1.125}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.5}, + + {"x": 12, "y": 1.5}, + {"x": 13, "y": 1.25}, + {"x": 14, "y": 1.125}, + {"x": 15, "y": 1}, + {"x": 16, "y": 1.125}, + {"x": 17, "y": 1.375}, + {"x": 18, "y": 1.375}, + + {"x": 0, "y": 2.375}, + {"x": 1, "y": 2.375}, + {"x": 2, "y": 2.125}, + {"x": 3, "y": 2}, + {"x": 4, "y": 2.125}, + {"x": 5, "y": 2.25}, + {"x": 6, "y": 2.5}, + + {"x": 12, "y": 2.5}, + {"x": 13, "y": 2.25}, + {"x": 14, "y": 2.125}, + {"x": 15, "y": 2}, + {"x": 16, "y": 2.125}, + {"x": 17, "y": 2.375}, + {"x": 18, "y": 2.375}, + + {"x": 0, "y": 3.375}, + {"x": 1, "y": 3.375}, + {"x": 2, "y": 3.125}, + {"x": 3, "y": 3}, + {"x": 4, "y": 3.125}, + {"x": 5, "y": 3.25}, + {"x": 6, "y": 3.5}, + + {"x": 12, "y": 3.5}, + {"x": 13, "y": 3.25}, + {"x": 14, "y": 3.125}, + {"x": 15, "y": 3}, + {"x": 16, "y": 3.125}, + {"x": 17, "y": 3.375}, + {"x": 18, "y": 3.375}, + + {"x": 0, "y": 4.375}, + {"x": 1, "y": 4.375}, + {"x": 2, "y": 4.25}, + {"x": 3, "y": 4.25}, + {"x": 5.25, "y": 3}, + {"x": 5.75, "y": 5}, + {"x": 7, "y": 4}, + + {"x": 11, "y": 4}, + {"x": 13.25, "y": 5}, + {"x": 13.75, "y": 3}, + {"x": 15, "y": 4.25}, + {"x": 16, "y": 4.25}, + {"x": 17, "y": 4.375}, + {"x": 18, "y": 4.375}, + + + {"x": 7, "y": 5}, + {"x": 8.25, "y": 3.75}, + {"x": 8.25, "y": 4.75}, + + {"x": 9.75, "y": 4.75}, + {"x": 9.75, "y": 3.75}, + {"x": 11, "y": 5}, + + + + + + ] + } + } +} diff --git a/keyboards/fungo/rev1/rev1.c b/keyboards/fungo/rev1/rev1.c new file mode 100644 index 000000000000..5fd3a1104906 --- /dev/null +++ b/keyboards/fungo/rev1/rev1.c @@ -0,0 +1,17 @@ +/* Copyright 2022 bojiguard (@bojiguard) + * + * 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 . + */ + + #include "fungo.h" diff --git a/keyboards/fungo/rev1/rev1.h b/keyboards/fungo/rev1/rev1.h new file mode 100644 index 000000000000..1d5e5f90a40d --- /dev/null +++ b/keyboards/fungo/rev1/rev1.h @@ -0,0 +1,79 @@ +/* Copyright 2022 bojiguard (@bojiguard) + * + * 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 . + */ + +#pragma once + +#include "fungo.h" +#include "quantum.h" + + +#ifdef MASTER_RIGHT +// 우측에 usb 케이블을 꽂아야 정상동작 + +#define LAYOUT_fungo_split_num( \ + L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ + L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \ + L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \ + L30, L31, L32, L33, L34, L35, L36, L46, L52, R52, R46, R36, R35, R34, R33, R32, R31, R30, \ + L50, L51, L40, L41, L42, L43, L44, L45, R45, R44, R43, R42, R41, R40, R51, R50 \ + ) \ + { \ + { L00, L01, L02, L03, L04, L05, L06}, \ + { L10, L11, L12, L13, L14, L15, L16}, \ + { L20, L21, L22, L23, L24, L25, L26}, \ + { L30, L31, L32, L33, L34, L35, L36}, \ + { L40, L41, L42, L43, L44, L45, L46}, \ + { L50, L51, L52, KC_NO, KC_NO, KC_NO, KC_NO}, \ + { R06, R05, R04, R03, R02, R01, R00}, \ + { R16, R15, R14, R13, R12, R11, R10}, \ + { R26, R25, R24, R23, R22, R21, R20}, \ + { R36, R35, R34, R33, R32, R31, R30}, \ + { R46, R45, R44, R43, R42, R41, R40}, \ + { KC_NO, KC_NO, KC_NO, KC_NO, R52, R51, R50}, \ + } +#endif + +#ifdef MASTER_LEFT + #define LAYOUT_fungo_split_num( \ + L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ + L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \ + L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \ + L30, L31, L32, L33, L34, L35, L36, L46, L52, R52, R46, R36, R35, R34, R33, R32, R31, R30, \ + L50, L51, L40, L41, L42, L43, L44, L45, R45, R44, R43, R42, R41, R40, R51, R50 \ + ) \ + { \ + { L00, L01, L02, L03, L04, L05, L06}, \ + { L10, L11, L12, L13, L14, L15, L16}, \ + { L20, L21, L22, L23, L24, L25, L26}, \ + { L30, L31, L32, L33, L34, L35, L36}, \ + { L40, L41, L42, L43, L44, L45, L46}, \ + { L50, L51, L52, KC_NO, KC_NO, KC_NO, KC_NO}, \ + { R06, R05, R04, R03, R02, R01, R00}, \ + { R16, R15, R14, R13, R12, R11, R10}, \ + { R26, R25, R24, R23, R22, R21, R20}, \ + { R36, R35, R34, R33, R32, R31, R30}, \ + { R46, R45, R44, R43, R42, R41, R40}, \ + { KC_NO, KC_NO, KC_NO, KC_NO, R52, R51, R50}, \ + } + +#endif + + + + + + + diff --git a/keyboards/fungo/rev1/rules.mk b/keyboards/fungo/rev1/rules.mk new file mode 100644 index 000000000000..4ca3772a46f8 --- /dev/null +++ b/keyboards/fungo/rev1/rules.mk @@ -0,0 +1,40 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu # controller Elite-C +#BOOTLOADER = caterina # controller pro micro + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = no # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +KEY_LOCK_ENABLE = yes # kc_lock use + +#PS2_MOUSE_ENABLE = yes +#PS2_USE_INT = yes +#PS2_USE_USART = yes + + +OLED_ENABLE = no +OLED_DRIVER = SSD1306 # OLED display +SPLIT_KEYBOARD = yes # split type + +DEFAULT_FOLDER = fungo/rev1 + +# point device future(mouse) + +# POINTING_DEVICE_DRIVER = adns9800 +# ADNS9800_CLOCK_SPEED (Optional) Sets the clock speed that the sensor runs at. 2000000 +# ADNS9800_SPI_LSBFIRST (Optional) Sets the Least/Most Significant Byte First setting for SPI. false +# ADNS9800_SPI_MODE (Optional) Sets the SPI Mode for the sensor. 3 +# ADNS9800_SPI_DIVISOR (Optional) Sets the SPI Divisor used for SPI communication. varies +# ADNS9800_CS_PIN (Required) Sets the Cable Select pin connected to the sensor. not defined diff --git a/keyboards/fungo/rules.mk b/keyboards/fungo/rules.mk new file mode 100644 index 000000000000..4ca3772a46f8 --- /dev/null +++ b/keyboards/fungo/rules.mk @@ -0,0 +1,40 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu # controller Elite-C +#BOOTLOADER = caterina # controller pro micro + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = no # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +KEY_LOCK_ENABLE = yes # kc_lock use + +#PS2_MOUSE_ENABLE = yes +#PS2_USE_INT = yes +#PS2_USE_USART = yes + + +OLED_ENABLE = no +OLED_DRIVER = SSD1306 # OLED display +SPLIT_KEYBOARD = yes # split type + +DEFAULT_FOLDER = fungo/rev1 + +# point device future(mouse) + +# POINTING_DEVICE_DRIVER = adns9800 +# ADNS9800_CLOCK_SPEED (Optional) Sets the clock speed that the sensor runs at. 2000000 +# ADNS9800_SPI_LSBFIRST (Optional) Sets the Least/Most Significant Byte First setting for SPI. false +# ADNS9800_SPI_MODE (Optional) Sets the SPI Mode for the sensor. 3 +# ADNS9800_SPI_DIVISOR (Optional) Sets the SPI Divisor used for SPI communication. varies +# ADNS9800_CS_PIN (Required) Sets the Cable Select pin connected to the sensor. not defined From 478af3806a7b559821f3e4c0346c03c145880c87 Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Sat, 2 Jul 2022 01:40:20 +0900 Subject: [PATCH 02/30] change master request --- keyboards/fungo/rev1/config.h | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/keyboards/fungo/rev1/config.h b/keyboards/fungo/rev1/config.h index 914181dbdab1..750b02ca7c69 100644 --- a/keyboards/fungo/rev1/config.h +++ b/keyboards/fungo/rev1/config.h @@ -21,7 +21,7 @@ #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0x1818 +#define VENDOR_ID 0x5892 #define PRODUCT_ID 0x1233 #define DEVICE_VER 0x0001 #define MANUFACTURER Fungo @@ -68,7 +68,7 @@ #define MATRIX_IO_DELAY 15 // default 30 //#define QMK_KEYS_PER_SCAN 4 #define TAP_CODE_DELAY 50 // default 100 -#define USB_POLLING_INTERVAL_MS 5 // default 10 +#define USB_POLLING_INTERVAL_MS 5 // default 1 /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 3 @@ -84,16 +84,7 @@ //tap or holding #define TAPPING_TERM 200 -//#define HOLD_ON_OTHER_KEY_PRESS -//#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY -#define IGNORE_MOD_TAP_INTERRUPT // ROLLING PRESS? -//#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY -//#define TAPPING_FORCE_HOLD -//#define TAPPING_FORCE_HOLD_PER_KEY -//#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY -//#define HOLD_ON_OTHER_KEY_PRESS -//#define PERMISSIVE_HOLD -//#define DEBUG_MATRIX_SCAN_RATE +#define IGNORE_MOD_TAP_INTERRUPT From 9ea8c50055111ff18ab1dc6eea85177b5e756b58 Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Sat, 2 Jul 2022 01:42:58 +0900 Subject: [PATCH 03/30] change master request --- keyboards/fungo/rev1/rules.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/keyboards/fungo/rev1/rules.mk b/keyboards/fungo/rev1/rules.mk index 4ca3772a46f8..b987888e5bce 100644 --- a/keyboards/fungo/rev1/rules.mk +++ b/keyboards/fungo/rev1/rules.mk @@ -3,7 +3,7 @@ MCU = atmega32u4 # Bootloader selection BOOTLOADER = atmel-dfu # controller Elite-C -#BOOTLOADER = caterina # controller pro micro + # Build Options # change yes to no to disable @@ -30,11 +30,3 @@ SPLIT_KEYBOARD = yes # split type DEFAULT_FOLDER = fungo/rev1 -# point device future(mouse) - -# POINTING_DEVICE_DRIVER = adns9800 -# ADNS9800_CLOCK_SPEED (Optional) Sets the clock speed that the sensor runs at. 2000000 -# ADNS9800_SPI_LSBFIRST (Optional) Sets the Least/Most Significant Byte First setting for SPI. false -# ADNS9800_SPI_MODE (Optional) Sets the SPI Mode for the sensor. 3 -# ADNS9800_SPI_DIVISOR (Optional) Sets the SPI Divisor used for SPI communication. varies -# ADNS9800_CS_PIN (Required) Sets the Cable Select pin connected to the sensor. not defined From f519bdec7d534ad9ecffbb105eb5653deef26f68 Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Sat, 2 Jul 2022 01:43:59 +0900 Subject: [PATCH 04/30] change master request --- keyboards/fungo/rules.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/keyboards/fungo/rules.mk b/keyboards/fungo/rules.mk index 4ca3772a46f8..6d4546549dc9 100644 --- a/keyboards/fungo/rules.mk +++ b/keyboards/fungo/rules.mk @@ -3,7 +3,6 @@ MCU = atmega32u4 # Bootloader selection BOOTLOADER = atmel-dfu # controller Elite-C -#BOOTLOADER = caterina # controller pro micro # Build Options # change yes to no to disable @@ -29,12 +28,3 @@ OLED_DRIVER = SSD1306 # OLED display SPLIT_KEYBOARD = yes # split type DEFAULT_FOLDER = fungo/rev1 - -# point device future(mouse) - -# POINTING_DEVICE_DRIVER = adns9800 -# ADNS9800_CLOCK_SPEED (Optional) Sets the clock speed that the sensor runs at. 2000000 -# ADNS9800_SPI_LSBFIRST (Optional) Sets the Least/Most Significant Byte First setting for SPI. false -# ADNS9800_SPI_MODE (Optional) Sets the SPI Mode for the sensor. 3 -# ADNS9800_SPI_DIVISOR (Optional) Sets the SPI Divisor used for SPI communication. varies -# ADNS9800_CS_PIN (Required) Sets the Cable Select pin connected to the sensor. not defined From 1d1c7207d34ac050d4c69357f60ec65ba9498cd9 Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Sat, 2 Jul 2022 01:45:47 +0900 Subject: [PATCH 05/30] change master request --- keyboards/fungo/rules.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/fungo/rules.mk b/keyboards/fungo/rules.mk index 6d4546549dc9..7397c639097e 100644 --- a/keyboards/fungo/rules.mk +++ b/keyboards/fungo/rules.mk @@ -18,10 +18,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output KEY_LOCK_ENABLE = yes # kc_lock use -#PS2_MOUSE_ENABLE = yes -#PS2_USE_INT = yes -#PS2_USE_USART = yes - OLED_ENABLE = no OLED_DRIVER = SSD1306 # OLED display From aacad307d76cadf038d498ec9f86c2ca1e05c968 Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Sat, 2 Jul 2022 01:47:45 +0900 Subject: [PATCH 06/30] change master request --- keyboards/fungo/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/fungo/readme.md b/keyboards/fungo/readme.md index 68a0e35cf3b2..6d36fadbad83 100644 --- a/keyboards/fungo/readme.md +++ b/keyboards/fungo/readme.md @@ -1,6 +1,6 @@ # fungo split keyboard (fungo) -![fungo](https://github.com/bojiguard/fungo-split-keyboard/blob/master/picture/full%20cover.jpg) + A split keyboard for my hands. From 03b273f915b40c27ffeecb069e46569d9561476d Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Sat, 2 Jul 2022 02:30:12 +0900 Subject: [PATCH 07/30] change image link --- keyboards/fungo/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/fungo/readme.md b/keyboards/fungo/readme.md index 6d36fadbad83..8366af2cd2f2 100644 --- a/keyboards/fungo/readme.md +++ b/keyboards/fungo/readme.md @@ -1,6 +1,7 @@ # fungo split keyboard (fungo) +![full](https://user-images.githubusercontent.com/107382014/176942337-31313d0e-1588-475b-877b-55e0a74f06e6.jpg) A split keyboard for my hands. From 71cd1c399cbb00d55595b6e7b7958178ce2731e4 Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Mon, 4 Jul 2022 01:03:23 +0900 Subject: [PATCH 08/30] delete image link and add bootloader information --- keyboards/fungo/readme.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/keyboards/fungo/readme.md b/keyboards/fungo/readme.md index 8366af2cd2f2..b93d152483aa 100644 --- a/keyboards/fungo/readme.md +++ b/keyboards/fungo/readme.md @@ -15,8 +15,14 @@ Make example for this keyboard (after setting up your build environment): 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). -# Characteristics +## Bootloader + +* **Physical reset button**: Briefly press the button on the front of the PCB + +## Characteristics + +The circuits on the left and right keyboard are different. Hardware Information: [Document](https://github.com/bojiguard/fungo-split-keyboard) matrix: 5x7+3 left : support oled From b29212a0d32f988c6bd221c06ba6bdb2d6acae7d Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Mon, 4 Jul 2022 01:05:03 +0900 Subject: [PATCH 09/30] Delete rules.mk --- keyboards/fungo/rules.mk | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 keyboards/fungo/rules.mk diff --git a/keyboards/fungo/rules.mk b/keyboards/fungo/rules.mk deleted file mode 100644 index 7397c639097e..000000000000 --- a/keyboards/fungo/rules.mk +++ /dev/null @@ -1,26 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu # controller Elite-C - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -KEY_LOCK_ENABLE = yes # kc_lock use - - -OLED_ENABLE = no -OLED_DRIVER = SSD1306 # OLED display -SPLIT_KEYBOARD = yes # split type - -DEFAULT_FOLDER = fungo/rev1 From fa38361e7bf46c15a834f6cc09a3e93bbb316535 Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Mon, 4 Jul 2022 01:13:39 +0900 Subject: [PATCH 10/30] delete comments --- keyboards/fungo/rev1/rules.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/fungo/rev1/rules.mk b/keyboards/fungo/rev1/rules.mk index b987888e5bce..097d8a7f11f6 100644 --- a/keyboards/fungo/rev1/rules.mk +++ b/keyboards/fungo/rev1/rules.mk @@ -19,10 +19,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output KEY_LOCK_ENABLE = yes # kc_lock use -#PS2_MOUSE_ENABLE = yes -#PS2_USE_INT = yes -#PS2_USE_USART = yes - OLED_ENABLE = no OLED_DRIVER = SSD1306 # OLED display From 74950c5a84b529691330ed57533a43cd3aad3bf8 Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Mon, 4 Jul 2022 01:27:23 +0900 Subject: [PATCH 11/30] change #ifdef --- keyboards/fungo/rev1/rev1.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/keyboards/fungo/rev1/rev1.h b/keyboards/fungo/rev1/rev1.h index 1d5e5f90a40d..1301a51eafab 100644 --- a/keyboards/fungo/rev1/rev1.h +++ b/keyboards/fungo/rev1/rev1.h @@ -20,10 +20,10 @@ #include "quantum.h" -#ifdef MASTER_RIGHT +#ifdef MASTER_LAYOUT_RIGHT // 우측에 usb 케이블을 꽂아야 정상동작 -#define LAYOUT_fungo_split_num( \ + #define LAYOUT_fungo_split_num( \ L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \ L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \ @@ -44,10 +44,11 @@ { R46, R45, R44, R43, R42, R41, R40}, \ { KC_NO, KC_NO, KC_NO, KC_NO, R52, R51, R50}, \ } -#endif + #endif + +#else -#ifdef MASTER_LEFT - #define LAYOUT_fungo_split_num( \ + #define LAYOUT_fungo_split_num( \ L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \ L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \ @@ -69,6 +70,7 @@ { KC_NO, KC_NO, KC_NO, KC_NO, R52, R51, R50}, \ } + #endif #endif From 2720375bb0b36ecd73560e6afaf323f7e6e8ad48 Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Mon, 4 Jul 2022 01:28:10 +0900 Subject: [PATCH 12/30] Update rules.mk --- keyboards/fungo/rev1/rules.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/fungo/rev1/rules.mk b/keyboards/fungo/rev1/rules.mk index 097d8a7f11f6..9eed722f67aa 100644 --- a/keyboards/fungo/rev1/rules.mk +++ b/keyboards/fungo/rev1/rules.mk @@ -24,5 +24,3 @@ OLED_ENABLE = no OLED_DRIVER = SSD1306 # OLED display SPLIT_KEYBOARD = yes # split type -DEFAULT_FOLDER = fungo/rev1 - From 4134789040a5f4a0c7f8c26e81b3cd6e0ba5892a Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Mon, 4 Jul 2022 01:41:58 +0900 Subject: [PATCH 13/30] add #define MASTER_LAYOUT_RIGHT --- keyboards/fungo/rev1/config.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/fungo/rev1/config.h b/keyboards/fungo/rev1/config.h index 750b02ca7c69..37f331d8f4ae 100644 --- a/keyboards/fungo/rev1/config.h +++ b/keyboards/fungo/rev1/config.h @@ -32,10 +32,12 @@ /* Use I2C or Serial, not both */ #define USE_SERIAL - #define SOFT_SERIAL_PIN D3 // RX8 -/* select main board - usb를 박을 곳 지정*/ +/* select keyboard master board - I2C or Serial communication master */ +/* Use [#define MASTER_LEFT] to master the left, and [#define MASTER_RIGHT] to master the right */ +/* If nothing is specified, it is the same as [#defineMASTER_LEFT] */ +#define MASTER_LAYOUT_RIGHT #define MASTER_RIGHT @@ -54,8 +56,6 @@ - - /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW From aa998b3ec14b757af856d65c8539adc88708517e Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Mon, 4 Jul 2022 01:43:46 +0900 Subject: [PATCH 14/30] Update readme.md --- keyboards/fungo/readme.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/fungo/readme.md b/keyboards/fungo/readme.md index b93d152483aa..db3637e4bd27 100644 --- a/keyboards/fungo/readme.md +++ b/keyboards/fungo/readme.md @@ -1,8 +1,6 @@ # fungo split keyboard (fungo) -![full](https://user-images.githubusercontent.com/107382014/176942337-31313d0e-1588-475b-877b-55e0a74f06e6.jpg) - A split keyboard for my hands. Keyboard Maintainer: [bojiguard](https://github.com/bojiguard/) From 5de0beca227d7dbfbc8627c6d4802743b25608af Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Mon, 4 Jul 2022 03:11:39 +0900 Subject: [PATCH 15/30] change #define --- keyboards/fungo/rev1/rev1.h | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/keyboards/fungo/rev1/rev1.h b/keyboards/fungo/rev1/rev1.h index 1301a51eafab..a567204d8208 100644 --- a/keyboards/fungo/rev1/rev1.h +++ b/keyboards/fungo/rev1/rev1.h @@ -20,6 +20,7 @@ #include "quantum.h" + #ifdef MASTER_LAYOUT_RIGHT // 우측에 usb 케이블을 꽂아야 정상동작 @@ -44,9 +45,10 @@ { R46, R45, R44, R43, R42, R41, R40}, \ { KC_NO, KC_NO, KC_NO, KC_NO, R52, R51, R50}, \ } - #endif -#else +#endif + +#ifdef MASTER_LAYOUT_LEFT #define LAYOUT_fungo_split_num( \ L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ @@ -70,12 +72,33 @@ { KC_NO, KC_NO, KC_NO, KC_NO, R52, R51, R50}, \ } - #endif #endif +#if !defined (MASTER_LAYOUT_RIGHT) && !defined (MASTER_LAYOUT_LEFT) + #define LAYOUT_fungo_split_num( \ + L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ + L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \ + L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \ + L30, L31, L32, L33, L34, L35, L36, L46, L52, R52, R46, R36, R35, R34, R33, R32, R31, R30, \ + L50, L51, L40, L41, L42, L43, L44, L45, R45, R44, R43, R42, R41, R40, R51, R50 \ + ) \ + { \ + { L00, L01, L02, L03, L04, L05, L06}, \ + { L10, L11, L12, L13, L14, L15, L16}, \ + { L20, L21, L22, L23, L24, L25, L26}, \ + { L30, L31, L32, L33, L34, L35, L36}, \ + { L40, L41, L42, L43, L44, L45, L46}, \ + { L50, L51, L52, KC_NO, KC_NO, KC_NO, KC_NO}, \ + { R06, R05, R04, R03, R02, R01, R00}, \ + { R16, R15, R14, R13, R12, R11, R10}, \ + { R26, R25, R24, R23, R22, R21, R20}, \ + { R36, R35, R34, R33, R32, R31, R30}, \ + { R46, R45, R44, R43, R42, R41, R40}, \ + { KC_NO, KC_NO, KC_NO, KC_NO, R52, R51, R50}, \ + } - +#endif From 58efad0e797d6b98f34e9f6fe137090a0291b69f Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Mon, 4 Jul 2022 14:41:15 +0900 Subject: [PATCH 16/30] edit Setting Handedness --- keyboards/fungo/rev1/config.h | 6 +--- keyboards/fungo/rev1/rev1.h | 58 +---------------------------------- 2 files changed, 2 insertions(+), 62 deletions(-) diff --git a/keyboards/fungo/rev1/config.h b/keyboards/fungo/rev1/config.h index 37f331d8f4ae..f4914b6b7d3d 100644 --- a/keyboards/fungo/rev1/config.h +++ b/keyboards/fungo/rev1/config.h @@ -35,9 +35,6 @@ #define SOFT_SERIAL_PIN D3 // RX8 /* select keyboard master board - I2C or Serial communication master */ -/* Use [#define MASTER_LEFT] to master the left, and [#define MASTER_RIGHT] to master the right */ -/* If nothing is specified, it is the same as [#defineMASTER_LEFT] */ -#define MASTER_LAYOUT_RIGHT #define MASTER_RIGHT @@ -90,5 +87,4 @@ #define MK_3_SPEED #define MOUSEKEY_INTERVAL 3 -#define MOUSEKEY_INITIAL_SPEED 20 - +#define MOUSEKEY_INITIAL_SPEED 20 \ No newline at end of file diff --git a/keyboards/fungo/rev1/rev1.h b/keyboards/fungo/rev1/rev1.h index a567204d8208..97161482ff28 100644 --- a/keyboards/fungo/rev1/rev1.h +++ b/keyboards/fungo/rev1/rev1.h @@ -21,36 +21,7 @@ -#ifdef MASTER_LAYOUT_RIGHT -// 우측에 usb 케이블을 꽂아야 정상동작 - - #define LAYOUT_fungo_split_num( \ - L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, L36, L46, L52, R52, R46, R36, R35, R34, R33, R32, R31, R30, \ - L50, L51, L40, L41, L42, L43, L44, L45, R45, R44, R43, R42, R41, R40, R51, R50 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06}, \ - { L10, L11, L12, L13, L14, L15, L16}, \ - { L20, L21, L22, L23, L24, L25, L26}, \ - { L30, L31, L32, L33, L34, L35, L36}, \ - { L40, L41, L42, L43, L44, L45, L46}, \ - { L50, L51, L52, KC_NO, KC_NO, KC_NO, KC_NO}, \ - { R06, R05, R04, R03, R02, R01, R00}, \ - { R16, R15, R14, R13, R12, R11, R10}, \ - { R26, R25, R24, R23, R22, R21, R20}, \ - { R36, R35, R34, R33, R32, R31, R30}, \ - { R46, R45, R44, R43, R42, R41, R40}, \ - { KC_NO, KC_NO, KC_NO, KC_NO, R52, R51, R50}, \ - } - -#endif - -#ifdef MASTER_LAYOUT_LEFT - - #define LAYOUT_fungo_split_num( \ +#define LAYOUT_fungo_split_num( \ L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \ L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \ @@ -72,33 +43,6 @@ { KC_NO, KC_NO, KC_NO, KC_NO, R52, R51, R50}, \ } -#endif - - -#if !defined (MASTER_LAYOUT_RIGHT) && !defined (MASTER_LAYOUT_LEFT) - - #define LAYOUT_fungo_split_num( \ - L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, L36, L46, L52, R52, R46, R36, R35, R34, R33, R32, R31, R30, \ - L50, L51, L40, L41, L42, L43, L44, L45, R45, R44, R43, R42, R41, R40, R51, R50 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06}, \ - { L10, L11, L12, L13, L14, L15, L16}, \ - { L20, L21, L22, L23, L24, L25, L26}, \ - { L30, L31, L32, L33, L34, L35, L36}, \ - { L40, L41, L42, L43, L44, L45, L46}, \ - { L50, L51, L52, KC_NO, KC_NO, KC_NO, KC_NO}, \ - { R06, R05, R04, R03, R02, R01, R00}, \ - { R16, R15, R14, R13, R12, R11, R10}, \ - { R26, R25, R24, R23, R22, R21, R20}, \ - { R36, R35, R34, R33, R32, R31, R30}, \ - { R46, R45, R44, R43, R42, R41, R40}, \ - { KC_NO, KC_NO, KC_NO, KC_NO, R52, R51, R50}, \ - } -#endif From c6adafa1b411591e96312ea94bf07cce12d82b93 Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Fri, 8 Jul 2022 12:05:49 +0900 Subject: [PATCH 17/30] add bootloader comment --- keyboards/fungo/rev1/rules.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/fungo/rev1/rules.mk b/keyboards/fungo/rev1/rules.mk index 9eed722f67aa..585e429c9075 100644 --- a/keyboards/fungo/rev1/rules.mk +++ b/keyboards/fungo/rev1/rules.mk @@ -2,9 +2,11 @@ MCU = atmega32u4 # Bootloader selection +# BOOTLOADER = caterina # controller pro micro BOOTLOADER = atmel-dfu # controller Elite-C + # Build Options # change yes to no to disable # From f46f6fbb1d7918cf22800d1800e8fef0a73f762a Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Fri, 8 Jul 2022 12:48:13 +0900 Subject: [PATCH 18/30] change bootloader selection --- keyboards/fungo/rev1/rules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/fungo/rev1/rules.mk b/keyboards/fungo/rev1/rules.mk index 585e429c9075..4cfaca9bc3f9 100644 --- a/keyboards/fungo/rev1/rules.mk +++ b/keyboards/fungo/rev1/rules.mk @@ -2,8 +2,8 @@ MCU = atmega32u4 # Bootloader selection -# BOOTLOADER = caterina # controller pro micro -BOOTLOADER = atmel-dfu # controller Elite-C +BOOTLOADER = caterina # controller pro micro +# BOOTLOADER = atmel-dfu # controller Elite-C From b882bb53f4c235840de8b67dcf6d96218809dd44 Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Tue, 12 Jul 2022 17:11:44 +0900 Subject: [PATCH 19/30] Update keyboards/fungo/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/fungo/keymaps/default/keymap.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/keyboards/fungo/keymaps/default/keymap.c b/keyboards/fungo/keymaps/default/keymap.c index fb798296f087..4c48b6467f70 100644 --- a/keyboards/fungo/keymaps/default/keymap.c +++ b/keyboards/fungo/keymaps/default/keymap.c @@ -154,11 +154,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - // If console is enabled, it will print the matrix position and status of each key pressed -#ifdef CONSOLE_ENABLE -// uprintf("KL: kc: 0x%04X, col: %u, row: %u, pressed: %b, time: %u, interrupt: %b, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count); -#endif - return true; -} - From e01846bd066b6743d81f68eaeec1875eaa49589d Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Tue, 12 Jul 2022 17:15:18 +0900 Subject: [PATCH 20/30] Update keyboards/fungo/rev1/config.h Co-authored-by: Drashna Jaelre --- keyboards/fungo/rev1/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/fungo/rev1/config.h b/keyboards/fungo/rev1/config.h index f4914b6b7d3d..7b49cd03d372 100644 --- a/keyboards/fungo/rev1/config.h +++ b/keyboards/fungo/rev1/config.h @@ -63,7 +63,6 @@ /*************************************/ #define MATRIX_IO_DELAY 15 // default 30 -//#define QMK_KEYS_PER_SCAN 4 #define TAP_CODE_DELAY 50 // default 100 #define USB_POLLING_INTERVAL_MS 5 // default 1 From d4b95c6f57d74993622b06bd2b9e372518fd1983 Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Tue, 12 Jul 2022 18:31:15 +0900 Subject: [PATCH 21/30] change USB_POLLING_INTERVAL_MS --- keyboards/fungo/rev1/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/fungo/rev1/config.h b/keyboards/fungo/rev1/config.h index 7b49cd03d372..f8d2b8f808c8 100644 --- a/keyboards/fungo/rev1/config.h +++ b/keyboards/fungo/rev1/config.h @@ -64,7 +64,7 @@ #define MATRIX_IO_DELAY 15 // default 30 #define TAP_CODE_DELAY 50 // default 100 -#define USB_POLLING_INTERVAL_MS 5 // default 1 +#define USB_POLLING_INTERVAL_MS 1 // default 1 /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 3 @@ -86,4 +86,4 @@ #define MK_3_SPEED #define MOUSEKEY_INTERVAL 3 -#define MOUSEKEY_INITIAL_SPEED 20 \ No newline at end of file +#define MOUSEKEY_INITIAL_SPEED 20 From c99681a7c584d5c26153517fa6fcd9b4f6317fce Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Wed, 13 Jul 2022 15:14:16 +0900 Subject: [PATCH 22/30] Update keyboards/fungo/rev1/config.h Co-authored-by: Drashna Jaelre --- keyboards/fungo/rev1/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/fungo/rev1/config.h b/keyboards/fungo/rev1/config.h index f8d2b8f808c8..28d3eb6000de 100644 --- a/keyboards/fungo/rev1/config.h +++ b/keyboards/fungo/rev1/config.h @@ -63,7 +63,7 @@ /*************************************/ #define MATRIX_IO_DELAY 15 // default 30 -#define TAP_CODE_DELAY 50 // default 100 +#define TAP_CODE_DELAY 50 // default 0, disabled #define USB_POLLING_INTERVAL_MS 1 // default 1 /* Set 0 if debouncing isn't needed */ From 645008821572ec651a2f243ccd65e7984055dd3b Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Mon, 18 Jul 2022 02:00:11 +0900 Subject: [PATCH 23/30] Update keyboards/fungo/rev1/config.h Co-authored-by: Drashna Jaelre --- keyboards/fungo/rev1/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/fungo/rev1/config.h b/keyboards/fungo/rev1/config.h index 28d3eb6000de..1cd16da26121 100644 --- a/keyboards/fungo/rev1/config.h +++ b/keyboards/fungo/rev1/config.h @@ -80,7 +80,6 @@ //tap or holding #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT From f95a1409533c5a57606dced0d7223133a63f65ec Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Mon, 18 Jul 2022 02:00:30 +0900 Subject: [PATCH 24/30] Update keyboards/fungo/rev1/config.h Co-authored-by: Drashna Jaelre --- keyboards/fungo/rev1/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/fungo/rev1/config.h b/keyboards/fungo/rev1/config.h index 1cd16da26121..493e8c8e5d9d 100644 --- a/keyboards/fungo/rev1/config.h +++ b/keyboards/fungo/rev1/config.h @@ -79,7 +79,6 @@ #define TAPPING_TOGGLE 3 //tap or holding -#define TAPPING_TERM 200 From 868f320680dd676dd6abebca8fc6c237099f332d Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Mon, 18 Jul 2022 02:02:00 +0900 Subject: [PATCH 25/30] Update keyboards/fungo/rev1/config.h Co-authored-by: Drashna Jaelre --- keyboards/fungo/rev1/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/fungo/rev1/config.h b/keyboards/fungo/rev1/config.h index 493e8c8e5d9d..2bdab6477fa2 100644 --- a/keyboards/fungo/rev1/config.h +++ b/keyboards/fungo/rev1/config.h @@ -64,7 +64,6 @@ #define MATRIX_IO_DELAY 15 // default 30 #define TAP_CODE_DELAY 50 // default 0, disabled -#define USB_POLLING_INTERVAL_MS 1 // default 1 /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 3 From d7710bed5300b5204a071d428b15999d6868329a Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Mon, 18 Jul 2022 02:05:08 +0900 Subject: [PATCH 26/30] configuration file for the keymap --- keyboards/fungo/keymaps/default/config.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 keyboards/fungo/keymaps/default/config.h diff --git a/keyboards/fungo/keymaps/default/config.h b/keyboards/fungo/keymaps/default/config.h new file mode 100644 index 000000000000..c6d778d1098b --- /dev/null +++ b/keyboards/fungo/keymaps/default/config.h @@ -0,0 +1,24 @@ +/* This is the c configuration file for the keymap + * Copyright 2022 bojiguard (@bojiguard) + * + * 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 . + */ + +#pragma once + + + + +#define IGNORE_MOD_TAP_INTERRUPT + From 1474cf0b3228aa5c8ba9b65d3ef332cd0ebc7d05 Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Mon, 18 Jul 2022 02:18:48 +0900 Subject: [PATCH 27/30] add post config file --- keyboards/fungo/rev1/post_config.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 keyboards/fungo/rev1/post_config.h diff --git a/keyboards/fungo/rev1/post_config.h b/keyboards/fungo/rev1/post_config.h new file mode 100644 index 000000000000..046ebe14a18e --- /dev/null +++ b/keyboards/fungo/rev1/post_config.h @@ -0,0 +1,30 @@ +/* Copyright 2022 bojiguard (@bojiguard) + * + * 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 . + */ + + +#pragma once + +#ifndef MK_3_SPEED +#define MK_3_SPEED +#endif + +#ifndef MOUSEKEY_INTERVAL +#define MOUSEKEY_INTERVAL 3 +#endif + +#ifndef MOUSEKEY_INITIAL_SPEED +#define MOUSEKEY_INITIAL_SPEED 20 +#endif \ No newline at end of file From 6e12a8381566eb1e71ff2721db17a9e775390bff Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Sat, 23 Jul 2022 15:23:31 +0900 Subject: [PATCH 28/30] Update config.h --- keyboards/fungo/rev1/config.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/keyboards/fungo/rev1/config.h b/keyboards/fungo/rev1/config.h index 2bdab6477fa2..68e793dedc91 100644 --- a/keyboards/fungo/rev1/config.h +++ b/keyboards/fungo/rev1/config.h @@ -77,10 +77,4 @@ //지정된 횟수로 눌러야 토글됨 #define TAPPING_TOGGLE 3 -//tap or holding - - -#define MK_3_SPEED -#define MOUSEKEY_INTERVAL 3 -#define MOUSEKEY_INITIAL_SPEED 20 From 4a50d514dd08537e36ce66a256f5d3ef942afea1 Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Mon, 15 Aug 2022 19:20:14 +0900 Subject: [PATCH 29/30] Update keyboards/fungo/readme.md Co-authored-by: Ryan --- keyboards/fungo/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/fungo/readme.md b/keyboards/fungo/readme.md index db3637e4bd27..fffd820d6045 100644 --- a/keyboards/fungo/readme.md +++ b/keyboards/fungo/readme.md @@ -3,9 +3,9 @@ A split keyboard for my hands. -Keyboard Maintainer: [bojiguard](https://github.com/bojiguard/) -Hardware Supported: Pro Micro, elite-c, nicenano -Hardware Availability: [fungo split keyboard](https://github.com/bojiguard/fungo-split-keyboard) +* Keyboard Maintainer: [bojiguard](https://github.com/bojiguard/) +* Hardware Supported: Pro Micro, elite-c, nicenano +* Hardware Availability: [fungo split keyboard](https://github.com/bojiguard/fungo-split-keyboard) Make example for this keyboard (after setting up your build environment): From 57152cdfd8d16e8b3fc3701ed296ca50404085a5 Mon Sep 17 00:00:00 2001 From: bojiguard <107382014+bojiguard@users.noreply.github.com> Date: Mon, 15 Aug 2022 19:21:22 +0900 Subject: [PATCH 30/30] Update keyboards/fungo/rev1/info.json Co-authored-by: Ryan --- keyboards/fungo/rev1/info.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/info.json index bc74da55a645..d34e95d5781a 100644 --- a/keyboards/fungo/rev1/info.json +++ b/keyboards/fungo/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "fungo", + "keyboard_name": "FungoSplit", + "manufacturer": "Fungo", "url": "https://github.com/bojiguard/", "maintainer": "@bojiguard", + "usb": { + "vid": "0x5892", + "pid": "0x1233", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_fungo_split_num": { "layout": [