Skip to content

J
jiancetai
Commit 0fe81466 authored by 何锐's avatar 何锐
Browse files
Options

✨ feat:调试新板子CAN收发与屏幕显示接口

parent 58ddfabb
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 74 deletions
YueJin_test_bench/source/Appliciation/CAN_APP.c
View file @ 0fe81466
......@@ -305,10 +305,11 @@ void can_submit(void)
data5[4] = 0x40; //发动机无法启动指示灯
init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5);
data6[3] = 0xAB; //配置为AB
data6[4] = 0x00; //ASR指示灯
init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6);
data7[5] = 0x00; //侧支架指示灯
data7[5] = 0x04; //侧支架指示灯，发动机故障
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
break;
case 2:
......@@ -524,7 +525,7 @@ void can_submit(void)
data6[4] = 0xC0; //ASR指示灯
init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6);
data7[5] = 0x80; //侧支架指示灯
data7[5] = 0x84; //侧支架指示灯
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
break;
case 10:
......@@ -576,6 +577,8 @@ void send_0x714_fuc()
CAN_Frame_st_t m_msg8;
uint8_t data8[8] = {0, 0, 0, 0, 0, 0, 0, 0};
CAN_Frame_st_t m_msg9;
uint8_t data9[8] = {0, 0, 0, 0, 0, 0, 0, 0};
switch (zhenduanstep)
{
case 0:
......@@ -708,12 +711,35 @@ void send_0x714_fuc()
init_CAN_Frame(&m_msg8, 0x7E3, 8, 1, data8);
can_mid(m_msg8);
zhenduanstep++;
case 11:
data9[0] = 0x02;
data9[1] = 0xFF;
data9[2] = 0x55;
data9[3] = 0x55;
data9[4] = 0x55;
data9[5] = 0x55;
data9[6] = 0x55;
data9[7] = 0x55;
init_CAN_Frame(&m_msg9, 0x6A1, 8, 1, data9);
can_mid(m_msg9);
zhenduanstep++;
break;
default:
break;
}
}
void Can_Set_Buff_2E1(uint8_t CopyData [])
{
CAN_Frame_st_t m_msg9;// 车速 母线电流
uint8_t data9[8] = {0, 0, 0, 0, 0, 0, 0, 0};//0x0C20FFD2
data9[4] = 0x40; //发动机无法启动指示灯
init_CAN_Frame(&m_msg9, 0x2E1, 8, 1, data9);
can_mid(m_msg9);
}
uint8_t UIDNumber[19] = {84,89,87,0,0,0,0,0,0,0,0,0,0,1,2,0,2,5,0xFF};
uint8_t UIDNumber2[15] = {0,5,2,2,0,0,0,0,0,0,0,0,0,0,0xFF};
uint8_t change = 13;
......
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 0fe81466
......@@ -582,13 +582,6 @@ void Function_Check_Ctrl(uint32_t cmd)
{
case 0:
{
if(resetflag == 0)
{
// POWER_CTRL_KL30 = 1u; //B+
// POWER_CTRL_KL15 = 1u; //KL15
}
/*负控*/
// LINE_OUT_NEG_01 = 0;
// LINE_OUT_NEG_02 = 0;
......@@ -602,11 +595,14 @@ void Function_Check_Ctrl(uint32_t cmd)
// LINE_OUT_NEG_08 = 0;
// LINE_OUT_NEG_09 = 0;
// LINE_OUT_NEG_10 = 0;
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15
/*正控*/
LINE_OUT_POS_01 = 0;
LINE_OUT_POS_02 = 0;
LINE_OUT_NEG_01 = 0;
LINE_OUT_POS_04 = 0;
LINE_OUT_POS_02 = 1; //远光
LINE_OUT_POS_04 = 1; //左转
LINE_OUT_POS_01 = 1; //右转
LINE_OUT_POS_11 = 1; //防盗
LINE_OUT_POS_12 = 1; //机油压力
/*燃油*/
FUEL_RES_1 = 0;
FUEL_RES_2 = 0;
......@@ -630,13 +626,16 @@ void Function_Check_Ctrl(uint32_t cmd)
// LINE_OUT_NEG_09 = 1;
// LINE_OUT_NEG_10 = 0;
/*正控*/
// LINE_OUT_POS_01 = 1; //右转
LINE_OUT_POS_04 = 1; //左转
LINE_OUT_POS_02 = 0; //远光
LINE_OUT_POS_04 = 0; //左转
LINE_OUT_POS_01 = 1; //右转
LINE_OUT_POS_11 = 1; //防盗
LINE_OUT_POS_12 = 0; //机油压力
/*燃油*/
FUEL_RES_1 = 1; //5格
FUEL_RES_2 = 1;
FUEL_RES_3 = 1;
FUEL_RES_4 = 1;
FUEL_RES_1 = 0; //开路0格
FUEL_RES_2 = 0;
FUEL_RES_3 = 0;
FUEL_RES_4 = 0;
break;
}
......@@ -656,11 +655,13 @@ void Function_Check_Ctrl(uint32_t cmd)
// LINE_OUT_NEG_09 = 1;
// LINE_OUT_NEG_10 = 0;
/*正控*/
// LINE_OUT_POS_02 = 1; //远光
LINE_OUT_POS_04 = 0; //左转
LINE_OUT_POS_02 = 1; //远光
LINE_OUT_POS_04 = 1; //左转
LINE_OUT_POS_01 = 0; //右转
LINE_OUT_POS_11 = 0; //防盗
LINE_OUT_POS_12 = 1; //机油压力
/*燃油*/
FUEL_RES_1 = 0; //4格
FUEL_RES_1 = 0; //1格
FUEL_RES_2 = 0;
FUEL_RES_3 = 0;
FUEL_RES_4 = 1;
......@@ -682,11 +683,14 @@ void Function_Check_Ctrl(uint32_t cmd)
// LINE_OUT_NEG_09 = 0;
// LINE_OUT_NEG_10 = 0;
/*正控*/
LINE_OUT_POS_02 = 1; //远光
// LINE_OUT_POS_03 = 0; //机油压力
LINE_OUT_POS_02 = 0; //远光
LINE_OUT_POS_04 = 0; //左转
LINE_OUT_POS_01 = 0; //右转
LINE_OUT_POS_11 = 0; //防盗
LINE_OUT_POS_12 = 0; //机油压力
// /*燃油*/
FUEL_RES_1 = 0; //3格
FUEL_RES_1 = 0; //2格
FUEL_RES_2 = 0;
FUEL_RES_3 = 1;
FUEL_RES_4 = 0;
......@@ -714,7 +718,7 @@ void Function_Check_Ctrl(uint32_t cmd)
// LINE_OUT_POS_04 = 1; //左转
LINE_OUT_POS_02 = 0; //远光
/*燃油*/
FUEL_RES_1 = 0; //2格
FUEL_RES_1 = 0; //3格
FUEL_RES_2 = 1;
FUEL_RES_3 = 0;
FUEL_RES_4 = 0;
......@@ -741,7 +745,7 @@ void Function_Check_Ctrl(uint32_t cmd)
// LINE_OUT_POS_03 = 0;
// LINE_OUT_POS_04 = 0;
/*燃油*/
FUEL_RES_1 = 1; //1格
FUEL_RES_1 = 1; //4格
FUEL_RES_2 = 0;
FUEL_RES_3 = 0;
FUEL_RES_4 = 0;
......@@ -768,10 +772,10 @@ void Function_Check_Ctrl(uint32_t cmd)
// LINE_OUT_POS_03 = 0;
// LINE_OUT_POS_04 = 0;
/*燃油*/
FUEL_RES_1 = 1; //1格
FUEL_RES_2 = 0;
FUEL_RES_3 = 0;
FUEL_RES_4 = 0;
FUEL_RES_1 = 1; //5格
FUEL_RES_2 = 1;
FUEL_RES_3 = 1;
FUEL_RES_4 = 1;
break;
}
case 7:
......@@ -795,10 +799,10 @@ void Function_Check_Ctrl(uint32_t cmd)
// LINE_OUT_POS_04 = 0;
LINE_OUT_NEG_01 = 1;
/*燃油*/
FUEL_RES_1 = 1; //1格
FUEL_RES_2 = 0;
FUEL_RES_3 = 0;
FUEL_RES_4 = 0;
FUEL_RES_1 = 1; //5格
FUEL_RES_2 = 1;
FUEL_RES_3 = 1;
FUEL_RES_4 = 1;
break;
}
case 8:
......@@ -822,10 +826,10 @@ void Function_Check_Ctrl(uint32_t cmd)
// LINE_OUT_POS_04 = 0;
LINE_OUT_NEG_01 = 0;
/*燃油*/
FUEL_RES_1 = 1; //1格
FUEL_RES_2 = 0;
FUEL_RES_3 = 0;
FUEL_RES_4 = 0;
FUEL_RES_1 = 1; //5格
FUEL_RES_2 = 1;
FUEL_RES_3 = 1;
FUEL_RES_4 = 1;
break;
}
case 9:
......@@ -845,10 +849,10 @@ void Function_Check_Ctrl(uint32_t cmd)
/*正控*/
LINE_OUT_POS_01 = 1; //右转
/*燃油*/
FUEL_RES_1 = 1; //1格
FUEL_RES_2 = 0;
FUEL_RES_3 = 0;
FUEL_RES_4 = 0;
FUEL_RES_1 = 1; //5格
FUEL_RES_2 = 1;
FUEL_RES_3 = 1;
FUEL_RES_4 = 1;
break;
}
case 10:
......@@ -866,15 +870,15 @@ void Function_Check_Ctrl(uint32_t cmd)
// LINE_OUT_NEG_09 = 0;
// LINE_OUT_NEG_10 = 0;
/*正控*/
LINE_OUT_POS_01 = 1;
LINE_OUT_POS_02 = 1;
LINE_OUT_POS_04 = 1;
LINE_OUT_NEG_01 = 1;
/*燃油*/
FUEL_RES_1 = 1; //1格
FUEL_RES_2 = 0;
FUEL_RES_3 = 0;
FUEL_RES_4 = 0;
// LINE_OUT_POS_01 = 1;
// LINE_OUT_POS_02 = 1;
// LINE_OUT_POS_04 = 1;
// LINE_OUT_NEG_01 = 1;
// /*燃油*/
// FUEL_RES_1 = 1; //1格
// FUEL_RES_2 = 0;
// FUEL_RES_3 = 0;
// FUEL_RES_4 = 0;
break;
}
}
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.c
View file @ 0fe81466
......@@ -71,26 +71,26 @@ void RTE_GPIO_Init(void)
GPIO_Init(GPIO_WAKEUP_MODE);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0;
gpio_temp.enGPIOPIN = GPIO_PIN_13;
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_9; //燃油阻值1
gpio_temp.enGPIOPIN = GPIO_PIN_6;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_8;
gpio_temp.enGPIOPIN = GPIO_PIN_10;
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_9; //燃油阻值2
gpio_temp.enGPIOPIN = GPIO_PIN_5;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_8;
gpio_temp.enGPIOPIN = GPIO_PIN_11;
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_9; //燃油阻值3
gpio_temp.enGPIOPIN = GPIO_PIN_4;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_8;
gpio_temp.enGPIOPIN = GPIO_PIN_12;
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_9; //燃油阻值4
gpio_temp.enGPIOPIN = GPIO_PIN_3;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
......@@ -269,4 +269,18 @@ void RTE_GPIO_Init(void)
// gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_4;
// gpio_temp.enGPIOCharacter = GPIO_Char_Schmitt1;
// GPIO_Config(&gpio_temp);//pin86
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0;
gpio_temp.enGPIOPIN = GPIO_PIN_4;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);//--CANSTB
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);//--右转输出
}
YueJin_test_bench/source/Appliciation/RTE_GPIO.h
View file @ 0fe81466
......@@ -34,10 +34,10 @@
#define SW9 GPIO_IN_PORT09_PIN00
#define SW10 GPIO_IN_PORT10_PIN06
#define FUEL_RES_1 GPIO_OUT_PORT00_PIN13
#define FUEL_RES_2 GPIO_OUT_PORT08_PIN12
#define FUEL_RES_3 GPIO_OUT_PORT08_PIN10
#define FUEL_RES_4 GPIO_OUT_PORT08_PIN11
#define FUEL_RES_1 GPIO_OUT_PORT09_PIN06
#define FUEL_RES_2 GPIO_OUT_PORT09_PIN05
#define FUEL_RES_3 GPIO_OUT_PORT09_PIN04
#define FUEL_RES_4 GPIO_OUT_PORT09_PIN03
// #define LINE_OUT_CHARGER GPIO_OUT_PORT10_PIN06//
// #define LINE_OUT_OIL GPIO_OUT_PORT10_PIN06
......@@ -46,11 +46,12 @@
// #define LINE_OUT_PARK GPIO_OUT_PORT10_PIN06
// #define LINE_OUT_EPS GPIO_OUT_PORT10_PIN06 //远光
#define POWER_CTRL_KL30 GPIO_OUT_PORT10_PIN13
#define POWER_CTRL_KL15 GPIO_OUT_PORT10_PIN12
#define POWER_CTRL_KL30_Current GPIO_OUT_PORT10_PIN14
#define POWER_CTRL_KL30 GPIO_OUT_PORT08_PIN12
#define POWER_CTRL_KL15 GPIO_OUT_PORT00_PIN07
#define POWER_CTRL_KL30_Current GPIO_OUT_PORT00_PIN08
// #define LINE_OUT_FANGDAO GPIO_OUT_PORT10_PIN06
#define CAN_STB GPIO_OUT_PORT00_PIN04
#define SD_FMQ GPIO_OUT_PORT10_PIN02
#define PWM_FMQ GPIO_OUT_PORT10_PIN11
......@@ -81,11 +82,15 @@
//左转
#define LINE_OUT_POS_04 GPIO_OUT_APORT00_PIN05
#define LINE_OUT_POS_04 GPIO_OUT_PORT10_PIN10
//右转
#define LINE_OUT_POS_01 GPIO_OUT_PORT10_PIN06
#define LINE_OUT_POS_01 GPIO_OUT_PORT10_PIN14
//机油压力
#define LINE_OUT_POS_12 GPIO_OUT_PORT00_PIN10
//防盗
#define LINE_OUT_POS_11 GPIO_OUT_PORT00_PIN12
//远光
#define LINE_OUT_POS_02 GPIO_OUT_PORT09_PIN00
#define LINE_OUT_POS_02 GPIO_OUT_PORT10_PIN13
//位置灯
#define LINE_OUT_POS_03 GPIO_OUT_APORT00_PIN04
#define LINE_OUT_POS_05 GPIO_OUT_APORT00_PIN06
......
YueJin_test_bench/source/Driver/GPIO/Simulated_8080.h
View file @ 0fe81466
......@@ -153,7 +153,7 @@ typedef union
extern D8080_data_t D8080_data;
#define SIM_8080_P_A0 GPIO_OUT_PORT11_PIN05
#define SIM_8080_P_A0 GPIO_OUT_PORT11_PIN01
#define SIM_8080_P_nRD GPIO_OUT_PORT11_PIN04
#define SIM_8080_P_nWR GPIO_OUT_PORT11_PIN03
#define SIM_8080_P_nCS GPIO_OUT_PORT11_PIN02
......
YueJin_test_bench/source/Driver/GPIO/TM035HFZGZx.h
View file @ 0fe81466
......@@ -5,7 +5,7 @@
#include "Simulated_8080.h"
#define LCD_nRST GPIO_OUT_PORT11_PIN06
#define LCD_nRST GPIO_OUT_PORT08_PIN09
......
YueJin_test_bench/source/System/init.c
View file @ 0fe81466
......@@ -83,9 +83,9 @@ void Sys_Startup_Init(void)
Key_Init( );
Buzzer_Init();
UIDdelay = 0;
CAN_STB = 0;
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15
LINE_OUT_NEG_02 = 0;
for (int i = 0; i < 33; i++)
{
UIDcode1[i] = 0;
......
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