diff options
Diffstat (limited to 'Software/Embedded_SW/Embedded/Drivers')
11 files changed, 652 insertions, 202 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c index c37bbc437..e9c674b25 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c @@ -18,6 +18,7 @@ #include "Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.h" #include <Drivers/I2C_Communication/I2C_Task.h> +#include <Utilities/utils.h> #include <Utilities/delay.h> FPGA_GPI FPGA_Gpi; @@ -122,7 +123,7 @@ LS_DISPENSER_7_8 LS_Dispenser_7_8; LS_DRYER_DH Ls_Dryer_Dh; F3_LS_01 LS_Spare; -void FPGA_Read_LS_Safty_Ind_Reg() +void FPGA_Read_LS_Safty_Ind_Reg()//MillisecLoop { // uint8_t temp[8] = {0,0,0,0,0,0,0,0},i; #ifndef EVALUATION_BOARD @@ -487,9 +488,9 @@ uint32_t DeActivateCleanerPump() return OK; } //---------------------------------- - void Power_Off()//Power Down { + utilsStoreLocalTime(); #ifdef WATCHDOG ROM_WatchdogResetDisable(WATCHDOG0_BASE); #endif @@ -499,6 +500,7 @@ void Power_Off()//Power Down void Power_Reset()// Resets the MCU { + utilsStoreLocalTime(); F3_SW_RESET_reg &= ~BIT0; SysCtlDelay(1000); F3_SW_RESET_reg |= BIT0; @@ -1214,8 +1216,8 @@ char Read_HW_Version(unsigned char *Brd_ID, unsigned char *Assy_ID) //MAP_GPIOPinTypeGPIOInput(GPIO_PORTJ_BASE, GPIO_PIN_5 | GPIO_PIN_4 | GPIO_PIN_7); //MAP_GPIOPinTypeGPIOInput(GPIO_PORTP_BASE, GPIO_PIN_3 | GPIO_PIN_5); - //Set HW Version GPIO to Pull down - GPIOPadConfigSet(GPIO_PORTS_BASE, GPIO_PIN_3 | GPIO_PIN_2 | GPIO_PIN_1, GPIO_STRENGTH_2MA,GPIO_PIN_TYPE_STD_WPD ); + //Set HW Version GPIO to Pull UP + GPIOPadConfigSet(GPIO_PORTS_BASE, GPIO_PIN_3 | GPIO_PIN_2 | GPIO_PIN_1, GPIO_STRENGTH_2MA,GPIO_PIN_TYPE_STD_WPU ); GPIOPadConfigSet(GPIO_PORTJ_BASE, GPIO_PIN_5 | GPIO_PIN_4 | GPIO_PIN_7, GPIO_STRENGTH_2MA,GPIO_PIN_TYPE_STD_WPD ); GPIOPadConfigSet(GPIO_PORTP_BASE, GPIO_PIN_3 | GPIO_PIN_5, GPIO_STRENGTH_2MA,GPIO_PIN_TYPE_STD_WPD ); // ------------------------------------------------------ @@ -1231,11 +1233,11 @@ char Read_HW_Version(unsigned char *Brd_ID, unsigned char *Assy_ID) if (ROM_GPIOPinRead(GPIO_PORTP_BASE, GPIO_PIN_3) == GPIO_PIN_3) *Assy_ID |= 0x08; - if (ROM_GPIOPinRead(GPIO_PORTP_BASE, GPIO_PIN_5) == GPIO_PIN_5) + if (ROM_GPIOPinRead(GPIO_PORTJ_BASE, GPIO_PIN_7) == GPIO_PIN_7) *Assy_ID |= 0x04; if (ROM_GPIOPinRead(GPIO_PORTS_BASE, GPIO_PIN_1) == GPIO_PIN_1) *Assy_ID |= 0x02; - if (ROM_GPIOPinRead(GPIO_PORTJ_BASE, GPIO_PIN_7) == GPIO_PIN_7) + if (ROM_GPIOPinRead(GPIO_PORTP_BASE, GPIO_PIN_5) == GPIO_PIN_5) *Assy_ID |= 0x01; return PASSED; diff --git a/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/fatfs_port_mx66l51235f.c b/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/fatfs_port_mx66l51235f.c index 0eccc7601..23490aca3 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/fatfs_port_mx66l51235f.c +++ b/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/fatfs_port_mx66l51235f.c @@ -24,6 +24,8 @@ #include "driverlib/gpio.h" #include "inc/hw_memmap.h" #include <time.h> +#include <utils/ustdlib.h> +#include <DataDef.h> //#include <ti/mw/fatfs/ff.h> //#include <ti/mw/fatfs/ffcio.h> @@ -200,7 +202,8 @@ void disk_timerproc (void) DWORD get_fattime (void) { //return miliseconds / 1000; - DWORD t = (DWORD)time(NULL); + time_t tt = umktime(&LocalTime); + DWORD t = (DWORD)tt; return t; } diff --git a/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/ff.c b/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/ff.c index 632dfb0d5..5140b8202 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/ff.c +++ b/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/ff.c @@ -898,7 +898,7 @@ FRESULT put_fat ( if (clst < 2 || clst >= fs->n_fatent) { /* Check range */ { res = FR_INT_ERR; - Report("put_fat FR_INT_ERR",__FILE__,__LINE__,(int)clst,RpWarning,(int)fs->n_fatent,0); + safeReport("put_fat FR_INT_ERR",__FILE__,__LINE__,(int)clst,RpWarning,(int)fs->n_fatent,0); } } else { @@ -934,7 +934,7 @@ FRESULT put_fat ( default : res = FR_INT_ERR; - Report("put_fat FR_INT_ERR",__FILE__,__LINE__,(int)clst,RpWarning,(int)fs->fs_type,0); + safeReport("put_fat FR_INT_ERR",__FILE__,__LINE__,(int)clst,RpWarning,(int)fs->fs_type,0); } fs->wflag = 1; @@ -965,7 +965,7 @@ FRESULT remove_chain ( if (clst < 2 || clst >= fs->n_fatent) { /* Check range */ res = FR_INT_ERR; - Report("remove_chain FR_INT_ERR",__FILE__,__LINE__,(int)clst,RpWarning,(int)fs->n_fatent,0); + safeReport("remove_chain FR_INT_ERR",__FILE__,__LINE__,(int)clst,RpWarning,(int)fs->n_fatent,0); } else { res = FR_OK; while (clst < fs->n_fatent) { /* Not a last link? */ @@ -973,7 +973,7 @@ FRESULT remove_chain ( if (nxt == 0) break; /* Empty cluster? */ if (nxt == 1) { res = FR_INT_ERR; - Report("remove_chain FR_INT_ERR",__FILE__,__LINE__,(int)res,RpWarning,(int)fs->n_fatent,0); + safeReport("remove_chain FR_INT_ERR",__FILE__,__LINE__,(int)res,RpWarning,(int)fs->n_fatent,0); break; } /* Internal error? */ if (nxt == 0xFFFFFFFF) { res = FR_DISK_ERR; break; } /* Disk error? */ res = put_fat(fs, clst, 0); /* Mark the cluster "empty" */ @@ -1108,7 +1108,7 @@ FRESULT dir_sdi ( clst = dj->sclust; if (clst == 1 || clst >= dj->fs->n_fatent) /* Check start cluster range */ { - Report("dir_sdi FR_INT_ERR",__FILE__,__LINE__,(int)clst,RpWarning,(int)dj->fs->n_fatent,0); + safeReport("dir_sdi FR_INT_ERR",__FILE__,__LINE__,(int)clst,RpWarning,(int)dj->fs->n_fatent,0); return FR_INT_ERR; } if (!clst && dj->fs->fs_type == FS_FAT32) /* Replace cluster# 0 with root cluster# if in FAT32 */ @@ -1118,7 +1118,7 @@ FRESULT dir_sdi ( dj->clust = clst; if (idx >= dj->fs->n_rootdir) /* Index is out of range */ { - Report("dir_sdi FR_INT_ERR",__FILE__,__LINE__,(int)idx,RpWarning,(int)dj->fs->n_rootdir,0); + safeReport("dir_sdi FR_INT_ERR",__FILE__,__LINE__,(int)idx,RpWarning,(int)dj->fs->n_rootdir,0); return FR_INT_ERR; } dj->sect = dj->fs->dirbase + idx / (SS(dj->fs) / SZ_DIR); /* Sector# */ @@ -1130,7 +1130,7 @@ FRESULT dir_sdi ( if (clst == 0xFFFFFFFF) return FR_DISK_ERR; /* Disk error */ if (clst < 2 || clst >= dj->fs->n_fatent) /* Reached to end of table or int error */ { - Report("dir_sdi FR_INT_ERR",__FILE__,__LINE__,(int)clst,RpWarning,(int)dj->fs->n_fatent,0); + safeReport("dir_sdi FR_INT_ERR",__FILE__,__LINE__,(int)clst,RpWarning,(int)dj->fs->n_fatent,0); return FR_INT_ERR; } idx -= ic; @@ -2578,7 +2578,7 @@ FRESULT f_write ( if (res != FR_OK) LEAVE_FF(fp->fs, res); if (fp->flag & FA__ERROR) /* Aborted file? */ { - Report("f_write FR_INT_ERR",__FILE__,__LINE__,(int)fp->flag,RpWarning,(int)btw,0); + safeReport("f_write FR_INT_ERR",__FILE__,__LINE__,(int)fp->flag,RpWarning,(int)btw,0); LEAVE_FF(fp->fs, FR_INT_ERR); } if (!(fp->flag & FA_WRITE)) /* Check access mode */ @@ -2620,7 +2620,7 @@ FRESULT f_write ( sect = clust2sect(fp->fs, fp->clust); /* Get current sector */ if (!sect) { - Report("f_write FR_INT_ERR",__FILE__,__LINE__,(int)sect,RpWarning,(int)btw,0); + safeReport("f_write FR_INT_ERR",__FILE__,__LINE__,(int)sect,RpWarning,(int)btw,0); ABORT(fp->fs, FR_INT_ERR); } sect += csect; @@ -2913,7 +2913,7 @@ FRESULT f_lseek ( if (res != FR_OK) LEAVE_FF(fp->fs, res); if (fp->flag & FA__ERROR) /* Check abort flag */ { - Report("f_lseek FR_INT_ERR",__FILE__,__LINE__,(int)fp->flag,RpWarning,(int)FA__ERROR,0); + safeReport("f_lseek FR_INT_ERR",__FILE__,__LINE__,(int)fp->flag,RpWarning,(int)FA__ERROR,0); LEAVE_FF(fp->fs, FR_INT_ERR); } @@ -3000,7 +3000,7 @@ FRESULT f_lseek ( clst = create_chain(fp->fs, 0); if (clst == 1) { - Report("f_lseek FR_INT_ERR",__FILE__,__LINE__,(int)clst,RpWarning,(int)FA__ERROR,0); + safeReport("f_lseek FR_INT_ERR",__FILE__,__LINE__,(int)clst,RpWarning,(int)FA__ERROR,0); ABORT(fp->fs, FR_INT_ERR); } if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR); @@ -3023,7 +3023,7 @@ FRESULT f_lseek ( if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR); if (clst <= 1 || clst >= fp->fs->n_fatent) { - Report("f_lseek FR_INT_ERR",__FILE__,__LINE__,(int)clst,RpWarning,(int)fp->fs->n_fatent,0); + safeReport("f_lseek FR_INT_ERR",__FILE__,__LINE__,(int)clst,RpWarning,(int)fp->fs->n_fatent,0); ABORT(fp->fs, FR_INT_ERR); } fp->clust = clst; @@ -3035,7 +3035,7 @@ FRESULT f_lseek ( nsect = clust2sect(fp->fs, clst); /* Current sector */ if (!nsect) { - Report("f_lseek FR_INT_ERR",__FILE__,__LINE__,(int)nsect,RpWarning,(int)0,0); + safeReport("f_lseek FR_INT_ERR",__FILE__,__LINE__,(int)nsect,RpWarning,(int)0,0); ABORT(fp->fs, FR_INT_ERR); } nsect += ofs / SS(fp->fs); @@ -3227,7 +3227,7 @@ FRESULT f_getfree ( if (stat == 0xFFFFFFFF) { res = FR_DISK_ERR; break; } if (stat == 1) { - Report("f_getfree FR_INT_ERR",__FILE__,__LINE__,(int)stat,RpWarning,(int)0,0); + safeReport("f_getfree FR_INT_ERR",__FILE__,__LINE__,(int)stat,RpWarning,(int)0,0); res = FR_INT_ERR; break; } if (stat == 0) n++; } while (++clst < fs->n_fatent); @@ -3277,7 +3277,7 @@ FRESULT f_truncate ( res = validate(fp); /* Check validity of the object */ if (res == FR_OK) { if (fp->flag & FA__ERROR) { /* Check abort flag */ - Report("f_truncate FR_INT_ERR",__FILE__,__LINE__,(int)fp->flag,RpWarning,(int)0,0); + safeReport("f_truncate FR_INT_ERR",__FILE__,__LINE__,(int)fp->flag,RpWarning,(int)0,0); res = FR_INT_ERR; } else { if (!(fp->flag & FA_WRITE)) /* Check access mode */ @@ -3297,7 +3297,7 @@ FRESULT f_truncate ( if (ncl == 0xFFFFFFFF) res = FR_DISK_ERR; if (ncl == 1) { - Report("f_truncate FR_INT_ERR",__FILE__,__LINE__,(int)ncl,RpWarning,(int)0,0); + safeReport("f_truncate FR_INT_ERR",__FILE__,__LINE__,(int)ncl,RpWarning,(int)0,0); res = FR_INT_ERR; } if (res == FR_OK && ncl < fp->fs->n_fatent) { @@ -3350,7 +3350,7 @@ FRESULT f_unlink ( dclst = ld_clust(dj.fs, dir); if (res == FR_OK && (dir[DIR_Attr] & AM_DIR)) { /* Is it a sub-dir? */ if (dclst < 2) { - Report("f_unlink FR_INT_ERR",__FILE__,__LINE__,(int)dclst,RpWarning,(int)0,0); + safeReport("f_unlink FR_INT_ERR",__FILE__,__LINE__,(int)dclst,RpWarning,(int)0,0); res = FR_INT_ERR; } else { mem_cpy(&sdj, &dj, sizeof (DIR)); /* Check if the sub-dir is empty or not */ diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC.c index 33f154492..1e989d4d1 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC.c @@ -118,15 +118,14 @@ RFID_RETURN_CODE RFID_Status = 0; uint8_t Connect_to_RFID_Reder(uint8_t readerID)//2 { RFID_RETURN_CODE RFIDRetValue; - bool isTagValid; uint8_t Status = OK; - - +/* + bool isTagValid; uint32_t newPwd; uint32_t newPACK; uint32_t counter; - int PwdRetVal; +*/ static uint32_t nop = 0; RFID_StartDiscovery(readerID); @@ -187,7 +186,7 @@ NFC_Tag NFC_Tag_U[Max_Readers];//read with updates RFID_RETURN_CODE TagWriteData(RFID_READER_ID readerID) { - uint8_t index = 0; + //uint8_t index = 0; uint32_t dummy = 0; uint32_t Tuint32 = 0; //uint16_t Tuint16 = 0; @@ -375,7 +374,7 @@ RFID_RETURN_CODE TagWriteData(RFID_READER_ID readerID) RFIDRetValue = WriteValue( readerID, &tagInfo, tagMemory, 31, Tuint32 ); - return SUCCESS; + return RFIDRetValue; } diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/logi-tag/LT_RFID.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/logi-tag/LT_RFID.c index 7035d172e..6d6425172 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/logi-tag/LT_RFID.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/logi-tag/LT_RFID.c @@ -1209,13 +1209,13 @@ uint32_t crc_ccitt_update(unsigned char * buf, int len) } -void RFID_Test() +RFID_RETURN_CODE RFID_Test() { uint8_t i, readerID = 1; NxpNci_RfIntf_t tagInfo; -uint8_t addressBlock = 0xE3; // NTAG216 - User memory blocks: 0x04-0xE1 = 222 blocks = 888 bytes -uint8_t tagId[]= {0}; +//uint8_t addressBlock = 0xE3; // NTAG216 - User memory blocks: 0x04-0xE1 = 222 blocks = 888 bytes +//uint8_t tagId[]= {0}; uint8_t Serial[] = {'1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G'}; uint8_t factoryID[] = { '1', '2', '3'}; uint16_t fillingSystem = 55; @@ -1250,12 +1250,12 @@ uint8_t uid[7] = {0}; uint8_t hashValue[16] = {0}; uint8_t newPACK[] = {0x11, 0x22}; uint8_t newPwd[] = {0xFF, 0xFF, 0xFF, 0xFF}; -uint8_t startingBlock = 0x04; +/*uint8_t startingBlock = 0x04; uint8_t pwdAddr = 0xE5; -uint8_t tagMemory[1024]; uint16_t succeededWriteSize = 0; uint16_t succeededReadSize = 0; -bool firstTime = true; +bool firstTime = true;*/ +uint8_t tagMemory[1024]; uint32_t dummy = 0; RFID_RETURN_CODE RFIDRetValue; @@ -1421,6 +1421,6 @@ while(1) } //---------------------------------------------------------------------------- - + return RFIDRetValue; } diff --git a/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/BTSR/BTSR.c b/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/BTSR/BTSR.c index 92337080d..0fe1ca152 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/BTSR/BTSR.c +++ b/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/BTSR/BTSR.c @@ -25,12 +25,9 @@ #include "driverlib/interrupt.h" #include "utils/uartstdio.h" #include "driverlib/uart.h" - -//#include <Drivers/I2C_Communication/WHS_Card/IO_Extender_Ports_TCA9555/WHS_IO.h> #include "Modules/Control/MillisecTask.h" #include <DataDef.h> #include <Drivers/I2C_Communication/I2C_Task.h> -//#include "Drivers/Uart_Comm/WHS_Controller_Comm/WHS_UART/WHS_Uart.h" #include "Drivers/FPGA/FPGA_Comm.h" #include "Drivers/Uart_Comm/BTSR/BTSR.h" @@ -41,6 +38,8 @@ uint8_t BTSR_RX_Buff[Max_BTSR_RX_Bytes]; uint16_t TX_Timeout = 0xFFFF;//6250 uint16_t RX_Timeout = 0xFFFF;//1 +BTSR_t BTSR[MaxUFeeders]; + typedef enum { BTSR_UART_CONFIG_PAR_1 = (UART_CONFIG_WLEN_8 |UART_CONFIG_STOP_ONE | UART_CONFIG_PAR_ONE), @@ -71,13 +70,10 @@ void U4RX() UARTIntEnable(UART4_BASE, UART_INT_TX); BTSR_RX_Buff[rxcounter] = ROM_UARTCharGetNonBlocking(UART4_BASE);//Receive data rxcounter++; - - } void uart4_intHandler() { - //static uint8_t nop = 0; //Get interrupt flags unsigned long status = UARTIntStatus(UART4_BASE, 1); @@ -137,7 +133,6 @@ void InitConsole_BTSR_UART4(int32_t ui32SysClock) SysCtlPeripheralEnable(SYSCTL_PERIPH_UART4); // // Enable GPIO port A which is used for UART4 pins. - // TODO: change this to whichever GPIO port you are using. // SysCtlPeripheralEnable(SYSCTL_PERIPH_GPIOA); @@ -366,6 +361,7 @@ uint8_t Check_Received_CheckSum(uint8_t CODE_STRING, uint8_t Function_Code, uint (Buf[size_include_Checksum - 1] != (Sum >> 8)) ) { Status = ERROR; + ReportWithPackageFilter(ThreadFilter,"BTSR Get Wrong Checksum",__FILE__,__LINE__,(int)CODE_STRING,RpError,(int)Function_Code,0); } } return Status; @@ -405,56 +401,6 @@ uint8_t BTSR_Send_Buf(uint8_t *Buf, uint8_t size) return TxResult; } - -/* -uint8_t BTSR_Send_Buf(uint8_t *Buf, uint8_t size) -{ - int TxResult = 0; - uint8_t i = 1;//change to ADD0 and send the rest of bytes (1..Size) - const uint8_t Save_Size = size; - - BTSR_Change_Comm_Mode(TX_FIRST_BYTE); - Task_sleep (eOneMillisecond); - TxResult |=ROM_UARTCharPutNonBlocking(UART4_BASE,Buf[0]); - - BTSR_Change_Comm_Mode(TX_NOT_FIRST_BYTE); - Task_sleep (eOneMillisecond); - - while(size) - { - if(size <= 16) //FIFO is working for data up to 16 bytes - { - for(; i < Save_Size; i++) - { - TxResult |=ROM_UARTCharPutNonBlocking(UART4_BASE,Buf[i]); - } - size = 0;// all sent - } - else - { - for(; i < 16; i++) - { - TxResult |=ROM_UARTCharPutNonBlocking(UART4_BASE,Buf[i]); - } - size -= 16; - } - - while(HWREG(UART4_BASE + UART_O_FR) & UART_FR_BUSY)//UARTFR - { - if(TX_Timeout) - { - TX_Timeout--; - } - else - return ERROR; - } - } - - UART4_RS485_Direction(RX); - - return TxResult; -} -*/ uint8_t BTSR_Send_Buf_3xADD1(uint8_t *Buf, uint8_t size)//Only for commands with 3 bytes with Address 1 (0x06/0xFD) { int TxResult = 0; @@ -630,90 +576,279 @@ uint8_t BTSR_Read_Status(uint8_t BTSR_Id, uint8_t Application, uint8_t Yarn_Type //---------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------- -//BTSR_ALARM_AND_ENABLING_STATUS_READ -typedef struct + + +typedef union { - bool D0 : 1;//0 - bool D1 : 1;//1 - bool D2 : 1;//2 - bool D3 : 1;//3 - bool D4 : 1;//4 - bool D5 : 1;//5 - bool D6 : 1;//6 - bool D7 : 1;//7 -}BITS; + struct + { + uint8_t CODE_STRING ; + uint8_t FUNCTION_STRING; + //DATA_STRING + uint16_t WORK_TENSION ;//1° - 2° + uint16_t OUTPUT_TENSION;//3° - 4° + uint16_t RELAX_YARN ;//5° - 6° + uint8_t INC_DEC_TENSION;//7° + uint8_t INC_DEC_STRETCH;//8° + uint16_t TENSION_ERROR ;//9° - 10° + uint16_t TIME_ALARM ;//11° - 12° + uint8_t RELAX_SPEED ;//13° + uint8_t APPLICATION ;//14° + uint8_t YARN_TYPE ;//15° + uint8_t SPARE[4] ;//16° + uint8_t ALARM_ENABLING ;//20° + uint8_t ABILITAZIONE ;//21° + + uint16_t CHECKSUM ; + }Byte; +uint8_t Buf[25]; +}BTSR_ADVANCED_STYLE_LOAD; + +BTSR_ADVANCED_STYLE_LOAD BTSR_AdvStyle_Load; typedef union { - BITS Bit[4]; - uint8_t Byte[4]; -}BTSR_ALARM_AND_ENABLING_STATUS_READ; + struct + { + uint8_t CODE_STRING ; + uint8_t FUNCTION_STRING ; + + //DATA_STRING + uint16_t OUTPUT_TENSION ; + uint16_t WORK_TENSION ; + uint16_t RELAX_YARN ; + uint8_t INC_DEC_TENSION ; + uint8_t INC_DEC_STRETCH ; + uint32_t METER_START ; + uint32_t INC_DEC_METER ; + uint32_t TARGET ; + uint16_t TENSION_ERROR ; + uint16_t ALARM_TIME ; + uint8_t SPARE1[2] ; + uint8_t ALARM_ENABLING ; + uint8_t TARGET_ENABLING ; + uint8_t RELAX_YARN_SPEED; + uint8_t SPARE2[6] ; + + uint16_t CHECKSUM ; + }Byte; +uint8_t Buf[39]; +}BTSR_ADVANCED_TENSION_PROGRAMMING; -BTSR_ALARM_AND_ENABLING_STATUS_READ BTSR_Status; +BTSR_ADVANCED_TENSION_PROGRAMMING BTSR_Adv_Tension_Prog; -void BTSR_Configuration_Set(uint8_t UFeeder_ID) +void BTSR_Configuration_Set(UFeeder_Index UFeeder_i)//15 { memset(BTSR_TX_Buff, 0, Max_BTSR_TX_Bytes); - BTSR_TX_Buff[0] = UFeeder_ID; + BTSR_TX_Buff[0] = BTSR[UFeeder_i].ID; BTSR_TX_Buff[1] = 0x36; - BTSR_TX_Buff[2] = 0x80;//CCW + BTSR_TX_Buff[2] = BTSR[UFeeder_i].DirectionCCW << 7; BTSR_TX_Buff[3] = 0x01;//YYT OFF, UNICO OFF - BTSR_TX_Buff[4] = 0x40;//FLIP DISPLAY + BTSR_TX_Buff[4] = BTSR[UFeeder_i].Flip_Display << 6; + BTSR_TX_Buff[5] = BTSR[UFeeder_i].Lock_Keyboard_Menue;// ‘1’ EDITOR LOCKED BTSR_Calculate_CheckSum(BTSR_TX_Buff,18); - BTSR_Send_Buf(Typology_Set.Buf, 20); + BTSR_Send_Buf(BTSR_TX_Buff, 20); + +} + +void BTSR_Advanced_Style_Load(UFeeder_Index UFeeder_i) +{ + //memset(BTSR_AdvStyle_Load.Buf, 0, Size); + /* + uint8_t Size = sizeof(BTSR_AdvStyle_Load.Buf); + + memset(BTSR_AdvStyle_Load.Buf, 0, Size); +/ + BTSR_AdvStyle_Load.Byte.CODE_STRING = UFeeder_ID; + BTSR_AdvStyle_Load.Byte.FUNCTION_STRING = 0x4B; + + BTSR_AdvStyle_Load.Byte.WORK_TENSION = Tension; + BTSR_AdvStyle_Load.Byte.TENSION_ERROR = Tension_Error; + BTSR_AdvStyle_Load.Byte.TIME_ALARM = Time_Alarm; + BTSR_AdvStyle_Load.Byte.APPLICATION = Application; + BTSR_AdvStyle_Load.Byte.YARN_TYPE = YarnType; + BTSR_AdvStyle_Load.Byte.ALARM_ENABLING = 0x03; // OUTPUT TENSION ENABLED + TENSION ERROR ENABLED +*/ + //BTSR_Calculate_CheckSum(BTSR_AdvStyle_Load.Buf,Size - 2); + + memset(BTSR_TX_Buff, 0, Max_BTSR_TX_Bytes); + + BTSR_TX_Buff[0] = BTSR[UFeeder_i].ID; + BTSR_TX_Buff[1] = 0x4B; + + BTSR_TX_Buff[2] = BTSR[UFeeder_i].Tension & 0XFF;//1 + BTSR_TX_Buff[3] = BTSR[UFeeder_i].Tension >> 8;//2 + + BTSR_TX_Buff[10] = BTSR[UFeeder_i].Tension_Err & 0XFF;//9 + BTSR_TX_Buff[11] = BTSR[UFeeder_i].Tension_Err >> 8;//10 + BTSR_TX_Buff[12] = BTSR[UFeeder_i].Alarm_Time & 0XFF;//11 + BTSR_TX_Buff[13] = BTSR[UFeeder_i].Alarm_Time >> 8;//12 + + + BTSR_TX_Buff[15] = BTSR[UFeeder_i].Application;//14 + BTSR_TX_Buff[16] = BTSR[UFeeder_i].Yarn_Type;//15 + + BTSR_Calculate_CheckSum(BTSR_TX_Buff,23); + + BTSR_Send_Buf(BTSR_TX_Buff,25); + +} + +void BTSR_Advanced_Tension_Prog(UFeeder_Index UFeeder_i ) +{ + + memset(BTSR_TX_Buff, 0, Max_BTSR_TX_Bytes); + + BTSR_TX_Buff[0] = BTSR[UFeeder_i].ID; + BTSR_TX_Buff[1] = 0x39; + + BTSR_TX_Buff[4] = BTSR[UFeeder_i].Tension & 0XFF;//3 + BTSR_TX_Buff[5] = BTSR[UFeeder_i].Tension >> 8;//4 + + BTSR_TX_Buff[22] = BTSR[UFeeder_i].Tension_Err & 0XFF;//21 + BTSR_TX_Buff[23] = BTSR[UFeeder_i].Tension_Err >> 8;//22 + + BTSR_TX_Buff[24] = BTSR[UFeeder_i].Alarm_Time & 0XFF;//23 + BTSR_TX_Buff[25] = BTSR[UFeeder_i].Alarm_Time >> 8;//24 + + BTSR_TX_Buff[28] = 0x01;//27 ‘1’ TENSION ERROR ENABLED + + BTSR_Calculate_CheckSum(BTSR_TX_Buff,37); + + BTSR_Send_Buf(BTSR_TX_Buff,39); +} + +void BTSR_Application_Yarn_Type_Set(UFeeder_Index UFeeder_i) +{ + //APPLICATION_AND_YARN_TYPOLOGY_SET_27 + memset(BTSR_TX_Buff, 0, Max_BTSR_TX_Bytes); + + BTSR_TX_Buff[0] = BTSR[UFeeder_i].ID; + BTSR_TX_Buff[1] = 0x3F; + BTSR_TX_Buff[2] = BTSR[UFeeder_i].Application; + BTSR_TX_Buff[3] = BTSR[UFeeder_i].Yarn_Type; + + BTSR_Calculate_CheckSum(BTSR_TX_Buff,4); + BTSR_Send_Buf(BTSR_TX_Buff, 6); } -void BTSR_Alarm_and_Enabling_Status_Read(uint8_t UFeeder_ID) + +void BTSR_Status_Reset(UFeeder_Index UFeeder_i)//35 { memset(BTSR_TX_Buff, 0, Max_BTSR_TX_Bytes); - BTSR_TX_Buff[0] = UFeeder_ID; + BTSR_TX_Buff[0] = BTSR[UFeeder_i].ID; + BTSR_TX_Buff[1] = 0x27; + + BTSR_TX_Buff[2] = 0x07;//RESET_0 + BTSR_TX_Buff[3] = 0x00;//RESET_1 + BTSR_TX_Buff[4] = 0x00;//SPARE + BTSR_TX_Buff[5] = 0x00;//SPARE + + BTSR_Calculate_CheckSum(BTSR_TX_Buff,6); + + BTSR_Send_Buf(BTSR_TX_Buff, 8); + +} + +void BTSR_Errors_Counter_Reset(UFeeder_Index UFeeder_i)//36 +{ + memset(BTSR_TX_Buff, 0, Max_BTSR_TX_Bytes); + + BTSR_TX_Buff[0] = BTSR[UFeeder_i].ID; + BTSR_TX_Buff[1] = 0x29; + BTSR_TX_Buff[2] = 0x00;//00 - RESETS ALL THE COUNTERS + + BTSR_Calculate_CheckSum(BTSR_TX_Buff,3); + + BTSR_Send_Buf(BTSR_TX_Buff, 5); + +} + +void BTSR_Meters_Total_Counter_Reset(UFeeder_Index UFeeder_i , uint8_t Resolution)//37/39/41 +{ + memset(BTSR_TX_Buff, 0, Max_BTSR_TX_Bytes); + + BTSR_TX_Buff[0] = BTSR[UFeeder_i].ID; + + if(Resolution == LOW) + BTSR_TX_Buff[1] = 0x06; + else + if(Resolution == HIGH) + BTSR_TX_Buff[1] = 0x1E; + else + if(Resolution == HIGHEST) + BTSR_TX_Buff[1] = 0x48; + + BTSR_Calculate_CheckSum(BTSR_TX_Buff,2); + + BTSR_Send_Buf(BTSR_TX_Buff, 4); +} + +void BTSR_Info_Read(UFeeder_Index UFeeder_i) +{ + memset(BTSR_TX_Buff, 0, Max_BTSR_TX_Bytes); + + BTSR_TX_Buff[0] = BTSR[UFeeder_i].ID; + BTSR_TX_Buff[1] = 0x3E; + + BTSR_Calculate_CheckSum(BTSR_TX_Buff,2); + + BTSR_Send_Buf(BTSR_TX_Buff, 4); + +} + +void BTSR_Meters_Total_Counter_Read(UFeeder_Index UFeeder_i , uint8_t Resolution)//37/39/41 +{ + memset(BTSR_TX_Buff, 0, Max_BTSR_TX_Bytes); + + BTSR_TX_Buff[0] = BTSR[UFeeder_i].ID; + + if(Resolution == LOW) + BTSR_TX_Buff[1] = 0x16; + else + if(Resolution == HIGH) + BTSR_TX_Buff[1] = 0x1D; + else + if(Resolution == HIGHEST) + BTSR_TX_Buff[1] = 0x47; + + BTSR_Calculate_CheckSum(BTSR_TX_Buff,2); + + BTSR_Send_Buf(BTSR_TX_Buff, 4); +} + +void BTSR_Alarm_and_Enabling_Status_Read(UFeeder_Index UFeeder_i)//30 +{ + memset(BTSR_TX_Buff, 0, Max_BTSR_TX_Bytes); + + BTSR_TX_Buff[0] = BTSR[UFeeder_i].ID; BTSR_TX_Buff[1] = 0x1C; BTSR_Calculate_CheckSum(BTSR_TX_Buff,2); - BTSR_Send_Buf(Typology_Set.Buf, 4); + BTSR_Send_Buf(BTSR_TX_Buff, 4); } -typedef enum + + +typedef union { - //BTSR_READ - DEVICE_INFORMATION_READ_10 , - ADVANCED_PROGRAMMING_READ_18 , - ADVANCED_TENSION_READ_23 , - APPLICATION_AND_YARN_TYPOLOGY_READ_28 , - ALARM_AND_ENABLING_STATUS_READ_30 , - PC_LINK_READ_32 , - METERS_TOTAL_COUNTER_READ_LOW_37 , - METERS_TOTAL_COUNTER_READ_HIGH_39 , - METER_TOTAL_COUNTER_READ_HIGHEST_41 , - MAX_BTSR_READ , + struct + { + uint32_t Uint32; + uint16_t CheckSum; + }Data; + uint8_t Buf[6]; +}BTSR_METERS; + +BTSR_METERS BTSR_Meters; - //BTSR_SET - //return 0xFA/0xFB/0xF9 - DEVICE_CALIBRATION_11 , - BAUDRATE_SET_13 , - DISPLAY_LANGUAGE_SET_14 , - CONFIGURATION_SET_15 , - ADVANCED_CONFIGURATION_SET_17 , - INPUT_CURRENT_CONTROL_SET_20 , - ADVANCED_TENSION_PROGRAMMING_21 , - ADVANCED_STYLE_LOAD_25 , - APPLICATION_AND_YARN_TYPOLOGY_SET_27 , - WORK_TENSION_AND_OPERATION_STATUS_SET_29 , - ALARM_STATUS_RESET_35 , - RESETS_ALL_THE_COUNTERS_36 , - //return device + Function code - METERS_TOTAL_COUNTER_RESET_LOW_38 , - METERS_TOTAL_COUNTER_RESET_HIGH_40 , - METERS_TOTAL_COUNTER_RESET_HIGHEST_42 , - MAX_BTSR_SET -}BTSR_CMD; #define Get_Set_resp 5 #define Set_Command 6 @@ -721,43 +856,61 @@ typedef enum #define Get_Read_resp 7 #define Read_Command 8 -BTSR_CMD BTSR_command_Stage[MAX_BTSR_SET]; - -uint8_t BTSR_State_Machine(uint8_t UFeeder_ID) +uint8_t BTSR_State_Machine(UFeeder_Index UFeeder_i) { uint8_t status = OK; - uint8_t i; + uint8_t i,j; + float temp = 0.0; + + //BTSR_Init(); for(i = DEVICE_CALIBRATION_11; i < MAX_BTSR_SET; i++) { - if(BTSR_command_Stage[i] == Get_Set_resp) + if(BTSR[UFeeder_i].Command[i] == Get_Set_resp) { - if((i >= DEVICE_CALIBRATION_11) && (i <= RESETS_ALL_THE_COUNTERS_36) /*&& (BTSR_RX_Buff[0] != BTSR_RISP_OK)*/) + if((i >= DEVICE_CALIBRATION_11) && (i <= RESETS_ALL_THE_COUNTERS_36) && (BTSR_RX_Buff[0] != BTSR_RISP_OK)) { status = ERROR; - BTSR_command_Stage[i] = BTSR_RX_Buff[0]; + BTSR[UFeeder_i].Command[i] = BTSR_RX_Buff[0]; //print response + command ID } - else if(((i == METERS_TOTAL_COUNTER_RESET_LOW_38) && (BTSR_RX_Buff[1] != 0x06)) || - ((i == METERS_TOTAL_COUNTER_RESET_HIGH_40) && (BTSR_RX_Buff[1] != 0x1E)) || - ((i == METERS_TOTAL_COUNTER_RESET_HIGHEST_42) && (BTSR_RX_Buff[1] != 0x48)) ) + else if( (i == METERS_TOTAL_COUNTER_RESET_38_40_42) && + ( ((BTSR[UFeeder_i].Length_Resolution == LOW) && (BTSR_RX_Buff[1] != 0x06)) || + ((BTSR[UFeeder_i].Length_Resolution == HIGH) && (BTSR_RX_Buff[1] != 0x1E)) || + ((BTSR[UFeeder_i].Length_Resolution == HIGHEST) && (BTSR_RX_Buff[1] != 0x48)) ) ) { status = ERROR; - BTSR_command_Stage[i] = BTSR_RX_Buff[1]; + BTSR[UFeeder_i].Command[i] = BTSR_RX_Buff[1]; //print response + command ID } - //print response + command ID - BTSR_command_Stage[i] = OK; + else//print response + command ID + BTSR[UFeeder_i].Command[i] = BTSR_RX_Buff[0];//OK; } - if(BTSR_command_Stage[i] == Set_Command) + if(BTSR[UFeeder_i].Command[i] == Set_Command) { - if(i == CONFIGURATION_SET_15) + switch(i) { - BTSR_Configuration_Set(UFeeder_ID); + case CONFIGURATION_SET_15: + BTSR_Configuration_Set(UFeeder_i); + break; + case ADVANCED_TENSION_PROGRAMMING_21: + BTSR_Advanced_Tension_Prog(UFeeder_i); + break; + case APPLICATION_AND_YARN_TYPOLOGY_SET_27: + BTSR_Application_Yarn_Type_Set(UFeeder_i); + break; + case ALARM_STATUS_RESET_35: + BTSR_Status_Reset(UFeeder_i); + break; + case RESETS_ALL_THE_COUNTERS_36: + BTSR_Errors_Counter_Reset(UFeeder_i); + break; + case METERS_TOTAL_COUNTER_RESET_38_40_42: + BTSR_Meters_Total_Counter_Reset(UFeeder_i, BTSR[UFeeder_i].Length_Resolution); + break; } - - BTSR_command_Stage[i] = Get_Set_resp; + BTSR[UFeeder_i].Command[i] = Get_Set_resp; return status;//Only one command in cycle } } @@ -765,25 +918,60 @@ uint8_t BTSR_State_Machine(uint8_t UFeeder_ID) for(i = DEVICE_INFORMATION_READ_10; i < MAX_BTSR_READ; i++) { - if(BTSR_command_Stage[i] == Get_Read_resp) + if(BTSR[UFeeder_i].Command[i] == Get_Read_resp) { // Add CRC check if(i == ALARM_AND_ENABLING_STATUS_READ_30) { - for(i = 0; i < 4; i++) - BTSR_Status.Byte[i] = BTSR_RX_Buff[i]; + for(j = 0; j < 6; j++) + BTSR[UFeeder_i].Status.Byte[j] = BTSR_RX_Buff[j]; + } + else + if(i == DEVICE_INFORMATION_READ_10) + { + for(j = 0; j < 12; j++) + BTSR[UFeeder_i].Info.Buf[j] = BTSR_RX_Buff[j]; + status |= Check_Received_CheckSum(BTSR[UFeeder_i].ID, 0x3E, BTSR[UFeeder_i].Info.Buf, 12); + ReportWithPackageFilter(ThreadFilter,"BTSR VERSION",__FILE__,UFeeder_i,(BTSR[UFeeder_i].Info.Byte.BOARD_HW_VERSION << 8) | BTSR[UFeeder_i].Info.Byte.BOOTLOADER_SW_VERSION,RpMessage,(BTSR[UFeeder_i].Info.Byte.SW_VERSION << 8) | BTSR[UFeeder_i].Info.Byte.SW_UNDER_VERSION,0); + } + else + if(METER_TOTAL_COUNTER_READ_37_39_41) + { + for(j = 0; j < 6; j++) + BTSR_Meters.Buf[j] = BTSR_RX_Buff[j]; + status |= Check_Received_CheckSum(BTSR[UFeeder_i].ID, 0x16, BTSR_Meters.Buf, 6); + + temp = (float)(BTSR_Meters.Data.Uint32) * PI * BTSR[UFeeder_i].Radius_Meter; + if(BTSR[UFeeder_i].Length_Resolution == HIGH) + temp /=12.0; + else + if(BTSR[UFeeder_i].Length_Resolution == HIGHEST) + temp /=750.0; + + BTSR[UFeeder_i].LengthInMeter = temp; } - BTSR_command_Stage[i] = 0; + + memset(BTSR_RX_Buff, 0, Max_BTSR_RX_Bytes); + BTSR[UFeeder_i].Command[i] = BTSR_RISP_OK; } + //else//? - if(BTSR_command_Stage[i] == Read_Command) + if(BTSR[UFeeder_i].Command[i] == Read_Command) { - - if(i == ALARM_AND_ENABLING_STATUS_READ_30) + switch(i) { - BTSR_Alarm_and_Enabling_Status_Read(UFeeder_ID); + case ALARM_AND_ENABLING_STATUS_READ_30: + BTSR_Alarm_and_Enabling_Status_Read(UFeeder_i); + break; + case DEVICE_INFORMATION_READ_10: + BTSR_Info_Read(UFeeder_i); + break; + case METER_TOTAL_COUNTER_READ_37_39_41: + BTSR_Meters_Total_Counter_Read(UFeeder_i, BTSR[UFeeder_i].Length_Resolution); + break; } - BTSR_command_Stage[i] = Get_Read_resp; + + BTSR[UFeeder_i].Command[i] = Get_Read_resp; return status;//Only one command in cycle } } @@ -791,3 +979,79 @@ uint8_t BTSR_State_Machine(uint8_t UFeeder_ID) return status; } +void BTSR_Read_Errors_Status(UFeeder_Index UFeeder_i)//Every 1 second. 3 seconds debouce for on/off +{ + BTSR[UFeeder_i].Command[ALARM_AND_ENABLING_STATUS_READ_30] = Read_Command; +} + +void BTSR_Read_Length(UFeeder_Index UFeeder_i, uint8_t Length_Resolution)//Every 100msec during thread movement +{ + BTSR[UFeeder_i].Length_Resolution = Length_Resolution; + + BTSR[UFeeder_i].Command[METER_TOTAL_COUNTER_READ_37_39_41] = Set_Command; +} + +void BTSR_Reset_Length(UFeeder_Index UFeeder_i, uint8_t Length_Resolution)//before job +{ + BTSR[UFeeder_i].Length_Resolution = Length_Resolution; + + BTSR[UFeeder_i].Command[METERS_TOTAL_COUNTER_RESET_38_40_42] = Set_Command; +} + +void BTSR_Reset_Status(UFeeder_Index UFeeder_i)// +{ + + BTSR[UFeeder_i].Command[ALARM_STATUS_RESET_35] = Set_Command; +} + +void BTSR_Reset_Counters(UFeeder_Index UFeeder_i)// +{ + + BTSR[UFeeder_i].Command[RESETS_ALL_THE_COUNTERS_36] = Set_Command; +} + +void BTSR_RML_Settings(UFeeder_Index UFeeder_i, BTSR_APPLICATION Application, BTSR_YARN_TYPE Yarn_Type, uint16_t Tension, uint16_t Tension_Err, uint16_t Alarm_Time ) +{ + BTSR[UFeeder_i].Application = Application; + BTSR[UFeeder_i].Yarn_Type = Yarn_Type; + BTSR[UFeeder_i].Tension = Tension; + BTSR[UFeeder_i].Tension_Err = Tension_Err; + BTSR[UFeeder_i].Alarm_Time = Alarm_Time; + + BTSR[UFeeder_i].Command[ADVANCED_TENSION_PROGRAMMING_21] = Set_Command; + BTSR[UFeeder_i].Command[APPLICATION_AND_YARN_TYPOLOGY_SET_27] = Set_Command; +} + + + +void BTSR_Init() +{ + UFeeder_Index i = RUFeeder1; + + for(i = RUFeeder1; i < MaxUFeeders; i++) + { + BTSR[i].ID = 0x01 + i; + BTSR[i].Flip_Display = true; + BTSR[i].DirectionCCW = true; + BTSR[i].Radius_Meter = BTSR_ROLLER_RADIUS; + BTSR[i].Lock_Keyboard_Menue = false; + + BTSR[i].Command[CONFIGURATION_SET_15] = Set_Command; + BTSR[i].Command[DEVICE_INFORMATION_READ_10] = Read_Command; + + BTSR_Reset_Status(i); + BTSR_Reset_Counters(i); + BTSR_Reset_Length(i,LOW); + BTSR_Reset_Length(i,HIGH); + BTSR_Reset_Length(i,HIGHEST); + } + //Only for testing ------------------------------------------------------------------------------- +// BTSR_RML_Settings(RUFeeder1, SHOES, ALL_YARNS3, 1000, 10, 5);//Test!!! --- need to move to RML +// BTSR_Reset_Counters(RUFeeder1); +// BTSR_Reset_Status(RUFeeder1); +// BTSR_Reset_Length(RUFeeder1, HIGHEST); +// BTSR_Read_Length(RUFeeder1, HIGHEST); +// BTSR_Read_Errors_Status(RUFeeder1); + //------------------------------------------------------------------------------------------------ +} + diff --git a/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/BTSR/BTSR.h b/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/BTSR/BTSR.h index 14fda8f19..db8f2879b 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/BTSR/BTSR.h +++ b/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/BTSR/BTSR.h @@ -11,6 +11,9 @@ #define Max_BTSR_RX_Bytes 55 #define Max_BTSR_TX_Bytes 40 +#define BTSR_ROLLER_RADIUS 0.021//meter + + typedef enum { SOCKS = 1 , @@ -48,12 +51,117 @@ typedef enum BTSR_RISP_OUT_OF_RANFE = 0xF9, }BTSR_RISP_BYTE; +typedef enum +{ + //BTSR_READ (Read - The highest priority first) + METER_TOTAL_COUNTER_READ_37_39_41 ,//0 + ALARM_AND_ENABLING_STATUS_READ_30 ,//1 + PC_LINK_READ_32 ,//2 + ADVANCED_TENSION_READ_23 ,//3 + ADVANCED_PROGRAMMING_READ_18 ,//4 + APPLICATION_AND_YARN_TYPOLOGY_READ_28 ,//5 + DEVICE_INFORMATION_READ_10 ,//6 + + MAX_BTSR_READ ,//7 + + //BTSR_SET (Set - The highest priority first) + //Return 0xFA/0xFB/0xF9: + BAUDRATE_SET_13 ,//8 + DISPLAY_LANGUAGE_SET_14 ,//9 + DEVICE_CALIBRATION_11 ,//10 + CONFIGURATION_SET_15 ,//11 + ADVANCED_CONFIGURATION_SET_17 ,//12 + //return device + Function code: + METERS_TOTAL_COUNTER_RESET_38_40_42 ,//13 + //Return 0xFA/0xFB/0xF9: + RESETS_ALL_THE_COUNTERS_36 ,//14 + ALARM_STATUS_RESET_35 ,//15 + WORK_TENSION_AND_OPERATION_STATUS_SET_29 ,//16 + ADVANCED_TENSION_PROGRAMMING_21 ,//17 + ADVANCED_STYLE_LOAD_25 ,//18 + APPLICATION_AND_YARN_TYPOLOGY_SET_27 ,//19 + INPUT_CURRENT_CONTROL_SET_20 ,//20 + + MAX_BTSR_SET //21 +}BTSR_CMD; + +typedef enum +{ + RUFeeder1 = 0, + //RUFeeder2 = 1, + //RUFeeder3 = 2, + //RUFeeder4 = 3, + + MaxUFeeders, +}UFeeder_Index; + +//BTSR_ALARM_AND_ENABLING_STATUS_READ +typedef struct +{ + bool D0 : 1;//0 + bool D1 : 1;//1 + bool D2 : 1;//2 + bool D3 : 1;//3 + bool D4 : 1;//4 + bool D5 : 1;//5 + bool D6 : 1;//6 + bool D7 : 1;//7 +}BITS; + + +typedef union +{ + BITS Bit[6]; + uint8_t Byte[6]; +}BTSR_ALARM_AND_ENABLING_STATUS_READ; + +typedef union +{ + struct + { + uint8_t SW_VERSION;//0XDE + uint8_t SW_UNDER_VERSION;//0X01 + uint8_t BYTE_U0X55;//0X55 + uint8_t BYTE_F0X46;//0X46 + uint8_t PRODUCT_CODE;//0X13 + uint8_t TENSION_SENSOR_END_SCALE;//0X65 + uint8_t BOARD_HW_VERSION;//0X02 + uint8_t BOOTLOADER_SW_VERSION;//0X0A + uint8_t BYTE_0X32;//0X32 + uint8_t SPARE;//0X00 + uint8_t CHECKSUM_LSB;//0X60 + uint8_t CHECKSUM_MSB;//0X01 + }Byte; +uint8_t Buf[12]; +}BTSR_DEVICE_INFORMATION_READ; + +typedef struct +{ + uint8_t ID; + bool DirectionCCW; + bool Flip_Display; + bool Lock_Keyboard_Menue; + float Radius_Meter; + uint8_t Command[MAX_BTSR_SET]; + uint8_t Application; + uint8_t Yarn_Type; + uint16_t Tension; + uint16_t Tension_Err; + uint16_t Alarm_Time; + uint8_t Length_Resolution; + + float LengthInMeter; + BTSR_ALARM_AND_ENABLING_STATUS_READ Status; + BTSR_DEVICE_INFORMATION_READ Info; + +}BTSR_t; + extern uint8_t BTSR_RX_Buff[Max_BTSR_RX_Bytes]; unsigned long UARTStatus(); bool BTSR_Change_Comm_Mode(uint8_t Mode); -uint8_t BTSR_Auto_Identify(uint8_t BTSR_Id);//AUTOMATIC IDENTIFICATION PROCEDURE (IDENTIFY) -uint8_t BTSR_Set_Parmeters(uint8_t BTSR_Id, uint8_t Application, uint8_t Yarn_Type ); +uint8_t BTSR_Auto_Identify(uint8_t BTSR_ID);//AUTOMATIC IDENTIFICATION PROCEDURE (IDENTIFY) +uint8_t BTSR_Set_Parmeters(uint8_t BTSR_ID, uint8_t Application, uint8_t Yarn_Type ); uint8_t BTSR_Send_Buf(uint8_t *Buf, uint8_t size); uint8_t BTSR_RECEIVE_Buf(uint8_t *Buf, uint8_t size); @@ -62,4 +170,14 @@ uint8_t Check_Received_CheckSum(uint8_t CODE_STRING, uint8_t Function_Code, uint uint8_t BTSR_Send_Buf_3xADD1(uint8_t *Buf, uint8_t size);//Only for commands with 3 bytes with Address 1 (0x06/0xFD) void InitConsole_BTSR_UART4(int32_t ui32SysClock); +uint8_t BTSR_State_Machine(UFeeder_Index UFeeder_i); + +void BTSR_Init(); +void BTSR_RML_Settings(UFeeder_Index UFeeder_i, BTSR_APPLICATION Application, BTSR_YARN_TYPE Yarn_Type, uint16_t Tension, uint16_t Tension_Err, uint16_t Alarm_Time ); +void BTSR_Reset_Counters(UFeeder_Index UFeeder_i);//After errors +void BTSR_Reset_Status(UFeeder_Index UFeeder_i);//After errors +void BTSR_Reset_Length(UFeeder_Index UFeeder_i, uint8_t Length_Resolution);//Before job +void BTSR_Read_Length(UFeeder_Index UFeeder_i, uint8_t Length_Resolution);//Every 100msec during thread movement +void BTSR_Read_Errors_Status(UFeeder_Index UFeeder_i);//Every 1 second. 3 seconds debouce for on/off + #endif /* DRIVERS_UART_COMM_BTSR_BTSR_H_ */ diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c index 10f65db1d..c757c3a3b 100644 --- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c +++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c @@ -132,18 +132,16 @@ uint32_t ReadAppAndProgram(uint32_t ui32FlashStart,uint32_t ui32FileSize,void* b return(1); } int base_flashErased = false; -uint32_t EraseFlashSection(uint32_t ui32FlashStart) +uint32_t EraseFlashSection(void) { - volatile uint32_t ui32Idx = ui32FlashStart; + volatile uint32_t ui32Idx = FLASH_RAM_BASE; uint32_t status; - if (ui32FlashStart<GENHWCFG_SECTION_FLASH) - { - if (base_flashErased == true) - return ERROR; - else - base_flashErased = true; //once in a run - } + if (base_flashErased == true) + return WARNING; + else + base_flashErased = true; //once in a run + #ifdef FLASH_DEBUG Address[RxIndex] = ui32FlashStart; Size[RxIndex] = ui32FileSize; @@ -152,9 +150,27 @@ uint32_t EraseFlashSection(uint32_t ui32FlashStart) RxIndex = 0; #endif status = FlashErase(ui32Idx); + //FlashErase returns 0 or -1 return status; } +/*void FlashTest(void) +{ + int i; + uint32_t stack[0x200]; + uint32_t offset = 0; + + for (i = 0; i < 0x200; i++) + stack[i] = i; + + while (offset < FLASH_SIZE) + { + ReadAppAndProgram(FLASH_RAM_BASE+offset,0x200,stack); + offset+=0x200; + } + EraseFlashSection(); + +}*/ //Each word may not be subject to more than a specific number of programming cycles before an //erase cycle is required. In other words, for any given word, FlashProgram can only be called //twice before FlashErase is called. diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h index 7da9f92a7..ab2c87acc 100644 --- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h +++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h @@ -8,23 +8,23 @@ #ifndef DRIVERS_FLASH_RAM_FLASHPROGRAM_H_ #define DRIVERS_FLASH_RAM_FLASHPROGRAM_H_ -#define FLASH_RAM_BASE 0x000F8000 +#define FLASH_RAM_BASE 0x000FC000 -#define EMBEDDED_PARAMETERS_SECTION_FLASH (FLASH_RAM_BASE + 0X0000 ) //512 -#define PROCESS_PARAMETERS_SECTION_FLASH (FLASH_RAM_BASE + 0X0000 )//512 -#define DANCERS_SECTION_FLASH (FLASH_RAM_BASE + 0X0000) -#define DISPENSERS_SECTION_FLASH (FLASH_RAM_BASE + 0X0000) -#define GENHWCFG_SECTION_FLASH (FLASH_RAM_BASE + 0X2000) -#define ALARM_SECTION_FLASH (FLASH_RAM_BASE + 0X4000 ) +//#define EMBEDDED_PARAMETERS_SECTION_FLASH (FLASH_RAM_BASE + 0X0000 ) //512 +//#define PROCESS_PARAMETERS_SECTION_FLASH (FLASH_RAM_BASE + 0X0000 )//512 +//#define DANCERS_SECTION_FLASH (FLASH_RAM_BASE + 0X0000) +//#define DISPENSERS_SECTION_FLASH (FLASH_RAM_BASE + 0X0000) +//#define GENHWCFG_SECTION_FLASH (FLASH_RAM_BASE + 0X0000) +//#define ALARM_SECTION_FLASH (FLASH_RAM_BASE + 0X0000 ) +//#define PROCESS_PARAMETERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X0200 ) +//#define DANCERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X0400) +//#define DISPENSERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X500) +//#define GENHWCFG_MAP_IN_FLASH (FLASH_RAM_BASE + 0x0300) #define EMBEDDED_PARAMETERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X0000 ) -#define PROCESS_PARAMETERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X0200 ) -#define DANCERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X0400) -#define DISPENSERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X500) -#define GENHWCFG_MAP_IN_FLASH (FLASH_RAM_BASE + 0X2000) -#define ALARM_MAP_IN_FLASH (FLASH_RAM_BASE + 0X4000 ) +#define ALARM_MAP_IN_FLASH (FLASH_RAM_BASE + 0X0300) -#define FLASH_SIZE 0X8000 +#define FLASH_SIZE 0X4000 extern int base_flashErased; @@ -38,7 +38,7 @@ extern int base_flashErased; //***************************************************************************** uint32_t ReadAppAndProgram(uint32_t ui32FlashStart,uint32_t ui32FileSize,void* buffer); void FlashInit(void); -uint32_t EraseFlashSection(uint32_t ui32FlashStart); +uint32_t EraseFlashSection(void); diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c b/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c index e9d5cfc07..71d26888d 100644 --- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c +++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c @@ -60,6 +60,42 @@ uint32_t MCU_E2PromRead(int Address,uint32_t *Data) return OK; } +/**************************************************/ +uint32_t MCU_E2PromProgramChunk(int Address,uint16_t Length,uint32_t Data) +{ + uint32_t Buffer = Data; +#ifdef EVALUATION_BOARD + return 0; +#else + Report("MCU_E2PromProgramChunk",__FILE__,Length,Address,RpWarning,Data,0); + return (EEPROMProgram((uint32_t *)Buffer, Address, Length)); +#endif +} +uint32_t MCU_E2PromReadChunk(int Address,uint16_t Length,uint32_t *Data) +{ +#ifndef EVALUATION_BOARD + EEPROMRead((uint32_t *)Data,Address, Length); +#endif + Report("MCU_E2PromReadChunk",__FILE__,Length,Address,RpWarning,*Data,0); + + return OK; + +} +void MCU_E2PromUpdateResetReason(int i) +{ + uint32_t Head; + uint32_t RESC = SysCtlResetCauseGet(); + + EEPROMRead(&Head,EEPROM_RESET_REASON_HEAD_ADDRESS, 4); + if (Head>=EEPROM_RESET_REASON_MAX_DATA) Head=0; + Head++; + RESC+=(i*0x1000); + EEPROMProgram(&Head, EEPROM_RESET_REASON_HEAD_ADDRESS, 4); + EEPROMProgram(&RESC, (EEPROM_RESET_REASON_HEAD_ADDRESS+(Head*4)), 4); + +} + +/*************************************************/ void MCU_E2PromProgramMidTank(int midtankId,float a,float b) { float A,B; diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.h b/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.h index 12598ed07..aee812973 100644 --- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.h +++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.h @@ -38,7 +38,7 @@ typedef enum { EEPROM_ALARM_SUPPORT, EEPROM_ORIFICE1_ZERO_VALUE, EEPROM_ORIFICE3_ZERO_VALUE, - EEPROM_WASTE_TANK_ZERO_VALUE, + EEPROM_LOCAL_TIME, EEPROM_PULLER_TENSION_POSITION, EEPROM_WINDER_TENSION_POSITION, EEPROM_INIT_FAILURE_COUNTER, @@ -61,6 +61,18 @@ typedef enum { ORIFICE3_ZERO_VALUE_ADDR, }EEPROM_ADDRESSES;*/ +#define EEPROM_RESET_REASON_HEAD_ADDRESS 160 +#define EEPROM_RESET_REASON_MAX_DATA 80 + +#define DISPENSERS_MAP_IN_EEPROM 0x200 +#define PROCESS_PARAMATERS_IN_EEPROM 0x400 + +uint32_t MCU_E2PromProgramChunk(int Address,uint16_t Length,uint32_t Data); +uint32_t MCU_E2PromReadChunk(int Address,uint16_t Length,uint32_t *Data); + +void MCU_E2PromUpdateResetReason(int i); + + uint32_t MCU_E2PromProgram(int Address,uint32_t Data); uint32_t MCU_E2PromRead(int Address,uint32_t *Data); void MCU_E2PromProgramMidTank(int midtankId,float a,float b); |