Bump firmware version to 8.2.3, update changelog, package.json and versions.h

Enable the link-time optimizer for the left side, as this was also us…

.gitignore

@@ -1,2 +1,3 @@
 package-lock.json
 node_modules
+build_make

.travis.yml

@@ -1,25 +1,36 @@
-language: generic
+language: c
+
 cache:
   directories:
     - $HOME/Library/Caches/Homebrew/Cask
-install: eclipse -noSplash 
+
-         -application org.eclipse.equinox.p2.director 
+install: eclipse -noSplash
-         -repository http://gnuarmeclipse.sourceforge.net/updates 
+         -application org.eclipse.equinox.p2.director
-         -installIUs ilg.gnuarmeclipse.managedbuild.cross.feature.group 
+         -repository http://gnuarmeclipse.sourceforge.net/updates
+         -installIUs ilg.gnuarmeclipse.managedbuild.cross.feature.group
          -profileProperties org.eclipse.update.install.features=true
-script: eclipse -noSplash 
+
-        -application org.eclipse.cdt.managedbuilder.core.headlessbuild 
+before_script:
-        -import $TRAVIS_BUILD_DIR/left/build
+  - tar -xf gcc-arm-none-eabi-7-2017-q4-major-*.tar.bz2
-        -import $TRAVIS_BUILD_DIR/right/build
+  - export PATH=$PATH:$PWD/gcc-arm-none-eabi-7-2017-q4-major/bin
-        -build all
+
+script:
+  - eclipse -noSplash -application org.eclipse.cdt.managedbuilder.core.headlessbuild -import $TRAVIS_BUILD_DIR/left/build -import $TRAVIS_BUILD_DIR/right/build -build all
+  - make -C left clean && make -j2 -C left DEBUG=1
+  - make -C left clean && make -j2 -C left DEBUG=0
+  - make -C right clean && make -j2 -C right DEBUG=1
+  - make -C right clean && make -j2 -C right DEBUG=0
+
 matrix:
   include:
     - os: linux
       sudo: required
-      before_install: 
+      before_install:
         - curl https://nixos.org/nix/install | sh && . ~/.nix-profile/etc/profile.d/nix.sh
-        - nix-env -i gcc-arm-embedded-4.8-2014q1-20140314
         - nix-env -i eclipse-cpp
+        - wget "https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2017q4/gcc-arm-none-eabi-7-2017-q4-major-linux.tar.bz2"
     - os: osx
       env: PATH="$PATH:/Applications/Eclipse CPP.app/Contents/MacOS"
-      before_install: brew update && brew bundle -v
+      before_install:
+        - brew cask install eclipse-cpp
+        - wget "https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2017q4/gcc-arm-none-eabi-7-2017-q4-major-mac.tar.bz2"

Brewfile

@@ -1,2 +0,0 @@
-cask "eclipse-cpp"
-cask "./gcc-arm-embedded.rb"

CHANGELOG.md

@@ -5,7 +5,28 @@ All notable changes to this project will be documented in this file.
 The format is loosely based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to the [UHK Versioning](VERSIONING.md) conventions.
 
-## [8.1.6] - 2018-04-10
+## [8.2.3] - 2018-05-15
+
+Device Protocol: 4.3.0 | Module Protocol: 4.0.0 | User Config: 4.0.1 | Hardware Config: 1.0.0
+
+- Don't switch keymaps instead of playing macros.
+- Make saving the user configuration faster by only writing the part of the EEPROM which actually contains the user configuration.
+
+## [8.2.2] - 2018-05-09
+
+Device Protocol: 4.3.0 | Module Protocol: 4.0.0 | User Config: 4.0.**1** | Hardware Config: 1.0.0
+
+- Parse long media macro actions. `USERCONFIG:PATCH`
+- Fix vendor-specific USB usage page entry. This makes the HIDAPI Linux/hidraw driver able to access interface 0.
+
+## [8.2.1] - 2018-05-02
+
+Device Protocol: 4.3.0 | Module Protocol: 4.0.0 | User Config: 4.0.0 | Hardware Config: 1.0.0
+
+- Don't suppress modifier keys upon releasing a layer.
+- Restore Caps Lock indicator when saving the configuration.
+
+## [8.2.0] - 2018-04-20
 
 Device Protocol: 4.**3.0** | Module Protocol: 4.0.0 | User Config: 4.0.0 | Hardware Config: 1.0.0
 

README.md

@@ -4,21 +4,17 @@
 
 This repository hosts the firmware of the [Ultimate Hacking Keyboard](https://ultimatehackingkeyboard.com/).
 
-## Updating to the latest firmware
+If you want to use the latest firmware version for your UHK, then instead of going through the pain of building the firmware, simply download the [latest release of Agent](https://github.com/UltimateHackingKeyboard/agent/releases/latest) and update to the latest firmware version within Agent with a click of a button.
 
-Want to update your UHK to the latest firmware version? Simply download the [latest release of Agent](https://github.com/UltimateHackingKeyboard/agent/releases/latest) which includes the latest firmware version. You'll be easily able to update the firmware within Agent.
+If you're one of the brave few who wants to hack the firmware then read on.
 
-## Cloning the repository
+1. Make sure to clone this repo with:
-
-Please make sure to clone this repo with:
 
 `git clone --recursive git@github.com:UltimateHackingKeyboard/firmware.git`
 
-This will download the dependent submodules, which are required to build the firmware.
+2. Download and install MCUXpresso IDE for [Linux](https://storage.googleapis.com/ugl-static/mcuxpresso-ide/mcuxpressoide-10.1.1_606.x86_64.deb.bin), [Mac](https://storage.googleapis.com/ugl-static/mcuxpresso-ide/MCUXpressoIDE_10.1.1_606.pkg), or [Windows](https://storage.googleapis.com/ugl-static/mcuxpresso-ide/MCUXpressoIDE_10.1.1_606.exe).
 
-## Importing the firmware
+3. In the IDE, import the project by invoking *File -> Import -> General -> Existing Projects into Workspace*, select the *left* or *right* directory depending on the desired firmware, then click on the *Finish* button.
-
-Install [Kinetis Design Studio](http://www.nxp.com/products/software-and-tools/run-time-software/kinetis-software-and-tools/ides-for-kinetis-mcus/kinetis-design-studio-integrated-development-environment-ide:KDS_IDE) (KDS), import the project by invoking *File -> Import -> General -> Existing Projects into Workspace*, select the *left* or *right* directory depending on the desired firmware, then click on the *Finish* button.
 
 ## Building and flashing the firmware
 

gcc-arm-embedded.rb

@@ -1,35 +0,0 @@
-cask 'gcc-arm-embedded' do
-  version '4_8-2014q3'
-  sha256 '6b30901738b09a8d22fdfff99e991217444b80ac492a6163af5c06a3baaa3487'
-
-  # launchpad.net/gcc-arm-embedded/ was verified as official when first introduced to the cask
-  url "https://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q3-update/+download/gcc-arm-none-eabi-#{version}-20140805-mac.tar.bz2"
-  name 'GCC ARM Embedded'
-  homepage 'https://developer.arm.com/open-source/gnu-toolchain/gnu-rm'
-
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-addr2line"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-ar"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-as"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-c++"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-c++filt"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-cpp"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-elfedit"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-g++"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-gcc"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-gcc-ar"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-gcc-nm"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-gcc-ranlib"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-gcov"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-gdb"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-gprof"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-ld"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-ld.bfd"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-nm"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-objcopy"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-objdump"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-ranlib"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-readelf"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-size"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-strings"
-  binary "gcc-arm-none-eabi-#{version}/bin/arm-none-eabi-strip"
-end

left/Makefile

@@ -0,0 +1,57 @@
+# Copyright (C) 2018 Kristian Lauszus. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Contact information
+# -------------------
+# Kristian Lauszus
+# Web      :  http://www.lauszus.com
+# e-mail   :  lauszus@gmail.com
+
+# Set project name.
+PROJECT_NAME = uhk_left
+
+# Defines the part type that this project uses.
+PART = MKL03Z32VFK4
+
+# Defines the linker script to use for the application.
+LDSCRIPT = ../lib/KSDK_2.0_MKL03Z8xxx4/devices/MKL03Z4/gcc/MKL03Z32xxx4_flash.ld
+
+# Size of the heap and stack.
+HEAP_SIZE = 0
+STACK_SIZE = 0x0050
+
+# Set the compiler CPU and FPU options.
+CPU = -mcpu=cortex-m0plus
+FPU = -mfloat-abi=soft
+
+# Command for flashing the left half of the keyboard.
+FLASH_CMD = node ../lib/agent/packages/usb/update-module-firmware.js leftHalf $(PROJECT_OBJ:.axf=.bin)
+
+# Path to the JLink script used for the left half.
+JLINK_SCRIPT = ../scripts/flash-left.jlink
+
+# Source files.
+SOURCE = $(wildcard src/*.c) \
+         ../lib/KSDK_2.0_MKL03Z8xxx4/devices/MKL03Z4/system_MKL03Z4.c \
+         ../lib/KSDK_2.0_MKL03Z8xxx4/devices/MKL03Z4/gcc/startup_MKL03Z4.S \
+         ../lib/KSDK_2.0_MKL03Z8xxx4/devices/MKL03Z4/drivers/fsl_clock.c \
+         ../lib/KSDK_2.0_MKL03Z8xxx4/devices/MKL03Z4/drivers/fsl_gpio.c \
+         ../lib/KSDK_2.0_MKL03Z8xxx4/devices/MKL03Z4/drivers/fsl_i2c.c \
+         ../lib/KSDK_2.0_MKL03Z8xxx4/devices/MKL03Z4/drivers/fsl_lptmr.c \
+         ../lib/KSDK_2.0_MKL03Z8xxx4/devices/MKL03Z4/drivers/fsl_spi.c \
+         ../lib/KSDK_2.0_MKL03Z8xxx4/devices/MKL03Z4/drivers/fsl_tpm.c \
+         $(wildcard ../shared/*.c)
+
+# Header files.
+IPATH = src \
+        ../lib/KSDK_2.0_MKL03Z8xxx4/CMSIS/Include \
+        ../lib/KSDK_2.0_MKL03Z8xxx4/devices/MKL03Z4 \
+        ../lib/KSDK_2.0_MKL03Z8xxx4/devices/MKL03Z4/drivers \
+        ../shared
+
+# Include main Makefile.
+include ../scripts/Makedefs.mk

left/build/.cproject

@@ -5,16 +5,16 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.1792027861" moduleId="org.eclipse.cdt.core.settings" name="uhk60-left_debug">
 				<externalSettings/>
 				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="${cross_rm} -rf" description="" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.1792027861" name="uhk60-left_debug" parent="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="${cross_rm} -rf" description="" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.1792027861" name="uhk60-left_debug" parent="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug">
 					<folderInfo id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.1792027861." name="/" resourcePath="">
 						<toolChain id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.debug.439601044" name="Cross ARM GCC" superClass="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.debug">
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.780228407" name="Optimization Level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level" value="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.most" valueType="enumerated"/>
@@ -61,7 +61,7 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.badfunctioncast.2943267007" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.badfunctioncast" value="false" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createlisting.9995899345" name="Create extended listing" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createlisting" value="false" valueType="boolean"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1777290613" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-							<builder buildPath="${workspace_loc:/k64f}/debug" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1406291427" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" stopOnErr="false" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
+							<builder buildPath="${workspace_loc:/uhk-left}/../" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1406291427" incrementalBuildTarget="all DEBUG=1" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" stopOnErr="false" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.2007968129" name="Cross ARM GNU Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1246588554" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.2122094274" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths"/>
@@ -165,16 +165,16 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.1792647078" moduleId="org.eclipse.cdt.core.settings" name="uhk60-left_release">
 				<externalSettings/>
 				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="${cross_rm} -rf" description="" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.1792647078" name="uhk60-left_release" parent="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="${cross_rm} -rf" description="" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.1792647078" name="uhk60-left_release" parent="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release">
 					<folderInfo id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.1792647078." name="/" resourcePath="">
 						<toolChain id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.release.1802192936" name="Cross ARM GCC" superClass="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.release">
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.918206081" name="Optimization Level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level" value="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.size" valueType="enumerated"/>
@@ -220,7 +220,7 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.badfunctioncast.6545741443.1540890614" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.badfunctioncast" value="false" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createlisting.1382191896" name="Create extended listing" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createlisting" value="false" valueType="boolean"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.2107171855" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-							<builder buildPath="${workspace_loc:/k64f}/release" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1689719605" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" stopOnErr="false" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
+							<builder buildPath="${workspace_loc:/uhk-left}/../" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1689719605" incrementalBuildTarget="all DEBUG=0" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" stopOnErr="false" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.1477971290" name="Cross ARM GNU Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.334227408" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.1702866230" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths"/>

left/build/.project

@@ -31,6 +31,16 @@
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>Makedefs.mk</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/scripts/Makedefs.mk</locationURI>
+		</link>
+		<link>
+			<name>Makefile</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Makefile</locationURI>
+		</link>
 		<link>
 			<name>drivers</name>
 			<type>2</type>

left/build/uhk60-left_debug_kboot.launch

@@ -1,34 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.cdt.launch.applicationLaunchType">
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.AUTO_SOLIB" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<listAttribute key="org.eclipse.cdt.dsf.gdb.AUTO_SOLIB_LIST"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/make"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="gdb"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-j8 DEBUG=1 flash"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_ON_FORK" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/uhk-left}/../"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.GDB_INIT" value=".gdbinit"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.REVERSE" value="false"/>
-<listAttribute key="org.eclipse.cdt.dsf.gdb.SOLIB_PATH"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.TRACEPOINT_MODE" value="TP_NORMAL_ONLY"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.internal.ui.launching.LocalApplicationCDebuggerTab.DEFAULTS_SET" value="true"/>
-<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
-<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_ID" value="gdb"/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
-<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="leftHalf uhk60-left_debug/uhk-left.bin"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="../../lib/agent/packages/usb/update-module-firmware.js"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="uhk-left"/>
-<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.1792027861"/>
-<booleanAttribute key="org.eclipse.cdt.launch.use_terminal" value="true"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/uhk-left"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
 </launchConfiguration>

left/build/uhk60-left_release_kboot.launch

@@ -1,48 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.cdt.launch.applicationLaunchType">
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.AUTO_SOLIB" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<listAttribute key="org.eclipse.cdt.dsf.gdb.AUTO_SOLIB_LIST"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/make"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="gdb"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-j8 DEBUG=0 flash"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_ON_FORK" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/uhk-left}/../"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.GDB_INIT" value=".gdbinit"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.REVERSE" value="false"/>
-<listAttribute key="org.eclipse.cdt.dsf.gdb.SOLIB_PATH"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.TRACEPOINT_MODE" value="TP_NORMAL_ONLY"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.internal.ui.launching.LocalApplicationCDebuggerTab.DEFAULTS_SET" value="true"/>
-<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
-<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_ID" value="gdb"/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
-<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="leftHalf uhk60-left_release/uhk-left.bin"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="../../lib/agent/packages/usb/update-module-firmware.js"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="uhk-left"/>
-<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.1792647078"/>
-<booleanAttribute key="org.eclipse.cdt.launch.use_terminal" value="true"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/uhk-left"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.DefaultEvent" value="true"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.HideUnresolvedSymbols" value="true"/>
-<stringAttribute key="org.eclipse.linuxtools.internal.perf.attr.Kernel.Location" value=""/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.Kernel.SourceLineNumbers" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.ModuleSymbols" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.MultipleEvents" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.Multiplex" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.Record.Realtime" value="false"/>
-<intAttribute key="org.eclipse.linuxtools.internal.perf.attr.Record.Realtime.Priority" value="1"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.Record.Verbose" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.ShowSourceDisassembly" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.ShowStat" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.SourceLineNumbers" value="true"/>
-<intAttribute key="org.eclipse.linuxtools.internal.perf.attr.StatRunCount" value="1"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
 </launchConfiguration>

right/Makefile

@@ -0,0 +1,76 @@
+# Copyright (C) 2018 Kristian Lauszus. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Contact information
+# -------------------
+# Kristian Lauszus
+# Web      :  http://www.lauszus.com
+# e-mail   :  lauszus@gmail.com
+
+# Set project name.
+PROJECT_NAME = uhk_right
+
+# Defines the part type that this project uses.
+PART = MK22FN512VLH12
+
+# Defines the linker script to use for the application.
+LDSCRIPT = src/link/MK22FN512xxx12_flash.ld
+
+# Size of the heap and stack.
+HEAP_SIZE = 0x2000
+STACK_SIZE = 0x0400
+
+# Set the compiler CPU and FPU options.
+CPU = -mcpu=cortex-m4
+FPU = -mfpu=fpv4-sp-d16 -mfloat-abi=hard
+
+# Command for flashing the right half of the keyboard.
+FLASH_CMD = node ../lib/agent/packages/usb/update-device-firmware.js $(PROJECT_OBJ:.axf=.hex)
+
+# Path to the JLink script used for the right half.
+JLINK_SCRIPT = ../scripts/flash-right.jlink
+
+# Preprocessor directives.
+BUILD_FLAGS = -DCPU_$(PART)_cm4 -DUSB_STACK_BM -DBL_HAS_BOOTLOADER_CONFIG=1
+
+# Address of the app vector table. The bootloader will take up the flash before this address.
+BL_APP_VECTOR_TABLE_ADDRESS = 0xc000
+
+# Source files.
+SOURCE = $(wildcard src/*.c) \
+         $(wildcard src/*/*.c) \
+         $(wildcard src/*/*/*.c) \
+         ../lib/bootloader/src/bootloader/src/wormhole.c \
+         $(wildcard ../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/device/*.c) \
+         $(wildcard ../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/osa/*.c) \
+         ../lib/KSDK_2.0_MK22FN512xxx12/devices/MK22F51212/system_MK22F51212.c \
+         ../lib/KSDK_2.0_MK22FN512xxx12/devices/MK22F51212/gcc/startup_MK22F51212.S \
+         ../lib/KSDK_2.0_MK22FN512xxx12/devices/MK22F51212/drivers/fsl_adc16.c \
+         ../lib/KSDK_2.0_MK22FN512xxx12/devices/MK22F51212/drivers/fsl_clock.c \
+         ../lib/KSDK_2.0_MK22FN512xxx12/devices/MK22F51212/drivers/fsl_ftm.c \
+         ../lib/KSDK_2.0_MK22FN512xxx12/devices/MK22F51212/drivers/fsl_gpio.c \
+         ../lib/KSDK_2.0_MK22FN512xxx12/devices/MK22F51212/drivers/fsl_i2c.c \
+         ../lib/KSDK_2.0_MK22FN512xxx12/devices/MK22F51212/drivers/fsl_pit.c \
+         ../lib/KSDK_2.0_MK22FN512xxx12/devices/MK22F51212/drivers/fsl_smc.c \
+         $(wildcard ../shared/*.c)
+
+# Header files.
+IPATH = src \
+        src/ksdk_usb \
+        src/buspal \
+        src/buspal/bm_usb \
+        ../lib/bootloader/src \
+        ../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/device \
+        ../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/include \
+        ../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/osa \
+        ../lib/KSDK_2.0_MK22FN512xxx12/CMSIS/Include \
+        ../lib/KSDK_2.0_MK22FN512xxx12/devices/MK22F51212 \
+        ../lib/KSDK_2.0_MK22FN512xxx12/devices/MK22F51212/drivers \
+        ../shared
+
+# Include main Makefile.
+include ../scripts/Makedefs.mk

right/build/.cproject

@@ -5,16 +5,16 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.1692217331" moduleId="org.eclipse.cdt.core.settings" name="uhk60-right_release">
 				<externalSettings/>
 				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="${cross_rm} -rf" description="" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.1692217331" name="uhk60-right_release" parent="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="${cross_rm} -rf" description="" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.1692217331" name="uhk60-right_release" parent="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release">
 					<folderInfo id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.1692217331." name="/" resourcePath="">
 						<toolChain id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.release.453692058" name="Cross ARM GCC" superClass="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.release">
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.8609064" name="Optimization Level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level" value="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.most" valueType="enumerated"/>
@@ -57,7 +57,7 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.toerrors.1518272175" name="Generate errors instead of warnings (-Werror)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.toerrors" value="false" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createlisting.104956045" name="Create extended listing" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createlisting" value="false" valueType="boolean"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1135747399" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-							<builder buildPath="${workspace_loc:/k64f}/release" id="ilg.gnuarmeclipse.managedbuild.cross.builder.789002772" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" stopOnErr="false" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
+							<builder buildPath="${workspace_loc:/uhk-right}/../" id="ilg.gnuarmeclipse.managedbuild.cross.builder.789002772" incrementalBuildTarget="all DEBUG=0" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" stopOnErr="false" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.2026990925" name="Cross ARM GNU Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.494477502" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.1465555477" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths"/>
@@ -145,16 +145,16 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.1692217331.1297236062" moduleId="org.eclipse.cdt.core.settings" name="uhk60-right_debug">
 				<externalSettings/>
 				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="${cross_rm} -rf" description="" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.1692217331.1297236062" name="uhk60-right_debug" parent="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="${cross_rm} -rf" description="" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.1692217331.1297236062" name="uhk60-right_debug" parent="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release">
 					<folderInfo id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.1692217331.1297236062." name="/" resourcePath="">
 						<toolChain id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.release.622643167" name="Cross ARM GCC" superClass="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.release">
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.274883814" name="Optimization Level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level" value="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.none" valueType="enumerated"/>
@@ -197,7 +197,7 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.toerrors.2098763517" name="Generate errors instead of warnings (-Werror)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.toerrors" value="false" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createlisting.836473542" name="Create extended listing" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createlisting" value="false" valueType="boolean"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1768350063" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-							<builder buildPath="${workspace_loc:/k64f}/release" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1931309296" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" stopOnErr="false" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
+							<builder buildPath="${workspace_loc:/uhk-right}/../" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1931309296" incrementalBuildTarget="all DEBUG=1" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" stopOnErr="false" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.894450" name="Cross ARM GNU Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.555709175" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.1619685061" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths"/>
@@ -288,16 +288,16 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.1692217331.1297236062.2081695142" moduleId="org.eclipse.cdt.core.settings" name="uhk60-right_debug_standalone">
 				<externalSettings/>
 				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="${cross_rm} -rf" description="Debug version of uhk60-right without the bootloader" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.1692217331.1297236062.2081695142" name="uhk60-right_debug_standalone" parent="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="${cross_rm} -rf" description="Debug version of uhk60-right without the bootloader" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.1692217331.1297236062.2081695142" name="uhk60-right_debug_standalone" parent="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release">
 					<folderInfo id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.1692217331.1297236062.2081695142." name="/" resourcePath="">
 						<toolChain id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.release.788475280" name="Cross ARM GCC" superClass="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.release">
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.402546001" name="Optimization Level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level" value="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.none" valueType="enumerated"/>
@@ -340,7 +340,7 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.toerrors.2124713168" name="Generate errors instead of warnings (-Werror)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.toerrors" value="false" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createlisting.1228214828" name="Create extended listing" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createlisting" value="false" valueType="boolean"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1911575583" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-							<builder buildPath="${workspace_loc:/k64f}/release" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1942759303" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" stopOnErr="false" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
+							<builder buildPath="${workspace_loc:/uhk-right}/../" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1942759303" incrementalBuildTarget="all DEBUG=1 BL_APP_VECTOR_TABLE_ADDRESS=0" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" stopOnErr="false" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.1355758441" name="Cross ARM GNU Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.511724221" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.1130167410" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths"/>
@@ -447,13 +447,13 @@
 		</scannerConfigBuildInfo>
 	</storageModule>
 	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="uhk60-right_debug_standalone">
+		<configuration configurationName="uhk60-right_debug">
 			<resource resourceType="PROJECT" workspacePath="/uhk-right"/>
 		</configuration>
 		<configuration configurationName="uhk60-right_release">
 			<resource resourceType="PROJECT" workspacePath="/uhk-right"/>
 		</configuration>
-		<configuration configurationName="uhk60-right_debug">
+		<configuration configurationName="uhk60-right_debug_standalone">
 			<resource resourceType="PROJECT" workspacePath="/uhk-right"/>
 		</configuration>
 	</storageModule>

right/build/.project

@@ -30,6 +30,16 @@
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>Makedefs.mk</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/scripts/Makedefs.mk</locationURI>
+		</link>
+		<link>
+			<name>Makefile</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Makefile</locationURI>
+		</link>
 		<link>
 			<name>bootloader-shared</name>
 			<type>2</type>

right/build/MK22FN512xxx12_flash.original.ld

@@ -204,21 +204,27 @@ SECTIONS
   text_end = ORIGIN(m_text) + LENGTH(m_text);
   ASSERT(__DATA_END <= text_end, "region m_text overflowed with text and data")
 
-  USB_RAM_GAP = DEFINED(__usb_ram_size__) ? __usb_ram_size__ : 0x800;
   /* Uninitialized data section */
-  .bss :
+  .bss : ALIGN(4)
   {
     /* This is used by the startup in order to initialize the .bss section */
-    . = ALIGN(4);
     __START_BSS = .;
     __bss_start__ = .;
     *(.bss)
     *(.bss*)
-    . = ALIGN(512);
-    USB_RAM_START = .;
-    . += USB_RAM_GAP;
     *(COMMON)
     . = ALIGN(4);
+  } > m_data
+  
+  .m_usb_bdt (NOLOAD) :
+  {
+    . = ALIGN(512); 
+    *(m_usb_bdt)
+  } > m_data
+
+  .m_usb_global (NOLOAD) :
+  {
+    *(m_usb_global)
     __bss_end__ = .;
     __END_BSS = .;
   } > m_data
@@ -247,17 +253,6 @@ SECTIONS
     . += STACK_SIZE;
   } > m_data_2
 
-  m_usb_bdt USB_RAM_START (NOLOAD) :
-  {
-    *(m_usb_bdt)
-    USB_RAM_BDT_END = .;
-  }
-
-  m_usb_global USB_RAM_BDT_END (NOLOAD) :
-  {
-    *(m_usb_global)
-  }
-
   /* Initializes stack on the end of block */
   __StackTop   = ORIGIN(m_data_2) + LENGTH(m_data_2);
   __StackLimit = __StackTop - STACK_SIZE;

right/build/uhk60-right_debug_kboot.launch

@@ -1,49 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.cdt.launch.applicationLaunchType">
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.AUTO_SOLIB" value="true"/>
+<stringAttribute key="bad_container_name" value="/uhk-l"/>
-<listAttribute key="org.eclipse.cdt.dsf.gdb.AUTO_SOLIB_LIST"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="gdb"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/make"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_ON_FORK" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-j8 DEBUG=1 flash"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.GDB_INIT" value=".gdbinit"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/uhk-right}/../"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.REVERSE" value="false"/>
-<listAttribute key="org.eclipse.cdt.dsf.gdb.SOLIB_PATH"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.TRACEPOINT_MODE" value="TP_NORMAL_ONLY"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.internal.ui.launching.LocalApplicationCDebuggerTab.DEFAULTS_SET" value="true"/>
-<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
-<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_ID" value="gdb"/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
-<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="uhk60-right_debug/uhk-right.hex"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="../../lib/agent/packages/usb/update-device-firmware.js"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="uhk-right"/>
-<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.1692217331.1297236062"/>
-<booleanAttribute key="org.eclipse.cdt.launch.use_terminal" value="true"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/uhk-right"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#10;"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.DefaultEvent" value="true"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.HideUnresolvedSymbols" value="true"/>
-<stringAttribute key="org.eclipse.linuxtools.internal.perf.attr.Kernel.Location" value=""/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.Kernel.SourceLineNumbers" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.ModuleSymbols" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.MultipleEvents" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.Multiplex" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.Record.Realtime" value="false"/>
-<intAttribute key="org.eclipse.linuxtools.internal.perf.attr.Record.Realtime.Priority" value="1"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.Record.Verbose" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.ShowSourceDisassembly" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.ShowStat" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.SourceLineNumbers" value="true"/>
-<intAttribute key="org.eclipse.linuxtools.internal.perf.attr.StatRunCount" value="1"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
 </launchConfiguration>

right/build/uhk60-right_release_kboot.launch

@@ -1,49 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.cdt.launch.applicationLaunchType">
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.AUTO_SOLIB" value="true"/>
+<stringAttribute key="bad_container_name" value="/uhk-l"/>
-<listAttribute key="org.eclipse.cdt.dsf.gdb.AUTO_SOLIB_LIST"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="gdb"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/make"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_ON_FORK" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-j8 DEBUG=0 flash"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.GDB_INIT" value=".gdbinit"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/uhk-right}/../"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.REVERSE" value="false"/>
-<listAttribute key="org.eclipse.cdt.dsf.gdb.SOLIB_PATH"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.TRACEPOINT_MODE" value="TP_NORMAL_ONLY"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.internal.ui.launching.LocalApplicationCDebuggerTab.DEFAULTS_SET" value="true"/>
-<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
-<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_ID" value="gdb"/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
-<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="uhk60-right_release/uhk-right.hex"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="../../lib/agent/packages/usb/update-device-firmware.js"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="uhk-right"/>
-<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1939339834.1692217331"/>
-<booleanAttribute key="org.eclipse.cdt.launch.use_terminal" value="true"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/uhk-right"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#10;"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.DefaultEvent" value="true"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.HideUnresolvedSymbols" value="true"/>
-<stringAttribute key="org.eclipse.linuxtools.internal.perf.attr.Kernel.Location" value=""/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.Kernel.SourceLineNumbers" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.ModuleSymbols" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.MultipleEvents" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.Multiplex" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.Record.Realtime" value="false"/>
-<intAttribute key="org.eclipse.linuxtools.internal.perf.attr.Record.Realtime.Priority" value="1"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.Record.Verbose" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.ShowSourceDisassembly" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.ShowStat" value="false"/>
-<booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.SourceLineNumbers" value="true"/>
-<intAttribute key="org.eclipse.linuxtools.internal.perf.attr.StatRunCount" value="1"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
 </launchConfiguration>

right/src/buspal/command.c

@@ -593,9 +593,6 @@ static status_t handle_command_internal(uint8_t *packet, uint32_t packetLength)
                     else
                     {
 #if FIXED_BUSPAL_BOOTLOADER
-                        size_t offset;
-                        int res;
-
                         status = kStatus_Success; /* set default */
                         res = WaitForStartByte(rxBuf, &offset);
                         if (res==1 && offset==1)

right/src/buspal/packet/serial_packet.c

@@ -110,7 +110,7 @@ status_t serial_packet_read(const peripheral_descriptor_t *self,
 
         // Receive the framing data packet.
         isPacketOk = true;
-        status_t status = read_data_packet(&framingPacket, g_serialContext.data, packetType);
+        status = read_data_packet(&framingPacket, g_serialContext.data, packetType);
         if (status != kStatus_Success)
         {
             // No packet available.

right/src/config.h

@@ -3,8 +3,4 @@
 
 // Macros:
 
-    #define I2C_WATCHDOG
-    #define LED_DRIVERS_ENABLED
-//    #define LED_DRIVER_STRESS_TEST
-
 #endif

right/src/config_parser/config_globals.c

@@ -6,6 +6,7 @@ static uint8_t hardwareConfig[HARDWARE_CONFIG_SIZE];
 static uint8_t ATTR_DATA2 stagingUserConfig[USER_CONFIG_SIZE];
 static uint8_t validatedUserConfig[USER_CONFIG_SIZE];
 
+uint16_t ValidatedUserConfigLength;
 config_buffer_t HardwareConfigBuffer = { hardwareConfig };
 config_buffer_t StagingUserConfigBuffer = { stagingUserConfig };
 config_buffer_t ValidatedUserConfigBuffer = { validatedUserConfig };

right/src/config_parser/config_globals.h

@@ -17,6 +17,7 @@
 // Variables:
 
     extern bool ParserRunDry;
+    extern uint16_t ValidatedUserConfigLength;
     extern config_buffer_t HardwareConfigBuffer;
     extern config_buffer_t StagingUserConfigBuffer;
     extern config_buffer_t ValidatedUserConfigBuffer;

right/src/config_parser/parse_config.c

@@ -51,7 +51,6 @@ parser_error_t ParseConfig(config_buffer_t *buffer)
     const char *deviceName = ReadString(buffer, &len);
     uint16_t doubleTapSwitchLayerTimeout = ReadUInt16(buffer);
 
-    (void)userConfigLength;
     (void)dataModelMajorVersion;
     (void)dataModelMinorVersion;
     (void)dataModelPatchVersion;
@@ -141,13 +140,14 @@ parser_error_t ParseConfig(config_buffer_t *buffer)
 
         // Update LED brightnesses and reinitialize LED drivers
 
+        ValidatedUserConfigLength = userConfigLength;
+
         IconsAndLayerTextsBrightness = iconsAndLayerTextsBrightness;
         AlphanumericSegmentsBrightness = alphanumericSegmentsBrightness;
         KeyBacklightBrightness = keyBacklightBrightness;
-#ifdef LED_DRIVERS_ENABLED
+
-        Slaves[SlaveId_LeftLedDriver].isConnected = false;
+        LedSlaveDriver_UpdateLeds();
-        Slaves[SlaveId_RightLedDriver].isConnected = false;
+
-#endif
         // Update mouse key speeds
 
         MouseMoveState.initialSpeed = mouseMoveInitialSpeed;

right/src/config_parser/parse_keymap.c

@@ -75,7 +75,7 @@ static parser_error_t parsePlayMacroAction(key_action_t *keyAction, config_buffe
     if (macroIndex >= tempMacroCount) {
         return ParserError_InvalidSerializedPlayMacroAction;
     }
-    keyAction->type = KeyActionType_SwitchKeymap;
+    keyAction->type = KeyActionType_PlayMacro;
     keyAction->playMacro.macroId = macroIndex;
     return ParserError_Success;
 }
@@ -196,4 +196,3 @@ parser_error_t ParseKeymap(config_buffer_t *buffer, uint8_t keymapIdx, uint8_t k
     }
     return ParserError_Success;
 }
-

right/src/config_parser/parse_macro.c

@@ -7,13 +7,15 @@ parser_error_t parseKeyMacroAction(config_buffer_t *buffer, macro_action_t *macr
     uint8_t keyMacroType = macroActionType - SerializedMacroActionType_KeyMacroAction;
     uint8_t action = keyMacroType & 0b11;
     uint8_t type;
-    uint8_t scancode;
+    uint16_t scancode = 0;
     uint8_t modifierMask;
 
     keyMacroType >>= 2;
     type = keyMacroType & 0b11;
     keyMacroType >>= 2;
-    scancode = keyMacroType & 0b10 ? ReadUInt8(buffer) : 0;
+    if (keyMacroType & 0b10) {
+        scancode = type == SerializedKeystrokeType_LongMedia ? ReadUInt16(buffer) : ReadUInt8(buffer);
+    }
     modifierMask = keyMacroType & 0b01 ? ReadUInt8(buffer) : 0;
     macroAction->type = MacroActionType_Key;
     macroAction->key.action = action;

right/src/eeprom.c

@@ -94,14 +94,14 @@ void EEPROM_Init(void)
     I2C_MasterTransferCreateHandle(I2C_EEPROM_BUS_BASEADDR, &i2cHandle, i2cCallback, NULL);
 }
 
-status_t EEPROM_LaunchTransfer(eeprom_operation_t operation, config_buffer_id_t config_buffer_id, void (*successCallback))
+status_t EEPROM_LaunchTransfer(eeprom_operation_t operation, config_buffer_id_t configBufferId, void (*successCallback))
 {
     if (IsEepromBusy) {
         return kStatus_I2C_Busy;
     }
 
     CurrentEepromOperation = operation;
-    CurrentConfigBufferId = config_buffer_id;
+    CurrentConfigBufferId = configBufferId;
     SuccessCallback = successCallback;
 
     bool isHardwareConfig = CurrentConfigBufferId == ConfigBufferId_HardwareConfig;
@@ -117,7 +117,8 @@ status_t EEPROM_LaunchTransfer(eeprom_operation_t operation, config_buffer_id_t
         case EepromOperation_Write:
             sourceBuffer = ConfigBufferIdToConfigBuffer(CurrentConfigBufferId)->buffer;
             sourceOffset = 0;
-            sourceLength = isHardwareConfig ? HARDWARE_CONFIG_SIZE : USER_CONFIG_SIZE;
+            uint16_t userConfigSize = ValidatedUserConfigLength && configBufferId == ConfigBufferId_ValidatedUserConfig ? ValidatedUserConfigLength : USER_CONFIG_SIZE;
+            sourceLength = isHardwareConfig ? HARDWARE_CONFIG_SIZE : userConfigSize;
             LastEepromTransferStatus = writePage();
             break;
     }

right/src/init_peripherals.c

@@ -144,9 +144,7 @@ void InitPeripherals(void)
     initI2c();
     InitTestLed();
     LedPwm_Init();
-#ifdef I2C_WATCHDOG
     InitI2cWatchdog();
-#endif
     InitKeyDebouncer();
     EEPROM_Init();
 }

right/src/key_action.h

@@ -19,7 +19,6 @@
         KeyActionType_SwitchLayer,
         KeyActionType_SwitchKeymap,
         KeyActionType_PlayMacro,
-        KeyActionType_Test,
     } key_action_type_t;
 
     typedef enum {

right/src/keymap.c

@@ -23,7 +23,7 @@ void SwitchKeymapById(uint8_t index)
     CurrentKeymapIndex = index;
     ValidatedUserConfigBuffer.offset = AllKeymaps[index].offset;
     ParseKeymap(&ValidatedUserConfigBuffer, index, AllKeymapsCount, AllMacrosCount);
-    LedDisplay_SetCurrentKeymapText();
+    LedDisplay_UpdateText();
 }
 
 bool SwitchKeymapByAbbreviation(uint8_t length, char *abbrev)

right/src/led_display.c

@@ -5,8 +5,9 @@
 
 uint8_t IconsAndLayerTextsBrightness = 0xff;
 uint8_t AlphanumericSegmentsBrightness = 0xff;
+bool ledIconStates[LedDisplayIcon_Last];
 
-static const uint16_t capitalLetterToSegmentSet[] = {
+static const uint16_t capitalLetterToSegmentMap[] = {
     0b0000000011110111,
     0b0001001010001111,
     0b0000000000111001,
@@ -35,7 +36,7 @@ static const uint16_t capitalLetterToSegmentSet[] = {
     0b0000110000001001,
 };
 
-static const uint16_t digitToSegmentSet[] = {
+static const uint16_t digitToSegmentMap[] = {
     0b0000110000111111,
     0b0000010000000110,
     0b0000100010001011,
@@ -48,13 +49,13 @@ static const uint16_t digitToSegmentSet[] = {
     0b0000000011101111,
 };
 
-static uint16_t characterToSegmentSet(char character)
+static uint16_t characterToSegmentMap(char character)
 {
     switch (character) {
         case 'A' ... 'Z':
-            return capitalLetterToSegmentSet[character - 'A'];
+            return capitalLetterToSegmentMap[character - 'A'];
         case '0' ... '9':
-            return digitToSegmentSet[character - '0'];
+            return digitToSegmentMap[character - '0'];
     }
     return 0;
 }
@@ -65,11 +66,11 @@ void LedDisplay_SetText(uint8_t length, const char* text)
 
     switch (length) {
         case 3:
-            allSegmentSets = (uint64_t)characterToSegmentSet(text[2]) << 28;
+            allSegmentSets = (uint64_t)characterToSegmentMap(text[2]) << 28;
         case 2:
-            allSegmentSets |= characterToSegmentSet(text[1]) << 14;
+            allSegmentSets |= characterToSegmentMap(text[1]) << 14;
         case 1:
-            allSegmentSets |= characterToSegmentSet(text[0]);
+            allSegmentSets |= characterToSegmentMap(text[0]);
     }
 
     LedDriverValues[LedDriverId_Left][11] = allSegmentSets & 0b00000001 ? AlphanumericSegmentsBrightness : 0;
@@ -84,12 +85,6 @@ void LedDisplay_SetText(uint8_t length, const char* text)
     }
 }
 
-void LedDisplay_SetCurrentKeymapText(void)
-{
-    keymap_reference_t *currentKeymap = AllKeymaps + CurrentKeymapIndex;
-    LedDisplay_SetText(currentKeymap->abbreviationLen, currentKeymap->abbreviation);
-}
-
 void LedDisplay_SetLayer(layer_id_t layerId)
 {
     for (uint8_t i = 13; i <= 45; i += 16) {
@@ -108,5 +103,25 @@ bool LedDisplay_GetIcon(led_display_icon_t icon)
 
 void LedDisplay_SetIcon(led_display_icon_t icon, bool isEnabled)
 {
-    LedDriverValues[LedDriverId_Left][8 + icon] = isEnabled ? IconsAndLayerTextsBrightness : 0;
+    ledIconStates[icon] = isEnabled;
+    LedDriverValues[LedDriverId_Left][icon + 8] = isEnabled ? IconsAndLayerTextsBrightness : 0;
+}
+
+void LedDisplay_UpdateIcons(void)
+{
+    for (led_display_icon_t i=0; i<=LedDisplayIcon_Last; i++) {
+        LedDisplay_SetIcon(i, ledIconStates[i]);
+    }
+}
+
+void LedDisplay_UpdateText(void)
+{
+    keymap_reference_t *currentKeymap = AllKeymaps + CurrentKeymapIndex;
+    LedDisplay_SetText(currentKeymap->abbreviationLen, currentKeymap->abbreviation);
+}
+
+void LedDisplay_UpdateAll(void)
+{
+    LedDisplay_UpdateIcons();
+    LedDisplay_UpdateText();
 }

right/src/led_display.h

@@ -13,6 +13,7 @@
         LedDisplayIcon_CapsLock,
         LedDisplayIcon_Agent,
         LedDisplayIcon_Adaptive,
+        LedDisplayIcon_Last = LedDisplayIcon_Adaptive,
     } led_display_icon_t;
 
 // Variables:
@@ -23,10 +24,11 @@
 // Functions:
 
     void LedDisplay_SetText(uint8_t length, const char* text);
-    void LedDisplay_SetCurrentKeymapText(void);
     void LedDisplay_SetLayer(layer_id_t layerId);
-    void LedDisplay_SetIcon(led_display_icon_t icon, bool isEnabled);
-
     bool LedDisplay_GetIcon(led_display_icon_t icon);
+    void LedDisplay_SetIcon(led_display_icon_t icon, bool isEnabled);
+    void LedDisplay_UpdateIcons(void);
+    void LedDisplay_UpdateText(void);
+    void LedDisplay_UpdateAll(void);
 
 #endif

right/src/link/MK22FN512xxx12_flash.ld

@@ -0,0 +1,277 @@
+/*
+** ###################################################################
+**     Processors:          MK22FN512CAP12
+**                          MK22FN512VDC12
+**                          MK22FN512VLH12
+**                          MK22FN512VLL12
+**                          MK22FN512VMP12
+**
+**     Compiler:            GNU C Compiler
+**     Reference manual:    K22P121M120SF7RM, Rev. 1, March 24, 2014
+**     Version:             rev. 2.8, 2015-02-19
+**     Build:               b151217
+**
+**     Abstract:
+**         Linker file for the GNU C Compiler
+**
+**     Copyright (c) 2015 Freescale Semiconductor, Inc.
+**     All rights reserved.
+**
+**     Redistribution and use in source and binary forms, with or without modification,
+**     are permitted provided that the following conditions are met:
+**
+**     o Redistributions of source code must retain the above copyright notice, this list
+**       of conditions and the following disclaimer.
+**
+**     o Redistributions in binary form must reproduce the above copyright notice, this
+**       list of conditions and the following disclaimer in the documentation and/or
+**       other materials provided with the distribution.
+**
+**     o Neither the name of Freescale Semiconductor, Inc. nor the names of its
+**       contributors may be used to endorse or promote products derived from this
+**       software without specific prior written permission.
+**
+**     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+**     ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+**     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+**     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+**     ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+**     (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+**     ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+**     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+**     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+**     http:                 www.freescale.com
+**     mail:                 support@freescale.com
+**
+** ###################################################################
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+HEAP_SIZE  = DEFINED(__heap_size__)  ? __heap_size__  : 0x2000;
+STACK_SIZE = DEFINED(__stack_size__) ? __stack_size__ : 0x0400;
+M_VECTOR_RAM_SIZE = DEFINED(__ram_vector_table__) ? 0x0400 : 0x0;
+
+/* This should match the value in bootloader_config.h if KBOOT is used */
+BL_APP_VECTOR_TABLE_ADDRESS = DEFINED(__bl_app_vector_table_address__) ? __bl_app_vector_table_address__ : 0;
+
+/* Specify the memory areas */
+MEMORY
+{
+  m_interrupts          (RX)  : ORIGIN = 0x0 + BL_APP_VECTOR_TABLE_ADDRESS, LENGTH = 0x00000400
+  m_text                (RX)  : ORIGIN = 0x00000400 + BL_APP_VECTOR_TABLE_ADDRESS, LENGTH = 512K - 0x400 - BL_APP_VECTOR_TABLE_ADDRESS
+  m_data                (RW)  : ORIGIN = 0x1FFF0000, LENGTH = 0x00010000
+  m_data_2              (RW)  : ORIGIN = 0x20000000, LENGTH = 0x0000FF00
+  m_noinit              (RW)  : ORIGIN = 0x2000FF00, LENGTH = 0x000000FF
+}
+
+/* Define output sections */
+SECTIONS
+{
+  /* The startup code goes first into internal flash */
+  .interrupts :
+  {
+    __VECTOR_TABLE = .;
+    . = ALIGN(4);
+    KEEP(*(.isr_vector))     /* Startup code */
+    . = ALIGN(4);
+  } > m_interrupts
+
+  /* The program code and other data goes into internal flash */
+  .text :
+  {
+    . = ALIGN(4);
+    *(.text)                 /* .text sections (code) */
+    *(.text*)                /* .text* sections (code) */
+    *(.rodata)               /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)              /* .rodata* sections (constants, strings, etc.) */
+    *(.glue_7)               /* glue arm to thumb code */
+    *(.glue_7t)              /* glue thumb to arm code */
+    *(.eh_frame)
+    KEEP (*(.init))
+    KEEP (*(.fini))
+    . = ALIGN(4);
+  } > m_text
+
+  .ARM.extab :
+  {
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+  } > m_text
+
+  .ARM :
+  {
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+  } > m_text
+
+ .ctors :
+  {
+    __CTOR_LIST__ = .;
+    /* gcc uses crtbegin.o to find the start of
+       the constructors, so we make sure it is
+       first.  Because this is a wildcard, it
+       doesn't matter if the user does not
+       actually link against crtbegin.o; the
+       linker won't look for a file to match a
+       wildcard.  The wildcard also means that it
+       doesn't matter which directory crtbegin.o
+       is in.  */
+    KEEP (*crtbegin.o(.ctors))
+    KEEP (*crtbegin?.o(.ctors))
+    /* We don't want to include the .ctor section from
+       from the crtend.o file until after the sorted ctors.
+       The .ctor section from the crtend file contains the
+       end of ctors marker and it must be last */
+    KEEP (*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors))
+    KEEP (*(SORT(.ctors.*)))
+    KEEP (*(.ctors))
+    __CTOR_END__ = .;
+  } > m_text
+
+  .dtors :
+  {
+    __DTOR_LIST__ = .;
+    KEEP (*crtbegin.o(.dtors))
+    KEEP (*crtbegin?.o(.dtors))
+    KEEP (*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors))
+    KEEP (*(SORT(.dtors.*)))
+    KEEP (*(.dtors))
+    __DTOR_END__ = .;
+  } > m_text
+
+  .preinit_array :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  } > m_text
+
+  .init_array :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } > m_text
+
+  .fini_array :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  } > m_text
+
+  __etext = .;    /* define a global symbol at end of code */
+  __DATA_ROM = .; /* Symbol is used by startup for data initialization */
+
+  .interrupts_ram :
+  {
+    . = ALIGN(4);
+    __VECTOR_RAM__ = .;
+    __interrupts_ram_start__ = .; /* Create a global symbol at data start */
+    *(.m_interrupts_ram)     /* This is a user defined section */
+    . += M_VECTOR_RAM_SIZE;
+    . = ALIGN(4);
+    __interrupts_ram_end__ = .; /* Define a global symbol at data end */
+  } > m_data
+
+  __VECTOR_RAM = DEFINED(__ram_vector_table__) ? __VECTOR_RAM__ : ORIGIN(m_interrupts);
+  __RAM_VECTOR_TABLE_SIZE_BYTES = DEFINED(__ram_vector_table__) ? (__interrupts_ram_end__ - __interrupts_ram_start__) : 0x0;
+
+  .data : AT(__DATA_ROM)
+  {
+    . = ALIGN(4);
+    __DATA_RAM = .;
+    __data_start__ = .;      /* create a global symbol at data start */
+    *(.data)                 /* .data sections */
+    *(.data*)                /* .data* sections */
+    KEEP(*(.jcr*))
+    . = ALIGN(4);
+    __data_end__ = .;        /* define a global symbol at data end */
+  } > m_data
+
+  __DATA_END = __DATA_ROM + (__data_end__ - __data_start__);
+  text_end = ORIGIN(m_text) + LENGTH(m_text);
+  ASSERT(__DATA_END <= text_end, "region m_text overflowed with text and data")
+
+  /* Uninitialized data section */
+  .bss : ALIGN(4)
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    __START_BSS = .;
+    __bss_start__ = .;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+    . = ALIGN(4);
+  } > m_data
+
+  .m_usb_bdt (NOLOAD) :
+  {
+    . = ALIGN(512);
+    *(m_usb_bdt)
+  } > m_data
+
+  .m_usb_global (NOLOAD) :
+  {
+    *(m_usb_global)
+    __bss_end__ = .;
+    __END_BSS = .;
+  } > m_data
+
+  .m_data_2 :
+  {
+     . = ALIGN(4);
+     *(.m_data_2) /* This is an User defined section */
+     . = ALIGN(4);
+  } > m_data_2
+
+  .heap :
+  {
+    . = ALIGN(8);
+    __end__ = .;
+    PROVIDE(end = .);
+    _pvHeapStart = .; /* Add for _sbrk */
+    __HeapBase = .;
+    . += HEAP_SIZE;
+    __HeapLimit = .;
+    __heap_limit = .; /* Add for _sbrk */
+  } > m_data_2
+
+  .stack :
+  {
+    . = ALIGN(8);
+    . += STACK_SIZE;
+  } > m_data_2
+
+  /* Initializes stack on the end of block */
+  __StackTop   = ORIGIN(m_data_2) + LENGTH(m_data_2);
+  __StackLimit = __StackTop - STACK_SIZE;
+  PROVIDE(__stack = __StackTop);
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+
+  ASSERT(__StackLimit >= __HeapLimit, "region m_data_2 overflowed with stack and heap")
+
+  .noinit (NOLOAD):
+  {
+    . = ALIGN(4);
+    _noinit = .;
+
+    *(.noinit .noinit.*)
+
+    . = ALIGN(4) ;
+    _end_noinit = .;
+  } > m_noinit
+
+  /* Mandatory to be word aligned, _sbrk assumes this */
+  PROVIDE ( end = _end_noinit ); /* was _ebss */
+  PROVIDE ( _end = _end_noinit );
+  PROVIDE ( __end = _end_noinit );
+  PROVIDE ( __end__ = _end_noinit );
+}

right/src/macros.h

@@ -39,7 +39,7 @@
             struct {
                 macro_sub_action_t action;
                 keystroke_type_t type;
-                uint8_t scancode;
+                uint16_t scancode;
                 uint8_t modifierMask;
             } ATTR_PACKED key;
             struct {

right/src/main.c

@@ -24,7 +24,7 @@ static void hardwareConfigurationReadFinished(void)
     EEPROM_LaunchTransfer(EepromOperation_Read, ConfigBufferId_StagingUserConfig, userConfigurationReadFinished);
 }
 
-void main(void)
+int main(void)
 {
     InitClock();
     InitPeripherals();

right/src/slave_drivers/is31fl3731_driver.c

@@ -62,6 +62,22 @@ static uint8_t setShutdownModeNormalBuffer[] = {LED_DRIVER_REGISTER_SHUTDOWN, SH
 static uint8_t setFrame1Buffer[] = {LED_DRIVER_REGISTER_FRAME, LED_DRIVER_FRAME_1};
 static uint8_t updatePwmRegistersBuffer[PWM_REGISTER_BUFFER_LENGTH];
 
+void LedSlaveDriver_DisableLeds(void)
+{
+    for (uint8_t ledDriverId=0; ledDriverId<=LedDriverId_Last; ledDriverId++) {
+        memset(LedDriverValues[ledDriverId], 0, LED_DRIVER_LED_COUNT);
+    }
+}
+
+void LedSlaveDriver_UpdateLeds(void)
+{
+    for (uint8_t ledDriverId=0; ledDriverId<=LedDriverId_Last; ledDriverId++) {
+        memset(LedDriverValues[ledDriverId], KeyBacklightBrightness, LED_DRIVER_LED_COUNT);
+    }
+
+    LedDisplay_UpdateAll();
+}
+
 void LedSlaveDriver_Init(uint8_t ledDriverId)
 {
     if (ledDriverId == ISO_KEY_LED_DRIVER_ID && IS_ISO) {
@@ -74,10 +90,7 @@ void LedSlaveDriver_Init(uint8_t ledDriverId)
     memset(LedDriverValues[ledDriverId], KeyBacklightBrightness, LED_DRIVER_LED_COUNT);
 
     if (ledDriverId == LedDriverId_Left) {
-        LedDisplay_SetIcon(LedDisplayIcon_CapsLock, false);
+        LedDisplay_UpdateAll();
-        LedDisplay_SetIcon(LedDisplayIcon_Agent, false);
-        LedDisplay_SetIcon(LedDisplayIcon_Adaptive, false);
-        LedDisplay_SetCurrentKeymapText();
     }
 }
 
@@ -118,10 +131,8 @@ status_t LedSlaveDriver_Update(uint8_t ledDriverId)
             *ledIndex += chunkSize;
             if (*ledIndex >= LED_DRIVER_LED_COUNT) {
                 *ledIndex = 0;
-#ifndef LED_DRIVER_STRESS_TEST
                 memcpy(currentLedDriverState->targetLedValues, ledValues, LED_DRIVER_LED_COUNT);
                 *ledDriverPhase = LedDriverPhase_UpdateChangedLedValues;
-#endif
             }
             break;
         case LedDriverPhase_UpdateChangedLedValues: {

right/src/slave_drivers/is31fl3731_driver.h

@@ -23,6 +23,7 @@
     typedef enum {
         LedDriverId_Right,
         LedDriverId_Left,
+        LedDriverId_Last = LedDriverId_Left,
     } led_driver_id_t;
 
     typedef enum {
@@ -49,6 +50,8 @@
 
 // Functions:
 
+    void LedSlaveDriver_DisableLeds(void);
+    void LedSlaveDriver_UpdateLeds(void);
     void LedSlaveDriver_Init(uint8_t ledDriverId);
     status_t LedSlaveDriver_Update(uint8_t ledDriverId);
 

right/src/slave_drivers/uhk_module_driver.c

@@ -265,10 +265,8 @@ status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId)
 
 void UhkModuleSlaveDriver_Disconnect(uint8_t uhkModuleDriverId)
 {
-#ifdef LED_DRIVERS_ENABLED
     if (uhkModuleDriverId == SlaveId_LeftKeyboardHalf) {
         Slaves[SlaveId_LeftLedDriver].isConnected = false;
     }
     UhkModuleStates[uhkModuleDriverId].moduleId = 0;
-#endif
 }

right/src/slave_scheduler.c

@@ -31,7 +31,6 @@ uhk_slave_t Slaves[] = {
         .update = UhkModuleSlaveDriver_Update,
         .perDriverId = UhkModuleDriverId_RightAddon,
     },
-#ifdef LED_DRIVERS_ENABLED
     {
         .init = LedSlaveDriver_Init,
         .update = LedSlaveDriver_Update,
@@ -42,7 +41,6 @@ uhk_slave_t Slaves[] = {
         .update = LedSlaveDriver_Update,
         .perDriverId = LedDriverId_Left,
     },
-#endif
     {
         .init = KbootSlaveDriver_Init,
         .update = KbootSlaveDriver_Update,

right/src/slave_scheduler.h

@@ -19,10 +19,8 @@
         SlaveId_LeftKeyboardHalf,
         SlaveId_LeftAddon,
         SlaveId_RightAddon,
-#ifdef LED_DRIVERS_ENABLED
         SlaveId_RightLedDriver,
         SlaveId_LeftLedDriver,
-#endif
         SlaveId_KbootDriver,
     } slave_id_t;
 

right/src/usb_composite_device.c

@@ -163,58 +163,21 @@ static usb_device_class_config_list_struct_t UsbDeviceCompositeConfigList = {
     }
 }};
 
-static bool computerSleeping = false;
+bool IsHostSleeping = false;
-#ifdef LED_DRIVERS_ENABLED
-static uint8_t oldKeyBacklightBrightness = 0xFF;
-static bool capsLockOn = false, agentOn = false, adaptiveOn = false;
-#endif
 
-bool IsComputerSleeping(void) {
+static void suspendHost(void) {
-    return computerSleeping;
+    IsHostSleeping = true;
+    LedSlaveDriver_DisableLeds();
 }
 
-static void ComputerIsSleeping(void) {
+void WakeUpHost(bool sendResume) {
-    computerSleeping = true;
+    if (sendResume) { // The device should wake up the host.
-#ifdef LED_DRIVERS_ENABLED
+        // Send resume signal - this will call USB_DeviceKhciControl(khciHandle, kUSB_DeviceControlResume, NULL);
-    // Save the state of the icons
+        USB_DeviceSetStatus(UsbCompositeDevice.deviceHandle, kUSB_DeviceStatusBus, NULL);
-    capsLockOn = LedDisplay_GetIcon(LedDisplayIcon_CapsLock);
+    }
-    agentOn = LedDisplay_GetIcon(LedDisplayIcon_Agent);
-    adaptiveOn = LedDisplay_GetIcon(LedDisplayIcon_Adaptive);
 
-    // Disable keyboard backlight
+    IsHostSleeping = false;
-    oldKeyBacklightBrightness = KeyBacklightBrightness;
+    LedSlaveDriver_UpdateLeds();
-    KeyBacklightBrightness = 0;
-    LedSlaveDriver_Init(LedDriverId_Right);
-    LedSlaveDriver_Init(LedDriverId_Left);
-
-    // Turn layer LEDs off
-    LedDisplay_SetLayer(LayerId_Base);
-
-    // Clear the text
-    LedDisplay_SetText(0, NULL);
-#endif
-}
-
-void WakeupComputer(bool sendResume) {
-    if (sendResume) // The device should wake up the computer
-        USB_DeviceSetStatus(UsbCompositeDevice.deviceHandle, kUSB_DeviceStatusBus, NULL); // Send resume signal - this will call USB_DeviceKhciControl(khciHandle, kUSB_DeviceControlResume, NULL);
-
-    computerSleeping = false; // The computer is now awake
-
-#ifdef LED_DRIVERS_ENABLED
-    // Restore keyboard backlight and text
-    KeyBacklightBrightness = oldKeyBacklightBrightness;
-    LedSlaveDriver_Init(LedDriverId_Right);
-    LedSlaveDriver_Init(LedDriverId_Left);
-
-    // Update the active layer
-    LedDisplay_SetLayer(GetActiveLayer());
-
-    // Restore icon states
-    LedDisplay_SetIcon(LedDisplayIcon_CapsLock, capsLockOn);
-    LedDisplay_SetIcon(LedDisplayIcon_Agent, agentOn);
-    LedDisplay_SetIcon(LedDisplayIcon_Adaptive, adaptiveOn);
-#endif
 }
 
 static usb_status_t usbDeviceCallback(usb_device_handle handle, uint32_t event, void *param)
@@ -227,8 +190,9 @@ static usb_status_t usbDeviceCallback(usb_device_handle handle, uint32_t event,
         return status;
     }
 
-    if (computerSleeping)
+    if (IsHostSleeping) {
-        WakeupComputer(false); // Wake up the keyboard if there is any activity on the bus
+        WakeUpHost(false); // Wake up the keyboard if there is any activity on the bus.
+    }
 
     switch (event) {
         case kUSB_DeviceEventBusReset:
@@ -237,13 +201,13 @@ static usb_status_t usbDeviceCallback(usb_device_handle handle, uint32_t event,
             break;
         case kUSB_DeviceEventSuspend:
             if (UsbCompositeDevice.attach) {
-                ComputerIsSleeping(); // The computer sends this event when it goes to sleep, so turn off all the LEDs
+                suspendHost(); // The host sends this event when it goes to sleep, so turn off all the LEDs.
                 status = kStatus_USB_Success;
             }
             break;
         case kUSB_DeviceEventResume:
-            // We will just wake up the computer if there is any activity on the bus
+            // We will just wake up the host if there is any activity on the bus.
-            // The problem is that the computer won't send a resume event when it boots, so the lights will never come back on
+            // The problem is that the host won't send a resume event when it boots, so the lights will never come back on.
             status = kStatus_USB_Success;
             break;
         case kUSB_DeviceEventSetConfiguration:

right/src/usb_composite_device.h

@@ -28,12 +28,12 @@
 
 // Variables:
 
+    extern bool IsHostSleeping;
     extern usb_composite_device_t UsbCompositeDevice;
 
 //Functions:
 
     void InitUsb(void);
-    bool IsComputerSleeping(void);
+    void WakeUpHost(bool sendResume);
-    void WakeupComputer(bool sendResume);
 
 #endif

right/src/usb_descriptors/usb_descriptor_basic_keyboard_report.c

@@ -21,7 +21,7 @@ uint8_t UsbBasicKeyboardReportDescriptor[USB_BASIC_KEYBOARD_REPORT_DESCRIPTOR_LE
         HID_RI_REPORT_SIZE(8, 0x08),
         HID_RI_INPUT(8, HID_IOF_CONSTANT),
 
-        // LED status
+        // LED status - Num lock, Caps lock, Scroll lock, Compose, Kana
         HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_LEDS),
         HID_RI_USAGE_MINIMUM(8, 0x01),
         HID_RI_USAGE_MAXIMUM(8, 0x05),

right/src/usb_descriptors/usb_descriptor_generic_hid_report.c

@@ -3,7 +3,7 @@
 #include "usb_descriptor_generic_hid_report.h"
 
 uint8_t UsbGenericHidReportDescriptor[USB_GENERIC_HID_REPORT_DESCRIPTOR_LENGTH] = {
-    HID_RI_USAGE_PAGE(8, USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_PAGE_INDEX),
+    HID_RI_USAGE_PAGE(16, (0xFF00 | USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_PAGE_INDEX)),
     HID_RI_USAGE(8, USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_COLLECTION),
     HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION),
 

right/src/usb_descriptors/usb_descriptor_generic_hid_report.h

@@ -3,12 +3,12 @@
 
 // Macros:
 
-    #define USB_GENERIC_HID_REPORT_DESCRIPTOR_LENGTH 33
+    #define USB_GENERIC_HID_REPORT_DESCRIPTOR_LENGTH 34
 
-    #define USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_PAGE_INDEX 0x80
+    #define USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_PAGE_INDEX 0x00
-    #define USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_COLLECTION 0x81
+    #define USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_COLLECTION 0x01
-    #define USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_DATA_IN    0x82
+    #define USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_DATA_IN    0x02
-    #define USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_DATA_OUT   0x83
+    #define USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_DATA_OUT   0x03
 
 // Variables:
 

right/src/usb_report_updater.c

@@ -288,7 +288,7 @@ static void updateActiveUsbReports(void)
     if (activeLayer == LayerId_Base) {
         activeLayer = GetActiveLayer();
     }
-    bool suppressKeys = previousLayer != LayerId_Base && activeLayer == LayerId_Base;
+    bool layerGotReleased = previousLayer != LayerId_Base && activeLayer == LayerId_Base;
     LedDisplay_SetLayer(activeLayer);
 
     if (MacroPlaying) {
@@ -305,7 +305,6 @@ static void updateActiveUsbReports(void)
             key_state_t *keyState = &KeyStates[slotId][keyId];
             key_action_t *action = &CurrentKeymap[activeLayer][slotId][keyId];
 
-
             if (keyState->debounceCounter < KEY_DEBOUNCER_TIMEOUT_MSEC) {
                 keyState->current = keyState->previous;
             } else if (!keyState->previous && keyState->current) {
@@ -313,7 +312,8 @@ static void updateActiveUsbReports(void)
             }
 
             if (keyState->current) {
-                if (suppressKeys) {
+                key_action_t *baseAction = &CurrentKeymap[LayerId_Base][slotId][keyId];
+                if (layerGotReleased && !(baseAction->type == KeyActionType_Keystroke && baseAction->keystroke.scancode == 0 && baseAction->keystroke.modifiers)) {
                     keyState->suppressed = true;
                 }
 
@@ -377,7 +377,7 @@ void UpdateUsbReports(void)
 {
     UsbReportUpdateCounter++;
 
-    // Process the key inputs at a constant rate when moving the mouse, so the mouse speed is consistent
+    // Process the key inputs at a constant rate when moving the mouse, so the mouse speed is consistent.
     bool hasActiveMouseState = false;
     for (uint8_t i=0; i<ACTIVE_MOUSE_STATES_COUNT; i++) {
         hasActiveMouseState = true;
@@ -428,7 +428,7 @@ void UpdateUsbReports(void)
         IsUsbMouseReportSent = false;
     }
 
-    if ((previousLayer != LayerId_Base || !IsUsbBasicKeyboardReportSent || !IsUsbMediaKeyboardReportSent || !IsUsbSystemKeyboardReportSent || !IsUsbMouseReportSent) && IsComputerSleeping()) {
+    if ((previousLayer != LayerId_Base || !IsUsbBasicKeyboardReportSent || !IsUsbMediaKeyboardReportSent || !IsUsbSystemKeyboardReportSent || !IsUsbMouseReportSent) && IsHostSleeping) {
-        WakeupComputer(true); // Wake up the computer if any key is pressed and the computer is sleeping
+        WakeUpHost(true); // Wake up the host if any key is pressed and the computer is sleeping.
     }
 }

scripts/Makedefs.mk

@@ -0,0 +1,229 @@
+# Copyright (C) 2018 Kristian Lauszus. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Contact information
+# -------------------
+# Kristian Lauszus
+# Web      :  http://www.lauszus.com
+# e-mail   :  lauszus@gmail.com
+
+# Debug using Semihosting.
+SEMIHOSTING ?= 0
+
+# Build directory.
+BUILD_DIR ?= build_make
+
+# Set default value (no bootloader) for the bootloader vector table address.
+BL_APP_VECTOR_TABLE_ADDRESS ?= 0
+
+# Preprocessor directives.
+BUILD_FLAGS += -D__NEWLIB__ -D__USE_CMSIS -D__MCUXPRESSO -DCPU_$(PART) -D__STARTUP_CLEAR_BSS -DBL_APP_VECTOR_TABLE_ADDRESS=$(BL_APP_VECTOR_TABLE_ADDRESS)
+
+# Path to project object file.
+PROJECT_OBJ = $(BUILD_DIR)/$(PROJECT_NAME).axf
+
+# Set the prefix for the tools to use.
+PREFIX ?= arm-none-eabi
+
+# Set WIN=1 manually for Windows Subsystem for Linux.
+WIN ?= 0
+
+# Determine if we are on a Windows machine and set the .exe suffix.
+UNAME_S := $(shell uname -s)
+ifeq ($(OS),Windows_NT) # Native Windows.
+    WIN = 1
+endif
+
+# Set J-Link executable.
+ifeq ($(WIN),1)
+    JLINK := JLink.exe
+else
+    JLINK := JLinkExe
+endif
+
+# We can not use the suffix command, as the PREFIX might contain spaces.
+ifeq ($(WIN),1)
+    SUFFIX := .exe
+endif
+
+# The command for calling the compilers.
+CC = $(PREFIX)-gcc$(SUFFIX)
+CXX = $(PREFIX)-g++$(SUFFIX)
+
+# The command for calling the linker.
+LD = $(PREFIX)-g++$(SUFFIX)
+
+# The command for extracting images from the linked executables.
+OBJCOPY = $(PREFIX)-objcopy$(SUFFIX)
+
+# The command for the size tool.
+SIZE = $(PREFIX)-size$(SUFFIX)
+
+# Auto-dependency generation flags.
+DEPS = -MMD -MP
+
+# The flags passed to the assembler.
+AFLAGS = -mthumb                    \
+         $(CPU)                     \
+         $(FPU)                     \
+         $(DEPS)                    \
+         $(BUILD_FLAGS)             \
+         -x assembler-with-cpp
+
+# The flags passed to the compiler.
+CFLAGS = -mthumb                    \
+         $(CPU)                     \
+         $(FPU)                     \
+         $(DEPS)                    \
+         -fno-builtin               \
+         -ffunction-sections        \
+         -fdata-sections            \
+         -fno-common                \
+         -Wdouble-promotion         \
+         -Woverflow                 \
+         -Wall                      \
+         -Wshadow                   \
+         $(BUILD_FLAGS)
+
+# Compiler options for C++ only.
+CXXFLAGS = -felide-constructors -fno-exceptions -fno-rtti
+
+# Set the C/C++ standard to use.
+CSTD = -std=gnu11
+CXXSTD = -std=gnu++14
+
+# Make all warnings into errors when building using Travis CI.
+ifdef TRAVIS
+    CFLAGS += -Werror
+endif
+
+# The flags passed to the linker.
+LDFLAGS = --specs=nano.specs -mthumb $(CPU) $(FPU) -T $(LDSCRIPT) -Wl,-Map=$(PROJECT_OBJ:.axf=.map),--gc-sections,-print-memory-usage,-no-wchar-size-warning,--defsym=__heap_size__=$(HEAP_SIZE),--defsym=__stack_size__=$(STACK_SIZE),--defsym=__bl_app_vector_table_address__=$(BL_APP_VECTOR_TABLE_ADDRESS)
+
+# Include the following archives.
+LDARCHIVES = -Wl,--start-group -lg -lgcc -lm -Wl,--end-group
+
+# Add flags to the build flags and linker depending on the build settings.
+ifeq ($(SEMIHOSTING),1)
+    # Include Semihost library.
+    LDARCHIVES += -lcr_newlib_semihost
+
+    # Enable printf floating numbers.
+    LDFLAGS += -u _printf_float
+else
+    # Include libnosys.a if Semihosting is disabled.
+    LDARCHIVES += -lnosys
+endif
+
+# Check if the DEBUG environment variable is set.
+DEBUG ?= 0
+ifeq ($(DEBUG),1)
+    CFLAGS += -O3 -g3 -DDEBUG
+else
+    CFLAGS += -O3 -DNDEBUG
+endif
+
+# Add the include file paths to AFLAGS and CFLAGS.
+AFLAGS += $(patsubst %,-I%,$(subst :, ,$(IPATH)))
+CFLAGS += $(patsubst %,-I%,$(subst :, ,$(IPATH)))
+
+# Create lists of C, C++ and assembly objects.
+C_OBJS := $(addsuffix .o,$(addprefix $(BUILD_DIR)/,$(basename $(filter %.c,$(abspath $(SOURCE))))))
+CPP_OBJS := $(addsuffix .o,$(addprefix $(BUILD_DIR)/,$(basename $(filter %.cpp,$(abspath $(SOURCE))))))
+S_OBJS := $(addsuffix .o,$(addprefix $(BUILD_DIR)/,$(basename $(filter %.S,$(abspath $(SOURCE))))))
+
+# Create a list of all objects.
+OBJS := $(C_OBJS) $(CPP_OBJS) $(S_OBJS)
+
+# Define the commands used for compiling the project.
+LD_CMD = $(LD) $(LDFLAGS) -o $(@) $(filter %.o %.a, $(^)) $(LDARCHIVES)
+CC_CMD = $(CC) $(CFLAGS) $(CSTD) -c $(<) -o $(@)
+CXX_CMD = $(CXX) $(CFLAGS) $(CXXFLAGS) $(CXXSTD) -c $(<) -o $(@)
+AS_CMD = $(CC) $(AFLAGS) $(CSTD) -c $(<) -o $(@)
+
+# Everyone need colors in their life!
+INTERACTIVE := $(shell [ -t 0 ] && echo 1)
+ifeq ($(INTERACTIVE),1)
+    color_default = \033[0m
+    color_bold = \033[01m
+    color_red = \033[31m
+    color_green = \033[32m
+    color_yellow = \033[33m
+    color_blue = \033[34m
+    color_magenta = \033[35m
+    color_cyan = \033[36m
+    color_orange = \033[38;5;172m
+    color_light_blue = \033[38;5;039m
+    color_gray = \033[38;5;008m
+    color_purple = \033[38;5;097m
+endif
+
+.PHONY: all clean flash flash-jlink
+
+# The default rule, which causes the project to be built.
+all: $(PROJECT_OBJ)
+
+# The rule to clean out all the build products.
+clean:
+	@rm -rf $(BUILD_DIR) $(wildcard *~)
+	@echo "$(color_red)Done cleaning!$(color_default)"
+
+flash: all
+	@$(FLASH_CMD) || exit 1
+
+flash-jlink: all
+	$(JLINK) -if SWD -CommandFile $(JLINK_SCRIPT) || exit 1
+
+# Rebuild all objects when the Makefiles change.
+$(OBJS): $(MAKEFILE_LIST)
+
+# The rule for linking the application.
+$(PROJECT_OBJ): $(OBJS) $(LDSCRIPT)
+	@if [ '$(VERBOSE)' = 1 ]; then                               \
+	     echo $(LD_CMD);                                         \
+	 else                                                        \
+	     echo "    $(color_purple)LD$(color_default)    $(@F)";  \
+	 fi
+	@echo
+	@$(LD_CMD)
+	@echo
+	@if [ '$(VERBOSE)' = 1 ]; then                               \
+	     $(SIZE) -Ax $(@);                                       \
+	 fi
+	@$(OBJCOPY) -O binary $(@) $(@:.axf=.bin)
+	@$(OBJCOPY) -O ihex $(@) $(@:.axf=.hex)
+
+# The rule for building the object files from each source file.
+$(C_OBJS): $(BUILD_DIR)/%.o : %.c
+	@mkdir -p $(@D)
+	@if [ '$(VERBOSE)' = 1 ]; then                               \
+	     echo $(CC_CMD);                                         \
+	 else                                                        \
+	     echo "    $(color_green)CC$(color_default)    $(<F)";   \
+	 fi
+	@$(CC_CMD)
+
+$(CPP_OBJS): $(BUILD_DIR)/%.o : %.cpp
+	@mkdir -p $(@D)
+	@if [ '$(VERBOSE)' = 1 ]; then                               \
+	     echo $(CXX_CMD);                                        \
+	 else                                                        \
+	     echo "    $(color_cyan)CXX$(color_default)   $(<F)";    \
+	 fi
+	@$(CXX_CMD)
+
+$(S_OBJS): $(BUILD_DIR)/%.o: %.S
+	@mkdir -p $(@D)
+	@if [ '$(VERBOSE)' = 1 ]; then                               \
+	     echo $(AS_CMD);                                         \
+	 else                                                        \
+	     echo "    $(color_magenta)AS$(color_default)    $(<F)"; \
+	 fi
+	@$(AS_CMD)
+
+# Include the automatically generated dependency files.
+-include $(OBJS:.o=.d)

scripts/flash-left.jlink

@@ -0,0 +1,7 @@
+speed 4000
+device MKL03Z32xxx4
+connect
+loadfile build_make/uhk_left.hex
+RSetType 2
+r
+qc

scripts/flash-right.jlink

@@ -0,0 +1,7 @@
+speed 4000
+device MK22FN512xxx12
+connect
+loadfile build_make/uhk_right.hex
+RSetType 2
+r
+qc

scripts/make-release.js

@@ -13,22 +13,15 @@ const releaseName = `uhk-firmware-${version}`;
 const releaseDir = `${__dirname}/${releaseName}`;
 const modulesDir = `${releaseDir}/modules`;
 const releaseFile = `${__dirname}/${releaseName}.tar.bz2`;
-const leftFirmwareFile = `${__dirname}/../left/build/uhk60-left_release/uhk-left.bin`;
+const leftFirmwareFile = `${__dirname}/../left/build_make/uhk_left.bin`;
 const usbDir = `${__dirname}/../lib/agent/packages/usb`;
 
 const deviceSourceFirmwares = package.devices.map(device => `${__dirname}/../${device.source}`);
 const moduleSourceFirmwares = package.modules.map(module => `${__dirname}/../${module.source}`);
 rm('-rf', releaseDir, releaseFile, deviceSourceFirmwares, moduleSourceFirmwares);
 
-exec(`/opt/Freescale/KDS_v3/eclipse/kinetis-design-studio \
+exec(`cd ${__dirname}/../left; make clean; make -j8`);
---launcher.suppressErrors \
+exec(`cd ${__dirname}/../right; make clean; make -j8`);
--noSplash \
--application org.eclipse.cdt.managedbuilder.core.headlessbuild \
--import ${__dirname}/../left/build \
--import ${__dirname}/../right/build \
--cleanBuild uhk-left \
--cleanBuild uhk-right`
-);
 
 for (const device of package.devices) {
     const deviceDir = `${releaseDir}/devices/${device.name}`;

scripts/package.json

@@ -15,7 +15,7 @@
     "commander": "^2.11.0",
     "shelljs": "^0.7.8"
   },
-  "firmwareVersion": "8.1.6",
+  "firmwareVersion": "8.2.3",
   "deviceProtocolVersion": "4.3.0",
   "moduleProtocolVersion": "4.0.0",
   "userConfigVersion": "4.0.0",
@@ -24,14 +24,14 @@
     {
       "deviceId": 1,
       "name": "uhk60-right",
-      "source": "right/build/uhk60-right_release/uhk-right.hex"
+      "source": "right/build_make/uhk_right.hex"
     }
   ],
   "modules": [
     {
       "moduleId": 1,
       "name": "uhk60-left",
-      "source": "left/build/uhk60-left_release/uhk-left.bin"
+      "source": "left/build_make/uhk_left.bin"
     }
   ]
 }

shared/versions.h

@@ -19,8 +19,8 @@
 // Variables:
 
     #define FIRMWARE_MAJOR_VERSION 8
-    #define FIRMWARE_MINOR_VERSION 1
+    #define FIRMWARE_MINOR_VERSION 2
-    #define FIRMWARE_PATCH_VERSION 6
+    #define FIRMWARE_PATCH_VERSION 3
 
     #define DEVICE_PROTOCOL_MAJOR_VERSION 4
     #define DEVICE_PROTOCOL_MINOR_VERSION 3