Skip to content

M
MV18
Commit a8ff2bdd authored by hu's avatar hu
Browse files
Options

调整掉线显示状态

parent 5fda5046
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 231 deletions
app_Sources/app_System.c
View file @ a8ff2bdd
......@@ -778,50 +778,6 @@ void App_Load_Data(void)
;
}
//-- gas --//
g_gasMeterInfo.bVirtualVal = 9;
g_gasMeterInfo.Resistor[0] = 0;
g_gasMeterInfo.Resistor[1] = 65; //0.66v
g_gasMeterInfo.Resistor[2] = 83;
g_gasMeterInfo.Resistor[3] = 183;
g_gasMeterInfo.Resistor[4] = 283;
g_gasMeterInfo.Resistor[5] = 327;
g_gasMeterInfo.Resistor[6] = 350;
g_gasMeterInfo.Resistor[7] = 417;
g_gasMeterInfo.Resistor[8] = 450;
g_gasMeterInfo.DashStep[0] = 0;
g_gasMeterInfo.DashStep[1] = 20;
g_gasMeterInfo.DashStep[2] = 40;
g_gasMeterInfo.DashStep[3] = 100;
g_gasMeterInfo.DashStep[4] = 160;
g_gasMeterInfo.DashStep[5] = 180;
g_gasMeterInfo.DashStep[6] = 200;
g_gasMeterInfo.DashStep[7] = 240;
g_gasMeterInfo.DashStep[8] = 260;
//-- adblue --//
g_adblueMeterInfo.bVirtualVal = 8;
g_adblueMeterInfo.Resistor[0] = 0;
g_adblueMeterInfo.Resistor[1] = 50; //5%
g_adblueMeterInfo.Resistor[2] = 104; //10.4%
g_adblueMeterInfo.Resistor[3] = 304;
g_adblueMeterInfo.Resistor[4] = 504;
g_adblueMeterInfo.Resistor[5] = 704;
g_adblueMeterInfo.Resistor[6] = 804;
g_adblueMeterInfo.Resistor[7] = 904;
g_adblueMeterInfo.DashStep[0] = 0;
g_adblueMeterInfo.DashStep[1] = 20;
g_adblueMeterInfo.DashStep[2] = 40;
g_adblueMeterInfo.DashStep[3] = 80;
g_adblueMeterInfo.DashStep[4] = 120;
g_adblueMeterInfo.DashStep[5] = 160;
g_adblueMeterInfo.DashStep[6] = 180;
g_adblueMeterInfo.DashStep[7] = 200;
//
w_Veh = TPM1Clock;
w_Veh1 = g_vehMeterInfo.Resistor[g_vehMeterInfo.bVirtualVal - 1];
......
gui_Sources/gui_Adblue.c
View file @ a8ff2bdd
......@@ -5,8 +5,7 @@
* Author: QTC
*/
#define GLOBALS_GUI_Adblue
#define GLOBALS_GUI_Adblue
#include "defines.h"
#include "g_includes.h"
......@@ -21,14 +20,14 @@
void Gui_Adblue_Disp(void)
{
if(g_adblueMeter.OldPosition != g_adblueMeter.DispPosition)
if (g_adblueMeter.OldPosition != g_adblueMeter.DispPosition)
{
Adblue_Updeta ;
Adblue_Updeta;
}
if(g_winUpdeta.bits.Adblue_Up == 1)
if (g_winUpdeta.bits.Adblue_Up == 1)
{
Adblue_UpdetaClr;
switch(g_adblueMeter.DispPosition)
switch (g_adblueMeter.DispPosition)
{
case 10:
Api_DrawImgIcon(211, 78, Adblue_zouge);
......@@ -50,10 +49,9 @@ void Gui_Adblue_Disp(void)
Api_DrawImgIcon(75, 78, Adblue_zouge);
case 1:
Api_DrawImgIcon(58, 78, Adblue_zouge);
default:
;
default:;
}
switch(g_adblueMeter.DispPosition + 1)
switch (g_adblueMeter.DispPosition + 1)
{
case 1:
Api_DrawImgIcon(58, 78, ClrAdblue_zouge);
......@@ -75,12 +73,10 @@ void Gui_Adblue_Disp(void)
Api_DrawImgIcon(194, 78, ClrAdblue_zouge);
case 10:
Api_DrawImgIcon(211, 78, ClrAdblue_zouge);
default:
;
default:;
}
}
g_adblueMeter.OldPosition = g_adblueMeter.DispPosition;
}
/*-------------------------------------------------------------------------
......@@ -94,7 +90,7 @@ void Gui_Adblue_Disp(void)
void Gui_Adblue_Disp_Manage(void)
{
//-- Set Time --//
if(g_adblueMeter.CurPosition >= g_adblueMeter.DestPosition)
if (g_adblueMeter.CurPosition >= g_adblueMeter.DestPosition)
{
g_adblueMeter.DelayTime = T_1s;
}
......@@ -104,18 +100,22 @@ void Gui_Adblue_Disp_Manage(void)
}
//-- Run --//
if((g_adblueMeter.Time > g_adblueMeter.DelayTime) || (g_sysFlag.Bits.AdbuleMeterInit))
if ((g_adblueMeter.Time > g_adblueMeter.DelayTime) || (g_sysFlag.Bits.AdbuleMeterInit))
{
g_adblueMeter.Time = null;
if(g_adblueMeter.CurPosition < g_adblueMeter.DestPosition)
if (g_adblueMeter.CurPosition < g_adblueMeter.DestPosition)
{
g_adblueMeter.CurPosition ++;
g_adblueMeter.CurPosition++;
}
if(g_adblueMeter.CurPosition > g_adblueMeter.DestPosition)
if (g_adblueMeter.CurPosition > g_adblueMeter.DestPosition)
{
g_adblueMeter.CurPosition --;
g_adblueMeter.CurPosition--;
}
//显示值
g_adblueMeter.DispPosition = g_adblueMeter.CurPosition;
/*
//-- Disp --//
if(g_adblueMeter.CurPosition <= 15)
{
......@@ -165,50 +165,51 @@ void Gui_Adblue_Disp_Manage(void)
{
;
}
*/
}
//报警灯
if(g_sysFlag.Bits.AdbuleMeterInit == Disable)
//10.19 天蓝液报警灯
if (g_sysFlag.Bits.AdbuleMeterInit == Disable)
{
//超时维持
if(ConfigItem.AdblueConfig == 0) //13%
if (ConfigItem.AdblueConfig == 0) //13%
{
if(g_canClock.signal.Exist65110_00)
if (g_canClock.signal.Exist65110_00)
{
if(g_adblueMeter.CurPosition <= 43) // 2021-04-12 (10%)36改(12%)43
{
Enable_signal(g_sysFlag.Bits.AdbuleLedEn);
}
else if(g_adblueMeter.CurPosition >= 47) // 2021-04-12 (12%)42改(14%)47
{
Disable_signal(g_sysFlag.Bits.AdbuleLedEn);
}
if (g_adblueMeter.CurPosition <= 43) // 2021-04-12 (10%)36改(12%)43
{
Enable_signal(g_sysFlag.Bits.AdbuleLedEn);
}
else if (g_adblueMeter.CurPosition >= 47) // 2021-04-12 (12%)42改(14%)47
{
Disable_signal(g_sysFlag.Bits.AdbuleLedEn);
}
}
}
else if(ConfigItem.AdblueConfig == 1) //15%
}
else if (ConfigItem.AdblueConfig == 1) //15%
{
if(g_canClock.signal.Exist65110_A3)
if (g_canClock.signal.Exist65110_A3)
{
if(g_adblueMeter.CurPosition <= 43) // 2021-04-12 (10%)36改(12%)43
{
Enable_signal(g_sysFlag.Bits.AdbuleLedEn);
}
else if(g_adblueMeter.CurPosition >= 47) // 2021-04-12 (12%)42改(14%)47
{
Disable_signal(g_sysFlag.Bits.AdbuleLedEn);
}
if (g_adblueMeter.CurPosition <= 43) // 2021-04-12 (10%)36改(12%)43
{
Enable_signal(g_sysFlag.Bits.AdbuleLedEn);
}
else if (g_adblueMeter.CurPosition >= 47) // 2021-04-12 (12%)42改(14%)47
{
Disable_signal(g_sysFlag.Bits.AdbuleLedEn);
}
}
}
else
{
;
}
;
}
}
//超过5s,初始化完成
if(g_Init.InitAdblueTime >= T_5_0s)
if (g_Init.InitAdblueTime >= T_5_0s)
{
if(g_adblueMeter.CurPosition >= g_adblueMeter.DestPosition )
if (g_adblueMeter.CurPosition >= g_adblueMeter.DestPosition)
g_sysFlag.Bits.AdbuleMeterInit = Disable;
}
}
gui_Sources/gui_Gas.c
View file @ a8ff2bdd
......@@ -5,8 +5,7 @@
* Author: QTC
*/
#define GLOBALS_GUI_Gas
#define GLOBALS_GUI_Gas
#include "defines.h"
#include "g_includes.h"
......@@ -20,16 +19,16 @@
--------------------------------------------------------------------------*/
void Gui_Gas1_Disp(void)
{
if(g_gas1Meter.OldPosition != g_gas1Meter.DispPosition)
if (g_gas1Meter.OldPosition != g_gas1Meter.DispPosition)
{
Gas1_Updeta;
}
if( g_winUpdeta.bits.Gas1_Up == 1)
if (g_winUpdeta.bits.Gas1_Up == 1)
{
Gas1_UpdetaClr;
if(g_Style == 1) //Adblue + 气压
if (g_Style == 1) //Adblue + 气压
{
switch(g_gas1Meter.DispPosition)
switch (g_gas1Meter.DispPosition)
{
case 12:
Api_DrawImgIcon(214, 147, qiya_zouge);
......@@ -61,11 +60,9 @@ void Gui_Gas1_Disp(void)
Api_DrawImgIcon(74, 147, qiya_zouge);
case 1:
Api_DrawImgIcon(60, 147, qiya_zouge);
default:
;
default:;
}
switch(g_gas1Meter.DispPosition + 1)
switch (g_gas1Meter.DispPosition + 1)
{
case 1:
Api_DrawImgIcon(60, 147, Clrqiya_zouge);
......@@ -103,14 +100,12 @@ void Gui_Gas1_Disp(void)
case 12:
Api_DrawImgIcon(214, 147, Clrqiya_zouge);
default:
;
default:;
}
}
else if(g_Style == 3) //油耗 + 气压
else if (g_Style == 3) //油耗 + 气压
{
switch(g_gas1Meter.DispPosition)
switch (g_gas1Meter.DispPosition)
{
case 12:
Api_DrawImgIcon(215, 74, qiya_zouge);
......@@ -138,10 +133,9 @@ void Gui_Gas1_Disp(void)
case 1:
Api_DrawImgIcon(61, 74, qiya_zouge);
default:
;
default:;
}
switch(g_gas1Meter.DispPosition + 1)
switch (g_gas1Meter.DispPosition + 1)
{
case 1:
Api_DrawImgIcon(61, 74, Clrqiya_zouge);
......@@ -179,15 +173,12 @@ void Gui_Gas1_Disp(void)
case 12:
Api_DrawImgIcon(215, 74, Clrqiya_zouge);
default:
;
default:;
}
}
}
g_gas1Meter.OldPosition = g_gas1Meter.DispPosition;
}
/*-------------------------------------------------------------------------
* Function Name : Gui_Gas2_Disp
......@@ -199,16 +190,16 @@ void Gui_Gas1_Disp(void)
--------------------------------------------------------------------------*/
void Gui_Gas2_Disp(void)
{
if(g_gas2Meter.OldPosition != g_gas2Meter.DispPosition)
if (g_gas2Meter.OldPosition != g_gas2Meter.DispPosition)
{
Gas2_Updeta;
}
if(g_winUpdeta.bits.Gas2_Up == 1)
if (g_winUpdeta.bits.Gas2_Up == 1)
{
Gas2_UpdetaClr;
if(g_Style == 1)
if (g_Style == 1)
{
switch(g_gas2Meter.DispPosition)
switch (g_gas2Meter.DispPosition)
{
case 12:
Api_DrawImgIcon(214, 219, qiya_zouge);
......@@ -235,10 +226,9 @@ void Gui_Gas2_Disp(void)
case 1:
Api_DrawImgIcon(60, 219, qiya_zouge);
default:
;
default:;
}
switch(g_gas2Meter.DispPosition + 1)
switch (g_gas2Meter.DispPosition + 1)
{
case 1:
......@@ -270,14 +260,12 @@ void Gui_Gas2_Disp(void)
Api_DrawImgIcon(200, 219, Clrqiya_zouge);
case 12:
Api_DrawImgIcon(214, 219, Clrqiya_zouge);
default:
;
default:;
}
}
else if(g_Style == 3)
else if (g_Style == 3)
{
switch(g_gas2Meter.DispPosition)
switch (g_gas2Meter.DispPosition)
{
case 12:
Api_DrawImgIcon(215, 125, qiya_zouge);
......@@ -304,10 +292,9 @@ void Gui_Gas2_Disp(void)
Api_DrawImgIcon(75, 125, qiya_zouge);
case 1:
Api_DrawImgIcon(61, 125, qiya_zouge);
default:
;
default:;
}
switch(g_gas2Meter.DispPosition + 1)
switch (g_gas2Meter.DispPosition + 1)
{
case 1:
Api_DrawImgIcon(61, 125, Clrqiya_zouge);
......@@ -345,14 +332,11 @@ void Gui_Gas2_Disp(void)
case 12:
Api_DrawImgIcon(215, 125, Clrqiya_zouge);
default:
;
default:;
}
}
}
g_gas2Meter.OldPosition = g_gas2Meter.DispPosition;
}
/*-------------------------------------------------------------------------
......@@ -365,30 +349,31 @@ void Gui_Gas2_Disp(void)
--------------------------------------------------------------------------*/
void Gui_Gas1_Disp_Manage(void)
{
//-- Set Time --//
if(g_gas1Meter.CurPosition >= g_gas1Meter.DestPosition)
//-- Set Time --//
if (g_gas1Meter.CurPosition >= g_gas1Meter.DestPosition)
{
g_gas1Meter.DelayTime = T_100ms;//T_1s;//
g_gas1Meter.DelayTime = T_100ms; //T_1s;//
}
else
{
g_gas1Meter.DelayTime = T_100ms;//T_700ms;//
g_gas1Meter.DelayTime = T_100ms; //T_700ms;//
}
//-- Run --//
if((g_gas1Meter.Time > g_gas1Meter.DelayTime) || (g_sysFlag.Bits.Gas1MeterInit))
if ((g_gas1Meter.Time > g_gas1Meter.DelayTime) || (g_sysFlag.Bits.Gas1MeterInit))
{
g_gas1Meter.Time = null;
if(g_gas1Meter.CurPosition < g_gas1Meter.DestPosition)
if (g_gas1Meter.CurPosition < g_gas1Meter.DestPosition)
{
g_gas1Meter.CurPosition ++;
g_gas1Meter.CurPosition++;
}
if(g_gas1Meter.CurPosition > g_gas1Meter.DestPosition)
if (g_gas1Meter.CurPosition > g_gas1Meter.DestPosition)
{
g_gas1Meter.CurPosition --;
g_gas1Meter.CurPosition--;
}
/*
//-- Disp --//
if(g_gas1Meter.CurPosition <= 19)
{
......@@ -445,28 +430,29 @@ void Gui_Gas1_Disp_Manage(void)
else
{
;
}
}
*/
}
//超过5s,初始化完成
if(g_Init.InitGas1Time >= T_5_0s)
if (g_Init.InitGas1Time >= T_5_0s)
{
if(g_gas1Meter.CurPosition >= g_gas1Meter.DestPosition)
if (g_gas1Meter.CurPosition >= g_gas1Meter.DestPosition)
g_sysFlag.Bits.Gas1MeterInit = Disable;
}
//报警灯
if(g_sysFlag.Bits.Gas1MeterInit == Disable)
if (g_sysFlag.Bits.Gas1MeterInit == Disable)
{
//电压≤2V 电压≥4.33V
if((g_gas1Meter.CurPosition <= 109) || (g_gas1Meter.CurPosition >= 250))
{
Enable_signal(g_sysFlag.Bits.Gas1LedEn);
}
else if((g_gas1Meter.CurPosition >= 116) && (g_gas1Meter.CurPosition <= 240))
{
Disable_signal(g_sysFlag.Bits.Gas1LedEn);
}
//电压≤2V 电压≥4.33V
if ((g_gas1Meter.CurPosition <= 109) || (g_gas1Meter.CurPosition >= 250))
{
Enable_signal(g_sysFlag.Bits.Gas1LedEn);
}
else if ((g_gas1Meter.CurPosition >= 116) && (g_gas1Meter.CurPosition <= 240))
{
Disable_signal(g_sysFlag.Bits.Gas1LedEn);
}
}
}
/*-------------------------------------------------------------------------
......@@ -479,108 +465,110 @@ void Gui_Gas1_Disp_Manage(void)
--------------------------------------------------------------------------*/
void Gui_Gas2_Disp_Manage(void)
{
//-- Set Time --//
if(g_gas2Meter.CurPosition >= g_gas2Meter.DestPosition)
//-- Set Time --//
if (g_gas2Meter.CurPosition >= g_gas2Meter.DestPosition)
{
g_gas2Meter.DelayTime = T_100ms;//T_1s;//
g_gas2Meter.DelayTime = T_100ms; //T_1s;//
}
else
{
g_gas2Meter.DelayTime = T_100ms;//T_700ms;//
g_gas2Meter.DelayTime = T_100ms; //T_700ms;//
}
//-- Run --//
if((g_gas2Meter.Time > g_gas2Meter.DelayTime) || (g_sysFlag.Bits.Gas2MeterInit))
if ((g_gas2Meter.Time > g_gas2Meter.DelayTime) || (g_sysFlag.Bits.Gas2MeterInit))
{
g_gas2Meter.Time = null;
if(g_gas2Meter.CurPosition < g_gas2Meter.DestPosition)
if (g_gas2Meter.CurPosition < g_gas2Meter.DestPosition)
{
g_gas2Meter.CurPosition ++;
g_gas2Meter.CurPosition++;
}
if(g_gas2Meter.CurPosition > g_gas2Meter.DestPosition)
if (g_gas2Meter.CurPosition > g_gas2Meter.DestPosition)
{
g_gas2Meter.CurPosition --;
g_gas2Meter.CurPosition--;
}
/*
//-- Disp --//
if(g_gas2Meter.CurPosition <= 19)
if (g_gas2Meter.CurPosition <= 19)
{
g_gas2Meter.DispPosition = 0;
}
else if((g_gas2Meter.CurPosition > 19) && (g_gas2Meter.CurPosition <= 58))
g_gas2Meter.DispPosition = 0;
}
else if ((g_gas2Meter.CurPosition > 19) && (g_gas2Meter.CurPosition <= 58))
{
g_gas2Meter.DispPosition = 1;
g_gas2Meter.DispPosition = 1;
}
else if((g_gas2Meter.CurPosition > 58) && (g_gas2Meter.CurPosition < 79))
else if ((g_gas2Meter.CurPosition > 58) && (g_gas2Meter.CurPosition < 79))
{
g_gas2Meter.DispPosition = 2;
g_gas2Meter.DispPosition = 2;
}
else if((g_gas2Meter.CurPosition >= 79) && (g_gas2Meter.CurPosition <= 98))
else if ((g_gas2Meter.CurPosition >= 79) && (g_gas2Meter.CurPosition <= 98))
{
g_gas2Meter.DispPosition = 3;
g_gas2Meter.DispPosition = 3;
}
else if((g_gas2Meter.CurPosition >= 99) && (g_gas2Meter.CurPosition <= 118))
else if ((g_gas2Meter.CurPosition >= 99) && (g_gas2Meter.CurPosition <= 118))
{
g_gas2Meter.DispPosition = 4;
}
else if((g_gas2Meter.CurPosition >= 119) && (g_gas2Meter.CurPosition <= 140))
g_gas2Meter.DispPosition = 4;
}
else if ((g_gas2Meter.CurPosition >= 119) && (g_gas2Meter.CurPosition <= 140))
{
g_gas2Meter.DispPosition = 5;
}
else if((g_gas2Meter.CurPosition > 140) && (g_gas2Meter.CurPosition <= 149))
g_gas2Meter.DispPosition = 5;
}
else if ((g_gas2Meter.CurPosition > 140) && (g_gas2Meter.CurPosition <= 149))
{
g_gas2Meter.DispPosition = 6;
}
else if((g_gas2Meter.CurPosition >= 150) && (g_gas2Meter.CurPosition <= 158))
g_gas2Meter.DispPosition = 6;
}
else if ((g_gas2Meter.CurPosition >= 150) && (g_gas2Meter.CurPosition <= 158))
{
g_gas2Meter.DispPosition = 7;
}
else if((g_gas2Meter.CurPosition >= 159) && (g_gas2Meter.CurPosition <= 183))
g_gas2Meter.DispPosition = 7;
}
else if ((g_gas2Meter.CurPosition >= 159) && (g_gas2Meter.CurPosition <= 183))
{
g_gas2Meter.DispPosition = 8;
}
else if((g_gas2Meter.CurPosition >= 184) && (g_gas2Meter.CurPosition <= 217))
g_gas2Meter.DispPosition = 8;
}
else if ((g_gas2Meter.CurPosition >= 184) && (g_gas2Meter.CurPosition <= 217))
{
g_gas2Meter.DispPosition = 9;
}
else if((g_gas2Meter.CurPosition >= 218) && (g_gas2Meter.CurPosition <= 232))
g_gas2Meter.DispPosition = 9;
}
else if ((g_gas2Meter.CurPosition >= 218) && (g_gas2Meter.CurPosition <= 232))
{
g_gas2Meter.DispPosition = 10;
}
else if((g_gas2Meter.CurPosition >= 233) && (g_gas2Meter.CurPosition <= 249))
g_gas2Meter.DispPosition = 10;
}
else if ((g_gas2Meter.CurPosition >= 233) && (g_gas2Meter.CurPosition <= 249))
{
g_gas2Meter.DispPosition = 11;
}
else if(g_gas2Meter.CurPosition >= 250)
g_gas2Meter.DispPosition = 11;
}
else if (g_gas2Meter.CurPosition >= 250)
{
g_gas2Meter.DispPosition = 12;
}
else
g_gas2Meter.DispPosition = 12;
}
else
{
;
}
;
}
*/
}
//超过5s,初始化完成
if(g_Init.InitGas2Time >= T_5_0s)
if (g_Init.InitGas2Time >= T_5_0s)
{
if(g_gas2Meter.CurPosition >= g_gas2Meter.DestPosition)
if (g_gas2Meter.CurPosition >= g_gas2Meter.DestPosition)
g_sysFlag.Bits.Gas2MeterInit = Disable;
}
//报警灯
if(g_sysFlag.Bits.Gas2MeterInit == Disable)
if (g_sysFlag.Bits.Gas2MeterInit == Disable)
{
//电压≥3.83V 电压≥4.33V
if((g_gas2Meter.CurPosition <= 109) || (g_gas2Meter.CurPosition >= 250))
{
Enable_signal(g_sysFlag.Bits.Gas2LedEn);
}
//2.13V≤电压≤3.7V
else if((g_gas2Meter.CurPosition >=116) && (g_gas2Meter.CurPosition <= 240))
{
Disable_signal(g_sysFlag.Bits.Gas2LedEn);
}
//电压≥3.83V 电压≥4.33V
if ((g_gas2Meter.CurPosition <= 109) || (g_gas2Meter.CurPosition >= 250))
{
Enable_signal(g_sysFlag.Bits.Gas2LedEn);
}
//2.13V≤电压≤3.7V
else if ((g_gas2Meter.CurPosition >= 116) && (g_gas2Meter.CurPosition <= 240))
{
Disable_signal(g_sysFlag.Bits.Gas2LedEn);
}
}
}
gui_Sources/gui_Led.c
View file @ a8ff2bdd
......@@ -890,18 +890,8 @@ void Gui_KL15LedDisplay(void)
bDSTable[PicBrakePiece] = 0;
}
}
//10.19 天蓝液 AdBlue 图片，屏幕指示灯
if ((g_sysFlag.Bits.AdbuleLedEn) && ((ConfigItem.AdblueConfig == 0) || (ConfigItem.AdblueConfig == 1)))
{
bDSTable[PicAdblueLow] |= DS0_MASK;
}
else
{
bDSTable[PicAdblueLow] = 0;
}
//BD8379_D11 10.20 门开 门开在30电上
//10.19 天蓝液 在显示部分实现的
}
/*-------------------------------------------------------------------------
* Function Name : Gui_KL30LedDisplay
......
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