Revision 43:a9682b81632b, committed 2017-11-22

Comitter:

spanesar

Date:

Wed Nov 22 12:48:08 2017 +0000

Parent:

42:4bf55ab88fbc

Child:

44:ca34a376a17c

Commit message:

put all serial commands in a single thread

Changed in this revision

--- a/main.cpp	Tue Nov 21 17:13:45 2017 +0000
+++ b/main.cpp	Wed Nov 22 12:48:08 2017 +0000
@@ -6,8 +6,8 @@
 #define READALL_OFF 1
 #define SETTIME_OFF 2
 #define SETT_OFF    4
-#define READ_OFF    7   
-#define ALL_OFF     9  
+#define READ_OFF    7
+#define ALL_OFF     9
 
 
 
@@ -36,15 +36,10 @@
 HTS221 humidity(I2C_SDA, I2C_SCL);
 
 void function1();
-void function2();
-void function3();
-void function4();
+
 
 Thread t1;
-Thread t2;
-Thread t3;
-Thread t4;
-Thread t5;
+
 
 osThreadId idMain;
 osThreadId id1;
@@ -52,147 +47,103 @@
 osThreadId id3;
 osThreadId id4;
 
-   
+
 
 void function1()
-{
-    while (true){
-    char buffer [128];
-    scanf("%127s", buffer);
-    string buffer_str(buffer);
-    char date [32];
-    strftime(date, 32, "%Y/%m/%d %a", localtime(&seconds));
-      char time [32];
-    strftime(time, 32, "%H:%M:%S %p", localtime(&seconds));
-    
-    if(buffer_str=="READALL") {
-        humidity.ReadTempHumi(&tempCelsius, &humi); // reads temperature and humity levels
-        barometer.get(); // gets barometer readings
-        // displays all the variables of time, date, temperature, humidity and all the barometric readings to the serial
-        printf("%s, %s, %4.2fC , %3.1f%%, %6.1f, %4.1f\n\r", time, date, tempCelsius, humi, barometer.pressure(), barometer.temperature());
-        myled = 1; // LED is ON
-        Thread::wait(200); // 200 ms NB 'Thread::wait(int d);' !!! d is in milliseconds!
-        myled = 0; // LED is OFF
-        t2.signal_set(READALL_OFF);
-        }
+{//begin function
+    while (true) {//begin while true
+        char buffer [128];
+        scanf("%127s", buffer);
+        string buffer_str(buffer);
+        char date [32];
+        strftime(date, 32, "%Y/%m/%d %a", localtime(&seconds));
+        char time [32];
+        strftime(time, 32, "%H:%M:%S %p", localtime(&seconds));
+
+        if(buffer_str=="READALL") {//begin if buffer readall
+            humidity.ReadTempHumi(&tempCelsius, &humi); // reads temperature and humity levels
+            barometer.get(); // gets barometer readings
+            // displays all the variables of time, date, temperature, humidity and all the barometric readings to the serial
+            printf("%s, %s, %4.2fC , %3.1f%%, %6.1f, %4.1f\n\r", time, date, tempCelsius, humi, barometer.pressure(), barometer.temperature());
+            myled = 1; // LED is ON
+            Thread::wait(200); // 200 ms NB 'Thread::wait(int d);' !!! d is in milliseconds!
+            myled = 0; // LED is OFF
+            t1.signal_set(READALL_OFF);
+        }//end if buffer readall
         Thread::wait(200);
-        
+
+
+        Thread::signal_wait(READALL_OFF);
+        scanf("%127s", buffer);
+        strftime(date, 32, "%Y/%m/%d %a", localtime(&seconds));
+        strftime(time, 32, "%H:%M:%S %p", localtime(&seconds));
+        if(buffer_str=="SETTIME") {// begin if buffer settime
+            set_time(1508268288);
+            printf("time and date updated to %s %s\n\r", time, date);
+            myled = 1;
+            Thread::wait(200);
+            myled = 0;
+            t1.signal_set(SETTIME_OFF);
+        }//end if buffer settime
+        Thread::wait(200);
+
+
+        Thread::signal_wait(SETTIME_OFF);
+        scanf("%127s", buffer);
+        strftime(date, 32, "%Y/%m/%d %a", localtime(&seconds));
+        strftime(time, 32, "%H:%M:%S %p", localtime(&seconds));
+        if(buffer_str=="SETT") // begin if buffer sett
+            for (count = 0; count < 5; count++) {
+                sz = snprintf(NULL, 0,"%s, %s, %4.2fC , %3.1f%%, %6.1f, %4.1f\n\r", time, date, tempCelsius, humi, barometer.pressure(), barometer.temperature());
+                buf = (char *)malloc(sz + 1);
+                snprintf(buf, sz + 1, "%s, %s, %4.2fC , %3.1f%%, %6.1f, %4.1f\n\r", time, date, tempCelsius, humi, barometer.pressure(), barometer.temperature());
+                printf("%s\n\r",buf);
+                printf("written to memory\n\r");
+                myled = 1;
+                Thread::wait(200);
+                myled = 0;
+                t1.signal_set(SETT_OFF);
+            } //end if buffer sett
+            Thread::wait(200);
+            
         
-        }
-}
-void function2()
-{
-    while (true){
-    Thread::signal_wait(READALL_OFF);    
-    char buffer [128];
-    scanf("%127s", buffer);
-    string buffer_str(buffer);
-    char date [32];
-    strftime(date, 32, "%Y/%m/%d %a", localtime(&seconds));
-      char time [32];
-    strftime(time, 32, "%H:%M:%S %p", localtime(&seconds));
-    if(buffer_str=="SETTIME") {
-        set_time(1508268288);
-        printf("time and date updated to %s %s\n\r", time, date);
-        myled = 1;
-        
-        t3.signal_set(SETTIME_OFF);
-        }
-        //Thread::wait(200);
-        //Thread::wait(200);
-        //myled = 0;
-        //Thread::wait(100);
+
+        Thread::signal_wait(SETT_OFF);
+        scanf("%127s", buffer);
+        if(buffer_str=="READ") { //begin if buffer read
+            printf("%s\n\r", buf);
+            myled = 1;
+            Thread::wait(200);
+            myled = 0;
+            osSignalSet(idMain, ALL_OFF);
+        }//end if buffer read
+        Thread::wait(200);
+        }//end while true
+    }//end function
+
+
+    int main() 
+    {
+        pc.baud(9600); //sets baud rate to 9600
+        time_t seconds = time(NULL);
+        idMain = osThreadGetId();
+        t1.start(function1);
+        id1 = t1.gettid();
+        humidity.init();
+        humidity.calib();
+        printf("Type SETTIME to set time and date [enter] \n\r");
+        printf("Type SETT to start sampling [ENTER]\n\r");
+        printf("Type DELETEALL to delete sensor data [enter]\n\r");
+        printf("Type READALL [enter]\n\r");
+        printf("Type READ to read sensor data in memory [ENTER]\n\r");
+
+
+        while(1) {
+            char buffer [128];
+            scanf("%127s", buffer);
+            string buffer_str(buffer);
+            osSignalWait(ALL_OFF,osWaitForever);
+
         }
 }
 
-void function3()
-{
-    while (true){
-    Thread::signal_wait(SETTIME_OFF);    
-    char buffer [128];
-    scanf("%127s", buffer);
-    string buffer_str(buffer);
-    char date [32];
-    strftime(date, 32, "%Y/%m/%d %a", localtime(&seconds));
-      char time [32];
-    strftime(time, 32, "%H:%M:%S %p", localtime(&seconds));
-    if(buffer_str=="SETT") {
-        for (count = 0; count < 5; count++) {
-            sz = snprintf(NULL, 0,"%s, %s, %4.2fC , %3.1f%%, %6.1f, %4.1f\n\r", time, date, tempCelsius, humi, barometer.pressure(), barometer.temperature());
-            buf = (char *)malloc(sz + 1);
-            snprintf(buf, sz + 1, "%s, %s, %4.2fC , %3.1f%%, %6.1f, %4.1f\n\r", time, date, tempCelsius, humi, barometer.pressure(), barometer.temperature());
-            printf("%s\n\r",buf);
-            printf("written to memory\n\r");
-            myled = 1;
-            t4.signal_set(SETT_OFF);
-            }
-            //Thread::wait(200);
-            //myled = 0;
-            //Thread::wait(100);
-            //wait(1);
-            }
-            }
-}
-void function4()
-{
-        while (true){
-    Thread::signal_wait(SETT_OFF);    
-    char buffer [128];
-    scanf("%127s", buffer);
-    string buffer_str(buffer);
-    char date [32];
-    strftime(date, 32, "%Y/%m/%d %a", localtime(&seconds));
-        if(buffer_str=="READ") {
-            printf("%s\n\r", buf);
-            myled = 1;
-            osSignalSet(idMain, ALL_OFF);
-            }
-            //Thread::wait(200);
-            //myled = 0;
-            //Thread::wait (100);
-        }
-    }
-
-int main()
-{
-    pc.baud(9600); //sets baud rate to 9600
-    idMain = osThreadGetId();
-    t1.start(function1);
-    t2.start(function2);
-    t3.start(function3);
-    t4.start(function4);
-    id1 = t1.gettid();
-    id2 = t2.gettid();
-    id3 = t3.gettid();
-    id4 = t4.gettid();
-    time_t seconds = time(NULL);
-  
-    humidity.init();
-    humidity.calib();
-    printf("Type SETTIME to set time and date [enter] \n\r");
-    printf("Type SETT to start sampling [ENTER]\n\r");
-    printf("Type DELETEALL to delete sensor data [enter]\n\r");
-    printf("Type READALL [enter]\n\r");
-    printf("Type READ to read sensor data in memory [ENTER]\n\r");
-
-
-
-
-
-    while(1) {
-        char buffer [128];
-        scanf("%127s", buffer);
-        string buffer_str(buffer);
-        osSignalWait(ALL_OFF,osWaitForever);
-
-
-        if(buffer_str=="?") {
-            printf("SOFT253 simple Temperature Humidity and Pressure Sensor Monitor\n\r");
-            printf("Using the X-NUCLEO-IKS01A1 shield and MBED Libraries\n\r");
-        }
-        
-
-    }
-
-
-}