Diff: CDMS_HK.h

Revision:

338:d63eb331a67d

Parent:

333:cddef120cae3

Child:

339:5c4bda268e08

Child:

342:77b0d59897f7

Child:

343:cd7b1734f7a0

--- a/CDMS_HK.h	Sun Jan 01 09:50:36 2017 +0000
+++ b/CDMS_HK.h	Mon Jan 02 14:21:44 2017 +0000
@@ -67,7 +67,11 @@
         CDMS_HK_MAIN_COUNTER++;
 
         FCTN_CDMS_HK();         //collects temperatures
-        RSSI_VOLTAGE = COMRX_RSSI_VOLTAGE.read() * 3.3;//to be checked
+        if(!COM_RSSI_SET)
+        {
+            RSSI_VOLTAGE = COMRX_RSSI_VOLTAGE.read() * 3.3;//to be checked
+        }
+        else COM_RSSI_SET = 0;
         //VERIFY_COMRX();
         VERIFY_RTC();
         HANDLE_HW_FAULTS();
@@ -208,7 +212,13 @@
         beacon_array[7] = SD_FAULTCOUNT;
         beacon_array[8] = RTC_FAULTCOUNT >> 8;
         beacon_array[9] = RTC_FAULTCOUNT;
+        if(!COM_OC_SET)
         beacon_array[10] = (((SD_STATUS == DEVICE_DISABLED || SD_STATUS == DEVICE_OC_FAULT)?1:0)<<7)|(RTC_STATUS <<6)|(COM_RX_STATUS<<3)|(0<<2)|(COMRX_OC_FAULT<<1)|(COM_TX_OC_FAULT);
+        else
+        {
+            beacon_array[10] = (((SD_STATUS == DEVICE_DISABLED || SD_STATUS == DEVICE_OC_FAULT)?1:0)<<7)|(RTC_STATUS <<6)|(COM_RX_STATUS<<3)|(0<<2)|(COMRX_OC_FAULT<<1)|(com_oc_sw_status);
+            COM_OC_SET = 0;
+        }
         beacon_array[11] = (COM_RX_CNTRL <<7)|(COM_TX_CNTRL);
         beacon_array[12] = CDMS_HK_MAIN_COUNTER >>8;
         beacon_array[13] = CDMS_HK_MAIN_COUNTER;