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

Merge pull request #176 from neutralinsomniac/alarm-fix-conditional

Browse Source 
alarm: fix accidental assignment vs conditional logic
This commit is contained in:
Wesley Ellis 2023-01-13 15:33:16 -05:00 committed by GitHub
commit 17c1b4a354
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,11 +182,11 @@ static void _alarm_update_alarm_enabled(movement_settings_t *settings, alarm_sta
if ((state->alarm[i].day == weekday_idx && alarm_minutes_of_day >= now_minutes_of_day) if ((state->alarm[i].day == weekday_idx && alarm_minutes_of_day >= now_minutes_of_day)
|| ((weekday_idx + 1) % 7 == state->alarm[i].day && alarm_minutes_of_day <= now_minutes_of_day) || ((weekday_idx + 1) % 7 == state->alarm[i].day && alarm_minutes_of_day <= now_minutes_of_day)
|| (state->alarm[i].day == ALARM_DAY_WORKDAY && (weekday_idx < 4 || (state->alarm[i].day == ALARM_DAY_WORKDAY && (weekday_idx < 4
|| (weekday_idx = 5 && alarm_minutes_of_day >= now_minutes_of_day) || (weekday_idx == 5 && alarm_minutes_of_day >= now_minutes_of_day)
|| (weekday_idx = 6 && alarm_minutes_of_day <= now_minutes_of_day))) || (weekday_idx == 6 && alarm_minutes_of_day <= now_minutes_of_day)))
|| (state->alarm[i].day == ALARM_DAY_WEEKEND && (weekday_idx == 5 || (state->alarm[i].day == ALARM_DAY_WEEKEND && (weekday_idx == 5
|| (weekday_idx = 6 && alarm_minutes_of_day >= now_minutes_of_day) || (weekday_idx == 6 && alarm_minutes_of_day >= now_minutes_of_day)
|| (weekday_idx = 4 && alarm_minutes_of_day <= now_minutes_of_day)))) { || (weekday_idx == 4 && alarm_minutes_of_day <= now_minutes_of_day)))) {
active_alarms = true; active_alarms = true;
break; break;
} }