Skip to content

J
jiancetai
Commit 8b9af7f5 authored by 何锐's avatar 何锐
Browse files
Options

✨ feat:修改打点模式指示灯

parent d1704fb8
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 8 deletions
YueJin_test_bench/source/Appliciation/CAN_APP.c
View file @ 8b9af7f5
......@@ -739,6 +739,31 @@ void Can_Set_Buff_207(uint8_t CopyData [])
}
}
void Can_Set_Buff_206(uint8_t CopyData [])
{
uint8_t i = 0u;
uint32_t wtemp = 0u;
CANMsg206Union *pCANMsg;
pCANMsg = (CANMsg206Union *)CopyData;
if ( pCANMsg != ( void * )0 )
{
for ( i = 0u; i < 8u; i++ )
{
pCANMsg->Msg [ i ] = 0u;
}
}
if(Fault == 1)
{
pCANMsg->Sig.worryz = 1;
}
else
{
pCANMsg->Sig.worryz = 0;
}
}
void CAN_Msg_Steps_100ms()
{
if(Student_Card_can_command==1)
......
YueJin_test_bench/source/Appliciation/CAN_APP.h
View file @ 8b9af7f5
......@@ -261,6 +261,25 @@ typedef union
} Sig;
} CANMsg207Union;
typedef union
{
uint8_t Msg [ 8 ];
struct
{
uint64_t :8;
uint64_t :8;
uint64_t :5;
uint64_t worryz:3;
uint64_t :8;
uint64_t :8;
uint64_t :8;
uint64_t :8;
uint64_t :8;
} Sig;
} CANMsg206Union;
extern uint8_t UIDNumber[15];
void CAN_MSG_COUNTER_PLUS(void);
......@@ -279,7 +298,7 @@ void Can_Set_Buff_021(uint8_t CopyData []);
void Can_Set_Buff_284(uint8_t CopyData []);
void Can_Set_Buff_786(uint8_t CopyData []);
void Can_Set_Buff_207(uint8_t CopyData []);
void Can_Set_Buff_206(uint8_t CopyData []);
void CAN_Msg_Steps_100ms();
extern void UID_ADD(void);
extern uint8_t uidWrite;
......
YueJin_test_bench/source/Appliciation/CAN_Communication_Matrix.c
View file @ 8b9af7f5
......@@ -23,6 +23,7 @@ const st_CAN_SendAttribute CAN_CH4_CANSendAttr[CAN_CH4_ID_SEND_TOTAL] =
{0x284, 100ul*1000ul, 50ul, 0u, MSG_STD, RSCAN_CHANNEL_BUF_13, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_284, (void *)0},//NFC
{0x786, 100ul*1000ul, 55ul, 0u, MSG_STD, RSCAN_CHANNEL_BUF_14, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_786, (void *)0},//诊断硬件软件版本号
{0x207, 100ul*1000ul, 60ul, 0u, MSG_STD, RSCAN_CHANNEL_BUF_15, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_207, (void *)0},//诊断
{0x206, 100ul*1000ul, 65ul, 0u, MSG_STD, RSCAN_CHANNEL_BUF_16, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_206, (void *)0},//故障码
};
const st_CANMsgAttribute CAN_CH4_CAN_MSG_CONST_ARRAY[CAN_CH4_ID_TOTAL_MAX] =
......
YueJin_test_bench/source/Appliciation/CAN_Communication_Matrix.h
View file @ 8b9af7f5
......@@ -32,6 +32,7 @@ typedef enum
CAN_CH4_ID_284,
CAN_CH4_ID_786,
CAN_CH4_ID_207,
CAN_CH4_ID_206,
CAN_CH4_ID_SEND_TOTAL,
} CAN_CH4_CAN_MSG_SEND_ID_t;
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ 8b9af7f5
......@@ -4773,6 +4773,8 @@ void Display_flag(uint8_t Check_Steps)
TFT_LCD_Draw_Box(0, 0, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);//清除全亮
TFT_LCD_Draw_Bmp(20, 50, ( uint8_t * )gImage_jct_nenglianghuishouX0_Y0_);
//TFT_LCD_Draw_Bmp(80, 40, ( uint8_t * )gImage_gImage_BianchengX6_Y165);/*定速巡航*/
// uint8_t dingsuxunhang[14] = {100,105,110,103,115,117,120,117,110,104,97,110,103,0xff};
// General_Number_Disp(dingsuxunhang, 3, 100); //
break;
case 7://能源回收（琥珀） READY亮
TFT_LCD_Draw_Box(0, 0, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);//清除全亮
......@@ -4782,17 +4784,17 @@ void Display_flag(uint8_t Check_Steps)
case 8://故障提示 电机过热 READY闪烁
TFT_LCD_Draw_Box(0, 0, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);//清除全亮
TFT_LCD_Draw_Bmp(20, 60, ( uint8_t * )gImage_gImage_zcguzhang1X6_Y16);
TFT_LCD_Draw_Bmp(80, 50, ( uint8_t * )gImage_dianchiguoreX0_Y0_);
TFT_LCD_Draw_Bmp(80, 50, ( uint8_t * )gImage_jct_Motor_overheatingX0_Y0);
TFT_LCD_Draw_Bmp(160, 65, ( uint8_t * )gImage_gImage_READY1X6_Y16);
break;
case 9://蓝牙 GPS信号格数
TFT_LCD_Draw_Box(0, 0, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);//清除全亮
TFT_LCD_Draw_Bmp(20, 50, ( uint8_t * )gImage_gImage_bluetoothX6_Y165);
// TFT_LCD_Draw_Bmp(20, 50, ( uint8_t * )gImage_gImage_bluetoothX6_Y165);
TFT_LCD_Draw_Bmp(90, 50, ( uint8_t * )gImage_jct_GPSX0_Y0_);
break;
case 10://蓝牙电话 4G网络格数
TFT_LCD_Draw_Box(0, 0, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);//清除全亮
TFT_LCD_Draw_Bmp(20, 50, ( uint8_t * )gImage_phoneX0_Y0_);
// TFT_LCD_Draw_Bmp(20, 50, ( uint8_t * )gImage_phoneX0_Y0_);
TFT_LCD_Draw_Bmp(80, 50, ( uint8_t * )gImage_4GX0_Y0_);
break;
case 11://全亮
......@@ -4806,7 +4808,7 @@ void Display_flag(uint8_t Check_Steps)
TFT_LCD_Draw_Bmp(80, 80, ( uint8_t * )gImage_icon_14X0_Y0);
TFT_LCD_Draw_Bmp(140,80, ( uint8_t * )gImage_jct_TCS_closeX0_Y0_);
TFT_LCD_Draw_Bmp(20, 120, ( uint8_t * )gImage_dianchiguoreX0_Y0_);
TFT_LCD_Draw_Bmp(20, 120, ( uint8_t * )gImage_jct_Motor_overheatingX0_Y0);
TFT_LCD_Draw_Bmp(80, 120, ( uint8_t * )gImage_gImage_ABSX6_Y165);
TFT_LCD_Draw_Bmp(140,120, ( uint8_t * )gImage_CHONGDIAN_X0_Y0_);
......@@ -4816,10 +4818,10 @@ void Display_flag(uint8_t Check_Steps)
TFT_LCD_Draw_Bmp(20, 210, ( uint8_t * )gImage_gImage_zcguzhang1X6_Y16);
TFT_LCD_Draw_Bmp(80,200, ( uint8_t * )gImage_dianchiguoreX0_Y0_);
TFT_LCD_Draw_Bmp(140, 200, ( uint8_t * )gImage_gImage_bluetoothX6_Y165);
// TFT_LCD_Draw_Bmp(140, 200, ( uint8_t * )gImage_gImage_bluetoothX6_Y165);
TFT_LCD_Draw_Bmp(20,240, ( uint8_t * )gImage_jct_GPSX0_Y0_);
TFT_LCD_Draw_Bmp(80, 240, ( uint8_t * )gImage_phoneX0_Y0_);
// TFT_LCD_Draw_Bmp(80, 240, ( uint8_t * )gImage_phoneX0_Y0_);
TFT_LCD_Draw_Bmp(140, 240, ( uint8_t * )gImage_4GX0_Y0_);
break;
default:
......
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ 8b9af7f5
......@@ -506,7 +506,7 @@ void User_CheckMode_Service(uint8_t CbkCycle)
LINE_OUT_NEG_05 = 1;
NFC_C_card = 0;
Side_bracket = 0;
Charging_connection_led=0;
break;
case 1:
......@@ -750,6 +750,7 @@ void User_CheckMode_Service(uint8_t CbkCycle)
Side_bracket = 1;
Hill_Descent_control = 1;
bluetooth_phone = 0 ;
Charging_connection_led=1;
break;
}
}
......
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