From 1ce2d434681720f8d54556660edacdfb0f420b74 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Sat, 2 Jul 2016 06:26:29 -0500 Subject: [PATCH] update ergodox to be like planck --- inf_ergodox/src/MDErgo1-Default-0.kll | 6 +- inf_ergodox/src/MDErgo1-Default-2.kll | 2 + inf_ergodox/src/MDErgo1-Default.json | 20 +- inf_ergodox/src/kll/MDErgo1-Default-0.kll | 6 +- inf_ergodox/src/kll/MDErgo1-Default-2.kll | 2 + inf_ergodox/src/left_kiibohd.dfu.bin | Bin 43664 -> 45280 bytes inf_ergodox/src/log/build.log | 186 +++++---- inf_ergodox/src/log/left_generatedKeymap.h | 430 ++++++++++---------- inf_ergodox/src/log/left_kll_defs.h | 211 +++++----- inf_ergodox/src/log/right_generatedKeymap.h | 425 +++++++++---------- inf_ergodox/src/log/right_kll_defs.h | 171 ++++---- inf_ergodox/src/right_kiibohd.dfu.bin | Bin 43568 -> 45192 bytes 12 files changed, 777 insertions(+), 682 deletions(-) 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 6ffc00a0198021146a00db96973b4e7ebe2a78fd..250fe761edcb241726ec0d5c358cee502c5a6743 100644 GIT binary patch delta 20348 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 U~*?VvGyL$^;+F>~vAIBzkXjDllS9hnbm) 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 ByO96@ 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 f50fea5cc56b3dbfc24f7087a6880e7a578dda17..0a97aeef6de08ccea6c3efe9b55f881e00d1451c 100644 GIT binary patch delta 20377 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 delta 18724 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%0DbyG+uciFK0f$190<%zRvww_p zMwMw5%hqHpTcx@g!TNf}`m`of1E=&Lsc$&BMq`CNIRc{^+hRwdCq#E`{KGf>!Oi=q{4tTv|vHPBHcr_!ohf#PDgO)SqBUF^ChVrB4X|aMgQZ z)wrV?Z}bX3$J8fHh(QqOm}F?|-|xr((nes5pLsvpVyLfZnx4v64qV4Ki50P51be!~ zsng?2RB+5JsVO2;JHQyt>2 z=_6v)DEaH&upI404mTqB9j$n2dKUk)ciW6|7v&xA#c<$dQsd=+tGn1iH^B0H>nMg4Z)tK-mJRPGr^wNAZInSsBxEEY6k(@xI*#G$nCj;c2!jJkir^SEFc*XJ*)WeZ2 z@51pB^b^ozQ2Oy%F$Vtbr7-=Zu|eV)jwI3u6kmsO!Jc^^h^J>RS@5^MM0}S{tcUCM zC4{&y`r;Li4n<7*F2ZJA0EgaVAzeHsKDIy$XX)yKJYMS6Bo{!T1e?jkWO8r?ohGQxH~E6V5|r* z0@Srk&~9`yuS5K1R_*{&Ux*|ciBH6&+4l{lihhHXKOto;a;dQskV&(tld+e6hu_P9 zcZ!X(r*d0F_w2F!v4E(blN$f;Hc%B*>=SYP9J^YvSll|tR6Z+EWc_RFoYZgUrL<^l z&(4Un_H^eu9A~IMcblei)EBvJ_2hh9G?xYTw*-1h1EMsimfLx9{M<*mi4Xc`b<;-` zDnot!FjR(yECyx{0%#gjLGRjP08f_O?b>?r=7W>@SifkQm%+0$;*xnQ_&@o?&*zO3 zj`{>~`uzE^8#=<;BCN~thW}Tv9zRA{=@WlHKRb%gjp$P4YP;}D9JlD5pB*>(o}OFL zEB6T}ix#wV^B6nuG-H2#hOrm(89NGox(ogYz6JbMVB&Cm%mY3B6h4*a;n)rSui(SM z|0np7;I9m2>R4;i;>6!Z@{kv)hCxf_FKW#jW6@J03Q&6-%i8p)96V=sUXh0f54cx%9a zyNU5^`N^#-w}*+hR>qy&_UcxZ_~z0WvG=uo;-YPFV&V3~T#k5Q`>jzrGlK==7^jON z1{(?E#zGno28IJf$Azc>%ImJ^vc#2ZjVh=b#XV~q#gui^)RbHzKDlnV!0CpIN7oGx z*FA}PA^_2|Zmm{V&W6q5bQ$7j>&L0I4&0xrX)6*Gy4ZP+M-h1$GfIqT_u}k2OfuDVxv86SPwSkXm#t2PjtOI=ZJGco&`k%oM z!>wsJ(l3Dj>TU2-aPbG;cbw(3vB>xV!s9KN>G@bmz@LB-<6*?V|8cqz;;i*k!*o+< zgrdc_)|V76gGZ69? zG|-NMO-S=X-v#+C$T4VOF&Z$V{9H7+8uYt;_{5AdN6?r9x(prM0(m>q&w@H({M(?v zK^vP~sPH0~wWx3&GA^LO38?TF6!d^Mqlf!Z@f_%_Lt_)6vj>f&qJkS#Im)HL5FbWo z63RKzSPbNO$m5WmqD-kl;j@VcqC+$uR5Z9Wak_ADN>-FYxiTh}xwe#(Zz@Mocn2@b)ooGLo!-odo=pRj0g)QDRs_i8#fj5iJc-T)H^9VT9|(D7X|F2*>I` ze+P!s|5=6wsTMCMXk&=}36$)7GbERR3Xsbd^y|@2Q0Q;`L;ZARh;9v~zX__8M>B1>F}jkP$PVW^cdtgkQ(^VK+p~FBl3?b=qG^AM>~T+*Sb(4DPBWEiJ<2}lR#A{ zkPO-bL&)h?LoXGy32)V4(4&ykK7e&x?J$78jvgC92V-P1K*yjy6X#4~Arcx}u;!o@{}_5YRkSoCA6cJsb);8FDV@6!a($bUpO*K_5p&!$8lV$HPI( zkskpnqsJpaXCvPX8j11+pzSDE2s#KID{KYDh*ylR;OagHu4aqrs`52cTaIIu7;RkM`LK^l%#JVN{6yjBO4n9KsyUfSiwt zXM)~B4`^gcP%%~b732p%7eXe3pFusdKySnF*`PM0&jFo?@^e9-hG7qa&O-V;&|hGX zi!7gkhUbH>!3a=~E4L%^27L_`Jp>ws{5sG&v!j$bSTM8uH1>ZlZ_e6F-4I3hF=yR)7|ugZF{HOz(dM zm>q0kAj<^i$-M^UZ{;1r0+F9|Jv)4p7C#=;5zOMh6}T zT>#kuiuEfC3)?7Su;?=`9f|ZOZhj$NKz-tyFXV^m@CBH0CE~>w3a08xh@XK%iNF9L z51^1tDN4in3PAML5N!(4mlVojtLfiv=714rH;stUeiPEzByMdg((E8fC;qwV`4|!G z-9M^wi@5Z~X(O??XOk5?)TV|Q3R9I<2S5#ZRaA_Mkmu2MFhsoZ;(cPAFmM2e4+M-? zQ)sJ867PR0>j6%ur!pgu5JwCu)!j!-B|XaMfjCt6Eiq#luTl0sQlpB8QL36A<@8X- z=K*M^h%v&zZ7)Z0+r;s%xM7>gAp9v+;86_~T3^VcU*k`<)JRp+X@hcKcSf_@Z3;(V7?evKo9KY%7!0GD~1|b zbU!7dA38-H`yxIVLc;fR-55aWD{Y79uMS&e|F|GZ&=moL$c}QIQvXcIHKdS6k3sZ+ z7wO<_jGIl53G|4j2R3RYsK-c)r#7W7$RT+Ml&@fxz|()qW#`ISU6UpE*S2vm?B zbuF8TX|Gg>^In;L|EEf$L$UthM{xe#D2v7HDt`46k9Cp9Lb+)ZetiW#3O>l`Diy=h z8HZml;5YvvQ(jakzE1HPPV~GogD+s>=vPZdDt%EN7&4s&#=WOBhd>4s%;_S@AoPuK zNsuN2G*IG=9iMZ0vGcV-19Ul|7IdKEn4MHwk3anIilv6BYgRkftTt3GU9{$5!()#xSvs7FiTf;K`OXpI?0pW{ z=yb)$$0q^ts1_5oZVP?@LoM*weqW(0XZ&ff`r)pP=8-n^F?ab4ScdyDS~e-d@IpVF z_zaFck4wC#m2{59y?QrY#hSrCsidpeuP7a>EehbAi^8;{F{7HjaIb)dWy7EnC0)bz z-%ZEzxC#wZGAD$q&O?WI9{gWJya4{mkd6xcyimFt{GZVl>1)6jYzk$BL6{xN(1Jf4 z;={pj3Gor&TSfK$9P#*my}okklgk$`9Z~hG)k{|`Tex_sSa%>%{As`L|Cf;@W*m4- zJbYl*$=ri#E~jAGl7h0u#idIZE;cV2wQNagX;JaQg=Gb!N{fn0OBNTF78fsBys&Jc zIP1{Sn8INN1%|@H(Iq2C7nT@?nM=i(!wUx#4>Ok-%%et|&7+G)opc=z@(VIM5eJ{b zK8gJ$7yO>z!Od1--veKY^j%0V1%Dfuyb_ZNdKBr)kv;+Z9AGo}D$rV_FNDth;Qs=C z=}PhMzx56<;@*fUfBD>H@w+1?7l+O7zs&=sH#pc&D@2S6uq9_Rut0v_Nha1EI8 z7RKSQ3%fq7)dPuu0cb+T`lF0B0M7xNfbGERz+u4f1`Gu~4Ris20lo&V0zUz_f!PR4 z<^j*4zIxD4-hnYN@N3Ykz)!$!z~{n4)r{T(`9LvH4pag)z`MX{;2dxs_yp(zE&?8) z9>z+bDug9bz(61s$OQ6%`nQpXWhe?52&4j;Kt50mxSF6)31%Mf$q5WIHa-h*4(aEC zOayHCKrv7bR01`?3}7}e4_E@M2c82q0o#Gsfy2N~_`~bKe&7gDw+BW64xnKV=Kpmx zauFF4AOj4;s|EBxBJuEtEx>gfuN~CCg8xRI6=?DKb`|!fuY<4x&_z?XraF! z^a${@cK#|f%T9+HL^!qm?SdS(e% z35<_G&>f~$@fJ|^Mk3)VL`}%ih8ttBUuQgtjOPXH-Qg-kH3Aeu88eab0xCiV0!x8o z5#dIcQltbqO;iMZa#K|>d+vm8~HWD4z5vv4u&AUG0U|^yMu4kK-We(CEP^S z8h!_NxP=cdrR)-%%GPKbHJzmKZVRu-sun>V6;aCfmv7`Xo#JobeqUVw&UtGg8-~M1 y0W;vBT!>>v2~K;X!IdCo7&GG(Y{ozO3*wJmAx;ZEtT_ge%uH*g{)MyqKmLFH5`Cip