Skip to content

Commit c5fb30a

Browse files
freznel10freznel10
committed
nesgit
Squashed commit of the following: commit cf5626e Author: Drashna Jaelre <[email protected]> Date: Wed Apr 12 21:43:27 2023 -0700 [Bug] Fix compilation issues with PS/2 driver on F4x1 controllers (qmk#20433) commit 572f863 Merge: d11c379 6d965d4 Author: QMK Bot <[email protected]> Date: Thu Apr 13 04:04:42 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 6d965d4 Author: Albert Y <[email protected]> Date: Thu Apr 13 12:04:02 2023 +0800 Add hardware information momokai keyboards (qmk#20434) commit d11c379 Author: Drashna Jaelre <[email protected]> Date: Wed Apr 12 17:59:07 2023 -0700 [Keyboard] Update ymdk/id75 config (qmk#20432) commit a41f6a3 Merge: 4a58db9 ce41722 Author: Drashna Jael're <[email protected]> Date: Wed Apr 12 14:36:45 2023 -0700 Merge remote-tracking branch 'origin/master' into develop commit ce41722 Author: James Young <[email protected]> Date: Wed Apr 12 14:29:29 2023 -0700 4pplet/eagle_viper_rep/rev_a Layout Macro Conversion and Additions (qmk#20414) * info.json: apply friendly formatting * add matrix_diagram.md * move matrix data to info.json * add LAYOUT_60_ansi_split_bs_rshift * add LAYOUT_60_tsangan_hhkb * add LAYOUT_60_hhkb commit 4a58db9 Merge: 614a682 0382a25 Author: QMK Bot <[email protected]> Date: Wed Apr 12 19:29:26 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 0382a25 Author: Paulo Pereira <[email protected]> Date: Wed Apr 12 20:28:26 2023 +0100 [Keymap] Add paulomp90 lily58 keymap (qmk#20327) Co-authored-by: Drashna Jaelre <[email protected]> commit 614a682 Merge: 134586d 83dcbef Author: QMK Bot <[email protected]> Date: Wed Apr 12 17:32:34 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 83dcbef Author: Tommy Oldfield <[email protected]> Date: Wed Apr 12 18:31:47 2023 +0100 [Keymap] Add personal keymap for Lily58 (qmk#18735) commit 134586d Merge: c57902d 18335dd Author: QMK Bot <[email protected]> Date: Wed Apr 12 17:28:51 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 18335dd Author: Josh Hinnebusch <[email protected]> Date: Wed Apr 12 13:27:37 2023 -0400 [Keyboard] Fix h87 g2 VID conflict (qmk#20388) commit c57902d Author: Moritz Plattner <[email protected]> Date: Wed Apr 12 17:36:28 2023 +0200 [Keyboard] Add support for ISO version of Durgod Hades (qmk#20110) Co-authored-by: Ryan <[email protected]> commit 41add95 Merge: a9ec2b3 051485c Author: QMK Bot <[email protected]> Date: Wed Apr 12 15:35:55 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 051485c Author: Ryan <[email protected]> Date: Wed Apr 12 11:35:12 2023 -0400 [Keymap] PHSC138 Keymap for Atom47 (qmk#18768) Co-authored-by: Ryan <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]> commit a9ec2b3 Merge: 9994e8c 5012dfd Author: QMK Bot <[email protected]> Date: Wed Apr 12 15:34:30 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 5012dfd Author: Jeff Epler <[email protected]> Date: Wed Apr 12 09:33:42 2023 -0600 [Keyboard] add kb2040 flavor of gherkin (qmk#18360) commit 9994e8c Merge: 1502193 641698d Author: QMK Bot <[email protected]> Date: Wed Apr 12 15:08:47 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 641698d Author: Less/Rikki <[email protected]> Date: Wed Apr 12 11:07:47 2023 -0400 [Keyboard] ymdk/id75 (qmk#19967) Co-authored-by: jack <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]> commit 1502193 Author: Manuel Ullmann <[email protected]> Date: Wed Apr 12 14:24:07 2023 +0000 quantum/action_util.c: Use uint8_t for oneshot_layer_data (qmk#20423) commit e77699a Author: Giuseppe Rota <[email protected]> Date: Wed Apr 12 16:22:07 2023 +0200 Fix preprocessor condition for SPLIT_HAPTIC_ENABLE (qmk#20411) commit e699724 Merge: 5bd68e3 75edefe Author: QMK Bot <[email protected]> Date: Wed Apr 12 10:11:37 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 75edefe Author: Mike Killewald <[email protected]> Date: Wed Apr 12 06:10:50 2023 -0400 fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapped (qmk#20420) commit 5bd68e3 Author: Ryan <[email protected]> Date: Wed Apr 12 13:42:51 2023 +1000 Move single `LAYOUT`s to data driven (qmk#20365) commit 941e159 Merge: fbf6727 7e6eba6 Author: James Young <[email protected]> Date: Tue Apr 11 13:42:35 2023 -0700 Merge remote-tracking branch 'origin/master' into develop commit 7e6eba6 Author: James Young <[email protected]> Date: Tue Apr 11 13:26:41 2023 -0700 4pplet/bootleg/rev_a Layout Macro Conversion and Addition (qmk#20400) * info.json: apply friendly formatting * move matrix data to info.json * add LAYOUT_60_ansi_split_bs_rshift commit fbf6727 Merge: b8d7f28 26b35a5 Author: QMK Bot <[email protected]> Date: Tue Apr 11 18:33:13 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 26b35a5 Author: James Young <[email protected]> Date: Tue Apr 11 11:31:56 2023 -0700 4pplet/aekiso60 Layout Macro Conversion and Additions (qmk#20399) * add matrix_diagram.md Adds `matrix_diagram.md` to the `4pplet/aekiso60` directory, and removes the diagrams from the keyboard revision header files. * info.json: apply friendly formatting * move matrix data to info.json * create keyboard-level info.json * add LAYOUT_60_iso_tsangan * enable Community Layout support commit b8d7f28 Merge: ae1e6b7 38700f7 Author: QMK Bot <[email protected]> Date: Tue Apr 11 01:44:24 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 38700f7 Author: Joel Challis <[email protected]> Date: Tue Apr 11 02:43:45 2023 +0100 Reject info.json at keymap level (qmk#20408) commit ae1e6b7 Merge: 6f77559 ed72c42 Author: QMK Bot <[email protected]> Date: Mon Apr 10 22:50:31 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit ed72c42 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Apr 10 23:49:53 2023 +0100 Bump anothrNick/github-tag-action from 1.61.0 to 1.62.0 (qmk#20407) Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.61.0 to 1.62.0. - [Release notes](https://github.com/anothrNick/github-tag-action/releases) - [Commits](anothrNick/github-tag-action@1.61.0...1.62.0) --- updated-dependencies: - dependency-name: anothrNick/github-tag-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 6f77559 Merge: d3b8179 bc6db28 Author: QMK Bot <[email protected]> Date: Mon Apr 10 19:33:02 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit bc6db28 Author: Vertex-kb <[email protected]> Date: Tue Apr 11 03:32:16 2023 +0800 [Keyboard] Update angle65 VID/PID (qmk#20401) commit d3b8179 Author: Ricardo Hermida Ruiz <[email protected]> Date: Mon Apr 10 09:45:25 2023 -0300 Prevent Tri-Layer keys from stopping caps words (qmk#20398)
1 parent 3e07eef commit c5fb30a

File tree

12 files changed

+17452
-338
lines changed

12 files changed

+17452
-338
lines changed

‎keyboards/zerfstudios/chunky/chunky.c

Lines changed: 56 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,14 +266,15 @@ static int8_t rotations = 0;
266266
bool lvgl_encoder = false;
267267
static lv_group_t *g;
268268
static uint32_t act_key = 0;
269-
269+
bool is_alt_tab_active_2 = false; // Flag to check if alt tab is active
270+
uint32_t alt_tab_timer_2 = 0;
271+
bool is_lalt_pressed = false;
270272
float pm_song[][2] = SONG(VIOLIN_SOUND);
271273

272274
bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
273275
if (!process_record_user(keycode, record)) {
274276
return false;
275277
}
276-
# ifndef NO_chunky_KEYCODES
277278
switch (keycode) {
278279
case POINTER_DEFAULT_DPI_FORWARD:
279280
if (record->event.pressed) {
@@ -384,10 +385,53 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
384385
act_key = 0;
385386
}
386387
break;
388+
}
389+
case KC_LALT: // If this is not defined, if the encoder is activated in the alt-tab mode while the LALT key is pressed, the menu goes away.
390+
if (record->event.pressed) is_lalt_pressed = true;
391+
else is_lalt_pressed = false;
392+
return true;
393+
case ALTTABF:
394+
case ALTTABB:
395+
if (record->event.pressed) {
396+
if (!is_alt_tab_active_2) {
397+
is_alt_tab_active_2 = true;
398+
register_code(KC_LALT);
399+
400+
}
401+
tap_code16(keycode == ALTTABF ? KC_TAB : S(KC_TAB)); // Due to S(KC_TAB), the 16-bit tap_code16 is needed.
402+
alt_tab_timer_2 = timer_read32();
403+
break;
404+
}
405+
case ALTTABC: {
406+
if (record->event.pressed) {
407+
if (is_alt_tab_active_2) {
408+
if (!is_lalt_pressed) unregister_code(KC_LALT);
409+
is_alt_tab_active_2 = false;
410+
}
411+
break;
412+
}
413+
}
414+
case SWITCH_1: {
415+
}
416+
break;
417+
case SWITCH_2: {
418+
}
419+
break;
420+
case SWITCH_3: {
387421
}
422+
break;
423+
case SWITCH_4: {
424+
}
425+
break;
426+
case SWITCH_5: {
427+
}
428+
break;
429+
case SWITCH_6: {
430+
}
431+
break;
388432
}
389-
# endif
390433
return true;
434+
391435
}
392436

393437
void rgb_matrix_increase_flags(void)
@@ -551,7 +595,16 @@ void keyboard_post_init_kb(void) {
551595

552596
}
553597

598+
#define ALT_TAB_DELAY 1000
599+
554600
void housekeeping_task_kb(void) {
601+
if (is_alt_tab_active_2) {
602+
if (is_lalt_pressed) alt_tab_timer_2 = timer_read32();
603+
else if (timer_elapsed32(alt_tab_timer_2) > ALT_TAB_DELAY) {
604+
unregister_code(KC_LALT);
605+
is_alt_tab_active_2 = false;
606+
}
607+
}
555608

556609
// static int prev_prox_state = 0;
557610
// static uint32_t prev_prox_time = 0;

‎keyboards/zerfstudios/chunky/chunky.h

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,18 @@ enum chunky_keycodes {
6666
LVGL_CONTROL_PREV,
6767
LVGL_CONTROL_LEFT,
6868
LVGL_CONTROL_RIGHT,
69-
LVGL_CONTROL_ENTER
69+
LVGL_CONTROL_ENTER,
70+
ALTTABF, // ALT-TAB forward
71+
ALTTABB, // ALT-TAB backwards
72+
ALTTABC, // For alt-tab-click
73+
SWITCH_1,
74+
SWITCH_2,
75+
SWITCH_3,
76+
SWITCH_4,
77+
SWITCH_5,
78+
SWITCH_6
79+
80+
7081
};
7182
# define CHUNKY_SAFE_RANGE KEYMAP_SAFE_RANGE
7283
# define DPI_MOD POINTER_DEFAULT_DPI_FORWARD

‎keyboards/zerfstudios/chunky/keymaps/freznel/keymap.c

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
156156
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
157157
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
158158
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
159-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
159+
SWITCH_1, SWITCH_2, SWITCH_3, SWITCH_4, SWITCH_5, SWITCH_6, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
160160
),
161161

162162
[_GAMEPAD] = LAYOUT_4x6_wrapper(
@@ -289,7 +289,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
289289
return true;
290290
}
291291

292-
#define BASE_ENCODERS { ENCODER_CCW_CW(KC_WH_D, KC_WH_U), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_WH_D, KC_WH_U), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
292+
#define BASE_ENCODERS { ENCODER_CCW_CW(ALTTABB, ALTTABF), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_WH_D, KC_WH_U), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
293293
#ifdef ENCODER_MAP_ENABLE
294294
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
295295
[_DEFAULT_LAYER_1] = BASE_ENCODERS,
@@ -305,24 +305,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
305305
[_KEYPAD] = { ENCODER_CCW_CW(LVGL_CLOCKWISE, LVGL_COUNTER_CLOCKWISE), ENCODER_CCW_CW(LVGL_CLOCKWISE, LVGL_COUNTER_CLOCKWISE), ENCODER_CCW_CW(LVGL_CLOCKWISE, LVGL_COUNTER_CLOCKWISE), ENCODER_CCW_CW(LVGL_CLOCKWISE, LVGL_COUNTER_CLOCKWISE) }
306306
};
307307

308-
309-
// #define BASE_ENCODERS {ENCODER_CCW_CW(KC_A, KC_B), ENCODER_CCW_CW(KC_WH_D, KC_WH_U) }
310-
// #ifdef ENCODER_MAP_ENABLE
311-
// const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
312-
// [_DEFAULT_LAYER_1] = BASE_ENCODERS,
313-
// [_DEFAULT_LAYER_2] = BASE_ENCODERS,
314-
// [_DEFAULT_LAYER_3] = BASE_ENCODERS,
315-
// [_DEFAULT_LAYER_4] = BASE_ENCODERS,
316-
// [_MOUSE] = BASE_ENCODERS,
317-
// [_GAMEPAD] = BASE_ENCODERS,
318-
// [_MEDIA] = BASE_ENCODERS,
319-
// [_RAISE] = BASE_ENCODERS,
320-
// [_LOWER] = BASE_ENCODERS,
321-
// [_ADJUST] = BASE_ENCODERS,
322-
// [_KEYPAD] = BASE_ENCODERS
323-
// };
324-
325-
// clang-format on
326308
#else
327309

328310
deferred_token encoder_token = INVALID_DEFERRED_TOKEN;

‎keyboards/zerfstudios/chunky/rules.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ QUANTUM_PAINTER_DRIVERS += gc9a01_spi
4747
SRC += ui/ui.c \
4848
ui/ui_helpers.c \
4949
ui/assets/ui_img_2120736529.c \
50+
ui/assets/ui_img_2040_png.c \
51+
ui/assets/ui_img_chunky_lower_png.c \
52+
ui/assets/ui_img_chunky_upper_png.c \
5053
ui/assets/ui_img_bk80_png.c \
5154
ui/assets/ui_img_logo_test_png.c \
5255
ui/assets/ui_img_logo_png.c \
@@ -65,6 +68,9 @@ SRC += ui/ui.c \
6568
ui/fonts/ui_font_Futura20.c \
6669
ui/fonts/ui_font_Futura22.c \
6770
ui/fonts/ui_font_Futura24.c \
71+
ui/fonts/ui_font_GaretHeavy14.c \
72+
ui/fonts/ui_font_GaretHeavy18.c \
73+
ui/fonts/ui_font_GaretHeavy48.c \
6874
ui/fonts/eleganticons.c \
6975
adps9660.c \
7076

0 commit comments

Comments
 (0)