Team Fox
/
workinQM_5thJan_azad
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_10thDec
by 
Team Fox
Diff: TCTM.cpp
- Revision:
- 27:61c856be467e
- Parent:
- 20:949d13045431
- Child:
- 33:76f2b8735501
diff -r 950dbe9fbeb8 -r 61c856be467e TCTM.cpp
--- a/TCTM.cpp Fri Jul 01 18:14:34 2016 +0000
+++ b/TCTM.cpp Sat Jul 02 14:06:34 2016 +0000
@@ -132,6 +132,7 @@
extern uint8_t BAE_STANDBY;
extern uint8_t BAE_INIT_STATUS;
extern uint8_t BAE_RESET_COUNTER;
+extern uint8_t BAE_MNG_I2C_STATUS;
/*given a default value as of now shuld read value from flash and increment it write it back very time it starts(bae)*/
extern uint32_t BAE_STATUS;//extern uint32_t BAE_STATUS;
@@ -331,14 +332,15 @@
telemetry[3] = ACS_ATS_STATUS;
telemetry[4] = ACS_TR_XY_SW_STATUS;
telemetry[4] = (telemetry[4]<<2)| ACS_TR_Z_SW_STATUS;
- telemetry[4] = (telemetry[4]<<1) | ACS_DETUMBLING_ALGO_TYPE;
- telemetry[4] = (telemetry[4]<<3) | ACS_STATE;
- telemetry[5] = BCN_TX_SW_STATUS;
+ telemetry[4] = (telemetry[4]<<4) | ACS_STATE;
+ telemetry[5] = ACS_DETUMBLING_ALGO_TYPE;
+ telemetry[5] = (telemetry[5]<<2) | BCN_TX_SW_STATUS;
telemetry[5] = (telemetry[5]<<1) | BCN_SPND_TX;
telemetry[5] = (telemetry[5]<<1) | BCN_FEN;
telemetry[5] = (telemetry[5]<<1) | BCN_LONG_MSG_TYPE;
telemetry[5] = (telemetry[5]<<1) | EPS_BTRY_HTR_AUTO;//EPS_BATTERY_HEATER_ENABLE
- //now two spares in telemetry[5]
+ telemetry[5] = (telemetry[5]<<1);
+ //now one spares in telemetry[5]
telemetry[6] = BAE_RESET_COUNTER;
telemetry[7] = EPS_SOC_LEVEL_12;
telemetry[8] = EPS_SOC_LEVEL_23;
@@ -371,26 +373,26 @@
//BAE RAM PARAMETER
telemetry[28] = BAE_INIT_STATUS;
- telemetry[28] = (telemetry[28]<<1) | 0;//change it
+ telemetry[28] = (telemetry[28]<<1) | BAE_MNG_I2C_STATUS;//changed
telemetry[28] = (telemetry[28]<<1) | BCN_INIT_STATUS;
telemetry[28] = (telemetry[28]<<1) | BCN_TX_MAIN_STATUS;
telemetry[28] = (telemetry[28]<<3) | BCN_TX_STATUS;
- telemetry[28] = (telemetry[28]<<3) | ACS_INIT_STATUS;
+ telemetry[28] = (telemetry[28]<<1) | ACS_INIT_STATUS;
telemetry[29] = ACS_DATA_ACQ_STATUS;
telemetry[29] = (telemetry[29]<<1) | ACS_MAIN_STATUS;
- telemetry[29] = (telemetry[29]<<3) | ACS_STATUS;
+ telemetry[29] = (telemetry[29]<<4) | ACS_STATUS;
telemetry[29] = (telemetry[29]<<1) | EPS_INIT_STATUS;
- telemetry[29] = (telemetry[29]<<3) | EPS_BATTERY_GAUGE_STATUS;
- telemetry[30] = EPS_MAIN_STATUS;
+ telemetry[30] = EPS_BATTERY_GAUGE_STATUS;
+ telemetry[30] = (telemetry[30]<<1) | EPS_MAIN_STATUS;
telemetry[30] = (telemetry[30]<<1) | EPS_BATTERY_TEMP_STATUS;
telemetry[30] = (telemetry[30]<<3) | EPS_STATUS;
telemetry[30] = (telemetry[30]<<2) | CDMS_SW_STATUS;
// telemetry[30] = (telemetry[30]<<1) | EPS_BTRY_HTR_STATUS;//new to : implement
- //spare 1
- //spare 5
- telemetry[31] = BAE_STANDBY;
+ //telemetry[31] = EPS_BTRY_HTR_STATUS;//new to : implement
+ //spare 4
+ telemetry[31] = (telemetry[31]<<7) | BAE_STANDBY;
// 6 next telemetries value to be given by registers
telemetry[32] = ATS1_EVENT_STATUS_RGTR;
telemetry[33] = ATS1_SENTRAL_STATUS_RGTR;
@@ -437,11 +439,12 @@
telemetry[61] = (telemetry[61]<<1) | EPS_CHARGER_FAULT;
telemetry[61] = (telemetry[61]<<1) | EPS_CHARGER_STATUS;
- telemetry[62] = (telemetry[62]<<1) | EPS_BATTERY_GAUGE_ALERT;
+ telemetry[62] = EPS_BATTERY_GAUGE_ALERT;
telemetry[62] = (telemetry[62]<<1) | CDMS_OC_FAULT;
telemetry[62] = (telemetry[62]<<1) | ACS_ATS1_OC_FAULT;
telemetry[62] = (telemetry[62]<<1) | ACS_ATS2_OC_FAULT;
telemetry[62] = (telemetry[62]<<1) | ACS_TR_Z_FAULT;
+ telemetry[62] = (telemetry[62]<<3);
//3 spare
telemetry[63] = ACS_TR_X_PWM;
@@ -454,6 +457,7 @@
telemetry[66] = 0x00;
telemetry[66] = (telemetry[65]<<1) | alarmmode;
telemetry[66] = (telemetry[65]<<1) | controlmode_mms;
+ telemetry[66] = (telemetry[65]<<2);
//2 bit spare
for(int i=0;i<9;i++)
@@ -623,7 +627,7 @@
//FCTN_BAE_WR_FLASH(0,FLASH_DATA[0]);
BCN_LONG_MSG_TYPE = tc[8];
FLASH_DATA = FCTN_BAE_RD_FLASH_ENTITY(0);
- FLASH_DATA = (FLASH_DATA & 0xFFFFF7FF) | (11<<(uint32_t)tc[8]);//see if uint8 to uint32 conversion works
+ FLASH_DATA = (FLASH_DATA & 0xFFFFFBFF) | (10<<(uint32_t)tc[8]);//see if uint8 to uint32 conversion works
FCTN_BAE_WR_FLASH(0,FLASH_DATA);
VALID_MID=1;
break;
@@ -631,10 +635,10 @@
case 0x0101:
{
//FLASH_DATA[1] = (((uint32_t)tc[5] << 24) | ((uint32_t)tc[6] << 16) | ((uint32_t)tc[7] << 8) | (uint32_t)tc[6]);
- ACS_DETUMBLING_ALGO_TYPE = tc[8]>>3;
- ACS_STATE = (tc[8] & 0x07);
+ ACS_DETUMBLING_ALGO_TYPE = (tc[8] & 0x01);
+ ACS_STATE = (tc[8]>>1) & 0x0F;
FLASH_DATA = FCTN_BAE_RD_FLASH_ENTITY(0);
- FLASH_DATA = (FLASH_DATA & 0xFFF0FFFF) | (16<<(uint32_t)tc[8]);
+ FLASH_DATA = (FLASH_DATA & 0xFFF07FFF) | (15<<(uint32_t)tc[8]);
FCTN_BAE_WR_FLASH(0,FLASH_DATA);
VALID_MID=1;
break;
@@ -646,7 +650,7 @@
//EPS_BATTERY_HEATER_ENABLE = tc[8];
EPS_BTRY_HTR_AUTO = tc[8];
FLASH_DATA = FCTN_BAE_RD_FLASH_ENTITY(0);
- FLASH_DATA = (FLASH_DATA & 0xFFFFFBFF) | (10<<(uint32_t)tc[8]);
+ FLASH_DATA = (FLASH_DATA & 0xFFFFFDFF) | (9<<(uint32_t)tc[8]);
FCTN_BAE_WR_FLASH(0,FLASH_DATA);
VALID_MID=1;
break;