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

This commit is contained in:
QMK Bot 2021-09-28 19:24:10 +00:00
commit f89620d7af
5 changed files with 187 additions and 12 deletions

View File

@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define VENDOR_ID 0x5950 // YP
#define PRODUCT_ID 0x8369
#define DEVICE_VER 0x0001
#define MANUFACTURER Mattia Dal Ben

View File

@ -0,0 +1,163 @@
/* MIT License
Copyright (c) 2019 Mattia Dal Ben
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
#include QMK_KEYBOARD_H
// Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers.
enum layers {
_BL,
_NV,
_FN
};
enum custom_keycodes {
KC_DBL0 = SAFE_RANGE,
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap _BL: (Base Layer) Default Layer
* ,-------------------.
* | NV | / | * |-/FN|
* |----|----|----|----|
* | 7 | 8 | 9 | |
* |----|----|----| + |
* | 4 | 5 | 6 | |
* |----|----|----|----|
* | 1 | 2 | 3 | |
* |----|----|----| En |
* | 0 | 00 | . | |
* `-------------------'
*/
[_BL] = LAYOUT(
TG(_NV), KC_PSLS, KC_PAST, LT(_FN, KC_PMNS),
KC_P7, KC_P8, KC_P9,
KC_P4, KC_P5, KC_P6, KC_PPLS,
KC_P1, KC_P2, KC_P3,
KC_P0, KC_DBL0, KC_PDOT, KC_PENT
),
/* Keymap _NV: Navigation layer
* ,-------------------.
* |INS |HOME|PGUP| |
* |----|----|----|----|
* |DEL |END |PGDN| |
* |----|----|----| |
* | | | | |
* |----|----|----|----|
* | | UP | | |
* |----|----|----| |
* |LEFT|DOWN|RIGH| |
* `-------------------'
*/
[_NV] = LAYOUT(
KC_INS, KC_HOME, KC_PGUP, TG(_NV),
KC_DEL, KC_END, KC_PGDN,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, KC_UP, XXXXXXX,
KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX
),
/* Keymap _FN: RGB Function Layer
* ,-------------------.
* |RMOD|RGBP|RTOG| FN |
* |----|----|----|----|
* |HUD |HUI | | |
* |----|----|----| |
* |SAD |SAI | | |
* |----|----|----|----|
* |VAD |VAS | | |
* |----|----|----| |
* |RST | | | |
* `-------------------'
*/
[_FN] = LAYOUT(
RGB_MOD, RGB_M_P, RGB_TOG, _______,
RGB_HUD, RGB_HUI, XXXXXXX,
RGB_SAD, RGB_SAI, XXXXXXX, XXXXXXX,
RGB_VAD, RGB_VAI, XXXXXXX,
RESET, XXXXXXX, XXXXXXX, XXXXXXX
),
};
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case KC_DBL0:
if (record->event.pressed) {
SEND_STRING("00");
} else {
// when keycode KC_DBL0 is released
}
break;
}
return true;
};
#ifdef OLED_ENABLE
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
return OLED_ROTATION_270; // flips the display 270 degrees
}
void oled_task_user(void) {
// Host Keyboard Layer Status
oled_write_P(PSTR("Layer"), false);
switch (get_highest_layer(layer_state)) {
case _BL:
oled_write_ln_P(PSTR(" BAS"), false);
break;
case _NV:
oled_write_ln_P(PSTR(" NAV"), false);
break;
case _FN:
oled_write_ln_P(PSTR(" RGB"), false);
break;
default:
// Or use the write_ln shortcut over adding '\n' to the end of your string
oled_write_ln_P(PSTR(" UND"), false);
}
// Host Keyboard LED Status
led_t led_state = host_keyboard_led_state();
oled_write_P(PSTR("-----"), false);
oled_write_P(PSTR("Stats"), false);
oled_write_P(led_state.num_lock ? PSTR("num:*") : PSTR("num:."), false);
oled_write_P(led_state.caps_lock ? PSTR("cap:*") : PSTR("cap:."), false);
oled_write_P(led_state.scroll_lock ? PSTR("scr:*") : PSTR("scr:."), false);
// Host Keyboard RGB backlight status
oled_write_P(PSTR("-----"), false);
oled_write_P(PSTR("Light"), false);
static char led_buf[30];
snprintf(led_buf, sizeof(led_buf) - 1, "RGB:%cM: %2d\nh: %2ds: %2dv: %2d\n",
rgblight_is_enabled() ? '*' : '.', (uint8_t)rgblight_get_mode(),
(uint8_t)(rgblight_get_hue() / RGBLIGHT_HUE_STEP),
(uint8_t)(rgblight_get_sat() / RGBLIGHT_SAT_STEP),
(uint8_t)(rgblight_get_val() / RGBLIGHT_VAL_STEP));
oled_write(led_buf, false);
}
#endif

View File

@ -0,0 +1,9 @@
![Yampad Layout Image](https://i.imgur.com/QwrufEt.png)
# VIA Yampad Layout
This is the layout in the VIA enabled firmware.
Optional 2U zero key to suit your Yampad build.
Compile: `make yampad:via`
Flash: `make yampad:via:flash`

View File

@ -0,0 +1,4 @@
EXTRAKEY_ENABLE = no
LTO_ENABLE = yes
MOUSEKEY_ENABLE = no
VIA_ENABLE = yes

View File

@ -7,18 +7,17 @@ BOOTLOADER = caterina
# 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 = no # Console for debug
AUDIO_ENABLE = no # Audio output
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
COMMAND_ENABLE = no # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
CONSOLE_ENABLE = no # Console for debug
DEBOUNCE_TYPE = sym_eager_pk
EXTRAKEY_ENABLE = no # Audio control and System control
LTO_ENABLE = yes # Link time optimise, reduce firmware size
MOUSEKEY_ENABLE = no # Mouse keys
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE = yes # USB Nkey Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
DEBOUNCE_TYPE = sym_eager_pk
OLED_ENABLE = yes
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow