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 --- keyboards/spaceman/2_milk/keymaps/emoji/config.h | 2 -- keyboards/spaceman/2_milk/keymaps/emoji/readme.md | 39 ----------------------- keyboards/spaceman/2_milk/keymaps/encg/config.h | 20 ------------ keyboards/spaceman/2_milk/keymaps/encg/readme.md | 26 --------------- 4 files changed, 87 deletions(-) delete mode 100644 keyboards/spaceman/2_milk/keymaps/emoji/config.h delete mode 100644 keyboards/spaceman/2_milk/keymaps/emoji/readme.md delete mode 100644 keyboards/spaceman/2_milk/keymaps/encg/config.h delete mode 100644 keyboards/spaceman/2_milk/keymaps/encg/readme.md (limited to 'keyboards/spaceman/2_milk/keymaps') diff --git a/keyboards/spaceman/2_milk/keymaps/emoji/config.h b/keyboards/spaceman/2_milk/keymaps/emoji/config.h deleted file mode 100644 index a564c44a29..0000000000 --- a/keyboards/spaceman/2_milk/keymaps/emoji/config.h +++ /dev/null @@ -1,2 +0,0 @@ -#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_MACOS, UNICODE_MODE_WINDOWS, UNICODE_MODE_WINCOMPOSE -#define TAPPING_TERM 300 \ No newline at end of file diff --git a/keyboards/spaceman/2_milk/keymaps/emoji/readme.md b/keyboards/spaceman/2_milk/keymaps/emoji/readme.md deleted file mode 100644 index 43b7dc4257..0000000000 --- a/keyboards/spaceman/2_milk/keymaps/emoji/readme.md +++ /dev/null @@ -1,39 +0,0 @@ -# Emoji Keymap -![Picture](https://i.imgur.com/1zEZ9Lq.png) - -# Unicode Setup - -Unicode input in QMK works by inputting a sequence of characters to the -OS, sort of like a macro. Unfortunately, the way this is done differs -for each platform. Specifically, each platform requires a different -combination of keys to trigger Unicode input. Therefore, a -corresponding input mode has to be set in QMK. - -Documentation: [Feature Unicode](https://beta.docs.qmk.fm/features/feature_unicode#input-modes) - -On this keymap the default unicode mode it's `UNICODE_MODE_LINUX`. -You can change it permanently tapping 2 times the KeyOne to select the next mode. - -## Unicode Mode List -- UNICODE_MODE_LINUX -- UNICODE_MODE_MACOS -- UNICODE_MODE_WINDOWS -- UNICODE_MODE_WINCOMPOSE - -# Keymap -To add more functionality to this Minimal Keyboard, -it's implemented the tap dance feature, so pressing the same key -multiples times will produce different emojis. - -## Key One - -- 1 Tap: `¯\_(ツ)_/¯` -- 2 Taps: Switch Unicode Input Type - -## Key Two - -- 1 Tap: `ಠ_ಠ` -- 2 Taps: `(ノಠ痊ಠ)ノ彡┻━┻` -- 3 Taps: `╭∩╮(-_-)╭∩╮` -- 4 Taps: `(づ￣ ³￣)づ` -- 5 Taps: `(︺︹︺)` \ No newline at end of file diff --git a/keyboards/spaceman/2_milk/keymaps/encg/config.h b/keyboards/spaceman/2_milk/keymaps/encg/config.h deleted file mode 100644 index abb80c2a34..0000000000 --- a/keyboards/spaceman/2_milk/keymaps/encg/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 encg - * - * 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_MACOS, UNICODE_MODE_WINCOMPOSE -#define UNICODE_CYCLE_PERSIST true diff --git a/keyboards/spaceman/2_milk/keymaps/encg/readme.md b/keyboards/spaceman/2_milk/keymaps/encg/readme.md deleted file mode 100644 index 73232ec32f..0000000000 --- a/keyboards/spaceman/2_milk/keymaps/encg/readme.md +++ /dev/null @@ -1,26 +0,0 @@ -# encg's Keymap - -## What is this? - -A simple slot machine emulator for the [2% Milk Keyboard](https://github.com/Spaceman/SpaceboardsHardware/tree/master/Keyboards/2%25%20Milk). This idea is based on the [implementation by /u/ln8r on /r/mechanicalkeyboards](https://www.reddit.com/r/MechanicalKeyboards/comments/hcw21b/2_milk_slot_machine/). - -## How does it work? - -The top button outputs all possible winning emoji combinations followed by a corresponding "score." Emojis are output one-by-one with a short delay to simulate the "slots" feel. - -![IMG](https://i.imgur.com/rUc3IOn.gif) - -The bottom button outputs 3 random emojis one by one. The random function takes `timer_read()` as its seed value [(referenced here)](https://beta.docs.qmk.fm/developing-qmk/qmk-reference/ref_functions#software-timers). - -![IMG](https://i.imgur.com/4EREsIq.png) - -## Unicode Setup - -This keymap's default unicode input mode is `UNICODE_MODE_WINCOMPOSE` which requires [WinCompose](https://github.com/samhocevar/wincompose). For other OSes, see [QMK documentation on unicode input modes](https://docs.qmk.fm/#/feature_unicode?id=input-modes). - -## Ideas for the future - -- [ ] Factor in emoji hierarchy into RNG algorithm -- [ ] Random/Wildcard emoji -- [ ] Keep a count for winng combinations -- [ ] Implement tap dance for easily switching unicode input types -- cgit v1.2.3