fern/qmk-firmware
1
0
Fork 0
mirror of https://github.com/firewalkwithm3/qmk_firmware.git synced 2024-11-22 19:40:29 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[Keyboard] Updated keyboard & keymaps (#12667)

Browse source 
Co-authored-by: pastapojken <6597735+pastapojken@users.noreply.github.com>
This commit is contained in:
farfalleflickan 2021-07-22 08:57:35 +02:00 committed by GitHub
parent e9c3f71e74
commit a400681ccf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 88 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
keyboards/nack/config.h
View file

@ -1,5 +1,5 @@
/*
Copyright 2020 pastapojken <pastapojken@gmail.com>
Copyright 2020 farfalleflickan <farfalleflickan@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define VENDOR_ID 0xDA12
#define PRODUCT_ID 0x6060
#define DEVICE_VER 0x0001
#define MANUFACTURER pastapojken
#define MANUFACTURER farfalleflickan
#define PRODUCT nack keyboard
#define MATRIX_ROWS 4
@ -48,12 +48,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
#ifdef AUDIO_ENABLE
#define STARTUP_SONG SONG(NO_SOUND)
#define AUDIO_PIN A5
#define AUDIO_PIN_ALT A4
#define AUDIO_PIN_ALT_AS_NEGATIVE
/*
* Basically, change this section once pull request 6165 has been merged
* https://github.com/qmk/qmk_firmware/pull/6165
*/
#define STARTUP_SONG SONG(NO_SOUND)
#define AUDIO_DAC_SAMPLE_MAX 4095U
#endif

4
keyboards/nack/info.json
View file

@ -1,7 +1,7 @@
{
"keyboard_name": "nack",
"url": "https://github.com/pastapojken/nack",
"maintainer": "pastapojken",
"url": "https://github.com/farfalleflickan/nack",
"maintainer": "farfalleflickan",
"width": 13,
"height": 4,
"layouts": {

14
keyboards/nack/keymaps/default/keymap.c
View file

@ -1,4 +1,4 @@
/* Copyright 2020 pastapojken <pastapojken@gmail.com>
/* Copyright 2020 farfalleflickan <farfalleflickan@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -25,7 +25,7 @@ enum layer_names {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[BASE] = LAYOUT(
/* __________________________________________________________________________________________________________________________________________________________________________
| \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
| \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
// | |----TAB-----|---Q--------|-----W------|-----E------|-----R------|----T-------|-----Y------|-----U------|----I-------|------O-----|----P-------|----Å-------|--( ¨^~ )---|
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
// | |----ESC-----|---A--------|---S--------|----D-------|-----F------|-----G------|-----H------|-----J------|-----K------|-----L------|-----Ö------|-----Ä------|--( '* )----|
@ -33,12 +33,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// | |---SHIFT----|---Z--------|---X--------|----C-------|-----V------|-----B------|-----N------|------M-----|---( ,; )---|---( .: )---|---( -_ )---|----UP------|-BACKSPACE--|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_BSPC,
// | |---CTRL-----|---ALT------|---META-----|----FN_1----|----------SPACE----------|----FN_2----|----AltGr---|--( <>| )---|---ENETER---|-LEFT-------|---DOWN-----|--RIGHT-----|
KC_LCTL, KC_LALT, KC_LGUI, TT(NUM), KC_SPC, KC_NO, TT(FN), KC_RALT, KC_NUBS, KC_ENT, KC_LEFT, KC_DOWN, KC_RIGHT
KC_LCTL, KC_LALT, KC_LGUI, MO(NUM), KC_SPC, KC_NO, MO(FN), KC_RALT, KC_NUBS, KC_ENT, KC_LEFT, KC_DOWN, KC_RIGHT
// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
),
[NUM] = LAYOUT(
/* __________________________________________________________________________________________________________________________________________________________________________
| \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
| \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
// | |---TAB------|---( 1! )---|--( 2"@ )---|--( 3#£ )---|---( 4¤$ )--|--( 5%€ )---|---( 6& )---|--( 7/{ )---|--( 8([ )---|--( 9)] )---|--( 0=} )---|---( +?\ )--|---( ´` )---|
_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,
// | |----ESC-----|-----F1-----|-----F2-----|----F3------|----F4------|----F5------|-----F6-----|-----F7------|----F8-----|-----F9-----|-----F10----|----F11-----|----F12-----|
@ -46,12 +46,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// | |---SHIFT----|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|
_______, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
// | |---CTRL-----|---ALT------|---META-----|---FN_1-----|------------|------------|----FN_2----|--AltGr-----|---( §½ )---|------------|------------|------------|------------|
_______, _______, _______, TT(FN), KC_NO, KC_NO, TO(BASE), _______, KC_GRV, KC_NO, KC_NO, KC_NO, KC_NO
_______, _______, _______, MO(FN), KC_NO, KC_NO, TO(BASE), _______, KC_GRV, KC_NO, KC_NO, KC_NO, KC_NO
// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
),
[FN] = LAYOUT(
/* __________________________________________________________________________________________________________________________________________________________________________
| \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
| \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
// | |-RGB TOGGLE-|-CHANGE RGB-|-RGB HUE UP-|-RGB SAT UP-|------------|------------|------------|------------|------------|------------|------------|------------|-RESET KBD--|
RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
// | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|
@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|-RGB LIGHT +|------------|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_VAI, KC_NO,
// | |------------|------------|------------|---FN_1-----|------------|------------|----FN_2----|------------|------------|------------|------------|-RGB LIGHT -|------------|
KC_NO, KC_NO, KC_NO, TT(NUM), KC_NO, KC_NO, TO(BASE), KC_NO, KC_NO, KC_NO, KC_NO, RGB_VAD, KC_NO
KC_NO, KC_NO, KC_NO, MO(NUM), KC_NO, KC_NO, TO(BASE), KC_NO, KC_NO, KC_NO, KC_NO, RGB_VAD, KC_NO
// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
)
};

78
keyboards/nack/keymaps/pastapojken/keymap.c → keyboards/nack/keymaps/farfalleflickan/keymap.c
View file

@ -1,4 +1,4 @@
/* Copyright 2020 pastapojken <pastapojken@gmail.com>
/* Copyright 2020 farfalleflickan <farfalleflickan@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -21,6 +21,7 @@
// Defines names for use in layer keycodes and the keymap
enum layer_names {
BASE,
NOGUI,
NUM,
FN
};
@ -30,43 +31,52 @@ enum custom_keycodes {
CK_LSFT = SAFE_RANGE, // Shift
CK_RALT, // AltGr
CK_BSPC_DEL, // Backspace or Del (if pressed with CK_LSFT or CK_RALT)
CK_UP_PGUP, // Up or PgUp (if pressed with CK_LSFT or CK_RALT)
CK_DOWN_PGDOWN, // Down or PgDown (if pressed with CK_LSFT or CK_RALT)
CK_LEFT_HOME, // Left or Home (if pressed with CK_LSFT or CK_RALT)
CK_RIGHT_END, // Right or End (if pressed with CK_LSFT or CK_RALT)
KK_RESET
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[BASE] = LAYOUT(
/* __________________________________________________________________________________________________________________________________________________________________________
| \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
| \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
// | |----TAB-----|---Q--------|-----W------|-----E------|-----R------|----T-------|-----Y------|-----U------|----I-------|------O-----|----P-------|----Å-------|--( ¨^~ )---|
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
// | |----ESC-----|---A--------|---S--------|----D-------|-----F------|-----G------|-----H------|-----J------|-----K------|-----L------|-----Ö------|-----Ä------|--( '* )----|
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS,
// | |---SHIFT----|---Z--------|---X--------|----C-------|-----V------|-----B------|-----N------|------M-----|---( ,; )---|---( .: )---|---( -_ )---|----UP------|-BACKSPACE--|
CK_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, CK_UP_PGUP, CK_BSPC_DEL,
// | |---CTRL-----|---ALT------|---META-----|----FN_1----|----------SPACE----------|----FN_2----|----AltGr---|--( <>| )---|---ENETER---|-LEFT-------|---DOWN-----|--RIGHT-----|
KC_LCTL, KC_LALT, KC_LGUI, TT(NUM), KC_SPC, KC_NO, TT(FN), CK_RALT, KC_NUBS, KC_ENT, CK_LEFT_HOME,CK_DOWN_PGDOWN,CK_RIGHT_END
CK_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, CK_BSPC_DEL,
// | |---CTRL-----|---ALT------|---META-----|----FN_1----|----------SPACE----------|----FN_2----|----AltGr---|--( <>| )---|---ENTER----|-LEFT-------|---DOWN-----|--RIGHT-----|
KC_LCTL, KC_LALT, KC_LGUI, MO(NUM), KC_SPC, KC_NO, MO(FN), CK_RALT, KC_NUBS, KC_ENT, KC_LEFT, KC_DOWN, KC_RIGHT
// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
),
[NOGUI] = LAYOUT(
/* __________________________________________________________________________________________________________________________________________________________________________
| \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
// | |----TAB-----|---Q--------|-----W------|-----E------|-----R------|----T-------|-----Y------|-----U------|----I-------|------O-----|----P-------|----Å-------|--( ¨^~ )---|
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
// | |----ESC-----|---A--------|---S--------|----D-------|-----F------|-----G------|-----H------|-----J------|-----K------|-----L------|-----Ö------|-----Ä------|--( '* )----|
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS,
// | |---SHIFT----|---Z--------|---X--------|----C-------|-----V------|-----B------|-----N------|------M-----|---( ,; )---|---( .: )---|---( -_ )---|----UP------|-BACKSPACE--|
CK_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, CK_BSPC_DEL,
// | |---CTRL-----|---ALT------|---META-----|----FN_1----|----------SPACE----------|----FN_2----|----AltGr---|--( <>| )---|---ENTER----|-LEFT-------|---DOWN-----|--RIGHT-----|
KC_LCTL, KC_LALT, KC_NO, MO(NUM), KC_SPC, KC_NO, TO(BASE), CK_RALT, KC_NUBS, KC_ENT, KC_LEFT, KC_DOWN, KC_RIGHT
// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
),
[NUM] = LAYOUT(
/* __________________________________________________________________________________________________________________________________________________________________________
| \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
| \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
// | |---TAB------|---( 1! )---|--( 2"@ )---|--( 3#£ )---|---( 4¤$ )--|--( 5%€ )---|---( 6& )---|--( 7/{ )---|--( 8([ )---|--( 9)] )---|--( 0=} )---|---( +?\ )--|---( ´` )---|
____, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,
// | |----ESC-----|-----F1-----|-----F2-----|----F3------|----F4------|----F5------|-----F6-----|-----F7------|----F8-----|-----F9-----|-----F10----|----F11-----|----F12-----|
____, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
// | |---SHIFT----|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|
____, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
____, KC_P0, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9, KC_PGUP, KC_NO,
// | |---CTRL-----|---ALT------|---META-----|---FN_1-----|------------|------------|----FN_2----|--AltGr-----|---( §½ )---|------------|------------|------------|------------|
____, ____, ____, TT(FN), KC_NO, KC_NO, TO(BASE), ____, KC_GRV, KC_NO, KC_NO, KC_NO, KC_NO
____, ____, ____, TO(BASE), KC_NO, KC_NO, MO(FN), ____, KC_GRV, KC_PDOT, KC_HOME, KC_PGDOWN, KC_END
// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
),
[FN] = LAYOUT(
/* __________________________________________________________________________________________________________________________________________________________________________
| \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
| \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
// | |-RGB TOGGLE-|-CHANGE RGB-|-RGB HUE UP-|-RGB SAT UP-|------------|------------|------------|------------|------------|------------|------------|------------|-RESET KBD--|
RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KK_RESET,
// | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|
@ -74,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|-RGB LIGHT +|------------|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_VAI, KC_NO,
// | |------------|------------|------------|---FN_1-----|------------|------------|----FN_2----|------------|------------|------------|------------|-RGB LIGHT -|------------|
KC_NO, KC_NO, KC_NO, TT(NUM), KC_NO, KC_NO, TO(BASE), KC_NO, KC_NO, KC_NO, KC_NO, RGB_VAD, KC_NO
KC_NO, KC_NO, KC_NO, TO(BASE), KC_NO, KC_NO, TO(BASE), TO(NOGUI), KC_NO, KC_NO, KC_NO, RGB_VAD, KC_NO
// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
)
};
@ -138,6 +148,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
lshift = false;
}
return false;
break;
case CK_RALT:
if(record->event.pressed) {
unregister_code(KC_RALT);
@ -149,33 +160,26 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
ralt = false;
}
return false;
break;
case CK_BSPC_DEL:
RALT_NO(KC_BSPC,KC_DEL);
break;
case CK_UP_PGUP:
RALT_NO(KC_UP,KC_PGUP);
break;
case CK_DOWN_PGDOWN:
RALT_NO(KC_DOWN,KC_PGDOWN);
break;
case CK_LEFT_HOME:
RALT_NO(KC_LEFT,KC_HOME);
break;
case CK_RIGHT_END:
RALT_NO(KC_RIGHT,KC_END);
if (ralt==true) {
RALT_NO(KC_BSPC,KC_DEL);
} else {
SHIFT_NO(KC_BSPC,KC_DEL);
}
break;
case KK_RESET: // Basically, turn off RGB before resetting
if (record->event.pressed) {
key_timer = timer_read32();
#ifdef RGB_MATRIX_ENABLE
rgb_matrix_disable_noeeprom();
#endif
} else {
if (timer_elapsed32(key_timer) >= 20) {
reset_keyboard();
}
if (record->event.pressed) {
key_timer = timer_read32();
#ifdef RGB_MATRIX_ENABLE
rgb_matrix_disable_noeeprom();
#endif
} else {
if (timer_elapsed32(key_timer) >= 20) {
reset_keyboard();
}
break;
}
break;
default:
if(record->event.pressed) {
timer_timeout_keymap();

8
keyboards/nack/keymaps/pastapojken/keymap.h → keyboards/nack/keymaps/farfalleflickan/keymap.h
View file

@ -1,4 +1,4 @@
/* Copyright 2020 pastapojken <pastapojken@gmail.com>
/* Copyright 2020 farfalleflickan <farfalleflickan@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -17,12 +17,6 @@
#pragma once
#include "quantum.h"
#define TAPPING_TOGGLE 2
#ifdef AUDIO_ENABLE
#define STARTUP_SONG SONG(NO_SOUND)
#endif
void add_to_prev(uint16_t kc);
void unreg_prev(void);
void timer_timeout_keymap(void);

1
keyboards/nack/keymaps/farfalleflickan/readme.md Normal file
View file

@ -0,0 +1 @@
# farfalleflickan's keymap for nack

1
keyboards/nack/keymaps/pastapojken/readme.md
View file

@ -1 +0,0 @@
# pastapojken's keymap for nack

1
keyboards/nack/mcuconf.h
View file

@ -28,4 +28,3 @@
#undef STM32_SPI_USE_SPI2
#define STM32_SPI_USE_SPI2 FALSE

2
keyboards/nack/nack.c
View file

@ -1,4 +1,4 @@
/* Copyright 2020 pastapojken <pastapojken@gmail.com>
/* Copyright 2020 farfalleflickan <farfalleflickan@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
keyboards/nack/nack.h
View file

@ -1,4 +1,4 @@
/* Copyright 2020 pastapojken <pastapojken@gmail.com>
/* Copyright 2020 farfalleflickan <farfalleflickan@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

4
keyboards/nack/readme.md
View file

@ -4,9 +4,9 @@
A ISO-friendly ortholinear keyboard, 13x4 keys.
See [screenshots](https://imgur.com/a/PPO18Lc).
* Keyboard Maintainer: [pastapojken](https://github.com/pastapojken)
* Keyboard Maintainer: [farfalleflickan](https://github.com/farfalleflickan)
* Hardware Supported: nack PCB
* Hardware Availability: [github repo](https://github.com/pastapojken/nack)
* Hardware Availability: [github repo](https://github.com/farfalleflickan/nack)
Make example for this keyboard (after setting up your build environment):

2
keyboards/nack/rules.mk
View file

@ -24,5 +24,5 @@ AUDIO_ENABLE = yes # Audio output
RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = WS2812
WS2812_DRIVER = spi
AUDIO_DRIVER = dac_additive # How to drive the 2 speakers
AUDIO_DRIVER = dac_basic # How to drive the 2 speakers
UNICODE_ENABLE = yes # Unicode support