diff --git a/inf_ergodox/src/MDErgo1-Default-0.kll b/inf_ergodox/src/MDErgo1-Default-0.kll index 08b18fc..cf739e3 100644 --- a/inf_ergodox/src/MDErgo1-Default-0.kll +++ b/inf_ergodox/src/MDErgo1-Default-0.kll @@ -39,10 +39,10 @@ U"HOME" : U"HOME"; U"END" : U"NUMLOCK"; U"DELETE" : U"BACKSPACE"; U"BACKSPACE" : U"SPACE"; -U"FUNCTION5" : U"FUN1"; +U"FUNCTION5" : U"FUN2"; U"FUNCTION4" : U"LGUI"; U"FUNCTION3" : U"LALT"; -U"BACKTICK" : flashMode(); +U"BACKTICK" : U"LCTRL"; U"LGUI" : U"LCTRL"; U"6" : U"6"; U"7" : U"7"; @@ -76,7 +76,7 @@ U"PAGEUP" : U"END"; U"PAGEDOWN" : U"PRINTSCREEN"; U"ENTER" : U"ENTER"; U"SPACE" : U"SPACE"; -U"LEFT" : U"FUN2"; +U"LEFT" : U"FUN1"; U"DOWN" : U"LEFT"; U"UP" : U"DOWN"; U"RIGHT" : U"UP"; diff --git a/inf_ergodox/src/MDErgo1-Default-2.kll b/inf_ergodox/src/MDErgo1-Default-2.kll index e82df14..26a9b8a 100644 --- a/inf_ergodox/src/MDErgo1-Default-2.kll +++ b/inf_ergodox/src/MDErgo1-Default-2.kll @@ -18,6 +18,7 @@ U"S" : U"F2"; U"A" : U"F1"; U"LALT" : CONS"SCANPREVIOUSTRACK"; U"LCTRL" : CONS"STOP"; +U"END" : flashMode(); U"Y" : U"6"; U"U" : U"7"; U"I" : U"8"; @@ -31,4 +32,5 @@ U"QUOTE" : '|'; U"RALT" : CONS"SCANNEXTTRACK"; U"RCTRL" : CONS"FILEBROWSER"; U"M" : U"INSERT"; +U"PAGEDOWN" : flashMode(); diff --git a/inf_ergodox/src/MDErgo1-Default.json b/inf_ergodox/src/MDErgo1-Default.json index 2cd315a..e95f9fd 100644 --- a/inf_ergodox/src/MDErgo1-Default.json +++ b/inf_ergodox/src/MDErgo1-Default.json @@ -550,6 +550,10 @@ "0": { "key": "NUMLOCK", "label": "NMLK" + }, + "2": { + "key": "#:flashMode()", + "label": "FLASH" } } }, @@ -591,8 +595,8 @@ "h": 4, "layers": { "0": { - "key": "FUN1", - "label": "\u01921" + "key": "FUN2", + "label": "\u01922" } } }, @@ -630,8 +634,8 @@ "h": 4, "layers": { "0": { - "key": "#:flashMode()", - "label": "FLASH" + "key": "LCTRL", + "label": "LCTRL" } } }, @@ -1184,6 +1188,10 @@ "0": { "key": "PRINTSCREEN", "label": "PRSC" + }, + "2": { + "key": "#:flashMode()", + "label": "FLASH" } } }, @@ -1221,8 +1229,8 @@ "h": 4, "layers": { "0": { - "key": "FUN2", - "label": "\u01922" + "key": "FUN1", + "label": "\u01921" } } }, diff --git a/inf_ergodox/src/kll/MDErgo1-Default-0.kll b/inf_ergodox/src/kll/MDErgo1-Default-0.kll index 08b18fc..cf739e3 100644 --- a/inf_ergodox/src/kll/MDErgo1-Default-0.kll +++ b/inf_ergodox/src/kll/MDErgo1-Default-0.kll @@ -39,10 +39,10 @@ U"HOME" : U"HOME"; U"END" : U"NUMLOCK"; U"DELETE" : U"BACKSPACE"; U"BACKSPACE" : U"SPACE"; -U"FUNCTION5" : U"FUN1"; +U"FUNCTION5" : U"FUN2"; U"FUNCTION4" : U"LGUI"; U"FUNCTION3" : U"LALT"; -U"BACKTICK" : flashMode(); +U"BACKTICK" : U"LCTRL"; U"LGUI" : U"LCTRL"; U"6" : U"6"; U"7" : U"7"; @@ -76,7 +76,7 @@ U"PAGEUP" : U"END"; U"PAGEDOWN" : U"PRINTSCREEN"; U"ENTER" : U"ENTER"; U"SPACE" : U"SPACE"; -U"LEFT" : U"FUN2"; +U"LEFT" : U"FUN1"; U"DOWN" : U"LEFT"; U"UP" : U"DOWN"; U"RIGHT" : U"UP"; diff --git a/inf_ergodox/src/kll/MDErgo1-Default-2.kll b/inf_ergodox/src/kll/MDErgo1-Default-2.kll index e82df14..26a9b8a 100644 --- a/inf_ergodox/src/kll/MDErgo1-Default-2.kll +++ b/inf_ergodox/src/kll/MDErgo1-Default-2.kll @@ -18,6 +18,7 @@ U"S" : U"F2"; U"A" : U"F1"; U"LALT" : CONS"SCANPREVIOUSTRACK"; U"LCTRL" : CONS"STOP"; +U"END" : flashMode(); U"Y" : U"6"; U"U" : U"7"; U"I" : U"8"; @@ -31,4 +32,5 @@ U"QUOTE" : '|'; U"RALT" : CONS"SCANNEXTTRACK"; U"RCTRL" : CONS"FILEBROWSER"; U"M" : U"INSERT"; +U"PAGEDOWN" : flashMode(); diff --git a/inf_ergodox/src/left_kiibohd.dfu.bin b/inf_ergodox/src/left_kiibohd.dfu.bin index 6ffc00a..250fe76 100644 Binary files a/inf_ergodox/src/left_kiibohd.dfu.bin and b/inf_ergodox/src/left_kiibohd.dfu.bin differ diff --git a/inf_ergodox/src/log/build.log b/inf_ergodox/src/log/build.log index 74940a1..3e7298c 100644 --- a/inf_ergodox/src/log/build.log +++ b/inf_ergodox/src/log/build.log @@ -1,35 +1,35 @@ -cgi-bin/build_layout.bash 1efe6f93b27899aeae10fefb1336f230 MDErgo1 "MDErgo1-Default-0.kll" "MDErgo1-Default-1.kll" "MDErgo1-Default-2.kll" 2>&1 -/srv/KiiConf/tmp/1efe6f93b27899aeae10fefb1336f230 -/srv/KiiConf/tmp/1efe6f93b27899aeae10fefb1336f230 +cgi-bin/build_layout.bash 2ebe861a73c34229904fb6c6121d5dc815777a49f9900e MDErgo1 "MDErgo1-Default-0.kll" "MDErgo1-Default-1.kll" "MDErgo1-Default-2.kll" 2>&1 +/srv/KiiConf/dist/tmp/2ebe861a73c34229904fb6c6121d5dc815777a49f9900e +/srv/KiiConf/dist/tmp/2ebe861a73c34229904fb6c6121d5dc815777a49f9900e + mkdir -p left + mkdir -p right + cd left ++ cp ../MDErgo1-Default-0.kll ../MDErgo1-Default-1.kll ../MDErgo1-Default-2.kll . + cd right + cp ../MDErgo1-Default-0.kll ../MDErgo1-Default-1.kll ../MDErgo1-Default-2.kll . -+ cp ../MDErgo1-Default-0.kll ../MDErgo1-Default-1.kll ../MDErgo1-Default-2.kll . -+ cmake /srv/KiiConf/controller -DScanModule=MDErgo1 -DCHIP=mk20dx256vlh7 '-DBaseMap=defaultMap leftHand slave1 rightHand' -DMacroModule=PartialMap -DOutputModule=pjrcUSB -DDebugModule=full '-DDefaultMap=MDErgo1-Default-0 lcdFuncMap' '-DPartialMaps=MDErgo1-Default-1 lcdFuncMap;MDErgo1-Default-2 lcdFuncMap' -+ cmake /srv/KiiConf/controller -DScanModule=MDErgo1 -DCHIP=mk20dx256vlh7 '-DBaseMap=defaultMap rightHand slave1 leftHand' -DMacroModule=PartialMap -DOutputModule=pjrcUSB -DDebugModule=full '-DDefaultMap=MDErgo1-Default-0 lcdFuncMap' '-DPartialMaps=MDErgo1-Default-1 lcdFuncMap;MDErgo1-Default-2 lcdFuncMap' --- Compiler Family: -arm ++ cmake /srv/KiiConf/controller -DScanModule=MDErgo1 -DCHIP=mk20dx256vlh7 '-DBaseMap=defaultMap rightHand slave1 leftHand' -DMacroModule=PartialMap -DOutputModule=pjrcUSB -DDebugModule=full '-DDefaultMap=MDErgo1-Default-0 lcdFuncMap' '-DPartialMaps=MDErgo1-Default-1 lcdFuncMap;MDErgo1-Default-2 lcdFuncMap' -DCONFIGURATOR=1 ++ cmake /srv/KiiConf/controller -DScanModule=MDErgo1 -DCHIP=mk20dx256vlh7 '-DBaseMap=defaultMap leftHand slave1 rightHand' -DMacroModule=PartialMap -DOutputModule=pjrcUSB -DDebugModule=full '-DDefaultMap=MDErgo1-Default-0 lcdFuncMap' '-DPartialMaps=MDErgo1-Default-1 lcdFuncMap;MDErgo1-Default-2 lcdFuncMap' -DCONFIGURATOR=1 -- Compiler Family: arm -- Compiler Selected: gcc -- Chip Selected: mk20dx256vlh7 --- Compiler Selected: -- Chip Family: mk20dx -- CPU Selected: cortex-m4 -- Compiler Source Files: -Lib/mk20dx.c;Lib/delay.cgcc +Lib/mk20dx.c;Lib/delay.c +-- Bootloader Type: +dfu +-- Compiler Family: +arm +-- Compiler Selected: +gcc -- Chip Selected: mk20dx256vlh7 - --- Bootloader Type: -dfu-- Chip Family: - +-- Chip Family: mk20dx -- CPU Selected: cortex-m4 @@ -40,28 +40,25 @@ dfu -- Detected Scan Module Source Files: Scan/ISSILed/led_scan.c;Scan/MatrixARM/matrix_scan.c;Scan/STLcd/lcd_scan.c;Scan/UARTConnect/connect_scan.c;Scan/MDErgo1/scan_loop.c -- Detected Macro Module Source Files: -Macro/PartialMap/macro.c +Macro/PartialMap/macro.c;Macro/PartialMap/result.c;Macro/PartialMap/trigger.c -- Detected Output Module Source Files: -Output/pjrcUSB/output_com.c;Output/pjrcUSB/arm/usb_desc.c;Output/pjrcUSB/arm/usb_dev.c;Output/pjrcUSB/arm/usb_joystick.c;Output/pjrcUSB/arm/usb_keyboard.c;Output/pjrcUSB/arm/usb_mem.c;Output/pjrcUSB/arm/usb_mouse.c;Output/pjrcUSB/arm/usb_serial.c +Output/pjrcUSB/output_com.c;Output/pjrcUSB/arm/usb_desc.c;Output/pjrcUSB/arm/usb_dev.c;Output/pjrcUSB/arm/usb_joystick.c;Output/pjrcUSB/arm/usb_keyboard.c;Output/pjrcUSB/arm/usb_mem.c;Output/pjrcUSB/arm/usb_mouse.c;Output/pjrcUSB/arm/usb_rawio.c;Output/pjrcUSB/arm/usb_serial.c +-- Detected Debug Module Source Files: +Debug/cli/cli.c;Debug/led/led.c;Debug/print/print.c +-- Found Git: /usr/bin/git (found version "1.9.1") -- Detected Scan Module Source Files: Scan/ISSILed/led_scan.c;Scan/MatrixARM/matrix_scan.c;Scan/STLcd/lcd_scan.c;Scan/UARTConnect/connect_scan.c;Scan/MDErgo1/scan_loop.c -- Detected Macro Module Source Files: -Macro/PartialMap/macro.c --- Detected Debug Module Source Files: -Debug/cli/cli.c;Debug/led/led.c;Debug/print/print.c +Macro/PartialMap/macro.c;Macro/PartialMap/result.c;Macro/PartialMap/trigger.c -- Detected Output Module Source Files: -Output/pjrcUSB/output_com.c;Output/pjrcUSB/arm/usb_desc.c;Output/pjrcUSB/arm/usb_dev.c;Output/pjrcUSB/arm/usb_joystick.c;Output/pjrcUSB/arm/usb_keyboard.c;Output/pjrcUSB/arm/usb_mem.c;Output/pjrcUSB/arm/usb_mouse.c;Output/pjrcUSB/arm/usb_serial.c +Output/pjrcUSB/output_com.c;Output/pjrcUSB/arm/usb_desc.c;Output/pjrcUSB/arm/usb_dev.c;Output/pjrcUSB/arm/usb_joystick.c;Output/pjrcUSB/arm/usb_keyboard.c;Output/pjrcUSB/arm/usb_mem.c;Output/pjrcUSB/arm/usb_mouse.c;Output/pjrcUSB/arm/usb_rawio.c;Output/pjrcUSB/arm/usb_serial.c +-- Found Ctags: /usr/bin/ctags (found version "5.9~svn20110310") -- Detected Debug Module Source Files: Debug/cli/cli.c;Debug/led/led.c;Debug/print/print.c -- Found Git: /usr/bin/git (found version "1.9.1") -- Found Ctags: /usr/bin/ctags (found version "5.9~svn20110310") --- Found Git: /usr/bin/git (found version "1.9.1") --- Found Ctags: /usr/bin/ctags (found version "5.9~svn20110310") -ctags: ctags: cannot open tag file : Permission denied -cannot open tag file : Permission denied +ctags: cannot open tag file : Permission denied -- Detected Layout Files: --- Detected Layout Files: -/srv/KiiConf/controller/Scan/ISSILed/capabilities.kll /srv/KiiConf/controller/Scan/ISSILed/capabilities.kll /srv/KiiConf/controller/Scan/MatrixARM/capabilities.kll /srv/KiiConf/controller/Scan/STLcd/capabilities.kll @@ -72,12 +69,15 @@ cannot open tag file : Permission denied /srv/KiiConf/controller/Scan/MDErgo1/rightHand.kll /srv/KiiConf/controller/Scan/MDErgo1/slave1.kll /srv/KiiConf/controller/Scan/MDErgo1/leftHand.kll -/srv/KiiConf/tmp/1efe6f93b27899aeae10fefb1336f230/right/MDErgo1-Default-0.kll +/srv/KiiConf/dist/tmp/2ebe861a73c34229904fb6c6121d5dc815777a49f9900e/right/MDErgo1-Default-0.kll /srv/KiiConf/controller/kll/layouts/lcdFuncMap.kll -/srv/KiiConf/tmp/1efe6f93b27899aeae10fefb1336f230/right/MDErgo1-Default-1.kll +/srv/KiiConf/dist/tmp/2ebe861a73c34229904fb6c6121d5dc815777a49f9900e/right/MDErgo1-Default-1.kll /srv/KiiConf/controller/kll/layouts/lcdFuncMap.kll -/srv/KiiConf/tmp/1efe6f93b27899aeae10fefb1336f230/right/MDErgo1-Default-2.kll +/srv/KiiConf/dist/tmp/2ebe861a73c34229904fb6c6121d5dc815777a49f9900e/right/MDErgo1-Default-2.kll /srv/KiiConf/controller/kll/layouts/lcdFuncMap.kll +ctags: cannot open tag file : Permission denied +-- Detected Layout Files: +/srv/KiiConf/controller/Scan/ISSILed/capabilities.kll /srv/KiiConf/controller/Scan/MatrixARM/capabilities.kll /srv/KiiConf/controller/Scan/STLcd/capabilities.kll /srv/KiiConf/controller/Scan/UARTConnect/capabilities.kll @@ -87,88 +87,106 @@ cannot open tag file : Permission denied /srv/KiiConf/controller/Scan/MDErgo1/leftHand.kll /srv/KiiConf/controller/Scan/MDErgo1/slave1.kll /srv/KiiConf/controller/Scan/MDErgo1/rightHand.kll -/srv/KiiConf/tmp/1efe6f93b27899aeae10fefb1336f230/left/MDErgo1-Default-0.kll +/srv/KiiConf/dist/tmp/2ebe861a73c34229904fb6c6121d5dc815777a49f9900e/left/MDErgo1-Default-0.kll /srv/KiiConf/controller/kll/layouts/lcdFuncMap.kll -/srv/KiiConf/tmp/1efe6f93b27899aeae10fefb1336f230/left/MDErgo1-Default-1.kll +/srv/KiiConf/dist/tmp/2ebe861a73c34229904fb6c6121d5dc815777a49f9900e/left/MDErgo1-Default-1.kll /srv/KiiConf/controller/kll/layouts/lcdFuncMap.kll -/srv/KiiConf/tmp/1efe6f93b27899aeae10fefb1336f230/left/MDErgo1-Default-2.kll +/srv/KiiConf/dist/tmp/2ebe861a73c34229904fb6c6121d5dc815777a49f9900e/left/MDErgo1-Default-2.kll /srv/KiiConf/controller/kll/layouts/lcdFuncMap.kll -- Found DFU_SUFFIX: /usr/local/bin/dfu-suffix (found version "0.8") +-- Configuring done -- Found DFU_SUFFIX: /usr/local/bin/dfu-suffix (found version "0.8") -- Configuring done --- Configuring done --- Generating done --- Build files have been written to: /srv/KiiConf/tmp/1efe6f93b27899aeae10fefb1336f230/left -- Generating done +CMake Warning: + Manually-specified variables were not used by the project: + + CONFIGURATOR + + +-- Build files have been written to: /srv/KiiConf/dist/tmp/2ebe861a73c34229904fb6c6121d5dc815777a49f9900e/right + make -j --- Build files have been written to: /srv/KiiConf/tmp/1efe6f93b27899aeae10fefb1336f230/right +-- Generating done +CMake Warning: + Manually-specified variables were not used by the project: + + CONFIGURATOR + + +-- Build files have been written to: /srv/KiiConf/dist/tmp/2ebe861a73c34229904fb6c6121d5dc815777a49f9900e/left + make -j [ 4%] [ 4%] Generating KLL Layout Generating KLL Layout Scanning dependencies of target kiibohd.elf -[ 9%] [ 13%] [ 18%] [ 22%] [ 27%] Building C object CMakeFiles/kiibohd.elf.dir/Lib/mk20dx.c.o +[ 16%] [ 16%] [ 16%] [ 20%] [ 24%] [ 28%] Building C object CMakeFiles/kiibohd.elf.dir/Scan/MatrixARM/matrix_scan.c.o Building C object CMakeFiles/kiibohd.elf.dir/main.c.o -[ 31%] [ 36%] Building C object CMakeFiles/kiibohd.elf.dir/Lib/delay.c.o -[ 40%] Building C object CMakeFiles/kiibohd.elf.dir/Scan/STLcd/lcd_scan.c.o -[ 45%] Building C object CMakeFiles/kiibohd.elf.dir/Scan/ISSILed/led_scan.c.o -Building C object CMakeFiles/kiibohd.elf.dir/Scan/MatrixARM/matrix_scan.c.o -Building C object CMakeFiles/kiibohd.elf.dir/Scan/MDErgo1/scan_loop.c.o -[ 50%] Scanning dependencies of target kiibohd.elf -Building C object CMakeFiles/kiibohd.elf.dir/Macro/PartialMap/macro.c.o -[ 54%] Building C object CMakeFiles/kiibohd.elf.dir/Scan/UARTConnect/connect_scan.c.o -[ 9%] [ 13%] [ 18%] Building C object CMakeFiles/kiibohd.elf.dir/main.c.o -Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/output_com.c.o +Building C object CMakeFiles/kiibohd.elf.dir/Lib/delay.c.o Building C object CMakeFiles/kiibohd.elf.dir/Lib/mk20dx.c.o -[ 59%] [ 63%] Building C object CMakeFiles/kiibohd.elf.dir/Lib/delay.c.o -[ 22%] Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_desc.c.o -[ 68%] [ 72%] [ 27%] Building C object CMakeFiles/kiibohd.elf.dir/Scan/ISSILed/led_scan.c.o -Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_dev.c.o -Building C object CMakeFiles/kiibohd.elf.dir/Scan/MatrixARM/matrix_scan.c.o -[ 31%] Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_keyboard.c.o -Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_joystick.c.o -Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_mem.c.o -[ 77%] [ 36%] Building C object CMakeFiles/kiibohd.elf.dir/Scan/STLcd/lcd_scan.c.o -[ 81%] [ 86%] [ 40%] [ 45%] Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_mouse.c.o -Building C object CMakeFiles/kiibohd.elf.dir/Scan/UARTConnect/connect_scan.c.o -Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_serial.c.o -[ 50%] Building C object CMakeFiles/kiibohd.elf.dir/Debug/cli/cli.c.o +Building C object CMakeFiles/kiibohd.elf.dir/Scan/ISSILed/led_scan.c.o +Building C object CMakeFiles/kiibohd.elf.dir/Scan/STLcd/lcd_scan.c.o +[ 32%] [ 36%] Building C object CMakeFiles/kiibohd.elf.dir/Scan/MDErgo1/scan_loop.c.o +[ 40%] Building C object CMakeFiles/kiibohd.elf.dir/Scan/UARTConnect/connect_scan.c.o Building C object CMakeFiles/kiibohd.elf.dir/Macro/PartialMap/macro.c.o -[ 90%] Building C object CMakeFiles/kiibohd.elf.dir/Scan/MDErgo1/scan_loop.c.o -[ 54%] [ 95%] Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/output_com.c.o -Building C object CMakeFiles/kiibohd.elf.dir/Debug/led/led.c.o -Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_desc.c.o -Building C object CMakeFiles/kiibohd.elf.dir/Debug/print/print.c.o -[ 59%] [ 63%] Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_dev.c.o -[ 68%] Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_joystick.c.o -[ 72%] [ 77%] [ 81%] Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_keyboard.c.o -[ 86%] Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_serial.c.o +[ 44%] [ 48%] [ 52%] Scanning dependencies of target kiibohd.elf +Building C object CMakeFiles/kiibohd.elf.dir/Macro/PartialMap/result.c.o +Building C object CMakeFiles/kiibohd.elf.dir/Macro/PartialMap/trigger.c.o +Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/output_com.c.o +[ 56%] [ 8%] [ 12%] Building C object CMakeFiles/kiibohd.elf.dir/main.c.o +[ 60%] [ 16%] [ 64%] Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_desc.c.o +[ 68%] Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_dev.c.o +Building C object CMakeFiles/kiibohd.elf.dir/Lib/mk20dx.c.o +[ 20%] [ 24%] Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_joystick.c.o +Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_keyboard.c.o +Building C object CMakeFiles/kiibohd.elf.dir/Lib/delay.c.o +[ 72%] [ 76%] [ 28%] Building C object CMakeFiles/kiibohd.elf.dir/Scan/ISSILed/led_scan.c.o +Building C object CMakeFiles/kiibohd.elf.dir/Scan/MatrixARM/matrix_scan.c.o +[ 32%] Building C object CMakeFiles/kiibohd.elf.dir/Scan/STLcd/lcd_scan.c.o Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_mem.c.o -Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_mouse.c.o +[ 80%] [ 84%] [ 88%] Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_mouse.c.o +Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_rawio.c.o +[ 36%] Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_serial.c.o +[ 92%] [ 96%] Building C object CMakeFiles/kiibohd.elf.dir/Scan/UARTConnect/connect_scan.c.o Building C object CMakeFiles/kiibohd.elf.dir/Debug/cli/cli.c.o -[ 90%] [ 95%] Building C object CMakeFiles/kiibohd.elf.dir/Debug/print/print.c.o +Building C object CMakeFiles/kiibohd.elf.dir/Scan/MDErgo1/scan_loop.c.o Building C object CMakeFiles/kiibohd.elf.dir/Debug/led/led.c.o +[ 40%] Building C object CMakeFiles/kiibohd.elf.dir/Debug/print/print.c.o +[ 44%] [ 48%] [ 52%] Building C object CMakeFiles/kiibohd.elf.dir/Macro/PartialMap/macro.c.o +Building C object CMakeFiles/kiibohd.elf.dir/Macro/PartialMap/result.c.o +[ 56%] Building C object CMakeFiles/kiibohd.elf.dir/Macro/PartialMap/trigger.c.o +Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/output_com.c.o +[ 60%] Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_desc.c.o +[ 64%] Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_dev.c.o +Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_joystick.c.o +[ 68%] Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_keyboard.c.o +[ 72%] [ 76%] Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_mem.c.o +[ 80%] Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_mouse.c.o +Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_rawio.c.o +[ 84%] [ 88%] [ 92%] Building C object CMakeFiles/kiibohd.elf.dir/Output/pjrcUSB/arm/usb_serial.c.o +Building C object CMakeFiles/kiibohd.elf.dir/Debug/cli/cli.c.o +Building C object CMakeFiles/kiibohd.elf.dir/Debug/led/led.c.o +[ 96%] Building C object CMakeFiles/kiibohd.elf.dir/Debug/print/print.c.o Linking C executable kiibohd.elf Create and sign dfu bin file: kiibohd.dfu.bin Creating Extended Listing: kiibohd.lss Linking C executable kiibohd.elf Creating Symbol Table: kiibohd.sym -[ 95%] Built target kiibohd.elf -Scanning dependencies of target SizeAfter -[100%] Chip usage for mk20dx256vlh7 -  SRAM: 14% 9664/65536 bytes Create and sign dfu bin file: kiibohd.dfu.bin - Flash: 17% 43552/253952 bytes +[ 96%] Built target kiibohd.elf Creating Extended Listing: kiibohd.lss -[100%] Built target SizeAfter -+ RETVAL=0 -+ set +x -/srv/KiiConf/tmp/1efe6f93b27899aeae10fefb1336f230 -Creating Symbol Table: kiibohd.sym -[ 95%] Built target kiibohd.elf Scanning dependencies of target SizeAfter [100%] Chip usage for mk20dx256vlh7 -  SRAM: 14% 9716/65536 bytes - Flash: 17% 43648/253952 bytes +  SRAM: 14% 9656/65536 bytes + Flash: 17% 45176/253952 bytes +[100%] Built target SizeAfter ++ RETVAL=0 ++ set +x +/srv/KiiConf/dist/tmp/2ebe861a73c34229904fb6c6121d5dc815777a49f9900e +Creating Symbol Table: kiibohd.sym +[ 96%] Built target kiibohd.elf +Scanning dependencies of target SizeAfter +[100%] Chip usage for mk20dx256vlh7 +  SRAM: 14% 9696/65536 bytes + Flash: 17% 45264/253952 bytes [100%] Built target SizeAfter + RETVAL=0 + set +x diff --git a/inf_ergodox/src/log/left_generatedKeymap.h b/inf_ergodox/src/log/left_generatedKeymap.h index c2b01ae..517d29b 100644 --- a/inf_ergodox/src/log/left_generatedKeymap.h +++ b/inf_ergodox/src/log/left_generatedKeymap.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014-2015 by Jacob Alexander +/* Copyright (C) 2014-2016 by Jacob Alexander * * This file is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,9 +15,9 @@ */ // This file was generated by the kll compiler, DO NOT EDIT. -// Generation Date: 2016-04-05 +// Generation Date: 2016-07-02 // KLL Backend: kiibohd -// KLL Git Rev: b6cf0f13a88fef650f48270a1d1e20ccb1972d21 +// KLL Git Rev: 6135cbb8329eff480c4100a1b46557f690ea604b // KLL Git Changes: None // Compiler arguments: // /srv/KiiConf/controller/kll/kll.py @@ -115,7 +115,9 @@ void Output_kbdProtocolBoot_capability( uint8_t state, uint8_t stateType, uint8_ void Output_kbdProtocolNKRO_capability( uint8_t state, uint8_t stateType, uint8_t *args ); void Output_noneSend_capability( uint8_t state, uint8_t stateType, uint8_t *args ); void Output_sysCtrlSend_capability( uint8_t state, uint8_t stateType, uint8_t *args ); +void Output_toggleKbdProtocol_capability( uint8_t state, uint8_t stateType, uint8_t *args ); void Output_usbCodeSend_capability( uint8_t state, uint8_t stateType, uint8_t *args ); +void Output_usbMouse_capability( uint8_t state, uint8_t stateType, uint8_t *args ); @@ -135,125 +137,127 @@ const Capability CapabilitiesList[] = { { Output_kbdProtocolNKRO_capability, 0 }, { Output_noneSend_capability, 0 }, { Output_sysCtrlSend_capability, 1 }, + { Output_toggleKbdProtocol_capability, 0 }, { Output_usbCodeSend_capability, 1 }, + { Output_usbMouse_capability, 6 }, }; // -- Result Macros // Result Macro Guides -Guide_RM( 0 ) = { 1, 14, KEY_2, 0 }; +Guide_RM( 0 ) = { 1, 15, KEY_2, 0 }; Guide_RM( 1 ) = { 2, 6, 6, 0, 1, 0 }; -Guide_RM( 2 ) = { 1, 14, KEY_F, 0 }; -Guide_RM( 3 ) = { 1, 14, KEY_SEMICOLON, 0 }; -Guide_RM( 4 ) = { 1, 14, KEY_ESC, 0 }; -Guide_RM( 5 ) = { 1, 14, KEY_J, 0 }; -Guide_RM( 6 ) = { 1, 14, KEY_QUOTE, 0 }; -Guide_RM( 7 ) = { 1, 14, KEY_LGUI, 0 }; -Guide_RM( 8 ) = { 1, 14, KEY_MENU, 0 }; -Guide_RM( 9 ) = { 1, 14, KEY_K, 0 }; -Guide_RM( 10 ) = { 1, 14, KEY_BACKSPACE, 0 }; -Guide_RM( 11 ) = { 1, 14, KEY_LEFT, 0 }; -Guide_RM( 12 ) = { 1, 14, KEY_5, 0 }; -Guide_RM( 13 ) = { 1, 14, KEY_LALT, 0 }; -Guide_RM( 14 ) = { 1, 14, KEY_ENTER, 0 }; -Guide_RM( 15 ) = { 1, 14, KEY_D, 0 }; -Guide_RM( 16 ) = { 1, 14, KEY_DOWN, 0 }; -Guide_RM( 17 ) = { 1, 14, KEY_P, 0 }; -Guide_RM( 18 ) = { 1, 9, 0 }; -Guide_RM( 19 ) = { 1, 14, KEY_TAB, 0 }; -Guide_RM( 20 ) = { 1, 14, KEY_SPACE, 0 }; -Guide_RM( 21 ) = { 1, 14, KEY_U, 0 }; -Guide_RM( 22 ) = { 1, 14, KEY_S, 0 }; -Guide_RM( 23 ) = { 1, 14, KEY_G, 0 }; -Guide_RM( 24 ) = { 1, 14, KEY_H, 0 }; -Guide_RM( 25 ) = { 1, 14, KEY_HOME, 0 }; -Guide_RM( 26 ) = { 1, 14, KEY_COMMA, 0 }; -Guide_RM( 27 ) = { 2, 6, 1, 0, 1, 0 }; -Guide_RM( 28 ) = { 1, 14, KEY_E, 0 }; -Guide_RM( 29 ) = { 1, 14, KEY_END, 0 }; -Guide_RM( 30 ) = { 1, 14, KEY_NUM_LOCK, 0 }; +Guide_RM( 2 ) = { 1, 15, KEY_F, 0 }; +Guide_RM( 3 ) = { 1, 15, KEY_SEMICOLON, 0 }; +Guide_RM( 4 ) = { 1, 15, KEY_ESC, 0 }; +Guide_RM( 5 ) = { 1, 15, KEY_J, 0 }; +Guide_RM( 6 ) = { 1, 15, KEY_QUOTE, 0 }; +Guide_RM( 7 ) = { 1, 15, KEY_LGUI, 0 }; +Guide_RM( 8 ) = { 1, 15, KEY_MENU, 0 }; +Guide_RM( 9 ) = { 1, 15, KEY_K, 0 }; +Guide_RM( 10 ) = { 1, 15, KEY_BACKSPACE, 0 }; +Guide_RM( 11 ) = { 1, 15, KEY_LEFT, 0 }; +Guide_RM( 12 ) = { 1, 15, KEY_5, 0 }; +Guide_RM( 13 ) = { 1, 15, KEY_LALT, 0 }; +Guide_RM( 14 ) = { 1, 15, KEY_ENTER, 0 }; +Guide_RM( 15 ) = { 1, 15, KEY_D, 0 }; +Guide_RM( 16 ) = { 1, 15, KEY_DOWN, 0 }; +Guide_RM( 17 ) = { 1, 15, KEY_P, 0 }; +Guide_RM( 18 ) = { 1, 15, KEY_LCTRL, 0 }; +Guide_RM( 19 ) = { 1, 15, KEY_TAB, 0 }; +Guide_RM( 20 ) = { 1, 15, KEY_SPACE, 0 }; +Guide_RM( 21 ) = { 1, 15, KEY_U, 0 }; +Guide_RM( 22 ) = { 1, 15, KEY_S, 0 }; +Guide_RM( 23 ) = { 1, 15, KEY_G, 0 }; +Guide_RM( 24 ) = { 1, 15, KEY_H, 0 }; +Guide_RM( 25 ) = { 1, 15, KEY_HOME, 0 }; +Guide_RM( 26 ) = { 1, 15, KEY_COMMA, 0 }; +Guide_RM( 27 ) = { 2, 6, 2, 0, 1, 0 }; +Guide_RM( 28 ) = { 1, 15, KEY_E, 0 }; +Guide_RM( 29 ) = { 1, 15, KEY_END, 0 }; +Guide_RM( 30 ) = { 1, 15, KEY_NUM_LOCK, 0 }; Guide_RM( 31 ) = { 2, 5, 0, 1, 0 }; -Guide_RM( 32 ) = { 1, 14, KEY_I, 0 }; -Guide_RM( 33 ) = { 1, 14, KEY_W, 0 }; -Guide_RM( 34 ) = { 1, 14, KEY_PRINTSCREEN, 0 }; -Guide_RM( 35 ) = { 1, 14, KEY_O, 0 }; -Guide_RM( 36 ) = { 1, 14, KEY_X, 0 }; -Guide_RM( 37 ) = { 1, 14, KEY_Q, 0 }; -Guide_RM( 38 ) = { 1, 14, KEY_Y, 0 }; -Guide_RM( 39 ) = { 1, 14, KEY_B, 0 }; -Guide_RM( 40 ) = { 1, 14, KEY_PERIOD, 0 }; -Guide_RM( 41 ) = { 1, 14, KEY_Z, 0 }; -Guide_RM( 42 ) = { 1, 14, KEY_N, 0 }; -Guide_RM( 43 ) = { 1, 14, KEY_T, 0 }; -Guide_RM( 44 ) = { 1, 14, KEY_SLASH, 0 }; -Guide_RM( 45 ) = { 1, 14, KEY_9, 0 }; -Guide_RM( 46 ) = { 1, 14, KEY_LSHIFT, 0 }; -Guide_RM( 47 ) = { 1, 14, KEY_1, 0 }; -Guide_RM( 48 ) = { 1, 14, KEY_M, 0 }; -Guide_RM( 49 ) = { 1, 14, KEY_6, 0 }; -Guide_RM( 50 ) = { 1, 14, KEY_R, 0 }; -Guide_RM( 51 ) = { 1, 14, KEY_0, 0 }; -Guide_RM( 52 ) = { 2, 14, KEY_LSHIFT, 14, KEY_BACKTICK, 0 }; -Guide_RM( 53 ) = { 1, 14, KEY_V, 0 }; -Guide_RM( 54 ) = { 1, 14, KEY_INSERT, 0 }; +Guide_RM( 32 ) = { 1, 15, KEY_I, 0 }; +Guide_RM( 33 ) = { 1, 15, KEY_W, 0 }; +Guide_RM( 34 ) = { 1, 15, KEY_PRINTSCREEN, 0 }; +Guide_RM( 35 ) = { 1, 15, KEY_O, 0 }; +Guide_RM( 36 ) = { 1, 15, KEY_X, 0 }; +Guide_RM( 37 ) = { 1, 15, KEY_Q, 0 }; +Guide_RM( 38 ) = { 1, 15, KEY_Y, 0 }; +Guide_RM( 39 ) = { 1, 15, KEY_B, 0 }; +Guide_RM( 40 ) = { 1, 15, KEY_PERIOD, 0 }; +Guide_RM( 41 ) = { 1, 15, KEY_Z, 0 }; +Guide_RM( 42 ) = { 1, 15, KEY_N, 0 }; +Guide_RM( 43 ) = { 1, 15, KEY_T, 0 }; +Guide_RM( 44 ) = { 1, 15, KEY_SLASH, 0 }; +Guide_RM( 45 ) = { 1, 15, KEY_9, 0 }; +Guide_RM( 46 ) = { 1, 15, KEY_LSHIFT, 0 }; +Guide_RM( 47 ) = { 1, 15, KEY_1, 0 }; +Guide_RM( 48 ) = { 1, 15, KEY_M, 0 }; +Guide_RM( 49 ) = { 1, 15, KEY_6, 0 }; +Guide_RM( 50 ) = { 1, 15, KEY_R, 0 }; +Guide_RM( 51 ) = { 1, 15, KEY_0, 0 }; +Guide_RM( 52 ) = { 2, 15, KEY_LSHIFT, 15, KEY_BACKTICK, 0 }; +Guide_RM( 53 ) = { 1, 15, KEY_V, 0 }; +Guide_RM( 54 ) = { 1, 15, KEY_INSERT, 0 }; Guide_RM( 55 ) = { 1, 8, 234, 0, 0 }; -Guide_RM( 56 ) = { 1, 14, KEY_L, 0 }; -Guide_RM( 57 ) = { 1, 14, KEY_C, 0 }; -Guide_RM( 58 ) = { 1, 14, KEY_4, 0 }; +Guide_RM( 56 ) = { 1, 15, KEY_L, 0 }; +Guide_RM( 57 ) = { 1, 15, KEY_C, 0 }; +Guide_RM( 58 ) = { 1, 15, KEY_4, 0 }; Guide_RM( 59 ) = { 1, 8, 233, 0, 0 }; Guide_RM( 60 ) = { 2, 5, 1, 1, 0 }; -Guide_RM( 61 ) = { 1, 14, KEY_7, 0 }; -Guide_RM( 62 ) = { 1, 14, KEY_UP, 0 }; -Guide_RM( 63 ) = { 1, 14, KEY_3, 0 }; -Guide_RM( 64 ) = { 1, 14, KEY_LCTRL, 0 }; -Guide_RM( 65 ) = { 2, 6, 2, 0, 1, 0 }; -Guide_RM( 66 ) = { 1, 14, KEY_8, 0 }; -Guide_RM( 67 ) = { 1, 14, KEY_A, 0 }; -Guide_RM( 68 ) = { 1, 14, KEY_RIGHT, 0 }; -Guide_RM( 69 ) = { 1, 14, KEY_F2, 0 }; -Guide_RM( 70 ) = { 1, 14, KEY_F12, 0 }; -Guide_RM( 71 ) = { 1, 14, KEY_F4, 0 }; -Guide_RM( 72 ) = { 1, 14, KEY_RIGHT_BRACKET, 0 }; -Guide_RM( 73 ) = { 1, 14, KEY_MINUS, 0 }; -Guide_RM( 74 ) = { 1, 14, KEY_F11, 0 }; -Guide_RM( 75 ) = { 1, 14, KEY_BACKSLASH, 0 }; -Guide_RM( 76 ) = { 1, 8, 112, 0, 0 }; -Guide_RM( 77 ) = { 1, 14, KEY_EQUAL, 0 }; -Guide_RM( 78 ) = { 1, 14, KEY_DELETE, 0 }; -Guide_RM( 79 ) = { 1, 14, KEY_F5, 0 }; -Guide_RM( 80 ) = { 1, 14, KEY_F3, 0 }; -Guide_RM( 81 ) = { 1, 14, KEY_PAGE_DOWN, 0 }; -Guide_RM( 82 ) = { 2, 14, KEY_LSHIFT, 14, KEY_0, 0 }; -Guide_RM( 83 ) = { 2, 14, KEY_LSHIFT, 14, KEY_7, 0 }; -Guide_RM( 84 ) = { 1, 14, KEY_F6, 0 }; -Guide_RM( 85 ) = { 2, 14, KEY_LSHIFT, 14, KEY_3, 0 }; -Guide_RM( 86 ) = { 2, 14, KEY_LSHIFT, 14, KEY_8, 0 }; -Guide_RM( 87 ) = { 2, 14, KEY_LSHIFT, 14, KEY_2, 0 }; -Guide_RM( 88 ) = { 2, 14, KEY_LSHIFT, 14, KEY_9, 0 }; -Guide_RM( 89 ) = { 1, 14, KEY_F8, 0 }; -Guide_RM( 90 ) = { 2, 14, KEY_LSHIFT, 14, KEY_1, 0 }; -Guide_RM( 91 ) = { 2, 14, KEY_LSHIFT, 14, KEY_6, 0 }; -Guide_RM( 92 ) = { 1, 14, KEY_F7, 0 }; -Guide_RM( 93 ) = { 2, 14, KEY_LSHIFT, 14, KEY_5, 0 }; -Guide_RM( 94 ) = { 1, 14, KEY_F9, 0 }; -Guide_RM( 95 ) = { 1, 14, KEY_F1, 0 }; -Guide_RM( 96 ) = { 2, 14, KEY_LSHIFT, 14, KEY_4, 0 }; -Guide_RM( 97 ) = { 1, 14, KEY_F10, 0 }; -Guide_RM( 98 ) = { 1, 8, 111, 0, 0 }; -Guide_RM( 99 ) = { 1, 8, 226, 0, 0 }; -Guide_RM( 100 ) = { 1, 14, KEY_LEFT_BRACKET, 0 }; -Guide_RM( 101 ) = { 1, 8, 205, 0, 0 }; -Guide_RM( 102 ) = { 1, 14, KEY_PAGE_UP, 0 }; -Guide_RM( 103 ) = { 2, 14, KEY_LSHIFT, 14, KEY_RIGHT_BRACKET, 0 }; -Guide_RM( 104 ) = { 2, 14, KEY_LSHIFT, 14, KEY_MINUS, 0 }; -Guide_RM( 105 ) = { 2, 14, KEY_LSHIFT, 14, KEY_BACKSLASH, 0 }; -Guide_RM( 106 ) = { 1, 8, 182, 0, 0 }; -Guide_RM( 107 ) = { 2, 14, KEY_LSHIFT, 14, KEY_EQUAL, 0 }; -Guide_RM( 108 ) = { 1, 14, KEY_BACKTICK, 0 }; +Guide_RM( 61 ) = { 1, 15, KEY_7, 0 }; +Guide_RM( 62 ) = { 1, 15, KEY_UP, 0 }; +Guide_RM( 63 ) = { 1, 15, KEY_3, 0 }; +Guide_RM( 64 ) = { 2, 6, 1, 0, 1, 0 }; +Guide_RM( 65 ) = { 1, 15, KEY_8, 0 }; +Guide_RM( 66 ) = { 1, 15, KEY_A, 0 }; +Guide_RM( 67 ) = { 1, 15, KEY_RIGHT, 0 }; +Guide_RM( 68 ) = { 1, 15, KEY_F2, 0 }; +Guide_RM( 69 ) = { 1, 15, KEY_F12, 0 }; +Guide_RM( 70 ) = { 1, 15, KEY_F4, 0 }; +Guide_RM( 71 ) = { 1, 15, KEY_RIGHT_BRACKET, 0 }; +Guide_RM( 72 ) = { 1, 15, KEY_MINUS, 0 }; +Guide_RM( 73 ) = { 1, 15, KEY_F11, 0 }; +Guide_RM( 74 ) = { 1, 15, KEY_BACKSLASH, 0 }; +Guide_RM( 75 ) = { 1, 8, 112, 0, 0 }; +Guide_RM( 76 ) = { 1, 15, KEY_EQUAL, 0 }; +Guide_RM( 77 ) = { 1, 15, KEY_DELETE, 0 }; +Guide_RM( 78 ) = { 1, 15, KEY_F5, 0 }; +Guide_RM( 79 ) = { 1, 15, KEY_F3, 0 }; +Guide_RM( 80 ) = { 1, 15, KEY_PAGE_DOWN, 0 }; +Guide_RM( 81 ) = { 2, 15, KEY_LSHIFT, 15, KEY_0, 0 }; +Guide_RM( 82 ) = { 2, 15, KEY_LSHIFT, 15, KEY_7, 0 }; +Guide_RM( 83 ) = { 1, 15, KEY_F6, 0 }; +Guide_RM( 84 ) = { 2, 15, KEY_LSHIFT, 15, KEY_3, 0 }; +Guide_RM( 85 ) = { 2, 15, KEY_LSHIFT, 15, KEY_8, 0 }; +Guide_RM( 86 ) = { 2, 15, KEY_LSHIFT, 15, KEY_2, 0 }; +Guide_RM( 87 ) = { 2, 15, KEY_LSHIFT, 15, KEY_9, 0 }; +Guide_RM( 88 ) = { 1, 15, KEY_F8, 0 }; +Guide_RM( 89 ) = { 2, 15, KEY_LSHIFT, 15, KEY_1, 0 }; +Guide_RM( 90 ) = { 2, 15, KEY_LSHIFT, 15, KEY_6, 0 }; +Guide_RM( 91 ) = { 1, 15, KEY_F7, 0 }; +Guide_RM( 92 ) = { 2, 15, KEY_LSHIFT, 15, KEY_5, 0 }; +Guide_RM( 93 ) = { 1, 15, KEY_F9, 0 }; +Guide_RM( 94 ) = { 1, 15, KEY_F1, 0 }; +Guide_RM( 95 ) = { 2, 15, KEY_LSHIFT, 15, KEY_4, 0 }; +Guide_RM( 96 ) = { 1, 15, KEY_F10, 0 }; +Guide_RM( 97 ) = { 1, 8, 111, 0, 0 }; +Guide_RM( 98 ) = { 1, 8, 226, 0, 0 }; +Guide_RM( 99 ) = { 1, 15, KEY_LEFT_BRACKET, 0 }; +Guide_RM( 100 ) = { 1, 8, 205, 0, 0 }; +Guide_RM( 101 ) = { 1, 15, KEY_PAGE_UP, 0 }; +Guide_RM( 102 ) = { 2, 15, KEY_LSHIFT, 15, KEY_RIGHT_BRACKET, 0 }; +Guide_RM( 103 ) = { 2, 15, KEY_LSHIFT, 15, KEY_MINUS, 0 }; +Guide_RM( 104 ) = { 2, 15, KEY_LSHIFT, 15, KEY_BACKSLASH, 0 }; +Guide_RM( 105 ) = { 1, 8, 182, 0, 0 }; +Guide_RM( 106 ) = { 2, 15, KEY_LSHIFT, 15, KEY_EQUAL, 0 }; +Guide_RM( 107 ) = { 1, 15, KEY_BACKTICK, 0 }; +Guide_RM( 108 ) = { 1, 9, 0 }; Guide_RM( 109 ) = { 1, 8, 181, 0, 0 }; Guide_RM( 110 ) = { 1, 8, 38, 2, 0 }; -Guide_RM( 111 ) = { 2, 14, KEY_LSHIFT, 14, KEY_LEFT_BRACKET, 0 }; +Guide_RM( 111 ) = { 2, 15, KEY_LSHIFT, 15, KEY_LEFT_BRACKET, 0 }; Guide_RM( 112 ) = { 1, 8, 180, 1, 0 }; @@ -523,19 +527,21 @@ Guide_TM( 133 ) = { 1, 0x00, 0x01, 0x3D, 0 }; Guide_TM( 134 ) = { 1, 0x00, 0x01, 0x11, 0 }; Guide_TM( 135 ) = { 1, 0x00, 0x01, 0x3A, 0 }; Guide_TM( 136 ) = { 1, 0x00, 0x01, 0x0E, 0 }; -Guide_TM( 137 ) = { 1, 0x00, 0x01, 0x3B, 0 }; -Guide_TM( 138 ) = { 1, 0x00, 0x01, 0x0F, 0 }; -Guide_TM( 139 ) = { 1, 0x00, 0x01, 0x3C, 0 }; -Guide_TM( 140 ) = { 1, 0x00, 0x01, 0x10, 0 }; -Guide_TM( 141 ) = { 1, 0x00, 0x01, 0x39, 0 }; -Guide_TM( 142 ) = { 1, 0x00, 0x01, 0x0C, 0 }; -Guide_TM( 143 ) = { 1, 0x00, 0x01, 0x4C, 0 }; -Guide_TM( 144 ) = { 1, 0x00, 0x01, 0x0D, 0 }; -Guide_TM( 145 ) = { 1, 0x00, 0x01, 0x08, 0 }; -Guide_TM( 146 ) = { 1, 0x00, 0x01, 0x48, 0 }; -Guide_TM( 147 ) = { 1, 0x00, 0x01, 0x1C, 0 }; -Guide_TM( 148 ) = { 1, 0x00, 0x01, 0x45, 0 }; -Guide_TM( 149 ) = { 1, 0x00, 0x01, 0x49, 0 }; +Guide_TM( 137 ) = { 1, 0x00, 0x01, 0x25, 0 }; +Guide_TM( 138 ) = { 1, 0x00, 0x01, 0x3B, 0 }; +Guide_TM( 139 ) = { 1, 0x00, 0x01, 0x0F, 0 }; +Guide_TM( 140 ) = { 1, 0x00, 0x01, 0x52, 0 }; +Guide_TM( 141 ) = { 1, 0x00, 0x01, 0x3C, 0 }; +Guide_TM( 142 ) = { 1, 0x00, 0x01, 0x10, 0 }; +Guide_TM( 143 ) = { 1, 0x00, 0x01, 0x39, 0 }; +Guide_TM( 144 ) = { 1, 0x00, 0x01, 0x0C, 0 }; +Guide_TM( 145 ) = { 1, 0x00, 0x01, 0x4C, 0 }; +Guide_TM( 146 ) = { 1, 0x00, 0x01, 0x0D, 0 }; +Guide_TM( 147 ) = { 1, 0x00, 0x01, 0x08, 0 }; +Guide_TM( 148 ) = { 1, 0x00, 0x01, 0x48, 0 }; +Guide_TM( 149 ) = { 1, 0x00, 0x01, 0x1C, 0 }; +Guide_TM( 150 ) = { 1, 0x00, 0x01, 0x45, 0 }; +Guide_TM( 151 ) = { 1, 0x00, 0x01, 0x49, 0 }; // -- Trigger Macro List @@ -613,85 +619,87 @@ const TriggerMacro TriggerMacroList[] = { Define_TM( 68, 62 ), Define_TM( 69, 63 ), Define_TM( 70, 60 ), - Define_TM( 71, 64 ), - Define_TM( 72, 65 ), - Define_TM( 73, 66 ), - Define_TM( 74, 67 ), - Define_TM( 75, 68 ), - Define_TM( 76, 69 ), - Define_TM( 77, 70 ), - Define_TM( 78, 71 ), - Define_TM( 79, 72 ), - Define_TM( 80, 73 ), - Define_TM( 81, 74 ), - Define_TM( 82, 75 ), - Define_TM( 83, 76 ), - Define_TM( 84, 77 ), - Define_TM( 85, 78 ), + Define_TM( 71, 18 ), + Define_TM( 72, 64 ), + Define_TM( 73, 65 ), + Define_TM( 74, 66 ), + Define_TM( 75, 67 ), + Define_TM( 76, 68 ), + Define_TM( 77, 69 ), + Define_TM( 78, 70 ), + Define_TM( 79, 71 ), + Define_TM( 80, 72 ), + Define_TM( 81, 73 ), + Define_TM( 82, 74 ), + Define_TM( 83, 75 ), + Define_TM( 84, 76 ), + Define_TM( 85, 77 ), Define_TM( 86, 25 ), - Define_TM( 87, 79 ), - Define_TM( 88, 80 ), - Define_TM( 89, 81 ), - Define_TM( 90, 82 ), + Define_TM( 87, 78 ), + Define_TM( 88, 79 ), + Define_TM( 89, 80 ), + Define_TM( 90, 81 ), Define_TM( 91, 52 ), - Define_TM( 92, 83 ), - Define_TM( 93, 69 ), - Define_TM( 94, 78 ), - Define_TM( 95, 79 ), - Define_TM( 96, 84 ), - Define_TM( 97, 85 ), - Define_TM( 98, 86 ), - Define_TM( 99, 87 ), - Define_TM( 100, 88 ), - Define_TM( 101, 89 ), - Define_TM( 102, 90 ), - Define_TM( 103, 91 ), - Define_TM( 104, 74 ), - Define_TM( 105, 92 ), - Define_TM( 106, 70 ), - Define_TM( 107, 93 ), - Define_TM( 108, 94 ), - Define_TM( 109, 95 ), - Define_TM( 110, 84 ), - Define_TM( 111, 96 ), - Define_TM( 112, 97 ), + Define_TM( 92, 82 ), + Define_TM( 93, 68 ), + Define_TM( 94, 77 ), + Define_TM( 95, 78 ), + Define_TM( 96, 83 ), + Define_TM( 97, 84 ), + Define_TM( 98, 85 ), + Define_TM( 99, 86 ), + Define_TM( 100, 87 ), + Define_TM( 101, 88 ), + Define_TM( 102, 89 ), + Define_TM( 103, 90 ), + Define_TM( 104, 73 ), + Define_TM( 105, 91 ), + Define_TM( 106, 69 ), + Define_TM( 107, 92 ), + Define_TM( 108, 93 ), + Define_TM( 109, 94 ), + Define_TM( 110, 83 ), + Define_TM( 111, 95 ), + Define_TM( 112, 96 ), Define_TM( 113, 4 ), - Define_TM( 114, 97 ), - Define_TM( 115, 98 ), - Define_TM( 116, 78 ), - Define_TM( 117, 99 ), - Define_TM( 118, 100 ), - Define_TM( 119, 94 ), - Define_TM( 120, 71 ), - Define_TM( 121, 101 ), - Define_TM( 122, 92 ), - Define_TM( 123, 102 ), - Define_TM( 124, 80 ), - Define_TM( 125, 89 ), - Define_TM( 126, 95 ), + Define_TM( 114, 96 ), + Define_TM( 115, 97 ), + Define_TM( 116, 77 ), + Define_TM( 117, 98 ), + Define_TM( 118, 99 ), + Define_TM( 119, 93 ), + Define_TM( 120, 70 ), + Define_TM( 121, 100 ), + Define_TM( 122, 91 ), + Define_TM( 123, 101 ), + Define_TM( 124, 79 ), + Define_TM( 125, 88 ), + Define_TM( 126, 94 ), Define_TM( 127, 29 ), - Define_TM( 128, 103 ), - Define_TM( 129, 104 ), - Define_TM( 130, 105 ), - Define_TM( 131, 106 ), - Define_TM( 132, 107 ), + Define_TM( 128, 102 ), + Define_TM( 129, 103 ), + Define_TM( 130, 104 ), + Define_TM( 131, 105 ), + Define_TM( 132, 106 ), Define_TM( 133, 51 ), - Define_TM( 134, 108 ), + Define_TM( 134, 107 ), Define_TM( 135, 61 ), Define_TM( 136, 63 ), - Define_TM( 137, 66 ), - Define_TM( 138, 0 ), - Define_TM( 139, 45 ), - Define_TM( 140, 47 ), - Define_TM( 141, 49 ), - Define_TM( 142, 12 ), - Define_TM( 143, 54 ), - Define_TM( 144, 58 ), - Define_TM( 145, 108 ), - Define_TM( 146, 109 ), - Define_TM( 147, 110 ), - Define_TM( 148, 111 ), - Define_TM( 149, 112 ), + Define_TM( 137, 108 ), + Define_TM( 138, 65 ), + Define_TM( 139, 0 ), + Define_TM( 140, 108 ), + Define_TM( 141, 45 ), + Define_TM( 142, 47 ), + Define_TM( 143, 49 ), + Define_TM( 144, 12 ), + Define_TM( 145, 54 ), + Define_TM( 146, 58 ), + Define_TM( 147, 107 ), + Define_TM( 148, 109 ), + Define_TM( 149, 110 ), + Define_TM( 150, 111 ), + Define_TM( 151, 112 ), }; @@ -899,15 +907,15 @@ Define_TL( layer1, 0x58 ) = { 1, 123 }; Define_TL( layer1, 0x59 ) = { 1, 127 }; // Partial Layer 2 -Define_TL( layer2, 0x08 ) = { 1, 145 }; +Define_TL( layer2, 0x08 ) = { 1, 147 }; Define_TL( layer2, 0x09 ) = { 0 }; Define_TL( layer2, 0x0A ) = { 0 }; Define_TL( layer2, 0x0B ) = { 0 }; -Define_TL( layer2, 0x0C ) = { 1, 142 }; -Define_TL( layer2, 0x0D ) = { 1, 144 }; +Define_TL( layer2, 0x0C ) = { 1, 144 }; +Define_TL( layer2, 0x0D ) = { 1, 146 }; Define_TL( layer2, 0x0E ) = { 1, 136 }; -Define_TL( layer2, 0x0F ) = { 1, 138 }; -Define_TL( layer2, 0x10 ) = { 1, 140 }; +Define_TL( layer2, 0x0F ) = { 1, 139 }; +Define_TL( layer2, 0x10 ) = { 1, 142 }; Define_TL( layer2, 0x11 ) = { 1, 134 }; Define_TL( layer2, 0x12 ) = { 0 }; Define_TL( layer2, 0x13 ) = { 0 }; @@ -919,7 +927,7 @@ Define_TL( layer2, 0x18 ) = { 1, 93 }; Define_TL( layer2, 0x19 ) = { 1, 126 }; Define_TL( layer2, 0x1A ) = { 0 }; Define_TL( layer2, 0x1B ) = { 1, 131 }; -Define_TL( layer2, 0x1C ) = { 1, 147 }; +Define_TL( layer2, 0x1C ) = { 1, 149 }; Define_TL( layer2, 0x1D ) = { 0 }; Define_TL( layer2, 0x1E ) = { 0 }; Define_TL( layer2, 0x1F ) = { 0 }; @@ -928,7 +936,7 @@ Define_TL( layer2, 0x21 ) = { 0 }; Define_TL( layer2, 0x22 ) = { 0 }; Define_TL( layer2, 0x23 ) = { 0 }; Define_TL( layer2, 0x24 ) = { 0 }; -Define_TL( layer2, 0x25 ) = { 0 }; +Define_TL( layer2, 0x25 ) = { 1, 137 }; Define_TL( layer2, 0x26 ) = { 0 }; Define_TL( layer2, 0x27 ) = { 0 }; Define_TL( layer2, 0x28 ) = { 0 }; @@ -948,10 +956,10 @@ Define_TL( layer2, 0x35 ) = { 0 }; Define_TL( layer2, 0x36 ) = { 0 }; Define_TL( layer2, 0x37 ) = { 0 }; Define_TL( layer2, 0x38 ) = { 0 }; -Define_TL( layer2, 0x39 ) = { 1, 141 }; +Define_TL( layer2, 0x39 ) = { 1, 143 }; Define_TL( layer2, 0x3A ) = { 1, 135 }; -Define_TL( layer2, 0x3B ) = { 1, 137 }; -Define_TL( layer2, 0x3C ) = { 1, 139 }; +Define_TL( layer2, 0x3B ) = { 1, 138 }; +Define_TL( layer2, 0x3C ) = { 1, 141 }; Define_TL( layer2, 0x3D ) = { 1, 133 }; Define_TL( layer2, 0x3E ) = { 0 }; Define_TL( layer2, 0x3F ) = { 0 }; @@ -960,14 +968,20 @@ Define_TL( layer2, 0x41 ) = { 0 }; Define_TL( layer2, 0x42 ) = { 0 }; Define_TL( layer2, 0x43 ) = { 1, 129 }; Define_TL( layer2, 0x44 ) = { 1, 132 }; -Define_TL( layer2, 0x45 ) = { 1, 148 }; +Define_TL( layer2, 0x45 ) = { 1, 150 }; Define_TL( layer2, 0x46 ) = { 1, 128 }; Define_TL( layer2, 0x47 ) = { 1, 130 }; -Define_TL( layer2, 0x48 ) = { 1, 146 }; -Define_TL( layer2, 0x49 ) = { 1, 149 }; +Define_TL( layer2, 0x48 ) = { 1, 148 }; +Define_TL( layer2, 0x49 ) = { 1, 151 }; Define_TL( layer2, 0x4A ) = { 0 }; Define_TL( layer2, 0x4B ) = { 0 }; -Define_TL( layer2, 0x4C ) = { 1, 143 }; +Define_TL( layer2, 0x4C ) = { 1, 145 }; +Define_TL( layer2, 0x4D ) = { 0 }; +Define_TL( layer2, 0x4E ) = { 0 }; +Define_TL( layer2, 0x4F ) = { 0 }; +Define_TL( layer2, 0x50 ) = { 0 }; +Define_TL( layer2, 0x51 ) = { 0 }; +Define_TL( layer2, 0x52 ) = { 1, 140 }; // -- ScanCode Offset Map @@ -1007,7 +1021,7 @@ layer1_tl_0x02, layer1_tl_0x03, layer1_tl_0x04, layer1_tl_0x05, layer1_tl_0x06, // Partial Layer 2 const nat_ptr_t *layer2_scanMap[] = { -layer2_tl_0x08, layer2_tl_0x09, layer2_tl_0x0A, layer2_tl_0x0B, layer2_tl_0x0C, layer2_tl_0x0D, layer2_tl_0x0E, layer2_tl_0x0F, layer2_tl_0x10, layer2_tl_0x11, layer2_tl_0x12, layer2_tl_0x13, layer2_tl_0x14, layer2_tl_0x15, layer2_tl_0x16, layer2_tl_0x17, layer2_tl_0x18, layer2_tl_0x19, layer2_tl_0x1A, layer2_tl_0x1B, layer2_tl_0x1C, layer2_tl_0x1D, layer2_tl_0x1E, layer2_tl_0x1F, layer2_tl_0x20, layer2_tl_0x21, layer2_tl_0x22, layer2_tl_0x23, layer2_tl_0x24, layer2_tl_0x25, layer2_tl_0x26, layer2_tl_0x27, layer2_tl_0x28, layer2_tl_0x29, layer2_tl_0x2A, layer2_tl_0x2B, layer2_tl_0x2C, layer2_tl_0x2D, layer2_tl_0x2E, layer2_tl_0x2F, layer2_tl_0x30, layer2_tl_0x31, layer2_tl_0x32, layer2_tl_0x33, layer2_tl_0x34, layer2_tl_0x35, layer2_tl_0x36, layer2_tl_0x37, layer2_tl_0x38, layer2_tl_0x39, layer2_tl_0x3A, layer2_tl_0x3B, layer2_tl_0x3C, layer2_tl_0x3D, layer2_tl_0x3E, layer2_tl_0x3F, layer2_tl_0x40, layer2_tl_0x41, layer2_tl_0x42, layer2_tl_0x43, layer2_tl_0x44, layer2_tl_0x45, layer2_tl_0x46, layer2_tl_0x47, layer2_tl_0x48, layer2_tl_0x49, layer2_tl_0x4A, layer2_tl_0x4B, layer2_tl_0x4C +layer2_tl_0x08, layer2_tl_0x09, layer2_tl_0x0A, layer2_tl_0x0B, layer2_tl_0x0C, layer2_tl_0x0D, layer2_tl_0x0E, layer2_tl_0x0F, layer2_tl_0x10, layer2_tl_0x11, layer2_tl_0x12, layer2_tl_0x13, layer2_tl_0x14, layer2_tl_0x15, layer2_tl_0x16, layer2_tl_0x17, layer2_tl_0x18, layer2_tl_0x19, layer2_tl_0x1A, layer2_tl_0x1B, layer2_tl_0x1C, layer2_tl_0x1D, layer2_tl_0x1E, layer2_tl_0x1F, layer2_tl_0x20, layer2_tl_0x21, layer2_tl_0x22, layer2_tl_0x23, layer2_tl_0x24, layer2_tl_0x25, layer2_tl_0x26, layer2_tl_0x27, layer2_tl_0x28, layer2_tl_0x29, layer2_tl_0x2A, layer2_tl_0x2B, layer2_tl_0x2C, layer2_tl_0x2D, layer2_tl_0x2E, layer2_tl_0x2F, layer2_tl_0x30, layer2_tl_0x31, layer2_tl_0x32, layer2_tl_0x33, layer2_tl_0x34, layer2_tl_0x35, layer2_tl_0x36, layer2_tl_0x37, layer2_tl_0x38, layer2_tl_0x39, layer2_tl_0x3A, layer2_tl_0x3B, layer2_tl_0x3C, layer2_tl_0x3D, layer2_tl_0x3E, layer2_tl_0x3F, layer2_tl_0x40, layer2_tl_0x41, layer2_tl_0x42, layer2_tl_0x43, layer2_tl_0x44, layer2_tl_0x45, layer2_tl_0x46, layer2_tl_0x47, layer2_tl_0x48, layer2_tl_0x49, layer2_tl_0x4A, layer2_tl_0x4B, layer2_tl_0x4C, layer2_tl_0x4D, layer2_tl_0x4E, layer2_tl_0x4F, layer2_tl_0x50, layer2_tl_0x51, layer2_tl_0x52 }; diff --git a/inf_ergodox/src/log/left_kll_defs.h b/inf_ergodox/src/log/left_kll_defs.h index 78178b0..efa0a40 100644 --- a/inf_ergodox/src/log/left_kll_defs.h +++ b/inf_ergodox/src/log/left_kll_defs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014-2015 by Jacob Alexander +/* Copyright (C) 2014-2016 by Jacob Alexander * * This file is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,9 +15,9 @@ */ // This file was generated by the kll compiler, DO NOT EDIT. -// Generation Date: 2016-04-05 +// Generation Date: 2016-07-02 // KLL Backend: kiibohd -// KLL Git Rev: b6cf0f13a88fef650f48270a1d1e20ccb1972d21 +// KLL Git Rev: 6135cbb8329eff480c4100a1b46557f690ea604b // KLL Git Changes: None // Compiler arguments: // /srv/KiiConf/controller/kll/kll.py @@ -109,7 +109,9 @@ typedef enum CapabilityIndex { Output_kbdProtocolNKRO_capability_index, Output_noneSend_capability_index, Output_sysCtrlSend_capability_index, + Output_toggleKbdProtocol_capability_index, Output_usbCodeSend_capability_index, + Output_usbMouse_capability_index, } CapabilityIndex; @@ -126,92 +128,7 @@ typedef enum CapabilityIndex { -#define UARTConnectBufSize_define 128 -#define STLcdNumber2Color_define 0x4B4B, 0x8D8D, 0x34B5 -#define STLcdNumber9Color_define 0x09CA, 0x12D3, 0x8484 -#define STLcdNumber1Color_define 0xA8A8, 0x2727, 0x1FA0 -#define KeyboardLocale_define 0 -#define STLcdNumber9_define \ -0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ - -#define STLcdBacklightRed_define 4095 #define StateWordSize_define 8 -#define STLcdNumber8_define \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ - -#define STLcdNumber6_define \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0x00, 0x00, 0x00, \ - -#define UARTConnectBaudFine_define 0 -#define ISSILedBrightness1_define \ -0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C1-1 -> C1-16 */ \ -0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C2-1 -> C2-16 */ \ -0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C3-1 -> C3-16 */ \ -0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C4-1 -> C4-16 */ \ -0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C5-1 -> C5-16 */ \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C6-1 -> C6-16 */ \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C7-1 -> C7-16 */ \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C8-1 -> C8-16 */ \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C9-1 -> C9-16 */ \ - -#define LCDEnabled_define 1 -#define STLcdNumber8Color_define 0x8303, 0x1394, 0xB9F9 -#define STLcdNumber4_define \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ - -#define STLcdNumber2_define \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ - -#define UARTConnectBaud_define 1 -#define DebounceDivThreshold_define 65535 -#define STLcdBacklightPrescalar_define 0 -#define STLcdNumber5Color_define 0xB7B7, 0x5D5D, 0x8545 -#define STLcdNumber0_define \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ - -#define DebounceThrottleDiv_define 0 -#define STLcdNumber3_define \ -0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ - -#define flashModeEnabled_define 0 -#define STLcdNumber4Color_define 0xF6F6, 0xA5A5, 0x4949 -#define STLcdBacklightGreen_define 4095 -#define STLcdNumber3Color_define 0x0000, 0x8242, 0xB3F3 -#define MinDebounceTime_define 5 -#define STLcdNumber5_define \ -0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0x00, 0x00, 0x00, \ - -#define STLcdNumber7Color_define 0x00C1, 0x7E7E, 0x3C3C -#define STLcdNumber7_define \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ - #define STLcdBacklightBlue_define 4095 #define ISSILedMask1_define \ 0xFF, 0x00, /* C1-1 -> C1-16 */ \ @@ -224,20 +141,120 @@ typedef enum CapabilityIndex { 0x00, 0x00, /* C8-1 -> C8-16 */ \ 0x00, 0x00, /* C9-1 -> C9-16 */ \ -#define ConnectEnabled_define 1 -#define STLcdNumber1_define \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - -#define STLcdNumber0Color_define 0xB939, 0xAAEA, 0x8D8D #define UARTConnectCableCheckLength_define 2 +#define STLcdBacklightPrescalar_define 0 +#define STLcdNumber8Color_define 0x8303, 0x1394, 0xB9F9 +#define STLcdNumber7Color_define 0x00C1, 0x7E7E, 0x3C3C +#define UARTConnectBufSize_define 128 +#define STLcdNumber0_define \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ + +#define DebounceThrottleDiv_define 0 +#define USBProtocol_define 1 +#define STLcdNumber2_define \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ + +#define STLcdNumber5_define \ +0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0x00, 0x00, 0x00, \ + +#define enableUSBResume_define 1 +#define UARTConnectBaudFine_define 0 +#define STLcdNumber3_define \ +0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ + +#define STLcdNumber5Color_define 0xB7B7, 0x5D5D, 0x8545 +#define MinDebounceTime_define 5 +#define ConnectEnabled_define 1 #define STLcdDefaultImage_define \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ -#define STLcdNumber6Color_define 0xBCFC, 0xB6F6, 0x2D2D +#define ISSILedBrightness1_define \ +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C1-1 -> C1-16 */ \ +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C2-1 -> C2-16 */ \ +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C3-1 -> C3-16 */ \ +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C4-1 -> C4-16 */ \ +0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C5-1 -> C5-16 */ \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C6-1 -> C6-16 */ \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C7-1 -> C7-16 */ \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C8-1 -> C8-16 */ \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C9-1 -> C9-16 */ \ + +#define STLcdNumber9Color_define 0x09CA, 0x12D3, 0x8484 +#define IndexWordSize_define 16 +#define flashModeEnabled_define 0 +#define STLcdNumber6Color_define 0xBCFC, 0xB6F6, 0x2D2D +#define enableJoystick_define 0 +#define enableDeviceRestartOnUSBTimeout_define 0 +#define LCDEnabled_define 1 +#define DebounceDivThreshold_define 65535 +#define STLcdNumber3Color_define 0x0000, 0x8242, 0xB3F3 +#define STLcdNumber8_define \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ + +#define STLcdNumber4Color_define 0xF6F6, 0xA5A5, 0x4949 +#define enableRawIO_define 0 +#define enableUSBSuspend_define 1 +#define STLcdNumber1_define \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ + +#define STLcdNumber2Color_define 0x4B4B, 0x8D8D, 0x34B5 +#define enableVirtualSerialPort_define 1 +#define enableMouse_define 1 +#define enableUSBLowPowerNegotiation_define 0 +#define STLcdNumber0Color_define 0xB939, 0xAAEA, 0x8D8D +#define STLcdNumber1Color_define 0xA8A8, 0x2727, 0x1FA0 +#define STLcdNumber4_define \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ + +#define STLcdNumber6_define \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0x00, 0x00, 0x00, \ + +#define UARTConnectBaud_define 1 +#define STLcdBacklightRed_define 4095 +#define STLcdBacklightGreen_define 4095 +#define STLcdNumber9_define \ +0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ + +#define enableKeyboard_define 1 +#define STLcdNumber7_define \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ + +#define KeyboardLocale_define 0 +#define CapabilitiesNum_KLL 17 +#define ResultMacroNum_KLL 113 +#define TriggerMacroNum_KLL 152 +#define LayerNum_KLL 3 diff --git a/inf_ergodox/src/log/right_generatedKeymap.h b/inf_ergodox/src/log/right_generatedKeymap.h index 36a9a28..5cb58a4 100644 --- a/inf_ergodox/src/log/right_generatedKeymap.h +++ b/inf_ergodox/src/log/right_generatedKeymap.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014-2015 by Jacob Alexander +/* Copyright (C) 2014-2016 by Jacob Alexander * * This file is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,9 +15,9 @@ */ // This file was generated by the kll compiler, DO NOT EDIT. -// Generation Date: 2016-04-05 +// Generation Date: 2016-07-02 // KLL Backend: kiibohd -// KLL Git Rev: b6cf0f13a88fef650f48270a1d1e20ccb1972d21 +// KLL Git Rev: 6135cbb8329eff480c4100a1b46557f690ea604b // KLL Git Changes: None // Compiler arguments: // /srv/KiiConf/controller/kll/kll.py @@ -115,7 +115,9 @@ void Output_kbdProtocolBoot_capability( uint8_t state, uint8_t stateType, uint8_ void Output_kbdProtocolNKRO_capability( uint8_t state, uint8_t stateType, uint8_t *args ); void Output_noneSend_capability( uint8_t state, uint8_t stateType, uint8_t *args ); void Output_sysCtrlSend_capability( uint8_t state, uint8_t stateType, uint8_t *args ); +void Output_toggleKbdProtocol_capability( uint8_t state, uint8_t stateType, uint8_t *args ); void Output_usbCodeSend_capability( uint8_t state, uint8_t stateType, uint8_t *args ); +void Output_usbMouse_capability( uint8_t state, uint8_t stateType, uint8_t *args ); @@ -135,126 +137,128 @@ const Capability CapabilitiesList[] = { { Output_kbdProtocolNKRO_capability, 0 }, { Output_noneSend_capability, 0 }, { Output_sysCtrlSend_capability, 1 }, + { Output_toggleKbdProtocol_capability, 0 }, { Output_usbCodeSend_capability, 1 }, + { Output_usbMouse_capability, 6 }, }; // -- Result Macros // Result Macro Guides -Guide_RM( 0 ) = { 1, 14, KEY_9, 0 }; -Guide_RM( 1 ) = { 1, 14, KEY_ESC, 0 }; -Guide_RM( 2 ) = { 1, 14, KEY_J, 0 }; -Guide_RM( 3 ) = { 1, 14, KEY_A, 0 }; -Guide_RM( 4 ) = { 1, 14, KEY_QUOTE, 0 }; -Guide_RM( 5 ) = { 1, 14, KEY_F, 0 }; +Guide_RM( 0 ) = { 1, 15, KEY_9, 0 }; +Guide_RM( 1 ) = { 1, 15, KEY_ESC, 0 }; +Guide_RM( 2 ) = { 1, 15, KEY_J, 0 }; +Guide_RM( 3 ) = { 1, 15, KEY_A, 0 }; +Guide_RM( 4 ) = { 1, 15, KEY_QUOTE, 0 }; +Guide_RM( 5 ) = { 1, 15, KEY_F, 0 }; Guide_RM( 6 ) = { 2, 6, 6, 0, 1, 0 }; -Guide_RM( 7 ) = { 1, 14, KEY_LEFT, 0 }; -Guide_RM( 8 ) = { 1, 14, KEY_INSERT, 0 }; -Guide_RM( 9 ) = { 1, 14, KEY_D, 0 }; -Guide_RM( 10 ) = { 1, 14, KEY_ENTER, 0 }; -Guide_RM( 11 ) = { 1, 14, KEY_LGUI, 0 }; -Guide_RM( 12 ) = { 1, 14, KEY_6, 0 }; -Guide_RM( 13 ) = { 1, 14, KEY_DOWN, 0 }; -Guide_RM( 14 ) = { 1, 14, KEY_BACKSPACE, 0 }; -Guide_RM( 15 ) = { 1, 14, KEY_K, 0 }; -Guide_RM( 16 ) = { 1, 14, KEY_LALT, 0 }; -Guide_RM( 17 ) = { 1, 14, KEY_Q, 0 }; -Guide_RM( 18 ) = { 1, 14, KEY_UP, 0 }; -Guide_RM( 19 ) = { 1, 14, KEY_SPACE, 0 }; -Guide_RM( 20 ) = { 1, 14, KEY_R, 0 }; -Guide_RM( 21 ) = { 1, 14, KEY_L, 0 }; -Guide_RM( 22 ) = { 1, 14, KEY_TAB, 0 }; -Guide_RM( 23 ) = { 1, 14, KEY_H, 0 }; -Guide_RM( 24 ) = { 1, 14, KEY_LSHIFT, 0 }; -Guide_RM( 25 ) = { 1, 14, KEY_G, 0 }; -Guide_RM( 26 ) = { 1, 14, KEY_END, 0 }; -Guide_RM( 27 ) = { 1, 14, KEY_C, 0 }; -Guide_RM( 28 ) = { 2, 6, 2, 0, 1, 0 }; -Guide_RM( 29 ) = { 1, 14, KEY_I, 0 }; -Guide_RM( 30 ) = { 1, 14, KEY_HOME, 0 }; -Guide_RM( 31 ) = { 1, 14, KEY_PRINTSCREEN, 0 }; +Guide_RM( 7 ) = { 1, 15, KEY_LEFT, 0 }; +Guide_RM( 8 ) = { 1, 15, KEY_INSERT, 0 }; +Guide_RM( 9 ) = { 1, 15, KEY_D, 0 }; +Guide_RM( 10 ) = { 1, 15, KEY_ENTER, 0 }; +Guide_RM( 11 ) = { 1, 15, KEY_LGUI, 0 }; +Guide_RM( 12 ) = { 1, 15, KEY_6, 0 }; +Guide_RM( 13 ) = { 1, 15, KEY_DOWN, 0 }; +Guide_RM( 14 ) = { 1, 15, KEY_BACKSPACE, 0 }; +Guide_RM( 15 ) = { 1, 15, KEY_K, 0 }; +Guide_RM( 16 ) = { 1, 15, KEY_LALT, 0 }; +Guide_RM( 17 ) = { 1, 15, KEY_Q, 0 }; +Guide_RM( 18 ) = { 1, 15, KEY_UP, 0 }; +Guide_RM( 19 ) = { 1, 15, KEY_SPACE, 0 }; +Guide_RM( 20 ) = { 1, 15, KEY_R, 0 }; +Guide_RM( 21 ) = { 1, 15, KEY_L, 0 }; +Guide_RM( 22 ) = { 1, 15, KEY_TAB, 0 }; +Guide_RM( 23 ) = { 1, 15, KEY_H, 0 }; +Guide_RM( 24 ) = { 1, 15, KEY_LSHIFT, 0 }; +Guide_RM( 25 ) = { 1, 15, KEY_G, 0 }; +Guide_RM( 26 ) = { 1, 15, KEY_END, 0 }; +Guide_RM( 27 ) = { 1, 15, KEY_C, 0 }; +Guide_RM( 28 ) = { 2, 6, 1, 0, 1, 0 }; +Guide_RM( 29 ) = { 1, 15, KEY_I, 0 }; +Guide_RM( 30 ) = { 1, 15, KEY_HOME, 0 }; +Guide_RM( 31 ) = { 1, 15, KEY_PRINTSCREEN, 0 }; Guide_RM( 32 ) = { 2, 5, 0, 1, 0 }; -Guide_RM( 33 ) = { 1, 14, KEY_E, 0 }; -Guide_RM( 34 ) = { 1, 14, KEY_O, 0 }; -Guide_RM( 35 ) = { 1, 14, KEY_NUM_LOCK, 0 }; -Guide_RM( 36 ) = { 1, 14, KEY_W, 0 }; -Guide_RM( 37 ) = { 1, 14, KEY_PERIOD, 0 }; -Guide_RM( 38 ) = { 1, 14, KEY_P, 0 }; -Guide_RM( 39 ) = { 1, 14, KEY_T, 0 }; -Guide_RM( 40 ) = { 1, 14, KEY_N, 0 }; -Guide_RM( 41 ) = { 1, 14, KEY_X, 0 }; -Guide_RM( 42 ) = { 1, 14, KEY_SLASH, 0 }; -Guide_RM( 43 ) = { 1, 14, KEY_B, 0 }; -Guide_RM( 44 ) = { 1, 14, KEY_Y, 0 }; -Guide_RM( 45 ) = { 1, 14, KEY_Z, 0 }; -Guide_RM( 46 ) = { 1, 14, KEY_2, 0 }; -Guide_RM( 47 ) = { 1, 14, KEY_0, 0 }; -Guide_RM( 48 ) = { 1, 14, KEY_V, 0 }; -Guide_RM( 49 ) = { 1, 14, KEY_5, 0 }; -Guide_RM( 50 ) = { 1, 14, KEY_U, 0 }; -Guide_RM( 51 ) = { 1, 14, KEY_1, 0 }; -Guide_RM( 52 ) = { 1, 14, KEY_M, 0 }; -Guide_RM( 53 ) = { 1, 14, KEY_MENU, 0 }; -Guide_RM( 54 ) = { 2, 14, KEY_LSHIFT, 14, KEY_BACKTICK, 0 }; +Guide_RM( 33 ) = { 1, 15, KEY_E, 0 }; +Guide_RM( 34 ) = { 1, 15, KEY_O, 0 }; +Guide_RM( 35 ) = { 1, 15, KEY_NUM_LOCK, 0 }; +Guide_RM( 36 ) = { 1, 15, KEY_W, 0 }; +Guide_RM( 37 ) = { 1, 15, KEY_PERIOD, 0 }; +Guide_RM( 38 ) = { 1, 15, KEY_P, 0 }; +Guide_RM( 39 ) = { 1, 15, KEY_T, 0 }; +Guide_RM( 40 ) = { 1, 15, KEY_N, 0 }; +Guide_RM( 41 ) = { 1, 15, KEY_X, 0 }; +Guide_RM( 42 ) = { 1, 15, KEY_SLASH, 0 }; +Guide_RM( 43 ) = { 1, 15, KEY_B, 0 }; +Guide_RM( 44 ) = { 1, 15, KEY_Y, 0 }; +Guide_RM( 45 ) = { 1, 15, KEY_Z, 0 }; +Guide_RM( 46 ) = { 1, 15, KEY_2, 0 }; +Guide_RM( 47 ) = { 1, 15, KEY_0, 0 }; +Guide_RM( 48 ) = { 1, 15, KEY_V, 0 }; +Guide_RM( 49 ) = { 1, 15, KEY_5, 0 }; +Guide_RM( 50 ) = { 1, 15, KEY_U, 0 }; +Guide_RM( 51 ) = { 1, 15, KEY_1, 0 }; +Guide_RM( 52 ) = { 1, 15, KEY_M, 0 }; +Guide_RM( 53 ) = { 1, 15, KEY_MENU, 0 }; +Guide_RM( 54 ) = { 2, 15, KEY_LSHIFT, 15, KEY_BACKTICK, 0 }; Guide_RM( 55 ) = { 1, 8, 233, 0, 0 }; -Guide_RM( 56 ) = { 1, 14, KEY_S, 0 }; -Guide_RM( 57 ) = { 1, 14, KEY_COMMA, 0 }; -Guide_RM( 58 ) = { 1, 14, KEY_7, 0 }; +Guide_RM( 56 ) = { 1, 15, KEY_S, 0 }; +Guide_RM( 57 ) = { 1, 15, KEY_COMMA, 0 }; +Guide_RM( 58 ) = { 1, 15, KEY_7, 0 }; Guide_RM( 59 ) = { 1, 8, 234, 0, 0 }; Guide_RM( 60 ) = { 2, 5, 1, 1, 0 }; -Guide_RM( 61 ) = { 1, 14, KEY_4, 0 }; -Guide_RM( 62 ) = { 1, 9, 0 }; -Guide_RM( 63 ) = { 1, 14, KEY_8, 0 }; -Guide_RM( 64 ) = { 1, 14, KEY_RIGHT, 0 }; -Guide_RM( 65 ) = { 2, 6, 1, 0, 1, 0 }; -Guide_RM( 66 ) = { 1, 14, KEY_3, 0 }; -Guide_RM( 67 ) = { 1, 14, KEY_SEMICOLON, 0 }; -Guide_RM( 68 ) = { 1, 14, KEY_LCTRL, 0 }; -Guide_RM( 69 ) = { 1, 14, KEY_F9, 0 }; -Guide_RM( 70 ) = { 1, 14, KEY_F11, 0 }; -Guide_RM( 71 ) = { 1, 14, KEY_MINUS, 0 }; -Guide_RM( 72 ) = { 1, 14, KEY_F1, 0 }; -Guide_RM( 73 ) = { 1, 14, KEY_BACKSLASH, 0 }; -Guide_RM( 74 ) = { 1, 14, KEY_F4, 0 }; -Guide_RM( 75 ) = { 1, 14, KEY_F12, 0 }; -Guide_RM( 76 ) = { 1, 8, 111, 0, 0 }; -Guide_RM( 77 ) = { 1, 14, KEY_F3, 0 }; -Guide_RM( 78 ) = { 1, 14, KEY_F6, 0 }; -Guide_RM( 79 ) = { 1, 14, KEY_PAGE_DOWN, 0 }; -Guide_RM( 80 ) = { 1, 14, KEY_DELETE, 0 }; -Guide_RM( 81 ) = { 1, 14, KEY_EQUAL, 0 }; -Guide_RM( 82 ) = { 2, 14, KEY_LSHIFT, 14, KEY_1, 0 }; -Guide_RM( 83 ) = { 1, 14, KEY_PAGE_UP, 0 }; -Guide_RM( 84 ) = { 2, 14, KEY_LSHIFT, 14, KEY_4, 0 }; -Guide_RM( 85 ) = { 1, 14, KEY_LEFT_BRACKET, 0 }; -Guide_RM( 86 ) = { 1, 14, KEY_F5, 0 }; -Guide_RM( 87 ) = { 2, 14, KEY_LSHIFT, 14, KEY_8, 0 }; -Guide_RM( 88 ) = { 2, 14, KEY_LSHIFT, 14, KEY_3, 0 }; -Guide_RM( 89 ) = { 2, 14, KEY_LSHIFT, 14, KEY_9, 0 }; -Guide_RM( 90 ) = { 2, 14, KEY_LSHIFT, 14, KEY_2, 0 }; -Guide_RM( 91 ) = { 2, 14, KEY_LSHIFT, 14, KEY_0, 0 }; -Guide_RM( 92 ) = { 2, 14, KEY_LSHIFT, 14, KEY_5, 0 }; -Guide_RM( 93 ) = { 1, 14, KEY_F8, 0 }; -Guide_RM( 94 ) = { 2, 14, KEY_LSHIFT, 14, KEY_6, 0 }; -Guide_RM( 95 ) = { 1, 14, KEY_F7, 0 }; -Guide_RM( 96 ) = { 1, 14, KEY_F2, 0 }; -Guide_RM( 97 ) = { 1, 14, KEY_F10, 0 }; -Guide_RM( 98 ) = { 2, 14, KEY_LSHIFT, 14, KEY_7, 0 }; -Guide_RM( 99 ) = { 1, 8, 112, 0, 0 }; -Guide_RM( 100 ) = { 1, 8, 205, 0, 0 }; -Guide_RM( 101 ) = { 1, 8, 226, 0, 0 }; -Guide_RM( 102 ) = { 1, 14, KEY_RIGHT_BRACKET, 0 }; -Guide_RM( 103 ) = { 2, 14, KEY_LSHIFT, 14, KEY_MINUS, 0 }; -Guide_RM( 104 ) = { 2, 14, KEY_LSHIFT, 14, KEY_BACKSLASH, 0 }; -Guide_RM( 105 ) = { 1, 8, 181, 0, 0 }; -Guide_RM( 106 ) = { 2, 14, KEY_LSHIFT, 14, KEY_EQUAL, 0 }; -Guide_RM( 107 ) = { 2, 14, KEY_LSHIFT, 14, KEY_LEFT_BRACKET, 0 }; -Guide_RM( 108 ) = { 1, 14, KEY_BACKTICK, 0 }; +Guide_RM( 61 ) = { 1, 15, KEY_4, 0 }; +Guide_RM( 62 ) = { 1, 15, KEY_LCTRL, 0 }; +Guide_RM( 63 ) = { 1, 15, KEY_8, 0 }; +Guide_RM( 64 ) = { 1, 15, KEY_RIGHT, 0 }; +Guide_RM( 65 ) = { 2, 6, 2, 0, 1, 0 }; +Guide_RM( 66 ) = { 1, 15, KEY_3, 0 }; +Guide_RM( 67 ) = { 1, 15, KEY_SEMICOLON, 0 }; +Guide_RM( 68 ) = { 1, 15, KEY_F9, 0 }; +Guide_RM( 69 ) = { 1, 15, KEY_F11, 0 }; +Guide_RM( 70 ) = { 1, 15, KEY_MINUS, 0 }; +Guide_RM( 71 ) = { 1, 15, KEY_F1, 0 }; +Guide_RM( 72 ) = { 1, 15, KEY_BACKSLASH, 0 }; +Guide_RM( 73 ) = { 1, 15, KEY_F4, 0 }; +Guide_RM( 74 ) = { 1, 15, KEY_F12, 0 }; +Guide_RM( 75 ) = { 1, 8, 111, 0, 0 }; +Guide_RM( 76 ) = { 1, 15, KEY_F3, 0 }; +Guide_RM( 77 ) = { 1, 15, KEY_F6, 0 }; +Guide_RM( 78 ) = { 1, 15, KEY_PAGE_DOWN, 0 }; +Guide_RM( 79 ) = { 1, 15, KEY_DELETE, 0 }; +Guide_RM( 80 ) = { 1, 15, KEY_EQUAL, 0 }; +Guide_RM( 81 ) = { 2, 15, KEY_LSHIFT, 15, KEY_1, 0 }; +Guide_RM( 82 ) = { 1, 15, KEY_PAGE_UP, 0 }; +Guide_RM( 83 ) = { 2, 15, KEY_LSHIFT, 15, KEY_4, 0 }; +Guide_RM( 84 ) = { 1, 15, KEY_LEFT_BRACKET, 0 }; +Guide_RM( 85 ) = { 1, 15, KEY_F5, 0 }; +Guide_RM( 86 ) = { 2, 15, KEY_LSHIFT, 15, KEY_8, 0 }; +Guide_RM( 87 ) = { 2, 15, KEY_LSHIFT, 15, KEY_3, 0 }; +Guide_RM( 88 ) = { 2, 15, KEY_LSHIFT, 15, KEY_9, 0 }; +Guide_RM( 89 ) = { 2, 15, KEY_LSHIFT, 15, KEY_2, 0 }; +Guide_RM( 90 ) = { 2, 15, KEY_LSHIFT, 15, KEY_0, 0 }; +Guide_RM( 91 ) = { 2, 15, KEY_LSHIFT, 15, KEY_5, 0 }; +Guide_RM( 92 ) = { 1, 15, KEY_F8, 0 }; +Guide_RM( 93 ) = { 2, 15, KEY_LSHIFT, 15, KEY_6, 0 }; +Guide_RM( 94 ) = { 1, 15, KEY_F7, 0 }; +Guide_RM( 95 ) = { 1, 15, KEY_F2, 0 }; +Guide_RM( 96 ) = { 1, 15, KEY_F10, 0 }; +Guide_RM( 97 ) = { 2, 15, KEY_LSHIFT, 15, KEY_7, 0 }; +Guide_RM( 98 ) = { 1, 8, 112, 0, 0 }; +Guide_RM( 99 ) = { 1, 8, 205, 0, 0 }; +Guide_RM( 100 ) = { 1, 8, 226, 0, 0 }; +Guide_RM( 101 ) = { 1, 15, KEY_RIGHT_BRACKET, 0 }; +Guide_RM( 102 ) = { 2, 15, KEY_LSHIFT, 15, KEY_MINUS, 0 }; +Guide_RM( 103 ) = { 2, 15, KEY_LSHIFT, 15, KEY_BACKSLASH, 0 }; +Guide_RM( 104 ) = { 1, 8, 181, 0, 0 }; +Guide_RM( 105 ) = { 2, 15, KEY_LSHIFT, 15, KEY_EQUAL, 0 }; +Guide_RM( 106 ) = { 2, 15, KEY_LSHIFT, 15, KEY_LEFT_BRACKET, 0 }; +Guide_RM( 107 ) = { 1, 15, KEY_BACKTICK, 0 }; +Guide_RM( 108 ) = { 1, 9, 0 }; Guide_RM( 109 ) = { 1, 8, 182, 0, 0 }; Guide_RM( 110 ) = { 1, 8, 180, 1, 0 }; Guide_RM( 111 ) = { 1, 8, 38, 2, 0 }; -Guide_RM( 112 ) = { 2, 14, KEY_LSHIFT, 14, KEY_RIGHT_BRACKET, 0 }; +Guide_RM( 112 ) = { 2, 15, KEY_LSHIFT, 15, KEY_RIGHT_BRACKET, 0 }; // -- Result Macro List @@ -523,19 +527,21 @@ Guide_TM( 133 ) = { 1, 0x00, 0x01, 0x3A, 0 }; Guide_TM( 134 ) = { 1, 0x00, 0x01, 0x18, 0 }; Guide_TM( 135 ) = { 1, 0x00, 0x01, 0x3E, 0 }; Guide_TM( 136 ) = { 1, 0x00, 0x01, 0x0E, 0 }; -Guide_TM( 137 ) = { 1, 0x00, 0x01, 0x3B, 0 }; -Guide_TM( 138 ) = { 1, 0x00, 0x01, 0x0F, 0 }; -Guide_TM( 139 ) = { 1, 0x00, 0x01, 0x3C, 0 }; -Guide_TM( 140 ) = { 1, 0x00, 0x01, 0x10, 0 }; -Guide_TM( 141 ) = { 1, 0x00, 0x01, 0x39, 0 }; -Guide_TM( 142 ) = { 1, 0x00, 0x01, 0x0C, 0 }; -Guide_TM( 143 ) = { 1, 0x00, 0x01, 0x0D, 0 }; -Guide_TM( 144 ) = { 1, 0x00, 0x01, 0x1F, 0 }; -Guide_TM( 145 ) = { 1, 0x00, 0x01, 0x48, 0 }; -Guide_TM( 146 ) = { 1, 0x00, 0x01, 0x35, 0 }; -Guide_TM( 147 ) = { 1, 0x00, 0x01, 0x1C, 0 }; -Guide_TM( 148 ) = { 1, 0x00, 0x01, 0x49, 0 }; -Guide_TM( 149 ) = { 1, 0x00, 0x01, 0x19, 0 }; +Guide_TM( 137 ) = { 1, 0x00, 0x01, 0x25, 0 }; +Guide_TM( 138 ) = { 1, 0x00, 0x01, 0x3B, 0 }; +Guide_TM( 139 ) = { 1, 0x00, 0x01, 0x0F, 0 }; +Guide_TM( 140 ) = { 1, 0x00, 0x01, 0x52, 0 }; +Guide_TM( 141 ) = { 1, 0x00, 0x01, 0x3C, 0 }; +Guide_TM( 142 ) = { 1, 0x00, 0x01, 0x10, 0 }; +Guide_TM( 143 ) = { 1, 0x00, 0x01, 0x39, 0 }; +Guide_TM( 144 ) = { 1, 0x00, 0x01, 0x0C, 0 }; +Guide_TM( 145 ) = { 1, 0x00, 0x01, 0x0D, 0 }; +Guide_TM( 146 ) = { 1, 0x00, 0x01, 0x1F, 0 }; +Guide_TM( 147 ) = { 1, 0x00, 0x01, 0x48, 0 }; +Guide_TM( 148 ) = { 1, 0x00, 0x01, 0x35, 0 }; +Guide_TM( 149 ) = { 1, 0x00, 0x01, 0x1C, 0 }; +Guide_TM( 150 ) = { 1, 0x00, 0x01, 0x49, 0 }; +Guide_TM( 151 ) = { 1, 0x00, 0x01, 0x19, 0 }; // -- Trigger Macro List @@ -617,81 +623,83 @@ const TriggerMacro TriggerMacroList[] = { Define_TM( 72, 65 ), Define_TM( 73, 66 ), Define_TM( 74, 67 ), - Define_TM( 75, 68 ), - Define_TM( 76, 69 ), - Define_TM( 77, 70 ), - Define_TM( 78, 71 ), - Define_TM( 79, 72 ), - Define_TM( 80, 73 ), - Define_TM( 81, 74 ), - Define_TM( 82, 75 ), + Define_TM( 75, 62 ), + Define_TM( 76, 68 ), + Define_TM( 77, 69 ), + Define_TM( 78, 70 ), + Define_TM( 79, 71 ), + Define_TM( 80, 72 ), + Define_TM( 81, 73 ), + Define_TM( 82, 74 ), Define_TM( 83, 30 ), - Define_TM( 84, 76 ), - Define_TM( 85, 77 ), - Define_TM( 86, 78 ), - Define_TM( 87, 79 ), - Define_TM( 88, 80 ), - Define_TM( 89, 81 ), - Define_TM( 90, 82 ), - Define_TM( 91, 83 ), - Define_TM( 92, 80 ), - Define_TM( 93, 84 ), - Define_TM( 94, 85 ), + Define_TM( 84, 75 ), + Define_TM( 85, 76 ), + Define_TM( 86, 77 ), + Define_TM( 87, 78 ), + Define_TM( 88, 79 ), + Define_TM( 89, 80 ), + Define_TM( 90, 81 ), + Define_TM( 91, 82 ), + Define_TM( 92, 79 ), + Define_TM( 93, 83 ), + Define_TM( 94, 84 ), Define_TM( 95, 54 ), - Define_TM( 96, 78 ), - Define_TM( 97, 86 ), - Define_TM( 98, 69 ), - Define_TM( 99, 87 ), - Define_TM( 100, 88 ), - Define_TM( 101, 89 ), - Define_TM( 102, 90 ), - Define_TM( 103, 91 ), - Define_TM( 104, 92 ), - Define_TM( 105, 75 ), - Define_TM( 106, 93 ), - Define_TM( 107, 70 ), - Define_TM( 108, 94 ), - Define_TM( 109, 95 ), - Define_TM( 110, 96 ), - Define_TM( 111, 97 ), - Define_TM( 112, 97 ), - Define_TM( 113, 86 ), - Define_TM( 114, 98 ), - Define_TM( 115, 72 ), - Define_TM( 116, 80 ), - Define_TM( 117, 99 ), + Define_TM( 96, 77 ), + Define_TM( 97, 85 ), + Define_TM( 98, 68 ), + Define_TM( 99, 86 ), + Define_TM( 100, 87 ), + Define_TM( 101, 88 ), + Define_TM( 102, 89 ), + Define_TM( 103, 90 ), + Define_TM( 104, 91 ), + Define_TM( 105, 74 ), + Define_TM( 106, 92 ), + Define_TM( 107, 69 ), + Define_TM( 108, 93 ), + Define_TM( 109, 94 ), + Define_TM( 110, 95 ), + Define_TM( 111, 96 ), + Define_TM( 112, 96 ), + Define_TM( 113, 85 ), + Define_TM( 114, 97 ), + Define_TM( 115, 71 ), + Define_TM( 116, 79 ), + Define_TM( 117, 98 ), Define_TM( 118, 1 ), - Define_TM( 119, 100 ), - Define_TM( 120, 96 ), - Define_TM( 121, 95 ), - Define_TM( 122, 101 ), - Define_TM( 123, 74 ), - Define_TM( 124, 93 ), + Define_TM( 119, 99 ), + Define_TM( 120, 95 ), + Define_TM( 121, 94 ), + Define_TM( 122, 100 ), + Define_TM( 123, 73 ), + Define_TM( 124, 92 ), Define_TM( 125, 26 ), - Define_TM( 126, 77 ), - Define_TM( 127, 102 ), - Define_TM( 128, 103 ), - Define_TM( 129, 104 ), - Define_TM( 130, 105 ), - Define_TM( 131, 106 ), + Define_TM( 126, 76 ), + Define_TM( 127, 101 ), + Define_TM( 128, 102 ), + Define_TM( 129, 103 ), + Define_TM( 130, 104 ), + Define_TM( 131, 105 ), Define_TM( 132, 51 ), Define_TM( 133, 61 ), - Define_TM( 134, 107 ), - Define_TM( 135, 108 ), + Define_TM( 134, 106 ), + Define_TM( 135, 107 ), Define_TM( 136, 63 ), - Define_TM( 137, 66 ), - Define_TM( 138, 0 ), - Define_TM( 139, 46 ), - Define_TM( 140, 47 ), - Define_TM( 141, 49 ), - Define_TM( 142, 12 ), - Define_TM( 143, 58 ), - Define_TM( 144, 8 ), - Define_TM( 145, 109 ), - Define_TM( 146, 108 ), - Define_TM( 147, 110 ), - Define_TM( 148, 111 ), - Define_TM( 149, 112 ), + Define_TM( 137, 108 ), + Define_TM( 138, 66 ), + Define_TM( 139, 0 ), + Define_TM( 140, 108 ), + Define_TM( 141, 46 ), + Define_TM( 142, 47 ), + Define_TM( 143, 49 ), + Define_TM( 144, 12 ), + Define_TM( 145, 58 ), + Define_TM( 146, 8 ), + Define_TM( 147, 109 ), + Define_TM( 148, 107 ), + Define_TM( 149, 110 ), + Define_TM( 150, 111 ), + Define_TM( 151, 112 ), }; @@ -893,11 +901,11 @@ Define_TL( layer1, 0x52 ) = { 0 }; Define_TL( layer1, 0x53 ) = { 1, 88 }; // Partial Layer 2 -Define_TL( layer2, 0x0C ) = { 1, 142 }; -Define_TL( layer2, 0x0D ) = { 1, 143 }; +Define_TL( layer2, 0x0C ) = { 1, 144 }; +Define_TL( layer2, 0x0D ) = { 1, 145 }; Define_TL( layer2, 0x0E ) = { 1, 136 }; -Define_TL( layer2, 0x0F ) = { 1, 138 }; -Define_TL( layer2, 0x10 ) = { 1, 140 }; +Define_TL( layer2, 0x0F ) = { 1, 139 }; +Define_TL( layer2, 0x10 ) = { 1, 142 }; Define_TL( layer2, 0x11 ) = { 0 }; Define_TL( layer2, 0x12 ) = { 0 }; Define_TL( layer2, 0x13 ) = { 0 }; @@ -906,19 +914,19 @@ Define_TL( layer2, 0x15 ) = { 0 }; Define_TL( layer2, 0x16 ) = { 1, 128 }; Define_TL( layer2, 0x17 ) = { 1, 131 }; Define_TL( layer2, 0x18 ) = { 1, 134 }; -Define_TL( layer2, 0x19 ) = { 1, 149 }; +Define_TL( layer2, 0x19 ) = { 1, 151 }; Define_TL( layer2, 0x1A ) = { 1, 129 }; Define_TL( layer2, 0x1B ) = { 1, 130 }; -Define_TL( layer2, 0x1C ) = { 1, 147 }; +Define_TL( layer2, 0x1C ) = { 1, 149 }; Define_TL( layer2, 0x1D ) = { 0 }; Define_TL( layer2, 0x1E ) = { 0 }; -Define_TL( layer2, 0x1F ) = { 1, 144 }; +Define_TL( layer2, 0x1F ) = { 1, 146 }; Define_TL( layer2, 0x20 ) = { 0 }; Define_TL( layer2, 0x21 ) = { 0 }; Define_TL( layer2, 0x22 ) = { 0 }; Define_TL( layer2, 0x23 ) = { 0 }; Define_TL( layer2, 0x24 ) = { 0 }; -Define_TL( layer2, 0x25 ) = { 0 }; +Define_TL( layer2, 0x25 ) = { 1, 137 }; Define_TL( layer2, 0x26 ) = { 0 }; Define_TL( layer2, 0x27 ) = { 0 }; Define_TL( layer2, 0x28 ) = { 0 }; @@ -934,14 +942,14 @@ Define_TL( layer2, 0x31 ) = { 0 }; Define_TL( layer2, 0x32 ) = { 0 }; Define_TL( layer2, 0x33 ) = { 0 }; Define_TL( layer2, 0x34 ) = { 0 }; -Define_TL( layer2, 0x35 ) = { 1, 146 }; +Define_TL( layer2, 0x35 ) = { 1, 148 }; Define_TL( layer2, 0x36 ) = { 0 }; Define_TL( layer2, 0x37 ) = { 0 }; Define_TL( layer2, 0x38 ) = { 0 }; -Define_TL( layer2, 0x39 ) = { 1, 141 }; +Define_TL( layer2, 0x39 ) = { 1, 143 }; Define_TL( layer2, 0x3A ) = { 1, 133 }; -Define_TL( layer2, 0x3B ) = { 1, 137 }; -Define_TL( layer2, 0x3C ) = { 1, 139 }; +Define_TL( layer2, 0x3B ) = { 1, 138 }; +Define_TL( layer2, 0x3C ) = { 1, 141 }; Define_TL( layer2, 0x3D ) = { 1, 132 }; Define_TL( layer2, 0x3E ) = { 1, 135 }; Define_TL( layer2, 0x3F ) = { 0 }; @@ -953,8 +961,17 @@ Define_TL( layer2, 0x44 ) = { 0 }; Define_TL( layer2, 0x45 ) = { 1, 120 }; Define_TL( layer2, 0x46 ) = { 1, 79 }; Define_TL( layer2, 0x47 ) = { 0 }; -Define_TL( layer2, 0x48 ) = { 1, 145 }; -Define_TL( layer2, 0x49 ) = { 1, 148 }; +Define_TL( layer2, 0x48 ) = { 1, 147 }; +Define_TL( layer2, 0x49 ) = { 1, 150 }; +Define_TL( layer2, 0x4A ) = { 0 }; +Define_TL( layer2, 0x4B ) = { 0 }; +Define_TL( layer2, 0x4C ) = { 0 }; +Define_TL( layer2, 0x4D ) = { 0 }; +Define_TL( layer2, 0x4E ) = { 0 }; +Define_TL( layer2, 0x4F ) = { 0 }; +Define_TL( layer2, 0x50 ) = { 0 }; +Define_TL( layer2, 0x51 ) = { 0 }; +Define_TL( layer2, 0x52 ) = { 1, 140 }; // -- ScanCode Offset Map @@ -994,7 +1011,7 @@ layer1_tl_0x02, layer1_tl_0x03, layer1_tl_0x04, layer1_tl_0x05, layer1_tl_0x06, // Partial Layer 2 const nat_ptr_t *layer2_scanMap[] = { -layer2_tl_0x0C, layer2_tl_0x0D, layer2_tl_0x0E, layer2_tl_0x0F, layer2_tl_0x10, layer2_tl_0x11, layer2_tl_0x12, layer2_tl_0x13, layer2_tl_0x14, layer2_tl_0x15, layer2_tl_0x16, layer2_tl_0x17, layer2_tl_0x18, layer2_tl_0x19, layer2_tl_0x1A, layer2_tl_0x1B, layer2_tl_0x1C, layer2_tl_0x1D, layer2_tl_0x1E, layer2_tl_0x1F, layer2_tl_0x20, layer2_tl_0x21, layer2_tl_0x22, layer2_tl_0x23, layer2_tl_0x24, layer2_tl_0x25, layer2_tl_0x26, layer2_tl_0x27, layer2_tl_0x28, layer2_tl_0x29, layer2_tl_0x2A, layer2_tl_0x2B, layer2_tl_0x2C, layer2_tl_0x2D, layer2_tl_0x2E, layer2_tl_0x2F, layer2_tl_0x30, layer2_tl_0x31, layer2_tl_0x32, layer2_tl_0x33, layer2_tl_0x34, layer2_tl_0x35, layer2_tl_0x36, layer2_tl_0x37, layer2_tl_0x38, layer2_tl_0x39, layer2_tl_0x3A, layer2_tl_0x3B, layer2_tl_0x3C, layer2_tl_0x3D, layer2_tl_0x3E, layer2_tl_0x3F, layer2_tl_0x40, layer2_tl_0x41, layer2_tl_0x42, layer2_tl_0x43, layer2_tl_0x44, layer2_tl_0x45, layer2_tl_0x46, layer2_tl_0x47, layer2_tl_0x48, layer2_tl_0x49 +layer2_tl_0x0C, layer2_tl_0x0D, layer2_tl_0x0E, layer2_tl_0x0F, layer2_tl_0x10, layer2_tl_0x11, layer2_tl_0x12, layer2_tl_0x13, layer2_tl_0x14, layer2_tl_0x15, layer2_tl_0x16, layer2_tl_0x17, layer2_tl_0x18, layer2_tl_0x19, layer2_tl_0x1A, layer2_tl_0x1B, layer2_tl_0x1C, layer2_tl_0x1D, layer2_tl_0x1E, layer2_tl_0x1F, layer2_tl_0x20, layer2_tl_0x21, layer2_tl_0x22, layer2_tl_0x23, layer2_tl_0x24, layer2_tl_0x25, layer2_tl_0x26, layer2_tl_0x27, layer2_tl_0x28, layer2_tl_0x29, layer2_tl_0x2A, layer2_tl_0x2B, layer2_tl_0x2C, layer2_tl_0x2D, layer2_tl_0x2E, layer2_tl_0x2F, layer2_tl_0x30, layer2_tl_0x31, layer2_tl_0x32, layer2_tl_0x33, layer2_tl_0x34, layer2_tl_0x35, layer2_tl_0x36, layer2_tl_0x37, layer2_tl_0x38, layer2_tl_0x39, layer2_tl_0x3A, layer2_tl_0x3B, layer2_tl_0x3C, layer2_tl_0x3D, layer2_tl_0x3E, layer2_tl_0x3F, layer2_tl_0x40, layer2_tl_0x41, layer2_tl_0x42, layer2_tl_0x43, layer2_tl_0x44, layer2_tl_0x45, layer2_tl_0x46, layer2_tl_0x47, layer2_tl_0x48, layer2_tl_0x49, layer2_tl_0x4A, layer2_tl_0x4B, layer2_tl_0x4C, layer2_tl_0x4D, layer2_tl_0x4E, layer2_tl_0x4F, layer2_tl_0x50, layer2_tl_0x51, layer2_tl_0x52 }; diff --git a/inf_ergodox/src/log/right_kll_defs.h b/inf_ergodox/src/log/right_kll_defs.h index 4c9d84d..fbca20e 100644 --- a/inf_ergodox/src/log/right_kll_defs.h +++ b/inf_ergodox/src/log/right_kll_defs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014-2015 by Jacob Alexander +/* Copyright (C) 2014-2016 by Jacob Alexander * * This file is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,9 +15,9 @@ */ // This file was generated by the kll compiler, DO NOT EDIT. -// Generation Date: 2016-04-05 +// Generation Date: 2016-07-02 // KLL Backend: kiibohd -// KLL Git Rev: b6cf0f13a88fef650f48270a1d1e20ccb1972d21 +// KLL Git Rev: 6135cbb8329eff480c4100a1b46557f690ea604b // KLL Git Changes: None // Compiler arguments: // /srv/KiiConf/controller/kll/kll.py @@ -109,7 +109,9 @@ typedef enum CapabilityIndex { Output_kbdProtocolNKRO_capability_index, Output_noneSend_capability_index, Output_sysCtrlSend_capability_index, + Output_toggleKbdProtocol_capability_index, Output_usbCodeSend_capability_index, + Output_usbMouse_capability_index, } CapabilityIndex; @@ -126,7 +128,54 @@ typedef enum CapabilityIndex { +#define ConnectEnabled_define 1 +#define DebounceDivThreshold_define 65535 +#define STLcdNumber7_define \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ + +#define STLcdBacklightBlue_define 4095 +#define STLcdNumber9Color_define 0x09CA, 0x12D3, 0x8484 +#define STLcdNumber2_define \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ + +#define KeyboardLocale_define 0 #define STLcdNumber8Color_define 0x8303, 0x1394, 0xB9F9 +#define flashModeEnabled_define 0 +#define StateWordSize_define 8 +#define STLcdNumber6_define \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0x00, 0x00, 0x00, \ + +#define STLcdNumber3_define \ +0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ + +#define STLcdNumber1Color_define 0xA8A8, 0x2727, 0x1FA0 +#define DebounceThrottleDiv_define 0 +#define enableDeviceRestartOnUSBTimeout_define 0 +#define STLcdNumber7Color_define 0x00C1, 0x7E7E, 0x3C3C +#define STLcdNumber5Color_define 0xB7B7, 0x5D5D, 0x8545 +#define enableMouse_define 1 +#define STLcdNumber0Color_define 0xB939, 0xAAEA, 0x8D8D +#define UARTConnectBaud_define 1 +#define STLcdNumber2Color_define 0x4B4B, 0x8D8D, 0x34B5 +#define STLcdBacklightPrescalar_define 0 +#define STLcdNumber4_define \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ + #define STLcdDefaultImage_define \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -139,6 +188,22 @@ typedef enum CapabilityIndex { 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +#define UARTConnectBufSize_define 128 +#define USBProtocol_define 1 +#define STLcdNumber4Color_define 0xF6F6, 0xA5A5, 0x4949 +#define enableVirtualSerialPort_define 1 +#define MinDebounceTime_define 5 +#define enableKeyboard_define 1 +#define UARTConnectBaudFine_define 0 +#define STLcdNumber5_define \ +0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0x00, 0x00, 0x00, \ + +#define enableJoystick_define 0 +#define enableUSBResume_define 1 +#define STLcdNumber6Color_define 0xBCFC, 0xB6F6, 0x2D2D #define ISSILedMask1_define \ 0xFF, 0x00, /* C1-1 -> C1-16 */ \ 0xFF, 0x00, /* C2-1 -> C2-16 */ \ @@ -150,18 +215,23 @@ typedef enum CapabilityIndex { 0x00, 0x00, /* C8-1 -> C8-16 */ \ 0x00, 0x00, /* C9-1 -> C9-16 */ \ -#define DebounceThrottleDiv_define 0 -#define STLcdNumber4Color_define 0xF6F6, 0xA5A5, 0x4949 -#define STLcdNumber0_define \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +#define LCDEnabled_define 1 +#define STLcdBacklightRed_define 4095 +#define STLcdNumber1_define \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ + +#define UARTConnectCableCheckLength_define 2 +#define enableUSBSuspend_define 1 +#define IndexWordSize_define 16 +#define STLcdNumber9_define \ +0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -#define STLcdNumber3Color_define 0x0000, 0x8242, 0xB3F3 -#define ConnectEnabled_define 1 -#define UARTConnectBaud_define 1 -#define KeyboardLocale_define 0 #define ISSILedBrightness1_define \ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C1-1 -> C1-16 */ \ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C2-1 -> C2-16 */ \ @@ -173,71 +243,18 @@ typedef enum CapabilityIndex { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C8-1 -> C8-16 */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* C9-1 -> C9-16 */ \ -#define STLcdBacklightRed_define 4095 -#define UARTConnectBaudFine_define 0 -#define STLcdNumber9Color_define 0x09CA, 0x12D3, 0x8484 -#define LCDEnabled_define 1 -#define STLcdNumber7Color_define 0x00C1, 0x7E7E, 0x3C3C -#define STLcdBacklightPrescalar_define 0 -#define MinDebounceTime_define 5 -#define flashModeEnabled_define 0 -#define STLcdBacklightBlue_define 4095 -#define STLcdBacklightGreen_define 4095 -#define UARTConnectBufSize_define 128 -#define UARTConnectCableCheckLength_define 2 -#define STLcdNumber3_define \ -0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ - -#define STLcdNumber5_define \ -0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0x00, 0x00, 0x00, \ - -#define STLcdNumber7_define \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ - -#define STLcdNumber1_define \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - -#define STLcdNumber4_define \ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +#define STLcdNumber3Color_define 0x0000, 0x8242, 0xB3F3 +#define enableRawIO_define 0 +#define STLcdNumber0_define \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ +0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ - -#define StateWordSize_define 8 -#define STLcdNumber9_define \ -0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -#define STLcdNumber6_define \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0x00, 0x00, 0x00, \ - -#define STLcdNumber2Color_define 0x4B4B, 0x8D8D, 0x34B5 -#define STLcdNumber0Color_define 0xB939, 0xAAEA, 0x8D8D -#define DebounceDivThreshold_define 65535 -#define STLcdNumber1Color_define 0xA8A8, 0x2727, 0x1FA0 -#define STLcdNumber2_define \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ -0x00, 0x00, 0x00, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, \ - -#define STLcdNumber5Color_define 0xB7B7, 0x5D5D, 0x8545 -#define STLcdNumber6Color_define 0xBCFC, 0xB6F6, 0x2D2D +#define STLcdBacklightGreen_define 4095 +#define enableUSBLowPowerNegotiation_define 0 +#define CapabilitiesNum_KLL 17 +#define ResultMacroNum_KLL 113 +#define TriggerMacroNum_KLL 152 +#define LayerNum_KLL 3 diff --git a/inf_ergodox/src/right_kiibohd.dfu.bin b/inf_ergodox/src/right_kiibohd.dfu.bin index f50fea5..0a97aee 100644 Binary files a/inf_ergodox/src/right_kiibohd.dfu.bin and b/inf_ergodox/src/right_kiibohd.dfu.bin differ