Skip to content

Commit ec8f8b1

Browse files
lleoninilleonini
committed
[Keyboard] ADM42: configuration refactoring
1 parent b0845d2 commit ec8f8b1

File tree

6 files changed

+102
-86
lines changed

6 files changed

+102
-86
lines changed

‎keyboards/adm42/config.h

-51
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@
3131

3232
#define DIODE_DIRECTION ROW2COL
3333

34-
#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
35-
#define TAPPING_FORCE_HOLD_PER_KEY
36-
#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
37-
#define TAPPING_TERM 200
38-
39-
#define USB_POLLING_INTERVAL_MS 1
4034
#define TAP_CODE_DELAY 1
4135
#define DEBOUNCE 10
4236

@@ -46,48 +40,3 @@
4640

4741
// Memory saver
4842
#define NO_ACTION_ONE_SHOT
49-
#if !defined(CONSOLE_ENABLE)
50-
#if !defined(NO_DEBUG)
51-
#define NO_DEBUG
52-
#endif
53-
#if !defined(NO_PRINT)
54-
#define NO_PRINT
55-
#endif
56-
#endif
57-
58-
#define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, F0, F1, F4, F5, F6, F7 }
59-
#define MATRIX_ROW_PINS { C7, D5, D3, D2 }
60-
61-
#define QMK_LED E6
62-
63-
#define RGB_DI_PIN B7
64-
65-
#define DRIVER_LED_TOTAL 42
66-
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
67-
#define RGB_MATRIX_CENTER { 112, 32 }
68-
#define RGB_DISABLE_WHEN_USB_SUSPENDED
69-
#define RGB_MATRIX_LED_PROCESS_LIMIT 21
70-
#define RGB_MATRIX_LED_FLUSH_LIMIT 16
71-
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
72-
#define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 20
73-
#define RGB_MATRIX_KEYPRESSES
74-
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
75-
#define RGB_MATRIX_SAT_STEP 24
76-
#define RGB_MATRIX_HUE_STEP 8
77-
#define RGB_MATRIX_VAL_STEP 16
78-
#define RGB_MATRIX_SPD_STEP 16
79-
80-
#define ENABLE_RGB_MATRIX_BREATHING
81-
#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
82-
#define ENABLE_RGBLIGHT_MODE_STATIC_LIGHT
83-
#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
84-
#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
85-
#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
86-
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
87-
#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
88-
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
89-
#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
90-
#define ENABLE_RGB_MATRIX_PIXEL_RAIN
91-
#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
92-
#define ENABLE_RGB_MATRIX_BAND_VAL
93-
#define ENABLE_RGB_MATRIX_SPLASH

‎keyboards/adm42/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ADM42
22

3-
![ADM42](https://adm42.dev/images/adm42.jpg)
3+
![ADM42](https://i.imgur.com/pviCQSQ.jpeg)
44

55
A compact ergonomic 40% ortholinear keyboard. [More info on ADM42.dev](https://adm42.dev)
66

‎keyboards/adm42/rev4/config.h

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
/* Copyright 2020-2022 Lorenzo Leonini
2+
* SPDX-License-Identifier: GPL-2.0-only
3+
*
4+
* This program is free software: you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License version 2 as
6+
* published by the Free Software Foundation.
7+
*
8+
* This program is distributed in the hope that it will be useful,
9+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
* GNU General Public License for more details.
12+
*
13+
* You should have received a copy of the GNU General Public License
14+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
15+
*/
16+
17+
#define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, F0, F1, F4, F5, F6, F7 }
18+
#define MATRIX_ROW_PINS { C7, D5, D3, D2 }
19+
20+
#define QMK_LED E6
21+
22+
#define RGB_DI_PIN B7
23+
24+
#define DRIVER_LED_TOTAL 42
25+
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
26+
#define RGB_MATRIX_CENTER { 112, 32 }
27+
#define RGB_DISABLE_WHEN_USB_SUSPENDED
28+
#define RGB_MATRIX_LED_PROCESS_LIMIT 21
29+
#define RGB_MATRIX_LED_FLUSH_LIMIT 16
30+
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
31+
#define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 20
32+
#define RGB_MATRIX_KEYPRESSES
33+
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
34+
#define RGB_MATRIX_SAT_STEP 24
35+
#define RGB_MATRIX_HUE_STEP 8
36+
#define RGB_MATRIX_VAL_STEP 16
37+
#define RGB_MATRIX_SPD_STEP 16
38+
39+
#define ENABLE_RGB_MATRIX_BREATHING
40+
#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
41+
#define ENABLE_RGBLIGHT_MODE_STATIC_LIGHT
42+
#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
43+
#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
44+
#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
45+
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
46+
#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
47+
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
48+
#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
49+
#define ENABLE_RGB_MATRIX_PIXEL_RAIN
50+
#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
51+
#define ENABLE_RGB_MATRIX_BAND_VAL
52+
#define ENABLE_RGB_MATRIX_SPLASH

‎keyboards/adm42/rev4/keymaps/default/keymap.c

+10-33
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,18 @@
1616

1717
#include QMK_KEYBOARD_H
1818

19-
led_config_t g_led_config = {
20-
{
21-
{12, 11, 8, 7, 4, 3, 36, 37, 38, 39, 40, 41},
22-
{13, 10, 9, 6, 5, 2, 35, 34, 33, 32, 31, 30},
23-
{14, 15, 16, 17, 18, 1, 24, 25, 26, 27, 28, 29},
24-
{NO_LED, NO_LED, NO_LED, 19, 20, 21, 0, 22, 23, NO_LED, NO_LED, NO_LED}
25-
}, {
26-
{112, 32}, {92, 36}, {94, 25}, {97, 14}, {80, 13}, {77, 24},
27-
{62, 18}, {64, 8}, {49, 6}, {46, 17}, {28, 23}, {30, 13},
28-
{14, 11}, {11, 22}, {8, 32}, {26, 34}, {43, 28}, {61, 29},
29-
{76, 34}, {78, 46}, {97, 49}, {112, 56}, {127, 49}, {146, 46},
30-
{132, 36}, {148, 34}, {164, 29}, {180, 28}, {198, 34}, {215, 32},
31-
{212, 22}, {196, 23}, {178, 17}, {161, 18}, {146, 24}, {130, 25},
32-
{126, 14}, {143, 13}, {159, 8}, {175, 6}, {194, 13}, {210, 11}
33-
}, {
34-
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
35-
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
36-
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
37-
4, 4, 4, 4, 4, 4
38-
}
19+
enum custom_layers {
20+
_QWERTY,
21+
_COLEMAKDH,
22+
_SPECIAL,
23+
_EXTRA,
24+
_ADM,
25+
_SETUP,
3926
};
4027

41-
#define _QWERTY 0
42-
#define _COLEMAKDH 1
43-
#define _SPECIAL 2
44-
#define _EXTRA 3
45-
#define _ADM 4
46-
#define _SETUP 5
28+
#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
29+
#define TAPPING_FORCE_HOLD_PER_KEY
30+
#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
4731

4832
#define LW_GRV LWIN_T(KC_GRV)
4933
#define RW_EQU RWIN_T(KC_EQUAL)
@@ -68,15 +52,8 @@ enum custom_keycodes {
6852
REFLASH = SAFE_RANGE,
6953
LC_CIRC,
7054
RC_DLR,
71-
7255
DF_QWER,
7356
DF_COLE,
74-
DF_TA1A,
75-
DF_TA1B,
76-
DF_TA2A,
77-
DF_TA2B,
78-
DF_TA3,
79-
DF_TA4,
8057
};
8158

8259
// Not a mistake to have KC_LALT (also) on the right, RALT is kept for compose (LLS_RALT)

‎keyboards/adm42/rev4/rev4.c

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/* Copyright 2020-2022 Lorenzo Leonini
2+
* SPDX-License-Identifier: GPL-2.0-only
3+
*
4+
* This program is free software: you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License version 2 as
6+
* published by the Free Software Foundation.
7+
*
8+
* This program is distributed in the hope that it will be useful,
9+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
* GNU General Public License for more details.
12+
*
13+
* You should have received a copy of the GNU General Public License
14+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
15+
*/
16+
17+
#include QMK_KEYBOARD_H
18+
19+
led_config_t g_led_config = {
20+
{
21+
{12, 11, 8, 7, 4, 3, 36, 37, 38, 39, 40, 41},
22+
{13, 10, 9, 6, 5, 2, 35, 34, 33, 32, 31, 30},
23+
{14, 15, 16, 17, 18, 1, 24, 25, 26, 27, 28, 29},
24+
{NO_LED, NO_LED, NO_LED, 19, 20, 21, 0, 22, 23, NO_LED, NO_LED, NO_LED}
25+
}, {
26+
{112, 32}, {92, 36}, {94, 25}, {97, 14}, {80, 13}, {77, 24},
27+
{62, 18}, {64, 8}, {49, 6}, {46, 17}, {28, 23}, {30, 13},
28+
{14, 11}, {11, 22}, {8, 32}, {26, 34}, {43, 28}, {61, 29},
29+
{76, 34}, {78, 46}, {97, 49}, {112, 56}, {127, 49}, {146, 46},
30+
{132, 36}, {148, 34}, {164, 29}, {180, 28}, {198, 34}, {215, 32},
31+
{212, 22}, {196, 23}, {178, 17}, {161, 18}, {146, 24}, {130, 25},
32+
{126, 14}, {143, 13}, {159, 8}, {175, 6}, {194, 13}, {210, 11}
33+
}, {
34+
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
35+
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
36+
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
37+
4, 4, 4, 4, 4, 4
38+
}
39+
};

‎keyboards/adm42/rules.mk

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ AUDIO_ENABLE = no # Audio output
1515

1616
DEBOUNCE_TYPE = sym_eager_pk
1717

18-
EXTRAFLAGS += -flto
1918
LTO_ENABLE = yes
2019

2120
DEFAULT_FOLDER = adm42/rev4

0 commit comments

Comments
 (0)