gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-12-13 13:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot 2023-12-21 00:25:24 +00:00
commit 7fbae29d87
8 changed files with 233 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keyboards/themadnoodle/ncc1701kb/v2/config.h Normal file
View File

@ -0,0 +1,6 @@
// Copyright 2023 Jesse Leventhal (@The=Mad-Noodle)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5

124
keyboards/themadnoodle/ncc1701kb/v2/info.json
View File

@ -1,59 +1,71 @@
{ {
"keyboard_name": "NCC-1701-KB v2", "manufacturer": "The Mad Noodle",
"manufacturer": "The Mad Noodle", "keyboard_name": "NCC-1701-KB v2",
"url": "instagram.com/the_mad_noodle", "maintainer": "The-Mad-Noodle",
"maintainer": "The-Mad-Noodle", "url": "https://www.madnoodleprototypes.com/",
"usb": { "bootloader": "atmel-dfu",
"vid": "0xFEED", "diode_direction": "ROW2COL",
"pid": "0x1701", "features": {
"device_version": "0.0.2" "bootmagic": true,
}, "command": false,
"matrix_pins": { "console": false,
"cols": ["B4", "B5", "B6"], "extrakey": true,
"rows": ["D4", "D6", "D7"] "mousekey": true,
}, "nkro": true,
"diode_direction": "ROW2COL", "rgblight": true,
"encoder": { "encoder": true
"rotary": [ },
{"pin_a": "D0", "pin_b": "D1"} "rgblight": {
] "hue_steps": 10,
}, "led_count": 4,
"rgblight": { "sleep": true,
"led_count": 4, "animations": {
"sleep": true, "breathing": true,
"animations": { "rainbow_mood": true,
"breathing": true, "rainbow_swirl": true,
"rainbow_mood": true, "snake": true,
"rainbow_swirl": true, "knight": true,
"snake": true, "christmas": true,
"knight": true, "static_gradient": true,
"christmas": true, "rgb_test": true,
"static_gradient": true, "alternating": true,
"rgb_test": true, "twinkle": true
"alternating": true, }
"twinkle": true },
} "ws2812": {
}, "pin": "B7"
"ws2812": { },
"pin": "B7" "matrix_pins": {
}, "rows": ["D4", "D6", "D7"],
"processor": "atmega32u4", "cols": ["B4", "B5", "B6"]
"bootloader": "atmel-dfu", },
"layouts": { "processor": "atmega32u4",
"LAYOUT_ortho_3x3": { "usb": {
"layout": [ "device_version": "2.0.0",
{"matrix": [0, 0], "x": 0, "y": 0}, "pid": "0x0021",
{"matrix": [0, 1], "x": 1, "y": 0}, "vid": "0x6A6C"
{"matrix": [0, 2], "x": 2, "y": 0}, },
"community_layouts": ["ortho_3x3"],
"layouts": {
"LAYOUT_ortho_3x3": {
"layout": [
{"x":0, "y":0, "matrix": [0,0]},
{"label":"Encoder", "x":1, "y":0, "matrix": [0,1]},
{"x":2, "y":0, "matrix": [0,2]},
{"x":0, "y":1, "matrix": [1,0]},
{"x":1, "y":1, "matrix": [1,1]},
{"x":2, "y":1, "matrix": [1,2]},
{"x":0, "y":2, "matrix": [2,0]},
{"x":1, "y":2, "matrix": [2,1]},
{"x":2, "y":2, "matrix": [2,2]}
]
}
},
{"matrix": [1, 0], "x": 0, "y": 1}, "encoder": {
{"matrix": [1, 1], "x": 1, "y": 1}, "rotary": [
{"matrix": [1, 2], "x": 2, "y": 1}, { "pin_a": "D0", "pin_b": "D1" }
]
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2}
]
} }
} }
}

97
keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/keymap.c
View File

@ -1,10 +1,13 @@
// Copyright 2023 The Mad Noodle(@the_mad_noodle)
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* LAYER 0 /* LAYER 0
* ,-----------------------. * ,-------|ENCODER|-------.
* | << | MUTE | >> | ENCODER - PRESS (MUTE) / HOLD (LAYER 2) / KNOB (VOLUME CONTROL) * | << | MUTE | >> |
* |-------+-------+-------| * |-------+-------+-------|
* | STOP | PLAY | MEDIA | * | STOP | PLAY | MEDIA |
* |-------+-------+-------| * |-------+-------+-------|
@ -13,72 +16,70 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/ */
[0] = LAYOUT_ortho_3x3( [0] = LAYOUT_ortho_3x3(
KC_MPRV, LT(2, KC_MUTE), KC_MNXT, KC_MPRV, LT(2, KC_MUTE), KC_MNXT,
KC_MSTP, KC_MPLY, KC_MSEL, KC_MSTP, KC_MPLY, KC_MSEL,
KC_CALC, KC_MAIL, LT(1, KC_MYCM) KC_CALC, KC_MAIL, LT(1, KC_MYCM)
), ),
/* LAYER 1 /* LAYER 1
* ,-----------------------. * ,-------|ENCODER|-------.
* | MODE+ |RGB TOG| MODE- | ENCODER - PRESS (NA) / KNOB (Hue Control) * | MODE+ |RGB TOG| MODE- |
* |-------+-------+-------| * |-------+-------+-------|
* | SPD- | SPD+ |Bright | * |Bright-| PLAIN |Bright+|
* |-------+-------+-------| * |-------+-------+-------|
* | SAT+ | SAT- | | * | SWIRL |BREATH | |
* `-----------------------' * `-----------------------'
*/ */
[1] = LAYOUT_ortho_3x3( [1] = LAYOUT_ortho_3x3(
RGB_MOD, RGB_TOG, RGB_RMOD, RGB_MOD, RGB_TOG, RGB_RMOD,
RGB_SPI, RGB_SPD, RGB_VAI, RGB_VAD, RGB_M_P, RGB_VAI,
RGB_SAI, RGB_SAD, KC_TRNS LT(3,RGB_M_SW), RGB_M_B, KC_TRNS
), ),
/* LAYER 2 (ENCODER) /* LAYER 2
* ,-----------------------. * ,-------|ENCODER|-------.
* | | | | ENCODER - PRESS (NA) / KNOB (Arrow Left/Right) * | | | |
* |-------+-------+-------| * |-------+-------+-------|
* | | | | * | | | |
* |-------+-------+-------| * |-------+-------+-------|
* | | | | * | | | |
* `-----------------------' * `-----------------------'
*/ */
[2] = LAYOUT_ortho_3x3( [2] = LAYOUT_ortho_3x3(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS
),
/* LAYER 3
* ,-------|ENCODER|-------.
* | | | |
* |-------+-------+-------|
* | | | |
* |-------+-------+-------|
* | | | |
* `-----------------------'
*/
[3] = LAYOUT_ortho_3x3(
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS KC_TRNS, KC_TRNS, KC_TRNS
) )
}; };
bool encoder_update_user(uint8_t index, bool clockwise) { /*Encoder Mapping*/
#if defined(ENCODER_MAP_ENABLE)
switch (get_highest_layer(layer_state)) { const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
case 1: [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
if (clockwise) { [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) },
rgblight_increase_hue(); [2] = { ENCODER_CCW_CW(KC_LEFT, KC_RGHT) },
} else { [3] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
rgblight_decrease_hue(); };
} #endif
break;
case 2:
if (clockwise) {
tap_code(KC_RGHT);
} else {
tap_code(KC_LEFT);
}
break;
default:
if (clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
break;
}
return true;
}

1
keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/rules.mk Normal file
View File

@ -0,0 +1 @@
ENCODER_MAP_ENABLE = yes

85
keyboards/themadnoodle/ncc1701kb/v2/keymaps/via/keymap.c Normal file
View File

@ -0,0 +1,85 @@
// Copyright 2023 The Mad Noodle(@the_mad_noodle)
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* LAYER 0
* ,-------|ENCODER|-------.
* | << | MUTE | >> |
* |-------+-------+-------|
* | STOP | PLAY | MEDIA |
* |-------+-------+-------|
* | CALC | MY PC | TO(3) |
* `-----------------------'
*/
[0] = LAYOUT_ortho_3x3(
KC_MPRV, KC_MUTE, KC_MNXT,
KC_MSTP, KC_MPLY, KC_MSEL,
KC_CALC, KC_MYCM, TO(3)
),
/* LAYER 1
* ,-------|ENCODER|-------.
* | MODE+ |RGB TOG| MODE- |
* |-------+-------+-------|
* |Bright-| PLAIN |Bright+|
* |-------+-------+-------|
* | SWIRL |BREATH | TO(0) |
* `-----------------------'
*/
[1] = LAYOUT_ortho_3x3(
RGB_MOD, RGB_TOG, RGB_RMOD,
RGB_VAD, RGB_M_P, RGB_VAI,
RGB_M_SW, RGB_M_B, TO(0)
),
/* LAYER 2
* ,-------|ENCODER|-------.
* | | | |
* |-------+-------+-------|
* | | | |
* |-------+-------+-------|
* | | | TO(0) |
* `-----------------------'
*/
[2] = LAYOUT_ortho_3x3(
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, TO(0)
),
/* LAYER 3
* ,-------|ENCODER|-------.
* | | | |
* |-------+-------+-------|
* | TO(1) | | TO(2) |
* |-------+-------+-------|
* | | | TO(0) |
* `-----------------------'
*/
[3] = LAYOUT_ortho_3x3(
KC_TRNS, KC_TRNS, KC_TRNS,
TO(1), KC_TRNS, TO(2),
KC_TRNS, KC_TRNS, TO(0)
)
};
/*Encoder Mapping*/
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
[1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)},
[2] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI)},
[3] = { ENCODER_CCW_CW(KC_UP, KC_DOWN)},
};
#endif

2
keyboards/themadnoodle/ncc1701kb/v2/keymaps/via/rules.mk Normal file
View File

@ -0,0 +1,2 @@
ENCODER_MAP_ENABLE = yes
VIA_ENABLE = yes

32
keyboards/themadnoodle/ncc1701kb/v2/readme.md
View File

@ -1,17 +1,27 @@
# NCC-1701-KB v2 Keypad with Encoder # NCC-1701-KB v.2
![NCC-1701-KB V2 TOP](https://static.wixstatic.com/media/59d0ff_e9812deb74a4408ca77599a19a8f93b6~mv2.jpg) ![NCC1701KBv2](https://i.imgur.com/Zq1SjBTh.jpg)
![NCC-1701-KB V2 RGB](https://static.wixstatic.com/media/59d0ff_7a8968b70ed849a591664332964cc936~mv2.jpg)
The NCC-1701-KB v2 by The Mad Noodle Prototypes is a custom Star Trek inspired 3x3 mechanical keypad with an encoder knob and full RGB Underglow. *The NCC-1701-KB v.2 is a 8 key macro keypad with a push button encoder knob*
* Keyboard Maintainer: [The Mad Noodle Prototypes](https://github.com/The-Mad-Noodle) * Keyboard Maintainer: [The Mad Noodle](https://github.com/The-Mad-Noodle)
* Hardware Supported: NCC-1701-KB v2 PCB, ATmega32U4 * Hardware Supported: NCC-1701-KB v.2 PCB
* Hardware Availability: [MadNoodlePrototypes.com](https://www.madnoodleprototypes.com/shop) * Hardware Availability: https://www.madnoodleprototypes.com/shop
Make example for this keyboard (after setting up your build environment):
make themadnoodle/ncc1701kb/v2:default Compile example for this keyboard (after setting up your build environment):
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. qmk compile -kb themadnoodle/ncc1701kb/v2 -km default
Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
Flashing example for this keyboard:
qmk flash -kb themadnoodle/ncc1701kb/v2 -km default
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
## Bootloader & Flashing
**Physical reset button**:
* Press the physical button located on the top left of the back of the PCB (Labeled RST) to enter Bootloader Mode

15
keyboards/themadnoodle/ncc1701kb/v2/rules.mk
View File

@ -1,14 +1 @@
# Build Options # This file intentionally left blank
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # 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
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
UNICODE_ENABLE = yes # Unicode
ENCODER_ENABLE = yes