dominic/watchy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 1.2.

Browse Source
This commit is contained in:
GuruSR 2021-11-04 00:20:24 -04:00 committed by GitHub
parent a49ee48466
commit 66bf31798d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Watchy_GSR.cpp
View File

@ -334,7 +334,7 @@ void WatchyGSR::init(){
Pulse = (((TimerDown.Tone / 2) & 1) != 0); Pulse = (((TimerDown.Tone / 2) & 1) != 0);
if (!Pulse && TimerDown.Tone > 0) TimerDown.Tone--; if (!Pulse && TimerDown.Tone > 0) TimerDown.Tone--;
VibeTo(Pulse); // Turns Vibe on or off depending on bit state. VibeTo(Pulse); // Turns Vibe on or off depending on bit state.
LastUse=millis(); LastUse=millis(); LastButton = LastUse;
} }
}else WaitForNext=true; }else WaitForNext=true;
}else if (Alarms_Times[AlarmIndex] > 0){ }else if (Alarms_Times[AlarmIndex] > 0){
@ -342,14 +342,14 @@ void WatchyGSR::init(){
Alarms_Playing[AlarmIndex]--; Alarms_Playing[AlarmIndex]--;
if (Menu.SubItem > 0 && Menu.Item - MENU_ALARM1 == AlarmIndex){ if (Menu.SubItem > 0 && Menu.Item - MENU_ALARM1 == AlarmIndex){
VibeTo(false); VibeTo(false);
LastUse=millis(); LastUse=millis(); LastButton = LastUse;
DoHaptic = false; DoHaptic = false;
Alarms_Playing[AlarmIndex]=0; Alarms_Playing[AlarmIndex]=0;
Alarms_Times[AlarmIndex]=0; Alarms_Times[AlarmIndex]=0;
}else{ }else{
Pulse = ((AlarmVBs[AlarmIndex] & Bits[Alarms_Playing[AlarmIndex] / 3]) != 0); Pulse = ((AlarmVBs[AlarmIndex] & Bits[Alarms_Playing[AlarmIndex] / 3]) != 0);
VibeTo(Pulse); // Turns Vibe on or off depending on bit state. VibeTo(Pulse); // Turns Vibe on or off depending on bit state.
LastUse=millis(); LastUse=millis(); LastButton = LastUse;
DoHaptic = false; DoHaptic = false;
} }
if (Alarms_Playing[AlarmIndex] == 0 && Alarms_Times[AlarmIndex] > 0){ if (Alarms_Playing[AlarmIndex] == 0 && Alarms_Times[AlarmIndex] > 0){
@ -826,7 +826,7 @@ void WatchyGSR::drawMenu(){
break; break;
case 3: // 0x minutes. case 3: // 0x minutes.
S=MakeMinutes(Steps.Minutes); S=MakeMinutes(Steps.Minutes);
O=MakeHour(Steps.Hour) + ":" + S.charAt(0) + "[" + S.charAt(1) + MakeTOD(Steps.Hour, true) + "]"; O=MakeHour(Steps.Hour) + ":" + S.charAt(0) + "[" + S.charAt(1) + "]" + MakeTOD(Steps.Hour, true);
break; break;
case 4: // Sunday. case 4: // Sunday.
O = "MENU to Reset"; O = "MENU to Reset";
@ -847,7 +847,7 @@ void WatchyGSR::drawMenu(){
O=MakeHour(Alarms_Hour[Menu.Item - MENU_ALARM1]) + ":[" + S.charAt(0) + "]" + S.charAt(1) + MakeTOD(Alarms_Hour[Menu.Item - MENU_ALARM1], false) + " " + getReduce(Alarms_Repeats[Menu.Item - MENU_ALARM1]); O=MakeHour(Alarms_Hour[Menu.Item - MENU_ALARM1]) + ":[" + S.charAt(0) + "]" + S.charAt(1) + MakeTOD(Alarms_Hour[Menu.Item - MENU_ALARM1], false) + " " + getReduce(Alarms_Repeats[Menu.Item - MENU_ALARM1]);
break; break;
case 3: // 0x minutes. case 3: // 0x minutes.
O=MakeHour(Alarms_Hour[Menu.Item - MENU_ALARM1]) + ":" + S.charAt(0) + "[" + S.charAt(1) + MakeTOD(Alarms_Hour[Menu.Item - MENU_ALARM1], false) + "] " + getReduce(Alarms_Repeats[Menu.Item - MENU_ALARM1]); O=MakeHour(Alarms_Hour[Menu.Item - MENU_ALARM1]) + ":" + S.charAt(0) + "[" + S.charAt(1) + "]" + MakeTOD(Alarms_Hour[Menu.Item - MENU_ALARM1], false) + " " + getReduce(Alarms_Repeats[Menu.Item - MENU_ALARM1]);
break; break;
case 4: // Repeats case 4: // Repeats
O=MakeHour(Alarms_Hour[Menu.Item - MENU_ALARM1]) + ":" + S.charAt(0) + S.charAt(1) + MakeTOD(Alarms_Hour[Menu.Item - MENU_ALARM1], false) + " [" + getReduce(Alarms_Repeats[Menu.Item - MENU_ALARM1]) + "]"; O=MakeHour(Alarms_Hour[Menu.Item - MENU_ALARM1]) + ":" + S.charAt(0) + S.charAt(1) + MakeTOD(Alarms_Hour[Menu.Item - MENU_ALARM1], false) + " [" + getReduce(Alarms_Repeats[Menu.Item - MENU_ALARM1]) + "]";
@ -2317,6 +2317,7 @@ void WatchyGSR::CheckAlarm(int I){
if (bA && Alarms_Times[I] == 0 && (Alarms_Active[I] & ALARM_TRIGGERED) == 0){ if (bA && Alarms_Times[I] == 0 && (Alarms_Active[I] & ALARM_TRIGGERED) == 0){
Alarms_Times[I] = 255; Alarms_Times[I] = 255;
Alarms_Playing[I] = 30; Alarms_Playing[I] = 30;
LastUse=millis(); LastButton=LastUse;
UpdateDisp=true; // Force it on, if it is in Dark Running. UpdateDisp=true; // Force it on, if it is in Dark Running.
Alarms_Active[I] |= ALARM_TRIGGERED; Alarms_Active[I] |= ALARM_TRIGGERED;
if ((Alarms_Active[I] & ALARM_REPEAT) == 0){ if ((Alarms_Active[I] & ALARM_REPEAT) == 0){
@ -2343,6 +2344,7 @@ void WatchyGSR::CheckCD(){
TimerDown.Tone = 24; TimerDown.Tone = 24;
TimerDown.ToneLeft = 255; TimerDown.ToneLeft = 255;
TimerDown.Active = false; TimerDown.Active = false;
LastUse=millis(); LastButton=LastUse;
UpdateDisp = true; // Quick Update. UpdateDisp = true; // Quick Update.
} }
} }