add alert type settings

Author: fbiego

hal/esp32/app_hal.cpp

@@ -66,6 +66,7 @@ void hal_loop(void);
 
 void vibratePin(bool state);
 
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif

hal/esp32/app_hal.h

@@ -60,7 +60,7 @@
 #define BL -1 // unused (connected on IO extender)
 #define VIBRATION_PIN 0 // dummy (connected on IO extender)
 
-#define BUZZER 3
+#define BUZZER_PIN 3
 
 #define MAX_FILE_OPEN 10
 
@@ -91,7 +91,7 @@
 
 #define BL 3
 
-#define BUZZER -1
+#define BUZZER_PIN -1
 
 #define MAX_FILE_OPEN 10
 
@@ -122,7 +122,7 @@
 
 #define BL 2
 
-#define BUZZER -1
+#define BUZZER_PIN -1
 
 #define MAX_FILE_OPEN 50
 
@@ -153,7 +153,7 @@
 
 #define BL 15
 
-#define BUZZER -1 //33
+#define BUZZER_PIN -1 //33
 
 #define MAX_FILE_OPEN 20
 
@@ -162,7 +162,7 @@
 #define WIDTH 240
 #define HEIGHT 240
 
-#define BUZZER 3
+#define BUZZER_PIN 3
 
 #define MAX_FILE_OPEN 10
 
@@ -193,7 +193,7 @@
 
 #define BL 2
 
-#define BUZZER -1
+#define BUZZER_PIN -1
 
 #define MAX_FILE_OPEN 10
 

hal/esp32/displays/pins.h

@@ -121,7 +121,7 @@ Vibration pattern[] = {
 
 void toneTask(void *param)
 {
-#if defined(BUZZER) && (BUZZER != -1)
+#if defined(BUZZER_PIN) && (BUZZER_PIN != -1)
 
     NoteSequence sequence;
 
@@ -131,7 +131,7 @@ void toneTask(void *param)
         {
             playing = true;
 
-            ledcAttach(BUZZER, 500, 8);
+            ledcAttach(BUZZER_PIN, 500, 8);
 
             if (sequence.repeat == 0)
             {
@@ -153,66 +153,24 @@ void toneTask(void *param)
 
                     if (pitch > 0)
                     {
-                        ledcWriteTone(BUZZER, pitch);
+                        ledcWriteTone(BUZZER_PIN, pitch);
                     }
                     else
                     {
-                        ledcWriteTone(BUZZER, 0); // Rest
+                        ledcWriteTone(BUZZER_PIN, 0); // Rest
                     }
                     vTaskDelay(pdMS_TO_TICKS(duration));
                 }
             }
 
-            ledcDetach(BUZZER);
+            ledcDetach(BUZZER_PIN);
 
             playing = false;
         }
     }
 #endif
 }
 
-void startToneSystem()
-{
-#if defined(BUZZER) && (BUZZER != -1)
-
-    if (!noteQueue)
-    {
-        noteQueue = xQueueCreate(MAX_QUEUE_SIZE, sizeof(NoteSequence));
-    }
-    if (!toneTaskHandle)
-    {
-        xTaskCreatePinnedToCore(toneTask, "toneTask", 2048, nullptr, 1, &toneTaskHandle, 0);
-    }
-#endif
-}
-
-void feedbackTone(Note *notes, int count, ToneType type, int repeat)
-{
-#if defined(BUZZER) && (BUZZER != -1)
-    if (!noteQueue)
-        startToneSystem();
-
-    if (count > MAX_NOTES_PER_SEQUENCE)
-        count = MAX_NOTES_PER_SEQUENCE;
-
-    if (playing && currentToneType >= type)
-    {
-        // If the current tone is of the same or higher priority, reset the queue
-        forceInterrupt = true;
-        xQueueReset(noteQueue);
-    }
-
-    NoteSequence sequence;
-    sequence.count = count;
-    sequence.repeat = repeat;
-    memcpy(sequence.notes, notes, count * sizeof(Note));
-
-    xQueueSend(noteQueue, &sequence, 0);
-    currentToneType = type;
-
-#endif
-}
-
 void vibrationTask(void *param)
 {
 #if defined(VIBRATION_PIN) && (VIBRATION_PIN != -1)
@@ -248,6 +206,21 @@ void vibrationTask(void *param)
 #endif
 }
 
+void startToneSystem()
+{
+#if defined(BUZZER_PIN) && (BUZZER_PIN != -1)
+
+    if (!noteQueue)
+    {
+        noteQueue = xQueueCreate(MAX_QUEUE_SIZE, sizeof(NoteSequence));
+    }
+    if (!toneTaskHandle)
+    {
+        xTaskCreatePinnedToCore(toneTask, "toneTask", 2048, nullptr, 1, &toneTaskHandle, 0);
+    }
+#endif
+}
+
 void startVibrationSystem()
 {
 #if defined(VIBRATION_PIN) && (VIBRATION_PIN != -1)
@@ -262,25 +235,99 @@ void startVibrationSystem()
 #endif
 }
 
+void feedbackTone(Note *notes, int count, ToneType type, int repeat)
+{
+#if defined(BUZZER_PIN) && (BUZZER_PIN != -1)
+    if (check_alert_state(ALERT_SOUND))
+    {
+        if (!noteQueue)
+            startToneSystem();
+
+        if (count > MAX_NOTES_PER_SEQUENCE)
+            count = MAX_NOTES_PER_SEQUENCE;
+
+        if (playing && currentToneType >= type)
+        {
+            // If the current tone is of the same or higher priority, reset the queue
+            forceInterrupt = true;
+            xQueueReset(noteQueue);
+        }
+
+        NoteSequence sequence;
+        sequence.count = count;
+        sequence.repeat = repeat;
+        memcpy(sequence.notes, notes, count * sizeof(Note));
+
+        xQueueSend(noteQueue, &sequence, 0);
+        currentToneType = type;
+    }
+#endif
+}
+
 void feedbackVibrate(Vibration *steps, int count, bool force)
 {
 #if defined(VIBRATION_PIN) && (VIBRATION_PIN != -1)
-    if (!vibQueue)
-        startVibrationSystem();
+    if (check_alert_state(ALERT_VIBRATE))
+    {
+        if (!vibQueue)
+            startVibrationSystem();
 
-    if (count > MAX_VIB_PATTERN_LENGTH)
-        count = MAX_VIB_PATTERN_LENGTH;
+        if (count > MAX_VIB_PATTERN_LENGTH)
+            count = MAX_VIB_PATTERN_LENGTH;
 
-    if (force && vibrating)
-    {
-        xQueueReset(vibQueue);
+        if (force && vibrating)
+        {
+            xQueueReset(vibQueue);
+        }
+
+        VibPattern pattern;
+        pattern.count = count;
+        memcpy(pattern.steps, steps, count * sizeof(Vibration));
+
+        xQueueSend(vibQueue, &pattern, 0);
     }
+#endif
+}
 
-    VibPattern pattern;
-    pattern.count = count;
-    memcpy(pattern.steps, steps, count * sizeof(Vibration));
+void feedbackRun(ToneType type)
+{
+    switch (type)
+    {
+    case T_CALLS:
+        feedbackTone(tone_call, 8, T_CALLS, 3);
+        feedbackVibrate(pattern, 4, true);
+        break;
+    case T_NOTIFICATION:
+        feedbackTone(tone_notification, 3, T_NOTIFICATION, 2);
+        feedbackVibrate(v_notif, 2, true);
+        break;
+    case T_TIMER:
+        feedbackTone(tone_alarm, 7, T_TIMER);
+        feedbackVibrate(pattern, 4, true);
+        break;
+    case T_ALARM:
+        feedbackTone(tone_timer, 6, T_TIMER, 3);
+        feedbackVibrate(pattern, 4, true);
+        break;
+    case T_SYSTEM:
+        feedbackTone(tone_button, 1, T_SYSTEM);
+        feedbackVibrate(pattern, 2, true);
+        break;
+    default:
+        break;
+    }
 
-    xQueueSend(vibQueue, &pattern, 0);
 
-#endif
-}
+    if (check_alert_state(ALERT_SCREEN))
+    {
+        switch (type)
+        {
+        case T_CALLS:
+            screen_on(50);
+            break;
+        default:
+            screen_on();
+            break;
+        }
+    }
+}

hal/esp32/feedback.cpp

@@ -23,7 +23,8 @@
 
 #define MAX_VIB_PATTERN_LENGTH 16
 
-enum ToneType {
+enum ToneType
+{
     T_ALARM = 0,
     T_TIMER,
     T_CALLS,
@@ -44,6 +45,14 @@ struct Vibration
     int duration;
 };
 
+enum AlertType
+{
+    ALERT_POPUP = 0x01,
+    ALERT_SCREEN = 0x02,
+    ALERT_SOUND = 0x04,
+    ALERT_VIBRATE = 0x08
+};
+
 extern Vibration pattern[];
 extern Vibration v_notif[];
 
@@ -59,9 +68,15 @@ extern Note tone_simonsays_intro[];
 extern Note tone_simonsays_gameover[];
 
 void startToneSystem();
-void feedbackTone(Note *notes, int count, ToneType type, int repeat = 0);
-
 void startVibrationSystem();
+
+void feedbackTone(Note *notes, int count, ToneType type, int repeat = 0);
 void feedbackVibrate(Vibration *steps, int count, bool force = false);
 
+void screen_on(long extra = 0);
+
+void feedbackRun(ToneType type);
+
+bool check_alert_state(AlertType type);
+
 #endif