From b05890c048aac318071ce897ea6784e333b09c0c Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Tue, 25 Apr 2023 15:51:19 +0800 Subject: [PATCH 01/71] add 5075 keyboard. --- keyboards/akko/5075/5075.c | 675 +++++++++++++++++++ keyboards/akko/5075/config.h | 102 +++ keyboards/akko/5075/halconf.h | 23 + keyboards/akko/5075/info.json | 122 ++++ keyboards/akko/5075/keymaps/default/keymap.c | 121 ++++ keyboards/akko/5075/keymaps/via/keymap.c | 121 ++++ keyboards/akko/5075/keymaps/via/rules.mk | 2 + keyboards/akko/5075/mcuconf.h | 24 + keyboards/akko/5075/readme.md | 19 + keyboards/akko/5075/rgb_matrix_kb.inc | 51 ++ keyboards/akko/5075/rules.mk | 28 + 11 files changed, 1288 insertions(+) create mode 100644 keyboards/akko/5075/5075.c create mode 100644 keyboards/akko/5075/config.h create mode 100644 keyboards/akko/5075/halconf.h create mode 100644 keyboards/akko/5075/info.json create mode 100644 keyboards/akko/5075/keymaps/default/keymap.c create mode 100644 keyboards/akko/5075/keymaps/via/keymap.c create mode 100644 keyboards/akko/5075/keymaps/via/rules.mk create mode 100644 keyboards/akko/5075/mcuconf.h create mode 100644 keyboards/akko/5075/readme.md create mode 100644 keyboards/akko/5075/rgb_matrix_kb.inc create mode 100644 keyboards/akko/5075/rules.mk diff --git a/keyboards/akko/5075/5075.c b/keyboards/akko/5075/5075.c new file mode 100644 index 00000000000..44de320fec6 --- /dev/null +++ b/keyboards/akko/5075/5075.c @@ -0,0 +1,675 @@ +/* Copyright (C) 2022 jonylee@hfd + * + * 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 + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "quantum.h" +// clang-format off +#ifdef RGB_MATRIX_ENABLE + +static uint16_t map_current_time = 0; +static bool pwron_flag = false; + +const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { +/* Refer to IS31 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {1, A_1, B_1, C_1}, + {1, A_2, B_2, C_2}, + {1, A_3, B_3, C_3}, + {1, A_4, B_4, C_4}, + {1, A_5, B_5, C_5}, + {1, A_6, B_6, C_6}, + {1, A_7, B_7, C_7}, + {1, A_8, B_8, C_8}, + {1, A_9, B_9, C_9}, + {1, A_10, B_10, C_10}, + {1, A_11, B_11, C_11}, + {1, A_12, B_12, C_12}, + {1, A_13, B_13, C_13}, + {1, A_14, B_14, C_14}, + + {0, A_1, B_1, C_1}, + {0, A_2, B_2, C_2}, + {0, A_3, B_3, C_3}, + {0, A_4, B_4, C_4}, + {0, A_5, B_5, C_5}, + {0, A_6, B_6, C_6}, + {0, A_7, B_7, C_7}, + {0, A_8, B_8, C_8}, + {0, A_9, B_9, C_9}, + {0, A_10, B_10, C_10}, + {0, A_11, B_11, C_11}, + {0, A_12, B_12, C_12}, + {0, A_13, B_13, C_13}, + {0, A_14, B_14, C_14}, + {1, D_1, E_1, F_1}, + + {0, D_1, E_1, F_1}, + {0, D_2, E_2, F_2}, + {0, D_3, E_3, F_3}, + {0, D_4, E_4, F_4}, + {0, D_5, E_5, F_5}, + {0, D_6, E_6, F_6}, + {0, D_7, E_7, F_7}, + {0, D_8, E_8, F_8}, + {0, D_9, E_9, F_9}, + {0, D_10, E_10, F_10}, + {0, D_11, E_11, F_11}, + {0, D_12, E_12, F_12}, + {0, D_13, E_13, F_13}, + {0, D_14, E_14, F_14}, + {1, D_2, E_2, F_2}, + + {0, G_1, H_1, I_1}, + {0, G_2, H_2, I_2}, + {0, G_3, H_3, I_3}, + {0, G_4, H_4, I_4}, + {0, G_5, H_5, I_5}, + {0, G_6, H_6, I_6}, + {0, G_7, H_7, I_7}, + {0, G_8, H_8, I_8}, + {0, G_9, H_9, I_9}, + {0, G_10, H_10, I_10}, + {0, G_11, H_11, I_11}, + {0, G_12, H_12, I_12}, + {0, A_15, B_15, C_15}, + {0, G_13, H_13, I_13}, + {1, D_3, E_3, F_3}, + + {0, J_1, K_1, L_1}, + {0, A_16, B_16, C_16}, + {0, J_2, K_2, L_2}, + {0, J_3, K_3, L_3}, + {0, J_4, K_4, L_4}, + {0, J_5, K_5, L_5}, + {0, J_6, K_6, L_6}, + {0, J_7, K_7, L_7}, + {0, J_8, K_8, L_8}, + {0, J_9, K_9, L_9}, + {0, J_10, K_10, L_10}, + {0, J_11, K_11, L_11}, + {0, J_12, K_12, L_12}, + {1, D_7, E_7, F_7}, + {1, D_4, E_4, F_4}, + + {0, J_13, K_13, L_13}, + {0, J_14, K_14, L_14}, + {0, J_15, K_15, L_15}, + {0, J_16, K_16, L_16}, + + {0, G_14, H_14, I_14}, + {0, G_15, H_15, I_15}, + {0, G_16, H_16, I_16}, + + {0, D_15, E_15, F_15}, + {1, D_6, E_6, F_6}, + {1, D_5, E_5, F_5}, + + {1, G_1, H_1, I_1}, + {1, G_2, H_2, I_2}, + {1, G_3, H_3, I_3}, + {1, G_4, H_4, I_4}, + {1, G_5, H_5, I_5}, + {1, G_6, H_6, I_6}, + {1, G_7, H_7, I_7}, + {1, G_8, H_8, I_8}, + {1, G_9, H_9, I_9}, + {1, G_10, H_10, I_10}, + {1, G_11, H_11, I_11}, + + {1, J_1, K_1, L_1}, + {1, J_2, K_2, L_2}, + {1, J_3, K_3, L_3}, + {1, J_4, K_4, L_4}, + {1, J_5, K_5, L_5}, + {1, J_6, K_6, L_6}, + {1, J_7, K_7, L_7}, + {1, J_8, K_8, L_8}, + {1, J_9, K_9, L_9}, + {1, J_10, K_10, L_10}, + {1, J_11, K_11, L_11}, +}; + +led_config_t g_led_config = { + { + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, NO_LED, NO_LED}, + { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, NO_LED, 28}, + { 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, NO_LED, 43}, + { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, NO_LED, 58}, + { 59, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 60, NO_LED, 71, 72, 73}, + { 74, 75, 76, NO_LED, NO_LED, 77, NO_LED, NO_LED, NO_LED, 78, 79, 80, NO_LED, 81, 82, 83} + }, + { + { 0, 0}, // 0 + { 14, 0}, // 1 + { 29, 0}, // 2 + { 44, 0}, // 3 + { 59, 0}, // 4 + { 74, 0}, // 5 + { 89, 0}, // 6 + {104, 0}, // 7 + {119, 0}, // 8 + {134, 0}, // 9 + {149, 0}, // 10 + {164, 0}, // 11 + {179, 0}, // 12 + {194, 0}, // 13 + + { 0, 12}, // 14 + { 14, 12}, // 15 + { 28, 12}, // 16 + { 42, 12}, // 17 + { 56, 12}, // 18 + { 70, 12}, // 19 + { 84, 12}, // 20 + { 98, 12}, // 21 + {112, 12}, // 22 + {126, 12}, // 23 + {140, 12}, // 24 + {154, 12}, // 25 + {168, 12}, // 26 + {182, 12}, // 27 + {224, 12}, // 28 + + { 0, 25}, // 29 + { 14, 25}, // 30 + { 28, 25}, // 31 + { 42, 25}, // 32 + { 56, 25}, // 33 + { 70, 25}, // 34 + { 84, 25}, // 35 + { 98, 25}, // 36 + {112, 25}, // 37 + {126, 25}, // 38 + {140, 25}, // 39 + {154, 25}, // 40 + {168, 25}, // 41 + {182, 25}, // 42 + {224, 25}, // 43 + + { 0, 38}, // 29 + { 14, 38}, // 30 + { 28, 38}, // 31 + { 42, 38}, // 32 + { 56, 38}, // 33 + { 70, 38}, // 34 + { 84, 38}, // 35 + { 98, 38}, // 36 + {112, 38}, // 37 + {126, 38}, // 38 + {140, 38}, // 39 + {154, 38}, // 40 + {168, 38}, // 41 + {182, 38}, // 42 + {224, 38}, // 43 + + { 0, 51}, // 29 + { 14, 51}, // 30 + { 28, 51}, // 31 + { 42, 51}, // 32 + { 56, 51}, // 33 + { 70, 51}, // 34 + { 84, 51}, // 35 + { 98, 51}, // 36 + {112, 51}, // 37 + {126, 51}, // 38 + {140, 51}, // 39 + {154, 51}, // 40 + {168, 51}, // 41 + {194, 51}, // 70 + {224, 51}, // 71 + + { 0, 64}, // 72 + { 14, 64}, // 73 + { 28, 64}, // 74 + { 84, 64}, // 75 + {140, 64}, // 76 + {154, 64}, // 77 + {168, 64}, // 78 + {182, 64}, // 80 + {194, 64}, // 81 + {224, 64}, // 82 + + {0, 0}, // 68 LED 1 + {0, 6}, // 69 LED 2 + {0, 13}, // 70 LED 3 + {0, 19}, // 71 LED 4 + {0, 25}, // 72 LED 5 + {0, 32}, // 73 LED 6 + {0, 38}, // 74 LED 7 + {0, 45}, // 75 LED 8 + {0, 51}, // 73 LED 9 + {0, 57}, // 74 LED 10 + {0, 64}, // 75 LED 11 + + {224, 0 }, // 78 LED 12 + {224, 6 }, // 79 LED 13 + {224, 13}, // 80 LED 14 + {224, 19}, // 81 LED 15 + {224, 25}, // 82 LED 16 + {224, 32}, // 83 LED 17 + {224, 38}, // 84 LED 18 + {224, 45}, // 82 LED 19 + {224, 51}, // 83 LED 20 + {224, 57}, // 84 LED 21 + {224, 64} // 85 LED 22 + }, + { + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 + } +}; +#endif + +enum __layers { + WIN_B, + WIN_W, + WIN_FN, + MAC_B, + MAC_W, + MAC_FN +}; +enum colors { + WHITE, + RED, + GREEN, + BLUE +}; +enum colors led_color_status = WHITE; + +// clang-format on +static bool Lkey_flag = false; +static bool reset_glint_flag = false; +static bool while_test_flag = false; +static bool alarm_flag = false; +static uint16_t current_time = 0; +static uint8_t glint_cnt = 0; +static uint16_t scancode = 0; +static uint8_t alarm_cnt = 0; + +#ifndef DISABLE_M1_KEYCODES +static uint8_t RGB_HSV_level; +static bool fn_make_flag = false; +#endif + +HSV hsv; + +void led_test(uint8_t color); +void clear_eeprom(void); + +void led_init_ports(void) { + // set our LED pings as output + setPinOutput(LED_CAPS_LOCK_PIN); // LED1 Num Lock + writePinLow(LED_CAPS_LOCK_PIN); + setPinOutput(LED_MAC_OS_PIN); // LDE2 MAC\WIN + writePinLow(LED_MAC_OS_PIN); + setPinOutput(LED_WIN_LOCK_PIN); // LED3 Win Lock + writePinLow(LED_WIN_LOCK_PIN); +} + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if (res) { + writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); + writePin(LED_MAC_OS_PIN, default_layer_state & ((1<= 3000) { + pwron_flag = true; + if (!rgb_matrix_get_flags()) { + rgb_matrix_set_flags(LED_FLAG_NONE); + rgb_matrix_set_color_all(0, 0, 0); + } else { + rgb_matrix_set_flags(LED_FLAG_ALL); + } + } + } + return true; +} + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + if (!process_record_user(keycode, record)) { + return false; + } + switch (keycode) { +#ifndef DISABLE_5075_KEYCODES + case MO(WIN_FN): + case MO(MAC_FN): + fn_make_flag = record->event.pressed; + return true; + case KC_GRV: + if (fn_make_flag && record->event.pressed) { + Lkey_flag = true; + current_time = timer_read(); + scancode = KC_GRV; + return false; + } else { + Lkey_flag = 0; + } + return true; + case KC_LCTL: + if (fn_make_flag && record->event.pressed) { + if (while_test_flag) { + while_test_flag = false; + rgb_matrix_init(); + } else { + Lkey_flag = true; + current_time = timer_read(); + scancode = KC_LCTL; + } + return false; + } else { + Lkey_flag = 0; + } + return true; + case TG(WIN_W): + if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { + alarm_flag = true; + rgb_matrix_toggle_noeeprom(); + current_time = timer_read(); + if (layer_state_cmp(default_layer_state, WIN_W)) { + set_single_persistent_default_layer(WIN_B); + layer_off(WIN_W); + } else { + set_single_persistent_default_layer(WIN_W); + layer_on(WIN_B); + } + } + return false; + case TG(MAC_W): + if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { + alarm_flag = true; + rgb_matrix_toggle_noeeprom(); + current_time = timer_read(); + if (layer_state_cmp(default_layer_state, MAC_W)) { + set_single_persistent_default_layer(MAC_B); + layer_off(MAC_W); + } else { + set_single_persistent_default_layer(MAC_W); + layer_on(MAC_B); + } + } + return false; + case GU_TOGG: + if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { + alarm_flag = true; + rgb_matrix_toggle_noeeprom(); + current_time = timer_read(); + writePin(LED_WIN_LOCK_PIN, !keymap_config.no_gui); + } + return true; + case RGB_HUI: + if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { + RGB_HSV_level = ((uint8_t)rgb_matrix_get_hue() / (UINT8_MAX / 6) + 1) % 7; + rgb_matrix_config.hsv.h = (uint8_t)(UINT8_MAX / 6) * RGB_HSV_level; + } + rgb_matrix_sethsv(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v); + + return false; + case RGB_VAI: + if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { + if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_val() / (RGB_MATRIX_MAXIMUM_BRIGHTNESS / 4)) < 4) { + alarm_cnt = 2; + RGB_HSV_level++; + rgb_matrix_config.hsv.v = (uint8_t)(RGB_MATRIX_MAXIMUM_BRIGHTNESS / 4) * RGB_HSV_level; + } + rgb_matrix_sethsv(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v); + } + return false; + case RGB_VAD: + if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { + if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_val() / (RGB_MATRIX_MAXIMUM_BRIGHTNESS / 4)) > 0) { + alarm_cnt = 2; + RGB_HSV_level--; + rgb_matrix_config.hsv.v = (uint8_t)(RGB_MATRIX_MAXIMUM_BRIGHTNESS / 4) * RGB_HSV_level; + } + rgb_matrix_sethsv(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v); + } + return false; + case RGB_SAI: + if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { + if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_sat() / (UINT8_MAX / 4)) < 4) { + RGB_HSV_level++; + rgb_matrix_config.hsv.s = (uint8_t)(UINT8_MAX / 4) * RGB_HSV_level; + alarm_cnt = 2; + } + rgb_matrix_sethsv(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v); + } + return false; + case RGB_SAD: + if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { + if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_sat() / (UINT8_MAX / 4)) > 0) { + RGB_HSV_level--; + rgb_matrix_config.hsv.s = (uint8_t)(UINT8_MAX / 4) * RGB_HSV_level; + alarm_cnt = 2; + } + rgb_matrix_sethsv(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v); + } + return false; + case RGB_SPI: + if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { + if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_speed() / (UINT8_MAX / 4)) < 4) { + alarm_cnt = 2; + RGB_HSV_level++; + rgb_matrix_set_speed((uint8_t)(UINT8_MAX / 4) * RGB_HSV_level); + } + } + return false; + case RGB_SPD: + if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { + if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_speed() / (UINT8_MAX / 4)) > 0) { + alarm_cnt = 2; + RGB_HSV_level--; + rgb_matrix_set_speed((uint8_t)(UINT8_MAX / 4) * RGB_HSV_level); + } + } + return false; + case RGB_TOG: + if (record->event.pressed) { + switch (rgb_matrix_get_flags()) { + case LED_FLAG_ALL: { + rgb_matrix_set_flags(LED_FLAG_NONE); + } break; + default: { + rgb_matrix_set_flags(LED_FLAG_ALL); + } break; + } + } + if (!rgb_matrix_is_enabled()) { + rgb_matrix_set_flags(LED_FLAG_ALL); + rgb_matrix_enable(); + } + return false; +#endif//DISABLE_5075_KEYCODES + default: + return true; + } +} + +void housekeeping_task_kb(void) { + if (Lkey_flag) { + if (scancode == KC_GRV) { + if (timer_elapsed(current_time) >= 3000) { + Lkey_flag = false; + clear_eeprom(); + + current_time = timer_read(); + reset_glint_flag = true; + glint_cnt = 0; + rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR); + rgb_matrix_sethsv_noeeprom(HSV_OFF); + } + } else if (scancode == KC_LCTL) { + if (timer_elapsed(current_time) >= 3000) { + Lkey_flag = false; + clear_eeprom(); + + while_test_flag = true; + glint_cnt = 0; + rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR); + rgb_matrix_sethsv_noeeprom(HSV_WHITE); + } + } + } else if (reset_glint_flag) { + if ((timer_elapsed(current_time)) >= 300) { + current_time = timer_read(); + if (((glint_cnt++) & 0x01) == 0) { + rgb_matrix_sethsv_noeeprom(HSV_WHITE); + } else { + rgb_matrix_sethsv_noeeprom(HSV_OFF); + } + if (glint_cnt >= 3) { + glint_cnt = 0; + reset_glint_flag = false; + rgb_matrix_init(); + } + } + + } else if (while_test_flag) { + if ((timer_elapsed(current_time)) >= 1000) { + current_time = timer_read(); + if ((glint_cnt % 4) == 0) { + rgb_matrix_sethsv_noeeprom(HSV_RED); + } else if ((glint_cnt % 4) == 1) { + rgb_matrix_sethsv_noeeprom(HSV_GREEN); + } else if ((glint_cnt % 4) == 2) { + rgb_matrix_sethsv_noeeprom(HSV_BLUE); + } else if ((glint_cnt % 4) == 3) { + rgb_matrix_sethsv_noeeprom(HSV_WHITE); + } + glint_cnt++; + if (glint_cnt >= 30) { + glint_cnt = 0; + while_test_flag = false; + rgb_matrix_init(); + } + } + } else if (alarm_cnt != 0) { + alarm_cnt--; + if (alarm_cnt == 0) { + alarm_flag = true; + rgb_matrix_toggle_noeeprom(); + current_time = timer_read(); + } + } else if (alarm_flag) { + if ((timer_elapsed(current_time)) >= 50) { + rgb_matrix_toggle_noeeprom(); + alarm_flag = 0; + } + } +} + +void led_test(uint8_t color) { + rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR); + + switch (color) { + case WHITE: + rgb_matrix_sethsv_noeeprom(HSV_WHITE); + break; + + case RED: + rgb_matrix_sethsv_noeeprom(HSV_RED); + break; + + case GREEN: + rgb_matrix_sethsv_noeeprom(HSV_GREEN); + break; + + case BLUE: + rgb_matrix_sethsv_noeeprom(HSV_BLUE); + break; + } +} + +void clear_eeprom(void) { + if (default_layer_state & ((1<. + */ + +#pragma once + +/* Use 5 dynamic keymap layers */ +#define DYNAMIC_KEYMAP_LAYER_COUNT 6 + +/* Force NKRO on boot up regardless of the setting saved in the EEPROM (uncomment to enable it) */ + #define FORCE_NKRO + + +/*encoder resolution */ +#define ENCODER_RESOLUTION 3 +//#define ENCODER_MAP_KEY_DELAY 20 + +/* DIP switch */ +#define DIP_SWITCH_PINS { A9 } + +/* LED Indicators */ +#define LED_CAPS_LOCK_PIN A15 +// #define LED_NUM_LOCK_PIN C10 +// #define LED_SCROLL_LOCK_PIN C11 +#define LED_MAC_OS_PIN C10 +#define LED_WIN_LOCK_PIN C11 + + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* SPI Config for spi flash*/ +#define SPI_DRIVER SPIDQ +#define SPI_SCK_PIN B3 +#define SPI_MOSI_PIN B5 +#define SPI_MISO_PIN B4 +#define SPI_MOSI_PAL_MODE 5 + +#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 +#define WEAR_LEVELING_BACKING_SIZE (8 * 1024) + +/* I2C Config for LED Driver */ +#define DRIVER_COUNT 2 +#define DRIVER_ADDR_1 0b1110100 +#define DRIVER_ADDR_2 0b1110111 +#define I2C1_OPMODE OPMODE_I2C +#define I2C1_CLOCK_SPEED 400000 /* 400000 */ + +#define DRIVER_1_LED_TOTAL 63 +#define DRIVER_2_LED_TOTAL 21 +#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL+22) + +#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +#define RGB_MATRIX_CENTER {112,32} + +#define RGB_TRIGGER_ON_KEYDOWN +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_MATRIX_KEYPRESSES +#define RGB_MATRIX_KEYRELEASES + +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +#define ENABLE_RGB_MATRIX_SOLID_COLOR // Static single hue, no speed support +#define ENABLE_RGB_MATRIX_BREATHING +#define ENABLE_RGB_MATRIX_CYCLE_ALL +#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +#define ENABLE_RGB_MATRIX_DUAL_BEACON +#define ENABLE_RGB_MATRIX_RAINBOW_BEACON +#define ENABLE_RGB_MATRIX_RAINDROPS +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +#define ENABLE_RGB_MATRIX_TYPING_HEATMAP +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +#define ENABLE_RGB_MATRIX_MULTISPLASH + +#define RGB_MATRIX_VAL_STEP 10 +#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 /* The maximum brightness level */ + +// #define DISABLE_5075_KEYCODES /*If you need to change or restore the default QMK button function, please open it*/ diff --git a/keyboards/akko/5075/halconf.h b/keyboards/akko/5075/halconf.h new file mode 100644 index 00000000000..2f64e65393a --- /dev/null +++ b/keyboards/akko/5075/halconf.h @@ -0,0 +1,23 @@ +/* Copyright (C) 2022 jonylee@hfd + * + * 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 + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#pragma once + +#define HAL_USE_I2C TRUE +#define HAL_USE_SPI TRUE +#define SPI_USE_WAIT TRUE +#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD + +#include_next diff --git a/keyboards/akko/5075/info.json b/keyboards/akko/5075/info.json new file mode 100644 index 00000000000..f46ff91d200 --- /dev/null +++ b/keyboards/akko/5075/info.json @@ -0,0 +1,122 @@ +{ + "keyboard_name": "Akko Keyboard", + "manufacturer": "Akko", + "url":"https://www.akkogear.com", + "maintainer": "jonylee@hfd", + "usb": { + "vid": "0xFFFE", + "pid": "0x000B", + "device_version": "1.0.3" + }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "encoder": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["C1","C2","C3","A0","A1","A2","A3","A4","A5","A6","A7","C4","C5","B0","B1","B2"], + "rows": ["B15", "C6", "C7", "C8", "C9", "A8"] + }, + "diode_direction": "ROW2COL", + "encoder": { + "rotary": [ + { "pin_a": "B14", "pin_b": "B13" } + ] + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 }, + { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0 }, + { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0 }, + { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0 }, + { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0 }, + { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0 }, + { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0 }, + { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0 }, + { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0 }, + { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0 }, + { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0 }, + { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0 }, + { "label": "Del", "matrix": [0, 13], "x": 14, "y": 0 }, + { "label": "Mute", "matrix": [0, 15], "x": 15.5, "y": 0 }, + { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 }, + { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 }, + { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 }, + { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 }, + { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 }, + { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 }, + { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 }, + { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 }, + { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.25 }, + { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.25 }, + { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.25 }, + { "label": "Bksp", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.25 }, + { "label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25 }, + { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 }, + { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 }, + { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 }, + { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 }, + { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25 }, + { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25 }, + { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25 }, + { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25 }, + { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25 }, + { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25 }, + { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25 }, + { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25 }, + { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25 }, + { "label": "|", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 }, + { "label": "PageUp", "matrix": [2, 15], "x": 15.5, "y": 2.25 }, + { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 }, + { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 }, + { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 }, + { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 }, + { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25 }, + { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25 }, + { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25 }, + { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25 }, + { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25 }, + { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25 }, + { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 }, + { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25 }, + { "label": ":", "matrix": [3, 12], "x": 12.75, "y": 3.25 }, + { "label": "Enter", "matrix": [3, 13], "w": 1.25, "x": 13.75, "y": 3.25 }, + { "label": "PageDn", "matrix": [3, 15], "x": 15.5, "y": 3.25 }, + { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 }, + { "label": ":", "matrix": [4, 11], "x": 1.25, "y": 4.25 }, + { "label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25 }, + { "label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25 }, + { "label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25 }, + { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25 }, + { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25 }, + { "label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25 }, + { "label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25 }, + { "label": "<", "matrix": [4, 8], "x": 9.25, "y": 4.25 }, + { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 }, + { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 }, + { "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 }, + { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.25 }, + { "label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25 }, + { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 }, + { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 }, + { "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 }, + { "label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 5.25 }, + { "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25 }, + { "label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25 }, + { "label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25 }, + { "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.25 }, + { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.25 }, + { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.25 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/akko/5075/keymaps/default/keymap.c b/keyboards/akko/5075/keymaps/default/keymap.c new file mode 100644 index 00000000000..26b1e5fe293 --- /dev/null +++ b/keyboards/akko/5075/keymaps/default/keymap.c @@ -0,0 +1,121 @@ +/* Copyright (C) 2022 jonylee@hfd + * + * 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 + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H +// clang-format off +enum __layers { + WIN_B, + WIN_W, + WIN_FN, + MAC_B, + MAC_W, + MAC_FN +}; +enum custom_keycodes { + ENC_VAI = SAFE_RANGE, + ENC_VAD +}; + +#define KC_TASK LGUI(KC_TAB) +#define KC_FLXP LGUI(KC_E) + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [WIN_B] = LAYOUT( /* Base */ + KC_ESC, 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_DEL, KC_MUTE, + KC_GRV, 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_HOME, + 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_PGUP, + 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_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NUBS, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [WIN_W] = LAYOUT( /* Base */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D), + + + + [WIN_FN] = LAYOUT( /* FN */ + _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, RGB_MOD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, + _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______, RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, RGB_VAI, _______, + _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), + + [MAC_B] = LAYOUT( /* Base */ + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,KC_VOLU, KC_DEL, KC_MUTE, + KC_GRV, 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_HOME, + 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_PGUP, + 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_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NUBS, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [MAC_W] = LAYOUT( /* Base */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D), + + [MAC_FN] = LAYOUT( /* FN */ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_MOD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, + _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______,RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), +}; +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [WIN_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [WIN_FN] = { ENCODER_CCW_CW(ENC_VAI, ENC_VAD) }, + [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [MAC_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [MAC_FN] = { ENCODER_CCW_CW(ENC_VAI, ENC_VAD) } +}; +#endif + +// clang-format on + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case ENC_VAI: + if (record->event.pressed){ + if(rgb_matrix_get_val() < RGB_MATRIX_MAXIMUM_BRIGHTNESS){ + rgb_matrix_config.hsv.v = rgb_matrix_get_val() + RGB_MATRIX_VAL_STEP; + rgb_matrix_sethsv(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v); + } + } + return false; + case ENC_VAD: + if (record->event.pressed){ + if(rgb_matrix_get_val() > 0){ + rgb_matrix_config.hsv.v = rgb_matrix_get_val() - RGB_MATRIX_VAL_STEP; + rgb_matrix_sethsv(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v); + } + } + return false; + } + return true; +} diff --git a/keyboards/akko/5075/keymaps/via/keymap.c b/keyboards/akko/5075/keymaps/via/keymap.c new file mode 100644 index 00000000000..26b1e5fe293 --- /dev/null +++ b/keyboards/akko/5075/keymaps/via/keymap.c @@ -0,0 +1,121 @@ +/* Copyright (C) 2022 jonylee@hfd + * + * 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 + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H +// clang-format off +enum __layers { + WIN_B, + WIN_W, + WIN_FN, + MAC_B, + MAC_W, + MAC_FN +}; +enum custom_keycodes { + ENC_VAI = SAFE_RANGE, + ENC_VAD +}; + +#define KC_TASK LGUI(KC_TAB) +#define KC_FLXP LGUI(KC_E) + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [WIN_B] = LAYOUT( /* Base */ + KC_ESC, 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_DEL, KC_MUTE, + KC_GRV, 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_HOME, + 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_PGUP, + 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_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NUBS, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [WIN_W] = LAYOUT( /* Base */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D), + + + + [WIN_FN] = LAYOUT( /* FN */ + _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, RGB_MOD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, + _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______, RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, RGB_VAI, _______, + _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), + + [MAC_B] = LAYOUT( /* Base */ + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,KC_VOLU, KC_DEL, KC_MUTE, + KC_GRV, 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_HOME, + 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_PGUP, + 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_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NUBS, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [MAC_W] = LAYOUT( /* Base */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D), + + [MAC_FN] = LAYOUT( /* FN */ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_MOD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, + _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______,RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), +}; +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [WIN_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [WIN_FN] = { ENCODER_CCW_CW(ENC_VAI, ENC_VAD) }, + [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [MAC_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [MAC_FN] = { ENCODER_CCW_CW(ENC_VAI, ENC_VAD) } +}; +#endif + +// clang-format on + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case ENC_VAI: + if (record->event.pressed){ + if(rgb_matrix_get_val() < RGB_MATRIX_MAXIMUM_BRIGHTNESS){ + rgb_matrix_config.hsv.v = rgb_matrix_get_val() + RGB_MATRIX_VAL_STEP; + rgb_matrix_sethsv(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v); + } + } + return false; + case ENC_VAD: + if (record->event.pressed){ + if(rgb_matrix_get_val() > 0){ + rgb_matrix_config.hsv.v = rgb_matrix_get_val() - RGB_MATRIX_VAL_STEP; + rgb_matrix_sethsv(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v); + } + } + return false; + } + return true; +} diff --git a/keyboards/akko/5075/keymaps/via/rules.mk b/keyboards/akko/5075/keymaps/via/rules.mk new file mode 100644 index 00000000000..4253f570f0b --- /dev/null +++ b/keyboards/akko/5075/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/akko/5075/mcuconf.h b/keyboards/akko/5075/mcuconf.h new file mode 100644 index 00000000000..0d16f4f04e4 --- /dev/null +++ b/keyboards/akko/5075/mcuconf.h @@ -0,0 +1,24 @@ +/* Copyright (C) 2022 jonylee@hfd + * + * 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 + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#pragma once + +#include_next + +#undef WB32_SPI_USE_QSPI +#define WB32_SPI_USE_QSPI TRUE + +#undef WB32_I2C_USE_I2C1 +#define WB32_I2C_USE_I2C1 TRUE diff --git a/keyboards/akko/5075/readme.md b/keyboards/akko/5075/readme.md new file mode 100644 index 00000000000..2bcda979727 --- /dev/null +++ b/keyboards/akko/5075/readme.md @@ -0,0 +1,19 @@ +# 5075 + +A customizable 75% encoder keyboard. + +* Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986) +* Hardware Supported: 5075 +* Hardware Availability: [monsgeek](https://www.akkogear.com/) + +Make example for this keyboard (after setting up your build environment): + + make akko/5075:default + +Flashing example for this keyboard: + + make akko/5075:default:flash + +**Reset Key**: Hold down the key located at *K00*, which programmed as *Esc* while plugging in the keyboard. + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/akko/5075/rgb_matrix_kb.inc b/keyboards/akko/5075/rgb_matrix_kb.inc new file mode 100644 index 00000000000..56e2bd31cbb --- /dev/null +++ b/keyboards/akko/5075/rgb_matrix_kb.inc @@ -0,0 +1,51 @@ +// !!! DO NOT ADD #pragma once !!! // + +// Step 1. +// Declare custom effects using the RGB_MATRIX_EFFECT macro +// (note the lack of semicolon after the macro!) + +RGB_MATRIX_EFFECT(turn_off_rgb) +RGB_MATRIX_EFFECT(kb_reset_rgb) + +// Step 2. +// Define effects inside the `RGB_MATRIX_CUSTOM_EFFECT_IMPLS` ifdef block + +#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS + +// e.g: A simple effect, self-contained within a single method +static bool turn_off_rgb(effect_params_t *params) { + RGB_MATRIX_USE_LIMITS(led_min, led_max); + for (uint8_t i = led_min; i < led_max; i++) { + rgb_matrix_set_color(i, 0x00, 0x00, 0x00); + } + return rgb_matrix_check_finished_leds(led_max); +} + +// e.g: A more complex effect, relying on external methods and state, with +// dedicated init and run methods +static uint8_t some_global_state; +static void kb_reset_rgb_init(effect_params_t* params) { + some_global_state = 0; +} +static bool kb_reset_rgb_run(effect_params_t* params) { + RGB_MATRIX_USE_LIMITS(led_min, led_max); + some_global_state++; + if(some_global_state&0x01){ + for (uint8_t i = led_min; i < led_max; i++) + rgb_matrix_set_color(i, 0, 0, 0); + } + else{ + for (uint8_t i = led_min; i < led_max; i++) + rgb_matrix_set_color(i, 0xc0, 0xc0, 0xc0); + } + if(some_global_state>=7) + rgb_matrix_init(); + return rgb_matrix_check_finished_leds(led_max); +} + +static bool kb_reset_rgb(effect_params_t* params) { + if (params->init) kb_reset_rgb_init(params); + return kb_reset_rgb_run(params); +} + +#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS diff --git a/keyboards/akko/5075/rules.mk b/keyboards/akko/5075/rules.mk new file mode 100644 index 00000000000..8146b05676d --- /dev/null +++ b/keyboards/akko/5075/rules.mk @@ -0,0 +1,28 @@ +# MCU name +MCU = WB32FQ95 + +# Bootloader selection +BOOTLOADER = wb32-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +KEYBOARD_SHARED_EP = no +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = yes +DIP_SWITCH_ENABLE = yes # DPI Switch +RGB_MATRIX_ENABLE = yes +RGB_MATRIX_DRIVER = IS31FL3733 +EEPROM_DRIVER = wear_leveling +WEAR_LEVELING_DRIVER = spi_flash +#RGB_MATRIX_CUSTOM_USER = yes #Add turnoff LED + + From 0786de93d7f8fe978551d4140180f3b82370ec03 Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Tue, 25 Apr 2023 15:56:15 +0800 Subject: [PATCH 02/71] add 5075 keyboard --- keyboards/akko/5075/keymaps/via/rules.mk | 1 - keyboards/akko/5075/rgb_matrix_kb.inc | 51 ------------------------ keyboards/akko/5075/rules.mk | 22 +--------- 3 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 keyboards/akko/5075/rgb_matrix_kb.inc diff --git a/keyboards/akko/5075/keymaps/via/rules.mk b/keyboards/akko/5075/keymaps/via/rules.mk index 4253f570f0b..1e5b99807cb 100644 --- a/keyboards/akko/5075/keymaps/via/rules.mk +++ b/keyboards/akko/5075/keymaps/via/rules.mk @@ -1,2 +1 @@ VIA_ENABLE = yes -ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/akko/5075/rgb_matrix_kb.inc b/keyboards/akko/5075/rgb_matrix_kb.inc deleted file mode 100644 index 56e2bd31cbb..00000000000 --- a/keyboards/akko/5075/rgb_matrix_kb.inc +++ /dev/null @@ -1,51 +0,0 @@ -// !!! DO NOT ADD #pragma once !!! // - -// Step 1. -// Declare custom effects using the RGB_MATRIX_EFFECT macro -// (note the lack of semicolon after the macro!) - -RGB_MATRIX_EFFECT(turn_off_rgb) -RGB_MATRIX_EFFECT(kb_reset_rgb) - -// Step 2. -// Define effects inside the `RGB_MATRIX_CUSTOM_EFFECT_IMPLS` ifdef block - -#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS - -// e.g: A simple effect, self-contained within a single method -static bool turn_off_rgb(effect_params_t *params) { - RGB_MATRIX_USE_LIMITS(led_min, led_max); - for (uint8_t i = led_min; i < led_max; i++) { - rgb_matrix_set_color(i, 0x00, 0x00, 0x00); - } - return rgb_matrix_check_finished_leds(led_max); -} - -// e.g: A more complex effect, relying on external methods and state, with -// dedicated init and run methods -static uint8_t some_global_state; -static void kb_reset_rgb_init(effect_params_t* params) { - some_global_state = 0; -} -static bool kb_reset_rgb_run(effect_params_t* params) { - RGB_MATRIX_USE_LIMITS(led_min, led_max); - some_global_state++; - if(some_global_state&0x01){ - for (uint8_t i = led_min; i < led_max; i++) - rgb_matrix_set_color(i, 0, 0, 0); - } - else{ - for (uint8_t i = led_min; i < led_max; i++) - rgb_matrix_set_color(i, 0xc0, 0xc0, 0xc0); - } - if(some_global_state>=7) - rgb_matrix_init(); - return rgb_matrix_check_finished_leds(led_max); -} - -static bool kb_reset_rgb(effect_params_t* params) { - if (params->init) kb_reset_rgb_init(params); - return kb_reset_rgb_run(params); -} - -#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS diff --git a/keyboards/akko/5075/rules.mk b/keyboards/akko/5075/rules.mk index 8146b05676d..848ebc02ada 100644 --- a/keyboards/akko/5075/rules.mk +++ b/keyboards/akko/5075/rules.mk @@ -1,28 +1,10 @@ -# MCU name -MCU = WB32FQ95 - -# Bootloader selection -BOOTLOADER = wb32-dfu - # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -KEYBOARD_SHARED_EP = no -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -DIP_SWITCH_ENABLE = yes # DPI Switch -RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = IS31FL3733 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = spi_flash -#RGB_MATRIX_CUSTOM_USER = yes #Add turnoff LED +ENCODER_MAP_ENABLE = yes +#RGB_MATRIX_CUSTOM_KB = yes #Add turnoff LED From 3769919213ada1320f5f0bc978ba84c1590da4c4 Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Tue, 25 Apr 2023 15:57:06 +0800 Subject: [PATCH 03/71] update readme.md --- keyboards/akko/5075/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/readme.md b/keyboards/akko/5075/readme.md index 2bcda979727..20be0b41ada 100644 --- a/keyboards/akko/5075/readme.md +++ b/keyboards/akko/5075/readme.md @@ -4,7 +4,7 @@ A customizable 75% encoder keyboard. * Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986) * Hardware Supported: 5075 -* Hardware Availability: [monsgeek](https://www.akkogear.com/) +* Hardware Availability: [akko](https://www.akkogear.com/) Make example for this keyboard (after setting up your build environment): From 0abcf3cf1cd23453f15e2cce86c10e4e6420b404 Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Tue, 25 Apr 2023 17:40:01 +0800 Subject: [PATCH 04/71] update info.json --- keyboards/akko/5075/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/info.json b/keyboards/akko/5075/info.json index f46ff91d200..0dfcabc70e4 100644 --- a/keyboards/akko/5075/info.json +++ b/keyboards/akko/5075/info.json @@ -29,7 +29,7 @@ ] }, "layouts": { - "LAYOUT_all": { + "LAYOUT": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 }, From 68b7f695acee2edada3992088cacb13b4df3a106 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 26 Apr 2023 09:27:06 +0800 Subject: [PATCH 05/71] Update keyboards/akko/5075/rules.mk Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com> --- keyboards/akko/5075/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/akko/5075/rules.mk b/keyboards/akko/5075/rules.mk index 848ebc02ada..1276b73592e 100644 --- a/keyboards/akko/5075/rules.mk +++ b/keyboards/akko/5075/rules.mk @@ -4,7 +4,6 @@ RGB_MATRIX_DRIVER = IS31FL3733 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = spi_flash -ENCODER_MAP_ENABLE = yes #RGB_MATRIX_CUSTOM_KB = yes #Add turnoff LED From b7b75e563cea9b179c02064bf61950445279875d Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 26 Apr 2023 09:27:27 +0800 Subject: [PATCH 06/71] Update keyboards/akko/5075/keymaps/via/rules.mk Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com> --- keyboards/akko/5075/keymaps/via/rules.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/akko/5075/keymaps/via/rules.mk b/keyboards/akko/5075/keymaps/via/rules.mk index 1e5b99807cb..f1adcab005e 100644 --- a/keyboards/akko/5075/keymaps/via/rules.mk +++ b/keyboards/akko/5075/keymaps/via/rules.mk @@ -1 +1,2 @@ VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes From b262e2be09aa761309b67cf1c2f2cebdf83ebde7 Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Wed, 26 Apr 2023 09:35:39 +0800 Subject: [PATCH 07/71] update info.json andadd keymap/default/rules.mk --- keyboards/akko/5075/info.json | 2 ++ keyboards/akko/5075/keymaps/default/rules.mk | 1 + 2 files changed, 3 insertions(+) create mode 100644 keyboards/akko/5075/keymaps/default/rules.mk diff --git a/keyboards/akko/5075/info.json b/keyboards/akko/5075/info.json index 0dfcabc70e4..f31b4a2649b 100644 --- a/keyboards/akko/5075/info.json +++ b/keyboards/akko/5075/info.json @@ -8,6 +8,8 @@ "pid": "0x000B", "device_version": "1.0.3" }, + "processor": "WB32FQ95", + "bootloader": "wb32-dfu", "features": { "bootmagic": true, "mousekey": false, diff --git a/keyboards/akko/5075/keymaps/default/rules.mk b/keyboards/akko/5075/keymaps/default/rules.mk new file mode 100644 index 00000000000..ee325681483 --- /dev/null +++ b/keyboards/akko/5075/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes From ab391abee9579039dc54f51297310006750e17af Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Wed, 26 Apr 2023 10:09:13 +0800 Subject: [PATCH 08/71] update info.json --- keyboards/akko/5075/info.json | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/akko/5075/info.json b/keyboards/akko/5075/info.json index f31b4a2649b..12c5c34c0c9 100644 --- a/keyboards/akko/5075/info.json +++ b/keyboards/akko/5075/info.json @@ -18,6 +18,7 @@ "command": false, "nkro": true, "encoder": true, + "dip_switch": true, "rgb_matrix": true }, "matrix_pins": { From 2664dc0a834b0a93b54ed5d058f34c54cb333ffb Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Fri, 26 May 2023 11:20:14 +0800 Subject: [PATCH 09/71] Move code to info.json,and removed redundant features --- keyboards/akko/5075/5075.c | 418 +------------------ keyboards/akko/5075/config.h | 39 +- keyboards/akko/5075/info.json | 150 ++++++- keyboards/akko/5075/keymaps/default/keymap.c | 35 +- keyboards/akko/5075/keymaps/via/keymap.c | 35 +- keyboards/akko/5075/rules.mk | 4 - 6 files changed, 161 insertions(+), 520 deletions(-) diff --git a/keyboards/akko/5075/5075.c b/keyboards/akko/5075/5075.c index 44de320fec6..533b194e78e 100644 --- a/keyboards/akko/5075/5075.c +++ b/keyboards/akko/5075/5075.c @@ -18,9 +18,6 @@ // clang-format off #ifdef RGB_MATRIX_ENABLE -static uint16_t map_current_time = 0; -static bool pwron_flag = false; - const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver @@ -145,141 +142,6 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { {1, J_11, K_11, L_11}, }; -led_config_t g_led_config = { - { - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, NO_LED, NO_LED}, - { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, NO_LED, 28}, - { 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, NO_LED, 43}, - { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, NO_LED, 58}, - { 59, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 60, NO_LED, 71, 72, 73}, - { 74, 75, 76, NO_LED, NO_LED, 77, NO_LED, NO_LED, NO_LED, 78, 79, 80, NO_LED, 81, 82, 83} - }, - { - { 0, 0}, // 0 - { 14, 0}, // 1 - { 29, 0}, // 2 - { 44, 0}, // 3 - { 59, 0}, // 4 - { 74, 0}, // 5 - { 89, 0}, // 6 - {104, 0}, // 7 - {119, 0}, // 8 - {134, 0}, // 9 - {149, 0}, // 10 - {164, 0}, // 11 - {179, 0}, // 12 - {194, 0}, // 13 - - { 0, 12}, // 14 - { 14, 12}, // 15 - { 28, 12}, // 16 - { 42, 12}, // 17 - { 56, 12}, // 18 - { 70, 12}, // 19 - { 84, 12}, // 20 - { 98, 12}, // 21 - {112, 12}, // 22 - {126, 12}, // 23 - {140, 12}, // 24 - {154, 12}, // 25 - {168, 12}, // 26 - {182, 12}, // 27 - {224, 12}, // 28 - - { 0, 25}, // 29 - { 14, 25}, // 30 - { 28, 25}, // 31 - { 42, 25}, // 32 - { 56, 25}, // 33 - { 70, 25}, // 34 - { 84, 25}, // 35 - { 98, 25}, // 36 - {112, 25}, // 37 - {126, 25}, // 38 - {140, 25}, // 39 - {154, 25}, // 40 - {168, 25}, // 41 - {182, 25}, // 42 - {224, 25}, // 43 - - { 0, 38}, // 29 - { 14, 38}, // 30 - { 28, 38}, // 31 - { 42, 38}, // 32 - { 56, 38}, // 33 - { 70, 38}, // 34 - { 84, 38}, // 35 - { 98, 38}, // 36 - {112, 38}, // 37 - {126, 38}, // 38 - {140, 38}, // 39 - {154, 38}, // 40 - {168, 38}, // 41 - {182, 38}, // 42 - {224, 38}, // 43 - - { 0, 51}, // 29 - { 14, 51}, // 30 - { 28, 51}, // 31 - { 42, 51}, // 32 - { 56, 51}, // 33 - { 70, 51}, // 34 - { 84, 51}, // 35 - { 98, 51}, // 36 - {112, 51}, // 37 - {126, 51}, // 38 - {140, 51}, // 39 - {154, 51}, // 40 - {168, 51}, // 41 - {194, 51}, // 70 - {224, 51}, // 71 - - { 0, 64}, // 72 - { 14, 64}, // 73 - { 28, 64}, // 74 - { 84, 64}, // 75 - {140, 64}, // 76 - {154, 64}, // 77 - {168, 64}, // 78 - {182, 64}, // 80 - {194, 64}, // 81 - {224, 64}, // 82 - - {0, 0}, // 68 LED 1 - {0, 6}, // 69 LED 2 - {0, 13}, // 70 LED 3 - {0, 19}, // 71 LED 4 - {0, 25}, // 72 LED 5 - {0, 32}, // 73 LED 6 - {0, 38}, // 74 LED 7 - {0, 45}, // 75 LED 8 - {0, 51}, // 73 LED 9 - {0, 57}, // 74 LED 10 - {0, 64}, // 75 LED 11 - - {224, 0 }, // 78 LED 12 - {224, 6 }, // 79 LED 13 - {224, 13}, // 80 LED 14 - {224, 19}, // 81 LED 15 - {224, 25}, // 82 LED 16 - {224, 32}, // 83 LED 17 - {224, 38}, // 84 LED 18 - {224, 45}, // 82 LED 19 - {224, 51}, // 83 LED 20 - {224, 57}, // 84 LED 21 - {224, 64} // 85 LED 22 - }, - { - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 - } -}; #endif enum __layers { @@ -290,34 +152,8 @@ enum __layers { MAC_W, MAC_FN }; -enum colors { - WHITE, - RED, - GREEN, - BLUE -}; -enum colors led_color_status = WHITE; // clang-format on -static bool Lkey_flag = false; -static bool reset_glint_flag = false; -static bool while_test_flag = false; -static bool alarm_flag = false; -static uint16_t current_time = 0; -static uint8_t glint_cnt = 0; -static uint16_t scancode = 0; -static uint8_t alarm_cnt = 0; - -#ifndef DISABLE_M1_KEYCODES -static uint8_t RGB_HSV_level; -static bool fn_make_flag = false; -#endif - -HSV hsv; - -void led_test(uint8_t color); -void clear_eeprom(void); - void led_init_ports(void) { // set our LED pings as output setPinOutput(LED_CAPS_LOCK_PIN); // LED1 Num Lock @@ -371,70 +207,14 @@ bool dip_switch_update_kb(uint8_t index, bool active) { return true; } -bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { - if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) { - return false; - } - keyboard_post_init_user(); - if (pwron_flag == false) { - map_current_time = timer_read(); - if (map_current_time < 3000) { - map_current_time++; - rgb_matrix_set_color_all(150, 150, 150); - } - if (map_current_time >= 3000) { - pwron_flag = true; - if (!rgb_matrix_get_flags()) { - rgb_matrix_set_flags(LED_FLAG_NONE); - rgb_matrix_set_color_all(0, 0, 0); - } else { - rgb_matrix_set_flags(LED_FLAG_ALL); - } - } - } - return true; -} - bool process_record_kb(uint16_t keycode, keyrecord_t *record) { if (!process_record_user(keycode, record)) { return false; } switch (keycode) { #ifndef DISABLE_5075_KEYCODES - case MO(WIN_FN): - case MO(MAC_FN): - fn_make_flag = record->event.pressed; - return true; - case KC_GRV: - if (fn_make_flag && record->event.pressed) { - Lkey_flag = true; - current_time = timer_read(); - scancode = KC_GRV; - return false; - } else { - Lkey_flag = 0; - } - return true; - case KC_LCTL: - if (fn_make_flag && record->event.pressed) { - if (while_test_flag) { - while_test_flag = false; - rgb_matrix_init(); - } else { - Lkey_flag = true; - current_time = timer_read(); - scancode = KC_LCTL; - } - return false; - } else { - Lkey_flag = 0; - } - return true; case TG(WIN_W): - if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { - alarm_flag = true; - rgb_matrix_toggle_noeeprom(); - current_time = timer_read(); + if (record->event.pressed) { if (layer_state_cmp(default_layer_state, WIN_W)) { set_single_persistent_default_layer(WIN_B); layer_off(WIN_W); @@ -445,10 +225,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { } return false; case TG(MAC_W): - if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { - alarm_flag = true; - rgb_matrix_toggle_noeeprom(); - current_time = timer_read(); + if (record->event.pressed) { if (layer_state_cmp(default_layer_state, MAC_W)) { set_single_persistent_default_layer(MAC_B); layer_off(MAC_W); @@ -459,79 +236,10 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { } return false; case GU_TOGG: - if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { - alarm_flag = true; - rgb_matrix_toggle_noeeprom(); - current_time = timer_read(); + if (record->event.pressed) { writePin(LED_WIN_LOCK_PIN, !keymap_config.no_gui); } return true; - case RGB_HUI: - if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { - RGB_HSV_level = ((uint8_t)rgb_matrix_get_hue() / (UINT8_MAX / 6) + 1) % 7; - rgb_matrix_config.hsv.h = (uint8_t)(UINT8_MAX / 6) * RGB_HSV_level; - } - rgb_matrix_sethsv(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v); - - return false; - case RGB_VAI: - if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { - if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_val() / (RGB_MATRIX_MAXIMUM_BRIGHTNESS / 4)) < 4) { - alarm_cnt = 2; - RGB_HSV_level++; - rgb_matrix_config.hsv.v = (uint8_t)(RGB_MATRIX_MAXIMUM_BRIGHTNESS / 4) * RGB_HSV_level; - } - rgb_matrix_sethsv(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v); - } - return false; - case RGB_VAD: - if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { - if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_val() / (RGB_MATRIX_MAXIMUM_BRIGHTNESS / 4)) > 0) { - alarm_cnt = 2; - RGB_HSV_level--; - rgb_matrix_config.hsv.v = (uint8_t)(RGB_MATRIX_MAXIMUM_BRIGHTNESS / 4) * RGB_HSV_level; - } - rgb_matrix_sethsv(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v); - } - return false; - case RGB_SAI: - if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { - if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_sat() / (UINT8_MAX / 4)) < 4) { - RGB_HSV_level++; - rgb_matrix_config.hsv.s = (uint8_t)(UINT8_MAX / 4) * RGB_HSV_level; - alarm_cnt = 2; - } - rgb_matrix_sethsv(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v); - } - return false; - case RGB_SAD: - if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { - if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_sat() / (UINT8_MAX / 4)) > 0) { - RGB_HSV_level--; - rgb_matrix_config.hsv.s = (uint8_t)(UINT8_MAX / 4) * RGB_HSV_level; - alarm_cnt = 2; - } - rgb_matrix_sethsv(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v); - } - return false; - case RGB_SPI: - if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { - if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_speed() / (UINT8_MAX / 4)) < 4) { - alarm_cnt = 2; - RGB_HSV_level++; - rgb_matrix_set_speed((uint8_t)(UINT8_MAX / 4) * RGB_HSV_level); - } - } - return false; - case RGB_SPD: - if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { - if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_speed() / (UINT8_MAX / 4)) > 0) { - alarm_cnt = 2; - RGB_HSV_level--; - rgb_matrix_set_speed((uint8_t)(UINT8_MAX / 4) * RGB_HSV_level); - } - } - return false; case RGB_TOG: if (record->event.pressed) { switch (rgb_matrix_get_flags()) { @@ -553,123 +261,3 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return true; } } - -void housekeeping_task_kb(void) { - if (Lkey_flag) { - if (scancode == KC_GRV) { - if (timer_elapsed(current_time) >= 3000) { - Lkey_flag = false; - clear_eeprom(); - - current_time = timer_read(); - reset_glint_flag = true; - glint_cnt = 0; - rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR); - rgb_matrix_sethsv_noeeprom(HSV_OFF); - } - } else if (scancode == KC_LCTL) { - if (timer_elapsed(current_time) >= 3000) { - Lkey_flag = false; - clear_eeprom(); - - while_test_flag = true; - glint_cnt = 0; - rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR); - rgb_matrix_sethsv_noeeprom(HSV_WHITE); - } - } - } else if (reset_glint_flag) { - if ((timer_elapsed(current_time)) >= 300) { - current_time = timer_read(); - if (((glint_cnt++) & 0x01) == 0) { - rgb_matrix_sethsv_noeeprom(HSV_WHITE); - } else { - rgb_matrix_sethsv_noeeprom(HSV_OFF); - } - if (glint_cnt >= 3) { - glint_cnt = 0; - reset_glint_flag = false; - rgb_matrix_init(); - } - } - - } else if (while_test_flag) { - if ((timer_elapsed(current_time)) >= 1000) { - current_time = timer_read(); - if ((glint_cnt % 4) == 0) { - rgb_matrix_sethsv_noeeprom(HSV_RED); - } else if ((glint_cnt % 4) == 1) { - rgb_matrix_sethsv_noeeprom(HSV_GREEN); - } else if ((glint_cnt % 4) == 2) { - rgb_matrix_sethsv_noeeprom(HSV_BLUE); - } else if ((glint_cnt % 4) == 3) { - rgb_matrix_sethsv_noeeprom(HSV_WHITE); - } - glint_cnt++; - if (glint_cnt >= 30) { - glint_cnt = 0; - while_test_flag = false; - rgb_matrix_init(); - } - } - } else if (alarm_cnt != 0) { - alarm_cnt--; - if (alarm_cnt == 0) { - alarm_flag = true; - rgb_matrix_toggle_noeeprom(); - current_time = timer_read(); - } - } else if (alarm_flag) { - if ((timer_elapsed(current_time)) >= 50) { - rgb_matrix_toggle_noeeprom(); - alarm_flag = 0; - } - } -} - -void led_test(uint8_t color) { - rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR); - - switch (color) { - case WHITE: - rgb_matrix_sethsv_noeeprom(HSV_WHITE); - break; - - case RED: - rgb_matrix_sethsv_noeeprom(HSV_RED); - break; - - case GREEN: - rgb_matrix_sethsv_noeeprom(HSV_GREEN); - break; - - case BLUE: - rgb_matrix_sethsv_noeeprom(HSV_BLUE); - break; - } -} - -void clear_eeprom(void) { - if (default_layer_state & ((1<event.pressed){ - if(rgb_matrix_get_val() < RGB_MATRIX_MAXIMUM_BRIGHTNESS){ - rgb_matrix_config.hsv.v = rgb_matrix_get_val() + RGB_MATRIX_VAL_STEP; - rgb_matrix_sethsv(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v); - } - } - return false; - case ENC_VAD: - if (record->event.pressed){ - if(rgb_matrix_get_val() > 0){ - rgb_matrix_config.hsv.v = rgb_matrix_get_val() - RGB_MATRIX_VAL_STEP; - rgb_matrix_sethsv(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v); - } - } - return false; - } - return true; -} diff --git a/keyboards/akko/5075/keymaps/via/keymap.c b/keyboards/akko/5075/keymaps/via/keymap.c index 26b1e5fe293..be19d1ecb0e 100644 --- a/keyboards/akko/5075/keymaps/via/keymap.c +++ b/keyboards/akko/5075/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2022 jonylee@hfd +/* Copyright (C) 2023 jonylee@hfd * * 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 @@ -24,15 +24,9 @@ enum __layers { MAC_W, MAC_FN }; -enum custom_keycodes { - ENC_VAI = SAFE_RANGE, - ENC_VAD -}; - #define KC_TASK LGUI(KC_TAB) #define KC_FLXP LGUI(KC_E) - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [WIN_B] = LAYOUT( /* Base */ @@ -89,33 +83,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [WIN_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [WIN_FN] = { ENCODER_CCW_CW(ENC_VAI, ENC_VAD) }, + [WIN_FN] = { ENCODER_CCW_CW(RGB_VAI, RGB_VAD) }, [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [MAC_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [MAC_FN] = { ENCODER_CCW_CW(ENC_VAI, ENC_VAD) } + [MAC_FN] = { ENCODER_CCW_CW(RGB_VAI, RGB_VAD) } }; #endif -// clang-format on - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case ENC_VAI: - if (record->event.pressed){ - if(rgb_matrix_get_val() < RGB_MATRIX_MAXIMUM_BRIGHTNESS){ - rgb_matrix_config.hsv.v = rgb_matrix_get_val() + RGB_MATRIX_VAL_STEP; - rgb_matrix_sethsv(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v); - } - } - return false; - case ENC_VAD: - if (record->event.pressed){ - if(rgb_matrix_get_val() > 0){ - rgb_matrix_config.hsv.v = rgb_matrix_get_val() - RGB_MATRIX_VAL_STEP; - rgb_matrix_sethsv(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v); - } - } - return false; - } - return true; -} diff --git a/keyboards/akko/5075/rules.mk b/keyboards/akko/5075/rules.mk index 1276b73592e..b861fb86dd7 100644 --- a/keyboards/akko/5075/rules.mk +++ b/keyboards/akko/5075/rules.mk @@ -1,9 +1,5 @@ # Build Options # change yes to no to disable # -RGB_MATRIX_DRIVER = IS31FL3733 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = spi_flash -#RGB_MATRIX_CUSTOM_KB = yes #Add turnoff LED - - From eed023ceeacbd843cea3e48cb3ccea1f122999ab Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Thu, 1 Jun 2023 10:47:31 +0800 Subject: [PATCH 10/71] Update info.json --- keyboards/akko/5075/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/akko/5075/info.json b/keyboards/akko/5075/info.json index c5a710b7829..589d8b5474c 100644 --- a/keyboards/akko/5075/info.json +++ b/keyboards/akko/5075/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Akko Keyboard", + "keyboard_name": "5075", "manufacturer": "Akko", "url":"https://www.akkogear.com", "maintainer": "jonylee@hfd", @@ -24,7 +24,7 @@ "rgb_matrix": true }, "matrix_pins": { - "cols": ["C1","C2","C3","A0","A1","A2","A3","A4","A5","A6","A7","C4","C5","B0","B1","B2"], + "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"], "rows": ["B15", "C6", "C7", "C8", "C9", "A8"] }, "diode_direction": "ROW2COL", @@ -270,4 +270,4 @@ ] } } -} \ No newline at end of file +} From 6898594d9bb506927acf0df8271defc9d15ac145 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Thu, 1 Jun 2023 10:48:42 +0800 Subject: [PATCH 11/71] Update keymap.c --- keyboards/akko/5075/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/keymaps/default/keymap.c b/keyboards/akko/5075/keymaps/default/keymap.c index be19d1ecb0e..68ef73024a0 100644 --- a/keyboards/akko/5075/keymaps/default/keymap.c +++ b/keyboards/akko/5075/keymaps/default/keymap.c @@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [WIN_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [WIN_FN] = { ENCODER_CCW_CW(RGB_VAI, RGB_VAD) }, From ca9b10397a90c93a90da6ce3b801327adba74e67 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Thu, 1 Jun 2023 10:49:04 +0800 Subject: [PATCH 12/71] Update keymap.c --- keyboards/akko/5075/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/keymaps/via/keymap.c b/keyboards/akko/5075/keymaps/via/keymap.c index be19d1ecb0e..68ef73024a0 100644 --- a/keyboards/akko/5075/keymaps/via/keymap.c +++ b/keyboards/akko/5075/keymaps/via/keymap.c @@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [WIN_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [WIN_FN] = { ENCODER_CCW_CW(RGB_VAI, RGB_VAD) }, From dbccad4c92860922ddb51100dc38eb85c6f14da8 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Fri, 9 Jun 2023 15:29:23 +0800 Subject: [PATCH 13/71] Update readme.md --- keyboards/akko/5075/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/readme.md b/keyboards/akko/5075/readme.md index 20be0b41ada..267ced4a452 100644 --- a/keyboards/akko/5075/readme.md +++ b/keyboards/akko/5075/readme.md @@ -3,7 +3,7 @@ A customizable 75% encoder keyboard. * Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986) -* Hardware Supported: 5075 +* Hardware Supported: Akko 5075 * Hardware Availability: [akko](https://www.akkogear.com/) Make example for this keyboard (after setting up your build environment): From 326f3bdaffa886ad5378b8372f80a1913d2bf307 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 9 Aug 2023 13:47:48 +0800 Subject: [PATCH 14/71] Update config.h --- keyboards/akko/5075/config.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/keyboards/akko/5075/config.h b/keyboards/akko/5075/config.h index b53f2275c41..5d5c2b7bfd8 100644 --- a/keyboards/akko/5075/config.h +++ b/keyboards/akko/5075/config.h @@ -16,7 +16,7 @@ #pragma once -/* Use 5 dynamic keymap layers */ +/* Use 6 dynamic keymap layers */ #define DYNAMIC_KEYMAP_LAYER_COUNT 6 /*encoder resolution */ @@ -26,9 +26,6 @@ #define DIP_SWITCH_PINS { A9 } /* LED Indicators */ -// #define LED_CAPS_LOCK_PIN A15 -// #define LED_NUM_LOCK_PIN C10 -// #define LED_SCROLL_LOCK_PIN C11 #define LED_MAC_OS_PIN C10 #define LED_WIN_LOCK_PIN C11 From 40cb160f1b2bd58b3657212f1c580eedebcd93f4 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Fri, 1 Sep 2023 11:11:19 +0800 Subject: [PATCH 15/71] Update info.json --- keyboards/akko/5075/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/akko/5075/info.json b/keyboards/akko/5075/info.json index 589d8b5474c..207d65f4a3f 100644 --- a/keyboards/akko/5075/info.json +++ b/keyboards/akko/5075/info.json @@ -8,7 +8,7 @@ "pid": "0x000B", "device_version": "1.0.3", "force_nkro": true, - "suspend_wakeup_delay": 400 + "suspend_wakeup_delay": 1000 }, "processor": "WB32FQ95", "bootloader": "wb32-dfu", @@ -37,7 +37,7 @@ "caps_lock": "A15" }, "rgb_matrix": { - "driver": "IS31FL3733", + "driver": "is31fl3733", "max_brightness": 180, "animations": { "breathing": true, From 4bd5619fbe04e6b39f0c5560a98b0abc6f65377a Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Fri, 15 Sep 2023 15:39:48 +0800 Subject: [PATCH 16/71] Update keyboards/akko/5075/keymaps/via/keymap.c Co-authored-by: Ryan --- keyboards/akko/5075/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/keymaps/via/keymap.c b/keyboards/akko/5075/keymaps/via/keymap.c index 68ef73024a0..88763116fc4 100644 --- a/keyboards/akko/5075/keymaps/via/keymap.c +++ b/keyboards/akko/5075/keymaps/via/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, 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_HOME, 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_PGUP, 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_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NUBS, KC_RSFT, KC_UP, KC_END, + 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_END, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_W] = LAYOUT( /* Base */ From 160f8b66a36eb13acc26920a3df6deaae4eb555a Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Fri, 15 Sep 2023 15:39:59 +0800 Subject: [PATCH 17/71] Update keyboards/akko/5075/keymaps/via/keymap.c Co-authored-by: Ryan --- keyboards/akko/5075/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/keymaps/via/keymap.c b/keyboards/akko/5075/keymaps/via/keymap.c index 88763116fc4..06bec1cda58 100644 --- a/keyboards/akko/5075/keymaps/via/keymap.c +++ b/keyboards/akko/5075/keymaps/via/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, 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_HOME, 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_PGUP, 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_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NUBS, KC_RSFT, KC_UP, KC_END, + 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_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_W] = LAYOUT( /* Base */ From a7bed10fc766a708e2a9919e20fc4a9c2cb33d1c Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Fri, 15 Sep 2023 15:40:06 +0800 Subject: [PATCH 18/71] Update keyboards/akko/5075/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/akko/5075/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/keymaps/default/keymap.c b/keyboards/akko/5075/keymaps/default/keymap.c index 68ef73024a0..88763116fc4 100644 --- a/keyboards/akko/5075/keymaps/default/keymap.c +++ b/keyboards/akko/5075/keymaps/default/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, 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_HOME, 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_PGUP, 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_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NUBS, KC_RSFT, KC_UP, KC_END, + 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_END, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_W] = LAYOUT( /* Base */ From b705098d640fe550c0ccf2020449750f107dfa83 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Fri, 15 Sep 2023 15:40:15 +0800 Subject: [PATCH 19/71] Update keyboards/akko/5075/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/akko/5075/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/keymaps/default/keymap.c b/keyboards/akko/5075/keymaps/default/keymap.c index 88763116fc4..06bec1cda58 100644 --- a/keyboards/akko/5075/keymaps/default/keymap.c +++ b/keyboards/akko/5075/keymaps/default/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, 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_HOME, 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_PGUP, 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_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NUBS, KC_RSFT, KC_UP, KC_END, + 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_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_W] = LAYOUT( /* Base */ From 95772d10e15b646681b507258f8d4c70217207cd Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 18 Sep 2023 12:15:49 +0800 Subject: [PATCH 20/71] Update keyboards/akko/5075/info.json Co-authored-by: Ryan --- keyboards/akko/5075/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/info.json b/keyboards/akko/5075/info.json index 207d65f4a3f..bb42e354fa4 100644 --- a/keyboards/akko/5075/info.json +++ b/keyboards/akko/5075/info.json @@ -55,7 +55,7 @@ "typing_heatmap": true, "solid_reactive_simple": true, "solid_reactive": true, - "solid_reactive_cross": true, + "solid_reactive_cross": true, "multisplash": true }, "layout":[ From b1ec5d8d6699de2aed1d0a6c670a3d1ba5460b34 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 18 Sep 2023 12:15:59 +0800 Subject: [PATCH 21/71] Update keyboards/akko/5075/5075.c Co-authored-by: Ryan --- keyboards/akko/5075/5075.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/5075.c b/keyboards/akko/5075/5075.c index 533b194e78e..d65251a28e1 100644 --- a/keyboards/akko/5075/5075.c +++ b/keyboards/akko/5075/5075.c @@ -18,7 +18,7 @@ // clang-format off #ifdef RGB_MATRIX_ENABLE -const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { +const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | R location From a000c40919f718264cbc842e9b0fb82391b8ee7c Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 18 Sep 2023 12:16:08 +0800 Subject: [PATCH 22/71] Update keyboards/akko/5075/info.json Co-authored-by: Ryan --- keyboards/akko/5075/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/info.json b/keyboards/akko/5075/info.json index bb42e354fa4..74099e67af7 100644 --- a/keyboards/akko/5075/info.json +++ b/keyboards/akko/5075/info.json @@ -37,7 +37,7 @@ "caps_lock": "A15" }, "rgb_matrix": { - "driver": "is31fl3733", + "driver": "ckled2001", "max_brightness": 180, "animations": { "breathing": true, From 8358e39f96aa8608ac5a7cfa9f86332f00322524 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 27 Sep 2023 10:59:42 +0800 Subject: [PATCH 23/71] Update keymap.c replace the tabs with spaces --- keyboards/akko/5075/keymaps/default/keymap.c | 72 ++++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/keyboards/akko/5075/keymaps/default/keymap.c b/keyboards/akko/5075/keymaps/default/keymap.c index 06bec1cda58..900ed980ab4 100644 --- a/keyboards/akko/5075/keymaps/default/keymap.c +++ b/keyboards/akko/5075/keymaps/default/keymap.c @@ -30,54 +30,54 @@ enum __layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [WIN_B] = LAYOUT( /* Base */ - KC_ESC, 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_DEL, KC_MUTE, - KC_GRV, 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_HOME, - 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_PGUP, - 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_PGDN, - 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_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + KC_ESC, 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_DEL, KC_MUTE, + KC_GRV, 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_HOME, + 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_PGUP, + 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_PGDN, + 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_W] = LAYOUT( /* Base */ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, - _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D), + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D), [WIN_FN] = LAYOUT( /* FN */ - _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, RGB_MOD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, - _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______, RGB_MOD, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, RGB_VAI, _______, - _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), + _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, RGB_MOD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, + _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______, RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, RGB_VAI, _______, + _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), [MAC_B] = LAYOUT( /* Base */ - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,KC_VOLU, KC_DEL, KC_MUTE, - KC_GRV, 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_HOME, - 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_PGUP, - 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_PGDN, - 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_END, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,KC_VOLU, KC_DEL, KC_MUTE, + KC_GRV, 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_HOME, + 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_PGUP, + 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_PGDN, + 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_END, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_W] = LAYOUT( /* Base */ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, - _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D), + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D), [MAC_FN] = LAYOUT( /* FN */ - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_MOD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, - _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______,RGB_MOD, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, RGB_VAI, _______, - _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_MOD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, + _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______,RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), }; #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { From 04918b02c5329d645d74731b99a0d02b0a244674 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 27 Sep 2023 11:00:10 +0800 Subject: [PATCH 24/71] Update keymap.c replace the tabs with spaces --- keyboards/akko/5075/keymaps/via/keymap.c | 72 ++++++++++++------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/keyboards/akko/5075/keymaps/via/keymap.c b/keyboards/akko/5075/keymaps/via/keymap.c index 06bec1cda58..900ed980ab4 100644 --- a/keyboards/akko/5075/keymaps/via/keymap.c +++ b/keyboards/akko/5075/keymaps/via/keymap.c @@ -30,54 +30,54 @@ enum __layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [WIN_B] = LAYOUT( /* Base */ - KC_ESC, 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_DEL, KC_MUTE, - KC_GRV, 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_HOME, - 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_PGUP, - 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_PGDN, - 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_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + KC_ESC, 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_DEL, KC_MUTE, + KC_GRV, 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_HOME, + 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_PGUP, + 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_PGDN, + 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_W] = LAYOUT( /* Base */ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, - _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D), + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D), [WIN_FN] = LAYOUT( /* FN */ - _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, RGB_MOD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, - _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______, RGB_MOD, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, RGB_VAI, _______, - _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), + _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, RGB_MOD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, + _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______, RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, RGB_VAI, _______, + _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), [MAC_B] = LAYOUT( /* Base */ - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,KC_VOLU, KC_DEL, KC_MUTE, - KC_GRV, 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_HOME, - 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_PGUP, - 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_PGDN, - 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_END, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,KC_VOLU, KC_DEL, KC_MUTE, + KC_GRV, 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_HOME, + 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_PGUP, + 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_PGDN, + 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_END, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_W] = LAYOUT( /* Base */ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, - _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D), + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D), [MAC_FN] = LAYOUT( /* FN */ - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_MOD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, - _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______,RGB_MOD, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, RGB_VAI, _______, - _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_MOD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, + _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______,RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), }; #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { From da18fe3f2b3a12c68dbe39ba98d056231dbb2e08 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 10 Oct 2023 10:09:45 +0800 Subject: [PATCH 25/71] Update keyboards/akko/5075/5075.c Co-authored-by: Drashna Jaelre --- keyboards/akko/5075/5075.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/keyboards/akko/5075/5075.c b/keyboards/akko/5075/5075.c index d65251a28e1..b7fa2be7509 100644 --- a/keyboards/akko/5075/5075.c +++ b/keyboards/akko/5075/5075.c @@ -164,15 +164,6 @@ void led_init_ports(void) { writePinLow(LED_WIN_LOCK_PIN); } -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - if (res) { - writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); - writePin(LED_MAC_OS_PIN, default_layer_state & ((1< Date: Tue, 10 Oct 2023 10:14:35 +0800 Subject: [PATCH 26/71] Update 5075.c --- keyboards/akko/5075/5075.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/keyboards/akko/5075/5075.c b/keyboards/akko/5075/5075.c index b7fa2be7509..3b7d87f7a42 100644 --- a/keyboards/akko/5075/5075.c +++ b/keyboards/akko/5075/5075.c @@ -164,6 +164,15 @@ void led_init_ports(void) { writePinLow(LED_WIN_LOCK_PIN); } +void housekeeping_task_kb(void) { + /* Execute every 1ms */ + static uint32_t last_time = 0; + if (timer_elapsed32(last_time) >= 1) { + last_time = timer_read32(); + writePin(LED_MAC_OS_PIN, default_layer_state & ((1< Date: Wed, 18 Oct 2023 11:01:58 +0800 Subject: [PATCH 27/71] Update keyboards/akko/5075/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/akko/5075/info.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/akko/5075/info.json b/keyboards/akko/5075/info.json index 74099e67af7..4786419ffa1 100644 --- a/keyboards/akko/5075/info.json +++ b/keyboards/akko/5075/info.json @@ -254,7 +254,7 @@ { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 }, { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 }, { "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 }, - { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.25 }, + { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.5 }, { "label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25 }, { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 }, @@ -264,9 +264,9 @@ { "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25 }, { "label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25 }, { "label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25 }, - { "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.25 }, - { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.25 }, - { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.25 } + { "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.5 }, + { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.5 }, + { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.5 } ] } } From 6a29e47223b391cb568f76270a3070158c2211e6 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 18 Oct 2023 11:02:07 +0800 Subject: [PATCH 28/71] Update keyboards/akko/5075/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/akko/5075/keymaps/default/keymap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/akko/5075/keymaps/default/keymap.c b/keyboards/akko/5075/keymaps/default/keymap.c index 900ed980ab4..476573af2ad 100644 --- a/keyboards/akko/5075/keymaps/default/keymap.c +++ b/keyboards/akko/5075/keymaps/default/keymap.c @@ -24,8 +24,6 @@ enum __layers { MAC_W, MAC_FN }; -#define KC_TASK LGUI(KC_TAB) -#define KC_FLXP LGUI(KC_E) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From f68f58c91625a388f67e42d02101610ff16f1a5d Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 18 Oct 2023 11:02:18 +0800 Subject: [PATCH 29/71] Update keyboards/akko/5075/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/akko/5075/keymaps/via/keymap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/akko/5075/keymaps/via/keymap.c b/keyboards/akko/5075/keymaps/via/keymap.c index 900ed980ab4..476573af2ad 100644 --- a/keyboards/akko/5075/keymaps/via/keymap.c +++ b/keyboards/akko/5075/keymaps/via/keymap.c @@ -24,8 +24,6 @@ enum __layers { MAC_W, MAC_FN }; -#define KC_TASK LGUI(KC_TAB) -#define KC_FLXP LGUI(KC_E) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From 9b1c82ec614ae53c1b74a11b7f44a8c980184293 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 18 Oct 2023 11:07:39 +0800 Subject: [PATCH 30/71] Update readme.md --- keyboards/akko/5075/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/readme.md b/keyboards/akko/5075/readme.md index 267ced4a452..b0b4a2c081b 100644 --- a/keyboards/akko/5075/readme.md +++ b/keyboards/akko/5075/readme.md @@ -14,6 +14,6 @@ Flashing example for this keyboard: make akko/5075:default:flash -**Reset Key**: Hold down the key located at *K00*, which programmed as *Esc* while plugging in the keyboard. +**Reset Key**: Hold down the top left key (commonly programmed as *Esc*) while plugging in the keyboard. See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From bc576f6c044fb921386691355af78d545522a777 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 18 Oct 2023 11:25:46 +0800 Subject: [PATCH 31/71] Update readme.md --- keyboards/akko/5075/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/akko/5075/readme.md b/keyboards/akko/5075/readme.md index b0b4a2c081b..e89603dc718 100644 --- a/keyboards/akko/5075/readme.md +++ b/keyboards/akko/5075/readme.md @@ -1,4 +1,5 @@ # 5075 +![5075](https://github.com/jonylee1986/qmk_firmware_master/assets/108282809/e2b46a2b-4ab5-48bd-90d2-7e8a7a841d7e) A customizable 75% encoder keyboard. From e0b0e4d04392885589674934f3586f1499422d61 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:57:23 +0800 Subject: [PATCH 32/71] Update info.json run qmk format-json --- keyboards/akko/5075/info.json | 460 +++++++++++++++++----------------- 1 file changed, 224 insertions(+), 236 deletions(-) diff --git a/keyboards/akko/5075/info.json b/keyboards/akko/5075/info.json index 4786419ffa1..f9d72439b46 100644 --- a/keyboards/akko/5075/info.json +++ b/keyboards/akko/5075/info.json @@ -1,272 +1,260 @@ { - "keyboard_name": "5075", "manufacturer": "Akko", - "url":"https://www.akkogear.com", + "keyboard_name": "5075", "maintainer": "jonylee@hfd", - "usb": { - "vid": "0xFFFE", - "pid": "0x000B", - "device_version": "1.0.3", - "force_nkro": true, - "suspend_wakeup_delay": 1000 - }, - "processor": "WB32FQ95", "bootloader": "wb32-dfu", + "diode_direction": "ROW2COL", + "encoder": { + "rotary": [ + {"pin_a": "B14", "pin_b": "B13"} + ] + }, "features": { "bootmagic": true, - "mousekey": false, - "extrakey": true, - "console": false, "command": false, - "nkro": true, - "encoder": true, + "console": false, "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, "rgb_matrix": true }, + "indicators": { + "caps_lock": "A15" + }, "matrix_pins": { "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"], "rows": ["B15", "C6", "C7", "C8", "C9", "A8"] }, - "diode_direction": "ROW2COL", - "encoder": { - "rotary": [ - { "pin_a": "B14", "pin_b": "B13" } - ] - }, - "indicators": { - "caps_lock": "A15" - }, + "processor": "WB32FQ95", "rgb_matrix": { - "driver": "ckled2001", - "max_brightness": 180, "animations": { "breathing": true, "cycle_all": true, "cycle_left_right": true, - "cycle_up_down": true, - "rainbow_moving_chevron": true, "cycle_out_in": true, "cycle_out_in_dual": true, "cycle_pinwheel": true, "cycle_spiral": true, + "cycle_up_down": true, "dual_beacon": true, + "multisplash": true, "rainbow_beacon": true, + "rainbow_moving_chevron": true, "raindrops": true, - "typing_heatmap": true, - "solid_reactive_simple": true, "solid_reactive": true, "solid_reactive_cross": true, - "multisplash": true + "solid_reactive_simple": true, + "typing_heatmap": true }, - "layout":[ - { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }, - { "flags": 4, "matrix": [0, 1], "x": 14, "y": 0 }, - { "flags": 4, "matrix": [0, 2], "x": 29, "y": 0 }, - { "flags": 4, "matrix": [0, 3], "x": 44, "y": 0 }, - { "flags": 4, "matrix": [0, 4], "x": 59, "y": 0 }, - { "flags": 4, "matrix": [0, 5], "x": 74, "y": 0 }, - { "flags": 4, "matrix": [0, 6], "x": 89, "y": 0 }, - { "flags": 4, "matrix": [0, 7], "x":104, "y": 0 }, - { "flags": 4, "matrix": [0, 8], "x":119, "y": 0 }, - { "flags": 4, "matrix": [0, 9], "x":134, "y": 0 }, - { "flags": 4, "matrix": [0, 10], "x":149, "y": 0 }, - { "flags": 4, "matrix": [0, 11], "x":164, "y": 0 }, - { "flags": 4, "matrix": [0, 12], "x":179, "y": 0 }, - { "flags": 4, "matrix": [0, 13], "x":196, "y": 0 }, - - { "flags": 4, "matrix": [1, 0], "x": 0, "y": 12}, - { "flags": 4, "matrix": [1, 1], "x": 14, "y": 12}, - { "flags": 4, "matrix": [1, 2], "x": 28, "y": 12}, - { "flags": 4, "matrix": [1, 3], "x": 42, "y": 12}, - { "flags": 4, "matrix": [1, 4], "x": 56, "y": 12}, - { "flags": 4, "matrix": [1, 5], "x": 70, "y": 12}, - { "flags": 4, "matrix": [1, 6], "x": 84, "y": 12}, - { "flags": 4, "matrix": [1, 7], "x": 98, "y": 12}, - { "flags": 4, "matrix": [1, 8], "x":112, "y": 12}, - { "flags": 4, "matrix": [1, 9], "x":126, "y": 12}, - { "flags": 4, "matrix": [1, 10], "x":140, "y": 12}, - { "flags": 4, "matrix": [1, 11], "x":154, "y": 12}, - { "flags": 4, "matrix": [1, 12], "x":168, "y": 12}, - { "flags": 4, "matrix": [1, 13], "x":182, "y": 12}, - { "flags": 4, "matrix": [1, 15], "x":224, "y": 12}, - - { "flags": 4, "matrix": [2, 0], "x": 0, "y": 25}, - { "flags": 4, "matrix": [2, 1], "x": 14, "y": 25}, - { "flags": 4, "matrix": [2, 2], "x": 28, "y": 25}, - { "flags": 4, "matrix": [2, 3], "x": 42, "y": 25}, - { "flags": 4, "matrix": [2, 4], "x": 56, "y": 25}, - { "flags": 4, "matrix": [2, 5], "x": 70, "y": 25}, - { "flags": 4, "matrix": [2, 6], "x": 84, "y": 25}, - { "flags": 4, "matrix": [2, 7], "x": 98, "y": 25}, - { "flags": 4, "matrix": [2, 8], "x":112, "y": 25}, - { "flags": 4, "matrix": [2, 9], "x":126, "y": 25}, - { "flags": 4, "matrix": [2, 10], "x":140, "y": 25}, - { "flags": 4, "matrix": [2, 11], "x":154, "y": 25}, - { "flags": 4, "matrix": [2, 12], "x":168, "y": 25}, - { "flags": 4, "matrix": [2, 13], "x":182, "y": 25}, - { "flags": 4, "matrix": [2, 15], "x":224, "y": 25}, - - { "flags": 4, "matrix": [3, 0], "x": 0, "y": 38}, - { "flags": 4, "matrix": [3, 1], "x": 28, "y": 38}, - { "flags": 4, "matrix": [3, 2], "x": 42, "y": 38}, - { "flags": 4, "matrix": [3, 3], "x": 56, "y": 38}, - { "flags": 4, "matrix": [3, 4], "x": 70, "y": 38}, - { "flags": 4, "matrix": [3, 5], "x": 84, "y": 38}, - { "flags": 4, "matrix": [3, 6], "x": 98, "y": 38}, - { "flags": 4, "matrix": [3, 7], "x":112, "y": 38}, - { "flags": 4, "matrix": [3, 8], "x":126, "y": 38}, - { "flags": 4, "matrix": [3, 9], "x":140, "y": 38}, - { "flags": 4, "matrix": [3, 10], "x":154, "y": 38}, - { "flags": 4, "matrix": [3, 11], "x":168, "y": 38}, - { "flags": 4, "matrix": [3, 12], "x":182, "y": 38}, - { "flags": 4, "matrix": [3, 13], "x":196, "y": 38}, - { "flags": 4, "matrix": [3, 15], "x":224, "y": 38}, - - { "flags": 4, "matrix": [4, 0], "x": 0, "y": 51}, - { "flags": 4, "matrix": [4, 11], "x": 18, "y": 51}, - { "flags": 4, "matrix": [4, 1], "x": 32, "y": 51}, - { "flags": 4, "matrix": [4, 2], "x": 46, "y": 51}, - { "flags": 4, "matrix": [4, 3], "x": 61, "y": 51}, - { "flags": 4, "matrix": [4, 4], "x": 75, "y": 51}, - { "flags": 4, "matrix": [4, 5], "x": 90, "y": 51}, - { "flags": 4, "matrix": [4, 6], "x":104, "y": 51}, - { "flags": 4, "matrix": [4, 7], "x":129, "y": 51}, - { "flags": 4, "matrix": [4, 8], "x":143, "y": 51}, - { "flags": 4, "matrix": [4, 9], "x":157, "y": 51}, - { "flags": 4, "matrix": [4, 10], "x":172, "y": 51}, - { "flags": 4, "matrix": [4, 13], "x":186, "y": 51}, - { "flags": 4, "matrix": [4, 14], "x":205, "y": 51}, - { "flags": 4, "matrix": [4, 15], "x":224, "y": 51}, - - { "flags": 4, "matrix": [5, 0], "x": 0, "y": 64}, - { "flags": 4, "matrix": [5, 1], "x": 18, "y": 64}, - { "flags": 4, "matrix": [5, 2], "x": 37, "y": 64}, - { "flags": 4, "matrix": [5, 5], "x": 90, "y": 64}, - { "flags": 4, "matrix": [5, 9], "x":144, "y": 64}, - { "flags": 4, "matrix": [5, 10], "x":158, "y": 64}, - { "flags": 4, "matrix": [5, 11], "x":173, "y": 64}, - { "flags": 4, "matrix": [5, 13], "x":191, "y": 64}, - { "flags": 4, "matrix": [5, 14], "x":205, "y": 64}, - { "flags": 4, "matrix": [5, 15], "x":220, "y": 64}, - - { "flags": 2, "x":0, "y":0}, - { "flags": 2, "x":0, "y":6}, - { "flags": 2, "x":0, "y":13}, - { "flags": 2, "x":0, "y":19}, - { "flags": 2, "x":0, "y":25}, - { "flags": 2, "x":0, "y":32}, - { "flags": 2, "x":0, "y":38}, - { "flags": 2, "x":0, "y":45}, - { "flags": 2, "x":0, "y":51}, - { "flags": 2, "x":0, "y":57}, - { "flags": 2, "x":0, "y":64}, - - { "flags": 2, "x":224, "y":0}, - { "flags": 2, "x":224, "y":6}, - { "flags": 2, "x":224, "y":13}, - { "flags": 2, "x":224, "y":19}, - { "flags": 2, "x":224, "y":25}, - { "flags": 2, "x":224, "y":32}, - { "flags": 2, "x":224, "y":38}, - { "flags": 2, "x":224, "y":45}, - { "flags": 2, "x":224, "y":51}, - { "flags": 2, "x":224, "y":57}, - { "flags": 2, "x":224, "y":64} - ] + "driver": "snled27351", + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 14, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 29, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 44, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 59, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 74, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 89, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 104, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 119, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 134, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 149, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 164, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 179, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 196, "y": 0, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 12, "flags": 4}, + {"matrix": [1, 1], "x": 14, "y": 12, "flags": 4}, + {"matrix": [1, 2], "x": 28, "y": 12, "flags": 4}, + {"matrix": [1, 3], "x": 42, "y": 12, "flags": 4}, + {"matrix": [1, 4], "x": 56, "y": 12, "flags": 4}, + {"matrix": [1, 5], "x": 70, "y": 12, "flags": 4}, + {"matrix": [1, 6], "x": 84, "y": 12, "flags": 4}, + {"matrix": [1, 7], "x": 98, "y": 12, "flags": 4}, + {"matrix": [1, 8], "x": 112, "y": 12, "flags": 4}, + {"matrix": [1, 9], "x": 126, "y": 12, "flags": 4}, + {"matrix": [1, 10], "x": 140, "y": 12, "flags": 4}, + {"matrix": [1, 11], "x": 154, "y": 12, "flags": 4}, + {"matrix": [1, 12], "x": 168, "y": 12, "flags": 4}, + {"matrix": [1, 13], "x": 182, "y": 12, "flags": 4}, + {"matrix": [1, 15], "x": 224, "y": 12, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 25, "flags": 4}, + {"matrix": [2, 1], "x": 14, "y": 25, "flags": 4}, + {"matrix": [2, 2], "x": 28, "y": 25, "flags": 4}, + {"matrix": [2, 3], "x": 42, "y": 25, "flags": 4}, + {"matrix": [2, 4], "x": 56, "y": 25, "flags": 4}, + {"matrix": [2, 5], "x": 70, "y": 25, "flags": 4}, + {"matrix": [2, 6], "x": 84, "y": 25, "flags": 4}, + {"matrix": [2, 7], "x": 98, "y": 25, "flags": 4}, + {"matrix": [2, 8], "x": 112, "y": 25, "flags": 4}, + {"matrix": [2, 9], "x": 126, "y": 25, "flags": 4}, + {"matrix": [2, 10], "x": 140, "y": 25, "flags": 4}, + {"matrix": [2, 11], "x": 154, "y": 25, "flags": 4}, + {"matrix": [2, 12], "x": 168, "y": 25, "flags": 4}, + {"matrix": [2, 13], "x": 182, "y": 25, "flags": 4}, + {"matrix": [2, 15], "x": 224, "y": 25, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 38, "flags": 4}, + {"matrix": [3, 1], "x": 28, "y": 38, "flags": 4}, + {"matrix": [3, 2], "x": 42, "y": 38, "flags": 4}, + {"matrix": [3, 3], "x": 56, "y": 38, "flags": 4}, + {"matrix": [3, 4], "x": 70, "y": 38, "flags": 4}, + {"matrix": [3, 5], "x": 84, "y": 38, "flags": 4}, + {"matrix": [3, 6], "x": 98, "y": 38, "flags": 4}, + {"matrix": [3, 7], "x": 112, "y": 38, "flags": 4}, + {"matrix": [3, 8], "x": 126, "y": 38, "flags": 4}, + {"matrix": [3, 9], "x": 140, "y": 38, "flags": 4}, + {"matrix": [3, 10], "x": 154, "y": 38, "flags": 4}, + {"matrix": [3, 11], "x": 168, "y": 38, "flags": 4}, + {"matrix": [3, 12], "x": 182, "y": 38, "flags": 4}, + {"matrix": [3, 13], "x": 196, "y": 38, "flags": 4}, + {"matrix": [3, 15], "x": 224, "y": 38, "flags": 4}, + {"matrix": [4, 0], "x": 0, "y": 51, "flags": 4}, + {"matrix": [4, 11], "x": 18, "y": 51, "flags": 4}, + {"matrix": [4, 1], "x": 32, "y": 51, "flags": 4}, + {"matrix": [4, 2], "x": 46, "y": 51, "flags": 4}, + {"matrix": [4, 3], "x": 61, "y": 51, "flags": 4}, + {"matrix": [4, 4], "x": 75, "y": 51, "flags": 4}, + {"matrix": [4, 5], "x": 90, "y": 51, "flags": 4}, + {"matrix": [4, 6], "x": 104, "y": 51, "flags": 4}, + {"matrix": [4, 7], "x": 129, "y": 51, "flags": 4}, + {"matrix": [4, 8], "x": 143, "y": 51, "flags": 4}, + {"matrix": [4, 9], "x": 157, "y": 51, "flags": 4}, + {"matrix": [4, 10], "x": 172, "y": 51, "flags": 4}, + {"matrix": [4, 13], "x": 186, "y": 51, "flags": 4}, + {"matrix": [4, 14], "x": 205, "y": 51, "flags": 4}, + {"matrix": [4, 15], "x": 224, "y": 51, "flags": 4}, + {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4}, + {"matrix": [5, 1], "x": 18, "y": 64, "flags": 4}, + {"matrix": [5, 2], "x": 37, "y": 64, "flags": 4}, + {"matrix": [5, 5], "x": 90, "y": 64, "flags": 4}, + {"matrix": [5, 9], "x": 144, "y": 64, "flags": 4}, + {"matrix": [5, 10], "x": 158, "y": 64, "flags": 4}, + {"matrix": [5, 11], "x": 173, "y": 64, "flags": 4}, + {"matrix": [5, 13], "x": 191, "y": 64, "flags": 4}, + {"matrix": [5, 14], "x": 205, "y": 64, "flags": 4}, + {"matrix": [5, 15], "x": 220, "y": 64, "flags": 4}, + {"x": 0, "y": 0, "flags": 2}, + {"x": 0, "y": 6, "flags": 2}, + {"x": 0, "y": 13, "flags": 2}, + {"x": 0, "y": 19, "flags": 2}, + {"x": 0, "y": 25, "flags": 2}, + {"x": 0, "y": 32, "flags": 2}, + {"x": 0, "y": 38, "flags": 2}, + {"x": 0, "y": 45, "flags": 2}, + {"x": 0, "y": 51, "flags": 2}, + {"x": 0, "y": 57, "flags": 2}, + {"x": 0, "y": 64, "flags": 2}, + {"x": 224, "y": 0, "flags": 2}, + {"x": 224, "y": 6, "flags": 2}, + {"x": 224, "y": 13, "flags": 2}, + {"x": 224, "y": 19, "flags": 2}, + {"x": 224, "y": 25, "flags": 2}, + {"x": 224, "y": 32, "flags": 2}, + {"x": 224, "y": 38, "flags": 2}, + {"x": 224, "y": 45, "flags": 2}, + {"x": 224, "y": 51, "flags": 2}, + {"x": 224, "y": 57, "flags": 2}, + {"x": 224, "y": 64, "flags": 2} + ], + "max_brightness": 180 + }, + "url": "https://www.akkogear.com", + "usb": { + "device_version": "1.0.3", + "force_nkro": true, + "pid": "0x000B", + "suspend_wakeup_delay": 1000, + "vid": "0xFFFE" }, "layouts": { "LAYOUT": { "layout": [ - { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 }, - { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0 }, - { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0 }, - { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0 }, - { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0 }, - { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0 }, - { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0 }, - { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0 }, - { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0 }, - { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0 }, - { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0 }, - { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0 }, - { "label": "Del", "matrix": [0, 13], "x": 14, "y": 0 }, - { "label": "Mute", "matrix": [0, 15], "x": 15.5, "y": 0 }, - - { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 }, - { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.25 }, - { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 }, - { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 }, - { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 }, - { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 }, - { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 }, - { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 }, - { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 }, - { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 }, - { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.25 }, - { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.25 }, - { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.25 }, - { "label": "Bksp", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.25 }, - { "label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25 }, - - { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 }, - { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 }, - { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 }, - { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 }, - { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25 }, - { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25 }, - { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25 }, - { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25 }, - { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25 }, - { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25 }, - { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25 }, - { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25 }, - { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25 }, - { "label": "|", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 }, - { "label": "PageUp", "matrix": [2, 15], "x": 15.5, "y": 2.25 }, - - { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 }, - { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 }, - { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 }, - { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 }, - { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25 }, - { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25 }, - { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25 }, - { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25 }, - { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25 }, - { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25 }, - { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 }, - { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25 }, - { "label": ":", "matrix": [3, 12], "x": 12.75, "y": 3.25 }, - { "label": "Enter", "matrix": [3, 13], "w": 1.25, "x": 13.75, "y": 3.25 }, - { "label": "PageDn", "matrix": [3, 15], "x": 15.5, "y": 3.25 }, - - { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 }, - { "label": ":", "matrix": [4, 11], "x": 1.25, "y": 4.25 }, - { "label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25 }, - { "label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25 }, - { "label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25 }, - { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25 }, - { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25 }, - { "label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25 }, - { "label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25 }, - { "label": "<", "matrix": [4, 8], "x": 9.25, "y": 4.25 }, - { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 }, - { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 }, - { "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 }, - { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.5 }, - { "label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25 }, - - { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 }, - { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 }, - { "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 }, - { "label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 5.25 }, - { "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25 }, - { "label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25 }, - { "label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25 }, - { "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.5 }, - { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.5 }, - { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.5 } + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + {"label": "Del", "matrix": [0, 13], "x": 14, "y": 0}, + {"label": "Mute", "matrix": [0, 15], "x": 15.5, "y": 0}, + {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "@", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "#", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "^", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "&", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "*", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "(", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": ")", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "_", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "+", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Bksp", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25}, + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "|", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "PageUp", "matrix": [2, 15], "x": 15.5, "y": 2.25}, + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": ":", "matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25}, + {"label": "PageDn", "matrix": [3, 15], "x": 15.5, "y": 3.25}, + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"label": ":", "matrix": [4, 11], "x": 1.25, "y": 4.25}, + {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"label": "<", "matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.5}, + {"label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25}, + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25}, + {"label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25}, + {"label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25}, + {"label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.5}, + {"label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.5}, + {"label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.5} ] } } From 55a0295aa02173dcdb4484f7e25534a3be7e4a8f Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:58:30 +0800 Subject: [PATCH 33/71] Update config.h --- keyboards/akko/5075/config.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/akko/5075/config.h b/keyboards/akko/5075/config.h index 5d5c2b7bfd8..5bbf97e986f 100644 --- a/keyboards/akko/5075/config.h +++ b/keyboards/akko/5075/config.h @@ -46,9 +46,8 @@ #define WEAR_LEVELING_BACKING_SIZE (8 * 1024) /* I2C Config for LED Driver */ -#define DRIVER_COUNT 2 -#define DRIVER_ADDR_1 0b1110100 -#define DRIVER_ADDR_2 0b1110111 +#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND +#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO #define I2C1_OPMODE OPMODE_I2C #define I2C1_CLOCK_SPEED 400000 /* 400000 */ From 4dfa0d135ace7b5d97677bcf146c74eb58b3224b Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:59:33 +0800 Subject: [PATCH 34/71] Update 5075.c --- keyboards/akko/5075/5075.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/5075.c b/keyboards/akko/5075/5075.c index 3b7d87f7a42..2aa8acda7d3 100644 --- a/keyboards/akko/5075/5075.c +++ b/keyboards/akko/5075/5075.c @@ -18,7 +18,7 @@ // clang-format off #ifdef RGB_MATRIX_ENABLE -const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { +const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | R location From f8ead3aa4b67d1852895896cb2522723ac8d8dbc Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 20 Dec 2023 09:24:07 +0800 Subject: [PATCH 35/71] Update 5075.c --- keyboards/akko/5075/5075.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/akko/5075/5075.c b/keyboards/akko/5075/5075.c index 2aa8acda7d3..70e662cab72 100644 --- a/keyboards/akko/5075/5075.c +++ b/keyboards/akko/5075/5075.c @@ -189,7 +189,6 @@ bool dip_switch_update_kb(uint8_t index, bool active) { layer_off(WIN_W); } keymap_config.no_gui = 0; - eeconfig_update_keymap(keymap_config.raw); } else { if (default_layer_state & (1< Date: Mon, 22 Jan 2024 10:08:34 +0800 Subject: [PATCH 36/71] Update keyboards/akko/5075/rules.mk Co-authored-by: Joel Challis --- keyboards/akko/5075/rules.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/keyboards/akko/5075/rules.mk b/keyboards/akko/5075/rules.mk index b861fb86dd7..6e7633bfe01 100644 --- a/keyboards/akko/5075/rules.mk +++ b/keyboards/akko/5075/rules.mk @@ -1,5 +1 @@ -# Build Options -# change yes to no to disable -# -EEPROM_DRIVER = wear_leveling -WEAR_LEVELING_DRIVER = spi_flash +# This file intentionally left blank From 453ce3ce07cef82bc65d2bb74243237e82d16d5a Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 22 Jan 2024 10:08:42 +0800 Subject: [PATCH 37/71] Update keyboards/akko/5075/config.h Co-authored-by: Joel Challis --- keyboards/akko/5075/config.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/keyboards/akko/5075/config.h b/keyboards/akko/5075/config.h index 5bbf97e986f..003dbc12fa4 100644 --- a/keyboards/akko/5075/config.h +++ b/keyboards/akko/5075/config.h @@ -50,16 +50,4 @@ #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO #define I2C1_OPMODE OPMODE_I2C #define I2C1_CLOCK_SPEED 400000 /* 400000 */ - -#define DRIVER_1_LED_TOTAL 63 -#define DRIVER_2_LED_TOTAL 21 -#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL+22) - -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended - -#define RGB_TRIGGER_ON_KEYDOWN -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS -#define RGB_MATRIX_KEYPRESSES -#define RGB_MATRIX_KEYRELEASES - // #define DISABLE_5075_KEYCODES /*If you need to change or restore the default QMK button function, please open it*/ From fe0642f5f4576d480a2b68875d8ac4096d4570c5 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 22 Jan 2024 10:08:54 +0800 Subject: [PATCH 38/71] Update keyboards/akko/5075/info.json Co-authored-by: Joel Challis --- keyboards/akko/5075/info.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/keyboards/akko/5075/info.json b/keyboards/akko/5075/info.json index f9d72439b46..8bc83687e90 100644 --- a/keyboards/akko/5075/info.json +++ b/keyboards/akko/5075/info.json @@ -4,6 +4,16 @@ "maintainer": "jonylee@hfd", "bootloader": "wb32-dfu", "diode_direction": "ROW2COL", + "eeprom": { + "driver": "wear_leveling", + "wear_leveling": { + "driver": "spi_flash", + "backing_size": 8192 + } + }, + "dip_switch": { + "pins": ["A9"] + }, "encoder": { "rotary": [ {"pin_a": "B14", "pin_b": "B13"} From d949d9ab595aa37af1e7825b0b7410172ac2d5bb Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 22 Jan 2024 10:09:14 +0800 Subject: [PATCH 39/71] Update keyboards/akko/5075/readme.md Co-authored-by: Joel Challis --- keyboards/akko/5075/readme.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/keyboards/akko/5075/readme.md b/keyboards/akko/5075/readme.md index e89603dc718..337ae881b20 100644 --- a/keyboards/akko/5075/readme.md +++ b/keyboards/akko/5075/readme.md @@ -15,6 +15,11 @@ Flashing example for this keyboard: make akko/5075:default:flash -**Reset Key**: Hold down the top left key (commonly programmed as *Esc*) while plugging in the keyboard. - See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 2 ways: + +* **Bootmagic reset**: Hold down the Hold down the top left key (commonly programmed as *Esc*) and plug in the keyboard +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 32134bde182092c38a116390e8f1032c34894500 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 22 Jan 2024 10:09:22 +0800 Subject: [PATCH 40/71] Update keyboards/akko/5075/config.h Co-authored-by: Joel Challis --- keyboards/akko/5075/config.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/akko/5075/config.h b/keyboards/akko/5075/config.h index 003dbc12fa4..a30b22e66c7 100644 --- a/keyboards/akko/5075/config.h +++ b/keyboards/akko/5075/config.h @@ -21,10 +21,6 @@ /*encoder resolution */ #define ENCODER_DEFAULT_POS 0x3 - -/* DIP switch */ -#define DIP_SWITCH_PINS { A9 } - /* LED Indicators */ #define LED_MAC_OS_PIN C10 #define LED_WIN_LOCK_PIN C11 From 6d21fe0d67b58e5206b4599eafa759b998a4b7f5 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 22 Jan 2024 10:09:29 +0800 Subject: [PATCH 41/71] Update keyboards/akko/5075/config.h Co-authored-by: Joel Challis --- keyboards/akko/5075/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/akko/5075/config.h b/keyboards/akko/5075/config.h index a30b22e66c7..a153878018b 100644 --- a/keyboards/akko/5075/config.h +++ b/keyboards/akko/5075/config.h @@ -39,7 +39,6 @@ #define SPI_MOSI_PAL_MODE 5 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 -#define WEAR_LEVELING_BACKING_SIZE (8 * 1024) /* I2C Config for LED Driver */ #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND From 7de9d20603fe1b51f5737bc841ea97790e64a266 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 19 Feb 2024 10:35:53 +0800 Subject: [PATCH 42/71] Update readme.md --- keyboards/akko/5075/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/readme.md b/keyboards/akko/5075/readme.md index 337ae881b20..3787318dfa0 100644 --- a/keyboards/akko/5075/readme.md +++ b/keyboards/akko/5075/readme.md @@ -1,5 +1,5 @@ # 5075 -![5075](https://github.com/jonylee1986/qmk_firmware_master/assets/108282809/e2b46a2b-4ab5-48bd-90d2-7e8a7a841d7e) +![5075](https://github.com/jonylee1986/qmk_firmware_master/assets/108282809/b4a560da-15ed-414c-a067-e778c4ced761) A customizable 75% encoder keyboard. From 86eb94ad0db1b963c4a58044f28884a85848af8d Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 19 Feb 2024 10:40:19 +0800 Subject: [PATCH 43/71] Update info.json --- keyboards/akko/5075/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/info.json b/keyboards/akko/5075/info.json index 8bc83687e90..c2c1c91ecfa 100644 --- a/keyboards/akko/5075/info.json +++ b/keyboards/akko/5075/info.json @@ -238,7 +238,7 @@ {"label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25}, {"label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25}, {"label": ":", "matrix": [3, 12], "x": 12.75, "y": 3.25}, - {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25}, + {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, {"label": "PageDn", "matrix": [3, 15], "x": 15.5, "y": 3.25}, {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, {"label": ":", "matrix": [4, 11], "x": 1.25, "y": 4.25}, From cb5f88f4c0cc1428e3686d93d14d10562d870cd3 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 19 Feb 2024 10:54:06 +0800 Subject: [PATCH 44/71] Update readme.md --- keyboards/akko/5075/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/readme.md b/keyboards/akko/5075/readme.md index 3787318dfa0..2c5db7bd447 100644 --- a/keyboards/akko/5075/readme.md +++ b/keyboards/akko/5075/readme.md @@ -1,5 +1,5 @@ # 5075 -![5075](https://github.com/jonylee1986/qmk_firmware_master/assets/108282809/b4a560da-15ed-414c-a067-e778c4ced761) +![5075](https://en.akkogear.com/wp-content/uploads/2022/06/5075S-Shine-through-Black3.jpg) A customizable 75% encoder keyboard. From c7f769b6b7b9536ab836d5d7a3404aae6aae61b9 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 4 Mar 2024 15:40:55 +0800 Subject: [PATCH 45/71] Update keyboards/akko/5075/keymaps/default/keymap.c Co-authored-by: doublevoid --- keyboards/akko/5075/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/keymaps/default/keymap.c b/keyboards/akko/5075/keymaps/default/keymap.c index 476573af2ad..bb669b1ff6e 100644 --- a/keyboards/akko/5075/keymaps/default/keymap.c +++ b/keyboards/akko/5075/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, 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_HOME, 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_PGUP, 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_PGDN, - 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_END, + 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_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_W] = LAYOUT( /* Base */ From 8558e5c310d012dc9d1df83a2f3118a6b9c17129 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 4 Mar 2024 15:41:53 +0800 Subject: [PATCH 46/71] Update keyboards/akko/5075/keymaps/default/keymap.c Co-authored-by: doublevoid --- keyboards/akko/5075/keymaps/default/keymap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/akko/5075/keymaps/default/keymap.c b/keyboards/akko/5075/keymaps/default/keymap.c index bb669b1ff6e..96a0f207ffe 100644 --- a/keyboards/akko/5075/keymaps/default/keymap.c +++ b/keyboards/akko/5075/keymaps/default/keymap.c @@ -50,7 +50,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______, + _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), [MAC_B] = LAYOUT( /* Base */ From c30496281f0a5530eb86b97ab599194d26545952 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 4 Mar 2024 15:42:00 +0800 Subject: [PATCH 47/71] Update keyboards/akko/5075/keymaps/default/keymap.c Co-authored-by: doublevoid --- keyboards/akko/5075/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/keymaps/default/keymap.c b/keyboards/akko/5075/keymaps/default/keymap.c index 96a0f207ffe..011255425ae 100644 --- a/keyboards/akko/5075/keymaps/default/keymap.c +++ b/keyboards/akko/5075/keymaps/default/keymap.c @@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______,RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), }; #if defined(ENCODER_MAP_ENABLE) From de8f209a36352195a85c5e4d0edbc8cc6f907802 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 4 Mar 2024 15:42:11 +0800 Subject: [PATCH 48/71] Update keyboards/akko/5075/keymaps/default/keymap.c Co-authored-by: doublevoid --- keyboards/akko/5075/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/keymaps/default/keymap.c b/keyboards/akko/5075/keymaps/default/keymap.c index 011255425ae..620b3da4fa3 100644 --- a/keyboards/akko/5075/keymaps/default/keymap.c +++ b/keyboards/akko/5075/keymaps/default/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, 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_HOME, 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_PGUP, 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_PGDN, - 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_END, + 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_END, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_W] = LAYOUT( /* Base */ From 8ac497816fc3b60e01d5cba4340f85f27be85511 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 4 Mar 2024 15:42:20 +0800 Subject: [PATCH 49/71] Update keyboards/akko/5075/keymaps/via/keymap.c Co-authored-by: doublevoid --- keyboards/akko/5075/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/keymaps/via/keymap.c b/keyboards/akko/5075/keymaps/via/keymap.c index 476573af2ad..bb669b1ff6e 100644 --- a/keyboards/akko/5075/keymaps/via/keymap.c +++ b/keyboards/akko/5075/keymaps/via/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, 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_HOME, 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_PGUP, 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_PGDN, - 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_END, + 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_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_W] = LAYOUT( /* Base */ From 3bee3ea487d8be3fe2bd8ef99676693ea634e399 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 4 Mar 2024 15:42:28 +0800 Subject: [PATCH 50/71] Update keyboards/akko/5075/keymaps/via/keymap.c Co-authored-by: doublevoid --- keyboards/akko/5075/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/keymaps/via/keymap.c b/keyboards/akko/5075/keymaps/via/keymap.c index bb669b1ff6e..d2231db43d5 100644 --- a/keyboards/akko/5075/keymaps/via/keymap.c +++ b/keyboards/akko/5075/keymaps/via/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, 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_HOME, 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_PGUP, 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_PGDN, - 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_END, + 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_END, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_W] = LAYOUT( /* Base */ From f13e1d4acce9b305a3acdfb3beefea09550ed7bc Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 4 Mar 2024 15:42:35 +0800 Subject: [PATCH 51/71] Update keyboards/akko/5075/keymaps/via/keymap.c Co-authored-by: doublevoid --- keyboards/akko/5075/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/keymaps/via/keymap.c b/keyboards/akko/5075/keymaps/via/keymap.c index d2231db43d5..e9bb6fcbc55 100644 --- a/keyboards/akko/5075/keymaps/via/keymap.c +++ b/keyboards/akko/5075/keymaps/via/keymap.c @@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______,RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), }; #if defined(ENCODER_MAP_ENABLE) From 959eebb327e71ec3604f4fa3c39e3f64ac3f4c5f Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 4 Mar 2024 15:42:41 +0800 Subject: [PATCH 52/71] Update keyboards/akko/5075/keymaps/via/keymap.c Co-authored-by: doublevoid --- keyboards/akko/5075/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/keymaps/via/keymap.c b/keyboards/akko/5075/keymaps/via/keymap.c index e9bb6fcbc55..88f1a4eae16 100644 --- a/keyboards/akko/5075/keymaps/via/keymap.c +++ b/keyboards/akko/5075/keymaps/via/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______, _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), [MAC_B] = LAYOUT( /* Base */ From 193c25c576f5baf2a30d2e466b778fea2193c75f Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 4 Mar 2024 15:42:46 +0800 Subject: [PATCH 53/71] Update keyboards/akko/5075/info.json Co-authored-by: doublevoid --- keyboards/akko/5075/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/akko/5075/info.json b/keyboards/akko/5075/info.json index c2c1c91ecfa..9814fb83756 100644 --- a/keyboards/akko/5075/info.json +++ b/keyboards/akko/5075/info.json @@ -241,7 +241,6 @@ {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, {"label": "PageDn", "matrix": [3, 15], "x": 15.5, "y": 3.25}, {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, - {"label": ":", "matrix": [4, 11], "x": 1.25, "y": 4.25}, {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25}, {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25}, {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25}, From 2324fcacd49d75dd5a96bae84b8ab57ef1751a8c Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 4 Mar 2024 15:42:52 +0800 Subject: [PATCH 54/71] Update keyboards/akko/5075/info.json Co-authored-by: doublevoid --- keyboards/akko/5075/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/akko/5075/info.json b/keyboards/akko/5075/info.json index 9814fb83756..bee63b12da7 100644 --- a/keyboards/akko/5075/info.json +++ b/keyboards/akko/5075/info.json @@ -237,7 +237,6 @@ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, {"label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25}, {"label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25}, - {"label": ":", "matrix": [3, 12], "x": 12.75, "y": 3.25}, {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, {"label": "PageDn", "matrix": [3, 15], "x": 15.5, "y": 3.25}, {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, From c987357cf4bc09e84d889b9feb3b40b54771fb27 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 5 Mar 2024 12:49:03 +0800 Subject: [PATCH 55/71] Update keymap.c --- keyboards/akko/5075/keymaps/default/keymap.c | 31 ++++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/keyboards/akko/5075/keymaps/default/keymap.c b/keyboards/akko/5075/keymaps/default/keymap.c index 620b3da4fa3..240182c8fd6 100644 --- a/keyboards/akko/5075/keymaps/default/keymap.c +++ b/keyboards/akko/5075/keymaps/default/keymap.c @@ -31,51 +31,50 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, 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_DEL, KC_MUTE, KC_GRV, 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_HOME, 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_PGUP, - 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_PGDN, - 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_END, + 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_PGDN, + 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_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_W] = LAYOUT( /* Base */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, - _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D), + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D), [WIN_FN] = LAYOUT( /* FN */ _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, - _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______, RGB_MOD, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______, - + _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, _______, RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______, _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), [MAC_B] = LAYOUT( /* Base */ KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,KC_VOLU, KC_DEL, KC_MUTE, KC_GRV, 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_HOME, 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_PGUP, - 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_PGDN, - 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_END, + 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_PGDN, + 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_END, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_W] = LAYOUT( /* Base */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D), [MAC_FN] = LAYOUT( /* FN */ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, - _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______,RGB_MOD, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______, + _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______, RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), }; #if defined(ENCODER_MAP_ENABLE) From 1c2ae36a89634bfb306a1faea99a34fd62e5a1f7 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 5 Mar 2024 12:51:14 +0800 Subject: [PATCH 56/71] Update keymap.c --- keyboards/akko/5075/keymaps/via/keymap.c | 32 ++++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/keyboards/akko/5075/keymaps/via/keymap.c b/keyboards/akko/5075/keymaps/via/keymap.c index 88f1a4eae16..f27faa9ec25 100644 --- a/keyboards/akko/5075/keymaps/via/keymap.c +++ b/keyboards/akko/5075/keymaps/via/keymap.c @@ -31,50 +31,50 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, 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_DEL, KC_MUTE, KC_GRV, 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_HOME, 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_PGUP, - 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_PGDN, - 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_END, + 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_PGDN, + 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_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_W] = LAYOUT( /* Base */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, - _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D), + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D), [WIN_FN] = LAYOUT( /* FN */ _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, - _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______, RGB_MOD, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______, - _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), + _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, _______, RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, ______, RGB_VAI, _______, + _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), [MAC_B] = LAYOUT( /* Base */ KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,KC_VOLU, KC_DEL, KC_MUTE, KC_GRV, 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_HOME, 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_PGUP, - 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_PGDN, - 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_END, + 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_PGDN, + 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_END, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_W] = LAYOUT( /* Base */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D), [MAC_FN] = LAYOUT( /* FN */ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, - _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______,RGB_MOD, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_MOD, RGB_HUI, _______, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______, + _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, _______, RGB_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), }; #if defined(ENCODER_MAP_ENABLE) From e35bb49a11f91a0096d7070f766628cdb363bc6e Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 5 Mar 2024 13:41:28 +0800 Subject: [PATCH 57/71] Update keymap.c --- keyboards/akko/5075/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/keymaps/via/keymap.c b/keyboards/akko/5075/keymaps/via/keymap.c index f27faa9ec25..a58d96c502f 100644 --- a/keyboards/akko/5075/keymaps/via/keymap.c +++ b/keyboards/akko/5075/keymaps/via/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, ______, RGB_VAI, _______, + _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______, _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), [MAC_B] = LAYOUT( /* Base */ From d24bf3ba8924ed74ef056bea4c87e45989602545 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 18 Mar 2024 17:46:22 +0800 Subject: [PATCH 58/71] Update keyboards/akko/5075/5075.c Co-authored-by: Ryan --- keyboards/akko/5075/5075.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/akko/5075/5075.c b/keyboards/akko/5075/5075.c index 70e662cab72..831660b2863 100644 --- a/keyboards/akko/5075/5075.c +++ b/keyboards/akko/5075/5075.c @@ -156,12 +156,12 @@ enum __layers { // clang-format on void led_init_ports(void) { // set our LED pings as output - setPinOutput(LED_CAPS_LOCK_PIN); // LED1 Num Lock - writePinLow(LED_CAPS_LOCK_PIN); - setPinOutput(LED_MAC_OS_PIN); // LDE2 MAC\WIN - writePinLow(LED_MAC_OS_PIN); - setPinOutput(LED_WIN_LOCK_PIN); // LED3 Win Lock - writePinLow(LED_WIN_LOCK_PIN); + gpio_set_pin_output(LED_CAPS_LOCK_PIN); // LED1 Num Lock + gpio_write_pin_low(LED_CAPS_LOCK_PIN); + gpio_set_pin_output(LED_MAC_OS_PIN); // LDE2 MAC\WIN + gpio_write_pin_low(LED_MAC_OS_PIN); + gpio_set_pin_output(LED_WIN_LOCK_PIN); // LED3 Win Lock + gpio_write_pin_low(LED_WIN_LOCK_PIN); } void housekeeping_task_kb(void) { From 593c0cff237467e84781c9fa442b1d2c59b7de53 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 18 Mar 2024 17:46:32 +0800 Subject: [PATCH 59/71] Update keyboards/akko/5075/5075.c Co-authored-by: Ryan --- keyboards/akko/5075/5075.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/akko/5075/5075.c b/keyboards/akko/5075/5075.c index 831660b2863..bcd29799335 100644 --- a/keyboards/akko/5075/5075.c +++ b/keyboards/akko/5075/5075.c @@ -169,8 +169,8 @@ void housekeeping_task_kb(void) { static uint32_t last_time = 0; if (timer_elapsed32(last_time) >= 1) { last_time = timer_read32(); - writePin(LED_MAC_OS_PIN, default_layer_state & ((1< Date: Tue, 19 Mar 2024 09:10:30 +0800 Subject: [PATCH 60/71] Update readme.md --- keyboards/akko/5075/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/readme.md b/keyboards/akko/5075/readme.md index 2c5db7bd447..3224bfc2f9c 100644 --- a/keyboards/akko/5075/readme.md +++ b/keyboards/akko/5075/readme.md @@ -1,5 +1,5 @@ # 5075 -![5075](https://en.akkogear.com/wp-content/uploads/2022/06/5075S-Shine-through-Black3.jpg) +[![5075](https://s21.ax1x.com/2024/03/19/pFRcz0H.jpg)](https://imgse.com/i/pFRcz0H) A customizable 75% encoder keyboard. From 19b4a1f06dc60db93cd00736477d45af1a59f293 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 15 May 2024 09:05:51 +0800 Subject: [PATCH 61/71] Update keyboards/akko/5075/5075.c Co-authored-by: Drashna Jaelre --- keyboards/akko/5075/5075.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/akko/5075/5075.c b/keyboards/akko/5075/5075.c index bcd29799335..93a3f1a22e3 100644 --- a/keyboards/akko/5075/5075.c +++ b/keyboards/akko/5075/5075.c @@ -190,11 +190,11 @@ bool dip_switch_update_kb(uint8_t index, bool active) { } keymap_config.no_gui = 0; } else { - if (default_layer_state & (1< Date: Wed, 15 May 2024 09:06:05 +0800 Subject: [PATCH 62/71] Update keyboards/akko/5075/5075.c Co-authored-by: Drashna Jaelre --- keyboards/akko/5075/5075.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/akko/5075/5075.c b/keyboards/akko/5075/5075.c index 93a3f1a22e3..873249edd0f 100644 --- a/keyboards/akko/5075/5075.c +++ b/keyboards/akko/5075/5075.c @@ -181,11 +181,11 @@ bool dip_switch_update_kb(uint8_t index, bool active) { switch (index) { case 0: if (active) { - if (default_layer_state & (1< Date: Wed, 15 May 2024 10:53:02 +0800 Subject: [PATCH 63/71] Update 5075.c --- keyboards/akko/5075/5075.c | 260 ++++++++++++++++--------------------- 1 file changed, 110 insertions(+), 150 deletions(-) diff --git a/keyboards/akko/5075/5075.c b/keyboards/akko/5075/5075.c index 873249edd0f..1bbc81eb35a 100644 --- a/keyboards/akko/5075/5075.c +++ b/keyboards/akko/5075/5075.c @@ -25,121 +25,121 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { * | | G location * | | | B location * | | | | */ - {1, A_1, B_1, C_1}, - {1, A_2, B_2, C_2}, - {1, A_3, B_3, C_3}, - {1, A_4, B_4, C_4}, - {1, A_5, B_5, C_5}, - {1, A_6, B_6, C_6}, - {1, A_7, B_7, C_7}, - {1, A_8, B_8, C_8}, - {1, A_9, B_9, C_9}, - {1, A_10, B_10, C_10}, - {1, A_11, B_11, C_11}, - {1, A_12, B_12, C_12}, - {1, A_13, B_13, C_13}, - {1, A_14, B_14, C_14}, + {1, CB1_CA1, CB2_CA1, CB3_CA1}, + {1, CB1_CA2, CB2_CA2, CB3_CA2}, + {1, CB1_CA3, CB2_CA3, CB3_CA3}, + {1, CB1_CA4, CB2_CA4, CB3_CA4}, + {1, CB1_CA5, CB2_CA5, CB3_CA5}, + {1, CB1_CA6, CB2_CA6, CB3_CA6}, + {1, CB1_CA7, CB2_CA7, CB3_CA7}, + {1, CB1_CA8, CB2_CA8, CB3_CA8}, + {1, CB1_CA9, CB2_CA9, CB3_CA9}, + {1, CB1_CA10, CB2_CA10, CB3_CA10}, + {1, CB1_CA11, CB2_CA11, CB3_CA11}, + {1, CB1_CA12, CB2_CA12, CB3_CA12}, + {1, CB1_CA13, CB2_CA13, CB3_CA13}, + {1, CB1_CA14, CB2_CA14, CB3_CA14}, - {0, A_1, B_1, C_1}, - {0, A_2, B_2, C_2}, - {0, A_3, B_3, C_3}, - {0, A_4, B_4, C_4}, - {0, A_5, B_5, C_5}, - {0, A_6, B_6, C_6}, - {0, A_7, B_7, C_7}, - {0, A_8, B_8, C_8}, - {0, A_9, B_9, C_9}, - {0, A_10, B_10, C_10}, - {0, A_11, B_11, C_11}, - {0, A_12, B_12, C_12}, - {0, A_13, B_13, C_13}, - {0, A_14, B_14, C_14}, - {1, D_1, E_1, F_1}, + {0, CB1_CA1, CB2_CA1, CB3_CA1}, + {0, CB1_CA2, CB2_CA2, CB3_CA2}, + {0, CB1_CA3, CB2_CA3, CB3_CA3}, + {0, CB1_CA4, CB2_CA4, CB3_CA4}, + {0, CB1_CA5, CB2_CA5, CB3_CA5}, + {0, CB1_CA6, CB2_CA6, CB3_CA6}, + {0, CB1_CA7, CB2_CA7, CB3_CA7}, + {0, CB1_CA8, CB2_CA8, CB3_CA8}, + {0, CB1_CA9, CB2_CA9, CB3_CA9}, + {0, CB1_CA10, CB2_CA10, CB3_CA10}, + {0, CB1_CA11, CB2_CA11, CB3_CA11}, + {0, CB1_CA12, CB2_CA12, CB3_CA12}, + {0, CB1_CA13, CB2_CA13, CB3_CA13}, + {0, CB1_CA14, CB2_CA14, CB3_CA14}, + {1, CB4_CA1, CB5_CA1, CB6_CA1}, - {0, D_1, E_1, F_1}, - {0, D_2, E_2, F_2}, - {0, D_3, E_3, F_3}, - {0, D_4, E_4, F_4}, - {0, D_5, E_5, F_5}, - {0, D_6, E_6, F_6}, - {0, D_7, E_7, F_7}, - {0, D_8, E_8, F_8}, - {0, D_9, E_9, F_9}, - {0, D_10, E_10, F_10}, - {0, D_11, E_11, F_11}, - {0, D_12, E_12, F_12}, - {0, D_13, E_13, F_13}, - {0, D_14, E_14, F_14}, - {1, D_2, E_2, F_2}, + {0, CB4_CA1, CB5_CA1, CB6_CA1}, + {0, CB4_CA2, CB5_CA2, CB6_CA2}, + {0, CB4_CA3, CB5_CA3, CB6_CA3}, + {0, CB4_CA4, CB5_CA4, CB6_CA4}, + {0, CB4_CA5, CB5_CA5, CB6_CA5}, + {0, CB4_CA6, CB5_CA6, CB6_CA6}, + {0, CB4_CA7, CB5_CA7, CB6_CA7}, + {0, CB4_CA8, CB5_CA8, CB6_CA8}, + {0, CB4_CA9, CB5_CA9, CB6_CA9}, + {0, CB4_CA10, CB5_CA10, CB6_CA10}, + {0, CB4_CA11, CB5_CA11, CB6_CA11}, + {0, CB4_CA12, CB5_CA12, CB6_CA12}, + {0, CB4_CA13, CB5_CA13, CB6_CA13}, + {0, CB4_CA14, CB5_CA14, CB6_CA14}, + {1, CB4_CA2, CB5_CA2, CB6_CA2}, - {0, G_1, H_1, I_1}, - {0, G_2, H_2, I_2}, - {0, G_3, H_3, I_3}, - {0, G_4, H_4, I_4}, - {0, G_5, H_5, I_5}, - {0, G_6, H_6, I_6}, - {0, G_7, H_7, I_7}, - {0, G_8, H_8, I_8}, - {0, G_9, H_9, I_9}, - {0, G_10, H_10, I_10}, - {0, G_11, H_11, I_11}, - {0, G_12, H_12, I_12}, - {0, A_15, B_15, C_15}, - {0, G_13, H_13, I_13}, - {1, D_3, E_3, F_3}, + {0, CB7_CA1, CB8_CA1, CB9_CA1}, + {0, CB7_CA2, CB8_CA2, CB9_CA2}, + {0, CB7_CA3, CB8_CA3, CB9_CA3}, + {0, CB7_CA4, CB8_CA4, CB9_CA4}, + {0, CB7_CA5, CB8_CA5, CB9_CA5}, + {0, CB7_CA6, CB8_CA6, CB9_CA6}, + {0, CB7_CA7, CB8_CA7, CB9_CA7}, + {0, CB7_CA8, CB8_CA8, CB9_CA8}, + {0, CB7_CA9, CB8_CA9, CB9_CA9}, + {0, CB7_CA10, CB8_CA10, CB9_CA10}, + {0, CB7_CA11, CB8_CA11, CB9_CA11}, + {0, CB7_CA12, CB8_CA12, CB9_CA12}, + {0, CB1_CA15, CB2_CA15, CB3_CA15}, + {0, CB7_CA13, CB8_CA13, CB9_CA13}, + {1, CB4_CA3, CB5_CA3, CB6_CA3}, - {0, J_1, K_1, L_1}, - {0, A_16, B_16, C_16}, - {0, J_2, K_2, L_2}, - {0, J_3, K_3, L_3}, - {0, J_4, K_4, L_4}, - {0, J_5, K_5, L_5}, - {0, J_6, K_6, L_6}, - {0, J_7, K_7, L_7}, - {0, J_8, K_8, L_8}, - {0, J_9, K_9, L_9}, - {0, J_10, K_10, L_10}, - {0, J_11, K_11, L_11}, - {0, J_12, K_12, L_12}, - {1, D_7, E_7, F_7}, - {1, D_4, E_4, F_4}, + {0, CB10_CA1, CB11_CA1, CB12_CA1}, + {0, CB1_CA16, CB2_CA16, CB3_CA16}, + {0, CB10_CA2, CB11_CA2, CB12_CA2}, + {0, CB10_CA3, CB11_CA3, CB12_CA3}, + {0, CB10_CA4, CB11_CA4, CB12_CA4}, + {0, CB10_CA5, CB11_CA5, CB12_CA5}, + {0, CB10_CA6, CB11_CA6, CB12_CA6}, + {0, CB10_CA7, CB11_CA7, CB12_CA7}, + {0, CB10_CA8, CB11_CA8, CB12_CA8}, + {0, CB10_CA9, CB11_CA9, CB12_CA9}, + {0, CB10_CA10, CB11_CA10, CB12_CA10}, + {0, CB10_CA11, CB11_CA11, CB12_CA11}, + {0, CB10_CA12, CB11_CA12, CB12_CA12}, + {1, CB4_CA7, CB5_CA7, CB6_CA7}, + {1, CB4_CA4, CB5_CA4, CB6_CA4}, - {0, J_13, K_13, L_13}, - {0, J_14, K_14, L_14}, - {0, J_15, K_15, L_15}, - {0, J_16, K_16, L_16}, + {0, CB10_CA13, CB11_CA13, CB12_CA13}, + {0, CB10_CA14, CB11_CA14, CB12_CA14}, + {0, CB10_CA15, CB11_CA15, CB12_CA15}, + {0, CB10_CA16, CB11_CA16, CB12_CA16}, - {0, G_14, H_14, I_14}, - {0, G_15, H_15, I_15}, - {0, G_16, H_16, I_16}, + {0, CB7_CA14, CB8_CA14, CB9_CA14}, + {0, CB7_CA15, CB8_CA15, CB9_CA15}, + {0, CB7_CA16, CB8_CA16, CB9_CA16}, - {0, D_15, E_15, F_15}, - {1, D_6, E_6, F_6}, - {1, D_5, E_5, F_5}, + {0, CB4_CA15, CB5_CA15, CB6_CA15}, + {1, CB4_CA6, CB5_CA6, CB6_CA6}, + {1, CB4_CA5, CB5_CA5, CB6_CA5}, - {1, G_1, H_1, I_1}, - {1, G_2, H_2, I_2}, - {1, G_3, H_3, I_3}, - {1, G_4, H_4, I_4}, - {1, G_5, H_5, I_5}, - {1, G_6, H_6, I_6}, - {1, G_7, H_7, I_7}, - {1, G_8, H_8, I_8}, - {1, G_9, H_9, I_9}, - {1, G_10, H_10, I_10}, - {1, G_11, H_11, I_11}, + {1, CB7_CA1, CB8_CA1, CB9_CA1}, + {1, CB7_CA2, CB8_CA2, CB9_CA2}, + {1, CB7_CA3, CB8_CA3, CB9_CA3}, + {1, CB7_CA4, CB8_CA4, CB9_CA4}, + {1, CB7_CA5, CB8_CA5, CB9_CA5}, + {1, CB7_CA6, CB8_CA6, CB9_CA6}, + {1, CB7_CA7, CB8_CA7, CB9_CA7}, + {1, CB7_CA8, CB8_CA8, CB9_CA8}, + {1, CB7_CA9, CB8_CA9, CB9_CA9}, + {1, CB7_CA10, CB8_CA10, CB9_CA10}, + {1, CB7_CA11, CB8_CA11, CB9_CA11}, - {1, J_1, K_1, L_1}, - {1, J_2, K_2, L_2}, - {1, J_3, K_3, L_3}, - {1, J_4, K_4, L_4}, - {1, J_5, K_5, L_5}, - {1, J_6, K_6, L_6}, - {1, J_7, K_7, L_7}, - {1, J_8, K_8, L_8}, - {1, J_9, K_9, L_9}, - {1, J_10, K_10, L_10}, - {1, J_11, K_11, L_11}, + {1, CB10_CA1, CB11_CA1, CB12_CA1}, + {1, CB10_CA2, CB11_CA2, CB12_CA2}, + {1, CB10_CA3, CB11_CA3, CB12_CA3}, + {1, CB10_CA4, CB11_CA4, CB12_CA4}, + {1, CB10_CA5, CB11_CA5, CB12_CA5}, + {1, CB10_CA6, CB11_CA6, CB12_CA6}, + {1, CB10_CA7, CB11_CA7, CB12_CA7}, + {1, CB10_CA8, CB11_CA8, CB12_CA8}, + {1, CB10_CA9, CB11_CA9, CB12_CA9}, + {1, CB10_CA10, CB11_CA10, CB12_CA10}, + {1, CB10_CA11, CB11_CA11, CB12_CA11}, }; #endif @@ -181,22 +181,9 @@ bool dip_switch_update_kb(uint8_t index, bool active) { switch (index) { case 0: if (active) { - if (layer_state_cmp(default_layer_state, MAC_W)) { - default_layer_set((layer_state_t)1 << MAC_W); - layer_on(MAC_B); - } else { - default_layer_set((layer_state_t)1 << MAC_B); - layer_off(WIN_W); - } - keymap_config.no_gui = 0; + default_layer_set((layer_state_t)1 << MAC_B); } else { - if (layer_state_cmp(default_layer_state, MAC_W)) { - default_layer_set((layer_state_t)1 << WIN_W); - layer_on(WIN_B); - } else { - default_layer_set((layer_state_t)1 << WIN_B); - layer_off(MAC_W); - } + default_layer_set((layer_state_t)1 << WIN_B); } default: break; @@ -209,34 +196,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return false; } switch (keycode) { -#ifndef DISABLE_5075_KEYCODES - case TG(WIN_W): - if (record->event.pressed) { - if (layer_state_cmp(default_layer_state, WIN_W)) { - set_single_persistent_default_layer(WIN_B); - layer_off(WIN_W); - } else { - set_single_persistent_default_layer(WIN_W); - layer_on(WIN_B); - } - } - return false; - case TG(MAC_W): - if (record->event.pressed) { - if (layer_state_cmp(default_layer_state, MAC_W)) { - set_single_persistent_default_layer(MAC_B); - layer_off(MAC_W); - } else { - set_single_persistent_default_layer(MAC_W); - layer_on(MAC_B); - } - } - return false; - case GU_TOGG: - if (record->event.pressed) { - writePin(LED_WIN_LOCK_PIN, !keymap_config.no_gui); - } - return true; +#ifndef DISABLE_CA5075_KEYCODES case RGB_TOG: if (record->event.pressed) { switch (rgb_matrix_get_flags()) { @@ -253,7 +213,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { rgb_matrix_enable(); } return false; -#endif//DISABLE_5075_KEYCODES +#endif//DISABLE_CA5075_KEYCODES default: return true; } From fd7c8b579c39a93253bf3fe0dd2fbd41c1a1e2cf Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Thu, 23 May 2024 14:59:41 +0800 Subject: [PATCH 64/71] Update keyboards/akko/5075/info.json Co-authored-by: mjbogusz --- keyboards/akko/5075/info.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/akko/5075/info.json b/keyboards/akko/5075/info.json index bee63b12da7..657702c3c2d 100644 --- a/keyboards/akko/5075/info.json +++ b/keyboards/akko/5075/info.json @@ -167,7 +167,8 @@ {"x": 224, "y": 57, "flags": 2}, {"x": 224, "y": 64, "flags": 2} ], - "max_brightness": 180 + "max_brightness": 180, + "sleep": true }, "url": "https://www.akkogear.com", "usb": { From 1a3013abfff1c28138200978d2b34a741a3c57f9 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:18:59 +0800 Subject: [PATCH 65/71] Delete keyboards/akko/5075/rules.mk --- keyboards/akko/5075/rules.mk | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/akko/5075/rules.mk diff --git a/keyboards/akko/5075/rules.mk b/keyboards/akko/5075/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/akko/5075/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank From 45ad36f029902fb762453f4b4616262090881e22 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:24:45 +0800 Subject: [PATCH 66/71] Rename info.json to keyboard.json --- keyboards/akko/5075/{info.json => keyboard.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename keyboards/akko/5075/{info.json => keyboard.json} (100%) diff --git a/keyboards/akko/5075/info.json b/keyboards/akko/5075/keyboard.json similarity index 100% rename from keyboards/akko/5075/info.json rename to keyboards/akko/5075/keyboard.json From d31be91186ee0cf35beb19ba1364e94765951eab Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 12 Jun 2024 10:24:48 +0800 Subject: [PATCH 67/71] Update readme.md --- keyboards/akko/5075/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/5075/readme.md b/keyboards/akko/5075/readme.md index 3224bfc2f9c..7618bb4dbf3 100644 --- a/keyboards/akko/5075/readme.md +++ b/keyboards/akko/5075/readme.md @@ -21,5 +21,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 2 ways: -* **Bootmagic reset**: Hold down the Hold down the top left key (commonly programmed as *Esc*) and plug in the keyboard +* **Bootmagic reset**: Hold down the top left key (commonly programmed as *Esc*) and plug in the keyboard * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 7a5711aac98a3b5d27245bc4d3be6bfec7302873 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 26 Jun 2024 10:44:21 +0800 Subject: [PATCH 68/71] Update config.h --- keyboards/akko/5075/config.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/keyboards/akko/5075/config.h b/keyboards/akko/5075/config.h index a153878018b..a8d13e3f534 100644 --- a/keyboards/akko/5075/config.h +++ b/keyboards/akko/5075/config.h @@ -25,12 +25,6 @@ #define LED_MAC_OS_PIN C10 #define LED_WIN_LOCK_PIN C11 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* SPI Config for spi flash*/ #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 From 03d61c59949ddb8f33c5ee0f994d8054c6a2bd3c Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 26 Jun 2024 10:44:46 +0800 Subject: [PATCH 69/71] Update keyboard.json --- keyboards/akko/5075/keyboard.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/keyboards/akko/5075/keyboard.json b/keyboards/akko/5075/keyboard.json index 657702c3c2d..776ff19a8ed 100644 --- a/keyboards/akko/5075/keyboard.json +++ b/keyboards/akko/5075/keyboard.json @@ -11,6 +11,12 @@ "backing_size": 8192 } }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "dip_switch": { "pins": ["A9"] }, From a424d570839fc8285a1f7c2c504ab9a1a553f69b Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:06:16 +0800 Subject: [PATCH 70/71] Update keyboards/akko/5075/config.h Co-authored-by: Drashna Jaelre --- keyboards/akko/5075/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/akko/5075/config.h b/keyboards/akko/5075/config.h index a8d13e3f534..3b284503e55 100644 --- a/keyboards/akko/5075/config.h +++ b/keyboards/akko/5075/config.h @@ -39,4 +39,3 @@ #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO #define I2C1_OPMODE OPMODE_I2C #define I2C1_CLOCK_SPEED 400000 /* 400000 */ -// #define DISABLE_5075_KEYCODES /*If you need to change or restore the default QMK button function, please open it*/ From d519e07df1126d7b9ae30f2fc156f5a715af2721 Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Fri, 20 Sep 2024 15:08:16 +0800 Subject: [PATCH 71/71] delete via keymap. --- keyboards/akko/5075/keymaps/via/keymap.c | 90 ------------------------ keyboards/akko/5075/keymaps/via/rules.mk | 2 - 2 files changed, 92 deletions(-) delete mode 100644 keyboards/akko/5075/keymaps/via/keymap.c delete mode 100644 keyboards/akko/5075/keymaps/via/rules.mk diff --git a/keyboards/akko/5075/keymaps/via/keymap.c b/keyboards/akko/5075/keymaps/via/keymap.c deleted file mode 100644 index a58d96c502f..00000000000 --- a/keyboards/akko/5075/keymaps/via/keymap.c +++ /dev/null @@ -1,90 +0,0 @@ -/* Copyright (C) 2023 jonylee@hfd - * - * 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 - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H -// clang-format off -enum __layers { - WIN_B, - WIN_W, - WIN_FN, - MAC_B, - MAC_W, - MAC_FN -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [WIN_B] = LAYOUT( /* Base */ - KC_ESC, 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_DEL, KC_MUTE, - KC_GRV, 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_HOME, - 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_PGUP, - 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_PGDN, - 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_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [WIN_W] = LAYOUT( /* Base */ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, - _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D), - - - - [WIN_FN] = LAYOUT( /* FN */ - _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, RGB_MOD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, - _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, _______, RGB_MOD, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______, - _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), - - [MAC_B] = LAYOUT( /* Base */ - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,KC_VOLU, KC_DEL, KC_MUTE, - KC_GRV, 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_HOME, - 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_PGUP, - 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_PGDN, - 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_END, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [MAC_W] = LAYOUT( /* Base */ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, - _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D), - - [MAC_FN] = LAYOUT( /* FN */ - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_MOD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, - _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, _______, RGB_MOD, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______, - _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______, - _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI), -}; -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [WIN_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [WIN_FN] = { ENCODER_CCW_CW(RGB_VAI, RGB_VAD) }, - [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [MAC_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [MAC_FN] = { ENCODER_CCW_CW(RGB_VAI, RGB_VAD) } -}; -#endif - diff --git a/keyboards/akko/5075/keymaps/via/rules.mk b/keyboards/akko/5075/keymaps/via/rules.mk deleted file mode 100644 index f1adcab005e..00000000000 --- a/keyboards/akko/5075/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -ENCODER_MAP_ENABLE = yes