Diff: main.cpp

Revision:

3:2a4bee05d0c1

Parent:

2:f65d4206b47b

Child:

4:57e7983c861c

--- a/main.cpp	Fri Apr 24 18:55:46 2020 +0000
+++ b/main.cpp	Fri Apr 24 20:46:56 2020 +0000
@@ -134,24 +134,41 @@
 
 void display_ulcd()
 {
+    mutex_lock.lock();
+    uLCD.color(WHITE);
+    mutex_lock.unlock();
     while(1){
         mutex_lock.lock();
         if(risk_level <= 1 && datalogged){
-            uLCD.background_color(BLACK);
-            uLCD.text_string("Safe", 1, 4, FONT_7X8, WHITE);
+            uLCD.cls();
+            uLCD.locate(5, 7);
+            uLCD.text_width(2);
+            uLCD.text_height(2);
+            uLCD.background_color(GREEN);
+            uLCD.textbackground_color(GREEN);
+            uLCD.printf("Safe");
         }else if(risk_level == 2 && datalogged){
-            uLCD.background_color(BLACK);
-            uLCD.text_string("Cautious 2", 1, 4, FONT_7X8, WHITE);
+            uLCD.cls();
+            uLCD.locate(1, 7);
+            uLCD.text_width(2);
+            uLCD.text_height(2);
+            uLCD.background_color(0xFFFF00);
+            uLCD.textbackground_color(0xFFFF00);
+            uLCD.printf("Cautious");
         }else if(risk_level == 3 && datalogged){
-            uLCD.background_color(BLACK);
-            uLCD.text_string("Hazardous", 1, 4, FONT_7X8, WHITE);
+            uLCD.cls();
+            uLCD.locate(3, 7);
+            uLCD.text_width(2);
+            uLCD.text_height(2);
+            uLCD.background_color(RED);
+            uLCD.textbackground_color(RED);
+            uLCD.printf("Hazard");
         }else{
             uLCD.background_color(BLACK);
-            uLCD.text_string("ok", 1, 4, FONT_7X8, WHITE);
+            uLCD.printf("waiting");
         }
         mutex_lock.unlock();
     }
-
 }
 
 int main()