hueso/Sensor-Watch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

bump gossamer commit

Browse Source
This commit is contained in:
joeycastillo 2024-10-07 08:00:32 -04:00
parent 43a7890a5c
commit a988733bb6
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gossamer

@ -1 +1 @@
Subproject commit 17d34e56b7e34405ceb7e3512bd4f26d8b8c22f7 Subproject commit df3f69ed6ac8fc45b66385f3cae1517adcdca9ad

12
watch-library/simulator/watch/watch_extint.c
View File

@ -153,20 +153,21 @@ void watch_disable_external_interrupts(void) {
static EM_BOOL watch_invoke_interrupt_callback(const uint8_t button_id, eic_interrupt_trigger_t event) { static EM_BOOL watch_invoke_interrupt_callback(const uint8_t button_id, eic_interrupt_trigger_t event) {
watch_cb_t callback; watch_cb_t callback;
eic_interrupt_trigger_t trigger; eic_interrupt_trigger_t trigger;
uint8_t pin; const bool level = (event & INTERRUPT_TRIGGER_RISING) != 0;
switch (button_id) { switch (button_id) {
case BTN_ID_MODE: case BTN_ID_MODE:
pin = HAL_GPIO_BTN_MODE_pin(); HAL_GPIO_BTN_MODE_write(level);
callback = external_interrupt_mode_callback; callback = external_interrupt_mode_callback;
trigger = external_interrupt_mode_trigger; trigger = external_interrupt_mode_trigger;
break; break;
case BTN_ID_LIGHT: case BTN_ID_LIGHT:
pin = HAL_GPIO_BTN_LIGHT_pin(); HAL_GPIO_BTN_LIGHT_write(level);
callback = external_interrupt_light_callback; callback = external_interrupt_light_callback;
trigger = external_interrupt_light_trigger; trigger = external_interrupt_light_trigger;
break; break;
case BTN_ID_ALARM: case BTN_ID_ALARM:
pin = HAL_GPIO_BTN_ALARM_pin(); HAL_GPIO_BTN_ALARM_write(level);
callback = external_interrupt_alarm_callback; callback = external_interrupt_alarm_callback;
trigger = external_interrupt_alarm_trigger; trigger = external_interrupt_alarm_trigger;
break; break;
@ -174,7 +175,6 @@ static EM_BOOL watch_invoke_interrupt_callback(const uint8_t button_id, eic_inte
return EM_FALSE; return EM_FALSE;
} }
const bool level = (event & INTERRUPT_TRIGGER_RISING) != 0;
EM_ASM({ EM_ASM({
const classList = document.querySelector('#btn' + $0).classList; const classList = document.querySelector('#btn' + $0).classList;
const highlight = 'highlight'; const highlight = 'highlight';
@ -185,8 +185,6 @@ static EM_BOOL watch_invoke_interrupt_callback(const uint8_t button_id, eic_inte
return EM_FALSE; return EM_FALSE;
} }
watch_set_pin_level(pin, level);
if (callback && (event & trigger) != 0) { if (callback && (event & trigger) != 0) {
callback(); callback();
resume_main_loop(); resume_main_loop();

6
watch-library/simulator/watch/watch_gpio.c
View File

@ -24,8 +24,6 @@
#include "watch_gpio.h" #include "watch_gpio.h"
static bool pin_levels[UINT8_MAX];
void watch_enable_digital_input(const uint8_t pin) {} void watch_enable_digital_input(const uint8_t pin) {}
void watch_disable_digital_input(const uint8_t pin) {} void watch_disable_digital_input(const uint8_t pin) {}
@ -35,7 +33,8 @@ void watch_enable_pull_up(const uint8_t pin) {}
void watch_enable_pull_down(const uint8_t pin) {} void watch_enable_pull_down(const uint8_t pin) {}
bool watch_get_pin_level(const uint8_t pin) { bool watch_get_pin_level(const uint8_t pin) {
return pin_levels[pin]; /// WARNING: Pin levels are now tracked in gossamer. This function has been deprecated and will be removed in a future release.
return 0;
} }
void watch_enable_digital_output(const uint8_t pin) {} void watch_enable_digital_output(const uint8_t pin) {}
@ -43,5 +42,4 @@ void watch_enable_digital_output(const uint8_t pin) {}
void watch_disable_digital_output(const uint8_t pin) {} void watch_disable_digital_output(const uint8_t pin) {}
void watch_set_pin_level(const uint8_t pin, const bool level) { void watch_set_pin_level(const uint8_t pin, const bool level) {
pin_levels[pin] = level;
} }