Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiancetai
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
陈家乐
jiancetai
Commits
e1aba751
Commit
e1aba751
authored
Dec 19, 2025
by
梁百峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:对应新零件号,增加左右转向输出检测
parent
945a3bb5
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
139 additions
and
16 deletions
+139
-16
Barcode_Scanner.c
YueJin_test_bench/source/Appliciation/Barcode_Scanner.c
+8
-0
Display_Info.c
YueJin_test_bench/source/Appliciation/Display_Info.c
+17
-4
Task.c
YueJin_test_bench/source/Appliciation/Task.c
+105
-5
Analog_Signals.c
..._test_bench/source/Driver/Analog_Signals/Analog_Signals.c
+8
-6
GPIO.c
YueJin_test_bench/source/Driver/GPIO/GPIO.c
+1
-1
No files found.
YueJin_test_bench/source/Appliciation/Barcode_Scanner.c
View file @
e1aba751
...
@@ -63,6 +63,14 @@ void get_key(void)
...
@@ -63,6 +63,14 @@ void get_key(void)
key_value
=
key_value
|
((
uint32_t
)
key_array
[
2
]
<<
8U
);
key_value
=
key_value
|
((
uint32_t
)
key_array
[
2
]
<<
8U
);
key_value
=
key_value
|
(
uint32_t
)
key_array
[
3
];
key_value
=
key_value
|
(
uint32_t
)
key_array
[
3
];
}
}
void
Key_Calculation
(
uint8_t
*
Seed_Value
,
uint8_t
*
Key_result
)
{
Key_result
[
0
]
=
Seed_Value
[
0
]
|
Seed_Value
[
3
];
Key_result
[
1
]
=
(
Seed_Value
[
1
]
>>
1
)
|
(
Seed_Value
[
2
]
<<
1
);
Key_result
[
2
]
=
(
Seed_Value
[
2
]
>>
2
)
|
(
Seed_Value
[
1
]
<<
2
);
Key_result
[
3
]
=
(
Seed_Value
[
3
]
>>
3
)
|
(
Seed_Value
[
0
]
<<
3
);
}
uint8_t
recvflag111
=
0
;
uint8_t
recvflag111
=
0
;
uint8_t
xierucishu
=
0
;
uint8_t
xierucishu
=
0
;
void
datacheck
(
void
)
void
datacheck
(
void
)
...
...
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @
e1aba751
...
@@ -3705,9 +3705,22 @@ void Display_Version_Info(uint32_t ON_OFF)
...
@@ -3705,9 +3705,22 @@ void Display_Version_Info(uint32_t ON_OFF)
wuliao
[
14
]
=
R485_ID4Dh
.
Sig
.
MaterialCode15
;
wuliao
[
14
]
=
R485_ID4Dh
.
Sig
.
MaterialCode15
;
wuliao
[
15
]
=
0xFF
;
wuliao
[
15
]
=
0xFF
;
if
(
R485_ID4Dh
.
Sig
.
MaterialCode07
==
0x47
)
if
(
R485_ID4Dh
.
Sig
.
MaterialCode07
==
0x47
)
{
if
(
R485_ID4Dh
.
Sig
.
MaterialCode08
==
0x32
)
{
{
nowbanbenhao
=
1
;
nowbanbenhao
=
1
;
nowbanbenhaohoumian
=
17
;
nowbanbenhaohoumian
=
21
;
}
else
if
(
R485_ID4Dh
.
Sig
.
MaterialCode08
==
0x33
)
{
nowbanbenhao
=
1
;
nowbanbenhaohoumian
=
4
;
}
else
{
}
}
}
else
if
(
R485_ID4Dh
.
Sig
.
MaterialCode07
==
0x43
)
else
if
(
R485_ID4Dh
.
Sig
.
MaterialCode07
==
0x43
)
...
@@ -3716,7 +3729,7 @@ void Display_Version_Info(uint32_t ON_OFF)
...
@@ -3716,7 +3729,7 @@ void Display_Version_Info(uint32_t ON_OFF)
if
(
R485_ID4Dh
.
Sig
.
MaterialCode13
==
0x32
)
if
(
R485_ID4Dh
.
Sig
.
MaterialCode13
==
0x32
)
{
{
nowbanbenhao
=
2
;
nowbanbenhao
=
2
;
nowbanbenhaohoumian
=
3
0
;
nowbanbenhaohoumian
=
3
2
;
}
}
else
if
(
R485_ID4Dh
.
Sig
.
MaterialCode13
==
0x35
)
else
if
(
R485_ID4Dh
.
Sig
.
MaterialCode13
==
0x35
)
{
{
...
@@ -3813,7 +3826,7 @@ void Display_Version_Info(uint32_t ON_OFF)
...
@@ -3813,7 +3826,7 @@ void Display_Version_Info(uint32_t ON_OFF)
// TFT_LCD_Draw_Bmp(3, 160, ( uint8_t * )gImage_Alarm_12_WordX6_Y165); //24脚输出占空比
// TFT_LCD_Draw_Bmp(3, 160, ( uint8_t * )gImage_Alarm_12_WordX6_Y165); //24脚输出占空比
// TFT_LCD_Draw_Bmp(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //%
// TFT_LCD_Draw_Bmp(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //%
TFT_LCD_Draw_Bmp
(
3
,
290
,
(
uint8_t
*
)
gImage_gImage_checkVX6_Y165
);
//检测台版本号
TFT_LCD_Draw_Bmp
(
3
,
290
,
(
uint8_t
*
)
gImage_gImage_checkVX6_Y165
);
//检测台版本号
uint8_t
mbuff
[
7
]
=
{
2
,
5
,
0
,
7
,
0
,
3
,
0xff
};
uint8_t
mbuff
[
7
]
=
{
2
,
5
,
1
,
2
,
1
,
6
,
0xff
};
General_Number_Disp
(
mbuff
,
160
,
290
);
General_Number_Disp
(
mbuff
,
160
,
290
);
}
}
...
...
YueJin_test_bench/source/Appliciation/Task.c
View file @
e1aba751
...
@@ -21,6 +21,8 @@
...
@@ -21,6 +21,8 @@
#include "api_RS485.h"
#include "api_RS485.h"
#include "RTE_WDT.h"
#include "RTE_WDT.h"
#include "R485_Communication_Matrix.h"
#include "R485_Communication_Matrix.h"
#include "Analog_Signals.h"
/*******************************************************************************
/*******************************************************************************
* *
* *
* ϵͳ��������ģʽ(SYS_MODE_OFF / SYS_MODE_ON / SYS_MODE_STANDBY )�����б� *
* ϵͳ��������ģʽ(SYS_MODE_OFF / SYS_MODE_ON / SYS_MODE_STANDBY )�����б� *
...
@@ -38,9 +40,100 @@ uint32_t bleOFFtoONtime = 0;
...
@@ -38,9 +40,100 @@ uint32_t bleOFFtoONtime = 0;
uint8_t
startONfalg
=
0
;
uint8_t
startONfalg
=
0
;
uint32_t
startIGONtime
=
0
;
uint32_t
startIGONtime
=
0
;
uint8_t
compareresult
;
uint8_t
compareresult
;
const
uint16_t
TurnRL_Volate
[]
=
{
25
,
15
,
5
};
extern
uint8_t
keyopenble
;
extern
uint8_t
keyopenble
;
uint8_t
buzzerflag
=
0
;
const
unsigned
char
gImage_cuo1
[]
=
{
24
,
24
,
0X00
,
0X00
,
0X00
,
0X00
,
0X30
,
0X70
,
0XE0
,
0XC0
,
0X80
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X80
,
0XC0
,
0X70
,
0X30
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X01
,
0X83
,
0XC7
,
0X66
,
0X38
,
0X38
,
0X7C
,
0XE6
,
0XC3
,
0X81
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X0C
,
0X0C
,
0X06
,
0X03
,
0X01
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X01
,
0X03
,
0X07
,
0X0E
,
0X0C
,
0X00
,
0X00
,
0X00
,
0X00
,};
const
unsigned
char
gImage_cuo1
[]
=
{
24
,
24
,
0X00
,
0X00
,
0X00
,
0X00
,
0X30
,
0X70
,
0XE0
,
0XC0
,
0X80
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X80
,
0XC0
,
0X70
,
0X30
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X01
,
0X83
,
0XC7
,
0X66
,
0X38
,
0X38
,
0X7C
,
0XE6
,
0XC3
,
0X81
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X0C
,
0X0C
,
0X06
,
0X03
,
0X01
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X01
,
0X03
,
0X07
,
0X0E
,
0X0C
,
0X00
,
0X00
,
0X00
,
0X00
,};
const
unsigned
char
gImage_dui1
[]
=
{
24
,
24
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X80
,
0XC0
,
0XE0
,
0X40
,
0X00
,
0X00
,
0X00
,
0X00
,
0X08
,
0X18
,
0X30
,
0X70
,
0XC0
,
0X80
,
0X00
,
0X00
,
0X80
,
0XC0
,
0XE0
,
0X70
,
0X38
,
0X1C
,
0X0E
,
0X07
,
0X03
,
0X01
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X01
,
0X03
,
0X07
,
0X03
,
0X01
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,};
const
unsigned
char
gImage_dui1
[]
=
{
24
,
24
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X80
,
0XC0
,
0XE0
,
0X40
,
0X00
,
0X00
,
0X00
,
0X00
,
0X08
,
0X18
,
0X30
,
0X70
,
0XC0
,
0X80
,
0X00
,
0X00
,
0X80
,
0XC0
,
0XE0
,
0X70
,
0X38
,
0X1C
,
0X0E
,
0X07
,
0X03
,
0X01
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X01
,
0X03
,
0X07
,
0X03
,
0X01
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,
0X00
,};
// nowAD1 = 0;
// uint16_t nowAD2 = 0;
uint8_t
leftTurnLightVoltageOK
=
0
;
uint8_t
rightTurnLightVoltageOK
=
0
;
uint8_t
changeZeroFlag
=
0
;
void
Check_TurnLights_Voltage_Service
(
void
)
{
static
uint32_t
voltageCheckTimer
=
0
;
static
uint16_t
processedLeftVoltage
=
0
;
static
uint16_t
processedRightVoltage
=
0
;
// Can_Write_Fun(2); //报文外发
// COM_RX_Process( );
uint16_t
currentRightVoltage
=
(
uint16_t
)
ADC_Read_Signal
(
ADC_CH_KL30_VOLTAGE
);
if
(
currentRightVoltage
<
1000
)
{
currentRightVoltage
=
0
;
}
uint16_t
currentLeftVoltage
=
(
uint16_t
)
ADC_Read_Signal
(
ADC_CH_10_VOLTAGE
);
if
(
currentLeftVoltage
<
1000
)
{
currentLeftVoltage
=
0
;
}
processedLeftVoltage
=
currentLeftVoltage
;
processedLeftVoltage
/=
100
;
if
(
MENU_CHECK_STEP
==
0
)
{
leftTurnLightVoltageOK
=
0
;
rightTurnLightVoltageOK
=
0
;
}
processedRightVoltage
=
currentRightVoltage
;
processedRightVoltage
/=
100
;
if
(
voltageCheckTimer
<
100
)
{
voltageCheckTimer
++
;
}
else
{
voltageCheckTimer
=
0
;
if
(
MENU_CHECK_STEP
==
2
||
MENU_CHECK_STEP
==
11
)
{
if
(
processedLeftVoltage
>=
80
&&
processedLeftVoltage
<=
160
)
{
leftTurnLightVoltageOK
=
1
;
}
GUI_General_Digit_Display
(
processedLeftVoltage
,
Num_15
,
3
,
2
,
TurnRL_Volate
,
40
+
25
+
25
+
25
+
25
+
25
+
25
+
25
+
30
);
}
if
(
MENU_CHECK_STEP
==
3
||
MENU_CHECK_STEP
==
11
)
{
if
(
processedRightVoltage
>=
80
&&
processedRightVoltage
<=
160
)
{
rightTurnLightVoltageOK
=
1
;
}
GUI_General_Digit_Display
(
processedRightVoltage
,
Num_15
,
3
,
2
,
TurnRL_Volate
,
40
+
25
+
25
+
25
+
25
+
25
+
25
+
25
+
25
+
30
);
}
}
// if(MENU_CHECK_STEP > 2 && leftTurnLightVoltageOK == 0)
// {
// MENU_CHECK_STEP = 2;
// }
// else if(MENU_CHECK_STEP > 3 && rightTurnLightVoltageOK == 0)
// {
// MENU_CHECK_STEP = 3;
// }
// else
// {
// ;
// }
}
void
Sys_Run_Mode_Pseudo_Real_Time_Tasks
(
void
)
void
Sys_Run_Mode_Pseudo_Real_Time_Tasks
(
void
)
{
{
SD_FMQ
=
1
;
SD_FMQ
=
1
;
...
@@ -52,19 +145,26 @@ void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void)
...
@@ -52,19 +145,26 @@ void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void)
TFT_LCD_Display_Update_Service
(
);
TFT_LCD_Display_Update_Service
(
);
Fre_In_Service
(
FRE_VEHICLE
);
Fre_In_Service
(
FRE_VEHICLE
);
RTE_ADC_Services
(
);
// MENU_CHECK_STEP = 11;
// MENU_CHECK_STEP = 11;
//Fre_In_Service(FRE_ENGINE);
//Fre_In_Service(FRE_ENGINE);
// LINE_FUEL_RES03 = 1;
}
}
/*============================================================================*/
/*============================================================================*/
/*==============================================================================
/*==============================================================================
2ms����ִ������ ��0��
2ms����ִ������ ��0��
------------------------------------------------------------------------------*/
------------------------------------------------------------------------------*/
void
Sys_Run_Mode_2ms_Tasks_Group
(
void
)
void
Sys_Run_Mode_2ms_Tasks_Group
(
void
)
{
{
// Can_Write_Fun(2); //报文外发
// COM_RX_Process( );
RTE_ADC_Services
(
);
// }
Check_TurnLights_Voltage_Service
();
Get_static_Current
();
Get_static_Current
();
}
}
...
@@ -73,6 +173,7 @@ void Sys_Run_Mode_2ms_Tasks_Group(void)
...
@@ -73,6 +173,7 @@ void Sys_Run_Mode_2ms_Tasks_Group(void)
------------------------------------------------------------------------------*/
------------------------------------------------------------------------------*/
void
Sys_Run_Mode_5ms_Tasks_Group
(
void
)
void
Sys_Run_Mode_5ms_Tasks_Group
(
void
)
{
{
}
}
/*==============================================================================
/*==============================================================================
...
@@ -421,7 +522,6 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
...
@@ -421,7 +522,6 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
Display_PageNum
();
Display_PageNum
();
// Freln_Duty_HZ_Service();
// Freln_Duty_HZ_Service();
if
(
RS485_send_time
<
0xFFFFFFFF
)
if
(
RS485_send_time
<
0xFFFFFFFF
)
{
{
...
...
YueJin_test_bench/source/Driver/Analog_Signals/Analog_Signals.c
View file @
e1aba751
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
* \attention
* \attention
*
*
* This file is automatically generated by analog signals configuration tool.
* This file is automatically generated by analog signals configuration tool.
* Date : 202
2/8/3 23:21:24
* Date : 202
5/10/7 12:03:45
* Cfg Tool Ver : 1.1.0
* Cfg Tool Ver : 1.1.0
* Engineer :
* Engineer :
* (c) Heilongjiang TYW electronics co., LTD
* (c) Heilongjiang TYW electronics co., LTD
...
@@ -74,21 +74,23 @@ ADC_Data_st_t stADCData[ADC_SIGNAL_CH_NUMBER];
...
@@ -74,21 +74,23 @@ ADC_Data_st_t stADCData[ADC_SIGNAL_CH_NUMBER];
const
uint8_t
u8ADCChList
[
ADC_CONV_CH_NUMBER
]
=
const
uint8_t
u8ADCChList
[
ADC_CONV_CH_NUMBER
]
=
{
{
9U
,
15U
,
14U
,
9U
,
7U
,
8U
,
};
};
const
ADC_Ch_Cfg_st_t
stADCChCfg
[
ADC_SIGNAL_CH_NUMBER
]
=
const
ADC_Ch_Cfg_st_t
stADCChCfg
[
ADC_SIGNAL_CH_NUMBER
]
=
{
{
{
0U
,
0U
,
0U
,
0U
,
0U
,
1U
,
ADC_Voltage_Calc_Circuit101
,},
{
0U
,
0U
,
0U
,
0U
,
0U
,
1U
,
ADC_Voltage_Calc_Circuit101
,},
{
1U
,
0U
,
0U
,
0U
,
0U
,
1U
,
ADC_Voltage_Calc_Circuit10
1
,},
{
1U
,
0U
,
0U
,
0U
,
0U
,
1U
,
ADC_Voltage_Calc_Circuit10
2
,},
{
2U
,
0U
,
0U
,
0U
,
0U
,
1U
,
ADC_Voltage_Calc_Circuit102
,},
{
2U
,
0U
,
0U
,
0U
,
0U
,
1U
,
ADC_Voltage_Calc_Circuit102
,},
};
};
const
ADC_Res_List_st_t
stADCResList
[
ADC_SIGNAL_CH_NUMBER
]
=
const
ADC_Res_List_st_t
stADCResList
[
ADC_SIGNAL_CH_NUMBER
]
=
{
{
{
0U
,
100000U
,
0U
,
0U
,},
{
0U
,
100000U
,
0U
,
0U
,},
{
0U
,
100000U
,
0U
,
0U
,},
{
3300000U
,
1000000U
,
0U
,
0U
,},
{
330000U
,
47000U
,
0U
,
0U
,},
{
3300000U
,
1000000U
,
0U
,
0U
,},
// { 0U, 1000000U, 47000U, 0U,},
// { 0U, 1000000U, 47000U, 0U,},
};
};
/* Private function prototypes ----------------------------------------------*/
/* Private function prototypes ----------------------------------------------*/
...
...
YueJin_test_bench/source/Driver/GPIO/GPIO.c
View file @
e1aba751
...
@@ -92,7 +92,7 @@ const uint16_t g_u16GPIOConfigArray[56U][2U] =
...
@@ -92,7 +92,7 @@ const uint16_t g_u16GPIOConfigArray[56U][2U] =
{
0x0000u
,
0x0000u
},
{
0x0000u
,
0x0000u
},
{
0x00FFu
,
0x00FFu
},
{
0x00FFu
,
0x00FFu
},
{
0x0200u
,
0x0000u
},
{
0x0200u
,
0x0000u
},
{
0x
C07Fu
,
0xC07
Fu
},
{
0x
03FFu
,
0x27F
Fu
},
{
0xFFFFu
,
0xFFFFu
},
{
0xFFFFu
,
0xFFFFu
},
};
};
static
void
GPIO_PIN_Init
(
GPIO_Config_Mode_en_t
enGPIOConfigMode
)
static
void
GPIO_PIN_Init
(
GPIO_Config_Mode_en_t
enGPIOConfigMode
)
...
...
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