Diff: CDMS_HK.h

Revision:

354:0da912441c7b

Parent:

353:e1803e801e20

--- a/CDMS_HK.h	Tue Feb 21 06:30:56 2017 +0000
+++ b/CDMS_HK.h	Sat Mar 11 04:46:31 2017 +0000
@@ -12,6 +12,7 @@
 void COLLECT_CDMS_RAM();
 
 extern uint8_t beacon_array[134];
+//extern RSSI_MAX;
 
 AnalogIn TempInput(PIN27);          // Input from Current Multiplexer
 AnalogIn CDMS_temp_sensor(PIN53);
@@ -22,12 +23,12 @@
 DigitalOut SelectLinec3 (PIN79); // MSB of Select Lines
 DigitalOut SelectLinec2 (PIN78);
 // SBC V1.0
-//DigitalOut SelectLinec1 (PIN76);
-//DigitalOut SelectLinec0 (PIN77); // LSB of Select Lines
+DigitalOut SelectLinec1 (PIN76);
+DigitalOut SelectLinec0 (PIN77); // LSB of Select Lines
 
 // SBC V2.0
-DigitalOut SelectLinec1 (PIN77);
-DigitalOut SelectLinec0 (PIN76); // LSB of Select Lines
+//DigitalOut SelectLinec1 (PIN77);
+//DigitalOut SelectLinec0 (PIN76); // LSB of Select Lines
 
 
 Convolution CDMS_HEALTH;
@@ -82,6 +83,8 @@
             RSSI_VOLTAGE = COMRX_RSSI_VOLTAGE.read() * 3.3;//to be checked
         }
         else COM_RSSI_SET = 0;
+          gPC.printf("RSSI_MAX = %f",RSSI_MAX);
+  //        gPC.printf("RSSI= %f",RSSI_VOLTAGE);
         //VERIFY_COMRX();
         VERIFY_RTC();
         HANDLE_HW_FAULTS();
@@ -91,7 +94,7 @@
         CDMS_quant[0]= COM_ADF_TMP+40;
         CDMS_quant[1]= (uint8_t)quant_data.CDMS_temp_quant;
         CDMS_quant[2]= (uint8_t)(RSSI_VOLTAGE*10);
-        CDMS_quant[3]= (uint8_t)(EPS_BTRY_VOLT*33*(62.0/11));
+        CDMS_quant[3]= (uint8_t)(EPS_BTRY_VOLT.read()*33*(62.0/11));
         for(int i=0; i<16; i++) {
             CDMS_quant[i+4]= (uint8_t)quant_data.temp_quant[i];
         }
@@ -257,7 +260,7 @@
             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[11] = (COM_RX_CNTRL <<7)|(COM_TX_CNTRL<<6);
         beacon_array[12] = CDMS_HK_MAIN_COUNTER >>8;
         beacon_array[13] = CDMS_HK_MAIN_COUNTER;
         beacon_array[14] = PL_MAIN_COUNTER >>8;
@@ -388,14 +391,17 @@
             quant_data.temp_quant[Iteration]=actual_data.temp_actual[Iteration];
             wait(0.001);
         } else if(Iteration<14)
+           {
             quant_data.temp_quant[Iteration]=quantiz(tstart_thermistor,tstep_thermistor,actual_data.temp_actual[Iteration]);
         // quant_data.temp_quant[Iteration]=quantiz(0,1,actual_data.temp_actual[Iteration]);
+            quant_data.temp_quant[13]= COM_PA_TMP_IN_TX;
+            }
         else
             // quant_data.temp_quant[Iteration]=quantiz(tstart,tstep,actual_data.temp_actual[Iteration]);
             quant_data.temp_quant[Iteration]=quantiz(tstart,tstep,actual_data.temp_actual[Iteration]);
     }
-    quant_data.CDMS_temp_quant=quantiz(tstart,tstep,actual_data.CDMS_temp_actual);
-
+ //   quant_data.CDMS_temp_quant=quantiz(tstart,tstep,actual_data.CDMS_temp_actual);
+     quant_data.CDMS_temp_quant=10*RSSI_MAX;
     minMaxHkData();
 }
 
@@ -501,13 +507,13 @@
             SD_FAULTCOUNT++;
             SD_STATUS = (SD_FAULTCOUNT == 3) ? DEVICE_DISABLED :DEVICE_OC_FAULT;
             if(SD_FAULTCOUNT == 3) {
-                WRITE_TO_EEPROM(2,DEVICE_DISABLED);
+                FCTN_CDMS_WR_FLASH(2,DEVICE_DISABLED);
                 gPC.printf("Declaring SD card permanantly Disabled");
             }
         } else {
             SD_STATUS = DEVICE_POWERED;
             if(SD_STATUS != DEVICE_POWERED)
-                WRITE_TO_EEPROM(2,DEVICE_POWERED);
+                FCTN_CDMS_WR_FLASH(2,DEVICE_POWERED);
             SD_FAULTCOUNT = 0;
         }
     }
@@ -528,13 +534,13 @@
             BAE_FAULTCOUNT++;
             BAE_STATUS = (BAE_FAULTCOUNT == 3)?DEVICE_DISABLED:DEVICE_OC_FAULT;
             if(BAE_FAULTCOUNT == 3) {
-                WRITE_TO_EEPROM(1,DEVICE_DISABLED);
+                FCTN_CDMS_WR_FLASH(1,DEVICE_DISABLED);
                 gPC.printf("Declaring BAE permanantly Disabled");
             }
         } else {
             BAE_STATUS = DEVICE_POWERED;
             if(SD_STATUS != DEVICE_POWERED);
-            WRITE_TO_EEPROM(1,DEVICE_POWERED);
+            FCTN_CDMS_WR_FLASH(1,DEVICE_POWERED);
             BAE_FAULTCOUNT = 0;
         }
     }
@@ -565,7 +571,7 @@
             PL_FAULTCOUNT++;
             PL_STATUS = (PL_FAULTCOUNT == 3)?DEVICE_DISABLED:DEVICE_OC_FAULT;
             if(PL_FAULTCOUNT == 3) {
-                WRITE_TO_EEPROM(3,DEVICE_DISABLED);
+               FCTN_CDMS_WR_FLASH(3,DEVICE_DISABLED);
                 gPC.printf("Declaring PL_BEE permanantly Disabled");
             }
         } else {
@@ -581,7 +587,7 @@
             }
             PL_STATUS = DEVICE_ENABLED;
             if(PL_STATUS != DEVICE_ENABLED)
-                WRITE_TO_EEPROM(3,DEVICE_ENABLED);
+                FCTN_CDMS_WR_FLASH(3,DEVICE_ENABLED);
             PL_FAULTCOUNT = 0;
         }
     }