diff options
author | Drashna Jaelre <drashna@live.com> | 2019-01-25 17:11:19 -0800 |
---|---|---|
committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-01-25 17:11:19 -0800 |
commit | 569ed9db9da5cdc4fc78584b51a66c7689d79806 (patch) | |
tree | a9726120b9a9acb944daf96fc7a0fcee864b1687 /keyboards/wheatfield | |
parent | 0306e487e2cd6a77ad840d0a441b478747b7ccd0 (diff) | |
download | qmk_firmware-569ed9db9da5cdc4fc78584b51a66c7689d79806.tar.gz qmk_firmware-569ed9db9da5cdc4fc78584b51a66c7689d79806.zip |
Revert Commit 1d3b9eea940908d02b6c2deda5d744a73cd838da (#4942)
Was not supposed to merge 4763 yet
This reverts commit 1d3b9eea940908d02b6c2deda5d744a73cd838da.
Diffstat (limited to 'keyboards/wheatfield')
-rwxr-xr-x | keyboards/wheatfield/blocked65/blocked65.c | 1 | ||||
-rwxr-xr-x | keyboards/wheatfield/blocked65/blocked65.h | 20 | ||||
-rwxr-xr-x | keyboards/wheatfield/blocked65/config.h | 53 | ||||
-rw-r--r-- | keyboards/wheatfield/blocked65/info.json | 13 | ||||
-rw-r--r-- | keyboards/wheatfield/blocked65/keymaps/default/keymap.c | 25 | ||||
-rw-r--r-- | keyboards/wheatfield/blocked65/keymaps/walker/config.h | 9 | ||||
-rw-r--r-- | keyboards/wheatfield/blocked65/keymaps/walker/keymap.c | 27 | ||||
-rwxr-xr-x | keyboards/wheatfield/blocked65/rules.mk | 59 |
8 files changed, 0 insertions, 207 deletions
diff --git a/keyboards/wheatfield/blocked65/blocked65.c b/keyboards/wheatfield/blocked65/blocked65.c deleted file mode 100755 index 81da8005b..000000000 --- a/keyboards/wheatfield/blocked65/blocked65.c +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include "blocked65.h" | ||
diff --git a/keyboards/wheatfield/blocked65/blocked65.h b/keyboards/wheatfield/blocked65/blocked65.h deleted file mode 100755 index 54b4485b7..000000000 --- a/keyboards/wheatfield/blocked65/blocked65.h +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | #pragma once | ||
2 | |||
3 | #include "quantum.h" | ||
4 | |||
5 | #define _x_ KC_NO | ||
6 | |||
7 | #define LAYOUT( \ | ||
8 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ | ||
9 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ | ||
10 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \ | ||
11 | K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ | ||
12 | K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \ | ||
13 | ){ \ | ||
14 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ | ||
15 | { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ | ||
16 | { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \ | ||
17 | { K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ | ||
18 | { K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, _x_, K4A, K4B, K4C, K4D, K4E }, \ | ||
19 | } | ||
20 | |||
diff --git a/keyboards/wheatfield/blocked65/config.h b/keyboards/wheatfield/blocked65/config.h deleted file mode 100755 index 36ec18f14..000000000 --- a/keyboards/wheatfield/blocked65/config.h +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | #pragma once | ||
2 | |||
3 | #include "config_common.h" | ||
4 | |||
5 | /* USB Device descriptor parameter */ | ||
6 | #define VENDOR_ID 0xFEED | ||
7 | #define PRODUCT_ID 0x6060 | ||
8 | #define DEVICE_VER 0x0001 | ||
9 | #define MANUFACTURER Dou | ||
10 | #define PRODUCT Blocked65 | ||
11 | #define DESCRIPTION 65% keyboard with arrow cluster blocker | ||
12 | |||
13 | /* key matrix size */ | ||
14 | #define MATRIX_ROWS 5 | ||
15 | #define MATRIX_COLS 15 | ||
16 | |||
17 | /* key matrix pins */ | ||
18 | #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } | ||
19 | #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 } | ||
20 | #define UNUSED_PINS | ||
21 | |||
22 | /* COL2ROW or ROW2COL */ | ||
23 | #define DIODE_DIRECTION ROW2COL | ||
24 | |||
25 | /* number of backlight levels */ | ||
26 | |||
27 | #define BACKLIGHT_PIN B6 | ||
28 | |||
29 | #ifdef BACKLIGHT_PIN | ||
30 | #define BACKLIGHT_LEVELS 6 | ||
31 | #endif | ||
32 | |||
33 | /* Set 0 if debouncing isn't needed */ | ||
34 | #define DEBOUNCING_DELAY 5 | ||
35 | |||
36 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | ||
37 | #define LOCKING_SUPPORT_ENABLE | ||
38 | |||
39 | /* Locking resynchronize hack */ | ||
40 | #define LOCKING_RESYNC_ENABLE | ||
41 | |||
42 | /* key combination for command */ | ||
43 | #define IS_COMMAND() ( \ | ||
44 | keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ | ||
45 | ) | ||
46 | |||
47 | #define RGB_DI_PIN E2 | ||
48 | #define RGBLIGHT_ANIMATIONS | ||
49 | #define RGBLED_NUM 2 | ||
50 | #define RGBLIGHT_HUE_STEP 8 | ||
51 | #define RGBLIGHT_SAT_STEP 8 | ||
52 | #define RGBLIGHT_VAL_STEP 8 | ||
53 | |||
diff --git a/keyboards/wheatfield/blocked65/info.json b/keyboards/wheatfield/blocked65/info.json deleted file mode 100644 index e3f9c360b..000000000 --- a/keyboards/wheatfield/blocked65/info.json +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | { | ||
2 | "keyboard_name": "Wheat Field blocked 65% keyboard", | ||
3 | "url": "", | ||
4 | "maintainer": "qmk", | ||
5 | "bootloader": "", | ||
6 | "width": 16, | ||
7 | "height": 5, | ||
8 | "layouts": { | ||
9 | "LAYOUT": { | ||
10 | "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"PrScr", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Del", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Fn", "x":10, "y":4, "w":1.25}, {"label":"Alt", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] | ||
11 | } | ||
12 | } | ||
13 | } | ||
diff --git a/keyboards/wheatfield/blocked65/keymaps/default/keymap.c b/keyboards/wheatfield/blocked65/keymaps/default/keymap.c deleted file mode 100644 index 9891d2f63..000000000 --- a/keyboards/wheatfield/blocked65/keymaps/default/keymap.c +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | #include QMK_KEYBOARD_H | ||
2 | |||
3 | #define RAISE MO(_RAISE) | ||
4 | |||
5 | enum layers { | ||
6 | _QWERTY, | ||
7 | _RAISE | ||
8 | }; | ||
9 | |||
10 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
11 | |||
12 | [_QWERTY] = LAYOUT( | ||
13 | KC_GESC, 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_BSPC, KC_INSERT, \ | ||
14 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, \ | ||
15 | KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, \ | ||
16 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, \ | ||
17 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, RAISE, KC_LEFT, KC_DOWN, KC_RIGHT), | ||
18 | |||
19 | [_RAISE] = LAYOUT( | ||
20 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_PSCR, \ | ||
21 | KC_TRNS, KC_NO, KC_UP, KC_NO, RGB_TOG,RGB_VAI,RGB_HUI,RGB_SAI,KC_INS, RESET, KC_PSCR, KC_SLCK, KC_PAUS, KC_BSLS, KC_SLCK, \ | ||
22 | KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,RGB_MOD,RGB_VAD,RGB_HUD,RGB_SAD,KC_NO, KC_NO, KC_F14, KC_F15, KC_INS, KC_HOME, \ | ||
23 | KC_LSFT, KC_MPRV, KC_MPLY, KC_MNXT,KC_NO, BL_TOGG,KC_NO, KC_MUTE,KC_VOLD, KC_VOLU, KC_NO, KC_RSFT, RGB_MOD, KC_END, \ | ||
24 | KC_LCTL, KC_LGUI, KC_LALT, RESET, KC_RALT, KC_TRNS, KC_HOME, BL_STEP, KC_END) | ||
25 | }; | ||
diff --git a/keyboards/wheatfield/blocked65/keymaps/walker/config.h b/keyboards/wheatfield/blocked65/keymaps/walker/config.h deleted file mode 100644 index e7c26d1d0..000000000 --- a/keyboards/wheatfield/blocked65/keymaps/walker/config.h +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | #pragma once | ||
2 | |||
3 | #define RGB_DI_PIN E2 | ||
4 | #define RGBLIGHT_ANIMATIONS | ||
5 | #undef RGBLED_NUM | ||
6 | #define RGBLED_NUM 72 | ||
7 | #define RGBLIGHT_HUE_STEP 8 | ||
8 | #define RGBLIGHT_SAT_STEP 8 | ||
9 | #define RGBLIGHT_VAL_STEP 8 | ||
diff --git a/keyboards/wheatfield/blocked65/keymaps/walker/keymap.c b/keyboards/wheatfield/blocked65/keymaps/walker/keymap.c deleted file mode 100644 index 3dc7a7dbd..000000000 --- a/keyboards/wheatfield/blocked65/keymaps/walker/keymap.c +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | #include QMK_KEYBOARD_H | ||
2 | |||
3 | #define RAISE MO(_RAISE) | ||
4 | |||
5 | enum layers { | ||
6 | _QWERTY, | ||
7 | _RAISE | ||
8 | }; | ||
9 | |||
10 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
11 | |||
12 | [_QWERTY] = LAYOUT( | ||
13 | KC_GESC, 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_BSPC, KC_INSERT, \ | ||
14 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, \ | ||
15 | KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, \ | ||
16 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, \ | ||
17 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, RAISE, KC_LEFT, KC_DOWN, KC_RIGHT), | ||
18 | |||
19 | [_RAISE] = LAYOUT( | ||
20 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_PSCR, \ | ||
21 | KC_TRNS, KC_NO, KC_UP, KC_NO, RGB_TOG,RGB_VAI,RGB_HUI,RGB_SAI,KC_INS, RESET, KC_PSCR, KC_SLCK, KC_PAUS, KC_BSLS, KC_SLCK, \ | ||
22 | KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,RGB_MOD,RGB_VAD,RGB_HUD,RGB_SAD,KC_NO, KC_NO, KC_F14, KC_F15, KC_INS, KC_HOME, \ | ||
23 | KC_LSFT, KC_MPRV, KC_MPLY, KC_MNXT,KC_NO, BL_TOGG,KC_NO, KC_MUTE,KC_VOLD, KC_VOLU, KC_NO, KC_RSFT, RGB_MOD, KC_END, \ | ||
24 | KC_LCTL, KC_LGUI, KC_LALT, RESET, KC_RALT, KC_TRNS, KC_HOME, BL_STEP, KC_END) | ||
25 | |||
26 | }; | ||
27 | |||
diff --git a/keyboards/wheatfield/blocked65/rules.mk b/keyboards/wheatfield/blocked65/rules.mk deleted file mode 100755 index 86525031a..000000000 --- a/keyboards/wheatfield/blocked65/rules.mk +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | # MCU name | ||
2 | MCU = atmega32u4 | ||
3 | |||
4 | # Processor frequency. | ||
5 | # This will define a symbol, F_CPU, in all source code files equal to the | ||
6 | # processor frequency in Hz. You can then use this symbol in your source code to | ||
7 | # calculate timings. Do NOT tack on a 'UL' at the end, this will be done | ||
8 | # automatically to create a 32-bit value in your source code. | ||
9 | # | ||
10 | # This will be an integer division of F_USB below, as it is sourced by | ||
11 | # F_USB after it has run through any CPU prescalers. Note that this value | ||
12 | # does not *change* the processor frequency - it should merely be updated to | ||
13 | # reflect the processor speed set externally so that the code can use accurate | ||
14 | # software delays. | ||
15 | F_CPU = 16000000 | ||
16 | |||
17 | # | ||
18 | # LUFA specific | ||
19 | # | ||
20 | # Target architecture (see library "Board Types" documentation). | ||
21 | ARCH = AVR8 | ||
22 | |||
23 | # Input clock frequency. | ||
24 | # This will define a symbol, F_USB, in all source code files equal to the | ||
25 | # input clock frequency (before any prescaling is performed) in Hz. This value may | ||
26 | # differ from F_CPU if prescaling is used on the latter, and is required as the | ||
27 | # raw input clock is fed directly to the PLL sections of the AVR for high speed | ||
28 | # clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' | ||
29 | # at the end, this will be done automatically to create a 32-bit value in your | ||
30 | # source code. | ||
31 | # | ||
32 | # If no clock division is performed on the input clock inside the AVR (via the | ||
33 | # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. | ||
34 | F_USB = $(F_CPU) | ||
35 | |||
36 | # Interrupt driven control endpoint task(+60) | ||
37 | OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT | ||
38 | |||
39 | BOOTLOADER = atmel-dfu | ||
40 | |||
41 | # Boot Section Size in *bytes* | ||
42 | # OPT_DEFS += -DBOOTLOADER_SIZE=4096 | ||
43 | |||
44 | # Build Options | ||
45 | # change yes to no to disable | ||
46 | # | ||
47 | BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) | ||
48 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) | ||
49 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | ||
50 | CONSOLE_ENABLE = no # Console for debug(+400) | ||
51 | COMMAND_ENABLE = yes # Commands for debug and configuration | ||
52 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | ||
53 | NKRO_ENABLE = yes # USB Nkey Rollover | ||
54 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default | ||
55 | RGBLIGHT_ENABLE = yes | ||
56 | MIDI_ENABLE = no # MIDI controls | ||
57 | UNICODE_ENABLE = no # Unicode | ||
58 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | ||
59 | AUDIO_ENABLE = no # Audio output on port C6 | ||