cleanup orthodox

qmk · Jun 28, 2017 · 663d390 · 663d390
1 parent f5f7dfa
commit 663d390
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 345 deletions.
diff --git a/keyboards/orthodox/Makefile b/keyboards/orthodox/Makefile
@@ -1,4 +1,4 @@
-SUBPROJECT_DEFAULT = rev2
+SUBPROJECT_DEFAULT = rev1
 
 ifndef MAKEFILE_INCLUDED
 	include ../../Makefile

diff --git a/keyboards/orthodox/config.h b/keyboards/orthodox/config.h
@@ -23,10 +23,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef SUBPROJECT_rev1
     #include "rev1/config.h"
 #endif
-#ifdef SUBPROJECT_rev2
-    #include "rev2/config.h"
-#endif
-#ifdef SUBPROJECT_rev2fliphalf
-	#include "../../rev2fliphalf/config.h"
-#endif
+
 #endif
diff --git a/keyboards/orthodox/keymaps/i2c/config.h b/keyboards/orthodox/keymaps/i2c/config.h
diff --git a/keyboards/orthodox/keymaps/i2c/keymap.c b/keyboards/orthodox/keymaps/i2c/keymap.c
diff --git a/keyboards/orthodox/keymaps/serial/config.h b/keyboards/orthodox/keymaps/serial/config.h
diff --git a/keyboards/orthodox/keymaps/serial/keymap.c b/keyboards/orthodox/keymaps/serial/keymap.c
diff --git a/keyboards/orthodox/readme.md b/keyboards/orthodox/readme.md
@@ -37,13 +37,13 @@ For further reading on build- and flashing-procedures for split ortholinear skel
 Download or clone the whole firmware and navigate to the keyboards/orthodox directory. Once your dev env is setup, you'll be able to generate the default .hex using:
 
 ```
-$ make rev1
+$ make rev1-default
 ```
 
 You will see a lot of output and if everything worked correctly you will see the built hex files in your *root qmk_firmware directory* two levels up:
 
 ```
-orthodox_rev1_serial.hex
+orthodox_rev1_default.hex
 ```
 
 If you would like to use one of the alternative keymaps, or create your own, copy one of the existing [keymaps](keymaps/) and run make like so:
@@ -97,7 +97,7 @@ the two halves, i.e. if your split keyboard has 3 rows in each half, then
 Flashing
 -------
 From the keymap directory run `make SUBPROJECT-KEYMAP-avrdude` for automatic serial port resolution and flashing.
-Example: `make rev2-serial-avrdude`
+Example: `make rev2-default-avrdude`
 
 
 Choosing which board to plug the USB cable into (choosing Master)

diff --git a/keyboards/orthodox/rev1/config.h b/keyboards/orthodox/rev1/config.h
@@ -15,10 +15,10 @@ 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       0xFEED