Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
TianYing_ty100
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
TY
TianYing_ty100
Commits
e61d3c70
Commit
e61d3c70
authored
Jan 02, 2025
by
陈家乐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:取消蓝牙相关功能,版本号改为1.29
parent
3a4522bc
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
30 additions
and
30 deletions
+30
-30
GUI_Display.c
Firmware/Source/Application/GUI_Display/GUI_Display.c
+2
-2
SEG_DISPLAY.c
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
+2
-2
PowerManag_user.c
Firmware/Source/Component/PowerManagement/PowerManag_user.c
+7
-7
Telltales_user.c
Firmware/Source/Component/Telltales/Telltales_user.c
+9
-9
Sys_Task_List.c
Firmware/Source/System/Sys_Task_List.c
+5
-5
UDS_ISO14229_Services.h
Firmware/Source/UDS/UDS_ISO14229_Services.h
+5
-5
No files found.
Firmware/Source/Application/GUI_Display/GUI_Display.c
View file @
e61d3c70
...
...
@@ -111,7 +111,7 @@ void Gauge_Service(void)
LED_Driver_Channel_Set
(
LampChannel_0
,
LampCh0_03
,
LED_ON
);
LED_Driver_Channel_Set
(
LampChannel_0
,
LampCh0_04
,
LED_ON
);
#endif
SEG_SET_Navigation_STS
(
Get_Navigation_St_Dis
(),
Get_Navigation_Code_Dis
(),
Get_Navigation_Mileage_Dis
()
);
//SEG_SET_Navigation_STS(0,0,0
);
}
else
...
...
@@ -198,7 +198,7 @@ void Gauge_Service(void)
LED_Driver_Channel_Set(LampChannel_0, LampCh0_03, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_04, LED_ON);
#endif
SEG_SET_Navigation_STS(Get_Navigation_St_Dis(),Get_Navigation_Code_Dis(),Get_Navigation_Mileage_Dis());
//
SEG_SET_Navigation_STS(Get_Navigation_St_Dis(),Get_Navigation_Code_Dis(),Get_Navigation_Mileage_Dis());
}
else
...
...
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
View file @
e61d3c70
...
...
@@ -4503,7 +4503,7 @@ void Check_SEG_Display(void)
SEG_SET_TPMS_DISPLAY
(
1
,
a
*
11
,
a
*
11
,
0
,
1
,
1
);
#endif
SEG_SET_Voltage_NUM
(
1
,
a
*
111
);
SEG_SET_Navigation_STS
(
1
,
3
,
a
*
11110
0
);
//SEG_SET_Navigation_STS(0, 0,
0);
for
(
i
=
0
;
i
<
SEG_LED_MAX
;
i
++
)
{
...
...
@@ -4576,7 +4576,7 @@ void Checkself_SEG_Display(void)
min
=
(
Checkself_SEG_step
/
3
)
*
11
;
voltage
=
(
Checkself_SEG_step
/
3
)
*
111
;
SEG_SET_Navigation_STS
(
1
,
3
,
Mileage
);
//SEG_SET_Navigation_STS(0, 0, 0
);
SEG_SET_FuelDial
(
1
,
Fuel
);
SEG_SET_CoolantDial
(
1
,
Fuel
,
collant
,
1
);
SEG_SET_EspeedDial
(
1
,
Espeed
/
500
);
...
...
Firmware/Source/Component/PowerManagement/PowerManag_user.c
View file @
e61d3c70
...
...
@@ -61,9 +61,9 @@ static void Power_KL30_Init(void)
Data_Read_DiagPara
();
Analog_Signal_Conv_Init
();
BU98R10_Init
();
Uart0_Init
(
115200
);
Protocol_KL30_Wakeup_Init
();
BlueTooth_KL30_KL15_Wakeup_Init
();
//
Uart0_Init(115200);
//
Protocol_KL30_Wakeup_Init();
//
BlueTooth_KL30_KL15_Wakeup_Init();
Sys_KL30_Init
();
Checkself_Init
();
Data_Vehicle_Speed_KL30_Init
();
...
...
@@ -139,9 +139,9 @@ static void Power_Wakeup_Init(void)
//Light_Sensor_Init_Example();//注意顺序1
LED_Driver_Init_Example
();
//注意顺序2
LED_Driver_Service_Immediate
();
Protocol_KL30_Wakeup_Init
();
Uart0_Init
(
115200
);
BlueTooth_KL30_KL15_Wakeup_Init
();
//
Protocol_KL30_Wakeup_Init();
//
Uart0_Init(115200);
//
BlueTooth_KL30_KL15_Wakeup_Init();
Fuel_KL30_Init
();
Data_Voltage_Init
();
// TimerM_PWM_counter_Output_Init(TIMERM_COUNTER0, 400, 64000000);
...
...
@@ -193,7 +193,7 @@ static void Power_IG_ON_Init(void)
Data_Voltage_Init
();
MenuData_TCS_Init
();
Data_Coolant_Temp_KL15_Init
();
BlueTooth_KL30_KL15_Wakeup_Init
();
//
BlueTooth_KL30_KL15_Wakeup_Init();
Data_TPMS_KL15_WAKE_UP_Init
();
CAN_TX_SetEnable
(
&
CAN_CH0_CanMsgTxOp
,
CAN_N_TX_Enable
);
DFlash_init
();
...
...
Firmware/Source/Component/Telltales/Telltales_user.c
View file @
e61d3c70
...
...
@@ -360,19 +360,19 @@ static void LED_Coolant_Execution(Tellib_uint16_t led_status)
static
Tellib_uint16_t
LED_Bluetooth_Judgement
(
void
)
{
Tellib_uint16_t
LED_STATE
=
0u
;
if
(
BlueTooth
.
BLE_St
)
{
LED_STATE
=
1u
;
}
else
{
LED_STATE
=
0u
;
}
//
if (BlueTooth.BLE_St)
//
{
//
LED_STATE = 1u;
//
}
//
else
//
{
//
LED_STATE = 0u;
//
}
return
LED_STATE
;
}
static
void
LED_Bluetooth_Execution
(
Tellib_uint16_t
led_status
)
{
if
(
led_status
==
1u
)
if
(
0
/*led_status == 1u*/
)
{
LED_Driver_Channel_Set
(
LampChannel_0
,
LampCh0_23_Bluetooth
,
LED_ON
);
SEG_SET_LED_STS
(
em_SEG_Bluetooth
,
1
);
...
...
Firmware/Source/System/Sys_Task_List.c
View file @
e61d3c70
...
...
@@ -54,8 +54,8 @@ void Sys_10ms_Tasks(void)
Fuel_R_Cal
(
10u
);
TYW_Check_Count
();
Data_TPMS_Processing_Service
();
Protocol_Service
();
Protocol_Send_Service
();
//
Protocol_Service();
//
Protocol_Send_Service();
//FaultCode_Service(10u);
FaultCode_Servers
();
...
...
@@ -98,7 +98,7 @@ void Sys_100ms_Tasks(void)
Services_Mileage_Callback
();
Data_Voltage_Processing_Service
();
S3_ServerCNTT
();
Send_UUID_To_Esp32
();
//
Send_UUID_To_Esp32();
if
(
u8LEDDriverCheckCount
>=
10U
)
{
...
...
@@ -112,8 +112,8 @@ void Sys_100ms_Tasks(void)
u8LEDDriverCheckCount
++
;
}
Clear_Navigation_St
();
Protocol_ESP32_Active_Service
();
//
Clear_Navigation_St();
//
Protocol_ESP32_Active_Service();
if
(
Common_GetIgnOffTime
()
>=
1000
)
{
CAN_TX_SetEnable
(
&
CAN_CH0_CanMsgTxOp
,
CAN_N_TX_Disable
);
...
...
Firmware/Source/UDS/UDS_ISO14229_Services.h
View file @
e61d3c70
...
...
@@ -312,13 +312,13 @@
#define CheckSumErr 7 // Checksum Error
#define UnknownPartID 8 // Unknown Part ID
#define SWV 0x12
8
// 0x100 = 1.00 software version 软件版本号
#define SWV 0x12
9
// 0x100 = 1.00 software version 软件版本号
#define HWV 0x103 // 0x100 = 1.00 hardware version 硬件版本号
#define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
#define INTLV 0x12
8
// 0x100 = 1.00 internal version 内部版本号
#define PROG_Y 0x2
4
// 0x24 = 2024年, program year
#define PROG_M 0x
1
1 // 0x03 = 3月, program month
#define PROG_D 0x
26
// 0x19 = 19日, program day
#define INTLV 0x12
9
// 0x100 = 1.00 internal version 内部版本号
#define PROG_Y 0x2
5
// 0x24 = 2024年, program year
#define PROG_M 0x
0
1 // 0x03 = 3月, program month
#define PROG_D 0x
02
// 0x19 = 19日, program day
/******************************************************************************
Bootloader Variable
...
...
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