Skip to content

J
jiancetai
Commit 6a552409 authored by 李梓源's avatar 李梓源
Browse files
Options

✨ feat:重新配置485函数第三步p档显示

parent c381ee2d
Show whitespace changes
Inline Side-by-side
Showing with 123 additions and 151 deletions
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 6a552409
...@@ -586,21 +586,6 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -586,21 +586,6 @@ void Function_Check_Ctrl(uint32_t cmd)
{ {
case 0: case 0:
{ {
// LED3 = 0; //右转
// LED4 = 0;
// LINE_OUT_NEG_05 = 0;
// LINE_OUT_NEG_06 = 1;
// LINE_jinguang = 0;
// POWER_CTRL_KL30_Current = 0;
// if(Auto_ONOFF == 0)
// {
// LINE_OUT_NEG_01 = 1;
// }
// LINE_OUT_NEG_02 = 1;
// LINE_OUT_NEG_03 = 1;
// LINE_OUT_NEG_04 = 1;
// POWER_CTRL_KL30 = 0;
RELAY_VBAT_MCU = 1; RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1; RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1; RELAY_KEY_MCU = 1;
...@@ -609,173 +594,91 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -609,173 +594,91 @@ void Function_Check_Ctrl(uint32_t cmd)
case 1: case 1:
{ {
// LED3 = 0;
// LED4 = 0;
// LINE_OUT_NEG_05 = 1;
// LINE_OUT_NEG_06 = 0;
// POWER_CTRL_KL30_Current = 0;
// LINE_jinguang = 1;
// POWER_CTRL_KL30 = 0;
RELAY_VBAT_MCU = 1; RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1; RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 0; RELAY_KEY_MCU = 0;
if(ACCONOFF_delay_3s >= 30) break;
}
case 2:
{
RELAY_DC12V_MCU = 1;
RELAY_VBAT_MCU = 1;
if(ONE_KEY_ONOFF <= 20)
{ {
RELAY_KEY_MCU = 1; RELAY_KEY_MCU = 1;
ONE_START = 0;
} }
break; else if(ONE_KEY_ONOFF <= 40)
{
RELAY_KEY_MCU = 0;
ONE_START = 1;
} }
case 2: else if(ONE_KEY_ONOFF <= 60)
{
RELAY_KEY_MCU = 0;
ONE_START = 0;
}
else if(ONE_KEY_ONOFF <=70)
{ {
LED3 = 0; RELAY_KEY_MCU = 0;
LINE_OUT_NEG_05 = 1; ONE_START = 1;
LINE_OUT_NEG_06 = 0; }
LINE_jinguang = 0; else
POWER_CTRL_KL30_Current = 0;
POWER_CTRL_KL30 = 1;
LED4 = 1;
if(LINE_FUEL_RES04 == 1 || LINE_FUEL_RES02 == 1)
{ {
LED3 = 1;
} }
break; break;
} }
case 3: case 3:
{ {
LED3 = 1; RELAY_VBAT_MCU = 1;
LINE_OUT_NEG_06 = 0; RELAY_DC12V_MCU = 1;
LINE_OUT_NEG_05 = 1; RELAY_KEY_MCU = 1;
LINE_jinguang = 0;
POWER_CTRL_KL30_Current = 0;
LED4 = 0;
POWER_CTRL_KL30 = 0;
break; break;
} }
case 4: case 4:
{ {
LED3 = 0;
LINE_OUT_NEG_06 = 0;
LINE_OUT_NEG_05 = 1;
LINE_jinguang = 0;
POWER_CTRL_KL30_Current = 0;
LED4 = 0;
POWER_CTRL_KL30 = 0;
break; break;
} }
case 5: case 5:
{ {
LED3 = 0;
LINE_OUT_NEG_06 = 0;
LINE_OUT_NEG_05 = 1;
LINE_jinguang = 0;
POWER_CTRL_KL30_Current = 0;
LED4 = 0;
POWER_CTRL_KL30 = 0;
// queren = 0 ;
// ABStime = 0;
break; break;
} }
case 6: case 6:
{ {
LED3 = 0;
LINE_OUT_NEG_06 = 0;
LINE_OUT_NEG_05 = 1;
LINE_jinguang = 0;
POWER_CTRL_KL30_Current = 0;
LED4 = 0;
POWER_CTRL_KL30 = 0;
if(ABStime < 30)
{
ABStime++;
}
else
{
// queren = 1;
ABStime = 0;
}
break; break;
} }
case 7: case 7:
{ {
LED3 = 0;
LINE_OUT_NEG_06 = 0;
LINE_OUT_NEG_05 = 0;
LINE_jinguang = 0;
POWER_CTRL_KL30_Current = 0;
LED4 = 0;
POWER_CTRL_KL30 = 0;
// queren = 0;
// ABStime = 0;
break; break;
} }
case 8: case 8:
{ {
LED3 = 0;
LINE_OUT_NEG_06 = 0;
LINE_OUT_NEG_05 = 1;
LINE_jinguang = 0;
LED4 = 0;
POWER_CTRL_KL30_Current = 1;
POWER_CTRL_KL30 = 0;
break; break;
} }
case 9: case 9:
{ {
LED3 = 0;
LINE_OUT_NEG_06 = 0;
LINE_OUT_NEG_05 = 1;
LINE_jinguang = 0;
LED4 = 0;
POWER_CTRL_KL30_Current = 0;
POWER_CTRL_KL30 = 0;
break; break;
} }
case 10: case 10:
{ {
LED3 = 1;
LED4 = 1;
LINE_OUT_NEG_05 = 0;
LINE_OUT_NEG_06 = 1;
LINE_jinguang = 1;
POWER_CTRL_KL30_Current = 1;
POWER_CTRL_KL30 = 1;
break; break;
} }
case 11: case 11:
{ {
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 1;
}
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1;
LED3 = 1;
LED4 = 1;
LINE_OUT_NEG_05 = 0;
LINE_OUT_NEG_06 = 1;
LINE_jinguang = 1;
POWER_CTRL_KL30 = 1;
POWER_CTRL_KL30_Current = 1;
break; break;
} }
case 12: case 12:
{ {
POWER_CTRL_KL30_Current = 1;
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 0;
}
LINE_OUT_NEG_02 = 0;
LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 0;
break; break;
} }
case 13: case 13:
{ {
POWER_CTRL_KL30_Current = 0;
if(Auto_ONOFF == 0) if(Auto_ONOFF == 0)
{ {
LINE_OUT_NEG_01 = 0; LINE_OUT_NEG_01 = 0;
......
YueJin_test_bench/source/Appliciation/R485_Communication_Matrix.c
View file @ 6a552409
...@@ -1103,6 +1103,7 @@ uint32_t R485_SendMACaddress_0x42(void) ...@@ -1103,6 +1103,7 @@ uint32_t R485_SendMACaddress_0x42(void)
uint32_t R485_Send_test(void) uint32_t R485_Send_test(void)
{ {
uint32_t u32sendendflag = 0; uint32_t u32sendendflag = 0;
memset(R485_ID42h.Msg, 0x00, 20);
switch (MENU_CHECK_STEP) switch (MENU_CHECK_STEP)
{ {
case 0: case 0:
...@@ -1111,13 +1112,16 @@ uint32_t R485_Send_test(void) ...@@ -1111,13 +1112,16 @@ uint32_t R485_Send_test(void)
break; break;
case 2: case 2:
AIMAtest.Sig.PGear = 0;
u32sendendflag = R485_Send(0x05, AIMAtest.Msg, sizeof(AIMAtest.Msg));
break; break;
case 3: case 3:
AIMAtest.Sig.PGear = 1;
u32sendendflag = R485_Send(0x05, AIMAtest.Msg, sizeof(AIMAtest.Msg));
break; break;
case 4: case 4:
u32sendendflag = R485_AIMA_Send(); AIMAtest.Sig.PGear = 0;
u32sendendflag = R485_Send(0x05, AIMAtest.Msg, sizeof(AIMAtest.Msg));
break; break;
case 5: case 5:
break; break;
......
YueJin_test_bench/source/Appliciation/R485_Communication_Matrix.h
View file @ 6a552409
...@@ -1102,6 +1102,47 @@ typedef union ...@@ -1102,6 +1102,47 @@ typedef union
}_ID0X4Dh_Data; }_ID0X4Dh_Data;
typedef union
{
uint8_t Msg[20];
struct
{
uint8_t : 8; /* 0预留 */
uint8_t : 8; /* 1预留 */
uint8_t : 8;
uint8_t : 5;
uint8_t PGear : 1;
uint8_t : 2;
uint8_t : 8; /* 4预留 */
uint8_t : 8; /* 5预留 */
uint8_t : 8; /* 6预留 */
uint8_t : 8; /* 7预留 */
uint8_t : 8; /* 8预留 */
uint8_t : 8; /* 9预留 */
uint8_t : 8; /* 10预留 */
uint8_t : 8; /* 11预留 */
uint8_t : 8; /* 12预留 */
uint8_t : 8; /* 13预留 */
uint8_t : 8; /* 14预留 */
uint8_t : 8; /* 15预留 */
uint8_t : 8; /* 16预留 */
uint8_t : 8; /* 17预留 */
uint8_t : 8; /* 18预留 */
uint8_t : 8; /* 19预留 */
uint8_t : 8; /* 20预留 */
}Sig;
}_AIMAtest;
typedef struct typedef struct
{ {
uint8_t ble1; uint8_t ble1;
...@@ -1113,6 +1154,7 @@ typedef struct ...@@ -1113,6 +1154,7 @@ typedef struct
uint8_t weizhilight1; uint8_t weizhilight1;
uint32_t power1; uint32_t power1;
}LineSta; }LineSta;
extern _AIMAtest AIMAtest;
extern LineSta LineGetSta; extern LineSta LineGetSta;
extern _ID0X40h_Data R485_ID40h; extern _ID0X40h_Data R485_ID40h;
extern _ID0X48h_Data R485_ID48h; extern _ID0X48h_Data R485_ID48h;
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.c
View file @ 6a552409
...@@ -101,11 +101,17 @@ void RTE_GPIO_Init(void) ...@@ -101,11 +101,17 @@ void RTE_GPIO_Init(void)
gpio_temp.enGPIODir = GPIO_DIR_IN; gpio_temp.enGPIODir = GPIO_DIR_IN;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1; gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp); GPIO_Config(&gpio_temp);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_10;
gpio_temp.enGPIOPIN = GPIO_PIN_14;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
// queren = 0; // queren = 0;
LINE_OUT_NEG_01 = 1; // LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_02 = 1; // LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1; // LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1; // LINE_OUT_NEG_04 = 1;
#if(0) #if(0)
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0; gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0;
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ 6a552409
...@@ -323,6 +323,7 @@ uint8_t compareresult; ...@@ -323,6 +323,7 @@ uint8_t compareresult;
uint8_t flashtime = 0; uint8_t flashtime = 0;
uint8_t showtime = 0; uint8_t showtime = 0;
uint8_t ACCONOFF_delay_3s; uint8_t ACCONOFF_delay_3s;
uint8_t ONE_KEY_ONOFF;
void Sys_Run_Mode_100ms_Tasks_Group(void) void Sys_Run_Mode_100ms_Tasks_Group(void)
{ {
// static uint32_t loc_timer = 0; // static uint32_t loc_timer = 0;
...@@ -334,7 +335,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -334,7 +335,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
// Recv_Byte1(); // Recv_Byte1();
// } // }
Display_PageNum(); Display_PageNum();
if(MENU_CHECK_STEP == 1) if(MENU_CHECK_STEP == 3)
{ {
if(ACCONOFF_delay_3s < 30) if(ACCONOFF_delay_3s < 30)
{ {
...@@ -346,6 +347,17 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -346,6 +347,17 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
ACCONOFF_delay_3s = 0; ACCONOFF_delay_3s = 0;
} }
if(MENU_CHECK_STEP == 2)
{
if(ONE_KEY_ONOFF < 80)
{
ONE_KEY_ONOFF++;
}
}
else
{
ONE_KEY_ONOFF = 0;
}
// Freln_Duty_HZ_Service(); // Freln_Duty_HZ_Service();
if(RS485_send_time<0xFFFFFFFF) if(RS485_send_time<0xFFFFFFFF)
{ {
......
YueJin_test_bench/source/Appliciation/Task.h
View file @ 6a552409
...@@ -10,6 +10,7 @@ extern uint32_t bleOFFtoONtime; ...@@ -10,6 +10,7 @@ extern uint32_t bleOFFtoONtime;
extern uint8_t startONfalg; extern uint8_t startONfalg;
extern uint32_t startIGONtime; extern uint32_t startIGONtime;
extern uint8_t ACCONOFF_delay_3s; extern uint8_t ACCONOFF_delay_3s;
extern uint8_t ONE_KEY_ONOFF;
void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void); void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void);
void Sys_Run_Mode_2ms_Tasks_Group(void); void Sys_Run_Mode_2ms_Tasks_Group(void);
void Sys_Run_Mode_5ms_Tasks_Group(void); void Sys_Run_Mode_5ms_Tasks_Group(void);
......
YueJin_test_bench/source/Appliciation/api_RS485.c
View file @ 6a552409
...@@ -32,6 +32,7 @@ _ID0X42h_Data R485_ID42h; ...@@ -32,6 +32,7 @@ _ID0X42h_Data R485_ID42h;
_ID0X4Ah_Data R485_ID4Ah; _ID0X4Ah_Data R485_ID4Ah;
_ID0X4Dh_Data R485_ID4Dh; _ID0X4Dh_Data R485_ID4Dh;
LineSta LineGetSta; LineSta LineGetSta;
_AIMAtest AIMAtest;
void R485_TX_Init(void) void R485_TX_Init(void)
{ {
...@@ -327,12 +328,14 @@ uint32_t R485_Send(const uint16_t cmdID, const uint8_t* pData, uint8_t len) ...@@ -327,12 +328,14 @@ uint32_t R485_Send(const uint16_t cmdID, const uint8_t* pData, uint8_t len)
// return 0; // return 0;
// } // }
dataBuf[0] = 0x59; /* 帧头 */ dataBuf[0] = 0xEF; /* 帧头 */
dataBuf[1] = 0x44; dataBuf[1] = 0xDD;/* ID */
dataBuf[2] = cmdID; /* ID */ dataBuf[2] = 0x8D;/* ID */
dataBuf[3] = cmdID; /* 设备地址 */
// dataBuf[3] = R485_DATA_LEN; /* 长度 固定64Byte */ // dataBuf[3] = R485_DATA_LEN; /* 长度 固定64Byte */
dataBuf[3] = len; dataBuf[4] = 0x80;/* 命令 */
frameLen = 4; dataBuf[5] = len;
frameLen = 6;
// 数据 Data // 数据 Data
for (i = 0; i < len; ++i) for (i = 0; i < len; ++i)
{ {
...@@ -341,13 +344,14 @@ uint32_t R485_Send(const uint16_t cmdID, const uint8_t* pData, uint8_t len) ...@@ -341,13 +344,14 @@ uint32_t R485_Send(const uint16_t cmdID, const uint8_t* pData, uint8_t len)
} }
// checksum = Yadi_CAL_Data_Sum(&dataBuf[2], R485_DATA_LEN + 2); // checksum = Yadi_CAL_Data_Sum(&dataBuf[2], R485_DATA_LEN + 2);
checksum = Yadi_CAL_Data_Sum(&dataBuf[2], len + 2); checksum = RS485_CRC16_Calc(&dataBuf[0], len + 6);
// checksum = 0; // checksum = 0;
dataBuf[frameLen] = checksum; dataBuf[frameLen] = checksum & 0xff;
frameLen++; frameLen++;
dataBuf[frameLen] = 0X4B; dataBuf[frameLen] = (checksum >> 8) & 0xff;
frameLen++; frameLen++;
dataBuf[frameLen] = 0X4A; dataBuf[frameLen] = 0xEE;
frameLen++; frameLen++;
// if (frameLen != 71) // if (frameLen != 71)
// { // {
......
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