sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Brassel
2022-10-16 16:08:34 +11:00
parent d089af8703 81988cc032
commit 39c22f5cf5
10 changed files with 40 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
keyboards/latincompass/latinpadble/config.h
View File

@@ -30,7 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/
#define DIODE_DIRECTION ROW2COL
#define SSD1306OLED
#define RGB_DI_PIN B7
#define RGBLED_NUM 4

17
keyboards/latincompass/latinpadble/keymaps/default/keymap.c
View File

@@ -14,10 +14,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_pad(
KC_PGUP,
KC_KP_7, KC_KP_8, KC_KP_9, MO(1),
KC_KP_7, KC_KP_8, KC_KP_9, MO(1),
KC_P4, KC_P5, KC_P6, KC_KP_PLUS,
KC_P1, KC_P2, KC_P3, KC_KP_MINUS,
KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER),
@@ -40,17 +41,3 @@ bool oled_task_user(void) {
return false;
}
#endif
bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) { /* First encoder */
if (clockwise) {
tap_code(KC_PGDN);
} else {
tap_code(KC_PGUP);
}
}
return true;
}
void matrix_init_user(void) { render_logo(); }

66
keyboards/latincompass/latinpadble/keymaps/via/keymap.c
View File

@@ -13,49 +13,37 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* Keymap _0: (Base Layer) Default Layer
* .----.
* |PGUP|
* |-----------------------.
* | 7 | 8 | 9 | MO1 |
* |-----|-----|-----|-----|
* | 4 | 5 | 6 | + |
* |-----|-----|-----|-----|
* | 1 | 2 | 3 | — |
* |-----|-----|-----|-----|
* | 0 | . | DEL |Enter|
* .-----------------------.
*/
/* Keymap _1: (Second Layer) second Layer
* .--------.
* |NUMLOCK|
* |--------------------------------.
* |RGB_TOG|RGB_MOD|RGB_M_K|RGB_M_X |
* |-------|-------|-------|--------|
* |RGB_SAI|RGB_SAD|RGB_HUI|RGB_HUD |
* |-------|-------|-------|--------|
* |RGB_VAI|RGB_VAD|RGB_SPI|RGB_SPD |
* |-------|-------|-------|--------|
* |RGB_SPI|RGB_SPD|RGB_TOG|KC_TRNS |
* .--------------------------------.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_pad(
KC_PGUP,
KC_KP_7, KC_KP_8, KC_KP_9, MO(1),
KC_KP_7, KC_KP_8, KC_KP_9, MO(1),
KC_P4, KC_P5, KC_P6, KC_KP_PLUS,
KC_P1, KC_P2, KC_P3, KC_KP_MINUS,
KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER),
KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER
),
[1] = LAYOUT_pad(
KC_NUM,
RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_X,
RGB_SAI, RGB_SAD, RGB_HUI, RGB_HUD,
RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD,
RGB_SPI, RGB_SPD, RGB_TOG, KC_TRNS),
RGB_SPI, RGB_SPD, RGB_TOG, KC_TRNS
),
[2] = LAYOUT_pad(
_______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______
),
[3] = LAYOUT_pad(
_______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______
)
};
static void render_logo(void) {
@@ -69,17 +57,3 @@ bool oled_task_user(void) {
return false;
}
#endif
bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) { /* First encoder */
if (clockwise) {
tap_code(KC_PGDN);
} else {
tap_code(KC_PGUP);
}
}
return true;
}
void matrix_init_user(void) { render_logo(); }

1
keyboards/latincompass/latinpadble/keymaps/via/rules.mk
View File

@@ -1,2 +1 @@
VIA_ENABLE = yes
LTO_ENABLE = yes

9
keyboards/latincompass/latinpadble/latinpadble.c
View File

@@ -15,3 +15,12 @@
*/
#include "latinpadble.h"
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }
if (clockwise) {
tap_code(KC_PGDN);
} else {
tap_code(KC_PGUP);
}
return true;
}

1
keyboards/latincompass/latinpadble/rules.mk
View File

@@ -19,6 +19,7 @@ NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
LTO_ENABLE = yes
BLUETOOTH_ENABLE = yes
BLUETOOTH_DRIVER = BluefruitLE

4
keyboards/sofle/keymaps/keyhive_via/readme.md
View File

@@ -2,7 +2,7 @@
![SofleKeyboard version 2.1 RGB Keyhive](https://i.imgur.com/Oa6spvZ.png)
# Configuring VIA / Vial App
# Configuring VIA
This firmware will not auto-recognize until [PR #1060](https://github.com/the-via/keyboards/pull/1060) is accepted to the VIA keyboard database. For now you must install the new layout:
@@ -10,7 +10,7 @@ This firmware will not auto-recognize until [PR #1060](https://github.com/the-vi
2. In the VIA app, select `File > Import Keymap` from the menu.
3. Open the file you just downloaded.
**You'll have to do this every time you use VIA or Vial until the PR is accepted.**
**You'll have to do this every time you use VIA until the PR is accepted.**
# Using with VIA
* The default layouts should be loaded automatically.

2
keyboards/wavtype/p01_ultra/readme.md
View File

@@ -20,4 +20,4 @@ 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 (this can be set in vial!)
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

5
keyboards/work_louder/micro/keymaps/via/config.h Normal file
View File

@@ -0,0 +1,5 @@
// Copyright 2022 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#undef RGBLIGHT_EFFECT_TWINKLE

1
keyboards/work_louder/micro/keymaps/via/rules.mk
View File

@@ -1,3 +1,2 @@
VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes
LTO_ENABLE = yes