diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-10-19 14:02:45 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-10-19 14:02:45 +0300 |
| commit | 1cdac5261f96f1d5e01d18cbd833744d67d42db7 (patch) | |
| tree | 869bc7c2acb57773230cc29393b2c4d4e304c451 /Software/Embedded_SW | |
| parent | 0249d98cb3d6c59714881eda9d3724b8b16e65fa (diff) | |
| download | Tango-1cdac5261f96f1d5e01d18cbd833744d67d42db7.tar.gz Tango-1cdac5261f96f1d5e01d18cbd833744d67d42db7.zip | |
exclude unused code + add define for EVB code
Diffstat (limited to 'Software/Embedded_SW')
| -rw-r--r-- | Software/Embedded_SW/Embedded/.cproject | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/Pin_config.c | 3 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Heaters/Head_Heaters.c | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C.c | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Comm.c | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/SPI/SPI_Comm.c | 16 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Main.c | 4 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/src/sysbios/makefile | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/src/sysbios/sysbios.aem4f | bin | 2002098 -> 2002098 bytes |
9 files changed, 19 insertions, 14 deletions
diff --git a/Software/Embedded_SW/Embedded/.cproject b/Software/Embedded_SW/Embedded/.cproject index ecfc74bc3..526c6ee8c 100644 --- a/Software/Embedded_SW/Embedded/.cproject +++ b/Software/Embedded_SW/Embedded/.cproject @@ -170,7 +170,7 @@ </toolChain> </folderInfo> <sourceEntries> - <entry excluding="Drivers/On_Chip_Flash|Drivers/I2C_Communication/RFID_NFC/Test_RFID.c|Drivers/I2C_Communication/I2C_FIFO.c|Drivers/I2C_Communication/test_fifo_dma.c|Drivers/Uart_Comm/WHS_Controller_Comm/Modbus|Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/tcp|Drivers/I2C_Communication/RFID_NFC/NFC_I2C|Drivers/I2C_Communication/RFID_NFC/PN7150|Drivers/I2C_Communication/Head_Card/ADC/Head_ADC_old.c|src|EmbParam.cfg" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> + <entry excluding="Modules/Stubs_Handler/temperature_sensor.c|Modules/Stubs_Handler/Stub_SteperMotor.c|Modules/Stubs_Handler/User_Leds.c|Modules/Stubs_Handler/Stub_HW_Version.c|Modules/Stubs_Handler/Stub_L6470.c|Drivers/I2C_Communication/ektm4c129_i2c_master_udma_fifo.c|Drivers/I2C_Communication/Thermo_K|Drivers/On_Chip_Flash|Drivers/I2C_Communication/RFID_NFC/Test_RFID.c|Drivers/I2C_Communication/I2C_FIFO.c|Drivers/I2C_Communication/test_fifo_dma.c|Drivers/Uart_Comm/WHS_Controller_Comm/Modbus|Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/tcp|Drivers/I2C_Communication/RFID_NFC/NFC_I2C|Drivers/I2C_Communication/RFID_NFC/PN7150|Drivers/I2C_Communication/Head_Card/ADC/Head_ADC_old.c|src|EmbParam.cfg" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> diff --git a/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/Pin_config.c b/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/Pin_config.c index abf773090..10fbdfafa 100644 --- a/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/Pin_config.c +++ b/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/Pin_config.c @@ -4,6 +4,8 @@ #include <driverlib/gpio.h> #include <inc/hw_memmap.h> +#ifdef EVALUATION_BOARD + void InitPinOutPullUps(void) { GPIOPadConfigSet(GPIO_PORTD_BASE, GPIO_INT_PIN_0,GPIO_STRENGTH_2MA,GPIO_PIN_TYPE_STD_WPU); @@ -47,6 +49,7 @@ void InitPinOutPullUps(void) GPIOPadConfigSet(GPIO_PORTT_BASE, GPIO_INT_PIN_2,GPIO_STRENGTH_2MA,GPIO_PIN_TYPE_STD_WPU); } +#endif diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Heaters/Head_Heaters.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Heaters/Head_Heaters.c index db954be06..655839786 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Heaters/Head_Heaters.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Heaters/Head_Heaters.c @@ -14,7 +14,7 @@ bool HeaterMap[HEADCARD_HIT_MIXER+1] = {0}; -uint8_t OT_Heater_Index = 0;IN_Heater_Index = 0; +uint8_t OT_Heater_Index = 0,IN_Heater_Index = 0; uint32_t Activate_Head_Card_Heaters(HEADCARD_HEATERS_ENUM Head_Heater_ID) { uint32_t status= OK; diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C.c index c83fe6e50..1bcf47fe8 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C.c @@ -18,7 +18,7 @@ #include "driverlib/i2c.h" #include "I2C.h" #include "inc/hw_i2c.h" -#include "i2c_fifo.h" +//#include "i2c_fifo.h" #define I2C_DELAY 3000 uint8_t Main_Mux_Flag = UNKNOWN; diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Comm.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Comm.c index 182e5ccf7..2dd26e98c 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Comm.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Comm.c @@ -19,7 +19,7 @@ #include "driverlib/sysctl.h" #include "driverlib/i2c.h" #include "inc/hw_i2c.h" -#include "i2c_fifo.h" +//#include "i2c_fifo.h" #include "i2c.h" uint32_t LastReadI2C_BASE; unsigned char LastReadaddr; unsigned char* LastReaddata; unsigned int LastReadlen; diff --git a/Software/Embedded_SW/Embedded/Drivers/SPI/SPI_Comm.c b/Software/Embedded_SW/Embedded/Drivers/SPI/SPI_Comm.c index 2fd26552b..2d89b8d2b 100644 --- a/Software/Embedded_SW/Embedded/Drivers/SPI/SPI_Comm.c +++ b/Software/Embedded_SW/Embedded/Drivers/SPI/SPI_Comm.c @@ -1212,8 +1212,8 @@ byte Transfer_tx(byte data/*, byte data_out*/ ) byte Write_Byte(uint8_t WByte) { - uint32_t RByte; - + uint32_t RByte = 0; +#ifdef EVALUATION_BOARD uint16_t TimeOut = 0; SSIDataPut(SSI2_BASE, WByte); @@ -1239,15 +1239,16 @@ byte Write_Byte(uint8_t WByte) } SSIDataGet(SSI2_BASE, &RByte); - +#endif return (RByte & 0xff); } uint32_t Get_Param(byte param)//OK { - uint32_t temp = 0; uint32_t rx = 0; +#ifdef EVALUATION_BOARD + uint32_t temp = 0; //while(SSIBusy(SSI2_BASE)){}; // while(Check_SPI_Busy() == BUSY){}; /* Send GetParam operation code to dSPIN */ @@ -1291,7 +1292,7 @@ uint32_t Get_Param(byte param)//OK temp = Write_Byte((uint8_t)(0x00)); rx |= temp & 0xFF; } - +#endif return rx; } /* @@ -1337,8 +1338,9 @@ void Avi_test_get_speed()// Working as expected read the speed */ uint32_t Get_and_Clear_Status()// Tested OK AVI { - uint32_t temp = 0; uint32_t rx = 0; +#ifdef EVALUATION_BOARD + uint32_t temp = 0; /* Send GetParam operation code to dSPIN */ temp = Write_Byte(x_GET_STATUS); @@ -1350,6 +1352,6 @@ uint32_t Get_and_Clear_Status()// Tested OK AVI temp = Write_Byte((uint8_t)(0x00)); rx |= temp & 0xFF; - +#endif return rx; } diff --git a/Software/Embedded_SW/Embedded/Main.c b/Software/Embedded_SW/Embedded/Main.c index 8a66e89c8..1ea6358da 100644 --- a/Software/Embedded_SW/Embedded/Main.c +++ b/Software/Embedded_SW/Embedded/Main.c @@ -203,7 +203,7 @@ void SysTickHandler(void) void Init_EVB() { - +#ifdef EVALUATION_BOARD InitPinOutPullUps(); #ifdef Stub_Mode @@ -215,7 +215,7 @@ void Init_EVB() SSI1_Init(); // Read dancer ENC SSI #endif - +#endif } int main(void) diff --git a/Software/Embedded_SW/Embedded/src/sysbios/makefile b/Software/Embedded_SW/Embedded/src/sysbios/makefile index b1ccf442b..57905d05f 100644 --- a/Software/Embedded_SW/Embedded/src/sysbios/makefile +++ b/Software/Embedded_SW/Embedded/src/sysbios/makefile @@ -10,7 +10,7 @@ XDC_ROOT = C:/ti/xdctools_3_32_00_06_core/packages/ BIOS_ROOT = C:/ti/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/ti/sysbios/ -BIOS_DEFS = -Dti_sysbios_BIOS_swiEnabled__D=TRUE -Dti_sysbios_BIOS_taskEnabled__D=TRUE -Dti_sysbios_BIOS_clockEnabled__D=TRUE -Dti_sysbios_BIOS_runtimeCreatesEnabled__D=TRUE -Dti_sysbios_hal_Hwi_DISABLE_ALL_HOOKS -Dti_sysbios_knl_Swi_DISABLE_ALL_HOOKS -Dti_sysbios_BIOS_smpEnabled__D=FALSE -Dti_sysbios_Build_useHwiMacros -Dti_sysbios_knl_Swi_numPriorities__D=16 -Dti_sysbios_knl_Task_deleteTerminatedTasks__D=FALSE -Dti_sysbios_knl_Task_numPriorities__D=16 -Dti_sysbios_knl_Task_checkStackFlag__D=TRUE -Dti_sysbios_knl_Task_initStackFlag__D=TRUE -Dti_sysbios_knl_Clock_TICK_SOURCE=ti_sysbios_knl_Clock_TickSource_TIMER -Dti_sysbios_knl_Clock_TICK_MODE=ti_sysbios_knl_Clock_TickMode_PERIODIC -Dti_sysbios_hal_Core_delegate_getId=ti_sysbios_hal_CoreNull_getId__E -Dti_sysbios_hal_Core_delegate_interruptCore=ti_sysbios_hal_CoreNull_interruptCore__E -Dti_sysbios_hal_Core_delegate_lock=ti_sysbios_hal_CoreNull_lock__E -Dti_sysbios_hal_Core_delegate_unlock=ti_sysbios_hal_CoreNull_unlock__E -Dti_sysbios_hal_Core_numCores__D=1 -Dti_sysbios_hal_CoreNull_numCores__D=1 -Dti_sysbios_utils_Load_taskEnabled__D=TRUE -Dti_sysbios_utils_Load_swiEnabled__D=FALSE -Dti_sysbios_utils_Load_hwiEnabled__D=FALSE -Dti_sysbios_family_arm_m3_Hwi_dispatcherSwiSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherTaskSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherAutoNestingSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherIrpTrackingSupport__D=TRUE -Dti_sysbios_knl_Semaphore_supportsEvents__D=FALSE -Dti_sysbios_knl_Semaphore_supportsPriority__D=TRUE +BIOS_DEFS = -Dti_sysbios_BIOS_swiEnabled__D=TRUE -Dti_sysbios_BIOS_taskEnabled__D=TRUE -Dti_sysbios_BIOS_clockEnabled__D=TRUE -Dti_sysbios_BIOS_runtimeCreatesEnabled__D=TRUE -Dti_sysbios_hal_Hwi_DISABLE_ALL_HOOKS -Dti_sysbios_knl_Swi_DISABLE_ALL_HOOKS -Dti_sysbios_BIOS_smpEnabled__D=FALSE -Dti_sysbios_Build_useHwiMacros -Dti_sysbios_knl_Swi_numPriorities__D=16 -Dti_sysbios_knl_Task_deleteTerminatedTasks__D=FALSE -Dti_sysbios_knl_Task_numPriorities__D=25 -Dti_sysbios_knl_Task_checkStackFlag__D=TRUE -Dti_sysbios_knl_Task_initStackFlag__D=TRUE -Dti_sysbios_knl_Clock_TICK_SOURCE=ti_sysbios_knl_Clock_TickSource_TIMER -Dti_sysbios_knl_Clock_TICK_MODE=ti_sysbios_knl_Clock_TickMode_PERIODIC -Dti_sysbios_hal_Core_delegate_getId=ti_sysbios_hal_CoreNull_getId__E -Dti_sysbios_hal_Core_delegate_interruptCore=ti_sysbios_hal_CoreNull_interruptCore__E -Dti_sysbios_hal_Core_delegate_lock=ti_sysbios_hal_CoreNull_lock__E -Dti_sysbios_hal_Core_delegate_unlock=ti_sysbios_hal_CoreNull_unlock__E -Dti_sysbios_hal_Core_numCores__D=1 -Dti_sysbios_hal_CoreNull_numCores__D=1 -Dti_sysbios_utils_Load_taskEnabled__D=TRUE -Dti_sysbios_utils_Load_swiEnabled__D=FALSE -Dti_sysbios_utils_Load_hwiEnabled__D=FALSE -Dti_sysbios_family_arm_m3_Hwi_dispatcherSwiSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherTaskSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherAutoNestingSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherIrpTrackingSupport__D=TRUE -Dti_sysbios_knl_Semaphore_supportsEvents__D=FALSE -Dti_sysbios_knl_Semaphore_supportsPriority__D=TRUE BIOS_INC = -I"C:/ti/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/" diff --git a/Software/Embedded_SW/Embedded/src/sysbios/sysbios.aem4f b/Software/Embedded_SW/Embedded/src/sysbios/sysbios.aem4f Binary files differindex 41e969041..654b2c170 100644 --- a/Software/Embedded_SW/Embedded/src/sysbios/sysbios.aem4f +++ b/Software/Embedded_SW/Embedded/src/sysbios/sysbios.aem4f |
