Rioux Chem Control Box

Revision 5:b56a4592aac0, committed 2021-09-12

Comitter:

wavenumber

Date:

Sun Sep 12 20:14:44 2021 +0000

Parent:

4:e3eda81c97ae

Child:

6:6a870e1e52c1

Commit message:

Updated the Temperature terminal common w/ Chris's status

Changed in this revision

--- a/DRIVERS/CHEM_BOX_COMMON.cpp	Thu Aug 05 02:16:11 2021 +0000
+++ b/DRIVERS/CHEM_BOX_COMMON.cpp	Sun Sep 12 20:14:44 2021 +0000
@@ -968,18 +968,39 @@
 {
     float Temp = 0;
     int Channel = -1;
+    int Status = 0;
     
      if(sscanf(arg,"%d",&Channel) == 1)
         {
                 Temp = ReadThermocouple(Channel);
-                 PC.printf("TEMP:%d:%.2f:%d\r\n",Channel,Temp,Thermocouple_OC);
+                
+                if(ReadThermocouple_FAULT() & (1<<Channel))
+                {
+                    Status = 1;
+                }
+                else
+                {
+                    Status = 0;
+                }
+                
+                 PC.printf("TEMP:%d:%.2f:%d\r\n",Channel,Temp,Status);
         }
         else
         {
             for(Channel = 0; Channel<12;Channel++)
             {
                  Temp = ReadThermocouple(Channel);
-                  PC.printf("TEMP:%d:%.2f:%d\r\n",Channel,Temp,Thermocouple_OC);
+                 
+                 if(ReadThermocouple_FAULT() & (1<<Channel))
+                 {
+                    Status = 1;
+                 }
+                 else
+                 {
+                    Status = 0;
+                 }
+                 
+                  PC.printf("TEMP:%d:%.2f:%d\r\n",Channel,Temp,Status);
             }
         }
 }