di0ib
/
controller
Watch 1
Star 0
Fork 0
Code Releases 0 Activity
Browse Source

Updating convenience build scripts to build Left and Right sides 

- Includes minor fix for MD1
capsense
Jacob Alexander 8 years ago
parent
1fe9dd2a53
commit
85586c574a
3 changed files with 30 additions and 3 deletions
Split View Show Diff Stats
  1. 1
    0
      Keyboards/cmake.bash
  2. 28
    3
      Keyboards/ergodox.bash
  3. 1
    0
      Scan/MD1/scan_loop.c

+ 1
- 0
Keyboards/cmake.bash View File

@@ -85,4 +85,5 @@ cmake -DCHIP="${Chip}" -DCOMPILER="${Compiler}" -DScanModule="${ScanModule}" -DM
make

echo "Firmware has been compiled into: '${BuildPath}'"
cd -


+ 28
- 3
Keyboards/ergodox.bash View File

@@ -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 @@ BaseMap="defaultMap leftHand slave1 rightHand"
# 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 @@ DefaultMap="stdFuncMap"
# 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 @@ fi
# 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



+ 1
- 0
Scan/MD1/scan_loop.c View File

@@ -169,6 +169,7 @@ void CustomAction_blockKey_capability( uint8_t state, uint8_t stateType, uint8_t
// 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 );
}
}