Mercurial > louis > kiibohd-controller

changeset 373:83cb0d4b57e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updating convenience build scripts to build Left and Right sides - Includes minor fix for MD1
author Jacob Alexander <haata@kiibohd.com>
date Fri, 21 Aug 2015 23:23:52 -0700
parents b6f4cfff9d1a
children cf3faad08228
files Keyboards/cmake.bash Keyboards/ergodox.bash Scan/MD1/scan_loop.c
diffstat 3 files changed, 30 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Keyboards/cmake.bash	Fri Aug 21 22:59:11 2015 -0700
+++ b/Keyboards/cmake.bash	Fri Aug 21 23:23:52 2015 -0700
@@ -85,4 +85,5 @@
 make
 
 echo "Firmware has been compiled into: '${BuildPath}'"
+cd -
 
--- a/Keyboards/ergodox.bash	Fri Aug 21 22:59:11 2015 -0700
+++ b/Keyboards/ergodox.bash	Fri Aug 21 23:23:52 2015 -0700
@@ -9,9 +9,11 @@
 # Configuration #
 #################
 
+######## Left Side ########
+
 # Feel free to change the variables in this section to configure your keyboard
 
-BuildPath="ICED"
+BuildPath="ICED-L"
 
 ## KLL Configuration ##
 
@@ -21,7 +23,7 @@
 # This is the default layer of the keyboard
 # NOTE: To combine kll files into a single layout, separate them by spaces
 # e.g.  DefaultMap="mylayout mylayoutmod"
-DefaultMap="stdFuncMap"
+DefaultMap="mdergo1Overlay lcdFuncMap"
 
 # This is where you set the additional layers
 # NOTE: Indexing starts at 1
@@ -29,7 +31,8 @@
 # e.g.  PartialMaps[1]="layer1 layer1mod"
 #       PartialMaps[2]="layer2"
 #       PartialMaps[3]="layer3"
-PartialMaps[1]="hhkbpro2"
+PartialMaps[1]="iced_func"
+PartialMaps[2]="iced_numpad"
 
 
 
@@ -70,3 +73,25 @@
 # Load the library
 source cmake.bash
 
+
+
+#########################
+# Re-run for right side #
+#########################
+
+######## Right Side ########
+
+# Feel free to change the variables in this section to configure your keyboard
+
+BuildPath="ICED-R"
+
+## KLL Configuration ##
+
+# Only changing the basemap (everything else is the same)
+# Generally shouldn't be changed, this will affect every layer
+BaseMap="defaultMap rightHand slave1 leftHand"
+
+# Load the library (starts the build)
+source cmake.bash
+
+
--- a/Scan/MD1/scan_loop.c	Fri Aug 21 22:59:11 2015 -0700
+++ b/Scan/MD1/scan_loop.c	Fri Aug 21 23:23:52 2015 -0700
@@ -169,6 +169,7 @@
 	// If key is not blocked, process
 	if ( key != CustomAction_blockHold_storage )
 	{
+		extern void Output_usbCodeSend_capability( uint8_t state, uint8_t stateType, uint8_t *args );
 		Output_usbCodeSend_capability( state, stateType, &key );
 	}
 }