neale/vail
neale
/
vail
mirror of https://github.com/nealey/vail.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Respond correctly to URL changes

This commit is contained in:
Neale Pickett 2021-04-28 14:28:59 -06:00
parent f50540aefe
commit 80335a6233
4 changed files with 92 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
static/index.html
View File

@ -38,21 +38,22 @@
<div class="mdl-layout__drawer">
<span class="mdl-layout-title">Repeaters</span>
<nav class="mdl-navigation">
<a class="mdl-navigation__link" href="?repeater=">General Chaos</a>
<a class="mdl-navigation__link" href="?repeater=1-15+WPM">1-15 WPM</a>
<a class="mdl-navigation__link" href="?repeater=16-20+WPM">16-20 WPM</a>
<a class="mdl-navigation__link" href="?repeater=21-99+WPM">21-99 WPM</a>
<a class="mdl-navigation__link" href="#">General Chaos</a>
<a class="mdl-navigation__link" href="#1-15 WPM">1-15 WPM</a>
<a class="mdl-navigation__link" href="#16-20 WPM">16-20 WPM</a>
<a class="mdl-navigation__link" href="#21%2B+WPM">21+ WPM</a>
</nav>
<hr>
<span class="mdl-layout-title">Local Practice</span>
<nav class="mdl-navigation">
<a class="mdl-navigation__link" href="?repeater=Fortunes">Fortunes</a>
<a class="mdl-navigation__link" href="?repeater=Fortunes: Pauses ×2">Fortunes (slow)</a>
<a class="mdl-navigation__link" href="?repeater=Fortunes: Pauses ×4">Fortunes (very slow)</a>
<a class="mdl-navigation__link" href="?repeater=Fortunes: Pauses ×6">Fortunes (very very slow)</a>
<a class="mdl-navigation__link" href="?repeater=Fortunes: Pauses ×10">Fortunes (crazy slow)</a>
<a class="mdl-navigation__link" href="#Echo">Echo</a>
<a class="mdl-navigation__link" href="#Fortunes">Fortunes</a>
<a class="mdl-navigation__link" href="#Fortunes: Pauses ×2">Fortunes (slow)</a>
<a class="mdl-navigation__link" href="#Fortunes: Pauses ×4">Fortunes (very slow)</a>
<a class="mdl-navigation__link" href="#Fortunes: Pauses ×6">Fortunes (very very slow)</a>
<a class="mdl-navigation__link" href="#Fortunes: Pauses ×10">Fortunes (crazy slow)</a>
</nav>
<hr>
<nav class="mdl-navigation">
<a class="mdl-navigation__link" href="https://morse.withgoogle.com/learn/">Learn Morse Code</a>
<a class="mdl-navigation__link" href="https://github.com/nealey/vail-adapter">Use a physical key</a>
@ -80,10 +81,14 @@
<option>1-15 WPM</option>
<option>16-20 WPM</option>
<option>21+ WPM</option>
<option>Fortunes: Pauses ×8</option>
<option>Fortunes: Pauses ×4</option>
<option>Fortunes: Pauses ×2</option>
<option>Null</option>
<option>Echo</option>
<option>Echo 5s</option>
<option>Echo 10s</option>
<option>Fortunes</option>
<option>Fortunes: Pauses ×2</option>
<option>Fortunes: Pauses ×4</option>
<option>Fortunes: Pauses ×8</option>
</datalist>
<label class="mdl-textfield__label" for="repeater">Repeater</label>
</div>

7
static/morse.mjs
View File

@ -189,6 +189,13 @@ class Keyer {
this.pauseMultiplier = multiplier
}
/**
* Delete anything left on the queue.
*/
Flush() {
this.queue.splice(0)
}
/**
* Add to the output queue, and start processing the queue if it's not currently being processed.
*

36
static/repeaters.mjs
View File

@ -5,9 +5,9 @@ const Second = 1000 * Millisecond
const Minute = 60 * Second
export class Vail {
constructor(name, rx) {
this.name = name
constructor(rx, name) {
this.rx = rx
this.name = name
this.lagDurations = []
this.sent = []
@ -110,10 +110,33 @@ export class Vail {
}
export class Null {
constructor() {
constructor(rx) {
this.rx = rx
this.interval = setInterval(() => this.pulse(), 1 * Second)
}
Transmit(time, duration, squelch=True) {
pulse() {
console.log("pulse")
this.rx(0, 0, {note: "local"})
}
Transmit(time, duration, squelch=true) {
}
Close() {
clearInterval(this.interval)
}
}
export class Echo {
constructor(rx, delay=0) {
this.rx = rx
this.delay = delay
this.Transmit(0, 0)
}
Transmit(time, duration, squelch=true) {
this.rx(time + this.delay, duration, {note: "local"})
}
Close() {
@ -135,15 +158,13 @@ export class Fortune {
}
pulse() {
this.rx(0, 0, {note: "local"})
if (this.keyer.Busy()) {
return
}
let fortune = GetFortune()
this.keyer.EnqueueAsciiString(`${fortune}\x04 `)
this.rx(0, 0, {
note: "local",
})
}
Transmit(time, duration, squelch=true) {
@ -151,6 +172,7 @@ export class Fortune {
}
Close() {
this.keyer.Flush()
clearInterval(this.interval)
}
}

56
static/vail.mjs
View File

@ -3,6 +3,9 @@ import * as Inputs from "./inputs.mjs"
import * as Repeaters from "./repeaters.mjs"
const DefaultRepeater = "General Chaos"
const Millisecond = 1
const Second = 1000 * Millisecond
const Minute = 60 * Second
/**
* Pop up a message, using an MDL snackbar.
@ -65,16 +68,27 @@ class VailClient {
this.rxDelay = Number(e.target.value)
})
// Fill in the name of our repeater
let repeaterElement = document.querySelector("#repeater").addEventListener("change", e => this.setRepeater(e.target.value.trim()))
this.setRepeater(decodeURI(decodeURIComponent(window.location.hash.split("#")[1] || "")))
window.addEventListener("hashchange", () => this.hashchange())
this.hashchange()
}
/**
* Called when the hash part of the URL has changed.
*/
hashchange() {
let hashParts = window.location.hash.split("#")
this.setRepeater(decodeURIComponent(hashParts[1] || ""))
}
/**
* Connect to a repeater by name.
*
* In the future this may do some fancy switching logic to provide multiple types of repeaters.
* For instance, I'd like to create a set of repeaters that run locally, for practice.
* This does some switching logic to provide multiple types of repeaters,
* like the Fortunes repeaters.
*
* @param {string} name Repeater name
*/
@ -94,12 +108,11 @@ class VailClient {
}
// Set window URL
let hash = name
if (name == DefaultRepeater) {
hash = ""
}
if (hash != window.location.hash) {
window.location.hash = hash
let prevHash = window.location.hash
window.location.hash = (name == DefaultRepeater) ? "" : name
if (window.location.hash != prevHash) {
// We're going to get a hashchange event, which will re-run this method
return
}
if (this.repeater) {
@ -107,17 +120,25 @@ class VailClient {
}
let rx = (w,d,s) => this.receive(w,d,s)
// You can set the repeater name to "Fortunes: Pauses×10" for a nice and easy intro
// If there's a number in the name, store that for potential later use
let numberMatch = name.match(/[0-9]+/)
let number = 0
if (numberMatch) {
number = Number(numberMatch[0])
}
if (name.startsWith("Fortunes")) {
let m = name.match(/[x×]([0-9]+)/)
let mult = 1
if (m) {
mult = Number(m[1])
}
this.roboKeyer.SetPauseMultiplier(mult)
this.roboKeyer.SetPauseMultiplier(number || 1)
this.repeater = new Repeaters.Fortune(rx, this.roboKeyer)
} else if (name.startsWith("Echo")) {
let delayElement = document.querySelector("#rx-delay")
delayElement.value = (number || 2) * Second
delayElement.dispatchEvent(new Event("input"))
this.repeater = new Repeaters.Echo(rx)
} else if (name == "Null") {
this.repeater = new Repeaters.Null(rx)
} else {
this.repeater = new Repeaters.Vail(name, rx)
this.repeater = new Repeaters.Vail(rx, name)
}
toast(`Now using repeater: ${name}`)
@ -195,7 +216,6 @@ class VailClient {
this.clockOffset = stats.clockOffset || "?"
let now = Date.now()
when += this.rxDelay
console.log(stats)
if (duration > 0) {
if (when < now) {