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

This commit is contained in:
QMK Bot 2022-02-12 07:01:58 +00:00
commit 9f506e64ba
3 changed files with 348 additions and 128 deletions

View file

@ -23,57 +23,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6060
#define DEVICE_VER 0x0001
#define MANUFACTURER Maxr1998
#define PRODUCT Phoebe
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 12
/* Planck PCB default pin-out */
#define MATRIX_ROW_PINS { B7, B3, B2, B1, D6 }
#define MATRIX_COL_PINS { D7, B4, B5, B6, C6, C7, B0, F1, F4, F5, F6, F7 }
#define UNUSED_PINS
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
/* RGB LED Setup */
#define RGB_DI_PIN F0 // pin the DI on the WS2812B is hooked-up to
#define RGBLED_NUM 8 // number of LEDs
/* Selectively enable animation effects */
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
#define RGBLIGHT_EFFECT_SNAKE
#define RGBLIGHT_EFFECT_CHRISTMAS
#define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
/* Leader key setup */
#define LEADER_PER_KEY_TIMING
#define LEADER_TIMEOUT 250
/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/
/* disable debug print */
//#define NO_DEBUG
/* disable print */
//#define NO_PRINT
/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION

View file

@ -1,69 +1,351 @@
{
"keyboard_name": "Phoebe",
"url": "https://github.com/Maxr1998/Phoebe_Keyboard",
"maintainer": "Maxr1998",
"manufacturer": "Maxr1998",
"url": "https://github.com/Maxr1998/Phoebe_Keyboard",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"bootloader_instructions": "Tap reset button on the back.",
"diode_direction": "COL2ROW",
"debounce": 5,
"features": {
"bootmagic": true,
"nkro": true,
"backlight": false,
"rgblight": true,
"key_lock": true,
"leader": true
},
"layouts": {
"LAYOUT": {
"layout": [
{ "w": 1, "x": 0, "y": 0 },
{ "w": 1, "x": 1, "y": 0 },
{ "w": 1, "x": 2, "y": 0 },
{ "w": 1, "x": 3, "y": 0 },
{ "w": 1, "x": 4, "y": 0 },
{ "w": 1, "x": 5, "y": 0 },
{ "w": 1, "x": 6, "y": 0 },
{ "w": 1, "x": 7, "y": 0 },
{ "w": 1, "x": 8, "y": 0 },
{ "w": 1, "x": 9, "y": 0 },
{ "w": 1, "x": 10, "y": 0 },
{ "w": 1, "x": 11, "y": 0 },
{ "w": 1, "x": 0, "y": 1 },
{ "w": 1, "x": 1, "y": 1 },
{ "w": 1, "x": 2, "y": 1 },
{ "w": 1, "x": 3, "y": 1 },
{ "w": 1, "x": 4, "y": 1 },
{ "w": 1, "x": 5, "y": 1 },
{ "w": 1, "x": 6, "y": 1 },
{ "w": 1, "x": 7, "y": 1 },
{ "w": 1, "x": 8, "y": 1 },
{ "w": 1, "x": 9, "y": 1 },
{ "w": 1, "x": 10, "y": 1 },
{ "w": 1, "x": 11, "y": 1 },
{ "w": 1, "x": 0, "y": 2 },
{ "w": 1, "x": 1, "y": 2 },
{ "w": 1, "x": 2, "y": 2 },
{ "w": 1, "x": 3, "y": 2 },
{ "w": 1, "x": 4, "y": 2 },
{ "w": 1, "x": 5, "y": 2 },
{ "w": 1, "x": 6, "y": 2 },
{ "w": 1, "x": 7, "y": 2 },
{ "w": 1, "x": 8, "y": 2 },
{ "w": 1, "x": 9, "y": 2 },
{ "w": 1, "x": 10, "y": 2 },
{ "w": 1, "x": 11, "y": 2 },
{ "w": 1, "x": 0, "y": 3 },
{ "w": 1, "x": 1, "y": 3 },
{ "w": 1, "x": 2, "y": 3 },
{ "w": 1, "x": 3, "y": 3 },
{ "w": 1, "x": 4, "y": 3 },
{ "w": 1, "x": 5, "y": 3 },
{ "w": 1, "x": 6, "y": 3 },
{ "w": 1, "x": 7, "y": 3 },
{ "w": 1, "x": 8, "y": 3 },
{ "w": 1, "x": 9, "y": 3 },
{ "w": 1, "x": 10, "y": 3 },
{ "w": 1, "x": 11, "y": 3 },
{ "w": 1, "x": 0, "y": 4 },
{ "w": 1, "x": 1, "y": 4 },
{ "w": 1, "x": 2, "y": 4 },
{ "w": 1, "x": 3, "y": 4 },
{ "w": 1, "x": 4, "y": 4 },
{ "w": 2, "x": 5, "y": 4 },
{ "w": 1, "x": 7, "y": 4 },
{ "w": 1, "x": 8, "y": 4 },
{ "w": 1, "x": 9, "y": 4 },
{ "w": 1, "x": 10, "y": 4 },
{ "w": 1, "x": 11, "y": 4 } ]
{
"w": 1,
"x": 0,
"y": 0
},
{
"w": 1,
"x": 1,
"y": 0
},
{
"w": 1,
"x": 2,
"y": 0
},
{
"w": 1,
"x": 3,
"y": 0
},
{
"w": 1,
"x": 4,
"y": 0
},
{
"w": 1,
"x": 5,
"y": 0
},
{
"w": 1,
"x": 6,
"y": 0
},
{
"w": 1,
"x": 7,
"y": 0
},
{
"w": 1,
"x": 8,
"y": 0
},
{
"w": 1,
"x": 9,
"y": 0
},
{
"w": 1,
"x": 10,
"y": 0
},
{
"w": 1,
"x": 11,
"y": 0
},
{
"w": 1,
"x": 0,
"y": 1
},
{
"w": 1,
"x": 1,
"y": 1
},
{
"w": 1,
"x": 2,
"y": 1
},
{
"w": 1,
"x": 3,
"y": 1
},
{
"w": 1,
"x": 4,
"y": 1
},
{
"w": 1,
"x": 5,
"y": 1
},
{
"w": 1,
"x": 6,
"y": 1
},
{
"w": 1,
"x": 7,
"y": 1
},
{
"w": 1,
"x": 8,
"y": 1
},
{
"w": 1,
"x": 9,
"y": 1
},
{
"w": 1,
"x": 10,
"y": 1
},
{
"w": 1,
"x": 11,
"y": 1
},
{
"w": 1,
"x": 0,
"y": 2
},
{
"w": 1,
"x": 1,
"y": 2
},
{
"w": 1,
"x": 2,
"y": 2
},
{
"w": 1,
"x": 3,
"y": 2
},
{
"w": 1,
"x": 4,
"y": 2
},
{
"w": 1,
"x": 5,
"y": 2
},
{
"w": 1,
"x": 6,
"y": 2
},
{
"w": 1,
"x": 7,
"y": 2
},
{
"w": 1,
"x": 8,
"y": 2
},
{
"w": 1,
"x": 9,
"y": 2
},
{
"w": 1,
"x": 10,
"y": 2
},
{
"w": 1,
"x": 11,
"y": 2
},
{
"w": 1,
"x": 0,
"y": 3
},
{
"w": 1,
"x": 1,
"y": 3
},
{
"w": 1,
"x": 2,
"y": 3
},
{
"w": 1,
"x": 3,
"y": 3
},
{
"w": 1,
"x": 4,
"y": 3
},
{
"w": 1,
"x": 5,
"y": 3
},
{
"w": 1,
"x": 6,
"y": 3
},
{
"w": 1,
"x": 7,
"y": 3
},
{
"w": 1,
"x": 8,
"y": 3
},
{
"w": 1,
"x": 9,
"y": 3
},
{
"w": 1,
"x": 10,
"y": 3
},
{
"w": 1,
"x": 11,
"y": 3
},
{
"w": 1,
"x": 0,
"y": 4
},
{
"w": 1,
"x": 1,
"y": 4
},
{
"w": 1,
"x": 2,
"y": 4
},
{
"w": 1,
"x": 3,
"y": 4
},
{
"w": 1,
"x": 4,
"y": 4
},
{
"w": 2,
"x": 5,
"y": 4
},
{
"w": 1,
"x": 7,
"y": 4
},
{
"w": 1,
"x": 8,
"y": 4
},
{
"w": 1,
"x": 9,
"y": 4
},
{
"w": 1,
"x": 10,
"y": 4
},
{
"w": 1,
"x": 11,
"y": 4
}
]
}
},
"leader_key": {
"timing": true,
"timeout": 250
},
"matrix_pins": {
"cols": [
"D7",
"B4",
"B5",
"B6",
"C6",
"C7",
"B0",
"F1",
"F4",
"F5",
"F6",
"F7"
],
"rows": [
"B7",
"B3",
"B2",
"B1",
"D6"
]
},
"rgblight": {
"led_count": 8,
"pin": "F0"
}
}

View file

@ -1,20 +0,0 @@
# MCU name
MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = no # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
KEY_LOCK_ENABLE = yes
LEADER_ENABLE = yes # Enable leader key