Skip to content

J
jiancetai
Commit 0f182e6f authored by 李梓源's avatar 李梓源
Browse files
Options

✨ feat:AD口配置

parent 6a552409
Hide whitespace changes
Inline Side-by-side
Showing with 178 additions and 116 deletions
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 0f182e6f
......@@ -589,6 +589,7 @@ void Function_Check_Ctrl(uint32_t cmd)
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1;
break;
}
......@@ -634,34 +635,69 @@ void Function_Check_Ctrl(uint32_t cmd)
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1;
FULL_BEAM = 0;
break;
}
case 4:
{
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1;
FULL_BEAM = 1;
ZXSW_12V = 0;
left_turn = 0;
break;
}
case 5:
{
{
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1;
ZXSW_12V = 1;
FULL_BEAM = 0;
left_turn = 1;
right_turn = 0;
break;
}
case 6:
{
{
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1;
ZXSW_12V = 1;
left_turn = 0;
right_turn = 1;
RELAY_LIGHTCONTROL_MCU = 0;
break;
}
case 7:
{
{
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1;
ZXSW_12V = 0;
right_turn = 0;
RELAY_LIGHTCONTROL_MCU = 1;
ABC_OUT = 0;
break;
}
case 8:
{
{
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 0;
RELAY_LIGHTCONTROL_MCU = 0;
if (ONE_KEY_ONOFF >=150)
{
ABC_OUT = 1;
}
break;
}
case 9:
{
ABC_OUT = 0;
break;
}
case 10:
......@@ -683,9 +719,6 @@ void Function_Check_Ctrl(uint32_t cmd)
{
LINE_OUT_NEG_01 = 0;
}
LINE_OUT_NEG_02 = 0;
LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 0;
break;
}
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ 0f182e6f
......@@ -3500,31 +3500,31 @@ void Display_Title_Info(void)// 检测台 标题
const uint16_t VoltageDigitNum09PosX[] = {190,170,160};
void HW_Voltage_Check(uint32_t cmd)
{
uint32_t Voltage = 0;
static uint32_t V_Timer = 0;
static uint32_t V_ret = 0;
if ( cmd == 0u )
{
// uint32_t Voltage = 0;
// static uint32_t V_Timer = 0;
// static uint32_t V_ret = 0;
// if ( cmd == 0u )
// {
}
else if ( cmd == 1u )
{
Voltage = ADC_Read_Signal(ADC_CH_KL30_VOLTAGE); //mv
Voltage = Voltage / 100;
// }
// else if ( cmd == 1u )
// {
// Voltage = ADC_Read_Signal(ADC_CH_KL30_VOLTAGE); //mv
// Voltage = Voltage / 100;
V_ret = V_ret + Voltage;
V_Timer++;
if ( V_Timer >= 10 )
{
V_Timer = 0;
V_ret /= 10;
GUI_General_Digit_Display(V_ret, Num_15, 3, 0, VoltageDigitNum09PosX, 160);
TFT_LCD_Draw_Bmp(180, 160, ( uint8_t * )gImage_Number_15_white_PiontX0_Y0);
// V_ret = V_ret + Voltage;
// V_Timer++;
// if ( V_Timer >= 10 )
// {
// V_Timer = 0;
// V_ret /= 10;
// GUI_General_Digit_Display(V_ret, Num_15, 3, 0, VoltageDigitNum09PosX, 160);
// TFT_LCD_Draw_Bmp(180, 160, ( uint8_t * )gImage_Number_15_white_PiontX0_Y0);
V_ret = 0;
}
}
// V_ret = 0;
// }
// }
}
const uint16_t CurrentDigitNum09PosX[] = {200,180,170};
......@@ -3577,25 +3577,25 @@ void HW_Static_Current_Check(uint32_t cmd)
}
void Get_static_Current(void)
{
static uint32_t loc_Timer = 0;
static uint32_t loc_ret = 0;
if(MENU_CHECK_STEP == 13)
{
loc_Current_0 = ADC_Read_Signal(ADC_CH_KL15_VOLTAGE);
loc_ret += loc_Current_0;
loc_Timer++;
// static uint32_t loc_Timer = 0;
// static uint32_t loc_ret = 0;
// if(MENU_CHECK_STEP == 13)
// {
// loc_Current_0 = ADC_Read_Signal(ADC_CH_KL15_VOLTAGE);
// loc_ret += loc_Current_0;
// loc_Timer++;
if ( loc_Timer >= Sampling_NUM )
{
loc_Timer = 0;
loc_ret /= Sampling_NUM;
// loc_ret *= 1000;//单位0.001毫伏
// loc_ret /= 100;//转化为电流，单位0.001毫安
loc_ret /= 10;//单位0.1毫安
loc_ret1 = loc_ret;
}
}
// if ( loc_Timer >= Sampling_NUM )
// {
// loc_Timer = 0;
// loc_ret /= Sampling_NUM;
// // loc_ret *= 1000;//单位0.001毫伏
// // loc_ret /= 100;//转化为电流，单位0.001毫安
// loc_ret /= 10;//单位0.1毫安
// loc_ret1 = loc_ret;
// }
// }
}
const uint16_t testNum[] = {200,190,180};
......
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ 0f182e6f
......@@ -124,10 +124,10 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
else
{
zhenduanflag = 0;
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1;
// LINE_OUT_NEG_01 = 1;
// LINE_OUT_NEG_02 = 1;
// LINE_OUT_NEG_03 = 1;
// LINE_OUT_NEG_04 = 1;
zhenduansendStep = 0;
// memset(barcode_Msg,0,sizeof(barcode_Msg));
......
YueJin_test_bench/source/Appliciation/R485_Communication_Matrix.c
View file @ 0f182e6f
......@@ -836,10 +836,10 @@ uint32_t R485_Send_0x47(void)
memcpy(R485_zhenduan_Msg+3,barcode_Msg,34);
break;
case 4:
LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_02 = 0;
LINE_OUT_NEG_03 = 0;
LINE_OUT_NEG_04 = 0;
// LINE_OUT_NEG_01 = 0;
// LINE_OUT_NEG_02 = 0;
// LINE_OUT_NEG_03 = 0;
// LINE_OUT_NEG_04 = 0;
break;
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.c
View file @ 0f182e6f
......@@ -107,6 +107,18 @@ void RTE_GPIO_Init(void)
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_6;
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_13;
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;
// LINE_OUT_NEG_01 = 1;
// LINE_OUT_NEG_02 = 1;
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.h
View file @ 0f182e6f
......@@ -15,6 +15,11 @@
#define RELAY_KEY_MCU GPIO_OUT_PORT10_PIN07
#define RELAY_LIGHTCONTROL_MCU GPIO_OUT_PORT10_PIN06 //光控大灯MCU
#define ZXSW_12V GPIO_OUT_PORT11_PIN05 //转向12V
#define FULL_BEAM GPIO_OUT_PORT09_PIN04 //远光
#define left_turn GPIO_OUT_PORT09_PIN03 //左转
#define right_turn GPIO_OUT_PORT09_PIN02 //右转
#define SW1 GPIO_IN_PORT09_PIN01
#define SW2 GPIO_IN_PORT09_PIN00
#define SW3 GPIO_IN_APORT00_PIN00
......@@ -40,7 +45,7 @@
/* ---------------------旧的-------------------------- */
#define POWER_CTRL_KL30 GPIO_OUT_PORT10_PIN13
#define POWER_CTRL_KL15 GPIO_OUT_PORT10_PIN12
#define SW10 GPIO_IN_PORT10_PIN06
#define SW10 GPIO_IN_PORT10_PIN02
#define LINE_OUT_NEG_01 GPIO_OUT_PORT09_PIN06 //12V
#define LINE_OUT_NEG_02 GPIO_OUT_PORT09_PIN05 //BAT
#define LINE_OUT_NEG_03 GPIO_OUT_PORT09_PIN04 //BAT~
......@@ -57,7 +62,6 @@
#define LED3 GPIO_OUT_APORT00_PIN10 //右转
#define LED4 GPIO_OUT_APORT00_PIN11 //左转
#define LINE_OUT_NEG_05 GPIO_OUT_PORT09_PIN02 //ABS
#define LINE_OUT_NEG_06 GPIO_OUT_PORT09_PIN01 //位置灯
#define LINE_jinguang GPIO_OUT_PORT10_PIN10 //近光
#define POWER_CTRL_KL30_Current GPIO_OUT_PORT10_PIN14 //蓝牙
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ 0f182e6f
......@@ -160,10 +160,10 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
else
{
// bleOFFtoONtime = 0;
LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_02 = 0;
LINE_OUT_NEG_03 = 0;
LINE_OUT_NEG_04 = 0;
// LINE_OUT_NEG_01 = 0;
// LINE_OUT_NEG_02 = 0;
// LINE_OUT_NEG_03 = 0;
// LINE_OUT_NEG_04 = 0;
startONfalg = 1;
Display_TFT_Clear();
}
......@@ -172,10 +172,10 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
{
if(startIGONtime >= 50)
{
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1;
// LINE_OUT_NEG_01 = 1;
// LINE_OUT_NEG_02 = 1;
// LINE_OUT_NEG_03 = 1;
// LINE_OUT_NEG_04 = 1;
R485_Send_0x80();
blename[4] = 0xFF;
......@@ -347,9 +347,9 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
ACCONOFF_delay_3s = 0;
}
if(MENU_CHECK_STEP == 2)
if(MENU_CHECK_STEP == 2 || MENU_CHECK_STEP == 8)
{
if(ONE_KEY_ONOFF < 80)
if(ONE_KEY_ONOFF < 200)
{
ONE_KEY_ONOFF++;
}
......
YueJin_test_bench/source/Appliciation/UDS_Common.c
View file @ 0f182e6f
......@@ -110,7 +110,7 @@ uint16_t getESpeed(void)
*/
uint16_t getKL30Voltage(void)
{
return ADC_Read_Signal(ADC_CH_KL30_VOLTAGE);
// return ADC_Read_Signal(ADC_CH_KL30_VOLTAGE);
}
/**
......
YueJin_test_bench/source/Driver/Analog_Signals/Analog_Signals.c
View file @ 0f182e6f
......@@ -4,9 +4,9 @@
* \attention
*
* This file is automatically generated by analog signals configuration tool.
* Date : 2022/8/3 23:21:24
* Date : 2025/2/18 19:34:44
* Cfg Tool Ver : 1.1.0
* Engineer :
* Engineer :
* (c) Heilongjiang TYW electronics co., LTD
*
******************************************************************************/
......@@ -74,21 +74,31 @@ ADC_Data_st_t stADCData[ADC_SIGNAL_CH_NUMBER];
const uint8_t u8ADCChList[ADC_CONV_CH_NUMBER] =
{
9U, 15U, 14U ,
13U, 12U, 15U, 11U, 14U, 10U, 9U, 7U,
};
const ADC_Ch_Cfg_st_t stADCChCfg[ADC_SIGNAL_CH_NUMBER] =
{
{ 0U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit101,},
{ 1U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit101,},
{ 0U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 1U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 2U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 3U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 4U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 5U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 6U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 7U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
};
const ADC_Res_List_st_t stADCResList[ADC_SIGNAL_CH_NUMBER] =
{
{ 0U, 100000U, 0U, 0U,},
{ 0U, 100000U, 0U, 0U,},
{ 330000U, 47000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,},
{ 3300000U, 100000U, 0U, 0U,},
};
/* Private function prototypes ----------------------------------------------*/
......@@ -231,7 +241,7 @@ void Analog_Signal_Conv_Service(void)
{
u8Valid = 0U;
}
if (u8Valid)
{
u16Result = stADCChCfg[stADCCtrl.u8CurrentCh].pfProcFunc(u16Voltage,
......@@ -390,19 +400,3 @@ uint16_t ADC_Conv_Single_Channel(uint8_t u8ADCCh)
return u16Result;
}
uint16_t ADC_Read_Signal_Voltage(uint8_t u8ADCCh)//AD采集不建议用这个函数获取最终的结果！
{
uint16_t u16Value;
if (u8ADCCh < ADC_SIGNAL_CH_NUMBER)
{
u16Value = u16ADCSample[u8ADCCh];
}
else
{
u16Value = 0U;
}
return u16Value;
}
YueJin_test_bench/source/Driver/Analog_Signals/Analog_Signals.h
View file @ 0f182e6f
......@@ -4,9 +4,9 @@
* \attention
*
* This file is automatically generated by analog signals configuration tool.
* Date : 2022/8/3 23:21:24
* Date : 2025/2/18 19:34:44
* Cfg Tool Ver : 1.1.0
* Engineer :
* Engineer :
* (c) Heilongjiang TYW electronics co., LTD
*
******************************************************************************/
......@@ -27,14 +27,19 @@ extern {
/* Exported types ------------------------------------------------------------*/
enum ADCChName
{
ADC_CH_KL15_VOLTAGE = 0,
ADC_CH_KL30_VOLTAGE,
ADC_CH_10_VOLTAGE,
ADC_CH_ZXSW = 0,
ADC_CH_GKDD,
ADC_CH_ZTS_A,
ADC_CH_DIS,
ADC_CH_ZTS_B,
ADC_CH_LOGOTY,
ADC_CH_WYTY,
ADC_CH_ACC,
};
/* Exported macro ------------------------------------------------------------*/
#define ADC_TOTAL_CH_NUMBER (3U)
#define ADC_SIGNAL_CH_NUMBER (3U)
#define ADC_TOTAL_CH_NUMBER (8U)
#define ADC_SIGNAL_CH_NUMBER (8U)
#define ADC_REF_VOLTAGE u16ADCRefVoltage
/* Exported variables --------------------------------------------------------*/
......@@ -49,7 +54,6 @@ extern void Analog_Signal_Conv_Service(void);
extern uint16_t ADC_Read_Signal(uint8_t u8ADCCh);
extern uint8_t ADC_Read_Signal_Valid(uint8_t u8ADCCh);
extern uint16_t ADC_Conv_Single_Channel(uint8_t u8ADCCh);
extern uint16_t ADC_Read_Signal_Voltage(uint8_t u8ADCCh);
/*! @} */
#ifdef __cplusplus
......
YueJin_test_bench/utility/config_Adc/inc/Analog_Signals.h
View file @ 0f182e6f
......@@ -4,7 +4,7 @@
* \attention
*
* This file is automatically generated by analog signals configuration tool.
* Date : 2023/9/9 15:45:21
* Date : 2025/2/18 19:34:44
* Cfg Tool Ver : 1.1.0
* Engineer :
* (c) Heilongjiang TYW electronics co., LTD
......@@ -27,14 +27,19 @@ extern {
/* Exported types ------------------------------------------------------------*/
enum ADCChName
{
ADC_CH_KL15_VOLTAGE = 0,
ADC_CH_KL30_VOLTAGE,
ADC_CH_10_VOLTAGE,
ADC_CH_ZXSW = 0,
ADC_CH_GKDD,
ADC_CH_ZTS_A,
ADC_CH_DIS,
ADC_CH_ZTS_B,
ADC_CH_LOGOTY,
ADC_CH_WYTY,
ADC_CH_ACC,
};
/* Exported macro ------------------------------------------------------------*/
#define ADC_TOTAL_CH_NUMBER (3U)
#define ADC_SIGNAL_CH_NUMBER (3U)
#define ADC_TOTAL_CH_NUMBER (8U)
#define ADC_SIGNAL_CH_NUMBER (8U)
#define ADC_REF_VOLTAGE u16ADCRefVoltage
/* Exported variables --------------------------------------------------------*/
......
YueJin_test_bench/utility/config_Adc/src/Analog_Signals.c
View file @ 0f182e6f
......@@ -4,7 +4,7 @@
* \attention
*
* This file is automatically generated by analog signals configuration tool.
* Date : 2023/9/9 15:45:21
* Date : 2025/2/18 19:34:44
* Cfg Tool Ver : 1.1.0
* Engineer :
* (c) Heilongjiang TYW electronics co., LTD
......@@ -74,21 +74,31 @@ ADC_Data_st_t stADCData[ADC_SIGNAL_CH_NUMBER];
const uint8_t u8ADCChList[ADC_CONV_CH_NUMBER] =
{
9U, 15U, 14U,
13U, 12U, 15U, 11U, 14U, 10U, 9U, 7U,
};
const ADC_Ch_Cfg_st_t stADCChCfg[ADC_SIGNAL_CH_NUMBER] =
{
{ 0U, 0U, 0U, 30U, 0U, 1U, ADC_Voltage_Calc_Circuit101,},
{ 1U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit101,},
{ 0U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 1U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 2U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 3U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 4U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 5U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 6U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 7U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
};
const ADC_Res_List_st_t stADCResList[ADC_SIGNAL_CH_NUMBER] =
{
{ 0U, 100000U, 0U, 0U,},
{ 0U, 100000U, 0U, 0U,},
{ 330000U, 47000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,},
{ 3300000U, 100000U, 0U, 0U,},
};
/* Private function prototypes ----------------------------------------------*/
......
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