From a336c2c5005251e4cb0f3a62ccabdb4cfccad915 Mon Sep 17 00:00:00 2001 From: lokher Date: Tue, 6 Dec 2022 17:10:48 +0800 Subject: Merge upstream master to 2022 Q4 breaking change --- .../kprepublic/bm43hsrgb/keymaps/bitstarr/config.h | 33 ------- .../kprepublic/bm43hsrgb/keymaps/bitstarr/keymap.c | 68 ------------- .../bm43hsrgb/keymaps/bitstarr/readme.md | 107 --------------------- keyboards/kprepublic/bm43hsrgb/rules.mk | 20 ---- 4 files changed, 228 deletions(-) delete mode 100755 keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h delete mode 100755 keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/keymap.c delete mode 100755 keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md delete mode 100755 keyboards/kprepublic/bm43hsrgb/rules.mk (limited to 'keyboards/kprepublic/bm43hsrgb') diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h deleted file mode 100755 index 50c75ee7f6..0000000000 --- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2021 bitstarr - -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 UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_WINDOWS, UNICODE_MODE_LINUX, UNICODE_MODE_MACOS -#define UNICODE_CYCLE_PERSIST false - -#ifdef RGB_DI_PIN -#undef RGBLIGHT_EFFECT_BREATHING -#undef RGBLIGHT_EFFECT_RAINBOW_MOOD -#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL -#undef RGBLIGHT_EFFECT_SNAKE -#undef RGBLIGHT_EFFECT_KNIGHT -#undef RGBLIGHT_EFFECT_CHRISTMAS -#undef RGBLIGHT_EFFECT_STATIC_GRADIENT -#undef RGBLIGHT_EFFECT_RGB_TEST -#undef RGBLIGHT_EFFECT_ALTERNATING -#undef RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/keymap.c b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/keymap.c deleted file mode 100755 index 6a4ca7550d..0000000000 --- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/keymap.c +++ /dev/null @@ -1,68 +0,0 @@ -/* Copyright 2021 bitstarr - * - * 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 - -#define WORD_BACK C(KC_LEFT) -#define WORD_FORWARD C(KC_RIGHT) - -enum layers { - _BASE, - _EXT, - _ADV, - _FN, - _UNI, - _UNI2 -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, LT(_EXT,KC_SPC), MO(_UNI), MO(_ADV), MO(_FN), KC_RCTL - ), - [_EXT] = LAYOUT( - 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_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, - KC_TRNS, KC_F11, KC_F12, KC_NO, KC_NO, KC_GRV, KC_SCLN, KC_QUOT, KC_LBRC, KC_RBRC, KC_BSLS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS - ), - [_ADV] = LAYOUT( - KC_GRV, WORD_BACK, KC_UP, WORD_FORWARD, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_NO, KC_PSCR, KC_DEL, - KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGDN, KC_END, KC_NO, - KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_MUTE, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_INS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS - ), - [_FN] = LAYOUT( - KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO - ), - [_UNI] = LAYOUT( - KC_NO, KC_NO, KC_NO, UC(L'€'), UC(L'§'), UC(L'°'), KC_NO, UC(L'ü'), KC_NO, UC(L'ö'), UC(L'–'), KC_NO, - KC_NO, UC(L'ä'), UC(L'ß'), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - MO(_UNI2), UC(L'„'), UC(L'“'), UC(L'”'), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, UC(L'…'), KC_NO, - KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, UC_NEXT - ), - [_UNI2] = LAYOUT( - KC_NO, KC_NO, KC_NO, UC(L'é'), KC_NO, KC_NO, KC_NO, UC(L'Ü'), KC_NO, UC(L'Ö'), UC(L'—'), KC_NO, - KC_NO, UC(L'Ä'), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO - ), -}; - diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md deleted file mode 100755 index 704be0e416..0000000000 --- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md +++ /dev/null @@ -1,107 +0,0 @@ -# Personal Layout of [bitstarr](https://github.com/bitstarr) - -I use an US ANSI Layout and set the OS to the US Keyboard. Since I'm german, I need to use some special characters once in a while - that's what the UNI and UNI2 Layers are for. Under Windows we have to rely on [WinCompose](https://github.com/samhocevar/wincompose) to work as intended. - - qmk compile -kb kprepublic/bm43hsrgb -km bitstarr - -## 0 Qwerty -``` -,----------------------------------------------------------------------------. -| ESC | Q | W | E | R | T | Y | U | I | O | P | Bscp | -|----------------------------------------------------------------------------+ -| Tab | A | S | D | F | G | H | J | K | L | Enter | -|----------------------------------------------------------------------------+ -| Shift | Z | X | C | V | B | N | M | , | . | / | -|----------------------------------------------------------------------------+ -| Ctrl | Win | Alt | Space | Space/EXT | UNI | ADV | FN | Ctrl | -`----------------------------------------------------------------------------' -``` - -## 1 EXT Layer -``` -EXT Layer -,----------------------------------------------------------------------------. -| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | O | - | + | -|----------------------------------------------------------------------------+ -| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | Enter | -|----------------------------------------------------------------------------+ -| Shift | F11 | F12 | | | ` | ; | ' | [ | ] | \ | -|----------------------------------------------------------------------------+ -| Ctrl | Win | Alt | Space | | | | | Ctrl | -`----------------------------------------------------------------------------' -``` - -* Numbers -* F-Keys -* Brackets, Punctuation, Special Characters - -## 2 ADV Layer -``` -ADV Layer -,----------------------------------------------------------------------------. -| ` | W→ | ↑ | W← | | | | | ⇞ | | PS | Del | -|----------------------------------------------------------------------------+ -| Tab | ← | ↓ | → | | | | ↖ | ⇟ | ↘︎ | | -|----------------------------------------------------------------------------+ -| Shift | ⏮ | ⏯ | ⏭ | 🔉 | 🔇 | 🔊 | | | | Ins | -|----------------------------------------------------------------------------+ -| Ctrl | Win | Alt | Space | | | | | Ctrl | -`----------------------------------------------------------------------------' -``` - -* Arrows, Word skips -* Print Screen, Page Up, Page Down -* Home, End, Ins, Del -* Media - -## 3 FN Layer -``` -FN Layer -,----------------------------------------------------------------------------. -| | | | | RESET | | | | | | | | -|----------------------------------------------------------------------------+ -| | | | | | | | | | | | -|----------------------------------------------------------------------------+ -| | RGB_T | RGB_M | H+ | H- | S+ | S- | B+ | B- | | | -|----------------------------------------------------------------------------+ -| | | | | | | | | | -`----------------------------------------------------------------------------' -``` - -* RGB, Toggle, Mode, Hue, Saturation, Brightness -* Reset - -## 4 UNI Layer -``` -UNI Layer -,----------------------------------------------------------------------------. -| | | | € | § | ° | | ü | | ö | – | | -|----------------------------------------------------------------------------+ -| | ä | ß | | | | | | | | | -|----------------------------------------------------------------------------+ -| UNI2 | „ | “ | ” | | | | | | … | | -|----------------------------------------------------------------------------+ -| | | | Space | Space | | | | Mode | -`----------------------------------------------------------------------------' -``` - -* Umlauts -* Punctuation -* Special Characters -* Switching [Input Modes](https://beta.docs.qmk.fm/using-qmk/software-features/feature_unicode#2-input-modes-id-input-modes) (UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_WINDOWS, UNICODE_MODE_LINUX, UNICODE_MODE_MACOS) - -## 5 UNI2 Layer -``` -UNI2 Layer -,----------------------------------------------------------------------------. -| | | | é | | | | Ü | | Ü | — | | -|----------------------------------------------------------------------------+ -| | Ä | | | | | | | | | | -|----------------------------------------------------------------------------+ -| UNI2 | | | | | | | | | | | -|----------------------------------------------------------------------------+ -| | | | Space | Space | | | | | -`----------------------------------------------------------------------------' -``` - -* Capital Umlauts \ No newline at end of file diff --git a/keyboards/kprepublic/bm43hsrgb/rules.mk b/keyboards/kprepublic/bm43hsrgb/rules.mk deleted file mode 100755 index 296559b474..0000000000 --- a/keyboards/kprepublic/bm43hsrgb/rules.mk +++ /dev/null @@ -1,20 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -KEY_LOCK_ENABLE = no -- cgit v1.2.3