|
@@ -52,9 +52,9 @@ static UINT32 gCellID = 0;
|
|
|
int TcpconnectID = -1;
|
|
|
volatile uint8_t Tcp_statuts = 0;
|
|
|
//slpManTimerID_e Timer_ID;
|
|
|
-uint8_t Batt_Cell_Num = 17;//默认数值14、17
|
|
|
+uint8_t Batt_Cell_Num = 14;//默认数值14、17
|
|
|
uint8_t Batt_Cell_Num_2 ;//默认数值
|
|
|
-uint8_t Batt_Temp_Num = 7;//默认数值5、7
|
|
|
+uint8_t Batt_Temp_Num = 5;//默认数值5、7
|
|
|
int16_t Uart_Rece_BattI=0x0000;
|
|
|
uint8_t Can_Rece_buffer[8];
|
|
|
volatile bool Can_Enable = false;
|
|
@@ -193,8 +193,8 @@ static void Main_Task(void* arg)
|
|
|
uint32_t sleep_time_flag;
|
|
|
int32_t inParam = 0xAABBCCDD;
|
|
|
uint32_t Chrgend_Work_time = 180000;
|
|
|
- uint32_t Wakeup_Work_time = 30000;
|
|
|
- uint32_t Sleep_Time = 300000;
|
|
|
+ uint32_t Wakeup_Work_time = 120*100;
|
|
|
+ uint32_t Sleep_Time = 120*1000;
|
|
|
//上述参数应写入文件里
|
|
|
slpManWakeSrc_e Wakeup_source;
|
|
|
PROC_MAIN_STATE_SWITCH(PROCESS_STATE_IDLE);
|
|
@@ -807,7 +807,7 @@ static void Can_Task(void* arg)
|
|
|
case 3:
|
|
|
{
|
|
|
Can_ID = 0x031;
|
|
|
- for (int i = 0; i < 8; i++)
|
|
|
+ for (int i = 0; i < 4; i++)
|
|
|
{
|
|
|
Can_TxMsg.Data[i] = battbuffer[i+31+3*8];
|
|
|
}
|
|
@@ -815,19 +815,19 @@ static void Can_Task(void* arg)
|
|
|
Can_TxMsg.stdIDL = Can_ID<<5;
|
|
|
Can_TxMsg.DLC = 8;
|
|
|
HAL_Can_Transmit(Can_TxMsg);
|
|
|
- Can_ID = 0x041;
|
|
|
- for (int i = 0; i < 2; i++)
|
|
|
- {
|
|
|
- Can_TxMsg.Data[i] = battbuffer[i+31+4*8];
|
|
|
- }
|
|
|
- for (int i = 0; i < 6; i++)
|
|
|
- {
|
|
|
- Can_TxMsg.Data[i+2] = 0x00;
|
|
|
- }
|
|
|
- Can_TxMsg.stdIDH = Can_ID>>3;
|
|
|
- Can_TxMsg.stdIDL = Can_ID<<5;
|
|
|
- Can_TxMsg.DLC = 8;
|
|
|
- HAL_Can_Transmit(Can_TxMsg);
|
|
|
+ // Can_ID = 0x041;
|
|
|
+ // for (int i = 0; i < 2; i++)
|
|
|
+ // {
|
|
|
+ // Can_TxMsg.Data[i] = battbuffer[i+31+4*8];
|
|
|
+ // }
|
|
|
+ // for (int i = 0; i < 6; i++)
|
|
|
+ // {
|
|
|
+ // Can_TxMsg.Data[i+2] = 0x00;
|
|
|
+ // }
|
|
|
+ // Can_TxMsg.stdIDH = Can_ID>>3;
|
|
|
+ // Can_TxMsg.stdIDL = Can_ID<<5;
|
|
|
+ // Can_TxMsg.DLC = 8;
|
|
|
+ // HAL_Can_Transmit(Can_TxMsg);
|
|
|
|
|
|
break;
|
|
|
}
|