Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #24 Adds a Min and Max Wait Inputs to Control Pileup Spread #45

Merged
merged 6 commits into from
Jan 30, 2025
Merged

Fixes #24 Adds a Min and Max Wait Inputs to Control Pileup Spread #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7df7727
Implement the spread first by defining a min and max wait time. This …
sc0tfree Jan 27, 2025
d878dd1
Add minWait and maxWait to the Tone and Volume Row.
sc0tfree Jan 27, 2025
abb48fc
Add minWait and maxWait into the global inputs object
sc0tfree Jan 27, 2025
2388efe
Change min and max delay to use the input value rather than being har…
sc0tfree Jan 27, 2025
ace45c0
Cleanup debugging statements
sc0tfree Jan 30, 2025
7bbe3ad
Add upper and lower validation to min and max wait
sc0tfree Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 30 additions & 13 deletions src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,31 +233,48 @@ <h5>Responding Station Settings</h5>
</div>

<!-- Tone and Volume Row -->
<div class="row g-3 mt-3">
<div class="col-12 col-md-3">
<div class="row g-3 mt-3 align-items-end">
<div class="col-12 col-md-6 col-lg-2">
<label for="minTone" class="form-label">Min Tone (Hz)</label>
<input type="number" id="minTone" name="minTone" class="form-control" value="400" min="1"
max="9999" step="1" required>
<input type="number" id="minTone" name="minTone" class="form-control"
value="400" min="1" max="9999" step="1" required>
<div class="invalid-feedback"></div>
</div>
<div class="col-12 col-md-3">
<div class="col-12 col-md-6 col-lg-2">
<label for="maxTone" class="form-label">Max Tone (Hz)</label>
<input type="number" id="maxTone" name="maxTone" class="form-control" value="900" min="1"
max="9999" step="1" required>
<input type="number" id="maxTone" name="maxTone" class="form-control"
value="900" min="1" max="9999" step="1" required>
</div>
<div class="col-12 col-md-3">
<div class="col-12 col-md-6 col-lg-2">
<label for="minVolume" class="form-label">Min Volume</label>
<input type="number" id="minVolume" name="minVolume" class="form-control" value="30" min="0"
max="100" step="1" required>
<input type="number" id="minVolume" name="minVolume" class="form-control"
value="30" min="0" max="100" step="1" required>
<div class="invalid-feedback"></div>
</div>
<div class="col-12 col-md-3">
<div class="col-12 col-md-6 col-lg-2">
<label for="maxVolume" class="form-label">Max Volume</label>
<input type="number" id="maxVolume" name="maxVolume" class="form-control" value="100"
min="0" max="100" step="1" required>
<input type="number" id="maxVolume" name="maxVolume" class="form-control"
value="100" min="0" max="100" step="1" required>
</div>
<div class="col-12 col-md-6 col-lg-2">
<label for="minWait" class="form-label">
<span class="badge bg-success me-2">NEW!</span>
<br class="d-none d-lg-block d-xl-none" />
Min Wait (s)</label>
<input type="number" id="minWait" name="minWait" class="form-control"
value="0.25" min="0" max="2" step="0.25" required>
</div>
<div class="col-12 col-md-6 col-lg-2">
<label for="maxWait" class="form-label">
<span class="badge bg-success me-2">NEW!</span>
<br class="d-none d-lg-block d-xl-none" />
Max Wait (s)</label>
<input type="number" id="maxWait" name="maxWait" class="form-control"
value="1.75" min="0" max="5" step="0.25" required>
</div>
</div>


<!-- US Only and Callsign Format Row -->
<div class="row g-3 mt-3 align-items-end">
<!-- US Only Callsigns -->
Expand Down
2 changes: 2 additions & 0 deletions src/js/inputs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ function getDOMInputs() {
// convert volumes to a float between 0 and 1
minVolume: parseFloat(document.getElementById('minVolume').value) / 100,
maxVolume: parseFloat(document.getElementById('maxVolume').value) / 100,
minWait: parseFloat(document.getElementById('minWait').value),
maxWait: parseFloat(document.getElementById('maxWait').value),

// Checkboxes & Radio
usOnly: document.getElementById('usOnly')
Expand Down
6 changes: 0 additions & 6 deletions src/js/stationGenerator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,8 @@ function getRandomUSCallsign(formats) {
possiblePrefixes = US_CALLSIGN_PREFIXES_WEIGHTED;
}

console.log("Chosen format: ", format);

console.log("Possible prefixes: ", possiblePrefixes);

const prefix = weightedRandomElement(possiblePrefixes);

console.log("Prefix: ", prefix);

let prefixLettersToGenerate = parseInt(format.slice(0, 1)) - prefix.length;

switch (format) {
Expand Down
12 changes: 11 additions & 1 deletion src/js/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {createMorsePlayer, updateAudioLock} from "./audio.js";
import {getCallingStation} from "./stationGenerator.js";
import {getInputs} from "./inputs.js";

/**
* Compares the source and query strings based on specific fuzzy match criteria.
Expand Down Expand Up @@ -426,10 +427,19 @@ export function normalizeStationGain(stations) {
* @param {number} audioLock - Base time offset for playback start.
*/
export function respondWithAllStations(stations, audioLock) {

let inputs = getInputs();

// Ensure minWait is between 0 and 2, and maxWait is between 0 and 5
const minDelay = Math.max(0, Math.min(inputs.minWait, 2));
const maxDelay = Math.max(0, Math.min(inputs.maxWait, 5));

console.log("<-- Responding with stations: " + stations.map(station => station.callsign));
stations = normalizeStationGain(stations);
for (let i = 0; i < stations.length; i++) {
let responseTimer = stations[i].player.playSentence(stations[i].callsign, audioLock + Math.random() + 0.5);
const randomDelay = minDelay + (Math.random() * maxDelay);

let responseTimer = stations[i].player.playSentence(stations[i].callsign, audioLock + randomDelay);
updateAudioLock(responseTimer);
}
}
Expand Down