From c534c3e734abc7335f92d2038804e18d02823e93 Mon Sep 17 00:00:00 2001
From: That-Canadian <poole.chris.11@gmail.com>
Date: Tue, 4 Jul 2017 15:26:25 -0400
Subject: [PATCH] Updated ECO files to follow proper formatting. Also updated
 that-canadian keymap to take out extraneous characters.

---
 keyboards/eco/config.h                       | 11 +++-
 keyboards/eco/keymaps/that-canadian/keymap.c |  2 +-
 keyboards/eco/readme.md                      | 10 +++-
 keyboards/eco/rev1/config.h                  | 57 ++------------------
 4 files changed, 23 insertions(+), 57 deletions(-)

diff --git a/keyboards/eco/config.h b/keyboards/eco/config.h
index b5676d5af1..af7e1822c8 100644
--- a/keyboards/eco/config.h
+++ b/keyboards/eco/config.h
@@ -23,11 +23,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0x1337
 #define PRODUCT_ID      0x6006
-#define DEVICE_VER      0x0001
 #define MANUFACTURER    Bishop Keyboards
 #define PRODUCT         The ECO Keyboard
 #define DESCRIPTION     An economical ortholinear keyboard
 
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 14
+
+#define CATERINA_BOOTLOADER
+
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
@@ -65,4 +70,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
 
+#ifdef SUBPROJECT_rev1
+    #include "rev1/config.h"
+#endif
+
 #endif
diff --git a/keyboards/eco/keymaps/that-canadian/keymap.c b/keyboards/eco/keymaps/that-canadian/keymap.c
index 37637bce34..87f859e8e0 100644
--- a/keyboards/eco/keymaps/that-canadian/keymap.c
+++ b/keyboards/eco/keymaps/that-canadian/keymap.c
@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |qqqqqqqqq
+ * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
  * `-------------------------------------------------------------------------------------------------'
diff --git a/keyboards/eco/readme.md b/keyboards/eco/readme.md
index 942e1800aa..819648a2a8 100644
--- a/keyboards/eco/readme.md
+++ b/keyboards/eco/readme.md
@@ -5,5 +5,11 @@ ECO
 
 An economical 4x14 ortholinear keyboard
 
-Design and concept by : BishopKeyboards
-PCB by : u/That-Canadian
+Keyboard Maintainer: BishopKeyboards and That-Canadian
+Hardware Supported: ECO PCB rev1 Pro Micro
+
+Make example for this keyboard (after setting up your build environment):
+
+    make eco-rev1-that-canadian
+
+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.
\ No newline at end of file
diff --git a/keyboards/eco/rev1/config.h b/keyboards/eco/rev1/config.h
index c25723e848..1e97a703d1 100644
--- a/keyboards/eco/rev1/config.h
+++ b/keyboards/eco/rev1/config.h
@@ -15,65 +15,16 @@ 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
+#ifndef REV1_CONFIG_H
+#define REV1_CONFIG_H
 
-#include "config_common.h"
+#include "../config.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x1337
-#define PRODUCT_ID      0x6006
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    Bishop Keyboards
-#define PRODUCT         The ECO Keyboard
-#define DESCRIPTION     An economical ortholinear keyboard
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 14
-
-/* Planck PCB default pin-out */
+/* ECO V1 pin-out */
 #define MATRIX_ROW_PINS { B1, B6, B2, B3 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 }
 #define UNUSED_PINS
 
-#define CATERINA_BOOTLOADER
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCING_DELAY 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* key combination for command */
-#define IS_COMMAND() ( \
-    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
-)
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
 #endif