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
1b967fbf
Commit
1b967fbf
authored
Mar 21, 2025
by
李梓源
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:新板子变更引脚
parent
574989e7
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
33 additions
and
26 deletions
+33
-26
Check_Ctrl.c
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
+13
-13
RTE_GPIO.c
YueJin_test_bench/source/Appliciation/RTE_GPIO.c
+6
-0
RTE_GPIO.h
YueJin_test_bench/source/Appliciation/RTE_GPIO.h
+3
-3
app_lsdn.c
YueJin_test_bench/source/Appliciation/app_lsdn.c
+2
-2
init.c
YueJin_test_bench/source/System/init.c
+3
-2
GPIO.c
YueJin_test_bench/utility/GPIO/GPIO.c
+1
-1
GPIO_RH850_F1KM_CFG.json
...h/utility/诊断工具1.10.11 x64/Option/GPIO_RH850_F1KM_CFG.json
+3
-3
Option.properties
...st_bench/utility/诊断工具1.10.11 x64/Option/Option.properties
+2
-2
No files found.
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @
1b967fbf
...
@@ -326,7 +326,7 @@ uint8_t yibiaoshuju[34];
...
@@ -326,7 +326,7 @@ uint8_t yibiaoshuju[34];
default:
default:
POWER_CTRL_KL30
=
0u
;
//
POWER_CTRL_KL30 = 0u;
POWER_CTRL_KL15
=
0u
;
POWER_CTRL_KL15
=
0u
;
CAN_Msg_Tx_Enable
=
1u
;
CAN_Msg_Tx_Enable
=
1u
;
Display_Menu_Type
=
0
;
Display_Menu_Type
=
0
;
...
@@ -613,7 +613,7 @@ void Function_Check_Ctrl(uint32_t cmd)
...
@@ -613,7 +613,7 @@ void Function_Check_Ctrl(uint32_t cmd)
{
{
}
}
// ONE_START = 1;
break
;
break
;
}
}
...
@@ -645,26 +645,26 @@ void Function_Check_Ctrl(uint32_t cmd)
...
@@ -645,26 +645,26 @@ void Function_Check_Ctrl(uint32_t cmd)
if
(
ONE_KEY_ONOFF
<=
20
)
if
(
ONE_KEY_ONOFF
<=
20
)
{
{
RELAY_KEY_MCU
=
1
;
RELAY_KEY_MCU
=
1
;
ONE_START
=
0
;
ONE_START
=
1
;
}
}
else
if
(
ONE_KEY_ONOFF
<=
40
)
else
if
(
ONE_KEY_ONOFF
<=
40
)
{
{
RELAY_KEY_MCU
=
0
;
RELAY_KEY_MCU
=
0
;
ONE_START
=
1
;
ONE_START
=
0
;
}
}
else
if
(
ONE_KEY_ONOFF
<=
60
)
else
if
(
ONE_KEY_ONOFF
<=
60
)
{
{
RELAY_KEY_MCU
=
0
;
RELAY_KEY_MCU
=
0
;
ONE_START
=
0
;
ONE_START
=
1
;
}
}
else
if
(
ONE_KEY_ONOFF
<=
70
)
else
if
(
ONE_KEY_ONOFF
<=
70
)
{
{
RELAY_KEY_MCU
=
0
;
RELAY_KEY_MCU
=
0
;
ONE_START
=
1
;
ONE_START
=
0
;
}
}
else
if
(
ONE_KEY_ONOFF
>
110
&&
ONE_KEY_ONOFF
<=
120
)
else
if
(
ONE_KEY_ONOFF
>
110
&&
ONE_KEY_ONOFF
<=
120
)
{
{
ONE_START
=
0
;
ONE_START
=
1
;
ABC_OUT
=
1
;
ABC_OUT
=
1
;
}
}
else
else
...
@@ -678,7 +678,7 @@ void Function_Check_Ctrl(uint32_t cmd)
...
@@ -678,7 +678,7 @@ void Function_Check_Ctrl(uint32_t cmd)
RELAY_VBAT_MCU
=
1
;
RELAY_VBAT_MCU
=
1
;
RELAY_DC12V_MCU
=
1
;
RELAY_DC12V_MCU
=
1
;
RELAY_KEY_MCU
=
1
;
RELAY_KEY_MCU
=
1
;
ONE_START
=
0
;
ONE_START
=
1
;
FULL_BEAM
=
0
;
FULL_BEAM
=
0
;
break
;
break
;
}
}
...
@@ -735,23 +735,23 @@ void Function_Check_Ctrl(uint32_t cmd)
...
@@ -735,23 +735,23 @@ void Function_Check_Ctrl(uint32_t cmd)
RELAY_LIGHTCONTROL_MCU
=
0
;
RELAY_LIGHTCONTROL_MCU
=
0
;
if
(
ACCONOFF_delay_3s
<=
5
)
if
(
ACCONOFF_delay_3s
<=
5
)
{
{
ONE_START
=
0
;
ONE_START
=
1
;
}
}
else
if
(
ACCONOFF_delay_3s
>
5
&&
ACCONOFF_delay_3s
<=
8
)
else
if
(
ACCONOFF_delay_3s
>
5
&&
ACCONOFF_delay_3s
<=
8
)
{
{
ONE_START
=
1
;
ONE_START
=
0
;
}
}
else
if
(
ACCONOFF_delay_3s
>
10
&&
ACCONOFF_delay_3s
<=
13
)
else
if
(
ACCONOFF_delay_3s
>
10
&&
ACCONOFF_delay_3s
<=
13
)
{
{
ONE_START
=
0
;
ONE_START
=
1
;
}
}
else
if
(
ACCONOFF_delay_3s
>
13
&&
ACCONOFF_delay_3s
<=
17
)
else
if
(
ACCONOFF_delay_3s
>
13
&&
ACCONOFF_delay_3s
<=
17
)
{
{
ONE_START
=
1
;
ONE_START
=
0
;
}
}
else
else
{
{
ONE_START
=
0
;
ONE_START
=
1
;
}
}
if
(
ACCONOFF_delay_3s
>
17
&&
CHECK_Value
==
0
)
if
(
ACCONOFF_delay_3s
>
17
&&
CHECK_Value
==
0
)
...
...
YueJin_test_bench/source/Appliciation/RTE_GPIO.c
View file @
1b967fbf
...
@@ -173,6 +173,12 @@ void RTE_GPIO_Init(void)
...
@@ -173,6 +173,12 @@ void RTE_GPIO_Init(void)
gpio_temp
.
enGPIODir
=
GPIO_DIR_OUT
;
gpio_temp
.
enGPIODir
=
GPIO_DIR_OUT
;
gpio_temp
.
enGPIOAltFun
=
GPIO_ALTER_FUN_1
;
gpio_temp
.
enGPIOAltFun
=
GPIO_ALTER_FUN_1
;
GPIO_Config
(
&
gpio_temp
);
GPIO_Config
(
&
gpio_temp
);
gpio_temp
.
enGPIOPort
=
GPIO_PORT_GROUP_0
;
gpio_temp
.
enGPIOPIN
=
GPIO_PIN_4
;
gpio_temp
.
enGPIOMode
=
GPIO_MODE_PORT
;
gpio_temp
.
enGPIODir
=
GPIO_DIR_OUT
;
gpio_temp
.
enGPIOAltFun
=
GPIO_ALTER_FUN_1
;
GPIO_Config
(
&
gpio_temp
);
// queren = 0;
// queren = 0;
// LINE_OUT_NEG_01 = 1;
// LINE_OUT_NEG_01 = 1;
// LINE_OUT_NEG_02 = 1;
// LINE_OUT_NEG_02 = 1;
...
...
YueJin_test_bench/source/Appliciation/RTE_GPIO.h
View file @
1b967fbf
...
@@ -7,8 +7,8 @@
...
@@ -7,8 +7,8 @@
#define LINE_OUT_NEG_09 GPIO_OUT_PORT10_PIN04 //485_RE
#define LINE_OUT_NEG_09 GPIO_OUT_PORT10_PIN04 //485_RE
#define ONE_START GPIO_OUT_PORT10_PIN1
4
//一键启动
#define ONE_START GPIO_OUT_PORT10_PIN1
3
//一键启动
#define ABC_OUT GPIO_OUT_PORT
10_PIN13
//ABC轮动报警输出
#define ABC_OUT GPIO_OUT_PORT
00_PIN04
//ABC轮动报警输出
#define RELAY_VBAT_MCU GPIO_OUT_PORT10_PIN10
#define RELAY_VBAT_MCU GPIO_OUT_PORT10_PIN10
#define RELAY_DC12V_MCU GPIO_OUT_PORT10_PIN09
#define RELAY_DC12V_MCU GPIO_OUT_PORT10_PIN09
...
@@ -45,7 +45,7 @@
...
@@ -45,7 +45,7 @@
/* ---------------------旧的-------------------------- */
/* ---------------------旧的-------------------------- */
#define POWER_CTRL_KL30 GPIO_OUT_PORT10_PIN13
//
#define POWER_CTRL_KL30 GPIO_OUT_PORT10_PIN13
#define POWER_CTRL_KL15 GPIO_OUT_PORT10_PIN12
#define POWER_CTRL_KL15 GPIO_OUT_PORT10_PIN12
#define SW10 GPIO_IN_PORT10_PIN02
#define SW10 GPIO_IN_PORT10_PIN02
#define LINE_OUT_NEG_01 GPIO_OUT_PORT09_PIN06 //12V
#define LINE_OUT_NEG_01 GPIO_OUT_PORT09_PIN06 //12V
...
...
YueJin_test_bench/source/Appliciation/app_lsdn.c
View file @
1b967fbf
...
@@ -14,7 +14,7 @@ void set_pin_high(uint8_t mode)
...
@@ -14,7 +14,7 @@ void set_pin_high(uint8_t mode)
}
}
else
else
{
{
ONE_START
=
0
;
ONE_START
=
1
;
}
}
}
}
void
set_pin_low
(
uint8_t
mode
)
void
set_pin_low
(
uint8_t
mode
)
...
@@ -28,7 +28,7 @@ void set_pin_low(uint8_t mode)
...
@@ -28,7 +28,7 @@ void set_pin_low(uint8_t mode)
}
}
else
else
{
{
ONE_START
=
1
;
ONE_START
=
0
;
}
}
}
}
void
lsdn_delay_us
(
uint32_t
us
)
void
lsdn_delay_us
(
uint32_t
us
)
...
...
YueJin_test_bench/source/System/init.c
View file @
1b967fbf
...
@@ -77,7 +77,8 @@ void Sys_Startup_Init(void)
...
@@ -77,7 +77,8 @@ void Sys_Startup_Init(void)
// GPIO_DIR_PORT00_PIN08 = 1;
// GPIO_DIR_PORT00_PIN08 = 1;
// TX_OUT = 0;
// TX_OUT = 0;
ONE_START
=
0
;
ONE_START
=
1
;
ABC_OUT
=
0
;
GPIO_SET_KEPP
(
);
GPIO_SET_KEPP
(
);
RTE_ADC_Init
(
);
RTE_ADC_Init
(
);
...
@@ -110,7 +111,7 @@ void Sys_Startup_Init(void)
...
@@ -110,7 +111,7 @@ void Sys_Startup_Init(void)
loc_config
.
pfnUARTConfirmCallBack
=
0
;
loc_config
.
pfnUARTConfirmCallBack
=
0
;
loc_config
.
pfnUARTErrHandleCallBack
=
0
;
loc_config
.
pfnUARTErrHandleCallBack
=
0
;
loc_config
.
pfnUARTReadMsgCallBack
=
UART_Put1
;
loc_config
.
pfnUARTReadMsgCallBack
=
UART_Put1
;
UART_Init
(
UART_RLIN31
,
&
loc_config
);
//
UART_Init(UART_RLIN31, &loc_config);
// Auto_ONOFF = 1;
// Auto_ONOFF = 1;
// AutoFlag = 1;
// AutoFlag = 1;
}
}
...
...
YueJin_test_bench/utility/GPIO/GPIO.c
View file @
1b967fbf
...
@@ -48,7 +48,7 @@ const uint16_t g_u16GPIOConfigArray[56U][2U] =
...
@@ -48,7 +48,7 @@ const uint16_t g_u16GPIOConfigArray[56U][2U] =
{
0x0000u
,
0x0000u
},
{
0x0000u
,
0x0000u
},
{
0x0630u
,
0x0600u
},
{
0x0630u
,
0x0600u
},
{
0x0220u
,
0x2207u
},
{
0x0220u
,
0x2207u
},
{
0x79
C
Fu
,
0x79FFu
},
{
0x79
D
Fu
,
0x79FFu
},
{
0x0000u
,
0x0000u
},
{
0x0000u
,
0x0000u
},
{
0x0000u
,
0x0000u
},
{
0x0000u
,
0x0000u
},
{
0x0000u
,
0x0000u
},
{
0x0000u
,
0x0000u
},
...
...
YueJin_test_bench/utility/诊断工具1.10.11 x64/Option/GPIO_RH850_F1KM_CFG.json
View file @
1b967fbf
...
@@ -198,7 +198,7 @@
...
@@ -198,7 +198,7 @@
"pinName"
:
"Pin_P0_04"
,
"pinName"
:
"Pin_P0_04"
,
"pinAddress"
:
"11"
,
"pinAddress"
:
"11"
,
"wakeupPin"
:
{
"wakeupPin"
:
{
"PinModeName"
:
"
CAN2TX
"
,
"PinModeName"
:
"
GPIO_OUT
"
,
"PUn"
:
false
,
"PUn"
:
false
,
"PDn"
:
false
,
"PDn"
:
false
,
"PISn"
:
false
,
"PISn"
:
false
,
...
@@ -207,9 +207,9 @@
...
@@ -207,9 +207,9 @@
"PFCAEn"
:
false
,
"PFCAEn"
:
false
,
"PIPCn"
:
false
,
"PIPCn"
:
false
,
"Pn"
:
false
,
"Pn"
:
false
,
"PMCn"
:
tru
e
,
"PMCn"
:
fals
e
,
"PMn"
:
false
,
"PMn"
:
false
,
"PIBCn"
:
fals
e
"PIBCn"
:
tru
e
},
},
"sleepPin"
:
{
"sleepPin"
:
{
"PinModeName"
:
"GPIO_OUT"
,
"PinModeName"
:
"GPIO_OUT"
,
...
...
YueJin_test_bench/utility/诊断工具1.10.11 x64/Option/Option.properties
View file @
1b967fbf
#new Option
#new Option
#
Wed Feb 19 15:12:14
CST 2025
#
Fri Mar 21 11:10:29
CST 2025
IsSort
=
true
IsSort
=
true
MergeFlashIsCompression
=
false
MergeFlashIsCompression
=
false
ChangeAppFilePath
=
ChangeAppFilePath
=
...
@@ -10,7 +10,7 @@ MergeCrcTtpe=1
...
@@ -10,7 +10,7 @@ MergeCrcTtpe=1
MergeBootFilePath
=
MergeBootFilePath
=
IsMergeChangeAddress
=
false
IsMergeChangeAddress
=
false
MergeFlashOutPutFilePath
=
D
\:\\
Code
\\\u7231\u
739B
\u
68C0
\u
6D4B
\u
53F0
\\\u
56FE
\u7247
MergeFlashOutPutFilePath
=
D
\:\\
Code
\\\u7231\u
739B
\u
68C0
\u
6D4B
\u
53F0
\\\u
56FE
\u7247
GPIOOutPutPath
=
GPIOOutPutPath
=
C
\:\\
Users
\\
Lenovo
\\
Desktop
MergeCanDBCPath
=
MergeCanDBCPath
=
IsFilling
=
true
IsFilling
=
true
RxID
=
729
RxID
=
729
...
...
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