доделка проекта с вариантом для новой версии ПЧ, в свойствах проекта дефайн REF0 или REF1

This commit is contained in:
seklyuts 2024-07-23 09:56:14 +03:00
parent 05542beb04
commit 4fcc1b54f8
18 changed files with 265 additions and 178 deletions

View File

@ -61,6 +61,7 @@
</option> </option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DEFINE.2084039298" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DEFINE" valueType="definedSymbols"> <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DEFINE.2084039298" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DEFINE" valueType="definedSymbols">
<listOptionValue builtIn="false" value="${COM_TI_C2000WARE_SOFTWARE_PACKAGE_SYMBOLS}"/> <listOptionValue builtIn="false" value="${COM_TI_C2000WARE_SOFTWARE_PACKAGE_SYMBOLS}"/>
<listOptionValue builtIn="false" value="REF1"/>
<listOptionValue builtIn="false" value="NRS485"/> <listOptionValue builtIn="false" value="NRS485"/>
<listOptionValue builtIn="false" value="USE_25MHZ_XTAL"/> <listOptionValue builtIn="false" value="USE_25MHZ_XTAL"/>
<listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="DEBUG"/>

View File

@ -1,16 +1,4 @@
eclipse.preferences.version=1 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_rules.mk=UTF-8
encoding//CPU1_FLASH/Freemaster/subdir_vars.mk=UTF-8 encoding//CPU1_FLASH/Freemaster/subdir_vars.mk=UTF-8
encoding//CPU1_FLASH/lib/subdir_rules.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/src/vector/subdir_vars.mk=UTF-8
encoding//CPU1_FLASH/subdir_rules.mk=UTF-8 encoding//CPU1_FLASH/subdir_rules.mk=UTF-8
encoding//CPU1_FLASH/subdir_vars.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

View File

@ -5,85 +5,91 @@
* Author: seklyuts * Author: seklyuts
*/ */
#include "f28x_project.h" #include "f28x_project.h"
#include "config.h"
void GpioDiodInit(void) void GpioDiodInit(void)
{ {
EALLOW; EALLOW;
GpioCtrlRegs.GPAMUX1.bit.GPIO6 = 0; GpioCtrlRegs.GPAMUX1.bit.GPIO_LED_R = 0;
GpioCtrlRegs.GPAGMUX1.bit.GPIO6 = 0; GpioCtrlRegs.GPAGMUX1.bit.GPIO_LED_R = 0;
GpioCtrlRegs.GPADIR.bit.GPIO6 = 1; GpioCtrlRegs.GPADIR.bit.GPIO_LED_R = 1;
GpioDataRegs.GPADAT.bit.GPIO6 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0;
GpioCtrlRegs.GPACSEL1.bit.GPIO6 = 2; GpioCtrlRegs.GPIO_LED_R_SEL.bit.GPIO_LED_R = 2;
GpioCtrlRegs.GPAMUX1.bit.GPIO7 = 0; GpioCtrlRegs.GPAMUX1.bit.GPIO_LED_B = 0;
GpioCtrlRegs.GPAGMUX1.bit.GPIO7 = 0; GpioCtrlRegs.GPAGMUX1.bit.GPIO_LED_B = 0;
GpioCtrlRegs.GPADIR.bit.GPIO7 = 1; GpioCtrlRegs.GPADIR.bit.GPIO_LED_B = 1;
GpioDataRegs.GPADAT.bit.GPIO7 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0;
GpioCtrlRegs.GPACSEL1.bit.GPIO7 = 2; GpioCtrlRegs.GPIO_LED_B_SEL.bit.GPIO_LED_B = 2;
GpioCtrlRegs.GPAMUX1.bit.GPIO10 = 0; GpioCtrlRegs.GPAMUX1.bit.GPIO_LED_G = 0;
GpioCtrlRegs.GPAGMUX1.bit.GPIO10 = 0; GpioCtrlRegs.GPAGMUX1.bit.GPIO_LED_G = 0;
GpioCtrlRegs.GPADIR.bit.GPIO10 = 1; GpioCtrlRegs.GPADIR.bit.GPIO_LED_G = 1;
GpioDataRegs.GPADAT.bit.GPIO10 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_G = 0;
GpioCtrlRegs.GPACSEL2.bit.GPIO10 = 2; GpioCtrlRegs.GPIO_LED_G_SEL.bit.GPIO_LED_G = 2;
EDIS; EDIS;
} }
void GpioSetGreen(void) void GpioSetGreen(void)
{ {
GpioDataRegs.GPADAT.bit.GPIO6 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0;
GpioDataRegs.GPADAT.bit.GPIO6 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0;
GpioDataRegs.GPADAT.bit.GPIO6 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0;
GpioDataRegs.GPADAT.bit.GPIO7 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0;
GpioDataRegs.GPADAT.bit.GPIO7 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0;
GpioDataRegs.GPADAT.bit.GPIO7 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0;
GpioDataRegs.GPADAT.bit.GPIO10 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1;
GpioDataRegs.GPADAT.bit.GPIO10 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1;
GpioDataRegs.GPADAT.bit.GPIO10 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1;
} }
void GpioSetBlue(void) void GpioSetBlue(void)
{ {
GpioDataRegs.GPADAT.bit.GPIO6 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0;
GpioDataRegs.GPADAT.bit.GPIO6 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0;
GpioDataRegs.GPADAT.bit.GPIO6 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0;
GpioDataRegs.GPADAT.bit.GPIO7 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_B = 1;
GpioDataRegs.GPADAT.bit.GPIO7 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_B = 1;
GpioDataRegs.GPADAT.bit.GPIO7 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_B = 1;
GpioDataRegs.GPADAT.bit.GPIO10 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_G = 0;
GpioDataRegs.GPADAT.bit.GPIO10 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_G = 0;
GpioDataRegs.GPADAT.bit.GPIO10 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_G = 0;
} }
void GpioSetOrange(void) void GpioSetOrange(void)
{ {
GpioDataRegs.GPADAT.bit.GPIO6 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_R = 1;
GpioDataRegs.GPADAT.bit.GPIO6 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_R = 1;
GpioDataRegs.GPADAT.bit.GPIO6 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_R = 1;
GpioDataRegs.GPADAT.bit.GPIO7 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0;
GpioDataRegs.GPADAT.bit.GPIO7 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0;
GpioDataRegs.GPADAT.bit.GPIO7 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0;
GpioDataRegs.GPADAT.bit.GPIO10 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1;
GpioDataRegs.GPADAT.bit.GPIO10 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1;
GpioDataRegs.GPADAT.bit.GPIO10 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1;
} }
void GpioInit(void) void GpioInit(void)
{ {
EALLOW; EALLOW;
#ifdef REF0
GpioCtrlRegs.GPCMUX2.bit.GPIO95 = 0; // Rele GpioCtrlRegs.GPCMUX2.bit.GPIO95 = 0; // Rele
GpioCtrlRegs.GPCGMUX2.bit.GPIO95 = 0; GpioCtrlRegs.GPCGMUX2.bit.GPIO95 = 0;
GpioCtrlRegs.GPCDIR.bit.GPIO95 = 1; GpioCtrlRegs.GPCDIR.bit.GPIO95 = 1;
GpioDataRegs.GPCDAT.bit.GPIO95 = 1; GpioDataRegs.GPCDAT.bit.GPIO95 = 1;
GpioCtrlRegs.GPCCSEL4.bit.GPIO95 = 2; GpioCtrlRegs.GPCCSEL4.bit.GPIO95 = 2;
#endif
GpioCtrlRegs.GPCMUX1.bit.GPIO64 = 0;//FaultPWM GpioCtrlRegs.GPIO_FaultPWM_MUX.bit.GPIO_FaultPWM = 0;//FaultPWM
GpioCtrlRegs.GPCGMUX1.bit.GPIO64 = 0; GpioCtrlRegs.GPIO_FaultPWM_GMUX.bit.GPIO_FaultPWM = 0;
GpioCtrlRegs.GPCDIR.bit.GPIO64 = 0; GpioCtrlRegs.GPIO_FaultPWM_DIR.bit.GPIO_FaultPWM = 0;
GpioDataRegs.GPCDAT.bit.GPIO64 = 0; GpioDataRegs.GPIO_FaultPWM_DAT.bit.GPIO_FaultPWM = 0;
GpioCtrlRegs.GPCCSEL1.bit.GPIO64 = 2; GpioCtrlRegs.GPIO_FaultPWM_SEL.bit.GPIO_FaultPWM = 2;
InputXbarRegs.INPUT4SELECT = 64;//xint1 InputXbarRegs.INPUT4SELECT = 64;//xint1
@ -133,12 +139,12 @@ void GpioInit(void)
void Gpio6out(uint16_t out_bit)//led_r 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 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 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) void Gpio_rainbow(uint16_t color)
{ {
GpioDataRegs.GPADAT.bit.GPIO10 = color & 1; GpioDataRegs.GPADAT.bit.GPIO_LED_G = color & 1;
GpioDataRegs.GPADAT.bit.GPIO10 = color & 1; GpioDataRegs.GPADAT.bit.GPIO_LED_G = color & 1;
GpioDataRegs.GPADAT.bit.GPIO10 = color & 1; GpioDataRegs.GPADAT.bit.GPIO_LED_G = color & 1;
GpioDataRegs.GPADAT.bit.GPIO7 = (color >> 1) & 1; GpioDataRegs.GPADAT.bit.GPIO_LED_B = (color >> 1) & 1;
GpioDataRegs.GPADAT.bit.GPIO7 = (color >> 1) & 1; GpioDataRegs.GPADAT.bit.GPIO_LED_B = (color >> 1) & 1;
GpioDataRegs.GPADAT.bit.GPIO7 = (color >> 1) & 1; GpioDataRegs.GPADAT.bit.GPIO_LED_B = (color >> 1) & 1;
GpioDataRegs.GPADAT.bit.GPIO6 = (color >> 2) & 1; GpioDataRegs.GPADAT.bit.GPIO_LED_R = (color >> 2) & 1;
GpioDataRegs.GPADAT.bit.GPIO6 = (color >> 2) & 1; GpioDataRegs.GPADAT.bit.GPIO_LED_R = (color >> 2) & 1;
GpioDataRegs.GPADAT.bit.GPIO6 = (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; GpioDataRegs.GPBDAT.bit.GPIO57 = out_bit;
} }
void Gpio95out(uint16_t out_bit) void ReleOut(uint16_t out_bit)
{ {
GpioDataRegs.GPCDAT.bit.GPIO95 = out_bit; GpioDataRegs.GPCDAT.bit.GPIO95 = out_bit;
} }

View File

@ -1,7 +1,7 @@
/* /*
* gpio_init.h * gpio_init.h
* *
* Created on: 4 ñåíò. 2023 ã. * Created on: 4 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>. 2023 <EFBFBD>.
* Author: seklyuts * Author: seklyuts
*/ */
@ -36,7 +36,7 @@ void Gpio10out(uint16_t out_bit);
void Gpio55out(uint16_t out_bit); void Gpio55out(uint16_t out_bit);
void Gpio56out(uint16_t out_bit); void Gpio56out(uint16_t out_bit);
void Gpio57out(uint16_t out_bit); void Gpio57out(uint16_t out_bit);
void Gpio95out(uint16_t out_bit);
void Gpio_rainbow(uint16_t color); void Gpio_rainbow(uint16_t color);
#endif /* SRC_GPIO_INIT_H_ */ #endif /* SRC_GPIO_INIT_H_ */

View File

@ -124,9 +124,9 @@ void PWMGpioInit(void)//<2F><><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>
GpioCtrlRegs.GPACSEL2.bit.GPIO12 = 2;//to cpu2 GpioCtrlRegs.GPACSEL2.bit.GPIO12 = 2;//to cpu2
GpioCtrlRegs.GPACSEL2.bit.GPIO13 = 2; GpioCtrlRegs.GPACSEL2.bit.GPIO13 = 2;
GpioCtrlRegs.GPAPUD.bit.GPIO14 = 1; // Disable pull-up on GPIO14 (EPWM8A) // GpioCtrlRegs.GPAPUD.bit.GPIO14 = 1; // Disable pull-up on GPIO14 (EPWM8A)
GpioCtrlRegs.GPAMUX1.bit.GPIO14 = 1; // Configure GPIO14 as EPWM8A // GpioCtrlRegs.GPAMUX1.bit.GPIO14 = 1; // Configure GPIO14 as EPWM8A
GpioCtrlRegs.GPACSEL2.bit.GPIO14 = 2;//to cpu2 // GpioCtrlRegs.GPACSEL2.bit.GPIO14 = 2;//to cpu2
GpioCtrlRegs.GPAPUD.bit.GPIO4 = 1; // Disable pull-up on GPIO4 (EPWM3A) GpioCtrlRegs.GPAPUD.bit.GPIO4 = 1; // Disable pull-up on GPIO4 (EPWM3A)
GpioCtrlRegs.GPAPUD.bit.GPIO5 = 1; // Disable pull-up on GPIO5 (EPWM3B) GpioCtrlRegs.GPAPUD.bit.GPIO5 = 1; // Disable pull-up on GPIO5 (EPWM3B)

View File

@ -7,6 +7,8 @@
#include "f28x_project.h" #include "f28x_project.h"
//#include "f2838x_pinmux.h" //#include "f2838x_pinmux.h"
#include "frm_uart.h" #include "frm_uart.h"
#include "config.h"
#define LSPCLK_HZ 50000000.0 #define LSPCLK_HZ 50000000.0
#define BAUD 19200.0 #define BAUD 19200.0
@ -38,19 +40,11 @@ void FRMGPIOInit(void)
GPIO_SetupPinMux(84, GPIO_MUX_CPU2, 5); GPIO_SetupPinMux(84, GPIO_MUX_CPU2, 5);
GPIO_SetupPinOptions(84, GPIO_OUTPUT, GPIO_ASYNC); GPIO_SetupPinOptions(84, GPIO_OUTPUT, GPIO_ASYNC);
GPIO_SetupPinMux(21, GPIO_MUX_CPU2, 0); GPIO_SetupPinMux(GPIO_RS485_DE, GPIO_MUX_CPU2, 0);
GPIO_SetupPinOptions(21, GPIO_OUTPUT, GPIO_PUSHPULL); GPIO_SetupPinOptions(GPIO_RS485_DE, GPIO_OUTPUT, GPIO_PUSHPULL);
GPIO_SetupPinMux(83, GPIO_MUX_CPU2, 0); GPIO_SetupPinMux(GPIO_RS485_RE, GPIO_MUX_CPU2, 0);
GPIO_SetupPinOptions(83, GPIO_OUTPUT, GPIO_PUSHPULL); 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) void FRMUartInit(void)

View File

@ -63,6 +63,7 @@
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DEFINE.2084039298" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DEFINE" valueType="definedSymbols"> <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DEFINE.2084039298" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DEFINE" valueType="definedSymbols">
<listOptionValue builtIn="false" value="${COM_TI_C2000WARE_SOFTWARE_PACKAGE_SYMBOLS}"/> <listOptionValue builtIn="false" value="${COM_TI_C2000WARE_SOFTWARE_PACKAGE_SYMBOLS}"/>
<listOptionValue builtIn="false" value="NRS485"/> <listOptionValue builtIn="false" value="NRS485"/>
<listOptionValue builtIn="false" value="REF1"/>
<listOptionValue builtIn="false" value="USE_25MHZ_XTAL"/> <listOptionValue builtIn="false" value="USE_25MHZ_XTAL"/>
<listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="DEBUG"/>
<listOptionValue builtIn="false" value="CPU2"/> <listOptionValue builtIn="false" value="CPU2"/>

View File

@ -5,46 +5,46 @@
* Author: seklyuts * Author: seklyuts
*/ */
#include "f28x_project.h" #include "f28x_project.h"
#include "config.h"
void GpioSetGreen(void) void GpioSetGreen(void)
{ {
GpioDataRegs.GPADAT.bit.GPIO6 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0;
GpioDataRegs.GPADAT.bit.GPIO6 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0;
GpioDataRegs.GPADAT.bit.GPIO6 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0;
GpioDataRegs.GPADAT.bit.GPIO7 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0;
GpioDataRegs.GPADAT.bit.GPIO7 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0;
GpioDataRegs.GPADAT.bit.GPIO7 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0;
GpioDataRegs.GPADAT.bit.GPIO10 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1;
GpioDataRegs.GPADAT.bit.GPIO10 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1;
GpioDataRegs.GPADAT.bit.GPIO10 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1;
} }
void GpioSetBlue(void) void GpioSetBlue(void)
{ {
GpioDataRegs.GPADAT.bit.GPIO6 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0;
GpioDataRegs.GPADAT.bit.GPIO6 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0;
GpioDataRegs.GPADAT.bit.GPIO6 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_R = 0;
GpioDataRegs.GPADAT.bit.GPIO7 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_B = 1;
GpioDataRegs.GPADAT.bit.GPIO7 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_B = 1;
GpioDataRegs.GPADAT.bit.GPIO7 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_B = 1;
GpioDataRegs.GPADAT.bit.GPIO10 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_G = 0;
GpioDataRegs.GPADAT.bit.GPIO10 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_G = 0;
GpioDataRegs.GPADAT.bit.GPIO10 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_G = 0;
} }
void GpioSetOrange(void) void GpioSetOrange(void)
{ {
GpioDataRegs.GPADAT.bit.GPIO6 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_R = 1;
GpioDataRegs.GPADAT.bit.GPIO6 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_R = 1;
GpioDataRegs.GPADAT.bit.GPIO6 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_R = 1;
GpioDataRegs.GPADAT.bit.GPIO7 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0;
GpioDataRegs.GPADAT.bit.GPIO7 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0;
GpioDataRegs.GPADAT.bit.GPIO7 = 0; GpioDataRegs.GPADAT.bit.GPIO_LED_B = 0;
GpioDataRegs.GPADAT.bit.GPIO10 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1;
GpioDataRegs.GPADAT.bit.GPIO10 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1;
GpioDataRegs.GPADAT.bit.GPIO10 = 1; GpioDataRegs.GPADAT.bit.GPIO_LED_G = 1;
} }
@ -64,30 +64,30 @@ void GpioSetOrange(void)
void Gpio6out(uint16_t out_bit)//led_r 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 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 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) void Gpio_rainbow(uint16_t color)
{ {
GpioDataRegs.GPADAT.bit.GPIO10 = color & 1; GpioDataRegs.GPADAT.bit.GPIO_LED_G = color & 1;
GpioDataRegs.GPADAT.bit.GPIO10 = color & 1; GpioDataRegs.GPADAT.bit.GPIO_LED_G = color & 1;
GpioDataRegs.GPADAT.bit.GPIO10 = color & 1; GpioDataRegs.GPADAT.bit.GPIO_LED_G = color & 1;
GpioDataRegs.GPADAT.bit.GPIO7 = (color >> 1) & 1; GpioDataRegs.GPADAT.bit.GPIO_LED_B = (color >> 1) & 1;
GpioDataRegs.GPADAT.bit.GPIO7 = (color >> 1) & 1; GpioDataRegs.GPADAT.bit.GPIO_LED_B = (color >> 1) & 1;
GpioDataRegs.GPADAT.bit.GPIO7 = (color >> 1) & 1; GpioDataRegs.GPADAT.bit.GPIO_LED_B = (color >> 1) & 1;
GpioDataRegs.GPADAT.bit.GPIO6 = (color >> 2) & 1; GpioDataRegs.GPADAT.bit.GPIO_LED_R = (color >> 2) & 1;
GpioDataRegs.GPADAT.bit.GPIO6 = (color >> 2) & 1; GpioDataRegs.GPADAT.bit.GPIO_LED_R = (color >> 2) & 1;
GpioDataRegs.GPADAT.bit.GPIO6 = (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; 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;
}

View File

@ -36,7 +36,7 @@ void Gpio10out(uint16_t out_bit);
void Gpio55out(uint16_t out_bit); void Gpio55out(uint16_t out_bit);
void Gpio56out(uint16_t out_bit); void Gpio56out(uint16_t out_bit);
void Gpio57out(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 Gpio_rainbow(uint16_t color);
void GpioTurnOnRele(void); void GpioTurnOnRele(void);
void GpioTurnOffRele(void); void GpioTurnOffRele(void);

View File

@ -68,12 +68,12 @@ void PWMAllInit(void)
PwmBrake100 = PERIOD_BRAKE; PwmBrake100 = PERIOD_BRAKE;
PwmMotor100 = PERIOD_MOTOR; PwmMotor100 = PERIOD_MOTOR;
PWMInit(1, TimerBase, INDEPENDED); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> PWMInit(PWM_BASE_TIMER, TimerBase, INDEPENDED); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
PWMInit(PWM_A, PwmMotor100, COMPLIMENTARY);//<2F><><EFBFBD> PWMInit(PWM_A, PwmMotor100, COMPLIMENTARY);//<2F><><EFBFBD>
PWMInit(PWM_B, PwmMotor100, COMPLIMENTARY);//<2F><><EFBFBD> PWMInit(PWM_B, PwmMotor100, COMPLIMENTARY);//<2F><><EFBFBD>
PWMInit(PWM_C, PwmMotor100, COMPLIMENTARY);//<2F><><EFBFBD> PWMInit(PWM_C, PwmMotor100, COMPLIMENTARY);//<2F><><EFBFBD>
PWMInit(PWM_BRAKE, PwmBrake100, INDEPENDED);//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> PWMInit(PWM_BRAKE, PwmBrake100, INDEPENDED);//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
PWMInit(3, PwmFan100, INDEPENDED);//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> PWMInit(PWM_FAN, PwmFan100, INDEPENDED);//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
//11 <20> 12 <20><><EFBFBD> SDFM //11 <20> 12 <20><><EFBFBD> SDFM
PWMInit(11, PwmMotor100, INDEPENDED); PWMInit(11, PwmMotor100, INDEPENDED);

View File

@ -34,12 +34,30 @@
#define INDEPENDED 1 #define INDEPENDED 1
#define COMPLIMENTARY 0 #define COMPLIMENTARY 0
#ifdef REF0
#define PWM_A 5 #define PWM_A 5
#define PWM_B 2 #define PWM_B 2
#define PWM_C 7 #define PWM_C 7
#define PWM_FAN 3
#define PWM_BRAKE 8 #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 PWMInit(uint16_t Num, uint16_t Period, uint16_t Independed);
void PWMGpioInit(void); void PWMGpioInit(void);
void PWMInitEnable(void); void PWMInitEnable(void);

View File

@ -8,6 +8,8 @@
#ifndef SRC_SDFM_H_ #ifndef SRC_SDFM_H_
#define SRC_SDFM_H_ #define SRC_SDFM_H_
#ifdef REF0
#define SDFM_IA 0//16, 17 #define SDFM_IA 0//16, 17
#define SDFM_IB 3//22, 23 #define SDFM_IB 3//22, 23
#define SDFM_IC 4//24, 25 #define SDFM_IC 4//24, 25
@ -20,6 +22,24 @@
#define SDFM_REF 2//67, 68 #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<<SDFM_IA) #define SDFM_BIT_IA (1<<SDFM_IA)
#define SDFM_BIT_IB (1<<SDFM_IB) #define SDFM_BIT_IB (1<<SDFM_IB)
#define SDFM_BIT_IC (1<<SDFM_IC) #define SDFM_BIT_IC (1<<SDFM_IC)

View File

@ -52,10 +52,11 @@ uint16_t Err1, Err2;
void faultInit(void) void faultInit(void)
{ {
uint16_t Fault_Bytes; uint16_t Fault_Bytes;
uint16_t Conf = 0xFF; uint16_t Conf0 = 0xFE;
Err1 = I2CWrite(I2C_FAULT_SLAVE_ADDRESS, 6, 1, true, &Conf); uint16_t Conf1 = 0xFF;
Err1 = I2CWrite(I2C_FAULT_SLAVE_ADDRESS, 6, 1, true, &Conf0);
Err2 = I2CWrite(I2C_FAULT_SLAVE_ADDRESS, 7, 1, true, &Conf); Err2 = I2CWrite(I2C_FAULT_SLAVE_ADDRESS, 7, 1, true, &Conf1);
I2CWrite(I2C_FAULT_SLAVE_ADDRESS, 0, 0, false, &Fault_Bytes); I2CWrite(I2C_FAULT_SLAVE_ADDRESS, 0, 0, false, &Fault_Bytes);

View File

@ -40,17 +40,20 @@ void FRMUartInit(void)
EDIS; EDIS;
// #ifdef REF0
EALLOW; EALLOW;
GpioDataRegs.GPADAT.bit.GPIO21 = 1; GpioDataRegs.GPADAT.bit.GPIO21 = 1;
GpioDataRegs.GPCDAT.bit.GPIO83 = 0; GpioDataRegs.GPCDAT.bit.GPIO83 = 0;
EDIS; EDIS;
// #else
// GPIO_SetupPinOptions(29, GPIO_OUTPUT, GPIO_ASYNC); EALLOW;
// GpioDataRegs.GPEDAT.bit.GPIO133 = 1;
// Note: Clocks were turned on to the SCIA peripheral GpioDataRegs.GPEDAT.bit.GPIO145 = 0;
// in the InitSysCtrl() function EDIS;
//
#endif
EALLOW; EALLOW;
SciaRegs.SCICCR.all = 0x0007; // 1 stop bit, No loopback SciaRegs.SCICCR.all = 0x0007; // 1 stop bit, No loopback
// No parity,8 char bits, // No parity,8 char bits,

View File

@ -80,12 +80,11 @@ void InitPerif(void)
#ifdef TEMPER_GPIO_20 #ifdef REF0
eqep_init();
#else
temperatureInit(); temperatureInit();
#else
eqep_init();
#endif #endif
rele_initRele(); rele_initRele();
// //

View File

@ -9,10 +9,35 @@
#include "vector.h" #include "vector.h"
#include "gpio_init.h" #include "gpio_init.h"
#include "rele.h" #include "rele.h"
#include "fault.h"
#include "i2c_init.h"
TRele Rele; TRele Rele;
#ifdef REF0
void ReleOut(uint16_t out_bit)
{
GpioDataRegs.GPCDAT.bit.GPIO95 = out_bit;
}
#else
void ReleOut(uint16_t out_bit)
{
uint16_t Err1;
Err1 = I2CWrite(I2C_FAULT_SLAVE_ADDRESS, 2, 1, true, &out_bit);
}
#endif
void GpioTurnOnRele(void)
{
GpioDataRegs.GPCDAT.bit.GPIO95 = 1;
}
void GpioTurnOffRele(void)
{
GpioDataRegs.GPCDAT.bit.GPIO95 = 0;
}
uint16_t rele_isReleOn(void) uint16_t rele_isReleOn(void)
{ {
return Rele.State; return Rele.State;
@ -22,16 +47,20 @@ uint16_t rele_isReleOn(void)
void rele_initRele(void) void rele_initRele(void)
{ {
Rele.State = 0; Rele.State = 0;
Rele.StateChange = 0;
Rele.ReleCounter = 0; Rele.ReleCounter = 0;
Rele.CounterMax = RELE_COUNTER_MAX; Rele.CounterMax = RELE_COUNTER_MAX;
Rele.UdcDiff = RELE_UDC_DIFF; Rele.UdcDiff = RELE_UDC_DIFF;
Rele.Error = 0; Rele.Error = 0;
ReleOut(0);
} }
void rele_run(int16_t UdcFiltered) void rele_run(int16_t UdcFiltered)
{ {
Gpio95out(Rele.State);
if(Rele.State != Rele.StateChange) {Rele.StateChange = Rele.State; ReleOut(Rele.State);}
if(!Rele.State) if(!Rele.State)
{ {
vectorFault(); vectorFault();

View File

@ -15,10 +15,12 @@
uint16_t rele_isReleOn(void); uint16_t rele_isReleOn(void);
void rele_initRele(void); void rele_initRele(void);
void rele_run(int16_t UdcFiltered); void rele_run(int16_t UdcFiltered);
void ReleOut(uint16_t out_bit);
typedef struct typedef struct
{ {
uint16_t State; uint16_t State;
uint16_t StateChange;
uint16_t ReleCounter; uint16_t ReleCounter;
uint16_t CounterMax; uint16_t CounterMax;
int16_t Udc; int16_t Udc;

View File

@ -1,29 +1,81 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<configurations XML_version="1.2" id="configurations_0"> <configurations XML_version="1.2" id="configurations_0">
<configuration XML_version="1.2" id="Texas Instruments XDS100v2 USB Debug Probe_0"> <configuration XML_version="1.2" id="Texas Instruments XDS100v2 USB Debug Probe_0">
<instance XML_version="1.2" desc="Texas Instruments XDS100v2 USB Debug Probe_0" href="connections/TIXDS100v2_Connection.xml" id="Texas Instruments XDS100v2 USB Debug Probe_0" xml="TIXDS100v2_Connection.xml" xmlpath="connections"/> <instance XML_version="1.2" desc="Texas Instruments XDS100v2 USB Debug Probe_0" href="connections/TIXDS100v2_Connection.xml" id="Texas Instruments XDS100v2 USB Debug Probe_0" xml="TIXDS100v2_Connection.xml" xmlpath="connections"/>
<connection XML_version="1.2" id="Texas Instruments XDS100v2 USB Debug Probe_0"> <connection XML_version="1.2" id="Texas Instruments XDS100v2 USB Debug Probe_0">
<instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/> <instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
<instance XML_version="1.2" href="drivers/tixds100v2c28x.xml" id="drivers" xml="tixds100v2c28x.xml" xmlpath="drivers"/> <instance XML_version="1.2" href="drivers/tixds100v2c28x.xml" id="drivers" xml="tixds100v2c28x.xml" xmlpath="drivers"/>
<instance XML_version="1.2" href="drivers/tixds100v2cla2.xml" id="drivers" xml="tixds100v2cla2.xml" xmlpath="drivers"/> <instance XML_version="1.2" href="drivers/tixds100v2cla2.xml" id="drivers" xml="tixds100v2cla2.xml" xmlpath="drivers"/>
<instance XML_version="1.2" href="drivers/tixds100v2cs_child.xml" id="drivers" xml="tixds100v2cs_child.xml" xmlpath="drivers"/> <instance XML_version="1.2" href="drivers/tixds100v2cs_child.xml" id="drivers" xml="tixds100v2cs_child.xml" xmlpath="drivers"/>
<instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/> <instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
<instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/> <instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
<instance XML_version="1.2" href="drivers/tixds510ajsm.xml" id="drivers" xml="tixds510ajsm.xml" xmlpath="drivers"/> <instance XML_version="1.2" href="drivers/tixds510ajsm.xml" id="drivers" xml="tixds510ajsm.xml" xmlpath="drivers"/>
<platform XML_version="1.2" id="platform_0"> <platform XML_version="1.2" id="platform_0">
<instance XML_version="1.2" desc="TMS320F28388D_0" href="devices/f28388d.xml" id="TMS320F28388D_0" xml="f28388d.xml" xmlpath="devices"/> <instance XML_version="1.2" desc="TMS320F28388D_0" href="devices/f28388d.xml" id="TMS320F28388D_0" xml="f28388d.xml" xmlpath="devices"/>
<device HW_revision="1" XML_version="1.2" description="" id="TMS320F28388D_0" partnum="TMS320F28388D">
<device HW_revision="1" XML_version="1.2" description="" id="TMS320F28388D_0" partnum="TMS320F28388D" simulation="no">
<router HW_revision="1.0" XML_version="1.2" description="ICEPick_C router" id="IcePick_C_0" isa="ICEPICK_C"> <router HW_revision="1.0" XML_version="1.2" description="ICEPick_C router" id="IcePick_C_0" isa="ICEPICK_C">
<subpath id="Subpath_1"> <subpath id="Subpath_1">
<property Type="numericfield" Value="0x11" desc="Port Number_0" id="Port Number"/> <property Type="numericfield" Value="0x11" desc="Port Number_0" id="Port Number"/>
</subpath> </subpath>
<subpath id="CM"> <subpath id="CM">
<property Type="numericfield" Value="0x12" desc="Port Number_1" id="Port Number"/> <property Type="numericfield" Value="0x12" desc="Port Number_1" id="Port Number"/>
</subpath> </subpath>
</router> </router>
</device> </device>
</platform> </platform>
</connection> </connection>
</configuration> </configuration>
</configurations> </configurations>