Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@qmk-bot
qmk-bot committed Apr 5, 2023
2 parents 8bb4cba + 1d045e8 commit cb87a23
Show file tree
Hide file tree
Showing 19 changed files with 1,381 additions and 0 deletions.
107 changes: 107 additions & 0 deletions keyboards/junco/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
{
"manufacturer": "Dane Skalski",
"keyboard_name": "Junco",
"url": "https://github.com/Daneski13/Junco",
"maintainer": "Daneski13",
"usb": {
"vid": "0x4413",
"pid": "0x4A13",
"device_version": "1.0.0"
},
"processor": "RP2040",
"bootloader": "rp2040",
"layouts": {
"LAYOUT_split4x6_r1": {
"layout": [
{ "label": "`", "matrix": [0, 0], "x": 0, "y": 0.7 },
{ "label": "1", "matrix": [0, 1], "x": 1, "y": 0.7 },
{ "label": "2", "matrix": [0, 2], "x": 2, "y": 0.3 },
{ "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
{ "label": "4", "matrix": [0, 4], "x": 4, "y": 0.3 },
{ "label": "5", "matrix": [0, 5], "x": 5, "y": 0.45 },
{ "label": "6", "matrix": [5, 5], "x": 9, "y": 0.45 },
{ "label": "7", "matrix": [5, 4], "x": 10, "y": 0.3 },
{ "label": "8", "matrix": [5, 3], "x": 11, "y": 0 },
{ "label": "9", "matrix": [5, 2], "x": 12, "y": 0.3 },
{ "label": "0", "matrix": [5, 1], "x": 13, "y": 0.7 },
{ "label": "-", "matrix": [5, 0], "x": 14, "y": 0.7 },

{ "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.7 },
{ "label": "Q", "matrix": [1, 1], "x": 1, "y": 1.7 },
{ "label": "W", "matrix": [1, 2], "x": 2, "y": 1.3 },
{ "label": "E", "matrix": [1, 3], "x": 3, "y": 1 },
{ "label": "R", "matrix": [1, 4], "x": 4, "y": 1.3 },
{ "label": "T", "matrix": [1, 5], "x": 5, "y": 1.45 },
{ "label": "Y", "matrix": [6, 5], "x": 9, "y": 1.45 },
{ "label": "U", "matrix": [6, 4], "x": 10, "y": 1.3 },
{ "label": "I", "matrix": [6, 3], "x": 11, "y": 1 },
{ "label": "O", "matrix": [6, 2], "x": 12, "y": 1.3 },
{ "label": "P", "matrix": [6, 1], "x": 13, "y": 1.7 },
{ "label": "Enter", "matrix": [6, 0], "x": 14, "y": 1.7 },

{ "label": "Esc", "matrix": [2, 0], "x": 0, "y": 2.7 },
{ "label": "A", "matrix": [2, 1], "x": 1, "y": 2.7 },
{ "label": "S", "matrix": [2, 2], "x": 2, "y": 2.3 },
{ "label": "D", "matrix": [2, 3], "x": 3, "y": 2 },
{ "label": "F", "matrix": [2, 4], "x": 4, "y": 2.3 },
{ "label": "G", "matrix": [2, 5], "x": 5, "y": 2.45 },
{ "label": "H", "matrix": [7, 5], "x": 9, "y": 2.45 },
{ "label": "J", "matrix": [7, 4], "x": 10, "y": 2.3 },
{ "label": "K", "matrix": [7, 3], "x": 11, "y": 2 },
{ "label": "L", "matrix": [7, 2], "x": 12, "y": 2.3 },
{ "label": ";", "matrix": [7, 1], "x": 13, "y": 2.7 },
{ "label": "'", "matrix": [7, 0], "x": 14, "y": 2.7 },

{ "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.7 },
{ "label": "Z", "matrix": [3, 1], "x": 1, "y": 3.7 },
{ "label": "X", "matrix": [3, 2], "x": 2, "y": 3.3 },
{ "label": "C", "matrix": [3, 3], "x": 3, "y": 3 },
{ "label": "V", "matrix": [3, 4], "x": 4, "y": 3.3 },
{ "label": "B", "matrix": [3, 5], "x": 5, "y": 3.45 },
{ "label": "Mute", "matrix": [4, 5], "x": 6.2, "y": 3.45 },
{ "label": "XXX", "matrix": [9, 5], "x": 7.8, "y": 3.45 },
{ "label": "N", "matrix": [8, 5], "x": 9, "y": 3.45 },
{ "label": "M", "matrix": [8, 4], "x": 10, "y": 3.3 },
{ "label": ",", "matrix": [8, 3], "x": 11, "y": 3 },
{ "label": ".", "matrix": [8, 2], "x": 12, "y": 3.3 },
{ "label": "/", "matrix": [8, 1], "x": 13, "y": 3.7 },
{ "label": "Shift", "matrix": [8, 0], "x": 14, "y": 3.7 },

{ "label": "Ctrl", "matrix": [4, 0], "x": 2, "y": 4.3 },
{ "label": "Win", "matrix": [4, 1], "x": 3, "y": 4 },
{ "label": "Alt", "matrix": [4, 2], "x": 4, "y": 4.3 },
{
"label": "Del",
"matrix": [4, 3],
"x": 5.1,
"y": 4.5,
"h": 1.5
},
{
"label": "Spc",
"matrix": [4, 4],
"x": 6.1,
"y": 4.5,
"h": 1.5
},
{
"label": "Shift",
"matrix": [9, 3],
"x": 7.9,
"y": 4.5,
"h": 1.5
},
{
"label": "Bspc",
"matrix": [9, 4],
"x": 8.9,
"y": 4.5,
"h": 1.5
},
{ "label": "Alt", "matrix": [9, 2], "x": 10, "y": 4.3 },
{ "label": "Win", "matrix": [9, 1], "x": 11, "y": 4 },
{ "label": "Ctrl", "matrix": [9, 0], "x": 12, "y": 4.3 }
]
}
}
}
38 changes: 38 additions & 0 deletions keyboards/junco/keymaps/default/config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// Copyright 2022 Dane Skalski (@Daneski13)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

/* - Encoder settings - */
#ifdef ENCODER_ENABLE
# define ENCODER_RESOLUTION 4
#endif
#ifdef ENCODER_MAP_ENABLE
// Key delay for encoders (necessary for some keycodes)
# define ENCODER_MAP_KEY_DELAY 10
#endif

/*
- RGB Stuff -
All effects can be found in the QMK docs:
https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
*/
#ifdef RGB_MATRIX_ENABLE

// Default effect when EEPROM cleared
# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON

// Turns off RGB effects when there is no longer a USB connection
# define RGB_DISABLE_WHEN_USB_SUSPENDED

// Key press reactive animations
# define SPLIT_TRANSPORT_MIRROR // Necessary setting for key press animations
# define RGB_MATRIX_KEYPRESSES // Enables key press effects
# define ENABLE_RGB_MATRIX_MULTISPLASH

// Normal effects
# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
# define ENABLE_RGB_MATRIX_PIXEL_RAIN

#endif
Loading

0 comments on commit cb87a23

Please sign in to comment.