Commit 8d11c196 authored by 时昊's avatar 时昊

增加PWM功能

parent c349acd4
...@@ -5,6 +5,8 @@ void COM_CAN_Init(void); ...@@ -5,6 +5,8 @@ void COM_CAN_Init(void);
void COM_RX_Process(void); void COM_RX_Process(void);
void Msg_Load_Init(void); void Msg_Load_Init(void);
void Execute_Specify_Step(unsigned int step); void Execute_Specify_Step(unsigned int step);
void Execute_Specify_Step_IO(unsigned int step);
void Execute_Specify_Step_PWM(unsigned int step);
unsigned int Get_Total_CheckStep(void); unsigned int Get_Total_CheckStep(void);
void COM_TX_Process(void); void COM_TX_Process(void);
......
...@@ -1731,11 +1731,6 @@ void Total_Check(void) ...@@ -1731,11 +1731,6 @@ void Total_Check(void)
HW_TFT_CHECK(0); HW_TFT_CHECK(0);
HW_LCD_CHECK(0); HW_LCD_CHECK(0);
HW_BACKLIGHT_CHECK(0); HW_BACKLIGHT_CHECK(0);
//PWM_OUT_12 = 1;
PWM_Channel_Set_Freq(10, 30000);//e
PWM_Channel_Set_Duty(10, 500);//e
PWM_Channel_Set_Freq(14, 10000);//v
PWM_Channel_Set_Duty(14, 800);//v
Function_Check_Ctrl(1); Function_Check_Ctrl(1);
HW_Static_Current_Check(0); HW_Static_Current_Check(0);
CAN_Msg_Tx_Enable = 1u; CAN_Msg_Tx_Enable = 1u;
...@@ -2040,6 +2035,11 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -2040,6 +2035,11 @@ void Function_Check_Ctrl(uint32_t cmd)
if ( MENU_BACK != MENU_CHECK_STEP ) if ( MENU_BACK != MENU_CHECK_STEP )
{ {
Execute_Specify_Step((MENU_CHECK_STEP)); Execute_Specify_Step((MENU_CHECK_STEP));
//Execute_Specify_Step_IO(MENU_CHECK_STEP);
if(MENU_CHECK_STEP >= 1)
{
//Execute_Specify_Step_PWM(MENU_CHECK_STEP - 1);
}
MENU_BACK = MENU_CHECK_STEP; MENU_BACK = MENU_CHECK_STEP;
} }
} }
......
...@@ -253,4 +253,20 @@ void RTE_GPIO_Init(void) ...@@ -253,4 +253,20 @@ void RTE_GPIO_Init(void)
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_3; gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_3;
gpio_temp.enGPIOCharacter = GPIO_Char_Schmitt1; gpio_temp.enGPIOCharacter = GPIO_Char_Schmitt1;
GPIO_Config(&gpio_temp);//车速 GPIO_Config(&gpio_temp);//车速
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_10;
gpio_temp.enGPIOPIN = GPIO_PIN_11;
gpio_temp.enGPIOMode = GPIO_MODE_ALTER_SOFTWARE;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_4;
gpio_temp.enGPIOCharacter = GPIO_Char_Schmitt1;
GPIO_Config(&gpio_temp);//pin85
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_10;
gpio_temp.enGPIOPIN = GPIO_PIN_12;
gpio_temp.enGPIOMode = GPIO_MODE_ALTER_SOFTWARE;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_4;
gpio_temp.enGPIOCharacter = GPIO_Char_Schmitt1;
GPIO_Config(&gpio_temp);//pin86
} }
...@@ -89,149 +89,149 @@ void SetIO_OUT_N_10(uint8_t val) ...@@ -89,149 +89,149 @@ void SetIO_OUT_N_10(uint8_t val)
IO_OUT_N_10 = val; IO_OUT_N_10 = val;
} }
void SetPWM_OUT_01(unsigned char Duty, unsigned int Freq) void SetPWM_OUT_01(uint32_t Duty, uint32_t Freq)
{ {
PWM_Channel_Set_Freq(10, Freq); PWM_Channel_Set_Freq(1, Freq);
PWM_Channel_Set_Duty(10, Duty); PWM_Channel_Set_Duty(1, Duty);
} }
void SetPWM_OUT_02(unsigned char Duty, unsigned int Freq) //void SetPWM_OUT_02(uint32_t Duty, uint32_t Freq)
{ //{
PWM_Channel_Set_Freq(14, Freq); // PWM_Channel_Set_Freq(3, Freq);
PWM_Channel_Set_Duty(14, Duty); // PWM_Channel_Set_Duty(3, Duty);
} //}
void SetPWM_OUT_03(unsigned char Duty, unsigned int Freq) void SetPWM_OUT_03(uint32_t Duty, uint32_t Freq)
{ {
PWM_Channel_Set_Freq(2, Freq); PWM_Channel_Set_Freq(3, Freq);
PWM_Channel_Set_Duty(2, Duty); PWM_Channel_Set_Duty(3, Duty);
} }
void SetPWM_OUT_04(unsigned char Duty, unsigned int Freq) //void SetPWM_OUT_04(uint32_t Duty, uint32_t Freq)
{ //{
PWM_Channel_Set_Freq(2, Freq); // PWM_Channel_Set_Freq(2, Freq);
PWM_Channel_Set_Duty(2, Duty); // PWM_Channel_Set_Duty(2, Duty);
} //}
void SetPWM_OUT_05(unsigned char Duty, unsigned int Freq) void SetPWM_OUT_05(uint32_t Duty, uint32_t Freq)
{ {
PWM_Channel_Set_Freq(2, Freq); PWM_Channel_Set_Freq(5, Freq);
PWM_Channel_Set_Duty(2, Duty); PWM_Channel_Set_Duty(5, Duty);
} }
void SetPWM_OUT_06(unsigned char Duty, unsigned int Freq) //void SetPWM_OUT_06(uint32_t Duty, uint32_t Freq)
{ //{
PWM_Channel_Set_Freq(2, Freq); // PWM_Channel_Set_Freq(2, Freq);
PWM_Channel_Set_Duty(2, Duty); // PWM_Channel_Set_Duty(2, Duty);
} //}
void SetPWM_OUT_07(unsigned char Duty, unsigned int Freq) void SetPWM_OUT_07(uint32_t Duty, uint32_t Freq)
{ {
PWM_Channel_Set_Freq(2, Freq); PWM_Channel_Set_Freq(7, Freq);
PWM_Channel_Set_Duty(2, Duty); PWM_Channel_Set_Duty(7, Duty);
} }
void SetPWM_OUT_08(unsigned char Duty, unsigned int Freq) //void SetPWM_OUT_08(uint32_t Duty, uint32_t Freq)
{ //{
PWM_Channel_Set_Freq(2, Freq); // PWM_Channel_Set_Freq(2, Freq);
PWM_Channel_Set_Duty(2, Duty); // PWM_Channel_Set_Duty(2, Duty);
} //}
void SetPWM_OUT_09(unsigned char Duty, unsigned int Freq) void SetPWM_OUT_09(uint32_t Duty, uint32_t Freq)
{ {
PWM_Channel_Set_Freq(2, Freq); PWM_Channel_Set_Freq(9, Freq);
PWM_Channel_Set_Duty(2, Duty); PWM_Channel_Set_Duty(9, Duty);
} }
void SetPWM_OUT_10(unsigned char Duty, unsigned int Freq) //void SetPWM_OUT_10(uint32_t Duty, uint32_t Freq)
{ //{
PWM_Channel_Set_Freq(2, Freq); // PWM_Channel_Set_Freq(2, Freq);
PWM_Channel_Set_Duty(2, Duty); // PWM_Channel_Set_Duty(2, Duty);
} //}
void SetPWM_OUT_11(unsigned char Duty, unsigned int Freq) void SetPWM_OUT_11(uint32_t Duty, uint32_t Freq)
{ {
PWM_Channel_Set_Freq(2, Freq); PWM_Channel_Set_Freq(11, Freq);
PWM_Channel_Set_Duty(2, Duty); PWM_Channel_Set_Duty(11, Duty);
} }
void SetPWM_OUT_12(unsigned char Duty, unsigned int Freq) //void SetPWM_OUT_12(uint32_t Duty, uint32_t Freq)
{ //{
PWM_Channel_Set_Freq(2, Freq); // PWM_Channel_Set_Freq(2, Freq);
PWM_Channel_Set_Duty(2, Duty); // PWM_Channel_Set_Duty(2, Duty);
} //}
void SetPWM_OUT_13(unsigned char Duty, unsigned int Freq) void SetPWM_OUT_13(uint32_t Duty, uint32_t Freq)
{ {
PWM_Channel_Set_Freq(2, Freq); PWM_Channel_Set_Freq(13, Freq);
PWM_Channel_Set_Duty(2, Duty); PWM_Channel_Set_Duty(13, Duty);
} }
void SetPWM_OUT_14(unsigned char Duty, unsigned int Freq) //void SetPWM_OUT_14(uint32_t Duty, uint32_t Freq)
{ //{
PWM_Channel_Set_Freq(2, Freq); // PWM_Channel_Set_Freq(2, Freq);
PWM_Channel_Set_Duty(2, Duty); // PWM_Channel_Set_Duty(2, Duty);
} //}
void SetPWM_OUT_15(unsigned char Duty, unsigned int Freq) void SetPWM_OUT_15(uint32_t Duty, uint32_t Freq)
{ {
PWM_Channel_Set_Freq(2, Freq); PWM_Channel_Set_Freq(15, Freq);
PWM_Channel_Set_Duty(2, Duty); PWM_Channel_Set_Duty(15, Duty);
} }
void SetPWM_OUT_16(unsigned char Duty, unsigned int Freq) //void SetPWM_OUT_16(uint32_t Duty, uint32_t Freq)
{ //{
PWM_Channel_Set_Freq(2, Freq); // PWM_Channel_Set_Freq(2, Freq);
PWM_Channel_Set_Duty(2, Duty); // PWM_Channel_Set_Duty(2, Duty);
} //}
void SetPWM_IN_01(unsigned char Duty, unsigned int Freq) void SetPWM_IN_01(uint32_t Duty, uint32_t Freq)
{ {
} }
void SetPWM_IN_02(unsigned char Duty, unsigned int Freq) void SetPWM_IN_02(uint32_t Duty, uint32_t Freq)
{ {
} }
void SetPWM_IN_03(unsigned char Duty, unsigned int Freq) void SetPWM_IN_03(uint32_t Duty, uint32_t Freq)
{ {
} }
void SetPWM_IN_04(unsigned char Duty, unsigned int Freq) void SetPWM_IN_04(uint32_t Duty, uint32_t Freq)
{ {
} }
void SetPWM_IN_05(unsigned char Duty, unsigned int Freq) void SetPWM_IN_05(uint32_t Duty, uint32_t Freq)
{ {
} }
void SetPWM_IN_06(unsigned char Duty, unsigned int Freq) void SetPWM_IN_06(uint32_t Duty, uint32_t Freq)
{ {
} }
void SetPWM_IN_07(unsigned char Duty, unsigned int Freq) void SetPWM_IN_07(uint32_t Duty, uint32_t Freq)
{ {
} }
void SetPWM_IN_08(unsigned char Duty, unsigned int Freq) void SetPWM_IN_08(uint32_t Duty, uint32_t Freq)
{ {
} }
void SetPWM_IN_09(unsigned char Duty, unsigned int Freq) void SetPWM_IN_09(uint32_t Duty, uint32_t Freq)
{ {
} }
void SetPWM_IN_10(unsigned char Duty, unsigned int Freq) void SetPWM_IN_10(uint32_t Duty, uint32_t Freq)
{ {
} }
void SetPWM_IN_11(unsigned char Duty, unsigned int Freq) void SetPWM_IN_11(uint32_t Duty, uint32_t Freq)
{ {
} }
void SetPWM_IN_12(unsigned char Duty, unsigned int Freq) void SetPWM_IN_12(uint32_t Duty, uint32_t Freq)
{ {
} }
void SetPWM_IN_13(unsigned char Duty, unsigned int Freq) void SetPWM_IN_13(uint32_t Duty, uint32_t Freq)
{ {
} }
void SetPWM_IN_14(unsigned char Duty, unsigned int Freq) void SetPWM_IN_14(uint32_t Duty, uint32_t Freq)
{ {
} }
void SetPWM_IN_15(unsigned char Duty, unsigned int Freq) void SetPWM_IN_15(uint32_t Duty, uint32_t Freq)
{ {
} }
void SetPWM_IN_16(unsigned char Duty, unsigned int Freq) void SetPWM_IN_16(uint32_t Duty, uint32_t Freq)
{ {
} }
...@@ -258,39 +258,39 @@ void SetIO_OUT_N_08(uint8_t val); ...@@ -258,39 +258,39 @@ void SetIO_OUT_N_08(uint8_t val);
void SetIO_OUT_N_09(uint8_t val); void SetIO_OUT_N_09(uint8_t val);
void SetIO_OUT_N_10(uint8_t val); void SetIO_OUT_N_10(uint8_t val);
void SetPWM_OUT_01(unsigned char Duty, unsigned int Freq); void SetPWM_OUT_01(uint32_t Duty, uint32_t Freq);
void SetPWM_OUT_02(unsigned char Duty, unsigned int Freq); void SetPWM_OUT_02(uint32_t Duty, uint32_t Freq);
void SetPWM_OUT_03(unsigned char Duty, unsigned int Freq); void SetPWM_OUT_03(uint32_t Duty, uint32_t Freq);
void SetPWM_OUT_04(unsigned char Duty, unsigned int Freq); void SetPWM_OUT_04(uint32_t Duty, uint32_t Freq);
void SetPWM_OUT_05(unsigned char Duty, unsigned int Freq); void SetPWM_OUT_05(uint32_t Duty, uint32_t Freq);
void SetPWM_OUT_06(unsigned char Duty, unsigned int Freq); void SetPWM_OUT_06(uint32_t Duty, uint32_t Freq);
void SetPWM_OUT_07(unsigned char Duty, unsigned int Freq); void SetPWM_OUT_07(uint32_t Duty, uint32_t Freq);
void SetPWM_OUT_08(unsigned char Duty, unsigned int Freq); void SetPWM_OUT_08(uint32_t Duty, uint32_t Freq);
void SetPWM_OUT_09(unsigned char Duty, unsigned int Freq); void SetPWM_OUT_09(uint32_t Duty, uint32_t Freq);
void SetPWM_OUT_10(unsigned char Duty, unsigned int Freq); void SetPWM_OUT_10(uint32_t Duty, uint32_t Freq);
void SetPWM_OUT_11(unsigned char Duty, unsigned int Freq); void SetPWM_OUT_11(uint32_t Duty, uint32_t Freq);
void SetPWM_OUT_12(unsigned char Duty, unsigned int Freq); void SetPWM_OUT_12(uint32_t Duty, uint32_t Freq);
void SetPWM_OUT_13(unsigned char Duty, unsigned int Freq); void SetPWM_OUT_13(uint32_t Duty, uint32_t Freq);
void SetPWM_OUT_14(unsigned char Duty, unsigned int Freq); void SetPWM_OUT_14(uint32_t Duty, uint32_t Freq);
void SetPWM_OUT_15(unsigned char Duty, unsigned int Freq); void SetPWM_OUT_15(uint32_t Duty, uint32_t Freq);
void SetPWM_OUT_16(unsigned char Duty, unsigned int Freq); void SetPWM_OUT_16(uint32_t Duty, uint32_t Freq);
void SetPWM_IN_01(unsigned char Duty, unsigned int Freq); void SetPWM_IN_01(uint32_t Duty, uint32_t Freq);
void SetPWM_IN_02(unsigned char Duty, unsigned int Freq); void SetPWM_IN_02(uint32_t Duty, uint32_t Freq);
void SetPWM_IN_03(unsigned char Duty, unsigned int Freq); void SetPWM_IN_03(uint32_t Duty, uint32_t Freq);
void SetPWM_IN_04(unsigned char Duty, unsigned int Freq); void SetPWM_IN_04(uint32_t Duty, uint32_t Freq);
void SetPWM_IN_05(unsigned char Duty, unsigned int Freq); void SetPWM_IN_05(uint32_t Duty, uint32_t Freq);
void SetPWM_IN_06(unsigned char Duty, unsigned int Freq); void SetPWM_IN_06(uint32_t Duty, uint32_t Freq);
void SetPWM_IN_07(unsigned char Duty, unsigned int Freq); void SetPWM_IN_07(uint32_t Duty, uint32_t Freq);
void SetPWM_IN_08(unsigned char Duty, unsigned int Freq); void SetPWM_IN_08(uint32_t Duty, uint32_t Freq);
void SetPWM_IN_09(unsigned char Duty, unsigned int Freq); void SetPWM_IN_09(uint32_t Duty, uint32_t Freq);
void SetPWM_IN_10(unsigned char Duty, unsigned int Freq); void SetPWM_IN_10(uint32_t Duty, uint32_t Freq);
void SetPWM_IN_11(unsigned char Duty, unsigned int Freq); void SetPWM_IN_11(uint32_t Duty, uint32_t Freq);
void SetPWM_IN_12(unsigned char Duty, unsigned int Freq); void SetPWM_IN_12(uint32_t Duty, uint32_t Freq);
void SetPWM_IN_13(unsigned char Duty, unsigned int Freq); void SetPWM_IN_13(uint32_t Duty, uint32_t Freq);
void SetPWM_IN_14(unsigned char Duty, unsigned int Freq); void SetPWM_IN_14(uint32_t Duty, uint32_t Freq);
void SetPWM_IN_15(unsigned char Duty, unsigned int Freq); void SetPWM_IN_15(uint32_t Duty, uint32_t Freq);
void SetPWM_IN_16(unsigned char Duty, unsigned int Freq); void SetPWM_IN_16(uint32_t Duty, uint32_t Freq);
const st_Port_IO F1KM_16843_Port_IO_P [20] = { const st_Port_IO F1KM_16843_Port_IO_P [20] = {
&SetIO_OUT_P_01, &SetIO_OUT_P_01,
...@@ -314,41 +314,41 @@ const st_Port_IO F1KM_16843_Port_IO_P [20] = { ...@@ -314,41 +314,41 @@ const st_Port_IO F1KM_16843_Port_IO_P [20] = {
&SetIO_OUT_N_09, &SetIO_OUT_N_09,
&SetIO_OUT_N_10, &SetIO_OUT_N_10,
}; };
const st_Port_PWM F1KM_16843_Port_PWM_Out [16] = { const st_Port_PWM F1KM_16843_Port_PWM_Out [8] = {
&SetPWM_OUT_01, &SetPWM_OUT_01,
&SetPWM_OUT_02, //&SetPWM_OUT_02,
&SetPWM_OUT_03, &SetPWM_OUT_03,
&SetPWM_OUT_04, //&SetPWM_OUT_04,
&SetPWM_OUT_05, &SetPWM_OUT_05,
&SetPWM_OUT_06, //&SetPWM_OUT_06,
&SetPWM_OUT_07, &SetPWM_OUT_07,
&SetPWM_OUT_08, //&SetPWM_OUT_08,
&SetPWM_OUT_09, &SetPWM_OUT_09,
&SetPWM_OUT_10, //&SetPWM_OUT_10,
&SetPWM_OUT_11, &SetPWM_OUT_11,
&SetPWM_OUT_12, //&SetPWM_OUT_12,
&SetPWM_OUT_13, &SetPWM_OUT_13,
&SetPWM_OUT_14, //&SetPWM_OUT_14,
&SetPWM_OUT_15, &SetPWM_OUT_15,
&SetPWM_OUT_16, //&SetPWM_OUT_16,
}; };
const st_Port_PWM F1KM_16843_Port_PWM_IN [16] = { const st_Port_PWM F1KM_16843_Port_PWM_IN [8] = {
&SetPWM_IN_01, &SetPWM_IN_01,
&SetPWM_IN_02, //&SetPWM_IN_02,
&SetPWM_IN_03, &SetPWM_IN_03,
&SetPWM_IN_04, //&SetPWM_IN_04,
&SetPWM_IN_05, &SetPWM_IN_05,
&SetPWM_IN_06, //&SetPWM_IN_06,
&SetPWM_IN_07, &SetPWM_IN_07,
&SetPWM_IN_08, //&SetPWM_IN_08,
&SetPWM_IN_09, &SetPWM_IN_09,
&SetPWM_IN_10, //&SetPWM_IN_10,
&SetPWM_IN_11, &SetPWM_IN_11,
&SetPWM_IN_12, //&SetPWM_IN_12,
&SetPWM_IN_13, &SetPWM_IN_13,
&SetPWM_IN_14, //&SetPWM_IN_14,
&SetPWM_IN_15, &SetPWM_IN_15,
&SetPWM_IN_16, //&SetPWM_IN_16,
}; };
...@@ -17,8 +17,8 @@ extern const st_Port_IO F1KM_16843_Port_IO_P [20] ; ...@@ -17,8 +17,8 @@ extern const st_Port_IO F1KM_16843_Port_IO_P [20] ;
typedef struct typedef struct
{ {
void (*PWM_Output)(unsigned char Duty, unsigned int Freq); void (*PWM_Output)(uint32_t Duty, uint32_t Freq);
} st_Port_PWM; } st_Port_PWM;
extern const st_Port_PWM F1KM_16843_Port_PWM_Out [16] ; extern const st_Port_PWM F1KM_16843_Port_PWM_Out [8] ;
#endif #endif
...@@ -80,8 +80,14 @@ void Sys_Startup_Init(void) ...@@ -80,8 +80,14 @@ void Sys_Startup_Init(void)
Display_Title_Info( ); Display_Title_Info( );
Key_Init( ); Key_Init( );
PWN_Init(); PWN_Init();
PWM_Channel_Init(10, 0, 0, 0, 0); PWM_Channel_Init(1, 0, 0, 0, 0);
PWM_Channel_Init(14, 0, 0, 0, 0); PWM_Channel_Init(3, 0, 0, 0, 0);
PWM_Channel_Init(5, 0, 0, 0, 0);
PWM_Channel_Init(7, 0, 0, 0, 0);
PWM_Channel_Init(9, 0, 0, 0, 0);
PWM_Channel_Init(11, 0, 0, 0, 0);
PWM_Channel_Init(13, 0, 0, 0, 0);
PWM_Channel_Init(15, 0, 0, 0, 0);
} }
/*********************************************************************** /***********************************************************************
......
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