archives/pebble
2
0
Fork 0
mirror of https://github.com/google/pebble.git synced 2025-04-30 15:21:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

spelling: overridden

Browse source 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
This commit is contained in:
Josh Soref 2025-01-28 15:23:51 -05:00
parent db1840c0f5
commit 3572d429b2
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/robert/boot/src/vector_table.c
View file

@ -53,7 +53,7 @@ __attribute__((__noreturn__)) void Default_Handler(void) {
// All these functions are weak references to the Default_Handler, // All these functions are weak references to the Default_Handler,
// so if we define a handler in elsewhere in the firmware, these // so if we define a handler in elsewhere in the firmware, these
// will be overriden // will be overridden
#define ALIAS(sym) __attribute__((__weak__, __alias__(sym))) #define ALIAS(sym) __attribute__((__weak__, __alias__(sym)))
ALIAS("Default_Handler") void NMI_Handler(void); ALIAS("Default_Handler") void NMI_Handler(void);
ALIAS("Default_Handler") void HardFault_Handler(void); ALIAS("Default_Handler") void HardFault_Handler(void);

2
src/fw/applib/ui/window_private.h
View file

@ -50,7 +50,7 @@ GRect window_calc_frame(bool fullscreen);
bool window_has_status_bar(Window *window); bool window_has_status_bar(Window *window);
//! @param window Pointer to the \ref Window to set //! @param window Pointer to the \ref Window to set
//! @param overrides_back_button Boolean indicating if the back button has been overriden //! @param overrides_back_button Boolean indicating if the back button has been overridden
//! in the \ref ClickConfigProvidier of the passed \ref Window //! in the \ref ClickConfigProvidier of the passed \ref Window
void window_set_overrides_back_button(Window *window, bool overrides_back_button); void window_set_overrides_back_button(Window *window, bool overrides_back_button);

4
src/fw/apps/demo_apps/click_app.c
View file

@ -117,7 +117,7 @@ static void config_provider(Window *window) {
// See ui/click.h for more information and default values. // See ui/click.h for more information and default values.
// single click / repeat-on-hold config: // single click / repeat-on-hold config:
window_single_repeating_click_subscribe(BUTTON_ID_SELECT, 1000, (ClickHandler)select_single_click_handler); // "hold-to-repeat" gets overriden if there's a long click handler configured! window_single_repeating_click_subscribe(BUTTON_ID_SELECT, 1000, (ClickHandler)select_single_click_handler); // "hold-to-repeat" gets overridden if there's a long click handler configured!
// multi click config: // multi click config:
window_multi_click_subscribe(BUTTON_ID_SELECT, 2, 10, 0, false, (ClickHandler) select_multi_click_handler); window_multi_click_subscribe(BUTTON_ID_SELECT, 2, 10, 0, false, (ClickHandler) select_multi_click_handler);
@ -126,7 +126,7 @@ static void config_provider(Window *window) {
window_long_click_subscribe(BUTTON_ID_SELECT, 700, (ClickHandler) select_long_click_handler, (ClickHandler) select_long_click_release_handler); window_long_click_subscribe(BUTTON_ID_SELECT, 700, (ClickHandler) select_long_click_handler, (ClickHandler) select_long_click_release_handler);
// single click / repeat-on-hold config: // single click / repeat-on-hold config:
window_single_repeating_click_subscribe(BUTTON_ID_UP, 1000, (ClickHandler) select_single_click_handler); // "hold-to-repeat" gets overriden if there's a long click handler configured! window_single_repeating_click_subscribe(BUTTON_ID_UP, 1000, (ClickHandler) select_single_click_handler); // "hold-to-repeat" gets overridden if there's a long click handler configured!
// multi click config: // multi click config:
window_multi_click_subscribe(BUTTON_ID_UP, 2, 10, 0, true, (ClickHandler) select_multi_click_handler); window_multi_click_subscribe(BUTTON_ID_UP, 2, 10, 0, true, (ClickHandler) select_multi_click_handler);

2
src/fw/vector_table.c
View file

@ -32,7 +32,7 @@ void Default_Handler(void) {
// All these functions are weak references to the Default_Handler, // All these functions are weak references to the Default_Handler,
// so if we define a handler in elsewhere in the firmware, these // so if we define a handler in elsewhere in the firmware, these
// will be overriden // will be overridden
ALIAS("Default_Handler") void NMI_Handler(void); ALIAS("Default_Handler") void NMI_Handler(void);
ALIAS("Default_Handler") void HardFault_Handler(void); ALIAS("Default_Handler") void HardFault_Handler(void);
ALIAS("Default_Handler") void MemManage_Handler(void); ALIAS("Default_Handler") void MemManage_Handler(void);

2
tests/fw/services/test_do_not_disturb.c
View file

@ -321,7 +321,7 @@ void test_do_not_disturb__disabling_manual_dnd_should_override_scheduled(void) {
active = do_not_disturb_is_active(); active = do_not_disturb_is_active();
cl_assert(active == true); // Both OFF cl_assert(active == true); // Both OFF
do_not_disturb_set_manually_enabled(false); // turned Manual OFF, scheduled should be overriden do_not_disturb_set_manually_enabled(false); // turned Manual OFF, scheduled should be overridden
cl_assert(do_not_disturb_is_manually_enabled() == false); cl_assert(do_not_disturb_is_manually_enabled() == false);
cl_assert(do_not_disturb_is_schedule_enabled(WeekdaySchedule) == true); cl_assert(do_not_disturb_is_schedule_enabled(WeekdaySchedule) == true);
active = do_not_disturb_is_active(); active = do_not_disturb_is_active();