summaryrefslogtreecommitdiffstats
path: root/watch-library/simulator
diff options
context:
space:
mode:
Diffstat (limited to 'watch-library/simulator')
-rw-r--r--watch-library/simulator/shell.html110
-rw-r--r--watch-library/simulator/watch/watch_buzzer.c3
-rw-r--r--watch-library/simulator/watch/watch_extint.c68
-rw-r--r--watch-library/simulator/watch/watch_rtc.c9
4 files changed, 137 insertions, 53 deletions
diff --git a/watch-library/simulator/shell.html b/watch-library/simulator/shell.html
index 335b9534..29fbed03 100644
--- a/watch-library/simulator/shell.html
+++ b/watch-library/simulator/shell.html
@@ -37,12 +37,13 @@
.highlight { fill: #fff !important; }
#skinselect label {
display: inline-block;
- padding: 8px;
+ padding: 4px;
background-color: black;
color: white;
border-radius: 8px;
border: 2px solid #0e57a9;
outline: 4px solid black;
+ margin: 4px;
cursor: pointer;
}
#skinselect #a158wea-label {
@@ -50,13 +51,16 @@
color: black;
border-color: black;
outline-color: #b68855ff;
-
+ }
+ h2 {
+ margin: 8px 0;
+ font-size: 1em;
}
</style>
</head>
<body>
-<div style="max-width: 800px; margin: 0 auto; display: flex; flex-direction: column; align-items: center;">
+<div style="max-width: 800px; min-width: 400px; margin: 0 auto; padding: 0 1em; display: flex; flex-direction: column; align-items: center;">
<h1 style="text-align: center;">Sensor Watch Emulator</h1>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1271 1311" width="320">
<defs>
@@ -882,18 +886,40 @@
</g>
</g>
</svg>
- <table cellpadding="5"><tr><td id="skinselect">
- <input type="radio" id="f91w" name="skin" value="f91w" onclick="toggleSkin()" checked><label for="f91w">F-91W</label>
- <input type="radio" name="skin" id="a158wea" value="a158wea" onclick="toggleSkin()"><label id="a158wea-label" for="a158wea">A158WEA-9</label>
- </td><td><a href="https://github.com/alexisphilip/Casio-F-91W">Original F-91W SVG</a> is &copy; 2020 Alexis Philip,<br>used here under the terms of the MIT license.</td></tr></table>
-</div>
-<button onclick="getLocation()">Set location register (will prompt for access)</button>
-<br>
-<input id="input" style="width: 500px"></input>
-<button id="submit" onclick="sendText()">Send</button>
-<br>
-<textarea id="output" rows="8" style="width: 100%"></textarea>
+ <div style="display: grid; grid-template-columns: 80px 1fr; align-items: center; margin: 8px 0">
+ <h2>Skin</h2>
+ <div id="skinselect">
+ <input type="radio" name="skin" id="f91w" value="f91w" onclick="setSkin(this.value)" checked><label
+ for="f91w">F-91W</label>
+ <input type="radio" name="skin" id="a158wea9" value="a158wea9" onclick="setSkin(this.value)"><label
+ id="a158wea-label" for="a158wea9">A158WEA-9</label>
+ </div>
+
+ <h2>Volume</h2>
+ <div>
+ <input id="volume" name="volume" type="range" min="0" max="100" step="1" oninput="setVolume(this.value)" />
+ </div>
+
+ <h2>Location</h2>
+ <div>
+ <button onclick="getLocation()">Set register (will prompt for access)</button>
+ </div>
+ </div>
+
+ <form onSubmit="sendText(); return false" style="display: flex; flex-direction: column; width: 100%">
+ <textarea id="output" rows="8" style="width: 100%"></textarea>
+ <div style="display: flex">
+ <input id="input" placeholder="Filesystem command (see filesystem.c)" style="flex-grow: 1"></input>
+ <button type="submit">Send</button>
+ </div>
+ </form>
+
+ <p>
+ <a href="https://github.com/alexisphilip/Casio-F-91W">Original F-91W SVG</a> is &copy; 2020 Alexis Philip, used here
+ under the terms of the MIT license.
+ </p>
+</div>
<script type='text/javascript'>
var outputElement = document.getElementById('output');
@@ -967,20 +993,52 @@
}
}
- function toggleSkin() {
- var isBlack = document.getElementById('f91w').checked;
- Array.from(document.getElementsByClassName("f91w")).forEach(
- function(element, index, array) {
- element.setAttribute('style', 'display:' + (isBlack ? 'inline':'none') + ';');
+ const validSkins = ["f91w", "a158wea9"];
+ function setSkin(chosenSkin) {
+ setLocalPref("skin", chosenSkin);
+ validSkins.forEach(function(skin) {
+ Array.from(document.getElementsByClassName(skin)).forEach(
+ function(element) {
+ element.setAttribute('style', 'display:' + (skin == chosenSkin ? 'inline':'none') + ';');
}
- );
- Array.from(document.getElementsByClassName("a158wea9")).forEach(
- function(element, index, array) {
- element.setAttribute('style', 'display:' + (isBlack ? 'none':'inline') + ';');
- }
- );
+ );
+ });
+ }
+
+ // emulator runs on localhost:8000 which could very well be used by other
+ // things, so we'll scope our localStorage keys with a prefix
+ const localStoragePrefix = "sensorwatch_";
+ function setLocalPref(key, val) {
+ localStorage.setItem(localStoragePrefix+key, val);
+ }
+ function getLocalPref(key, dfault) {
+ let pref = localStorage.getItem(localStoragePrefix+key);
+ if (pref === null) return dfault;
+ return pref;
+ }
+
+ volumeGain = 0.1;
+ function setVolume(vol) {
+ setLocalPref("volume", vol);
+ volumeGain = Math.pow(100, (vol / 100) - 1) - 0.01;
+ }
+
+ function loadPrefs() {
+ let vol = +getLocalPref("volume", "50");
+ if (isNaN(vol) || vol < 0 || vol > 100) {
+ vol = 50;
+ }
+ document.getElementById("volume").value = vol;
+ setVolume(vol);
+
+ let skin = getLocalPref("skin", "f91w");
+ if (!validSkins.includes(skin)) {
+ skin = "f91w";
+ }
+ document.getElementById(skin).checked = true;
+ setSkin(skin);
}
- toggleSkin();
+ loadPrefs();
</script>
{{{ SCRIPT }}}
diff --git a/watch-library/simulator/watch/watch_buzzer.c b/watch-library/simulator/watch/watch_buzzer.c
index 68d9a139..7ccb8545 100644
--- a/watch-library/simulator/watch/watch_buzzer.c
+++ b/watch-library/simulator/watch/watch_buzzer.c
@@ -23,6 +23,7 @@
*/
#include "watch_buzzer.h"
+#include "watch_private_buzzer.h"
#include "watch_main_loop.h"
#include <emscripten.h>
@@ -152,7 +153,7 @@ void watch_set_buzzer_on(void) {
}
audioContext._oscillator.frequency.value = 1e6/$0;
- audioContext._gain.gain.value = 1;
+ audioContext._gain.gain.value = volumeGain;
}, buzzer_period);
}
diff --git a/watch-library/simulator/watch/watch_extint.c b/watch-library/simulator/watch/watch_extint.c
index cbba4c3d..b5894b95 100644
--- a/watch-library/simulator/watch/watch_extint.c
+++ b/watch-library/simulator/watch/watch_extint.c
@@ -22,13 +22,15 @@
* SOFTWARE.
*/
+#include <string.h>
+
#include "watch_extint.h"
#include "watch_main_loop.h"
#include <emscripten.h>
#include <emscripten/html5.h>
-static bool output_focused = false;
+static bool debug_console_focused = false;
static bool external_interrupt_enabled = false;
static bool button_callbacks_installed = false;
static ext_irq_cb_t external_interrupt_mode_callback = NULL;
@@ -45,27 +47,47 @@ static const uint8_t BTN_IDS[] = { BTN_ID_ALARM, BTN_ID_LIGHT, BTN_ID_MODE };
static EM_BOOL watch_invoke_interrupt_callback(const uint8_t button_id, watch_interrupt_trigger trigger);
static EM_BOOL watch_invoke_key_callback(int eventType, const EmscriptenKeyboardEvent *keyEvent, void *userData) {
- if (output_focused || keyEvent->repeat) return EM_FALSE;
-
- const char *key = keyEvent->key;
- if (key[1] != 0) return EM_FALSE;
+ if (debug_console_focused || keyEvent->repeat) return EM_FALSE;
uint8_t button_id;
- switch (key[0]) {
- case 'A':
- case 'a':
- button_id = BTN_ID_ALARM;
- break;
- case 'L':
- case 'l':
- button_id = BTN_ID_LIGHT;
- break;
- case 'M':
- case 'm':
- button_id = BTN_ID_MODE;
- break;
- default:
- return EM_FALSE;
+ const char *key = keyEvent->key;
+ if (key[1] == 0) {
+ // event is from a plain letter key
+ switch (key[0]) {
+ case 'A':
+ case 'a':
+ button_id = BTN_ID_ALARM;
+ break;
+ case 'L':
+ case 'l':
+ button_id = BTN_ID_LIGHT;
+ break;
+ case 'M':
+ case 'm':
+ button_id = BTN_ID_MODE;
+ break;
+ default:
+ return EM_FALSE;
+ }
+ } else if (strncmp(key, "Arrow", 5) == 0) {
+ // event is from one of the arrow keys
+ switch(key[5]) {
+ case 'U': // ArrowUp
+ button_id = BTN_ID_LIGHT;
+ break;
+ case 'D': // ArrowDown
+ case 'L': // ArrowLeft
+ button_id = BTN_ID_MODE;
+ break;
+ case 'R': // ArrowRight
+ button_id = BTN_ID_ALARM;
+ break;
+ default:
+ return EM_FALSE;
+ }
+ } else {
+ // another kind of key
+ return EM_FALSE;
}
watch_interrupt_trigger trigger = eventType == EMSCRIPTEN_EVENT_KEYDOWN ? INTERRUPT_TRIGGER_RISING : INTERRUPT_TRIGGER_FALLING;
@@ -86,7 +108,7 @@ static EM_BOOL watch_invoke_touch_callback(int eventType, const EmscriptenTouchE
}
static EM_BOOL watch_invoke_focus_callback(int eventType, const EmscriptenFocusEvent *focusEvent, void *userData) {
- output_focused = eventType == EMSCRIPTEN_EVENT_FOCUS;
+ debug_console_focused = eventType == EMSCRIPTEN_EVENT_FOCUS;
return EM_TRUE;
}
@@ -98,6 +120,10 @@ static void watch_install_button_callbacks(void) {
emscripten_set_focus_callback(target_output, NULL, EM_FALSE, watch_invoke_focus_callback);
emscripten_set_blur_callback(target_output, NULL, EM_FALSE, watch_invoke_focus_callback);
+ const char *target_input = "#input";
+ emscripten_set_focus_callback(target_input, NULL, EM_FALSE, watch_invoke_focus_callback);
+ emscripten_set_blur_callback(target_input, NULL, EM_FALSE, watch_invoke_focus_callback);
+
for (int i = 0, count = sizeof(BTN_IDS) / sizeof(BTN_IDS[0]); i < count; i++) {
char target[] = "#btn_";
target[4] = BTN_IDS[i] + '0';
diff --git a/watch-library/simulator/watch/watch_rtc.c b/watch-library/simulator/watch/watch_rtc.c
index fa80d6b4..2bb6074c 100644
--- a/watch-library/simulator/watch/watch_rtc.c
+++ b/watch-library/simulator/watch/watch_rtc.c
@@ -92,13 +92,12 @@ void watch_rtc_register_periodic_callback(ext_irq_cb_t callback, uint8_t frequen
if (__builtin_popcount(frequency) != 1) return;
// this left-justifies the period in a 32-bit integer.
- uint32_t tmp = frequency << 24;
+ uint32_t tmp = (frequency & 0xFF) << 24;
// now we can count the leading zeroes to get the value we need.
// 0x01 (1 Hz) will have 7 leading zeros for PER7. 0xF0 (128 Hz) will have no leading zeroes for PER0.
uint8_t per_n = __builtin_clz(tmp);
- // this also maps nicely to an index for our list of tick callbacks.
- double interval = 1000 / frequency; // in msec
+ double interval = 1000.0 / frequency; // in msec
if (tick_callbacks[per_n] != -1) emscripten_clear_interval(tick_callbacks[per_n]);
tick_callbacks[per_n] = emscripten_set_interval(watch_invoke_periodic_callback, interval, (void *)callback);
@@ -106,7 +105,7 @@ void watch_rtc_register_periodic_callback(ext_irq_cb_t callback, uint8_t frequen
void watch_rtc_disable_periodic_callback(uint8_t frequency) {
if (__builtin_popcount(frequency) != 1) return;
- uint8_t per_n = __builtin_clz(frequency << 24);
+ uint8_t per_n = __builtin_clz((frequency & 0xFF) << 24);
if (tick_callbacks[per_n] != -1) {
emscripten_clear_interval(tick_callbacks[per_n]);
tick_callbacks[per_n] = -1;
@@ -115,7 +114,7 @@ void watch_rtc_disable_periodic_callback(uint8_t frequency) {
void watch_rtc_disable_matching_periodic_callbacks(uint8_t mask) {
for (int i = 0; i < 8; i++) {
- if (tick_callbacks[i] != -1 && (mask & (1 << (7 - i))) != 0) {
+ if (tick_callbacks[i] != -1 && (mask & (1 << i)) != 0) {
emscripten_clear_interval(tick_callbacks[i]);
tick_callbacks[i] = -1;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-10 11:32:47 +0000