Skip to content

Commit

Permalink
Merge branch 'oryx'
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions committed Nov 30, 2024
2 parents 33e29ad + 28d8d83 commit de2cf8d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion JzWvO/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#define USB_SUSPEND_WAKEUP_DELAY 0
#define CAPS_LOCK_STATUS
#define SERIAL_NUMBER "JzWvO/GdP3Q"
#define SERIAL_NUMBER "JzWvO/Q4vqg"
#define LAYER_STATE_32BIT
#define HCS(report) host_consumer_send(record->event.pressed ? report : 0); return false

Expand Down
6 changes: 3 additions & 3 deletions JzWvO/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
KC_TRANSPARENT, KC_TRANSPARENT, KC_S, KC_D, KC_F, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_J, KC_K, KC_L, KC_TRANSPARENT, KC_TRANSPARENT,
KC_LEFT_SHIFT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_RIGHT_SHIFT,
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT
),
Expand Down Expand Up @@ -86,8 +86,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_Y, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_F1,
KC_TRANSPARENT, KC_LEFT_SHIFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_TRANSPARENT, KC_TRANSPARENT, KC_J, KC_K, KC_L, KC_SCLN, KC_F3,
KC_B, KC_LEFT_CTRL, KC_Z, KC_X, KC_C, KC_V, KC_TRANSPARENT, KC_TRANSPARENT, KC_UP, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
KC_LEFT_GUI, KC_TRANSPARENT, KC_TRANSPARENT, KC_END, KC_HOME, KC_F5, KC_F9, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_PAGE_UP,
KC_SPACE, KC_LEFT_ALT, KC_TAB, TO(0), KC_BSPC, KC_ENTER
TO(0), KC_TRANSPARENT, KC_TRANSPARENT, KC_END, KC_HOME, KC_F5, KC_F9, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_PAGE_UP,
KC_SPACE, KC_LEFT_ALT, KC_TAB, KC_LEFT_GUI, KC_BSPC, KC_ENTER
),
[7] = LAYOUT_moonlander(
KC_ESCAPE, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_6, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
Expand Down

0 comments on commit de2cf8d

Please sign in to comment.