Trigger alerts based on settings values

Lyrkan · Apr 29, 2023 · e97d278 · e97d278
1 parent f2e0ee7
commit e97d278
Show file tree

Hide file tree

Showing 14 changed files with 153 additions and 92 deletions.
diff --git a/include/K40/alerts.h b/include/K40/alerts.h
@@ -0,0 +1,14 @@
+#ifndef K40_ALERTS_H
+#define K40_ALERTS_H
+
+enum AlertType {
+    ALERT_TYPE_VOLTAGE = 0x01,
+    ALERT_TYPE_COOLING = 0x02,
+    ALERT_TYPE_LIDS = 0x04,
+    ALERT_TYPE_FLAME_SENSOR = 0x08,
+};
+
+void alerts_toggle_alert(AlertType type, bool enable);
+uint8_t alerts_get_current_alerts();
+
+#endif
diff --git a/include/K40/cooling.h b/include/K40/cooling.h
@@ -12,11 +12,6 @@
 #define COOLING_THERMISTOR_VOLTAGE_DIVIDER_RESISTANCE 10000
 #define COOLING_THERMISTOR_BUFFER_LENGTH 50
 
-#define COOLING_TEMP_MIN_VALUE 5
-#define COOLING_TEMP_MAX_VALUE 30
-#define COOLING_FLOW_MIN_VALUE 1
-#define COOLING_FLOW_MAX_VALUE 99
-
 #define COOLING_FLOW_UPDATE_INTERVAL 500 // ms
 
 enum CoolingPin {

diff --git a/include/K40/voltage_probes.h b/include/K40/voltage_probes.h
@@ -7,14 +7,6 @@
 
 #define VOLTAGE_PROBES_UPDATE_INTERVAL 1000 // ms
 
-#define VOLTAGE_PROBE_1_MIN_VALUE 4.0
-#define VOLTAGE_PROBE_2_MIN_VALUE 11.0
-#define VOLTAGE_PROBE_3_MIN_VALUE 24.0
-
-#define VOLTAGE_PROBE_1_MAX_VALUE 5.5
-#define VOLTAGE_PROBE_2_MAX_VALUE 12.5
-#define VOLTAGE_PROBE_3_MAX_VALUE 25.5
-
 enum VoltageProbePin {
     PIN_VOLTAGE_PROBE_1 = 34,
     PIN_VOLTAGE_PROBE_2 = 39,

diff --git a/include/UI/alerts.h b/include/UI/alerts.h
diff --git a/include/UI/overlay.h b/include/UI/overlay.h
@@ -0,0 +1,9 @@
+#ifndef UI_ALERTS_H
+#define UI_ALERTS_H
+
+#include <lvgl.h>
+
+void ui_overlay_init();
+void ui_overlay_update();
+
+#endif
diff --git a/src/K40/alerts.cpp b/src/K40/alerts.cpp
@@ -0,0 +1,31 @@
+#include <freertos/FreeRTOS.h>
+#include <freertos/semphr.h>
+
+#include "K40/alerts.h"
+#include "queues.h"
+
+static uint8_t alerts_statuses = 0;
+static SemaphoreHandle_t alerts_statuses_mutex = xSemaphoreCreateMutex();
+
+void alerts_toggle_alert(AlertType type, bool enable) {
+    while (xSemaphoreTake(alerts_statuses_mutex, portMAX_DELAY) != pdPASS)
+        ;
+
+    if (enable) {
+        alerts_statuses |= type;
+    } else {
+        alerts_statuses &= ~type;
+    }
+
+    xSemaphoreGive(alerts_statuses_mutex);
+}
+
+uint8_t alerts_get_current_alerts() {
+    while (xSemaphoreTake(alerts_statuses_mutex, portMAX_DELAY) != pdPASS)
+        ;
+
+    uint8_t result = alerts_statuses;
+    xSemaphoreGive(alerts_statuses_mutex);
+
+    return result;
+}
diff --git a/src/K40/cooling.cpp b/src/K40/cooling.cpp
@@ -4,9 +4,11 @@
 #include <math.h>
 #include "esp_adc_cal.h"
 
+#include "K40/alerts.h"
 #include "K40/cooling.h"
 #include "UI/screens/status.h"
 #include "queues.h"
+#include "settings.h"
 
 static CoolingValues cooling_values;
 
@@ -71,6 +73,16 @@ void cooling_update_status(esp_adc_cal_characteristics_t *adc_chars) {
 
     // Send update to the queue
     if (cooling_values_updated) {
+        // Change alert state
+        bool enable_alert =
+            (cooling_values.temperature < probes_settings.cooling_temp_min ||
+             cooling_values.temperature > probes_settings.cooling_temp_max ||
+             cooling_values.flow < probes_settings.cooling_flow_min ||
+             cooling_values.flow > probes_settings.cooling_temp_max);
+
+        alerts_toggle_alert(ALERT_TYPE_COOLING, enable_alert);
+
+        // Notify UI of new values
         xQueueOverwrite(cooling_current_status_queue, &cooling_values);
         ui_status_notify_update(STATUS_UPDATE_PROBE_COOLING);
     }

diff --git a/src/K40/flame_sensor.cpp b/src/K40/flame_sensor.cpp
@@ -3,6 +3,7 @@
 #include <freertos/queue.h>
 #include "esp_adc_cal.h"
 
+#include "K40/alerts.h"
 #include "K40/flame_sensor.h"
 #include "UI/screens/status.h"
 #include "queues.h"
@@ -16,6 +17,11 @@ void flame_sensor_update_status() {
     if (first_update || (updated_sensor_value != flame_sensor_triggered)) {
         first_update = false;
         flame_sensor_triggered = updated_sensor_value;
+
+        // Change alert state
+        alerts_toggle_alert(ALERT_TYPE_FLAME_SENSOR, flame_sensor_triggered);
+
+        // Notify UI of new value
         xQueueOverwrite(flame_sensor_current_status_queue, &flame_sensor_triggered);
         ui_status_notify_update(STATUS_UPDATE_PROBE_FLAME_SENSOR);
     }

diff --git a/src/K40/lids.cpp b/src/K40/lids.cpp
@@ -2,6 +2,7 @@
 #include <freertos/FreeRTOS.h>
 #include <freertos/queue.h>
 
+#include "K40/alerts.h"
 #include "K40/lids.h"
 #include "UI/screens/status.h"
 #include "queues.h"
@@ -17,6 +18,12 @@ void lids_update_status() {
         first_update = false;
         lids_states.front_opened = front_lid_opened;
         lids_states.back_opened = back_lid_opened;
+
+        // Change alert state
+        bool enable_alert = front_lid_opened || back_lid_opened;
+        alerts_toggle_alert(ALERT_TYPE_LIDS, enable_alert);
+
+        // Notify UI of new values
         xQueueOverwrite(lids_current_status_queue, &lids_states);
         ui_status_notify_update(STATUS_UPDATE_PROBE_LIDS);
     }

diff --git a/src/K40/voltage_probes.cpp b/src/K40/voltage_probes.cpp
@@ -4,9 +4,11 @@
 #include <math.h>
 #include "esp_adc_cal.h"
 
+#include "K40/alerts.h"
 #include "K40/voltage_probes.h"
 #include "UI/screens/status.h"
 #include "queues.h"
+#include "settings.h"
 
 static VoltageProbesValues voltage_probes_values;
 
@@ -41,6 +43,19 @@ void voltage_probes_update_status(esp_adc_cal_characteristics_t *adc_chars) {
     voltage_probes_values.probe2 = voltage_probes_get_value(PIN_VOLTAGE_PROBE_2, adc_chars);
     voltage_probes_values.probe3 = voltage_probes_get_value(PIN_VOLTAGE_PROBE_3, adc_chars);
     xQueueOverwrite(voltage_current_status_queue, &voltage_probes_values);
+
+    // Change alert state
+    bool enable_alert =
+        (voltage_probes_values.probe1 < probes_settings.voltage_probe_v1_min ||
+         voltage_probes_values.probe1 > probes_settings.voltage_probe_v1_max ||
+         voltage_probes_values.probe1 < probes_settings.voltage_probe_v2_min ||
+         voltage_probes_values.probe1 > probes_settings.voltage_probe_v2_max ||
+         voltage_probes_values.probe2 < probes_settings.voltage_probe_v3_min ||
+         voltage_probes_values.probe2 > probes_settings.voltage_probe_v3_max);
+
+    alerts_toggle_alert(ALERT_TYPE_VOLTAGE, enable_alert);
+
+    // Notify UI of new values
     ui_status_notify_update(STATUS_UPDATE_PROBE_VOLTAGE);
 
     // Reset timer

diff --git a/src/UI/alerts.cpp b/src/UI/alerts.cpp
diff --git a/src/UI/overlay.cpp b/src/UI/overlay.cpp
@@ -0,0 +1,49 @@
+#include <Arduino.h>
+#include <lvgl.h>
+
+#include "UI/images.h"
+#include "UI/overlay.h"
+#include "UI/screens/controls.h"
+#include "queues.h"
+
+static lv_obj_t *ui_overlay_laser_enabled_label;
+
+void ui_overlay_init() {
+    ui_overlay_laser_enabled_label = lv_label_create(lv_layer_top());
+    lv_obj_set_width(ui_overlay_laser_enabled_label, LV_SIZE_CONTENT);
+    lv_obj_set_height(ui_overlay_laser_enabled_label, LV_SIZE_CONTENT);
+    lv_obj_set_align(ui_overlay_laser_enabled_label, LV_ALIGN_BOTTOM_RIGHT);
+    lv_obj_set_x(ui_overlay_laser_enabled_label, -25);
+    lv_obj_set_y(ui_overlay_laser_enabled_label, -20);
+    lv_label_set_recolor(ui_overlay_laser_enabled_label, true);
+    lv_label_set_text(ui_overlay_laser_enabled_label, "#FF0000 " LV_SYMBOL_WARNING "# Laser enabled");
+    lv_obj_set_style_text_color(ui_overlay_laser_enabled_label, lv_color_black(), LV_PART_MAIN | LV_STATE_DEFAULT);
+    lv_obj_set_style_text_font(ui_overlay_laser_enabled_label, &font_default_14, LV_PART_MAIN | LV_STATE_DEFAULT);
+    lv_obj_set_style_radius(ui_overlay_laser_enabled_label, 6, LV_PART_MAIN | LV_STATE_DEFAULT);
+    lv_obj_set_style_bg_color(ui_overlay_laser_enabled_label, lv_color_white(), LV_PART_MAIN | LV_STATE_DEFAULT);
+    lv_obj_set_style_bg_opa(ui_overlay_laser_enabled_label, 255, LV_PART_MAIN | LV_STATE_DEFAULT);
+    lv_obj_set_style_pad_left(ui_overlay_laser_enabled_label, 10, LV_PART_MAIN | LV_STATE_DEFAULT);
+    lv_obj_set_style_pad_right(ui_overlay_laser_enabled_label, 10, LV_PART_MAIN | LV_STATE_DEFAULT);
+    lv_obj_set_style_pad_top(ui_overlay_laser_enabled_label, 6, LV_PART_MAIN | LV_STATE_DEFAULT);
+    lv_obj_set_style_pad_bottom(ui_overlay_laser_enabled_label, 6, LV_PART_MAIN | LV_STATE_DEFAULT);
+    lv_obj_set_style_border_color(ui_overlay_laser_enabled_label, lv_color_black(), LV_PART_MAIN | LV_STATE_DEFAULT);
+    lv_obj_set_style_border_opa(ui_overlay_laser_enabled_label, 25, LV_PART_MAIN | LV_STATE_DEFAULT);
+    lv_obj_set_style_border_width(ui_overlay_laser_enabled_label, 1, LV_PART_MAIN | LV_STATE_DEFAULT);
+    lv_obj_set_style_shadow_color(ui_overlay_laser_enabled_label, lv_color_black(), LV_PART_MAIN | LV_STATE_DEFAULT);
+    lv_obj_set_style_shadow_opa(ui_overlay_laser_enabled_label, 15, LV_PART_MAIN | LV_STATE_DEFAULT);
+    lv_obj_set_style_shadow_width(ui_overlay_laser_enabled_label, 4, LV_PART_MAIN | LV_STATE_DEFAULT);
+    lv_obj_set_style_shadow_ofs_x(ui_overlay_laser_enabled_label, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
+    lv_obj_set_style_shadow_ofs_y(ui_overlay_laser_enabled_label, 4, LV_PART_MAIN | LV_STATE_DEFAULT);
+}
+
+void ui_overlay_update() {
+    if (lv_obj_has_state(ui_controls_laser_switch, LV_STATE_CHECKED)) {
+        if (lv_obj_has_flag(ui_overlay_laser_enabled_label, LV_OBJ_FLAG_HIDDEN)) {
+            lv_obj_clear_flag(ui_overlay_laser_enabled_label, LV_OBJ_FLAG_HIDDEN);
+        }
+    } else {
+        if (!lv_obj_has_flag(ui_overlay_laser_enabled_label, LV_OBJ_FLAG_HIDDEN)) {
+            lv_obj_add_flag(ui_overlay_laser_enabled_label, LV_OBJ_FLAG_HIDDEN);
+        }
+    }
+}
diff --git a/src/UI/screens/status.cpp b/src/UI/screens/status.cpp
@@ -3,6 +3,7 @@
 #include <freertos/queue.h>
 #include <freertos/event_groups.h>
 
+#include "K40/alerts.h"
 #include "K40/cooling.h"
 #include "K40/lids.h"
 #include "K40/voltage_probes.h"
@@ -313,6 +314,8 @@ void ui_status_update() {
     bool pending_lids_update = (pending_updates & STATUS_UPDATE_PROBE_LIDS) != 0;
     bool pending_flame_sensor_update = (pending_updates & STATUS_UPDATE_PROBE_FLAME_SENSOR) != 0;
 
+    uint8_t alerts_statuses = alerts_get_current_alerts();
+
     // Update voltage probes widgets
     if (pending_voltage_update && xQueuePeek(voltage_current_status_queue, &voltage_probes_values, 0) == pdTRUE) {
         // Probe 1
@@ -330,14 +333,7 @@ void ui_status_update() {
         lv_label_set_text(ui_status_voltages_v3_value, voltage_probe3_formatted_value);
         lv_bar_set_value(ui_status_voltages_v3_bar, (int)voltage_probes_values.probe3, LV_ANIM_ON);
 
-        updateWarningIcon(
-            ui_status_voltages_icon_warning,
-            voltage_probes_values.probe1 < VOLTAGE_PROBE_1_MIN_VALUE ||
-                voltage_probes_values.probe1 > VOLTAGE_PROBE_1_MAX_VALUE ||
-                voltage_probes_values.probe2 < VOLTAGE_PROBE_2_MIN_VALUE ||
-                voltage_probes_values.probe2 > VOLTAGE_PROBE_2_MAX_VALUE ||
-                voltage_probes_values.probe3 < VOLTAGE_PROBE_3_MIN_VALUE ||
-                voltage_probes_values.probe3 > VOLTAGE_PROBE_3_MAX_VALUE);
+        updateWarningIcon(ui_status_voltages_icon_warning, (alerts_statuses & ALERT_TYPE_VOLTAGE) != 0);
     }
 
     // Update cooling widgets
@@ -352,25 +348,21 @@ void ui_status_update() {
         lv_label_set_text(ui_status_cooling_temp_value, cooling_temp_formatted_value);
         lv_bar_set_value(ui_status_cooling_temp_bar, (int)cooling_values.temperature, LV_ANIM_ON);
 
-        updateWarningIcon(
-            ui_status_cooling_icon_warning,
-            cooling_values.flow < COOLING_FLOW_MIN_VALUE || cooling_values.flow > COOLING_FLOW_MAX_VALUE ||
-                cooling_values.temperature < COOLING_TEMP_MIN_VALUE ||
-                cooling_values.temperature > COOLING_TEMP_MAX_VALUE);
+        updateWarningIcon(ui_status_cooling_icon_warning, (alerts_statuses & ALERT_TYPE_COOLING) != 0);
     }
 
     // Update lids widgets
     if (pending_lids_update && xQueuePeek(lids_current_status_queue, &lids_states, 0) == pdTRUE) {
         lv_label_set_text(ui_status_lid_front_value, lids_states.front_opened ? "Opened" : "Closed");
         lv_label_set_text(ui_status_lid_back_value, lids_states.back_opened ? "Opened" : "Closed");
-        updateWarningIcon(ui_status_lid_icon_warning, lids_states.front_opened || lids_states.back_opened);
+        updateWarningIcon(ui_status_lid_icon_warning, (alerts_statuses & ALERT_TYPE_LIDS) != 0);
     }
 
     // Update flame sensor widgets
     if (pending_flame_sensor_update &&
         xQueuePeek(flame_sensor_current_status_queue, &flame_sensor_triggered, 0) == pdTRUE) {
         lv_label_set_text(ui_status_fire_value, flame_sensor_triggered ? "Triggered" : "OK");
-        updateWarningIcon(ui_status_fire_icon_warning, flame_sensor_triggered);
+        updateWarningIcon(ui_status_fire_icon_warning, (alerts_statuses & ALERT_TYPE_FLAME_SENSOR) != 0);
     }
 
     // Clear pending updates bits

diff --git a/src/UI/ui.cpp b/src/UI/ui.cpp
@@ -1,5 +1,5 @@
-#include "UI/alerts.h"
 #include "UI/menu.h"
+#include "UI/overlay.h"
 #include "UI/ui.h"
 #include "UI/screens/bed.h"
 #include "UI/screens/controls.h"
@@ -19,7 +19,7 @@ void ui_init() {
     lv_disp_set_theme(default_display, theme);
 
     // Initialize alerts overlay
-    ui_alerts_init();
+    ui_overlay_init();
 
     // Initialize screens
     ui_splashscreen_init();
@@ -33,7 +33,7 @@ void ui_init() {
 }
 
 void ui_update() {
-    ui_alerts_update();
+    ui_overlay_update();
     ui_menu_indicators_update();
     ui_status_update();
     ui_controls_update();