增加了全局结构体,将UI定时器函数中全局变量替换成结构体变量

This commit is contained in:
liulin
2024-03-19 11:00:34 +08:00
parent c0b6bd173d
commit d224a48a7f
5 changed files with 375 additions and 58 deletions

View File

@ -4,6 +4,57 @@
#include "menu_list.h"
/*****************************发电机仪表面板****************************/
//liulin 2024.3.15
//定义全局的数据变量用于接收从驱动传来的值
//UpLoadData_t g_DataFromDrv;
//UIData_t g_DataForMainUI;
//InverterData_t g_InverterData;
UserData_t g_UserData;
//初始化接收数据变量
void SystemDataInit()
{
//1.初始化接收数据结构体
g_UserData.upLoadData.mEngineSpeed = 0;
g_UserData.upLoadData.mVoltAge = 0;
g_UserData.upLoadData.mCurrent = 0;
g_UserData.upLoadData.mPercent = 0;
g_UserData.upLoadData.mErrCode = 0;
g_UserData.upLoadData.mStatus = 0;
g_UserData.upLoadData.mInverterType = 0;
g_UserData.upLoadData.mInverterData = 0;
g_UserData.upLoadData.mCylinderTemp = 0;
g_UserData.upLoadData.mRevDragStartUP = 0;
g_UserData.upLoadData.mRevDragErrCode = 0;
//2.初始化UI需要数据
g_UserData.uiData.mPowerValue = 0.0;
g_UserData.uiData.mVoltValue = 0.0;
g_UserData.uiData.mCurrentValue = 0.0;
g_UserData.uiData.mRunTime = 0;
g_UserData.uiData.mLeftTime = 0;
g_UserData.uiData.mTotalTime = 0;
g_UserData.uiData.mOilValue = 0;
g_UserData.uiData.mBTFlag = 0;
g_UserData.uiData.mErrFlag = 0;
g_UserData.uiData.mPowerFlag = 0;
g_UserData.uiData.mFreqValue = 0;
g_UserData.uiData.mPercentValue = 0.0;
g_UserData.uiData.mEngineSpeed = 0;
g_UserData.uiData.mFuelType = 0;
//3.初始化逆变器常规数据
g_UserData.inverterData.MCUTemper = 0;
g_UserData.inverterData.IGBTTemper = 0;
g_UserData.inverterData.BusVolt = 0;
g_UserData.inverterData.ACFreq = 0;
}
/*****************************机车仪表面板******************************/
Local_UiCommon_t local_UiCommon = {0};
daily_data_t custom_data;
lv_coord_t child_id = 0;
@ -166,12 +217,9 @@ void system_date_init(void)
custom_data.warning.fan = 0;
custom_data.warning.null = 0;
custom_data.now_defect_code = 0x2255;
custom_data.his_defect_code = 0x400;
custom_data.ttrb = 0;
custom_data.ttrb_time = 10;
custom_data.odo_reset = 10;
@ -180,7 +228,6 @@ void system_date_init(void)
custom_data.plan = 0;
custom_data.pace = 0;
custom_data.upgrade = 0;
}
void updateCurTime()
@ -241,7 +288,6 @@ void InitSysDateTime(void)
GetSysDateTime(DEF_DATE_YEAR, DEF_DATE_MONTH, DEF_DATE_DAY);
}
void GetSysDateTime(uint16_t year, uint8_t month, uint8_t day)
{
custom_data.time.ucYear = year;