Skip to content

Commit

Permalink
nesgit
Browse files Browse the repository at this point in the history 
Squashed commit of the following:

commit cf5626e
Author: Drashna Jaelre <drashna@drashna.net>
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 <hello@qmk.fm>
Date:   Thu Apr 13 04:04:42 2023 +0000

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

commit 6d965d4
Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date:   Thu Apr 13 12:04:02 2023 +0800

    Add hardware information momokai keyboards (qmk#20434)

commit d11c379
Author: Drashna Jaelre <drashna@drashna.net>
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 <drashna@live.com>
Date:   Wed Apr 12 14:36:45 2023 -0700

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

commit ce41722
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
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 <hello@qmk.fm>
Date:   Wed Apr 12 19:29:26 2023 +0000

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

commit 0382a25
Author: Paulo Pereira <paulomp90@gmail.com>
Date:   Wed Apr 12 20:28:26 2023 +0100

    [Keymap] Add paulomp90 lily58 keymap (qmk#20327)

    Co-authored-by: Drashna Jaelre <drashna@live.com>

commit 614a682
Merge: 134586d 83dcbef
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 17:32:34 2023 +0000

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

commit 83dcbef
Author: Tommy Oldfield <oldfieldtc@gmail.com>
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 <hello@qmk.fm>
Date:   Wed Apr 12 17:28:51 2023 +0000

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

commit 18335dd
Author: Josh Hinnebusch <joshhinnebusch@gmail.com>
Date:   Wed Apr 12 13:27:37 2023 -0400

    [Keyboard] Fix h87 g2 VID conflict (qmk#20388)

commit c57902d
Author: Moritz Plattner <moritz.plattner@gmx.net>
Date:   Wed Apr 12 17:36:28 2023 +0200

    [Keyboard] Add support for ISO version of Durgod Hades (qmk#20110)

    Co-authored-by: Ryan <fauxpark@gmail.com>

commit 41add95
Merge: a9ec2b3 051485c
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 15:35:55 2023 +0000

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

commit 051485c
Author: Ryan <PHSC138@users.noreply.github.com>
Date:   Wed Apr 12 11:35:12 2023 -0400

    [Keymap] PHSC138 Keymap for Atom47 (qmk#18768)

    Co-authored-by: Ryan <fauxpark@gmail.com>
    Co-authored-by: Drashna Jaelre <drashna@live.com>

commit a9ec2b3
Merge: 9994e8c 5012dfd
Author: QMK Bot <hello@qmk.fm>
Date:   Wed Apr 12 15:34:30 2023 +0000

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

commit 5012dfd
Author: Jeff Epler <jepler@gmail.com>
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 <hello@qmk.fm>
Date:   Wed Apr 12 15:08:47 2023 +0000

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

commit 641698d
Author: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Date:   Wed Apr 12 11:07:47 2023 -0400

    [Keyboard] ymdk/id75 (qmk#19967)

    Co-authored-by: jack <0x6a73@protonmail.com>
    Co-authored-by: Drashna Jaelre <drashna@live.com>

commit 1502193
Author: Manuel Ullmann <labre@posteo.de>
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 <403432+grota@users.noreply.github.com>
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 <hello@qmk.fm>
Date:   Wed Apr 12 10:11:37 2023 +0000

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

commit 75edefe
Author: Mike Killewald <mkillewald@yahoo.com>
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 <fauxpark@gmail.com>
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 <18669334+noroadsleft@users.noreply.github.com>
Date:   Tue Apr 11 13:42:35 2023 -0700

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

commit 7e6eba6
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
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 <hello@qmk.fm>
Date:   Tue Apr 11 18:33:13 2023 +0000

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

commit 26b35a5
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
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 <hello@qmk.fm>
Date:   Tue Apr 11 01:44:24 2023 +0000

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

commit 38700f7
Author: Joel Challis <git@zvecr.com>
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 <hello@qmk.fm>
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] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 6f77559
Merge: d3b8179 bc6db28
Author: QMK Bot <hello@qmk.fm>
Date:   Mon Apr 10 19:33:02 2023 +0000

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

commit bc6db28
Author: Vertex-kb <102476474+Vertex-kb@users.noreply.github.com>
Date:   Tue Apr 11 03:32:16 2023 +0800

    [Keyboard] Update angle65 VID/PID (qmk#20401)

commit d3b8179
Author: Ricardo Hermida Ruiz <rhruiz@gmail.com>
Date:   Mon Apr 10 09:45:25 2023 -0300

    Prevent Tri-Layer keys from stopping caps words (qmk#20398)
  • Loading branch information
@freznel10
freznel10 committed Apr 15, 2023
1 parent 3e07eef commit c5fb30a
Show file tree
Hide file tree
Showing 12 changed files with 17,452 additions and 338 deletions.
59 changes: 56 additions & 3 deletions keyboards/zerfstudios/chunky/chunky.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,14 +266,15 @@ static int8_t rotations = 0;
bool lvgl_encoder = false;
static lv_group_t *g;
static uint32_t act_key = 0;

bool is_alt_tab_active_2 = false; // Flag to check if alt tab is active
uint32_t alt_tab_timer_2 = 0;
bool is_lalt_pressed = false;
float pm_song[][2] = SONG(VIOLIN_SOUND);

bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
if (!process_record_user(keycode, record)) {
return false;
}
# ifndef NO_chunky_KEYCODES
switch (keycode) {
case POINTER_DEFAULT_DPI_FORWARD:
if (record->event.pressed) {
Expand Down Expand Up @@ -384,10 +385,53 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
act_key = 0;
}
break;
}
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.
if (record->event.pressed) is_lalt_pressed = true;
else is_lalt_pressed = false;
return true;
case ALTTABF:
case ALTTABB:
if (record->event.pressed) {
if (!is_alt_tab_active_2) {
is_alt_tab_active_2 = true;
register_code(KC_LALT);

}
tap_code16(keycode == ALTTABF ? KC_TAB : S(KC_TAB)); // Due to S(KC_TAB), the 16-bit tap_code16 is needed.
alt_tab_timer_2 = timer_read32();
break;
}
case ALTTABC: {
if (record->event.pressed) {
if (is_alt_tab_active_2) {
if (!is_lalt_pressed) unregister_code(KC_LALT);
is_alt_tab_active_2 = false;
}
break;
}
}
case SWITCH_1: {
}
break;
case SWITCH_2: {
}
break;
case SWITCH_3: {
}
break;
case SWITCH_4: {
}
break;
case SWITCH_5: {
}
break;
case SWITCH_6: {
}
break;
}
# endif
return true;

}

void rgb_matrix_increase_flags(void)
Expand Down Expand Up @@ -551,7 +595,16 @@ void keyboard_post_init_kb(void) {

}

#define ALT_TAB_DELAY 1000

void housekeeping_task_kb(void) {
if (is_alt_tab_active_2) {
if (is_lalt_pressed) alt_tab_timer_2 = timer_read32();
else if (timer_elapsed32(alt_tab_timer_2) > ALT_TAB_DELAY) {
unregister_code(KC_LALT);
is_alt_tab_active_2 = false;
}
}

// static int prev_prox_state = 0;
// static uint32_t prev_prox_time = 0;
Expand Down
13 changes: 12 additions & 1 deletion keyboards/zerfstudios/chunky/chunky.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,18 @@ enum chunky_keycodes {
LVGL_CONTROL_PREV,
LVGL_CONTROL_LEFT,
LVGL_CONTROL_RIGHT,
LVGL_CONTROL_ENTER
LVGL_CONTROL_ENTER,
ALTTABF, // ALT-TAB forward
ALTTABB, // ALT-TAB backwards
ALTTABC, // For alt-tab-click
SWITCH_1,
SWITCH_2,
SWITCH_3,
SWITCH_4,
SWITCH_5,
SWITCH_6


};
# define CHUNKY_SAFE_RANGE KEYMAP_SAFE_RANGE
# define DPI_MOD POINTER_DEFAULT_DPI_FORWARD
Expand Down
22 changes: 2 additions & 20 deletions keyboards/zerfstudios/chunky/keymaps/freznel/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
SWITCH_1, SWITCH_2, SWITCH_3, SWITCH_4, SWITCH_5, SWITCH_6, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

[_GAMEPAD] = LAYOUT_4x6_wrapper(
Expand Down Expand Up @@ -289,7 +289,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
return true;
}

#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) }
#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) }
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[_DEFAULT_LAYER_1] = BASE_ENCODERS,
Expand All @@ -305,24 +305,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[_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) }
};


// #define BASE_ENCODERS {ENCODER_CCW_CW(KC_A, KC_B), ENCODER_CCW_CW(KC_WH_D, KC_WH_U) }
// #ifdef ENCODER_MAP_ENABLE
// const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
// [_DEFAULT_LAYER_1] = BASE_ENCODERS,
// [_DEFAULT_LAYER_2] = BASE_ENCODERS,
// [_DEFAULT_LAYER_3] = BASE_ENCODERS,
// [_DEFAULT_LAYER_4] = BASE_ENCODERS,
// [_MOUSE] = BASE_ENCODERS,
// [_GAMEPAD] = BASE_ENCODERS,
// [_MEDIA] = BASE_ENCODERS,
// [_RAISE] = BASE_ENCODERS,
// [_LOWER] = BASE_ENCODERS,
// [_ADJUST] = BASE_ENCODERS,
// [_KEYPAD] = BASE_ENCODERS
// };

// clang-format on
#else

deferred_token encoder_token = INVALID_DEFERRED_TOKEN;
Expand Down
6 changes: 6 additions & 0 deletions keyboards/zerfstudios/chunky/rules.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ QUANTUM_PAINTER_DRIVERS += gc9a01_spi
SRC += ui/ui.c \
ui/ui_helpers.c \
ui/assets/ui_img_2120736529.c \
ui/assets/ui_img_2040_png.c \
ui/assets/ui_img_chunky_lower_png.c \
ui/assets/ui_img_chunky_upper_png.c \
ui/assets/ui_img_bk80_png.c \
ui/assets/ui_img_logo_test_png.c \
ui/assets/ui_img_logo_png.c \
Expand All @@ -65,6 +68,9 @@ SRC += ui/ui.c \
ui/fonts/ui_font_Futura20.c \
ui/fonts/ui_font_Futura22.c \
ui/fonts/ui_font_Futura24.c \
ui/fonts/ui_font_GaretHeavy14.c \
ui/fonts/ui_font_GaretHeavy18.c \
ui/fonts/ui_font_GaretHeavy48.c \
ui/fonts/eleganticons.c \
adps9660.c \

Expand Down
Loading

0 comments on commit c5fb30a

Please sign in to comment.