Commit 874949d0 authored by 何锐's avatar 何锐

feat:发送车速最大

parent 5e17b162
......@@ -63,6 +63,22 @@
"com_can.h": "c",
"task.h": "c",
"simulated_8080.h": "c",
"analog_signals.h": "c"
"analog_signals.h": "c",
"uart.h": "c",
"frein_user.h": "c",
"key.h": "c",
"check_ctrl.h": "c",
"rte_wdt.h": "c",
"gendelay.h": "c",
"timerb.h": "c",
"internal_eeprom.h": "c",
"rte_pwm.h": "c",
"rte_can.h": "c",
"rte_adc.h": "c",
"tyw_stdint.h": "c",
"rte_gpio.h": "c",
"task_scheduler.h": "c",
"gpio.h": "c",
"string.h": "c"
}
}
\ No newline at end of file
......@@ -191,7 +191,12 @@ void RTE_GPIO_Init(void)
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0;/*WMH*/
gpio_temp.enGPIOPIN = GPIO_PIN_2;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
......
......@@ -112,6 +112,7 @@
#define LINE_OUT_NEG_09 GPIO_OUT_PORT10_PIN04
#define LINE_OUT_NEG_10 GPIO_OUT_PORT00_PIN08
#define WMH_COMM GPIO_OUT_PORT00_PIN02
// #define LINE_FUEL_RES01 GPIO_OUT_PORT00_PIN13
#define LINE_FUEL_RES03 GPIO_OUT_PORT08_PIN10
......
......@@ -24,6 +24,9 @@
#include "CAN_Communication_Matrix.h"
#include "CAN_APP.h"
#include "Display_Info.h"
#include "wmhcomm.h"
#include "wmhcommdata.h"
#include "mwwmhcomm.h"
/*******************************************************************************
* *
* ϵͳ��������ģʽ(SYS_MODE_OFF / SYS_MODE_ON / SYS_MODE_STANDBY )�����б� *
......@@ -69,6 +72,7 @@ void Sys_Run_Mode_2ms_Tasks_Group(void)
COM_RX_Process( );
COM_TX_Process();
Obtain_The_Static_Current();
WMHCommService(2);
}
/*==============================================================================
......@@ -129,6 +133,7 @@ uint8_t *pcan_data = &can_flag;
uint8_t test[10] = {0x56,0x0B,0x0C,0x0D,0x1,0x2,0x3,0x4,0x05,0xFF};
uint8_t timee;
void Sys_Run_Mode_100ms_Tasks_Group(void)
{
......@@ -164,8 +169,12 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
// testtime = 0;
// }
// General_Number_Disp(test, 100 , 100 );
timee++;
if(timee > 10)
{
WMHCommFramePackedTransmit(EM_WMH_COMM_SEND_MSG_ICM_0x90);
timee = 0;
}
}
/*=================================================================*/
......@@ -181,6 +190,7 @@ void Sys_Exact_50us_Tasks(void)
{
GenDelay_Tick( );
DoCAN_Timer_Update(50u);
mwWMHCommSendIsr(50);
}
/*============================================================================*/
......
......@@ -10,7 +10,8 @@ const WMH_COMM_INIT_FRAME_T WMHCommRecvInitList[EM_WMH_COMM_RECV_MSG_TOTAL] = {
};
const WMH_COMM_INIT_FRAME_T WMHCommSendInitList[EM_WMH_COMM_SEND_MSG_TOTAL] = {
{0x80u, 1000u, COMM_DATA_UNION_ICM_LENGTH, 1000u, 1u, WMHCommDataIcm.Bytes, WMHCommFrameCallBack_Icm, WMHCommFrameTimeoutFunc_Icm, WMHCommFrameCheckSumFunc},
// {0x80u, 1000u, COMM_DATA_UNION_ICM_LENGTH, 1000u, 1u, WMHCommDataIcm.Bytes, WMHCommFrameCallBack_Icm, WMHCommFrameTimeoutFunc_Icm, WMHCommFrameCheckSumFunc},
{0x90u, 1000u, COMM_DATA_UNION_WI_BOX_LENGTH_0X90, 1000u, 1u, WMHCommDataWiBox_0x90.Bytes, WMHCommFrameCallBack_Icm, WMHCommFrameTimeoutFunc_WiBox, WMHCommFrameCheckSumFunc},
};
uint32_t WMHCommRecvMessageTimeout[EM_WMH_COMM_RECV_MSG_TOTAL] = {0};
......
......@@ -24,7 +24,9 @@ typedef enum {
} EM_WMH_COMM_RECV_MSG_T;
typedef enum {
EM_WMH_COMM_SEND_MSG_ICM_0x80 = 0,
// EM_WMH_COMM_SEND_MSG_ICM_0x80 = 0,
EM_WMH_COMM_SEND_MSG_ICM_0x90 = 0,
EM_WMH_COMM_SEND_MSG_TOTAL,
} EM_WMH_COMM_SEND_MSG_T;
......
......@@ -36,7 +36,7 @@ void WMHCommFrameCallBack_WiBox_0x92(void)
uint8_t tmpCond = 0;
if((WMHCommDataWiBox_0x92.bits.Inquire == 0)||(WMHCommDataWiBox_0x92.bits.NfcOperate == 0 ))
{
WMHCommFramePackedTransmit(EM_WMH_COMM_SEND_MSG_ICM_0x80);
WMHCommFramePackedTransmit(EM_WMH_COMM_SEND_MSG_ICM_0x90);
}
}
......@@ -70,10 +70,12 @@ void WMHCommFrameCallBack_Icm(void)
// //EM_FUEL_STATE_T tmpSt = GetFuelModuleState();
// uint32_t tmpVal = Data_ODO_Read() / 10u;
// // WMHCommDataIcm.bits.Mileage_H = 0x11;
// // WMHCommDataIcm.bits.Mileage_M = 0x33;
// // WMHCommDataIcm.bits.Mileage_L = 0x44;
// WMHCommDataIcm.bits.Mileage_H = 0x11;
// WMHCommDataIcm.bits.Mileage_M = 0x33;
// WMHCommDataIcm.bits.Mileage_L = 0x44;
WMHCommDataWiBox_0x90.bits.Espeed_H = 0xEE;
WMHCommDataWiBox_0x90.bits.Espeed_L = 0xDD;
// //if(WMHCommDataWiBox_0x92.bits.Inquire == 0x11)
// {
// if (tmpVal > 9999999) {
......@@ -163,6 +165,7 @@ void WMHCommFrameCallBack_Icm(void)
// WMHCommDataIcm.bits.RemoveCardStatus = 0xFF;
// }
// WMHCommDataIcm.bits.Reserved = 0xFF;
// WMHCommDataWiBox_0x90.bits.Espeed_L = 0xDD;
}
void WMHCommFrameTimeoutFunc_Icm(void)
{
......
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