From 8ea16cd0ddab015276f0a9f3c7fb62108de1b18f Mon Sep 17 00:00:00 2001 From: nacly Date: Fri, 13 May 2022 13:19:18 -0400 Subject: [PATCH 01/21] added sodium keyboards --- keyboards/nacly/sodium42/config.h | 75 +++++++++++++++++++ keyboards/nacly/sodium42/info.json | 10 +++ .../nacly/sodium42/keymaps/default/keymap.c | 47 ++++++++++++ keyboards/nacly/sodium42/readme.md | 13 ++++ keyboards/nacly/sodium42/rules.mk | 20 +++++ keyboards/nacly/sodium42/sodium42.c | 1 + keyboards/nacly/sodium42/sodium42.h | 21 ++++++ keyboards/nacly/sodium50/config.h | 75 +++++++++++++++++++ keyboards/nacly/sodium50/info.json | 10 +++ .../nacly/sodium50/keymaps/default/keymap.c | 46 ++++++++++++ keyboards/nacly/sodium50/readme.md | 13 ++++ keyboards/nacly/sodium50/rules.mk | 20 +++++ keyboards/nacly/sodium50/sodium50.c | 1 + keyboards/nacly/sodium50/sodium50.h | 21 ++++++ keyboards/nacly/sodium62/config.h | 75 +++++++++++++++++++ keyboards/nacly/sodium62/info.json | 10 +++ .../nacly/sodium62/keymaps/default/keymap.c | 50 +++++++++++++ keyboards/nacly/sodium62/readme.md | 13 ++++ keyboards/nacly/sodium62/rules.mk | 20 +++++ keyboards/nacly/sodium62/sodium62.c | 1 + keyboards/nacly/sodium62/sodium62.h | 24 ++++++ 21 files changed, 566 insertions(+) create mode 100644 keyboards/nacly/sodium42/config.h create mode 100644 keyboards/nacly/sodium42/info.json create mode 100644 keyboards/nacly/sodium42/keymaps/default/keymap.c create mode 100644 keyboards/nacly/sodium42/readme.md create mode 100644 keyboards/nacly/sodium42/rules.mk create mode 100644 keyboards/nacly/sodium42/sodium42.c create mode 100644 keyboards/nacly/sodium42/sodium42.h create mode 100644 keyboards/nacly/sodium50/config.h create mode 100644 keyboards/nacly/sodium50/info.json create mode 100644 keyboards/nacly/sodium50/keymaps/default/keymap.c create mode 100644 keyboards/nacly/sodium50/readme.md create mode 100644 keyboards/nacly/sodium50/rules.mk create mode 100644 keyboards/nacly/sodium50/sodium50.c create mode 100644 keyboards/nacly/sodium50/sodium50.h create mode 100644 keyboards/nacly/sodium62/config.h create mode 100644 keyboards/nacly/sodium62/info.json create mode 100644 keyboards/nacly/sodium62/keymaps/default/keymap.c create mode 100644 keyboards/nacly/sodium62/readme.md create mode 100644 keyboards/nacly/sodium62/rules.mk create mode 100644 keyboards/nacly/sodium62/sodium62.c create mode 100644 keyboards/nacly/sodium62/sodium62.h diff --git a/keyboards/nacly/sodium42/config.h b/keyboards/nacly/sodium42/config.h new file mode 100644 index 000000000000..983dc95149f3 --- /dev/null +++ b/keyboards/nacly/sodium42/config.h @@ -0,0 +1,75 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 0xBEEF +#define PRODUCT_ID 0xFED0 +#define DEVICE_VER 0x0001 +#define MANUFACTURER nacly +#define PRODUCT sodium42 + +/* key matrix size */ +// Rows are doubled-up +#define MATRIX_ROWS 8 +#define MATRIX_COLS 6 + +// wiring of each half +#define MATRIX_ROW_PINS { F7, D4, D7, B4 } +#define MATRIX_COL_PINS { D2, C6, E6, B5, B2, B3 } + +#define DIODE_DIRECTION COL2ROW + +#define SPLIT_HAND_PIN F4 + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +/* serial.c configuration for split keyboard */ +#define SOFT_SERIAL_PIN D3 + +/* 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 + +/* ws2812 RGB LED */ +//#define RGB_DI_PIN B1 +/* +#define RGBLED_NUM 12 // Number of LEDs + +#define RGBLED_SPLIT { 6, 6 } +*/ +/* + * 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 diff --git a/keyboards/nacly/sodium42/info.json b/keyboards/nacly/sodium42/info.json new file mode 100644 index 000000000000..9b3777e5b379 --- /dev/null +++ b/keyboards/nacly/sodium42/info.json @@ -0,0 +1,10 @@ +{ + "keyboard_name": "sodium42", + "url": "https://nacly.net", + "maintainer": "nacly", + "layouts": { + "LAYOUT": { + "layout": [{"label":"E", "x":2, "y":0}, {"label":"I", "x":10.75, "y":0}, {"label":"R", "x":3, "y":0.25}, {"label":"W", "x":1, "y":0.5}, {"label":"U", "x":9.75, "y":0.5}, {"label":"O", "x":11.75, "y":0.5}, {"label":"Q", "x":0, "y":0.75}, {"label":"P", "x":12.75, "y":0.75}, {"label":"D", "x":2, "y":1}, {"label":"T", "x":4, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"K", "x":10.75, "y":1}, {"label":"F", "x":3, "y":1.25}, {"label":"S", "x":1, "y":1.5}, {"label":"J", "x":9.75, "y":1.5}, {"label":"L", "x":11.75, "y":1.5}, {"label":"A", "x":0, "y":1.75}, {"label":";", "x":12.75, "y":1.75}, {"label":"C", "x":2, "y":2}, {"label":"G", "x":4, "y":2}, {"label":"H", "x":8.75, "y":2}, {"label":"<", "x":10.75, "y":2}, {"label":"V", "x":3, "y":2.25}, {"label":"X", "x":1, "y":2.5}, {"label":"M", "x":9.75, "y":2.5}, {"label":">", "x":11.75, "y":2.5}, {"label":"Z", "x":0, "y":2.75}, {"label":"?", "x":12.75, "y":2.75}, {"label":"~", "x":2, "y":3}, {"label":"B", "x":4, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"]", "x":10.75, "y":3}, {"label":"+", "x":3, "y":3.25}, {"label":"ALT", "x":1, "y":3.5}, {"label":"[", "x":9.75, "y":3.5}, {"label":"Home", "x":11.75, "y":3.5}, {"label":"gui", "x":0, "y":3.75}, {"label":"End", "x":12.75, "y":3.75}, {"label":"Backspace", "x":4, "y":4}, {"label":"Space", "x":8.75, "y":4}, {"label":"Del", "x":5, "y":4.5}, {"label":"Enter", "x":7.75, "y":4.5}] + } + } +} diff --git a/keyboards/nacly/sodium42/keymaps/default/keymap.c b/keyboards/nacly/sodium42/keymaps/default/keymap.c new file mode 100644 index 000000000000..199c4ff4746b --- /dev/null +++ b/keyboards/nacly/sodium42/keymaps/default/keymap.c @@ -0,0 +1,47 @@ +/* Copyright 2022 NaCly + * + * 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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, LT(3,KC_D), LT(1,KC_F), KC_G, KC_H, LT(2,KC_J), KC_K, KC_L, KC_SCLN, + MT(MOD_LSFT,KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MT(MOD_RSFT,KC_SLSH), + KC_LCTL, KC_LALT, KC_LGUI, LT(2,KC_EQL), KC_BSPC, KC_DEL, KC_ENT, KC_SPC, KC_LBRC, KC_RBRC, KC_MINS, KC_ESC + ), + //Holding F + [1] = LAYOUT( + KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + KC_NO, KC_NO, KC_NO, _______, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, + MT(MOD_LSFT,KC_Z), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, MT(MOD_RSFT,KC_SLSH), + KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_END, KC_NO, KC_NO, KC_NO, KC_NO + ), + //Holding J + [2] = LAYOUT( + KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BSLS, + KC_MPRV, KC_MPLY, KC_MNXT, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_QUOT, + MT(MOD_LSFT,KC_Z), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, _______, KC_NO, KC_NO, MT(MOD_RSFT,KC_SLSH), + KC_LGUI, KC_LALT, KC_NO, _______, KC_F14, KC_F15, KC_ENT, KC_SPC, KC_NO, KC_NO, KC_NO, KC_NO + ), + //Holding d + [3] = LAYOUT( + KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_7, KC_8, KC_9, KC_MINS, + KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_4, KC_5, KC_6, KC_QUOT, + MT(MOD_LSFT,KC_Z), KC_NO, _______, KC_NO, KC_NO, KC_NO, KC_1, KC_2, KC_3, MT(MOD_RSFT,KC_SLSH), + KC_LCTL, KC_LALT, KC_LGUI, LT(2,KC_EQL), KC_BSPC, KC_DEL, KC_ENT, KC_0, KC_NO, KC_NO, KC_DOT, KC_NO + ) +}; + diff --git a/keyboards/nacly/sodium42/readme.md b/keyboards/nacly/sodium42/readme.md new file mode 100644 index 000000000000..c9307e647557 --- /dev/null +++ b/keyboards/nacly/sodium42/readme.md @@ -0,0 +1,13 @@ +# sodium keyboard + +## Your new favorite split columnar stagger + +* Keyboard Maintainer: [NaCly](https://github.com/Na-Cly) +* Hardware Supported: sodium42 PCBs, Pro Micro +* Hardware Availability: https://nacly.net + +Make example for this keyboard (after setting up your build environment): + + make nacly/sodium42: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/nacly/sodium42/rules.mk b/keyboards/nacly/sodium42/rules.mk new file mode 100644 index 000000000000..ea969e963fd9 --- /dev/null +++ b/keyboards/nacly/sodium42/rules.mk @@ -0,0 +1,20 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = caterina + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output + +SPLIT_KEYBOARD = yes \ No newline at end of file diff --git a/keyboards/nacly/sodium42/sodium42.c b/keyboards/nacly/sodium42/sodium42.c new file mode 100644 index 000000000000..94595c89ab02 --- /dev/null +++ b/keyboards/nacly/sodium42/sodium42.c @@ -0,0 +1 @@ +#include "sodium42.h" diff --git a/keyboards/nacly/sodium42/sodium42.h b/keyboards/nacly/sodium42/sodium42.h new file mode 100644 index 000000000000..c904c7b99f24 --- /dev/null +++ b/keyboards/nacly/sodium42/sodium42.h @@ -0,0 +1,21 @@ +#pragma once + +#include "quantum.h" + +#define LAYOUT(\ + L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \ + L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \ + L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \ + L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30 \ +)\ + {\ + { L00, L01, L02, L03, L04 }, \ + { L10, L11, L12, L13, L14 }, \ + { L20, L21, L22, L23, L24 }, \ + { L30, L31, L32, L33, L34, L35 }, \ +\ + { R00, R01, R02, R03, R04 }, \ + { R10, R11, R12, R13, R14 }, \ + { R20, R21, R22, R23, R24 }, \ + { R30, R31, R32, R33, R34, R35 } \ +} diff --git a/keyboards/nacly/sodium50/config.h b/keyboards/nacly/sodium50/config.h new file mode 100644 index 000000000000..534e51ad3783 --- /dev/null +++ b/keyboards/nacly/sodium50/config.h @@ -0,0 +1,75 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 0xBEEF +#define PRODUCT_ID 0xFED0 +#define DEVICE_VER 0x0001 +#define MANUFACTURER nacly +#define PRODUCT sodium50 + +/* key matrix size */ +// Rows are doubled-up +#define MATRIX_ROWS 10 +#define MATRIX_COLS 7 + +// wiring of each half +#define MATRIX_ROW_PINS { F7, D4, D7, B4, B6 } +#define MATRIX_COL_PINS { D2, C6, E6, B5, B2, B3, B1 } + +#define DIODE_DIRECTION COL2ROW + +#define SPLIT_HAND_PIN F4 + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +/* serial.c configuration for split keyboard */ +#define SOFT_SERIAL_PIN D3 + +/* 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 + +/* ws2812 RGB LED */ +//#define RGB_DI_PIN B1 +/* +#define RGBLED_NUM 12 // Number of LEDs + +#define RGBLED_SPLIT { 6, 6 } +*/ +/* + * 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 diff --git a/keyboards/nacly/sodium50/info.json b/keyboards/nacly/sodium50/info.json new file mode 100644 index 000000000000..94e1159d864a --- /dev/null +++ b/keyboards/nacly/sodium50/info.json @@ -0,0 +1,10 @@ +{ + "keyboard_name": "sodium50", + "url": "https://nacly.net", + "maintainer": "nacly", + "layouts": { + "LAYOUT": { + "layout": [{"label":"E", "x":3, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"R", "x":4, "y":1.25}, {"label":"W", "x":2, "y":1.5}, {"label":"U", "x":10.75, "y":1.5}, {"label":"O", "x":12.75, "y":1.5}, {"label":"Tab", "x":0, "y":1.75}, {"label":"Q", "x":1, "y":1.75}, {"label":"P", "x":13.75, "y":1.75}, {"label":"\\", "x":14.75, "y":1.75}, {"label":"D", "x":3, "y":2}, {"label":"T", "x":5, "y":2}, {"label":"Y", "x":9.75, "y":2}, {"label":"K", "x":11.75, "y":2}, {"label":"F", "x":4, "y":2.25}, {"label":"S", "x":2, "y":2.5}, {"label":"J", "x":10.75, "y":2.5}, {"label":"L", "x":12.75, "y":2.5}, {"label":"gui", "x":0, "y":2.75}, {"label":"A", "x":1, "y":2.75}, {"label":";", "x":13.75, "y":2.75}, {"label":"'", "x":14.75, "y":2.75}, {"label":"C", "x":3, "y":3}, {"label":"G", "x":5, "y":3}, {"label":"H", "x":9.75, "y":3}, {"label":"<", "x":11.75, "y":3}, {"label":"V", "x":4, "y":3.25}, {"label":"X", "x":2, "y":3.5}, {"label":"M", "x":10.75, "y":3.5}, {"label":">", "x":12.75, "y":3.5}, {"label":"shift", "x":0, "y":3.75}, {"label":"Z", "x":1, "y":3.75}, {"label":"?", "x":13.75, "y":3.75}, {"label":"Shift", "x":14.75, "y":3.75}, {"label":"~", "x":3, "y":4}, {"label":"B", "x":5, "y":4}, {"label":"N", "x":9.75, "y":4}, {"label":"]", "x":11.75, "y":4}, {"label":"+", "x":4, "y":4.25}, {"label":"ALT", "x":2, "y":4.5}, {"label":"[", "x":10.75, "y":4.5}, {"label":"Home", "x":12.75, "y":4.5}, {"label":"ctrl", "x":0, "y":4.75}, {"label":"gui", "x":1, "y":4.75}, {"label":"End", "x":13.75, "y":4.75}, {"label":"Esc", "x":14.75, "y":4.75}, {"label":"Backspace", "x":5, "y":5}, {"label":"Space", "x":9.75, "y":5}, {"label":"Del", "x":6, "y":5.5}, {"label":"Enter", "x":8.75, "y":5.5}] + } + } +} diff --git a/keyboards/nacly/sodium50/keymaps/default/keymap.c b/keyboards/nacly/sodium50/keymaps/default/keymap.c new file mode 100644 index 000000000000..954e4678af38 --- /dev/null +++ b/keyboards/nacly/sodium50/keymaps/default/keymap.c @@ -0,0 +1,46 @@ +/* Copyright 2022 NaCly + * + * 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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_LGUI, KC_A, KC_S, KC_D, LT(1,KC_F), KC_G, KC_H, LT(2,KC_J), KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_GRV, KC_EQL, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, KC_LBRC, KC_RBRC, KC_HOME, KC_END, KC_ESC + ), + //Holding F + [1] = LAYOUT( + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_LGUI, KC_NO, KC_NO, KC_NO, _______, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, + KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_END, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO + ), + //Holding J + [2] = LAYOUT( + KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_NO, _______, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_F14, KC_F15, KC_ENT, KC_SPC, KC_NO, KC_NO, KC_NO, KC_NO, TG(3) + ), + //game layer + [3] = LAYOUT( + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, LT(2,KC_J), KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_NO, KC_M, KC_GRV, KC_SPC, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, KC_LBRC, KC_RBRC, KC_HOME, KC_END, TO(0) + ) +}; diff --git a/keyboards/nacly/sodium50/readme.md b/keyboards/nacly/sodium50/readme.md new file mode 100644 index 000000000000..d2ab3480b29c --- /dev/null +++ b/keyboards/nacly/sodium50/readme.md @@ -0,0 +1,13 @@ +# sodium keyboard + +## Your new favorite split columnar stagger + +* Keyboard Maintainer: [NaCly](https://github.com/Na-Cly) +* Hardware Supported: sodium50 PCBs, Pro Micro +* Hardware Availability: https://nacly.net + +Make example for this keyboard (after setting up your build environment): + + make nacly/sodium50: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/nacly/sodium50/rules.mk b/keyboards/nacly/sodium50/rules.mk new file mode 100644 index 000000000000..ea969e963fd9 --- /dev/null +++ b/keyboards/nacly/sodium50/rules.mk @@ -0,0 +1,20 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = caterina + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output + +SPLIT_KEYBOARD = yes \ No newline at end of file diff --git a/keyboards/nacly/sodium50/sodium50.c b/keyboards/nacly/sodium50/sodium50.c new file mode 100644 index 000000000000..0fed5523b527 --- /dev/null +++ b/keyboards/nacly/sodium50/sodium50.c @@ -0,0 +1 @@ +#include "sodium50.h" diff --git a/keyboards/nacly/sodium50/sodium50.h b/keyboards/nacly/sodium50/sodium50.h new file mode 100644 index 000000000000..358814aff4f4 --- /dev/null +++ b/keyboards/nacly/sodium50/sodium50.h @@ -0,0 +1,21 @@ +#pragma once + +#include "quantum.h" + +#define LAYOUT(\ + L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ + L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ + L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \ + L30, L31, L32, L33, L34, L35, L36, R36, R35, R34, R33, R32, R31, R30 \ +)\ + {\ + { L00, L01, L02, L03, L04, L05 }, \ + { L10, L11, L12, L13, L14, L15 }, \ + { L20, L21, L22, L23, L24, L25 }, \ + { L30, L31, L32, L33, L34, L35, L36 }, \ +\ + { R00, R01, R02, R03, R04, R05 }, \ + { R10, R11, R12, R13, R14, R15 }, \ + { R20, R21, R22, R23, R24, R25 }, \ + { R30, R31, R32, R33, R34, R35, L36 } \ +} diff --git a/keyboards/nacly/sodium62/config.h b/keyboards/nacly/sodium62/config.h new file mode 100644 index 000000000000..f59cd633bb0a --- /dev/null +++ b/keyboards/nacly/sodium62/config.h @@ -0,0 +1,75 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 0xBEEF +#define PRODUCT_ID 0xFED0 +#define DEVICE_VER 0x0001 +#define MANUFACTURER nacly +#define PRODUCT sodium62 + +/* key matrix size */ +// Rows are doubled-up +#define MATRIX_ROWS 10 +#define MATRIX_COLS 7 + +// wiring of each half +#define MATRIX_ROW_PINS { F7, D4, D7, B4, B6 } +#define MATRIX_COL_PINS { D2, C6, E6, B5, B2, B3, B1 } + +#define DIODE_DIRECTION COL2ROW + +#define SPLIT_HAND_PIN F4 + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +/* serial.c configuration for split keyboard */ +#define SOFT_SERIAL_PIN D3 + +/* 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 + +/* ws2812 RGB LED */ +//#define RGB_DI_PIN B1 +/* +#define RGBLED_NUM 12 // Number of LEDs + +#define RGBLED_SPLIT { 6, 6 } +*/ +/* + * 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 diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/info.json new file mode 100644 index 000000000000..0c7e94d15b07 --- /dev/null +++ b/keyboards/nacly/sodium62/info.json @@ -0,0 +1,10 @@ +{ + "keyboard_name": "sodium62", + "url": "https://nacly.net", + "maintainer": "nacly", + "layouts": { + "LAYOUT": { + "layout": [{"label":"3", "x":3, "y":0}, {"label":"8", "x":11.75, "y":0}, {"label":"4", "x":4, "y":0.25}, {"label":"2", "x":2, "y":0.5}, {"label":"7", "x":10.75, "y":0.5}, {"label":"9", "x":12.75, "y":0.5}, {"label":"Esc", "x":0, "y":0.75}, {"label":"1", "x":1, "y":0.75}, {"label":"0", "x":13.75, "y":0.75}, {"label":"-", "x":14.75, "y":0.75}, {"label":"E", "x":3, "y":1}, {"label":"5", "x":5, "y":1}, {"label":"6", "x":9.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"R", "x":4, "y":1.25}, {"label":"W", "x":2, "y":1.5}, {"label":"U", "x":10.75, "y":1.5}, {"label":"O", "x":12.75, "y":1.5}, {"label":"Tab", "x":0, "y":1.75}, {"label":"Q", "x":1, "y":1.75}, {"label":"P", "x":13.75, "y":1.75}, {"label":"\\", "x":14.75, "y":1.75}, {"label":"D", "x":3, "y":2}, {"label":"T", "x":5, "y":2}, {"label":"Y", "x":9.75, "y":2}, {"label":"K", "x":11.75, "y":2}, {"label":"F", "x":4, "y":2.25}, {"label":"S", "x":2, "y":2.5}, {"label":"J", "x":10.75, "y":2.5}, {"label":"L", "x":12.75, "y":2.5}, {"label":"gui", "x":0, "y":2.75}, {"label":"A", "x":1, "y":2.75}, {"label":";", "x":13.75, "y":2.75}, {"label":"'", "x":14.75, "y":2.75}, {"label":"C", "x":3, "y":3}, {"label":"G", "x":5, "y":3}, {"label":"H", "x":9.75, "y":3}, {"label":"<", "x":11.75, "y":3}, {"label":"V", "x":4, "y":3.25}, {"label":"X", "x":2, "y":3.5}, {"label":"M", "x":10.75, "y":3.5}, {"label":">", "x":12.75, "y":3.5}, {"label":"shift", "x":0, "y":3.75}, {"label":"Z", "x":1, "y":3.75}, {"label":"?", "x":13.75, "y":3.75}, {"label":"Shift", "x":14.75, "y":3.75}, {"label":"~", "x":3, "y":4}, {"label":"B", "x":5, "y":4}, {"label":"N", "x":9.75, "y":4}, {"label":"]", "x":11.75, "y":4}, {"label":"+", "x":4, "y":4.25}, {"label":"ALT", "x":2, "y":4.5}, {"label":"[", "x":10.75, "y":4.5}, {"label":"Home", "x":12.75, "y":4.5}, {"label":"ctrl", "x":0, "y":4.75}, {"label":"gui", "x":1, "y":4.75}, {"label":"End", "x":13.75, "y":4.75}, {"label":"Esc", "x":14.75, "y":4.75}, {"label":"Backspace", "x":5, "y":5}, {"label":"Space", "x":9.75, "y":5}, {"label":"Del", "x":6, "y":5.5}, {"label":"Enter", "x":8.75, "y":5.5}] + } + } +} diff --git a/keyboards/nacly/sodium62/keymaps/default/keymap.c b/keyboards/nacly/sodium62/keymaps/default/keymap.c new file mode 100644 index 000000000000..c07d91a392a2 --- /dev/null +++ b/keyboards/nacly/sodium62/keymaps/default/keymap.c @@ -0,0 +1,50 @@ +/* Copyright 2022 NaCly + * + * 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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_LGUI, KC_A, KC_S, KC_D, LT(1,KC_F), KC_G, KC_H, LT(2,KC_J), KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_GRV, KC_EQL, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, KC_LBRC, KC_RBRC, KC_HOME, KC_END, KC_ESC + ), + //Holding F + [1] = LAYOUT( + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_LGUI, KC_NO, KC_NO, KC_NO, _______, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, + KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_END, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO + ), + //Holding J + [2] = LAYOUT( + KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, _______, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_F14, KC_F15, KC_ENT, KC_SPC, KC_NO, KC_NO, KC_NO, KC_NO, TG(3) + ), + //game layer + [3] = LAYOUT( + 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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, LT(2,KC_J), KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_NO, KC_M, KC_GRV, KC_SPC, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, KC_LBRC, KC_RBRC, KC_HOME, KC_END, TO(0) + ) +}; diff --git a/keyboards/nacly/sodium62/readme.md b/keyboards/nacly/sodium62/readme.md new file mode 100644 index 000000000000..09a77426d9f0 --- /dev/null +++ b/keyboards/nacly/sodium62/readme.md @@ -0,0 +1,13 @@ +# sodium keyboard + +## Your new favorite split columnar stagger + +* Keyboard Maintainer: [NaCly](https://github.com/Na-Cly) +* Hardware Supported: sodium62 PCBs, Pro Micro +* Hardware Availability: https://nacly.net + +Make example for this keyboard (after setting up your build environment): + + make nacly/sodium62: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/nacly/sodium62/rules.mk b/keyboards/nacly/sodium62/rules.mk new file mode 100644 index 000000000000..ea969e963fd9 --- /dev/null +++ b/keyboards/nacly/sodium62/rules.mk @@ -0,0 +1,20 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = caterina + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output + +SPLIT_KEYBOARD = yes \ No newline at end of file diff --git a/keyboards/nacly/sodium62/sodium62.c b/keyboards/nacly/sodium62/sodium62.c new file mode 100644 index 000000000000..767b9249cc7e --- /dev/null +++ b/keyboards/nacly/sodium62/sodium62.c @@ -0,0 +1 @@ +#include "sodium62.h" diff --git a/keyboards/nacly/sodium62/sodium62.h b/keyboards/nacly/sodium62/sodium62.h new file mode 100644 index 000000000000..468fdc93fd12 --- /dev/null +++ b/keyboards/nacly/sodium62/sodium62.h @@ -0,0 +1,24 @@ +#pragma once + +#include "quantum.h" + +#define LAYOUT(\ + L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ + L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ + L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \ + L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30, \ + L40, L41, L42, L43, L44, L45, L46, R46, R45, R44, R43, R42, R41, R40 \ +)\ + {\ + { L00, L01, L02, L03, L04, L05 }, \ + { L10, L11, L12, L13, L14, L15 }, \ + { L20, L21, L22, L23, L24, L25 }, \ + { L30, L31, L32, L33, L34, L35 }, \ + { L40, L41, L42, L43, L44, L45, L46}, \ +\ + { R00, R01, R02, R03, R04, R05 }, \ + { R10, R11, R12, R13, R14, R15 }, \ + { R20, R21, R22, R23, R24, R25 }, \ + { R30, R31, R32, R33, R34, R35 }, \ + { R40, R41, R42, R43, R44, R45, R46 } \ +} From 03771772486b82f0de574b6cfe36a7e364191023 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 13 May 2022 18:43:52 -0400 Subject: [PATCH 02/21] Apply suggestions from code review Co-authored-by: Joel Challis --- keyboards/nacly/sodium42/config.h | 32 +++++++++++++------------- keyboards/nacly/sodium42/sodium42.c | 15 +++++++++++++ keyboards/nacly/sodium42/sodium42.h | 31 ++++++++++++++++++------- keyboards/nacly/sodium50/config.h | 32 +++++++++++++------------- keyboards/nacly/sodium50/sodium50.c | 15 +++++++++++++ keyboards/nacly/sodium50/sodium50.h | 31 ++++++++++++++++++------- keyboards/nacly/sodium62/config.h | 32 +++++++++++++------------- keyboards/nacly/sodium62/sodium62.c | 15 +++++++++++++ keyboards/nacly/sodium62/sodium62.h | 35 ++++++++++++++++++++--------- 9 files changed, 161 insertions(+), 77 deletions(-) diff --git a/keyboards/nacly/sodium42/config.h b/keyboards/nacly/sodium42/config.h index 983dc95149f3..94c6d903e1bf 100644 --- a/keyboards/nacly/sodium42/config.h +++ b/keyboards/nacly/sodium42/config.h @@ -1,20 +1,18 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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 . -*/ +/* Copyright 2022 NaCly + * + * 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 diff --git a/keyboards/nacly/sodium42/sodium42.c b/keyboards/nacly/sodium42/sodium42.c index 94595c89ab02..980b123bac46 100644 --- a/keyboards/nacly/sodium42/sodium42.c +++ b/keyboards/nacly/sodium42/sodium42.c @@ -1 +1,16 @@ +/* Copyright 2022 NaCly + * + * 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 "sodium42.h" diff --git a/keyboards/nacly/sodium42/sodium42.h b/keyboards/nacly/sodium42/sodium42.h index c904c7b99f24..427b6f4d43c7 100644 --- a/keyboards/nacly/sodium42/sodium42.h +++ b/keyboards/nacly/sodium42/sodium42.h @@ -1,3 +1,18 @@ +/* Copyright 2022 NaCly + * + * 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" @@ -9,13 +24,13 @@ L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30 \ )\ {\ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { L30, L31, L32, L33, L34, L35 }, \ + { L00, L01, L02, L03, L04, KC_NO }, \ + { L10, L11, L12, L13, L14, KC_NO }, \ + { L20, L21, L22, L23, L24, KC_NO }, \ + { L30, L31, L32, L33, L34, L35 }, \ \ - { R00, R01, R02, R03, R04 }, \ - { R10, R11, R12, R13, R14 }, \ - { R20, R21, R22, R23, R24 }, \ - { R30, R31, R32, R33, R34, R35 } \ + { R00, R01, R02, R03, R04, KC_NO }, \ + { R10, R11, R12, R13, R14, KC_NO }, \ + { R20, R21, R22, R23, R24, KC_NO }, \ + { R30, R31, R32, R33, R34, R35 } \ } diff --git a/keyboards/nacly/sodium50/config.h b/keyboards/nacly/sodium50/config.h index 534e51ad3783..0247752d3f01 100644 --- a/keyboards/nacly/sodium50/config.h +++ b/keyboards/nacly/sodium50/config.h @@ -1,20 +1,18 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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 . -*/ +/* Copyright 2022 NaCly + * + * 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 diff --git a/keyboards/nacly/sodium50/sodium50.c b/keyboards/nacly/sodium50/sodium50.c index 0fed5523b527..74b2b5e16cda 100644 --- a/keyboards/nacly/sodium50/sodium50.c +++ b/keyboards/nacly/sodium50/sodium50.c @@ -1 +1,16 @@ +/* Copyright 2022 NaCly + * + * 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 "sodium50.h" diff --git a/keyboards/nacly/sodium50/sodium50.h b/keyboards/nacly/sodium50/sodium50.h index 358814aff4f4..c20ea9bc3b7c 100644 --- a/keyboards/nacly/sodium50/sodium50.h +++ b/keyboards/nacly/sodium50/sodium50.h @@ -1,3 +1,18 @@ +/* Copyright 2022 NaCly + * + * 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" @@ -9,13 +24,13 @@ L30, L31, L32, L33, L34, L35, L36, R36, R35, R34, R33, R32, R31, R30 \ )\ {\ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ + { L00, L01, L02, L03, L04, L05, KC_NO }, \ + { L10, L11, L12, L13, L14, L15, KC_NO }, \ + { L20, L21, L22, L23, L24, L25, KC_NO }, \ + { L30, L31, L32, L33, L34, L35, L36 }, \ \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35, L36 } \ + { R00, R01, R02, R03, R04, R05, KC_NO }, \ + { R10, R11, R12, R13, R14, R15, KC_NO }, \ + { R20, R21, R22, R23, R24, R25, KC_NO }, \ + { R30, R31, R32, R33, R34, R35, L36 } \ } diff --git a/keyboards/nacly/sodium62/config.h b/keyboards/nacly/sodium62/config.h index f59cd633bb0a..bf96041888e7 100644 --- a/keyboards/nacly/sodium62/config.h +++ b/keyboards/nacly/sodium62/config.h @@ -1,20 +1,18 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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 . -*/ +/* Copyright 2022 NaCly + * + * 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 diff --git a/keyboards/nacly/sodium62/sodium62.c b/keyboards/nacly/sodium62/sodium62.c index 767b9249cc7e..6def733a28d6 100644 --- a/keyboards/nacly/sodium62/sodium62.c +++ b/keyboards/nacly/sodium62/sodium62.c @@ -1 +1,16 @@ +/* Copyright 2022 NaCly + * + * 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 "sodium62.h" diff --git a/keyboards/nacly/sodium62/sodium62.h b/keyboards/nacly/sodium62/sodium62.h index 468fdc93fd12..7db100233306 100644 --- a/keyboards/nacly/sodium62/sodium62.h +++ b/keyboards/nacly/sodium62/sodium62.h @@ -1,3 +1,18 @@ +/* Copyright 2022 NaCly + * + * 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" @@ -10,15 +25,15 @@ L40, L41, L42, L43, L44, L45, L46, R46, R45, R44, R43, R42, R41, R40 \ )\ {\ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45, L46}, \ + { L00, L01, L02, L03, L04, L05, KC_NO }, \ + { L10, L11, L12, L13, L14, L15, KC_NO }, \ + { L20, L21, L22, L23, L24, L25, KC_NO }, \ + { L30, L31, L32, L33, L34, L35, KC_NO }, \ + { L40, L41, L42, L43, L44, L45, L46 }, \ \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { R40, R41, R42, R43, R44, R45, R46 } \ + { R00, R01, R02, R03, R04, R05, KC_NO }, \ + { R10, R11, R12, R13, R14, R15, KC_NO }, \ + { R20, R21, R22, R23, R24, R25, KC_NO }, \ + { R30, R31, R32, R33, R34, R35, KC_NO }, \ + { R40, R41, R42, R43, R44, R45, R46 } \ } From 15942f57cd20a7b01facc7b9db227810497caed0 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 13 May 2022 21:07:08 -0400 Subject: [PATCH 03/21] Update readme.md --- keyboards/nacly/sodium42/readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/nacly/sodium42/readme.md b/keyboards/nacly/sodium42/readme.md index c9307e647557..0434a2dbb55e 100644 --- a/keyboards/nacly/sodium42/readme.md +++ b/keyboards/nacly/sodium42/readme.md @@ -10,4 +10,6 @@ Make example for this keyboard (after setting up your build environment): make nacly/sodium42:default +_Enter bootloader by pressing the reset button twice in succession. + 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). From e65b691b016087fb64c36475b7b7173fceb6097a Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 13 May 2022 21:07:18 -0400 Subject: [PATCH 04/21] Update readme.md --- keyboards/nacly/sodium42/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/nacly/sodium42/readme.md b/keyboards/nacly/sodium42/readme.md index 0434a2dbb55e..988451a399b7 100644 --- a/keyboards/nacly/sodium42/readme.md +++ b/keyboards/nacly/sodium42/readme.md @@ -10,6 +10,6 @@ Make example for this keyboard (after setting up your build environment): make nacly/sodium42:default -_Enter bootloader by pressing the reset button twice in succession. +_Enter bootloader by pressing the reset button twice in succession._ 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). From 2f72268578120eca9d8669afb2a07f5b8c221934 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 13 May 2022 21:08:03 -0400 Subject: [PATCH 05/21] Update readme.md --- keyboards/nacly/sodium50/readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/nacly/sodium50/readme.md b/keyboards/nacly/sodium50/readme.md index d2ab3480b29c..b9c8197fddd6 100644 --- a/keyboards/nacly/sodium50/readme.md +++ b/keyboards/nacly/sodium50/readme.md @@ -9,5 +9,6 @@ Make example for this keyboard (after setting up your build environment): make nacly/sodium50:default - + +_Enter the bootloader by pressing the reset button twice in succession._ 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). From 5ba333a1dce48731f7f0614b3888229b2036e9aa Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 13 May 2022 21:08:21 -0400 Subject: [PATCH 06/21] Update readme.md --- keyboards/nacly/sodium62/readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/nacly/sodium62/readme.md b/keyboards/nacly/sodium62/readme.md index 09a77426d9f0..beb73b4f3831 100644 --- a/keyboards/nacly/sodium62/readme.md +++ b/keyboards/nacly/sodium62/readme.md @@ -10,4 +10,6 @@ Make example for this keyboard (after setting up your build environment): make nacly/sodium62:default +_Enter the bootloader by pressing the reset button twice in succession._ + 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). From c6bd7a0f2fd1eafe412f2dcdca35fea927ba843b Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 13 May 2022 21:09:33 -0400 Subject: [PATCH 07/21] Update readme.md --- keyboards/nacly/sodium42/readme.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/keyboards/nacly/sodium42/readme.md b/keyboards/nacly/sodium42/readme.md index 988451a399b7..f9f29664ca84 100644 --- a/keyboards/nacly/sodium42/readme.md +++ b/keyboards/nacly/sodium42/readme.md @@ -10,6 +10,12 @@ Make example for this keyboard (after setting up your build environment): make nacly/sodium42:default -_Enter bootloader by pressing the reset button twice in succession._ +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `RESET` if it is available 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). From 73f67508e47839408d66575e08813d0ebed5e147 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 13 May 2022 21:10:12 -0400 Subject: [PATCH 08/21] Update readme.md --- keyboards/nacly/sodium42/readme.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/nacly/sodium42/readme.md b/keyboards/nacly/sodium42/readme.md index f9f29664ca84..8e44f510ec16 100644 --- a/keyboards/nacly/sodium42/readme.md +++ b/keyboards/nacly/sodium42/readme.md @@ -12,10 +12,9 @@ Make example for this keyboard (after setting up your build environment): ## Bootloader -Enter the bootloader in 3 ways: +Enter the bootloader in 2 ways: -* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard -* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Physical reset button**: Press the reset button twice * **Keycode in layout**: Press the key mapped to `RESET` if it is available 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). From 4c8f5dd5f8e28d9945ac8ba889cba15e18319192 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 13 May 2022 21:10:38 -0400 Subject: [PATCH 09/21] Update readme.md --- keyboards/nacly/sodium50/readme.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/keyboards/nacly/sodium50/readme.md b/keyboards/nacly/sodium50/readme.md index b9c8197fddd6..8cd5e10e2021 100644 --- a/keyboards/nacly/sodium50/readme.md +++ b/keyboards/nacly/sodium50/readme.md @@ -10,5 +10,11 @@ Make example for this keyboard (after setting up your build environment): make nacly/sodium50:default -_Enter the bootloader by pressing the reset button twice in succession._ +## Bootloader + +Enter the bootloader in 2 ways: + +* **Physical reset button**: Press the reset button twice +* **Keycode in layout**: Press the key mapped to `RESET` if it is available + 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). From 04a9992c43a3c2f6df2a29e1bd00b863c8ac8f98 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 13 May 2022 21:10:58 -0400 Subject: [PATCH 10/21] Update readme.md --- keyboards/nacly/sodium62/readme.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/keyboards/nacly/sodium62/readme.md b/keyboards/nacly/sodium62/readme.md index beb73b4f3831..315f6cd9877b 100644 --- a/keyboards/nacly/sodium62/readme.md +++ b/keyboards/nacly/sodium62/readme.md @@ -10,6 +10,12 @@ Make example for this keyboard (after setting up your build environment): make nacly/sodium62:default -_Enter the bootloader by pressing the reset button twice in succession._ +## Bootloader + +Enter the bootloader in 2 ways: + +* **Physical reset button**: Press the reset button twice +* **Keycode in layout**: Press the key mapped to `RESET` if it is available + 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). From 86b7f0835acd59463515ec2d69b053c15a070498 Mon Sep 17 00:00:00 2001 From: Derek Date: Mon, 16 May 2022 09:01:54 -0400 Subject: [PATCH 11/21] Update keymap.c --- .../nacly/sodium62/keymaps/default/keymap.c | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/keyboards/nacly/sodium62/keymaps/default/keymap.c b/keyboards/nacly/sodium62/keymaps/default/keymap.c index c07d91a392a2..ee26f0d6802b 100644 --- a/keyboards/nacly/sodium62/keymaps/default/keymap.c +++ b/keyboards/nacly/sodium62/keymaps/default/keymap.c @@ -14,6 +14,10 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H +#define _BASE 0 +#define _L1 1 +#define _L2 2 +#define _L3 3 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( @@ -48,3 +52,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_NO, KC_M, KC_GRV, KC_SPC, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, KC_LBRC, KC_RBRC, KC_HOME, KC_END, TO(0) ) }; +#ifdef OLED_ENABLE +bool oled_task_user(void) { + // Host Keyboard Layer Status + oled_write_P(PSTR("Layer: "), false); + + switch (get_highest_layer(layer_state)) { + case _BASE: + oled_write_P(PSTR("Base\n"), false); + break; + case _L1: + oled_write_P(PSTR("ONE\n"), false); + break; + case _L2: + oled_write_P(PSTR("TWO\n"), false); + break; + case _L3: + oled_write_P(PSTR("Three\n"), false); + break; + default: + // Or use the write_ln shortcut over adding '\n' to the end of your string + oled_write_ln_P(PSTR("Undefined"), false); + } + + // Host Keyboard LED Status + led_t led_state = host_keyboard_led_state(); + oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + return false; +} +#endif From 697e4fef16d4eff30a66f44edb186c316a10b37d Mon Sep 17 00:00:00 2001 From: Derek Date: Mon, 16 May 2022 09:02:46 -0400 Subject: [PATCH 12/21] Update rules.mk --- keyboards/nacly/sodium62/rules.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/nacly/sodium62/rules.mk b/keyboards/nacly/sodium62/rules.mk index ea969e963fd9..713bfa6c38c3 100644 --- a/keyboards/nacly/sodium62/rules.mk +++ b/keyboards/nacly/sodium62/rules.mk @@ -17,4 +17,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes \ No newline at end of file +SPLIT_KEYBOARD = yes +OLED_DRIVER = SSD1306 From 0f069486a092265c01ffd019c4b5f650030d114d Mon Sep 17 00:00:00 2001 From: Derek Date: Mon, 16 May 2022 09:03:08 -0400 Subject: [PATCH 13/21] Update rules.mk --- keyboards/nacly/sodium62/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/nacly/sodium62/rules.mk b/keyboards/nacly/sodium62/rules.mk index 713bfa6c38c3..f7e87175ac5e 100644 --- a/keyboards/nacly/sodium62/rules.mk +++ b/keyboards/nacly/sodium62/rules.mk @@ -18,4 +18,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output SPLIT_KEYBOARD = yes -OLED_DRIVER = SSD1306 +OLED_ENABLE = yes From c530b3e3c113bc81d7e020f5b9f14aaf3ef8f9e8 Mon Sep 17 00:00:00 2001 From: Derek Date: Mon, 16 May 2022 09:03:57 -0400 Subject: [PATCH 14/21] Update config.h --- keyboards/nacly/sodium62/config.h | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/nacly/sodium62/config.h b/keyboards/nacly/sodium62/config.h index bf96041888e7..b6140db5f6d6 100644 --- a/keyboards/nacly/sodium62/config.h +++ b/keyboards/nacly/sodium62/config.h @@ -48,6 +48,7 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE +#define OLED_BRIGHTNESS 128 /* ws2812 RGB LED */ //#define RGB_DI_PIN B1 From c309a0ca7670a349d42bcbdd6763a09f28479e92 Mon Sep 17 00:00:00 2001 From: Derek Date: Tue, 17 May 2022 06:52:33 -0400 Subject: [PATCH 15/21] Update keyboards/nacly/sodium62/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/nacly/sodium62/keymaps/default/keymap.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/keyboards/nacly/sodium62/keymaps/default/keymap.c b/keyboards/nacly/sodium62/keymaps/default/keymap.c index ee26f0d6802b..8562c323cf77 100644 --- a/keyboards/nacly/sodium62/keymaps/default/keymap.c +++ b/keyboards/nacly/sodium62/keymaps/default/keymap.c @@ -14,10 +14,13 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#define _BASE 0 -#define _L1 1 -#define _L2 2 -#define _L3 3 + +enum custom_layers { + _BASE, + _L1, + _L2, + _L3, +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( From 346ba4c6c35ae72a8e21d0cafa619d12250c6872 Mon Sep 17 00:00:00 2001 From: Derek Date: Sun, 22 May 2022 17:26:53 -0400 Subject: [PATCH 16/21] Update keyboards/nacly/sodium62/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- .../nacly/sodium62/keymaps/default/keymap.c | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/keyboards/nacly/sodium62/keymaps/default/keymap.c b/keyboards/nacly/sodium62/keymaps/default/keymap.c index 8562c323cf77..f65524187603 100644 --- a/keyboards/nacly/sodium62/keymaps/default/keymap.c +++ b/keyboards/nacly/sodium62/keymaps/default/keymap.c @@ -55,35 +55,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_NO, KC_M, KC_GRV, KC_SPC, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, KC_LBRC, KC_RBRC, KC_HOME, KC_END, TO(0) ) }; -#ifdef OLED_ENABLE -bool oled_task_user(void) { - // Host Keyboard Layer Status - oled_write_P(PSTR("Layer: "), false); - - switch (get_highest_layer(layer_state)) { - case _BASE: - oled_write_P(PSTR("Base\n"), false); - break; - case _L1: - oled_write_P(PSTR("ONE\n"), false); - break; - case _L2: - oled_write_P(PSTR("TWO\n"), false); - break; - case _L3: - oled_write_P(PSTR("Three\n"), false); - break; - default: - // Or use the write_ln shortcut over adding '\n' to the end of your string - oled_write_ln_P(PSTR("Undefined"), false); - } - - // Host Keyboard LED Status - led_t led_state = host_keyboard_led_state(); - oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - - return false; -} -#endif From e80157f7b3c6bb52dc615c05f6afcefe8f1194b9 Mon Sep 17 00:00:00 2001 From: Derek Date: Sun, 22 May 2022 17:27:00 -0400 Subject: [PATCH 17/21] Update keyboards/nacly/sodium62/sodium62.c Co-authored-by: Drashna Jaelre --- keyboards/nacly/sodium62/sodium62.c | 36 +++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/keyboards/nacly/sodium62/sodium62.c b/keyboards/nacly/sodium62/sodium62.c index 6def733a28d6..d165bc1f2f05 100644 --- a/keyboards/nacly/sodium62/sodium62.c +++ b/keyboards/nacly/sodium62/sodium62.c @@ -14,3 +14,39 @@ * along with this program. If not, see . */ #include "sodium62.h" + +#ifdef OLED_ENABLE +bool oled_task_kb(void) { + if (!oled_task_user()) { + return false; + } + // Host Keyboard Layer Status + oled_write_P(PSTR("Layer: "), false); + + switch (get_highest_layer(layer_state)) { + case _BASE: + oled_write_P(PSTR("Base\n"), false); + break; + case _L1: + oled_write_P(PSTR("ONE\n"), false); + break; + case _L2: + oled_write_P(PSTR("TWO\n"), false); + break; + case _L3: + oled_write_P(PSTR("Three\n"), false); + break; + default: + // Or use the write_ln shortcut over adding '\n' to the end of your string + oled_write_ln_P(PSTR("Undefined"), false); + } + + // Host Keyboard LED Status + led_t led_state = host_keyboard_led_state(); + oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + return true; +} +#endif From ada7e2e88116bc60dc6f9d5773e393487e42485b Mon Sep 17 00:00:00 2001 From: Derek Date: Thu, 2 Jun 2022 10:29:35 -0400 Subject: [PATCH 18/21] Updated json file ordering --- keyboards/nacly/sodium42/info.json | 2 +- keyboards/nacly/sodium50/info.json | 10 +++++----- keyboards/nacly/sodium62/info.json | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/keyboards/nacly/sodium42/info.json b/keyboards/nacly/sodium42/info.json index 9b3777e5b379..42de6b22649d 100644 --- a/keyboards/nacly/sodium42/info.json +++ b/keyboards/nacly/sodium42/info.json @@ -4,7 +4,7 @@ "maintainer": "nacly", "layouts": { "LAYOUT": { - "layout": [{"label":"E", "x":2, "y":0}, {"label":"I", "x":10.75, "y":0}, {"label":"R", "x":3, "y":0.25}, {"label":"W", "x":1, "y":0.5}, {"label":"U", "x":9.75, "y":0.5}, {"label":"O", "x":11.75, "y":0.5}, {"label":"Q", "x":0, "y":0.75}, {"label":"P", "x":12.75, "y":0.75}, {"label":"D", "x":2, "y":1}, {"label":"T", "x":4, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"K", "x":10.75, "y":1}, {"label":"F", "x":3, "y":1.25}, {"label":"S", "x":1, "y":1.5}, {"label":"J", "x":9.75, "y":1.5}, {"label":"L", "x":11.75, "y":1.5}, {"label":"A", "x":0, "y":1.75}, {"label":";", "x":12.75, "y":1.75}, {"label":"C", "x":2, "y":2}, {"label":"G", "x":4, "y":2}, {"label":"H", "x":8.75, "y":2}, {"label":"<", "x":10.75, "y":2}, {"label":"V", "x":3, "y":2.25}, {"label":"X", "x":1, "y":2.5}, {"label":"M", "x":9.75, "y":2.5}, {"label":">", "x":11.75, "y":2.5}, {"label":"Z", "x":0, "y":2.75}, {"label":"?", "x":12.75, "y":2.75}, {"label":"~", "x":2, "y":3}, {"label":"B", "x":4, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"]", "x":10.75, "y":3}, {"label":"+", "x":3, "y":3.25}, {"label":"ALT", "x":1, "y":3.5}, {"label":"[", "x":9.75, "y":3.5}, {"label":"Home", "x":11.75, "y":3.5}, {"label":"gui", "x":0, "y":3.75}, {"label":"End", "x":12.75, "y":3.75}, {"label":"Backspace", "x":4, "y":4}, {"label":"Space", "x":8.75, "y":4}, {"label":"Del", "x":5, "y":4.5}, {"label":"Enter", "x":7.75, "y":4.5}] + "layout": [{"label": "Q", "x": 1, "y": 1.75},{"label": "W", "x": 2, "y": 1.5},{"label": "E", "x": 3, "y": 1},{"label": "R", "x": 4, "y": 1.25},{"label": "T", "x": 5, "y": 2},{"label": "Y", "x": 9.75, "y": 2},{"label": "U", "x": 10.75, "y": 1.5},{"label": "I", "x": 11.75, "y": 1},{"label": "O", "x": 12.75, "y": 1.5},{"label": "P", "x": 13.75, "y": 1.75},{"label": "A", "x": 1, "y": 2.75},{"label": "S", "x": 2, "y": 2.5},{"label": "D", "x": 3, "y": 2},{"label": "F", "x": 4, "y": 2.25},{"label": "G", "x": 5, "y": 3},{"label": "H", "x": 9.75, "y": 3},{"label": "J", "x": 10.75, "y": 2.5},{"label": "K", "x": 11.75, "y": 2},{"label": "L", "x": 12.75, "y": 2.5},{"label": ";", "x": 13.75, "y": 2.75},{"label": "Z", "x": 1, "y": 3.75},{"label": "X", "x": 2, "y": 3.5},{"label": "C", "x": 3, "y": 3},{"label": "V", "x": 4, "y": 3.25},{"label": "B", "x": 5, "y": 4},{"label": "N", "x": 9.75, "y": 4},{"label": "M", "x": 10.75, "y": 3.5},{"label": "<", "x": 11.75, "y": 3},{"label": ">", "x": 12.75, "y": 3.5},{"label": "?", "x": 13.75, "y": 3.75},{"label": "gui", "x": 1, "y": 4.75},{"label": "ALT", "x": 2, "y": 4.5},{"label": "~", "x": 3, "y": 4},{"label": "+", "x": 4, "y": 4.25},{"label": "Backspace", "x": 5, "y": 5},{"label": "Del", "x": 6, "y": 5.5},{"label": "Enter", "x": 8.75, "y": 5.5},{"label": "Space", "x": 9.75, "y": 5},{"label": "[", "x": 10.75, "y": 4.5},{"label": "]", "x": 11.75, "y": 4},{"label": "Home", "x": 12.75, "y": 4.5},{"label": "End", "x": 13.75, "y": 4.75}] } } } diff --git a/keyboards/nacly/sodium50/info.json b/keyboards/nacly/sodium50/info.json index 94e1159d864a..a8ff3ae00ebd 100644 --- a/keyboards/nacly/sodium50/info.json +++ b/keyboards/nacly/sodium50/info.json @@ -1,10 +1,10 @@ { - "keyboard_name": "sodium50", - "url": "https://nacly.net", - "maintainer": "nacly", + "keyboard_name": "sodium50", + "url": "https://nacly.net", + "maintainer": "nacly", "layouts": { "LAYOUT": { - "layout": [{"label":"E", "x":3, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"R", "x":4, "y":1.25}, {"label":"W", "x":2, "y":1.5}, {"label":"U", "x":10.75, "y":1.5}, {"label":"O", "x":12.75, "y":1.5}, {"label":"Tab", "x":0, "y":1.75}, {"label":"Q", "x":1, "y":1.75}, {"label":"P", "x":13.75, "y":1.75}, {"label":"\\", "x":14.75, "y":1.75}, {"label":"D", "x":3, "y":2}, {"label":"T", "x":5, "y":2}, {"label":"Y", "x":9.75, "y":2}, {"label":"K", "x":11.75, "y":2}, {"label":"F", "x":4, "y":2.25}, {"label":"S", "x":2, "y":2.5}, {"label":"J", "x":10.75, "y":2.5}, {"label":"L", "x":12.75, "y":2.5}, {"label":"gui", "x":0, "y":2.75}, {"label":"A", "x":1, "y":2.75}, {"label":";", "x":13.75, "y":2.75}, {"label":"'", "x":14.75, "y":2.75}, {"label":"C", "x":3, "y":3}, {"label":"G", "x":5, "y":3}, {"label":"H", "x":9.75, "y":3}, {"label":"<", "x":11.75, "y":3}, {"label":"V", "x":4, "y":3.25}, {"label":"X", "x":2, "y":3.5}, {"label":"M", "x":10.75, "y":3.5}, {"label":">", "x":12.75, "y":3.5}, {"label":"shift", "x":0, "y":3.75}, {"label":"Z", "x":1, "y":3.75}, {"label":"?", "x":13.75, "y":3.75}, {"label":"Shift", "x":14.75, "y":3.75}, {"label":"~", "x":3, "y":4}, {"label":"B", "x":5, "y":4}, {"label":"N", "x":9.75, "y":4}, {"label":"]", "x":11.75, "y":4}, {"label":"+", "x":4, "y":4.25}, {"label":"ALT", "x":2, "y":4.5}, {"label":"[", "x":10.75, "y":4.5}, {"label":"Home", "x":12.75, "y":4.5}, {"label":"ctrl", "x":0, "y":4.75}, {"label":"gui", "x":1, "y":4.75}, {"label":"End", "x":13.75, "y":4.75}, {"label":"Esc", "x":14.75, "y":4.75}, {"label":"Backspace", "x":5, "y":5}, {"label":"Space", "x":9.75, "y":5}, {"label":"Del", "x":6, "y":5.5}, {"label":"Enter", "x":8.75, "y":5.5}] + "layout": [{"label": "Tab", "x": 0, "y": 1.75},{"label": "Q", "x": 1, "y": 1.75},{"label": "W", "x": 2, "y": 1.5},{"label": "E", "x": 3, "y": 1},{"label": "R", "x": 4, "y": 1.25},{"label": "T", "x": 5, "y": 2},{"label": "Y", "x": 9.75, "y": 2},{"label": "U", "x": 10.75, "y": 1.5},{"label": "I", "x": 11.75, "y": 1},{"label": "O", "x": 12.75, "y": 1.5},{"label": "P", "x": 13.75, "y": 1.75},{"label": "\\", "x": 14.75, "y": 1.75},{"label": "gui", "x": 0, "y": 2.75},{"label": "A", "x": 1, "y": 2.75},{"label": "S", "x": 2, "y": 2.5},{"label": "D", "x": 3, "y": 2},{"label": "F", "x": 4, "y": 2.25},{"label": "G", "x": 5, "y": 3},{"label": "H", "x": 9.75, "y": 3},{"label": "J", "x": 10.75, "y": 2.5},{"label": "K", "x": 11.75, "y": 2},{"label": "L", "x": 12.75, "y": 2.5},{"label": ";", "x": 13.75, "y": 2.75},{"label": "'", "x": 14.75, "y": 2.75},{"label": "shift", "x": 0, "y": 3.75},{"label": "Z", "x": 1, "y": 3.75},{"label": "X", "x": 2, "y": 3.5},{"label": "C", "x": 3, "y": 3},{"label": "V", "x": 4, "y": 3.25},{"label": "B", "x": 5, "y": 4},{"label": "N", "x": 9.75, "y": 4},{"label": "M", "x": 10.75, "y": 3.5},{"label": "<", "x": 11.75, "y": 3},{"label": ">", "x": 12.75, "y": 3.5},{"label": "?", "x": 13.75, "y": 3.75},{"label": "Shift", "x": 14.75, "y": 3.75},{"label": "ctrl", "x": 0, "y": 4.75},{"label": "gui", "x": 1, "y": 4.75},{"label": "ALT", "x": 2, "y": 4.5},{"label": "~", "x": 3, "y": 4},{"label": "+", "x": 4, "y": 4.25},{"label": "Backspace", "x": 5, "y": 5},{"label": "Del", "x": 6, "y": 5.5},{"label": "Enter", "x": 8.75, "y": 5.5},{"label": "Space", "x": 9.75, "y": 5},{"label": "[", "x": 10.75, "y": 4.5},{"label": "]", "x": 11.75, "y": 4},{"label": "Home", "x": 12.75, "y": 4.5},{"label": "End", "x": 13.75, "y": 4.75},{"label": "Esc", "x": 14.75, "y": 4.75}] } } -} +} \ No newline at end of file diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/info.json index 0c7e94d15b07..572f63e85341 100644 --- a/keyboards/nacly/sodium62/info.json +++ b/keyboards/nacly/sodium62/info.json @@ -1,10 +1,10 @@ { - "keyboard_name": "sodium62", - "url": "https://nacly.net", - "maintainer": "nacly", + "keyboard_name": "sodium62", + "url": "https://nacly.net", + "maintainer": "nacly", "layouts": { "LAYOUT": { - "layout": [{"label":"3", "x":3, "y":0}, {"label":"8", "x":11.75, "y":0}, {"label":"4", "x":4, "y":0.25}, {"label":"2", "x":2, "y":0.5}, {"label":"7", "x":10.75, "y":0.5}, {"label":"9", "x":12.75, "y":0.5}, {"label":"Esc", "x":0, "y":0.75}, {"label":"1", "x":1, "y":0.75}, {"label":"0", "x":13.75, "y":0.75}, {"label":"-", "x":14.75, "y":0.75}, {"label":"E", "x":3, "y":1}, {"label":"5", "x":5, "y":1}, {"label":"6", "x":9.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"R", "x":4, "y":1.25}, {"label":"W", "x":2, "y":1.5}, {"label":"U", "x":10.75, "y":1.5}, {"label":"O", "x":12.75, "y":1.5}, {"label":"Tab", "x":0, "y":1.75}, {"label":"Q", "x":1, "y":1.75}, {"label":"P", "x":13.75, "y":1.75}, {"label":"\\", "x":14.75, "y":1.75}, {"label":"D", "x":3, "y":2}, {"label":"T", "x":5, "y":2}, {"label":"Y", "x":9.75, "y":2}, {"label":"K", "x":11.75, "y":2}, {"label":"F", "x":4, "y":2.25}, {"label":"S", "x":2, "y":2.5}, {"label":"J", "x":10.75, "y":2.5}, {"label":"L", "x":12.75, "y":2.5}, {"label":"gui", "x":0, "y":2.75}, {"label":"A", "x":1, "y":2.75}, {"label":";", "x":13.75, "y":2.75}, {"label":"'", "x":14.75, "y":2.75}, {"label":"C", "x":3, "y":3}, {"label":"G", "x":5, "y":3}, {"label":"H", "x":9.75, "y":3}, {"label":"<", "x":11.75, "y":3}, {"label":"V", "x":4, "y":3.25}, {"label":"X", "x":2, "y":3.5}, {"label":"M", "x":10.75, "y":3.5}, {"label":">", "x":12.75, "y":3.5}, {"label":"shift", "x":0, "y":3.75}, {"label":"Z", "x":1, "y":3.75}, {"label":"?", "x":13.75, "y":3.75}, {"label":"Shift", "x":14.75, "y":3.75}, {"label":"~", "x":3, "y":4}, {"label":"B", "x":5, "y":4}, {"label":"N", "x":9.75, "y":4}, {"label":"]", "x":11.75, "y":4}, {"label":"+", "x":4, "y":4.25}, {"label":"ALT", "x":2, "y":4.5}, {"label":"[", "x":10.75, "y":4.5}, {"label":"Home", "x":12.75, "y":4.5}, {"label":"ctrl", "x":0, "y":4.75}, {"label":"gui", "x":1, "y":4.75}, {"label":"End", "x":13.75, "y":4.75}, {"label":"Esc", "x":14.75, "y":4.75}, {"label":"Backspace", "x":5, "y":5}, {"label":"Space", "x":9.75, "y":5}, {"label":"Del", "x":6, "y":5.5}, {"label":"Enter", "x":8.75, "y":5.5}] + "layout": [ {"label": "Esc", "x": 0, "y": 0.75}, {"label": "1", "x": 1, "y": 0.75}, {"label": "2", "x": 2, "y": 0.5}, {"label": "3", "x": 3, "y": 0}, {"label": "4", "x": 4, "y": 0.25}, {"label": "5", "x": 5, "y": 1}, {"label": "6", "x": 9.75, "y": 1}, {"label": "7", "x": 10.75, "y": 0.5}, {"label": "8", "x": 11.75, "y": 0}, {"label": "9", "x": 12.75, "y": 0.5}, {"label": "0", "x": 13.75, "y": 0.75}, {"label": "-", "x": 14.75, "y": 0.75}, {"label": "Tab", "x": 0, "y": 1.75}, {"label": "Q", "x": 1, "y": 1.75}, {"label": "W", "x": 2, "y": 1.5}, {"label": "E", "x": 3, "y": 1}, {"label": "R", "x": 4, "y": 1.25}, {"label": "T", "x": 5, "y": 2}, {"label": "Y", "x": 9.75, "y": 2}, {"label": "U", "x": 10.75, "y": 1.5}, {"label": "I", "x": 11.75, "y": 1}, {"label": "O", "x": 12.75, "y": 1.5}, {"label": "P", "x": 13.75, "y": 1.75}, {"label": "\\", "x": 14.75, "y": 1.75}, {"label": "gui", "x": 0, "y": 2.75}, {"label": "A", "x": 1, "y": 2.75}, {"label": "S", "x": 2, "y": 2.5}, {"label": "D", "x": 3, "y": 2}, {"label": "F", "x": 4, "y": 2.25}, {"label": "G", "x": 5, "y": 3}, {"label": "H", "x": 9.75, "y": 3}, {"label": "J", "x": 10.75, "y": 2.5}, {"label": "K", "x": 11.75, "y": 2}, {"label": "L", "x": 12.75, "y": 2.5}, {"label": ";", "x": 13.75, "y": 2.75}, {"label": "'", "x": 14.75, "y": 2.75}, {"label": "shift", "x": 0, "y": 3.75}, {"label": "Z", "x": 1, "y": 3.75}, {"label": "X", "x": 2, "y": 3.5}, {"label": "C", "x": 3, "y": 3}, {"label": "V", "x": 4, "y": 3.25}, {"label": "B", "x": 5, "y": 4}, {"label": "N", "x": 9.75, "y": 4}, {"label": "M", "x": 10.75, "y": 3.5}, {"label": "<", "x": 11.75, "y": 3}, {"label": ">", "x": 12.75, "y": 3.5}, {"label": "?", "x": 13.75, "y": 3.75}, {"label": "Shift", "x": 14.75, "y": 3.75}, {"label": "ctrl", "x": 0, "y": 4.75}, {"label": "gui", "x": 1, "y": 4.75}, {"label": "ALT", "x": 2, "y": 4.5}, {"label": "~", "x": 3, "y": 4}, {"label": "+", "x": 4, "y": 4.25}, {"label": "Backspace", "x": 5, "y": 5}, {"label": "Del", "x": 6, "y": 5.5}, {"label": "Enter", "x": 8.75, "y": 5.5}, {"label": "Space", "x": 9.75, "y": 5}, {"label": "[", "x": 10.75, "y": 4.5}, {"label": "]", "x": 11.75, "y": 4}, {"label": "Home", "x": 12.75, "y": 4.5}, {"label": "End", "x": 13.75, "y": 4.75}, {"label": "Esc", "x": 14.75, "y": 4.75} ] } } -} +} \ No newline at end of file From 1360a1b907b18dba3d1426c0505e4eb50b122ea2 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 3 Jun 2022 07:02:12 -0400 Subject: [PATCH 19/21] Update keyboards/nacly/sodium62/info.json Co-authored-by: Ryan --- keyboards/nacly/sodium62/info.json | 74 +++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/info.json index 572f63e85341..f1dc474dcc79 100644 --- a/keyboards/nacly/sodium62/info.json +++ b/keyboards/nacly/sodium62/info.json @@ -4,7 +4,79 @@ "maintainer": "nacly", "layouts": { "LAYOUT": { - "layout": [ {"label": "Esc", "x": 0, "y": 0.75}, {"label": "1", "x": 1, "y": 0.75}, {"label": "2", "x": 2, "y": 0.5}, {"label": "3", "x": 3, "y": 0}, {"label": "4", "x": 4, "y": 0.25}, {"label": "5", "x": 5, "y": 1}, {"label": "6", "x": 9.75, "y": 1}, {"label": "7", "x": 10.75, "y": 0.5}, {"label": "8", "x": 11.75, "y": 0}, {"label": "9", "x": 12.75, "y": 0.5}, {"label": "0", "x": 13.75, "y": 0.75}, {"label": "-", "x": 14.75, "y": 0.75}, {"label": "Tab", "x": 0, "y": 1.75}, {"label": "Q", "x": 1, "y": 1.75}, {"label": "W", "x": 2, "y": 1.5}, {"label": "E", "x": 3, "y": 1}, {"label": "R", "x": 4, "y": 1.25}, {"label": "T", "x": 5, "y": 2}, {"label": "Y", "x": 9.75, "y": 2}, {"label": "U", "x": 10.75, "y": 1.5}, {"label": "I", "x": 11.75, "y": 1}, {"label": "O", "x": 12.75, "y": 1.5}, {"label": "P", "x": 13.75, "y": 1.75}, {"label": "\\", "x": 14.75, "y": 1.75}, {"label": "gui", "x": 0, "y": 2.75}, {"label": "A", "x": 1, "y": 2.75}, {"label": "S", "x": 2, "y": 2.5}, {"label": "D", "x": 3, "y": 2}, {"label": "F", "x": 4, "y": 2.25}, {"label": "G", "x": 5, "y": 3}, {"label": "H", "x": 9.75, "y": 3}, {"label": "J", "x": 10.75, "y": 2.5}, {"label": "K", "x": 11.75, "y": 2}, {"label": "L", "x": 12.75, "y": 2.5}, {"label": ";", "x": 13.75, "y": 2.75}, {"label": "'", "x": 14.75, "y": 2.75}, {"label": "shift", "x": 0, "y": 3.75}, {"label": "Z", "x": 1, "y": 3.75}, {"label": "X", "x": 2, "y": 3.5}, {"label": "C", "x": 3, "y": 3}, {"label": "V", "x": 4, "y": 3.25}, {"label": "B", "x": 5, "y": 4}, {"label": "N", "x": 9.75, "y": 4}, {"label": "M", "x": 10.75, "y": 3.5}, {"label": "<", "x": 11.75, "y": 3}, {"label": ">", "x": 12.75, "y": 3.5}, {"label": "?", "x": 13.75, "y": 3.75}, {"label": "Shift", "x": 14.75, "y": 3.75}, {"label": "ctrl", "x": 0, "y": 4.75}, {"label": "gui", "x": 1, "y": 4.75}, {"label": "ALT", "x": 2, "y": 4.5}, {"label": "~", "x": 3, "y": 4}, {"label": "+", "x": 4, "y": 4.25}, {"label": "Backspace", "x": 5, "y": 5}, {"label": "Del", "x": 6, "y": 5.5}, {"label": "Enter", "x": 8.75, "y": 5.5}, {"label": "Space", "x": 9.75, "y": 5}, {"label": "[", "x": 10.75, "y": 4.5}, {"label": "]", "x": 11.75, "y": 4}, {"label": "Home", "x": 12.75, "y": 4.5}, {"label": "End", "x": 13.75, "y": 4.75}, {"label": "Esc", "x": 14.75, "y": 4.75} ] + "layout": [ + {"x": 0, "y": 0.75}, + {"x": 1, "y": 0.75}, + {"x": 2, "y": 0.5}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0.25}, + {"x": 5, "y": 1}, + + {"x": 9.75, "y": 1}, + {"x": 10.75, "y": 0.5}, + {"x": 11.75, "y": 0}, + {"x": 12.75, "y": 0.5}, + {"x": 13.75, "y": 0.75}, + {"x": 14.75, "y": 0.75}, + + {"x": 0, "y": 1.75}, + {"x": 1, "y": 1.75}, + {"x": 2, "y": 1.5}, + {"x": 3, "y": 1}, + {"x": 4, "y": 1.25}, + {"x": 5, "y": 2}, + + {"x": 9.75, "y": 2}, + {"x": 10.75, "y": 1.5}, + {"x": 11.75, "y": 1}, + {"x": 12.75, "y": 1.5}, + {"x": 13.75, "y": 1.75}, + {"x": 14.75, "y": 1.75}, + + {"x": 0, "y": 2.75}, + {"x": 1, "y": 2.75}, + {"x": 2, "y": 2.5}, + {"x": 3, "y": 2}, + {"x": 4, "y": 2.25}, + {"x": 5, "y": 3}, + + {"x": 9.75, "y": 3}, + {"x": 10.75, "y": 2.5}, + {"x": 11.75, "y": 2}, + {"x": 12.75, "y": 2.5}, + {"x": 13.75, "y": 2.75}, + {"x": 14.75, "y": 2.75}, + + {"x": 0, "y": 3.75}, + {"x": 1, "y": 3.75}, + {"x": 2, "y": 3.5}, + {"x": 3, "y": 3}, + {"x": 4, "y": 3.25}, + {"x": 5, "y": 4}, + + {"x": 9.75, "y": 4}, + {"x": 10.75, "y": 3.5}, + {"x": 11.75, "y": 3}, + {"x": 12.75, "y": 3.5}, + {"x": 13.75, "y": 3.75}, + {"x": 14.75, "y": 3.75}, + + {"x": 0, "y": 4.75}, + {"x": 1, "y": 4.75}, + {"x": 2, "y": 4.5}, + {"x": 3, "y": 4}, + {"x": 4, "y": 4.25}, + {"x": 5, "y": 5}, + {"x": 6, "y": 5.5}, + + {"x": 8.75, "y": 5.5}, + {"x": 9.75, "y": 5}, + {"x": 10.75, "y": 4.5}, + {"x": 11.75, "y": 4}, + {"x": 12.75, "y": 4.5}, + {"x": 13.75, "y": 4.75}, + {"x": 14.75, "y": 4.75} + ] } } } \ No newline at end of file From 61759fe34b42866f6556d082039cb0e82231da39 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 3 Jun 2022 07:02:35 -0400 Subject: [PATCH 20/21] Update keyboards/nacly/sodium42/info.json Co-authored-by: Ryan --- keyboards/nacly/sodium42/info.json | 58 +++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 4 deletions(-) diff --git a/keyboards/nacly/sodium42/info.json b/keyboards/nacly/sodium42/info.json index 42de6b22649d..0597d17dc0c6 100644 --- a/keyboards/nacly/sodium42/info.json +++ b/keyboards/nacly/sodium42/info.json @@ -1,10 +1,60 @@ { - "keyboard_name": "sodium42", - "url": "https://nacly.net", - "maintainer": "nacly", + "keyboard_name": "sodium42", + "url": "https://nacly.net", + "maintainer": "nacly", "layouts": { "LAYOUT": { - "layout": [{"label": "Q", "x": 1, "y": 1.75},{"label": "W", "x": 2, "y": 1.5},{"label": "E", "x": 3, "y": 1},{"label": "R", "x": 4, "y": 1.25},{"label": "T", "x": 5, "y": 2},{"label": "Y", "x": 9.75, "y": 2},{"label": "U", "x": 10.75, "y": 1.5},{"label": "I", "x": 11.75, "y": 1},{"label": "O", "x": 12.75, "y": 1.5},{"label": "P", "x": 13.75, "y": 1.75},{"label": "A", "x": 1, "y": 2.75},{"label": "S", "x": 2, "y": 2.5},{"label": "D", "x": 3, "y": 2},{"label": "F", "x": 4, "y": 2.25},{"label": "G", "x": 5, "y": 3},{"label": "H", "x": 9.75, "y": 3},{"label": "J", "x": 10.75, "y": 2.5},{"label": "K", "x": 11.75, "y": 2},{"label": "L", "x": 12.75, "y": 2.5},{"label": ";", "x": 13.75, "y": 2.75},{"label": "Z", "x": 1, "y": 3.75},{"label": "X", "x": 2, "y": 3.5},{"label": "C", "x": 3, "y": 3},{"label": "V", "x": 4, "y": 3.25},{"label": "B", "x": 5, "y": 4},{"label": "N", "x": 9.75, "y": 4},{"label": "M", "x": 10.75, "y": 3.5},{"label": "<", "x": 11.75, "y": 3},{"label": ">", "x": 12.75, "y": 3.5},{"label": "?", "x": 13.75, "y": 3.75},{"label": "gui", "x": 1, "y": 4.75},{"label": "ALT", "x": 2, "y": 4.5},{"label": "~", "x": 3, "y": 4},{"label": "+", "x": 4, "y": 4.25},{"label": "Backspace", "x": 5, "y": 5},{"label": "Del", "x": 6, "y": 5.5},{"label": "Enter", "x": 8.75, "y": 5.5},{"label": "Space", "x": 9.75, "y": 5},{"label": "[", "x": 10.75, "y": 4.5},{"label": "]", "x": 11.75, "y": 4},{"label": "Home", "x": 12.75, "y": 4.5},{"label": "End", "x": 13.75, "y": 4.75}] + "layout": [ + {"x": 0, "y": 0.75}, + {"x": 1, "y": 0.5}, + {"x": 2, "y": 0}, + {"x": 3, "y": 0.25}, + {"x": 4, "y": 1}, + + {"x": 8.75, "y": 1}, + {"x": 9.75, "y": 0.5}, + {"x": 10.75, "y": 0}, + {"x": 11.75, "y": 0.5}, + {"x": 12.75, "y": 0.75}, + + {"x": 0, "y": 1.75}, + {"x": 1, "y": 1.5}, + {"x": 2, "y": 1}, + {"x": 3, "y": 1.25}, + {"x": 4, "y": 2}, + + {"x": 8.75, "y": 2}, + {"x": 9.75, "y": 1.5}, + {"x": 10.75, "y": 1}, + {"x": 11.75, "y": 1.5}, + {"x": 12.75, "y": 1.75}, + + {"x": 0, "y": 2.75}, + {"x": 1, "y": 2.5}, + {"x": 2, "y": 2}, + {"x": 3, "y": 2.25}, + {"x": 4, "y": 3}, + + {"x": 8.75, "y": 3}, + {"x": 9.75, "y": 2.5}, + {"x": 10.75, "y": 2}, + {"x": 11.75, "y": 2.5}, + {"x": 12.75, "y": 2.75}, + + {"x": 0, "y": 3.75}, + {"x": 1, "y": 3.5}, + {"x": 2, "y": 3}, + {"x": 3, "y": 3.25}, + {"x": 4, "y": 4}, + {"x": 5, "y": 4.5}, + + {"x": 7.75, "y": 4.5}, + {"x": 8.75, "y": 4}, + {"x": 9.75, "y": 3.5}, + {"x": 10.75, "y": 3}, + {"x": 11.75, "y": 3.5}, + {"x": 12.75, "y": 3.75} + ] } } } From af557948891e7e1b41f98d31dbf49df8f8b873cc Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 3 Jun 2022 07:02:46 -0400 Subject: [PATCH 21/21] Update keyboards/nacly/sodium50/info.json Co-authored-by: Ryan --- keyboards/nacly/sodium50/info.json | 60 +++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/keyboards/nacly/sodium50/info.json b/keyboards/nacly/sodium50/info.json index a8ff3ae00ebd..254e4a11cdf3 100644 --- a/keyboards/nacly/sodium50/info.json +++ b/keyboards/nacly/sodium50/info.json @@ -4,7 +4,65 @@ "maintainer": "nacly", "layouts": { "LAYOUT": { - "layout": [{"label": "Tab", "x": 0, "y": 1.75},{"label": "Q", "x": 1, "y": 1.75},{"label": "W", "x": 2, "y": 1.5},{"label": "E", "x": 3, "y": 1},{"label": "R", "x": 4, "y": 1.25},{"label": "T", "x": 5, "y": 2},{"label": "Y", "x": 9.75, "y": 2},{"label": "U", "x": 10.75, "y": 1.5},{"label": "I", "x": 11.75, "y": 1},{"label": "O", "x": 12.75, "y": 1.5},{"label": "P", "x": 13.75, "y": 1.75},{"label": "\\", "x": 14.75, "y": 1.75},{"label": "gui", "x": 0, "y": 2.75},{"label": "A", "x": 1, "y": 2.75},{"label": "S", "x": 2, "y": 2.5},{"label": "D", "x": 3, "y": 2},{"label": "F", "x": 4, "y": 2.25},{"label": "G", "x": 5, "y": 3},{"label": "H", "x": 9.75, "y": 3},{"label": "J", "x": 10.75, "y": 2.5},{"label": "K", "x": 11.75, "y": 2},{"label": "L", "x": 12.75, "y": 2.5},{"label": ";", "x": 13.75, "y": 2.75},{"label": "'", "x": 14.75, "y": 2.75},{"label": "shift", "x": 0, "y": 3.75},{"label": "Z", "x": 1, "y": 3.75},{"label": "X", "x": 2, "y": 3.5},{"label": "C", "x": 3, "y": 3},{"label": "V", "x": 4, "y": 3.25},{"label": "B", "x": 5, "y": 4},{"label": "N", "x": 9.75, "y": 4},{"label": "M", "x": 10.75, "y": 3.5},{"label": "<", "x": 11.75, "y": 3},{"label": ">", "x": 12.75, "y": 3.5},{"label": "?", "x": 13.75, "y": 3.75},{"label": "Shift", "x": 14.75, "y": 3.75},{"label": "ctrl", "x": 0, "y": 4.75},{"label": "gui", "x": 1, "y": 4.75},{"label": "ALT", "x": 2, "y": 4.5},{"label": "~", "x": 3, "y": 4},{"label": "+", "x": 4, "y": 4.25},{"label": "Backspace", "x": 5, "y": 5},{"label": "Del", "x": 6, "y": 5.5},{"label": "Enter", "x": 8.75, "y": 5.5},{"label": "Space", "x": 9.75, "y": 5},{"label": "[", "x": 10.75, "y": 4.5},{"label": "]", "x": 11.75, "y": 4},{"label": "Home", "x": 12.75, "y": 4.5},{"label": "End", "x": 13.75, "y": 4.75},{"label": "Esc", "x": 14.75, "y": 4.75}] + "layout": [ + {"x": 0, "y": 0.75}, + {"x": 1, "y": 0.75}, + {"x": 2, "y": 0.5}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0.25}, + {"x": 5, "y": 1}, + + {"x": 9.75, "y": 1}, + {"x": 10.75, "y": 0.5}, + {"x": 11.75, "y": 0}, + {"x": 12.75, "y": 0.5}, + {"x": 13.75, "y": 0.75}, + {"x": 14.75, "y": 0.75}, + + {"x": 0, "y": 1.75}, + {"x": 1, "y": 1.75}, + {"x": 2, "y": 1.5}, + {"x": 3, "y": 1}, + {"x": 4, "y": 1.25}, + {"x": 5, "y": 2}, + + {"x": 9.75, "y": 2}, + {"x": 10.75, "y": 1.5}, + {"x": 11.75, "y": 1}, + {"x": 12.75, "y": 1.5}, + {"x": 13.75, "y": 1.75}, + {"x": 14.75, "y": 1.75}, + + {"x": 0, "y": 2.75}, + {"x": 1, "y": 2.75}, + {"x": 2, "y": 2.5}, + {"x": 3, "y": 2}, + {"x": 4, "y": 2.25}, + {"x": 5, "y": 3}, + + {"x": 9.75, "y": 3}, + {"x": 10.75, "y": 2.5}, + {"x": 11.75, "y": 2}, + {"x": 12.75, "y": 2.5}, + {"x": 13.75, "y": 2.75}, + {"x": 14.75, "y": 2.75}, + + {"x": 0, "y": 3.75}, + {"x": 1, "y": 3.75}, + {"x": 2, "y": 3.5}, + {"x": 3, "y": 3}, + {"x": 4, "y": 3.25}, + {"x": 5, "y": 4}, + {"x": 6, "y": 4.5}, + + {"x": 8.75, "y": 4.5}, + {"x": 9.75, "y": 4}, + {"x": 10.75, "y": 3.5}, + {"x": 11.75, "y": 3}, + {"x": 12.75, "y": 3.5}, + {"x": 13.75, "y": 3.75}, + {"x": 14.75, "y": 3.75} + ] } } } \ No newline at end of file