diff --git a/efm32/.cproject b/efm32/.cproject
index de52b56..4f6fe54 100644
--- a/efm32/.cproject
+++ b/efm32/.cproject
@@ -23,7 +23,7 @@
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
-			<storageModule buildConfig.stockConfigId="com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt.debug#com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt:7.2.1.20170904" cppBuildConfig.builtinIncludes="studio:/sdk/platform/emlib/inc/ studio:/sdk/platform/Device/SiliconLabs/EFM32JG1B/Include/ studio:/sdk/platform/CMSIS/Include/ studio:/sdk/util/third_party/mbedtls/configs/ studio:/sdk/util/third_party/mbedtls/include/ studio:/sdk/util/third_party/mbedtls/include/mbedtls/ studio:/sdk/util/third_party/mbedtls/sl_crypto/include/ studio:/sdk/util/third_party/mbedtls/sl_crypto/src/ studio:/sdk/platform/emlib/inc/ studio:/sdk/platform/Device/SiliconLabs/EFM32JG1B/Include/ studio:/sdk/platform/CMSIS/Include/ studio:/sdk/util/third_party/mbedtls/configs/ studio:/sdk/util/third_party/mbedtls/include/ studio:/sdk/util/third_party/mbedtls/include/mbedtls/ studio:/sdk/util/third_party/mbedtls/sl_crypto/include/ studio:/sdk/util/third_party/mbedtls/sl_crypto/src/" cppBuildConfig.builtinLibraryFiles="" cppBuildConfig.builtinLibraryNames="" cppBuildConfig.builtinLibraryObjects="" cppBuildConfig.builtinLibraryPaths="" cppBuildConfig.builtinMacros="EFM32JG1B200F128GM32 EFM32JG1B200F128GM32" moduleId="com.silabs.ss.framework.ide.project.core.cpp" projectCommon.boardIds="com.silabs.board.none:0.0.0" projectCommon.partId="mcu.arm.efm32.jg1.efm32jg1b200f128gm32" projectCommon.referencedModules="[{&quot;builtinExcludes&quot;:[],&quot;builtinSources&quot;:[&quot;mbedtls/debug.c&quot;,&quot;mbedtls/aesni.c&quot;,&quot;mbedtls/xtea.c&quot;,&quot;mbedtls/error.c&quot;,&quot;mbedtls/certs.c&quot;,&quot;mbedtls/Makefile&quot;,&quot;mbedtls/havege.c&quot;,&quot;mbedtls/gcm.c&quot;,&quot;mbedtls/x509.c&quot;,&quot;mbedtls/x509_create.c&quot;,&quot;mbedtls/padlock.c&quot;,&quot;mbedtls/oid.c&quot;,&quot;mbedtls/camellia.c&quot;,&quot;mbedtls/platform.c&quot;,&quot;mbedtls/pkcs12.c&quot;,&quot;mbedtls/aes.c&quot;,&quot;mbedtls/pk_wrap.c&quot;,&quot;mbedtls/ssl_ciphersuites.c&quot;,&quot;mbedtls/dhm.c&quot;,&quot;mbedtls/ecdh.c&quot;,&quot;mbedtls/arc4.c&quot;,&quot;mbedtls/hmac_drbg.c&quot;,&quot;mbedtls/ecp_curves.c&quot;,&quot;mbedtls/bignum.c&quot;,&quot;mbedtls/sha1.c&quot;,&quot;mbedtls/md5.c&quot;,&quot;mbedtls/timing.c&quot;,&quot;mbedtls/x509write_crt.c&quot;,&quot;mbedtls/ecp.c&quot;,&quot;mbedtls/ctr_drbg.c&quot;,&quot;mbedtls/entropy_poll.c&quot;,&quot;mbedtls/CMakeLists.txt&quot;,&quot;mbedtls/ripemd160.c&quot;,&quot;mbedtls/pk.c&quot;,&quot;mbedtls/des.c&quot;,&quot;mbedtls/asn1write.c&quot;,&quot;mbedtls/asn1parse.c&quot;,&quot;mbedtls/ssl_cookie.c&quot;,&quot;mbedtls/rsa.c&quot;,&quot;mbedtls/cipher.c&quot;,&quot;mbedtls/version_features.c&quot;,&quot;mbedtls/pkcs5.c&quot;,&quot;mbedtls/x509write_csr.c&quot;,&quot;mbedtls/ccm.c&quot;,&quot;mbedtls/ssl_cache.c&quot;,&quot;mbedtls/entropy.c&quot;,&quot;mbedtls/net.c&quot;,&quot;mbedtls/x509_crt.c&quot;,&quot;mbedtls/blowfish.c&quot;,&quot;mbedtls/pkwrite.c&quot;,&quot;mbedtls/sha512.c&quot;,&quot;mbedtls/memory_buffer_alloc.c&quot;,&quot;mbedtls/x509_crl.c&quot;,&quot;mbedtls/pkcs11.c&quot;,&quot;mbedtls/md.c&quot;,&quot;mbedtls/base64.c&quot;,&quot;mbedtls/ssl_srv.c&quot;,&quot;mbedtls/ssl_tls.c&quot;,&quot;mbedtls/pkparse.c&quot;,&quot;mbedtls/sha256.c&quot;,&quot;mbedtls/ecdsa.c&quot;,&quot;mbedtls/md4.c&quot;,&quot;mbedtls/md2.c&quot;,&quot;mbedtls/ecjpake.c&quot;,&quot;mbedtls/cipher_wrap.c&quot;,&quot;mbedtls/ssl_cli.c&quot;,&quot;mbedtls/pem.c&quot;,&quot;mbedtls/x509_csr.c&quot;,&quot;mbedtls/threading.c&quot;,&quot;mbedtls/md_wrap.c&quot;,&quot;mbedtls/ssl_ticket.c&quot;,&quot;mbedtls/version.c&quot;,&quot;sl_crypto/slcl_device_internal.h&quot;,&quot;sl_crypto/slcl_ecp.c&quot;,&quot;sl_crypto/sl_sha1.c&quot;,&quot;sl_crypto/aesdrv_blockcipher_crypto.c&quot;,&quot;sl_crypto/aesdrv_common.c&quot;,&quot;sl_crypto/slcl_device.c&quot;,&quot;sl_crypto/aesdrv_authencr_crypto.c&quot;,&quot;sl_crypto/sl_crypto_internal.h&quot;,&quot;sl_crypto/sl_entropy.c&quot;,&quot;sl_crypto/aesdrv_common_crypto.c&quot;,&quot;sl_crypto/slcl_sha1.c&quot;,&quot;sl_crypto/slcl_ccm.c&quot;,&quot;sl_crypto/slcl_cmac.c&quot;,&quot;sl_crypto/aesdrv_common_aes.c&quot;,&quot;sl_crypto/trng.c&quot;,&quot;sl_crypto/aesdrv_internal.h&quot;,&quot;sl_crypto/sl_aes.c&quot;,&quot;sl_crypto/slcl_device_crypto.h&quot;,&quot;sl_crypto/sl_timing.c&quot;,&quot;sl_crypto/aesdrv_common_crypto.h&quot;,&quot;sl_crypto/aesdrv_blockcipher_aes.c&quot;,&quot;sl_crypto/sl_sha256.c&quot;,&quot;sl_crypto/slcl_sha256.c&quot;,&quot;sl_crypto/aesdrv_common_aes.h&quot;,&quot;sl_crypto/slcl_aes.c&quot;,&quot;sl_crypto/slcl_device_crypto.c&quot;,&quot;sl_crypto/aesdrv_authencr.h&quot;,&quot;sl_crypto/sl_ecp.c&quot;,&quot;sl_crypto/slpal_ucos3.c&quot;,&quot;sl_crypto/sldp.c&quot;,&quot;sl_crypto/slcl_device_aes.h&quot;,&quot;sl_crypto/slcl_device_aes.c&quot;,&quot;sl_crypto/slpal_freertos.c&quot;,&quot;sl_crypto/aesdrv_authencr_aes.c&quot;],&quot;builtin&quot;:false,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; id=\&quot;com.silabs.sdk.exx32.external.mbedtls\&quot;/&gt;&quot;},{&quot;builtinExcludes&quot;:[],&quot;builtinSources&quot;:[&quot;CMSIS/EFM32JG1B/startup_gcc_efm32jg1b.s&quot;,&quot;CMSIS/EFM32JG1B/system_efm32jg1b.c&quot;],&quot;builtin&quot;:true,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; builtin=\&quot;true\&quot; id=\&quot;com.silabs.sdk.exx32.part\&quot;/&gt;&quot;},{&quot;builtinExcludes&quot;:[],&quot;builtinSources&quot;:[],&quot;builtin&quot;:true,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; builtin=\&quot;true\&quot; id=\&quot;com.silabs.sdk.exx32.common.CMSIS\&quot;&gt;\r\n  &lt;exclusions pattern=\&quot;.*\&quot;/&gt;\r\n&lt;/project:MModule&gt;&quot;},{&quot;builtinExcludes&quot;:[&quot;emlib/em_i2c.c&quot;,&quot;emlib/em_ldma.c&quot;],&quot;builtinSources&quot;:[&quot;emlib/em_gpio.c&quot;,&quot;emlib/em_timer.c&quot;,&quot;emlib/em_adc.c&quot;,&quot;emlib/em_system.c&quot;,&quot;emlib/em_cmu.c&quot;,&quot;emlib/em_cryotimer.c&quot;,&quot;emlib/em_crypto.c&quot;,&quot;emlib/em_assert.c&quot;,&quot;emlib/em_emu.c&quot;,&quot;emlib/em_usart.c&quot;,&quot;emlib/em_i2c.c&quot;,&quot;emlib/em_ldma.c&quot;],&quot;builtin&quot;:true,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; builtin=\&quot;true\&quot; id=\&quot;com.silabs.sdk.exx32.common.emlib\&quot;&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_system.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_emu.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_cmu.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_device.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_chip.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_assert.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_adc.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_cryotimer.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_crypto.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_gpio.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_timer.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_usart.c\&quot;/&gt;\r\n&lt;/project:MModule&gt;&quot;}]" projectCommon.sdkId="com.silabs.sdk.stack.super:1.1.1._310456152" projectCommon.toolchainId="com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt:7.2.1.20170904"/>
+			<storageModule buildConfig.stockConfigId="com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt.debug#com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt:7.2.1.20170904" cppBuildConfig.builtinIncludes="studio:/sdk/platform/Device/SiliconLabs/EFM32JG1B/Include/ studio:/sdk/platform/CMSIS/Include/ studio:/sdk/platform/emlib/inc/ studio:/sdk/util/third_party/mbedtls/configs/ studio:/sdk/util/third_party/mbedtls/include/ studio:/sdk/util/third_party/mbedtls/include/mbedtls/ studio:/sdk/util/third_party/mbedtls/sl_crypto/include/ studio:/sdk/util/third_party/mbedtls/sl_crypto/src/ studio:/sdk/platform/Device/SiliconLabs/EFM32JG1B/Include/ studio:/sdk/platform/CMSIS/Include/ studio:/sdk/platform/emlib/inc/ studio:/sdk/util/third_party/mbedtls/configs/ studio:/sdk/util/third_party/mbedtls/include/ studio:/sdk/util/third_party/mbedtls/include/mbedtls/ studio:/sdk/util/third_party/mbedtls/sl_crypto/include/ studio:/sdk/util/third_party/mbedtls/sl_crypto/src/" cppBuildConfig.builtinLibraryFiles="" cppBuildConfig.builtinLibraryNames="" cppBuildConfig.builtinLibraryObjects="" cppBuildConfig.builtinLibraryPaths="" cppBuildConfig.builtinMacros="EFM32JG1B200F128GM32 EFM32JG1B200F128GM32" moduleId="com.silabs.ss.framework.ide.project.core.cpp" projectCommon.boardIds="com.silabs.board.none:0.0.0" projectCommon.partId="mcu.arm.efm32.jg1.efm32jg1b200f128gm32" projectCommon.referencedModules="[{&quot;builtinExcludes&quot;:[],&quot;builtinSources&quot;:[&quot;mbedtls/debug.c&quot;,&quot;mbedtls/aesni.c&quot;,&quot;mbedtls/xtea.c&quot;,&quot;mbedtls/error.c&quot;,&quot;mbedtls/certs.c&quot;,&quot;mbedtls/Makefile&quot;,&quot;mbedtls/havege.c&quot;,&quot;mbedtls/gcm.c&quot;,&quot;mbedtls/x509.c&quot;,&quot;mbedtls/x509_create.c&quot;,&quot;mbedtls/padlock.c&quot;,&quot;mbedtls/oid.c&quot;,&quot;mbedtls/camellia.c&quot;,&quot;mbedtls/platform.c&quot;,&quot;mbedtls/pkcs12.c&quot;,&quot;mbedtls/aes.c&quot;,&quot;mbedtls/pk_wrap.c&quot;,&quot;mbedtls/ssl_ciphersuites.c&quot;,&quot;mbedtls/dhm.c&quot;,&quot;mbedtls/ecdh.c&quot;,&quot;mbedtls/arc4.c&quot;,&quot;mbedtls/hmac_drbg.c&quot;,&quot;mbedtls/ecp_curves.c&quot;,&quot;mbedtls/bignum.c&quot;,&quot;mbedtls/sha1.c&quot;,&quot;mbedtls/md5.c&quot;,&quot;mbedtls/timing.c&quot;,&quot;mbedtls/x509write_crt.c&quot;,&quot;mbedtls/ecp.c&quot;,&quot;mbedtls/ctr_drbg.c&quot;,&quot;mbedtls/entropy_poll.c&quot;,&quot;mbedtls/CMakeLists.txt&quot;,&quot;mbedtls/ripemd160.c&quot;,&quot;mbedtls/pk.c&quot;,&quot;mbedtls/des.c&quot;,&quot;mbedtls/asn1write.c&quot;,&quot;mbedtls/asn1parse.c&quot;,&quot;mbedtls/ssl_cookie.c&quot;,&quot;mbedtls/rsa.c&quot;,&quot;mbedtls/cipher.c&quot;,&quot;mbedtls/version_features.c&quot;,&quot;mbedtls/pkcs5.c&quot;,&quot;mbedtls/x509write_csr.c&quot;,&quot;mbedtls/ccm.c&quot;,&quot;mbedtls/ssl_cache.c&quot;,&quot;mbedtls/entropy.c&quot;,&quot;mbedtls/net.c&quot;,&quot;mbedtls/x509_crt.c&quot;,&quot;mbedtls/blowfish.c&quot;,&quot;mbedtls/pkwrite.c&quot;,&quot;mbedtls/sha512.c&quot;,&quot;mbedtls/memory_buffer_alloc.c&quot;,&quot;mbedtls/x509_crl.c&quot;,&quot;mbedtls/pkcs11.c&quot;,&quot;mbedtls/md.c&quot;,&quot;mbedtls/base64.c&quot;,&quot;mbedtls/ssl_srv.c&quot;,&quot;mbedtls/ssl_tls.c&quot;,&quot;mbedtls/pkparse.c&quot;,&quot;mbedtls/sha256.c&quot;,&quot;mbedtls/ecdsa.c&quot;,&quot;mbedtls/md4.c&quot;,&quot;mbedtls/md2.c&quot;,&quot;mbedtls/ecjpake.c&quot;,&quot;mbedtls/cipher_wrap.c&quot;,&quot;mbedtls/ssl_cli.c&quot;,&quot;mbedtls/pem.c&quot;,&quot;mbedtls/x509_csr.c&quot;,&quot;mbedtls/threading.c&quot;,&quot;mbedtls/md_wrap.c&quot;,&quot;mbedtls/ssl_ticket.c&quot;,&quot;mbedtls/version.c&quot;,&quot;sl_crypto/slcl_device_internal.h&quot;,&quot;sl_crypto/slcl_ecp.c&quot;,&quot;sl_crypto/sl_sha1.c&quot;,&quot;sl_crypto/aesdrv_blockcipher_crypto.c&quot;,&quot;sl_crypto/aesdrv_common.c&quot;,&quot;sl_crypto/slcl_device.c&quot;,&quot;sl_crypto/aesdrv_authencr_crypto.c&quot;,&quot;sl_crypto/sl_crypto_internal.h&quot;,&quot;sl_crypto/sl_entropy.c&quot;,&quot;sl_crypto/aesdrv_common_crypto.c&quot;,&quot;sl_crypto/slcl_sha1.c&quot;,&quot;sl_crypto/slcl_ccm.c&quot;,&quot;sl_crypto/slcl_cmac.c&quot;,&quot;sl_crypto/aesdrv_common_aes.c&quot;,&quot;sl_crypto/trng.c&quot;,&quot;sl_crypto/aesdrv_internal.h&quot;,&quot;sl_crypto/sl_aes.c&quot;,&quot;sl_crypto/slcl_device_crypto.h&quot;,&quot;sl_crypto/sl_timing.c&quot;,&quot;sl_crypto/aesdrv_common_crypto.h&quot;,&quot;sl_crypto/aesdrv_blockcipher_aes.c&quot;,&quot;sl_crypto/sl_sha256.c&quot;,&quot;sl_crypto/slcl_sha256.c&quot;,&quot;sl_crypto/aesdrv_common_aes.h&quot;,&quot;sl_crypto/slcl_aes.c&quot;,&quot;sl_crypto/slcl_device_crypto.c&quot;,&quot;sl_crypto/aesdrv_authencr.h&quot;,&quot;sl_crypto/sl_ecp.c&quot;,&quot;sl_crypto/slpal_ucos3.c&quot;,&quot;sl_crypto/sldp.c&quot;,&quot;sl_crypto/slcl_device_aes.h&quot;,&quot;sl_crypto/slcl_device_aes.c&quot;,&quot;sl_crypto/slpal_freertos.c&quot;,&quot;sl_crypto/aesdrv_authencr_aes.c&quot;],&quot;builtin&quot;:false,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; id=\&quot;com.silabs.sdk.exx32.external.mbedtls\&quot;/&gt;&quot;},{&quot;builtinExcludes&quot;:[],&quot;builtinSources&quot;:[&quot;CMSIS/EFM32JG1B/startup_gcc_efm32jg1b.s&quot;,&quot;CMSIS/EFM32JG1B/system_efm32jg1b.c&quot;],&quot;builtin&quot;:true,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; builtin=\&quot;true\&quot; id=\&quot;com.silabs.sdk.exx32.part\&quot;/&gt;&quot;},{&quot;builtinExcludes&quot;:[],&quot;builtinSources&quot;:[],&quot;builtin&quot;:true,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; builtin=\&quot;true\&quot; id=\&quot;com.silabs.sdk.exx32.common.CMSIS\&quot;&gt;\r\n  &lt;exclusions pattern=\&quot;.*\&quot;/&gt;\r\n&lt;/project:MModule&gt;&quot;},{&quot;builtinExcludes&quot;:[&quot;emlib/em_i2c.c&quot;,&quot;emlib/em_ldma.c&quot;],&quot;builtinSources&quot;:[&quot;emlib/em_gpio.c&quot;,&quot;emlib/em_timer.c&quot;,&quot;emlib/em_adc.c&quot;,&quot;emlib/em_system.c&quot;,&quot;emlib/em_cmu.c&quot;,&quot;emlib/em_cryotimer.c&quot;,&quot;emlib/em_crypto.c&quot;,&quot;emlib/em_assert.c&quot;,&quot;emlib/em_emu.c&quot;,&quot;emlib/em_usart.c&quot;,&quot;emlib/em_i2c.c&quot;,&quot;emlib/em_ldma.c&quot;],&quot;builtin&quot;:true,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; builtin=\&quot;true\&quot; id=\&quot;com.silabs.sdk.exx32.common.emlib\&quot;&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_system.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_emu.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_cmu.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_device.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_chip.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_assert.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_adc.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_cryotimer.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_crypto.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_gpio.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_timer.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_usart.c\&quot;/&gt;\r\n&lt;/project:MModule&gt;&quot;}]" projectCommon.sdkId="com.silabs.sdk.stack.super:1.1.1._310456152" projectCommon.toolchainId="com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt:7.2.1.20170904"/>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" description="" id="com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt.debug#com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt:7.2.1.20170904" name="GNU ARM v7.2.1 - Debug" parent="com.silabs.ide.si32.gcc.cdt.managedbuild.config.gnu.exe">
 					<folderInfo id="com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt.debug#com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt:7.2.1.20170904." name="/" resourcePath="">
@@ -67,9 +67,9 @@
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/platform/emdrv/dmadrv/inc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/platform/emdrv/common/inc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/platform/emdrv/config&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/platform/emlib/inc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/platform/Device/SiliconLabs/EFM32JG1B/Include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/platform/CMSIS/Include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/platform/emlib/inc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/util/third_party/mbedtls/configs&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/util/third_party/mbedtls/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/util/third_party/mbedtls/include/mbedtls&quot;"/>
@@ -93,9 +93,9 @@
 									<listOptionValue builtIn="false" value="C:/Users/conor/Desktop/u2f-one/fido2"/>
 									<listOptionValue builtIn="false" value="C:/Users/conor/Desktop/u2f-one/tinycbor/src"/>
 									<listOptionValue builtIn="false" value="C:/Users/conor/Desktop/u2f-one/crypto"/>
-									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/platform/emlib/inc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/platform/Device/SiliconLabs/EFM32JG1B/Include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/platform/CMSIS/Include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/platform/emlib/inc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/util/third_party/mbedtls/configs&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/util/third_party/mbedtls/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/util/third_party/mbedtls/include/mbedtls&quot;"/>
@@ -159,7 +159,7 @@
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
-			<storageModule buildConfig.stockConfigId="com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt.release#com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt:7.2.1.20170904" cppBuildConfig.builtinIncludes="studio:/sdk/platform/emlib/inc/ studio:/sdk/platform/Device/SiliconLabs/EFM32PG1B/Include/ studio:/sdk/platform/CMSIS/Include/ studio:/sdk/hardware/kit/SLSTK3401A_EFM32PG/config/ studio:/sdk/hardware/kit/common/bsp/ studio:/sdk/hardware/kit/common/drivers/ studio:/sdk/platform/emlib/inc/ studio:/sdk/platform/Device/SiliconLabs/EFM32PG1B/Include/ studio:/sdk/platform/CMSIS/Include/ studio:/sdk/hardware/kit/SLSTK3401A_EFM32PG/config/ studio:/sdk/hardware/kit/common/bsp/ studio:/sdk/hardware/kit/common/drivers/" cppBuildConfig.builtinLibraryFiles="" cppBuildConfig.builtinLibraryNames="" cppBuildConfig.builtinLibraryObjects="" cppBuildConfig.builtinLibraryPaths="" cppBuildConfig.builtinMacros="EFM32PG1B200F256GM48 EFM32PG1B200F256GM48" moduleId="com.silabs.ss.framework.ide.project.core.cpp" projectCommon.referencedModules="[{&quot;builtinExcludes&quot;:[&quot;emlib/em_i2c.c&quot;,&quot;emlib/em_ldma.c&quot;],&quot;builtinSources&quot;:[&quot;emlib/em_gpio.c&quot;,&quot;emlib/em_timer.c&quot;,&quot;emlib/em_adc.c&quot;,&quot;emlib/em_system.c&quot;,&quot;emlib/em_cmu.c&quot;,&quot;emlib/em_cryotimer.c&quot;,&quot;emlib/em_crypto.c&quot;,&quot;emlib/em_assert.c&quot;,&quot;emlib/em_emu.c&quot;,&quot;emlib/em_usart.c&quot;,&quot;emlib/em_i2c.c&quot;,&quot;emlib/em_ldma.c&quot;],&quot;builtin&quot;:true,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; builtin=\&quot;true\&quot; id=\&quot;com.silabs.sdk.exx32.common.emlib\&quot;&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_system.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_emu.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_cmu.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_device.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_chip.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_assert.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_adc.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_cryotimer.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_crypto.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_gpio.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_timer.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_usart.c\&quot;/&gt;\r\n&lt;/project:MModule&gt;&quot;},{&quot;builtinExcludes&quot;:[],&quot;builtinSources&quot;:[],&quot;builtin&quot;:true,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; builtin=\&quot;true\&quot; id=\&quot;com.silabs.sdk.exx32.board\&quot;/&gt;&quot;},{&quot;builtinExcludes&quot;:[],&quot;builtinSources&quot;:[&quot;CMSIS/EFM32PG1B/startup_gcc_efm32pg1b.s&quot;,&quot;CMSIS/EFM32PG1B/system_efm32pg1b.c&quot;],&quot;builtin&quot;:true,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; builtin=\&quot;true\&quot; id=\&quot;com.silabs.sdk.exx32.part\&quot;/&gt;&quot;},{&quot;builtinExcludes&quot;:[],&quot;builtinSources&quot;:[],&quot;builtin&quot;:true,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; builtin=\&quot;true\&quot; id=\&quot;com.silabs.sdk.exx32.common.bsp\&quot;&gt;\r\n  &lt;exclusions pattern=\&quot;.*\&quot;/&gt;\r\n&lt;/project:MModule&gt;&quot;},{&quot;builtinExcludes&quot;:[],&quot;builtinSources&quot;:[],&quot;builtin&quot;:true,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; builtin=\&quot;true\&quot; id=\&quot;com.silabs.sdk.exx32.common.CMSIS\&quot;&gt;\r\n  &lt;exclusions pattern=\&quot;.*\&quot;/&gt;\r\n&lt;/project:MModule&gt;&quot;},{&quot;builtinExcludes&quot;:[],&quot;builtinSources&quot;:[],&quot;builtin&quot;:true,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; builtin=\&quot;true\&quot; id=\&quot;com.silabs.sdk.exx32.common.drivers\&quot;&gt;\r\n  &lt;exclusions pattern=\&quot;.*\&quot;/&gt;\r\n&lt;/project:MModule&gt;&quot;}]" projectCommon.toolchainId="com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt:7.2.1.20170904"/>
+			<storageModule buildConfig.stockConfigId="com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt.release#com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt:7.2.1.20170904" cppBuildConfig.builtinIncludes="studio:/sdk/platform/Device/SiliconLabs/EFM32PG1B/Include/ studio:/sdk/platform/CMSIS/Include/ studio:/sdk/platform/emlib/inc/ studio:/sdk/hardware/kit/SLSTK3401A_EFM32PG/config/ studio:/sdk/hardware/kit/common/bsp/ studio:/sdk/hardware/kit/common/drivers/ studio:/sdk/platform/Device/SiliconLabs/EFM32PG1B/Include/ studio:/sdk/platform/CMSIS/Include/ studio:/sdk/platform/emlib/inc/ studio:/sdk/hardware/kit/SLSTK3401A_EFM32PG/config/ studio:/sdk/hardware/kit/common/bsp/ studio:/sdk/hardware/kit/common/drivers/" cppBuildConfig.builtinLibraryFiles="" cppBuildConfig.builtinLibraryNames="" cppBuildConfig.builtinLibraryObjects="" cppBuildConfig.builtinLibraryPaths="" cppBuildConfig.builtinMacros="EFM32PG1B200F256GM48 EFM32PG1B200F256GM48" moduleId="com.silabs.ss.framework.ide.project.core.cpp" projectCommon.referencedModules="[{&quot;builtinExcludes&quot;:[&quot;emlib/em_i2c.c&quot;,&quot;emlib/em_ldma.c&quot;],&quot;builtinSources&quot;:[&quot;emlib/em_gpio.c&quot;,&quot;emlib/em_timer.c&quot;,&quot;emlib/em_adc.c&quot;,&quot;emlib/em_system.c&quot;,&quot;emlib/em_cmu.c&quot;,&quot;emlib/em_cryotimer.c&quot;,&quot;emlib/em_crypto.c&quot;,&quot;emlib/em_assert.c&quot;,&quot;emlib/em_emu.c&quot;,&quot;emlib/em_usart.c&quot;,&quot;emlib/em_i2c.c&quot;,&quot;emlib/em_ldma.c&quot;],&quot;builtin&quot;:true,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; builtin=\&quot;true\&quot; id=\&quot;com.silabs.sdk.exx32.common.emlib\&quot;&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_system.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_emu.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_cmu.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_device.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_chip.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_assert.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_adc.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_cryotimer.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_crypto.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_gpio.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_timer.c\&quot;/&gt;\r\n  &lt;inclusions pattern=\&quot;emlib/em_usart.c\&quot;/&gt;\r\n&lt;/project:MModule&gt;&quot;},{&quot;builtinExcludes&quot;:[],&quot;builtinSources&quot;:[],&quot;builtin&quot;:true,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; builtin=\&quot;true\&quot; id=\&quot;com.silabs.sdk.exx32.board\&quot;/&gt;&quot;},{&quot;builtinExcludes&quot;:[],&quot;builtinSources&quot;:[&quot;CMSIS/EFM32PG1B/startup_gcc_efm32pg1b.s&quot;,&quot;CMSIS/EFM32PG1B/system_efm32pg1b.c&quot;],&quot;builtin&quot;:true,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; builtin=\&quot;true\&quot; id=\&quot;com.silabs.sdk.exx32.part\&quot;/&gt;&quot;},{&quot;builtinExcludes&quot;:[],&quot;builtinSources&quot;:[],&quot;builtin&quot;:true,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; builtin=\&quot;true\&quot; id=\&quot;com.silabs.sdk.exx32.common.bsp\&quot;&gt;\r\n  &lt;exclusions pattern=\&quot;.*\&quot;/&gt;\r\n&lt;/project:MModule&gt;&quot;},{&quot;builtinExcludes&quot;:[],&quot;builtinSources&quot;:[],&quot;builtin&quot;:true,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; builtin=\&quot;true\&quot; id=\&quot;com.silabs.sdk.exx32.common.CMSIS\&quot;&gt;\r\n  &lt;exclusions pattern=\&quot;.*\&quot;/&gt;\r\n&lt;/project:MModule&gt;&quot;},{&quot;builtinExcludes&quot;:[],&quot;builtinSources&quot;:[],&quot;builtin&quot;:true,&quot;module&quot;:&quot;&lt;project:MModule xmlns:project=\&quot;http://www.silabs.com/ss/Project.ecore\&quot; builtin=\&quot;true\&quot; id=\&quot;com.silabs.sdk.exx32.common.drivers\&quot;&gt;\r\n  &lt;exclusions pattern=\&quot;.*\&quot;/&gt;\r\n&lt;/project:MModule&gt;&quot;}]" projectCommon.toolchainId="com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt:7.2.1.20170904"/>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" description="" id="com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt.release#com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt:7.2.1.20170904" name="GNU ARM v7.2.1 - Release" parent="com.silabs.ide.si32.gcc.cdt.managedbuild.config.gnu.exe">
 					<folderInfo id="com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt.release#com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt:7.2.1.20170904." name="/" resourcePath="">
@@ -178,9 +178,9 @@
 								<option id="gnu.c.compiler.option.include.paths.656306182" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/inc&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/platform/emlib/inc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/platform/Device/SiliconLabs/EFM32PG1B/Include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/platform/CMSIS/Include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/platform/emlib/inc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/hardware/kit/SLSTK3401A_EFM32PG/config&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/hardware/kit/common/bsp&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/hardware/kit/common/drivers&quot;"/>
@@ -195,9 +195,9 @@
 								<option id="gnu.both.asm.option.include.paths.1646608287" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/inc&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/platform/emlib/inc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/platform/Device/SiliconLabs/EFM32PG1B/Include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/platform/CMSIS/Include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/platform/emlib/inc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/hardware/kit/SLSTK3401A_EFM32PG/config&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/hardware/kit/common/bsp&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${StudioSdkPath}/hardware/kit/common/drivers&quot;"/>
@@ -227,7 +227,7 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
-	<storageModule moduleId="com.silabs.ss.framework.ide.project.core.cpp" project.generation="120" projectCommon.boardIds="brd2500a:0.0.0" projectCommon.buildArtifactType="EXE" projectCommon.importModeId="COPY" projectCommon.partId="mcu.arm.efm32.pg1.efm32pg1b200f256gm48" projectCommon.sdkId="com.silabs.sdk.stack.super:1.1.1._310456152"/>
+	<storageModule moduleId="com.silabs.ss.framework.ide.project.core.cpp" project.generation="15" projectCommon.boardIds="brd2500a:0.0.0" projectCommon.buildArtifactType="EXE" projectCommon.importModeId="COPY" projectCommon.partId="mcu.arm.efm32.pg1.efm32pg1b200f256gm48" projectCommon.sdkId="com.silabs.sdk.stack.super:1.1.1._310456152"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 		<project id="EFM32.com.silabs.ss.framework.ide.project.core.cdt.cdtMbsProjectType.1696568425" name="SLS CDT Project" projectType="com.silabs.ss.framework.ide.project.core.cdt.cdtMbsProjectType"/>
 	</storageModule>
diff --git a/efm32/src/device.c b/efm32/src/device.c
index 1ee70d0..de3a5a9 100644
--- a/efm32/src/device.c
+++ b/efm32/src/device.c
@@ -33,8 +33,8 @@
 #define RDY_PIN			gpioPortC,10
 #define RW_PIN			gpioPortD,11
 #define RESET_PIN		gpioPortB,13
-#define LED1_PIN		gpioPortF,4
-#define LED2_PIN		gpioPortF,5
+#define LED_RED_PIN		gpioPortF,4
+#define LED_GREEN_PIN		gpioPortF,5
 
 #else
 
@@ -42,11 +42,15 @@
 #define RDY_PIN			gpioPortA,0
 #define RW_PIN			gpioPortD,15
 #define RESET_PIN		gpioPortB,15
-#define LED1_PIN		gpioPortD,9
-#define LED2_PIN		gpioPortD,10
-#define LED3_PIN		gpioPortD,14
+#define LED_RED_PIN		gpioPortD,10
+#define LED_GREEN_PIN	gpioPortD,14
+#define LED_BLUE_PIN	gpioPortD,9
 #define BUTTON_PIN		gpioPortD,13
 
+#define RED_CHANNEL		0
+#define GREEN_CHANNEL	2
+#define BLUE_CHANNEL	1
+
 #endif
 
 #define PAGE_SIZE		2048
@@ -135,9 +139,9 @@ void RGB(uint32_t hex)
     uint16_t g = 256 - ((hex & 0xff00) >> 8);
     uint16_t b = 256 - ((hex & 0xff) >> 0);
 
-    TIMER_CompareBufSet(TIMER0, 0, g);		// green
-    TIMER_CompareBufSet(TIMER0, 1, r);		// red
-    TIMER_CompareBufSet(TIMER0, 2, b);		// blue
+    TIMER_CompareBufSet(TIMER0, GREEN_CHANNEL, g);		// green
+    TIMER_CompareBufSet(TIMER0, RED_CHANNEL, r);		// red
+    TIMER_CompareBufSet(TIMER0, BLUE_CHANNEL, b);		// blue
     _color = hex;
 }
 
@@ -246,7 +250,7 @@ void heartbeat()
 
 
 #if 0
-    RGB(0x70fefe);  // bright ass light
+    RGB(0x100000);  // bright ass light
     return;
 #endif
 
@@ -467,14 +471,14 @@ void bootloader_init(void)
     GPIO_PinModeSet(RESET_PIN, gpioModePushPull, 1);
 
     // status LEDS
-    GPIO_PinModeSet(LED1_PIN,
+    GPIO_PinModeSet(LED_RED_PIN,
             gpioModePushPull,
             1);		// red
 
-    GPIO_PinModeSet(LED2_PIN,
+    GPIO_PinModeSet(LED_GREEN_PIN,
             gpioModePushPull,
             1);		// green
-    GPIO_PinModeSet(LED3_PIN,
+    GPIO_PinModeSet(LED_BLUE_PIN,
             gpioModePushPull,
             1);		// blue
 
@@ -505,14 +509,14 @@ void device_init(void)
     enter_DefaultMode_from_RESET();
 
     // status LEDS
-    GPIO_PinModeSet(LED1_PIN,
+    GPIO_PinModeSet(LED_RED_PIN,
             gpioModePushPull,
             1);		// red
 
-    GPIO_PinModeSet(LED2_PIN,
+    GPIO_PinModeSet(LED_GREEN_PIN,
             gpioModePushPull,
             1);		// green
-    GPIO_PinModeSet(LED3_PIN,
+    GPIO_PinModeSet(LED_BLUE_PIN,
             gpioModePushPull,
             1);		// blue