From f22ff7f4907f4e3eb17008bb71d78205c6125b38 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Sun, 15 Sep 2019 12:30:23 -0500 Subject: [PATCH 01/14] initial commit restart of osa development --- keyboards/sck/osa/config.h | 251 ++++++++++++++++++ keyboards/sck/osa/info.json | 25 ++ keyboards/sck/osa/keymaps/default/config.h | 19 ++ keyboards/sck/osa/keymaps/default/keymap.c | 123 +++++++++ keyboards/sck/osa/keymaps/default/readme.md | 1 + keyboards/sck/osa/keymaps/dualsplit/config.h | 19 ++ keyboards/sck/osa/keymaps/dualsplit/keymap.c | 123 +++++++++ keyboards/sck/osa/keymaps/dualsplit/readme.md | 1 + keyboards/sck/osa/keymaps/ocm/config.h | 19 ++ keyboards/sck/osa/keymaps/ocm/keymap.c | 123 +++++++++ keyboards/sck/osa/keymaps/ocm/readme.md | 1 + keyboards/sck/osa/keymaps/splitbs/config.h | 19 ++ keyboards/sck/osa/keymaps/splitbs/keymap.c | 123 +++++++++ keyboards/sck/osa/keymaps/splitbs/readme.md | 1 + keyboards/sck/osa/keymaps/splitrs/config.h | 19 ++ keyboards/sck/osa/keymaps/splitrs/keymap.c | 123 +++++++++ keyboards/sck/osa/keymaps/splitrs/readme.md | 1 + keyboards/sck/osa/osa.c | 74 ++++++ keyboards/sck/osa/osa.h | 60 +++++ keyboards/sck/osa/readme.md | 19 ++ keyboards/sck/osa/rules.mk | 82 ++++++ 21 files changed, 1226 insertions(+) create mode 100644 keyboards/sck/osa/config.h create mode 100644 keyboards/sck/osa/info.json create mode 100644 keyboards/sck/osa/keymaps/default/config.h create mode 100644 keyboards/sck/osa/keymaps/default/keymap.c create mode 100644 keyboards/sck/osa/keymaps/default/readme.md create mode 100644 keyboards/sck/osa/keymaps/dualsplit/config.h create mode 100644 keyboards/sck/osa/keymaps/dualsplit/keymap.c create mode 100644 keyboards/sck/osa/keymaps/dualsplit/readme.md create mode 100644 keyboards/sck/osa/keymaps/ocm/config.h create mode 100644 keyboards/sck/osa/keymaps/ocm/keymap.c create mode 100644 keyboards/sck/osa/keymaps/ocm/readme.md create mode 100644 keyboards/sck/osa/keymaps/splitbs/config.h create mode 100644 keyboards/sck/osa/keymaps/splitbs/keymap.c create mode 100644 keyboards/sck/osa/keymaps/splitbs/readme.md create mode 100644 keyboards/sck/osa/keymaps/splitrs/config.h create mode 100644 keyboards/sck/osa/keymaps/splitrs/keymap.c create mode 100644 keyboards/sck/osa/keymaps/splitrs/readme.md create mode 100644 keyboards/sck/osa/osa.c create mode 100644 keyboards/sck/osa/osa.h create mode 100644 keyboards/sck/osa/readme.md create mode 100644 keyboards/sck/osa/rules.mk diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h new file mode 100644 index 000000000000..f5669402a03a --- /dev/null +++ b/keyboards/sck/osa/config.h @@ -0,0 +1,251 @@ +/* +Copyright 2019 jrfhoutx + +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 0xFEED +#define PRODUCT_ID 0x0000 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Nomenclackture +#define PRODUCT OSA +#define DESCRIPTION PCB for the Open Source Alice + +/* key matrix size */ +#define MATRIX_ROWS 10 +#define MATRIX_COLS 8 + +/* + * 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 { F0, F1, F4, F5, F6, B0, B1, B2, B3, B7 } +#define MATRIX_COL_PINS { B4, D7, D5, D3, D2, D0, D1, B5 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +/* + * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. + */ +//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 + +// #define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +// #define BACKLIGHT_LEVELS 3 + + #define RGB_DI_PIN D4 + #ifdef RGB_DI_PIN + #define RGBLED_NUM 9 + #define RGBLIGHT_HUE_STEP 10 + #define RGBLIGHT_SAT_STEP 17 + #define RGBLIGHT_VAL_STEP 17 + #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ + #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ + /*== all animations enable ==*/ + // #define RGBLIGHT_ANIMATIONS + /*== or choose animations ==*/ + #define RGBLIGHT_EFFECT_BREATHING + // #define RGBLIGHT_EFFECT_RAINBOW_MOOD + #define RGBLIGHT_EFFECT_RAINBOW_SWIRL + #define RGBLIGHT_EFFECT_SNAKE + #define RGBLIGHT_EFFECT_KNIGHT + // #define RGBLIGHT_EFFECT_CHRISTMAS + #define RGBLIGHT_EFFECT_STATIC_GRADIENT + #define RGBLIGHT_EFFECT_RGB_TEST +// #define RGBLIGHT_EFFECT_ALTERNATING + /*== customize breathing effect ==*/ + /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ + #define RGBLIGHT_BREATHE_TABLE_SIZE 128 // 256(default) or 128 or 64 + /*==== use exp() and sin() ====*/ + // #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 + #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 + #endif + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* number of backlight levels */ + +/* 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 + +/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. + * This is userful for the Windows task manager shortcut (ctrl+shift+esc). + */ +// #define GRAVE_ESC_CTRL_OVERRIDE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Magic Key Options + * + * Magic keys are hotkey commands that allow control over firmware functions of + * the keyboard. They are best used in combination with the HID Listen program, + * found here: https://www.pjrc.com/teensy/hid_listen.html + * + * The options below allow the magic key functionality to be changed. This is + * useful if your keyboard/keypad is missing keys and you want magic key support. + * + */ + +/* key combination for magic key command */ +/* defined by default; to change, uncomment and set to the combination you want */ +// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) + +/* control how magic key switches layers */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false + +/* override magic key keymap */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM +//#define MAGIC_KEY_HELP H +//#define MAGIC_KEY_HELP_ALT SLASH +//#define MAGIC_KEY_DEBUG D +//#define MAGIC_KEY_DEBUG_MATRIX X +//#define MAGIC_KEY_DEBUG_KBD K +//#define MAGIC_KEY_DEBUG_MOUSE M +//#define MAGIC_KEY_VERSION V +//#define MAGIC_KEY_STATUS S +//#define MAGIC_KEY_CONSOLE C +//#define MAGIC_KEY_LAYER0 0 +//#define MAGIC_KEY_LAYER0_ALT GRAVE +//#define MAGIC_KEY_LAYER1 1 +//#define MAGIC_KEY_LAYER2 2 +//#define MAGIC_KEY_LAYER3 3 +//#define MAGIC_KEY_LAYER4 4 +//#define MAGIC_KEY_LAYER5 5 +//#define MAGIC_KEY_LAYER6 6 +//#define MAGIC_KEY_LAYER7 7 +//#define MAGIC_KEY_LAYER8 8 +//#define MAGIC_KEY_LAYER9 9 +//#define MAGIC_KEY_BOOTLOADER B +//#define MAGIC_KEY_BOOTLOADER_ALT ESC +//#define MAGIC_KEY_LOCK CAPS +//#define MAGIC_KEY_EEPROM E +//#define MAGIC_KEY_EEPROM_CLEAR BSPACE +//#define MAGIC_KEY_NKRO N +//#define MAGIC_KEY_SLEEP_LED Z + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +//#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ +//#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +//#define MIDI_TONE_KEYCODE_OCTAVES 1 + +/* + * HD44780 LCD Display Configuration + */ +/* +#define LCD_LINES 2 //< number of visible lines of the display +#define LCD_DISP_LENGTH 16 //< visibles characters per line of the display + +#define LCD_IO_MODE 1 //< 0: memory mapped mode, 1: IO port mode + +#if LCD_IO_MODE +#define LCD_PORT PORTB //< port for the LCD lines +#define LCD_DATA0_PORT LCD_PORT //< port for 4bit data bit 0 +#define LCD_DATA1_PORT LCD_PORT //< port for 4bit data bit 1 +#define LCD_DATA2_PORT LCD_PORT //< port for 4bit data bit 2 +#define LCD_DATA3_PORT LCD_PORT //< port for 4bit data bit 3 +#define LCD_DATA0_PIN 4 //< pin for 4bit data bit 0 +#define LCD_DATA1_PIN 5 //< pin for 4bit data bit 1 +#define LCD_DATA2_PIN 6 //< pin for 4bit data bit 2 +#define LCD_DATA3_PIN 7 //< pin for 4bit data bit 3 +#define LCD_RS_PORT LCD_PORT //< port for RS line +#define LCD_RS_PIN 3 //< pin for RS line +#define LCD_RW_PORT LCD_PORT //< port for RW line +#define LCD_RW_PIN 2 //< pin for RW line +#define LCD_E_PORT LCD_PORT //< port for Enable line +#define LCD_E_PIN 1 //< pin for Enable line +#endif +*/ + +/* Bootmagic Lite key configuration */ +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/sck/osa/info.json b/keyboards/sck/osa/info.json new file mode 100644 index 000000000000..8b1a5601d30d --- /dev/null +++ b/keyboards/sck/osa/info.json @@ -0,0 +1,25 @@ +{ + "keyboard_name": "OSA", + "url": "", + "maintainer": "qmk", + "width": 18.25, + "height": 5, + "layouts": { + "LAYOUT_default_ansi": { + "key_count": 64, + "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] + }, + "LAYOUT_split_backspace": { + "key_count": 65, + "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] + }, + "LAYOUT_split_right_shift": { + "key_count": 65, + "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] + }, + "LAYOUT_dual_split": { + "key_count": 66, + "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] + } + } +} diff --git a/keyboards/sck/osa/keymaps/default/config.h b/keyboards/sck/osa/keymaps/default/config.h new file mode 100644 index 000000000000..499a4753f4b1 --- /dev/null +++ b/keyboards/sck/osa/keymaps/default/config.h @@ -0,0 +1,19 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// place overrides here diff --git a/keyboards/sck/osa/keymaps/default/keymap.c b/keyboards/sck/osa/keymaps/default/keymap.c new file mode 100644 index 000000000000..dfd56013cb4c --- /dev/null +++ b/keyboards/sck/osa/keymaps/default/keymap.c @@ -0,0 +1,123 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// Defines the keycodes used by our macros in process_record_user +//enum custom_keycodes { +// QMKBEST = SAFE_RANGE, +// QMKURL +//}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 || ~ | 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =|Backsp | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] | \ | + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ + [0] = LAYOUT( /* Base */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .--------.,----------------------------------------------------------------------. + * |RGB_TOG || ~ | 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =|Backsp | + * |--------||----------------------------------------------------------------------| + * |RGB_MOD ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] | \ | + * |--------||----------------------------------------------------------------------| + * |RGB_RMOD||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `--------'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ + [1] = LAYOUT( /* OSA Layer 1 */ + RGB_TOG, RGB_M_T, RGB_VAI, RGB_VAD, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS, + RGB_MOD, 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, + RGB_RMOD, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(2), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 || ~ | 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =|Backsp | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] | \ | + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ + [2] = LAYOUT( /* OSA Layer 2 */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(0), KC_SPC, KC_RALT, KC_RCTL + ), +}; + + + + +//bool process_record_user(uint16_t keycode, keyrecord_t *record) { +// switch (keycode) { +// case QMKBEST: +// if (record->event.pressed) { +// // when keycode QMKBEST is pressed +// SEND_STRING("QMK is the best thing ever!"); +// } else { +// // when keycode QMKBEST is released +// } +// break; +// case QMKURL: +// if (record->event.pressed) { +// // when keycode QMKURL is pressed +// SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); +// } else { +// // when keycode QMKURL is released +// } +// break; +// } +// return true; +//} + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +//void led_set_user(uint16_t usb_led) { +// +//} diff --git a/keyboards/sck/osa/keymaps/default/readme.md b/keyboards/sck/osa/keymaps/default/readme.md new file mode 100644 index 000000000000..982042494a5f --- /dev/null +++ b/keyboards/sck/osa/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default ANSI keymap for OSA diff --git a/keyboards/sck/osa/keymaps/dualsplit/config.h b/keyboards/sck/osa/keymaps/dualsplit/config.h new file mode 100644 index 000000000000..499a4753f4b1 --- /dev/null +++ b/keyboards/sck/osa/keymaps/dualsplit/config.h @@ -0,0 +1,19 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// place overrides here diff --git a/keyboards/sck/osa/keymaps/dualsplit/keymap.c b/keyboards/sck/osa/keymaps/dualsplit/keymap.c new file mode 100644 index 000000000000..e770e637707a --- /dev/null +++ b/keyboards/sck/osa/keymaps/dualsplit/keymap.c @@ -0,0 +1,123 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// Defines the keycodes used by our macros in process_record_user +//enum custom_keycodes { +// QMKBEST = SAFE_RANGE, +// QMKURL +//}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[0] = LAYOUT( /* OSA Base */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[1] = LAYOUT( /* OSA Layer 1 */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(2), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[2] = LAYOUT( /* OSA Layer 2 */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), +}; + + + + +//bool process_record_user(uint16_t keycode, keyrecord_t *record) { +// switch (keycode) { +// case QMKBEST: +// if (record->event.pressed) { +// // when keycode QMKBEST is pressed +// SEND_STRING("QMK is the best thing ever!"); +// } else { +// // when keycode QMKBEST is released +// } +// break; +// case QMKURL: +// if (record->event.pressed) { +// // when keycode QMKURL is pressed +// SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); +// } else { +// // when keycode QMKURL is released +// } +// break; +// } +// return true; +//} + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/sck/osa/keymaps/dualsplit/readme.md b/keyboards/sck/osa/keymaps/dualsplit/readme.md new file mode 100644 index 000000000000..03a0b5463ef7 --- /dev/null +++ b/keyboards/sck/osa/keymaps/dualsplit/readme.md @@ -0,0 +1 @@ +# The split backspace and split right shift keymap for osa diff --git a/keyboards/sck/osa/keymaps/ocm/config.h b/keyboards/sck/osa/keymaps/ocm/config.h new file mode 100644 index 000000000000..499a4753f4b1 --- /dev/null +++ b/keyboards/sck/osa/keymaps/ocm/config.h @@ -0,0 +1,19 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// place overrides here diff --git a/keyboards/sck/osa/keymaps/ocm/keymap.c b/keyboards/sck/osa/keymaps/ocm/keymap.c new file mode 100644 index 000000000000..e770e637707a --- /dev/null +++ b/keyboards/sck/osa/keymaps/ocm/keymap.c @@ -0,0 +1,123 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// Defines the keycodes used by our macros in process_record_user +//enum custom_keycodes { +// QMKBEST = SAFE_RANGE, +// QMKURL +//}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[0] = LAYOUT( /* OSA Base */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[1] = LAYOUT( /* OSA Layer 1 */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(2), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[2] = LAYOUT( /* OSA Layer 2 */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), +}; + + + + +//bool process_record_user(uint16_t keycode, keyrecord_t *record) { +// switch (keycode) { +// case QMKBEST: +// if (record->event.pressed) { +// // when keycode QMKBEST is pressed +// SEND_STRING("QMK is the best thing ever!"); +// } else { +// // when keycode QMKBEST is released +// } +// break; +// case QMKURL: +// if (record->event.pressed) { +// // when keycode QMKURL is pressed +// SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); +// } else { +// // when keycode QMKURL is released +// } +// break; +// } +// return true; +//} + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/sck/osa/keymaps/ocm/readme.md b/keyboards/sck/osa/keymaps/ocm/readme.md new file mode 100644 index 000000000000..3624b1078ea7 --- /dev/null +++ b/keyboards/sck/osa/keymaps/ocm/readme.md @@ -0,0 +1 @@ +# OneCreativeMind's keymap for OSA diff --git a/keyboards/sck/osa/keymaps/splitbs/config.h b/keyboards/sck/osa/keymaps/splitbs/config.h new file mode 100644 index 000000000000..499a4753f4b1 --- /dev/null +++ b/keyboards/sck/osa/keymaps/splitbs/config.h @@ -0,0 +1,19 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// place overrides here diff --git a/keyboards/sck/osa/keymaps/splitbs/keymap.c b/keyboards/sck/osa/keymaps/splitbs/keymap.c new file mode 100644 index 000000000000..4a965a15b056 --- /dev/null +++ b/keyboards/sck/osa/keymaps/splitbs/keymap.c @@ -0,0 +1,123 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// Defines the keycodes used by our macros in process_record_user +//enum custom_keycodes { +// QMKBEST = SAFE_RANGE, +// QMKURL +//}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[0] = LAYOUT( /* OSA Base */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[1] = LAYOUT( /* OSA Layer 1 */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(2), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[2] = LAYOUT( /* OSA Layer 2 */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), +}; + + + + +//bool process_record_user(uint16_t keycode, keyrecord_t *record) { +// switch (keycode) { +// case QMKBEST: +// if (record->event.pressed) { +// // when keycode QMKBEST is pressed +// SEND_STRING("QMK is the best thing ever!"); +// } else { +// // when keycode QMKBEST is released +// } +// break; +// case QMKURL: +// if (record->event.pressed) { +// // when keycode QMKURL is pressed +// SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); +// } else { +// // when keycode QMKURL is released +// } +// break; +// } +// return true; +//} + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/sck/osa/keymaps/splitbs/readme.md b/keyboards/sck/osa/keymaps/splitbs/readme.md new file mode 100644 index 000000000000..33fb31b336fe --- /dev/null +++ b/keyboards/sck/osa/keymaps/splitbs/readme.md @@ -0,0 +1 @@ +# The split backspace keymap for osa diff --git a/keyboards/sck/osa/keymaps/splitrs/config.h b/keyboards/sck/osa/keymaps/splitrs/config.h new file mode 100644 index 000000000000..499a4753f4b1 --- /dev/null +++ b/keyboards/sck/osa/keymaps/splitrs/config.h @@ -0,0 +1,19 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// place overrides here diff --git a/keyboards/sck/osa/keymaps/splitrs/keymap.c b/keyboards/sck/osa/keymaps/splitrs/keymap.c new file mode 100644 index 000000000000..bc552c914885 --- /dev/null +++ b/keyboards/sck/osa/keymaps/splitrs/keymap.c @@ -0,0 +1,123 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// Defines the keycodes used by our macros in process_record_user +//enum custom_keycodes { +// QMKBEST = SAFE_RANGE, +// QMKURL +//}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 || ~ | 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =|Backsp | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] | \ | + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[0] = LAYOUT( /* OSA Base */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 || ~ | 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =|Backsp | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] | \ | + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[1] = LAYOUT( /* OSA Layer 1 */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(2), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 || ~ | 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =|Backsp | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] | \ | + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[2] = LAYOUT( /* OSA Layer 2 */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), +}; + + + + +//bool process_record_user(uint16_t keycode, keyrecord_t *record) { +// switch (keycode) { +// case QMKBEST: +// if (record->event.pressed) { +// // when keycode QMKBEST is pressed +// SEND_STRING("QMK is the best thing ever!"); +// } else { +// // when keycode QMKBEST is released +// } +// break; +// case QMKURL: +// if (record->event.pressed) { +// // when keycode QMKURL is pressed +// SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); +// } else { +// // when keycode QMKURL is released +// } +// break; +// } +// return true; +//} + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/sck/osa/keymaps/splitrs/readme.md b/keyboards/sck/osa/keymaps/splitrs/readme.md new file mode 100644 index 000000000000..9f2315c2a29a --- /dev/null +++ b/keyboards/sck/osa/keymaps/splitrs/readme.md @@ -0,0 +1 @@ +# The split right shift keymap for osa diff --git a/keyboards/sck/osa/osa.c b/keyboards/sck/osa/osa.c new file mode 100644 index 000000000000..9e2147367627 --- /dev/null +++ b/keyboards/sck/osa/osa.c @@ -0,0 +1,74 @@ +/* Copyright 2019 jrfhoutx + * + * 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 "osa.h" + +//#include "led.h" + +// Optional override functions below. +// You can leave any or all of these undefined. +// These are only required if you want to perform custom actions. + +/* + +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(); +} + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + // put your per-action keyboard code here + // runs for every action, just before processing by the firmware + + return process_record_user(keycode, record); +} + +void matrix_init_board(void){ + setPinOutput(C7); + setPinOutput(C6); + setPinOutput(B6); +} + +void led_set_kb(uint8_t usb_led) { + // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + + if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) { + writePinLow(C7); + } else { + writePinHigh(C7); + } + if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { + writePinLow(C6); + } else { + writePinHigh(C6); + } + if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) { + writePinLow(B6); + } else { + writePinHigh(B6); + } + led_set_user(usb_led); +} + +*/ diff --git a/keyboards/sck/osa/osa.h b/keyboards/sck/osa/osa.h new file mode 100644 index 000000000000..cb7e43bce5b7 --- /dev/null +++ b/keyboards/sck/osa/osa.h @@ -0,0 +1,60 @@ +/* Copyright 2019 jrfhoutx + * + * 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" + +/* This a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ + +/* LAYOUT + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐┌────────┐ + * │10 │ │00 │01 │02 │03 │04 │05 │06 │ │56 │55 │54 │53 │52 │51 │50 │57 ││57 │ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤└────────┘ + * │20 │ │11 │12 │13 │14 │15 │16 │ │66 │65 │64 │63 │62 │61 │60 │67 │ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │30 │ │21 │22 │23 │24 │25 │26 │ │76 │75 │74 │73 │72 │71 │77 │ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤┌──────────┐ + * │31 │32 │33 │34 │35 │36 │ │86 │85 │84 │83 │82 │81 │80 │87 ││87 │ + * ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐ ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤└──────────┘ + * │41 │ │43 │45 │46 │ │95 │93 │ │90 │ + * └─────┘ └─────┴───────┴────┘ └──────────┴─────┘ └─────┘ + */ +#define LAYOUT( \ + K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K50, K57, \ + K20, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, K67, \ + K30, K21, K22, K23, K24, K25, K26, K76, K75, K74, K73, K72, K71, K77, \ + K31, K32, K33, K34, K35, K36, K86, K85, K84, K83, K82, K81, K80, K87, \ + K41, K43, K45, K46, K95, K93, K90 \ +) \ +{ \ + { K00, K01, K02, K03, K04, K05, K06, KC_NO }, \ + { K10, K11, K12, K13, K14, K15, K16, KC_NO }, \ + { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \ + { K30, K31, K32, K33, K34, K35, K36, KC_NO }, \ + { KC_NO, K41, KC_NO, K43, KC_NO, K45, K46, KC_NO }, \ + { K50, K51, K52, K53, K54, K55, K56, K57 }, \ + { K60, K61, K62, K63, K64, K65, K66, K67 }, \ + { KC_NO, K71, K72, K73, K74, K75, K76, K77 }, \ + { K80, K81, K82, K83, K84, K85, K86, K87 }, \ + { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ +} diff --git a/keyboards/sck/osa/readme.md b/keyboards/sck/osa/readme.md new file mode 100644 index 000000000000..d88902841d53 --- /dev/null +++ b/keyboards/sck/osa/readme.md @@ -0,0 +1,19 @@ +# osa + +![osa](imgur.com image replace me!) + +About the OSA: + +The OSA was run as a private group buy of 20 units. It is an Alice layout keyboard based on the Open Source Alice files, altered based on input from the private group buy members. +All case and other design files have been either reworked or created from scratch by BlindAssassin111. PCB was designed from scratch by BlindAssassin111. +The OSA! PCB is an ATMega32u4 powered, USB Type C, Alice compatible PCB and was created specifically for the OSA case, but with considerations to make it compatible with the Lubrigante acrylic cases (except for the Type C connector it should also be compatible with original TGR Alice cases). + +Keyboard Maintainer: [jrfhoutx](https://github.com/jrfhoutx) +Hardware Supported: OSA! PCB by BlindAssassin111, ATMEGA32u4 +Hardware Availability: Unavailable + +Make example for this keyboard (after setting up your build environment): + + make osa: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). diff --git a/keyboards/sck/osa/rules.mk b/keyboards/sck/osa/rules.mk new file mode 100644 index 000000000000..01df5bb5d054 --- /dev/null +++ b/keyboards/sck/osa/rules.mk @@ -0,0 +1,82 @@ +# MCU name +#MCU = at90usb1286 +MCU = atmega32u4 + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +F_CPU = 16000000 + + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +# This will define a symbol, F_USB, in all source code files equal to the +# input clock frequency (before any prescaling is performed) in Hz. This value may +# differ from F_CPU if prescaling is used on the latter, and is required as the +# raw input clock is fed directly to the PLL sections of the AVR for high speed +# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +# at the end, this will be done automatically to create a 32-bit value in your +# source code. +# +# If no clock division is performed on the input clock inside the AVR (via the +# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# atmega32a bootloadHID +BOOTLOADER = atmel-dfu +#BOOTLOADER = qmk-dfu + + +# If you don't know the bootloader type, then you can specify the +# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +# OPT_DEFS += -DBOOTLOADER_SIZE=4096 + + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = yes # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400) From 8aff62d7c13f57a1d340aa48264918a4fa3445e3 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Mon, 30 Sep 2019 22:07:19 -0500 Subject: [PATCH 02/14] minor changes Minor changes mostly changing naming and comment out rgb modes --- keyboards/sck/osa/config.h | 18 +++++++++--------- keyboards/sck/osa/osa.c | 2 +- keyboards/sck/osa/readme.md | 4 ++-- keyboards/sck/osa/rules.mk | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h index f5669402a03a..b23ee1eeedf6 100644 --- a/keyboards/sck/osa/config.h +++ b/keyboards/sck/osa/config.h @@ -23,7 +23,7 @@ along with this program. If not, see . #define VENDOR_ID 0xFEED #define PRODUCT_ID 0x0000 #define DEVICE_VER 0x0001 -#define MANUFACTURER Nomenclackture +#define MANUFACTURER Space City Keyboards #define PRODUCT OSA #define DESCRIPTION PCB for the Open Source Alice @@ -68,21 +68,21 @@ along with this program. If not, see . /*== all animations enable ==*/ // #define RGBLIGHT_ANIMATIONS /*== or choose animations ==*/ - #define RGBLIGHT_EFFECT_BREATHING + //#define RGBLIGHT_EFFECT_BREATHING // #define RGBLIGHT_EFFECT_RAINBOW_MOOD - #define RGBLIGHT_EFFECT_RAINBOW_SWIRL - #define RGBLIGHT_EFFECT_SNAKE - #define RGBLIGHT_EFFECT_KNIGHT + // #define RGBLIGHT_EFFECT_RAINBOW_SWIRL + // #define RGBLIGHT_EFFECT_SNAKE + // #define RGBLIGHT_EFFECT_KNIGHT // #define RGBLIGHT_EFFECT_CHRISTMAS - #define RGBLIGHT_EFFECT_STATIC_GRADIENT - #define RGBLIGHT_EFFECT_RGB_TEST + // #define RGBLIGHT_EFFECT_STATIC_GRADIENT + // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING /*== customize breathing effect ==*/ /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ - #define RGBLIGHT_BREATHE_TABLE_SIZE 128 // 256(default) or 128 or 64 + // #define RGBLIGHT_BREATHE_TABLE_SIZE 128 // 256(default) or 128 or 64 /*==== use exp() and sin() ====*/ // #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 - #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 + // #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ diff --git a/keyboards/sck/osa/osa.c b/keyboards/sck/osa/osa.c index 9e2147367627..e14275aa8a6d 100644 --- a/keyboards/sck/osa/osa.c +++ b/keyboards/sck/osa/osa.c @@ -15,7 +15,7 @@ */ #include "osa.h" -//#include "led.h" +#include "led.h" // Optional override functions below. // You can leave any or all of these undefined. diff --git a/keyboards/sck/osa/readme.md b/keyboards/sck/osa/readme.md index d88902841d53..3493476ba71f 100644 --- a/keyboards/sck/osa/readme.md +++ b/keyboards/sck/osa/readme.md @@ -10,10 +10,10 @@ The OSA! PCB is an ATMega32u4 powered, USB Type C, Alice compatible PCB and was Keyboard Maintainer: [jrfhoutx](https://github.com/jrfhoutx) Hardware Supported: OSA! PCB by BlindAssassin111, ATMEGA32u4 -Hardware Availability: Unavailable +Hardware Availability: Currently Unavailable outside of the private group buy Make example for this keyboard (after setting up your build environment): - make osa:default + make sck/osa: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). diff --git a/keyboards/sck/osa/rules.mk b/keyboards/sck/osa/rules.mk index 01df5bb5d054..090e993f2066 100644 --- a/keyboards/sck/osa/rules.mk +++ b/keyboards/sck/osa/rules.mk @@ -47,7 +47,7 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT # QMK DFU qmk-dfu # atmega32a bootloadHID BOOTLOADER = atmel-dfu -#BOOTLOADER = qmk-dfu + # If you don't know the bootloader type, then you can specify the From ee121b71ade844c5110a0d8ef3595a989e056aa4 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Sun, 15 Sep 2019 12:30:23 -0500 Subject: [PATCH 03/14] initial commit restart of osa development --- keyboards/sck/osa/config.h | 251 ++++++++++++++++++ keyboards/sck/osa/info.json | 25 ++ keyboards/sck/osa/keymaps/default/config.h | 19 ++ keyboards/sck/osa/keymaps/default/keymap.c | 123 +++++++++ keyboards/sck/osa/keymaps/default/readme.md | 1 + keyboards/sck/osa/keymaps/dualsplit/config.h | 19 ++ keyboards/sck/osa/keymaps/dualsplit/keymap.c | 123 +++++++++ keyboards/sck/osa/keymaps/dualsplit/readme.md | 1 + keyboards/sck/osa/keymaps/ocm/config.h | 19 ++ keyboards/sck/osa/keymaps/ocm/keymap.c | 123 +++++++++ keyboards/sck/osa/keymaps/ocm/readme.md | 1 + keyboards/sck/osa/keymaps/splitbs/config.h | 19 ++ keyboards/sck/osa/keymaps/splitbs/keymap.c | 123 +++++++++ keyboards/sck/osa/keymaps/splitbs/readme.md | 1 + keyboards/sck/osa/keymaps/splitrs/config.h | 19 ++ keyboards/sck/osa/keymaps/splitrs/keymap.c | 123 +++++++++ keyboards/sck/osa/keymaps/splitrs/readme.md | 1 + keyboards/sck/osa/osa.c | 74 ++++++ keyboards/sck/osa/osa.h | 60 +++++ keyboards/sck/osa/readme.md | 19 ++ keyboards/sck/osa/rules.mk | 82 ++++++ 21 files changed, 1226 insertions(+) create mode 100644 keyboards/sck/osa/config.h create mode 100644 keyboards/sck/osa/info.json create mode 100644 keyboards/sck/osa/keymaps/default/config.h create mode 100644 keyboards/sck/osa/keymaps/default/keymap.c create mode 100644 keyboards/sck/osa/keymaps/default/readme.md create mode 100644 keyboards/sck/osa/keymaps/dualsplit/config.h create mode 100644 keyboards/sck/osa/keymaps/dualsplit/keymap.c create mode 100644 keyboards/sck/osa/keymaps/dualsplit/readme.md create mode 100644 keyboards/sck/osa/keymaps/ocm/config.h create mode 100644 keyboards/sck/osa/keymaps/ocm/keymap.c create mode 100644 keyboards/sck/osa/keymaps/ocm/readme.md create mode 100644 keyboards/sck/osa/keymaps/splitbs/config.h create mode 100644 keyboards/sck/osa/keymaps/splitbs/keymap.c create mode 100644 keyboards/sck/osa/keymaps/splitbs/readme.md create mode 100644 keyboards/sck/osa/keymaps/splitrs/config.h create mode 100644 keyboards/sck/osa/keymaps/splitrs/keymap.c create mode 100644 keyboards/sck/osa/keymaps/splitrs/readme.md create mode 100644 keyboards/sck/osa/osa.c create mode 100644 keyboards/sck/osa/osa.h create mode 100644 keyboards/sck/osa/readme.md create mode 100644 keyboards/sck/osa/rules.mk diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h new file mode 100644 index 000000000000..f5669402a03a --- /dev/null +++ b/keyboards/sck/osa/config.h @@ -0,0 +1,251 @@ +/* +Copyright 2019 jrfhoutx + +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 0xFEED +#define PRODUCT_ID 0x0000 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Nomenclackture +#define PRODUCT OSA +#define DESCRIPTION PCB for the Open Source Alice + +/* key matrix size */ +#define MATRIX_ROWS 10 +#define MATRIX_COLS 8 + +/* + * 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 { F0, F1, F4, F5, F6, B0, B1, B2, B3, B7 } +#define MATRIX_COL_PINS { B4, D7, D5, D3, D2, D0, D1, B5 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +/* + * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. + */ +//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 + +// #define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +// #define BACKLIGHT_LEVELS 3 + + #define RGB_DI_PIN D4 + #ifdef RGB_DI_PIN + #define RGBLED_NUM 9 + #define RGBLIGHT_HUE_STEP 10 + #define RGBLIGHT_SAT_STEP 17 + #define RGBLIGHT_VAL_STEP 17 + #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ + #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ + /*== all animations enable ==*/ + // #define RGBLIGHT_ANIMATIONS + /*== or choose animations ==*/ + #define RGBLIGHT_EFFECT_BREATHING + // #define RGBLIGHT_EFFECT_RAINBOW_MOOD + #define RGBLIGHT_EFFECT_RAINBOW_SWIRL + #define RGBLIGHT_EFFECT_SNAKE + #define RGBLIGHT_EFFECT_KNIGHT + // #define RGBLIGHT_EFFECT_CHRISTMAS + #define RGBLIGHT_EFFECT_STATIC_GRADIENT + #define RGBLIGHT_EFFECT_RGB_TEST +// #define RGBLIGHT_EFFECT_ALTERNATING + /*== customize breathing effect ==*/ + /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ + #define RGBLIGHT_BREATHE_TABLE_SIZE 128 // 256(default) or 128 or 64 + /*==== use exp() and sin() ====*/ + // #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 + #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 + #endif + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* number of backlight levels */ + +/* 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 + +/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. + * This is userful for the Windows task manager shortcut (ctrl+shift+esc). + */ +// #define GRAVE_ESC_CTRL_OVERRIDE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Magic Key Options + * + * Magic keys are hotkey commands that allow control over firmware functions of + * the keyboard. They are best used in combination with the HID Listen program, + * found here: https://www.pjrc.com/teensy/hid_listen.html + * + * The options below allow the magic key functionality to be changed. This is + * useful if your keyboard/keypad is missing keys and you want magic key support. + * + */ + +/* key combination for magic key command */ +/* defined by default; to change, uncomment and set to the combination you want */ +// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) + +/* control how magic key switches layers */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false + +/* override magic key keymap */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM +//#define MAGIC_KEY_HELP H +//#define MAGIC_KEY_HELP_ALT SLASH +//#define MAGIC_KEY_DEBUG D +//#define MAGIC_KEY_DEBUG_MATRIX X +//#define MAGIC_KEY_DEBUG_KBD K +//#define MAGIC_KEY_DEBUG_MOUSE M +//#define MAGIC_KEY_VERSION V +//#define MAGIC_KEY_STATUS S +//#define MAGIC_KEY_CONSOLE C +//#define MAGIC_KEY_LAYER0 0 +//#define MAGIC_KEY_LAYER0_ALT GRAVE +//#define MAGIC_KEY_LAYER1 1 +//#define MAGIC_KEY_LAYER2 2 +//#define MAGIC_KEY_LAYER3 3 +//#define MAGIC_KEY_LAYER4 4 +//#define MAGIC_KEY_LAYER5 5 +//#define MAGIC_KEY_LAYER6 6 +//#define MAGIC_KEY_LAYER7 7 +//#define MAGIC_KEY_LAYER8 8 +//#define MAGIC_KEY_LAYER9 9 +//#define MAGIC_KEY_BOOTLOADER B +//#define MAGIC_KEY_BOOTLOADER_ALT ESC +//#define MAGIC_KEY_LOCK CAPS +//#define MAGIC_KEY_EEPROM E +//#define MAGIC_KEY_EEPROM_CLEAR BSPACE +//#define MAGIC_KEY_NKRO N +//#define MAGIC_KEY_SLEEP_LED Z + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +//#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ +//#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +//#define MIDI_TONE_KEYCODE_OCTAVES 1 + +/* + * HD44780 LCD Display Configuration + */ +/* +#define LCD_LINES 2 //< number of visible lines of the display +#define LCD_DISP_LENGTH 16 //< visibles characters per line of the display + +#define LCD_IO_MODE 1 //< 0: memory mapped mode, 1: IO port mode + +#if LCD_IO_MODE +#define LCD_PORT PORTB //< port for the LCD lines +#define LCD_DATA0_PORT LCD_PORT //< port for 4bit data bit 0 +#define LCD_DATA1_PORT LCD_PORT //< port for 4bit data bit 1 +#define LCD_DATA2_PORT LCD_PORT //< port for 4bit data bit 2 +#define LCD_DATA3_PORT LCD_PORT //< port for 4bit data bit 3 +#define LCD_DATA0_PIN 4 //< pin for 4bit data bit 0 +#define LCD_DATA1_PIN 5 //< pin for 4bit data bit 1 +#define LCD_DATA2_PIN 6 //< pin for 4bit data bit 2 +#define LCD_DATA3_PIN 7 //< pin for 4bit data bit 3 +#define LCD_RS_PORT LCD_PORT //< port for RS line +#define LCD_RS_PIN 3 //< pin for RS line +#define LCD_RW_PORT LCD_PORT //< port for RW line +#define LCD_RW_PIN 2 //< pin for RW line +#define LCD_E_PORT LCD_PORT //< port for Enable line +#define LCD_E_PIN 1 //< pin for Enable line +#endif +*/ + +/* Bootmagic Lite key configuration */ +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/sck/osa/info.json b/keyboards/sck/osa/info.json new file mode 100644 index 000000000000..8b1a5601d30d --- /dev/null +++ b/keyboards/sck/osa/info.json @@ -0,0 +1,25 @@ +{ + "keyboard_name": "OSA", + "url": "", + "maintainer": "qmk", + "width": 18.25, + "height": 5, + "layouts": { + "LAYOUT_default_ansi": { + "key_count": 64, + "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] + }, + "LAYOUT_split_backspace": { + "key_count": 65, + "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] + }, + "LAYOUT_split_right_shift": { + "key_count": 65, + "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] + }, + "LAYOUT_dual_split": { + "key_count": 66, + "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] + } + } +} diff --git a/keyboards/sck/osa/keymaps/default/config.h b/keyboards/sck/osa/keymaps/default/config.h new file mode 100644 index 000000000000..499a4753f4b1 --- /dev/null +++ b/keyboards/sck/osa/keymaps/default/config.h @@ -0,0 +1,19 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// place overrides here diff --git a/keyboards/sck/osa/keymaps/default/keymap.c b/keyboards/sck/osa/keymaps/default/keymap.c new file mode 100644 index 000000000000..dfd56013cb4c --- /dev/null +++ b/keyboards/sck/osa/keymaps/default/keymap.c @@ -0,0 +1,123 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// Defines the keycodes used by our macros in process_record_user +//enum custom_keycodes { +// QMKBEST = SAFE_RANGE, +// QMKURL +//}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 || ~ | 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =|Backsp | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] | \ | + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ + [0] = LAYOUT( /* Base */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .--------.,----------------------------------------------------------------------. + * |RGB_TOG || ~ | 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =|Backsp | + * |--------||----------------------------------------------------------------------| + * |RGB_MOD ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] | \ | + * |--------||----------------------------------------------------------------------| + * |RGB_RMOD||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `--------'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ + [1] = LAYOUT( /* OSA Layer 1 */ + RGB_TOG, RGB_M_T, RGB_VAI, RGB_VAD, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS, + RGB_MOD, 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, + RGB_RMOD, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(2), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 || ~ | 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =|Backsp | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] | \ | + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ + [2] = LAYOUT( /* OSA Layer 2 */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(0), KC_SPC, KC_RALT, KC_RCTL + ), +}; + + + + +//bool process_record_user(uint16_t keycode, keyrecord_t *record) { +// switch (keycode) { +// case QMKBEST: +// if (record->event.pressed) { +// // when keycode QMKBEST is pressed +// SEND_STRING("QMK is the best thing ever!"); +// } else { +// // when keycode QMKBEST is released +// } +// break; +// case QMKURL: +// if (record->event.pressed) { +// // when keycode QMKURL is pressed +// SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); +// } else { +// // when keycode QMKURL is released +// } +// break; +// } +// return true; +//} + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +//void led_set_user(uint16_t usb_led) { +// +//} diff --git a/keyboards/sck/osa/keymaps/default/readme.md b/keyboards/sck/osa/keymaps/default/readme.md new file mode 100644 index 000000000000..982042494a5f --- /dev/null +++ b/keyboards/sck/osa/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default ANSI keymap for OSA diff --git a/keyboards/sck/osa/keymaps/dualsplit/config.h b/keyboards/sck/osa/keymaps/dualsplit/config.h new file mode 100644 index 000000000000..499a4753f4b1 --- /dev/null +++ b/keyboards/sck/osa/keymaps/dualsplit/config.h @@ -0,0 +1,19 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// place overrides here diff --git a/keyboards/sck/osa/keymaps/dualsplit/keymap.c b/keyboards/sck/osa/keymaps/dualsplit/keymap.c new file mode 100644 index 000000000000..e770e637707a --- /dev/null +++ b/keyboards/sck/osa/keymaps/dualsplit/keymap.c @@ -0,0 +1,123 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// Defines the keycodes used by our macros in process_record_user +//enum custom_keycodes { +// QMKBEST = SAFE_RANGE, +// QMKURL +//}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[0] = LAYOUT( /* OSA Base */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[1] = LAYOUT( /* OSA Layer 1 */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(2), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[2] = LAYOUT( /* OSA Layer 2 */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), +}; + + + + +//bool process_record_user(uint16_t keycode, keyrecord_t *record) { +// switch (keycode) { +// case QMKBEST: +// if (record->event.pressed) { +// // when keycode QMKBEST is pressed +// SEND_STRING("QMK is the best thing ever!"); +// } else { +// // when keycode QMKBEST is released +// } +// break; +// case QMKURL: +// if (record->event.pressed) { +// // when keycode QMKURL is pressed +// SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); +// } else { +// // when keycode QMKURL is released +// } +// break; +// } +// return true; +//} + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/sck/osa/keymaps/dualsplit/readme.md b/keyboards/sck/osa/keymaps/dualsplit/readme.md new file mode 100644 index 000000000000..03a0b5463ef7 --- /dev/null +++ b/keyboards/sck/osa/keymaps/dualsplit/readme.md @@ -0,0 +1 @@ +# The split backspace and split right shift keymap for osa diff --git a/keyboards/sck/osa/keymaps/ocm/config.h b/keyboards/sck/osa/keymaps/ocm/config.h new file mode 100644 index 000000000000..499a4753f4b1 --- /dev/null +++ b/keyboards/sck/osa/keymaps/ocm/config.h @@ -0,0 +1,19 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// place overrides here diff --git a/keyboards/sck/osa/keymaps/ocm/keymap.c b/keyboards/sck/osa/keymaps/ocm/keymap.c new file mode 100644 index 000000000000..e770e637707a --- /dev/null +++ b/keyboards/sck/osa/keymaps/ocm/keymap.c @@ -0,0 +1,123 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// Defines the keycodes used by our macros in process_record_user +//enum custom_keycodes { +// QMKBEST = SAFE_RANGE, +// QMKURL +//}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[0] = LAYOUT( /* OSA Base */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[1] = LAYOUT( /* OSA Layer 1 */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(2), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[2] = LAYOUT( /* OSA Layer 2 */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), +}; + + + + +//bool process_record_user(uint16_t keycode, keyrecord_t *record) { +// switch (keycode) { +// case QMKBEST: +// if (record->event.pressed) { +// // when keycode QMKBEST is pressed +// SEND_STRING("QMK is the best thing ever!"); +// } else { +// // when keycode QMKBEST is released +// } +// break; +// case QMKURL: +// if (record->event.pressed) { +// // when keycode QMKURL is pressed +// SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); +// } else { +// // when keycode QMKURL is released +// } +// break; +// } +// return true; +//} + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/sck/osa/keymaps/ocm/readme.md b/keyboards/sck/osa/keymaps/ocm/readme.md new file mode 100644 index 000000000000..3624b1078ea7 --- /dev/null +++ b/keyboards/sck/osa/keymaps/ocm/readme.md @@ -0,0 +1 @@ +# OneCreativeMind's keymap for OSA diff --git a/keyboards/sck/osa/keymaps/splitbs/config.h b/keyboards/sck/osa/keymaps/splitbs/config.h new file mode 100644 index 000000000000..499a4753f4b1 --- /dev/null +++ b/keyboards/sck/osa/keymaps/splitbs/config.h @@ -0,0 +1,19 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// place overrides here diff --git a/keyboards/sck/osa/keymaps/splitbs/keymap.c b/keyboards/sck/osa/keymaps/splitbs/keymap.c new file mode 100644 index 000000000000..4a965a15b056 --- /dev/null +++ b/keyboards/sck/osa/keymaps/splitbs/keymap.c @@ -0,0 +1,123 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// Defines the keycodes used by our macros in process_record_user +//enum custom_keycodes { +// QMKBEST = SAFE_RANGE, +// QMKURL +//}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[0] = LAYOUT( /* OSA Base */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[1] = LAYOUT( /* OSA Layer 1 */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(2), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[2] = LAYOUT( /* OSA Layer 2 */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), +}; + + + + +//bool process_record_user(uint16_t keycode, keyrecord_t *record) { +// switch (keycode) { +// case QMKBEST: +// if (record->event.pressed) { +// // when keycode QMKBEST is pressed +// SEND_STRING("QMK is the best thing ever!"); +// } else { +// // when keycode QMKBEST is released +// } +// break; +// case QMKURL: +// if (record->event.pressed) { +// // when keycode QMKURL is pressed +// SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); +// } else { +// // when keycode QMKURL is released +// } +// break; +// } +// return true; +//} + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/sck/osa/keymaps/splitbs/readme.md b/keyboards/sck/osa/keymaps/splitbs/readme.md new file mode 100644 index 000000000000..33fb31b336fe --- /dev/null +++ b/keyboards/sck/osa/keymaps/splitbs/readme.md @@ -0,0 +1 @@ +# The split backspace keymap for osa diff --git a/keyboards/sck/osa/keymaps/splitrs/config.h b/keyboards/sck/osa/keymaps/splitrs/config.h new file mode 100644 index 000000000000..499a4753f4b1 --- /dev/null +++ b/keyboards/sck/osa/keymaps/splitrs/config.h @@ -0,0 +1,19 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// place overrides here diff --git a/keyboards/sck/osa/keymaps/splitrs/keymap.c b/keyboards/sck/osa/keymaps/splitrs/keymap.c new file mode 100644 index 000000000000..bc552c914885 --- /dev/null +++ b/keyboards/sck/osa/keymaps/splitrs/keymap.c @@ -0,0 +1,123 @@ +/* Copyright 2019 jrfhoutx + * + * 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 + +// Defines the keycodes used by our macros in process_record_user +//enum custom_keycodes { +// QMKBEST = SAFE_RANGE, +// QMKURL +//}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 || ~ | 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =|Backsp | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] | \ | + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[0] = LAYOUT( /* OSA Base */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 || ~ | 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =|Backsp | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] | \ | + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[1] = LAYOUT( /* OSA Layer 1 */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(2), KC_SPC, KC_RALT, KC_RCTL + ), +/* Keymap BASE: (Base Layer) Default Layer + * .----.,----------------------------------------------------------------------. + * | M1 || ~ | 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =|Backsp | + * |----||----------------------------------------------------------------------| + * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] | \ | + * |----||----------------------------------------------------------------------| + * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * `----'|----------------------------------------------------------------------| + * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | + * |----------------------------------------------------------------------| + * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| + * `----------------------------------------------------------------------' + */ +[2] = LAYOUT( /* OSA Layer 2 */ + KC_DEL, 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_GRV, KC_BSLS, + KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + ), +}; + + + + +//bool process_record_user(uint16_t keycode, keyrecord_t *record) { +// switch (keycode) { +// case QMKBEST: +// if (record->event.pressed) { +// // when keycode QMKBEST is pressed +// SEND_STRING("QMK is the best thing ever!"); +// } else { +// // when keycode QMKBEST is released +// } +// break; +// case QMKURL: +// if (record->event.pressed) { +// // when keycode QMKURL is pressed +// SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); +// } else { +// // when keycode QMKURL is released +// } +// break; +// } +// return true; +//} + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/sck/osa/keymaps/splitrs/readme.md b/keyboards/sck/osa/keymaps/splitrs/readme.md new file mode 100644 index 000000000000..9f2315c2a29a --- /dev/null +++ b/keyboards/sck/osa/keymaps/splitrs/readme.md @@ -0,0 +1 @@ +# The split right shift keymap for osa diff --git a/keyboards/sck/osa/osa.c b/keyboards/sck/osa/osa.c new file mode 100644 index 000000000000..9e2147367627 --- /dev/null +++ b/keyboards/sck/osa/osa.c @@ -0,0 +1,74 @@ +/* Copyright 2019 jrfhoutx + * + * 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 "osa.h" + +//#include "led.h" + +// Optional override functions below. +// You can leave any or all of these undefined. +// These are only required if you want to perform custom actions. + +/* + +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(); +} + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + // put your per-action keyboard code here + // runs for every action, just before processing by the firmware + + return process_record_user(keycode, record); +} + +void matrix_init_board(void){ + setPinOutput(C7); + setPinOutput(C6); + setPinOutput(B6); +} + +void led_set_kb(uint8_t usb_led) { + // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + + if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) { + writePinLow(C7); + } else { + writePinHigh(C7); + } + if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { + writePinLow(C6); + } else { + writePinHigh(C6); + } + if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) { + writePinLow(B6); + } else { + writePinHigh(B6); + } + led_set_user(usb_led); +} + +*/ diff --git a/keyboards/sck/osa/osa.h b/keyboards/sck/osa/osa.h new file mode 100644 index 000000000000..cb7e43bce5b7 --- /dev/null +++ b/keyboards/sck/osa/osa.h @@ -0,0 +1,60 @@ +/* Copyright 2019 jrfhoutx + * + * 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" + +/* This a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ + +/* LAYOUT + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐┌────────┐ + * │10 │ │00 │01 │02 │03 │04 │05 │06 │ │56 │55 │54 │53 │52 │51 │50 │57 ││57 │ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤└────────┘ + * │20 │ │11 │12 │13 │14 │15 │16 │ │66 │65 │64 │63 │62 │61 │60 │67 │ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │30 │ │21 │22 │23 │24 │25 │26 │ │76 │75 │74 │73 │72 │71 │77 │ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤┌──────────┐ + * │31 │32 │33 │34 │35 │36 │ │86 │85 │84 │83 │82 │81 │80 │87 ││87 │ + * ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐ ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤└──────────┘ + * │41 │ │43 │45 │46 │ │95 │93 │ │90 │ + * └─────┘ └─────┴───────┴────┘ └──────────┴─────┘ └─────┘ + */ +#define LAYOUT( \ + K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K50, K57, \ + K20, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, K67, \ + K30, K21, K22, K23, K24, K25, K26, K76, K75, K74, K73, K72, K71, K77, \ + K31, K32, K33, K34, K35, K36, K86, K85, K84, K83, K82, K81, K80, K87, \ + K41, K43, K45, K46, K95, K93, K90 \ +) \ +{ \ + { K00, K01, K02, K03, K04, K05, K06, KC_NO }, \ + { K10, K11, K12, K13, K14, K15, K16, KC_NO }, \ + { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \ + { K30, K31, K32, K33, K34, K35, K36, KC_NO }, \ + { KC_NO, K41, KC_NO, K43, KC_NO, K45, K46, KC_NO }, \ + { K50, K51, K52, K53, K54, K55, K56, K57 }, \ + { K60, K61, K62, K63, K64, K65, K66, K67 }, \ + { KC_NO, K71, K72, K73, K74, K75, K76, K77 }, \ + { K80, K81, K82, K83, K84, K85, K86, K87 }, \ + { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ +} diff --git a/keyboards/sck/osa/readme.md b/keyboards/sck/osa/readme.md new file mode 100644 index 000000000000..d88902841d53 --- /dev/null +++ b/keyboards/sck/osa/readme.md @@ -0,0 +1,19 @@ +# osa + +![osa](imgur.com image replace me!) + +About the OSA: + +The OSA was run as a private group buy of 20 units. It is an Alice layout keyboard based on the Open Source Alice files, altered based on input from the private group buy members. +All case and other design files have been either reworked or created from scratch by BlindAssassin111. PCB was designed from scratch by BlindAssassin111. +The OSA! PCB is an ATMega32u4 powered, USB Type C, Alice compatible PCB and was created specifically for the OSA case, but with considerations to make it compatible with the Lubrigante acrylic cases (except for the Type C connector it should also be compatible with original TGR Alice cases). + +Keyboard Maintainer: [jrfhoutx](https://github.com/jrfhoutx) +Hardware Supported: OSA! PCB by BlindAssassin111, ATMEGA32u4 +Hardware Availability: Unavailable + +Make example for this keyboard (after setting up your build environment): + + make osa: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). diff --git a/keyboards/sck/osa/rules.mk b/keyboards/sck/osa/rules.mk new file mode 100644 index 000000000000..01df5bb5d054 --- /dev/null +++ b/keyboards/sck/osa/rules.mk @@ -0,0 +1,82 @@ +# MCU name +#MCU = at90usb1286 +MCU = atmega32u4 + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +F_CPU = 16000000 + + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +# This will define a symbol, F_USB, in all source code files equal to the +# input clock frequency (before any prescaling is performed) in Hz. This value may +# differ from F_CPU if prescaling is used on the latter, and is required as the +# raw input clock is fed directly to the PLL sections of the AVR for high speed +# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +# at the end, this will be done automatically to create a 32-bit value in your +# source code. +# +# If no clock division is performed on the input clock inside the AVR (via the +# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# atmega32a bootloadHID +BOOTLOADER = atmel-dfu +#BOOTLOADER = qmk-dfu + + +# If you don't know the bootloader type, then you can specify the +# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +# OPT_DEFS += -DBOOTLOADER_SIZE=4096 + + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = yes # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400) From 63d107c32b87bdb4db3a7eb589e55a4fb1aea0f6 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Mon, 30 Sep 2019 22:07:19 -0500 Subject: [PATCH 04/14] minor changes Minor changes mostly changing naming and comment out rgb modes --- keyboards/sck/osa/config.h | 18 +++++++++--------- keyboards/sck/osa/osa.c | 2 +- keyboards/sck/osa/readme.md | 4 ++-- keyboards/sck/osa/rules.mk | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h index f5669402a03a..b23ee1eeedf6 100644 --- a/keyboards/sck/osa/config.h +++ b/keyboards/sck/osa/config.h @@ -23,7 +23,7 @@ along with this program. If not, see . #define VENDOR_ID 0xFEED #define PRODUCT_ID 0x0000 #define DEVICE_VER 0x0001 -#define MANUFACTURER Nomenclackture +#define MANUFACTURER Space City Keyboards #define PRODUCT OSA #define DESCRIPTION PCB for the Open Source Alice @@ -68,21 +68,21 @@ along with this program. If not, see . /*== all animations enable ==*/ // #define RGBLIGHT_ANIMATIONS /*== or choose animations ==*/ - #define RGBLIGHT_EFFECT_BREATHING + //#define RGBLIGHT_EFFECT_BREATHING // #define RGBLIGHT_EFFECT_RAINBOW_MOOD - #define RGBLIGHT_EFFECT_RAINBOW_SWIRL - #define RGBLIGHT_EFFECT_SNAKE - #define RGBLIGHT_EFFECT_KNIGHT + // #define RGBLIGHT_EFFECT_RAINBOW_SWIRL + // #define RGBLIGHT_EFFECT_SNAKE + // #define RGBLIGHT_EFFECT_KNIGHT // #define RGBLIGHT_EFFECT_CHRISTMAS - #define RGBLIGHT_EFFECT_STATIC_GRADIENT - #define RGBLIGHT_EFFECT_RGB_TEST + // #define RGBLIGHT_EFFECT_STATIC_GRADIENT + // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING /*== customize breathing effect ==*/ /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ - #define RGBLIGHT_BREATHE_TABLE_SIZE 128 // 256(default) or 128 or 64 + // #define RGBLIGHT_BREATHE_TABLE_SIZE 128 // 256(default) or 128 or 64 /*==== use exp() and sin() ====*/ // #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 - #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 + // #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ diff --git a/keyboards/sck/osa/osa.c b/keyboards/sck/osa/osa.c index 9e2147367627..e14275aa8a6d 100644 --- a/keyboards/sck/osa/osa.c +++ b/keyboards/sck/osa/osa.c @@ -15,7 +15,7 @@ */ #include "osa.h" -//#include "led.h" +#include "led.h" // Optional override functions below. // You can leave any or all of these undefined. diff --git a/keyboards/sck/osa/readme.md b/keyboards/sck/osa/readme.md index d88902841d53..3493476ba71f 100644 --- a/keyboards/sck/osa/readme.md +++ b/keyboards/sck/osa/readme.md @@ -10,10 +10,10 @@ The OSA! PCB is an ATMega32u4 powered, USB Type C, Alice compatible PCB and was Keyboard Maintainer: [jrfhoutx](https://github.com/jrfhoutx) Hardware Supported: OSA! PCB by BlindAssassin111, ATMEGA32u4 -Hardware Availability: Unavailable +Hardware Availability: Currently Unavailable outside of the private group buy Make example for this keyboard (after setting up your build environment): - make osa:default + make sck/osa: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). diff --git a/keyboards/sck/osa/rules.mk b/keyboards/sck/osa/rules.mk index 01df5bb5d054..090e993f2066 100644 --- a/keyboards/sck/osa/rules.mk +++ b/keyboards/sck/osa/rules.mk @@ -47,7 +47,7 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT # QMK DFU qmk-dfu # atmega32a bootloadHID BOOTLOADER = atmel-dfu -#BOOTLOADER = qmk-dfu + # If you don't know the bootloader type, then you can specify the From 8864eb63972c9da8cfcbc8f4e28606a835d152a0 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Tue, 1 Oct 2019 00:00:18 -0500 Subject: [PATCH 05/14] more minor changes comment out some functions correct some spelling errors change some of the descriptive text --- keyboards/sck/osa/config.h | 2 +- keyboards/sck/osa/readme.md | 8 ++++---- keyboards/sck/osa/rules.mk | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h index b23ee1eeedf6..cfa05193b1c6 100644 --- a/keyboards/sck/osa/config.h +++ b/keyboards/sck/osa/config.h @@ -25,7 +25,7 @@ along with this program. If not, see . #define DEVICE_VER 0x0001 #define MANUFACTURER Space City Keyboards #define PRODUCT OSA -#define DESCRIPTION PCB for the Open Source Alice +#define DESCRIPTION PCB for the OSA (A no longer open source version of the TGR Alice) /* key matrix size */ #define MATRIX_ROWS 10 diff --git a/keyboards/sck/osa/readme.md b/keyboards/sck/osa/readme.md index 3493476ba71f..e46f389a6b6e 100644 --- a/keyboards/sck/osa/readme.md +++ b/keyboards/sck/osa/readme.md @@ -4,13 +4,13 @@ About the OSA: -The OSA was run as a private group buy of 20 units. It is an Alice layout keyboard based on the Open Source Alice files, altered based on input from the private group buy members. +The OSA was run as a private group buy of 20 units. It is an Alice layout keyboard based on the Open Source Alice files, altered by BlindAssassin111 based on input from the private group buy members. All case and other design files have been either reworked or created from scratch by BlindAssassin111. PCB was designed from scratch by BlindAssassin111. -The OSA! PCB is an ATMega32u4 powered, USB Type C, Alice compatible PCB and was created specifically for the OSA case, but with considerations to make it compatible with the Lubrigante acrylic cases (except for the Type C connector it should also be compatible with original TGR Alice cases). +The OSA PCB is an ATMega32u4 powered, USB Type C, Alice compatible PCB and was created specifically for the OSA case, but with considerations to make it compatible with the Lubrigante acrylic cases (except for the Type C connector it should also be compatible with original TGR Alice cases). Keyboard Maintainer: [jrfhoutx](https://github.com/jrfhoutx) -Hardware Supported: OSA! PCB by BlindAssassin111, ATMEGA32u4 -Hardware Availability: Currently Unavailable outside of the private group buy +Hardware Supported: OSA PCB by BlindAssassin111, ATMEGA32u4 +Hardware Availability: Currently unavailable outside of the private group buy Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/sck/osa/rules.mk b/keyboards/sck/osa/rules.mk index 090e993f2066..3e6ed3e4e7b8 100644 --- a/keyboards/sck/osa/rules.mk +++ b/keyboards/sck/osa/rules.mk @@ -13,14 +13,14 @@ MCU = atmega32u4 # does not *change* the processor frequency - it should merely be updated to # reflect the processor speed set externally so that the code can use accurate # software delays. -F_CPU = 16000000 +#F_CPU = 16000000 # # LUFA specific # # Target architecture (see library "Board Types" documentation). -ARCH = AVR8 +#ARCH = AVR8 # Input clock frequency. # This will define a symbol, F_USB, in all source code files equal to the @@ -33,10 +33,10 @@ ARCH = AVR8 # # If no clock division is performed on the input clock inside the AVR (via the # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) +#F_USB = $(F_CPU) # Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT +#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT # Bootloader selection From 5a59ec8af5642422dbffed0caf20fdad378e8ea3 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Tue, 1 Oct 2019 15:34:18 -0500 Subject: [PATCH 06/14] Minor Changes Minor changers per PR requests --- keyboards/sck/osa/readme.md | 4 ++-- keyboards/sck/osa/rules.mk | 45 ------------------------------------- 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/keyboards/sck/osa/readme.md b/keyboards/sck/osa/readme.md index e46f389a6b6e..63147c54864d 100644 --- a/keyboards/sck/osa/readme.md +++ b/keyboards/sck/osa/readme.md @@ -1,6 +1,6 @@ # osa -![osa](imgur.com image replace me!) +![osa](https://imgur.com/U2x7TQ8) About the OSA: @@ -9,7 +9,7 @@ All case and other design files have been either reworked or created from scratc The OSA PCB is an ATMega32u4 powered, USB Type C, Alice compatible PCB and was created specifically for the OSA case, but with considerations to make it compatible with the Lubrigante acrylic cases (except for the Type C connector it should also be compatible with original TGR Alice cases). Keyboard Maintainer: [jrfhoutx](https://github.com/jrfhoutx) -Hardware Supported: OSA PCB by BlindAssassin111, ATMEGA32u4 +Hardware Supported: OSA PCB by BlindAssassin111, ATMEGA32u4 Hardware Availability: Currently unavailable outside of the private group buy Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/sck/osa/rules.mk b/keyboards/sck/osa/rules.mk index 3e6ed3e4e7b8..4feda0e9aff3 100644 --- a/keyboards/sck/osa/rules.mk +++ b/keyboards/sck/osa/rules.mk @@ -2,41 +2,6 @@ #MCU = at90usb1286 MCU = atmega32u4 -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -#F_CPU = 16000000 - - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -#ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -#F_USB = $(F_CPU) - -# Interrupt driven control endpoint task(+60) -#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT # Bootloader selection @@ -50,16 +15,6 @@ BOOTLOADER = atmel-dfu -# If you don't know the bootloader type, then you can specify the -# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBaspLoader 2048 -# OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - # Build Options # change yes to no to disable # From 4c9bb8e6093d3322af8a0996c20b3df3c455cd79 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Tue, 1 Oct 2019 15:50:01 -0500 Subject: [PATCH 07/14] Minor Changes Minor changes per PR suggestions --- keyboards/sck/osa/config.h | 4 ++-- keyboards/sck/osa/osa.c | 1 - keyboards/sck/osa/rules.mk | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h index cfa05193b1c6..1b574a0997f4 100644 --- a/keyboards/sck/osa/config.h +++ b/keyboards/sck/osa/config.h @@ -247,5 +247,5 @@ along with this program. If not, see . */ /* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 +//#define BOOTMAGIC_LITE_ROW 0 +//#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/sck/osa/osa.c b/keyboards/sck/osa/osa.c index e14275aa8a6d..8fa566182b8d 100644 --- a/keyboards/sck/osa/osa.c +++ b/keyboards/sck/osa/osa.c @@ -15,7 +15,6 @@ */ #include "osa.h" -#include "led.h" // Optional override functions below. // You can leave any or all of these undefined. diff --git a/keyboards/sck/osa/rules.mk b/keyboards/sck/osa/rules.mk index 4feda0e9aff3..d71485a9af04 100644 --- a/keyboards/sck/osa/rules.mk +++ b/keyboards/sck/osa/rules.mk @@ -1,5 +1,4 @@ # MCU name -#MCU = at90usb1286 MCU = atmega32u4 From b3b49c3700151ab8613a50907aa819492099d444 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Tue, 1 Oct 2019 16:31:26 -0500 Subject: [PATCH 08/14] Major Changes Per PR suggestion from noroadsleft: - changed macro to LAYOUT_all in info.json, dualsplit/keymap.c and ocm/keymap.c, and osa.h - added osa.h macros for other layouts per suggestion and used suggested naming - changed naming of layout macros to correspond to macros and naming in default/keymap.c, dualsplit/keymap.c, ocm/keymap.c, splitbs/keymap.c, and splitrs/keymap.c - removed duplicate layers from all keymaps and edited per suggestions - compiled each keymap to check for and correct any potential errors. all compiled with no errors --- keyboards/sck/osa/info.json | 2 +- keyboards/sck/osa/keymaps/default/keymap.c | 38 +++---------- keyboards/sck/osa/keymaps/dualsplit/keymap.c | 26 +-------- keyboards/sck/osa/keymaps/ocm/keymap.c | 6 +- keyboards/sck/osa/keymaps/splitbs/keymap.c | 30 ++-------- keyboards/sck/osa/keymaps/splitrs/keymap.c | 34 +++-------- keyboards/sck/osa/osa.h | 59 +++++++++++++++++++- 7 files changed, 86 insertions(+), 109 deletions(-) diff --git a/keyboards/sck/osa/info.json b/keyboards/sck/osa/info.json index 8b1a5601d30d..64ed057e4a3b 100644 --- a/keyboards/sck/osa/info.json +++ b/keyboards/sck/osa/info.json @@ -17,7 +17,7 @@ "key_count": 65, "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] }, - "LAYOUT_dual_split": { + "LAYOUT_all": { "key_count": 66, "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] } diff --git a/keyboards/sck/osa/keymaps/default/keymap.c b/keyboards/sck/osa/keymaps/default/keymap.c index dfd56013cb4c..d6cfddc46827 100644 --- a/keyboards/sck/osa/keymaps/default/keymap.c +++ b/keyboards/sck/osa/keymaps/default/keymap.c @@ -36,11 +36,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| * `----------------------------------------------------------------------' */ - [0] = LAYOUT( /* Base */ - KC_DEL, 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_GRV, KC_BSLS, - KC_PGUP, 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, + [0] = LAYOUT_default_ansi( /* Base */ + KC_DEL, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL ), /* Keymap BASE: (Base Layer) Default Layer @@ -56,32 +56,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| * `----------------------------------------------------------------------' */ - [1] = LAYOUT( /* OSA Layer 1 */ - RGB_TOG, RGB_M_T, RGB_VAI, RGB_VAD, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS, - RGB_MOD, 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, + [1] = LAYOUT_default_ansi( /* OSA Layer 1 */ + RGB_TOG, RGB_M_T, RGB_VAI, RGB_VAD, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, RGB_RMOD, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, - KC_LCTL, KC_LALT, KC_SPC, MO(2), KC_SPC, KC_RALT, KC_RCTL - ), -/* Keymap BASE: (Base Layer) Default Layer - * .----.,----------------------------------------------------------------------. - * | M1 || ~ | 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =|Backsp | - * |----||----------------------------------------------------------------------| - * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] | \ | - * |----||----------------------------------------------------------------------| - * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | - * `----'|----------------------------------------------------------------------| - * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | - * |----------------------------------------------------------------------| - * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| - * `----------------------------------------------------------------------' - */ - [2] = LAYOUT( /* OSA Layer 2 */ - KC_DEL, 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_GRV, KC_BSLS, - KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, - KC_LCTL, KC_LALT, KC_SPC, MO(0), KC_SPC, KC_RALT, KC_RCTL + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LALT, KC_SPC, _______, KC_SPC, KC_RALT, KC_RCTL ), }; diff --git a/keyboards/sck/osa/keymaps/dualsplit/keymap.c b/keyboards/sck/osa/keymaps/dualsplit/keymap.c index e770e637707a..fc9ac15705f4 100644 --- a/keyboards/sck/osa/keymaps/dualsplit/keymap.c +++ b/keyboards/sck/osa/keymaps/dualsplit/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| * `----------------------------------------------------------------------' */ -[0] = LAYOUT( /* OSA Base */ +[0] = LAYOUT_all( /* OSA Base */ KC_DEL, 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_GRV, KC_BSLS, KC_PGUP, 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_PGDN, 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, @@ -56,32 +56,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| * `----------------------------------------------------------------------' */ -[1] = LAYOUT( /* OSA Layer 1 */ +[1] = LAYOUT_all( /* OSA Layer 1 */ KC_DEL, 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_GRV, KC_BSLS, KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, - KC_LCTL, KC_LALT, KC_SPC, MO(2), KC_SPC, KC_RALT, KC_RCTL - ), -/* Keymap BASE: (Base Layer) Default Layer - * .----.,----------------------------------------------------------------------. - * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | - * |----||----------------------------------------------------------------------| - * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| - * |----||----------------------------------------------------------------------| - * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | - * `----'|----------------------------------------------------------------------| - * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | - * |----------------------------------------------------------------------| - * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| - * `----------------------------------------------------------------------' - */ -[2] = LAYOUT( /* OSA Layer 2 */ - KC_DEL, 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_GRV, KC_BSLS, - KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, - KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + KC_LCTL, KC_LALT, KC_SPC, _______, KC_SPC, KC_RALT, KC_RCTL ), }; diff --git a/keyboards/sck/osa/keymaps/ocm/keymap.c b/keyboards/sck/osa/keymaps/ocm/keymap.c index e770e637707a..cd48b57291f7 100644 --- a/keyboards/sck/osa/keymaps/ocm/keymap.c +++ b/keyboards/sck/osa/keymaps/ocm/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| * `----------------------------------------------------------------------' */ -[0] = LAYOUT( /* OSA Base */ +[0] = LAYOUT_all( /* OSA Base */ KC_DEL, 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_GRV, KC_BSLS, KC_PGUP, 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_PGDN, 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, @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| * `----------------------------------------------------------------------' */ -[1] = LAYOUT( /* OSA Layer 1 */ +[1] = LAYOUT_all( /* OSA Layer 1 */ KC_DEL, 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_GRV, KC_BSLS, KC_PGUP, 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_PGDN, 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, @@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| * `----------------------------------------------------------------------' */ -[2] = LAYOUT( /* OSA Layer 2 */ +[2] = LAYOUT_all( /* OSA Layer 2 */ KC_DEL, 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_GRV, KC_BSLS, KC_PGUP, 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_PGDN, 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, diff --git a/keyboards/sck/osa/keymaps/splitbs/keymap.c b/keyboards/sck/osa/keymaps/splitbs/keymap.c index 4a965a15b056..528e45329b78 100644 --- a/keyboards/sck/osa/keymaps/splitbs/keymap.c +++ b/keyboards/sck/osa/keymaps/splitbs/keymap.c @@ -36,11 +36,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| * `----------------------------------------------------------------------' */ -[0] = LAYOUT( /* OSA Base */ +[0] = LAYOUT_split_backspace( /* OSA Base */ KC_DEL, 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_GRV, KC_BSLS, KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL ), /* Keymap BASE: (Base Layer) Default Layer @@ -56,32 +56,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| * `----------------------------------------------------------------------' */ -[1] = LAYOUT( /* OSA Layer 1 */ +[1] = LAYOUT_split_backspace( /* OSA Layer 1 */ KC_DEL, 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_GRV, KC_BSLS, KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, - KC_LCTL, KC_LALT, KC_SPC, MO(2), KC_SPC, KC_RALT, KC_RCTL - ), -/* Keymap BASE: (Base Layer) Default Layer - * .----.,----------------------------------------------------------------------. - * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | - * |----||----------------------------------------------------------------------| - * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| - * |----||----------------------------------------------------------------------| - * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | - * `----'|----------------------------------------------------------------------| - * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | - * |----------------------------------------------------------------------| - * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| - * `----------------------------------------------------------------------' - */ -[2] = LAYOUT( /* OSA Layer 2 */ - KC_DEL, 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_GRV, KC_BSLS, - KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, - KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LALT, KC_SPC, _______, KC_SPC, KC_RALT, KC_RCTL ), }; diff --git a/keyboards/sck/osa/keymaps/splitrs/keymap.c b/keyboards/sck/osa/keymaps/splitrs/keymap.c index bc552c914885..a59b66334e3f 100644 --- a/keyboards/sck/osa/keymaps/splitrs/keymap.c +++ b/keyboards/sck/osa/keymaps/splitrs/keymap.c @@ -36,9 +36,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| * `----------------------------------------------------------------------' */ -[0] = LAYOUT( /* OSA Base */ - KC_DEL, 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_GRV, KC_BSLS, - KC_PGUP, 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, +[0] = LAYOUT_split_right_shift( /* OSA Base */ + KC_DEL, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL @@ -56,32 +56,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| * `----------------------------------------------------------------------' */ -[1] = LAYOUT( /* OSA Layer 1 */ - KC_DEL, 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_GRV, KC_BSLS, - KC_PGUP, 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, +[1] = LAYOUT_split_right_shift( /* OSA Layer 1 */ + KC_DEL, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, - KC_LCTL, KC_LALT, KC_SPC, MO(2), KC_SPC, KC_RALT, KC_RCTL - ), -/* Keymap BASE: (Base Layer) Default Layer - * .----.,----------------------------------------------------------------------. - * | M1 || ~ | 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =|Backsp | - * |----||----------------------------------------------------------------------| - * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] | \ | - * |----||----------------------------------------------------------------------| - * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | - * `----'|----------------------------------------------------------------------| - * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | - * |----------------------------------------------------------------------| - * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| - * `----------------------------------------------------------------------' - */ -[2] = LAYOUT( /* OSA Layer 2 */ - KC_DEL, 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_GRV, KC_BSLS, - KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, - KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL + KC_LCTL, KC_LALT, KC_SPC, _______, KC_SPC, KC_RALT, KC_RCTL ), }; diff --git a/keyboards/sck/osa/osa.h b/keyboards/sck/osa/osa.h index cb7e43bce5b7..748c7f19aaed 100644 --- a/keyboards/sck/osa/osa.h +++ b/keyboards/sck/osa/osa.h @@ -39,7 +39,7 @@ * │41 │ │43 │45 │46 │ │95 │93 │ │90 │ * └─────┘ └─────┴───────┴────┘ └──────────┴─────┘ └─────┘ */ -#define LAYOUT( \ +#define LAYOUT_all( \ K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K50, K57, \ K20, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, K67, \ K30, K21, K22, K23, K24, K25, K26, K76, K75, K74, K73, K72, K71, K77, \ @@ -58,3 +58,60 @@ { K80, K81, K82, K83, K84, K85, K86, K87 }, \ { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ } +#define LAYOUT_default_ansi( \ + K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K57, \ + K20, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, K67, \ + K30, K21, K22, K23, K24, K25, K26, K76, K75, K74, K73, K72, K71, K77, \ + K31, K32, K33, K34, K35, K36, K86, K85, K84, K83, K82, K81, K87, \ + K41, K43, K45, K46, K95, K93, K90 \ +) \ +{ \ + { K00, K01, K02, K03, K04, K05, K06, KC_NO }, \ + { K10, K11, K12, K13, K14, K15, K16, KC_NO }, \ + { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \ + { K30, K31, K32, K33, K34, K35, K36, KC_NO }, \ + { KC_NO, K41, KC_NO, K43, KC_NO, K45, K46, KC_NO }, \ + { KC_NO, K51, K52, K53, K54, K55, K56, K57 }, \ + { K60, K61, K62, K63, K64, K65, K66, K67 }, \ + { KC_NO, K71, K72, K73, K74, K75, K76, K77 }, \ + { KC_NO, K81, K82, K83, K84, K85, K86, K87 }, \ + { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ +} +#define LAYOUT_split_backspace( \ + K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K50, K57, \ + K20, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, K67, \ + K30, K21, K22, K23, K24, K25, K26, K76, K75, K74, K73, K72, K71, K77, \ + K31, K32, K33, K34, K35, K36, K86, K85, K84, K83, K82, K81, K87, \ + K41, K43, K45, K46, K95, K93, K90 \ +) \ +{ \ + { K00, K01, K02, K03, K04, K05, K06, KC_NO }, \ + { K10, K11, K12, K13, K14, K15, K16, KC_NO }, \ + { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \ + { K30, K31, K32, K33, K34, K35, K36, KC_NO }, \ + { KC_NO, K41, KC_NO, K43, KC_NO, K45, K46, KC_NO }, \ + { K50, K51, K52, K53, K54, K55, K56, K57 }, \ + { K60, K61, K62, K63, K64, K65, K66, K67 }, \ + { KC_NO, K71, K72, K73, K74, K75, K76, K77 }, \ + { KC_NO, K81, K82, K83, K84, K85, K86, K87 }, \ + { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ +} +#define LAYOUT_split_right_shift( \ + K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K57, \ + K20, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, K67, \ + K30, K21, K22, K23, K24, K25, K26, K76, K75, K74, K73, K72, K71, K77, \ + K31, K32, K33, K34, K35, K36, K86, K85, K84, K83, K82, K81, K80, K87, \ + K41, K43, K45, K46, K95, K93, K90 \ +) \ +{ \ + { K00, K01, K02, K03, K04, K05, K06, KC_NO }, \ + { K10, K11, K12, K13, K14, K15, K16, KC_NO }, \ + { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \ + { K30, K31, K32, K33, K34, K35, K36, KC_NO }, \ + { KC_NO, K41, KC_NO, K43, KC_NO, K45, K46, KC_NO }, \ + { KC_NO, K51, K52, K53, K54, K55, K56, K57 }, \ + { K60, K61, K62, K63, K64, K65, K66, K67 }, \ + { KC_NO, K71, K72, K73, K74, K75, K76, K77 }, \ + { K80, K81, K82, K83, K84, K85, K86, K87 }, \ + { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ +} From dac60bad218d89f98f9fe1ca0bf2729625fc06e9 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Tue, 1 Oct 2019 16:36:51 -0500 Subject: [PATCH 09/14] Minor Change - fixed imgur image link in readme.md to be correct format --- keyboards/sck/osa/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/sck/osa/readme.md b/keyboards/sck/osa/readme.md index 63147c54864d..a7b15c74f8c6 100644 --- a/keyboards/sck/osa/readme.md +++ b/keyboards/sck/osa/readme.md @@ -1,6 +1,6 @@ # osa -![osa](https://imgur.com/U2x7TQ8) +![osa](https://i.imgur.com/U2x7TQ8) About the OSA: From 873d67e7c599a76396481aafc3f18a4322dd22c3 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Wed, 2 Oct 2019 22:14:03 -0500 Subject: [PATCH 10/14] Minor Changes changes to macro layouts in osa.h changes to dualsplit/keymap.c - added arrows to layer 1 --- keyboards/sck/osa/keymaps/dualsplit/keymap.c | 10 +++--- keyboards/sck/osa/osa.h | 32 ++++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/keyboards/sck/osa/keymaps/dualsplit/keymap.c b/keyboards/sck/osa/keymaps/dualsplit/keymap.c index fc9ac15705f4..a174d4370c44 100644 --- a/keyboards/sck/osa/keymaps/dualsplit/keymap.c +++ b/keyboards/sck/osa/keymaps/dualsplit/keymap.c @@ -47,9 +47,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * .----.,----------------------------------------------------------------------. * | M1 ||Esc| 1 | 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| ~ | \ | * |----||----------------------------------------------------------------------| - * | M2 ||Tab | Q| W| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| + * | M2 ||Tab | Q| UP| E| R| T| | Y| U| I| O| P| [ | ] |BkSpc| * |----||----------------------------------------------------------------------| - * | M3 ||Ctrl | A| S| D| F| G| | H| J| K| L| ;| '|Return | + * | M3 ||Ctrl |LFT| DN|RGHT| F| G| |LFT|DN| UP |RGHT| ;| '|Return | * `----'|----------------------------------------------------------------------| * |Shift | Z| X| C| V| B| | B| N| M| ,| .| /|Shift | Fn | * |----------------------------------------------------------------------| @@ -58,10 +58,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [1] = LAYOUT_all( /* OSA Layer 1 */ KC_DEL, 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_GRV, KC_BSLS, - KC_PGUP, 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_PGDN, 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_PGUP, KC_TAB, KC_Q, KC_UP, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_PGDN, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_F, KC_G, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, - KC_LCTL, KC_LALT, KC_SPC, _______, KC_SPC, KC_RALT, KC_RCTL + KC_LCTL, KC_LALT, KC_SPC, _______, KC_SPC, KC_RALT, KC_RCTL ), }; diff --git a/keyboards/sck/osa/osa.h b/keyboards/sck/osa/osa.h index 748c7f19aaed..46cb3cd85fd5 100644 --- a/keyboards/sck/osa/osa.h +++ b/keyboards/sck/osa/osa.h @@ -39,11 +39,11 @@ * │41 │ │43 │45 │46 │ │95 │93 │ │90 │ * └─────┘ └─────┴───────┴────┘ └──────────┴─────┘ └─────┘ */ -#define LAYOUT_all( \ - K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K50, K57, \ +#define LAYOUT_default_ansi( \ + K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K57, \ K20, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, K67, \ K30, K21, K22, K23, K24, K25, K26, K76, K75, K74, K73, K72, K71, K77, \ - K31, K32, K33, K34, K35, K36, K86, K85, K84, K83, K82, K81, K80, K87, \ + K31, K32, K33, K34, K35, K36, K86, K85, K84, K83, K82, K81, K87, \ K41, K43, K45, K46, K95, K93, K90 \ ) \ { \ @@ -52,14 +52,14 @@ { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \ { K30, K31, K32, K33, K34, K35, K36, KC_NO }, \ { KC_NO, K41, KC_NO, K43, KC_NO, K45, K46, KC_NO }, \ - { K50, K51, K52, K53, K54, K55, K56, K57 }, \ + { KC_NO, K51, K52, K53, K54, K55, K56, K57 }, \ { K60, K61, K62, K63, K64, K65, K66, K67 }, \ { KC_NO, K71, K72, K73, K74, K75, K76, K77 }, \ - { K80, K81, K82, K83, K84, K85, K86, K87 }, \ + { KC_NO, K81, K82, K83, K84, K85, K86, K87 }, \ { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ } -#define LAYOUT_default_ansi( \ - K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K57, \ +#define LAYOUT_split_backspace( \ + K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K50, K57, \ K20, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, K67, \ K30, K21, K22, K23, K24, K25, K26, K76, K75, K74, K73, K72, K71, K77, \ K31, K32, K33, K34, K35, K36, K86, K85, K84, K83, K82, K81, K87, \ @@ -71,17 +71,17 @@ { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \ { K30, K31, K32, K33, K34, K35, K36, KC_NO }, \ { KC_NO, K41, KC_NO, K43, KC_NO, K45, K46, KC_NO }, \ - { KC_NO, K51, K52, K53, K54, K55, K56, K57 }, \ + { K50, K51, K52, K53, K54, K55, K56, K57 }, \ { K60, K61, K62, K63, K64, K65, K66, K67 }, \ { KC_NO, K71, K72, K73, K74, K75, K76, K77 }, \ { KC_NO, K81, K82, K83, K84, K85, K86, K87 }, \ { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ } -#define LAYOUT_split_backspace( \ - K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K50, K57, \ +#define LAYOUT_split_right_shift( \ + K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K57, \ K20, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, K67, \ K30, K21, K22, K23, K24, K25, K26, K76, K75, K74, K73, K72, K71, K77, \ - K31, K32, K33, K34, K35, K36, K86, K85, K84, K83, K82, K81, K87, \ + K31, K32, K33, K34, K35, K36, K86, K85, K84, K83, K82, K81, K80, K87, \ K41, K43, K45, K46, K95, K93, K90 \ ) \ { \ @@ -90,14 +90,14 @@ { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \ { K30, K31, K32, K33, K34, K35, K36, KC_NO }, \ { KC_NO, K41, KC_NO, K43, KC_NO, K45, K46, KC_NO }, \ - { K50, K51, K52, K53, K54, K55, K56, K57 }, \ + { KC_NO, K51, K52, K53, K54, K55, K56, K57 }, \ { K60, K61, K62, K63, K64, K65, K66, K67 }, \ { KC_NO, K71, K72, K73, K74, K75, K76, K77 }, \ - { KC_NO, K81, K82, K83, K84, K85, K86, K87 }, \ + { K80, K81, K82, K83, K84, K85, K86, K87 }, \ { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ } -#define LAYOUT_split_right_shift( \ - K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K57, \ +#define LAYOUT_all( \ + K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K50, K57, \ K20, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, K67, \ K30, K21, K22, K23, K24, K25, K26, K76, K75, K74, K73, K72, K71, K77, \ K31, K32, K33, K34, K35, K36, K86, K85, K84, K83, K82, K81, K80, K87, \ @@ -109,7 +109,7 @@ { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \ { K30, K31, K32, K33, K34, K35, K36, KC_NO }, \ { KC_NO, K41, KC_NO, K43, KC_NO, K45, K46, KC_NO }, \ - { KC_NO, K51, K52, K53, K54, K55, K56, K57 }, \ + { K50, K51, K52, K53, K54, K55, K56, K57 }, \ { K60, K61, K62, K63, K64, K65, K66, K67 }, \ { KC_NO, K71, K72, K73, K74, K75, K76, K77 }, \ { K80, K81, K82, K83, K84, K85, K86, K87 }, \ From e682c80ba07cd859d46f4c88d56e61267c04c02f Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Thu, 3 Oct 2019 23:44:48 -0500 Subject: [PATCH 11/14] Changes - Made changes to info.json to match osa.h - changes to osa.c enabling indicator LEDs - changed "dualsplit" directory name to "all" to match keymap naming in osa.h, info.json, and keymap.c - minor changes to all/keymap.c --- keyboards/sck/osa/info.json | 8 ++++---- .../sck/osa/keymaps/{dualsplit => all}/config.h | 0 .../sck/osa/keymaps/{dualsplit => all}/keymap.c | 6 +++--- .../sck/osa/keymaps/{dualsplit => all}/readme.md | 0 keyboards/sck/osa/osa.c | 14 +++++++------- 5 files changed, 14 insertions(+), 14 deletions(-) rename keyboards/sck/osa/keymaps/{dualsplit => all}/config.h (100%) rename keyboards/sck/osa/keymaps/{dualsplit => all}/keymap.c (94%) rename keyboards/sck/osa/keymaps/{dualsplit => all}/readme.md (100%) diff --git a/keyboards/sck/osa/info.json b/keyboards/sck/osa/info.json index 64ed057e4a3b..a7b580cd87fd 100644 --- a/keyboards/sck/osa/info.json +++ b/keyboards/sck/osa/info.json @@ -7,19 +7,19 @@ "layouts": { "LAYOUT_default_ansi": { "key_count": 64, - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] + "layout": [{"label":"@", "x":3.75, "y":0}, {"label":"_", "x":13.1, "y":0.050000000000000044}, {"label":"Delete", "x":0.55, "y":0.15000000000000002}, {"label":"Esc", "x":1.75, "y":0.25}, {"label":"!", "x":2.75, "y":0.25}, {"label":"+", "x":14.1, "y":0.25}, {"label":"", "x":15.1, "y":0.25, "w":2}, {"label":"Pg Up", "x":0.3, "y":1.15}, {"label":"P", "x":12.85, "y":1.18}, {"label":"", "x":1.5, "y":1.25, "w":1.5}, {"label":"Q", "x":3, "y":1.25}, {"label":"{", "x":13.85, "y":1.25}, {"label":"}", "x":14.85, "y":1.25}, {"label":"|", "x":15.85, "y":1.25, "w":1.5}, {"label":"Pg Dn", "x":0.05, "y":2.15}, {"label":"⇓", "x":1.25, "y":2.25, "w":1.75}, {"label":"A", "x":3, "y":2.25}, {"label":":", "x":13.35, "y":2.25}, {"label":"\"", "x":14.35, "y":2.25}, {"label":"", "x":15.35, "y":2.25, "w":2.25}, {"label":"⇑", "x":1, "y":3.25, "w":2.25}, {"label":"Z", "x":3.25, "y":3.25}, {"label":">", "x":13.1, "y":3.25}, {"label":"?", "x":14.1, "y":3.25}, {"label":"⇑", "x":15.1, "y":3.25, "w":2.75}, {"label":"Control", "x":1, "y":4.25, "w":1.5}, {"label":"Control", "x":16.1, "y":4.25, "w":1.5}, {"label":"#", "x":-0.55, "y":2.0}, {"label":"$", "x":0.44999999999999996, "y":2.0}, {"label":"%", "x":1.45, "y":2.0}, {"label":"^", "x":2.45, "y":2.0}, {"label":"W", "x":-1.05, "y":3.0}, {"label":"E", "x":-0.050000000000000044, "y":3.0}, {"label":"R", "x":0.95, "y":3.0}, {"label":"T", "x":1.95, "y":3.0}, {"label":"S", "x":-0.8, "y":4.0}, {"label":"D", "x":0.19999999999999996, "y":4.0}, {"label":"F", "x":1.2, "y":4.0}, {"label":"G", "x":2.2, "y":4.0}, {"label":"X", "x":-0.3, "y":5.0}, {"label":"C", "x":0.7000000000000001, "y":5.0}, {"label":"V", "x":1.7, "y":5.0}, {"label":"B", "x":2.7, "y":5.0}, {"x":0.95, "y":6.0, "w":2.25}, {"x":3.2, "y":6.0}, {"label":"Alt", "x":-0.55, "y":6.13, "w":1.5}, {"label":"&", "x":-2.1, "y":0.2800000000000003}, {"label":"*", "x":-1.1, "y":0.2800000000000003}, {"label":"(", "x":-0.10000000000000009, "y":0.2800000000000003}, {"label":")", "x":0.8999999999999999, "y":0.2800000000000003}, {"label":"Y", "x":-2.6, "y":1.2800000000000002}, {"label":"U", "x":-1.6, "y":1.2800000000000002}, {"label":"I", "x":-0.6000000000000001, "y":1.2800000000000002}, {"label":"O", "x":0.3999999999999999, "y":1.2800000000000002}, {"label":"H", "x":-2.35, "y":2.2800000000000002}, {"label":"J", "x":-1.35, "y":2.2800000000000002}, {"label":"K", "x":-0.3500000000000001, "y":2.2800000000000002}, {"label":"L", "x":0.6499999999999999, "y":2.2800000000000002}, {"label":"Fn", "x":-2.85, "y":3.2800000000000002}, {"label":"N", "x":-1.85, "y":3.2800000000000002}, {"label":"M", "x":-0.8500000000000001, "y":3.2800000000000002}, {"label":"<", "x":0.1499999999999999, "y":3.2800000000000002}, {"x":-2.85, "y":4.28, "w":2.75}, {"label":"Alt", "x":-0.1, "y":4.38, "w":1.5}] }, "LAYOUT_split_backspace": { "key_count": 65, - "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] + "layout": [{"label":"@", "x":3.75, "y":0}, {"label":"_", "x":13.1, "y":0.050000000000000044}, {"label":"Home", "x":0.55, "y":0.15000000000000002}, {"label":"Esc", "x":1.75, "y":0.25}, {"label":"!", "x":2.75, "y":0.25}, {"label":"+", "x":14.1, "y":0.25}, {"label":"|", "x":15.1, "y":0.25}, {"label":"Delete", "x":16.1, "y":0.25}, {"label":"Pg Up", "x":0.3, "y":1.15}, {"label":"P", "x":12.85, "y":1.18}, {"label":"", "x":1.5, "y":1.25, "w":1.5}, {"label":"Q", "x":3, "y":1.25}, {"label":"{", "x":13.85, "y":1.25}, {"label":"}", "x":14.85, "y":1.25}, {"label":"", "x":15.85, "y":1.25, "w":1.5}, {"label":"Pg Dn", "x":0.05, "y":2.15}, {"label":"⇓", "x":1.25, "y":2.25, "w":1.75}, {"label":"A", "x":3, "y":2.25}, {"label":":", "x":13.35, "y":2.25}, {"label":"\"", "x":14.35, "y":2.25}, {"label":"", "x":15.35, "y":2.25, "w":2.25}, {"label":"⇑", "x":1, "y":3.25, "w":2.25}, {"label":"Z", "x":3.25, "y":3.25}, {"label":">", "x":13.1, "y":3.25}, {"label":"?", "x":14.1, "y":3.25}, {"label":"⇑", "x":15.1, "y":3.25, "w":2.75}, {"label":"Control", "x":1, "y":4.25, "w":1.5}, {"label":"Control", "x":16.1, "y":4.25, "w":1.5}, {"label":"#", "x":-0.55, "y":2.0}, {"label":"$", "x":0.44999999999999996, "y":2.0}, {"label":"%", "x":1.45, "y":2.0}, {"label":"^", "x":2.45, "y":2.0}, {"label":"W", "x":-1.05, "y":3.0}, {"label":"E", "x":-0.050000000000000044, "y":3.0}, {"label":"R", "x":0.95, "y":3.0}, {"label":"T", "x":1.95, "y":3.0}, {"label":"S", "x":-0.8, "y":4.0}, {"label":"D", "x":0.19999999999999996, "y":4.0}, {"label":"F", "x":1.2, "y":4.0}, {"label":"G", "x":2.2, "y":4.0}, {"label":"X", "x":-0.3, "y":5.0}, {"label":"C", "x":0.7000000000000001, "y":5.0}, {"label":"V", "x":1.7, "y":5.0}, {"label":"B", "x":2.7, "y":5.0}, {"x":0.95, "y":6.0, "w":2.25}, {"x":3.2, "y":6.0}, {"label":"Alt", "x":-0.55, "y":6.13, "w":1.5}, {"label":"&", "x":-2.1, "y":0.2800000000000003}, {"label":"*", "x":-1.1, "y":0.2800000000000003}, {"label":"(", "x":-0.10000000000000009, "y":0.2800000000000003}, {"label":")", "x":0.8999999999999999, "y":0.2800000000000003}, {"label":"Y", "x":-2.6, "y":1.2800000000000002}, {"label":"U", "x":-1.6, "y":1.2800000000000002}, {"label":"I", "x":-0.6000000000000001, "y":1.2800000000000002}, {"label":"O", "x":0.3999999999999999, "y":1.2800000000000002}, {"label":"H", "x":-2.35, "y":2.2800000000000002}, {"label":"J", "x":-1.35, "y":2.2800000000000002}, {"label":"K", "x":-0.3500000000000001, "y":2.2800000000000002}, {"label":"L", "x":0.6499999999999999, "y":2.2800000000000002}, {"label":"Fn", "x":-2.85, "y":3.2800000000000002}, {"label":"N", "x":-1.85, "y":3.2800000000000002}, {"label":"M", "x":-0.8500000000000001, "y":3.2800000000000002}, {"label":"<", "x":0.1499999999999999, "y":3.2800000000000002}, {"x":-2.85, "y":4.28, "w":2.75}, {"label":"Alt", "x":-0.1, "y":4.38, "w":1.5}] }, "LAYOUT_split_right_shift": { "key_count": 65, - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] + "layout": [{"label":"@", "x":3.75, "y":0}, {"label":"_", "x":13.1, "y":0.050000000000000044}, {"label":"Delete", "x":0.55, "y":0.15000000000000002}, {"label":"Esc", "x":1.75, "y":0.25}, {"label":"!", "x":2.75, "y":0.25}, {"label":"+", "x":14.1, "y":0.25}, {"label":"", "x":15.1, "y":0.25, "w":2}, {"label":"Pg Up", "x":0.3, "y":1.15}, {"label":"P", "x":12.85, "y":1.18}, {"label":"", "x":1.5, "y":1.25, "w":1.5}, {"label":"Q", "x":3, "y":1.25}, {"label":"{", "x":13.85, "y":1.25}, {"label":"}", "x":14.85, "y":1.25}, {"label":"|", "x":15.85, "y":1.25, "w":1.5}, {"label":"Pg Dn", "x":0.05, "y":2.15}, {"label":"⇓", "x":1.25, "y":2.25, "w":1.75}, {"label":"A", "x":3, "y":2.25}, {"label":":", "x":13.35, "y":2.25}, {"label":"\"", "x":14.35, "y":2.25}, {"label":"", "x":15.35, "y":2.25, "w":2.25}, {"label":"⇑", "x":1, "y":3.25, "w":2.25}, {"label":"Z", "x":3.25, "y":3.25}, {"label":">", "x":13.1, "y":3.25}, {"label":"?", "x":14.1, "y":3.25}, {"label":"⇑", "x":15.1, "y":3.25, "w":1.75}, {"label":"Fn", "x":16.85, "y":3.25}, {"label":"Control", "x":1, "y":4.25, "w":1.5}, {"label":"Control", "x":16.1, "y":4.25, "w":1.5}, {"label":"#", "x":-0.55, "y":2.0}, {"label":"$", "x":0.44999999999999996, "y":2.0}, {"label":"%", "x":1.45, "y":2.0}, {"label":"^", "x":2.45, "y":2.0}, {"label":"W", "x":-1.05, "y":3.0}, {"label":"E", "x":-0.050000000000000044, "y":3.0}, {"label":"R", "x":0.95, "y":3.0}, {"label":"T", "x":1.95, "y":3.0}, {"label":"S", "x":-0.8, "y":4.0}, {"label":"D", "x":0.19999999999999996, "y":4.0}, {"label":"F", "x":1.2, "y":4.0}, {"label":"G", "x":2.2, "y":4.0}, {"label":"X", "x":-0.3, "y":5.0}, {"label":"C", "x":0.7000000000000001, "y":5.0}, {"label":"V", "x":1.7, "y":5.0}, {"label":"B", "x":2.7, "y":5.0}, {"x":0.95, "y":6.0, "w":2.25}, {"x":3.2, "y":6.0}, {"label":"Alt", "x":-0.55, "y":6.13, "w":1.5}, {"label":"&", "x":-2.1, "y":0.2800000000000003}, {"label":"*", "x":-1.1, "y":0.2800000000000003}, {"label":"(", "x":-0.10000000000000009, "y":0.2800000000000003}, {"label":")", "x":0.8999999999999999, "y":0.2800000000000003}, {"label":"Y", "x":-2.6, "y":1.2800000000000002}, {"label":"U", "x":-1.6, "y":1.2800000000000002}, {"label":"I", "x":-0.6000000000000001, "y":1.2800000000000002}, {"label":"O", "x":0.3999999999999999, "y":1.2800000000000002}, {"label":"H", "x":-2.35, "y":2.2800000000000002}, {"label":"J", "x":-1.35, "y":2.2800000000000002}, {"label":"K", "x":-0.3500000000000001, "y":2.2800000000000002}, {"label":"L", "x":0.6499999999999999, "y":2.2800000000000002}, {"label":"Fn", "x":-2.85, "y":3.2800000000000002}, {"label":"N", "x":-1.85, "y":3.2800000000000002}, {"label":"M", "x":-0.8500000000000001, "y":3.2800000000000002}, {"label":"<", "x":0.1499999999999999, "y":3.2800000000000002}, {"x":-2.85, "y":4.28, "w":2.75}, {"label":"Alt", "x":-0.1, "y":4.38, "w":1.5}] }, "LAYOUT_all": { "key_count": 66, - "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] + "layout": [{"label":"@", "x":3.75, "y":0}, {"label":"_", "x":13.1, "y":0.050000000000000044}, {"label":"Home", "x":0.55, "y":0.15000000000000002}, {"label":"Esc", "x":1.75, "y":0.25}, {"label":"!", "x":2.75, "y":0.25}, {"label":"+", "x":14.1, "y":0.25}, {"label":"|", "x":15.1, "y":0.25}, {"label":"Delete", "x":16.1, "y":0.25}, {"label":"Pg Up", "x":0.3, "y":1.15}, {"label":"P", "x":12.85, "y":1.18}, {"label":"", "x":1.5, "y":1.25, "w":1.5}, {"label":"Q", "x":3, "y":1.25}, {"label":"{", "x":13.85, "y":1.25}, {"label":"}", "x":14.85, "y":1.25}, {"label":"", "x":15.85, "y":1.25, "w":1.5}, {"label":"Pg Dn", "x":0.05, "y":2.15}, {"label":"⇓", "x":1.25, "y":2.25, "w":1.75}, {"label":"A", "x":3, "y":2.25}, {"label":":", "x":13.35, "y":2.25}, {"label":"\"", "x":14.35, "y":2.25}, {"label":"", "x":15.35, "y":2.25, "w":2.25}, {"label":"⇑", "x":1, "y":3.25, "w":2.25}, {"label":"Z", "x":3.25, "y":3.25}, {"label":">", "x":13.1, "y":3.25}, {"label":"?", "x":14.1, "y":3.25}, {"label":"⇑", "x":15.1, "y":3.25, "w":1.75}, {"label":"Fn", "x":16.85, "y":3.25}, {"label":"Control", "x":1, "y":4.25, "w":1.5}, {"label":"Control", "x":16.1, "y":4.25, "w":1.5}, {"label":"#", "x":-0.55, "y":2.0}, {"label":"$", "x":0.44999999999999996, "y":2.0}, {"label":"%", "x":1.45, "y":2.0}, {"label":"^", "x":2.45, "y":2.0}, {"label":"W", "x":-1.05, "y":3.0}, {"label":"E", "x":-0.050000000000000044, "y":3.0}, {"label":"R", "x":0.95, "y":3.0}, {"label":"T", "x":1.95, "y":3.0}, {"label":"S", "x":-0.8, "y":4.0}, {"label":"D", "x":0.19999999999999996, "y":4.0}, {"label":"F", "x":1.2, "y":4.0}, {"label":"G", "x":2.2, "y":4.0}, {"label":"X", "x":-0.3, "y":5.0}, {"label":"C", "x":0.7000000000000001, "y":5.0}, {"label":"V", "x":1.7, "y":5.0}, {"label":"B", "x":2.7, "y":5.0}, {"x":0.95, "y":6.0, "w":2.25}, {"x":3.2, "y":6.0}, {"label":"Alt", "x":-0.55, "y":6.13, "w":1.5}, {"label":"&", "x":-2.1, "y":0.2800000000000003}, {"label":"*", "x":-1.1, "y":0.2800000000000003}, {"label":"(", "x":-0.10000000000000009, "y":0.2800000000000003}, {"label":")", "x":0.8999999999999999, "y":0.2800000000000003}, {"label":"Y", "x":-2.6, "y":1.2800000000000002}, {"label":"U", "x":-1.6, "y":1.2800000000000002}, {"label":"I", "x":-0.6000000000000001, "y":1.2800000000000002}, {"label":"O", "x":0.3999999999999999, "y":1.2800000000000002}, {"label":"H", "x":-2.35, "y":2.2800000000000002}, {"label":"J", "x":-1.35, "y":2.2800000000000002}, {"label":"K", "x":-0.3500000000000001, "y":2.2800000000000002}, {"label":"L", "x":0.6499999999999999, "y":2.2800000000000002}, {"label":"Fn", "x":-2.85, "y":3.2800000000000002}, {"label":"N", "x":-1.85, "y":3.2800000000000002}, {"label":"M", "x":-0.8500000000000001, "y":3.2800000000000002}, {"label":"<", "x":0.1499999999999999, "y":3.2800000000000002}, {"x":-2.85, "y":4.28, "w":2.75}, {"label":"Alt", "x":-0.1, "y":4.38, "w":1.5}] } } } diff --git a/keyboards/sck/osa/keymaps/dualsplit/config.h b/keyboards/sck/osa/keymaps/all/config.h similarity index 100% rename from keyboards/sck/osa/keymaps/dualsplit/config.h rename to keyboards/sck/osa/keymaps/all/config.h diff --git a/keyboards/sck/osa/keymaps/dualsplit/keymap.c b/keyboards/sck/osa/keymaps/all/keymap.c similarity index 94% rename from keyboards/sck/osa/keymaps/dualsplit/keymap.c rename to keyboards/sck/osa/keymaps/all/keymap.c index a174d4370c44..378f8ed58f40 100644 --- a/keyboards/sck/osa/keymaps/dualsplit/keymap.c +++ b/keyboards/sck/osa/keymaps/all/keymap.c @@ -57,9 +57,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------------------------------------------------' */ [1] = LAYOUT_all( /* OSA Layer 1 */ - KC_DEL, 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_GRV, KC_BSLS, - KC_PGUP, KC_TAB, KC_Q, KC_UP, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, - KC_PGDN, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_F, KC_G, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_SCLN, KC_QUOT, KC_ENT, + KC_SLCK, 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_GRV, KC_BSLS, + KC_NLCK, KC_TAB, KC_Q, KC_UP, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_CLCK, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_F, KC_G, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_HOME, KC_LCTL, KC_LALT, KC_SPC, _______, KC_SPC, KC_RALT, KC_RCTL ), diff --git a/keyboards/sck/osa/keymaps/dualsplit/readme.md b/keyboards/sck/osa/keymaps/all/readme.md similarity index 100% rename from keyboards/sck/osa/keymaps/dualsplit/readme.md rename to keyboards/sck/osa/keymaps/all/readme.md diff --git a/keyboards/sck/osa/osa.c b/keyboards/sck/osa/osa.c index 8fa566182b8d..138a28893b89 100644 --- a/keyboards/sck/osa/osa.c +++ b/keyboards/sck/osa/osa.c @@ -42,6 +42,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return process_record_user(keycode, record); } +*/ void matrix_init_board(void){ setPinOutput(C7); @@ -53,21 +54,20 @@ void led_set_kb(uint8_t usb_led) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) { - writePinLow(C7); - } else { writePinHigh(C7); + } else { + writePinLow(C7); } if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { - writePinLow(C6); - } else { writePinHigh(C6); + } else { + writePinLow(C6); } if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) { - writePinLow(B6); - } else { writePinHigh(B6); + } else { + writePinLow(B6); } led_set_user(usb_led); } -*/ From 4f667bf5fe06414ab0607453023f5f964451ff28 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Thu, 3 Oct 2019 23:57:48 -0500 Subject: [PATCH 12/14] Update keyboards/sck/osa/rules.mk Co-Authored-By: fauxpark --- keyboards/sck/osa/rules.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/sck/osa/rules.mk b/keyboards/sck/osa/rules.mk index d71485a9af04..3538c25babd2 100644 --- a/keyboards/sck/osa/rules.mk +++ b/keyboards/sck/osa/rules.mk @@ -9,7 +9,8 @@ MCU = atmega32u4 # Atmel DFU atmel-dfu # LUFA DFU lufa-dfu # QMK DFU qmk-dfu -# atmega32a bootloadHID +# ATmega32A bootloadHID +# ATmega328P USBasp BOOTLOADER = atmel-dfu From adb38871f5b5c9fafb65340b0104dafd6ecb08c6 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Fri, 4 Oct 2019 19:48:20 -0500 Subject: [PATCH 13/14] Update keyboards/sck/osa/readme.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> --- keyboards/sck/osa/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/sck/osa/readme.md b/keyboards/sck/osa/readme.md index a7b15c74f8c6..024df5cee6bf 100644 --- a/keyboards/sck/osa/readme.md +++ b/keyboards/sck/osa/readme.md @@ -1,6 +1,6 @@ # osa -![osa](https://i.imgur.com/U2x7TQ8) +![osa](https://i.imgur.com/U2x7TQ8.jpg) About the OSA: From b22590a7b598fe96d95257fbf46a244e82ffca5f Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Fri, 4 Oct 2019 20:05:57 -0500 Subject: [PATCH 14/14] Changes to info.json - revert to info.json from version in b3b49c3 per requested changes --- keyboards/sck/osa/info.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/sck/osa/info.json b/keyboards/sck/osa/info.json index a7b580cd87fd..64ed057e4a3b 100644 --- a/keyboards/sck/osa/info.json +++ b/keyboards/sck/osa/info.json @@ -7,19 +7,19 @@ "layouts": { "LAYOUT_default_ansi": { "key_count": 64, - "layout": [{"label":"@", "x":3.75, "y":0}, {"label":"_", "x":13.1, "y":0.050000000000000044}, {"label":"Delete", "x":0.55, "y":0.15000000000000002}, {"label":"Esc", "x":1.75, "y":0.25}, {"label":"!", "x":2.75, "y":0.25}, {"label":"+", "x":14.1, "y":0.25}, {"label":"", "x":15.1, "y":0.25, "w":2}, {"label":"Pg Up", "x":0.3, "y":1.15}, {"label":"P", "x":12.85, "y":1.18}, {"label":"", "x":1.5, "y":1.25, "w":1.5}, {"label":"Q", "x":3, "y":1.25}, {"label":"{", "x":13.85, "y":1.25}, {"label":"}", "x":14.85, "y":1.25}, {"label":"|", "x":15.85, "y":1.25, "w":1.5}, {"label":"Pg Dn", "x":0.05, "y":2.15}, {"label":"⇓", "x":1.25, "y":2.25, "w":1.75}, {"label":"A", "x":3, "y":2.25}, {"label":":", "x":13.35, "y":2.25}, {"label":"\"", "x":14.35, "y":2.25}, {"label":"", "x":15.35, "y":2.25, "w":2.25}, {"label":"⇑", "x":1, "y":3.25, "w":2.25}, {"label":"Z", "x":3.25, "y":3.25}, {"label":">", "x":13.1, "y":3.25}, {"label":"?", "x":14.1, "y":3.25}, {"label":"⇑", "x":15.1, "y":3.25, "w":2.75}, {"label":"Control", "x":1, "y":4.25, "w":1.5}, {"label":"Control", "x":16.1, "y":4.25, "w":1.5}, {"label":"#", "x":-0.55, "y":2.0}, {"label":"$", "x":0.44999999999999996, "y":2.0}, {"label":"%", "x":1.45, "y":2.0}, {"label":"^", "x":2.45, "y":2.0}, {"label":"W", "x":-1.05, "y":3.0}, {"label":"E", "x":-0.050000000000000044, "y":3.0}, {"label":"R", "x":0.95, "y":3.0}, {"label":"T", "x":1.95, "y":3.0}, {"label":"S", "x":-0.8, "y":4.0}, {"label":"D", "x":0.19999999999999996, "y":4.0}, {"label":"F", "x":1.2, "y":4.0}, {"label":"G", "x":2.2, "y":4.0}, {"label":"X", "x":-0.3, "y":5.0}, {"label":"C", "x":0.7000000000000001, "y":5.0}, {"label":"V", "x":1.7, "y":5.0}, {"label":"B", "x":2.7, "y":5.0}, {"x":0.95, "y":6.0, "w":2.25}, {"x":3.2, "y":6.0}, {"label":"Alt", "x":-0.55, "y":6.13, "w":1.5}, {"label":"&", "x":-2.1, "y":0.2800000000000003}, {"label":"*", "x":-1.1, "y":0.2800000000000003}, {"label":"(", "x":-0.10000000000000009, "y":0.2800000000000003}, {"label":")", "x":0.8999999999999999, "y":0.2800000000000003}, {"label":"Y", "x":-2.6, "y":1.2800000000000002}, {"label":"U", "x":-1.6, "y":1.2800000000000002}, {"label":"I", "x":-0.6000000000000001, "y":1.2800000000000002}, {"label":"O", "x":0.3999999999999999, "y":1.2800000000000002}, {"label":"H", "x":-2.35, "y":2.2800000000000002}, {"label":"J", "x":-1.35, "y":2.2800000000000002}, {"label":"K", "x":-0.3500000000000001, "y":2.2800000000000002}, {"label":"L", "x":0.6499999999999999, "y":2.2800000000000002}, {"label":"Fn", "x":-2.85, "y":3.2800000000000002}, {"label":"N", "x":-1.85, "y":3.2800000000000002}, {"label":"M", "x":-0.8500000000000001, "y":3.2800000000000002}, {"label":"<", "x":0.1499999999999999, "y":3.2800000000000002}, {"x":-2.85, "y":4.28, "w":2.75}, {"label":"Alt", "x":-0.1, "y":4.38, "w":1.5}] + "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] }, "LAYOUT_split_backspace": { "key_count": 65, - "layout": [{"label":"@", "x":3.75, "y":0}, {"label":"_", "x":13.1, "y":0.050000000000000044}, {"label":"Home", "x":0.55, "y":0.15000000000000002}, {"label":"Esc", "x":1.75, "y":0.25}, {"label":"!", "x":2.75, "y":0.25}, {"label":"+", "x":14.1, "y":0.25}, {"label":"|", "x":15.1, "y":0.25}, {"label":"Delete", "x":16.1, "y":0.25}, {"label":"Pg Up", "x":0.3, "y":1.15}, {"label":"P", "x":12.85, "y":1.18}, {"label":"", "x":1.5, "y":1.25, "w":1.5}, {"label":"Q", "x":3, "y":1.25}, {"label":"{", "x":13.85, "y":1.25}, {"label":"}", "x":14.85, "y":1.25}, {"label":"", "x":15.85, "y":1.25, "w":1.5}, {"label":"Pg Dn", "x":0.05, "y":2.15}, {"label":"⇓", "x":1.25, "y":2.25, "w":1.75}, {"label":"A", "x":3, "y":2.25}, {"label":":", "x":13.35, "y":2.25}, {"label":"\"", "x":14.35, "y":2.25}, {"label":"", "x":15.35, "y":2.25, "w":2.25}, {"label":"⇑", "x":1, "y":3.25, "w":2.25}, {"label":"Z", "x":3.25, "y":3.25}, {"label":">", "x":13.1, "y":3.25}, {"label":"?", "x":14.1, "y":3.25}, {"label":"⇑", "x":15.1, "y":3.25, "w":2.75}, {"label":"Control", "x":1, "y":4.25, "w":1.5}, {"label":"Control", "x":16.1, "y":4.25, "w":1.5}, {"label":"#", "x":-0.55, "y":2.0}, {"label":"$", "x":0.44999999999999996, "y":2.0}, {"label":"%", "x":1.45, "y":2.0}, {"label":"^", "x":2.45, "y":2.0}, {"label":"W", "x":-1.05, "y":3.0}, {"label":"E", "x":-0.050000000000000044, "y":3.0}, {"label":"R", "x":0.95, "y":3.0}, {"label":"T", "x":1.95, "y":3.0}, {"label":"S", "x":-0.8, "y":4.0}, {"label":"D", "x":0.19999999999999996, "y":4.0}, {"label":"F", "x":1.2, "y":4.0}, {"label":"G", "x":2.2, "y":4.0}, {"label":"X", "x":-0.3, "y":5.0}, {"label":"C", "x":0.7000000000000001, "y":5.0}, {"label":"V", "x":1.7, "y":5.0}, {"label":"B", "x":2.7, "y":5.0}, {"x":0.95, "y":6.0, "w":2.25}, {"x":3.2, "y":6.0}, {"label":"Alt", "x":-0.55, "y":6.13, "w":1.5}, {"label":"&", "x":-2.1, "y":0.2800000000000003}, {"label":"*", "x":-1.1, "y":0.2800000000000003}, {"label":"(", "x":-0.10000000000000009, "y":0.2800000000000003}, {"label":")", "x":0.8999999999999999, "y":0.2800000000000003}, {"label":"Y", "x":-2.6, "y":1.2800000000000002}, {"label":"U", "x":-1.6, "y":1.2800000000000002}, {"label":"I", "x":-0.6000000000000001, "y":1.2800000000000002}, {"label":"O", "x":0.3999999999999999, "y":1.2800000000000002}, {"label":"H", "x":-2.35, "y":2.2800000000000002}, {"label":"J", "x":-1.35, "y":2.2800000000000002}, {"label":"K", "x":-0.3500000000000001, "y":2.2800000000000002}, {"label":"L", "x":0.6499999999999999, "y":2.2800000000000002}, {"label":"Fn", "x":-2.85, "y":3.2800000000000002}, {"label":"N", "x":-1.85, "y":3.2800000000000002}, {"label":"M", "x":-0.8500000000000001, "y":3.2800000000000002}, {"label":"<", "x":0.1499999999999999, "y":3.2800000000000002}, {"x":-2.85, "y":4.28, "w":2.75}, {"label":"Alt", "x":-0.1, "y":4.38, "w":1.5}] + "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] }, "LAYOUT_split_right_shift": { "key_count": 65, - "layout": [{"label":"@", "x":3.75, "y":0}, {"label":"_", "x":13.1, "y":0.050000000000000044}, {"label":"Delete", "x":0.55, "y":0.15000000000000002}, {"label":"Esc", "x":1.75, "y":0.25}, {"label":"!", "x":2.75, "y":0.25}, {"label":"+", "x":14.1, "y":0.25}, {"label":"", "x":15.1, "y":0.25, "w":2}, {"label":"Pg Up", "x":0.3, "y":1.15}, {"label":"P", "x":12.85, "y":1.18}, {"label":"", "x":1.5, "y":1.25, "w":1.5}, {"label":"Q", "x":3, "y":1.25}, {"label":"{", "x":13.85, "y":1.25}, {"label":"}", "x":14.85, "y":1.25}, {"label":"|", "x":15.85, "y":1.25, "w":1.5}, {"label":"Pg Dn", "x":0.05, "y":2.15}, {"label":"⇓", "x":1.25, "y":2.25, "w":1.75}, {"label":"A", "x":3, "y":2.25}, {"label":":", "x":13.35, "y":2.25}, {"label":"\"", "x":14.35, "y":2.25}, {"label":"", "x":15.35, "y":2.25, "w":2.25}, {"label":"⇑", "x":1, "y":3.25, "w":2.25}, {"label":"Z", "x":3.25, "y":3.25}, {"label":">", "x":13.1, "y":3.25}, {"label":"?", "x":14.1, "y":3.25}, {"label":"⇑", "x":15.1, "y":3.25, "w":1.75}, {"label":"Fn", "x":16.85, "y":3.25}, {"label":"Control", "x":1, "y":4.25, "w":1.5}, {"label":"Control", "x":16.1, "y":4.25, "w":1.5}, {"label":"#", "x":-0.55, "y":2.0}, {"label":"$", "x":0.44999999999999996, "y":2.0}, {"label":"%", "x":1.45, "y":2.0}, {"label":"^", "x":2.45, "y":2.0}, {"label":"W", "x":-1.05, "y":3.0}, {"label":"E", "x":-0.050000000000000044, "y":3.0}, {"label":"R", "x":0.95, "y":3.0}, {"label":"T", "x":1.95, "y":3.0}, {"label":"S", "x":-0.8, "y":4.0}, {"label":"D", "x":0.19999999999999996, "y":4.0}, {"label":"F", "x":1.2, "y":4.0}, {"label":"G", "x":2.2, "y":4.0}, {"label":"X", "x":-0.3, "y":5.0}, {"label":"C", "x":0.7000000000000001, "y":5.0}, {"label":"V", "x":1.7, "y":5.0}, {"label":"B", "x":2.7, "y":5.0}, {"x":0.95, "y":6.0, "w":2.25}, {"x":3.2, "y":6.0}, {"label":"Alt", "x":-0.55, "y":6.13, "w":1.5}, {"label":"&", "x":-2.1, "y":0.2800000000000003}, {"label":"*", "x":-1.1, "y":0.2800000000000003}, {"label":"(", "x":-0.10000000000000009, "y":0.2800000000000003}, {"label":")", "x":0.8999999999999999, "y":0.2800000000000003}, {"label":"Y", "x":-2.6, "y":1.2800000000000002}, {"label":"U", "x":-1.6, "y":1.2800000000000002}, {"label":"I", "x":-0.6000000000000001, "y":1.2800000000000002}, {"label":"O", "x":0.3999999999999999, "y":1.2800000000000002}, {"label":"H", "x":-2.35, "y":2.2800000000000002}, {"label":"J", "x":-1.35, "y":2.2800000000000002}, {"label":"K", "x":-0.3500000000000001, "y":2.2800000000000002}, {"label":"L", "x":0.6499999999999999, "y":2.2800000000000002}, {"label":"Fn", "x":-2.85, "y":3.2800000000000002}, {"label":"N", "x":-1.85, "y":3.2800000000000002}, {"label":"M", "x":-0.8500000000000001, "y":3.2800000000000002}, {"label":"<", "x":0.1499999999999999, "y":3.2800000000000002}, {"x":-2.85, "y":4.28, "w":2.75}, {"label":"Alt", "x":-0.1, "y":4.38, "w":1.5}] + "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] }, "LAYOUT_all": { "key_count": 66, - "layout": [{"label":"@", "x":3.75, "y":0}, {"label":"_", "x":13.1, "y":0.050000000000000044}, {"label":"Home", "x":0.55, "y":0.15000000000000002}, {"label":"Esc", "x":1.75, "y":0.25}, {"label":"!", "x":2.75, "y":0.25}, {"label":"+", "x":14.1, "y":0.25}, {"label":"|", "x":15.1, "y":0.25}, {"label":"Delete", "x":16.1, "y":0.25}, {"label":"Pg Up", "x":0.3, "y":1.15}, {"label":"P", "x":12.85, "y":1.18}, {"label":"", "x":1.5, "y":1.25, "w":1.5}, {"label":"Q", "x":3, "y":1.25}, {"label":"{", "x":13.85, "y":1.25}, {"label":"}", "x":14.85, "y":1.25}, {"label":"", "x":15.85, "y":1.25, "w":1.5}, {"label":"Pg Dn", "x":0.05, "y":2.15}, {"label":"⇓", "x":1.25, "y":2.25, "w":1.75}, {"label":"A", "x":3, "y":2.25}, {"label":":", "x":13.35, "y":2.25}, {"label":"\"", "x":14.35, "y":2.25}, {"label":"", "x":15.35, "y":2.25, "w":2.25}, {"label":"⇑", "x":1, "y":3.25, "w":2.25}, {"label":"Z", "x":3.25, "y":3.25}, {"label":">", "x":13.1, "y":3.25}, {"label":"?", "x":14.1, "y":3.25}, {"label":"⇑", "x":15.1, "y":3.25, "w":1.75}, {"label":"Fn", "x":16.85, "y":3.25}, {"label":"Control", "x":1, "y":4.25, "w":1.5}, {"label":"Control", "x":16.1, "y":4.25, "w":1.5}, {"label":"#", "x":-0.55, "y":2.0}, {"label":"$", "x":0.44999999999999996, "y":2.0}, {"label":"%", "x":1.45, "y":2.0}, {"label":"^", "x":2.45, "y":2.0}, {"label":"W", "x":-1.05, "y":3.0}, {"label":"E", "x":-0.050000000000000044, "y":3.0}, {"label":"R", "x":0.95, "y":3.0}, {"label":"T", "x":1.95, "y":3.0}, {"label":"S", "x":-0.8, "y":4.0}, {"label":"D", "x":0.19999999999999996, "y":4.0}, {"label":"F", "x":1.2, "y":4.0}, {"label":"G", "x":2.2, "y":4.0}, {"label":"X", "x":-0.3, "y":5.0}, {"label":"C", "x":0.7000000000000001, "y":5.0}, {"label":"V", "x":1.7, "y":5.0}, {"label":"B", "x":2.7, "y":5.0}, {"x":0.95, "y":6.0, "w":2.25}, {"x":3.2, "y":6.0}, {"label":"Alt", "x":-0.55, "y":6.13, "w":1.5}, {"label":"&", "x":-2.1, "y":0.2800000000000003}, {"label":"*", "x":-1.1, "y":0.2800000000000003}, {"label":"(", "x":-0.10000000000000009, "y":0.2800000000000003}, {"label":")", "x":0.8999999999999999, "y":0.2800000000000003}, {"label":"Y", "x":-2.6, "y":1.2800000000000002}, {"label":"U", "x":-1.6, "y":1.2800000000000002}, {"label":"I", "x":-0.6000000000000001, "y":1.2800000000000002}, {"label":"O", "x":0.3999999999999999, "y":1.2800000000000002}, {"label":"H", "x":-2.35, "y":2.2800000000000002}, {"label":"J", "x":-1.35, "y":2.2800000000000002}, {"label":"K", "x":-0.3500000000000001, "y":2.2800000000000002}, {"label":"L", "x":0.6499999999999999, "y":2.2800000000000002}, {"label":"Fn", "x":-2.85, "y":3.2800000000000002}, {"label":"N", "x":-1.85, "y":3.2800000000000002}, {"label":"M", "x":-0.8500000000000001, "y":3.2800000000000002}, {"label":"<", "x":0.1499999999999999, "y":3.2800000000000002}, {"x":-2.85, "y":4.28, "w":2.75}, {"label":"Alt", "x":-0.1, "y":4.38, "w":1.5}] + "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] } } }