Commit 7916c242 authored by 何锐's avatar 何锐

feat:修改一键启动引脚

parent 0ea7fe8a
...@@ -268,8 +268,6 @@ uint8_t yibiaoshuju[34]; ...@@ -268,8 +268,6 @@ uint8_t yibiaoshuju[34];
// comparestart = 1; // comparestart = 1;
break; break;
case 2: case 2:
// POWER_CTRL_KL30 = 0u; //B+
// POWER_CTRL_KL15 = 0u; //KL15
CAN_Msg_Tx_Enable = 1u; CAN_Msg_Tx_Enable = 1u;
if(MENU_CHECK_STEP == 0) if(MENU_CHECK_STEP == 0)
{ {
...@@ -299,8 +297,6 @@ uint8_t yibiaoshuju[34]; ...@@ -299,8 +297,6 @@ uint8_t yibiaoshuju[34];
recvflag111 = 0; recvflag111 = 0;
} }
// POWER_CTRL_KL30 = 0u; //B+
// POWER_CTRL_KL15 = 0u; //KL15
// CAN_Msg_Tx_Enable = 1u; // CAN_Msg_Tx_Enable = 1u;
// Diag_Info_Init( ); // Diag_Info_Init( );
// Display_Init( ); // Display_Init( );
...@@ -326,8 +322,6 @@ uint8_t yibiaoshuju[34]; ...@@ -326,8 +322,6 @@ uint8_t yibiaoshuju[34];
default: default:
// POWER_CTRL_KL30 = 0u;
POWER_CTRL_KL15 = 0u;
CAN_Msg_Tx_Enable = 1u; CAN_Msg_Tx_Enable = 1u;
Display_Menu_Type = 0; Display_Menu_Type = 0;
Diag_Info_Init( ); Diag_Info_Init( );
......
...@@ -114,6 +114,12 @@ void RTE_GPIO_Init(void) ...@@ -114,6 +114,12 @@ void RTE_GPIO_Init(void)
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_2; gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_2;
GPIO_Config(&gpio_temp); GPIO_Config(&gpio_temp);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_10; gpio_temp.enGPIOPort = GPIO_PORT_GROUP_10;
gpio_temp.enGPIOPIN = GPIO_PIN_12;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_10;
gpio_temp.enGPIOPIN = GPIO_PIN_2; gpio_temp.enGPIOPIN = GPIO_PIN_2;
gpio_temp.enGPIOMode = GPIO_MODE_PORT; gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT; gpio_temp.enGPIODir = GPIO_DIR_OUT;
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#include "TYW_stdint.h" #include "TYW_stdint.h"
#include "GPIO.h" #include "GPIO.h"
#define ONE_KEY GPIO_OUT_PORT00_PIN08 //一键启动 #define ONE_KEY GPIO_OUT_PORT10_PIN12 //一键启动
#define ONE_KEY_IN GPIO_OUT_PORT00_PIN07 //一键启动 #define ONE_KEY_IN GPIO_IN_PORT10_PIN11 //一键启动
#define LINE_OUT_NEG_09 GPIO_OUT_PORT10_PIN04 //485_RE #define LINE_OUT_NEG_09 GPIO_OUT_PORT10_PIN04 //485_RE
#define ABC_OUT GPIO_OUT_PORT00_PIN04 //ABC轮动报警输出 #define ABC_OUT GPIO_OUT_PORT00_PIN04 //ABC轮动报警输出
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
#define FanHui GPIO_OUT_PORT00_PIN13 //负控按键1 #define FanHui GPIO_OUT_PORT00_PIN13 //负控按键1
/* ---------------------旧的-------------------------- */ /* ---------------------旧的-------------------------- */
#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
#define LINE_OUT_NEG_02 GPIO_OUT_PORT09_PIN05 //BAT #define LINE_OUT_NEG_02 GPIO_OUT_PORT09_PIN05 //BAT
......
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