ws2812: Fix number of nops for AVR at 8 MHz (#9559)

* ws2812: Fix number of nops for AVR at 8 MHz

When trying to calculate the number of nops for AVR running at 8 MHz,
the value of `w3` is expected to be negative; however, because `F_CPU`
is defined in tmk_core/avr.mk with the `UL` suffix, the preprocessor
performs its calculations using `unsigned long`, getting a very large
positive number instead of the expected negative number; this then
results in generating code with a huge number of nops.  Fix the broken
calculations by performing a comparison before subtraction, so that the
unsigned number wraparound does not occur.

The keyboard which triggers the problem is `handwired/promethium`; the
buggy code silently compiles, but the resulting timings would be
completely wrong.

* ws2812: Clean up the code after the 8 MHz fix

Remove old code which was unsuccessfully trying to clamp negative w1, w2
and w3 values to 0, and set w1_nops, w2_nops and w3_nops directly.

.github/workflows/format.yaml

@@ -28,10 +28,16 @@ jobs:
         bin/qmk pyformat
         bin/qmk fileformat
 
-    - name: Commit files
-      uses: stefanzweifel/git-auto-commit-action@v4
+    - name: Become QMK Bot
+      run: |
+        git config user.name 'QMK Bot'
+        git config user.email 'hello@qmk.fm'
+
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v3
       with:
-        commit_message: Format code according to conventions for $GITHUB_SHA
-        commit_user_name: QMK Bot
-        commit_user_email: hello@qmk.fm
-        commit_author: QMK Bot <hello@qmk.fm>
+        delete-branch: true
+        author: QMK Bot <hello@qmk.fm>
+        committer: QMK Bot <hello@qmk.fm>
+        commit-message: Format code according to conventions
+        title: '[CI] Format code according to conventions'

common_features.mk

@@ -17,6 +17,7 @@ SERIAL_PATH := $(QUANTUM_PATH)/serial_link
 
 QUANTUM_SRC += \
     $(QUANTUM_DIR)/quantum.c \
+    $(QUANTUM_DIR)/bitwise.c \
     $(QUANTUM_DIR)/led.c \
     $(QUANTUM_DIR)/keymap_common.c \
     $(QUANTUM_DIR)/keycode_config.c
@@ -36,6 +37,11 @@ ifeq ($(strip $(API_SYSEX_ENABLE)), yes)
     SRC += $(QUANTUM_DIR)/api.c
 endif
 
+ifeq ($(strip $(COMMAND_ENABLE)), yes)
+    SRC += $(QUANTUM_DIR)/command.c
+    OPT_DEFS += -DCOMMAND_ENABLE
+endif
+
 ifeq ($(strip $(AUDIO_ENABLE)), yes)
     OPT_DEFS += -DAUDIO_ENABLE
     MUSIC_ENABLE = yes

docs/isp_flashing_guide.md

@@ -45,6 +45,7 @@ You'll need one of the following to actually perform the ISP flashing (followed
 
 * [SparkFun PocketAVR](https://www.sparkfun.com/products/9825) - (USB Tiny)
 * [USBtinyISP AVR Programmer Kit](https://www.adafruit.com/product/46) - (USB Tiny)
+* [USBasp](https://www.fischl.de/usbasp/) - (usbasp)
 * [Teensy 2.0](https://www.pjrc.com/store/teensy.html) - (avrisp)
 * [Pro Micro](https://www.sparkfun.com/products/12640)  - (avrisp)
 * [Bus Pirate](https://www.adafruit.com/product/237) - (buspirate)
@@ -82,6 +83,15 @@ This is pretty straight-forward - we'll be connecting like-things to like-things
     PocketAVR VCC  <-> Keyboard VCC
     PocketAVR GND  <-> Keyboard GND
 
+### USBasp
+
+    USBasp RST  <-> Keyboard RESET
+    USBasp SCLK <-> Keyboard B1 (SCLK)
+    USBasp MOSI <-> Keyboard B2 (MOSI)
+    USBasp MISO <-> Keyboard B3 (MISO)
+    USBasp VCC  <-> Keyboard VCC
+    USBasp GND  <-> Keyboard GND
+
 ### Teensy 2.0
 
     Teensy B0  <-> Keyboard RESET

docs/spi_driver.md

@@ -8,7 +8,7 @@ No special setup is required - just connect the `SS`, `SCK`, `MOSI` and `MISO` p
 
 |MCU            |`SS`|`SCK`|`MOSI`|`MISO`|
 |---------------|----|-----|------|------|
-|ATMega16/32U2/4|`B0`|`B1` |`B2`  |`B3`  |
+|ATmega16/32U2/4|`B0`|`B1` |`B2`  |`B3`  |
 |AT90USB64/128  |`B0`|`B1` |`B2`  |`B3`  |
 |ATmega32A      |`B4`|`B7` |`B5`  |`B6`  |
 |ATmega328/P    |`B2`|`B5` |`B3`  |`B4`  |
@@ -20,22 +20,34 @@ You may use more than one slave select pin, not just the `SS` pin. This is usefu
 
 You'll need to determine which pins can be used for SPI -- as an example, STM32 parts generally have multiple SPI peripherals, labeled SPI1, SPI2, SPI3 etc.
 
-To enable SPI, modify your board's `halconf.h` to enable SPI - both `HAL_USE_SPI` and `SPI_USE_WAIT` should be `TRUE`, and `SPI_SELECT_MODE` should be `SPI_SELECT_MODE_PAD`.
-Then, modify your board's `mcuconf.h` to enable the SPI peripheral you've chosen -- in the case of using SPI2, modify `STM32_SPI_USE_SPI2` to be `TRUE`.
+To enable SPI, modify your board's `halconf.h` to enable SPI:
 
-As per the AVR configuration, you may select any other standard GPIO as a slave select pin, and can be supplied to `spi_start()`.
+```c
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+```
+
+Then, modify your board's `mcuconf.h` to enable the peripheral you've chosen, for example:
+
+```c
+#undef STM32_SPI_USE_SPI2
+#define STM32_SPI_USE_SPI2 TRUE
+```
 
 Configuration-wise, you'll need to set up the peripheral as per your MCU's datasheet -- the defaults match the pins for a Proton-C, i.e. STM32F303.
 
-`config.h` override         | Description                                                   | Default Value
-----------------------------|---------------------------------------------------------------|--------------
-`#define SPI_DRIVER`        | SPI peripheral to use - SPI1 => `SPID1`, SPI2 => `SPID2` etc. | `SPID2`
-`#define SPI_SCK_PIN`       | The pin to use for the SCK                                    | `B13`
-`#define SPI_SCK_PAL_MODE`  | The alternate function mode for the SCK pin                   | `5`
-`#define SPI_MOSI_PIN`      | The pin to use for the MOSI                                   | `B15`
-`#define SPI_MOSI_PAL_MODE` | The alternate function mode for the MOSI pin                  | `5`
-`#define SPI_MISO_PIN`      | The pin to use for the MISO                                   | `B14`
-`#define SPI_MISO_PAL_MODE` | The alternate function mode for the MISO pin                  | `5`
+|`config.h` Override|Description                                                  |Default|
+|-------------------|-------------------------------------------------------------|-------|
+|`SPI_DRIVER`       |SPI peripheral to use - SPI1 -> `SPID1`, SPI2 -> `SPID2` etc.|`SPID2`|
+|`SPI_SCK_PIN`      |The pin to use for SCK                                       |`B13`  |
+|`SPI_SCK_PAL_MODE` |The alternate function mode for SCK                          |`5`    |
+|`SPI_MOSI_PIN`     |The pin to use for MOSI                                      |`B15`  |
+|`SPI_MOSI_PAL_MODE`|The alternate function mode for MOSI                         |`5`    |
+|`SPI_MISO_PIN`     |The pin to use for MISO                                      |`B14`  |
+|`SPI_MISO_PAL_MODE`|The alternate function mode for MISO                         |`5`    |
+
+As per the AVR configuration, you may choose any other standard GPIO as a slave select pin, which should be supplied to `spi_start()`.
 
 ## Functions
 
@@ -112,7 +124,7 @@ Send multiple bytes to the selected SPI device.
 
 #### Return Value
 
-`SPI_STATUS_TIMEOUT` if the timeout period elapses, `SPI_STATUS_SUCCESS` on success, or `SPI_STATUS_ERROR` otherwise.
+`SPI_STATUS_TIMEOUT` if the timeout period elapses, `SPI_STATUS_ERROR` if some other error occurs, otherwise `SPI_STATUS_SUCCESS`.
 
 ---
 
@@ -129,7 +141,7 @@ Receive multiple bytes from the selected SPI device.
 
 #### Return Value
 
-`SPI_STATUS_TIMEOUT` if the internal transmission timeout period elapses, `SPI_STATUS_SUCCESS` on success, or `SPI_STATUS_ERROR` otherwise.
+`SPI_STATUS_TIMEOUT` if the timeout period elapses, `SPI_STATUS_ERROR` if some other error occurs, otherwise `SPI_STATUS_SUCCESS`.
 
 ---
 

drivers/avr/ws2812.c

@@ -67,19 +67,27 @@ void ws2812_setleds(LED_TYPE *ledarray, uint16_t number_of_leds) {
 #define w_onecycles (((F_CPU / 1000) * w_onepulse + 500000) / 1000000)
 #define w_totalcycles (((F_CPU / 1000) * w_totalperiod + 500000) / 1000000)
 
-// w1 - nops between rising edge and falling edge - low
-#define w1 (w_zerocycles - w_fixedlow)
-// w2   nops between fe low and fe high
-#define w2 (w_onecycles - w_fixedhigh - w1)
-// w3   nops to complete loop
-#define w3 (w_totalcycles - w_fixedtotal - w1 - w2)
-
-#if w1 > 0
-#    define w1_nops w1
+// w1_nops - nops between rising edge and falling edge - low
+#if w_zerocycles >= w_fixedlow
+#    define w1_nops (w_zerocycles - w_fixedlow)
 #else
 #    define w1_nops 0
 #endif
 
+// w2_nops - nops between fe low and fe high
+#if w_onecycles >= (w_fixedhigh + w1_nops)
+#    define w2_nops (w_onecycles - w_fixedhigh - w1_nops)
+#else
+#    define w2_nops 0
+#endif
+
+// w3_nops - nops to complete loop
+#if w_totalcycles >= (w_fixedtotal + w1_nops + w2_nops)
+#    define w3_nops (w_totalcycles - w_fixedtotal - w1_nops - w2_nops)
+#else
+#    define w3_nops 0
+#endif
+
 // The only critical timing parameter is the minimum pulse length of the "0"
 // Warn or throw error if this timing can not be met with current F_CPU settings.
 #define w_lowtime ((w1_nops + w_fixedlow) * 1000000) / (F_CPU / 1000)
@@ -90,18 +98,6 @@ void ws2812_setleds(LED_TYPE *ledarray, uint16_t number_of_leds) {
 #    warning "Please consider a higher clockspeed, if possible"
 #endif
 
-#if w2 > 0
-#    define w2_nops w2
-#else
-#    define w2_nops 0
-#endif
-
-#if w3 > 0
-#    define w3_nops w3
-#else
-#    define w3_nops 0
-#endif
-
 #define w_nop1 "nop      \n\t"
 #define w_nop2 "rjmp .+0 \n\t"
 #define w_nop4 w_nop2 w_nop2

keyboards/ai03/orbit/matrix.h

@@ -1,3 +0,0 @@
-#pragma once
-
-#include "common/matrix.h"

keyboards/ai03/orbit/transport.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/matrix.h"
+#include "matrix.h"
 
 #define ROWS_PER_HAND (MATRIX_ROWS/2)
 

keyboards/alpine65/config.h

@@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 68
-#define RGBLIGT_LIMIT_VAL 200
+#define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_ANIMATIONS
 

keyboards/bat43/config.h

@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x1070
+#define VENDOR_ID 0x5946 // YF
+#define PRODUCT_ID 0x0002
 #define DEVICE_VER 0x0001
 #define MANUFACTURER yfuku
 #define PRODUCT bat43

keyboards/bat43/keymaps/via/keymap.c

@@ -0,0 +1,58 @@
+/* Copyright 2020 yfuku
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
+
+#define L_SPC LT(_LOWER, KC_SPC)
+#define R_ENT LT(_RAISE, KC_ENT)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_BSPC, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_RSFT,
+        KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RCTL,
+                                   KC_LGUI, KC_LANG2,L_SPC,            R_ENT,   KC_LANG1,KC_RALT,
+                                            KC_A,    KC_B,             KC_C,    KC_D,    KC_E
+    ),
+    [_LOWER] = LAYOUT(
+        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, KC_EQL,  KC_PLUS, KC_ASTR, KC_PERC, _______,
+        _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, _______, _______, _______, _______,
+                                   _______, _______, _______,          KC_DEL,  _______, _______,
+                                            _______, _______,          _______, _______, _______
+    ),
+    [_RAISE] = LAYOUT(
+        _______, KC_BSLS, KC_EXLM, KC_AMPR, KC_PIPE, XXXXXXX,          XXXXXXX, KC_EQL,  KC_PLUS, KC_ASTR, KC_PERC, _______,
+        _______, KC_HASH, KC_GRV,  KC_DQT,  KC_QUOT, KC_TILD, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_DLR,  _______,
+        _______, XXXXXXX, XXXXXXX, KC_LCBR, KC_LBRC, KC_LPRN,          KC_RPRN, KC_RBRC, KC_RCBR, KC_AT,   KC_CIRC, _______,
+                                   _______, _______, KC_BSPC,          _______, _______, _______,
+                                            _______, _______,          _______, _______, _______
+    ),
+    [_ADJUST] = LAYOUT(
+        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
+                                   _______, _______, _______,          _______, _______, _______,
+                                            _______, _______,          _______, _______, _______
+    ),
+};

keyboards/bat43/keymaps/via/readme.md

@@ -0,0 +1 @@
+# The default keymap for bat43

keyboards/bat43/keymaps/via/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes

keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c

@@ -0,0 +1,100 @@
+/* Copyright 2020 Stanrc85
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "stanrc85.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Base */
+[_QWERTY] = LAYOUT_all(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_MPLY, 
+  KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, CA_SCLN, 
+  KC_CTLE,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  CA_QUOT, 
+  KC_LSFT, 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_UP,   
+  KC_LCTL, KC_LGUI, KC_LALT,          LT_SPCF,           LT_SPCF,         LT_SPCF,        TD_TWIN, MO(_FN2_60), KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
+),
+[_DEFAULT] = LAYOUT_all(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_MPLY, 
+  KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, CA_SCLN, 
+  KC_CTLE,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  CA_QUOT, 
+  KC_LSFT, 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_UP,   
+  KC_LCTL, KC_LGUI, KC_LALT,          LT_SPCF,           LT_SPCF,         LT_SPCF,        TD_TWIN, MO(_FN2_60), KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
+),
+[_FN1_60] = LAYOUT_all(
+  KC_TILD,    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_DEL,     KC_DEL,    _______,
+  _______,                _______,    CA_QUOT,    KC_VOLU,    CA_SCLN,    _______,    _______,    KC_HOME,    KC_UP,      KC_END,     KC_PSCR,    _______,    _______,    KC_INS,    _______,
+  KC_CAPS,                _______,    KC_MUTE,    KC_VOLD,    KC_MPLY,    _______,    _______,    KC_LEFT,    KC_DOWN,    KC_RGHT,    _______,    _______,                _______,   _______,
+  _______,    _______,    KC_RDP,     _______,    _______,    _______,    _______,    _______,    KC_WBAK,    KC_WFWD,    _______,    _______,    _______,                _______,
+  _______,    _______,    _______,                _______,                _______,                _______,                _______,    _______,    _______,    _______,    _______,    _______
+),
+[_FN2_60] = LAYOUT_all(
+  RGB_TOG,   RGB_MOD,     RGB_VAD,    RGB_VAI,    RGB_SAI,    RGB_HUD,    RGB_HUI,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
+  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    RESET,      _______,
+  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                KC_MAKE,    _______,
+  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    
+  _______,    _______,    _______,                _______,                _______,                _______,                _______,    _______,    _______,    _______,    _______,    TG(_DEFAULT)
+)
+
+};
+
+
+void rgb_matrix_indicators_user(void) {
+  uint8_t layer = get_highest_layer(layer_state);
+  switch (layer) {
+    case _QWERTY:
+      rgb_matrix_set_color(10, 0, 0, 0); 
+      break;
+    case _FN1_60:
+      rgb_matrix_set_color(10, 0, 0, 255); 
+      break;
+    case _FN2_60:
+      rgb_matrix_set_color(10, 255, 255, 255); 
+      break;
+    case _DEFAULT:
+      rgb_matrix_set_color(10, 0, 255, 0); 
+      break;
+    default:
+      break;
+  }
+  if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(10, 255, 0, 0);
+  }
+}
+
+void matrix_init_kb(void){
+
+#ifdef RGB_MATRIX_ENABLE
+
+  g_led_config = (led_config_t){ {
+    // Key Matrix to LED Index
+    { 10    , 10    , 9     , 9     , 8     , 7     , 7     , 6     , 5     , 5     , 4     , 3     , 3     , 2     , 1     , 1      },
+    { NO_LED, 11    , NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 0     , 1      },
+    { NO_LED, 12    , NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 23    , 1      },
+    { NO_LED, 13    , 14    , NO_LED, 15    , 16    , NO_LED, 17    , 18    , NO_LED, 19    , 20    , NO_LED, 21    , 22    , NO_LED },
+    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+  }, {
+    // LED Index to Physical Position
+    {224, 42}, {224, 21}, {209, 21}, {179, 21}, {164, 21}, {134, 21}, {119, 21}, {89, 21}, {74, 21}, {45, 21}, {30, 21}, {30, 42},
+    {30, 64}, {30, 85}, {45, 85}, {74, 85}, {89, 85}, {119, 85}, {134, 85}, {164, 85}, {179, 85}, {209, 85}, {224, 85}, {224, 64}
+  }, {
+    // LED Index to Flag
+    LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL,
+    LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL,
+    LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL
+  } };
+
+#endif
+  matrix_init_user();
+}

keyboards/boardsource/the_mark/keymaps/stanrc85/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes

keyboards/ck60i/config.h

@@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 16
-#define RGBLIGT_LIMIT_VAL 200
+#define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_ANIMATIONS
 

keyboards/earth_rover/config.h

@@ -0,0 +1,114 @@
+/*
+Copyright 2020 k.bigwheel
+
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0xEE11
+#define DEVICE_VER   0x0001
+#define MANUFACTURER k.bigwheel
+#define PRODUCT      earth_rover
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 4
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * 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
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0

keyboards/earth_rover/earth_rover.c

@@ -0,0 +1,17 @@
+/* Copyright 2020 k.bigwheel
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "earth_rover.h"

keyboards/earth_rover/earth_rover.h

@@ -0,0 +1,41 @@
+/* Copyright 2020 k.bigwheel
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+// clang-format off
+#define LAYOUT( \
+    k00, k01, \
+    k10, k12, k13, k14, \
+    k20, k22, k23, k24, \
+    k30, k32, k33, k34 \
+) { \
+    { KC_NO, k00, k01, KC_NO }, \
+    { k10,   k12, k13, k14   }, \
+    { k20,   k22, k23, k24   }, \
+    { k30,   k32, k33, k34   }, \
+}
+// clang-format on

keyboards/earth_rover/info.json

@@ -0,0 +1,30 @@
+{
+    "keyboard_name": "earth_rover",
+    "url": "https://github.com/bigwheel/earth_rover",
+    "maintainer": "k.bigwheel",
+    "width": 4,
+    "height": 4,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "k10", "x": 1.25, "y": 0},
+                {"label": "k20", "x": 2.25, "y": 0},
+
+                {"label": "k01", "x": 0, "y": 1.25},
+                {"label": "k11", "x": 1.25, "y": 1.25},
+                {"label": "k21", "x": 2.25, "y": 1.25},
+                {"label": "k31", "x": 3.5, "y": 1.25},
+
+                {"label": "k02", "x": 0, "y": 2.25},
+                {"label": "k12", "x": 1.25, "y": 2.25},
+                {"label": "k22", "x": 2.25, "y": 2.25},
+                {"label": "k32", "x": 3.5, "y": 2.25},
+
+                {"label": "k03", "x": 0, "y": 3.25},
+                {"label": "k13", "x": 1.25, "y": 3.25},
+                {"label": "k23", "x": 2.25, "y": 3.25},
+                {"label": "k33", "x": 3.5, "y": 3.25}
+            ]
+        }
+    }
+}

keyboards/earth_rover/keymaps/default/keymap.c

@@ -0,0 +1,31 @@
+/* Copyright 2020 k.bigwheel
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names { _BASE };
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+              KC_A, KC_B,
+        KC_C, KC_D, KC_E, KC_F,
+        KC_G, KC_H, KC_I, KC_J,
+        KC_K, KC_L, KC_M, KC_N
+    )
+};
+// clang-format on

keyboards/earth_rover/keymaps/default/readme.md

@@ -0,0 +1 @@
+# The default keymap for earth_rover

keyboards/earth_rover/readme.md

@@ -0,0 +1,22 @@
+# earth_rover
+
+![earth_rover](https://pbs.twimg.com/media/Eqh29nYUUAA-9NE?format=jpg)
+
+Mechanical warm, or just cubic macro pad.
+
+* Keyboard Maintainer: [k.bigwheel](https://github.com/bigwheel)
+* Build Guide: [bigwheel/earth\_rover](https://github.com/bigwheel/earth_rover)
+* Hardware Supported: [無限の可能性 \| MxLEDBitPCB](https://swanmatch.github.io/MxLEDBitPCB/), Pro Micro
+* Hardware Availability: [魔界鍵盤製作所 \- BOOTH](https://swanmatch.booth.pm/), [Pro Micro （コンスルー付き） \| 遊舎工房](https://yushakobo.jp/shop/promicro-spring-pinheader/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make earth_rover:default
+
+Reset Pro Micro by reset button on ProMicroSocket (Red LED must light).
+
+Flashing example for this keyboard:
+
+    make earth_rover: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).

keyboards/earth_rover/rules.mk

@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output

keyboards/ergoarrows/config.h

@@ -0,0 +1,84 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x04D8
+#define PRODUCT_ID      0xEA54
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Salicylic_Acid
+#define PRODUCT         ergoarrows
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 7
+
+// wiring of each half
+#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
+
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* serial.c configuration for split keyboard */
+#define SOFT_SERIAL_PIN D0
+#define SPLIT_HAND_PIN B6
+
+/* 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 D3
+
+#ifndef RGBLED_NUM
+  #define RGBLED_NUM 86
+  #define RGBLIGHT_SPLIT
+  #define RGBLED_SPLIT { 43, 43 }
+#endif
+
+#define RGBLIGHT_ANIMATIONS
+
+#ifndef IOS_DEVICE_ENABLE
+  #define RGBLIGHT_LIMIT_VAL 90
+  #define RGBLIGHT_VAL_STEP 17
+#else
+  #define RGBLIGHT_LIMIT_VAL 30
+  #define RGBLIGHT_VAL_STEP 4
+#endif
+#define RGBLIGHT_HUE_STEP 10
+#define RGBLIGHT_SAT_STEP 17
+
+#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
+// USB_MAX_POWER_CONSUMPTION value for naked48 keyboard
+//  120  RGBoff, OLEDoff
+//  120  OLED
+//  330  RGB 6
+//  300  RGB 32
+//  310  OLED & RGB 32
+  #define USB_MAX_POWER_CONSUMPTION 400
+#else
+  // fix iPhone and iPad power adapter issue
+  // iOS device need lessthan 100
+  #define USB_MAX_POWER_CONSUMPTION 100
+#endif

keyboards/ergoarrows/ergoarrows.c

@@ -0,0 +1,18 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#include "ergoarrows.h"

keyboards/ergoarrows/ergoarrows.h

@@ -0,0 +1,59 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+/*
+ * ,------------------------------------------   ------------------------------------------.
+ * | L00 | L01 | L02 | L03 | L04 | L05 | L06 |   | R06 | R05 | R04 | R03 | R02 | R01 | R00 |
+ * |------------------------------------------   ------------------------------------------+
+ * | L10 | L11 | L12 | L13 | L14 | L15 | L16 |   | R16 | R15 | R14 | R13 | R12 | R11 | R10 |
+ * |------------------------------------------   ------------------------------------------+
+ * | L20 | L21 | L22 | L23 | L24 | L25 | L26 |   | R26 | R25 | R24 | R23 | R22 | R21 | R20 |
+ * |------------------------------------------   ------------------------------------------+
+ * | L30 | L31 | L32 | L33 | L34 | L35 | L36 |   | R36 | R35 | R34 | R33 | R32 | R31 | R30 |
+ * |------------------------------------------   ------------------------------------------+
+ * | L40 | L41 | L42 | L43 | L44 | L45 | L46 |   | R46 | R45 | R44 | R43 | R42 | R41 | R40 |
+ * |------------------------------------------   ------------------------------------------+
+ *       | L51 | L52 | L53 |                                       | R53 | R52 | R51 |
+ *       -------------------                                       ------------------'
+ */
+
+#define LAYOUT( \
+    L00, L01, L02, L03, L04, L05, L06,      R06, R05, R04, R03, R02, R01, R00, \
+    L10, L11, L12, L13, L14, L15, L16,      R16, R15, R14, R13, R12, R11, R10, \
+    L20, L21, L22, L23, L24, L25, L26,      R26, R25, R24, R23, R22, R21, R20, \
+    L30, L31, L32, L33, L34, L35, L36,      R36, R35, R34, R33, R32, R31, R30, \
+    L40, L41, L42, L43, L44, L45, L46,      R46, R45, R44, R43, R42, R41, R40, \
+         L51, L52, L53,                                    R53, R52, R51       \
+  ) \
+  { \
+    { L00,   L01,   L02,   L03,   L04,   L05,   L06 }, \
+    { L10,   L11,   L12,   L13,   L14,   L15,   L16 }, \
+    { L20,   L21,   L22,   L23,   L24,   L25,   L26 }, \
+    { L30,   L31,   L32,   L33,   L34,   L35,   L36 }, \
+    { L40,   L41,   L42,   L43,   L44,   L45,   L46 }, \
+    {KC_NO,  L51,   L52,   L53, KC_NO, KC_NO, KC_NO }, \
+    { R00,   R01,   R02,   R03,   R04,   R05,   R06 }, \
+    { R10,   R11,   R12,   R13,   R14,   R15,   R16 }, \
+    { R20,   R21,   R22,   R23,   R24,   R25,   R26 }, \
+    { R30,   R31,   R32,   R33,   R34,   R35,   R36 }, \
+    { R40,   R41,   R42,   R43,   R44,   R45,   R46 }, \
+    {KC_NO,  R51,   R52,   R53, KC_NO, KC_NO, KC_NO }  \
+  }

keyboards/ergoarrows/info.json

@@ -0,0 +1,87 @@
+{
+    "keyboard_name": "ergoarrows", 
+    "url": "https://salicylic-acid3.hatenablog.com/", 
+    "maintainer": "Salicylic_acid3", 
+    "width": 16.25, 
+    "height": 6.51, 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"#", "x":3.5, "y":0},
+                {"label":"*", "x":12.25, "y":0},
+                {"label":"@", "x":2.5, "y":0.125},
+                {"label":"$", "x":4.5, "y":0.125},
+                {"label":"&", "x":11.25, "y":0.13},
+                {"label":"(", "x":13.25, "y":0.13},
+                {"label":"%", "x":5.5, "y":0.25},
+                {"label":"^", "x":10.25, "y":0.25},
+                {"label":"!", "x":1.5, "y":0.375},
+                {"label":"Esc", "x":0.5, "y":0.38},
+                {"label":")", "x":14.25, "y":0.38},
+                {"label":"PrtScr", "x":15.25, "y":0.38},
+                {"x":6.5, "y":0.5}, {"x":9.25, "y":0.5},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"I", "x":12.25, "y":1},
+                {"label":"W", "x":2.5, "y":1.125},
+                {"label":"R", "x":4.5, "y":1.125},
+                {"label":"U", "x":11.25, "y":1.13},
+                {"label":"O", "x":13.25, "y":1.13},
+                {"label":"T", "x":5.5, "y":1.25},
+                {"label":"Y", "x":10.25, "y":1.25},
+                {"label":"Q", "x":1.5, "y":1.375},
+                {"label":"Tab", "x":0.5, "y":1.38},
+                {"label":"P", "x":14.25, "y":1.38},
+                {"label":"\u2019", "x":15.25, "y":1.38},
+                {"label":"[", "x":6.5, "y":1.5},
+                {"label":"]", "x":9.25, "y":1.5},
+                {"label":"D", "x":3.5, "y":2},
+                {"label":"K", "x":12.25, "y":2},
+                {"label":"S", "x":2.5, "y":2.125},
+                {"label":"F", "x":4.5, "y":2.125},
+                {"label":"J", "x":11.25, "y":2.13},
+                {"label":"L", "x":13.25, "y":2.13},
+                {"label":"G", "x":5.5, "y":2.25},
+                {"label":"H", "x":10.25, "y":2.25},
+                {"label":"A", "x":1.5, "y":2.375},
+                {"label":"Caps", "x":0.5, "y":2.38},
+                {"label":":", "x":14.25, "y":2.38},
+                {"label":"Ent", "x":15.25, "y":2.38},
+                {"label":"(", "x":6.5, "y":2.5},
+                {"label":")", "x":9.25, "y":2.5},
+                {"label":"C", "x":3.5, "y":3},
+                {"label":"<", "x":12.25, "y":3},
+                {"label":"X", "x":2.5, "y":3.125},
+                {"label":"V", "x":4.5, "y":3.125},
+                {"label":"M", "x":11.25, "y":3.13},
+                {"label":">", "x":13.25, "y":3.13},
+                {"label":"B", "x":5.5, "y":3.25},
+                {"label":"N", "x":10.25, "y":3.25},
+                {"label":"Z", "x":1.5, "y":3.375},
+                {"label":"Shift", "x":0.5, "y":3.38},
+                {"label":"?", "x":14.25, "y":3.38},
+                {"label":"_", "x":15.25, "y":3.38},
+                {"x":6.5, "y":3.5},
+                {"x":9.25, "y":3.5},
+                {"label":"Ctrl", "x":0.5, "y":4.375},
+                {"label":"Win", "x":1.5, "y":4.38},
+                {"label":"\u7121\u5909", "x":3.75, "y":4.38},
+                {"label":"Ent", "x":4.75, "y":4.38},
+                {"label":"Spc", "x":11, "y":4.38},
+                {"label":"\u5909\u63db", "x":12, "y":4.38},
+                {"label":"Alt", "x":14.25, "y":4.38},
+                {"label":"App", "x":15.25, "y":4.38},
+                {"label":"\u2191", "x":2.625, "y":4.505},
+                {"label":"\u2191", "x":13.13, "y":4.51},
+                {"label":"BS", "x":5.85, "y":4.6},
+                {"label":"Del", "x":9.9, "y":4.6},
+                {"label":"Del", "x":6.9, "y":5.15},
+                {"label":"BS", "x":8.85, "y":5.15},
+                {"label":"\u2190", "x":1.625, "y":5.505},
+                {"label":"\u2193", "x":2.625, "y":5.505},
+                {"label":"\u2192", "x":3.625, "y":5.505},
+                {"label":"\u2190", "x":12.13, "y":5.51},
+                {"label":"\u2193", "x":13.13, "y":5.51},
+                {"label":"\u2192", "x":14.13, "y":5.51}]
+        }
+    }
+}

keyboards/ergoarrows/keymaps/default/config.h

@@ -0,0 +1,22 @@
+/* Copyright 2021 Salicylic_acid3
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Select hand configuration */
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 180

keyboards/ergoarrows/keymaps/default/keymap.c

@@ -0,0 +1,61 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_number {
+  _QWERTY = 0,
+  _FN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QWERTY] = LAYOUT(
+  //,--------------------------------------------------------------|   |--------------------------------------------------------------.
+       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
+  //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,        KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSLS,
+  //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
+      KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,        KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,  KC_ENT,
+  //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
+      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,        KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
+  //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
+     KC_LCTRL, KC_LGUI,   KC_UP, KC_LALT,  KC_SPC, KC_BSPC,  KC_DEL,     KC_BSPC,  KC_DEL,  KC_SPC, KC_RALT,   KC_UP,  KC_APP, MO(_FN),
+  //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
+               KC_LEFT, KC_DOWN, KC_RGHT,                                                           KC_LEFT, KC_DOWN, KC_RGHT    
+  //|--------------------------------------------------------------|   |--------------------------------------------------------------'
+  ),
+
+  [_FN] = LAYOUT(
+  //,--------------------------------------------------------------|   |--------------------------------------------------------------.
+       KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_PSCR,
+  //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, KC_PSCR, KC_SLCK, KC_LBRC, KC_RBRC,
+  //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, KC_HOME, KC_PGUP, KC_QUOT, _______,
+  //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, RGB_TOG, RGB_MOD, _______, RGB_SAD, RGB_SAI, _______,     _______, _______, _______, KC_END, KC_PGDN, _______, _______,
+  //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, RGB_VAD, KC_VOLU, RGB_VAI, RGB_HUD, RGB_HUI, _______,     _______, _______, _______, _______, _______, _______, MO(_FN),
+  //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
+               KC_MPRV, KC_VOLD, KC_MNXT,                                                           _______, _______, _______    
+  //|--------------------------------------------------------------|   |--------------------------------------------------------------'
+  )
+};