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

Merge pull request #168 from neutralinsomniac/remove-unnecessary-conditionals

Browse Source 
Remove more unnecessary conditionals
This commit is contained in:
joeycastillo 2023-01-11 11:42:52 -05:00 committed by GitHub
commit cfd43a5b84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
movement/watch_faces/clock/weeknumber_clock_face.c
View File

@ -136,13 +136,7 @@ bool weeknumber_clock_face_loop(movement_event_t event, movement_settings_t *set
case EVENT_BACKGROUND_TASK: case EVENT_BACKGROUND_TASK:
// uncomment this line to snap back to the clock face when the hour signal sounds: // uncomment this line to snap back to the clock face when the hour signal sounds:
// movement_move_to_face(state->watch_face_index); // movement_move_to_face(state->watch_face_index);
if (watch_is_buzzer_or_led_enabled()) { movement_play_signal();
// if we are in the foreground, we can just beep.
movement_play_signal();
} else {
// beep quickly (this call blocks for 275 ms),
movement_play_signal();
}
break; break;
default: default:
break; break;

8
movement/watch_faces/complication/alarm_face.c
View File

@ -417,13 +417,7 @@ bool alarm_face_loop(movement_event_t event, movement_settings_t *settings, void
case EVENT_BACKGROUND_TASK: case EVENT_BACKGROUND_TASK:
// play alarm // play alarm
if (state->alarm[state->alarm_playing_idx].beeps == 0) { if (state->alarm[state->alarm_playing_idx].beeps == 0) {
// short beep _alarm_play_short_beep(state->alarm[state->alarm_playing_idx].pitch);
if (watch_is_buzzer_or_led_enabled()) {
_alarm_play_short_beep(state->alarm[state->alarm_playing_idx].pitch);
} else {
// play beep
_alarm_play_short_beep(state->alarm[state->alarm_playing_idx].pitch);
}
} else { } else {
// regular alarm beeps // regular alarm beeps
movement_play_alarm_beeps((state->alarm[state->alarm_playing_idx].beeps == (ALARM_MAX_BEEP_ROUNDS - 1) ? 20 : state->alarm[state->alarm_playing_idx].beeps), movement_play_alarm_beeps((state->alarm[state->alarm_playing_idx].beeps == (ALARM_MAX_BEEP_ROUNDS - 1) ? 20 : state->alarm[state->alarm_playing_idx].beeps),