qmk · jackhumbert · Nov 8, 2017 · Oct 10, 2017 · Sep 29, 2017 · Nov 7, 2017
diff --git a/Makefile b/Makefile
@@ -316,21 +316,21 @@ define PARSE_SUBPROJECT
     ifneq ($$(CURRENT_SP),allsp)
         # get a list of all keymaps
         KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/keymaps/*/.)))
-        LAYOUTS :=
-        $$(eval -include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/rules.mk)
-        KEYBOARD_LAYOUTS := $$(LAYOUTS)
-        ifneq ($$(CURRENT_SP),)
-            # if the subproject is defined, then also look for keymaps inside the subproject folder
-            SP_KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/$$(CURRENT_SP)/keymaps/*/.)))
-            KEYMAPS := $$(sort $$(KEYMAPS) $$(SP_KEYMAPS))
-	        # $$(eval -include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/$$(CURRENT_SP)/rules.mk)
-        	# KEYBOARD_LAYOUTS := $$(sort $$(KEYBOARD_LAYOUTS) $$(LAYOUTS))
-        endif
-
-        LAYOUT_KEYMAPS :=
-        $$(foreach LAYOUT,$$(KEYBOARD_LAYOUTS),$$(eval LAYOUT_KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/layouts/*/$$(LAYOUT)/*/.)))))
+        # LAYOUTS :=
+        # $$(eval -include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/rules.mk)
+        # KEYBOARD_LAYOUTS := $$(LAYOUTS)
+        # ifneq ($$(CURRENT_SP),)
+        #     # if the subproject is defined, then also look for keymaps inside the subproject folder
+        #     SP_KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/$$(CURRENT_SP)/keymaps/*/.)))
+        #     KEYMAPS := $$(sort $$(KEYMAPS) $$(SP_KEYMAPS))
+	       #  # $$(eval -include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/$$(CURRENT_SP)/rules.mk)
+        # 	# KEYBOARD_LAYOUTS := $$(sort $$(KEYBOARD_LAYOUTS) $$(LAYOUTS))
+        # endif
+
+        # LAYOUT_KEYMAPS :=
+        # $$(foreach LAYOUT,$$(KEYBOARD_LAYOUTS),$$(eval LAYOUT_KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/layouts/*/$$(LAYOUT)/*/.)))))
 
-        KEYMAPS := $$(sort $$(KEYMAPS) $$(LAYOUT_KEYMAPS))
+        KEYMAPS := $$(sort $$(KEYMAPS))
         # if the rule after removing the start of it is empty (we haven't specified a kemap or target)
         # compile all the keymaps
         ifeq ($$(RULE),)
@@ -556,6 +556,10 @@ test: test-all
 .PHONY: test-clean
 test-clean: test-all-clean
 
+.PHONY: clean
+clean:
+	rm -r .build
+
 lib/%:
 	git submodule sync $?
 	git submodule update --init $?

diff --git a/keyboards/converter/converter.c b/keyboards/converter/converter.c
diff --git a/keyboards/converter/converter.h b/keyboards/converter/converter.h
diff --git a/keyboards/converter/ibm_terminal/ibm_terminal.c b/keyboards/converter/ibm_terminal/ibm_terminal.c
diff --git a/keyboards/converter/rules.mk b/keyboards/converter/rules.mk
diff --git a/keyboards/converter/usb_usb/usb_usb.c b/keyboards/converter/usb_usb/usb_usb.c
diff --git a/keyboards/converter/ibm_terminal/README → keyboards/ibm_terminal_converter/README b/keyboards/converter/ibm_terminal/README → keyboards/ibm_terminal_converter/README
@@ -6,7 +6,7 @@ This is a port of TMK's converter/terminal_usb to QMK.
 It supports PS/2 Scan Code Set 3 and runs on USB AVR chips such like PJRC Teensy.
 I tested the converter on ATMega32U4 with 1392595(102keys) and 6110345(122keys).
 
-Source code: https://github.com/tmk/tmk_keyboard
+Source code: https://github.com/qmk/qmk_firmware.git
 Article: http://geekhack.org/index.php?topic=27272.0
 
 
@@ -22,9 +22,9 @@ And VCC and GND, of course. See RESOURCE for keyboard connector pin assign.
 
 BUILD
 -----
-$ git clone https://github.com/tmk/tmk_keyboard.git
-$ cd converter/terminal_usb
-$ make 
+$ git clone https://github.com/qmk/qmk_firmware.git
+$ cd qmk_firmware
+$ make ibm_terminal_converter
 
 
 RESOURCE

diff --git a/keyboards/converter/ibm_terminal/config.h → keyboards/ibm_terminal_converter/config.h b/keyboards/converter/ibm_terminal/config.h → keyboards/ibm_terminal_converter/config.h
diff --git a/keyboards/ibm_terminal_converter/ibm_terminal_converter.c b/keyboards/ibm_terminal_converter/ibm_terminal_converter.c
@@ -0,0 +1 @@
+#include "ibm_terminal_converter.h"
diff --git a/...rds/converter/ibm_terminal/ibm_terminal.h → ...rminal_converter/ibm_terminal_converter.h b/...rds/converter/ibm_terminal/ibm_terminal.h → ...rminal_converter/ibm_terminal_converter.h
@@ -1,5 +1,5 @@
-#ifndef IBM_TERMINAL_H
-#define IBM_TERMINAL_H
+#ifndef IBM_TERMINAL_CONVERTER_H
+#define IBM_TERMINAL_CONVERTER_H
 
 #include "quantum.h"
 

diff --git a/...ter/ibm_terminal/keymaps/default/config.h → ...rminal_converter/keymaps/default/config.h b/...ter/ibm_terminal/keymaps/default/config.h → ...rminal_converter/keymaps/default/config.h
diff --git a/...ter/ibm_terminal/keymaps/default/keymap.c → ...rminal_converter/keymaps/default/keymap.c b/...ter/ibm_terminal/keymaps/default/keymap.c → ...rminal_converter/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "print.h"
 #include "debug.h"
 #include "util.h"
-#include "ibm_terminal.h"
+#include "ibm_terminal_converter.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // Layer 0

diff --git a/...ter/ibm_terminal/keymaps/default/rules.mk → ...rminal_converter/keymaps/default/rules.mk b/...ter/ibm_terminal/keymaps/default/rules.mk → ...rminal_converter/keymaps/default/rules.mk
diff --git a/...ter/ibm_terminal/keymaps/priyadi/config.h → ...rminal_converter/keymaps/priyadi/config.h b/...ter/ibm_terminal/keymaps/priyadi/config.h → ...rminal_converter/keymaps/priyadi/config.h
diff --git a/...ter/ibm_terminal/keymaps/priyadi/keymap.c → ...rminal_converter/keymaps/priyadi/keymap.c b/...ter/ibm_terminal/keymaps/priyadi/keymap.c → ...rminal_converter/keymaps/priyadi/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "print.h"
 #include "debug.h"
 #include "util.h"
-#include "ibm_terminal.h"
+#include "ibm_terminal_converter.h"
 #include "action_layer.h"
 
 // Fillers to make layering clearer

diff --git a/...ter/ibm_terminal/keymaps/priyadi/rules.mk → ...rminal_converter/keymaps/priyadi/rules.mk b/...ter/ibm_terminal/keymaps/priyadi/rules.mk → ...rminal_converter/keymaps/priyadi/rules.mk
diff --git a/keyboards/converter/ibm_terminal/led.c → keyboards/ibm_terminal_converter/led.c b/keyboards/converter/ibm_terminal/led.c → keyboards/ibm_terminal_converter/led.c
diff --git a/keyboards/converter/ibm_terminal/matrix.c → keyboards/ibm_terminal_converter/matrix.c b/keyboards/converter/ibm_terminal/matrix.c → keyboards/ibm_terminal_converter/matrix.c
diff --git a/keyboards/converter/ibm_terminal/rules.mk → keyboards/ibm_terminal_converter/rules.mk b/keyboards/converter/ibm_terminal/rules.mk → keyboards/ibm_terminal_converter/rules.mk
diff --git a/keyboards/converter/usb_usb/README.md → keyboards/usb_usb_converter/README.md b/keyboards/converter/usb_usb/README.md → keyboards/usb_usb_converter/README.md
@@ -9,17 +9,22 @@ Hardware Availability: [GH thread](https://geekhack.org/index.php?topic=72052.0)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make converter-usb_usb-default
+    make usb_usb-pro_micro-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.
 
+Note that you have to choose the right hardware variant as your subproject, otherwise you will probably have issues.
+
 Troubleshooting & Known Issues
 ------------------------------
-The Pro Micro variant runs at 8MHz, hence the following line in `usb_usb/rules.mk`:
-`F_CPU ?= 8000000`
-If the firmware doesn't work, try changing that line to
-`F_CPU ?= 16000000`
-or override the `F_CPU` variable in the `rules.mk` of your keymap.
+If something doesn't work, it's probably because of the CPU clock. 
+Be sure to select the correct subproject (the middle part of the `make` argument) according to your hardware. 
+If you are sure you have this correct, try changeing the default in `usb_usb/rules.mk` or overriding the value in the `rules.mk` of your keymap.
+
+The Pro Micro variant uses a 3.3V Pro Micro and thus runs at 8MHz, hence the following line in `usb_usb/pro_micro/rules.mk`:
+`F_CPU = 8000000`
+The converter sold by Hasu runs at 16MHz and so the corresponding line in `usb_usb/hasurules.mk` is:
+`F_CPU = 16000000`
 
 Getting the Hardware
 --------------------

diff --git a/keyboards/converter/usb_usb/config.h → keyboards/usb_usb_converter/config.h b/keyboards/converter/usb_usb/config.h → keyboards/usb_usb_converter/config.h
diff --git a/...oards/converter/usb_usb/custom_matrix.cpp → ...oards/usb_usb_converter/custom_matrix.cpp b/...oards/converter/usb_usb/custom_matrix.cpp → ...oards/usb_usb_converter/custom_matrix.cpp
diff --git a/keyboards/usb_usb_converter/hasu/hasu.c b/keyboards/usb_usb_converter/hasu/hasu.c
@@ -0,0 +1 @@
+#include "hasu.h"
diff --git a/keyboards/usb_usb_converter/hasu/hasu.h b/keyboards/usb_usb_converter/hasu/hasu.h
@@ -0,0 +1,6 @@
+#ifndef HASU_H
+#define HASU_H
+
+#include QMK_KEYBOARD_H
+
+#endif
diff --git a/keyboards/usb_usb_converter/hasu/rules.mk b/keyboards/usb_usb_converter/hasu/rules.mk
@@ -0,0 +1 @@
+F_CPU = 16000000
diff --git a/keyboards/converter/usb_usb/keymap.c → keyboards/usb_usb_converter/keymap.c b/keyboards/converter/usb_usb/keymap.c → keyboards/usb_usb_converter/keymap.c
diff --git a/...ter/usb_usb/keymaps/coloneljesus/config.h → ...b_converter/keymaps/coloneljesus/config.h b/...ter/usb_usb/keymaps/coloneljesus/config.h → ...b_converter/keymaps/coloneljesus/config.h
diff --git a/...ter/usb_usb/keymaps/coloneljesus/keymap.c → ...b_converter/keymaps/coloneljesus/keymap.c b/...ter/usb_usb/keymaps/coloneljesus/keymap.c → ...b_converter/keymaps/coloneljesus/keymap.c
@@ -15,7 +15,7 @@ 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 "usb_usb.h"
+#include "usb_usb_converter.h"
 
 const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     /* 0: plain Qwerty without layer switching

diff --git a/...onverter/usb_usb/keymaps/default/config.h → ...sb_usb_converter/keymaps/default/config.h b/...onverter/usb_usb/keymaps/default/config.h → ...sb_usb_converter/keymaps/default/config.h
diff --git a/...onverter/usb_usb/keymaps/default/keymap.c → ...sb_usb_converter/keymaps/default/keymap.c b/...onverter/usb_usb/keymaps/default/keymap.c → ...sb_usb_converter/keymaps/default/keymap.c
@@ -15,7 +15,7 @@ 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 "usb_usb.h"
+#include "usb_usb_converter.h"
 
 const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     /* 0: plain Qwerty without layer switching

diff --git a/keyboards/converter/usb_usb/main.c → keyboards/usb_usb_converter/main.c b/keyboards/converter/usb_usb/main.c → keyboards/usb_usb_converter/main.c
diff --git a/keyboards/converter/usb_usb/matrix.c → keyboards/usb_usb_converter/matrix.c b/keyboards/converter/usb_usb/matrix.c → keyboards/usb_usb_converter/matrix.c
diff --git a/keyboards/usb_usb_converter/pro_micro/pro_micro.c b/keyboards/usb_usb_converter/pro_micro/pro_micro.c
@@ -0,0 +1 @@
+#include "pro_micro.h"
diff --git a/keyboards/usb_usb_converter/pro_micro/pro_micro.h b/keyboards/usb_usb_converter/pro_micro/pro_micro.h
@@ -0,0 +1,6 @@
+#ifndef PRO_MICRO_H
+#define PRO_MICRO_H
+
+#include QMK_KEYBOARD_H
+
+#endif
diff --git a/keyboards/usb_usb_converter/pro_micro/rules.mk b/keyboards/usb_usb_converter/pro_micro/rules.mk
@@ -0,0 +1 @@
+F_CPU = 8000000
diff --git a/keyboards/converter/usb_usb/rules.mk → keyboards/usb_usb_converter/rules.mk b/keyboards/converter/usb_usb/rules.mk → keyboards/usb_usb_converter/rules.mk
@@ -13,7 +13,13 @@ MCU ?= atmega32u4
 #     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 ?= 8000000
+
+# Since there are different hardware variations of these adapters and since these
+# have different CPU clocks, the clock speed should be set in the rules.mk file of the
+# respective hardware variantion (i.e. subproject). For example, in /pro_micro/rules.mk
+# this is set to 8000000.
+# The value here is only a fallback and is ignored if it is defined in the subproject.
+F_CPU ?= 16000000
 
 
 #

diff --git a/keyboards/usb_usb_converter/usb_usb_converter.c b/keyboards/usb_usb_converter/usb_usb_converter.c
@@ -0,0 +1 @@
+#include "usb_usb_converter.h"
diff --git a/keyboards/converter/usb_usb/usb_usb.h → ...rds/usb_usb_converter/usb_usb_converter.h b/keyboards/converter/usb_usb/usb_usb.h → ...rds/usb_usb_converter/usb_usb_converter.h
@@ -15,8 +15,8 @@ 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 USB_USB_H
-#define USB_USB_H
+#ifndef USB_USB_CONVERTER_H
+#define USB_USB_CONVERTER_H
 
 #include "quantum.h"