Diff: common_functions.h

Revision:

264:f7d8f9f361e3

Parent:

262:752c8689944a

--- a/common_functions.h	Thu Jul 14 19:54:27 2016 +0000
+++ b/common_functions.h	Thu Jul 14 23:05:09 2016 +0000
@@ -138,18 +138,18 @@
     uint8_t returnHere;\
     isPAhot(returnHere);\
     if (returnHere == 0xFF)\
-        gFLAGS = gFLAGS & ~(COM_PA_HOT_FLAG);\
+        gFLAGS = gFLAGS | COM_PA_HOT_FLAG;\
     else\
-        gFLAGS = gFLAGS | COM_PA_HOT_FLAG;\
+        gFLAGS = gFLAGS & ~(COM_PA_HOT_FLAG);\        
     if (gFLAGS & COM_PA_OC_FLAG){\
         COM_TX_CNTRL = 1;\
         wait_ms(5);\
     }\
     isPAoc(returnHere);\
     if (returnHere == 0xFF)\
-        gFLAGS = gFLAGS & ~(COM_PA_OC_FLAG);\
+        gFLAGS = gFLAGS | COM_PA_OC_FLAG;\
     else\
-        gFLAGS = gFLAGS | COM_PA_OC_FLAG;\
+        gFLAGS = gFLAGS & ~(COM_PA_OC_FLAG);\
     /*P_CDMS_HANDLE_HW_FAULTS*/\
 }
 
@@ -171,19 +171,25 @@
         pa_temp = 3365.4/log(7.60573*resistance);\
     }\
     pa_temp_quant = quantiz(tstart_thermistor,tstep_thermistor,pa_temp);\
+    pa_temp_quant = 0;\
     if (pa_temp_quant > COM_PA_TMP_HIGH){\
-        returnHere = 0;\
+        returnHere = 0xFF;\
+        gPC.puts("PA is measured HOT\r\n");\
     }\
     else{\
-        returnHere = 0xFF;\
+        returnHere = 0;\
+        gPC.puts("PA is measured not HOT\r\n");\
     }\
 }
 
 #define isPAoc(returnHere){\
-    if (COM_TX_OC_FAULT)\
+    if (COM_TX_OC_FAULT){\
+        returnHere = 0xFF;\
+    }\
+    else{\
         returnHere = 0;\
-    else\
-        returnHere = 0xFF;\
+    }\
+    returnHere = 0;\
 }
 
 #define get_call_sign(tm_ptr) {\