From 2ea18e0f737045a22a16a6d4215168f724386477 Mon Sep 17 00:00:00 2001 From: joeycastillo Date: Mon, 14 Oct 2024 12:51:17 -0400 Subject: [PATCH] fix broken simulator build --- gossamer | 2 +- movement.c | 7 +++++++ watch-library/simulator/watch/watch_tcc.c | 6 +++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gossamer b/gossamer index 5487c83d..0bac9645 160000 --- a/gossamer +++ b/gossamer @@ -1 +1 @@ -Subproject commit 5487c83df80be238a9e869e281201f4f122a0883 +Subproject commit 0bac9645bc2ba42e8e298234884768e726151025 diff --git a/movement.c b/movement.c index 68faf7c4..1535af87 100644 --- a/movement.c +++ b/movement.c @@ -617,6 +617,13 @@ void app_setup(void) { watch_register_interrupt_callback(HAL_GPIO_BTN_ALARM_pin(), cb_alarm_btn_interrupt, INTERRUPT_TRIGGER_BOTH); #ifdef HAS_ACCELEROMETER +// gossamer doesn't include all the chip-specific constants, so we have to fake them here. +#ifndef EVSYS_ID_GEN_EIC_EXTINT_3 +#define EVSYS_ID_GEN_EIC_EXTINT_3 18 +#endif +#ifndef EVSYS_ID_USER_TC2_EVU +#define EVSYS_ID_USER_TC2_EVU 17 +#endif watch_enable_i2c(); if (lis2dw_begin()) { lis2dw_set_mode(LIS2DW_MODE_LOW_POWER); // select low power (not high performance) diff --git a/watch-library/simulator/watch/watch_tcc.c b/watch-library/simulator/watch/watch_tcc.c index 6cf7235c..f0046849 100644 --- a/watch-library/simulator/watch/watch_tcc.c +++ b/watch-library/simulator/watch/watch_tcc.c @@ -171,10 +171,14 @@ void watch_set_buzzer_off(void) { } void watch_buzzer_play_note(watch_buzzer_note_t note, uint16_t duration_ms) { + watch_buzzer_play_note_with_volume(note, duration_ms, WATCH_BUZZER_VOLUME_LOUD); +} + +void watch_buzzer_play_note_with_volume(watch_buzzer_note_t note, uint16_t duration_ms, watch_buzzer_volume_t volume) { if (note == BUZZER_NOTE_REST) { watch_set_buzzer_off(); } else { - watch_set_buzzer_period_and_duty_cycle(NotePeriods[note], 25); + watch_set_buzzer_period_and_duty_cycle(NotePeriods[note], volume == WATCH_BUZZER_VOLUME_SOFT ? 5 : 25); watch_set_buzzer_on(); }