8 Commits

Author SHA1 Message Date
László Monda
721a4dc6e7 Bump Agent version to 1.0.2 and update changelog. 2017-12-25 23:55:23 +01:00
László Monda
c9f03b4e57 Reference firmware 8.0.1 and don't include the moduleProtocolVersion field because it's firmware-related, not Agent-related. 2017-12-25 23:39:27 +01:00
László Monda
bbb6839f7e Fix Linux blhost path. 2017-12-25 21:48:41 +01:00
László Monda
dd973c80ea Add install-win-driver-*.bat 2017-12-24 03:56:13 +01:00
László Monda
48574a121a Move zadic-*.exe to packages/zadic 2017-12-24 03:35:13 +01:00
László Monda
8bc2462589 Reluctantly, add back zadic as it's needed to install Windows drivers for blhost to update the firmware on Windows. 2017-12-24 03:12:49 +01:00
László Monda
975ab8a5e9 Update README.md 2017-12-23 19:24:13 +01:00
László Monda
f0a54768d4 Clarify the difference between the two builds. 2017-12-23 19:20:26 +01:00
10 changed files with 30 additions and 6 deletions

View File

@@ -4,6 +4,12 @@ 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/). The format is loosely based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
## [1.0.2] - 2017-12-25
Firmware: [**8.0.1**](https://github.com/UltimateHackingKeyboard/firmware/releases/tag/8.0.1) | Device Protocol: 4.0.0 | User Config: 4.0.0 | Hardware Config: 1.0.0
- Fix firmware upgrade on Linux.
## [1.0.1] - 2017-12-22 ## [1.0.1] - 2017-12-22
Firmware: [7.0.0](https://github.com/UltimateHackingKeyboard/firmware/releases/tag/7.0.0) | Device Protocol: 4.0.0 | User Config: 4.0.0 | Hardware Config: 1.0.0 Firmware: [7.0.0](https://github.com/UltimateHackingKeyboard/firmware/releases/tag/7.0.0) | Device Protocol: 4.0.0 | User Config: 4.0.0 | Hardware Config: 1.0.0

View File

@@ -7,7 +7,17 @@ Agent is the configuration application of the [Ultimate Hacking Keyboard](https:
[Give it a whirl!](http://ultimatehackingkeyboard.github.io/agent/) [Give it a whirl!](http://ultimatehackingkeyboard.github.io/agent/)
## Set up instructions ## Two builds to rule them all
It's worth mentioning that Agent has two builds.
The **electron build** is the desktop application which is meant to be used if you have an actual UHK at hand. It starts with an opening screen which detects your UHK. You cannot get past this screen without connecting a UHK via USB.
The **web build** is meant to be used for demonstation purposes, so people who don't yet own a UHK can get a feel of Agent and its capabilities in their browser. Eventually, WebUSB support will be added to the web build, making it able to communicate with the UHK. Given the sandboxed nature of browers, the web build will always lack features that the electron build offers, so this won't make the electron build obsolete.
The two builds share code as much as possible.
## Building the electron application
First up, make sure that node >=8.1.x and npm >=5.1.x are installed on your system. Next up: First up, make sure that node >=8.1.x and npm >=5.1.x are installed on your system. Next up:
@@ -24,6 +34,13 @@ npm run electron
At this point, Agent should be running on your machine. At this point, Agent should be running on your machine.
## Developing the web application
- The frontend code is located in `packages/uhk-web/`
- Run the project locally with `npm run server:web`
- View the app at `http://localhost:8080`
- The app will automatically reload when you make changes
## Contributing ## Contributing
Wanna contribute? Please let us show you [how](CONTRIBUTING.md). Wanna contribute? Please let us show you [how](CONTRIBUTING.md).

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "uhk-agent", "name": "uhk-agent",
"version": "1.0.0", "version": "1.0.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@@ -3,7 +3,7 @@
"private": true, "private": true,
"author": "Ultimate Gadget Laboratories", "author": "Ultimate Gadget Laboratories",
"main": "electron/dist/electron-main.js", "main": "electron/dist/electron-main.js",
"version": "1.0.1", "version": "1.0.2",
"description": "Agent is the configuration application of the Ultimate Hacking Keyboard.", "description": "Agent is the configuration application of the Ultimate Hacking Keyboard.",
"repository": { "repository": {
"type": "git", "type": "git",

View File

@@ -16,9 +16,8 @@
"dependencies": { "dependencies": {
"node-hid": "0.5.7" "node-hid": "0.5.7"
}, },
"firmwareVersion": "7.0.0", "firmwareVersion": "8.0.1",
"deviceProtocolVersion": "4.0.0", "deviceProtocolVersion": "4.0.0",
"moduleProtocolVersion": "3.0.0",
"userConfigVersion": "4.0.0", "userConfigVersion": "4.0.0",
"hardwareConfigVersion": "1.0.0" "hardwareConfigVersion": "1.0.0"
} }

View File

@@ -70,7 +70,7 @@ export class UhkBlhost {
let blhostPath; let blhostPath;
switch (process.platform) { switch (process.platform) {
case 'linux': case 'linux':
blhostPath = 'linux/amd64/blhost'; blhostPath = 'linux/x86_64/blhost';
break; break;
case 'darwin': case 'darwin':
blhostPath = 'mac/blhost'; blhostPath = 'mac/blhost';

View File

@@ -0,0 +1 @@
zadic-ia32.exe --vid 0x1d50 --pid 0x6120 --iface 0 --usealldevices --noprompt

View File

@@ -0,0 +1 @@
zadic-x64.exe --vid 0x1d50 --pid 0x6120 --iface 0 --usealldevices --noprompt

Binary file not shown.

Binary file not shown.