Renaming Output modules pjrcUSB -> USB, uartOut -> UARTOut, usbMuxUart -> USBxUART

- pjrcUSB is going to start diverging more and makes less sense to maintain the name
- uartOut and usbMuxUart are already referred to as UARTOut and USBxUART
- Updated all build scripts and documentation
- Adding links to the Keyboard/README.md

Author: haata

CMakeLists.txt

@@ -76,7 +76,7 @@ set(  MacroModule "PartialMap"
 	CACHE STRING "Macro Module" )
 
 ##| Sends the current list of usb key codes through USB HID
-set( OutputModule "pjrcUSB"
+set( OutputModule "USB"
 	CACHE STRING "Output Module"
 )
 

Keyboards/README.md

@@ -44,7 +44,7 @@ PartialMaps[1]="whitefox/whitefox"
 # Keyboard Module Configuration
 ScanModule="WhiteFox"
 MacroModule="PixelMap"
-OutputModule="pjrcUSB"
+OutputModule="USB"
 DebugModule="full"
 
 # Microcontroller

Keyboards/Testing/mk20test.bash

@@ -44,7 +44,7 @@ PartialMaps[1]="whitefox/whitefox"
 # Keyboard Module Configuration
 ScanModule="WhiteFox"
 MacroModule="PixelMap"
-OutputModule="pjrcUSB"
+OutputModule="USB"
 DebugModule="full"
 
 # Microcontroller

Keyboards/Testing/mk22test.bash

@@ -44,7 +44,7 @@ PartialMaps[1]="whitefox/whitefox"
 # Keyboard Module Configuration
 ScanModule="WhiteFox"
 MacroModule="PixelMap"
-OutputModule="pjrcUSB"
+OutputModule="USB"
 DebugModule="full"
 
 # Microcontroller

Keyboards/Testing/mk64test.bash

@@ -44,7 +44,7 @@ PartialMaps[1]="whitefox/whitefox"
 # Keyboard Module Configuration
 ScanModule="WhiteFox"
 MacroModule="PixelMap"
-OutputModule="pjrcUSB"
+OutputModule="USB"
 DebugModule="full"
 
 # Microcontroller

Keyboards/Testing/mk66test.bash

@@ -45,7 +45,7 @@ PartialMaps[2]="colemak"
 # Keyboard Module Configuration
 ScanModule="Infinity_60"
 MacroModule="PartialMap"
-OutputModule="pjrcUSB"
+OutputModule="USB"
 DebugModule="full"
 
 # Microcontroller

Keyboards/Testing/template.bash

@@ -43,10 +43,9 @@ PartialMaps[2]="colemak"
 # NOTE: Changing any of these variables will require a force build to compile correctly
 
 # Keyboard Module Configuration
-ScanModule="MD1"
-#ScanModule="Infinity_60%" # XXX Ninja build generator has issues with %'s in filenames...
+ScanModule="Infinity_60"
 MacroModule="PartialMap"
-OutputModule="uartOut"
+OutputModule="UARTOut"
 DebugModule="full"
 
 # Microcontroller

Keyboards/Testing/uartout.bash

@@ -43,10 +43,9 @@ PartialMaps[2]="colemak"
 # NOTE: Changing any of these variables will require a force build to compile correctly
 
 # Keyboard Module Configuration
-ScanModule="MD1"
-#ScanModule="Infinity_60%" # XXX Ninja build generator has issues with %'s in filenames...
+ScanModule="Infinity_60"
 MacroModule="PartialMap"
-OutputModule="usbMuxUart"
+OutputModule="USBxUART"
 DebugModule="full"
 
 # Microcontroller

Keyboards/Testing/usbmuxuart.bash

@@ -48,7 +48,7 @@ PartialMaps[2]="infinity_ergodox/iced_numpad"
 # Keyboard Module Configuration
 ScanModule="Infinity_Ergodox"
 MacroModule="PixelMap"
-OutputModule="pjrcUSB"
+OutputModule="USB"
 DebugModule="full"
 
 # Microcontroller

Keyboards/ergodox-l.bash

@@ -47,7 +47,7 @@ PartialMaps[2]="infinity_ergodox/iced_numpad"
 # Keyboard Module Configuration
 ScanModule="Infinity_Ergodox"
 MacroModule="PixelMap"
-OutputModule="pjrcUSB"
+OutputModule="USB"
 DebugModule="full"
 
 # Microcontroller

Keyboards/ergodox-r.bash

@@ -44,7 +44,7 @@ PartialMaps[1]=""
 # Keyboard Module Configuration
 ScanModule="ICPad"
 MacroModule="PixelMap"
-OutputModule="pjrcUSB"
+OutputModule="USB"
 DebugModule="full"
 
 # Microcontroller

Keyboards/icpad.bash

@@ -54,7 +54,7 @@ PartialMaps[1]="ic60/hhkbpro2"
 # Keyboard Module Configuration
 ScanModule="Infinity_60"
 MacroModule="PartialMap"
-OutputModule="pjrcUSB"
+OutputModule="USB"
 DebugModule="full"
 
 # Microcontroller

Keyboards/infinity.bash

@@ -54,7 +54,7 @@ PartialMaps[1]="ic60/hhkbpro2"
 # Keyboard Module Configuration
 ScanModule="Infinity_60_LED"
 MacroModule="PixelMap"
-OutputModule="pjrcUSB"
+OutputModule="USB"
 DebugModule="full"
 
 # Microcontroller

Keyboards/infinity_led.bash

@@ -43,7 +43,7 @@ DefaultMap="k-type/release.1 stdFuncMap"
 # Keyboard Module Configuration
 ScanModule="K-Type"
 MacroModule="PixelMap"
-OutputModule="pjrcUSB"
+OutputModule="USB"
 DebugModule="full"
 
 # Microcontroller

Keyboards/k-type.bash

@@ -45,7 +45,7 @@ DefaultMap="k-type/vmw stdFuncMap"
 # Keyboard Module Configuration
 ScanModule="K-Type"
 MacroModule="PixelMap"
-OutputModule="pjrcUSB"
+OutputModule="USB"
 DebugModule="full"
 
 # Microcontroller

Keyboards/k-type.p2.bash

@@ -45,7 +45,7 @@ PartialMaps[2]="k-type/unset_v1 k-type/color_painter"
 # Keyboard Module Configuration
 ScanModule="K-Type"
 MacroModule="PixelMap"
-OutputModule="pjrcUSB"
+OutputModule="USB"
 DebugModule="full"
 
 # Microcontroller

Keyboards/k-type.p3.bash

@@ -43,7 +43,7 @@ DefaultMap="kira/demo.1 stdFuncMap remote_reload"
 # Keyboard Module Configuration
 ScanModule="Kira"
 MacroModule="PixelMap"
-OutputModule="pjrcUSB"
+OutputModule="USB"
 DebugModule="full"
 
 # Microcontroller

Keyboards/kira.bash

@@ -41,7 +41,7 @@ DefaultMap="stdFuncMap"
 # Keyboard Module Configuration
 ScanModule="PS2"
 MacroModule="PartialMap"
-OutputModule="pjrcUSB"
+OutputModule="USB"
 DebugModule="full"
 
 # Microcontroller

Keyboards/ps2_converter.bash

@@ -47,7 +47,7 @@ PartialMaps[2]="colemak"
 # Keyboard Module Configuration
 ScanModule="Infinity_60"
 MacroModule="PartialMap"
-OutputModule="pjrcUSB"
+OutputModule="USB"
 DebugModule="full"
 
 # Microcontroller

Keyboards/template.bash

@@ -52,7 +52,7 @@ PartialMaps[1]="whitefox/whitefox"
 # Keyboard Module Configuration
 ScanModule="WhiteFox"
 MacroModule="PixelMap"
-OutputModule="pjrcUSB"
+OutputModule="USB"
 DebugModule="full"
 
 # Microcontroller

Keyboards/whitefox.bash

@@ -1,6 +1,6 @@
 ###| CMake Kiibohd Controller UART Output Module |###
 #
-# Written by Jacob Alexander in 2014-2015 for the Kiibohd Controller
+# Written by Jacob Alexander in 2014-2017 for the Kiibohd Controller
 #
 # Released into the Public Domain
 #
@@ -36,7 +36,7 @@ endif ()
 
 # Use pjrcUSB output_com.h
 include_directories (
-	${CMAKE_CURRENT_LIST_DIR}/../pjrcUSB
+	${CMAKE_CURRENT_LIST_DIR}/../USB
 )
 
 

Output/README.md

@@ -1,6 +1,6 @@
 ###| CMake Kiibohd Controller Muxed UART and USB Output Module |###
 #
-# Written by Jacob Alexander in 2014-2015 for the Kiibohd Controller
+# Written by Jacob Alexander in 2014-2017 for the Kiibohd Controller
 #
 # Released into the Public Domain
 #
@@ -11,8 +11,8 @@
 # Required Submodules
 #
 
-AddModule ( Output pjrcUSB )
-AddModule ( Output uartOut )
+AddModule ( Output USB )
+AddModule ( Output UARTOut )
 
 
 ###
@@ -25,8 +25,8 @@ set( Module_SRCS
 
 # Remove duplicate output_com.c files from pjrcUSB and uartOut
 list ( REMOVE_ITEM Output_SRCS
-	Output/pjrcUSB/output_com.c
-	Output/uartOut/output_com.c
+	Output/USB/output_com.c
+	Output/UARTOut/output_com.c
 )