Skip to content

J
jiancetai
Commit eb02050a authored by 何锐's avatar 何锐
Browse files
Options

✨ feat:完成转速PWM输出，修改规范变动的指示灯

parent bdac6f2b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 137 additions and 68 deletions
.vscode/settings.json
View file @ eb02050a
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
"display_info.h": "c", "display_info.h": "c",
"can_communication_matrix.h": "c", "can_communication_matrix.h": "c",
"analog_signals.h": "c", "analog_signals.h": "c",
"key.h": "c" "key.h": "c",
"timerb.h": "c"
} }
} }
\ No newline at end of file
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ eb02050a
...@@ -584,6 +584,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -584,6 +584,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_05 = 0; LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1; LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 0; LINE_OUT_POS_07 = 0;
LINE_OUT_POS_08 = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; FUEL_RES_1 = 0;
FUEL_RES_2 = 0; FUEL_RES_2 = 0;
...@@ -600,6 +601,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -600,6 +601,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_05 = 0; LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1; LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 0; LINE_OUT_POS_07 = 0;
LINE_OUT_POS_08 = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 1; FUEL_RES_1 = 1;
FUEL_RES_2 = 0; FUEL_RES_2 = 0;
...@@ -617,6 +619,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -617,6 +619,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_05 = 0; LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1; LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 0; LINE_OUT_POS_07 = 0;
LINE_OUT_POS_08 = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; FUEL_RES_1 = 0;
FUEL_RES_2 = 1; FUEL_RES_2 = 1;
...@@ -634,6 +637,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -634,6 +637,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_05 = 0; LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1; LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 0; LINE_OUT_POS_07 = 0;
LINE_OUT_POS_08 = 0;
// /*燃油*/ // /*燃油*/
FUEL_RES_1 = 0; FUEL_RES_1 = 0;
FUEL_RES_2 = 1; FUEL_RES_2 = 1;
...@@ -650,6 +654,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -650,6 +654,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_05 = 0; LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1; LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 0; LINE_OUT_POS_07 = 0;
LINE_OUT_POS_08 = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; FUEL_RES_1 = 0;
FUEL_RES_2 = 0; FUEL_RES_2 = 0;
...@@ -667,6 +672,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -667,6 +672,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_05 = 0; LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1; LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 0; LINE_OUT_POS_07 = 0;
LINE_OUT_POS_08 = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; FUEL_RES_1 = 0;
FUEL_RES_2 = 2; FUEL_RES_2 = 2;
...@@ -684,6 +690,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -684,6 +690,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_05 = 1; LINE_OUT_POS_05 = 1;
LINE_OUT_POS_06 = 1; LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 0; LINE_OUT_POS_07 = 0;
LINE_OUT_POS_08 = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; FUEL_RES_1 = 0;
FUEL_RES_2 = 2; FUEL_RES_2 = 2;
...@@ -700,6 +707,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -700,6 +707,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_05 = 0; LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 0; LINE_OUT_POS_06 = 0;
LINE_OUT_POS_07 = 0; LINE_OUT_POS_07 = 0;
LINE_OUT_POS_08 = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; FUEL_RES_1 = 0;
FUEL_RES_2 = 2; FUEL_RES_2 = 2;
...@@ -716,6 +724,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -716,6 +724,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_05 = 0; LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1; LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 0; LINE_OUT_POS_07 = 0;
LINE_OUT_POS_08 = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; FUEL_RES_1 = 0;
FUEL_RES_2 = 2; FUEL_RES_2 = 2;
...@@ -732,6 +741,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -732,6 +741,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_05 = 0; LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1; LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 0; LINE_OUT_POS_07 = 0;
LINE_OUT_POS_08 = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; FUEL_RES_1 = 0;
FUEL_RES_2 = 2; FUEL_RES_2 = 2;
...@@ -748,6 +758,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -748,6 +758,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_05 = 0; LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1; LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 0; LINE_OUT_POS_07 = 0;
LINE_OUT_POS_08 = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; FUEL_RES_1 = 0;
FUEL_RES_2 = 2; FUEL_RES_2 = 2;
...@@ -764,6 +775,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -764,6 +775,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_05 = 0; LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1; LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 0; LINE_OUT_POS_07 = 0;
LINE_OUT_POS_08 = 1;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; FUEL_RES_1 = 0;
FUEL_RES_2 = 2; FUEL_RES_2 = 2;
...@@ -780,6 +792,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -780,6 +792,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_05 = 0; LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1; LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 0; LINE_OUT_POS_07 = 0;
LINE_OUT_POS_08 = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; FUEL_RES_1 = 0;
FUEL_RES_2 = 2; FUEL_RES_2 = 2;
...@@ -796,6 +809,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -796,6 +809,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_05 = 0; LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1; LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 0; LINE_OUT_POS_07 = 0;
LINE_OUT_POS_08 = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; FUEL_RES_1 = 0;
FUEL_RES_2 = 2; FUEL_RES_2 = 2;
...@@ -812,6 +826,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -812,6 +826,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_05 = 0; LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1; LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 1; LINE_OUT_POS_07 = 1;
LINE_OUT_POS_08 = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; FUEL_RES_1 = 0;
FUEL_RES_2 = 2; FUEL_RES_2 = 2;
...@@ -828,6 +843,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -828,6 +843,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_05 = 1; LINE_OUT_POS_05 = 1;
LINE_OUT_POS_06 = 0; LINE_OUT_POS_06 = 0;
LINE_OUT_POS_07 = 1; LINE_OUT_POS_07 = 1;
LINE_OUT_POS_08 = 1;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; FUEL_RES_1 = 0;
FUEL_RES_2 = 2; FUEL_RES_2 = 2;
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ eb02050a
...@@ -5148,60 +5148,58 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -5148,60 +5148,58 @@ void Display_Send_Vspead(uint8_t menu)
199km/h 700*/ 199km/h 700*/
void Buzzer_Start(void) void Buzzer_Start(void)
{ {
PWM_Channel_Init(9,0,0,0,0);
switch (MENU_CHECK_STEP) switch (MENU_CHECK_STEP)
{ {
case 0: case 0:
// PWM_Channel_Set_Freq(11,0); PWM_Channel_Set_Freq(1,1);
PWM_Channel_Set_Duty(9, 1000);
break; break;
case 1: case 1:
PWM_Channel_Set_Freq(9,35); PWM_Channel_Set_Freq(1,19);
break; break;
case 2: case 2:
PWM_Channel_Set_Freq(9,68); PWM_Channel_Set_Freq(1,50);
break; break;
case 3: case 3:
PWM_Channel_Set_Freq(9,101); PWM_Channel_Set_Freq(1,84);
break; break;
case 4: case 4:
PWM_Channel_Set_Freq(9,137); PWM_Channel_Set_Freq(1,117);
break; break;
case 5: case 5:
PWM_Channel_Set_Freq(9,170); PWM_Channel_Set_Freq(1,150);
break; break;
case 6: case 6:
PWM_Channel_Set_Freq(9,205); PWM_Channel_Set_Freq(1,183);
break; break;
case 7: case 7:
PWM_Channel_Set_Freq(9,237); PWM_Channel_Set_Freq(1,200);
break; break;
case 8: case 8:
PWM_Channel_Set_Freq(9,271); PWM_Channel_Set_Freq(1,200);
break; break;
case 9: case 9:
PWM_Channel_Set_Freq(9,304); PWM_Channel_Set_Freq(1,200);
break; break;
case 10: case 10:
PWM_Channel_Set_Freq(9,390); PWM_Channel_Set_Freq(1,200);
break; break;
case 11: case 11:
PWM_Channel_Set_Freq(9,453); PWM_Channel_Set_Freq(1,200);
break; break;
case 12: case 12:
PWM_Channel_Set_Freq(9,518); PWM_Channel_Set_Freq(1,200);
break; break;
case 13: case 13:
PWM_Channel_Set_Freq(9,700); PWM_Channel_Set_Freq(1,200);
break; break;
default: default:
break; break;
} }
if(MENU_CHECK_STEP != 0) // if(MENU_CHECK_STEP != 0)
{ // {
PWM_Channel_Set_Duty(9, 500); PWM_Channel_Set_Duty(1, 500);
} // }
} }
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.h
View file @ eb02050a
...@@ -136,7 +136,8 @@ ...@@ -136,7 +136,8 @@
#define LINE_OUT_POS_06 GPIO_OUT_PORT09_PIN03 #define LINE_OUT_POS_06 GPIO_OUT_PORT09_PIN03
//负控10 //负控10
#define LINE_OUT_POS_07 GPIO_OUT_PORT00_PIN08 #define LINE_OUT_POS_07 GPIO_OUT_PORT00_PIN08
//负控1
#define LINE_OUT_POS_08 GPIO_OUT_PORT09_PIN06
//zh: //zh:
......
YueJin_test_bench/source/Driver/GPIO/GPIO.c
View file @ eb02050a
...@@ -72,14 +72,14 @@ const uint16_t g_u16GPIOConfigArray[56U][2U] = ...@@ -72,14 +72,14 @@ const uint16_t g_u16GPIOConfigArray[56U][2U] =
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x8000u, 0x8000u}, {0x8800u, 0x8000u},
{0x8000u, 0x8000u}, {0x8800u, 0x8000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x8000u, 0x8000u}, {0x8800u, 0x8000u},
{0x0020u, 0x0000u}, {0x0020u, 0x0000u},
{0x7FFFu, 0x7FFFu}, {0x77FFu, 0x7FFFu},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
......
YueJin_test_bench/source/Driver/TimerB/TimerB.c
View file @ eb02050a
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#elif (TIMERB_0_CK0_DIV == 16U) #elif (TIMERB_0_CK0_DIV == 16U)
#define TIMERB_0_CK0_DIV_COE 4U #define TIMERB_0_CK0_DIV_COE 4U
#elif (TIMERB_0_CK0_DIV == 32U) #elif (TIMERB_0_CK0_DIV == 32U)
#define TIMERB_0_CK0_DIV_COE 5U #define TIMERB_0_CK0_DIV_COE 7U
#elif (TIMERB_0_CK0_DIV == 64U) #elif (TIMERB_0_CK0_DIV == 64U)
#define TIMERB_0_CK0_DIV_COE 6U #define TIMERB_0_CK0_DIV_COE 6U
#elif (TIMERB_0_CK0_DIV == 128U) #elif (TIMERB_0_CK0_DIV == 128U)
...@@ -358,7 +358,7 @@ uint32_t TimerB_PWM_Channel_Fre_Set(TIMERB_Channel_en_t enTimerBChannel, uint16_ ...@@ -358,7 +358,7 @@ uint32_t TimerB_PWM_Channel_Fre_Set(TIMERB_Channel_en_t enTimerBChannel, uint16_
u32TimerBRegAddrChannel = u32TimerBRegBaseAddr + (4U * (u8TimerBChannel)); u32TimerBRegAddrChannel = u32TimerBRegBaseAddr + (4U * (u8TimerBChannel));
(*((uint16_t *)(u32TimerBRegAddrChannel - 4U * TIMERB_CHANNEL_INTERVAL))) = u32CalBuf - 1U; (*((uint16_t *)(u32TimerBRegAddrChannel - 4U * TIMERB_CHANNEL_INTERVAL))) = (u32CalBuf - 1U) / 4;
/*TAUB0CDR2 = u32CalBuf - 1U; // fre*/ /*TAUB0CDR2 = u32CalBuf - 1U; // fre*/
(*((uint16_t *)u32TimerBRegAddrChannel)) = (u32Duty * u32CalBuf / 1000U); (*((uint16_t *)u32TimerBRegAddrChannel)) = (u32Duty * u32CalBuf / 1000U);
......
YueJin_test_bench/source/System/init.c
View file @ eb02050a
...@@ -82,6 +82,9 @@ void Sys_Startup_Init(void) ...@@ -82,6 +82,9 @@ void Sys_Startup_Init(void)
Display_Title_Info( ); Display_Title_Info( );
Key_Init( ); Key_Init( );
Buzzer_Init(); Buzzer_Init();
PWM_Channel_Init(1,0,0,0,0);
UIDdelay = 0; UIDdelay = 0;
POWER_CTRL_KL30 = 1u; //B+ POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15 POWER_CTRL_KL15 = 1u; //KL15
......
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