From db52482ce91446fea4e2cde35d7adfa7a708fea6 Mon Sep 17 00:00:00 2001 From: falsonix Date: Wed, 10 Jul 2024 21:00:28 -0600 Subject: [PATCH 01/31] modified keyboard.json --- keyboards/falsonix/fx19/keyboard.json | 50 +++++++++++++++++++ .../falsonix/fx19/keymaps/default/keymap.c | 24 +++++++++ keyboards/falsonix/fx19/readme.md | 27 ++++++++++ 3 files changed, 101 insertions(+) create mode 100644 keyboards/falsonix/fx19/keyboard.json create mode 100644 keyboards/falsonix/fx19/keymaps/default/keymap.c create mode 100644 keyboards/falsonix/fx19/readme.md diff --git a/keyboards/falsonix/fx19/keyboard.json b/keyboards/falsonix/fx19/keyboard.json new file mode 100644 index 000000000000..40f0b5539ab4 --- /dev/null +++ b/keyboards/falsonix/fx19/keyboard.json @@ -0,0 +1,50 @@ +{ + "manufacturer": "Falsonix", + "keyboard_name": "falsonix/fx19", + "maintainer": "falsonix", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5"], + "rows": ["F0", "F1", "F4", "F5", "F6"] + }, + "processor": "atmega32u4", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0000", + "vid": "0xFEED" + }, + "layouts": { + "LAYOUT_numpad_4x5": { + "layout": [ + {"label":"Num Lock", "x":0, "y":0}, + {"label":"/", "x":1, "y":0}, + {"label":"*", "x":2, "y":0}, + {"label":"-", "x":3, "y":0}, + {"label":"7", "x":0, "y":1}, + {"label":"8", "x":1, "y":1}, + {"label":"9", "x":2, "y":1}, + {"label":"+", "x":3, "y":1, "h":2}, + {"label":"4", "x":0, "y":2}, + {"label":"5", "x":1, "y":2}, + {"label":"6", "x":2, "y":2}, + {"label":"1", "x":0, "y":3}, + {"label":"2", "x":1, "y":3}, + {"label":"3", "x":2, "y":3}, + {"label":"Enter", "x":3, "y":3, "h":2}, + {"label":"Win", "x":0, "y":4}, + {"label":"0", "x":1, "y":4}, + {"label":".", "x":2, "y":4} + ] + } + } +} diff --git a/keyboards/falsonix/fx19/keymaps/default/keymap.c b/keyboards/falsonix/fx19/keymaps/default/keymap.c new file mode 100644 index 000000000000..b907381f0fd1 --- /dev/null +++ b/keyboards/falsonix/fx19/keymaps/default/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┐ + * │ 7 │ 8 │ 9 │ │ + * ├───┼───┼───┤ + │ + * │ 4 │ 5 │ 6 │ │ + * ├───┼───┼───┼───┤ + * │ 1 │ 2 │ 3 │ │ + * ├───┴───┼───┤Ent│ + * │ 0 │ . │ │ + * └───────┴───┴───┘ + */ + [0] = LAYOUT_numpad_4x4( + KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_P4, KC_P5, KC_P6, + KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_PDOT + ) +}; diff --git a/keyboards/falsonix/fx19/readme.md b/keyboards/falsonix/fx19/readme.md new file mode 100644 index 000000000000..6986d82b970e --- /dev/null +++ b/keyboards/falsonix/fx19/readme.md @@ -0,0 +1,27 @@ +# falsonix/fx19 + +![falsonix/fx19](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [Christian Greene](https://github.com/falsonix) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make falsonix/fx19:default + +Flashing example for this keyboard: + + make falsonix/fx19:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## 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 `QK_BOOT` if it is available From 5d7f01de054c9a69d192e91e34a2187b78c4f991 Mon Sep 17 00:00:00 2001 From: falsonix Date: Wed, 10 Jul 2024 21:25:15 -0600 Subject: [PATCH 02/31] add proper keymap --- .vscode/settings.json | 4 ++- .../falsonix/fx19/keymaps/default/keymap.c | 33 ++++++++++--------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index f369ecb1748c..e19826580cc5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -30,5 +30,7 @@ }, "clangd.arguments": [ "--header-insertion=never" - ] + ], + "cmake.configureOnOpen": true, + "C_Cpp.errorSquiggles": "disabled" } diff --git a/keyboards/falsonix/fx19/keymaps/default/keymap.c b/keyboards/falsonix/fx19/keymaps/default/keymap.c index b907381f0fd1..b2db9bf5953d 100644 --- a/keyboards/falsonix/fx19/keymaps/default/keymap.c +++ b/keyboards/falsonix/fx19/keymaps/default/keymap.c @@ -5,20 +5,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* - * ┌───┬───┬───┬───┐ - * │ 7 │ 8 │ 9 │ │ - * ├───┼───┼───┤ + │ - * │ 4 │ 5 │ 6 │ │ - * ├───┼───┼───┼───┤ - * │ 1 │ 2 │ 3 │ │ - * ├───┴───┼───┤Ent│ - * │ 0 │ . │ │ - * └───────┴───┴───┘ - */ - [0] = LAYOUT_numpad_4x4( - KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_P4, KC_P5, KC_P6, - KC_P1, KC_P2, KC_P3, KC_PENT, - KC_P0, KC_PDOT + *┌───┬───┬───┬───┐ + * Num│ / │ * │ - │ + *├───┼───┼───┼───┤ + *│ 7 │ 8 │ 9 │ + │ + *├───┼───┼───┤ │ + *│ 4 │ 5 │ 6 │ │ + *├───┼───┼───┤───┤ + *│ 1 │ 2 │ 3 │ │ + *├───┼───┼───┤Ent│ + *│Win│ 0 │ . │ │ + *┴───┴───┴───┴───┘ + */ + [0] = LAYOUT_numpad_4x5( + KC_LNUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_P4, KC_P5, KC_P6, + KC_P1, KC_P2, KC_P3, KC_PENT, + KC_RWIN, KC_P0, KC_PDOT ) }; From f16e395deb9f49ffa9dc1e974e42a170cba52a8e Mon Sep 17 00:00:00 2001 From: falsonix Date: Wed, 10 Jul 2024 21:49:25 -0600 Subject: [PATCH 03/31] update readme.md --- keyboards/falsonix/fx19/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/falsonix/fx19/readme.md b/keyboards/falsonix/fx19/readme.md index 6986d82b970e..02fee86f6ef1 100644 --- a/keyboards/falsonix/fx19/readme.md +++ b/keyboards/falsonix/fx19/readme.md @@ -4,9 +4,9 @@ *A short description of the keyboard/project* -* Keyboard Maintainer: [Christian Greene](https://github.com/falsonix) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* +* Keyboard Maintainer: [falsonix](https://github.com/falsonix) +* Hardware Supported: *FX19 Numpads* +* Hardware Availability: *Coming soon!* Make example for this keyboard (after setting up your build environment): From 26da65ef9bc1c7525ca0b8a1f9d4aef9b7f3051b Mon Sep 17 00:00:00 2001 From: falsonix Date: Thu, 11 Jul 2024 12:47:49 -0600 Subject: [PATCH 04/31] add config for RGB and bootloader --- .vscode/settings.json | 3 ++- keyboards/falsonix/fx19/config.h | 5 +++++ keyboards/falsonix/fx19/rules.mk | 7 +++++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 keyboards/falsonix/fx19/config.h create mode 100644 keyboards/falsonix/fx19/rules.mk diff --git a/.vscode/settings.json b/.vscode/settings.json index e19826580cc5..a6a65080a25f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -32,5 +32,6 @@ "--header-insertion=never" ], "cmake.configureOnOpen": true, - "C_Cpp.errorSquiggles": "disabled" + "C_Cpp.errorSquiggles": "disabled", + "cmake.ignoreCMakeListsMissing": true } diff --git a/keyboards/falsonix/fx19/config.h b/keyboards/falsonix/fx19/config.h new file mode 100644 index 000000000000..730340bad843 --- /dev/null +++ b/keyboards/falsonix/fx19/config.h @@ -0,0 +1,5 @@ +// Written by Falsonix +// Original on 7/11/2024 + +#define WS2812_DI_PIN F7 // Define pin for RGB lighting +#define RGBLIGHT_DEFAULT_ON // Set RGB lighting on by default \ No newline at end of file diff --git a/keyboards/falsonix/fx19/rules.mk b/keyboards/falsonix/fx19/rules.mk new file mode 100644 index 000000000000..2b60c338deb0 --- /dev/null +++ b/keyboards/falsonix/fx19/rules.mk @@ -0,0 +1,7 @@ +# Written by Falsonix +# Original on 7/11/2024 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +RGBLIGHT_ENABLE = yes # Enable RGB lighting \ No newline at end of file From 2b8616adb8bac4e2ef2b40ca9bb8ea638dfe76da Mon Sep 17 00:00:00 2001 From: falsonix Date: Thu, 25 Jul 2024 16:52:58 -0600 Subject: [PATCH 05/31] change some settings due to compilation errors --- keyboards/falsonix/fx19/keyboard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/falsonix/fx19/keyboard.json b/keyboards/falsonix/fx19/keyboard.json index 40f0b5539ab4..668835f88b83 100644 --- a/keyboards/falsonix/fx19/keyboard.json +++ b/keyboards/falsonix/fx19/keyboard.json @@ -25,7 +25,7 @@ }, "layouts": { "LAYOUT_numpad_4x5": { - "layout": [ + "matrix": [ {"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, From 88569c45cc9dac69e66d15a9446974508c227893 Mon Sep 17 00:00:00 2001 From: falsonix Date: Thu, 25 Jul 2024 17:08:40 -0600 Subject: [PATCH 06/31] disable RGB lighting temporarily --- keyboards/falsonix/fx19/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/falsonix/fx19/rules.mk b/keyboards/falsonix/fx19/rules.mk index 2b60c338deb0..c2ad415837a2 100644 --- a/keyboards/falsonix/fx19/rules.mk +++ b/keyboards/falsonix/fx19/rules.mk @@ -4,4 +4,4 @@ # Bootloader selection BOOTLOADER = atmel-dfu -RGBLIGHT_ENABLE = yes # Enable RGB lighting \ No newline at end of file +# RGBLIGHT_ENABLE = yes # Enable RGB lighting \ No newline at end of file From ec92e887fb86c8230acc2682f5df2baefca2fd32 Mon Sep 17 00:00:00 2001 From: falsonix Date: Thu, 25 Jul 2024 17:22:07 -0600 Subject: [PATCH 07/31] fix some led stuff maybe --- keyboards/falsonix/fx19/config.h | 3 ++- keyboards/falsonix/fx19/keyboard.json | 2 +- keyboards/falsonix/fx19/rules.mk | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/keyboards/falsonix/fx19/config.h b/keyboards/falsonix/fx19/config.h index 730340bad843..1a399f84f7dc 100644 --- a/keyboards/falsonix/fx19/config.h +++ b/keyboards/falsonix/fx19/config.h @@ -2,4 +2,5 @@ // Original on 7/11/2024 #define WS2812_DI_PIN F7 // Define pin for RGB lighting -#define RGBLIGHT_DEFAULT_ON // Set RGB lighting on by default \ No newline at end of file +#define RGBLIGHT_DEFAULT_ON // Set RGB lighting on by default +#define RGB_MATRIX_LED_COUNT 6 // 6 LEDs onboard \ No newline at end of file diff --git a/keyboards/falsonix/fx19/keyboard.json b/keyboards/falsonix/fx19/keyboard.json index 668835f88b83..40f0b5539ab4 100644 --- a/keyboards/falsonix/fx19/keyboard.json +++ b/keyboards/falsonix/fx19/keyboard.json @@ -25,7 +25,7 @@ }, "layouts": { "LAYOUT_numpad_4x5": { - "matrix": [ + "layout": [ {"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, diff --git a/keyboards/falsonix/fx19/rules.mk b/keyboards/falsonix/fx19/rules.mk index c2ad415837a2..9fbadfc5b918 100644 --- a/keyboards/falsonix/fx19/rules.mk +++ b/keyboards/falsonix/fx19/rules.mk @@ -4,4 +4,5 @@ # Bootloader selection BOOTLOADER = atmel-dfu -# RGBLIGHT_ENABLE = yes # Enable RGB lighting \ No newline at end of file +RGB_MATRIX_ENABLE = yes # Enable RGB matrix +RGB_MATRIX_DRIVER = ws2812 # Set LED type to the WS2812 \ No newline at end of file From b3e2b3b423ca52828a8d5b738a32187dd2717943 Mon Sep 17 00:00:00 2001 From: falsonix Date: Thu, 25 Jul 2024 17:30:22 -0600 Subject: [PATCH 08/31] rename config.h so that it compiles properly --- keyboards/falsonix/fx19/{config.h => fx19.h} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename keyboards/falsonix/fx19/{config.h => fx19.h} (100%) diff --git a/keyboards/falsonix/fx19/config.h b/keyboards/falsonix/fx19/fx19.h similarity index 100% rename from keyboards/falsonix/fx19/config.h rename to keyboards/falsonix/fx19/fx19.h From 108d4f5fcf5c4820861cc8197b6e12f4b6567909 Mon Sep 17 00:00:00 2001 From: falsonix Date: Thu, 25 Jul 2024 17:35:28 -0600 Subject: [PATCH 09/31] rename yet another file lol --- keyboards/falsonix/fx19/{keyboard.json => info.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename keyboards/falsonix/fx19/{keyboard.json => info.json} (100%) diff --git a/keyboards/falsonix/fx19/keyboard.json b/keyboards/falsonix/fx19/info.json similarity index 100% rename from keyboards/falsonix/fx19/keyboard.json rename to keyboards/falsonix/fx19/info.json From 6c5e4a3a4cf83c81b977406d4b565f5d1ea99098 Mon Sep 17 00:00:00 2001 From: falsonix Date: Thu, 25 Jul 2024 18:02:28 -0600 Subject: [PATCH 10/31] fix matrix definitions in config.h --- keyboards/falsonix/fx19/fx19.h | 20 ++++++++++++++++++- .../fx19/{info.json => keyboard.json} | 0 2 files changed, 19 insertions(+), 1 deletion(-) rename keyboards/falsonix/fx19/{info.json => keyboard.json} (100%) diff --git a/keyboards/falsonix/fx19/fx19.h b/keyboards/falsonix/fx19/fx19.h index 1a399f84f7dc..ae3ff3ccb19c 100644 --- a/keyboards/falsonix/fx19/fx19.h +++ b/keyboards/falsonix/fx19/fx19.h @@ -1,6 +1,24 @@ // Written by Falsonix // Original on 7/11/2024 +#pragma once + +#include "quantum.h" // include firmware dependencies + #define WS2812_DI_PIN F7 // Define pin for RGB lighting #define RGBLIGHT_DEFAULT_ON // Set RGB lighting on by default -#define RGB_MATRIX_LED_COUNT 6 // 6 LEDs onboard \ No newline at end of file +#define RGB_MATRIX_LED_COUNT 6 // 6 LEDs onboard + +#define LAYOUT_numpad_4x5( \ + k00, k01, k02, k03, \ + k04, k05, k06, \ + k07, k08, k09, k16, \ + k10, k11, k12, \ + k13, k14, k15, k17 \ +) { \ + { k00, k01, k02, k03 }, \ + { k04, k05, k06, KC_NO }, \ + { k07, k08, k09, k16 }, \ + { k10, k11, k12, KC_NO }, \ + { k13, k14, k15, k17 } \ +} \ No newline at end of file diff --git a/keyboards/falsonix/fx19/info.json b/keyboards/falsonix/fx19/keyboard.json similarity index 100% rename from keyboards/falsonix/fx19/info.json rename to keyboards/falsonix/fx19/keyboard.json From f6ee5f1fa789c5d79086bd0792877d9d751150f8 Mon Sep 17 00:00:00 2001 From: falsonix Date: Thu, 25 Jul 2024 18:06:59 -0600 Subject: [PATCH 11/31] move layout info --- keyboards/falsonix/fx19/fx19.h | 16 +--------------- keyboards/falsonix/fx19/keymaps/default/keymap.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/keyboards/falsonix/fx19/fx19.h b/keyboards/falsonix/fx19/fx19.h index ae3ff3ccb19c..aa9b0e7410ff 100644 --- a/keyboards/falsonix/fx19/fx19.h +++ b/keyboards/falsonix/fx19/fx19.h @@ -7,18 +7,4 @@ #define WS2812_DI_PIN F7 // Define pin for RGB lighting #define RGBLIGHT_DEFAULT_ON // Set RGB lighting on by default -#define RGB_MATRIX_LED_COUNT 6 // 6 LEDs onboard - -#define LAYOUT_numpad_4x5( \ - k00, k01, k02, k03, \ - k04, k05, k06, \ - k07, k08, k09, k16, \ - k10, k11, k12, \ - k13, k14, k15, k17 \ -) { \ - { k00, k01, k02, k03 }, \ - { k04, k05, k06, KC_NO }, \ - { k07, k08, k09, k16 }, \ - { k10, k11, k12, KC_NO }, \ - { k13, k14, k15, k17 } \ -} \ No newline at end of file +#define RGB_MATRIX_LED_COUNT 6 // 6 LEDs onboard \ No newline at end of file diff --git a/keyboards/falsonix/fx19/keymaps/default/keymap.c b/keyboards/falsonix/fx19/keymaps/default/keymap.c index b2db9bf5953d..d5f5f681f2ca 100644 --- a/keyboards/falsonix/fx19/keymaps/default/keymap.c +++ b/keyboards/falsonix/fx19/keymaps/default/keymap.c @@ -3,6 +3,20 @@ #include QMK_KEYBOARD_H +#define LAYOUT_numpad_4x5( \ + k00, k01, k02, k03, \ + k04, k05, k06, \ + k07, k08, k09, k16, \ + k10, k11, k12, \ + k13, k14, k15, k17 \ +) { \ + { k00, k01, k02, k03 }, \ + { k04, k05, k06, KC_NO }, \ + { k07, k08, k09, k16 }, \ + { k10, k11, k12, KC_NO }, \ + { k13, k14, k15, k17 } \ +} + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* *┌───┬───┬───┬───┐ From e919e8e0993efcd1aa7351e38bfa036cd9c860f1 Mon Sep 17 00:00:00 2001 From: falsonix Date: Thu, 25 Jul 2024 18:50:52 -0600 Subject: [PATCH 12/31] fix matrix once and for all (thanks qmk discord) --- keyboards/falsonix/fx19/keyboard.json | 44 +++++++++++++++------------ 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/keyboards/falsonix/fx19/keyboard.json b/keyboards/falsonix/fx19/keyboard.json index 40f0b5539ab4..66d2071583df 100644 --- a/keyboards/falsonix/fx19/keyboard.json +++ b/keyboards/falsonix/fx19/keyboard.json @@ -24,26 +24,30 @@ "vid": "0xFEED" }, "layouts": { - "LAYOUT_numpad_4x5": { - "layout": [ - {"label":"Num Lock", "x":0, "y":0}, - {"label":"/", "x":1, "y":0}, - {"label":"*", "x":2, "y":0}, - {"label":"-", "x":3, "y":0}, - {"label":"7", "x":0, "y":1}, - {"label":"8", "x":1, "y":1}, - {"label":"9", "x":2, "y":1}, - {"label":"+", "x":3, "y":1, "h":2}, - {"label":"4", "x":0, "y":2}, - {"label":"5", "x":1, "y":2}, - {"label":"6", "x":2, "y":2}, - {"label":"1", "x":0, "y":3}, - {"label":"2", "x":1, "y":3}, - {"label":"3", "x":2, "y":3}, - {"label":"Enter", "x":3, "y":3, "h":2}, - {"label":"Win", "x":0, "y":4}, - {"label":"0", "x":1, "y":4}, - {"label":".", "x":2, "y":4} + "LAYOUT_numpad_4x5": { + "layout": [ + {"matrix": [0, 0], "x":0, "y":0}, + {"matrix": [0, 1], "x":1, "y":0}, + {"matrix": [0, 2], "x":2, "y":0}, + {"matrix": [0, 3], "x":3, "y":0}, + + {"matrix": [1, 0], "x":0, "y":1}, + {"matrix": [1, 1], "x":1, "y":1}, + {"matrix": [1, 2], "x":2, "y":1}, + + {"matrix": [2, 0], "x":0, "y":2}, + {"matrix": [2, 1], "x":1, "y":2}, + {"matrix": [2, 2], "x":2, "y":2}, + {"matrix": [2, 3], "x":3, "y":2, "h":2}, + + {"matrix": [3, 0], "x":0, "y":3}, + {"matrix": [3, 1], "x":1, "y":3}, + {"matrix": [3, 2], "x":2, "y":3}, + + {"matrix": [4, 0], "x":0, "y":4}, + {"matrix": [4, 1], "x":1, "y":4}, + {"matrix": [4, 2], "x":2, "y":4}, + {"matrix": [4, 3], "x":3, "y":3, "h":2} ] } } From 0bb712f34714b021526cd529a221432922e3be65 Mon Sep 17 00:00:00 2001 From: falsonix Date: Thu, 25 Jul 2024 20:14:07 -0600 Subject: [PATCH 13/31] fixing some stuff with RGB --- keyboards/falsonix/fx19/fx19.h | 2 +- keyboards/falsonix/fx19/keymaps/default/keymap.c | 14 -------------- keyboards/falsonix/fx19/rules.mk | 4 ++-- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/keyboards/falsonix/fx19/fx19.h b/keyboards/falsonix/fx19/fx19.h index aa9b0e7410ff..840210e61048 100644 --- a/keyboards/falsonix/fx19/fx19.h +++ b/keyboards/falsonix/fx19/fx19.h @@ -7,4 +7,4 @@ #define WS2812_DI_PIN F7 // Define pin for RGB lighting #define RGBLIGHT_DEFAULT_ON // Set RGB lighting on by default -#define RGB_MATRIX_LED_COUNT 6 // 6 LEDs onboard \ No newline at end of file +#define RGBLIGHT_LED_COUNT 6 // 6 LEDs onboard \ No newline at end of file diff --git a/keyboards/falsonix/fx19/keymaps/default/keymap.c b/keyboards/falsonix/fx19/keymaps/default/keymap.c index d5f5f681f2ca..b2db9bf5953d 100644 --- a/keyboards/falsonix/fx19/keymaps/default/keymap.c +++ b/keyboards/falsonix/fx19/keymaps/default/keymap.c @@ -3,20 +3,6 @@ #include QMK_KEYBOARD_H -#define LAYOUT_numpad_4x5( \ - k00, k01, k02, k03, \ - k04, k05, k06, \ - k07, k08, k09, k16, \ - k10, k11, k12, \ - k13, k14, k15, k17 \ -) { \ - { k00, k01, k02, k03 }, \ - { k04, k05, k06, KC_NO }, \ - { k07, k08, k09, k16 }, \ - { k10, k11, k12, KC_NO }, \ - { k13, k14, k15, k17 } \ -} - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* *┌───┬───┬───┬───┐ diff --git a/keyboards/falsonix/fx19/rules.mk b/keyboards/falsonix/fx19/rules.mk index 9fbadfc5b918..0a5fbcaf47b9 100644 --- a/keyboards/falsonix/fx19/rules.mk +++ b/keyboards/falsonix/fx19/rules.mk @@ -4,5 +4,5 @@ # Bootloader selection BOOTLOADER = atmel-dfu -RGB_MATRIX_ENABLE = yes # Enable RGB matrix -RGB_MATRIX_DRIVER = ws2812 # Set LED type to the WS2812 \ No newline at end of file +RGBLIGHT_ENABLE = yes # enable RGB lighting +RGBLIGHT_DRIVER = ws2812 # specify led type \ No newline at end of file From 29f51aeccec0bb8d8a9a24f4cc5fc7b1fdf5a961 Mon Sep 17 00:00:00 2001 From: falsonix Date: Fri, 26 Jul 2024 17:12:40 -0600 Subject: [PATCH 14/31] fix stuff once and for all --- keyboards/falsonix/fx19/fx19.h | 10 ---------- keyboards/falsonix/fx19/keyboard.json | 6 ++++++ keyboards/falsonix/fx19/rules.mk | 8 -------- 3 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 keyboards/falsonix/fx19/fx19.h delete mode 100644 keyboards/falsonix/fx19/rules.mk diff --git a/keyboards/falsonix/fx19/fx19.h b/keyboards/falsonix/fx19/fx19.h deleted file mode 100644 index 840210e61048..000000000000 --- a/keyboards/falsonix/fx19/fx19.h +++ /dev/null @@ -1,10 +0,0 @@ -// Written by Falsonix -// Original on 7/11/2024 - -#pragma once - -#include "quantum.h" // include firmware dependencies - -#define WS2812_DI_PIN F7 // Define pin for RGB lighting -#define RGBLIGHT_DEFAULT_ON // Set RGB lighting on by default -#define RGBLIGHT_LED_COUNT 6 // 6 LEDs onboard \ No newline at end of file diff --git a/keyboards/falsonix/fx19/keyboard.json b/keyboards/falsonix/fx19/keyboard.json index 66d2071583df..615df114b86d 100644 --- a/keyboards/falsonix/fx19/keyboard.json +++ b/keyboards/falsonix/fx19/keyboard.json @@ -12,6 +12,12 @@ "mousekey": true, "nkro": true }, + "rgblight": { + "led_count": 6 + }, + "ws2812": { + "pin": "D7" + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/falsonix/fx19/rules.mk b/keyboards/falsonix/fx19/rules.mk deleted file mode 100644 index 0a5fbcaf47b9..000000000000 --- a/keyboards/falsonix/fx19/rules.mk +++ /dev/null @@ -1,8 +0,0 @@ -# Written by Falsonix -# Original on 7/11/2024 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -RGBLIGHT_ENABLE = yes # enable RGB lighting -RGBLIGHT_DRIVER = ws2812 # specify led type \ No newline at end of file From 2fefcd7df55f2e52281283f6d950e03f38f1cdf7 Mon Sep 17 00:00:00 2001 From: falsonix Date: Sun, 28 Jul 2024 15:13:12 -0600 Subject: [PATCH 15/31] fix some keymapping issues --- keyboards/falsonix/fx19/keyboard.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/falsonix/fx19/keyboard.json b/keyboards/falsonix/fx19/keyboard.json index 615df114b86d..7a0ec9157338 100644 --- a/keyboards/falsonix/fx19/keyboard.json +++ b/keyboards/falsonix/fx19/keyboard.json @@ -43,8 +43,8 @@ {"matrix": [2, 0], "x":0, "y":2}, {"matrix": [2, 1], "x":1, "y":2}, - {"matrix": [2, 2], "x":2, "y":2}, - {"matrix": [2, 3], "x":3, "y":2, "h":2}, + {"matrix": [2, 2], "x":2, "y":2}, + {"matrix": [2, 3], "x":3, "y":2}, {"matrix": [3, 0], "x":0, "y":3}, {"matrix": [3, 1], "x":1, "y":3}, @@ -53,7 +53,7 @@ {"matrix": [4, 0], "x":0, "y":4}, {"matrix": [4, 1], "x":1, "y":4}, {"matrix": [4, 2], "x":2, "y":4}, - {"matrix": [4, 3], "x":3, "y":3, "h":2} + {"matrix": [4, 3], "x":3, "y":3} ] } } From 398172e065935cd3a4063520cbce3af69ecefa03 Mon Sep 17 00:00:00 2001 From: falsonix Date: Sun, 28 Jul 2024 15:13:57 -0600 Subject: [PATCH 16/31] fixed a typo in layout config --- keyboards/falsonix/fx19/keyboard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/falsonix/fx19/keyboard.json b/keyboards/falsonix/fx19/keyboard.json index 7a0ec9157338..8ff051044be7 100644 --- a/keyboards/falsonix/fx19/keyboard.json +++ b/keyboards/falsonix/fx19/keyboard.json @@ -53,7 +53,7 @@ {"matrix": [4, 0], "x":0, "y":4}, {"matrix": [4, 1], "x":1, "y":4}, {"matrix": [4, 2], "x":2, "y":4}, - {"matrix": [4, 3], "x":3, "y":3} + {"matrix": [4, 3], "x":3, "y":4} ] } } From b224534b272c1a8c0d20a3f37076c09196cf0e4d Mon Sep 17 00:00:00 2001 From: falsonix Date: Sun, 28 Jul 2024 15:47:12 -0600 Subject: [PATCH 17/31] more layout fixes hopefully --- keyboards/falsonix/fx19/keyboard.json | 4 ++-- keyboards/falsonix/fx19/keymaps/default/keymap.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/falsonix/fx19/keyboard.json b/keyboards/falsonix/fx19/keyboard.json index 8ff051044be7..42a59433bcb5 100644 --- a/keyboards/falsonix/fx19/keyboard.json +++ b/keyboards/falsonix/fx19/keyboard.json @@ -44,7 +44,7 @@ {"matrix": [2, 0], "x":0, "y":2}, {"matrix": [2, 1], "x":1, "y":2}, {"matrix": [2, 2], "x":2, "y":2}, - {"matrix": [2, 3], "x":3, "y":2}, + {"matrix": [2, 3], "x":3, "y":2, "h": 2}, {"matrix": [3, 0], "x":0, "y":3}, {"matrix": [3, 1], "x":1, "y":3}, @@ -53,7 +53,7 @@ {"matrix": [4, 0], "x":0, "y":4}, {"matrix": [4, 1], "x":1, "y":4}, {"matrix": [4, 2], "x":2, "y":4}, - {"matrix": [4, 3], "x":3, "y":4} + {"matrix": [4, 3], "x":3, "y":4, "h": 2} ] } } diff --git a/keyboards/falsonix/fx19/keymaps/default/keymap.c b/keyboards/falsonix/fx19/keymaps/default/keymap.c index b2db9bf5953d..259606d78b6d 100644 --- a/keyboards/falsonix/fx19/keymaps/default/keymap.c +++ b/keyboards/falsonix/fx19/keymaps/default/keymap.c @@ -19,9 +19,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [0] = LAYOUT_numpad_4x5( KC_LNUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_P4, KC_P5, KC_P6, - KC_P1, KC_P2, KC_P3, KC_PENT, - KC_RWIN, KC_P0, KC_PDOT + KC_P7, KC_P8, KC_P9, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, + KC_RWIN, KC_P0, KC_PDOT, KC_PENT ) }; From fbe8e27d8d09bf07e3762a5a060b0140d89243de Mon Sep 17 00:00:00 2001 From: falsonix Date: Sun, 28 Jul 2024 17:04:01 -0600 Subject: [PATCH 18/31] add rgblight settings to keyboard.json --- keyboards/falsonix/fx19/keyboard.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/falsonix/fx19/keyboard.json b/keyboards/falsonix/fx19/keyboard.json index 42a59433bcb5..320e90f6827d 100644 --- a/keyboards/falsonix/fx19/keyboard.json +++ b/keyboards/falsonix/fx19/keyboard.json @@ -13,7 +13,9 @@ "nkro": true }, "rgblight": { - "led_count": 6 + "led_count": 6, + "default_on": true, + "default_mode": "RGBLIGHT_MODE_RAINBOW_MOOD" }, "ws2812": { "pin": "D7" From f7e46777bdf8935b56b9a06566cfc36e7afbd04b Mon Sep 17 00:00:00 2001 From: falsonix Date: Sun, 28 Jul 2024 17:54:31 -0600 Subject: [PATCH 19/31] more rgb stuff --- keyboards/falsonix/fx19/config.h | 5 +++++ keyboards/falsonix/fx19/keyboard.json | 4 +--- keyboards/falsonix/fx19/rules.mk | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 keyboards/falsonix/fx19/config.h create mode 100644 keyboards/falsonix/fx19/rules.mk diff --git a/keyboards/falsonix/fx19/config.h b/keyboards/falsonix/fx19/config.h new file mode 100644 index 000000000000..089b02653e1c --- /dev/null +++ b/keyboards/falsonix/fx19/config.h @@ -0,0 +1,5 @@ +#pragma once + +#define RGBLIGHT_DEFAULT_ON = true +#define RGBLIGHT_DEFAULT_MODE = RGBLIGHT_MODE_RAINBOW_MOOD +#define RGBLIGHT_SLEEP \ No newline at end of file diff --git a/keyboards/falsonix/fx19/keyboard.json b/keyboards/falsonix/fx19/keyboard.json index 320e90f6827d..c18383154583 100644 --- a/keyboards/falsonix/fx19/keyboard.json +++ b/keyboards/falsonix/fx19/keyboard.json @@ -13,9 +13,7 @@ "nkro": true }, "rgblight": { - "led_count": 6, - "default_on": true, - "default_mode": "RGBLIGHT_MODE_RAINBOW_MOOD" + "led_count": 5 }, "ws2812": { "pin": "D7" diff --git a/keyboards/falsonix/fx19/rules.mk b/keyboards/falsonix/fx19/rules.mk new file mode 100644 index 000000000000..7ad666d1a383 --- /dev/null +++ b/keyboards/falsonix/fx19/rules.mk @@ -0,0 +1 @@ +RGBLIGHT_ENABLE = yes \ No newline at end of file From e067a1e6b6bc65879434df52df3f2ec473ef3110 Mon Sep 17 00:00:00 2001 From: falsonix Date: Sun, 28 Jul 2024 20:20:53 -0600 Subject: [PATCH 20/31] just kind of messing about and hoping that something works lmao --- keyboards/falsonix/fx19/config.h | 5 ----- keyboards/falsonix/fx19/keyboard.json | 9 ++++++++- keyboards/falsonix/fx19/rules.mk | 1 - 3 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 keyboards/falsonix/fx19/config.h delete mode 100644 keyboards/falsonix/fx19/rules.mk diff --git a/keyboards/falsonix/fx19/config.h b/keyboards/falsonix/fx19/config.h deleted file mode 100644 index 089b02653e1c..000000000000 --- a/keyboards/falsonix/fx19/config.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#define RGBLIGHT_DEFAULT_ON = true -#define RGBLIGHT_DEFAULT_MODE = RGBLIGHT_MODE_RAINBOW_MOOD -#define RGBLIGHT_SLEEP \ No newline at end of file diff --git a/keyboards/falsonix/fx19/keyboard.json b/keyboards/falsonix/fx19/keyboard.json index c18383154583..601476cae7a9 100644 --- a/keyboards/falsonix/fx19/keyboard.json +++ b/keyboards/falsonix/fx19/keyboard.json @@ -13,7 +13,14 @@ "nkro": true }, "rgblight": { - "led_count": 5 + "led_count": 5, + "animations": { + "rainbow_mood": true, + "rainbow_swirl": true + }, + "default": { + "animation": "rainbow_swirl" + } }, "ws2812": { "pin": "D7" diff --git a/keyboards/falsonix/fx19/rules.mk b/keyboards/falsonix/fx19/rules.mk deleted file mode 100644 index 7ad666d1a383..000000000000 --- a/keyboards/falsonix/fx19/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes \ No newline at end of file From 51a638108d01a42eed8debf8a1d3e7001341f94c Mon Sep 17 00:00:00 2001 From: falsonix Date: Sun, 28 Jul 2024 21:53:44 -0600 Subject: [PATCH 21/31] fix rgb once and for all (i tested, it works irl yay) --- keyboards/falsonix/fx19/keyboard.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/keyboards/falsonix/fx19/keyboard.json b/keyboards/falsonix/fx19/keyboard.json index 601476cae7a9..49340e89d38b 100644 --- a/keyboards/falsonix/fx19/keyboard.json +++ b/keyboards/falsonix/fx19/keyboard.json @@ -10,7 +10,8 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgblight": true }, "rgblight": { "led_count": 5, @@ -23,7 +24,7 @@ } }, "ws2812": { - "pin": "D7" + "pin": "F7" }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5"], From 7cce73d7b389ab7e458a1ad34beb25cd8881a277 Mon Sep 17 00:00:00 2001 From: falsonix Date: Mon, 29 Jul 2024 21:06:58 -0600 Subject: [PATCH 22/31] add support for via configurator --- keyboards/falsonix/fx19/keyboard.json | 2 +- keyboards/falsonix/fx19/keymaps/via/keymap.c | 27 ++++++++++++++++++++ keyboards/falsonix/fx19/keymaps/via/rules.mk | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 keyboards/falsonix/fx19/keymaps/via/keymap.c create mode 100644 keyboards/falsonix/fx19/keymaps/via/rules.mk diff --git a/keyboards/falsonix/fx19/keyboard.json b/keyboards/falsonix/fx19/keyboard.json index 49340e89d38b..2ad22a7c2678 100644 --- a/keyboards/falsonix/fx19/keyboard.json +++ b/keyboards/falsonix/fx19/keyboard.json @@ -35,7 +35,7 @@ "usb": { "device_version": "1.0.0", "pid": "0x0000", - "vid": "0xFEED" + "vid": "0x4658" }, "layouts": { "LAYOUT_numpad_4x5": { diff --git a/keyboards/falsonix/fx19/keymaps/via/keymap.c b/keyboards/falsonix/fx19/keymaps/via/keymap.c new file mode 100644 index 000000000000..259606d78b6d --- /dev/null +++ b/keyboards/falsonix/fx19/keymaps/via/keymap.c @@ -0,0 +1,27 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + *┌───┬───┬───┬───┐ + * Num│ / │ * │ - │ + *├───┼───┼───┼───┤ + *│ 7 │ 8 │ 9 │ + │ + *├───┼───┼───┤ │ + *│ 4 │ 5 │ 6 │ │ + *├───┼───┼───┤───┤ + *│ 1 │ 2 │ 3 │ │ + *├───┼───┼───┤Ent│ + *│Win│ 0 │ . │ │ + *┴───┴───┴───┴───┘ + */ + [0] = LAYOUT_numpad_4x5( + KC_LNUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, + KC_RWIN, KC_P0, KC_PDOT, KC_PENT + ) +}; diff --git a/keyboards/falsonix/fx19/keymaps/via/rules.mk b/keyboards/falsonix/fx19/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/falsonix/fx19/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file From 044aa3d0d2a683ec07c7d6865e23a7f199eeee63 Mon Sep 17 00:00:00 2001 From: Christian Greene <95236755+falsonix@users.noreply.github.com> Date: Tue, 30 Jul 2024 10:25:39 -0600 Subject: [PATCH 23/31] Update readme.md --- keyboards/falsonix/fx19/readme.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/keyboards/falsonix/fx19/readme.md b/keyboards/falsonix/fx19/readme.md index 02fee86f6ef1..66222353d4b1 100644 --- a/keyboards/falsonix/fx19/readme.md +++ b/keyboards/falsonix/fx19/readme.md @@ -1,12 +1,14 @@ # falsonix/fx19 -![falsonix/fx19](imgur.com image replace me!) +![falsonix/fx19](https://github.com/falsonix/fx19/blob/main/fx19-enclosure-v45.png) -*A short description of the keyboard/project* +A small, 18-key number pad for use with modern computers. (Yes, the name says 19 and this is due to me miscounting the keys and realizing only after I'd named everything in firmware and hardware). Includes RGB for maximum performance. + +Support for VIA is also included for easy reconfiguration. * Keyboard Maintainer: [falsonix](https://github.com/falsonix) * Hardware Supported: *FX19 Numpads* -* Hardware Availability: *Coming soon!* +* Hardware Availability: *DIY by the enduser* Make example for this keyboard (after setting up your build environment): @@ -20,8 +22,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to ## 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 -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the top left key) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the front of the PCB From 1a4edaf059e4b6243f8b8e4b39b9c16d3330322e Mon Sep 17 00:00:00 2001 From: falsonix Date: Tue, 30 Jul 2024 10:29:47 -0600 Subject: [PATCH 24/31] update gitignore to exclude my via configs --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 35b128606d7d..e8aad66ac5bf 100644 --- a/.gitignore +++ b/.gitignore @@ -117,3 +117,4 @@ compile_commands.json # VIA(L) files that don't belong in QMK repo via*.json /keyboards/**/keymaps/vial/* +/keyboards/**/keymaps/via/* From 75e05706c0684d3412ff8cb84cd4b14591a6e85d Mon Sep 17 00:00:00 2001 From: Christian Greene <95236755+falsonix@users.noreply.github.com> Date: Tue, 30 Jul 2024 10:30:08 -0600 Subject: [PATCH 25/31] Update readme.md --- keyboards/falsonix/fx19/readme.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/falsonix/fx19/readme.md b/keyboards/falsonix/fx19/readme.md index 66222353d4b1..2892dc7d7df3 100644 --- a/keyboards/falsonix/fx19/readme.md +++ b/keyboards/falsonix/fx19/readme.md @@ -4,8 +4,6 @@ A small, 18-key number pad for use with modern computers. (Yes, the name says 19 and this is due to me miscounting the keys and realizing only after I'd named everything in firmware and hardware). Includes RGB for maximum performance. -Support for VIA is also included for easy reconfiguration. - * Keyboard Maintainer: [falsonix](https://github.com/falsonix) * Hardware Supported: *FX19 Numpads* * Hardware Availability: *DIY by the enduser* From 0054861b9cfe8f0fdbb67c95fa710eeb5dea8ed0 Mon Sep 17 00:00:00 2001 From: Christian Greene <95236755+falsonix@users.noreply.github.com> Date: Tue, 30 Jul 2024 10:30:48 -0600 Subject: [PATCH 26/31] Delete keyboards/falsonix/fx19/keymaps/via directory --- keyboards/falsonix/fx19/keymaps/via/keymap.c | 27 -------------------- keyboards/falsonix/fx19/keymaps/via/rules.mk | 1 - 2 files changed, 28 deletions(-) delete mode 100644 keyboards/falsonix/fx19/keymaps/via/keymap.c delete mode 100644 keyboards/falsonix/fx19/keymaps/via/rules.mk diff --git a/keyboards/falsonix/fx19/keymaps/via/keymap.c b/keyboards/falsonix/fx19/keymaps/via/keymap.c deleted file mode 100644 index 259606d78b6d..000000000000 --- a/keyboards/falsonix/fx19/keymaps/via/keymap.c +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2023 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* - *┌───┬───┬───┬───┐ - * Num│ / │ * │ - │ - *├───┼───┼───┼───┤ - *│ 7 │ 8 │ 9 │ + │ - *├───┼───┼───┤ │ - *│ 4 │ 5 │ 6 │ │ - *├───┼───┼───┤───┤ - *│ 1 │ 2 │ 3 │ │ - *├───┼───┼───┤Ent│ - *│Win│ 0 │ . │ │ - *┴───┴───┴───┴───┘ - */ - [0] = LAYOUT_numpad_4x5( - KC_LNUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_P7, KC_P8, KC_P9, - KC_P4, KC_P5, KC_P6, KC_PPLS, - KC_P1, KC_P2, KC_P3, - KC_RWIN, KC_P0, KC_PDOT, KC_PENT - ) -}; diff --git a/keyboards/falsonix/fx19/keymaps/via/rules.mk b/keyboards/falsonix/fx19/keymaps/via/rules.mk deleted file mode 100644 index 036bd6d1c3ec..000000000000 --- a/keyboards/falsonix/fx19/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes \ No newline at end of file From e1808ae640228e9a8e025ba3364bb9c493dcc0d3 Mon Sep 17 00:00:00 2001 From: Christian Greene <95236755+falsonix@users.noreply.github.com> Date: Tue, 30 Jul 2024 15:42:26 -0600 Subject: [PATCH 27/31] remove via exclude Co-authored-by: Joel Challis --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index e8aad66ac5bf..35b128606d7d 100644 --- a/.gitignore +++ b/.gitignore @@ -117,4 +117,3 @@ compile_commands.json # VIA(L) files that don't belong in QMK repo via*.json /keyboards/**/keymaps/vial/* -/keyboards/**/keymaps/via/* From 1068b3742c4c26360257691072e27e426010e63d Mon Sep 17 00:00:00 2001 From: Christian Greene <95236755+falsonix@users.noreply.github.com> Date: Tue, 30 Jul 2024 15:42:46 -0600 Subject: [PATCH 28/31] Update .vscode/settings.json Co-authored-by: Joel Challis --- .vscode/settings.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index a6a65080a25f..f369ecb1748c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -30,8 +30,5 @@ }, "clangd.arguments": [ "--header-insertion=never" - ], - "cmake.configureOnOpen": true, - "C_Cpp.errorSquiggles": "disabled", - "cmake.ignoreCMakeListsMissing": true + ] } From 4d34aa1fa55a969787008a7bb3e0a83737a81ac7 Mon Sep 17 00:00:00 2001 From: Christian Greene <95236755+falsonix@users.noreply.github.com> Date: Tue, 30 Jul 2024 15:47:02 -0600 Subject: [PATCH 29/31] Update readme.md --- keyboards/falsonix/fx19/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/falsonix/fx19/readme.md b/keyboards/falsonix/fx19/readme.md index 2892dc7d7df3..9c69f7812d05 100644 --- a/keyboards/falsonix/fx19/readme.md +++ b/keyboards/falsonix/fx19/readme.md @@ -1,6 +1,6 @@ # falsonix/fx19 -![falsonix/fx19](https://github.com/falsonix/fx19/blob/main/fx19-enclosure-v45.png) +![falsonix/fx19](https://i.imgur.com/UGExzJl.png) A small, 18-key number pad for use with modern computers. (Yes, the name says 19 and this is due to me miscounting the keys and realizing only after I'd named everything in firmware and hardware). Includes RGB for maximum performance. From da851c3318cae8b0fae6461a55d842b53a24957d Mon Sep 17 00:00:00 2001 From: Christian Greene <95236755+falsonix@users.noreply.github.com> Date: Tue, 30 Jul 2024 15:47:35 -0600 Subject: [PATCH 30/31] Update keyboards/falsonix/fx19/keyboard.json Co-authored-by: Joel Challis --- keyboards/falsonix/fx19/keyboard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/falsonix/fx19/keyboard.json b/keyboards/falsonix/fx19/keyboard.json index 2ad22a7c2678..4ef4730a5d64 100644 --- a/keyboards/falsonix/fx19/keyboard.json +++ b/keyboards/falsonix/fx19/keyboard.json @@ -38,7 +38,7 @@ "vid": "0x4658" }, "layouts": { - "LAYOUT_numpad_4x5": { + "LAYOUT": { "layout": [ {"matrix": [0, 0], "x":0, "y":0}, {"matrix": [0, 1], "x":1, "y":0}, From ffe6fb2ec6feb0a88fa34d85be01f9f4a5a6d6cb Mon Sep 17 00:00:00 2001 From: Christian Greene <95236755+falsonix@users.noreply.github.com> Date: Tue, 30 Jul 2024 15:47:47 -0600 Subject: [PATCH 31/31] Update keyboards/falsonix/fx19/keymaps/default/keymap.c Co-authored-by: Joel Challis --- keyboards/falsonix/fx19/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/falsonix/fx19/keymaps/default/keymap.c b/keyboards/falsonix/fx19/keymaps/default/keymap.c index 259606d78b6d..4404d65a844e 100644 --- a/keyboards/falsonix/fx19/keymaps/default/keymap.c +++ b/keyboards/falsonix/fx19/keymaps/default/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { *│Win│ 0 │ . │ │ *┴───┴───┴───┴───┘ */ - [0] = LAYOUT_numpad_4x5( + [0] = LAYOUT( KC_LNUM, KC_PSLS, KC_PAST, KC_PMNS, KC_P7, KC_P8, KC_P9, KC_P4, KC_P5, KC_P6, KC_PPLS,