summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexsander Akers <me@a2.io>2022-01-27 11:12:01 -0500
committerAlexsander Akers <me@a2.io>2022-01-27 11:12:01 -0500
commita0f8e9c8bc458b0a34b34864703fd97d9835fd86 (patch)
tree0ad14a8ba36dd5440b43852a71d099c8a8a3f63e
parent14e4562b7a44ab6882180b69145665d4920769ac (diff)
downloadSensor-Watch-a0f8e9c8bc458b0a34b34864703fd97d9835fd86.tar.gz
Sensor-Watch-a0f8e9c8bc458b0a34b34864703fd97d9835fd86.tar.bz2
Sensor-Watch-a0f8e9c8bc458b0a34b34864703fd97d9835fd86.zip
Implement buzzer methods with AudioContext API
-rw-r--r--apps/buzzer-test/app.c2
-rw-r--r--make.mk2
-rw-r--r--rules.mk1
-rw-r--r--watch-library/hardware/watch/watch_buzzer.c4
-rw-r--r--watch-library/shared/watch/watch_private_buzzer.c28
-rw-r--r--watch-library/simulator/watch/watch_buzzer.c82
-rw-r--r--watch-library/simulator/watch/watch_deepsleep.c1
7 files changed, 95 insertions, 25 deletions
diff --git a/apps/buzzer-test/app.c b/apps/buzzer-test/app.c
index 65d2356c..2946b646 100644
--- a/apps/buzzer-test/app.c
+++ b/apps/buzzer-test/app.c
@@ -115,7 +115,7 @@ bool app_loop(void) {
900,
};
application_state.play = false;
- for(size_t i = 0; i < sizeof(rains); i++) {
+ for(size_t i = 0, count = sizeof(rains) / sizeof(rains[0]); i < count; i++) {
char buf[9] = {0};
if (rains[i] == BUZZER_NOTE_REST) {
printf("rest for %d ms\n", durations[i]);
diff --git a/make.mk b/make.mk
index 85d38fea..004868c4 100644
--- a/make.mk
+++ b/make.mk
@@ -120,6 +120,7 @@ SRCS += \
$(TOP)/watch-library/shared/driver/lis2dh.c \
$(TOP)/watch-library/shared/driver/lis2dw.c \
$(TOP)/watch-library/shared/driver/spiflash.c \
+ $(TOP)/watch-library/shared/watch/watch_private_buzzer.c \
$(TOP)/watch-library/shared/watch/watch_private_display.c \
$(TOP)/watch-library/shared/watch/watch_utility.c \
@@ -159,6 +160,7 @@ SRCS += \
$(TOP)/watch-library/simulator/watch/watch_deepsleep.c \
$(TOP)/watch-library/simulator/watch/watch_private.c \
$(TOP)/watch-library/simulator/watch/watch.c \
+ $(TOP)/watch-library/shared/watch/watch_private_buzzer.c \
$(TOP)/watch-library/shared/watch/watch_private_display.c \
$(TOP)/watch-library/shared/watch/watch_utility.c \
diff --git a/rules.mk b/rules.mk
index cd42a433..1aa135a8 100644
--- a/rules.mk
+++ b/rules.mk
@@ -13,6 +13,7 @@ endif
$(BUILD)/$(BIN).html: $(OBJS)
@echo HTML $@
@$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@ \
+ -s ASYNCIFY=1 \
-s EXPORTED_FUNCTIONS=_main \
--shell-file=$(TOP)/watch-library/simulator/shell.html
diff --git a/watch-library/hardware/watch/watch_buzzer.c b/watch-library/hardware/watch/watch_buzzer.c
index a275b00d..c06242ff 100644
--- a/watch-library/hardware/watch/watch_buzzer.c
+++ b/watch-library/hardware/watch/watch_buzzer.c
@@ -47,10 +47,6 @@ inline void watch_set_buzzer_off(void) {
gpio_set_pin_function(BUZZER, GPIO_PIN_FUNCTION_OFF);
}
-// note: the buzzer uses a 1 MHz clock. these values were determined by dividing 1,000,000 by the target frequency.
-// i.e. for a 440 Hz tone (A4 on the piano), 1MHz/440Hz = 2273
-const uint16_t NotePeriods[108] = {18182,17161,16197,15288,14430,13620,12857,12134,11453,10811,10204,9631,9091,8581,8099,7645,7216,6811,6428,6068,5727,5405,5102,4816,4545,4290,4050,3822,3608,3405,3214,3034,2863,2703,2551,2408,2273,2145,2025,1911,1804,1703,1607,1517,1432,1351,1276,1204,1136,1073,1012,956,902,851,804,758,716,676,638,602,568,536,506,478,451,426,402,379,358,338,319,301,284,268,253,239,225,213,201,190,179,169,159,150,142,134,127};
-
void watch_buzzer_play_note(BuzzerNote note, uint16_t duration_ms) {
if (note == BUZZER_NOTE_REST) {
watch_set_buzzer_off();
diff --git a/watch-library/shared/watch/watch_private_buzzer.c b/watch-library/shared/watch/watch_private_buzzer.c
new file mode 100644
index 00000000..0618f425
--- /dev/null
+++ b/watch-library/shared/watch/watch_private_buzzer.c
@@ -0,0 +1,28 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 Joey Castillo
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include "driver_init.h"
+
+// note: the buzzer uses a 1 MHz clock. these values were determined by dividing 1,000,000 by the target frequency.
+// i.e. for a 440 Hz tone (A4 on the piano), 1MHz/440Hz = 2273
+const uint16_t NotePeriods[108] = {18182,17161,16197,15288,14430,13620,12857,12134,11453,10811,10204,9631,9091,8581,8099,7645,7216,6811,6428,6068,5727,5405,5102,4816,4545,4290,4050,3822,3608,3405,3214,3034,2863,2703,2551,2408,2273,2145,2025,1911,1804,1703,1607,1517,1432,1351,1276,1204,1136,1073,1012,956,902,851,804,758,716,676,638,602,568,536,506,478,451,426,402,379,358,338,319,301,284,268,253,239,225,213,201,190,179,169,159,150,142,134,127};
diff --git a/watch-library/simulator/watch/watch_buzzer.c b/watch-library/simulator/watch/watch_buzzer.c
index f19e1928..c5191de2 100644
--- a/watch-library/simulator/watch/watch_buzzer.c
+++ b/watch-library/simulator/watch/watch_buzzer.c
@@ -24,37 +24,79 @@
#include "watch_buzzer.h"
-inline void watch_enable_buzzer(void) {
- // TODO: (a2) hook to UI
+#include <emscripten.h>
+
+static bool buzzer_enabled = false;
+static uint32_t buzzer_period;
+
+void watch_enable_buzzer(void) {
+ buzzer_enabled = true;
+ buzzer_period = NotePeriods[BUZZER_NOTE_A4];
+
+ EM_ASM({
+ Module['audioContext'] = new (window.AudioContext || window.webkitAudioContext)();
+ });
}
-inline void watch_set_buzzer_period(uint32_t period) {
- // TODO: (a2) hook to UI
+
+void watch_set_buzzer_period(uint32_t period) {
+ if (!buzzer_enabled) return;
+ buzzer_period = period;
}
void watch_disable_buzzer(void) {
- _watch_disable_tcc();
-}
+ buzzer_enabled = false;
+ buzzer_period = NotePeriods[BUZZER_NOTE_A4];
-inline void watch_set_buzzer_on(void) {
- // TODO: (a2) hook to UI
+ EM_ASM({
+ if (Module['audioContext']) {
+ Module['audioContext'].close();
+ Module['audioContext'] = null;
+ }
+ });
}
-inline void watch_set_buzzer_off(void) {
- // TODO: (a2) hook to UI
+void watch_set_buzzer_on(void) {
+ if (!buzzer_enabled) return;
+
+ EM_ASM({
+ const audioContext = Module['audioContext'];
+ if (!audioContext) return;
+
+ if (!(audioContext._oscillator && audioContext._gain)) {
+ const oscillator = audioContext.createOscillator();
+ const gain = audioContext.createGain();
+ oscillator.type = 'triangle';
+ oscillator.connect(gain);
+ gain.connect(audioContext.destination);
+ oscillator.start(0);
+
+ audioContext._oscillator = oscillator;
+ audioContext._gain = gain;
+ }
+
+ audioContext._oscillator.frequency.value = 1e6/$0;
+ audioContext._gain.gain.value = 1;
+ }, buzzer_period);
}
-// note: the buzzer uses a 1 MHz clock. these values were determined by dividing 1,000,000 by the target frequency.
-// i.e. for a 440 Hz tone (A4 on the piano), 1MHz/440Hz = 2273
-const uint16_t NotePeriods[108] = {0};
+void watch_set_buzzer_off(void) {
+ if (!buzzer_enabled) return;
+
+ EM_ASM({
+ const audioContext = Module['audioContext'];
+ if (audioContext && audioContext._gain) {
+ audioContext._gain.gain.value = 0;
+ }
+ });
+}
void watch_buzzer_play_note(BuzzerNote note, uint16_t duration_ms) {
if (note == BUZZER_NOTE_REST) {
watch_set_buzzer_off();
- } // else {
- // hri_tcc_write_PERBUF_reg(TCC0, NotePeriods[note]);
- // hri_tcc_write_CCBUF_reg(TCC0, WATCH_BUZZER_TCC_CHANNEL, NotePeriods[note] / 2);
- // watch_set_buzzer_on();
- // }
- // delay_ms(duration_ms);
- // watch_set_buzzer_off();
+ } else {
+ watch_set_buzzer_period(NotePeriods[note]);
+ watch_set_buzzer_on();
+ }
+ emscripten_sleep(duration_ms);
+ watch_set_buzzer_off();
}
diff --git a/watch-library/simulator/watch/watch_deepsleep.c b/watch-library/simulator/watch/watch_deepsleep.c
index 9f409570..a12cf2a6 100644
--- a/watch-library/simulator/watch/watch_deepsleep.c
+++ b/watch-library/simulator/watch/watch_deepsleep.c
@@ -35,6 +35,7 @@ static uint32_t watch_backup_data[8];
void watch_register_extwake_callback(uint8_t pin, ext_irq_cb_t callback, bool level) {
if (pin == BTN_ALARM) {
+ watch_enable_external_interrupts();
watch_register_interrupt_callback(pin, callback, level ? INTERRUPT_TRIGGER_RISING : INTERRUPT_TRIGGER_FALLING);
}
}