Diff: BCN.cpp

Revision:

94:17172893d231

Parent:

93:e3fd5439e919

Child:

97:36a91c432cb1

--- a/BCN.cpp	Wed Jan 04 14:22:31 2017 +0000
+++ b/BCN.cpp	Thu Jan 05 12:49:47 2017 +0000
@@ -71,12 +71,12 @@
     SHORT_HK_data[5] = 0x28;
     SHORT_HK_data[6] = 0x8A;
     
-    SHORT_HK_data[7] = quant_data.voltage_quant[15];
+    SHORT_HK_data[7] = quant_data.voltage_quant[15]/10;
     SHORT_HK_data[7] = (SHORT_HK_data[7] & 0xF0) | (quant_data.current_quant[1]>>4);
     
     //taking only the most significant bits
     SHORT_HK_data[8] = actual_data.bit_data_acs_mg[0]>>8;
-    SHORT_HK_data[8] = (SHORT_HK_data[8] & 0xF0) | BCN_TMP>>4;
+    SHORT_HK_data[8] = (SHORT_HK_data[8] & 0xF0) | (BCN_TMP+50)>>3;
     //SHORT_HK_data[9] = 0xFF;
     SHORT_HK_data[9] = float_to_uint8(-50,100,EPS_BTRY_TMP_AVG);
     SHORT_HK_data[9] = (SHORT_HK_data[9]&0xF0) | BAE_RESET_COUNTER>>4;
@@ -84,14 +84,14 @@
     
     RETURN_UPTIME(BAE_uptime.read(),&days,&hours,&mins);
     SHORT_HK_data[10] = CDMS_OC_FAULT;
-    SHORT_HK_data[10] = (SHORT_HK_data[10]<<1) | 0;//receiver_oc_fault//to be diss;
-    SHORT_HK_data[10] = (SHORT_HK_data[10]<<1) | ((quant_data.voltage_quant[5]>>2)&0x3C);
-    SHORT_HK_data[10] = (SHORT_HK_data[10]<<2) | ((days>>3)&0x03);
+    SHORT_HK_data[10] = (SHORT_HK_data[10]<<1) | 0;//receiver_oc_fault//to be diss - Is it (tc[10]>>1)&0x01 ?
+    SHORT_HK_data[10] = (SHORT_HK_data[10]<<6) | ((quant_data.voltage_quant[5])&0x3C);
+    SHORT_HK_data[10] = (SHORT_HK_data[10]) | ((days>>3)&0x03);
     SHORT_HK_data[11] = (days<<5) | (hours&0x1F);
     
     RETURN_UPTIME(I2C_last.read(),&days,&hours,&mins);
     SHORT_HK_data[12] = EPS_CHARGER_STATUS;
-    SHORT_HK_data[12] = (SHORT_HK_data[12]<<4) | (quant_data.voltage_quant[6]>>4);
+    SHORT_HK_data[12] = (SHORT_HK_data[12]<<4) | (quant_data.voltage_quant[6]>>2);
     SHORT_HK_data[12] = (SHORT_HK_data[12]<<3) | (days>>2);    
     SHORT_HK_data[13] = (days<<6) | (mins&0x3F);
 
@@ -100,7 +100,10 @@
     #if short_bcn_print
     pc_bcn.printf("\n\rShort BCN data:\n");
     for(int ib = 0;ib<15;ib++) pc_bcn.printf("\n\r%02x",SHORT_HK_data[ib]);
-    pc_bcn.printf("\n");
+    pc_bcn.printf("\n\rV_D = %d\n",quant_data.voltage_quant[6]);
+    pc_bcn.printf("V_C = %d\n",quant_data.voltage_quant[5]);
+    pc_bcn.printf("V_C in bits = %x\n",(quant_data.voltage_quant[5])&0x3C);
+    
     #endif
 }