FaSTTUBe/steering-wheel-evo
56
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disable alarms for 60s after clearing

Browse Source
This commit is contained in:
Jasper Blanckenburg 2022-03-31 19:21:08 +02:00
parent 661e1a2274
commit c6793a2129
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/FT18_STW_DISPLAY/FT18_STW_DISPLAY.cpp
View File

@ -178,6 +178,8 @@ String get_label(Value val) {
bool check_alarms() { bool check_alarms() {
static uint32_t poil_last_valid, tmot_last_valid, toil_last_valid; static uint32_t poil_last_valid, tmot_last_valid, toil_last_valid;
static int32_t poil_last_cleared = INT32_MIN, tmot_last_cleared = INT32_MIN,
toil_last_cleared = INT32_MIN;
uint32_t now = millis(); uint32_t now = millis();
if (Vehicle_data.p_oil >= POIL_ALARM_THRESH || Vehicle_data.speed == 0) { if (Vehicle_data.p_oil >= POIL_ALARM_THRESH || Vehicle_data.speed == 0) {
poil_last_valid = now; poil_last_valid = now;
@ -189,21 +191,33 @@ bool check_alarms() {
if (Vehicle_data.t_oil <= TOIL_ALARM_THRESH) { if (Vehicle_data.t_oil <= TOIL_ALARM_THRESH) {
toil_last_valid = now; toil_last_valid = now;
} }
// bool poil_alarm = now - poil_last_valid >= POIL_ALARM_TIME; // bool poil_alarm = now - poil_last_valid >= POIL_ALARM_TIME && now -
// poil_last_cleared >= ALARM_CLEAR_TIME;
bool poil_alarm = false; bool poil_alarm = false;
bool tmot_alarm = now - tmot_last_valid >= TMOT_ALARM_TIME; bool tmot_alarm = now - tmot_last_valid >= TMOT_ALARM_TIME &&
bool toil_alarm = now - toil_last_valid >= TOIL_ALARM_TIME; now - tmot_last_cleared >= ALARM_CLEAR_TIME;
bool toil_alarm = now - toil_last_valid >= TOIL_ALARM_TIME &&
now - toil_last_cleared >= ALARM_CLEAR_TIME;
bool alarm_active = poil_alarm || tmot_alarm || toil_alarm; bool alarm_active = poil_alarm || tmot_alarm || toil_alarm;
if (alarm_active) { if (alarm_active) {
String alarm_text = ""; String alarm_text = "";
if (poil_alarm) if (poil_alarm)
alarm_text += "PO"; alarm_text += "POIL";
alarm_text += "|";
if (tmot_alarm) if (tmot_alarm)
alarm_text += "TM"; alarm_text += "TMOT";
alarm_text += "|";
if (toil_alarm) if (toil_alarm)
alarm_text += "TO"; alarm_text += "TOIL";
alarm(alarm_text); alarm(alarm_text);
now = millis();
if (poil_alarm)
poil_last_cleared = now;
if (tmot_alarm)
tmot_last_cleared = now;
if (toil_alarm)
toil_last_cleared = now;
} }
return alarm_active; return alarm_active;
@ -303,14 +317,12 @@ void update_display() {
void alarm(String textstr) { void alarm(String textstr) {
uint8_t x = 1; uint8_t x = 1;
; ;
char text[7]; tft.setTextSize(6, 6);
textstr.toCharArray(text, 7);
tft.setTextSize(8, 8);
while (x == 1) { while (x == 1) {
if (!tft.disconnected) { if (!tft.disconnected) {
tft.setTextColor(EA_BLACK, EA_RED); tft.setTextColor(EA_BLACK, EA_RED);
tft.fillDisplayColor(EA_RED); tft.fillDisplayColor(EA_RED);
tft.drawText(5, 68, 'L', text); tft.drawText(5, 10, 'L', textstr.c_str());
} }
for (int j = 0; j < 16; j++) { for (int j = 0; j < 16; j++) {
digitalWrite(led_s[j], HIGH); digitalWrite(led_s[j], HIGH);
@ -319,7 +331,7 @@ void alarm(String textstr) {
if (!tft.disconnected) { if (!tft.disconnected) {
tft.setTextColor(EA_BLACK, EA_WHITE); tft.setTextColor(EA_BLACK, EA_WHITE);
tft.fillDisplayColor(EA_WHITE); tft.fillDisplayColor(EA_WHITE);
tft.drawText(5, 68, 'L', text); tft.drawText(5, 10, 'L', textstr.c_str());
} }
for (int j = 0; j < 16; j++) { for (int j = 0; j < 16; j++) {
digitalWrite(led_s[j], LOW); digitalWrite(led_s[j], LOW);

5
lib/FT18_STW_DISPLAY/FT18_STW_DISPLAY.h
View File

@ -18,8 +18,9 @@
#define TMOT_SAFE_VALUE (40 + 200) #define TMOT_SAFE_VALUE (40 + 200)
#define TMOT_ALARM_TIME 20000 // ms #define TMOT_ALARM_TIME 20000 // ms
#define TOIL_ALARM_THRESH (40 + 150) #define TOIL_ALARM_THRESH (40 + 150)
#define TOIL_ALARM_TIME 10000 // ms #define TOIL_ALARM_TIME 10000 // ms
#define ENC_DISPLAY_TIME 1000 // ms #define ALARM_CLEAR_TIME 60000 // ms
#define ENC_DISPLAY_TIME 1000 // ms
String pad_left(String orig, int len, char pad_char = ' '); String pad_left(String orig, int len, char pad_char = ' ');