diff --git a/Projects/epwm_test_biss_c_cpu1/.cproject b/Projects/epwm_test_biss_c_cpu1/.cproject index 291ad8d..e5223fd 100644 --- a/Projects/epwm_test_biss_c_cpu1/.cproject +++ b/Projects/epwm_test_biss_c_cpu1/.cproject @@ -61,6 +61,7 @@ + diff --git a/Projects/epwm_test_biss_c_cpu1/.settings/org.eclipse.core.resources.prefs b/Projects/epwm_test_biss_c_cpu1/.settings/org.eclipse.core.resources.prefs index 392c912..e36b17b 100644 --- a/Projects/epwm_test_biss_c_cpu1/.settings/org.eclipse.core.resources.prefs +++ b/Projects/epwm_test_biss_c_cpu1/.settings/org.eclipse.core.resources.prefs @@ -1,16 +1,4 @@ eclipse.preferences.version=1 -encoding//CPU1_FLASH/CPU1_RAM/Freemaster/subdir_rules.mk=UTF-8 -encoding//CPU1_FLASH/CPU1_RAM/Freemaster/subdir_vars.mk=UTF-8 -encoding//CPU1_FLASH/CPU1_RAM/lib/subdir_rules.mk=UTF-8 -encoding//CPU1_FLASH/CPU1_RAM/lib/subdir_vars.mk=UTF-8 -encoding//CPU1_FLASH/CPU1_RAM/src/ExternalEEPROM/subdir_rules.mk=UTF-8 -encoding//CPU1_FLASH/CPU1_RAM/src/ExternalEEPROM/subdir_vars.mk=UTF-8 -encoding//CPU1_FLASH/CPU1_RAM/src/Peripherals/subdir_rules.mk=UTF-8 -encoding//CPU1_FLASH/CPU1_RAM/src/Peripherals/subdir_vars.mk=UTF-8 -encoding//CPU1_FLASH/CPU1_RAM/src/subdir_rules.mk=UTF-8 -encoding//CPU1_FLASH/CPU1_RAM/src/subdir_vars.mk=UTF-8 -encoding//CPU1_FLASH/CPU1_RAM/subdir_rules.mk=UTF-8 -encoding//CPU1_FLASH/CPU1_RAM/subdir_vars.mk=UTF-8 encoding//CPU1_FLASH/Freemaster/subdir_rules.mk=UTF-8 encoding//CPU1_FLASH/Freemaster/subdir_vars.mk=UTF-8 encoding//CPU1_FLASH/lib/subdir_rules.mk=UTF-8 @@ -28,18 +16,3 @@ encoding//CPU1_FLASH/src/vector/subdir_rules.mk=UTF-8 encoding//CPU1_FLASH/src/vector/subdir_vars.mk=UTF-8 encoding//CPU1_FLASH/subdir_rules.mk=UTF-8 encoding//CPU1_FLASH/subdir_vars.mk=UTF-8 -encoding//CPU1_RAM/Freemaster/subdir_rules.mk=UTF-8 -encoding//CPU1_RAM/Freemaster/subdir_vars.mk=UTF-8 -encoding//CPU1_RAM/lib/subdir_rules.mk=UTF-8 -encoding//CPU1_RAM/lib/subdir_vars.mk=UTF-8 -encoding//CPU1_RAM/makefile=UTF-8 -encoding//CPU1_RAM/objects.mk=UTF-8 -encoding//CPU1_RAM/sources.mk=UTF-8 -encoding//CPU1_RAM/src/CLB/subdir_rules.mk=UTF-8 -encoding//CPU1_RAM/src/CLB/subdir_vars.mk=UTF-8 -encoding//CPU1_RAM/src/Peripherals/subdir_rules.mk=UTF-8 -encoding//CPU1_RAM/src/Peripherals/subdir_vars.mk=UTF-8 -encoding//CPU1_RAM/src/subdir_rules.mk=UTF-8 -encoding//CPU1_RAM/src/subdir_vars.mk=UTF-8 -encoding//CPU1_RAM/subdir_rules.mk=UTF-8 -encoding//CPU1_RAM/subdir_vars.mk=UTF-8 diff --git a/Projects/epwm_test_biss_c_cpu1/src/Peripherals/gpio_init.c b/Projects/epwm_test_biss_c_cpu1/src/Peripherals/gpio_init.c index 373d52f..2424ab8 100644 --- a/Projects/epwm_test_biss_c_cpu1/src/Peripherals/gpio_init.c +++ b/Projects/epwm_test_biss_c_cpu1/src/Peripherals/gpio_init.c @@ -5,85 +5,91 @@ * Author: seklyuts */ #include "f28x_project.h" +#include "config.h" + void GpioDiodInit(void) { EALLOW; - GpioCtrlRegs.GPAMUX1.bit.GPIO6 = 0; - GpioCtrlRegs.GPAGMUX1.bit.GPIO6 = 0; - GpioCtrlRegs.GPADIR.bit.GPIO6 = 1; - GpioDataRegs.GPADAT.bit.GPIO6 = 0; - GpioCtrlRegs.GPACSEL1.bit.GPIO6 = 2; + GpioCtrlRegs.GPAMUX1.bit.GPIO_LED_R = 0; + GpioCtrlRegs.GPAGMUX1.bit.GPIO_LED_R = 0; + GpioCtrlRegs.GPADIR.bit.GPIO_LED_R = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0; + GpioCtrlRegs.GPIO_LED_R_SEL.bit.GPIO_LED_R = 2; - GpioCtrlRegs.GPAMUX1.bit.GPIO7 = 0; - GpioCtrlRegs.GPAGMUX1.bit.GPIO7 = 0; - GpioCtrlRegs.GPADIR.bit.GPIO7 = 1; - GpioDataRegs.GPADAT.bit.GPIO7 = 0; - GpioCtrlRegs.GPACSEL1.bit.GPIO7 = 2; + GpioCtrlRegs.GPAMUX1.bit.GPIO_LED_B = 0; + GpioCtrlRegs.GPAGMUX1.bit.GPIO_LED_B = 0; + GpioCtrlRegs.GPADIR.bit.GPIO_LED_B = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0; + GpioCtrlRegs.GPIO_LED_B_SEL.bit.GPIO_LED_B = 2; - GpioCtrlRegs.GPAMUX1.bit.GPIO10 = 0; - GpioCtrlRegs.GPAGMUX1.bit.GPIO10 = 0; - GpioCtrlRegs.GPADIR.bit.GPIO10 = 1; - GpioDataRegs.GPADAT.bit.GPIO10 = 0; - GpioCtrlRegs.GPACSEL2.bit.GPIO10 = 2; + GpioCtrlRegs.GPAMUX1.bit.GPIO_LED_G = 0; + GpioCtrlRegs.GPAGMUX1.bit.GPIO_LED_G = 0; + GpioCtrlRegs.GPADIR.bit.GPIO_LED_G = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = 0; + GpioCtrlRegs.GPIO_LED_G_SEL.bit.GPIO_LED_G = 2; EDIS; } void GpioSetGreen(void) { - GpioDataRegs.GPADAT.bit.GPIO6 = 0; - GpioDataRegs.GPADAT.bit.GPIO6 = 0; - GpioDataRegs.GPADAT.bit.GPIO6 = 0; - GpioDataRegs.GPADAT.bit.GPIO7 = 0; - GpioDataRegs.GPADAT.bit.GPIO7 = 0; - GpioDataRegs.GPADAT.bit.GPIO7 = 0; - GpioDataRegs.GPADAT.bit.GPIO10 = 1; - GpioDataRegs.GPADAT.bit.GPIO10 = 1; - GpioDataRegs.GPADAT.bit.GPIO10 = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1; } void GpioSetBlue(void) { - GpioDataRegs.GPADAT.bit.GPIO6 = 0; - GpioDataRegs.GPADAT.bit.GPIO6 = 0; - GpioDataRegs.GPADAT.bit.GPIO6 = 0; - GpioDataRegs.GPADAT.bit.GPIO7 = 1; - GpioDataRegs.GPADAT.bit.GPIO7 = 1; - GpioDataRegs.GPADAT.bit.GPIO7 = 1; - GpioDataRegs.GPADAT.bit.GPIO10 = 0; - GpioDataRegs.GPADAT.bit.GPIO10 = 0; - GpioDataRegs.GPADAT.bit.GPIO10 = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = 0; } void GpioSetOrange(void) { - GpioDataRegs.GPADAT.bit.GPIO6 = 1; - GpioDataRegs.GPADAT.bit.GPIO6 = 1; - GpioDataRegs.GPADAT.bit.GPIO6 = 1; - GpioDataRegs.GPADAT.bit.GPIO7 = 0; - GpioDataRegs.GPADAT.bit.GPIO7 = 0; - GpioDataRegs.GPADAT.bit.GPIO7 = 0; - GpioDataRegs.GPADAT.bit.GPIO10 = 1; - GpioDataRegs.GPADAT.bit.GPIO10 = 1; - GpioDataRegs.GPADAT.bit.GPIO10 = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1; } + + void GpioInit(void) { EALLOW; +#ifdef REF0 GpioCtrlRegs.GPCMUX2.bit.GPIO95 = 0; // Rele GpioCtrlRegs.GPCGMUX2.bit.GPIO95 = 0; GpioCtrlRegs.GPCDIR.bit.GPIO95 = 1; GpioDataRegs.GPCDAT.bit.GPIO95 = 1; GpioCtrlRegs.GPCCSEL4.bit.GPIO95 = 2; +#endif - GpioCtrlRegs.GPCMUX1.bit.GPIO64 = 0;//FaultPWM - GpioCtrlRegs.GPCGMUX1.bit.GPIO64 = 0; - GpioCtrlRegs.GPCDIR.bit.GPIO64 = 0; - GpioDataRegs.GPCDAT.bit.GPIO64 = 0; - GpioCtrlRegs.GPCCSEL1.bit.GPIO64 = 2; + GpioCtrlRegs.GPIO_FaultPWM_MUX.bit.GPIO_FaultPWM = 0;//FaultPWM + GpioCtrlRegs.GPIO_FaultPWM_GMUX.bit.GPIO_FaultPWM = 0; + GpioCtrlRegs.GPIO_FaultPWM_DIR.bit.GPIO_FaultPWM = 0; + GpioDataRegs.GPIO_FaultPWM_DAT.bit.GPIO_FaultPWM = 0; + GpioCtrlRegs.GPIO_FaultPWM_SEL.bit.GPIO_FaultPWM = 2; InputXbarRegs.INPUT4SELECT = 64;//xint1 @@ -133,12 +139,12 @@ void GpioInit(void) void Gpio6out(uint16_t out_bit)//led_r { - GpioDataRegs.GPADAT.bit.GPIO6 = out_bit; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = out_bit; } void Gpio7out(uint16_t out_bit)//led_b { - GpioDataRegs.GPADAT.bit.GPIO7 = out_bit; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = out_bit; } void Gpio10out(uint16_t out_bit)//led_g @@ -148,15 +154,15 @@ void Gpio10out(uint16_t out_bit)//led_g void Gpio_rainbow(uint16_t color) { - GpioDataRegs.GPADAT.bit.GPIO10 = color & 1; - GpioDataRegs.GPADAT.bit.GPIO10 = color & 1; - GpioDataRegs.GPADAT.bit.GPIO10 = color & 1; - GpioDataRegs.GPADAT.bit.GPIO7 = (color >> 1) & 1; - GpioDataRegs.GPADAT.bit.GPIO7 = (color >> 1) & 1; - GpioDataRegs.GPADAT.bit.GPIO7 = (color >> 1) & 1; - GpioDataRegs.GPADAT.bit.GPIO6 = (color >> 2) & 1; - GpioDataRegs.GPADAT.bit.GPIO6 = (color >> 2) & 1; - GpioDataRegs.GPADAT.bit.GPIO6 = (color >> 2) & 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = color & 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = color & 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = color & 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = (color >> 1) & 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = (color >> 1) & 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = (color >> 1) & 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = (color >> 2) & 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = (color >> 2) & 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = (color >> 2) & 1; } @@ -175,7 +181,7 @@ void Gpio57out(uint16_t out_bit) GpioDataRegs.GPBDAT.bit.GPIO57 = out_bit; } -void Gpio95out(uint16_t out_bit) +void ReleOut(uint16_t out_bit) { GpioDataRegs.GPCDAT.bit.GPIO95 = out_bit; } diff --git a/Projects/epwm_test_biss_c_cpu1/src/Peripherals/gpio_init.h b/Projects/epwm_test_biss_c_cpu1/src/Peripherals/gpio_init.h index 621135b..4cb3a3b 100644 --- a/Projects/epwm_test_biss_c_cpu1/src/Peripherals/gpio_init.h +++ b/Projects/epwm_test_biss_c_cpu1/src/Peripherals/gpio_init.h @@ -1,7 +1,7 @@ /* * gpio_init.h * - * Created on: 4 ñåíò. 2023 ã. + * Created on: 4 ����. 2023 �. * Author: seklyuts */ @@ -36,7 +36,7 @@ void Gpio10out(uint16_t out_bit); void Gpio55out(uint16_t out_bit); void Gpio56out(uint16_t out_bit); void Gpio57out(uint16_t out_bit); -void Gpio95out(uint16_t out_bit); + void Gpio_rainbow(uint16_t color); #endif /* SRC_GPIO_INIT_H_ */ diff --git a/Projects/epwm_test_biss_c_cpu1/src/Peripherals/pwm_init.c b/Projects/epwm_test_biss_c_cpu1/src/Peripherals/pwm_init.c index ef48a48..80b27ba 100644 --- a/Projects/epwm_test_biss_c_cpu1/src/Peripherals/pwm_init.c +++ b/Projects/epwm_test_biss_c_cpu1/src/Peripherals/pwm_init.c @@ -124,9 +124,9 @@ void PWMGpioInit(void)//��� � ������������ � GpioCtrlRegs.GPACSEL2.bit.GPIO12 = 2;//to cpu2 GpioCtrlRegs.GPACSEL2.bit.GPIO13 = 2; - GpioCtrlRegs.GPAPUD.bit.GPIO14 = 1; // Disable pull-up on GPIO14 (EPWM8A) - GpioCtrlRegs.GPAMUX1.bit.GPIO14 = 1; // Configure GPIO14 as EPWM8A - GpioCtrlRegs.GPACSEL2.bit.GPIO14 = 2;//to cpu2 +// GpioCtrlRegs.GPAPUD.bit.GPIO14 = 1; // Disable pull-up on GPIO14 (EPWM8A) +// GpioCtrlRegs.GPAMUX1.bit.GPIO14 = 1; // Configure GPIO14 as EPWM8A +// GpioCtrlRegs.GPACSEL2.bit.GPIO14 = 2;//to cpu2 GpioCtrlRegs.GPAPUD.bit.GPIO4 = 1; // Disable pull-up on GPIO4 (EPWM3A) GpioCtrlRegs.GPAPUD.bit.GPIO5 = 1; // Disable pull-up on GPIO5 (EPWM3B) diff --git a/Projects/epwm_test_biss_c_cpu1/src/frm_uart.c b/Projects/epwm_test_biss_c_cpu1/src/frm_uart.c index 540856e..e6114ee 100644 --- a/Projects/epwm_test_biss_c_cpu1/src/frm_uart.c +++ b/Projects/epwm_test_biss_c_cpu1/src/frm_uart.c @@ -7,6 +7,8 @@ #include "f28x_project.h" //#include "f2838x_pinmux.h" #include "frm_uart.h" +#include "config.h" + #define LSPCLK_HZ 50000000.0 #define BAUD 19200.0 @@ -38,19 +40,11 @@ void FRMGPIOInit(void) GPIO_SetupPinMux(84, GPIO_MUX_CPU2, 5); GPIO_SetupPinOptions(84, GPIO_OUTPUT, GPIO_ASYNC); - GPIO_SetupPinMux(21, GPIO_MUX_CPU2, 0); - GPIO_SetupPinOptions(21, GPIO_OUTPUT, GPIO_PUSHPULL); - GPIO_SetupPinMux(83, GPIO_MUX_CPU2, 0); - GPIO_SetupPinOptions(83, GPIO_OUTPUT, GPIO_PUSHPULL); + GPIO_SetupPinMux(GPIO_RS485_DE, GPIO_MUX_CPU2, 0); + GPIO_SetupPinOptions(GPIO_RS485_DE, GPIO_OUTPUT, GPIO_PUSHPULL); + GPIO_SetupPinMux(GPIO_RS485_RE, GPIO_MUX_CPU2, 0); + GPIO_SetupPinOptions(GPIO_RS485_RE, GPIO_OUTPUT, GPIO_PUSHPULL); -// EALLOW; -// GpioCtrlRegs.GPADIR.bit.GPIO21 = 1; -// GpioDataRegs.GPADAT.bit.GPIO21 = 1; -// GpioCtrlRegs.GPCDIR.bit.GPIO83 = 1; -// GpioDataRegs.GPCDAT.bit.GPIO83 = 0; -// EDIS; - -// GPIO_SetupPinOptions(29, GPIO_OUTPUT, GPIO_ASYNC); } void FRMUartInit(void) diff --git a/Projects/epwm_test_biss_c_cpu2/.cproject b/Projects/epwm_test_biss_c_cpu2/.cproject index 40f7089..25b0cf8 100644 --- a/Projects/epwm_test_biss_c_cpu2/.cproject +++ b/Projects/epwm_test_biss_c_cpu2/.cproject @@ -63,6 +63,7 @@ + diff --git a/Projects/epwm_test_biss_c_cpu2/src/Peripherals/gpio_init.c b/Projects/epwm_test_biss_c_cpu2/src/Peripherals/gpio_init.c index 504903c..8220518 100644 --- a/Projects/epwm_test_biss_c_cpu2/src/Peripherals/gpio_init.c +++ b/Projects/epwm_test_biss_c_cpu2/src/Peripherals/gpio_init.c @@ -5,46 +5,46 @@ * Author: seklyuts */ #include "f28x_project.h" - +#include "config.h" void GpioSetGreen(void) { - GpioDataRegs.GPADAT.bit.GPIO6 = 0; - GpioDataRegs.GPADAT.bit.GPIO6 = 0; - GpioDataRegs.GPADAT.bit.GPIO6 = 0; - GpioDataRegs.GPADAT.bit.GPIO7 = 0; - GpioDataRegs.GPADAT.bit.GPIO7 = 0; - GpioDataRegs.GPADAT.bit.GPIO7 = 0; - GpioDataRegs.GPADAT.bit.GPIO10 = 1; - GpioDataRegs.GPADAT.bit.GPIO10 = 1; - GpioDataRegs.GPADAT.bit.GPIO10 = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1; } void GpioSetBlue(void) { - GpioDataRegs.GPADAT.bit.GPIO6 = 0; - GpioDataRegs.GPADAT.bit.GPIO6 = 0; - GpioDataRegs.GPADAT.bit.GPIO6 = 0; - GpioDataRegs.GPADAT.bit.GPIO7 = 1; - GpioDataRegs.GPADAT.bit.GPIO7 = 1; - GpioDataRegs.GPADAT.bit.GPIO7 = 1; - GpioDataRegs.GPADAT.bit.GPIO10 = 0; - GpioDataRegs.GPADAT.bit.GPIO10 = 0; - GpioDataRegs.GPADAT.bit.GPIO10 = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = 0; } void GpioSetOrange(void) { - GpioDataRegs.GPADAT.bit.GPIO6 = 1; - GpioDataRegs.GPADAT.bit.GPIO6 = 1; - GpioDataRegs.GPADAT.bit.GPIO6 = 1; - GpioDataRegs.GPADAT.bit.GPIO7 = 0; - GpioDataRegs.GPADAT.bit.GPIO7 = 0; - GpioDataRegs.GPADAT.bit.GPIO7 = 0; - GpioDataRegs.GPADAT.bit.GPIO10 = 1; - GpioDataRegs.GPADAT.bit.GPIO10 = 1; - GpioDataRegs.GPADAT.bit.GPIO10 = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1; } @@ -64,30 +64,30 @@ void GpioSetOrange(void) void Gpio6out(uint16_t out_bit)//led_r { - GpioDataRegs.GPADAT.bit.GPIO6 = out_bit; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = out_bit; } void Gpio7out(uint16_t out_bit)//led_b { - GpioDataRegs.GPADAT.bit.GPIO7 = out_bit; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = out_bit; } void Gpio10out(uint16_t out_bit)//led_g { - GpioDataRegs.GPADAT.bit.GPIO10 = out_bit; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = out_bit; } void Gpio_rainbow(uint16_t color) { - GpioDataRegs.GPADAT.bit.GPIO10 = color & 1; - GpioDataRegs.GPADAT.bit.GPIO10 = color & 1; - GpioDataRegs.GPADAT.bit.GPIO10 = color & 1; - GpioDataRegs.GPADAT.bit.GPIO7 = (color >> 1) & 1; - GpioDataRegs.GPADAT.bit.GPIO7 = (color >> 1) & 1; - GpioDataRegs.GPADAT.bit.GPIO7 = (color >> 1) & 1; - GpioDataRegs.GPADAT.bit.GPIO6 = (color >> 2) & 1; - GpioDataRegs.GPADAT.bit.GPIO6 = (color >> 2) & 1; - GpioDataRegs.GPADAT.bit.GPIO6 = (color >> 2) & 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = color & 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = color & 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_G = color & 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = (color >> 1) & 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = (color >> 1) & 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_B = (color >> 1) & 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = (color >> 2) & 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = (color >> 2) & 1; + GpioDataRegs.GPADAT.bit.GPIO_LED_R = (color >> 2) & 1; } @@ -106,19 +106,7 @@ void Gpio57out(uint16_t out_bit) GpioDataRegs.GPBDAT.bit.GPIO57 = out_bit; } -void Gpio95out(uint16_t out_bit) -{ - GpioDataRegs.GPCDAT.bit.GPIO95 = out_bit; -} - -void GpioTurnOnRele(void) -{ - GpioDataRegs.GPCDAT.bit.GPIO95 = 1; -} - -void GpioTurnOffRele(void) -{ - GpioDataRegs.GPCDAT.bit.GPIO95 = 0; -} + + diff --git a/Projects/epwm_test_biss_c_cpu2/src/Peripherals/gpio_init.h b/Projects/epwm_test_biss_c_cpu2/src/Peripherals/gpio_init.h index 14e1da4..8c078e2 100644 --- a/Projects/epwm_test_biss_c_cpu2/src/Peripherals/gpio_init.h +++ b/Projects/epwm_test_biss_c_cpu2/src/Peripherals/gpio_init.h @@ -36,7 +36,7 @@ void Gpio10out(uint16_t out_bit); void Gpio55out(uint16_t out_bit); void Gpio56out(uint16_t out_bit); void Gpio57out(uint16_t out_bit); -void Gpio95out(uint16_t out_bit); +void ReleOut(uint16_t out_bit); void Gpio_rainbow(uint16_t color); void GpioTurnOnRele(void); void GpioTurnOffRele(void); diff --git a/Projects/epwm_test_biss_c_cpu2/src/Peripherals/pwm_init.c b/Projects/epwm_test_biss_c_cpu2/src/Peripherals/pwm_init.c index 92b0b7d..0d39c70 100644 --- a/Projects/epwm_test_biss_c_cpu2/src/Peripherals/pwm_init.c +++ b/Projects/epwm_test_biss_c_cpu2/src/Peripherals/pwm_init.c @@ -68,12 +68,12 @@ void PWMAllInit(void) PwmBrake100 = PERIOD_BRAKE; PwmMotor100 = PERIOD_MOTOR; - PWMInit(1, TimerBase, INDEPENDED); //������� ������ ���������� + PWMInit(PWM_BASE_TIMER, TimerBase, INDEPENDED); //������� ������ ���������� PWMInit(PWM_A, PwmMotor100, COMPLIMENTARY);//��� PWMInit(PWM_B, PwmMotor100, COMPLIMENTARY);//��� PWMInit(PWM_C, PwmMotor100, COMPLIMENTARY);//��� PWMInit(PWM_BRAKE, PwmBrake100, INDEPENDED);//������ - PWMInit(3, PwmFan100, INDEPENDED);//���������� � ������ + PWMInit(PWM_FAN, PwmFan100, INDEPENDED);//���������� � ������ //11 � 12 ��� SDFM PWMInit(11, PwmMotor100, INDEPENDED); diff --git a/Projects/epwm_test_biss_c_cpu2/src/Peripherals/pwm_init.h b/Projects/epwm_test_biss_c_cpu2/src/Peripherals/pwm_init.h index 2de0fb3..3e339ba 100644 --- a/Projects/epwm_test_biss_c_cpu2/src/Peripherals/pwm_init.h +++ b/Projects/epwm_test_biss_c_cpu2/src/Peripherals/pwm_init.h @@ -34,12 +34,30 @@ #define INDEPENDED 1 #define COMPLIMENTARY 0 + +#ifdef REF0 + #define PWM_A 5 #define PWM_B 2 #define PWM_C 7 - +#define PWM_FAN 3 #define PWM_BRAKE 8 +#define PWM_BASE_TIMER 1 + +#else + +#define PWM_A 5 +#define PWM_B 4 +#define PWM_C 2 +#define PWM_FAN 3 +#define PWM_BRAKE 8 + +#define PWM_BASE_TIMER 1 +#endif + + + void PWMInit(uint16_t Num, uint16_t Period, uint16_t Independed); void PWMGpioInit(void); void PWMInitEnable(void); diff --git a/Projects/epwm_test_biss_c_cpu2/src/Peripherals/sdfm.h b/Projects/epwm_test_biss_c_cpu2/src/Peripherals/sdfm.h index fff4587..a58cbf4 100644 --- a/Projects/epwm_test_biss_c_cpu2/src/Peripherals/sdfm.h +++ b/Projects/epwm_test_biss_c_cpu2/src/Peripherals/sdfm.h @@ -8,6 +8,8 @@ #ifndef SRC_SDFM_H_ #define SRC_SDFM_H_ +#ifdef REF0 + #define SDFM_IA 0//16, 17 #define SDFM_IB 3//22, 23 #define SDFM_IC 4//24, 25 @@ -20,6 +22,24 @@ #define SDFM_REF 2//67, 68 +#else + +#define SDFM_IA 0//16, 17 +#define SDFM_IB 3//22, 23 +#define SDFM_IC 4//24, 25 + +#define SDFM_BRAKE 7//62, 63 +#define SDFM_U_DC 2//67, 68 + +#define SDFM_SIN 5//58, 59 +#define SDFM_COS 6//60, 61 + +#define SDFM_REF 1//65, 66 + +#endif + + + #define SDFM_BIT_IA (1< + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + +