forked from qmk/qmk_firmware
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
commit ef788c6 Merge: aa33fb0 ae5bcaa Author: QMK Bot <hello@qmk.fm> Date: Fri Jun 2 07:46:36 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit ae5bcaa Author: yiancar <yiangosyiangou@cytanet.com.cy> Date: Fri Jun 2 08:45:54 2023 +0100 [keyboard] Phoenix (qmk#21051) * Update keyboards/cablecardesigns/phoenix/ commit aa33fb0 Author: Joel Challis <git@zvecr.com> Date: Fri Jun 2 02:45:48 2023 +0100 Revert "Add *_MATRIX_LED_COUNT generation/validation (qmk#19515)" (qmk#21109) This reverts commit 25c16b3. commit 25c16b3 Author: Joel Challis <git@zvecr.com> Date: Fri Jun 2 02:42:49 2023 +0100 Add *_MATRIX_LED_COUNT generation/validation (qmk#19515) * Add *_MATRIX_LED_COUNT parsing/validation * Disable parsing for now * Disable complexity check commit 0a3ec7f Author: Joel Challis <git@zvecr.com> Date: Thu Jun 1 21:12:25 2023 +0100 Merge upstream uf2conv.py changes (qmk#21107) commit a4ed6ad Author: Ryan <fauxpark@gmail.com> Date: Fri Jun 2 02:25:08 2023 +1000 Unicodemap keycodes rename (qmk#21092) commit 45c9bc4 Merge: 857e9b7 b110a09 Author: QMK Bot <hello@qmk.fm> Date: Thu Jun 1 14:11:31 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit b110a09 Author: DeskDaily <65656486+DeskDaily@users.noreply.github.com> Date: Thu Jun 1 22:10:47 2023 +0800 [Keyboard] Add lightweight65 keyboard (qmk#21034) Co-authored-by: Neil Brian Ramirez <nightlykeyboards@gmail.com> Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com> commit 857e9b7 Merge: 6156972 c805c10 Author: QMK Bot <hello@qmk.fm> Date: Thu Jun 1 09:26:41 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit c805c10 Author: Sergi Meseguer <zigotica@gmail.com> Date: Thu Jun 1 11:25:49 2023 +0200 [Keymap] z12 zigotica keymap tweaks (qmk#20990) commit 0c9c4a4 Author: adiabatic <adiabatic@users.noreply.github.com> Date: Thu Jun 1 02:25:33 2023 -0700 [Keymap] `zweihander-macos`: Don’t pretend to be a mouse (qmk#20997) commit 6156972 Merge: 5a26e5e 81bc092 Author: QMK Bot <hello@qmk.fm> Date: Wed May 31 19:03:39 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 81bc092 Author: kkokdae <kkokdae@me.com> Date: Thu Jun 1 04:02:58 2023 +0900 [Keymap] Modify kkokdae keymap for keyboardio/atreus (qmk#21037) commit 5a26e5e Author: 3araht <69518343+3araht@users.noreply.github.com> Date: Thu Jun 1 03:48:56 2023 +0900 [Keymap] transpose added to giabalanai keymaps (qmk#21054) commit 6a2de56 Merge: 04719c7 c2ddd77 Author: QMK Bot <hello@qmk.fm> Date: Wed May 31 18:47:46 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit c2ddd77 Author: CoffeeIsLife <36961653+CoffeeIsLife87@users.noreply.github.com> Date: Wed May 31 13:46:59 2023 -0500 [Keymap] Cleanup coffeeislife87 keymap and remove features (qmk#21061) Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Fae <faenkhauser@gmail.com> commit 04719c7 Author: Evgenii Vilkov <zzeneg@gmail.com> Date: Wed May 31 20:46:03 2023 +0200 Fix backlight sync on suspend_power_down for split keyboards (qmk#21079) commit b3a7f80 Merge: cc11b63 3a3e5ab Author: QMK Bot <hello@qmk.fm> Date: Wed May 31 18:44:47 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 3a3e5ab Author: Drashna Jaelre <drashna@live.com> Date: Wed May 31 11:44:06 2023 -0700 [Keymap] Drashna Keymap updates for 0.21.0 (qmk#21073) commit cc11b63 Merge: 23658cf 1411c79 Author: QMK Bot <hello@qmk.fm> Date: Tue May 30 18:25:04 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 1411c79 Author: Sergey Vlasov <sigprof@gmail.com> Date: Tue May 30 21:24:19 2023 +0300 `qmk find`: Fix handling of functions in filters (qmk#21090) Functions in filters did not work properly except when used in the last (or only) filter. The problem was caused by the peculiarity of the `lambda` behavior in Python — any variables from the outer scope are captured only by reference, therefore any subsequent reassignment of those variables is propagated to all lambdas created earlier in the same scope. Together with the laziness of `filter()` (it returns an iterator which performs filtering on demand) this resulted in all function filters using the values of the `key` and `value` variables which correspond to the last filter in the sequence, therefore the result of filtering was wrong if some filter with a function was not the last one in the sequence. Apparently the shortest way to make a Python lambda capture some variables by value is to add arguments with default values for such variables (default values are evaluated when the lambda is created, and any subsequent reassignments in the outer scope no longer changes them). This makes filters with functions work properly even when such filters are not at the last position in the sequence. commit 23658cf Merge: ffeaf46 913691b Author: QMK Bot <hello@qmk.fm> Date: Tue May 30 01:11:34 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 913691b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue May 30 02:10:57 2023 +0100 Bump tj-actions/changed-files from 35 to 36 (qmk#21058) Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 35 to 36. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](tj-actions/changed-files@v35...v36) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit ffeaf46 Merge: 0ffa4ef 1e2dedd Author: QMK Bot <hello@qmk.fm> Date: Tue May 30 01:08:54 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 1e2dedd Author: precondition <57645186+precondition@users.noreply.github.com> Date: Tue May 30 03:08:15 2023 +0200 Remove outdated remarks regarding the default MT behavior (qmk#21077)
- Loading branch information
Showing
158 changed files
with
2,930 additions
and
2,753 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
// Copyright 2023 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com> | ||
// SPDX-License-Identifier: GPL-2.0-or-later | ||
|
||
#pragma once | ||
|
||
#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64 | ||
#define TAPPING_TERM 499 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,100 @@ | ||
// Copyright 2023 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com> | ||
// SPDX-License-Identifier: GPL-2.0-or-later | ||
|
||
#include "drashna.h" | ||
|
||
// clang-format off | ||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
[0] = LAYOUT( | ||
LT(1,KC_MUTE), | ||
KC_ENT, KC_0, KC_BSPC, | ||
KC_7, KC_8, KC_9, | ||
KC_4, KC_5, KC_6, | ||
KC_1, KC_2, KC_3 | ||
), | ||
[1] = LAYOUT( | ||
_______, | ||
CK_TOGG, AU_TOGG, _______, | ||
_______, _______, _______, | ||
_______, _______, _______, | ||
_______, _______, _______ | ||
), | ||
}; | ||
// clang-format on | ||
|
||
#ifdef ENCODER_MAP_ENABLE | ||
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { | ||
[0] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, | ||
[1] = {ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)}, | ||
}; | ||
#endif | ||
|
||
void render_oled_title(bool side) { | ||
oled_write_P(PSTR(" Macropad "), true); | ||
} | ||
|
||
void render_rgb_mode(uint8_t col, uint8_t line); | ||
|
||
void l_render_keylock_status(led_t led_usb_state, uint8_t col, uint8_t line) { | ||
oled_set_cursor(col, line); | ||
#ifdef CAPS_WORD_ENABLE | ||
led_usb_state.caps_lock |= is_caps_word_on(); | ||
#endif | ||
oled_write_P(PSTR(OLED_RENDER_LOCK_NUML), led_usb_state.num_lock); | ||
oled_write_P(PSTR(" "), false); | ||
oled_write_P(PSTR(OLED_RENDER_LOCK_CAPS), led_usb_state.caps_lock); | ||
oled_write_P(PSTR(" "), false); | ||
oled_write_P(PSTR(OLED_RENDER_LOCK_SCLK), led_usb_state.scroll_lock); | ||
} | ||
|
||
bool oled_task_keymap(void) { | ||
oled_write_raw_P(header_image, sizeof(header_image)); | ||
oled_set_cursor(0, 1); | ||
oled_write_raw_P(row_2_image, sizeof(row_2_image)); | ||
oled_set_cursor(4, 0); | ||
render_oled_title(false); | ||
|
||
render_kitty(0, 2); | ||
render_matrix_scan_rate(1, 7, 2); | ||
|
||
#ifdef AUDIO_ENABLE | ||
oled_set_cursor(7, 4); | ||
bool l_is_audio_on = is_audio_on(); | ||
|
||
static const char PROGMEM audio_status[2][3] = {{0xE0, 0xE1, 0}, {0xE2, 0xE3, 0}}; | ||
oled_write_P(audio_status[l_is_audio_on], false); | ||
|
||
# ifdef AUDIO_CLICKY | ||
bool l_is_clicky_on = is_clicky_on(); | ||
static const char PROGMEM audio_clicky_status[2][3] = {{0xF4, 0xF5, 0}, {0xF6, 0xF7, 0}}; | ||
oled_write_P(audio_clicky_status[l_is_clicky_on && l_is_audio_on], false); | ||
# endif | ||
#endif | ||
|
||
static const char PROGMEM cat_mode[3] = {0xF8, 0xF9, 0}; | ||
oled_write_P(cat_mode, get_keyboard_lock()); | ||
|
||
#ifdef RGB_MATIRX_ENABLE | ||
static const char PROGMEM rgb_layer_status[2][3] = {{0xEE, 0xEF, 0}, {0xF0, 0xF1, 0}}; | ||
oled_write_P(rgb_layer_status[rgb_matrix_is_enabled()], false); | ||
#endif | ||
|
||
#ifdef HAPTIC_ENABLE | ||
static const char PROGMEM nukem_good[2] = {0xFA, 0}; | ||
oled_write_P(haptic_get_enable() ? nukem_good : PSTR(" "), false); | ||
#endif | ||
|
||
l_render_keylock_status(host_keyboard_led_state(), 7, 5); | ||
render_rgb_mode(1, 6); | ||
|
||
for (uint8_t i = 1; i < 7; i++) { | ||
oled_set_cursor(0, i); | ||
oled_write_raw_P(display_border, sizeof(display_border)); | ||
oled_set_cursor(21, i); | ||
oled_write_raw_P(display_border, sizeof(display_border)); | ||
} | ||
oled_set_cursor(0, 7); | ||
oled_write_raw_P(footer_image, sizeof(footer_image)); | ||
|
||
return false; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
ENCODER_MAP_ENABLE = yes | ||
DEBUG_MATRIX_SCAN_RATE_ENABLE = api | ||
WPM_ENABLE = yes |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.