Commit be88bac5 authored by 何锐's avatar 何锐

feat:完成水温指示灯

parent ab34077c
...@@ -15,7 +15,6 @@ void Can_Set_Buff_69B(uint8_t CopyData []); ...@@ -15,7 +15,6 @@ void Can_Set_Buff_69B(uint8_t CopyData []);
void Can_Set_Buff_28A(uint8_t CopyData []); void Can_Set_Buff_28A(uint8_t CopyData []);
void Can_Set_Buff_2E1(uint8_t CopyData []);
void Can_Set_Buff_0E1(uint8_t CopyData []); void Can_Set_Buff_0E1(uint8_t CopyData []);
void Can_Set_Buff_0F6(uint8_t CopyData []); void Can_Set_Buff_0F6(uint8_t CopyData []);
void Can_Set_Buff_036(uint8_t CopyData []); void Can_Set_Buff_036(uint8_t CopyData []);
...@@ -52,14 +51,13 @@ extern uint8_t ruanjianbanbenhao[8]; ...@@ -52,14 +51,13 @@ extern uint8_t ruanjianbanbenhao[8];
void Get_PN_msg(void); void Get_PN_msg(void);
extern void Get_UID_msg(void); extern void Get_UID_msg(void);
void change_UDS_DID(void); void change_UDS_DID(void);
void resetchangeUDSfuc(void);
void resetpowerfuel(void);
void UIDWrite(void); void UIDWrite(void);
extern void Get_SW_msg(void); extern void Get_SW_msg(void);
extern void Get_SWIN_msg(void); extern void Get_SWIN_msg(void);
extern void Get_HW_msg(void); extern void Get_HW_msg(void);
extern void UIDRead(void); extern void UIDRead(void);
extern void uidreset(void); extern void uidreset(void);
extern void CAN_Service(void);
extern uint8_t UIDcode1[33]; extern uint8_t UIDcode1[33];
extern uint8_t UIDcode2[33]; extern uint8_t UIDcode2[33];
extern uint8_t UIDNumber[19]; extern uint8_t UIDNumber[19];
......
...@@ -8,13 +8,6 @@ can4 64 95 ...@@ -8,13 +8,6 @@ can4 64 95
*/ */
//Tx:
const st_CAN_SendAttribute st_CANSendAttr [ ID_SEND_TOTAL ] = {
{0x2E1ul, 50ul * 1000ul, 0ul, 0u, 0, 64u, 8u, 0, Can_Set_Buff_2E1, ( void * )0},
};
//Rx: //Rx:
const st_CANMsgAttribute CAN_MSG_CONST_ARRAY [ CAN_CH0_ID_TOTAL_MAX ] = const st_CANMsgAttribute CAN_MSG_CONST_ARRAY [ CAN_CH0_ID_TOTAL_MAX ] =
......
...@@ -4,24 +4,7 @@ ...@@ -4,24 +4,7 @@
#include "TYW_stdint.h" #include "TYW_stdint.h"
#include "GPIO.h" #include "GPIO.h"
/*按键对应引脚*/
// #define LINE_IN_CHARGE GPIO_IN_PORT11_PIN00
// #define LINE_IN_BRAKE_LEVELn GPIO_IN_PORT08_PIN08
// #define LINE_IN_OIL_PRESSUREn GPIO_IN_PORT08_PIN09
// #define LINE_IN_WASHING_LEVELn GPIO_IN_PORT09_PIN01
// #define LINE_IN_PARKn GPIO_IN_PORT09_PIN00
// #define LED1 GPIO_OUT_APORT00_PIN07
// #define LED2 GPIO_OUT_APORT00_PIN08
// #define LED3 GPIO_OUT_APORT00_PIN10
// #define LED4 GPIO_OUT_APORT00_PIN11
// #define LED5 GPIO_OUT_APORT00_PIN12
// #define LED6 GPIO_OUT_PORT10_PIN06
// #define LED7 GPIO_OUT_PORT10_PIN06
// #define LCDAL GPIO_IN_APORT00_PIN13
// #define LCDAR GPIO_IN_APORT00_PIN14
#define SW1 GPIO_IN_APORT00_PIN00 #define SW1 GPIO_IN_APORT00_PIN00
#define SW2 GPIO_IN_PORT10_PIN05 #define SW2 GPIO_IN_PORT10_PIN05
#define SW3 GPIO_IN_APORT00_PIN01 #define SW3 GPIO_IN_APORT00_PIN01
...@@ -33,25 +16,16 @@ ...@@ -33,25 +16,16 @@
#define SW8 GPIO_IN_APORT00_PIN06 #define SW8 GPIO_IN_APORT00_PIN06
#define SW9 GPIO_IN_PORT09_PIN00 #define SW9 GPIO_IN_PORT09_PIN00
#define SW10 GPIO_IN_PORT10_PIN06 #define SW10 GPIO_IN_PORT10_PIN06
/*燃油对应引脚*/
#define FUEL_RES_1 GPIO_OUT_PORT00_PIN13 #define FUEL_RES_1 GPIO_OUT_PORT00_PIN13
#define FUEL_RES_2 GPIO_OUT_PORT08_PIN12 #define FUEL_RES_2 GPIO_OUT_PORT08_PIN12
#define FUEL_RES_3 GPIO_OUT_PORT08_PIN10 #define FUEL_RES_3 GPIO_OUT_PORT08_PIN10
#define FUEL_RES_4 GPIO_OUT_PORT08_PIN11 #define FUEL_RES_4 GPIO_OUT_PORT08_PIN11
/*电源对应引脚*/
// #define LINE_OUT_CHARGER GPIO_OUT_PORT10_PIN06//
// #define LINE_OUT_OIL GPIO_OUT_PORT10_PIN06
// #define LINE_OUT_BREAK_LEVEL GPIO_OUT_PORT10_PIN06
// #define LINE_OUT_WARSH_LEVEL GPIO_OUT_PORT10_PIN06
// #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_KL30 GPIO_OUT_PORT10_PIN13
#define POWER_CTRL_KL15 GPIO_OUT_PORT10_PIN12 #define POWER_CTRL_KL15 GPIO_OUT_PORT10_PIN12
#define POWER_CTRL_KL30_Current GPIO_OUT_PORT10_PIN14 #define POWER_CTRL_KL30_Current GPIO_OUT_PORT10_PIN14
// #define LINE_OUT_FANGDAO GPIO_OUT_PORT10_PIN06
#define SD_FMQ GPIO_OUT_PORT10_PIN02 #define SD_FMQ GPIO_OUT_PORT10_PIN02
#define PWM_FMQ GPIO_OUT_PORT10_PIN11 #define PWM_FMQ GPIO_OUT_PORT10_PIN11
...@@ -67,19 +41,6 @@ ...@@ -67,19 +41,6 @@
#define NEG_9_Ctrl GPIO_OUT_PORT10_PIN04 #define NEG_9_Ctrl GPIO_OUT_PORT10_PIN04
#define NEG_10_Ctrl GPIO_OUT_PORT00_PIN08 #define NEG_10_Ctrl GPIO_OUT_PORT00_PIN08
// #define LINE_SafeBelt_1 NEG_1_Ctrl
// #define LINE_SafeBelt_2 NEG_2_Ctrl
// #define LINE_SafeBelt_3 NEG_3_Ctrl
// #define LINE_SafeBelt_4 NEG_4_Ctrl
// #define LINE_SafeBelt_5 NEG_5_Ctrl
// #define LINE_SafeBelt_2_press NEG_6_Ctrl
// #define LINE_SafeBelt_3_press NEG_7_Ctrl
// #define LINE_SafeBelt_4_press NEG_8_Ctrl
// #define LINE_SafeBelt_5_press NEG_9_Ctrl
//左转 //左转
#define LINE_OUT_POS_04 GPIO_OUT_APORT00_PIN05 #define LINE_OUT_POS_04 GPIO_OUT_APORT00_PIN05
//右转 //右转
......
...@@ -68,7 +68,6 @@ void Sys_Run_Mode_5ms_Tasks_Group(void) ...@@ -68,7 +68,6 @@ void Sys_Run_Mode_5ms_Tasks_Group(void)
/*============================================================================== /*==============================================================================
10ms����ִ������ ��0�� 10ms����ִ������ ��0��
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
uint32_t fakedelay = 0;
uint32_t send0x714time = 0; uint32_t send0x714time = 0;
extern uint8_t HWtestresult; extern uint8_t HWtestresult;
extern uint8_t PNtestresult; extern uint8_t PNtestresult;
...@@ -113,20 +112,11 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -113,20 +112,11 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
} }
if(fuelreset1 == 1 || fuelreset2 == 1 || fuelreset3 == 1 || fuelreset4 == 1) if(fuelreset1 == 1 || fuelreset2 == 1 || fuelreset3 == 1 || fuelreset4 == 1)
{ {
resetpowerfuel();
} }
BusOff_Service( ); BusOff_Service( );
Key_Service( ); Key_Service( );
resetchangeUDSfuc();
if(fakedelay < 100)
{
fakedelay++;
}
else
{
change_UDS_DID();
}
if(MENU_CHECK_STEP == 0) if(MENU_CHECK_STEP == 0)
{ {
...@@ -177,7 +167,7 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -177,7 +167,7 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
void Sys_Run_Mode_20ms_Tasks_Group0(void) void Sys_Run_Mode_20ms_Tasks_Group0(void)
{ {
//Total_Check( ); //Total_Check( );
CAN_Service();
} }
/*============================================================================== /*==============================================================================
......
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