Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
haoJin750TFT
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
时昊
haoJin750TFT
Commits
63456160
Commit
63456160
authored
7 months ago
by
张金硕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:修改光感和自检的bug,IGON时取消630初始化,修改软硬件版本号和boot版本号
parent
2352c3e3
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
32 additions
and
13 deletions
+32
-13
BackLight.c
Firmware/Source/Application/BackLight.c
+2
-2
BlueTooth.c
Firmware/Source/Application/BlueTooth.c
+3
-3
AMT630H.c
Firmware/Source/Component/AMT630H/AMT630H.c
+21
-3
AMT630H.h
Firmware/Source/Component/AMT630H/AMT630H.h
+2
-1
AMT630H_Datas.c
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
+0
-1
PowerManag_user.c
Firmware/Source/Component/PowerManagement/PowerManag_user.c
+2
-1
UDS_ISO14229_Services.h
Firmware/Source/UDS/UDS_ISO14229_Services.h
+2
-2
No files found.
Firmware/Source/Application/BackLight.c
View file @
63456160
...
...
@@ -104,11 +104,11 @@ void Data_Light_Res_service(Light_uint8_t deltaTime)//获取光感阻值,并
LightRes
+=
5
;
}
}
timeCount
+=
deltaTime
;
if
(
LightADCompleteFlg
)
else
{
LightRes
=
32000
;
}
/*由小到大插入数据*/
for
(
i
=
0
;
i
<
NtcDataCount
;
i
++
)
{
...
...
This diff is collapsed.
Click to expand it.
Firmware/Source/Application/BlueTooth.c
View file @
63456160
...
...
@@ -10,13 +10,13 @@ uint8_t SetUUIDTimes = 0;
_PICID_Struct
PicObj
;
_QRCODE_RECT
QRCode_Rect
;
const
uint8_t
HJBlueToothName
[
9
]
=
{
"HJ750"
};
uint8_t
UUIDConfigBuf
[
22
]
=
{
"800082024071700000001"
};
//
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
uint8_t
UUIDConfigBuf
[
22
]
=
{
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0x00
};
//
"600032023120100000995"
void
TextService
(
void
);
void
BlueToothService
()
void
BlueToothService
(
void
)
{
// SetUUIDTimes++;
if
(
Get_Dis_Bluetooth_Open_Close
()
==
0
)
...
...
This diff is collapsed.
Click to expand it.
Firmware/Source/Component/AMT630H/AMT630H.c
View file @
63456160
...
...
@@ -298,8 +298,8 @@ void Amt630hInit(void)
AMT630H_InitTime
=
0
;
AMT630H_Animation_Start
=
0
;
AMT630H_Animation_Finish
=
0
;
AMT630H_Animation_DispPic
=
0
;
//
AMT630H_Animation_Finish = 0;
//
AMT630H_Animation_DispPic = 0;
AMT630H_Animation_RefreshTime
=
0
;
AMT630H_Animation_RefreshTime_default
=
AMT630H_ANIMATION_REFRESHTIME_DEF
(
0
);
...
...
@@ -476,4 +476,22 @@ unsigned char AMT630H_isInitFinish(void)
{
return
0
;
}
}
\ No newline at end of file
}
void
AMT630H_Animation_IGON
(
void
)
{
AMT630H_Animation_Finish
=
0
;
AMT630H_Animation_DispPic
=
0
;
}
unsigned
char
AMT630H_Animation_Finish_Flage
(
void
)
{
if
(
AMT630H_Animation_Finish
==
1
)
{
return
1
;
}
else
{
return
0
;
}
}
This diff is collapsed.
Click to expand it.
Firmware/Source/Component/AMT630H/AMT630H.h
View file @
63456160
...
...
@@ -37,6 +37,7 @@ void AMT630H_Sleep(void);
static
void
AMT630H_AliveCounterMonitor
(
void
);
void
AMT630H_Main
(
void
);
unsigned
char
AMT630H_isInitFinish
(
void
);
extern
uint32_t
Amt630hInitTimerCnts
;
unsigned
char
AMT630H_Animation_Finish_Flage
(
void
);
void
AMT630H_Animation_IGON
(
void
);
#endif
This diff is collapsed.
Click to expand it.
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @
63456160
...
...
@@ -4269,7 +4269,6 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0740_682_21
);
/*蓝牙*/
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0748_194_26
);
/*E*/
AMT630H_GUI_Telephone
();
AMT630H_GUI_TIME
(
Get_Dis_Hour_Time
(),
Get_Dis_Minute_Time
());
if
(
KL30_VOLTAGE_time
<
10
)
{
...
...
This diff is collapsed.
Click to expand it.
Firmware/Source/Component/PowerManagement/PowerManag_user.c
View file @
63456160
...
...
@@ -134,7 +134,8 @@ static void Power_IG_ON_Init(void)
Fuel_KL15_Init
();
//RTE_GPIO_Set_Level(Blacklight_PWM, 1);
FaultCode_Init
();
Amt630hInit
();
AMT630H_Animation_IGON
();
// Amt630hInit();
AMT630H_GUI_SELFCHECK_STS_INIT
();
}
...
...
This diff is collapsed.
Click to expand it.
Firmware/Source/UDS/UDS_ISO14229_Services.h
View file @
63456160
...
...
@@ -30,8 +30,8 @@
program version
*******************************************************************************/
#define SWV 0x104 // 0x100 = 1.00 software version 软件版本号
#define HWV 0x1
0
0 // 0x100 = 1.00 hardware version 硬件版本号
#define BTV 0x10
0
// 0x100 = 1.00 bootloader version boot程序版本号
#define HWV 0x1
1
0 // 0x100 = 1.00 hardware version 硬件版本号
#define BTV 0x10
4
// 0x100 = 1.00 bootloader version boot程序版本号
#define internal_version (105UL)
/* 内部版本号 105 -> 1.05 */
#define internal_date (20240805UL)
/* 内部版本日期 20240805 -> 2024.08.05 */
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment