diff --git a/CHANGELOG.md b/CHANGELOG.md index 5526d707f..18c8cc13d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ 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. +## [2.1.0] - 2017-10-13 + +Data Model: 1.0.0 (unchanged) | USB Protocol: 1.2.0 (minor bump) | Slave Protocol: 2.1.0 (minor bump) + +- Add jumpToSlaveBootloader USB and slave protocol command. `USBPROTOCOL:MINOR` `SLAVEPROTOCOL:MINOR` +- Fix generic HID descriptor enumeration error. + ## [2.0.0] - 2017-10-10 Data Model: 1.0.0 (unchanged) | USB Protocol: 1.1.0 (minor bump) | Slave Protocol: 2.0.0 (major bump) diff --git a/package.json b/package.json index 1155748f9..00ad51bd3 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,8 @@ "bugs": { "url": "https://github.com/UltimateHackingKeyboard/firmware/issues" }, - "version": "2.0.0", + "version": "2.1.0", "dataModelVersion": "1.0.0", - "usbProtocolVersion": "1.1.0", - "slaveProtocolVersion": "2.0.0" + "usbProtocolVersion": "1.2.0", + "slaveProtocolVersion": "2.1.0" }