diff --git a/watch-faces/demo/irda_demo_face.c b/watch-faces/demo/irda_demo_face.c index 3b22e4a1..9d4abb9a 100644 --- a/watch-faces/demo/irda_demo_face.c +++ b/watch-faces/demo/irda_demo_face.c @@ -44,12 +44,11 @@ void irda_demo_face_setup(uint8_t watch_face_index, void ** context_ptr) { void irda_demo_face_activate(void *context) { irda_demo_state_t *state = (irda_demo_state_t *)context; (void) state; - // Rev 05 had the polarity reversed, so we had to bodge a different circuit and bypass the enable pin. - // HAL_GPIO_IR_ENABLE_out(); - // HAL_GPIO_IR_ENABLE_clr(); + HAL_GPIO_IR_ENABLE_out(); + HAL_GPIO_IR_ENABLE_clr(); HAL_GPIO_IRSENSE_in(); HAL_GPIO_IRSENSE_pmuxen(HAL_GPIO_PMUX_SERCOM_ALT); - uart_init_instance(0, UART_TXPO_NONE, UART_RXPO_0, 300); + uart_init_instance(0, UART_TXPO_NONE, UART_RXPO_0, 600); uart_set_irda_mode_instance(0, true); uart_enable_instance(0); } @@ -67,12 +66,15 @@ bool irda_demo_face_loop(movement_event_t event, void *context) { size_t bytes_read = uart_read_instance(0, data, 32); if (bytes_read) { char buf[14]; + movement_force_led_on(0, 48, 0); snprintf(buf, 11, "IR%2d%c%c%c%c%c%c", bytes_read, data[0], data[1], data[2], data[3], data[4], data[5]); + watch_clear_display(); watch_display_text(WATCH_POSITION_FULL, buf); data[31] = 0; printf("%s\n", data); printf("%s\n", buf); } else { + movement_force_led_off(); watch_display_text(WATCH_POSITION_FULL, " no dat"); } } @@ -99,6 +101,7 @@ void irda_demo_face_resign(void *context) { uart_disable_instance(0); HAL_GPIO_IRSENSE_pmuxdis(); HAL_GPIO_IRSENSE_off(); + HAL_GPIO_IR_ENABLE_off(); } void irq_handler_sercom0(void); diff --git a/watch-faces/demo/light_sensor_face.c b/watch-faces/demo/light_sensor_face.c index 2a25108e..a3f0223a 100644 --- a/watch-faces/demo/light_sensor_face.c +++ b/watch-faces/demo/light_sensor_face.c @@ -44,7 +44,8 @@ void light_sensor_face_setup(uint8_t watch_face_index, void ** context_ptr) { void light_sensor_face_activate(void *context) { light_sensor_state_t *state = (light_sensor_state_t *)context; (void) state; - HAL_GPIO_IRSENSE_in(); + HAL_GPIO_IR_ENABLE_out(); + HAL_GPIO_IR_ENABLE_clr(); HAL_GPIO_IRSENSE_pmuxen(HAL_GPIO_PMUX_ADC); adc_init(); adc_enable(); @@ -89,6 +90,7 @@ void light_sensor_face_resign(void *context) { adc_disable(); HAL_GPIO_IRSENSE_pmuxdis(); HAL_GPIO_IRSENSE_off(); + HAL_GPIO_IR_ENABLE_off(); } #endif // HAS_IR_SENSOR