aboutsummaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorfarfalleflickan <6597735+farfalleflickan@users.noreply.github.com>2021-07-22 08:57:35 +0200
committerGitHub <noreply@github.com>2021-07-21 23:57:35 -0700
commita400681ccf56b41a4badece43f73939329a1fe47 (patch)
tree9fc049871b43efb24b207ee9360ee542837bbfce /keyboards
parente9c3f71e74db1a11020acef3a017f79bbedc0015 (diff)
downloadqmk_firmware-a400681ccf56b41a4badece43f73939329a1fe47.tar.gz
qmk_firmware-a400681ccf56b41a4badece43f73939329a1fe47.zip
[Keyboard] Updated keyboard & keymaps (#12667)
Co-authored-by: pastapojken <6597735+pastapojken@users.noreply.github.com>
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/nack/config.h12
-rw-r--r--keyboards/nack/info.json4
-rw-r--r--keyboards/nack/keymaps/default/keymap.c42
-rw-r--r--keyboards/nack/keymaps/farfalleflickan/keymap.c (renamed from keyboards/nack/keymaps/pastapojken/keymap.c)104
-rw-r--r--keyboards/nack/keymaps/farfalleflickan/keymap.h (renamed from keyboards/nack/keymaps/pastapojken/keymap.h)8
-rw-r--r--keyboards/nack/keymaps/farfalleflickan/readme.md1
-rw-r--r--keyboards/nack/keymaps/pastapojken/readme.md1
-rw-r--r--keyboards/nack/mcuconf.h1
-rw-r--r--keyboards/nack/nack.c2
-rw-r--r--keyboards/nack/nack.h2
-rw-r--r--keyboards/nack/readme.md4
-rw-r--r--keyboards/nack/rules.mk2
12 files changed, 88 insertions, 95 deletions
diff --git a/keyboards/nack/config.h b/keyboards/nack/config.h
index e442a1333..26fe7edf2 100644
--- a/keyboards/nack/config.h
+++ b/keyboards/nack/config.h
@@ -1,5 +1,5 @@
1/* 1/*
2Copyright 2020 pastapojken <pastapojken@gmail.com> 2Copyright 2020 farfalleflickan <farfalleflickan@gmail.com>
3 3
4This program is free software: you can redistribute it and/or modify 4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by 5it 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/>.
21#define VENDOR_ID 0xDA12 21#define VENDOR_ID 0xDA12
22#define PRODUCT_ID 0x6060 22#define PRODUCT_ID 0x6060
23#define DEVICE_VER 0x0001 23#define DEVICE_VER 0x0001
24#define MANUFACTURER pastapojken 24#define MANUFACTURER farfalleflickan
25#define PRODUCT nack keyboard 25#define PRODUCT nack keyboard
26 26
27#define MATRIX_ROWS 4 27#define MATRIX_ROWS 4
@@ -48,12 +48,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
48#endif 48#endif
49 49
50#ifdef AUDIO_ENABLE 50#ifdef AUDIO_ENABLE
51 #define STARTUP_SONG SONG(NO_SOUND)
52 #define AUDIO_PIN A5 51 #define AUDIO_PIN A5
53 #define AUDIO_PIN_ALT A4 52 #define AUDIO_PIN_ALT A4
54 #define AUDIO_PIN_ALT_AS_NEGATIVE 53 #define STARTUP_SONG SONG(NO_SOUND)
55 /* 54 #define AUDIO_DAC_SAMPLE_MAX 4095U
56 * Basically, change this section once pull request 6165 has been merged
57 * https://github.com/qmk/qmk_firmware/pull/6165
58 */
59#endif 55#endif
diff --git a/keyboards/nack/info.json b/keyboards/nack/info.json
index 780017f6c..47942c4f1 100644
--- a/keyboards/nack/info.json
+++ b/keyboards/nack/info.json
@@ -1,7 +1,7 @@
1{ 1{
2 "keyboard_name": "nack", 2 "keyboard_name": "nack",
3 "url": "https://github.com/pastapojken/nack", 3 "url": "https://github.com/farfalleflickan/nack",
4 "maintainer": "pastapojken", 4 "maintainer": "farfalleflickan",
5 "width": 13, 5 "width": 13,
6 "height": 4, 6 "height": 4,
7 "layouts": { 7 "layouts": {
diff --git a/keyboards/nack/keymaps/default/keymap.c b/keyboards/nack/keymaps/default/keymap.c
index 4c3e3dacb..9a76fbbdd 100644
--- a/keyboards/nack/keymaps/default/keymap.c
+++ b/keyboards/nack/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
1/* Copyright 2020 pastapojken <pastapojken@gmail.com> 1/* Copyright 2020 farfalleflickan <farfalleflickan@gmail.com>
2 * 2 *
3 * This program is free software: you can redistribute it and/or modify 3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by 4 * it under the terms of the GNU General Public License as published by
@@ -25,41 +25,41 @@ enum layer_names {
25const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 25const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
26 [BASE] = LAYOUT( 26 [BASE] = LAYOUT(
27/* __________________________________________________________________________________________________________________________________________________________________________ 27/* __________________________________________________________________________________________________________________________________________________________________________
28 | \ \ \ \ \ \ \ \ \ \ \ \ \ \ */ 28 | \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
29// | |----TAB-----|---Q--------|-----W------|-----E------|-----R------|----T-------|-----Y------|-----U------|----I-------|------O-----|----P-------|----Å-------|--( ¨^~ )---| 29// | |----TAB-----|---Q--------|-----W------|-----E------|-----R------|----T-------|-----Y------|-----U------|----I-------|------O-----|----P-------|----Å-------|--( ¨^~ )---|
30 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, 30 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,
31// | |----ESC-----|---A--------|---S--------|----D-------|-----F------|-----G------|-----H------|-----J------|-----K------|-----L------|-----Ö------|-----Ä------|--( '* )----| 31// | |----ESC-----|---A--------|---S--------|----D-------|-----F------|-----G------|-----H------|-----J------|-----K------|-----L------|-----Ö------|-----Ä------|--( '* )----|
32 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, 32 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,
33// | |---SHIFT----|---Z--------|---X--------|----C-------|-----V------|-----B------|-----N------|------M-----|---( ,; )---|---( .: )---|---( -_ )---|----UP------|-BACKSPACE--| 33// | |---SHIFT----|---Z--------|---X--------|----C-------|-----V------|-----B------|-----N------|------M-----|---( ,; )---|---( .: )---|---( -_ )---|----UP------|-BACKSPACE--|
34 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, 34 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,
35// | |---CTRL-----|---ALT------|---META-----|----FN_1----|----------SPACE----------|----FN_2----|----AltGr---|--( <>| )---|---ENETER---|-LEFT-------|---DOWN-----|--RIGHT-----| 35// | |---CTRL-----|---ALT------|---META-----|----FN_1----|----------SPACE----------|----FN_2----|----AltGr---|--( <>| )---|---ENETER---|-LEFT-------|---DOWN-----|--RIGHT-----|
36 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 36 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
37// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________| 37// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
38 ), 38 ),
39 [NUM] = LAYOUT( 39 [NUM] = LAYOUT(
40/* __________________________________________________________________________________________________________________________________________________________________________ 40/* __________________________________________________________________________________________________________________________________________________________________________
41 | \ \ \ \ \ \ \ \ \ \ \ \ \ \ */ 41 | \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
42// | |---TAB------|---( 1! )---|--( 2"@ )---|--( 3#£ )---|---( 4¤$ )--|--( 5%€ )---|---( 6& )---|--( 7/{ )---|--( 8([ )---|--( 9)] )---|--( 0=} )---|---( +?\ )--|---( ´` )---| 42// | |---TAB------|---( 1! )---|--( 2"@ )---|--( 3#£ )---|---( 4¤$ )--|--( 5%€ )---|---( 6& )---|--( 7/{ )---|--( 8([ )---|--( 9)] )---|--( 0=} )---|---( +?\ )--|---( ´` )---|
43 _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, 43 _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,
44// | |----ESC-----|-----F1-----|-----F2-----|----F3------|----F4------|----F5------|-----F6-----|-----F7------|----F8-----|-----F9-----|-----F10----|----F11-----|----F12-----| 44// | |----ESC-----|-----F1-----|-----F2-----|----F3------|----F4------|----F5------|-----F6-----|-----F7------|----F8-----|-----F9-----|-----F10----|----F11-----|----F12-----|
45 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 45 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
46// | |---SHIFT----|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------| 46// | |---SHIFT----|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|
47 _______, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 47 _______, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
48// | |---CTRL-----|---ALT------|---META-----|---FN_1-----|------------|------------|----FN_2----|--AltGr-----|---( §½ )---|------------|------------|------------|------------| 48// | |---CTRL-----|---ALT------|---META-----|---FN_1-----|------------|------------|----FN_2----|--AltGr-----|---( §½ )---|------------|------------|------------|------------|
49 _______, _______, _______, TT(FN), KC_NO, KC_NO, TO(BASE), _______, KC_GRV, KC_NO, KC_NO, KC_NO, KC_NO 49 _______, _______, _______, MO(FN), KC_NO, KC_NO, TO(BASE), _______, KC_GRV, KC_NO, KC_NO, KC_NO, KC_NO
50// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________| 50// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
51 ), 51 ),
52 [FN] = LAYOUT( 52 [FN] = LAYOUT(
53/* __________________________________________________________________________________________________________________________________________________________________________ 53/* __________________________________________________________________________________________________________________________________________________________________________
54 | \ \ \ \ \ \ \ \ \ \ \ \ \ \ */ 54 | \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
55// | |-RGB TOGGLE-|-CHANGE RGB-|-RGB HUE UP-|-RGB SAT UP-|------------|------------|------------|------------|------------|------------|------------|------------|-RESET KBD--| 55// | |-RGB TOGGLE-|-CHANGE RGB-|-RGB HUE UP-|-RGB SAT UP-|------------|------------|------------|------------|------------|------------|------------|------------|-RESET KBD--|
56 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, 56 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,
57// | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------| 57// | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|
58 MU_TOG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 58 MU_TOG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
59// | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|-RGB LIGHT +|------------| 59// | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|-RGB LIGHT +|------------|
60 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, 60 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,
61// | |------------|------------|------------|---FN_1-----|------------|------------|----FN_2----|------------|------------|------------|------------|-RGB LIGHT -|------------| 61// | |------------|------------|------------|---FN_1-----|------------|------------|----FN_2----|------------|------------|------------|------------|-RGB LIGHT -|------------|
62 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 62 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
63// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________| 63// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
64 ) 64 )
65}; 65};
diff --git a/keyboards/nack/keymaps/pastapojken/keymap.c b/keyboards/nack/keymaps/farfalleflickan/keymap.c
index 3bbcc4b36..6e447bee1 100644
--- a/keyboards/nack/keymaps/pastapojken/keymap.c
+++ b/keyboards/nack/keymaps/farfalleflickan/keymap.c
@@ -1,4 +1,4 @@
1/* Copyright 2020 pastapojken <pastapojken@gmail.com> 1/* Copyright 2020 farfalleflickan <farfalleflickan@gmail.com>
2 * 2 *
3 * This program is free software: you can redistribute it and/or modify 3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by 4 * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
21// Defines names for use in layer keycodes and the keymap 21// Defines names for use in layer keycodes and the keymap
22enum layer_names { 22enum layer_names {
23 BASE, 23 BASE,
24 NOGUI,
24 NUM, 25 NUM,
25 FN 26 FN
26}; 27};
@@ -30,52 +31,61 @@ enum custom_keycodes {
30 CK_LSFT = SAFE_RANGE, // Shift 31 CK_LSFT = SAFE_RANGE, // Shift
31 CK_RALT, // AltGr 32 CK_RALT, // AltGr
32 CK_BSPC_DEL, // Backspace or Del (if pressed with CK_LSFT or CK_RALT) 33 CK_BSPC_DEL, // Backspace or Del (if pressed with CK_LSFT or CK_RALT)
33 CK_UP_PGUP, // Up or PgUp (if pressed with CK_LSFT or CK_RALT)
34 CK_DOWN_PGDOWN, // Down or PgDown (if pressed with CK_LSFT or CK_RALT)
35 CK_LEFT_HOME, // Left or Home (if pressed with CK_LSFT or CK_RALT)
36 CK_RIGHT_END, // Right or End (if pressed with CK_LSFT or CK_RALT)
37 KK_RESET 34 KK_RESET
38}; 35};
39 36
40const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 37const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
41 [BASE] = LAYOUT( 38 [BASE] = LAYOUT(
42/* __________________________________________________________________________________________________________________________________________________________________________ 39/* __________________________________________________________________________________________________________________________________________________________________________
43 | \ \ \ \ \ \ \ \ \ \ \ \ \ \ */ 40 | \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
44// | |----TAB-----|---Q--------|-----W------|-----E------|-----R------|----T-------|-----Y------|-----U------|----I-------|------O-----|----P-------|----Å-------|--( ¨^~ )---| 41// | |----TAB-----|---Q--------|-----W------|-----E------|-----R------|----T-------|-----Y------|-----U------|----I-------|------O-----|----P-------|----Å-------|--( ¨^~ )---|
45 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, 42 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,
46// | |----ESC-----|---A--------|---S--------|----D-------|-----F------|-----G------|-----H------|-----J------|-----K------|-----L------|-----Ö------|-----Ä------|--( '* )----| 43// | |----ESC-----|---A--------|---S--------|----D-------|-----F------|-----G------|-----H------|-----J------|-----K------|-----L------|-----Ö------|-----Ä------|--( '* )----|
47 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, 44 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,
48// | |---SHIFT----|---Z--------|---X--------|----C-------|-----V------|-----B------|-----N------|------M-----|---( ,; )---|---( .: )---|---( -_ )---|----UP------|-BACKSPACE--| 45// | |---SHIFT----|---Z--------|---X--------|----C-------|-----V------|-----B------|-----N------|------M-----|---( ,; )---|---( .: )---|---( -_ )---|----UP------|-BACKSPACE--|
49 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, 46 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,
50// | |---CTRL-----|---ALT------|---META-----|----FN_1----|----------SPACE----------|----FN_2----|----AltGr---|--( <>| )---|---ENETER---|-LEFT-------|---DOWN-----|--RIGHT-----| 47// | |---CTRL-----|---ALT------|---META-----|----FN_1----|----------SPACE----------|----FN_2----|----AltGr---|--( <>| )---|---ENTER----|-LEFT-------|---DOWN-----|--RIGHT-----|
51 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 48 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
52// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________| 49// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
50 ),
51 [NOGUI] = LAYOUT(
52/* __________________________________________________________________________________________________________________________________________________________________________
53 | \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
54// | |----TAB-----|---Q--------|-----W------|-----E------|-----R------|----T-------|-----Y------|-----U------|----I-------|------O-----|----P-------|----Å-------|--( ¨^~ )---|
55 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,
56// | |----ESC-----|---A--------|---S--------|----D-------|-----F------|-----G------|-----H------|-----J------|-----K------|-----L------|-----Ö------|-----Ä------|--( '* )----|
57 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,
58// | |---SHIFT----|---Z--------|---X--------|----C-------|-----V------|-----B------|-----N------|------M-----|---( ,; )---|---( .: )---|---( -_ )---|----UP------|-BACKSPACE--|
59 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,
60// | |---CTRL-----|---ALT------|---META-----|----FN_1----|----------SPACE----------|----FN_2----|----AltGr---|--( <>| )---|---ENTER----|-LEFT-------|---DOWN-----|--RIGHT-----|
61 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
62// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
53 ), 63 ),
54 [NUM] = LAYOUT( 64 [NUM] = LAYOUT(
55/* __________________________________________________________________________________________________________________________________________________________________________ 65/* __________________________________________________________________________________________________________________________________________________________________________
56 | \ \ \ \ \ \ \ \ \ \ \ \ \ \ */ 66 | \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
57// | |---TAB------|---( 1! )---|--( 2"@ )---|--( 3#£ )---|---( 4¤$ )--|--( 5%€ )---|---( 6& )---|--( 7/{ )---|--( 8([ )---|--( 9)] )---|--( 0=} )---|---( +?\ )--|---( ´` )---| 67// | |---TAB------|---( 1! )---|--( 2"@ )---|--( 3#£ )---|---( 4¤$ )--|--( 5%€ )---|---( 6& )---|--( 7/{ )---|--( 8([ )---|--( 9)] )---|--( 0=} )---|---( +?\ )--|---( ´` )---|
58 ____, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, 68 ____, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,
59// | |----ESC-----|-----F1-----|-----F2-----|----F3------|----F4------|----F5------|-----F6-----|-----F7------|----F8-----|-----F9-----|-----F10----|----F11-----|----F12-----| 69// | |----ESC-----|-----F1-----|-----F2-----|----F3------|----F4------|----F5------|-----F6-----|-----F7------|----F8-----|-----F9-----|-----F10----|----F11-----|----F12-----|
60 ____, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 70 ____, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
61// | |---SHIFT----|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------| 71// | |---SHIFT----|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|
62 ____, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 72 ____, KC_P0, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9, KC_PGUP, KC_NO,
63// | |---CTRL-----|---ALT------|---META-----|---FN_1-----|------------|------------|----FN_2----|--AltGr-----|---( §½ )---|------------|------------|------------|------------| 73// | |---CTRL-----|---ALT------|---META-----|---FN_1-----|------------|------------|----FN_2----|--AltGr-----|---( §½ )---|------------|------------|------------|------------|
64 ____, ____, ____, TT(FN), KC_NO, KC_NO, TO(BASE), ____, KC_GRV, KC_NO, KC_NO, KC_NO, KC_NO 74 ____, ____, ____, TO(BASE), KC_NO, KC_NO, MO(FN), ____, KC_GRV, KC_PDOT, KC_HOME, KC_PGDOWN, KC_END
65// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________| 75// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
66 ), 76 ),
67 [FN] = LAYOUT( 77 [FN] = LAYOUT(
68/* __________________________________________________________________________________________________________________________________________________________________________ 78/* __________________________________________________________________________________________________________________________________________________________________________
69 | \ \ \ \ \ \ \ \ \ \ \ \ \ \ */ 79 | \ \ \ \ \ \ \ \ \ \ \ \ \ \ */
70// | |-RGB TOGGLE-|-CHANGE RGB-|-RGB HUE UP-|-RGB SAT UP-|------------|------------|------------|------------|------------|------------|------------|------------|-RESET KBD--| 80// | |-RGB TOGGLE-|-CHANGE RGB-|-RGB HUE UP-|-RGB SAT UP-|------------|------------|------------|------------|------------|------------|------------|------------|-RESET KBD--|
71 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, 81 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,
72// | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------| 82// | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|
73 MU_TOG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 83 MU_TOG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
74// | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|-RGB LIGHT +|------------| 84// | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|-RGB LIGHT +|------------|
75 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, 85 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,
76// | |------------|------------|------------|---FN_1-----|------------|------------|----FN_2----|------------|------------|------------|------------|-RGB LIGHT -|------------| 86// | |------------|------------|------------|---FN_1-----|------------|------------|----FN_2----|------------|------------|------------|------------|-RGB LIGHT -|------------|
77 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 87 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
78// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________| 88// \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
79 ) 89 )
80}; 90};
81 91
@@ -138,6 +148,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
138 lshift = false; 148 lshift = false;
139 } 149 }
140 return false; 150 return false;
151 break;
141 case CK_RALT: 152 case CK_RALT:
142 if(record->event.pressed) { 153 if(record->event.pressed) {
143 unregister_code(KC_RALT); 154 unregister_code(KC_RALT);
@@ -149,33 +160,26 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
149 ralt = false; 160 ralt = false;
150 } 161 }
151 return false; 162 return false;
163 break;
152 case CK_BSPC_DEL: 164 case CK_BSPC_DEL:
153 RALT_NO(KC_BSPC,KC_DEL); 165 if (ralt==true) {
154 break; 166 RALT_NO(KC_BSPC,KC_DEL);
155 case CK_UP_PGUP: 167 } else {
156 RALT_NO(KC_UP,KC_PGUP); 168 SHIFT_NO(KC_BSPC,KC_DEL);
157 break; 169 }
158 case CK_DOWN_PGDOWN:
159 RALT_NO(KC_DOWN,KC_PGDOWN);
160 break;
161 case CK_LEFT_HOME:
162 RALT_NO(KC_LEFT,KC_HOME);
163 break;
164 case CK_RIGHT_END:
165 RALT_NO(KC_RIGHT,KC_END);
166 break; 170 break;
167 case KK_RESET: // Basically, turn off RGB before resetting 171 case KK_RESET: // Basically, turn off RGB before resetting
168 if (record->event.pressed) { 172 if (record->event.pressed) {
169 key_timer = timer_read32(); 173 key_timer = timer_read32();
170 #ifdef RGB_MATRIX_ENABLE 174 #ifdef RGB_MATRIX_ENABLE
171 rgb_matrix_disable_noeeprom(); 175 rgb_matrix_disable_noeeprom();
172 #endif 176 #endif
173 } else { 177 } else {
174 if (timer_elapsed32(key_timer) >= 20) { 178 if (timer_elapsed32(key_timer) >= 20) {
175 reset_keyboard(); 179 reset_keyboard();
176 }
177 } 180 }
178 break; 181 }
182 break;
179 default: 183 default:
180 if(record->event.pressed) { 184 if(record->event.pressed) {
181 timer_timeout_keymap(); 185 timer_timeout_keymap();
diff --git a/keyboards/nack/keymaps/pastapojken/keymap.h b/keyboards/nack/keymaps/farfalleflickan/keymap.h
index aaeed7070..212f45ffd 100644
--- a/keyboards/nack/keymaps/pastapojken/keymap.h
+++ b/keyboards/nack/keymaps/farfalleflickan/keymap.h
@@ -1,4 +1,4 @@
1/* Copyright 2020 pastapojken <pastapojken@gmail.com> 1/* Copyright 2020 farfalleflickan <farfalleflickan@gmail.com>
2 * 2 *
3 * This program is free software: you can redistribute it and/or modify 3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by 4 * it under the terms of the GNU General Public License as published by
@@ -17,12 +17,6 @@
17#pragma once 17#pragma once
18#include "quantum.h" 18#include "quantum.h"
19 19
20#define TAPPING_TOGGLE 2
21
22#ifdef AUDIO_ENABLE
23 #define STARTUP_SONG SONG(NO_SOUND)
24#endif
25
26void add_to_prev(uint16_t kc); 20void add_to_prev(uint16_t kc);
27void unreg_prev(void); 21void unreg_prev(void);
28void timer_timeout_keymap(void); 22void timer_timeout_keymap(void);
diff --git a/keyboards/nack/keymaps/farfalleflickan/readme.md b/keyboards/nack/keymaps/farfalleflickan/readme.md
new file mode 100644
index 000000000..fbe5c6f5e
--- /dev/null
+++ b/keyboards/nack/keymaps/farfalleflickan/readme.md
@@ -0,0 +1 @@
# farfalleflickan's keymap for nack
diff --git a/keyboards/nack/keymaps/pastapojken/readme.md b/keyboards/nack/keymaps/pastapojken/readme.md
deleted file mode 100644
index 73e1e2add..000000000
--- a/keyboards/nack/keymaps/pastapojken/readme.md
+++ /dev/null
@@ -1 +0,0 @@
1# pastapojken's keymap for nack
diff --git a/keyboards/nack/mcuconf.h b/keyboards/nack/mcuconf.h
index d2251dbae..4b714b9d5 100644
--- a/keyboards/nack/mcuconf.h
+++ b/keyboards/nack/mcuconf.h
@@ -28,4 +28,3 @@
28 28
29#undef STM32_SPI_USE_SPI2 29#undef STM32_SPI_USE_SPI2
30#define STM32_SPI_USE_SPI2 FALSE 30#define STM32_SPI_USE_SPI2 FALSE
31
diff --git a/keyboards/nack/nack.c b/keyboards/nack/nack.c
index 185a96fda..8433e551c 100644
--- a/keyboards/nack/nack.c
+++ b/keyboards/nack/nack.c
@@ -1,4 +1,4 @@
1/* Copyright 2020 pastapojken <pastapojken@gmail.com> 1/* Copyright 2020 farfalleflickan <farfalleflickan@gmail.com>
2 * 2 *
3 * This program is free software: you can redistribute it and/or modify 3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by 4 * it under the terms of the GNU General Public License as published by
diff --git a/keyboards/nack/nack.h b/keyboards/nack/nack.h
index 30e310a48..6680e992e 100644
--- a/keyboards/nack/nack.h
+++ b/keyboards/nack/nack.h
@@ -1,4 +1,4 @@
1/* Copyright 2020 pastapojken <pastapojken@gmail.com> 1/* Copyright 2020 farfalleflickan <farfalleflickan@gmail.com>
2 * 2 *
3 * This program is free software: you can redistribute it and/or modify 3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by 4 * it under the terms of the GNU General Public License as published by
diff --git a/keyboards/nack/readme.md b/keyboards/nack/readme.md
index 6a1adeaf7..b654020c4 100644
--- a/keyboards/nack/readme.md
+++ b/keyboards/nack/readme.md
@@ -4,9 +4,9 @@
4A ISO-friendly ortholinear keyboard, 13x4 keys. 4A ISO-friendly ortholinear keyboard, 13x4 keys.
5See [screenshots](https://imgur.com/a/PPO18Lc). 5See [screenshots](https://imgur.com/a/PPO18Lc).
6 6
7* Keyboard Maintainer: [pastapojken](https://github.com/pastapojken) 7* Keyboard Maintainer: [farfalleflickan](https://github.com/farfalleflickan)
8* Hardware Supported: nack PCB 8* Hardware Supported: nack PCB
9* Hardware Availability: [github repo](https://github.com/pastapojken/nack) 9* Hardware Availability: [github repo](https://github.com/farfalleflickan/nack)
10 10
11Make example for this keyboard (after setting up your build environment): 11Make example for this keyboard (after setting up your build environment):
12 12
diff --git a/keyboards/nack/rules.mk b/keyboards/nack/rules.mk
index 35e944069..f8b7d4d39 100644
--- a/keyboards/nack/rules.mk
+++ b/keyboards/nack/rules.mk
@@ -24,5 +24,5 @@ AUDIO_ENABLE = yes # Audio output
24RGB_MATRIX_ENABLE = yes 24RGB_MATRIX_ENABLE = yes
25RGB_MATRIX_DRIVER = WS2812 25RGB_MATRIX_DRIVER = WS2812
26WS2812_DRIVER = spi 26WS2812_DRIVER = spi
27AUDIO_DRIVER = dac_additive # How to drive the 2 speakers 27AUDIO_DRIVER = dac_basic # How to drive the 2 speakers
28UNICODE_ENABLE = yes # Unicode support 28UNICODE_ENABLE = yes # Unicode support
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-18 23:02:38 +0000