summaryrefslogtreecommitdiff
path: root/keyboards/lfkeyboards/smk65
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-01-23 05:24:02 +1100
committerGitHub <noreply@github.com>2022-01-22 18:24:02 +0000
commit8ec18d147613d3539764b33e92af5c9542dd5f46 (patch)
treec444919d497dfd2886d406ff6c87e145e62f6e8e /keyboards/lfkeyboards/smk65
parent4ef11f0905f28dedcd17f4be7949d3592fef20b5 (diff)
downloadqmk_firmware-8ec18d147613d3539764b33e92af5c9542dd5f46.tar.gz
qmk_firmware-8ec18d147613d3539764b33e92af5c9542dd5f46.zip
Remove `action_function()` from LFKeyboards boards (#15993)
Diffstat (limited to 'keyboards/lfkeyboards/smk65')
-rw-r--r--keyboards/lfkeyboards/smk65/keymaps/default/keymap.c90
-rw-r--r--keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c90
-rw-r--r--keyboards/lfkeyboards/smk65/revb/revb.c56
-rw-r--r--keyboards/lfkeyboards/smk65/revb/revb.h13
4 files changed, 80 insertions, 169 deletions
diff --git a/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c b/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c
index 1470f95022..0e6b2820d0 100644
--- a/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c
@@ -21,55 +21,45 @@ enum layer_names {
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- /* Keymap VANILLA: (Base Layer) Default Layer
- * ,------------------------------------------------------------.----.
- * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0| - | = |Backspa| Ins|
- * |------------------------------------------------------------|----|
- * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| Del|
- * |------------------------------------------------------------|----|
- * |CAPS | A| S| D| F| G| H| J| K| L| ;| '|Return |PgUp|
- * |------------------------------------------------------------|----|
- * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgDn|
- * |-----------------------------------------------------------------|
- * |Ctrl|Win |Alt | Space |Alt |Ctrl|Func|Lft| Dn |Rig |
- * `-----------------------------------------------------------------'
- */
- [_BASE] = LAYOUT_65_ansi(
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
- 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, KC_BSLS, KC_DEL,
- KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
- ),
+ /* Keymap VANILLA: (Base Layer) Default Layer
+ * ,------------------------------------------------------------.----.
+ * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0| - | = |Backspa| Ins|
+ * |------------------------------------------------------------|----|
+ * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| Del|
+ * |------------------------------------------------------------|----|
+ * |CAPS | A| S| D| F| G| H| J| K| L| ;| '|Return |PgUp|
+ * |------------------------------------------------------------|----|
+ * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgDn|
+ * |-----------------------------------------------------------------|
+ * |Ctrl|Win |Alt | Space |Alt |Ctrl|Func|Lft| Dn |Rig |
+ * `-----------------------------------------------------------------'
+ */
+ [_BASE] = LAYOUT_65_ansi(
+ KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
+ 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, KC_BSLS, KC_DEL,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
- /* Keymap VANILLA: Function Layer
- * ,------------------------------------------------------------.----.
- * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0| - | = |Backspa| Ins|
- * |------------------------------------------------------------|----|
- * |MuMode | | | |E| R| T| Y| U| I| O| P| [| ]| \| Del|
- * |------------------------------------------------------------|----|
- * |AudTgl|Hz+|MS+| | D| F| G| H| J| K| L| ;| '|Return |PgUp|
- * |------------------------------------------------------------|----|
- * |ClickTgl|Hz-|MS-|| C| V| B| N|MuTgl| ,| .| /|Shift |Up |PgDn|
- * |-----------------------------------------------------------------|
- * |Ctrl|Win |Alt | Space |Alt |Ctrl|Func|Lft| Dn |Rig |
- * `-----------------------------------------------------------------'
- */
- [_FN] = LAYOUT_65_ansi(
- KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14,
- MU_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
- AU_TOG, F(1), F(3), _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, RGB_MOD,
- F(5), F(2), F(4), _______, _______, _______, _______, MU_TOG, RGB_VAD, RGB_VAI, _______, _______, RGB_HUI, _______,
- _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI
- )
+ /* Keymap VANILLA: Function Layer
+ * ,------------------------------------------------------------.----.
+ * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0| - | = |Backspa| Ins|
+ * |------------------------------------------------------------|----|
+ * |MuMode | | | |E| R| T| Y| U| I| O| P| [| ]| \| Del|
+ * |------------------------------------------------------------|----|
+ * |AudTgl|Hz+|MS+| | D| F| G| H| J| K| L| ;| '|Return |PgUp|
+ * |------------------------------------------------------------|----|
+ * |ClickTgl|Hz-|MS-|| C| V| B| N|MuTgl| ,| .| /|Shift |Up |PgDn|
+ * |-----------------------------------------------------------------|
+ * |Ctrl|Win |Alt | Space |Alt |Ctrl|Func|Lft| Dn |Rig |
+ * `-----------------------------------------------------------------'
+ */
+ [_FN] = LAYOUT_65_ansi(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14,
+ MU_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
+ AU_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, RGB_MOD,
+ _______, _______, _______, _______, _______, _______, _______, MU_TOG, RGB_VAD, RGB_VAI, _______, _______, RGB_HUI, _______,
+ _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI
+ )
};
-
-#ifndef NO_ACTION_FUNCTION
-const uint16_t PROGMEM fn_actions[] = {
- [1] = ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER), // FN1 - Increase Freq of audio click
- [2] = ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER), // FN2 - Decrease Freq of audio click
- [3] = ACTION_FUNCTION(LFK_CLICK_TIME_LONGER), // FN3 - Increase length of audio click
- [4] = ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER), // FN4 - Decrease length of audio click
- [5] = ACTION_FUNCTION(LFK_CLICK_TOGGLE), // FN5 - Toggle audio click
-};
-#endif
diff --git a/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c b/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c
index 3a1701ce86..881ff99c9d 100644
--- a/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c
+++ b/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c
@@ -21,55 +21,45 @@ enum layer_names {
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- /* Keymap VANILLA: (Base Layer) Default Layer
- * ,------------------------------------------------------------.----.
- * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0| - | = |Backspa| Ins|
- * |------------------------------------------------------------|----|
- * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| Ret | Del|
- * |--------------------------------------------------------. |----|
- * |CAPS | A| S| D| F| G| H| J| K| L| ;| '| # | |PgUp|
- * |------------------------------------------------------------|----|
- * |Shft| \ | Z| X| C| V| B| N| M| ,| .| /|Shift | Up |PgDn|
- * |-----------------------------------------------------------------|
- * |Ctrl|Win |Alt | Space |Alt |Ctrl|Func|Lft| Dn |Rig |
- * `-----------------------------------------------------------------'
- */
- [_BASE] = LAYOUT_65_iso(
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
- 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, KC_DEL,
- KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGUP,
- KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
- ),
+ /* Keymap VANILLA: (Base Layer) Default Layer
+ * ,------------------------------------------------------------.----.
+ * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0| - | = |Backspa| Ins|
+ * |------------------------------------------------------------|----|
+ * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| Ret | Del|
+ * |--------------------------------------------------------. |----|
+ * |CAPS | A| S| D| F| G| H| J| K| L| ;| '| # | |PgUp|
+ * |------------------------------------------------------------|----|
+ * |Shft| \ | Z| X| C| V| B| N| M| ,| .| /|Shift | Up |PgDn|
+ * |-----------------------------------------------------------------|
+ * |Ctrl|Win |Alt | Space |Alt |Ctrl|Func|Lft| Dn |Rig |
+ * `-----------------------------------------------------------------'
+ */
+ [_BASE] = LAYOUT_65_iso(
+ KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
+ 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, KC_DEL,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGUP,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
- /* Keymap VANILLA: Function Layer
- * ,------------------------------------------------------------.----.
- * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0| - | = |Backspa| Ins|
- * |------------------------------------------------------------|----|
- * |MuMode | | | |E| R| T| Y| U| I| O| P| [| ]| RESET| Del|
- * |--------------------------------------------------------. |----|
- * |AudTgl|Hz+|MS+| | D| F| G| H| J| K| L| ;| '| | |PgUp|
- * |------------------------------------------------------------|----|
- * |CTgl| |Hz-|MS-|| C| V| B| N|MuTgl| ,| .| /|Shift |Up |PgDn|
- * |-----------------------------------------------------------------|
- * |Ctrl|Win |Alt | Space |Alt |Ctrl|Func|Lft| Dn |Rig |
- * `-----------------------------------------------------------------'
- */
- [_FN] = LAYOUT_65_iso(
- KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14,
- MU_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
- AU_TOG, F(1), F(3), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, RGB_MOD,
- F(5), _______, F(2), F(4), _______, _______, _______, _______, MU_TOG, RGB_VAD, RGB_VAI, _______, _______, RGB_HUI, _______,
- _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI
- ),
+ /* Keymap VANILLA: Function Layer
+ * ,------------------------------------------------------------.----.
+ * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0| - | = |Backspa| Ins|
+ * |------------------------------------------------------------|----|
+ * |MuMode | | | |E| R| T| Y| U| I| O| P| [| ]| RESET| Del|
+ * |--------------------------------------------------------. |----|
+ * |AudTgl|Hz+|MS+| | D| F| G| H| J| K| L| ;| '| | |PgUp|
+ * |------------------------------------------------------------|----|
+ * |CTgl| |Hz-|MS-|| C| V| B| N|MuTgl| ,| .| /|Shift |Up |PgDn|
+ * |-----------------------------------------------------------------|
+ * |Ctrl|Win |Alt | Space |Alt |Ctrl|Func|Lft| Dn |Rig |
+ * `-----------------------------------------------------------------'
+ */
+ [_FN] = LAYOUT_65_iso(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14,
+ MU_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
+ AU_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, RGB_MOD,
+ _______, _______, _______, _______, _______, _______, _______, _______, MU_TOG, RGB_VAD, RGB_VAI, _______, _______, RGB_HUI, _______,
+ _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI
+ )
};
-
-#ifndef NO_ACTION_FUNCTION
-const uint16_t PROGMEM fn_actions[] = {
- [1] = ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER), // FN1 - Increase Freq of audio click
- [2] = ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER), // FN2 - Decrease Freq of audio click
- [3] = ACTION_FUNCTION(LFK_CLICK_TIME_LONGER), // FN3 - Increase length of audio click
- [4] = ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER), // FN4 - Decrease length of audio click
- [5] = ACTION_FUNCTION(LFK_CLICK_TOGGLE), // FN5 - Toggle audio click
-};
-#endif
diff --git a/keyboards/lfkeyboards/smk65/revb/revb.c b/keyboards/lfkeyboards/smk65/revb/revb.c
index 01c339f06b..9b34eff1c3 100644
--- a/keyboards/lfkeyboards/smk65/revb/revb.c
+++ b/keyboards/lfkeyboards/smk65/revb/revb.c
@@ -81,62 +81,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
return process_record_user(keycode, record);
}
-void action_function(keyrecord_t *event, uint8_t id, uint8_t opt)
-{
-#ifdef AUDIO_ENABLE
- int8_t sign = 1;
-#endif
- if(id == LFK_ESC_TILDE){
- // Send ~ on shift-esc
- void (*method)(uint8_t) = (event->event.pressed) ? &add_key : &del_key;
- uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT));
- method(shifted ? KC_GRAVE : KC_ESCAPE);
- send_keyboard_report();
- }else if(event->event.pressed){
- switch(id){
- case LFK_SET_DEFAULT_LAYER:
- // set/save the current base layer to eeprom, falls through to LFK_CLEAR
- eeconfig_update_default_layer(1UL << opt);
- default_layer_set(1UL << opt);
- case LFK_CLEAR:
- // Go back to default layer
- layer_clear();
- break;
-#ifdef AUDIO_ENABLE
- case LFK_CLICK_FREQ_LOWER:
- sign = -1; // continue to next statement
- case LFK_CLICK_FREQ_HIGHER:
- click_hz += sign * 100;
- click(click_hz, click_time);
- break;
- case LFK_CLICK_TOGGLE:
- if(click_toggle){
- click_toggle = 0;
- click(4000, 100);
- click(1000, 100);
- }else{
- click_toggle = 1;
- click(1000, 100);
- click(4000, 100);
- }
- break;
- case LFK_CLICK_TIME_SHORTER:
- sign = -1; // continue to next statement
- case LFK_CLICK_TIME_LONGER:
- click_time += sign;
- click(click_hz, click_time);
- break;
-#endif
- case LFK_DEBUG_SETTINGS:
- dprintf("Click:\n");
- dprintf(" toggle: %d\n", click_toggle);
- dprintf(" freq(hz): %d\n", click_hz);
- dprintf(" duration(ms): %d\n", click_time);
- break;
- }
- }
-}
-
void reset_keyboard_kb(){
#ifdef WATCHDOG_ENABLE
MCUSR = 0;
diff --git a/keyboards/lfkeyboards/smk65/revb/revb.h b/keyboards/lfkeyboards/smk65/revb/revb.h
index dbb25b869a..28fed40aa2 100644
--- a/keyboards/lfkeyboards/smk65/revb/revb.h
+++ b/keyboards/lfkeyboards/smk65/revb/revb.h
@@ -33,19 +33,6 @@ typedef struct Layer_Info {
extern const uint32_t layer_count;
extern const Layer_Info layer_info[];
-enum action_functions {
- LFK_CLEAR = 0, // Resets all layers
- LFK_ESC_TILDE, // esc+lshift = ~
- LFK_SET_DEFAULT_LAYER, // changes and saves current base layer to eeprom
- LFK_CLICK_TOGGLE, // Adjusts click duration
- LFK_CLICK_FREQ_HIGHER, // Adjusts click frequency
- LFK_CLICK_FREQ_LOWER, // Adjusts click frequency
- LFK_CLICK_TIME_LONGER, // Adjusts click duration
- LFK_CLICK_TIME_SHORTER, // Adjusts click duration
- LFK_DEBUG_SETTINGS, // prints LED and click settings to HID
- LFK_LED_TEST // cycles through switch and RGB LEDs
-};
-
#define CLICK_HZ 500
#define CLICK_MS 2
#define CLICK_ENABLED 0