diff options
| -rw-r--r-- | keyboards/duck/jetfire/readme.md | 2 | ||||
| -rw-r--r-- | keyboards/duck/octagon/keymaps/default/keymap.c (renamed from keyboards/octagon/v2/keymaps/default/keymap.c) | 28 | ||||
| -rw-r--r-- | keyboards/duck/octagon/keymaps/default/readme.md | 0 | ||||
| -rw-r--r-- | keyboards/duck/octagon/readme.md (renamed from keyboards/octagon/readme.md) | 2 | ||||
| -rw-r--r-- | keyboards/duck/octagon/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/duck/octagon/v1/config.h (renamed from keyboards/octagon/v1/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/duck/octagon/v1/info.json (renamed from keyboards/octagon/v1/info.json) | 0 | ||||
| -rw-r--r-- | keyboards/duck/octagon/v1/matrix.c (renamed from keyboards/octagon/v1/matrix.c) | 0 | ||||
| -rw-r--r-- | keyboards/duck/octagon/v1/readme.md (renamed from keyboards/octagon/v1/readme.md) | 2 | ||||
| -rw-r--r-- | keyboards/duck/octagon/v1/rules.mk (renamed from keyboards/octagon/v1/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/duck/octagon/v1/v1.c (renamed from keyboards/octagon/v1/v1.c) | 0 | ||||
| -rw-r--r-- | keyboards/duck/octagon/v1/v1.h (renamed from keyboards/octagon/v1/v1.h) | 18 | ||||
| -rw-r--r-- | keyboards/duck/octagon/v2/config.h (renamed from keyboards/octagon/v2/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/duck/octagon/v2/indicator_leds.c (renamed from keyboards/octagon/v2/indicator_leds.c) | 0 | ||||
| -rw-r--r-- | keyboards/duck/octagon/v2/indicator_leds.h (renamed from keyboards/octagon/v2/indicator_leds.h) | 0 | ||||
| -rw-r--r-- | keyboards/duck/octagon/v2/info.json (renamed from keyboards/octagon/v2/info.json) | 0 | ||||
| -rw-r--r-- | keyboards/duck/octagon/v2/matrix.c (renamed from keyboards/octagon/v2/matrix.c) | 0 | ||||
| -rw-r--r-- | keyboards/duck/octagon/v2/readme.md (renamed from keyboards/octagon/v2/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/duck/octagon/v2/rules.mk (renamed from keyboards/octagon/v2/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/duck/octagon/v2/v2.c (renamed from keyboards/octagon/v2/v2.c) | 0 | ||||
| -rw-r--r-- | keyboards/duck/octagon/v2/v2.h (renamed from keyboards/octagon/v2/v2.h) | 2 | ||||
| -rw-r--r-- | keyboards/octagon/octagon.c | 1 | ||||
| -rw-r--r-- | keyboards/octagon/octagon.h | 14 | ||||
| -rw-r--r-- | keyboards/octagon/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/octagon/v1/keymaps/default/keymap.c | 39 | ||||
| -rw-r--r-- | keyboards/octagon/v1/keymaps/default/readme.md | 8 | ||||
| -rw-r--r-- | keyboards/octagon/v2/keymaps/default/readme.md | 8 |
27 files changed, 35 insertions, 91 deletions
diff --git a/keyboards/duck/jetfire/readme.md b/keyboards/duck/jetfire/readme.md index fb5baf975..fe641e622 100644 --- a/keyboards/duck/jetfire/readme.md +++ b/keyboards/duck/jetfire/readme.md | |||
| @@ -13,6 +13,6 @@ To get into bootloader mode, hold the top top most key above the 2 navigation ke | |||
| 13 | 13 | ||
| 14 | Make example for this keyboard (after setting up your build environment): | 14 | Make example for this keyboard (after setting up your build environment): |
| 15 | 15 | ||
| 16 | make jetfire:default | 16 | make duck/jetfire:default |
| 17 | 17 | ||
| 18 | See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. | 18 | See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. |
diff --git a/keyboards/octagon/v2/keymaps/default/keymap.c b/keyboards/duck/octagon/keymaps/default/keymap.c index b3182fc23..a2029ba05 100644 --- a/keyboards/octagon/v2/keymaps/default/keymap.c +++ b/keyboards/duck/octagon/keymaps/default/keymap.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* Copyright 2017 MechMerlin <mechmerlin@gmail.com> | 1 | /* Copyright 2018 MechMerlin <mechmerlin@gmail.com> |
| 2 | * | 2 | * |
| 3 | * This program is free software: you can redistribute it and/or modify | 3 | * This program is free software: you can redistribute it and/or modify |
| 4 | * it under the terms of the GNU General Public License as published by | 4 | * it under the terms of the GNU General Public License as published by |
| @@ -15,25 +15,23 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | #define _BL 0 // Base Layer | ||
| 19 | #define _FL 1 // Fn Layer | ||
| 20 | |||
| 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 21 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 19 | /* layer 0: qwerty */ | 22 | [_BL] = LAYOUT_75_ansi(\ |
| 20 | [0] = LAYOUT_75_ansi(\ | 23 | KC_ESC, 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_PSCR, KC_PAUS, KC_DEL, |
| 21 | KC_ESC, 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_PSCR, KC_PAUS, KC_DEL, | 24 | KC_GRV, 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_HOME, |
| 22 | KC_GRV, 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_HOME, | 25 | 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_PGUP, |
| 23 | 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_PGUP, | 26 | 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_PGDN, |
| 24 | 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_PGDN, | 27 | 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_END, |
| 25 | 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_END, | 28 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FL), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), |
| 26 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), | ||
| 27 | 29 | ||
| 28 | [1] = LAYOUT_75_ansi(\ | 30 | [_FL] = LAYOUT_75_ansi(\ |
| 29 | KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 31 | KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 30 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 32 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 31 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 33 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 32 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 34 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 33 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 35 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 34 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) | 36 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), |
| 35 | }; | ||
| 36 | |||
| 37 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
| 38 | return MACRO_NONE; | ||
| 39 | }; \ No newline at end of file | 37 | }; \ No newline at end of file |
diff --git a/keyboards/duck/octagon/keymaps/default/readme.md b/keyboards/duck/octagon/keymaps/default/readme.md new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/keyboards/duck/octagon/keymaps/default/readme.md | |||
diff --git a/keyboards/octagon/readme.md b/keyboards/duck/octagon/readme.md index 5b3169424..7f5b2f7e6 100644 --- a/keyboards/octagon/readme.md +++ b/keyboards/duck/octagon/readme.md | |||
| @@ -8,4 +8,4 @@ Newest version is the [Octagon V2](http://duck0113.tistory.com/127) | |||
| 8 | 8 | ||
| 9 | Make example for this keyboard (after setting up your build environment): | 9 | Make example for this keyboard (after setting up your build environment): |
| 10 | 10 | ||
| 11 | make octagon/v2:default | 11 | make duck/octagon/v2:default |
diff --git a/keyboards/duck/octagon/rules.mk b/keyboards/duck/octagon/rules.mk new file mode 100644 index 000000000..46bd457bb --- /dev/null +++ b/keyboards/duck/octagon/rules.mk | |||
| @@ -0,0 +1 @@ | |||
| DEFAULT_FOLDER = duck/octagon/v2 \ No newline at end of file | |||
diff --git a/keyboards/octagon/v1/config.h b/keyboards/duck/octagon/v1/config.h index fbbc8999b..fbbc8999b 100644 --- a/keyboards/octagon/v1/config.h +++ b/keyboards/duck/octagon/v1/config.h | |||
diff --git a/keyboards/octagon/v1/info.json b/keyboards/duck/octagon/v1/info.json index 1feff9519..1feff9519 100644 --- a/keyboards/octagon/v1/info.json +++ b/keyboards/duck/octagon/v1/info.json | |||
diff --git a/keyboards/octagon/v1/matrix.c b/keyboards/duck/octagon/v1/matrix.c index 855534994..855534994 100644 --- a/keyboards/octagon/v1/matrix.c +++ b/keyboards/duck/octagon/v1/matrix.c | |||
diff --git a/keyboards/octagon/v1/readme.md b/keyboards/duck/octagon/v1/readme.md index 72285b1ed..f5cb2d789 100644 --- a/keyboards/octagon/v1/readme.md +++ b/keyboards/duck/octagon/v1/readme.md | |||
| @@ -9,7 +9,7 @@ Hardware Availability: Wait until GB of the next revision | |||
| 9 | 9 | ||
| 10 | Make example for this keyboard (after setting up your build environment): | 10 | Make example for this keyboard (after setting up your build environment): |
| 11 | 11 | ||
| 12 | make octagon/v1:default | 12 | make duck/octagon/v1:default |
| 13 | 13 | ||
| 14 | See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. | 14 | See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. |
| 15 | 15 | ||
diff --git a/keyboards/octagon/v1/rules.mk b/keyboards/duck/octagon/v1/rules.mk index a08695b50..a08695b50 100644 --- a/keyboards/octagon/v1/rules.mk +++ b/keyboards/duck/octagon/v1/rules.mk | |||
diff --git a/keyboards/octagon/v1/v1.c b/keyboards/duck/octagon/v1/v1.c index 258688229..258688229 100644 --- a/keyboards/octagon/v1/v1.c +++ b/keyboards/duck/octagon/v1/v1.c | |||
diff --git a/keyboards/octagon/v1/v1.h b/keyboards/duck/octagon/v1/v1.h index 3a27a078b..d89188f22 100644 --- a/keyboards/octagon/v1/v1.h +++ b/keyboards/duck/octagon/v1/v1.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #ifndef V1_H | 16 | #ifndef V1_H |
| 17 | #define V1_H | 17 | #define V1_H |
| 18 | 18 | ||
| 19 | #include "../octagon.h" | 19 | #include "quantum.h" |
| 20 | 20 | ||
| 21 | #define LAYOUT( \ | 21 | #define LAYOUT( \ |
| 22 | K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5P, \ | 22 | K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5P, \ |
| @@ -33,4 +33,20 @@ | |||
| 33 | { K1A, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, KC_NO, K1M, K1N, KC_NO, K1P }, \ | 33 | { K1A, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, KC_NO, K1M, K1N, KC_NO, K1P }, \ |
| 34 | { K0A, K0B, K0C, KC_NO, KC_NO, K0G, KC_NO, KC_NO, K0J, K0K, K0L, KC_NO, K0M, K0N, KC_NO, K0P } \ | 34 | { K0A, K0B, K0C, KC_NO, KC_NO, K0G, KC_NO, KC_NO, K0J, K0K, K0L, KC_NO, K0M, K0N, KC_NO, K0P } \ |
| 35 | } | 35 | } |
| 36 | |||
| 37 | #define LAYOUT_75_ansi( \ | ||
| 38 | K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, \ | ||
| 39 | K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4P, \ | ||
| 40 | K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3P, \ | ||
| 41 | K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2N, K2P, \ | ||
| 42 | K1A, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N, K1P, \ | ||
| 43 | K0A, K0B, K0C, K0G, K0J, K0K, K0L, K0M, K0N, K0P \ | ||
| 44 | ) { \ | ||
| 45 | { K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P }, \ | ||
| 46 | { K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, KC_NO, K4P }, \ | ||
| 47 | { K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, KC_NO, K3P }, \ | ||
| 48 | { K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, KC_NO, K2N, KC_NO, K2P }, \ | ||
| 49 | { K1A, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, KC_NO, K1M, K1N, KC_NO, K1P }, \ | ||
| 50 | { K0A, K0B, K0C, KC_NO, KC_NO, K0G, KC_NO, KC_NO, K0J, K0K, K0L, KC_NO, K0M, K0N, KC_NO, K0P } \ | ||
| 51 | } | ||
| 36 | #endif | 52 | #endif |
diff --git a/keyboards/octagon/v2/config.h b/keyboards/duck/octagon/v2/config.h index c916a30a1..c916a30a1 100644 --- a/keyboards/octagon/v2/config.h +++ b/keyboards/duck/octagon/v2/config.h | |||
diff --git a/keyboards/octagon/v2/indicator_leds.c b/keyboards/duck/octagon/v2/indicator_leds.c index c24509f51..c24509f51 100644 --- a/keyboards/octagon/v2/indicator_leds.c +++ b/keyboards/duck/octagon/v2/indicator_leds.c | |||
diff --git a/keyboards/octagon/v2/indicator_leds.h b/keyboards/duck/octagon/v2/indicator_leds.h index 9bb2c8ced..9bb2c8ced 100644 --- a/keyboards/octagon/v2/indicator_leds.h +++ b/keyboards/duck/octagon/v2/indicator_leds.h | |||
diff --git a/keyboards/octagon/v2/info.json b/keyboards/duck/octagon/v2/info.json index 7bc0c6ef9..7bc0c6ef9 100644 --- a/keyboards/octagon/v2/info.json +++ b/keyboards/duck/octagon/v2/info.json | |||
diff --git a/keyboards/octagon/v2/matrix.c b/keyboards/duck/octagon/v2/matrix.c index a63a37640..a63a37640 100644 --- a/keyboards/octagon/v2/matrix.c +++ b/keyboards/duck/octagon/v2/matrix.c | |||
diff --git a/keyboards/octagon/v2/readme.md b/keyboards/duck/octagon/v2/readme.md index 125f09f9c..125f09f9c 100644 --- a/keyboards/octagon/v2/readme.md +++ b/keyboards/duck/octagon/v2/readme.md | |||
diff --git a/keyboards/octagon/v2/rules.mk b/keyboards/duck/octagon/v2/rules.mk index 37f3938d9..37f3938d9 100644 --- a/keyboards/octagon/v2/rules.mk +++ b/keyboards/duck/octagon/v2/rules.mk | |||
diff --git a/keyboards/octagon/v2/v2.c b/keyboards/duck/octagon/v2/v2.c index 52653b37e..52653b37e 100644 --- a/keyboards/octagon/v2/v2.c +++ b/keyboards/duck/octagon/v2/v2.c | |||
diff --git a/keyboards/octagon/v2/v2.h b/keyboards/duck/octagon/v2/v2.h index 29b03211b..1487b3640 100644 --- a/keyboards/octagon/v2/v2.h +++ b/keyboards/duck/octagon/v2/v2.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #ifndef V2_H | 16 | #ifndef V2_H |
| 17 | #define V2_H | 17 | #define V2_H |
| 18 | 18 | ||
| 19 | #include "../octagon.h" | 19 | #include "quantum.h" |
| 20 | 20 | ||
| 21 | #define LAYOUT( \ | 21 | #define LAYOUT( \ |
| 22 | K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5Q, \ | 22 | K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5Q, \ |
diff --git a/keyboards/octagon/octagon.c b/keyboards/octagon/octagon.c deleted file mode 100644 index 6eb9e73b2..000000000 --- a/keyboards/octagon/octagon.c +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | #include "octagon.h" | ||
diff --git a/keyboards/octagon/octagon.h b/keyboards/octagon/octagon.h deleted file mode 100644 index d91da2eda..000000000 --- a/keyboards/octagon/octagon.h +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | #ifndef OCTAGON_H | ||
| 2 | #define OCTAGON_H | ||
| 3 | |||
| 4 | #include "quantum.h" | ||
| 5 | |||
| 6 | #ifdef KEYBOARD_octagon_v1 | ||
| 7 | #include "v1.h" | ||
| 8 | #endif | ||
| 9 | |||
| 10 | #ifdef KEYBOARD_octagon_v2 | ||
| 11 | #include "v2.h" | ||
| 12 | #endif | ||
| 13 | |||
| 14 | #endif | ||
diff --git a/keyboards/octagon/rules.mk b/keyboards/octagon/rules.mk deleted file mode 100644 index ce04362e6..000000000 --- a/keyboards/octagon/rules.mk +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | DEFAULT_FOLDER = octagon/v2 \ No newline at end of file | ||
diff --git a/keyboards/octagon/v1/keymaps/default/keymap.c b/keyboards/octagon/v1/keymaps/default/keymap.c deleted file mode 100644 index 2faf7a9fc..000000000 --- a/keyboards/octagon/v1/keymaps/default/keymap.c +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | /* Copyright 2017 MechMerlin <mechmerlin@gmail.com> | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #include "octagon.h" | ||
| 17 | |||
| 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 19 | /* layer 0: qwerty */ | ||
| 20 | [0] = LAYOUT(\ | ||
| 21 | KC_ESC, 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_PSCR, KC_PAUS, | ||
| 22 | KC_GRV, 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_HOME, | ||
| 23 | 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_PGUP, | ||
| 24 | 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_NO, KC_ENT, KC_PGDN, | ||
| 25 | 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_END, | ||
| 26 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_NO, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), | ||
| 27 | |||
| 28 | [1] = LAYOUT(\ | ||
| 29 | KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 30 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 31 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 32 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, | ||
| 33 | KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 34 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) | ||
| 35 | }; | ||
| 36 | |||
| 37 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
| 38 | return MACRO_NONE; | ||
| 39 | }; | ||
diff --git a/keyboards/octagon/v1/keymaps/default/readme.md b/keyboards/octagon/v1/keymaps/default/readme.md deleted file mode 100644 index 3a3e3db57..000000000 --- a/keyboards/octagon/v1/keymaps/default/readme.md +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | # Default Octagon Layout | ||
| 2 | |||
| 3 | This is the default implement layout for Duck Octagon V1. | ||
| 4 | |||
| 5 | |||
| 6 | ## Features | ||
| 7 | |||
| 8 | * Default QWERTY layer | ||
diff --git a/keyboards/octagon/v2/keymaps/default/readme.md b/keyboards/octagon/v2/keymaps/default/readme.md deleted file mode 100644 index d52c00129..000000000 --- a/keyboards/octagon/v2/keymaps/default/readme.md +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | # Default Octagon Layout | ||
| 2 | |||
| 3 | This is the default implement layout for Duck Octagon V2. | ||
| 4 | |||
| 5 | |||
| 6 | ## Features | ||
| 7 | |||
| 8 | * Default QWERTY layer \ No newline at end of file | ||
