Revision 11:03f86b377280, committed 22 months ago

Comitter:

krishnamvs

Date:

Thu Dec 08 16:58:55 2022 +0000

Parent:

10:112572fbb168

Commit message:

Final

Changed in this revision

diff -r 112572fbb168 -r 03f86b377280 ENS160_Library.lib
--- a/ENS160_Library.lib	Tue Dec 06 21:23:57 2022 +0000
+++ b/ENS160_Library.lib	Thu Dec 08 16:58:55 2022 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/users/krishnamvs/code/ENS160_Library/#63ff52373e71
+https://os.mbed.com/users/krishnamvs/code/ENS160_Library/#a0c26b45ad20

diff -r 112572fbb168 -r 03f86b377280 PinDetect.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/PinDetect.lib	Thu Dec 08 16:58:55 2022 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/AjK/code/PinDetect/#cb3afc45028b

diff -r 112572fbb168 -r 03f86b377280 main.cpp
--- a/main.cpp	Tue Dec 06 21:23:57 2022 +0000
+++ b/main.cpp	Thu Dec 08 16:58:55 2022 +0000
@@ -1,63 +1,132 @@
-#include "mbed.h"
+#include "mbed.h" 
+#include "rtos.h"
+#include "uLCD_4DGL.h"
+#include "PinDetect.h"
 #include "ens160_i2c.h"
-#include "uLCD_4DGL.h"
 
 ENS160 myENS(p9, p10, ENS160_ADDRESS_HIGH);
-DigitalOut myled(LED1);
-Serial pc(USBTX, USBRX);
 uLCD_4DGL uLCD(p28,p27,p30); // serial tx, serial rx, reset pin;
+PinDetect pb(p8);
+Mutex mutex;
+
+uint8_t volatile aqi;
+uint32_t volatile co2,tvoc;
+uint8_t volatile current_screen = 0;
+
+void redrawBG()
+{
+    mutex.lock();
+    uLCD.color(WHITE);
+    uLCD.circle(64,64,64,WHITE);
+    uLCD.filled_circle(64,64,60,BLUE);   
+    mutex.unlock();
+}
+
+void getData(void const *args)
+{
+    while(1)
+    {
+        aqi = myENS.getAQI();
+        co2 = myENS.getECO2();
+        tvoc = myENS.getTVOC();
+        Thread::wait(100);
+    }
+}
+
+void allScreens()
+{
+    uLCD.text_width(1.75); //4X size text
+    uLCD.text_height(1.75);
+    uLCD.locate(6,4);
+    uLCD.printf("AQI:");
+    uLCD.printf("%d",aqi);
+    uLCD.locate(4,7);
+    uLCD.printf("C02:");
+    uLCD.printf("%d", co2);
+    uLCD.printf("ppm");
+    uLCD.locate(4,10);
+    uLCD.printf("TVOC:");
+    uLCD.printf("%d",tvoc);
+    uLCD.printf("ppb");
+}
 
-bool printedCompensation = false; 
-int ensStatus; 
+void AQI()
+{
+    uLCD.text_width(2); //4X size text
+    uLCD.text_height(2);
+    uLCD.locate(3,3);
+    uLCD.printf("AQI\n");
+    uLCD.locate(4,4);
+    uLCD.printf("%d",aqi);
+}
+
+void CO2()
+{
+    uLCD.text_width(2); //4X size text
+    uLCD.text_height(2);
+    uLCD.locate(3,3);
+    uLCD.printf("C02\n");
+    uLCD.locate(1,4);
+    uLCD.printf("%d", co2);
+    uLCD.printf("ppm");
+}
 
-float rh;
-float tempC; 
+void TVOC()
+{
+    uLCD.text_width(2); //4X size text
+    uLCD.text_height(2);
+    uLCD.locate(3,3);
+    uLCD.printf("TVOC\n");
+    uLCD.locate(2,4);
+    uLCD.printf("%d",tvoc);
+    uLCD.printf("ppb");
+}
+
+void updateScreen()
+{
+    mutex.lock();
+    switch (current_screen)
+    {
+        case 0:
+            allScreens();
+            break;
+        case 1:
+            AQI();
+            break;
+        case 2:
+            TVOC();
+            break;
+        case 3:
+            CO2();
+            break;
+    }
+    mutex.unlock();
+}
+
+void pb_hit_callback()
+{
+    current_screen = current_screen + 1;
+    if (current_screen > 3)
+        current_screen = 0;
+}
 
 int main()
 {
-    if (!myENS.init())
+    pb.mode(PullUp);
+    wait(.001);
+    pb.attach_deasserted(&pb_hit_callback);
+    pb.setSampleFrequency();
+    Thread t1(getData);
+    redrawBG();
+    uint8_t oldScreen = current_screen;
+    while(1)
     {
-        pc.printf("Hello, ENS160! Reading raw data from registers...\n");
-        while(1);
-    }
-    if( myENS.setOperatingMode(SFE_ENS160_RESET) )
-        pc.printf("Ready.\n");
-    wait(0.1);
-    myENS.setOperatingMode(SFE_ENS160_IDLE);
-    wait(0.5);
-    myENS.setOperatingMode(SFE_ENS160_STANDARD);
-    ensStatus = myENS.getFlags();
-    pc.printf("Gas Sensor Status Flag: ");
-    pc.printf("%d\n", ensStatus);
-    while (1)
-    {
-        if( myENS.checkDataStatus() )
+        if (oldScreen != current_screen)
         {
-            if( printedCompensation == false)
-            {
-                pc.printf("---------------------------\n");
-                pc.printf("Compensation Temperature: ");
-                pc.printf("%f\n", myENS.getTempCelsius());
-                pc.printf("---------------------------");
-                pc.printf("Compensation Relative Humidity: ");
-                pc.printf("%f\n", myENS.getRH());
-                pc.printf("---------------------------\n");
-                printedCompensation = true;
-                wait(0.5);
-            }
-
-            pc.printf("Air Quality Index (1-5) : ");
-            pc.printf("%d\n", myENS.getAQI());
-
-            pc.printf("Total Volatile Organic Compounds: ");
-            pc.printf("%d", myENS.getTVOC());
-            pc.printf("ppb\n");
-
-            pc.printf("CO2 concentration: ");
-            pc.printf("%d", myENS.getECO2());
-            pc.printf("ppm\n");
-
+            oldScreen = current_screen;
+            redrawBG();
         }
-        wait(0.1);
-        }
+        updateScreen();
+        Thread::wait(1000);
+    }
 }
\ No newline at end of file

diff -r 112572fbb168 -r 03f86b377280 mbed-rtos.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mbed-rtos.lib	Thu Dec 08 16:58:55 2022 +0000
@@ -0,0 +1,1 @@
+http://developer.mbed.org/users/mbed_official/code/mbed-rtos/#58563e6cba1e

diff -r 112572fbb168 -r 03f86b377280 mbed.bld
--- a/mbed.bld	Tue Dec 06 21:23:57 2022 +0000
+++ b/mbed.bld	Thu Dec 08 16:58:55 2022 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/mbed_official/code/mbed/builds/34e6b704fe68
\ No newline at end of file
+https://os.mbed.com/users/mbed_official/code/mbed/builds/0ab6a29f35bf
\ No newline at end of file