Theaninova/DeviceManager
1
0
Fork 0
mirror of https://github.com/CharaChorder/DeviceManager.git synced 2026-01-07 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: use hexadecimal for settings

Browse Source
This commit is contained in:
Thea Schöbl
2023-12-21 23:49:55 +01:00
parent 84b22e0006
commit 630687de80
2 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/serial/device.ts
View File

@@ -290,7 +290,7 @@ export class CharaDevice {
* To permanently store the settings, you *must* call commit. * To permanently store the settings, you *must* call commit.
*/ */
async setSetting(id: number, value: number) { async setSetting(id: number, value: number) {
const [status] = await this.send(`VAR B2 ${id} ${value}`) const [status] = await this.send(`VAR B2 ${id.toString(16).toUpperCase()} ${value}`)
if (status !== "0") throw new Error(`Failed with status ${status}`) if (status !== "0") throw new Error(`Failed with status ${status}`)
} }
@@ -298,8 +298,9 @@ export class CharaDevice {
* Retrieves a setting from the device * Retrieves a setting from the device
*/ */
async getSetting(id: number): Promise<number> { async getSetting(id: number): Promise<number> {
const [value, status] = await this.send(`VAR B1 ${id}`) const [value, status] = await this.send(`VAR B1 ${id.toString(16).toUpperCase()}`)
if (status !== "0") throw new Error(`Setting "${id}" doesn't exist (Status code ${status})`) if (status !== "0")
throw new Error(`Setting "0x${id.toString(16)}" doesn't exist (Status code ${status})`)
return Number(value) return Number(value)
} }

54
src/routes/config/settings/+page.svelte
View File

@@ -7,7 +7,7 @@
{#if $serialPort} {#if $serialPort}
<form> <form>
<fieldset> <fieldset>
<legend><label><input type="checkbox" use:setting={{id: 41}} />Spurring</label></legend> <legend><label><input type="checkbox" use:setting={{id: 0x41}} />Spurring</label></legend>
<p> <p>
"Chording only" mode which tells your device to output chords on a press rather than a press & "Chording only" mode which tells your device to output chords on a press rather than a press &
release. It also enables you to jump from one chord to another without releasing everything and can be release. It also enables you to jump from one chord to another without releasing everything and can be
@@ -23,13 +23,19 @@
</p> </p>
<label <label
>Character Counter Timeout<span class="unit" >Character Counter Timeout<span class="unit"
><input type="number" step="0.001" min="0" max="240" use:setting={{id: 43, scale: 0.001}} />s</span ><input
type="number"
step="0.001"
min="0"
max="240"
use:setting={{id: 0x43, scale: 0.001}}
/>s</span
></label ></label
> >
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend><label><input type="checkbox" use:setting={{id: 51}} />Arpeggiates</label></legend> <legend><label><input type="checkbox" use:setting={{id: 0x51}} />Arpeggiates</label></legend>
<p> <p>
A quick, single key press and release used to indicate a suffix, prefix, or modifier to be associated A quick, single key press and release used to indicate a suffix, prefix, or modifier to be associated
with a chord. with a chord.
@@ -54,7 +60,8 @@
</li> </li>
</ul> </ul>
<label <label
>Timeout After Chord<span class="unit"><input type="number" step="1" use:setting={{id: 54}} />ms</span >Timeout After Chord<span class="unit"
><input type="number" step="1" use:setting={{id: 0x54}} />ms</span
></label ></label
> >
</fieldset> </fieldset>
@@ -78,74 +85,75 @@
<fieldset> <fieldset>
<legend>Character Entry</legend> <legend>Character Entry</legend>
{#if $serialPort.device === "LITE"} {#if $serialPort.device === "LITE"}
<label>Swap Keymap 0 and 1<input type="checkbox" use:setting={{id: 13}} /></label> <label>Swap Keymap 0 and 1<input type="checkbox" use:setting={{id: 0x13}} /></label>
{/if} {/if}
<label> <label>
Character Entry (chentry) Character Entry (chentry)
<input type="checkbox" use:setting={{id: 12}} /> <input type="checkbox" use:setting={{id: 0x12}} />
</label> </label>
<label> <label>
Key Scan Rate Key Scan Rate
<span class="unit"><input type="number" use:setting={{id: 14, inverse: 1000}} />Hz</span></label <span class="unit"><input type="number" use:setting={{id: 0x14, inverse: 1000}} />Hz</span></label
> >
<label> <label>
Key Debounce Press<span class="unit"><input type="number" use:setting={{id: 15}} />ms</span></label Key Debounce Press<span class="unit"><input type="number" use:setting={{id: 0x15}} />ms</span></label
> >
<label <label
>Key Debounce Release<span class="unit"><input type="number" use:setting={{id: 16}} />ms</span></label >Key Debounce Release<span class="unit"><input type="number" use:setting={{id: 0x16}} />ms</span
></label
> >
<label <label
>Output Character Delay<span class="unit"><input type="number" use:setting={{id: 17}} />µs</span >Output Character Delay<span class="unit"><input type="number" use:setting={{id: 0x17}} />µs</span
></label ></label
> >
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend><label><input type="checkbox" use:setting={{id: 21}} />Mouse</label></legend> <legend><label><input type="checkbox" use:setting={{id: 0x21}} />Mouse</label></legend>
<label <label
>Mouse Speed<input type="number" use:setting={{id: 22}} /><input >Mouse Speed<input type="number" use:setting={{id: 0x22}} /><input
type="number" type="number"
use:setting={{id: 23}} use:setting={{id: 0x23}}
/></label /></label
> >
<label>Scroll Speed<input type="number" use:setting={{id: 25}} /></label> <label>Scroll Speed<input type="number" use:setting={{id: 0x25}} /></label>
<label> <label>
<span> <span>
Active Mouse Active Mouse
<p>Bounces mouse by 1px every 60s if enabled</p></span <p>Bounces mouse by 1px every 60s if enabled</p></span
> >
<input type="checkbox" use:setting={{id: 24}} /></label <input type="checkbox" use:setting={{id: 0x24}} /></label
> >
<label <label
>Poll Rate<span class="unit"><input type="number" use:setting={{id: 26, inverse: 1000}} />Hz</span >Poll Rate<span class="unit"><input type="number" use:setting={{id: 0x26, inverse: 1000}} />Hz</span
></label ></label
> >
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend><label><input type="checkbox" use:setting={{id: 31}} />Chording</label></legend> <legend><label><input type="checkbox" use:setting={{id: 0x31}} />Chording</label></legend>
<label <label
>Auto-delete Timeout <span class="unit" >Auto-delete Timeout <span class="unit"
><input type="number" min="0" max="25500" step="10" use:setting={{id: 33}} />ms</span ><input type="number" min="0" max="25500" step="10" use:setting={{id: 0x33}} />ms</span
></label ></label
> >
<label <label
>Press Tolerance<span class="unit" >Press Tolerance<span class="unit"
><input type="number" min="1" max="50" step="1" use:setting={{id: 34}} />ms</span ><input type="number" min="1" max="50" step="1" use:setting={{id: 0x34}} />ms</span
></label ></label
> >
<label <label
>Release Tolerance<span class="unit" >Release Tolerance<span class="unit"
><input type="number" min="1" max="50" step="1" use:setting={{id: 35}} />ms</span ><input type="number" min="1" max="50" step="1" use:setting={{id: 0x35}} />ms</span
></label ></label
> >
<label>Compound Chording<input type="checkbox" use:setting={{id: 61}} /></label> <label>Compound Chording<input type="checkbox" use:setting={{id: 0x61}} /></label>
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend>Device</legend> <legend>Device</legend>
<label>Boot message<input type="checkbox" use:setting={{id: 93}} /></label> <label>Boot message<input type="checkbox" use:setting={{id: 0x93}} /></label>
<label>GTM Realtime Feedback<input type="checkbox" use:setting={{id: 92}} /></label> <label>GTM Realtime Feedback<input type="checkbox" use:setting={{id: 0x92}} /></label>
</fieldset> </fieldset>
{#if $serialPort.device === "LITE"} {#if $serialPort.device === "LITE"}