From 9581289745736ce068a1040f44cec37a2ca8830d Mon Sep 17 00:00:00 2001 From: lokher Date: Tue, 13 Sep 2022 11:24:05 +0800 Subject: Remove non-Keychron keyboards --- keyboards/bastardkb/dilemma/config.h | 49 --- keyboards/bastardkb/dilemma/dilemma.c | 329 --------------------- keyboards/bastardkb/dilemma/dilemma.h | 134 --------- keyboards/bastardkb/dilemma/elitec/config.h | 37 --- keyboards/bastardkb/dilemma/elitec/info.json | 6 - keyboards/bastardkb/dilemma/elitec/rules.mk | 5 - keyboards/bastardkb/dilemma/info.json | 46 --- .../bastardkb/dilemma/keymaps/bstiq/README.md | 3 - keyboards/bastardkb/dilemma/keymaps/bstiq/config.h | 153 ---------- keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c | 224 -------------- .../bastardkb/dilemma/keymaps/default/keymap.c | 84 ------ .../bastardkb/dilemma/keymaps/drashna/config.h | 8 - .../bastardkb/dilemma/keymaps/drashna/keymap.c | 160 ---------- .../bastardkb/dilemma/keymaps/drashna/rules.mk | 8 - keyboards/bastardkb/dilemma/readme.md | 14 - keyboards/bastardkb/dilemma/rules.mk | 25 -- keyboards/bastardkb/dilemma/splinky/config.h | 46 --- keyboards/bastardkb/dilemma/splinky/halconf.h | 21 -- keyboards/bastardkb/dilemma/splinky/info.json | 6 - keyboards/bastardkb/dilemma/splinky/mcuconf.h | 23 -- keyboards/bastardkb/dilemma/splinky/rules.mk | 9 - keyboards/bastardkb/dilemma/splinky/splinky.c | 33 --- 22 files changed, 1423 deletions(-) delete mode 100644 keyboards/bastardkb/dilemma/config.h delete mode 100644 keyboards/bastardkb/dilemma/dilemma.c delete mode 100644 keyboards/bastardkb/dilemma/dilemma.h delete mode 100644 keyboards/bastardkb/dilemma/elitec/config.h delete mode 100644 keyboards/bastardkb/dilemma/elitec/info.json delete mode 100644 keyboards/bastardkb/dilemma/elitec/rules.mk delete mode 100644 keyboards/bastardkb/dilemma/info.json delete mode 100644 keyboards/bastardkb/dilemma/keymaps/bstiq/README.md delete mode 100644 keyboards/bastardkb/dilemma/keymaps/bstiq/config.h delete mode 100644 keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c delete mode 100644 keyboards/bastardkb/dilemma/keymaps/default/keymap.c delete mode 100644 keyboards/bastardkb/dilemma/keymaps/drashna/config.h delete mode 100644 keyboards/bastardkb/dilemma/keymaps/drashna/keymap.c delete mode 100644 keyboards/bastardkb/dilemma/keymaps/drashna/rules.mk delete mode 100644 keyboards/bastardkb/dilemma/readme.md delete mode 100644 keyboards/bastardkb/dilemma/rules.mk delete mode 100644 keyboards/bastardkb/dilemma/splinky/config.h delete mode 100644 keyboards/bastardkb/dilemma/splinky/halconf.h delete mode 100644 keyboards/bastardkb/dilemma/splinky/info.json delete mode 100644 keyboards/bastardkb/dilemma/splinky/mcuconf.h delete mode 100644 keyboards/bastardkb/dilemma/splinky/rules.mk delete mode 100644 keyboards/bastardkb/dilemma/splinky/splinky.c (limited to 'keyboards/bastardkb/dilemma') diff --git a/keyboards/bastardkb/dilemma/config.h b/keyboards/bastardkb/dilemma/config.h deleted file mode 100644 index af59efb709..0000000000 --- a/keyboards/bastardkb/dilemma/config.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2021 Quentin LEBASTARD - * Copyright 2022 Charly Delay (@0xcharly) - * - * 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 "config_common.h" - -/* Key matrix configuration. */ - -#define MATRIX_ROWS 8 // Rows are doubled-up. -#define MATRIX_COLS 5 - -#define DIODE_DIRECTION ROW2COL - -// Set 0 if debouncing isn't needed. -#define DEBOUNCE 5 - -/* Pointing device configuration. */ - -// Enable use of pointing device on slave split. -#define SPLIT_POINTING_ENABLE - -// Pointing device is on the right split. -#define POINTING_DEVICE_RIGHT - -// Limits the frequency that the sensor is polled for motion. -#define POINTING_DEVICE_TASK_THROTTLE_MS 10 - -// Adjust trackpad rotation. -#define POINTING_DEVICE_ROTATION_90 - -// Configure for the Cirque model used on the Dilemma. -#define CIRQUE_PINNACLE_DIAMETER_MM 35 -#define CIRQUE_PINNACLE_CURVED_OVERLAY diff --git a/keyboards/bastardkb/dilemma/dilemma.c b/keyboards/bastardkb/dilemma/dilemma.c deleted file mode 100644 index e710f3aab7..0000000000 --- a/keyboards/bastardkb/dilemma/dilemma.c +++ /dev/null @@ -1,329 +0,0 @@ -/* - * Copyright 2020 Christopher Courtney (@drashna) - * Copyright 2021 Quentin LEBASTARD - * Copyright 2022 Charly Delay (@0xcharly) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Publicw 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 "dilemma.h" - -#ifdef CONSOLE_ENABLE -# include "print.h" -#endif // CONSOLE_ENABLE - -#ifdef POINTING_DEVICE_ENABLE -# ifndef DILEMMA_MINIMUM_DEFAULT_DPI -# define DILEMMA_MINIMUM_DEFAULT_DPI 400 -# endif // DILEMMA_MINIMUM_DEFAULT_DPI - -# ifndef DILEMMA_DEFAULT_DPI_CONFIG_STEP -# define DILEMMA_DEFAULT_DPI_CONFIG_STEP 200 -# endif // DILEMMA_DEFAULT_DPI_CONFIG_STEP - -# ifndef DILEMMA_MINIMUM_SNIPING_DPI -# define DILEMMA_MINIMUM_SNIPING_DPI 200 -# endif // DILEMMA_MINIMUM_SNIPING_DPI - -# ifndef DILEMMA_SNIPING_DPI_CONFIG_STEP -# define DILEMMA_SNIPING_DPI_CONFIG_STEP 100 -# endif // DILEMMA_SNIPING_DPI_CONFIG_STEP - -// Fixed DPI for drag-scroll. -# ifndef DILEMMA_DRAGSCROLL_DPI -# define DILEMMA_DRAGSCROLL_DPI 100 -# endif // DILEMMA_DRAGSCROLL_DPI - -# ifndef DILEMMA_DRAGSCROLL_BUFFER_SIZE -# define DILEMMA_DRAGSCROLL_BUFFER_SIZE 6 -# endif // !DILEMMA_DRAGSCROLL_BUFFER_SIZE - -typedef union { - uint8_t raw; - struct { - uint8_t pointer_default_dpi : 4; // 16 steps available. - uint8_t pointer_sniping_dpi : 2; // 4 steps available. - bool is_dragscroll_enabled : 1; - bool is_sniping_enabled : 1; - } __attribute__((packed)); -} dilemma_config_t; - -static dilemma_config_t g_dilemma_config = {0}; - -/** - * \brief Set the value of `config` from EEPROM. - * - * Note that `is_dragscroll_enabled` and `is_sniping_enabled` are purposefully - * ignored since we do not want to persist this state to memory. In practice, - * this state is always written to maximize write-performances. Therefore, we - * explicitly set them to `false` in this function. - */ -static void read_dilemma_config_from_eeprom(dilemma_config_t* config) { - config->raw = eeconfig_read_kb() & 0xff; - config->is_dragscroll_enabled = false; - config->is_sniping_enabled = false; -} - -/** - * \brief Save the value of `config` to eeprom. - * - * Note that all values are written verbatim, including whether drag-scroll - * and/or sniper mode are enabled. `read_dilemma_config_from_eeprom(…)` - * resets these 2 values to `false` since it does not make sense to persist - * these across reboots of the board. - */ -static void write_dilemma_config_to_eeprom(dilemma_config_t* config) { - eeconfig_update_kb(config->raw); -} - -/** \brief Return the current value of the pointer's default DPI. */ -static uint16_t get_pointer_default_dpi(dilemma_config_t* config) { - return (uint16_t)config->pointer_default_dpi * DILEMMA_DEFAULT_DPI_CONFIG_STEP + DILEMMA_MINIMUM_DEFAULT_DPI; -} - -/** \brief Return the current value of the pointer's sniper-mode DPI. */ -static uint16_t get_pointer_sniping_dpi(dilemma_config_t* config) { - return (uint16_t)config->pointer_sniping_dpi * DILEMMA_SNIPING_DPI_CONFIG_STEP + DILEMMA_MINIMUM_SNIPING_DPI; -} - -/** \brief Set the appropriate DPI for the input config. */ -static void maybe_update_pointing_device_cpi(dilemma_config_t* config) { - if (config->is_dragscroll_enabled) { - pointing_device_set_cpi(DILEMMA_DRAGSCROLL_DPI); - } else if (config->is_sniping_enabled) { - pointing_device_set_cpi(get_pointer_sniping_dpi(config)); - } else { - pointing_device_set_cpi(get_pointer_default_dpi(config)); - } -} - -/** - * \brief Update the pointer's default DPI to the next or previous step. - * - * Increases the DPI value if `forward` is `true`, decreases it otherwise. - * The increment/decrement steps are equal to DILEMMA_DEFAULT_DPI_CONFIG_STEP. - */ -static void step_pointer_default_dpi(dilemma_config_t* config, bool forward) { - config->pointer_default_dpi += forward ? 1 : -1; - maybe_update_pointing_device_cpi(config); -} - -/** - * \brief Update the pointer's sniper-mode DPI to the next or previous step. - * - * Increases the DPI value if `forward` is `true`, decreases it otherwise. - * The increment/decrement steps are equal to DILEMMA_SNIPING_DPI_CONFIG_STEP. - */ -static void step_pointer_sniping_dpi(dilemma_config_t* config, bool forward) { - config->pointer_sniping_dpi += forward ? 1 : -1; - maybe_update_pointing_device_cpi(config); -} - -uint16_t dilemma_get_pointer_default_dpi(void) { - return get_pointer_default_dpi(&g_dilemma_config); -} - -uint16_t dilemma_get_pointer_sniping_dpi(void) { - return get_pointer_sniping_dpi(&g_dilemma_config); -} - -void dilemma_cycle_pointer_default_dpi_noeeprom(bool forward) { - step_pointer_default_dpi(&g_dilemma_config, forward); -} - -void dilemma_cycle_pointer_default_dpi(bool forward) { - step_pointer_default_dpi(&g_dilemma_config, forward); - write_dilemma_config_to_eeprom(&g_dilemma_config); -} - -void dilemma_cycle_pointer_sniping_dpi_noeeprom(bool forward) { - step_pointer_sniping_dpi(&g_dilemma_config, forward); -} - -void dilemma_cycle_pointer_sniping_dpi(bool forward) { - step_pointer_sniping_dpi(&g_dilemma_config, forward); - write_dilemma_config_to_eeprom(&g_dilemma_config); -} - -bool dilemma_get_pointer_sniping_enabled(void) { - return g_dilemma_config.is_sniping_enabled; -} - -void dilemma_set_pointer_sniping_enabled(bool enable) { - g_dilemma_config.is_sniping_enabled = enable; - maybe_update_pointing_device_cpi(&g_dilemma_config); -} - -bool dilemma_get_pointer_dragscroll_enabled(void) { - return g_dilemma_config.is_dragscroll_enabled; -} - -void dilemma_set_pointer_dragscroll_enabled(bool enable) { - g_dilemma_config.is_dragscroll_enabled = enable; - maybe_update_pointing_device_cpi(&g_dilemma_config); -} - -void pointing_device_init_kb(void) { - maybe_update_pointing_device_cpi(&g_dilemma_config); - pointing_device_init_user(); -} - -/** - * \brief Augment the pointing device behavior. - * - * Implement drag-scroll. - */ -static void pointing_device_task_dilemma(report_mouse_t* mouse_report) { - static int16_t scroll_buffer_x = 0; - static int16_t scroll_buffer_y = 0; - if (g_dilemma_config.is_dragscroll_enabled) { -# ifdef DILEMMA_DRAGSCROLL_REVERSE_X - scroll_buffer_x -= mouse_report->x; -# else - scroll_buffer_x += mouse_report->x; -# endif // DILEMMA_DRAGSCROLL_REVERSE_X -# ifdef DILEMMA_DRAGSCROLL_REVERSE_Y - scroll_buffer_y -= mouse_report->y; -# else - scroll_buffer_y += mouse_report->y; -# endif // DILEMMA_DRAGSCROLL_REVERSE_Y - mouse_report->x = 0; - mouse_report->y = 0; - if (abs(scroll_buffer_x) > DILEMMA_DRAGSCROLL_BUFFER_SIZE) { - mouse_report->h = scroll_buffer_x > 0 ? 1 : -1; - scroll_buffer_x = 0; - } - if (abs(scroll_buffer_y) > DILEMMA_DRAGSCROLL_BUFFER_SIZE) { - mouse_report->v = scroll_buffer_y > 0 ? 1 : -1; - scroll_buffer_y = 0; - } - } -} - -report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) { - if (is_keyboard_master()) { - pointing_device_task_dilemma(&mouse_report); - mouse_report = pointing_device_task_user(mouse_report); - } - return mouse_report; -} - -# if defined(POINTING_DEVICE_ENABLE) && !defined(NO_DILEMMA_KEYCODES) -/** \brief Whether SHIFT mod is enabled. */ -static bool has_shift_mod(void) { -# ifdef NO_ACTION_ONESHOT - return mod_config(get_mods()) & MOD_MASK_SHIFT; -# else - return mod_config(get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT; -# endif // NO_ACTION_ONESHOT -} -# endif // POINTING_DEVICE_ENABLE && !NO_DILEMMA_KEYCODES - -/** - * \brief Outputs the Dilemma configuration to console. - * - * Prints the in-memory configuration structure to console, for debugging. - * Includes: - * - raw value - * - drag-scroll: on/off - * - sniping: on/off - * - default DPI: internal table index/actual DPI - * - sniping DPI: internal table index/actual DPI - */ -static void debug_dilemma_config_to_console(dilemma_config_t* config) { -# ifdef CONSOLE_ENABLE - dprintf("(dilemma) process_record_kb: config = {\n" - "\traw = 0x%X,\n" - "\t{\n" - "\t\tis_dragscroll_enabled=%u\n" - "\t\tis_sniping_enabled=%u\n" - "\t\tdefault_dpi=0x%X (%u)\n" - "\t\tsniping_dpi=0x%X (%u)\n" - "\t}\n" - "}\n", - config->raw, config->is_dragscroll_enabled, config->is_sniping_enabled, config->pointer_default_dpi, get_pointer_default_dpi(config), config->pointer_sniping_dpi, get_pointer_sniping_dpi(config)); -# endif // CONSOLE_ENABLE -} - -bool process_record_kb(uint16_t keycode, keyrecord_t* record) { - if (!process_record_user(keycode, record)) { - debug_dilemma_config_to_console(&g_dilemma_config); - return false; - } -# ifdef POINTING_DEVICE_ENABLE -# ifndef NO_DILEMMA_KEYCODES - switch (keycode) { - case POINTER_DEFAULT_DPI_FORWARD: - if (record->event.pressed) { - // Step backward if shifted, forward otherwise. - dilemma_cycle_pointer_default_dpi(/* forward= */ !has_shift_mod()); - } - break; - case POINTER_DEFAULT_DPI_REVERSE: - if (record->event.pressed) { - // Step forward if shifted, backward otherwise. - dilemma_cycle_pointer_default_dpi(/* forward= */ has_shift_mod()); - } - break; - case POINTER_SNIPING_DPI_FORWARD: - if (record->event.pressed) { - // Step backward if shifted, forward otherwise. - dilemma_cycle_pointer_sniping_dpi(/* forward= */ !has_shift_mod()); - } - break; - case POINTER_SNIPING_DPI_REVERSE: - if (record->event.pressed) { - // Step forward if shifted, backward otherwise. - dilemma_cycle_pointer_sniping_dpi(/* forward= */ has_shift_mod()); - } - break; - case SNIPING_MODE: - dilemma_set_pointer_sniping_enabled(record->event.pressed); - break; - case SNIPING_MODE_TOGGLE: - if (record->event.pressed) { - dilemma_set_pointer_sniping_enabled(!dilemma_get_pointer_sniping_enabled()); - } - break; - case DRAGSCROLL_MODE: - dilemma_set_pointer_dragscroll_enabled(record->event.pressed); - break; - case DRAGSCROLL_MODE_TOGGLE: - if (record->event.pressed) { - dilemma_set_pointer_dragscroll_enabled(!dilemma_get_pointer_dragscroll_enabled()); - } - break; - } -# endif // !NO_DILEMMA_KEYCODES -# endif // POINTING_DEVICE_ENABLE - debug_dilemma_config_to_console(&g_dilemma_config); - if ((keycode >= POINTER_DEFAULT_DPI_FORWARD && keycode < DILEMMA_SAFE_RANGE) || IS_MOUSEKEY(keycode)) { - debug_dilemma_config_to_console(&g_dilemma_config); - } - return true; -} - -void eeconfig_init_kb(void) { - g_dilemma_config.raw = 0; - g_dilemma_config.pointer_default_dpi = 4; - write_dilemma_config_to_eeprom(&g_dilemma_config); - maybe_update_pointing_device_cpi(&g_dilemma_config); - eeconfig_init_user(); -} - -void matrix_init_kb(void) { - read_dilemma_config_from_eeprom(&g_dilemma_config); - matrix_init_user(); -} -#endif // POINTING_DEVICE_ENABLE diff --git a/keyboards/bastardkb/dilemma/dilemma.h b/keyboards/bastardkb/dilemma/dilemma.h deleted file mode 100644 index fbf54c804b..0000000000 --- a/keyboards/bastardkb/dilemma/dilemma.h +++ /dev/null @@ -1,134 +0,0 @@ -/** - * Copyright 2022 Charly Delay (@0xcharly) - * - * 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 "quantum.h" - -// clang-format off -#define LAYOUT_split_3x5_2( \ - k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \ - k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \ - k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \ - k30, k32, k72, k70 \ -) \ -{ \ - { k00, k01, k02, k03, k04 }, \ - { k10, k11, k12, k13, k14 }, \ - { k20, k21, k22, k23, k24 }, \ - { k30, KC_NO, k32, KC_NO, KC_NO }, \ - { k40, k41, k42, k43, k44 }, \ - { k50, k51, k52, k53, k54 }, \ - { k60, k61, k62, k63, k64 }, \ - { k70, KC_NO, k72, KC_NO, KC_NO }, \ -} -// clang-format on - -#ifdef POINTING_DEVICE_ENABLE -# ifndef NO_DILEMMA_KEYCODES -enum dilemma_keycodes { -# ifdef VIA_ENABLE - POINTER_DEFAULT_DPI_FORWARD = USER00, -# else - POINTER_DEFAULT_DPI_FORWARD = SAFE_RANGE, -# endif // VIA_ENABLE - POINTER_DEFAULT_DPI_REVERSE, - POINTER_SNIPING_DPI_FORWARD, - POINTER_SNIPING_DPI_REVERSE, - SNIPING_MODE, - SNIPING_MODE_TOGGLE, - DRAGSCROLL_MODE, - DRAGSCROLL_MODE_TOGGLE, - DILEMMA_SAFE_RANGE, -}; - -# define DPI_MOD POINTER_DEFAULT_DPI_FORWARD -# define DPI_RMOD POINTER_DEFAULT_DPI_REVERSE -# define S_D_MOD POINTER_SNIPING_DPI_FORWARD -# define S_D_RMOD POINTER_SNIPING_DPI_REVERSE -# define SNIPING SNIPING_MODE -# define SNP_TOG SNIPING_MODE_TOGGLE -# define DRGSCRL DRAGSCROLL_MODE -# define DRG_TOG DRAGSCROLL_MODE_TOGGLE -# endif // !NO_DILEMMA_KEYCODES - -/** \brief Return the current DPI value for the pointer's default mode. */ -uint16_t dilemma_get_pointer_default_dpi(void); - -/** - * \brief Update the pointer's default DPI to the next or previous step. - * - * Increases the DPI value if `forward` is `true`, decreases it otherwise. - * The increment/decrement steps are equal to DILEMMA_DEFAULT_DPI_CONFIG_STEP. - * - * The new value is persisted in EEPROM. - */ -void dilemma_cycle_pointer_default_dpi(bool forward); - -/** - * \brief Same as `dilemma_cycle_pointer_default_dpi`, but do not write to - * EEPROM. - * - * This means that reseting the board will revert the value to the last - * persisted one. - */ -void dilemma_cycle_pointer_default_dpi_noeeprom(bool forward); - -/** \brief Return the current DPI value for the pointer's sniper-mode. */ -uint16_t dilemma_get_pointer_sniping_dpi(void); - -/** - * \brief Update the pointer's sniper-mode DPI to the next or previous step. - * - * Increases the DPI value if `forward` is `true`, decreases it otherwise. - * The increment/decrement steps are equal to DILEMMA_SNIPING_DPI_CONFIG_STEP. - * - * The new value is persisted in EEPROM. - */ -void dilemma_cycle_pointer_sniping_dpi(bool forward); - -/** - * \brief Same as `dilemma_cycle_pointer_sniping_dpi`, but do not write to - * EEPROM. - * - * This means that reseting the board will revert the value to the last - * persisted one. - */ -void dilemma_cycle_pointer_sniping_dpi_noeeprom(bool forward); - -/** \brief Whether sniper-mode is enabled. */ -bool dilemma_get_pointer_sniping_enabled(void); - -/** - * \brief Enable/disable sniper mode. - * - * When sniper mode is enabled the dpi is reduced to slow down the pointer for - * more accurate movements. - */ -void dilemma_set_pointer_sniping_enabled(bool enable); - -/** \brief Whether drag-scroll is enabled. */ -bool dilemma_get_pointer_dragscroll_enabled(void); - -/** - * \brief Enable/disable drag-scroll mode. - * - * When drag-scroll mode is enabled, horizontal and vertical pointer movements - * are translated into horizontal and vertical scroll movements. - */ -void dilemma_set_pointer_dragscroll_enabled(bool enable); -#endif // POINTING_DEVICE_ENABLE diff --git a/keyboards/bastardkb/dilemma/elitec/config.h b/keyboards/bastardkb/dilemma/elitec/config.h deleted file mode 100644 index 0f26e46fdb..0000000000 --- a/keyboards/bastardkb/dilemma/elitec/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2022 Charly Delay (@0xcharly) - * - * 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 - -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { D4, C6, F5, F7 } -#define MATRIX_COL_PINS \ - { B4, B5, E6, D7, F6 } - -/* Handedness. */ -#define MASTER_RIGHT - -// To use the handedness pin, resistors need to be installed on the PCB. -// If so, uncomment the following code, and undefine MASTER_RIGHT above. -//#define SPLIT_HAND_PIN F4 -// If you've soldered the handedness pull-up on the upper side instead of the -// left one, uncomment the following line. -//#define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. - -/* serial.c configuration (for split keyboard). */ -#define SOFT_SERIAL_PIN D2 diff --git a/keyboards/bastardkb/dilemma/elitec/info.json b/keyboards/bastardkb/dilemma/elitec/info.json deleted file mode 100644 index f5916f3ab1..0000000000 --- a/keyboards/bastardkb/dilemma/elitec/info.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "keyboard_name": "Dilemma Elite-C", - "usb": { - "device_version": "1.0.0", - }, -} diff --git a/keyboards/bastardkb/dilemma/elitec/rules.mk b/keyboards/bastardkb/dilemma/elitec/rules.mk deleted file mode 100644 index e8326bcf09..0000000000 --- a/keyboards/bastardkb/dilemma/elitec/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu diff --git a/keyboards/bastardkb/dilemma/info.json b/keyboards/bastardkb/dilemma/info.json deleted file mode 100644 index 6764219969..0000000000 --- a/keyboards/bastardkb/dilemma/info.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "url": "https://bastardkb.com/dilemma", - "usb": { - "pid": "0x1835", - }, - "layouts": { - "LAYOUT_split_3x5_2": { - "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"R00", "x":11, "y":0}, - {"label":"R01", "x":12, "y":0}, - {"label":"R02", "x":13, "y":0}, - {"label":"R03", "x":14, "y":0}, - {"label":"R04", "x":15, "y":0}, - {"label":"L10", "x":0, "y":1}, - {"label":"L11", "x":1, "y":1}, - {"label":"L12", "x":2, "y":1}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1}, - {"label":"R10", "x":11, "y":1}, - {"label":"R11", "x":12, "y":1}, - {"label":"R12", "x":13, "y":1}, - {"label":"R13", "x":14, "y":1}, - {"label":"R14", "x":15, "y":1}, - {"label":"L20", "x":0, "y":2}, - {"label":"L21", "x":1, "y":2}, - {"label":"L22", "x":2, "y":2}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2}, - {"label":"R20", "x":11, "y":2}, - {"label":"R21", "x":12, "y":2}, - {"label":"R22", "x":13, "y":2}, - {"label":"R23", "x":14, "y":2}, - {"label":"R24", "x":15, "y":2}, - {"label":"L30", "x":4, "y":3}, - {"label":"L32", "x":5, "y":3}, - {"label":"R32", "x":10, "y":3}, - {"label":"R30", "x":11, "y":3} - ] - } - } -} diff --git a/keyboards/bastardkb/dilemma/keymaps/bstiq/README.md b/keyboards/bastardkb/dilemma/keymaps/bstiq/README.md deleted file mode 100644 index df1f43cbcb..0000000000 --- a/keyboards/bastardkb/dilemma/keymaps/bstiq/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Dilemma @bstiq keymap - -Inspired from Miryoku, using home-rows. diff --git a/keyboards/bastardkb/dilemma/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/keymaps/bstiq/config.h deleted file mode 100644 index b2e49c8c6e..0000000000 --- a/keyboards/bastardkb/dilemma/keymaps/bstiq/config.h +++ /dev/null @@ -1,153 +0,0 @@ -/** - * Copyright 2021 Quentin LEBASTARD - * Copyright 2022 Charly Delay (@0xcharly) - * - * 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 - -#ifdef VIA_ENABLE -/* Via configuration. */ -# define DYNAMIC_KEYMAP_LAYER_COUNT 8 -#endif // VIA_ENABLE - -/** - * Configure the global tapping term (default: 200ms). - * If you have a lot of accidental mod activations, crank up the tapping term. - * - * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term - */ -#ifndef TAPPING_TERM -# define TAPPING_TERM 160 -#endif // TAPPING_TERM - -// disable trackpad taps -// #define CIRQUE_PINNACLE_TAPPING_TERM 0 - -/** - * Enable rapid switch from tap to hold. Disable auto-repeat when pressing key - * twice, except for one-shot keys. - * - * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold - */ -#define TAPPING_FORCE_HOLD - -/* - * Tap-or-Hold decision modes. - * - * Note that the following flags behave differently when combined (ie. when 2 or - * more are enabled). - * - * See bit.ly/tap-or-hold for a visual explanation of the following tap-or-hold - * decision modes. - */ - -/** - * Faster tap-hold trigger. - * - * Without `PERMISSIVE_HOLD`, within `TAPPING_TERM`: - * Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ ae - * With `PERMISSIVE_HOLD`, within `TAPPING_TERM`: - * Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ Mod+e - * - * See docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold - */ -#define PERMISSIVE_HOLD - -/** - * Prevent normal rollover on alphas from accidentally triggering mods. - * - * Ignores key presses that interrupt a mod-tap. Must-have for Home Row mod. - * - * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`: - * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e - * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`: - * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae - * - * See docs.qmk.fm/using-qmk/software-features/tap_hold#ignore-mod-tap-interrupt - */ -#define IGNORE_MOD_TAP_INTERRUPT - -/** Dilemma-specific features. */ - -#ifdef POINTING_DEVICE_ENABLE -// Flip horizontal direction for drag-scroll. -# define DILEMMA_DRAGSCROLL_REVERSE_X -// #define DILEMMA_DRAGSCROLL_REVERSE_Y -#endif // POINTING_DEVICE_ENABLE - -/** RGB Matrix. */ - -#ifdef RGB_MATRIX_ENABLE -// Enable all animations on ARM boards since they have plenty of memory -// available for it. -# define ENABLE_RGB_MATRIX_ALPHAS_MODS -# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_BREATHING -# define ENABLE_RGB_MATRIX_BAND_SAT -# define ENABLE_RGB_MATRIX_BAND_VAL -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -# 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_RAINBOW_PINWHEELS -# define ENABLE_RGB_MATRIX_RAINDROPS -# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -# define ENABLE_RGB_MATRIX_HUE_BREATHING -# define ENABLE_RGB_MATRIX_HUE_PENDULUM -# define ENABLE_RGB_MATRIX_HUE_WAVE -# define ENABLE_RGB_MATRIX_TYPING_HEATMAP -# define ENABLE_RGB_MATRIX_DIGITAL_RAIN -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define ENABLE_RGB_MATRIX_SPLASH -# define ENABLE_RGB_MATRIX_MULTISPLASH -# define ENABLE_RGB_MATRIX_SOLID_SPLASH -# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH - -// Limit maximum brightness to keep power consumption reasonable, and avoid -// disconnects. -# undef RGB_MATRIX_MAXIMUM_BRIGHTNESS -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64 - -// Rainbow swirl as startup mode. -# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT - -// Slow swirl at startup. -# define RGB_MATRIX_STARTUP_SPD 32 - -// Startup values. -# define RGB_MATRIX_STARTUP_HUE 0 -# define RGB_MATRIX_STARTUP_SAT 255 -# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS -# define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL -#endif // RGB_MATRIX_ENABLE diff --git a/keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c b/keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c deleted file mode 100644 index f8396cb1c2..0000000000 --- a/keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c +++ /dev/null @@ -1,224 +0,0 @@ -/** - * Copyright 2021 Quentin LEBASTARD - * Copyright 2022 Charly Delay (@0xcharly) - * - * 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 - -enum bstiq_layers { - LAYER_BASE = 0, - LAYER_MBO, - LAYER_MEDIA, - LAYER_NAV, - LAYER_MOUSE, - LAYER_SYM, - LAYER_NUM, - LAYER_FUN, -}; - -// Automatically enable sniping when the mouse layer is on. -#define DILEMMA_AUTO_SNIPING_ON_LAYER LAYER_MOUSE - -#define BSP_NAV LT(LAYER_NAV, KC_BSPC) -#define ENT_MBO LT(LAYER_MBO, KC_ENT) -#define TAB_MED LT(LAYER_MEDIA, KC_TAB) -#define ESC_SYM LT(LAYER_SYM, KC_ESC) -#define SPC_NUM LT(LAYER_NUM, KC_SPC) -#define SPC_MBO LT(LAYER_MBO, KC_SPC) -#define MOUSE(KC) LT(LAYER_MOUSE, KC) - -#define USR_RDO KC_AGAIN -#define USR_PST S(KC_INS) -#define USR_CPY C(KC_INS) -#define USR_CUT S(KC_DEL) -#define USR_UND KC_UNDO - -#define MS_L KC_MS_LEFT -#define MS_R KC_MS_RIGHT -#define MS_D KC_MS_DOWN -#define MS_U KC_MS_UP - -#define WH_L KC_MS_WH_LEFT -#define WH_R KC_MS_WH_RIGHT -#define WH_D KC_MS_WH_DOWN -#define WH_U KC_MS_WH_UP - -// clang-format off -/** Convenience macro. */ -#define _KC_LAYOUT_wrapper( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \ - ...) \ - KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, \ - KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, \ - KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, \ - __VA_ARGS__ -#define KC_LAYOUT_wrapper(...) _KC_LAYOUT_wrapper(__VA_ARGS__) - -/** Base layer with BÉPO layout. */ -#define LAYOUT_LAYER_BASE_BEPO KC_LAYOUT_wrapper( \ - B, W, P, O, QUOT, DOT, V, D, L, J, \ - A, U, I, E, COMM, C, T, S, R, N, \ - Z, Y, X, SLSH, K, M, Q, G, H, F, \ - SPC_MBO, TAB_MED, ESC_SYM, SPC_NUM) - -/** Convenience key shorthands. */ -#define U_NA KC_NO // Present but not available for use. -#define U_NU KC_NO // Available but not used. - -/** Convenience row shorthands. */ -#define ________________HOME_ROW_NA________________ U_NA, U_NA, U_NA, U_NA, U_NA -#define ______________HOME_ROW_GASC_L______________ KC_LGUI, KC_LALT, KC_LSFT, KC_LCTL, U_NA -#define ______________HOME_ROW_ALGR_L______________ U_NA, KC_ALGR, U_NA, U_NA, U_NA -#define ______________HOME_ROW_GASC_R______________ U_NA, KC_LCTL, KC_LSFT, KC_LALT, KC_LGUI -#define ______________HOME_ROW_ALGR_R______________ U_NA, U_NA, U_NA, KC_ALGR, U_NA - -/** Layers. */ - -// Buttons. -#define LAYOUT_LAYER_MBO \ - ________________HOME_ROW_NA________________, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \ - ______________HOME_ROW_GASC_L______________, KC_BSPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, \ - KC_BTN3, KC_ALGR, KC_BTN2, KC_BTN1, U_NA, KC_DEL, KC_HOME, KC_PGDN, KC_PGUP, KC_END, \ - U_NA, U_NA, KC_ENT, KC_ENT - -// Media. -#define LAYOUT_LAYER_MEDIA \ - ________________HOME_ROW_NA________________, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \ - ______________HOME_ROW_GASC_L______________, U_NU, MS_L, MS_D, MS_U, MS_R, \ - ______________HOME_ROW_ALGR_L______________, U_NU, WH_L, WH_D, WH_U, WH_R, \ - U_NA, U_NA, KC_BTN1, KC_BTN3 - -// Navigation. -#define LAYOUT_LAYER_NAV \ - ________________HOME_ROW_NA________________, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, \ - ______________HOME_ROW_GASC_L______________, U_NU, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, \ - ______________HOME_ROW_ALGR_L______________, U_NU, U_NU, U_NU, U_NU, U_NU, \ - U_NA, U_NA, KC_MSTP, KC_MPLY - -// Mouse. -#define LAYOUT_LAYER_MOUSE \ - S_D_MOD, USR_PST, USR_CPY, USR_CUT, USR_UND, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \ - DPI_MOD, DRGSCRL, KC_LSFT, DRGSCRL, _______, U_NU, MS_L, MS_D, MS_U, MS_R, \ - USR_RDO, USR_PST, USR_CPY, KC_BTN3, USR_UND, U_NU, WH_L, WH_D, WH_U, WH_R, \ - KC_BTN1, KC_BTN2, KC_BTN1, KC_BTN3 - -// Symbols. -#define LAYOUT_LAYER_SYM \ - KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, ________________HOME_ROW_NA________________, \ - KC_COLN, KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, ______________HOME_ROW_GASC_R______________, \ - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_MINS, ______________HOME_ROW_ALGR_R______________, \ - KC_RPRN, KC_LPRN, U_NA, U_NA - -// Numerals. -#define LAYOUT_LAYER_NUM \ - KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, ________________HOME_ROW_NA________________, \ - KC_SCLN, KC_4, KC_5, KC_6, KC_EQL, ______________HOME_ROW_GASC_R______________, \ - KC_GRV, KC_1, KC_2, KC_3, KC_UNDS, ______________HOME_ROW_ALGR_R______________, \ - KC_0, KC_MINS, U_NA, U_NA - -// Function keys. -#define LAYOUT_LAYER_FUN \ - KC_F12, KC_F7, KC_F8, KC_F9, KC_PSCR, ________________HOME_ROW_NA________________, \ - KC_F11, KC_F4, KC_F5, KC_F6, KC_SLCK, ______________HOME_ROW_GASC_R______________, \ - KC_F10, KC_F1, KC_F2, KC_F3, KC_PAUS, ______________HOME_ROW_ALGR_R______________,\ - KC_APP, KC_TAB, U_NA, U_NA - -/** - * Add Home Row mod to a layout. - * - * Expects a 10-key per row layout. Adds support for GASC (Gui, Alt, Shift, Ctl) - * home row. The layout passed in parameter must contain at least 20 keycodes. - * - * This is meant to be used with `LAYOUT_LAYER_BASE_BEPO` defined above, eg.: - * - * HOME_ROW_MOD_GASC(LAYOUT_LAYER_BASE_BEPO) - */ -#define _HOME_ROW_MOD_GASC( \ - L00, L01, L02, L03, L04, R05, R06, R07, R08, R09, \ - L10, L11, L12, L13, L14, R15, R16, R17, R18, R19, \ - ...) \ - L00, L01, L02, L03, L04, \ - R05, R06, R07, R08, R09, \ - LGUI_T(L10), LALT_T(L11), LSFT_T(L12), LCTL_T(L13), L14, \ - R15, RCTL_T(R16), RSFT_T(R17), LALT_T(R18), RGUI_T(R19), \ - __VA_ARGS__ -#define HOME_ROW_MOD_GASC(...) _HOME_ROW_MOD_GASC(__VA_ARGS__) - -/** - * Add mouse layer keys to a layout. - * - * Expects a 10-key per row layout. The layout passed in parameter must contain - * at least 30 keycodes. - * - * This is meant to be used with `LAYOUT_LAYER_BASE_BEPO` defined above, eg.: - * - * MOUSE_MOD(LAYOUT_LAYER_BASE_BEPO) - */ -#define _MOUSE_MOD( \ - L00, L01, L02, L03, L04, R05, R06, R07, R08, R09, \ - L10, L11, L12, L13, L14, R15, R16, R17, R18, R19, \ - L20, L21, L22, L23, L24, R25, R26, R27, R28, R29, \ - ...) \ - L00, L01, L02, L03, L04, \ - R05, R06, R07, R08, R09, \ - L10, L11, L12, L13, L14, \ - R15, R16, R17, R18, R19, \ - L20, MOUSE(L21), L22, L23, L24, \ - R25, R26, R27, R28, MOUSE(R29), \ - __VA_ARGS__ -#define MOUSE_MOD(...) _MOUSE_MOD(__VA_ARGS__) - -#define LAYOUT_wrapper(...) LAYOUT_split_3x5_2(__VA_ARGS__) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [LAYER_BASE] = LAYOUT_wrapper( - MOUSE_MOD(HOME_ROW_MOD_GASC(LAYOUT_LAYER_BASE_BEPO)) - ), - [LAYER_MBO] = LAYOUT_wrapper(LAYOUT_LAYER_MBO), - [LAYER_MEDIA] = LAYOUT_wrapper(LAYOUT_LAYER_MEDIA), - [LAYER_NAV] = LAYOUT_wrapper(LAYOUT_LAYER_NAV), - [LAYER_MOUSE] = LAYOUT_wrapper(LAYOUT_LAYER_MOUSE), - [LAYER_SYM] = LAYOUT_wrapper(LAYOUT_LAYER_SYM), - [LAYER_NUM] = LAYOUT_wrapper(LAYOUT_LAYER_NUM), - [LAYER_FUN] = LAYOUT_wrapper(LAYOUT_LAYER_FUN), -}; -// clang-format on - -#if defined(POINTING_DEVICE_ENABLE) && defined(DILEMMA_AUTO_SNIPING_ON_LAYER) -layer_state_t layer_state_set_kb(layer_state_t state) { - state = layer_state_set_user(state); - dilemma_set_pointer_sniping_enabled(layer_state_cmp(state, DILEMMA_AUTO_SNIPING_ON_LAYER)); - return state; -} -#endif // POINTING_DEVICE_ENABLE && DILEMMA_AUTO_SNIPING_ON_LAYER - -#ifdef RGB_MATRIX_ENABLE -// Forward-declare this helper function since it is defined in rgb_matrix.c. -void rgb_matrix_update_pwm_buffers(void); -#endif - -void shutdown_user(void) { -#ifdef RGBLIGHT_ENABLE - rgblight_enable_noeeprom(); - rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); - rgblight_setrgb_red(); -#endif // RGBLIGHT_ENABLE -#ifdef RGB_MATRIX_ENABLE - rgb_matrix_set_color_all(RGB_RED); - rgb_matrix_update_pwm_buffers(); -#endif // RGB_MATRIX_ENABLE -} diff --git a/keyboards/bastardkb/dilemma/keymaps/default/keymap.c b/keyboards/bastardkb/dilemma/keymaps/default/keymap.c deleted file mode 100644 index 3f77ebcabb..0000000000 --- a/keyboards/bastardkb/dilemma/keymaps/default/keymap.c +++ /dev/null @@ -1,84 +0,0 @@ -/** - * Copyright 2022 Charly Delay (@0xcharly) - * - * 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 - -enum charybdis_keymap_layers { - LAYER_BASE = 0, - LAYER_NAV, - LAYER_SYM, - LAYER_NUM, -}; - -#define NAV MO(LAYER_NAV) -#define SYM MO(LAYER_SYM) - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [LAYER_BASE] = LAYOUT_split_3x5_2( - // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮ - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤ - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, - // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤ - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, - // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯ - NAV, CAPSWRD, KC_SPC, SYM - // ╰──────────────────╯ ╰──────────────────╯ - ), - - [LAYER_NAV] = LAYOUT_split_3x5_2( - // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮ - KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, XXXXXXX, KC_HOME, KC_UP, KC_END, KC_DEL, - // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤ - KC_LSFT, KC_LCTL, KC_LALT, KC_RGUI, KC_VOLD, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, - // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤ - QK_BOOT, EEP_RST, KC_MPRV, KC_MNXT, KC_MPLY, XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX, KC_ENT, - // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯ - _______, KC_LSFT, KC_SPC, _______ - // ╰──────────────────╯ ╰──────────────────╯ - ), - - [LAYER_SYM] = LAYOUT_split_3x5_2( - // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮ - KC_ESC, KC_LBRC, KC_LCBR, KC_LPRN, KC_TILD, KC_CIRC, KC_RPRN, KC_RCBR, KC_RBRC, KC_GRV, - // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤ - KC_MINS, KC_ASTR, KC_EQL, KC_UNDS, KC_DLR, KC_HASH, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT, - // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤ - KC_PLUS, KC_PIPE, KC_AT, KC_SLSH, KC_PERC, _______, KC_BSLS, KC_AMPR, KC_QUES, KC_EXLM, - // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯ - _______, KC_LSFT, KC_SPC, _______ - // ╰──────────────────╯ ╰──────────────────╯ - ), - - [LAYER_NUM] = LAYOUT_split_3x5_2( - // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮ - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, - // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤ - KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, KC_F11, KC_F12, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT, - // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤ - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, - // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯ - _______, KC_LSFT, KC_SPC, _______ - // ╰──────────────────╯ ╰──────────────────╯ - ), -}; -// clang-format on - -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, LAYER_NAV, LAYER_SYM, LAYER_NUM); -} diff --git a/keyboards/bastardkb/dilemma/keymaps/drashna/config.h b/keyboards/bastardkb/dilemma/keymaps/drashna/config.h deleted file mode 100644 index d7b1351d89..0000000000 --- a/keyboards/bastardkb/dilemma/keymaps/drashna/config.h +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#define CIRQUE_PINNACLE_TAP_ENABLE -#define POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE -#define POINTING_DEVICE_GESTURES_SCROLL_ENABLE diff --git a/keyboards/bastardkb/dilemma/keymaps/drashna/keymap.c b/keyboards/bastardkb/dilemma/keymaps/drashna/keymap.c deleted file mode 100644 index 9cd21c3c1f..0000000000 --- a/keyboards/bastardkb/dilemma/keymaps/drashna/keymap.c +++ /dev/null @@ -1,160 +0,0 @@ -/** - * Copyright 2022 Charly Delay (@0xcharly) - * - * 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 "drashna.h" - -// clang-format off -#define LAYOUT_split_3x5_2_wrapper(...) LAYOUT_split_3x5_2(__VA_ARGS__) -#define LAYOUT_split_3x5_2_base( \ - K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \ - K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ - K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \ - ) \ - LAYOUT_split_3x5_2 ( \ - K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \ - ALT_T(K11), K12, K13, K14, GUI_T(K15), LGUI_T(K16), K17, K18, K19, LALT_T(K1A), \ - CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, RCTL_T(K2A), \ - KC_SPC, BK_LWER, DL_RAIS, RSFT_T(KC_ENT) \ - ) - -#define LAYOUT_split_3x5_2_base_wrapper(...) LAYOUT_split_3x5_2_base(__VA_ARGS__) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [_DEFAULT_LAYER_1] = LAYOUT_split_3x5_2_base_wrapper( - _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, - _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, - _________________QWERTY_L3_________________, _________________QWERTY_R3_________________ - ), - - [_DEFAULT_LAYER_2] = LAYOUT_split_3x5_2_base_wrapper( - ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________, - ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________, - ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ - ), - [_DEFAULT_LAYER_3] = LAYOUT_split_3x5_2_base_wrapper( - _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, - _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, - _________________COLEMAK_L3________________, _________________COLEMAK_R3________________ - ), - - [_DEFAULT_LAYER_4] = LAYOUT_split_3x5_2_base_wrapper( - _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, - _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, - _________________DVORAK_L3_________________, _________________DVORAK_R3_________________ - ), - - [_MOUSE] = LAYOUT_split_3x5_2( - _______, _______, _______, _______, _______, KC_WH_U, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, - _______, _______, _______, _______, _______, KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, - _______, _______, _______, _______, _______, KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, - SNIPING, _______, _______, _______ - ), - [_LOWER] = LAYOUT_split_3x5_2_wrapper( - _________________LOWER_L1__________________, _________________LOWER_R1__________________, - _________________LOWER_L2__________________, _________________LOWER_R2__________________, - _________________LOWER_L3__________________, _________________LOWER_R3__________________, - _______, _______, _______, AUTO_CTN - ), - [_RAISE] = LAYOUT_split_3x5_2_wrapper( - _________________RAISE_L1__________________, _________________RAISE_R1__________________, - _________________RAISE_L2__________________, _________________RAISE_R2__________________, - _________________RAISE_L3__________________, _________________RAISE_R3__________________, - _______, _______, _______, _______ - ), - [_ADJUST] = LAYOUT_split_3x5_2_wrapper( - _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, - _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, - _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, - KC_NUKE, _______, _______, QK_BOOT - ), -}; - - -void matrix_output_unselect_delay(uint8_t line, bool key_pressed) { - for (int32_t i = 0; i < 40; i++) { - __asm__ volatile("nop" ::: "memory"); - } -} - - -#if defined(OLED_ENABLE) && defined(OLED_DISPLAY_128X128) -# ifdef UNICODE_COMMON_ENABLE -# include "process_unicode_common.h" -# include "keyrecords/unicode.h" -# endif - -extern const char PROGMEM display_border[3]; - - -extern uint32_t oled_timer; -extern bool is_oled_enabled; - - -bool oled_task_keymap(void) { - static const char PROGMEM header_image[] = { - 0, 192, 32, 16, 8, 4, 2, 1, 1, 1, 1, 1, 1, 1, 1, 3, 7, 15, 31, 63, 127, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 127, 63, 31, 15, 7, 3, 1, 1, 1, 1, 1, 1, 1, 1, 2, 4, 8, 16, 32, 192, 0, - // 0,255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 7, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 7, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,255, 0 - }; - oled_write_raw_P(header_image, sizeof(header_image)); - oled_set_cursor(7, 0); - oled_write_P(PSTR("Rock On"), true); - - render_default_layer_state(1, 1); - render_layer_state(1, 2); - render_kitty(0, 5); - render_wpm(1, 7, 5); -# if defined(POINTING_DEVICE_ENABLE) - render_pointing_dpi_status(dilemma_get_pointer_sniping_enabled() ? dilemma_get_pointer_sniping_dpi() : dilemma_get_pointer_default_dpi(), 1, 7, 6); - render_mouse_mode(17, 6); -# elif defined(WPM_ENABLE) && defined(DEBUG_MATRIX_SCAN_RATE) - render_matrix_scan_rate(1, 7, 6); -# endif - render_bootmagic_status(7, 7); - render_user_status(1, 9); - - render_mod_status(get_mods() | get_oneshot_mods(), 1, 10); - render_keylock_status(host_keyboard_led_state(), 1, 11); - render_unicode_mode(1, 12); - -// render_rgb_hsv(1, 13); - oled_set_cursor(1, 13); - // oled_write_P(PSTR("Timer:"), false); - // oled_write(get_u8_str((uint8_t)(timer_elapsed32(oled_timer) / 1000), ' '), false); - oled_write_P(PSTR("Status: "), false); - if (is_oled_enabled) { - oled_write_P(PSTR("on "), false); - } else { - oled_write_P(PSTR("off"), false); - } - - render_keylogger_status(1, 14); - - for (uint8_t i = 1; i < 15; i++) { - oled_set_cursor(0, i); - oled_write_raw_P(display_border, sizeof(display_border)); - oled_set_cursor(21, i); - oled_write_raw_P(display_border, sizeof(display_border)); - } - - static const char PROGMEM footer_image[] = {0, 3, 4, 8, 16, 32, 64, 128, 128, 128, 128, 128, 128, 128, 192, 224, 240, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 240, 224, 192, 128, 128, 128, 128, 128, 128, 128, 64, 32, 16, 8, 4, 3, 0}; - oled_set_cursor(0, 15); - oled_write_raw_P(footer_image, sizeof(footer_image)); - - return false; -} -#endif diff --git a/keyboards/bastardkb/dilemma/keymaps/drashna/rules.mk b/keyboards/bastardkb/dilemma/keymaps/drashna/rules.mk deleted file mode 100644 index 5f4afb7259..0000000000 --- a/keyboards/bastardkb/dilemma/keymaps/drashna/rules.mk +++ /dev/null @@ -1,8 +0,0 @@ -SWAP_HANDS_ENABLE = no -AUTOCORRECTION_ENABLE = yes -CAPS_WORD_ENABLE = yes -CONSOLE_ENABLE = yes -KEYLOGGER_ENABLE = no -WPM_ENABLE = yes -OLED_ENABLE = yes -OLED_DRIVER = custom diff --git a/keyboards/bastardkb/dilemma/readme.md b/keyboards/bastardkb/dilemma/readme.md deleted file mode 100644 index ecd1f9f1c9..0000000000 --- a/keyboards/bastardkb/dilemma/readme.md +++ /dev/null @@ -1,14 +0,0 @@ -# Dilemma - -A very small keyboard made for ergonomic enthusiasts. - -- Keyboard Maintainer: [Bastard Keyboards](https://github.com/Bastardkb/) -- Hardware Supported: elite-C V4, Splinky -- Hardware Availability: [Bastardkb.com](https://bastardkb.com/) - -Make example for this keyboard (after setting up your build environment): - - make bastardkb/dilemma/elitec:default - make bastardkb/dilemma/splinky:default - -See the [keyboard build instructions](http://docs.bastardkb.com/) diff --git a/keyboards/bastardkb/dilemma/rules.mk b/keyboards/bastardkb/dilemma/rules.mk deleted file mode 100644 index 499eadfdfb..0000000000 --- a/keyboards/bastardkb/dilemma/rules.mk +++ /dev/null @@ -1,25 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = no # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = no # RGB underglow is supported, but not enabled by default -RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix functionality - -POINTING_DEVICE_ENABLE = yes -POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c - -SPLIT_KEYBOARD = yes -LAYOUTS = split_3x5_2 - -DEFAULT_FOLDER = bastardkb/dilemma/splinky diff --git a/keyboards/bastardkb/dilemma/splinky/config.h b/keyboards/bastardkb/dilemma/splinky/config.h deleted file mode 100644 index 80c9e42224..0000000000 --- a/keyboards/bastardkb/dilemma/splinky/config.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2022 Charly Delay (@0xcharly) - * - * 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