Commit ee7df05e authored by 张金硕's avatar 张金硕

feat:静态电流

parent f31a98bf
...@@ -664,7 +664,7 @@ static void TIMER13_10MS_ISR(void) ...@@ -664,7 +664,7 @@ static void TIMER13_10MS_ISR(void)
if (g_Stage == STAGE_AutoCheck) { if (g_Stage == STAGE_AutoCheck) {
if(StaticCurrent.count < 50){ if(StaticCurrent.count < 50){
StaticCurrent.buf[StaticCurrent.count] = Calculate_Thermistor(AdcValList[14]);//18 StaticCurrent.buf[StaticCurrent.count] = AdcValList[14];//18
StaticCurrent.count ++; StaticCurrent.count ++;
if(StaticCurrent.count == 50) { if(StaticCurrent.count == 50) {
StaticCurrent.count = 0; StaticCurrent.count = 0;
......
...@@ -1874,8 +1874,8 @@ void StaticCurrentCheck(void)//??????? ...@@ -1874,8 +1874,8 @@ void StaticCurrentCheck(void)//???????
//if(LampState_L.Lamps.RELAY_B_ == 1){ //if(LampState_L.Lamps.RELAY_B_ == 1){
//LampState_L.Lamps.RELAY_IGN1 = 0; //LampState_L.Lamps.RELAY_IGN1 = 0;
//} //}
MC1413_B_ON; // MC1413_B_ON;
MC1413_IGNOFF; // MC1413_IGNOFF;
g_CostTimeSecond = 0; g_CostTimeSecond = 0;
StaticCurrent.enable = 1; StaticCurrent.enable = 1;
} }
...@@ -1886,7 +1886,7 @@ void StaticCurrentCheck(void)//??????? ...@@ -1886,7 +1886,7 @@ void StaticCurrentCheck(void)//???????
} }
else if (BetweenTime(1000,2000)) { else if (BetweenTime(1000,2000)) {
//LampState_L.Lamps.RELAY_B = 0; //LampState_L.Lamps.RELAY_B = 0;
MC1413_BOFF; //MC1413_BOFF;
} }
else if(GreaterThan(3000)){// else if(GreaterThan(3000)){//
StaticCurrentNum = StaticCurrent.Value; StaticCurrentNum = StaticCurrent.Value;
...@@ -1895,9 +1895,9 @@ void StaticCurrentCheck(void)//??????? ...@@ -1895,9 +1895,9 @@ void StaticCurrentCheck(void)//???????
//LampState_L.Lamps.RELAY_B = 1; //LampState_L.Lamps.RELAY_B = 1;
//LampState_L.Lamps.RELAY_IGN1 = 1; //LampState_L.Lamps.RELAY_IGN1 = 1;
//LampState_L.Lamps.RELAY_B_ = 0; //LampState_L.Lamps.RELAY_B_ = 0;
MC1413_IGNON; // MC1413_IGNON;
MC1413_BON; // MC1413_BON;
MC1413_B_OFF; // MC1413_B_OFF;
CANSendEnable = ON; CANSendEnable = ON;
if (BetweenTime(STATIC_BEGIN_CHECK_TIME,STATIC_BEGIN_CHECK_TIME+CLUSTER_START_TIME)) { if (BetweenTime(STATIC_BEGIN_CHECK_TIME,STATIC_BEGIN_CHECK_TIME+CLUSTER_START_TIME)) {
//uint8_t test1=1; //uint8_t test1=1;
...@@ -1919,9 +1919,9 @@ void StaticCurrentCheck(void)//??????? ...@@ -1919,9 +1919,9 @@ void StaticCurrentCheck(void)//???????
//LampState_L.Lamps.RELAY_B = 1; //LampState_L.Lamps.RELAY_B = 1;
//LampState_L.Lamps.RELAY_IGN1 = 1; //LampState_L.Lamps.RELAY_IGN1 = 1;
//LampState_L.Lamps.RELAY_B_ = 0; //LampState_L.Lamps.RELAY_B_ = 0;
MC1413_IGNON; // MC1413_IGNON;
MC1413_BON; // MC1413_BON;
MC1413_B_OFF; // MC1413_B_OFF;
CANSendEnable = ON; CANSendEnable = ON;
if (BetweenTime(STATIC_BEGIN_CHECK_TIME,STATIC_BEGIN_CHECK_TIME+CLUSTER_START_TIME)) { if (BetweenTime(STATIC_BEGIN_CHECK_TIME,STATIC_BEGIN_CHECK_TIME+CLUSTER_START_TIME)) {
//uint8_t test2=1; //uint8_t test2=1;
...@@ -2413,7 +2413,7 @@ void APP_AUTO(void) ...@@ -2413,7 +2413,7 @@ void APP_AUTO(void)
{ {
switch (ButtomCurrent.count) { switch (ButtomCurrent.count) {
case 0: case 0:
// OtherCheck(); OtherCheck();
if(g_AutoConfig.AUTO_STEP10_APPLY == 0){ if(g_AutoConfig.AUTO_STEP10_APPLY == 0){
ButtomCurrent.count++; ButtomCurrent.count++;
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment