diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-08-06 21:54:58 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-08-06 21:54:58 +0300 |
| commit | 6af95ce0e0e9083a2e2dd2fd114778e68e8f1e16 (patch) | |
| tree | 1ebd1f57228c235a5511caa060a4fa83264cef99 /Software/Embedded_SW/Embedded | |
| parent | 25e6266ed956efc6afd248322a8ad85ac3eb3c71 (diff) | |
| download | Tango-6af95ce0e0e9083a2e2dd2fd114778e68e8f1e16.tar.gz Tango-6af95ce0e0e9083a2e2dd2fd114778e68e8f1e16.zip | |
Version 1.4.6.39 bug fix in motor mov with callback (dancers motors)
Diffstat (limited to 'Software/Embedded_SW/Embedded')
4 files changed, 4 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/.cproject b/Software/Embedded_SW/Embedded/.cproject index b0b5c14ed..88f4e5215 100644 --- a/Software/Embedded_SW/Embedded/.cproject +++ b/Software/Embedded_SW/Embedded/.cproject @@ -170,7 +170,7 @@ </toolChain> </folderInfo> <sourceEntries> - <entry excluding="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="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/SW_Info/SW_Info.c b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c index 4f84962ed..7a6db7993 100644 --- a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c +++ b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c @@ -20,7 +20,7 @@ typedef struct } TangoVersion_t; -TangoVersion_t _gTangoVersion = {1,4,6,38}; +TangoVersion_t _gTangoVersion = {1,4,6,39}; #define BUILD_DATE __DATE__ char Dat[50] = BUILD_DATE; char _gTangoName [MAX_STRING_LEN] = "Tango01 ";//d diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c index 2945851b6..99d74538b 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c @@ -376,6 +376,7 @@ void FPGA_GetBusy() MotorDriverResponse[HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_8].Busy = (F2_MOT_NBUSY1.bits.F2_MOTO_DISPENSER_A1_8_NBUSY) | F2_SPI_BUSY2.bits.F2_MOTO_DISPENSER_A1_1_BUSY; MotorDriverResponse[HARDWARE_MOTOR_TYPE__MOTO_SCREW].Busy = (F1_MOT_NBUSY2.bits.F1_MOTO_SCREW_A1_NBUSY) | F1_SPI_BUSY2.bits.F1_MOTO_SCREW_A1_SDI_busy; MotorDriverResponse[HARDWARE_MOTOR_TYPE__MOTO_WINDER].Busy = (F1_MOT_NBUSY2.bits.F1_MOTO_WINDER_A1_NBUSY) | F1_SPI_BUSY1.bits.F1_MOTO_WINDER_A1_SDI_busy; + MotorDriverResponse[HARDWARE_MOTOR_TYPE__MOTO_LDANCER1].Busy = (F1_MOT_NBUSY1.bits.F1_MOTO_LDANCER1_A1_NBUSY) /*| F1_SPI_BUSY1.bits.F1_MOTO_LDANCER1_A1_SDI_busy*/; MotorDriverResponse[HARDWARE_MOTOR_TYPE__MOTO_LDANCER2].Busy = (F1_MOT_NBUSY1.bits.F1_MOTO_LDANCER2_A1_NBUSY) | F1_SPI_BUSY1.bits.F1_MOTO_LDANCER2_A1_SDI_busy; MotorDriverResponse[HARDWARE_MOTOR_TYPE__MOTO_LDRIVING].Busy = (F1_MOT_NBUSY1.bits.F1_MOTO_LDRIVING_A1_NBUSY) | F1_SPI_BUSY1.bits.F1_MOTO_LDRIVING_A1_SDI_busy; MotorDriverResponse[HARDWARE_MOTOR_TYPE__MOTO_LLOADING].Busy = (F1_MOT_NBUSY1.bits.F1_MOTO_LLOADING_A1_NBUSY) | F1_SPI_BUSY1.bits.F1_MOTO_LLOADING_A1_SDI_busy; diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index ef80d3603..9c29cf14d 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -900,7 +900,7 @@ uint32_t Adjust_Right_TFU_Tension(double tension) } uint32_t ThreadPrepare_TensionCallback (int MotorId, double tension) { - MotorStop(MotorId,Hard_Hiz); + //MotorStop(MotorId,Hard_Hiz); if (PrepareWaitCount) { ReportWithPackageFilter(ThreadFilter,"ThreadPrepare_TensionCallback",__FILE__,__LINE__,MotorId,RpWarning,PrepareWaitCount,0); |