From fced377ac007d27f2650ccffbe0b18abcdcfe23d Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 30 May 2020 13:14:59 -0700 Subject: 2020 May 30 Breaking Changes Update (#9215) * Branch point for 2020 May 30 Breaking Change * Migrate `ACTION_LAYER_TOGGLE` to `TG()` (#8954) * Migrate `ACTION_MODS_ONESHOT` to `OSM()` (#8957) * Migrate `ACTION_DEFAULT_LAYER_SET` to `DF()` (#8958) * Migrate `ACTION_LAYER_MODS` to `LM()` (#8959) * Migrate `ACTION_MODS_TAP_KEY` to `MT()` (#8968) * Convert V-USB usbdrv to a submodule (#8321) * Unify Tap Hold functions and documentation (#8348) * Changing board names to prevent confusion (#8412) * Move the Keyboardio Model01 to a keyboardio/ subdir (#8499) * Move spaceman keyboards (#8830) * Migrate miscellaneous `fn_actions` entries (#8977) * Migrate `ACTION_MODS_KEY` to chained mod keycodes (#8979) * Organizing my keyboards (plaid, tartan, ergoinu) (#8537) * Refactor Lily58 to use split_common (#6260) * Refactor zinc to use split_common (#7114) * Add a message if bin/qmk doesn't work (#9000) * Fix conflicting types for 'tfp_printf' (#8269) * Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup (#6480) * Refactor and updates to TKC1800 code (#8472) * Switch to qmk forks for everything (#9019) * audio refactor: replace deprecated PLAY_NOTE_ARRAY (#8484) * Audio enable corrections (2/3) (#8903) * Split HHKB to ANSI and JP layouts and Add VIA support for each (#8582) * Audio enable corrections (Part 4) (#8974) * Fix typo from PR7114 (#9171) * Augment future branch Changelogs (#8978) * Revert "Branch point for 2020 May 30 Breaking Change" --- keyboards/2_milk/2_milk.c | 16 -------- keyboards/2_milk/2_milk.h | 26 ------------ keyboards/2_milk/config.h | 41 ------------------- keyboards/2_milk/info.json | 14 ------- keyboards/2_milk/keymaps/binary/keymap.c | 8 ---- keyboards/2_milk/keymaps/binary/readme.md | 2 - keyboards/2_milk/keymaps/copypasta/keymap.c | 8 ---- keyboards/2_milk/keymaps/copypasta/readme.md | 2 - keyboards/2_milk/keymaps/default/keymap.c | 8 ---- keyboards/2_milk/keymaps/default/readme.md | 2 - keyboards/2_milk/keymaps/emoji/config.h | 2 - keyboards/2_milk/keymaps/emoji/keymap.c | 53 ------------------------- keyboards/2_milk/keymaps/emoji/readme.md | 39 ------------------ keyboards/2_milk/keymaps/emoji/rules.mk | 2 - keyboards/2_milk/keymaps/excessbread/keymap.c | 8 ---- keyboards/2_milk/keymaps/excessbread/readme.md | 2 - keyboards/2_milk/keymaps/mikethetiger/keymap.c | 8 ---- keyboards/2_milk/keymaps/mikethetiger/readme.md | 1 - keyboards/2_milk/keymaps/mikethetiger/rules.mk | 13 ------ keyboards/2_milk/keymaps/mouse/keymap.c | 8 ---- keyboards/2_milk/keymaps/mouse/readme.md | 2 - keyboards/2_milk/readme.md | 19 --------- keyboards/2_milk/rules.mk | 26 ------------ 23 files changed, 310 deletions(-) delete mode 100644 keyboards/2_milk/2_milk.c delete mode 100644 keyboards/2_milk/2_milk.h delete mode 100644 keyboards/2_milk/config.h delete mode 100644 keyboards/2_milk/info.json delete mode 100644 keyboards/2_milk/keymaps/binary/keymap.c delete mode 100644 keyboards/2_milk/keymaps/binary/readme.md delete mode 100644 keyboards/2_milk/keymaps/copypasta/keymap.c delete mode 100644 keyboards/2_milk/keymaps/copypasta/readme.md delete mode 100644 keyboards/2_milk/keymaps/default/keymap.c delete mode 100644 keyboards/2_milk/keymaps/default/readme.md delete mode 100644 keyboards/2_milk/keymaps/emoji/config.h delete mode 100644 keyboards/2_milk/keymaps/emoji/keymap.c delete mode 100644 keyboards/2_milk/keymaps/emoji/readme.md delete mode 100644 keyboards/2_milk/keymaps/emoji/rules.mk delete mode 100644 keyboards/2_milk/keymaps/excessbread/keymap.c delete mode 100644 keyboards/2_milk/keymaps/excessbread/readme.md delete mode 100644 keyboards/2_milk/keymaps/mikethetiger/keymap.c delete mode 100644 keyboards/2_milk/keymaps/mikethetiger/readme.md delete mode 100644 keyboards/2_milk/keymaps/mikethetiger/rules.mk delete mode 100644 keyboards/2_milk/keymaps/mouse/keymap.c delete mode 100644 keyboards/2_milk/keymaps/mouse/readme.md delete mode 100644 keyboards/2_milk/readme.md delete mode 100644 keyboards/2_milk/rules.mk (limited to 'keyboards/2_milk') diff --git a/keyboards/2_milk/2_milk.c b/keyboards/2_milk/2_milk.c deleted file mode 100644 index 96071c2ad5..0000000000 --- a/keyboards/2_milk/2_milk.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Spaceman - * - * 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 "2_milk.h" diff --git a/keyboards/2_milk/2_milk.h b/keyboards/2_milk/2_milk.h deleted file mode 100644 index 7d90d2064f..0000000000 --- a/keyboards/2_milk/2_milk.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2019 Spaceman - * - * 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" - -#define LAYOUT( \ - K00, \ - K01 \ -) { \ - { K00 }, \ - { K01 } \ -} diff --git a/keyboards/2_milk/config.h b/keyboards/2_milk/config.h deleted file mode 100644 index e9a104117b..0000000000 --- a/keyboards/2_milk/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2019 Spaceman - * - * 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" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xB195 -#define DEVICE_VER 0x0001 -#define MANUFACTURER rionlion100 -#define PRODUCT 2% Milk -#define DESCRIPTION A milk themed 2% Keyboard - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 1 - -/* Milk default pinout */ -#define DIRECT_PINS { \ - {D4}, \ - {C6} \ -} -#define UNUSED_PINS - -#ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN B6 -#define RGBLED_NUM 1 -#endif diff --git a/keyboards/2_milk/info.json b/keyboards/2_milk/info.json deleted file mode 100644 index 6dc4eeaf8b..0000000000 --- a/keyboards/2_milk/info.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "keyboard_name": "2% Milk", - "keyboard_folder": "2_milk", - "url": "", - "maintainer": "rionlion100 (Spaceman)", - "width": 1, - "height": 2, - "layouts": { - "LAYOUT": { - "key_count": 2, - "layout": [ {"x": 0, "y": 0 }, {"x": 0, "y": 1 }] - } - } -} diff --git a/keyboards/2_milk/keymaps/binary/keymap.c b/keyboards/2_milk/keymaps/binary/keymap.c deleted file mode 100644 index c8df8e9ff0..0000000000 --- a/keyboards/2_milk/keymaps/binary/keymap.c +++ /dev/null @@ -1,8 +0,0 @@ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - KC_P0, - KC_P1 - ) -}; diff --git a/keyboards/2_milk/keymaps/binary/readme.md b/keyboards/2_milk/keymaps/binary/readme.md deleted file mode 100644 index 5ebcbd3e58..0000000000 --- a/keyboards/2_milk/keymaps/binary/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# Binary keymap -0 and 1 that's it diff --git a/keyboards/2_milk/keymaps/copypasta/keymap.c b/keyboards/2_milk/keymaps/copypasta/keymap.c deleted file mode 100644 index c82a6ff216..0000000000 --- a/keyboards/2_milk/keymaps/copypasta/keymap.c +++ /dev/null @@ -1,8 +0,0 @@ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - RCTL(KC_C), - RCTL(KC_V) - ) -}; diff --git a/keyboards/2_milk/keymaps/copypasta/readme.md b/keyboards/2_milk/keymaps/copypasta/readme.md deleted file mode 100644 index 6c2f4e8fbf..0000000000 --- a/keyboards/2_milk/keymaps/copypasta/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# Copy/Paste Keymap -![Picture](https://i.imgur.com/7LMZZrL.png) diff --git a/keyboards/2_milk/keymaps/default/keymap.c b/keyboards/2_milk/keymaps/default/keymap.c deleted file mode 100644 index 1f327eee9a..0000000000 --- a/keyboards/2_milk/keymaps/default/keymap.c +++ /dev/null @@ -1,8 +0,0 @@ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - KC_Z, - KC_X - ) -}; diff --git a/keyboards/2_milk/keymaps/default/readme.md b/keyboards/2_milk/keymaps/default/readme.md deleted file mode 100644 index 4482bce34a..0000000000 --- a/keyboards/2_milk/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# Default keymap for 2% Milk -![Picture](https://i.imgur.com/9PsZ6wa.png) diff --git a/keyboards/2_milk/keymaps/emoji/config.h b/keyboards/2_milk/keymaps/emoji/config.h deleted file mode 100644 index 90e4d63102..0000000000 --- a/keyboards/2_milk/keymaps/emoji/config.h +++ /dev/null @@ -1,2 +0,0 @@ -#define UNICODE_SELECTED_MODES UC_LNX, UC_OSX, UC_WIN, UC_WINC -#define TAPPING_TERM 300 \ No newline at end of file diff --git a/keyboards/2_milk/keymaps/emoji/keymap.c b/keyboards/2_milk/keymaps/emoji/keymap.c deleted file mode 100644 index 024a6a054b..0000000000 --- a/keyboards/2_milk/keymaps/emoji/keymap.c +++ /dev/null @@ -1,53 +0,0 @@ -#include QMK_KEYBOARD_H - -enum tapdance_keycodes { - TD_KEY_1, - TD_KEY_2, -}; - -void dance_key_one (qk_tap_dance_state_t *state, void *user_data) { - if (state->count == 1) { - send_unicode_hex_string("00AF 005C 005F 0028 30C4 0029 005F 002F 00AF"); // ¯\_(ツ)_/¯ - SEND_STRING(SS_TAP(X_ENTER)); - reset_tap_dance (state); - } else if (state->count == 2) { - cycle_unicode_input_mode(+1); - reset_tap_dance (state); - } -} - -void dance_key_two (qk_tap_dance_state_t *state, void *user_data) { - if (state->count == 1) { - send_unicode_hex_string("0CA0 005F 0CA0"); // ಠ_ಠ - SEND_STRING(SS_TAP(X_ENTER)); - reset_tap_dance (state); - } else if (state->count == 2) { - send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B"); // (ノಠ痊ಠ)ノ彡┻━┻ - SEND_STRING(SS_TAP(X_ENTER)); - reset_tap_dance (state); - } else if (state->count == 3) { - send_unicode_hex_string("256D 2229 256E 0028 002D 005F 002D 0029 256D 2229 256E"); // ╭∩╮(-_-)╭∩╮ - SEND_STRING(SS_TAP(X_ENTER)); - reset_tap_dance (state); - } else if (state->count == 4) { - send_unicode_hex_string("0028 3065 FFE3 0020 00B3 FFE3 0029 3065"); // (づ ̄ ³ ̄)づ - SEND_STRING(SS_TAP(X_ENTER)); - reset_tap_dance (state); - } else if (state->count == 5) { - send_unicode_hex_string("0028 FE3A FE39 FE3A 0029"); // (︺︹︺) - SEND_STRING(SS_TAP(X_ENTER)); - reset_tap_dance (state); - } -} - -qk_tap_dance_action_t tap_dance_actions[] = { - [TD_KEY_1] = ACTION_TAP_DANCE_FN(dance_key_one), - [TD_KEY_2] = ACTION_TAP_DANCE_FN(dance_key_two), -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - TD(TD_KEY_1), - TD(TD_KEY_2) - ), -}; diff --git a/keyboards/2_milk/keymaps/emoji/readme.md b/keyboards/2_milk/keymaps/emoji/readme.md deleted file mode 100644 index 1d5a08730d..0000000000 --- a/keyboards/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 `UC_LNX`. -You can change it permanently tapping 2 times the KeyOne to select the next mode. - -## Unicode Mode List -- UC_LNX -- UC_OSX -- UC_WIN -- UC_WINC - -# 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/2_milk/keymaps/emoji/rules.mk b/keyboards/2_milk/keymaps/emoji/rules.mk deleted file mode 100644 index 7a64eb9023..0000000000 --- a/keyboards/2_milk/keymaps/emoji/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -UNICODE_ENABLE = yes # Unicode -TAP_DANCE_ENABLE = yes # Tap Dance \ No newline at end of file diff --git a/keyboards/2_milk/keymaps/excessbread/keymap.c b/keyboards/2_milk/keymaps/excessbread/keymap.c deleted file mode 100644 index a01b47f271..0000000000 --- a/keyboards/2_milk/keymaps/excessbread/keymap.c +++ /dev/null @@ -1,8 +0,0 @@ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - KC_LGUI, - KC_F11 - ) -}; diff --git a/keyboards/2_milk/keymaps/excessbread/readme.md b/keyboards/2_milk/keymaps/excessbread/readme.md deleted file mode 100644 index a6535e62cf..0000000000 --- a/keyboards/2_milk/keymaps/excessbread/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# ExcessBread's keymap -requested by excessbread diff --git a/keyboards/2_milk/keymaps/mikethetiger/keymap.c b/keyboards/2_milk/keymaps/mikethetiger/keymap.c deleted file mode 100644 index 20e2292f08..0000000000 --- a/keyboards/2_milk/keymaps/mikethetiger/keymap.c +++ /dev/null @@ -1,8 +0,0 @@ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - KC_VOLU, - KC_VOLD - ) -}; diff --git a/keyboards/2_milk/keymaps/mikethetiger/readme.md b/keyboards/2_milk/keymaps/mikethetiger/readme.md deleted file mode 100644 index 677732b057..0000000000 --- a/keyboards/2_milk/keymaps/mikethetiger/readme.md +++ /dev/null @@ -1 +0,0 @@ -# mikethetiger's keymap for 2% Milk diff --git a/keyboards/2_milk/keymaps/mikethetiger/rules.mk b/keyboards/2_milk/keymaps/mikethetiger/rules.mk deleted file mode 100644 index b5f038ef23..0000000000 --- a/keyboards/2_milk/keymaps/mikethetiger/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = no # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = yes # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Custom backlighting code is used, so this should not be enabled -AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below -RGBLIGHT_ENABLE = yes # This can be enabled if a ws2812 strip is connected to the expansion port. diff --git a/keyboards/2_milk/keymaps/mouse/keymap.c b/keyboards/2_milk/keymaps/mouse/keymap.c deleted file mode 100644 index a8ba44fb46..0000000000 --- a/keyboards/2_milk/keymaps/mouse/keymap.c +++ /dev/null @@ -1,8 +0,0 @@ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - KC_BTN1, - KC_BTN2 - ) -}; diff --git a/keyboards/2_milk/keymaps/mouse/readme.md b/keyboards/2_milk/keymaps/mouse/readme.md deleted file mode 100644 index 8ecb99eddb..0000000000 --- a/keyboards/2_milk/keymaps/mouse/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# left and right mouse buttons -requested by WanderingVagrant diff --git a/keyboards/2_milk/readme.md b/keyboards/2_milk/readme.md deleted file mode 100644 index f3a85458ce..0000000000 --- a/keyboards/2_milk/readme.md +++ /dev/null @@ -1,19 +0,0 @@ -# 2% Milk - -![2%Milk](https://i.imgur.com/Ud96uXn.png) - -A 2% Meme board themed around a milk carton - -Keyboard Maintainer: Spaceman AKA:[Rionlion100](https://github.com/rionlion100) -Hardware Availability: [Open Source](https://github.com/Rionlion100/Spaceboards/tree/master/Keyboards/2%25%20Milk) - -Make example for this keyboard (after setting up your build environment): - - make 2_milk:default - -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). - -### Credits -+ Case design by Soft -+ PCB by PyroL -+ Name by jetpacktuxedo diff --git a/keyboards/2_milk/rules.mk b/keyboards/2_milk/rules.mk deleted file mode 100644 index 4e6c5f7039..0000000000 --- a/keyboards/2_milk/rules.mk +++ /dev/null @@ -1,26 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp -BOOTLOADER = caterina - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Custom backlighting code is used, so this should not be enabled -AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below -RGBLIGHT_ENABLE = yes # This can be enabled if a ws2812 strip is connected to the expansion port. -- cgit v1.2.3