Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-01-23 03:24:06 +00:00
commit 5a7ad4cb2d
10 changed files with 213 additions and 825 deletions

View file

@ -1,385 +0,0 @@
flabbergast's TMK/ChibiOS port
==============================
2015/10/16
Build
-----
$ git clone -b chibios https://github.com/flabbergast/tmk_keyboard.git
$ cd tmk_keyboard
$ git submodule add -f -b kinetis https://github.com/flabbergast/ChibiOS.git tmk_core/tool/chibios/chibios
or
$ cd tmk_keyboard/tmk_core/tool/chibios
$ git clone -b kinetis https://github.com/flabbergast/ChibiOS.git tmk_core/tool/chibios/chibios
$ cd tmk_keyboard/keyboard/infinity_chibios
$ make
Chibios Configuration
---------------------
halconf.h: for HAL configuration
placed in project directory
read in chibios/os/hal/hal.mk
included in chibios/os/hal/include/hal.h
mcuconf.h: for MCU configuration
placed in project directory
included in halconf.h
Chibios Term
------------
PAL = Port Abstraction Layer
palWritePad
palReadPad
palSetPad
chibios/os/hal/include/pal.h
LLD = Low Level Driver
Makefile
--------
# <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = KINETIS
MCU_SERIES = KL2x
# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
# or <this_dir>/ld/
MCU_LDSCRIPT = MKL26Z64
# - it should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/
MCU_STARTUP = kl2x
# Board: it should exist either in <chibios>/os/hal/boards/
# or <this_dir>/boards
BOARD = PJRC_TEENSY_LC
MCU = cortex-m0
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 6
halconf.h
---------
mcuconf.h
---------
chconf.h
--------
ld script
---------
--- ../../tmk_core/tool/chibios/chibios/os/common/ports/ARMCMx/compilers/GCC/ld/MKL26Z64.ld 2015-10-15 09:08:58.732904304 +0900
+++ ld/MKL26Z64.ld 2015-10-15 08:48:06.430215496 +0900
@@ -27,7 +27,8 @@
{
flash0 : org = 0x00000000, len = 0xc0
flashcfg : org = 0x00000400, len = 0x10
- flash : org = 0x00000410, len = 64k - 0x410
+ flash : org = 0x00000410, len = 62k - 0x410
+ eeprom_emu : org = 0x0000F800, len = 2k
ram : org = 0x1FFFF800, len = 8k
}
@@ -35,6 +36,10 @@
__ram_size__ = LENGTH(ram);
__ram_end__ = __ram_start__ + __ram_size__;
+__eeprom_workarea_start__ = ORIGIN(eeprom_emu);
+__eeprom_workarea_size__ = LENGTH(eeprom_emu);
+__eeprom_workarea_end__ = __eeprom_workarea_start__ + __eeprom_workarea_size__;
+
SECTIONS
{
. = 0;
Configuration/Startup for Infinity 60%
--------------------------------------
Configuration:
Clock:
Inifinity
FEI(FLL Engaged Internal) mode with core clock:48MHz, bus clock:48MHz, flash clock:24MHz
Clock dividor:
SIM_CLKDIV1[OUTDIV1] = 0 divide-by-1 for core clock
SIM_CLKDIV1[OUTDIV2] = 0 divide-by-1 for bus clock
SIM_CLKDIV1[OUTDIV4] = 1 divide-by-2 for flash clock
Internal reference clock:
MCG_C1[IREFS] = 1 Internal Reference Select for clock source for FLL
MCG_C1[IRCLKEN] = 1 Internal Reference Clock Enable
FLL multipilication:
MCG_C4[DMX32] = 1
MCG_C4[DRST_DRS] = 01 FLL factor 1464 * 32.768kHz = 48MHz
chibios/os/hal/ports/KINETIS/K20x/hal_lld.c
k20x_clock_init(): called in __early_init() defined in board.c
disable watchdog and configure clock
configurable macros:
KINETIS_NO_INIT: whether init or not
KINETIS_MCG_MODE: clock mode
KINETIS_MCG_MODE_FEI
KINETIS_MCG_MODE_PEE
hal/ports/KINETIS/K20x/hal_lld.h
chibios/os/hal/boards/FREESCALE_FREEDOM_K20D50M/board.h
PALConfig pal_default_config
boardInit()
__early_init()
macro definitions for board infos, freq and mcu type
chibios/os/hal/boards/FREESCALE_FREEDOM_K20D50M/board.c
USB
Startup
-------
common/ports/ARMCMx/GCC/crt0_v[67]m.s
Reset_Handler: startup code
common/ports/ARMCMx/GCC/crt1.c
__core_init(): weak
__early_init(): weak
__late_init(): weak
__default_exit(): weak
called from Reset_Handler of crt0
common/ports/ARMCMx/GCC/vector.c
common/ports/ARMCMx/GCC/ld/*.ld
chibios/os/common/ports/ARMCMx/compilers/GCC/
├── crt0_v6m.s
├── crt0_v7m.s
├── crt1.c
├── ld
│   ├── MK20DX128BLDR3.ld
│   ├── MK20DX128BLDR4.ld
│   ├── MK20DX128.ld
│   ├── MK20DX256.ld
│   ├── MKL25Z128.ld
│   ├── MKL26Z128.ld
│   ├── MKL26Z64.ld
│   └── STM32L476xG.ld
├── mk
│   ├── startup_k20x5.mk
│   ├── startup_k20x7.mk
│   ├── startup_k20x.mk
│   ├── startup_kl2x.mk
│   └── startup_stm32l4xx.mk
├── rules.ld
├── rules.mk
└── vectors.c
chibios/os/hal/
├── boards
│   ├── FREESCALE_FREEDOM_K20D50M
│   │   ├── board.c
│   │   ├── board.h
│   │   └── board.mk
│   ├── MCHCK_K20
│   │   ├── board.c
│   │   ├── board.h
│   │   └── board.mk
│   ├── PJRC_TEENSY_3
│   │   ├── board.c
│   │   ├── board.h
│   │   └── board.mk
│   ├── PJRC_TEENSY_3_1
│   │   ├── board.c
│   │   ├── board.h
│   │   └── board.mk
│   ├── PJRC_TEENSY_LC
│   │   ├── board.c
│   │   ├── board.h
│   │   └── board.mk
│   ├── readme.txt
│   ├── simulator
│   │   ├── board.c
│   │   ├── board.h
│   │   └── board.mk
│   ├── ST_NUCLEO_F030R8
│   │   ├── board.c
│   │   ├── board.h
│   │   ├── board.mk
│   │   └── cfg
│   │   └── board.chcfg
├── hal.mk
├── include
│   ├── adc.h
│   ├── can.h
│   ├── dac.h
│   ├── ext.h
│   ├── gpt.h
│   ├── hal_channels.h
│   ├── hal_files.h
│   ├── hal.h
│   ├── hal_ioblock.h
│   ├── hal_mmcsd.h
│   ├── hal_queues.h
│   ├── hal_streams.h
│   ├── i2c.h
│   ├── i2s.h
│   ├── icu.h
│   ├── mac.h
│   ├── mii.h
│   ├── mmc_spi.h
│   ├── pal.h
│   ├── pwm.h
│   ├── rtc.h
│   ├── sdc.h
│   ├── serial.h
│   ├── serial_usb.h
│   ├── spi.h
│   ├── st.h
│   ├── uart.h
│   └── usb.h
├── lib
│   └── streams
│   ├── chprintf.c
│   ├── chprintf.h
│   ├── memstreams.c
│   ├── memstreams.h
│   ├── nullstreams.c
│   └── nullstreams.h
├── osal
│   ├── nil
│   │   ├── osal.c
│   │   ├── osal.h
│   │   └── osal.mk
│   ├── os-less
│   │   └── ARMCMx
│   │   ├── osal.c
│   │   ├── osal.h
│   │   └── osal.mk
│   └── rt
│   ├── osal.c
│   ├── osal.h
│   └── osal.mk
├── ports
│   ├── AVR
│   ├── common
│   │   └── ARMCMx
│   │   ├── mpu.h
│   │   ├── nvic.c
│   │   └── nvic.h
│   ├── KINETIS
│   │   ├── K20x
│   │   │   ├── hal_lld.c
│   │   │   ├── hal_lld.h
│   │   │   ├── kinetis_registry.h
│   │   │   ├── platform.dox
│   │   │   ├── platform.mk
│   │   │   ├── pwm_lld.c
│   │   │   ├── pwm_lld.h
│   │   │   ├── spi_lld.c
│   │   │   └── spi_lld.h
│   │   ├── KL2x
│   │   │   ├── hal_lld.c
│   │   │   ├── hal_lld.h
│   │   │   ├── kinetis_registry.h
│   │   │   ├── platform.mk
│   │   │   ├── pwm_lld.c
│   │   │   └── pwm_lld.h
│   │   ├── LLD
│   │   │   ├── adc_lld.c
│   │   │   ├── adc_lld.h
│   │   │   ├── ext_lld.c
│   │   │   ├── ext_lld.h
│   │   │   ├── gpt_lld.c
│   │   │   ├── gpt_lld.h
│   │   │   ├── i2c_lld.c
│   │   │   ├── i2c_lld.h
│   │   │   ├── pal_lld.c
│   │   │   ├── pal_lld.h
│   │   │   ├── serial_lld.c
│   │   │   ├── serial_lld.h
│   │   │   ├── st_lld.c
│   │   │   ├── st_lld.h
│   │   │   ├── usb_lld.c
│   │   │   └── usb_lld.h
│   │   └── README.md
│   ├── LPC
│   ├── simulator
│   └── STM32
├── src
│   ├── adc.c
│   ├── can.c
│   ├── dac.c
│   ├── ext.c
│   ├── gpt.c
│   ├── hal.c
│   ├── hal_mmcsd.c
│   ├── hal_queues.c
│   ├── i2c.c
│   ├── i2s.c
│   ├── icu.c
│   ├── mac.c
│   ├── mmc_spi.c
│   ├── pal.c
│   ├── pwm.c
│   ├── rtc.c
│   ├── sdc.c
│   ├── serial.c
│   ├── serial_usb.c
│   ├── spi.c
│   ├── st.c
│   ├── uart.c
│   └── usb.c
└── templates
├── adc_lld.c
├── adc_lld.h
├── can_lld.c
├── can_lld.h
├── dac_lld.c
├── dac_lld.h
├── ext_lld.c
├── ext_lld.h
├── gpt_lld.c
├── gpt_lld.h
├── halconf.h
├── hal_lld.c
├── hal_lld.h
├── i2c_lld.c
├── i2c_lld.h
├── i2s_lld.c
├── i2s_lld.h
├── icu_lld.c
├── icu_lld.h
├── mac_lld.c
├── mac_lld.h
├── mcuconf.h
├── osal
│   ├── osal.c
│   ├── osal.h
│   └── osal.mk
├── pal_lld.c
├── pal_lld.h
├── platform.mk
├── pwm_lld.c
├── pwm_lld.h
├── rtc_lld.c
├── rtc_lld.h
├── sdc_lld.c
├── sdc_lld.h
├── serial_lld.c
├── serial_lld.h
├── spi_lld.c
├── spi_lld.h
├── st_lld.c
├── st_lld.h
├── uart_lld.c
├── uart_lld.h
├── usb_lld.c
└── usb_lld.h

View file

@ -15,36 +15,47 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef CONFIG_H #pragma once
#define CONFIG_H
/* USB Device descriptor parameter */ /* USB Device descriptor parameter */
#define VENDOR_ID 0x1c11 #define VENDOR_ID 0x1C11
#define PRODUCT_ID 0xb04d #define PRODUCT_ID 0xB04D
#define DEVICE_VER 0x0001 #define DEVICE_VER 0x0001
#define MANUFACTURER Input Club #define MANUFACTURER Input Club
#define PRODUCT Infinity_60%_LED/QMK #define PRODUCT Infinity 60% (QMK)
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 9 #define MATRIX_ROWS 7
#define MATRIX_COLS 7 #define MATRIX_COLS 9
/*
* Keyboard Matrix Assignments
*
* Change this to how you wired your keyboard
* COLS: AVR pins used for columns, left to right
* ROWS: AVR pins used for rows, top to bottom
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
#define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 }
#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5, C6, C7, D0 }
#define UNUSED_PINS
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5
/* define if matrix has ghost */ /* define if matrix has ghost */
//#define MATRIX_HAS_GHOST //#define MATRIX_HAS_GHOST
/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
//#define LOCKING_SUPPORT_ENABLE //#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */ /* Locking resynchronize hack */
//#define LOCKING_RESYNC_ENABLE //#define LOCKING_RESYNC_ENABLE
/* Keymap for Infinity prototype */
//#define INFINITY_PROTOTYPE
/* Keymap for Infinity 1.1a (first revision with LED support) */
#define INFINITY_LED
/* /*
* Feature disable options * Feature disable options
* These options are also useful to firmware size reduction. * These options are also useful to firmware size reduction.
@ -62,5 +73,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_ONESHOT //#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO //#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION //#define NO_ACTION_FUNCTION
#endif

View file

@ -14,19 +14,5 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "infinity60.h" #include "infinity60.h"
void matrix_init_kb(void) {
// put your keyboard start-up code here
// runs once when the firmware starts up
matrix_init_user();
}
void matrix_scan_kb(void) {
// put your looping keyboard code here
// runs every cycle (a lot)
matrix_scan_user();
}

View file

@ -14,51 +14,23 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#pragma once #pragma once
#include "quantum.h" #include "quantum.h"
#ifdef INFINITY_PROTOTYPE
/* Infinity prototype */
#define LAYOUT_60_ansi_split_bs_rshift( \ #define LAYOUT_60_ansi_split_bs_rshift( \
K00, K10, K20, K30, K40, K50, K60, K70, K80, K01, K11, K21, K31, K41, K86, \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k10, k11, k12, k13, k14, k15, \
K51, K61, K71, K81, K02, K12, K22, K32, K42, K52, K62, K72, K82, K03, \ k16, k17, k18, k20, k21, k22, k23, k24, k25, k26, k27, k28, k30, k31, \
K13, K23, K33, K43, K53, K63, K73, K83, K04, K14, K24, K34, K44, \ k32, k33, k34, k35, k36, k37, k38, k40, k41, k42, k43, k44, k45, \
K54, K64, K74, K84, K05, K15, K25, K35, K45, K55, K65, K75, K85, \ k46, k47, k48, k50, k51, k52, k53, k54, k55, k56, k57, k58, k60, \
K06, K16, K26, K36, K46, K56, K66, K76 \ k61, k62, k63, k64, k65, k66, k67, k68 \
) { \ ) { \
{ K00, K01, K02, K03, K04, K05, K06 }, \ { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
{ K10, K11, K12, K13, K14, K15, K16 }, \ { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \
{ K20, K21, K22, K23, K24, K25, K26 }, \ { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
{ K30, K31, K32, K33, K34, K35, K36 }, \ { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
{ K40, K41, K42, K43, K44, K45, K46 }, \ { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
{ K50, K51, K52, K53, K54, K55, K56 }, \ { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
{ K60, K61, K62, K63, K64, K65, K66 }, \ { k60, k61, k62, k63, k64, k65, k66, k67, k68 } \
{ K70, K71, K72, K73, K74, K75, K76 }, \
{ K80, K81, K82, K83, K84, K85, K86 } \
} }
#else
/* Infinity production */
#define LAYOUT_60_ansi_split_bs_rshift( \
K00, K10, K20, K30, K40, K50, K60, K70, K80, K01, K11, K21, K31, K41, K51, \
K61, K71, K81, K02, K12, K22, K32, K42, K52, K62, K72, K82, K03, K13, \
K23, K33, K43, K53, K63, K73, K83, K04, K14, K24, K34, K44, K54, \
K64, K74, K84, K05, K15, K25, K35, K45, K55, K65, K75, K85, K06, \
K16, K26, K36, K46, K56, K66, K76, K86 \
) { \
{ K00, K01, K02, K03, K04, K05, K06 }, \
{ K10, K11, K12, K13, K14, K15, K16 }, \
{ K20, K21, K22, K23, K24, K25, K26 }, \
{ K30, K31, K32, K33, K34, K35, K36 }, \
{ K40, K41, K42, K43, K44, K45, K46 }, \
{ K50, K51, K52, K53, K54, K55, K56 }, \
{ K60, K61, K62, K63, K64, K65, K66 }, \
{ K70, K71, K72, K73, K74, K75, K76 }, \
{ K80, K81, K82, K83, K84, K85, K86 } \
}
#endif

View file

@ -1,78 +1,81 @@
{ {
"keyboard_name": "Infinity 60%", "keyboard_name": "Infinity 60%",
"keyboard_folder": "infinity60", "keyboard_folder": "infinity60",
"url": "https://input.club/devices/infinity-keyboard/", "url": "https://input.club/devices/infinity-keyboard/",
"maintainer": "qmk", "maintainer": "qmk",
"width": 15, "width": 15,
"height": 5, "height": 5,
"layouts": { "layouts": {
"LAYOUT_60_ansi_split_bs_rshift": { "LAYOUT_60_ansi_split_bs_rshift": {
"key_count": 63, "layout": [
"layout": [ {"x": 0, "y": 0},
{"label":"Esc", "x":0, "y":0}, {"x": 1, "y": 0},
{"label":"1", "x":1, "y":0}, {"x": 2, "y": 0},
{"label":"2", "x":2, "y":0}, {"x": 3, "y": 0},
{"label":"3", "x":3, "y":0}, {"x": 4, "y": 0},
{"label":"4", "x":4, "y":0}, {"x": 5, "y": 0},
{"label":"5", "x":5, "y":0}, {"x": 6, "y": 0},
{"label":"6", "x":6, "y":0}, {"x": 7, "y": 0},
{"label":"7", "x":7, "y":0}, {"x": 8, "y": 0},
{"label":"8", "x":8, "y":0}, {"x": 9, "y": 0},
{"label":"9", "x":9, "y":0}, {"x": 10, "y": 0},
{"label":"0", "x":10, "y":0}, {"x": 11, "y": 0},
{"label":"-", "x":11, "y":0}, {"x": 12, "y": 0},
{"label":"=", "x":12, "y":0}, {"x": 13, "y": 0},
{"label":"\\", "x":13, "y":0}, {"x": 14, "y": 0},
{"label":"`", "x":14, "y":0},
{"label":"Tab", "x":0, "y":1, "w":1.5}, {"x": 0, "y": 1, "w": 1.5},
{"label":"Q", "x":1.5, "y":1}, {"x": 1.5, "y": 1},
{"label":"W", "x":2.5, "y":1}, {"x": 2.5, "y": 1},
{"label":"E", "x":3.5, "y":1}, {"x": 3.5, "y": 1},
{"label":"R", "x":4.5, "y":1}, {"x": 4.5, "y": 1},
{"label":"T", "x":5.5, "y":1}, {"x": 5.5, "y": 1},
{"label":"Y", "x":6.5, "y":1}, {"x": 6.5, "y": 1},
{"label":"U", "x":7.5, "y":1}, {"x": 7.5, "y": 1},
{"label":"I", "x":8.5, "y":1}, {"x": 8.5, "y": 1},
{"label":"O", "x":9.5, "y":1}, {"x": 9.5, "y": 1},
{"label":"P", "x":10.5, "y":1}, {"x": 10.5, "y": 1},
{"label":"[", "x":11.5, "y":1}, {"x": 11.5, "y": 1},
{"label":"]", "x":12.5, "y":1}, {"x": 12.5, "y": 1},
{"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"x": 13.5, "y": 1, "w": 1.5},
{"label":"Caps Lock", "x":0, "y":2, "w":1.75},
{"label":"A", "x":1.75, "y":2}, {"x": 0, "y": 2, "w": 1.75},
{"label":"S", "x":2.75, "y":2}, {"x": 1.75, "y": 2},
{"label":"D", "x":3.75, "y":2}, {"x": 2.75, "y": 2},
{"label":"F", "x":4.75, "y":2}, {"x": 3.75, "y": 2},
{"label":"G", "x":5.75, "y":2}, {"x": 4.75, "y": 2},
{"label":"H", "x":6.75, "y":2}, {"x": 5.75, "y": 2},
{"label":"J", "x":7.75, "y":2}, {"x": 6.75, "y": 2},
{"label":"K", "x":8.75, "y":2}, {"x": 7.75, "y": 2},
{"label":"L", "x":9.75, "y":2}, {"x": 8.75, "y": 2},
{"label":";", "x":10.75, "y":2}, {"x": 9.75, "y": 2},
{"label":"'", "x":11.75, "y":2}, {"x": 10.75, "y": 2},
{"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"x": 11.75, "y": 2},
{"label":"Shift", "x":0, "y":3, "w":2.25}, {"x": 12.75, "y": 2, "w": 2.25},
{"label":"Z", "x":2.25, "y":3},
{"label":"X", "x":3.25, "y":3}, {"x": 0, "y": 3, "w": 2.25},
{"label":"C", "x":4.25, "y":3}, {"x": 2.25, "y": 3},
{"label":"V", "x":5.25, "y":3}, {"x": 3.25, "y": 3},
{"label":"B", "x":6.25, "y":3}, {"x": 4.25, "y": 3},
{"label":"N", "x":7.25, "y":3}, {"x": 5.25, "y": 3},
{"label":"M", "x":8.25, "y":3}, {"x": 6.25, "y": 3},
{"label":",", "x":9.25, "y":3}, {"x": 7.25, "y": 3},
{"label":".", "x":10.25, "y":3}, {"x": 8.25, "y": 3},
{"label":"/", "x":11.25, "y":3}, {"x": 9.25, "y": 3},
{"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x": 10.25, "y": 3},
{"label":"Fn", "x":14, "y":3}, {"x": 11.25, "y": 3},
{"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"x": 12.25, "y": 3, "w": 1.75},
{"label":"GUI", "x":1.5, "y":4}, {"x": 14, "y": 3},
{"label":"Alt", "x":2.5, "y":4, "w":1.5},
{"label":"Space", "x":4, "y":4, "w":6}, {"x": 0, "y": 4, "w": 1.5},
{"label":"Alt", "x":10, "y":4, "w":1.5}, {"x": 1.5, "y": 4},
{"label":"GUI", "x":11.5, "y":4}, {"x": 2.5, "y": 4, "w": 1.5},
{"label":"Fn", "x":12.5, "y":4}, {"x": 4, "y": 4, "w": 6},
{"label":"Ctrl", "x":13.5, "y":4, "w":1.5} {"x": 10, "y": 4, "w": 1.5},
] {"x": 11.5, "y": 4},
{"x": 12.5, "y": 4},
{"x": 13.5, "y": 4, "w": 1.5}
]
}
} }
}
} }

View file

@ -1,43 +1,45 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Layer 0: Default Layer /*
* ,-----------------------------------------------------------. *
* |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `| * Esc 1  2  3  4  5  6  7  8  9  0  -  =  \  ` 
* |-----------------------------------------------------------| *
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| Bksp| *  Tab  Q  W  E  R  T  Y  U  I  O  P  [  ]  Bspc
* |-----------------------------------------------------------| *
* |Contro| A| S| D| F| G| H| J| K| L| ;| '|Enter | *  Ctrl  A  S  D  F  G  H  J  K  L  ;  '   Enter 
* |-----------------------------------------------------------| *
* |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Fn0| *  Shift   Z  X  C  V  B  N  M  ,  .  /  Shift Fn
* |-----------------------------------------------------------' *
* | |Gui|Alt | Space |Alt |Gui| | | *      GUI Alt                         Alt GUI        
* `-----------------------------------------------------------' *
*/ */
[0] = LAYOUT_60_ansi_split_bs_rshift( [0] = LAYOUT_60_ansi_split_bs_rshift(
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_BSLS, KC_GRV, \ 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_BSLS, KC_GRV,
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_BSPC, \ 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_BSPC,
KC_LCTL,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_LCTL, 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_LSFT,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,MO(1), \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
KC_NO, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI,KC_NO, KC_NO), XXXXXXX, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, XXXXXXX, XXXXXXX
),
/* Layer 1: HHKB mode (HHKB Fn) /*
* ,-----------------------------------------------------------. *
* |Pwr| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del| * PwrF1 F2 F3 F4 F5 F6 F7 F8 F9 F10F11F12InsDel
* |-----------------------------------------------------------| *
* |Caps | | | | | | | |Psc|Slk|Pus|Up | |Backs| * Caps                      PScSlkPse          
* |-----------------------------------------------------------| *
* | |VoD|VoU|Mut| | | *| /|Hom|PgU|Lef|Rig|Enter | *       Vl-Vl+Mut       *  / HomPgU      Enter 
* |-----------------------------------------------------------| *
* | | | | | | | +| -|End|PgD|Dow| | | *                         +  - EndPgD           
* `-----------------------------------------------------------' *
* | |Gui|Alt | Space |Alt |Gui| | | *                                                     
* `-----------------------------------------------------------' *
*/ */
[1] = LAYOUT_60_ansi_split_bs_rshift( [1] = LAYOUT_60_ansi_split_bs_rshift(
KC_PWR, 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_INS, KC_DEL, \ KC_PWR, 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_INS, KC_DEL,
KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS, KC_UP, KC_TRNS, KC_BSPC, \ KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______,
KC_TRNS,KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,KC_TRNS,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,KC_PENT, \ _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PPLS,KC_PMNS,KC_END, KC_PGDN,KC_DOWN,KC_TRNS,KC_TRNS, \ _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______,
KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS), _______, _______, _______, _______, _______, _______, _______, _______
)
}; };

View file

@ -15,11 +15,12 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------' * `-----------------------------------------------------------'
*/ */
[0] = LAYOUT_60_ansi_split_bs_rshift( [0] = LAYOUT_60_ansi_split_bs_rshift(
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_BSLS,KC_GRV, \ 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_BSLS, KC_GRV,
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_BSPC, \ 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_BSPC,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(3, KC_SCLN), KC_QUOT,MT(KC_RCTL, KC_ENT), \ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(3, KC_SCLN), KC_QUOT, MT(KC_RCTL, KC_ENT),
OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, LT(2, KC_SLSH), KC_RSFT,TG(1), \ OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, LT(2, KC_SLSH), KC_RSFT, TG(1),
KC_NO, KC_LGUI,KC_LALT, LT(4, KC_SPC), MO(4), KC_RGUI,KC_NO, KC_NO), KC_NO, KC_LGUI, KC_LALT, LT(4, KC_SPC), MO(4), KC_RGUI, KC_NO, KC_NO
),
/* Layer 1: HHKB mode (HHKB Fn) /* Layer 1: HHKB mode (HHKB Fn)
* ,-----------------------------------------------------------. * ,-----------------------------------------------------------.
@ -35,11 +36,12 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------' * `-----------------------------------------------------------'
*/ */
[1] = LAYOUT_60_ansi_split_bs_rshift( [1] = LAYOUT_60_ansi_split_bs_rshift(
KC_PWR, 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_INS, KC_DEL, \ KC_PWR, 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_INS, KC_DEL,
KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS, KC_UP, KC_TRNS,KC_BSPC, \ KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS, KC_UP, KC_TRNS,KC_BSPC,
KC_LCTL,KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,KC_TRNS,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,KC_ENT, \ KC_LCTL,KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,KC_TRNS,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,KC_ENT,
KC_LSFT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PPLS,KC_PMNS,KC_END, KC_PGDN,KC_DOWN,KC_RSFT,KC_TRNS, \ KC_LSFT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PPLS,KC_PMNS,KC_END, KC_PGDN,KC_DOWN,KC_RSFT,KC_TRNS,
KC_TRNS,KC_LGUI,KC_LALT, KC_TRNS, KC_RALT,KC_RGUI,KC_TRNS,KC_TRNS), KC_TRNS,KC_LGUI,KC_LALT, KC_TRNS, KC_RALT,KC_RGUI,KC_TRNS,KC_TRNS
),
/* Layer 2: Vi mode[Slash] /* Layer 2: Vi mode[Slash]
* ,-----------------------------------------------------------. * ,-----------------------------------------------------------.
@ -55,11 +57,12 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-------------------------------------------' * `-------------------------------------------'
*/ */
[2] = LAYOUT_60_ansi_split_bs_rshift( [2] = LAYOUT_60_ansi_split_bs_rshift(
KC_GRV, 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_INS, KC_DEL, \ KC_GRV, 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_INS, KC_DEL,
KC_TAB, KC_HOME,KC_PGDN,KC_UP, KC_PGUP,KC_END, KC_HOME,KC_PGDN,KC_PGUP,KC_END, KC_NO, KC_NO, KC_NO, KC_BSPC, \ KC_TAB, KC_HOME,KC_PGDN,KC_UP, KC_PGUP,KC_END, KC_HOME,KC_PGDN,KC_PGUP,KC_END, KC_NO, KC_NO, KC_NO, KC_BSPC,
KC_LCTL,KC_NO, KC_LEFT,KC_DOWN,KC_RGHT,KC_NO, KC_LEFT,KC_DOWN,KC_UP, KC_RGHT,KC_NO, KC_NO, KC_ENT, \ KC_LCTL,KC_NO, KC_LEFT,KC_DOWN,KC_RGHT,KC_NO, KC_LEFT,KC_DOWN,KC_UP, KC_RGHT,KC_NO, KC_NO, KC_ENT,
KC_LSFT,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME,KC_PGDN,KC_PGUP,KC_END, LT(2, KC_SLSH), KC_RSFT,KC_TRNS, \ KC_LSFT,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME,KC_PGDN,KC_PGUP,KC_END, LT(2, KC_SLSH), KC_RSFT,KC_TRNS,
KC_TRNS,KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI,KC_TRNS, KC_TRNS), KC_TRNS,KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI,KC_TRNS, KC_TRNS
),
/* Layer 3: Mouse mode(IJKL)[Semicolon] /* Layer 3: Mouse mode(IJKL)[Semicolon]
* ,-----------------------------------------------------------. * ,-----------------------------------------------------------.
@ -76,11 +79,12 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel
*/ */
[3] = LAYOUT_60_ansi_split_bs_rshift( [3] = LAYOUT_60_ansi_split_bs_rshift(
KC_GRV, 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_INS, KC_DEL, \ KC_GRV, 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_INS, KC_DEL,
LALT(KC_TAB), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_L,KC_WH_D,KC_MS_U, KC_WH_U, KC_WH_R, ALT_T(KC_LEFT), ALT_T(KC_RGHT),LALT(KC_TAB), \ LALT(KC_TAB), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_L,KC_WH_D,KC_MS_U, KC_WH_U, KC_WH_R, ALT_T(KC_LEFT), ALT_T(KC_RGHT),LALT(KC_TAB),
KC_LCTL, KC_ACL0,KC_ACL1,KC_ACL2,KC_ACL2,KC_NO, KC_NO, KC_MS_L,KC_MS_D, KC_MS_R, LT(3, KC_SCLN), KC_NO, KC_ENT, \ KC_LCTL, KC_ACL0,KC_ACL1,KC_ACL2,KC_ACL2,KC_NO, KC_NO, KC_MS_L,KC_MS_D, KC_MS_R, LT(3, KC_SCLN), KC_NO, KC_ENT,
KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN3,KC_BTN2,KC_BTN1,ALT_T(KC_LEFT), ALT_T(KC_RGHT), KC_NO, KC_RSFT, KC_TRNS, \ KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN3,KC_BTN2,KC_BTN1,ALT_T(KC_LEFT), ALT_T(KC_RGHT), KC_NO, KC_RSFT, KC_TRNS,
KC_TRNS, KC_LGUI,KC_LALT, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), KC_TRNS, KC_LGUI,KC_LALT, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
/* Layer 4: Mouse mode(IJKL)[Space] /* Layer 4: Mouse mode(IJKL)[Space]
* ,-----------------------------------------------------------. * ,-----------------------------------------------------------.
@ -88,29 +92,19 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |-----------------------------------------------------------| * |-----------------------------------------------------------|
* |Tab | | | | | |MwL|MwD|McU|MwU|MwR|Wbk|Wfr|Alt-T| * |Tab | | | | | |MwL|MwD|McU|MwU|MwR|Wbk|Wfr|Alt-T|
* |-----------------------------------------------------------| * |-----------------------------------------------------------|
* |Contro| | | | | |Mb2|McL|McD|McR|Mb1| |Return | * |Contro|VlD|VlU|VlM| | | |McL|McD|McR|Mb1| |Return |
* |-----------------------------------------------------------| * |-----------------------------------------------------------|
* |Shift | | | | |Mb3|Mb2|Mb1|Mb4|Mb5| |Shift | | * |Shift | | | | |Mb3|Mb2|Mb1|A/L|A/R| |Shift | |
* `-----------------------------------------------------------' * `-----------------------------------------------------------'
* |Gui |Alt | Mb1 |Fn |Fn | * |Gui |Alt | Mb1 |Fn |Fn |
* `--------------------------------------------' * `--------------------------------------------'
* Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel
*/ */
[4] = LAYOUT_60_ansi_split_bs_rshift( [4] = LAYOUT_60_ansi_split_bs_rshift(
KC_GRV, 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_INS, KC_DEL, \ KC_GRV, 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_INS, KC_DEL,
LALT(KC_TAB), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_L,KC_WH_D,KC_MS_U, KC_WH_U, KC_WH_R,KC_BTN4,KC_BTN5,LALT(KC_TAB), \ LALT(KC_TAB), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_L, KC_WH_D, KC_MS_U, KC_WH_U, KC_WH_R, KC_BTN4, KC_BTN5, LALT(KC_TAB),
KC_LCTL, KC_VOLD,KC_VOLU,KC_MUTE,KC_NO, KC_NO, KC_NO, KC_MS_L,KC_MS_D, KC_MS_R, KC_BTN1,KC_NO, KC_ENT, \ KC_LCTL, KC_VOLD, KC_VOLU, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN1, KC_NO, KC_ENT,
KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN3,KC_BTN2,KC_BTN1,ALT_T(KC_LEFT),ALT_T(KC_RGHT),KC_NO, KC_RSFT,KC_TRNS, \ KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN3, KC_BTN2, KC_BTN1, ALT_T(KC_LEFT), ALT_T(KC_RGHT), KC_NO, KC_RSFT, KC_NO,
KC_TRNS, KC_LGUI,KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS), KC_NO, KC_LGUI, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
};
// Runs just one time when the keyboard initializes.
void matrix_init_user(void) {
};
// Runs constantly in the background, in a loop.
void matrix_scan_user(void) {
}; };

View file

@ -1,198 +0,0 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
#include <hal.h>
#include "timer.h"
#include "wait.h"
#include "print.h"
#include "matrix.h"
/*
* Infinity Pinusage:
* Column pins are input with internal pull-down. Row pins are output and strobe with high.
* Key is high or 1 when it turns on.
* INFINITY PRODUCTION (NO LED)
* col: { PTD1, PTD2, PTD3, PTD4, PTD5, PTD6, PTD7 }
* row: { PTB0, PTB1, PTB2, PTB3, PTB16, PTB17, PTC4, PTC5, PTD0 }
* INFINITY PRODUCTION (WITH LED)
* col: { PTD1, PTD2, PTD3, PTD4, PTD5, PTD6, PTD7 }
* row: { PTC0, PTC1, PTC2, PTC3, PTC4, PTC5, PTC6, PTC7, PTD0 }
*/
/* matrix state(1:on, 0:off) */
static matrix_row_t matrix[MATRIX_ROWS];
static matrix_row_t matrix_debouncing[MATRIX_ROWS];
static bool debouncing = false;
static uint16_t debouncing_time = 0;
void matrix_init(void)
{
/* Column(sense) */
palSetPadMode(GPIOD, 1, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOD, 2, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOD, 3, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOD, 4, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOD, 5, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOD, 6, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOD, 7, PAL_MODE_INPUT_PULLDOWN);
#ifdef INFINITY_LED
/* Row(strobe) */
palSetPadMode(GPIOC, 0, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOC, 1, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOC, 2, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOC, 3, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOC, 4, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOC, 5, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOC, 6, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOC, 7, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOD, 0, PAL_MODE_OUTPUT_PUSHPULL);
#else
/* Row(strobe) */
palSetPadMode(GPIOB, 0, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOB, 1, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOB, 2, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOB, 3, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOB, 16, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOB, 17, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOC, 4, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOC, 5, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOD, 0, PAL_MODE_OUTPUT_PUSHPULL);
#endif
memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
memset(matrix_debouncing, 0, MATRIX_ROWS * sizeof(matrix_row_t));
matrix_init_quantum();
}
uint8_t matrix_scan(void)
{
for (int row = 0; row < MATRIX_ROWS; row++) {
matrix_row_t data = 0;
#ifdef INFINITY_LED
// strobe row
switch (row) {
case 0: palSetPad(GPIOC, 0); break;
case 1: palSetPad(GPIOC, 1); break;
case 2: palSetPad(GPIOC, 2); break;
case 3: palSetPad(GPIOC, 3); break;
case 4: palSetPad(GPIOC, 4); break;
case 5: palSetPad(GPIOC, 5); break;
case 6: palSetPad(GPIOC, 6); break;
case 7: palSetPad(GPIOC, 7); break;
case 8: palSetPad(GPIOD, 0); break;
}
#else
// strobe row
switch (row) {
case 0: palSetPad(GPIOB, 0); break;
case 1: palSetPad(GPIOB, 1); break;
case 2: palSetPad(GPIOB, 2); break;
case 3: palSetPad(GPIOB, 3); break;
case 4: palSetPad(GPIOB, 16); break;
case 5: palSetPad(GPIOB, 17); break;
case 6: palSetPad(GPIOC, 4); break;
case 7: palSetPad(GPIOC, 5); break;
case 8: palSetPad(GPIOD, 0); break;
}
#endif
// need wait to settle pin state
// if you wait too short, or have a too high update rate
// the keyboard might freeze, or there might not be enough
// processing power to update the LCD screen properly.
// 20us, or two ticks at 100000Hz seems to be OK
wait_us(20);
// read col data
data = (palReadPort(GPIOD)>>1);
#ifdef INFINITY_LED
// un-strobe row
switch (row) {
case 0: palClearPad(GPIOC, 0); break;
case 1: palClearPad(GPIOC, 1); break;
case 2: palClearPad(GPIOC, 2); break;
case 3: palClearPad(GPIOC, 3); break;
case 4: palClearPad(GPIOC, 4); break;
case 5: palClearPad(GPIOC, 5); break;
case 6: palClearPad(GPIOC, 6); break;
case 7: palClearPad(GPIOC, 7); break;
case 8: palClearPad(GPIOD, 0); break;
}
#else
// un-strobe row
switch (row) {
case 0: palClearPad(GPIOB, 0); break;
case 1: palClearPad(GPIOB, 1); break;
case 2: palClearPad(GPIOB, 2); break;
case 3: palClearPad(GPIOB, 3); break;
case 4: palClearPad(GPIOB, 16); break;
case 5: palClearPad(GPIOB, 17); break;
case 6: palClearPad(GPIOC, 4); break;
case 7: palClearPad(GPIOC, 5); break;
case 8: palClearPad(GPIOD, 0); break;
}
#endif
if (matrix_debouncing[row] != data) {
matrix_debouncing[row] = data;
debouncing = true;
debouncing_time = timer_read();
}
}
if (debouncing && timer_elapsed(debouncing_time) > DEBOUNCE) {
for (int row = 0; row < MATRIX_ROWS; row++) {
matrix[row] = matrix_debouncing[row];
}
debouncing = false;
}
matrix_scan_quantum();
return 1;
}
bool matrix_is_on(uint8_t row, uint8_t col)
{
return (matrix[row] & (1<<col));
}
matrix_row_t matrix_get_row(uint8_t row)
{
return matrix[row];
}
void matrix_print(void)
{
xprintf("\nr/c 01234567\n");
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
xprintf("%02X: ");
matrix_row_t data = matrix_get_row(row);
for (int col = 0; col < MATRIX_COLS; col++) {
if (data & (1<<col))
xprintf("1");
else
xprintf("0");
}
xprintf("\n");
}
}
__attribute__ ((weak))
void matrix_init_kb(void) {
matrix_init_user();
}
__attribute__ ((weak))
void matrix_scan_kb(void) {
matrix_scan_user();
}
__attribute__ ((weak))
void matrix_init_user(void) {
}
__attribute__ ((weak))
void matrix_scan_user(void) {
}

View file

@ -1,15 +1,17 @@
Infinity 60% # Infinity 60%
============
A compact community driven keyboard. A compact community driven keyboard.
Keyboard Maintainer: QMK Community * Keyboard Maintainer: QMK Community
Hardware Supported: Infinity 60% PCB * Hardware Supported: Infinity 60% PCB
Hardware Availability: https://input.club/devices/infinity-keyboard/ * Hardware Availability: https://input.club/devices/infinity-keyboard/
Make example for this keyboard (after setting up your build environment): Make example for this keyboard (after setting up your build environment):
make infinity60:default make infinity60: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). Flashing example for this keyboard:
make infinity60: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).

View file

@ -14,24 +14,27 @@ BOOTLOADER = kiibohd
BOARD = MCHCK_K20 BOARD = MCHCK_K20
# Build Options # Build Options
# comment out to disable the options. # change yes to no to disable
# #
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration COMMAND_ENABLE = yes # Commands for debug and configuration
SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
NKRO_ENABLE = yes # USB Nkey Rollover SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
CUSTOM_MATRIX = yes # Custom matrix file # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE = yes # 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
# project specific files # project specific files
SRC = matrix.c \ SRC += led.c \
led.c \ led_controller.c
led_controller.c
LAYOUTS = 60_ansi_split_bs_rshift LAYOUTS = 60_ansi_split_bs_rshift
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE