Skip to content

H
HaoJin232
Commit b3af226b authored by 时昊's avatar 时昊
Browse files
Options

🎉 init:删除无用文件-gauges

parent 0cf48992
Show whitespace changes
Inline Side-by-side
Showing with 712 additions and 956 deletions
HJ232_Source/Out/QJ300_circle.lnp
View file @ b3af226b
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
".\objects\can_communication_matrix.o" ".\objects\can_communication_matrix.o"
".\source\Application\APPCan\CAN_Lib.lib" ".\source\Application\APPCan\CAN_Lib.lib"
".\objects\can_user.o" ".\objects\can_user.o"
".\objects\gauges.o"
".\objects\app_telltales.o" ".\objects\app_telltales.o"
".\source\Application\Telltales\Telltales.lib" ".\source\Application\Telltales\Telltales.lib"
".\objects\app_service.o" ".\objects\app_service.o"
......
HJ232_Source/Out/QJ300_circle.map
View file @ b3af226b
This source diff could not be displayed because it is too large. You can view the blob instead.
HJ232_Source/source/Application/Gauges/Gauges.c deleted 100644 → 0
View file @ 0cf48992
#include "Gauges.h"
#include "Common_Interface.h"
typedef struct
{
uint32_t SelfDir;
uint32_t VehicleTestValue;
uint32_t EngineTestValue;
uint32_t FuelTestValue;
uint32_t TempTestValue;
}SelfTestTime;
SelfTestTime MotorSelfTestTime;
GaugesCtrlStruct GaugesCtrl;
//20Ms
/*void Gauges_Management_Service(void)
{
uint16_t DATA_ENGINE_SPEED_DISPLAYING;
if (Common_Get_IG_Sts() == COMMON_POWER_OFF)
{
SEG_LCD_Vehicle_Speed_Num_Display(0, 0, 0);
SEG_LCD_Engine_Speed_Seg_Display(0, 0, 0);
SEG_LCD_ODO_Trip_Display(0, 0, 0, 0);
SEG_Fuel_Level_Display(0, 0);
SEG_LCD_Battery_Voltage_Display(0, 0 ,0);
SEG_Coolant_Temp_Display(0, 0);
SEG_LCD_Gear_Display(0, 0, 0);
MotorSelfTestTime.VehicleTestValue = 0;
MotorSelfTestTime.EngineTestValue = 0;
MotorSelfTestTime.FuelTestValue = 0;
MotorSelfTestTime.TempTestValue = 0;
MotorSelfTestTime.SelfDir = 0;
}
//else if (Common_GetIgnOnTime() < 3000)
if(0) //取消扫表
{
if (MotorSelfTestTime.SelfDir >= 15) //顶格停留15*20ms=0.3s
{
if (MotorSelfTestTime.EngineTestValue < 200) //1.2s
MotorSelfTestTime.EngineTestValue = 0;
else
MotorSelfTestTime.EngineTestValue -= 210;
if (MotorSelfTestTime.VehicleTestValue < 60) //1.2s
MotorSelfTestTime.VehicleTestValue = 0;
else
MotorSelfTestTime.VehicleTestValue -= 30;
if (MotorSelfTestTime.FuelTestValue < 100) //1.2s
MotorSelfTestTime.FuelTestValue = 0;
else
MotorSelfTestTime.FuelTestValue -= 10;
if (MotorSelfTestTime.TempTestValue < 100) //1.2s
MotorSelfTestTime.TempTestValue = 0;
else
MotorSelfTestTime.TempTestValue -= 10;
}
else
{
if ((MotorSelfTestTime.EngineTestValue >= 12600) && (MotorSelfTestTime.VehicleTestValue >= 1990) &&\
(MotorSelfTestTime.FuelTestValue >= 600) && (MotorSelfTestTime.FuelTestValue >= 600))
{
MotorSelfTestTime.SelfDir ++;
}
else
{
MotorSelfTestTime.EngineTestValue += 168; //1.5s
MotorSelfTestTime.VehicleTestValue += 24; //1.5s
MotorSelfTestTime.FuelTestValue += 8; //1.5s
MotorSelfTestTime.TempTestValue += 8; //1.5s
}
}
}
else
{
if(0) //查表未使用
{
//转速表
DATA_ENGINE_SPEED_DISPLAYING = Common_Get_Disp_E_Speed();
if (DATA_ENGINE_SPEED_DISPLAYING > GaugesCtrl.ESpeedBackup) //转速增加,查上升表
{
while (GaugesCtrl.ESpeedSeg < GAUGES_TOTAL_TACHOMETER_SEG)
{
if (DATA_ENGINE_SPEED_DISPLAYING < GaugesTachoMeterSegIncTable[GaugesCtrl.ESpeedSeg])
break;
GaugesCtrl.ESpeedSeg++;
}
}
else if (DATA_ENGINE_SPEED_DISPLAYING < GaugesCtrl.ESpeedBackup) //转速减小,查下降表
{
while (GaugesCtrl.ESpeedSeg)
{
if (DATA_ENGINE_SPEED_DISPLAYING >= GaugesTachoMeterSegDecTable[GaugesCtrl.ESpeedSeg - 1])
break;
GaugesCtrl.ESpeedSeg--;
}
}
GaugesCtrl.ESpeedBackup = DATA_ENGINE_SPEED_DISPLAYING;
Common_Set_Gauges_E_Speed(GaugesCtrl.ESpeedSeg);
}
}
Common_Set_E_Speed_Test(MotorSelfTestTime.VehicleTestValue);
Common_Set_V_Speed_Test(MotorSelfTestTime.EngineTestValue);
Common_Set_Fuel_Test(MotorSelfTestTime.FuelTestValue / 100);
Common_Set_Temp_Test(MotorSelfTestTime.TempTestValue / 100);
}
*/
HJ232_Source/source/Application/Gauges/Gauges.h deleted 100644 → 0
View file @ 0cf48992
#ifndef _GAUGES_H_
#define _GAUGES_H_
#include "SEG_LCD.h"
#include "Common_Interface.h"
/******************************************************************************
ת�ٶ�������
******************************************************************************/
static const uint16_t GaugesTachoMeterSegIncTable[] =
{
/*=================
��ʾ�� | ת ��
---------+-------*/
/* 0 */ 200,
/* 1 */ 550,
/* 2 */ 1050,
/* 3 */ 1550,
/* 4 */ 2050,
/* 5 */ 2550,
/* 6 */ 3050,
/* 7 */ 3550,
/* 8 */ 4050,
/* 9 */ 4550,
/* 10 */ 5050,
/* 11 */ 5550,
/* 12 */ 6050,
/* 13 */ 6550,
/* 14 */ 7050,
/* 15 */ 7550,
/* 16 */ 8050,
/* 17 */ 65535,
/*=== ============*/
};
/******************************************************************************
ת�ٶ��½���
******************************************************************************/
static const uint16_t GaugesTachoMeterSegDecTable[] =
{
/*=================
��ʾ�� | ת ��
---------+-------*/
/* 0 */ 50,
/* 1 */ 450,
/* 2 */ 950,
/* 3 */ 1450,
/* 4 */ 1950,
/* 5 */ 2450,
/* 6 */ 2950,
/* 7 */ 3450,
/* 8 */ 3950,
/* 9 */ 4450,
/* 10 */ 4950,
/* 11 */ 5450,
/* 12 */ 5950,
/* 13 */ 6450,
/* 14 */ 6950,
/* 15 */ 7450,
/* 16 */ 7950,
/* 17 */ 65535,
/*===============*/
};
#define GAUGES_TOTAL_TACHOMETER_SEG (sizeof(GaugesTachoMeterSegIncTable) / 2)
typedef struct
{
uint16_t ESpeedBackup;
uint8_t ESpeedSeg;
}GaugesCtrlStruct;
//void Gauges_Management_Service(void);
#endif
HJ232_Source/source/Application/MCU_Core_Protocol/MCU_Core_Protocol.c
View file @ b3af226b
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "BGLInterface.h" #include "BGLInterface.h"
#include "SEG_LCD.h" #include "SEG_LCD.h"
#include "System_Monitor.h" #include "System_Monitor.h"
#include "Gauges.h"
#include "Services_Mileage_User.h" #include "Services_Mileage_User.h"
#include "CAN_Communication_Matrix.h" #include "CAN_Communication_Matrix.h"
......
HJ232_Source/source/System/tasks.c
View file @ b3af226b
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "U2_uds_includes.h" #include "U2_uds_includes.h"
#include "BU98R10.h" #include "BU98R10.h"
#include "Gauges.h"
#include "Services_Mileage_User.h" #include "Services_Mileage_User.h"
#include "can.h" #include "can.h"
#include "IS31FL3236.h" #include "IS31FL3236.h"
......
HJ232_Source/tim4DelayCounter.uvoptx
View file @ b3af226b
...@@ -1311,30 +1311,6 @@ ...@@ -1311,30 +1311,6 @@
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>.\source\Application\Gauges\Gauges.c</PathWithFileName>
<FilenameWithoutPath>Gauges.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>90</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\source\Application\Gauges\Gauges.h</PathWithFileName>
<FilenameWithoutPath>Gauges.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>91</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\source\Application\Telltales\app_Telltales.c</PathWithFileName> <PathWithFileName>.\source\Application\Telltales\app_Telltales.c</PathWithFileName>
<FilenameWithoutPath>app_Telltales.c</FilenameWithoutPath> <FilenameWithoutPath>app_Telltales.c</FilenameWithoutPath>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
...@@ -1342,7 +1318,7 @@ ...@@ -1342,7 +1318,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>92</FileNumber> <FileNumber>90</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1362,7 +1338,7 @@ ...@@ -1362,7 +1338,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>4</GroupNumber> <GroupNumber>4</GroupNumber>
<FileNumber>93</FileNumber> <FileNumber>91</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1374,7 +1350,7 @@ ...@@ -1374,7 +1350,7 @@
</File> </File>
<File> <File>
<GroupNumber>4</GroupNumber> <GroupNumber>4</GroupNumber>
<FileNumber>94</FileNumber> <FileNumber>92</FileNumber>
<FileType>4</FileType> <FileType>4</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1394,7 +1370,7 @@ ...@@ -1394,7 +1370,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>95</FileNumber> <FileNumber>93</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1406,7 +1382,7 @@ ...@@ -1406,7 +1382,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>96</FileNumber> <FileNumber>94</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1418,7 +1394,7 @@ ...@@ -1418,7 +1394,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>97</FileNumber> <FileNumber>95</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1430,7 +1406,7 @@ ...@@ -1430,7 +1406,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>98</FileNumber> <FileNumber>96</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1442,7 +1418,7 @@ ...@@ -1442,7 +1418,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>99</FileNumber> <FileNumber>97</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1454,7 +1430,7 @@ ...@@ -1454,7 +1430,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>100</FileNumber> <FileNumber>98</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1466,7 +1442,7 @@ ...@@ -1466,7 +1442,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>101</FileNumber> <FileNumber>99</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1478,7 +1454,7 @@ ...@@ -1478,7 +1454,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>102</FileNumber> <FileNumber>100</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1490,7 +1466,7 @@ ...@@ -1490,7 +1466,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>103</FileNumber> <FileNumber>101</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1502,7 +1478,7 @@ ...@@ -1502,7 +1478,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>104</FileNumber> <FileNumber>102</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1514,7 +1490,7 @@ ...@@ -1514,7 +1490,7 @@
</File> </File>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>105</FileNumber> <FileNumber>103</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1534,7 +1510,7 @@ ...@@ -1534,7 +1510,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>106</FileNumber> <FileNumber>104</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1546,7 +1522,7 @@ ...@@ -1546,7 +1522,7 @@
</File> </File>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>107</FileNumber> <FileNumber>105</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1558,7 +1534,7 @@ ...@@ -1558,7 +1534,7 @@
</File> </File>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>108</FileNumber> <FileNumber>106</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1570,7 +1546,7 @@ ...@@ -1570,7 +1546,7 @@
</File> </File>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>109</FileNumber> <FileNumber>107</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1582,7 +1558,7 @@ ...@@ -1582,7 +1558,7 @@
</File> </File>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>110</FileNumber> <FileNumber>108</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1594,7 +1570,7 @@ ...@@ -1594,7 +1570,7 @@
</File> </File>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>111</FileNumber> <FileNumber>109</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1606,7 +1582,7 @@ ...@@ -1606,7 +1582,7 @@
</File> </File>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>112</FileNumber> <FileNumber>110</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1618,7 +1594,7 @@ ...@@ -1618,7 +1594,7 @@
</File> </File>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>113</FileNumber> <FileNumber>111</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1630,7 +1606,7 @@ ...@@ -1630,7 +1606,7 @@
</File> </File>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>114</FileNumber> <FileNumber>112</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
...@@ -1642,7 +1618,7 @@ ...@@ -1642,7 +1618,7 @@
</File> </File>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>115</FileNumber> <FileNumber>113</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
......
HJ232_Source/tim4DelayCounter.uvprojx
View file @ b3af226b
...@@ -833,16 +833,6 @@ ...@@ -833,16 +833,6 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>.\source\Application\APPCan\CAN_User.c</FilePath> <FilePath>.\source\Application\APPCan\CAN_User.c</FilePath>
</File> </File>
<File>
<FileName>Gauges.c</FileName>
<FileType>1</FileType>
<FilePath>.\source\Application\Gauges\Gauges.c</FilePath>
</File>
<File>
<FileName>Gauges.h</FileName>
<FileType>5</FileType>
<FilePath>.\source\Application\Gauges\Gauges.h</FilePath>
</File>
<File> <File>
<FileName>app_Telltales.c</FileName> <FileName>app_Telltales.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
......
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