Putting my ducks in a row: Octagon V1/V2 (#3765)

* Move octagon directory into duck diretory and fix as many compile issues as I can

* fix formatting

* fix layout75 matrix

* edit readme for build instructions

27 files changed, 35 insertions, 91 deletions

diff --git a/keyboards/duck/jetfire/readme.md b/keyboards/duck/jetfire/readme.md
index fb5baf975b..fe641e622f 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
 
 Make example for this keyboard (after setting up your build environment):
 
-    make jetfire:default
+    make duck/jetfire:default
 
 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 b3182fc239..a2029ba051 100644
--- a/keyboards/octagon/v2/keymaps/default/keymap.c
+++ b/keyboards/duck/octagon/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2017 MechMerlin <mechmerlin@gmail.com>
+/* Copyright 2018 MechMerlin <mechmerlin@gmail.com>
  *
  * 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
@@ -15,25 +15,23 @@
  */
 #include QMK_KEYBOARD_H
 
+#define _BL 0 // Base Layer
+#define _FL 1 // Fn Layer
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* layer 0: qwerty */
-    [0] = LAYOUT_75_ansi(\
-        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,
-        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,
-        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,
-        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,
-        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,
-        KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                                  MO(1),   KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+    [_BL] = LAYOUT_75_ansi(\
+        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,
+        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,
+        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,
+        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,
+        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,
+        KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                                   MO(_FL), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
-    [1] = LAYOUT_75_ansi(\
+    [_FL] = LAYOUT_75_ansi(\
         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,
         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,
         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,
         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, 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, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-        };
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  return MACRO_NONE;
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 };
\ 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 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/duck/octagon/keymaps/default/readme.md
diff --git a/keyboards/octagon/readme.md b/keyboards/duck/octagon/readme.md
index 5b3169424a..7f5b2f7e60 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)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make octagon/v2:default
+    make duck/octagon/v2:default
diff --git a/keyboards/duck/octagon/rules.mk b/keyboards/duck/octagon/rules.mk
new file mode 100644
index 0000000000..46bd457bb7
--- /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 fbbc8999bb..fbbc8999bb 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 1feff95192..1feff95192 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 8555349943..8555349943 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 72285b1ed7..f5cb2d7892 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
 
 Make example for this keyboard (after setting up your build environment):
 
-    make octagon/v1:default
+    make duck/octagon/v1:default
 
 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/v1/rules.mk b/keyboards/duck/octagon/v1/rules.mk
index a08695b504..a08695b504 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 2586882291..2586882291 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 3a27a078ba..d89188f22c 100644
--- a/keyboards/octagon/v1/v1.h
+++ b/keyboards/duck/octagon/v1/v1.h
@@ -16,7 +16,7 @@
 #ifndef V1_H
 #define V1_H
 
-#include "../octagon.h"
+#include "quantum.h"
 
 #define LAYOUT( \
     K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5P, \
@@ -33,4 +33,20 @@
   { K1A, K1C, K1D, K1E,   K1F,   K1G, K1H,   K1I,   K1J, K1K, K1L, KC_NO, K1M,   K1N, KC_NO, K1P }, \
   { K0A, K0B, K0C, KC_NO, KC_NO, K0G, KC_NO, KC_NO, K0J, K0K, K0L, KC_NO, K0M,   K0N, KC_NO, K0P }  \
 }
+
+#define LAYOUT_75_ansi( \
+    K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, \
+    K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N,      K4P, \
+    K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N,      K3P, \
+    K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L,      K2N,      K2P, \
+    K1A,      K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N,      K1P, \
+    K0A, K0B, K0C,                K0G,           K0J, K0K, K0L, K0M, K0N,      K0P  \
+) { \
+  { K5A, K5B, K5C, K5D,   K5E,   K5F, K5G,   K5H,   K5I, K5J, K5K, K5L,   K5M,   K5N, K5O,   K5P }, \
+  { K4A, K4B, K4C, K4D,   K4E,   K4F, K4G,   K4H,   K4I, K4J, K4K, K4L,   K4M,   K4N, KC_NO, K4P }, \
+  { K3A, K3B, K3C, K3D,   K3E,   K3F, K3G,   K3H,   K3I, K3J, K3K, K3L,   K3M,   K3N, KC_NO, K3P }, \
+  { K2A, K2B, K2C, K2D,   K2E,   K2F, K2G,   K2H,   K2I, K2J, K2K, K2L,   KC_NO, K2N, KC_NO, K2P }, \
+  { K1A, K1C, K1D, K1E,   K1F,   K1G, K1H,   K1I,   K1J, K1K, K1L, KC_NO, K1M,   K1N, KC_NO, K1P }, \
+  { K0A, K0B, K0C, KC_NO, KC_NO, K0G, KC_NO, KC_NO, K0J, K0K, K0L, KC_NO, K0M,   K0N, KC_NO, K0P }  \
+}
 #endif
diff --git a/keyboards/octagon/v2/config.h b/keyboards/duck/octagon/v2/config.h
index c916a30a1e..c916a30a1e 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 c24509f514..c24509f514 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 9bb2c8ced9..9bb2c8ced9 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 7bc0c6ef90..7bc0c6ef90 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 a63a37640f..a63a37640f 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 125f09f9cd..125f09f9cd 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 37f3938d93..37f3938d93 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 52653b37e7..52653b37e7 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 29b03211ba..1487b3640a 100644
--- a/keyboards/octagon/v2/v2.h
+++ b/keyboards/duck/octagon/v2/v2.h
@@ -16,7 +16,7 @@
 #ifndef V2_H
 #define V2_H
 
-#include "../octagon.h"
+#include "quantum.h"
 
 #define LAYOUT( \
     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 6eb9e73b24..0000000000
--- a/keyboards/octagon/octagon.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "octagon.h"
diff --git a/keyboards/octagon/octagon.h b/keyboards/octagon/octagon.h
deleted file mode 100644
index d91da2eda8..0000000000
--- a/keyboards/octagon/octagon.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef OCTAGON_H
-#define OCTAGON_H
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_octagon_v1
-    #include "v1.h"
-#endif
-
-#ifdef KEYBOARD_octagon_v2
-    #include "v2.h"
-#endif
-
-#endif
diff --git a/keyboards/octagon/rules.mk b/keyboards/octagon/rules.mk
deleted file mode 100644
index ce04362e6f..0000000000
--- a/keyboards/octagon/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-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 2faf7a9fc4..0000000000
--- a/keyboards/octagon/v1/keymaps/default/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2017 MechMerlin <mechmerlin@gmail.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-#include "octagon.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* layer 0: qwerty */
-    [0] = LAYOUT(\
-        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_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,
-        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,
-        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,
-        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,
-        KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                          MO(1),  KC_NO,   KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
-
-    [1] = LAYOUT(\
-        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, 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, 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,
-        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,
-        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,
-        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-        };
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  return MACRO_NONE;
-};
diff --git a/keyboards/octagon/v1/keymaps/default/readme.md b/keyboards/octagon/v1/keymaps/default/readme.md
deleted file mode 100644
index 3a3e3db577..0000000000
--- a/keyboards/octagon/v1/keymaps/default/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default Octagon Layout
-
-This is the default implement layout for Duck Octagon V1.
-
-
-## Features
-
-* 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 d52c00129f..0000000000
--- a/keyboards/octagon/v2/keymaps/default/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default Octagon Layout
-
-This is the default implement layout for Duck Octagon V2.
-
-
-## Features
-
-* Default QWERTY layer
\ No newline at end of file