This commit is contained in:
2023-07-23 00:43:54 +02:00
parent c0fb737314
commit 998a400395
13 changed files with 446 additions and 47 deletions

View File

@@ -1,4 +1,4 @@
import {writable} from "svelte/store"
import {get, writable} from "svelte/store"
import {CharaDevice} from "$lib/serial/device"
import type {Chord} from "$lib/serial/chord"
import type {Writable} from "svelte/store"
@@ -26,10 +26,11 @@ export const syncStatus: Writable<"done" | "error" | "downloading" | "uploading"
let device: CharaDevice // @hmr:keep
export async function initSerial() {
syncStatus.set("downloading")
device ??= new CharaDevice()
const device = get(serialPort) ?? new CharaDevice()
await device.ready()
serialPort.set(device)
syncStatus.set("downloading")
const parsedLayout: CharaLayout = [[], [], []]
for (let layer = 1; layer <= 3; layer++) {
for (let i = 0; i < 90; i++) {

View File

@@ -5,8 +5,12 @@ import {chordFromCommandCompatible} from "$lib/serial/chord"
export const VENDOR_ID = 0x239a
export async function hasSerialPermission() {
return navigator.serial.getPorts().then(it => it.length > 0)
export async function getViablePorts(): Promise<SerialPort[]> {
return navigator.serial.getPorts().then(ports => ports.filter(it => it.getInfo().usbVendorId === VENDOR_ID))
}
export async function canAutoConnect() {
return getViablePorts().then(it => it.length === 1)
}
export class CharaDevice {
@@ -22,10 +26,11 @@ export class CharaDevice {
deviceId: Promise<string>
constructor(baudRate = 115200) {
this.port = navigator.serial.getPorts().then(async ports => {
this.port = getViablePorts().then(async ports => {
const port =
ports.find(it => it.getInfo().usbVendorId === VENDOR_ID) ??
(await navigator.serial.requestPort({filters: [{usbVendorId: VENDOR_ID}]}))
ports.length === 1
? ports[0]
: await navigator.serial.requestPort({filters: [{usbVendorId: VENDOR_ID}]})
await port.open({baudRate})
const info = port.getInfo()
serialLog.update(it => {
@@ -91,6 +96,21 @@ export class CharaDevice {
}
}
async ready() {
await this.port
}
async forget() {
await (await this.port).forget()
}
async disconnect() {
this.abortController1.abort()
this.abortController2.abort()
;(await this.reader).releaseLock()
await (await this.port).close()
}
/**
* Read/write to serial port
*/

View File

@@ -1,10 +1,20 @@
import {chords, layout} from "$lib/serial/connection"
import {userPreferences} from "$lib/preferences"
const PROFILE_KEY = "profiles"
const CHORD_LIBRARY_STORAGE_KEY = "chord-library"
const LAYOUT_STORAGE_KEY = "layouts"
const PREFERENCES = "user-preferences"
export function initLocalStorage() {
const storedPreferences = localStorage.getItem(PREFERENCES)
if (storedPreferences) {
userPreferences.set(JSON.parse(storedPreferences))
}
userPreferences.subscribe(preferences => {
localStorage.setItem(PREFERENCES, JSON.stringify(preferences))
})
const storedLayout = localStorage.getItem(LAYOUT_STORAGE_KEY)
if (storedLayout) {
layout.set(JSON.parse(storedLayout))