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

24 files changed, 0 insertions, 1339 deletions

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/readme.md b/keyboards/octagon/readme.md
deleted file mode 100644
index 5b3169424a..0000000000
--- a/keyboards/octagon/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Duck Octagon
-
-Non official firmware for custom Korean keyboard with 75% key layout made by Duck.
-
-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.
-
-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
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/config.h b/keyboards/octagon/v1/config.h
deleted file mode 100644
index fbbc8999bb..0000000000
--- a/keyboards/octagon/v1/config.h
+++ /dev/null
@@ -1,54 +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/>.
-*/
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6050
-#define DEVICE_VER      0x0104
-#define MANUFACTURER    Duck
-#define PRODUCT         Octagon V1
-#define DESCRIPTION     Duck Octagon V1
-
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 16
-
-#define DIODE_DIRECTION COL2ROW
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCING_DELAY 5
-
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 1
-
-/* key combination for magic key command */
-#define IS_COMMAND() ( \
-    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
-)
-
-#define RGBLIGHT_ANIMATIONS
-#define RGB_DI_PIN D6
-#define RGBLED_NUM 17
-
-#define TAPPING_TERM 200
-
-#endif
diff --git a/keyboards/octagon/v1/info.json b/keyboards/octagon/v1/info.json
deleted file mode 100644
index 1feff95192..0000000000
--- a/keyboards/octagon/v1/info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "keyboard_name": "Octagon V1", 
-    "url": "", 
-    "maintainer": "qmk", 
-    "width": 16, 
-    "height": 6, 
-    "layouts": {
-        "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Home", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Page Up", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"x":12.75, "y":3}, {"label":"Enter", "x":13.75, "y":3, "w":1.25}, {"label":"Page Down", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"End", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5}, {"label":"Fn", "x":11, "y":5}, {"label":"Ctrl", "x":12, "y":5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}]
-        }
-    }
-}
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/v1/matrix.c b/keyboards/octagon/v1/matrix.c
deleted file mode 100644
index 8555349943..0000000000
--- a/keyboards/octagon/v1/matrix.c
+++ /dev/null
@@ -1,227 +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 <util/delay.h>
-#include <avr/io.h>
-#include <stdio.h>
-#include "matrix.h"
-#include "util.h"
-#include "print.h"
-#include "debug.h"
-
-static uint8_t debouncing = DEBOUNCING_DELAY;
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-static matrix_row_t matrix_debouncing[MATRIX_ROWS];
-
-static uint8_t read_rows(uint8_t col);
-static void init_rows(void);
-static void unselect_cols(void);
-static void select_col(uint8_t col);
-
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-void backlight_init_ports(void)
-{
-    DDRB |= 0b00011111;  // PB0 (caps), PB1 (alpha), PB2 (extra), PB3 (modnum), PB4 (caps)
-    DDRD |= 0b11010000;  // PD4, (rgb blue), PD6 (rgb red), PD7 (rgb green)
-    DDRE |= 0b01000000;  // PE6 (frow)
-}
-
-void matrix_init(void) {
-  backlight_init_ports();
-  unselect_cols();
-  init_rows();
-
-  for (uint8_t i=0; i < MATRIX_ROWS; i++)  {
-    matrix[i] = 0;
-    matrix_debouncing[i] = 0;
-  }
-
-  matrix_init_quantum();
-}
-
-uint8_t matrix_scan(void) {
-  for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-    select_col(col);
-    _delay_us(3);
-
-    uint8_t rows = read_rows(col);
-
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-      bool prev_bit = matrix_debouncing[row] & ((matrix_row_t)1<<col);
-      bool curr_bit = rows & (1<<row);
-      if (prev_bit != curr_bit) {
-        matrix_debouncing[row] ^= ((matrix_row_t)1<<col);
-        debouncing = DEBOUNCING_DELAY;
-      }
-    }
-    unselect_cols();
-  }
-
-  if (debouncing) {
-    if (--debouncing) {
-      _delay_ms(1);
-    } else {
-      for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        matrix[i] = matrix_debouncing[i];
-      }
-    }
-  }
-
-  matrix_scan_quantum();
-  return 1;
-}
-
-inline matrix_row_t matrix_get_row(uint8_t row) {
-  return matrix[row];
-}
-
-void matrix_print(void) {
-  print("\nr/c 0123456789ABCDEF\n");
-  for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-    xprintf("%02X: %032lb\n", row, bitrev32(matrix_get_row(row)));
-  }
-}
-
-/* Row pin configuration
- * row: 0    1    2    3    4    5
- * pin: PB7  PD0  PD1  PD2  PD3  PD5
- *
- * Esc uses its own pin PE2
- */
-static void init_rows(void) {
-    DDRD  &= ~0b00101111; // PD0, PD1, PD2, PD3, PD5 input
-    PORTD &= ~0b00101111; // PD0, PD1, PD2, PD3, PD5 low
-
-    DDRB  &= ~0b10000000; // PB7 input
-    PORTB &= ~0b10000000; // PB7 low
-
-    DDRE  &= ~0b00000100; // PE2 input
-    PORTE |=  0b00000100; // PE2 high
-}
-
-static uint8_t read_rows(uint8_t col) {
-  if (col == 14) {
-    return PINE&(1<<2) ? 0 : (1<<0);        // PE2 (Row 0)
-  } else {
-      return (PIND&(1<<0) ? (1<<0) : 0) |   // PD0 (Row 0)
-             (PIND&(1<<1) ? (1<<1) : 0) |   // PD1 (Row 1)
-             (PIND&(1<<2) ? (1<<2) : 0) |   // PD2 (Row 2)
-             (PIND&(1<<3) ? (1<<3) : 0) |   // PD3 (Row 3)
-             (PIND&(1<<5) ? (1<<4) : 0) |   // PD5 (Row 4)
-             (PINB&(1<<7) ? (1<<5) : 0);    // PB7 (Row 5)
-    }
-}
-
-uint8_t read_fwkey(void)
-{
-  return PINE&(1<<2) ? 0 : (1<<0);
-}
-
-static void unselect_cols(void) {
-    DDRB  |=  0b01000000; // PB6 (U2) output
-    PORTB &= ~0b01000000; // PB6 (U2) low
-
-    DDRC  |=  0b11000000; // PC6 (U1), PC7 (A2) output
-    PORTC &= ~0b11000000; // PC6 (U1), PC7 (A2) low
-
-    DDRF  |=  0b00000011; // PF0 (A0), PF1 (A1) output
-    PORTF &= ~0b00000011; // PF0 (A0), PF1 (A1) low
-}
-
-static void select_col(uint8_t col) {
- 
-   switch (col) {
-        case 0:
-            PORTC |= 0b01000000; // PC6 high
-            break;
-        case 1:
-            PORTC |= 0b01000000; // PC6 high
-            PORTF |= 0b00000001; // PF0 high
-            break;
-        case 2:
-            PORTC |= 0b01000000; // PC6 high
-            PORTF |= 0b00000010; // PF1 high
-            break;
-        case 3:
-            PORTC |= 0b01000000; // PC6 high
-            PORTF |= 0b00000011; // PF0, PF1 high
-            break;
-        case 4:
-            PORTC |= 0b11000000; // PC6, PC7 high
-            break;
-        case 5:
-            PORTC |= 0b11000000; // PC6, PC7 high
-            PORTF |= 0b00000001; // PF0 high
-            break;
-        case 6:
-            PORTC |= 0b11000000; // PC6, PC7 high
-            PORTF |= 0b00000010; // PF1 high
-            break;
-        case 7:
-            PORTC |= 0b11000000; // PC6, PC7 high
-            PORTF |= 0b00000011; // PF0, PF1 high
-            break;
-        case 8:
-            PORTB |= 0b01000000; // PB6 high
-            break;
-        case 9:
-            PORTB |= 0b01000000; // PB6 high
-            PORTF |= 0b00000001; // PF0 high
-            break;
-        case 10:
-            PORTB |= 0b01000000; // PB6 high
-            PORTF |= 0b00000010; // PF1 high
-            break;
-        case 11:
-            PORTB |= 0b01000000; // PB6 high
-            PORTF |= 0b00000011; // PF0, PF1 high
-            break;
-        case 12:
-            PORTB |= 0b01000000; // PB6 high
-            PORTC |= 0b10000000; // PC7 high
-            break;
-        case 13:
-            PORTB |= 0b01000000; // PB6 high
-            PORTF |= 0b00000001; // PF0 high
-            PORTC |= 0b10000000; // PC7 high
-            break;
-        case 15:
-            PORTB |= 0b01000000; // PB6 high
-            PORTF |= 0b00000010; // PF1 high
-            PORTC |= 0b10000000; // PC7 high
-            break;
-    }
-}
diff --git a/keyboards/octagon/v1/readme.md b/keyboards/octagon/v1/readme.md
deleted file mode 100644
index 72285b1ed7..0000000000
--- a/keyboards/octagon/v1/readme.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Duck Octagon V1
-
-Non official firmware for custom Korean keyboard with 75% key layout made by Duck.  
-Group buy was run October 2014 via [geekhack](https://geekhack.org/index.php?topic=65036.0) 35 keyboards total. 
-
-Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)  
-Hardware Supported: Duck Octagon PCB Ver 1.0, Atmega32u4  
-Hardware Availability: Wait until GB of the next revision
-
-Make example for this keyboard (after setting up your build environment):
-
-    make 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.
-
-## Hardware Notes
-
-The Duck Octagon V1 PCB consists of:
-
-### Microchips
-2 74HC237D 3-to-8 line decoders
-1 Atmega32u4 microcontroller
-2 WS2811 LED controller
-
-## Notes
-Thanks to Ralf Schmitt for previous implementations in his [TMK fork](https://github.com/xauser/tmk_keyboard/tree/xauser/) and few helping words.
-
-Based heavily on Rasmus Schults [Duck Lightsaver QMK Port](https://github.com/qmk/qmk_firmware/tree/master/keyboards/lightsaver)
diff --git a/keyboards/octagon/v1/rules.mk b/keyboards/octagon/v1/rules.mk
deleted file mode 100644
index a08695b504..0000000000
--- a/keyboards/octagon/v1/rules.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Processor frequency.
-#     This will define a symbol, F_CPU, in all source code files equal to the
-#     processor frequency in Hz. You can then use this symbol in your source code to
-#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
-#     automatically to create a 32-bit value in your source code.
-#
-#     This will be an integer division of F_USB below, as it is sourced by
-#     F_USB after it has run through any CPU prescalers. Note that this value
-#     does not *change* the processor frequency - it should merely be updated to
-#     reflect the processor speed set externally so that the code can use accurate
-#     software delays.
-F_CPU = 16000000
-
-
-#
-# LUFA specific
-#
-# Target architecture (see library "Board Types" documentation).
-ARCH = AVR8
-
-# Input clock frequency.
-#     This will define a symbol, F_USB, in all source code files equal to the
-#     input clock frequency (before any prescaling is performed) in Hz. This value may
-#     differ from F_CPU if prescaling is used on the latter, and is required as the
-#     raw input clock is fed directly to the PLL sections of the AVR for high speed
-#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
-#     at the end, this will be done automatically to create a 32-bit value in your
-#     source code.
-#
-#     If no clock division is performed on the input clock inside the AVR (via the
-#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_USB = $(F_CPU)
-
-# Interrupt driven control endpoint task(+60)
-#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
-
-# Boot Section Size in *bytes*
-#   Teensy halfKay   512
-#   Teensy++ halfKay 1024
-#   Atmel DFU loader 4096
-#   LUFA bootloader  4096
-#   USBaspLoader     2048
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
-
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE ?= no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE ?= no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE ?= no        # Audio control and System control(+450)
-CONSOLE_ENABLE ?= no         # Console for debug(+400)
-COMMAND_ENABLE ?= yes        # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE ?= no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE ?= yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE ?= yes      # Enable keyboard backlight functionality on B7 by default
-MIDI_ENABLE ?= no            # MIDI support (+2400 to 4200, depending on config)
-UNICODE_ENABLE ?= no         # Unicode
-BLUETOOTH_ENABLE ?= no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE ?= no           # Audio output on port C6
-FAUXCLICKY_ENABLE ?= no      # Use buzzer to emulate clicky switches
-RGBLIGHT_ENABLE = yes
-
-CUSTOM_MATRIX = yes
-SRC += matrix.c \
-		
diff --git a/keyboards/octagon/v1/v1.c b/keyboards/octagon/v1/v1.c
deleted file mode 100644
index 2586882291..0000000000
--- a/keyboards/octagon/v1/v1.c
+++ /dev/null
@@ -1,50 +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 "v1.h"
-
-enum BACKLIGHT_AREAS {
-  BACKLIGHT_ALPHA    = 0b0000001,
-  BACKLIGHT_EXTRA    = 0b0000010,
-  BACKLIGHT_MODNUM   = 0b0000100,
-  BACKLIGHT_FROW     = 0b0001000,
-  BACKLIGHT_RGB      = 0b0010000,
-  BACKLIGHT_RGBRED   = 0b0010000,
-  BACKLIGHT_RGBGREEN = 0b0100000,
-  BACKLIGHT_RGBBLUE  = 0b1000000,
-  BACKLIGHT_SWITCH   = 0b0001111
-};
-
-uint8_t backlight_os_state = 0;
-uint32_t backlight_layer_state = 0;
-
-void backlight_set(uint8_t level) {
-  level & BACKLIGHT_ALPHA ? (PORTB |= 0b00000010) : (PORTB &= ~0b00000010);
-  level & BACKLIGHT_EXTRA ? (PORTB |= 0b00000100) : (PORTB &= ~0b00000100);
-  level & BACKLIGHT_MODNUM ? (PORTB |= 0b00001000) : (PORTB &= ~0b00001000);
-  level & BACKLIGHT_FROW ? (PORTE |= 0b01000000) : (PORTE &= ~0b01000000);
-  level & BACKLIGHT_RGBRED ? (PORTD |= 0b01000000) : (PORTD &= ~0b01000000);
-  level & BACKLIGHT_RGBGREEN ? (PORTD |= 0b10000000) : (PORTD &= ~0b10000000);
-  level & BACKLIGHT_RGBBLUE ? (PORTD |= 0b00010000) : (PORTD &= ~0b00010000);
-}
-
-void led_set_kb(uint8_t usb_led) {
-  backlight_os_state & (1<<USB_LED_CAPS_LOCK) ? (PORTB &= ~0b00000001) : (PORTB |= 0b00000001);
-  backlight_os_state & (1<<USB_LED_SCROLL_LOCK) ? (PORTB &= ~0b00010000) : (PORTB |= 0b00010000);
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  return process_record_user(keycode, record);
-}
diff --git a/keyboards/octagon/v1/v1.h b/keyboards/octagon/v1/v1.h
deleted file mode 100644
index 3a27a078ba..0000000000
--- a/keyboards/octagon/v1/v1.h
+++ /dev/null
@@ -1,36 +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/>.
- */
-#ifndef V1_H
-#define V1_H
-
-#include "../octagon.h"
-
-#define LAYOUT( \
-    K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, 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, K5O, 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/octagon/v2/config.h
deleted file mode 100644
index c916a30a1e..0000000000
--- a/keyboards/octagon/v2/config.h
+++ /dev/null
@@ -1,54 +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/>.
-*/
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6050
-#define DEVICE_VER      0x0104
-#define MANUFACTURER    Duck
-#define PRODUCT         Octagon V2
-#define DESCRIPTION     Duck Octagon V2
-
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
-#define DIODE_DIRECTION COL2ROW
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCING_DELAY 5
-
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 1
-
-/* key combination for magic key command */
-#define IS_COMMAND() ( \
-    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
-)
-
-#define RGBLIGHT_ANIMATIONS
-#define RGB_DI_PIN D6
-#define RGBLED_NUM 17
-
-#define TAPPING_TERM 200
-
-#endif
diff --git a/keyboards/octagon/v2/indicator_leds.c b/keyboards/octagon/v2/indicator_leds.c
deleted file mode 100644
index c24509f514..0000000000
--- a/keyboards/octagon/v2/indicator_leds.c
+++ /dev/null
@@ -1,133 +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 <avr/interrupt.h>
-#include <avr/io.h>
-#include <stdbool.h>
-#include <util/delay.h>
-#include "indicator_leds.h"
-
-#define T1H  900
-#define T1L  600
-#define T0H  400
-#define T0L  900
-#define RES 6000
-
-#define NS_PER_SEC (1000000000L)
-#define CYCLES_PER_SEC (F_CPU)
-#define NS_PER_CYCLE (NS_PER_SEC / CYCLES_PER_SEC)
-#define NS_TO_CYCLES(n) ((n) / NS_PER_CYCLE)
-
-void send_bit_d4(bool bitVal) {
-  if(bitVal) {
-    asm volatile (
-        "sbi %[port], %[bit] \n\t"
-        ".rept %[onCycles] \n\t"
-        "nop \n\t"
-        ".endr \n\t"
-        "cbi %[port], %[bit] \n\t"
-        ".rept %[offCycles] \n\t"
-        "nop \n\t"
-        ".endr \n\t"
-        ::
-        [port]      "I" (_SFR_IO_ADDR(PORTD)),
-        [bit]       "I" (4),
-        [onCycles]  "I" (NS_TO_CYCLES(T1H) - 2),
-        [offCycles] "I" (NS_TO_CYCLES(T1L) - 2));
-  } else {
-    asm volatile (
-        "sbi %[port], %[bit] \n\t"
-        ".rept %[onCycles] \n\t"
-        "nop \n\t"
-        ".endr \n\t"
-        "cbi %[port], %[bit] \n\t"
-        ".rept %[offCycles] \n\t"
-        "nop \n\t"
-        ".endr \n\t"
-        ::
-        [port]      "I" (_SFR_IO_ADDR(PORTD)),
-        [bit]       "I" (4),
-        [onCycles]  "I" (NS_TO_CYCLES(T0H) - 2),
-        [offCycles] "I" (NS_TO_CYCLES(T0L) - 2));
-  }
-}
-
-void send_bit_d6(bool bitVal)
-{
-  if(bitVal) {
-    asm volatile (
-        "sbi %[port], %[bit] \n\t"
-        ".rept %[onCycles] \n\t"
-        "nop \n\t"
-        ".endr \n\t"
-        "cbi %[port], %[bit] \n\t"
-        ".rept %[offCycles] \n\t"
-        "nop \n\t"
-        ".endr \n\t"
-        ::
-        [port]      "I" (_SFR_IO_ADDR(PORTD)),
-        [bit]       "I" (6),
-        [onCycles]  "I" (NS_TO_CYCLES(T1H) - 2),
-        [offCycles] "I" (NS_TO_CYCLES(T1L) - 2));
-  } else {
-    asm volatile (
-        "sbi %[port], %[bit] \n\t"
-        ".rept %[onCycles] \n\t"
-        "nop \n\t"
-        ".endr \n\t"
-        "cbi %[port], %[bit] \n\t"
-        ".rept %[offCycles] \n\t"
-        "nop \n\t"
-        ".endr \n\t"
-        ::
-        [port]      "I" (_SFR_IO_ADDR(PORTD)),
-        [bit]       "I" (6),
-        [onCycles]  "I" (NS_TO_CYCLES(T0H) - 2),
-        [offCycles] "I" (NS_TO_CYCLES(T0L) - 2));
-  }
-}
-
-void show(void) {
-  _delay_us((RES / 1000UL) + 1);
-}
-
-void send_value(uint8_t byte, enum Device device) {
-  for(uint8_t b = 0; b < 8; b++) {
-    if(device == Device_STATUSLED) {
-      send_bit_d4(byte & 0b10000000);
-    }
-    if(device == Device_PCBRGB) {
-      send_bit_d6(byte & 0b10000000);
-    }
-