CHENJIE-PC\QiXiang_CHENJIE 4 years ago
parent
commit
582e9a0c0b
1 changed files with 14 additions and 7 deletions
  1. 14 7
      src/app.c

+ 14 - 7
src/app.c

@@ -52,12 +52,19 @@ static UINT32                   gCellID = 0;
 int TcpconnectID = -1;
 int TcpconnectID = -1;
 volatile uint8_t Tcp_statuts = 0;
 volatile uint8_t Tcp_statuts = 0;
 //slpManTimerID_e Timer_ID;
 //slpManTimerID_e Timer_ID;
-#define BAT4830
-uint8_t Batt_Cell_Num = 17;//默认数值14、17
-uint8_t Batt_Cell_Num_2 ;//默认数值
-uint8_t Batt_Temp_Num = 7;//默认数值5、7
-CHAR SN[] = "GY606000000000001";//SN应写到osfile里面
+#define BAT6060
+
+#ifdef BAT4830
+    uint8_t Batt_Cell_Num = 14;
+    uint8_t Batt_Temp_Num = 5;
+#else
+    uint8_t Batt_Cell_Num = 17;
+    uint8_t Batt_Temp_Num = 7;
+#endif
+
+CHAR SN[] = "GY606000000000002";//SN应写到osfile里面
 
 
+uint8_t Batt_Cell_Num_2 ;//默认数值
 int16_t Uart_Rece_BattI=0x0000;
 int16_t Uart_Rece_BattI=0x0000;
 uint8_t Can_Rece_buffer[8];
 uint8_t Can_Rece_buffer[8];
 volatile bool Can_Enable = false;
 volatile bool Can_Enable = false;
@@ -201,8 +208,8 @@ static void Main_Task(void* arg)
     uint32_t sleep_time_flag;
     uint32_t sleep_time_flag;
     int32_t inParam = 0xAABBCCDD;
     int32_t inParam = 0xAABBCCDD;
     uint32_t Chrgend_Work_time = 180000;
     uint32_t Chrgend_Work_time = 180000;
-    uint32_t Wakeup_Work_time = 600*100;
-    uint32_t Sleep_Time = 300*1000;
+    uint32_t Wakeup_Work_time = 5*60*100;
+    uint32_t Sleep_Time = 5*60*1000;
     //上述参数应写入文件里
     //上述参数应写入文件里
     slpManWakeSrc_e Wakeup_source;
     slpManWakeSrc_e Wakeup_source;
     PROC_MAIN_STATE_SWITCH(PROCESS_STATE_IDLE);
     PROC_MAIN_STATE_SWITCH(PROCESS_STATE_IDLE);