From 60b4ee1df37d2436e3fa9479c9bcaea72abcdcc0 Mon Sep 17 00:00:00 2001
From: yfuku <30647434+yfuku@users.noreply.github.com>
Date: Tue, 28 Dec 2021 12:34:24 +0900
Subject: Move to organization folder (#15481)
* move directory
* fix
* move wings42 to dailycraft
* Adjust wings42 to work with organization folder.
---
keyboards/wings42/rev2/keymaps/default/keymap.c | 81 ---------
keyboards/wings42/rev2/keymaps/default/readme.md | 1 -
keyboards/wings42/rev2/keymaps/via/config.h | 20 ---
keyboards/wings42/rev2/keymaps/via/keymap.c | 218 -----------------------
keyboards/wings42/rev2/keymaps/via/rules.mk | 2 -
5 files changed, 322 deletions(-)
delete mode 100644 keyboards/wings42/rev2/keymaps/default/keymap.c
delete mode 100644 keyboards/wings42/rev2/keymaps/default/readme.md
delete mode 100644 keyboards/wings42/rev2/keymaps/via/config.h
delete mode 100644 keyboards/wings42/rev2/keymaps/via/keymap.c
delete mode 100644 keyboards/wings42/rev2/keymaps/via/rules.mk
(limited to 'keyboards/wings42/rev2/keymaps')
diff --git a/keyboards/wings42/rev2/keymaps/default/keymap.c b/keyboards/wings42/rev2/keymaps/default/keymap.c
deleted file mode 100644
index df572a6f5a..0000000000
--- a/keyboards/wings42/rev2/keymaps/default/keymap.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * 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 layer_number {
- _QWERTY = 0,
- _RAISE,
- _LOWER,
- _ADJUST,
-};
-
-#define KC_G_TAB LGUI_T(KC_TAB)
-#define KC_G_BS LGUI_T(KC_BSPC)
-#define KC_L_SPC LT(_LOWER, KC_SPC)
-#define KC_R_ENT LT(_RAISE, KC_ENT)
-#define KC_S_JA LSFT_T(KC_LANG1)
-#define KC_S_EN LSFT_T(KC_LANG2)
-#define KC_A_DEL ALT_T(KC_DEL)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_QWERTY] = LAYOUT_split_3x6_3_2(
- //,--------+--------+--------+--------+--------+--------. ,--------+---------+--------+---------+--------+--------.
- KC_ESC , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_MINS,
- //|--------+--------+--------+--------+--------+--------| |--------+---------+--------+---------+--------+--------|
- KC_G_TAB, KC_A , KC_S , KC_D , KC_F , KC_G , KC_BSPC, KC_BSPC, KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_G_BS,
- //|--------+--------+--------+--------+--------+--------| |--------+---------+--------+---------+--------+--------|
- KC_LCTL, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_DEL , KC_DEL , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RCTL,
- //`--------+--------+--------+--------+--------+--------/ \--------+---------+--------+---------+--------+--------'
- KC_A_DEL,KC_S_EN ,KC_L_SPC, KC_R_ENT, KC_S_JA , KC_A_DEL
- // `+--------+--------+--------' `--------+---------+--------+'
- ),
-
- [_RAISE] = LAYOUT_split_3x6_3_2(
- //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
- _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE, KC_AT , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD, _______, _______, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_GRV , KC_RPRN,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- _______, _______, _______, _______, KC_LCBR, KC_LBRC, _______, _______, KC_RBRC, KC_RCBR, _______, _______, _______, _______,
- //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
- _______, _______, _______, _______, _______, RESET
- // `+--------+--------+--------' `--------+-------+--------+'
- ),
-
- [_LOWER] = LAYOUT_split_3x6_3_2(
- //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
- KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- _______, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , _______, _______, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , _______,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , _______, _______, _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______,
- //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
- RESET , _______, _______, _______, _______, _______
- // `+--------+--------+--------' `--------+--------+--------+'
- ),
-
- [_ADJUST] = LAYOUT_split_3x6_3_2(
- //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
- _______, _______, _______, _______, _______, _______
- // `+--------+--------+--------' `--------+--------+--------+'
- ),
-};
diff --git a/keyboards/wings42/rev2/keymaps/default/readme.md b/keyboards/wings42/rev2/keymaps/default/readme.md
deleted file mode 100644
index d99098ad0c..0000000000
--- a/keyboards/wings42/rev2/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for wings42
diff --git a/keyboards/wings42/rev2/keymaps/via/config.h b/keyboards/wings42/rev2/keymaps/via/config.h
deleted file mode 100644
index 3e0c8d146a..0000000000
--- a/keyboards/wings42/rev2/keymaps/via/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * 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 ENCODERS_PAD_A { B5, B6 }
-#define ENCODERS_PAD_B { B4, B2 }
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/wings42/rev2/keymaps/via/keymap.c b/keyboards/wings42/rev2/keymaps/via/keymap.c
deleted file mode 100644
index e6b4ef840a..0000000000
--- a/keyboards/wings42/rev2/keymaps/via/keymap.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * 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 layer_number {
- _QWERTY = 0,
- _RAISE,
- _LOWER,
- _ADJUST,
-};
-
-#define KC_G_TAB LGUI_T(KC_TAB)
-#define KC_G_BS LGUI_T(KC_BSPC)
-#define KC_L_SPC LT(_LOWER, KC_SPC)
-#define KC_R_ENT LT(_RAISE, KC_ENT)
-#define KC_S_JA LSFT_T(KC_LANG1)
-#define KC_S_EN LSFT_T(KC_LANG2)
-#define KC_A_DEL ALT_T(KC_DEL)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_QWERTY] = LAYOUT_split_3x6_3_2(
- //,--------+--------+--------+--------+--------+--------. ,--------+---------+--------+---------+--------+--------.
- KC_ESC , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_MINS,
- //|--------+--------+--------+--------+--------+--------| |--------+---------+--------+---------+--------+--------|
- KC_G_TAB, KC_A , KC_S , KC_D , KC_F , KC_G , KC_BSPC, KC_BSPC, KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_G_BS,
- //|--------+--------+--------+--------+--------+--------| |--------+---------+--------+---------+--------+--------|
- KC_LCTL, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_DEL , KC_DEL , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RCTL,
- //`--------+--------+--------+--------+--------+--------/ \--------+---------+--------+---------+--------+--------'
- KC_A_DEL,KC_S_EN ,KC_L_SPC, KC_R_ENT, KC_S_JA , KC_A_DEL
- // `+--------+--------+--------' `--------+---------+--------+'
- ),
-
- [_RAISE] = LAYOUT_split_3x6_3_2(
- //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
- _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE, KC_AT , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD, _______, _______, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_GRV , KC_RPRN,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- _______, _______, _______, _______, KC_LCBR, KC_LBRC, _______, _______, KC_RBRC, KC_RCBR, _______, _______, _______, _______,
- //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
- _______, _______, _______, _______, _______, RESET
- // `+--------+--------+--------' `--------+-------+--------+'
- ),
-
- [_LOWER] = LAYOUT_split_3x6_3_2(
- //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
- KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- _______, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , _______, _______, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , _______,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , _______, _______, _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______,
- //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
- RESET , _______, _______, _______, _______, _______
- // `+--------+--------+--------' `--------+--------+--------+'
- ),
-
- [_ADJUST] = LAYOUT_split_3x6_3_2(
- //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
- _______, _______, _______, _______, _______, _______
- // `+--------+--------+--------' `--------+--------+--------+'
- ),
-};
-
-keyevent_t encoder1_ccw = {
- .key = (keypos_t){.row = 4, .col = 0},
- .pressed = false
-};
-
-keyevent_t encoder1_cw = {
- .key = (keypos_t){.row = 4, .col = 1},
- .pressed = false
-};
-
-keyevent_t encoder2_ccw = {
- .key = (keypos_t){.row = 4, .col = 2},
- .pressed = false
-};
-
-keyevent_t encoder2_cw = {
- .key = (keypos_t){.row = 4, .col = 3},
- .pressed = false
-};
-
-keyevent_t encoder3_ccw = {
- .key = (keypos_t){.row = 9, .col = 1},
- .pressed = false
-};
-
-keyevent_t encoder3_cw = {
- .key = (keypos_t){.row = 9, .col = 0},
- .pressed = false
-};
-
-keyevent_t encoder4_ccw = {
- .key = (keypos_t){.row = 9, .col = 3},
- .pressed = false
-};
-
-keyevent_t encoder4_cw = {
- .key = (keypos_t){.row = 9, .col = 2},
- .pressed = false
-};
-
-
-void matrix_scan_user(void) {
- if (IS_PRESSED(encoder1_ccw)) {
- encoder1_ccw.pressed = false;
- encoder1_ccw.time = (timer_read() | 1);
- action_exec(encoder1_ccw);
- }
-
- if (IS_PRESSED(encoder1_cw)) {
- encoder1_cw.pressed = false;
- encoder1_cw.time = (timer_read() | 1);
- action_exec(encoder1_cw);
- }
-
- if (IS_PRESSED(encoder2_ccw)) {
- encoder2_ccw.pressed = false;
- encoder2_ccw.time = (timer_read() | 1);
- action_exec(encoder2_ccw);
- }
-
- if (IS_PRESSED(encoder2_cw)) {
- encoder2_cw.pressed = false;
- encoder2_cw.time = (timer_read() | 1);
- action_exec(encoder2_cw);
- }
-
- if (IS_PRESSED(encoder3_ccw)) {
- encoder3_ccw.pressed = false;
- encoder3_ccw.time = (timer_read() | 1);
- action_exec(encoder3_ccw);
- }
-
- if (IS_PRESSED(encoder3_cw)) {
- encoder3_cw.pressed = false;
- encoder3_cw.time = (timer_read() | 1);
- action_exec(encoder3_cw);
- }
-
- if (IS_PRESSED(encoder4_ccw)) {
- encoder4_ccw.pressed = false;
- encoder4_ccw.time = (timer_read() | 1);
- action_exec(encoder4_ccw);
- }
-
- if (IS_PRESSED(encoder4_cw)) {
- encoder4_cw.pressed = false;
- encoder4_cw.time = (timer_read() | 1);
- action_exec(encoder4_cw);
- }
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
- if (index == 0) {
- if (clockwise) {
- encoder1_cw.pressed = true;
- encoder1_cw.time = (timer_read() | 1);
- action_exec(encoder1_cw);
- } else {
- encoder1_ccw.pressed = true;
- encoder1_ccw.time = (timer_read() | 1);
- action_exec(encoder1_ccw);
- }
- } else if (index == 1) {
- if (clockwise) {
- encoder2_cw.pressed = true;
- encoder2_cw.time = (timer_read() | 1);
- action_exec(encoder2_cw);
- } else {
- encoder2_ccw.pressed = true;
- encoder2_ccw.time = (timer_read() | 1);
- action_exec(encoder2_ccw);
- }
- } else if (index == 2) {
- if (clockwise) {
- encoder3_cw.pressed = true;
- encoder3_cw.time = (timer_read() | 1);
- action_exec(encoder3_cw);
- } else {
- encoder3_ccw.pressed = true;
- encoder3_ccw.time = (timer_read() | 1);
- action_exec(encoder3_ccw);
- }
- } else if (index == 3) {
- if (clockwise) {
- encoder4_cw.pressed = true;
- encoder4_cw.time = (timer_read() | 1);
- action_exec(encoder4_cw);
- } else {
- encoder4_ccw.pressed = true;
- encoder4_ccw.time = (timer_read() | 1);
- action_exec(encoder4_ccw);
- }
- }
-
- return true;
-}
diff --git a/keyboards/wings42/rev2/keymaps/via/rules.mk b/keyboards/wings42/rev2/keymaps/via/rules.mk
deleted file mode 100644
index eea5e1e2a2..0000000000
--- a/keyboards/wings42/rev2/keymaps/via/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-ENCODER_ENABLE = yes
-VIA_ENABLE = yes
--
cgit v1.2.1