Team Fox
/
BAE_QM_MAR9
Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: FreescaleIAP mbed-rtos mbed
Fork of
workinQM_5thJan_azad
by 
Team Fox
Diff: TCTM.cpp
- Revision:
- 101:cf1976e16f28
- Parent:
- 100:af43bc82d3eb
diff -r af43bc82d3eb -r cf1976e16f28 TCTM.cpp
--- a/TCTM.cpp Thu Mar 09 08:08:10 2017 +0000
+++ b/TCTM.cpp Tue Mar 28 08:48:42 2017 +0000
@@ -428,7 +428,7 @@
telemetry[31] = (telemetry[31]<<1) | EPS_MAIN_STATUS;
telemetry[31] = (telemetry[31]<<1) | EPS_BTRY_TMP_STATUS;
telemetry[31] = (telemetry[31]<<3) | EPS_STATUS;
- telemetry[31] = (telemetry[31]<<2) | CDMS_SW_STATUS;
+ telemetry[31] = (telemetry[31]<<2) | CDMS_SW_STATUS;
// telemetry[30] = (telemetry[30]<<1) | EPS_BTRY_HTR_STATUS;//new to : implement
telemetry[32] = EPS_BTRY_HTR; //new to : implement
@@ -461,7 +461,7 @@
printf("\n\r the values bae of days,hour,min %d, %d, %d",days,hours,mins);
telemetry[50] = days;
- RETURN_UPTIME(I2C_last.read(),&days,&hours,&mins);
+ RETURN_UPTIME(I2C_last.read(),&days,&hours,&mins);
telemetry[50] = (telemetry[50]<<3) | (hours>>2);
telemetry[51] = hours;
telemetry[51] = (telemetry[51]<<6) | mins;
@@ -494,21 +494,23 @@
scaled = float_to_uint16(-5000,5000,actual_data.AngularSpeed_actual[2]);
telemetry[62] = (scaled>>8);
telemetry[63] = scaled;
-
- telemetry[64] = (~BCN_TX_OC_FAULT);
- telemetry[64] = (telemetry[64]<<1) | ACS_TR_XY_ENABLE;
- telemetry[64] = (telemetry[64]<<1) | ACS_TR_Z_ENABLE;
- telemetry[64] = (telemetry[64]<<1) | (~ACS_TR_XY_OC_FAULT);
- telemetry[64] = (telemetry[64]<<1) | (~ACS_TR_Z_OC_FAULT);
- telemetry[64] = (telemetry[64]<<1) | (~ACS_TR_XY_FAULT);
- telemetry[64] = (telemetry[64]<<1) | (~EPS_CHARGER_FAULT);
- telemetry[64] = (telemetry[64]<<1) | EPS_CHARGER_STATUS;
-
+ // printf("\n\r TM64_B %d",telemetry[64]);
+ telemetry[64]= 0;
+ telemetry[64] = (~BCN_TX_OC_FAULT&&0x01);
+ telemetry[64] = (telemetry[64]<<1) | (ACS_TR_XY_ENABLE&&0x01);
+ telemetry[64] = (telemetry[64]<<1) | ACS_TR_Z_ENABLE&&0x01;
+ telemetry[64] = (telemetry[64]<<1) | (~ACS_TR_XY_OC_FAULT&&0x01);
+ telemetry[64] = (telemetry[64]<<1) | (~ACS_TR_Z_OC_FAULT&&0x01);
+ telemetry[64] = (telemetry[64]<<1) | (~ACS_TR_XY_FAULT&&0x01);
+ telemetry[64] = (telemetry[64]<<1) | (~EPS_CHARGER_FAULT&&0x01);
+ telemetry[64] = (telemetry[64]<<1) | EPS_CHARGER_STATUS&&0x01;
+ printf("\n\r TM64_A %d",telemetry[64]);
+
telemetry[65] = EPS_BATTERY_GAUGE_ALERT;
- telemetry[65] = (telemetry[65]<<1) | (~CDMS_OC_FAULT);
- telemetry[65] = (telemetry[65]<<1) | (~ACS_ATS1_OC_FAULT);
- telemetry[65] = (telemetry[65]<<1) | (~ACS_ATS2_OC_FAULT);
- telemetry[65] = (telemetry[65]<<1) | (~ACS_TR_Z_FAULT);
+ telemetry[65] = (telemetry[65]<<1) | (~CDMS_OC_FAULT&&0x01);
+ telemetry[65] = (telemetry[65]<<1) | (~ACS_ATS1_OC_FAULT&&0x01);
+ telemetry[65] = (telemetry[65]<<1) | (~ACS_ATS2_OC_FAULT&&0x01);
+ telemetry[65] = (telemetry[65]<<1) | (~ACS_TR_Z_FAULT&&0x01);
telemetry[65] = (telemetry[65]<<3);
//3 spare
@@ -545,9 +547,12 @@
telemetry[122] = quant_data.Batt_voltage_quant;// changed (quant_data.Batt_voltage_quant<<3)+(quant_data.Batt_voltage_quant<<1);
telemetry[123] = quant_data.BAE_temp_quant;
- telemetry[124] = (uint8_t)(actual_data.Batt_gauge_actual[1]);
- telemetry[125] = quant_data.Batt_temp_quant[0];
- telemetry[126] = quant_data.Batt_temp_quant[1];
+ telemetry[124] = soc(); //(actual_data.Batt_gauge_actual[1]);//(uint8_t)(actual_data.Batt_gauge_actual[1]);
+ printf("\n\r SOC_A %d",telemetry[124]);
+ FCTN_BATT_TEMP_SENSOR_MAIN(actual_data.Batt_temp_actual);
+
+ telemetry[125] = actual_data.Batt_temp_actual[0]+50;//quant_data.Batt_temp_quant[0];
+ telemetry[126] = actual_data.Batt_temp_actual[1]+50;
telemetry[127] = BCN_TMP+50;
@@ -569,7 +574,7 @@
telemetry[2] = ACK_CODE;
telemetry[3] = 0x00;
- for(int i;i<16;i++)
+ for(int i=0;i<16;i++)
{
telemetry[i+4] = (uint8_t)bae_HK_minmax.voltage_max[i];//(bae_HK_minmax.voltage_max[i]<<3)+(bae_HK_minmax.voltage_max[i]<<2);
telemetry[i+20] = bae_HK_minmax.current_max[i];
@@ -597,7 +602,7 @@
/*min data*/
- for(int i;i<16;i++)
+ for(int i=0;i<16;i++)
{ telemetry[i+54] = (uint8_t)bae_HK_minmax.voltage_min[i];//(bae_HK_minmax.voltage_min[i]<<3)+(bae_HK_minmax.voltage_min[i]<<1);
//for(int i;i<16;i++)
telemetry[i+70] = bae_HK_minmax.current_min[i];