diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-08-26 11:04:13 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-08-26 11:04:13 +0300 |
| commit | ce95311e3ca782c405591d12da7cf4366c8dcfb2 (patch) | |
| tree | fecccbd960dacbca0384c830956aad3c8c17f320 /Software/Embedded_SW | |
| parent | 089997906dccbde0028b7fc81088739ca8c6d25e (diff) | |
| download | Tango-ce95311e3ca782c405591d12da7cf4366c8dcfb2.tar.gz Tango-ce95311e3ca782c405591d12da7cf4366c8dcfb2.zip | |
Add support of WHS fan controller with slave address 0x5E .
Add option to read 2 more dancers for 4 winders demo
Diffstat (limited to 'Software/Embedded_SW')
20 files changed, 205 insertions, 128 deletions
diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h index 2b104a521..cf917c846 100644 --- a/Software/Embedded_SW/Embedded/DataDef.h +++ b/Software/Embedded_SW/Embedded/DataDef.h @@ -23,7 +23,9 @@ #define WATCHDOG //#define DISPESER_TEST //#define FPGA_WATCHDOG_DISABLE + //#define FOUR_WINDERS + //#define USE_POWERSTEP01 -NA //#define EMC_FORCE_MOT_CLOCK_INTERNAL diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SSI_Comm.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SSI_Comm.c index 96598ef31..782949fd0 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SSI_Comm.c +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SSI_Comm.c @@ -14,6 +14,8 @@ #include "PMR/Hardware/HardwareDancerType.pb-c.h" +static short DummyBusy = 0; + static FpgaDancerMap_t FpgaRotEncMap[NUM_OF_ROTENC] = { @@ -22,10 +24,19 @@ static FpgaDancerMap_t FpgaRotEncMap[NUM_OF_ROTENC] = {&F1_RDANCER_ROTENC_DATA_p_TX , &F1_RDANCER_ROTENC_DATA_p_RX_msb , &F1_RDANCER_ROTENC_DATA_p_RX_lsb ,&F1_SPI_Busy1_D}, // {&F1_LSPARE_ROTENC_DATA_p_TX , &F1_LSPARE_ROTENC_DATA_p_RX_msb , &F1_LSPARE_ROTENC_DATA_p_RX_lsb ,&F1_SPI_Busy1_D},//Dryer_ENC // {&F1_RSPARE_ROTENC_DATA_p_TX , &F1_RSPARE_ROTENC_DATA_p_RX_msb , &F1_RSPARE_ROTENC_DATA_p_RX_lsb ,&F1_SPI_Busy1_D}, +#ifdef FOUR_WINDERS + {&F2_DISPENSER_ROTENC_DATA_p_6_TX , &F2_DISPENSER_ROTENC_DATA_p_6_RX_msb , &F2_DISPENSER_ROTENC_DATA_p_6_RX_lsb ,&DummyBusy},//We don't have Busy bit in FPGA & It is not in use + {&F3_SPARE2_ROTENC_DATA_p_2_TX , &F3_SPARE2_ROTENC_DATA_p_2_RX_msb , &F3_SPARE2_ROTENC_DATA_p_2_RX_lsb ,&DummyBusy},//We don't have Busy bit in FPGA & It is not in use +#endif + }; +#ifdef FOUR_WINDERS +uint8_t FPGA_SSI_Transmit(Dancers_4_Winders _RotEncId) +#else uint8_t FPGA_SSI_Transmit(HardwareDancerType _RotEncId) +#endif { //if(*FpgaRotEncMap[_RotEncId].SSI_Busy == NOTBUSY) { @@ -36,7 +47,11 @@ uint8_t FPGA_SSI_Transmit(HardwareDancerType _RotEncId) return OK; } +#ifdef FOUR_WINDERS +uint8_t FPGA_SSI_Receive(Dancers_4_Winders _RotEncId) +#else uint8_t FPGA_SSI_Receive(HardwareDancerType _RotEncId) +#endif { INT2SHORT Int2Short; unsigned int temp; diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SSI_Comm.h b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SSI_Comm.h index cec4c4de3..d51576778 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SSI_Comm.h +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SSI_Comm.h @@ -51,9 +51,16 @@ typedef struct } FpgaDancerMap_t; + + +#ifdef FOUR_WINDERS +uint8_t FPGA_SSI_Transmit(Dancers_4_Winders _RotEncId); +uint8_t FPGA_SSI_Receive(Dancers_4_Winders _RotEncId); +#else uint8_t FPGA_SSI_Transmit(HardwareDancerType _RotEncId); uint8_t FPGA_SSI_Receive(HardwareDancerType _RotEncId); +#endif uint8_t FPGA_SSI_Speed_Sensor_Transnit(); diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.c index 7c854fe8b..6cb64262c 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.c @@ -12,7 +12,7 @@ #include <Drivers/I2C_Communication/WHS_Card/IO_Extender_Ports_TCA9555/WHS_IO.h> #include <Drivers/I2C_Communication/I2C_Task.h> -FAN_DRIVER_INFO Fan_Driver_Info[maxFAN-1]; +FAN_DRIVER_INFO Fan_Driver_Info[maxFAN]; #define NUM_OF_FAN_DRIVER 3 @@ -24,6 +24,8 @@ uint8_t Fan_Mux_Channel = UNKNOWN; bool Select_WHS_Fan_Mux_Channel(WHS_fan_num fan_number); uint8_t Select_Fan_Driver(WHS_fan_num fan_number); +uint8_t I2CFanViaSwitch_ADD_Buf[maxFAN] = {UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN}; + uint8_t SmallFansCfg = 200; uint8_t LargeFansCfg = 200; /* @@ -60,8 +62,8 @@ uint8_t Select_Fan_Driver(WHS_fan_num fan_number) case FAN6: fan_driver = 2; break; - //default: - + default: + break; } return fan_driver; } @@ -113,8 +115,8 @@ bool WHS_set_fan_speed(WHS_fan_num fan_number, uint8_t fan_speed) fan_driver = Select_Fan_Driver(fan_number); status = Select_Main_WHS_Mux_Channel(); Select_WHS_Fan_Mux_Channel(fan_number); - status |= D_Fan_Setting(I2C_ID_WHS_CARD ,I2CFanViaSwitch_ADDRESS, !(fan_number & 0x01), fan_speed); - D_EMC2302_Write[fan_driver].Reg.Fan_Setting[!(fan_number & 0x01)] = fan_speed; + status |= D_Fan_Setting(I2C_ID_WHS_CARD ,I2CFanViaSwitch_ADD_Buf[fan_number], (fan_number & 0x01), fan_speed); + D_EMC2302_Write[fan_driver].Reg.Fan_Setting[(fan_number & 0x01)] = fan_speed; return status; } @@ -128,8 +130,8 @@ bool WHS_Read_fan_tach(WHS_fan_num fan_number) status = Select_Main_WHS_Mux_Channel(); Select_WHS_Fan_Mux_Channel(fan_number); - status |= D_Fan_Read_Tacho_HIGH(I2C_ID_WHS_CARD ,I2CFanViaSwitch_ADDRESS, !(fan_number & 0x01), &(D_EMC2302_Read[fan_driver].Reg.TACHReading_High[!(fan_number & 0x01)])); - status |= D_Fan_Read_Tacho_LOW (I2C_ID_WHS_CARD ,I2CFanViaSwitch_ADDRESS, !(fan_number & 0x01), &(D_EMC2302_Read[fan_driver].Reg.TACHReading_Low [!(fan_number & 0x01)])); + status |= D_Fan_Read_Tacho_HIGH(I2C_ID_WHS_CARD ,I2CFanViaSwitch_ADD_Buf[fan_number], (fan_number & 0x01), &(D_EMC2302_Read[fan_driver].Reg.TACHReading_High[(fan_number & 0x01)])); + status |= D_Fan_Read_Tacho_LOW (I2C_ID_WHS_CARD ,I2CFanViaSwitch_ADD_Buf[fan_number], (fan_number & 0x01), &(D_EMC2302_Read[fan_driver].Reg.TACHReading_Low [(fan_number & 0x01)])); return status; } @@ -140,8 +142,8 @@ uint16_t WHS_Get_fan_tach(WHS_fan_num fan_number) uint8_t fan_driver = 0; fan_driver = Select_Fan_Driver(fan_number); - tach = D_EMC2302_Read[fan_driver].Reg.TACHReading_High[!(fan_number & 0x01)]; - tach = ((tach << 8) | D_EMC2302_Read[fan_driver].Reg.TACHReading_Low[!(fan_number & 0x01)]); + tach = D_EMC2302_Read[fan_driver].Reg.TACHReading_High[(fan_number & 0x01)]; + tach = ((tach << 8) | D_EMC2302_Read[fan_driver].Reg.TACHReading_Low[(fan_number & 0x01)]); return tach; } @@ -170,22 +172,23 @@ bool WHS_Get_fan_ALERT(WHS_fan_num fan_number, bool *fan_alert) switch (fan_number) { - case 0: - fan_number_bit = FAN_BREAK; - break; - case 1: - case 2: +// case noFAN: +// fan_number_bit = FAN_BREAK; +// break; + case FAN1: + case FAN2: fan_number_bit = FAN_ALERT_12; break; - case 3: - case 4: + case FAN3: + case FAN4: fan_number_bit = FAN_ALERT_34; break; - case 5: - case 6: + case FAN5: + case FAN6: fan_number_bit = FAN_ALERT_56; break; default : + fan_number_bit = FAN_BREAK; status = ERROR; return status; } @@ -193,6 +196,38 @@ bool WHS_Get_fan_ALERT(WHS_fan_num fan_number, bool *fan_alert) return status; } +bool Fan_Status[] = {OK,OK,OK,OK,OK,OK}; + +uint8_t WHS_Check_Fan_Controller_Type(WHS_fan_num fan_number) +{ + uint8_t status = ERROR; + + if ( (I2CFanViaSwitch_ADD_Buf[fan_number] == UNKNOWN) && (( fan_number == FAN1) || ( fan_number == FAN3) || ( fan_number == FAN5))) + { + + I2CFanViaSwitch_ADD_Buf[fan_number] = 0x5C; + status = D_fan_productID (I2C_ID_WHS_CARD, I2CFanViaSwitch_ADD_Buf[fan_number], &(Fan_Driver_Info[fan_number].Product_ID) ); + + if((Fan_Driver_Info[fan_number].Product_ID != 0x36) || (status != OK)) + { + I2CFanViaSwitch_ADD_Buf[fan_number] = 0x5E; + status = D_fan_productID (I2C_ID_WHS_CARD, I2CFanViaSwitch_ADD_Buf[fan_number], &(Fan_Driver_Info[fan_number].Product_ID) ); + } + + if((Fan_Driver_Info[fan_number].Product_ID != 0x36) || (status != OK)) + { + I2CFanViaSwitch_ADD_Buf[fan_number] = 0x00; + ReportWithPackageFilter(WasteFilter,"unable to recognize the an controller", __FILE__,__LINE__, status, RpMessage, fan_number, 0); + status = ERROR; + } + + I2CFanViaSwitch_ADD_Buf[fan_number + 1] = I2CFanViaSwitch_ADD_Buf[fan_number]; + Fan_Driver_Info[fan_number + 1].Product_ID = Fan_Driver_Info[fan_number].Product_ID; + + } + return status; +} + bool init_WHS_fan() { @@ -246,11 +281,17 @@ bool init_WHS_fan() update = 0; } + + for (fan_number = FAN1 ; fan_number < maxFAN; fan_number++) { Select_WHS_Fan_Mux_Channel(fan_number); - status |= D_Fan_PWM_Output_Config(I2C_ID_WHS_CARD ,I2CFanViaSwitch_ADDRESS, !(fan_number & 0x01), PUSH_PULL ); - status |= D_Fan_Setting(I2C_ID_WHS_CARD ,I2CFanViaSwitch_ADDRESS, !(fan_number & 0x01), DEFAULT_FAN_SPEED);//FAN_SPEED_OFF + + Fan_Status[fan_number] = WHS_Check_Fan_Controller_Type(fan_number); + status |= Fan_Status[fan_number]; + + status |= D_Fan_PWM_Output_Config(I2C_ID_WHS_CARD ,I2CFanViaSwitch_ADD_Buf[fan_number], (fan_number & 0x01), PUSH_PULL ); + status |= D_Fan_Setting(I2C_ID_WHS_CARD ,I2CFanViaSwitch_ADD_Buf[fan_number], (fan_number & 0x01), DEFAULT_FAN_SPEED);//FAN_SPEED_OFF } @@ -266,9 +307,9 @@ bool Read_WHS_fan_info(WHS_fan_num fan_number) Select_Main_WHS_Mux_Channel(); Select_WHS_Fan_Mux_Channel(fan_number); - status |= D_fan_productID (I2C_ID_WHS_CARD, I2CFanViaSwitch_ADDRESS, &(Fan_Driver_Info[fan_number-1].Product_ID) ); - status |= D_fan_manufactuerID(I2C_ID_WHS_CARD, I2CFanViaSwitch_ADDRESS, &(Fan_Driver_Info[fan_number-1].Manufactuere_ID)); - status |= D_fan_revision (I2C_ID_WHS_CARD, I2CFanViaSwitch_ADDRESS, &(Fan_Driver_Info[fan_number-1].Revision) ); + status |= D_fan_productID (I2C_ID_WHS_CARD, I2CFanViaSwitch_ADD_Buf[fan_number], &(Fan_Driver_Info[fan_number].Product_ID) ); + status |= D_fan_manufactuerID(I2C_ID_WHS_CARD, I2CFanViaSwitch_ADD_Buf[fan_number], &(Fan_Driver_Info[fan_number].Manufactuere_ID)); + status |= D_fan_revision (I2C_ID_WHS_CARD, I2CFanViaSwitch_ADD_Buf[fan_number], &(Fan_Driver_Info[fan_number].Revision) ); return status; } @@ -325,15 +366,15 @@ bool Test_WHS_Fan() { status = Read_WHS_fan_info(fan_number); - if (Fan_Driver_Info[fan_number-1].Manufactuere_ID != 0x5D) + if (Fan_Driver_Info[fan_number].Manufactuere_ID != 0x5D) { status|= ERROR; } - if (Fan_Driver_Info[fan_number-1].Product_ID != 0x36) + if (Fan_Driver_Info[fan_number].Product_ID != 0x36) { status|= ERROR; } - if (Fan_Driver_Info[fan_number-1].Revision != 0x80) + if (Fan_Driver_Info[fan_number].Revision != 0x80) { status|= ERROR; } @@ -363,3 +404,4 @@ bool Test_WHS_Fan() return status; } + diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.h index c8a81a612..a15248866 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.h +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.h @@ -48,7 +48,7 @@ typedef struct #define number_of_EMC2302 3 typedef enum { - noFAN = 0, + //noFAN = 0, FAN1 , FAN2 , FAN3 , @@ -58,6 +58,8 @@ typedef enum maxFAN }WHS_fan_num; +extern uint8_t I2CFanViaSwitch_ADD_Buf[maxFAN]; + typedef enum { FAN1chanel = 0, diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/WHS_data.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/WHS_data.h index 3d6bbc462..e0745ea35 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/WHS_data.h +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/WHS_data.h @@ -15,12 +15,14 @@ #define I2C_ID_WHS_CARD 0x03 #define I2C2_MAIN_MUX_TCA9548A_0xE0 0xE0 //WHS - SD1, SC1 + + typedef enum { I2CExp1_ADDRESS = 0x40, I2CExp2_ADDRESS = 0x42, I2CSwitch_ADDRESS = 0xE8, - I2CFanViaSwitch_ADDRESS = 0x5C, + //I2CFanViaSwitch_ADDRESS = 0x5C, I2CTemp1_ADDRESS = 0x80, I2CTemp2_ADDRESS = 0x82, I2CDAC_ADDRESS = 0x30, diff --git a/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/Dancer/Dancer.c b/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/Dancer/Dancer.c index ae814a8cb..00ef10032 100644 --- a/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/Dancer/Dancer.c +++ b/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/Dancer/Dancer.c @@ -43,13 +43,22 @@ typedef struct // 24bit SSI_ENC SSI_enc; #ifndef HUNDRED_MICROSECONDS_DANCER_READ +#ifdef FOUR_WINDERS +uint32_t Control_Read_Dancer_Position(Dancers_4_Winders DancerId, uint32_t Parameter1) +#else uint32_t Control_Read_Dancer_Position(HardwareDancerType DancerId, uint32_t Parameter1) +#endif { return DANCER_ENC[DancerId].Position; //return SSI_enc.Position; } #endif + +#ifdef FOUR_WINDERS +uint32_t Read_Dancer_Position (Dancers_4_Winders DancerId) +#else uint32_t Read_Dancer_Position (HardwareDancerType DancerId) +#endif { #ifdef EVALUATION_BOARD uint32_t ENC_SSI_Data = 0; @@ -71,7 +80,11 @@ uint32_t Read_Dancer_Position (HardwareDancerType DancerId) return SSI_enc.Position; #else // must call FPGA_SSI_Transmit first! + #ifdef FOUR_WINDERS + Dancers_4_Winders Dancer_Id = (Dancers_4_Winders)DancerId;//to remove warning + #else HardwareDancerType Dancer_Id = (HardwareDancerType)DancerId;//to remove warning + #endif FPGA_SSI_Receive(Dancer_Id); FPGA_SSI_Transmit(Dancer_Id); return DANCER_ENC[Dancer_Id].Position; @@ -86,11 +99,20 @@ uint32_t Read_Dryer_ENC_Position () //REPORT_MSG(Dryer_ENC.Position,"Read_Dryer_ENC_Position"); return Dryer_ENC.Position; } +#ifdef FOUR_WINDERS +uint32_t Read_Dryer_Status(Dancers_4_Winders DancerId) +#else uint32_t Read_Dryer_Status(HardwareDancerType DancerId) +#endif { return Dryer_ENC.Gen_status; } +#ifdef FOUR_WINDERS +uint32_t Control_Read_Dryer_Position(Dancers_4_Winders DancerId, uint32_t Parameter1) +#else uint32_t Control_Read_Dryer_Position(HardwareDancerType DancerId, uint32_t Parameter1) +#endif + { return Dryer_ENC.Position; //return SSI_enc.Position; diff --git a/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/SSI_Comm.h b/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/SSI_Comm.h index 3a1c3ad5b..f726baeb4 100644 --- a/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/SSI_Comm.h +++ b/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/SSI_Comm.h @@ -23,7 +23,23 @@ NUM_OF_ROTENC }RotEnc_t;*/ -#define NUM_OF_ROTENC (HARDWARE_DANCER_TYPE__RightDancer+1) +#ifdef FOUR_WINDERS + + typedef enum Dancers4Winders + { + HARDWARE_DANCER_0 = 0, + HARDWARE_DANCER_1 = 1, + HARDWARE_DANCER_2 = 2, + HARDWARE_DANCER_3 = 3, + HARDWARE_DANCER_4 = 4, + MAX_HARDWARE_DANCER + } Dancers_4_Winders; + + #define NUM_OF_ROTENC (MAX_HARDWARE_DANCER) +#else + #define NUM_OF_ROTENC (HARDWARE_DANCER_TYPE__RightDancer+1) +#endif + void SSI1_Init(); diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c index 89399cbe1..853f6913a 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c @@ -833,9 +833,9 @@ void Stub_ProgressRequest(MessageContainer* requestContainer) if (WHS_Type == WHS_TYPE_NEW) { - Trigger_SetWHSFanSpeed(((request->amount & 0x0000000F)-1) , request->delay & 0x000000FF); + Trigger_SetWHSFanSpeed(((request->amount & 0x0000000F)-2) , request->delay & 0x000000FF); Task_sleep(2000); - fan_tacho = WHS_Get_fan_tach( (request->amount & 0x0000000F)-1); + fan_tacho = WHS_Get_fan_tach( (request->amount & 0x0000000F)-2); } response.progress = fan_tacho; response.has_progress = true; diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dancer.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dancer.c index 213902038..3d2db071e 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dancer.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dancer.c @@ -52,7 +52,11 @@ void Stub_DancerPositionRequest(MessageContainer* requestContainer) response.dancer_id = request->dancer_id; response.has_dancer_id = true; + #ifdef FOUR_WINDERS + Dancers_4_Winders Dancer_Id = (Dancers_4_Winders)request->dancer_id;//to remove warning + #else HardwareDancerType Dancer_Id = (HardwareDancerType)request->dancer_id;//to remove warning + #endif if(Dancer_Id < NUM_OF_ROTENC) { diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h b/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h index aea0dd93a..1f2da8dc0 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h @@ -17,6 +17,7 @@ #include "../control/pidalgo.h" #include "thread_ex.h" +#include "drivers/SSI_Comm/SSI_Comm.h" #define NORMAL_COEF_DIVIDER 100 typedef struct @@ -56,7 +57,13 @@ typedef struct #define MAX_SYSTEM_DANCERS (HARDWARE_DANCER_TYPE__RightDancer+1) extern TimerMotors_t ThreadMotorIdToMotorId[MAX_THREAD_MOTORS_NUM]; + +#ifdef FOUR_WINDERS +extern Dancers_4_Winders ThreadMotorIdToDancerId[MAX_THREAD_MOTORS_NUM]; +#else extern HardwareDancerType ThreadMotorIdToDancerId[MAX_THREAD_MOTORS_NUM]; +#endif + extern HardwarePidControlType ThreadMotorIdToControlId[MAX_THREAD_MOTORS_NUM]; extern bool BreakSensorenabled; diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index 3f13365c2..72f369b64 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -37,6 +37,8 @@ #include "Control/MillisecTask.h" #include "drivers/Flash_ram/MCU_E2Prom.h" +#include "drivers/SSI_Comm/SSI_Comm.h" + ////////////////////////////////State machine operation//////////////////////////////////// //the state machine operation is used to operate in runtime correct profile flow execution //by recieved esign flow of the user from the UI @@ -45,7 +47,11 @@ double CurrentControlledSpeed[MAX_THREAD_MOTORS_NUM] = {0}; TimerMotors_t ThreadMotorIdToMotorId[MAX_THREAD_MOTORS_NUM] = {HARDWARE_MOTOR_TYPE__MOTO_RDRIVING,HARDWARE_MOTOR_TYPE__MOTO_DRYER_DRIVING,HARDWARE_MOTOR_TYPE__MOTO_LDRIVING,HARDWARE_MOTOR_TYPE__MOTO_WINDER,HARDWARE_MOTOR_TYPE__MOTO_SCREW}; +#ifdef FOUR_WINDERS +Dancers_4_Winders ThreadMotorIdToDancerId[MAX_THREAD_MOTORS_NUM] = {FEEDER_DANCER,NUM_OF_DANCERS,POOLER_DANCER,WINDER_DANCER,NUM_OF_DANCERS}; +#else HardwareDancerType ThreadMotorIdToDancerId[MAX_THREAD_MOTORS_NUM] = {FEEDER_DANCER,NUM_OF_DANCERS,POOLER_DANCER,WINDER_DANCER,NUM_OF_DANCERS}; +#endif uint32_t ControlIdtoMotorId [MAX_THREAD_MOTORS_NUM] = {0xFF,0xFF,0xFF,0xFF,0xFF}; uint32_t SpeedControlId=0xFF; uint32_t PoolerSpeedControlId=0xFF; diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c index 04cc389ef..88fdff1b2 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c @@ -41,6 +41,7 @@ #include "PowerIdle.h" #include "InitSequence.h" #include "PowerOffSequence.h" +#include "modules/waste/waste_ex.h" /* typedef enum { diff --git a/Software/Embedded_SW/Embedded/debug_w_pmr/makefile b/Software/Embedded_SW/Embedded/debug_w_pmr/makefile index 911c345fc..4fec7571c 100644 --- a/Software/Embedded_SW/Embedded/debug_w_pmr/makefile +++ b/Software/Embedded_SW/Embedded/debug_w_pmr/makefile @@ -4,14 +4,13 @@ SHELL = cmd.exe -CG_TOOL_ROOT := C:/TI/ccsv7/tools/compiler/ti-cgt-arm_16.9.4.LTS +CG_TOOL_ROOT := C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS GEN_OPTS__FLAG := --cmd_file="configPkg/compiler.opt" GEN_CMDS__FLAG := -l"configPkg/linker.cmd" ORDERED_OBJS += \ "./Main.obj" \ -"./delay.obj" \ "./Common/CheckSum/Checksum.obj" \ "./Common/SWUpdate/FileSystem.obj" \ "./Common/SWUpdate/FirmwareUpgrade.obj" \ @@ -23,6 +22,7 @@ ORDERED_OBJS += \ "./Common/Utilities/RFIDTagHandling.obj" \ "./Common/Utilities/Update.obj" \ "./Common/Utilities/Utils.obj" \ +"./Common/Utilities/delay.obj" \ "./Common/Utilities/idle_task.obj" \ "./Common/Utilities/ustdlib.obj" \ "./Common/protobuf-c/protobuf-c.obj" \ @@ -386,7 +386,6 @@ ORDERED_OBJS += \ "./Drivers/I2C_Communication/Dispenser_Card/I2C_Dispenser_Card_Mux.obj" \ "./Drivers/I2C_Communication/Dispenser_Card/IO_Ports/Dispenser_IO.obj" \ "./Drivers/I2C_Communication/Head_Card/ADC/Head_ADC.obj" \ -"./Drivers/I2C_Communication/Head_Card/ADC/Head_ADC_old.obj" \ "./Drivers/I2C_Communication/Head_Card/EEPROM/Head_EEPROM.obj" \ "./Drivers/I2C_Communication/Head_Card/Fan/Head_Fan.obj" \ "./Drivers/I2C_Communication/Head_Card/Fan/fan_click.obj" \ @@ -399,12 +398,12 @@ ORDERED_OBJS += \ "./Drivers/I2C_Communication/I2C_FIFO.obj" \ "./Drivers/I2C_Communication/I2C_Task.obj" \ "./Drivers/I2C_Communication/ektm4c129_i2c_master_udma_fifo.obj" \ +"./Drivers/I2C_Communication/test_fifo_dma.obj" \ "./Drivers/I2C_Communication/Main_Board_EEPROM/Main_EEPROM.obj" \ +"./Drivers/I2C_Communication/RFID_NFC/I2C_IFS_Mux.obj" \ "./Drivers/I2C_Communication/RFID_NFC/NFC.obj" \ "./Drivers/I2C_Communication/RFID_NFC/NFC_MainBaord.obj" \ -"./Drivers/I2C_Communication/RFID_NFC/NFC_I2C/NFC_I2C.obj" \ -"./Drivers/I2C_Communication/RFID_NFC/NFC_I2C/Test_NFC.obj" \ -"./Drivers/I2C_Communication/RFID_NFC/PN7150/PN7150.obj" \ +"./Drivers/I2C_Communication/RFID_NFC/Test_RFID.obj" \ "./Drivers/I2C_Communication/RFID_NFC/logi-tag/LT_NFC.obj" \ "./Drivers/I2C_Communication/RFID_NFC/logi-tag/LT_RFID.obj" \ "./Drivers/I2C_Communication/Thermo_K/MCP9600.obj" \ @@ -434,18 +433,6 @@ ORDERED_OBJS += \ "./Drivers/SSI_Comm/Speed_Sensor/Speed_Sensor.obj" \ "./Drivers/USB_Communication/USBCDCD.obj" \ "./Drivers/Uart_Comm/Uart.obj" \ -"./Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/ascii/mbascii.obj" \ -"./Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/functions/mbfunccoils.obj" \ -"./Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/functions/mbfuncdiag.obj" \ -"./Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/functions/mbfuncdisc.obj" \ -"./Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/functions/mbfuncholding.obj" \ -"./Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/functions/mbfuncinput.obj" \ -"./Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/functions/mbfuncother.obj" \ -"./Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/functions/mbutils.obj" \ -"./Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/mb.obj" \ -"./Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/rtu/mbcrc.obj" \ -"./Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/rtu/mbrtu.obj" \ -"./Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/tcp/mbtcp.obj" \ "./Drivers/Uart_Comm/WHS_Controller_Comm/Shinko/ACS-13AC5E3.obj" \ "./Drivers/Uart_Comm/WHS_Controller_Comm/WHS_UART/WHS_Uart.obj" \ "./Drivers/Valves/Valve.obj" \ @@ -513,7 +500,6 @@ ORDERED_OBJS += \ "./Modules/Waste/Waste_BIT.obj" \ "./Modules/Waste/Waste_init.obj" \ "./Modules/Waste/Waste_maint.obj" \ -"./Modules/Waste/Waste_print.obj" \ "./Modules/Waste/newWHS_init.obj" \ "./StateMachines/Initialization/InitSequence.obj" \ "./StateMachines/Initialization/PowerIdle.obj" \ @@ -582,8 +568,6 @@ RMDIR := RMDIR /S/Q -include Drivers/I2C_Communication/subdir_vars.mk -include Drivers/I2C_Communication/Main_Board_EEPROM/subdir_vars.mk -include Drivers/I2C_Communication/RFID_NFC/subdir_vars.mk --include Drivers/I2C_Communication/RFID_NFC/NFC_I2C/subdir_vars.mk --include Drivers/I2C_Communication/RFID_NFC/PN7150/subdir_vars.mk -include Drivers/I2C_Communication/RFID_NFC/logi-tag/subdir_vars.mk -include Drivers/I2C_Communication/Thermo_K/subdir_vars.mk -include Drivers/I2C_Communication/WHS_Card/D_AD5272_Rheostat/subdir_vars.mk @@ -603,11 +587,6 @@ RMDIR := RMDIR /S/Q -include Drivers/SSI_Comm/Speed_Sensor/subdir_vars.mk -include Drivers/USB_Communication/subdir_vars.mk -include Drivers/Uart_Comm/subdir_vars.mk --include Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/ascii/subdir_vars.mk --include Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/functions/subdir_vars.mk --include Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/subdir_vars.mk --include Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/rtu/subdir_vars.mk --include Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/tcp/subdir_vars.mk -include Drivers/Uart_Comm/WHS_Controller_Comm/Shinko/subdir_vars.mk -include Drivers/Uart_Comm/WHS_Controller_Comm/WHS_UART/subdir_vars.mk -include Drivers/Valves/subdir_vars.mk @@ -672,8 +651,6 @@ RMDIR := RMDIR /S/Q -include Drivers/I2C_Communication/subdir_rules.mk -include Drivers/I2C_Communication/Main_Board_EEPROM/subdir_rules.mk -include Drivers/I2C_Communication/RFID_NFC/subdir_rules.mk --include Drivers/I2C_Communication/RFID_NFC/NFC_I2C/subdir_rules.mk --include Drivers/I2C_Communication/RFID_NFC/PN7150/subdir_rules.mk -include Drivers/I2C_Communication/RFID_NFC/logi-tag/subdir_rules.mk -include Drivers/I2C_Communication/Thermo_K/subdir_rules.mk -include Drivers/I2C_Communication/WHS_Card/D_AD5272_Rheostat/subdir_rules.mk @@ -693,11 +670,6 @@ RMDIR := RMDIR /S/Q -include Drivers/SSI_Comm/Speed_Sensor/subdir_rules.mk -include Drivers/USB_Communication/subdir_rules.mk -include Drivers/Uart_Comm/subdir_rules.mk --include Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/ascii/subdir_rules.mk --include Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/functions/subdir_rules.mk --include Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/subdir_rules.mk --include Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/rtu/subdir_rules.mk --include Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/tcp/subdir_rules.mk -include Drivers/Uart_Comm/WHS_Controller_Comm/Shinko/subdir_rules.mk -include Drivers/Uart_Comm/WHS_Controller_Comm/WHS_UART/subdir_rules.mk -include Drivers/Valves/subdir_rules.mk @@ -832,20 +804,21 @@ main-build: Embedded.out # Tool invocations Embedded.out: $(OBJS) $(CMD_SRCS) $(GEN_CMDS) - @echo 'Building target: $@' + @echo 'Building target: "$@"' @echo 'Invoking: ARM Linker' - @echo 'Flags: -mv7M4 --code_state=16 --float_support=FPv4SPD16 -me -Ooff --opt_for_speed=0 --define=ENABLE_LFN --define=DEBUG_TEST_FUNCTIONS --define=TARGET_IS_TM4C129_RA0 --define=ccs="ccs" --define=ccs --define=TIVAWARE --define=PART_TM4C129XNCZAD -g --gcc --diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number --abi=eabi -z -m"Embedded.map" --heap_size=20480 --stack_size=4095 -i"C:/TI/ccsv7/tools/compiler/ti-cgt-arm_16.9.4.LTS/lib" -i"C:/TI/ccsv7/tools/compiler/ti-cgt-arm_16.9.4.LTS/include" --reread_libs --diag_wrap=off --display_error_number --warn_sections --xml_link_info="Embedded_linkInfo.xml" --rom_model' - $(shell echo -mv7M4 --code_state=16 --float_support=FPv4SPD16 -me -Ooff --opt_for_speed=0 --define=ENABLE_LFN --define=DEBUG_TEST_FUNCTIONS --define=TARGET_IS_TM4C129_RA0 --define=ccs="ccs" --define=ccs --define=TIVAWARE --define=PART_TM4C129XNCZAD -g --gcc --diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number --abi=eabi -z -m"Embedded.map" --heap_size=20480 --stack_size=4095 -i"C:/TI/ccsv7/tools/compiler/ti-cgt-arm_16.9.4.LTS/lib" -i"C:/TI/ccsv7/tools/compiler/ti-cgt-arm_16.9.4.LTS/include" --reread_libs --diag_wrap=off --display_error_number --warn_sections --xml_link_info="Embedded_linkInfo.xml" --rom_model > "ccsLinker.opt") + @echo 'Flags: -mv7M4 --code_state=16 --float_support=FPv4SPD16 -me -Ooff --opt_for_speed=0 --define=ENABLE_LFN --define=DEBUG_TEST_FUNCTIONS --define=TARGET_IS_TM4C129_RA0 --define=ccs="ccs" --define=ccs --define=TIVAWARE --define=PART_TM4C129XNCZAD -g --gcc --diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number --abi=eabi -z -m"Embedded.map" --heap_size=20480 --stack_size=4095 -i"C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/lib" -i"C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/include" --reread_libs --diag_wrap=off --display_error_number --warn_sections --xml_link_info="Embedded_linkInfo.xml" --rom_model' + $(shell echo -mv7M4 --code_state=16 --float_support=FPv4SPD16 -me -Ooff --opt_for_speed=0 --define=ENABLE_LFN --define=DEBUG_TEST_FUNCTIONS --define=TARGET_IS_TM4C129_RA0 --define=ccs="ccs" --define=ccs --define=TIVAWARE --define=PART_TM4C129XNCZAD -g --gcc --diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number --abi=eabi -z -m"Embedded.map" --heap_size=20480 --stack_size=4095 -i"C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/lib" -i"C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/include" --reread_libs --diag_wrap=off --display_error_number --warn_sections --xml_link_info="Embedded_linkInfo.xml" --rom_model > "ccsLinker.opt") $(shell type "ccsObjs.opt" >> "ccsLinker.opt") - "C:/TI/ccsv7/tools/compiler/ti-cgt-arm_16.9.4.LTS/bin/armcl" -@"ccsLinker.opt" -o "Embedded.out" - @echo 'Finished building target: $@' + "C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/bin/armcl" -@"ccsLinker.opt" -o "Embedded.out" + @echo 'Finished building target: "$@"' @echo ' ' @$(MAKE) --no-print-directory post-build Embedded.bin: $(EXE_OUTPUTS) + @echo 'Building files: $(strip $(EXE_OUTPUTS__QUOTED))' @echo 'Invoking: ARM Hex Utility' - "C:/TI/ccsv7/tools/compiler/ti-cgt-arm_16.9.4.LTS/bin/armhex" -o "Embedded.bin" $(EXE_OUTPUTS__QUOTED) - @echo 'Finished building: $@' + "C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/bin/armhex" -o "Embedded.bin" $(EXE_OUTPUTS__QUOTED) + @echo 'Finished building: $(strip $(EXE_OUTPUTS__QUOTED))' @echo ' ' @$(MAKE) --no-print-directory post-build @@ -853,7 +826,7 @@ Embedded.bin: $(EXE_OUTPUTS) clean: -$(RM) $(GEN_CMDS__QUOTED)$(GEN_MISC_FILES__QUOTED)$(BIN_OUTPUTS__QUOTED)$(GEN_FILES__QUOTED)$(EXE_OUTPUTS__QUOTED)$(GEN_OPTS__QUOTED) -$(RMDIR) $(GEN_MISC_DIRS__QUOTED) - -$(RM) "Main.obj" "delay.obj" "Common\CheckSum\Checksum.obj" "Common\SWUpdate\FileSystem.obj" "Common\SWUpdate\FirmwareUpgrade.obj" "Common\SW_Info\SW_Info.obj" "Common\Software_CRC\sw_crc.obj" "Common\Sys_PinOut_Config\MCU_MAIN_pinout.obj" "Common\Sys_PinOut_Config\Pin.obj" "Common\Sys_PinOut_Config\Pin_config.obj" "Common\Utilities\RFIDTagHandling.obj" "Common\Utilities\Update.obj" "Common\Utilities\Utils.obj" "Common\Utilities\idle_task.obj" "Common\Utilities\ustdlib.obj" "Common\protobuf-c\protobuf-c.obj" "Common\report\distributor.obj" "Common\report\filter.obj" "Common\report\reportInit.obj" "Communication\CommunicationTask.obj" "Communication\Connection.obj" "Communication\Container.obj" "Communication\PMR\Common\ErrorCode.pb-c.obj" "Communication\PMR\Common\ErrorResponse.pb-c.obj" "Communication\PMR\Common\MessageContainer.pb-c.obj" "Communication\PMR\Common\MessageType.pb-c.obj" "Communication\PMR\Connection\ConnectRequest.pb-c.obj" "Communication\PMR\Connection\ConnectResponse.pb-c.obj" + -$(RM) "Main.obj" "Common\CheckSum\Checksum.obj" "Common\SWUpdate\FileSystem.obj" "Common\SWUpdate\FirmwareUpgrade.obj" "Common\SW_Info\SW_Info.obj" "Common\Software_CRC\sw_crc.obj" "Common\Sys_PinOut_Config\MCU_MAIN_pinout.obj" "Common\Sys_PinOut_Config\Pin.obj" "Common\Sys_PinOut_Config\Pin_config.obj" "Common\Utilities\RFIDTagHandling.obj" "Common\Utilities\Update.obj" "Common\Utilities\Utils.obj" "Common\Utilities\delay.obj" "Common\Utilities\idle_task.obj" "Common\Utilities\ustdlib.obj" "Common\protobuf-c\protobuf-c.obj" "Common\report\distributor.obj" "Common\report\filter.obj" "Common\report\reportInit.obj" "Communication\CommunicationTask.obj" "Communication\Connection.obj" "Communication\Container.obj" "Communication\PMR\Common\ErrorCode.pb-c.obj" "Communication\PMR\Common\ErrorResponse.pb-c.obj" "Communication\PMR\Common\MessageContainer.pb-c.obj" "Communication\PMR\Common\MessageType.pb-c.obj" "Communication\PMR\Connection\ConnectRequest.pb-c.obj" "Communication\PMR\Connection\ConnectResponse.pb-c.obj" -$(RM) "Communication\PMR\Connection\DeviceInformation.pb-c.obj" "Communication\PMR\Connection\DisconnectRequest.pb-c.obj" "Communication\PMR\Connection\DisconnectResponse.pb-c.obj" "Communication\PMR\Connection\KeepAliveRequest.pb-c.obj" "Communication\PMR\Connection\KeepAliveResponse.pb-c.obj" "Communication\PMR\Debugging\DebugDistributor.pb-c.obj" "Communication\PMR\Debugging\DebugDistributorType.pb-c.obj" "Communication\PMR\Debugging\DebugLogCategory.pb-c.obj" "Communication\PMR\Debugging\SetDebugLogCategoryRequest.pb-c.obj" "Communication\PMR\Debugging\SetDebugLogCategoryResponse.pb-c.obj" "Communication\PMR\Debugging\SetupDebugDisributorsRequest.pb-c.obj" "Communication\PMR\Debugging\SetupDebugDisributorsResponse.pb-c.obj" "Communication\PMR\Debugging\StartDebugLogRequest.pb-c.obj" "Communication\PMR\Debugging\StartDebugLogResponse.pb-c.obj" "Communication\PMR\Debugging\StopDebugLogRequest.pb-c.obj" "Communication\PMR\Debugging\StopDebugLogResponse.pb-c.obj" "Communication\PMR\Diagnostics\Cartridge.pb-c.obj" -$(RM) "Communication\PMR\Diagnostics\CartridgeAction.pb-c.obj" "Communication\PMR\Diagnostics\CartridgeSlot.pb-c.obj" "Communication\PMR\Diagnostics\CartridgeTagContent.pb-c.obj" "Communication\PMR\Diagnostics\CartridgeValidationRequest.pb-c.obj" "Communication\PMR\Diagnostics\CartridgeValidationResponse.pb-c.obj" "Communication\PMR\Diagnostics\DataFileFrame.pb-c.obj" "Communication\PMR\Diagnostics\DiagnosticsMonitors.pb-c.obj" "Communication\PMR\Diagnostics\DigitalInterfaceState.pb-c.obj" "Communication\PMR\Diagnostics\DispenserAbortHomingRequest.pb-c.obj" "Communication\PMR\Diagnostics\DispenserAbortHomingResponse.pb-c.obj" "Communication\PMR\Diagnostics\DispenserAbortJoggingRequest.pb-c.obj" "Communication\PMR\Diagnostics\DispenserAbortJoggingResponse.pb-c.obj" "Communication\PMR\Diagnostics\DispenserHomingRequest.pb-c.obj" "Communication\PMR\Diagnostics\DispenserHomingResponse.pb-c.obj" "Communication\PMR\Diagnostics\DispenserJoggingRequest.pb-c.obj" "Communication\PMR\Diagnostics\DispenserJoggingResponse.pb-c.obj" -$(RM) "Communication\PMR\Diagnostics\DoubleArray.pb-c.obj" "Communication\PMR\Diagnostics\Event.pb-c.obj" "Communication\PMR\Diagnostics\EventType.pb-c.obj" "Communication\PMR\Diagnostics\HeaterState.pb-c.obj" "Communication\PMR\Diagnostics\HeaterType.pb-c.obj" "Communication\PMR\Diagnostics\InterfaceIOs.pb-c.obj" "Communication\PMR\Diagnostics\MotorAbortHomingRequest.pb-c.obj" "Communication\PMR\Diagnostics\MotorAbortHomingResponse.pb-c.obj" "Communication\PMR\Diagnostics\MotorAbortJoggingRequest.pb-c.obj" "Communication\PMR\Diagnostics\MotorAbortJoggingResponse.pb-c.obj" "Communication\PMR\Diagnostics\MotorDirection.pb-c.obj" "Communication\PMR\Diagnostics\MotorHomingRequest.pb-c.obj" "Communication\PMR\Diagnostics\MotorHomingResponse.pb-c.obj" "Communication\PMR\Diagnostics\MotorJoggingRequest.pb-c.obj" "Communication\PMR\Diagnostics\MotorJoggingResponse.pb-c.obj" "Communication\PMR\Diagnostics\ResolveEventRequest.pb-c.obj" "Communication\PMR\Diagnostics\ResolveEventResponse.pb-c.obj" "Communication\PMR\Diagnostics\SetBlowerStateRequest.pb-c.obj" @@ -873,15 +846,14 @@ clean: -$(RM) "Communication\PMR\Stubs\StubMotorPositionResponse.pb-c.obj" "Communication\PMR\Stubs\StubMotorRequest.pb-c.obj" "Communication\PMR\Stubs\StubMotorResponse.pb-c.obj" "Communication\PMR\Stubs\StubMotorRunRequest.pb-c.obj" "Communication\PMR\Stubs\StubMotorRunResponse.pb-c.obj" "Communication\PMR\Stubs\StubMotorRunStepTickRequest.pb-c.obj" "Communication\PMR\Stubs\StubMotorRunStepTickResponse.pb-c.obj" "Communication\PMR\Stubs\StubMotorSpeedRequest.pb-c.obj" "Communication\PMR\Stubs\StubMotorSpeedResponse.pb-c.obj" "Communication\PMR\Stubs\StubMotorStatusRequest.pb-c.obj" "Communication\PMR\Stubs\StubMotorStatusResponse.pb-c.obj" "Communication\PMR\Stubs\StubMotorStopRequest.pb-c.obj" "Communication\PMR\Stubs\StubMotorStopResponse.pb-c.obj" "Communication\PMR\Stubs\StubOptLimitSwitchRequest.pb-c.obj" "Communication\PMR\Stubs\StubOptLimitSwitchResponse.pb-c.obj" "Communication\PMR\Stubs\StubReadEmbeddedVersionRequest.pb-c.obj" "Communication\PMR\Stubs\StubReadEmbeddedVersionResponse.pb-c.obj" -$(RM) "Communication\PMR\Stubs\StubRealTimeUsageRequest.pb-c.obj" "Communication\PMR\Stubs\StubRealTimeUsageResponse.pb-c.obj" "Communication\PMR\Stubs\StubSpeedSensorRequest.pb-c.obj" "Communication\PMR\Stubs\StubSpeedSensorResponse.pb-c.obj" "Communication\PMR\Stubs\StubSteperMotorRequest.pb-c.obj" "Communication\PMR\Stubs\StubSteperMotorResponse.pb-c.obj" "Communication\PMR\Stubs\StubTempSensorRequest.pb-c.obj" "Communication\PMR\Stubs\StubTempSensorResponse.pb-c.obj" "Communication\PMR\Stubs\StubTivaReadRegRequest.pb-c.obj" "Communication\PMR\Stubs\StubTivaReadRegResponse.pb-c.obj" "Communication\PMR\Stubs\StubTivaWriteRegRequest.pb-c.obj" "Communication\PMR\Stubs\StubTivaWriteRegResponse.pb-c.obj" "Communication\PMR\Stubs\StubValveRequest.pb-c.obj" "Communication\PMR\Stubs\StubValveResponse.pb-c.obj" "Communication\PMR\Stubs\StubWhsEEpromData.pb-c.obj" "Communication\PMR\Stubs\StubWhsEEpromRequest.pb-c.obj" "Communication\PMR\Stubs\StubWhsEEpromResponse.pb-c.obj" "Communication\PMR\ThreadLoading\ContinueThreadLoadingRequest.pb-c.obj" -$(RM) "Communication\PMR\ThreadLoading\ContinueThreadLoadingResponse.pb-c.obj" "Communication\PMR\ThreadLoading\StartThreadLoadingRequest.pb-c.obj" "Communication\PMR\ThreadLoading\StartThreadLoadingResponse.pb-c.obj" "Communication\PMR\ThreadLoading\StopThreadLoadingRequest.pb-c.obj" "Communication\PMR\ThreadLoading\StopThreadLoadingResponse.pb-c.obj" "Communication\PMR\ThreadLoading\ThreadLoadingState.pb-c.obj" "Communication\PMR\ThreadLoading\TryThreadLoadingRequest.pb-c.obj" "Communication\PMR\ThreadLoading\TryThreadLoadingResponse.pb-c.obj" "Drivers\ADC_Sampling\ADC.obj" "Drivers\ADC_Sampling\ADC_DispPressSens.obj" "Drivers\ADC_Sampling\ADC_VAC.obj" "Drivers\ADC_Sampling\ADC_VOC_Sensor.obj" "Drivers\FPGA\FPGA.obj" "Drivers\FPGA\FPGA_SPI_Comm.obj" "Drivers\FPGA\FPGA_SSI_Comm.obj" "Drivers\FPGA\FPGA_GPIO\FPGA_GPIO.obj" "Drivers\FPGA\FPGA_INTERRUPTS\FPGA_Interrupts.obj" "Drivers\FPGA\Full_Vme\FPGA_Programming_Up.obj" "Drivers\FPGA\Full_Vme\ispvme\hardware.obj" "Drivers\FPGA\Full_Vme\ispvme\ispvm_ui.obj" - -$(RM) "Drivers\FPGA\Full_Vme\ispvme\ivm_core.obj" "Drivers\FPGA\Motors_Driver\L6470.obj" "Drivers\Flash_Memory\FATFS\Control_File_System.obj" "Drivers\Flash_Memory\FATFS\cc932.obj" "Drivers\Flash_Memory\FATFS\fatfs_port_mx66l51235f.obj" "Drivers\Flash_Memory\FATFS\ff.obj" "Drivers\Flash_Memory\FATFS\mx66l51235f.obj" "Drivers\Flash_Memory\FATFS\spi_flash.obj" "Drivers\Flash_Memory\Flash_Memory.obj" "Drivers\Heater\ADS1220.obj" "Drivers\Heater\Heater.obj" "Drivers\Heater\TemperatureSensor.obj" "Drivers\I2C_Communication\ADC_MUX\ADC_MUX.obj" "Drivers\I2C_Communication\DAC\Blower.obj" "Drivers\I2C_Communication\Dispenser_Card\EEPROM\Dispenser_EEPROM.obj" "Drivers\I2C_Communication\Dispenser_Card\I2C_Dispenser_Card_Mux.obj" "Drivers\I2C_Communication\Dispenser_Card\IO_Ports\Dispenser_IO.obj" "Drivers\I2C_Communication\Head_Card\ADC\Head_ADC.obj" "Drivers\I2C_Communication\Head_Card\ADC\Head_ADC_old.obj" "Drivers\I2C_Communication\Head_Card\EEPROM\Head_EEPROM.obj" "Drivers\I2C_Communication\Head_Card\Fan\Head_Fan.obj" - -$(RM) "Drivers\I2C_Communication\Head_Card\Fan\fan_click.obj" "Drivers\I2C_Communication\Head_Card\I2C_Head_Mux.obj" "Drivers\I2C_Communication\Head_Card\IO_Ports\Head_IO.obj" "Drivers\I2C_Communication\Head_Card\IO_Ports\Heaters\Head_Heaters.obj" "Drivers\I2C_Communication\Head_Card\PT100\Head_PT100_ADC.obj" "Drivers\I2C_Communication\I2C.obj" "Drivers\I2C_Communication\I2C_Comm.obj" "Drivers\I2C_Communication\I2C_FIFO.obj" "Drivers\I2C_Communication\I2C_Task.obj" "Drivers\I2C_Communication\ektm4c129_i2c_master_udma_fifo.obj" "Drivers\I2C_Communication\Main_Board_EEPROM\Main_EEPROM.obj" "Drivers\I2C_Communication\RFID_NFC\NFC.obj" "Drivers\I2C_Communication\RFID_NFC\NFC_MainBaord.obj" "Drivers\I2C_Communication\RFID_NFC\NFC_I2C\NFC_I2C.obj" "Drivers\I2C_Communication\RFID_NFC\NFC_I2C\Test_NFC.obj" "Drivers\I2C_Communication\RFID_NFC\PN7150\PN7150.obj" "Drivers\I2C_Communication\RFID_NFC\logi-tag\LT_NFC.obj" "Drivers\I2C_Communication\RFID_NFC\logi-tag\LT_RFID.obj" "Drivers\I2C_Communication\Thermo_K\MCP9600.obj" - -$(RM) "Drivers\I2C_Communication\WHS_Card\D_AD5272_Rheostat\AD5272_Driver.obj" "Drivers\I2C_Communication\WHS_Card\D_AD5272_Rheostat\WHS_Rheostat.obj" "Drivers\I2C_Communication\WHS_Card\D_ADS122_PT100\ADS122X04_Driver.obj" "Drivers\I2C_Communication\WHS_Card\D_ADS122_PT100\WHS_PT100_ADC.obj" "Drivers\I2C_Communication\WHS_Card\D_EMC2302_Fan\D_EMC2302_fan.obj" "Drivers\I2C_Communication\WHS_Card\D_EMC2302_Fan\WHS_Fan.obj" "Drivers\I2C_Communication\WHS_Card\D_MAX11614_ADC\MAX11614_Driver.obj" "Drivers\I2C_Communication\WHS_Card\D_MAX11614_ADC\WHS_MAX11614_A2D.obj" "Drivers\I2C_Communication\WHS_Card\D_Max5805_ADC_Blower\Max_5805_Driver.obj" "Drivers\I2C_Communication\WHS_Card\D_Max5805_ADC_Blower\WHS_Blower.obj" "Drivers\I2C_Communication\WHS_Card\D_TCA9546_ADC_MUX\TCA9546_Driver.obj" "Drivers\I2C_Communication\WHS_Card\EEPROM\D_EEPROM.obj" "Drivers\I2C_Communication\WHS_Card\EEPROM\WHS_EEPROM.obj" "Drivers\I2C_Communication\WHS_Card\I2C_WHS_Fan_Mux.obj" "Drivers\I2C_Communication\WHS_Card\I2C_WHS_Mux.obj" - -$(RM) "Drivers\I2C_Communication\WHS_Card\IO_Extender_Ports_TCA9555\TCA9555_Driver.obj" "Drivers\I2C_Communication\WHS_Card\IO_Extender_Ports_TCA9555\WHS_IO.obj" "Drivers\Motors\Motor.obj" "Drivers\Motors\MotorActions.obj" "Drivers\On_Chip_Flash\Flashstore.obj" "Drivers\SPI\SPI_Comm.obj" "Drivers\SSI_Comm\Dancer\Dancer.obj" "Drivers\SSI_Comm\SSI_Comm.obj" "Drivers\SSI_Comm\Speed_Sensor\Speed_Sensor.obj" "Drivers\USB_Communication\USBCDCD.obj" "Drivers\Uart_Comm\Uart.obj" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\ascii\mbascii.obj" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\functions\mbfunccoils.obj" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\functions\mbfuncdiag.obj" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\functions\mbfuncdisc.obj" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\functions\mbfuncholding.obj" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\functions\mbfuncinput.obj" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\functions\mbfuncother.obj" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\functions\mbutils.obj" - -$(RM) "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\mb.obj" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\rtu\mbcrc.obj" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\rtu\mbrtu.obj" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\tcp\mbtcp.obj" "Drivers\Uart_Comm\WHS_Controller_Comm\Shinko\ACS-13AC5E3.obj" "Drivers\Uart_Comm\WHS_Controller_Comm\WHS_UART\WHS_Uart.obj" "Drivers\Valves\Valve.obj" "Drivers\flash_ram\FlashProgram.obj" "Drivers\flash_ram\MCU_E2Prom.obj" "Modules\AlarmHandling\AlarmHandling.obj" "Modules\Control\DriverWithCallbackExample.obj" "Modules\Control\MillisecTask.obj" "Modules\Control\PIDAlgo.obj" "Modules\Control\control.obj" "Modules\Diagnostics\DiagnosticActions.obj" "Modules\Diagnostics\Diagnostics.obj" "Modules\Diagnostics\DiagnosticsHoming.obj" "Modules\Diagnostics\DiagnosticsJogging.obj" "Modules\General\GeneralHardware.obj" "Modules\General\MachineStatus.obj" "Modules\General\Safety.obj" "Modules\General\buttons.obj" "Modules\General\process.obj" "Modules\Heaters\Heaters_bit.obj" - -$(RM) "Modules\Heaters\Heaters_init.obj" "Modules\Heaters\Heaters_maint.obj" "Modules\Heaters\Heaters_print.obj" "Modules\IDS\IDS_BIT.obj" "Modules\IDS\IDS_Cleaning.obj" "Modules\IDS\IDS_dispenser.obj" "Modules\IDS\IDS_init.obj" "Modules\IDS\IDS_maint.obj" "Modules\IDS\IDS_print.obj" "Modules\IFS\ifs.obj" "Modules\Stubs_Handler\Calculate.obj" "Modules\Stubs_Handler\Progress.obj" "Modules\Stubs_Handler\StubRealTimeUsage.obj" "Modules\Stubs_Handler\Stub_Cartridge.obj" "Modules\Stubs_Handler\Stub_Dancer.obj" "Modules\Stubs_Handler\Stub_Dispenser.obj" "Modules\Stubs_Handler\Stub_ExtFlash.obj" "Modules\Stubs_Handler\Stub_FPGARWReg.obj" "Modules\Stubs_Handler\Stub_FPGAReadBackReg.obj" "Modules\Stubs_Handler\Stub_FPGAReadVersion.obj" "Modules\Stubs_Handler\Stub_GPIO.obj" "Modules\Stubs_Handler\Stub_HW_Version.obj" "Modules\Stubs_Handler\Stub_Heater.obj" "Modules\Stubs_Handler\Stub_I2C.obj" "Modules\Stubs_Handler\Stub_IntADC.obj" "Modules\Stubs_Handler\Stub_L6470.obj" "Modules\Stubs_Handler\Stub_MidTankPressureSensor.obj" - -$(RM) "Modules\Stubs_Handler\Stub_Motor.obj" "Modules\Stubs_Handler\Stub_OptLimitSwitch.obj" "Modules\Stubs_Handler\Stub_ReadEmbeddedVersion.obj" "Modules\Stubs_Handler\Stub_SpeedSensor.obj" "Modules\Stubs_Handler\Stub_Status.obj" "Modules\Stubs_Handler\Stub_SteperMotor.obj" "Modules\Stubs_Handler\Stub_TempSensor.obj" "Modules\Stubs_Handler\Stub_TivaReg.obj" "Modules\Stubs_Handler\Stub_Valve.obj" "Modules\Stubs_Handler\User_Leds.obj" "Modules\Stubs_Handler\temperature_sensor.obj" "Modules\Thread\ThreadLoad.obj" "Modules\Thread\Thread_BIT.obj" "Modules\Thread\Thread_Winder.obj" "Modules\Thread\Thread_init.obj" "Modules\Thread\Thread_maint.obj" "Modules\Thread\Thread_print.obj" "Modules\Waste\Waste_BIT.obj" "Modules\Waste\Waste_init.obj" "Modules\Waste\Waste_maint.obj" "Modules\Waste\Waste_print.obj" "Modules\Waste\newWHS_init.obj" "StateMachines\Initialization\InitSequence.obj" "StateMachines\Initialization\PowerIdle.obj" "StateMachines\Initialization\PowerOffSequence.obj" "StateMachines\Printing\JobSTM.obj" - -$(RM) "StateMachines\Printing\PrintingSTM.obj" - -$(RM) "Main.d" "delay.d" "Common\CheckSum\Checksum.d" "Common\SWUpdate\FileSystem.d" "Common\SWUpdate\FirmwareUpgrade.d" "Common\SW_Info\SW_Info.d" "Common\Software_CRC\sw_crc.d" "Common\Sys_PinOut_Config\MCU_MAIN_pinout.d" "Common\Sys_PinOut_Config\Pin.d" "Common\Sys_PinOut_Config\Pin_config.d" "Common\Utilities\RFIDTagHandling.d" "Common\Utilities\Update.d" "Common\Utilities\Utils.d" "Common\Utilities\idle_task.d" "Common\Utilities\ustdlib.d" "Common\protobuf-c\protobuf-c.d" "Common\report\distributor.d" "Common\report\filter.d" "Common\report\reportInit.d" "Communication\CommunicationTask.d" "Communication\Connection.d" "Communication\Container.d" "Communication\PMR\Common\ErrorCode.pb-c.d" "Communication\PMR\Common\ErrorResponse.pb-c.d" "Communication\PMR\Common\MessageContainer.pb-c.d" "Communication\PMR\Common\MessageType.pb-c.d" "Communication\PMR\Connection\ConnectRequest.pb-c.d" "Communication\PMR\Connection\ConnectResponse.pb-c.d" "Communication\PMR\Connection\DeviceInformation.pb-c.d" + -$(RM) "Drivers\FPGA\Full_Vme\ispvme\ivm_core.obj" "Drivers\FPGA\Motors_Driver\L6470.obj" "Drivers\Flash_Memory\FATFS\Control_File_System.obj" "Drivers\Flash_Memory\FATFS\cc932.obj" "Drivers\Flash_Memory\FATFS\fatfs_port_mx66l51235f.obj" "Drivers\Flash_Memory\FATFS\ff.obj" "Drivers\Flash_Memory\FATFS\mx66l51235f.obj" "Drivers\Flash_Memory\FATFS\spi_flash.obj" "Drivers\Flash_Memory\Flash_Memory.obj" "Drivers\Heater\ADS1220.obj" "Drivers\Heater\Heater.obj" "Drivers\Heater\TemperatureSensor.obj" "Drivers\I2C_Communication\ADC_MUX\ADC_MUX.obj" "Drivers\I2C_Communication\DAC\Blower.obj" "Drivers\I2C_Communication\Dispenser_Card\EEPROM\Dispenser_EEPROM.obj" "Drivers\I2C_Communication\Dispenser_Card\I2C_Dispenser_Card_Mux.obj" "Drivers\I2C_Communication\Dispenser_Card\IO_Ports\Dispenser_IO.obj" "Drivers\I2C_Communication\Head_Card\ADC\Head_ADC.obj" "Drivers\I2C_Communication\Head_Card\EEPROM\Head_EEPROM.obj" "Drivers\I2C_Communication\Head_Card\Fan\Head_Fan.obj" "Drivers\I2C_Communication\Head_Card\Fan\fan_click.obj" + -$(RM) "Drivers\I2C_Communication\Head_Card\I2C_Head_Mux.obj" "Drivers\I2C_Communication\Head_Card\IO_Ports\Head_IO.obj" "Drivers\I2C_Communication\Head_Card\IO_Ports\Heaters\Head_Heaters.obj" "Drivers\I2C_Communication\Head_Card\PT100\Head_PT100_ADC.obj" "Drivers\I2C_Communication\I2C.obj" "Drivers\I2C_Communication\I2C_Comm.obj" "Drivers\I2C_Communication\I2C_FIFO.obj" "Drivers\I2C_Communication\I2C_Task.obj" "Drivers\I2C_Communication\ektm4c129_i2c_master_udma_fifo.obj" "Drivers\I2C_Communication\test_fifo_dma.obj" "Drivers\I2C_Communication\Main_Board_EEPROM\Main_EEPROM.obj" "Drivers\I2C_Communication\RFID_NFC\I2C_IFS_Mux.obj" "Drivers\I2C_Communication\RFID_NFC\NFC.obj" "Drivers\I2C_Communication\RFID_NFC\NFC_MainBaord.obj" "Drivers\I2C_Communication\RFID_NFC\Test_RFID.obj" "Drivers\I2C_Communication\RFID_NFC\logi-tag\LT_NFC.obj" "Drivers\I2C_Communication\RFID_NFC\logi-tag\LT_RFID.obj" "Drivers\I2C_Communication\Thermo_K\MCP9600.obj" "Drivers\I2C_Communication\WHS_Card\D_AD5272_Rheostat\AD5272_Driver.obj" + -$(RM) "Drivers\I2C_Communication\WHS_Card\D_AD5272_Rheostat\WHS_Rheostat.obj" "Drivers\I2C_Communication\WHS_Card\D_ADS122_PT100\ADS122X04_Driver.obj" "Drivers\I2C_Communication\WHS_Card\D_ADS122_PT100\WHS_PT100_ADC.obj" "Drivers\I2C_Communication\WHS_Card\D_EMC2302_Fan\D_EMC2302_fan.obj" "Drivers\I2C_Communication\WHS_Card\D_EMC2302_Fan\WHS_Fan.obj" "Drivers\I2C_Communication\WHS_Card\D_MAX11614_ADC\MAX11614_Driver.obj" "Drivers\I2C_Communication\WHS_Card\D_MAX11614_ADC\WHS_MAX11614_A2D.obj" "Drivers\I2C_Communication\WHS_Card\D_Max5805_ADC_Blower\Max_5805_Driver.obj" "Drivers\I2C_Communication\WHS_Card\D_Max5805_ADC_Blower\WHS_Blower.obj" "Drivers\I2C_Communication\WHS_Card\D_TCA9546_ADC_MUX\TCA9546_Driver.obj" "Drivers\I2C_Communication\WHS_Card\EEPROM\D_EEPROM.obj" "Drivers\I2C_Communication\WHS_Card\EEPROM\WHS_EEPROM.obj" "Drivers\I2C_Communication\WHS_Card\I2C_WHS_Fan_Mux.obj" "Drivers\I2C_Communication\WHS_Card\I2C_WHS_Mux.obj" "Drivers\I2C_Communication\WHS_Card\IO_Extender_Ports_TCA9555\TCA9555_Driver.obj" + -$(RM) "Drivers\I2C_Communication\WHS_Card\IO_Extender_Ports_TCA9555\WHS_IO.obj" "Drivers\Motors\Motor.obj" "Drivers\Motors\MotorActions.obj" "Drivers\On_Chip_Flash\Flashstore.obj" "Drivers\SPI\SPI_Comm.obj" "Drivers\SSI_Comm\Dancer\Dancer.obj" "Drivers\SSI_Comm\SSI_Comm.obj" "Drivers\SSI_Comm\Speed_Sensor\Speed_Sensor.obj" "Drivers\USB_Communication\USBCDCD.obj" "Drivers\Uart_Comm\Uart.obj" "Drivers\Uart_Comm\WHS_Controller_Comm\Shinko\ACS-13AC5E3.obj" "Drivers\Uart_Comm\WHS_Controller_Comm\WHS_UART\WHS_Uart.obj" "Drivers\Valves\Valve.obj" "Drivers\flash_ram\FlashProgram.obj" "Drivers\flash_ram\MCU_E2Prom.obj" "Modules\AlarmHandling\AlarmHandling.obj" "Modules\Control\DriverWithCallbackExample.obj" "Modules\Control\MillisecTask.obj" "Modules\Control\PIDAlgo.obj" "Modules\Control\control.obj" "Modules\Diagnostics\DiagnosticActions.obj" "Modules\Diagnostics\Diagnostics.obj" "Modules\Diagnostics\DiagnosticsHoming.obj" "Modules\Diagnostics\DiagnosticsJogging.obj" "Modules\General\GeneralHardware.obj" + -$(RM) "Modules\General\MachineStatus.obj" "Modules\General\Safety.obj" "Modules\General\buttons.obj" "Modules\General\process.obj" "Modules\Heaters\Heaters_bit.obj" "Modules\Heaters\Heaters_init.obj" "Modules\Heaters\Heaters_maint.obj" "Modules\Heaters\Heaters_print.obj" "Modules\IDS\IDS_BIT.obj" "Modules\IDS\IDS_Cleaning.obj" "Modules\IDS\IDS_dispenser.obj" "Modules\IDS\IDS_init.obj" "Modules\IDS\IDS_maint.obj" "Modules\IDS\IDS_print.obj" "Modules\IFS\ifs.obj" "Modules\Stubs_Handler\Calculate.obj" "Modules\Stubs_Handler\Progress.obj" "Modules\Stubs_Handler\StubRealTimeUsage.obj" "Modules\Stubs_Handler\Stub_Cartridge.obj" "Modules\Stubs_Handler\Stub_Dancer.obj" "Modules\Stubs_Handler\Stub_Dispenser.obj" "Modules\Stubs_Handler\Stub_ExtFlash.obj" "Modules\Stubs_Handler\Stub_FPGARWReg.obj" "Modules\Stubs_Handler\Stub_FPGAReadBackReg.obj" "Modules\Stubs_Handler\Stub_FPGAReadVersion.obj" "Modules\Stubs_Handler\Stub_GPIO.obj" "Modules\Stubs_Handler\Stub_HW_Version.obj" "Modules\Stubs_Handler\Stub_Heater.obj" + -$(RM) "Modules\Stubs_Handler\Stub_I2C.obj" "Modules\Stubs_Handler\Stub_IntADC.obj" "Modules\Stubs_Handler\Stub_L6470.obj" "Modules\Stubs_Handler\Stub_MidTankPressureSensor.obj" "Modules\Stubs_Handler\Stub_Motor.obj" "Modules\Stubs_Handler\Stub_OptLimitSwitch.obj" "Modules\Stubs_Handler\Stub_ReadEmbeddedVersion.obj" "Modules\Stubs_Handler\Stub_SpeedSensor.obj" "Modules\Stubs_Handler\Stub_Status.obj" "Modules\Stubs_Handler\Stub_SteperMotor.obj" "Modules\Stubs_Handler\Stub_TempSensor.obj" "Modules\Stubs_Handler\Stub_TivaReg.obj" "Modules\Stubs_Handler\Stub_Valve.obj" "Modules\Stubs_Handler\User_Leds.obj" "Modules\Stubs_Handler\temperature_sensor.obj" "Modules\Thread\ThreadLoad.obj" "Modules\Thread\Thread_BIT.obj" "Modules\Thread\Thread_Winder.obj" "Modules\Thread\Thread_init.obj" "Modules\Thread\Thread_maint.obj" "Modules\Thread\Thread_print.obj" "Modules\Waste\Waste_BIT.obj" "Modules\Waste\Waste_init.obj" "Modules\Waste\Waste_maint.obj" "Modules\Waste\newWHS_init.obj" "StateMachines\Initialization\InitSequence.obj" + -$(RM) "StateMachines\Initialization\PowerIdle.obj" "StateMachines\Initialization\PowerOffSequence.obj" "StateMachines\Printing\JobSTM.obj" "StateMachines\Printing\PrintingSTM.obj" + -$(RM) "Main.d" "Common\CheckSum\Checksum.d" "Common\SWUpdate\FileSystem.d" "Common\SWUpdate\FirmwareUpgrade.d" "Common\SW_Info\SW_Info.d" "Common\Software_CRC\sw_crc.d" "Common\Sys_PinOut_Config\MCU_MAIN_pinout.d" "Common\Sys_PinOut_Config\Pin.d" "Common\Sys_PinOut_Config\Pin_config.d" "Common\Utilities\RFIDTagHandling.d" "Common\Utilities\Update.d" "Common\Utilities\Utils.d" "Common\Utilities\delay.d" "Common\Utilities\idle_task.d" "Common\Utilities\ustdlib.d" "Common\protobuf-c\protobuf-c.d" "Common\report\distributor.d" "Common\report\filter.d" "Common\report\reportInit.d" "Communication\CommunicationTask.d" "Communication\Connection.d" "Communication\Container.d" "Communication\PMR\Common\ErrorCode.pb-c.d" "Communication\PMR\Common\ErrorResponse.pb-c.d" "Communication\PMR\Common\MessageContainer.pb-c.d" "Communication\PMR\Common\MessageType.pb-c.d" "Communication\PMR\Connection\ConnectRequest.pb-c.d" "Communication\PMR\Connection\ConnectResponse.pb-c.d" "Communication\PMR\Connection\DeviceInformation.pb-c.d" -$(RM) "Communication\PMR\Connection\DisconnectRequest.pb-c.d" "Communication\PMR\Connection\DisconnectResponse.pb-c.d" "Communication\PMR\Connection\KeepAliveRequest.pb-c.d" "Communication\PMR\Connection\KeepAliveResponse.pb-c.d" "Communication\PMR\Debugging\DebugDistributor.pb-c.d" "Communication\PMR\Debugging\DebugDistributorType.pb-c.d" "Communication\PMR\Debugging\DebugLogCategory.pb-c.d" "Communication\PMR\Debugging\SetDebugLogCategoryRequest.pb-c.d" "Communication\PMR\Debugging\SetDebugLogCategoryResponse.pb-c.d" "Communication\PMR\Debugging\SetupDebugDisributorsRequest.pb-c.d" "Communication\PMR\Debugging\SetupDebugDisributorsResponse.pb-c.d" "Communication\PMR\Debugging\StartDebugLogRequest.pb-c.d" "Communication\PMR\Debugging\StartDebugLogResponse.pb-c.d" "Communication\PMR\Debugging\StopDebugLogRequest.pb-c.d" "Communication\PMR\Debugging\StopDebugLogResponse.pb-c.d" "Communication\PMR\Diagnostics\Cartridge.pb-c.d" "Communication\PMR\Diagnostics\CartridgeAction.pb-c.d" "Communication\PMR\Diagnostics\CartridgeSlot.pb-c.d" -$(RM) "Communication\PMR\Diagnostics\CartridgeTagContent.pb-c.d" "Communication\PMR\Diagnostics\CartridgeValidationRequest.pb-c.d" "Communication\PMR\Diagnostics\CartridgeValidationResponse.pb-c.d" "Communication\PMR\Diagnostics\DataFileFrame.pb-c.d" "Communication\PMR\Diagnostics\DiagnosticsMonitors.pb-c.d" "Communication\PMR\Diagnostics\DigitalInterfaceState.pb-c.d" "Communication\PMR\Diagnostics\DispenserAbortHomingRequest.pb-c.d" "Communication\PMR\Diagnostics\DispenserAbortHomingResponse.pb-c.d" "Communication\PMR\Diagnostics\DispenserAbortJoggingRequest.pb-c.d" "Communication\PMR\Diagnostics\DispenserAbortJoggingResponse.pb-c.d" "Communication\PMR\Diagnostics\DispenserHomingRequest.pb-c.d" "Communication\PMR\Diagnostics\DispenserHomingResponse.pb-c.d" "Communication\PMR\Diagnostics\DispenserJoggingRequest.pb-c.d" "Communication\PMR\Diagnostics\DispenserJoggingResponse.pb-c.d" "Communication\PMR\Diagnostics\DoubleArray.pb-c.d" "Communication\PMR\Diagnostics\Event.pb-c.d" "Communication\PMR\Diagnostics\EventType.pb-c.d" -$(RM) "Communication\PMR\Diagnostics\HeaterState.pb-c.d" "Communication\PMR\Diagnostics\HeaterType.pb-c.d" "Communication\PMR\Diagnostics\InterfaceIOs.pb-c.d" "Communication\PMR\Diagnostics\MotorAbortHomingRequest.pb-c.d" "Communication\PMR\Diagnostics\MotorAbortHomingResponse.pb-c.d" "Communication\PMR\Diagnostics\MotorAbortJoggingRequest.pb-c.d" "Communication\PMR\Diagnostics\MotorAbortJoggingResponse.pb-c.d" "Communication\PMR\Diagnostics\MotorDirection.pb-c.d" "Communication\PMR\Diagnostics\MotorHomingRequest.pb-c.d" "Communication\PMR\Diagnostics\MotorHomingResponse.pb-c.d" "Communication\PMR\Diagnostics\MotorJoggingRequest.pb-c.d" "Communication\PMR\Diagnostics\MotorJoggingResponse.pb-c.d" "Communication\PMR\Diagnostics\ResolveEventRequest.pb-c.d" "Communication\PMR\Diagnostics\ResolveEventResponse.pb-c.d" "Communication\PMR\Diagnostics\SetBlowerStateRequest.pb-c.d" "Communication\PMR\Diagnostics\SetBlowerStateResponse.pb-c.d" "Communication\PMR\Diagnostics\SetComponentValueRequest.pb-c.d" @@ -901,13 +873,12 @@ clean: -$(RM) "Communication\PMR\Stubs\StubMotorStatusRequest.pb-c.d" "Communication\PMR\Stubs\StubMotorStatusResponse.pb-c.d" "Communication\PMR\Stubs\StubMotorStopRequest.pb-c.d" "Communication\PMR\Stubs\StubMotorStopResponse.pb-c.d" "Communication\PMR\Stubs\StubOptLimitSwitchRequest.pb-c.d" "Communication\PMR\Stubs\StubOptLimitSwitchResponse.pb-c.d" "Communication\PMR\Stubs\StubReadEmbeddedVersionRequest.pb-c.d" "Communication\PMR\Stubs\StubReadEmbeddedVersionResponse.pb-c.d" "Communication\PMR\Stubs\StubRealTimeUsageRequest.pb-c.d" "Communication\PMR\Stubs\StubRealTimeUsageResponse.pb-c.d" "Communication\PMR\Stubs\StubSpeedSensorRequest.pb-c.d" "Communication\PMR\Stubs\StubSpeedSensorResponse.pb-c.d" "Communication\PMR\Stubs\StubSteperMotorRequest.pb-c.d" "Communication\PMR\Stubs\StubSteperMotorResponse.pb-c.d" "Communication\PMR\Stubs\StubTempSensorRequest.pb-c.d" "Communication\PMR\Stubs\StubTempSensorResponse.pb-c.d" "Communication\PMR\Stubs\StubTivaReadRegRequest.pb-c.d" "Communication\PMR\Stubs\StubTivaReadRegResponse.pb-c.d" -$(RM) "Communication\PMR\Stubs\StubTivaWriteRegRequest.pb-c.d" "Communication\PMR\Stubs\StubTivaWriteRegResponse.pb-c.d" "Communication\PMR\Stubs\StubValveRequest.pb-c.d" "Communication\PMR\Stubs\StubValveResponse.pb-c.d" "Communication\PMR\Stubs\StubWhsEEpromData.pb-c.d" "Communication\PMR\Stubs\StubWhsEEpromRequest.pb-c.d" "Communication\PMR\Stubs\StubWhsEEpromResponse.pb-c.d" "Communication\PMR\ThreadLoading\ContinueThreadLoadingRequest.pb-c.d" "Communication\PMR\ThreadLoading\ContinueThreadLoadingResponse.pb-c.d" "Communication\PMR\ThreadLoading\StartThreadLoadingRequest.pb-c.d" "Communication\PMR\ThreadLoading\StartThreadLoadingResponse.pb-c.d" "Communication\PMR\ThreadLoading\StopThreadLoadingRequest.pb-c.d" "Communication\PMR\ThreadLoading\StopThreadLoadingResponse.pb-c.d" "Communication\PMR\ThreadLoading\ThreadLoadingState.pb-c.d" "Communication\PMR\ThreadLoading\TryThreadLoadingRequest.pb-c.d" "Communication\PMR\ThreadLoading\TryThreadLoadingResponse.pb-c.d" "Drivers\ADC_Sampling\ADC.d" -$(RM) "Drivers\ADC_Sampling\ADC_DispPressSens.d" "Drivers\ADC_Sampling\ADC_VAC.d" "Drivers\ADC_Sampling\ADC_VOC_Sensor.d" "Drivers\FPGA\FPGA.d" "Drivers\FPGA\FPGA_SPI_Comm.d" "Drivers\FPGA\FPGA_SSI_Comm.d" "Drivers\FPGA\FPGA_GPIO\FPGA_GPIO.d" "Drivers\FPGA\FPGA_INTERRUPTS\FPGA_Interrupts.d" "Drivers\FPGA\Full_Vme\FPGA_Programming_Up.d" "Drivers\FPGA\Full_Vme\ispvme\hardware.d" "Drivers\FPGA\Full_Vme\ispvme\ispvm_ui.d" "Drivers\FPGA\Full_Vme\ispvme\ivm_core.d" "Drivers\FPGA\Motors_Driver\L6470.d" "Drivers\Flash_Memory\FATFS\Control_File_System.d" "Drivers\Flash_Memory\FATFS\cc932.d" "Drivers\Flash_Memory\FATFS\fatfs_port_mx66l51235f.d" "Drivers\Flash_Memory\FATFS\ff.d" "Drivers\Flash_Memory\FATFS\mx66l51235f.d" "Drivers\Flash_Memory\FATFS\spi_flash.d" "Drivers\Flash_Memory\Flash_Memory.d" "Drivers\Heater\ADS1220.d" "Drivers\Heater\Heater.d" "Drivers\Heater\TemperatureSensor.d" "Drivers\I2C_Communication\ADC_MUX\ADC_MUX.d" "Drivers\I2C_Communication\DAC\Blower.d" "Drivers\I2C_Communication\Dispenser_Card\EEPROM\Dispenser_EEPROM.d" - -$(RM) "Drivers\I2C_Communication\Dispenser_Card\I2C_Dispenser_Card_Mux.d" "Drivers\I2C_Communication\Dispenser_Card\IO_Ports\Dispenser_IO.d" "Drivers\I2C_Communication\Head_Card\ADC\Head_ADC.d" "Drivers\I2C_Communication\Head_Card\ADC\Head_ADC_old.d" "Drivers\I2C_Communication\Head_Card\EEPROM\Head_EEPROM.d" "Drivers\I2C_Communication\Head_Card\Fan\Head_Fan.d" "Drivers\I2C_Communication\Head_Card\Fan\fan_click.d" "Drivers\I2C_Communication\Head_Card\I2C_Head_Mux.d" "Drivers\I2C_Communication\Head_Card\IO_Ports\Head_IO.d" "Drivers\I2C_Communication\Head_Card\IO_Ports\Heaters\Head_Heaters.d" "Drivers\I2C_Communication\Head_Card\PT100\Head_PT100_ADC.d" "Drivers\I2C_Communication\I2C.d" "Drivers\I2C_Communication\I2C_Comm.d" "Drivers\I2C_Communication\I2C_FIFO.d" "Drivers\I2C_Communication\I2C_Task.d" "Drivers\I2C_Communication\ektm4c129_i2c_master_udma_fifo.d" "Drivers\I2C_Communication\Main_Board_EEPROM\Main_EEPROM.d" "Drivers\I2C_Communication\RFID_NFC\NFC.d" "Drivers\I2C_Communication\RFID_NFC\NFC_MainBaord.d" - -$(RM) "Drivers\I2C_Communication\RFID_NFC\NFC_I2C\NFC_I2C.d" "Drivers\I2C_Communication\RFID_NFC\NFC_I2C\Test_NFC.d" "Drivers\I2C_Communication\RFID_NFC\PN7150\PN7150.d" "Drivers\I2C_Communication\RFID_NFC\logi-tag\LT_NFC.d" "Drivers\I2C_Communication\RFID_NFC\logi-tag\LT_RFID.d" "Drivers\I2C_Communication\Thermo_K\MCP9600.d" "Drivers\I2C_Communication\WHS_Card\D_AD5272_Rheostat\AD5272_Driver.d" "Drivers\I2C_Communication\WHS_Card\D_AD5272_Rheostat\WHS_Rheostat.d" "Drivers\I2C_Communication\WHS_Card\D_ADS122_PT100\ADS122X04_Driver.d" "Drivers\I2C_Communication\WHS_Card\D_ADS122_PT100\WHS_PT100_ADC.d" "Drivers\I2C_Communication\WHS_Card\D_EMC2302_Fan\D_EMC2302_fan.d" "Drivers\I2C_Communication\WHS_Card\D_EMC2302_Fan\WHS_Fan.d" "Drivers\I2C_Communication\WHS_Card\D_MAX11614_ADC\MAX11614_Driver.d" "Drivers\I2C_Communication\WHS_Card\D_MAX11614_ADC\WHS_MAX11614_A2D.d" "Drivers\I2C_Communication\WHS_Card\D_Max5805_ADC_Blower\Max_5805_Driver.d" "Drivers\I2C_Communication\WHS_Card\D_Max5805_ADC_Blower\WHS_Blower.d" - -$(RM) "Drivers\I2C_Communication\WHS_Card\D_TCA9546_ADC_MUX\TCA9546_Driver.d" "Drivers\I2C_Communication\WHS_Card\EEPROM\D_EEPROM.d" "Drivers\I2C_Communication\WHS_Card\EEPROM\WHS_EEPROM.d" "Drivers\I2C_Communication\WHS_Card\I2C_WHS_Fan_Mux.d" "Drivers\I2C_Communication\WHS_Card\I2C_WHS_Mux.d" "Drivers\I2C_Communication\WHS_Card\IO_Extender_Ports_TCA9555\TCA9555_Driver.d" "Drivers\I2C_Communication\WHS_Card\IO_Extender_Ports_TCA9555\WHS_IO.d" "Drivers\Motors\Motor.d" "Drivers\Motors\MotorActions.d" "Drivers\On_Chip_Flash\Flashstore.d" "Drivers\SPI\SPI_Comm.d" "Drivers\SSI_Comm\Dancer\Dancer.d" "Drivers\SSI_Comm\SSI_Comm.d" "Drivers\SSI_Comm\Speed_Sensor\Speed_Sensor.d" "Drivers\USB_Communication\USBCDCD.d" "Drivers\Uart_Comm\Uart.d" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\ascii\mbascii.d" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\functions\mbfunccoils.d" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\functions\mbfuncdiag.d" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\functions\mbfuncdisc.d" - -$(RM) "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\functions\mbfuncholding.d" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\functions\mbfuncinput.d" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\functions\mbfuncother.d" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\functions\mbutils.d" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\mb.d" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\rtu\mbcrc.d" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\rtu\mbrtu.d" "Drivers\Uart_Comm\WHS_Controller_Comm\Modbus\tcp\mbtcp.d" "Drivers\Uart_Comm\WHS_Controller_Comm\Shinko\ACS-13AC5E3.d" "Drivers\Uart_Comm\WHS_Controller_Comm\WHS_UART\WHS_Uart.d" "Drivers\Valves\Valve.d" "Drivers\flash_ram\FlashProgram.d" "Drivers\flash_ram\MCU_E2Prom.d" "Modules\AlarmHandling\AlarmHandling.d" "Modules\Control\DriverWithCallbackExample.d" "Modules\Control\MillisecTask.d" "Modules\Control\PIDAlgo.d" "Modules\Control\control.d" "Modules\Diagnostics\DiagnosticActions.d" "Modules\Diagnostics\Diagnostics.d" "Modules\Diagnostics\DiagnosticsHoming.d" - -$(RM) "Modules\Diagnostics\DiagnosticsJogging.d" "Modules\General\GeneralHardware.d" "Modules\General\MachineStatus.d" "Modules\General\Safety.d" "Modules\General\buttons.d" "Modules\General\process.d" "Modules\Heaters\Heaters_bit.d" "Modules\Heaters\Heaters_init.d" "Modules\Heaters\Heaters_maint.d" "Modules\Heaters\Heaters_print.d" "Modules\IDS\IDS_BIT.d" "Modules\IDS\IDS_Cleaning.d" "Modules\IDS\IDS_dispenser.d" "Modules\IDS\IDS_init.d" "Modules\IDS\IDS_maint.d" "Modules\IDS\IDS_print.d" "Modules\IFS\ifs.d" "Modules\Stubs_Handler\Calculate.d" "Modules\Stubs_Handler\Progress.d" "Modules\Stubs_Handler\StubRealTimeUsage.d" "Modules\Stubs_Handler\Stub_Cartridge.d" "Modules\Stubs_Handler\Stub_Dancer.d" "Modules\Stubs_Handler\Stub_Dispenser.d" "Modules\Stubs_Handler\Stub_ExtFlash.d" "Modules\Stubs_Handler\Stub_FPGARWReg.d" "Modules\Stubs_Handler\Stub_FPGAReadBackReg.d" "Modules\Stubs_Handler\Stub_FPGAReadVersion.d" "Modules\Stubs_Handler\Stub_GPIO.d" "Modules\Stubs_Handler\Stub_HW_Version.d" "Modules\Stubs_Handler\Stub_Heater.d" - -$(RM) "Modules\Stubs_Handler\Stub_I2C.d" "Modules\Stubs_Handler\Stub_IntADC.d" "Modules\Stubs_Handler\Stub_L6470.d" "Modules\Stubs_Handler\Stub_MidTankPressureSensor.d" "Modules\Stubs_Handler\Stub_Motor.d" "Modules\Stubs_Handler\Stub_OptLimitSwitch.d" "Modules\Stubs_Handler\Stub_ReadEmbeddedVersion.d" "Modules\Stubs_Handler\Stub_SpeedSensor.d" "Modules\Stubs_Handler\Stub_Status.d" "Modules\Stubs_Handler\Stub_SteperMotor.d" "Modules\Stubs_Handler\Stub_TempSensor.d" "Modules\Stubs_Handler\Stub_TivaReg.d" "Modules\Stubs_Handler\Stub_Valve.d" "Modules\Stubs_Handler\User_Leds.d" "Modules\Stubs_Handler\temperature_sensor.d" "Modules\Thread\ThreadLoad.d" "Modules\Thread\Thread_BIT.d" "Modules\Thread\Thread_Winder.d" "Modules\Thread\Thread_init.d" "Modules\Thread\Thread_maint.d" "Modules\Thread\Thread_print.d" "Modules\Waste\Waste_BIT.d" "Modules\Waste\Waste_init.d" "Modules\Waste\Waste_maint.d" "Modules\Waste\Waste_print.d" "Modules\Waste\newWHS_init.d" "StateMachines\Initialization\InitSequence.d" - -$(RM) "StateMachines\Initialization\PowerIdle.d" "StateMachines\Initialization\PowerOffSequence.d" "StateMachines\Printing\JobSTM.d" "StateMachines\Printing\PrintingSTM.d" + -$(RM) "Drivers\I2C_Communication\Dispenser_Card\I2C_Dispenser_Card_Mux.d" "Drivers\I2C_Communication\Dispenser_Card\IO_Ports\Dispenser_IO.d" "Drivers\I2C_Communication\Head_Card\ADC\Head_ADC.d" "Drivers\I2C_Communication\Head_Card\EEPROM\Head_EEPROM.d" "Drivers\I2C_Communication\Head_Card\Fan\Head_Fan.d" "Drivers\I2C_Communication\Head_Card\Fan\fan_click.d" "Drivers\I2C_Communication\Head_Card\I2C_Head_Mux.d" "Drivers\I2C_Communication\Head_Card\IO_Ports\Head_IO.d" "Drivers\I2C_Communication\Head_Card\IO_Ports\Heaters\Head_Heaters.d" "Drivers\I2C_Communication\Head_Card\PT100\Head_PT100_ADC.d" "Drivers\I2C_Communication\I2C.d" "Drivers\I2C_Communication\I2C_Comm.d" "Drivers\I2C_Communication\I2C_FIFO.d" "Drivers\I2C_Communication\I2C_Task.d" "Drivers\I2C_Communication\ektm4c129_i2c_master_udma_fifo.d" "Drivers\I2C_Communication\test_fifo_dma.d" "Drivers\I2C_Communication\Main_Board_EEPROM\Main_EEPROM.d" "Drivers\I2C_Communication\RFID_NFC\I2C_IFS_Mux.d" "Drivers\I2C_Communication\RFID_NFC\NFC.d" + -$(RM) "Drivers\I2C_Communication\RFID_NFC\NFC_MainBaord.d" "Drivers\I2C_Communication\RFID_NFC\Test_RFID.d" "Drivers\I2C_Communication\RFID_NFC\logi-tag\LT_NFC.d" "Drivers\I2C_Communication\RFID_NFC\logi-tag\LT_RFID.d" "Drivers\I2C_Communication\Thermo_K\MCP9600.d" "Drivers\I2C_Communication\WHS_Card\D_AD5272_Rheostat\AD5272_Driver.d" "Drivers\I2C_Communication\WHS_Card\D_AD5272_Rheostat\WHS_Rheostat.d" "Drivers\I2C_Communication\WHS_Card\D_ADS122_PT100\ADS122X04_Driver.d" "Drivers\I2C_Communication\WHS_Card\D_ADS122_PT100\WHS_PT100_ADC.d" "Drivers\I2C_Communication\WHS_Card\D_EMC2302_Fan\D_EMC2302_fan.d" "Drivers\I2C_Communication\WHS_Card\D_EMC2302_Fan\WHS_Fan.d" "Drivers\I2C_Communication\WHS_Card\D_MAX11614_ADC\MAX11614_Driver.d" "Drivers\I2C_Communication\WHS_Card\D_MAX11614_ADC\WHS_MAX11614_A2D.d" "Drivers\I2C_Communication\WHS_Card\D_Max5805_ADC_Blower\Max_5805_Driver.d" "Drivers\I2C_Communication\WHS_Card\D_Max5805_ADC_Blower\WHS_Blower.d" "Drivers\I2C_Communication\WHS_Card\D_TCA9546_ADC_MUX\TCA9546_Driver.d" + -$(RM) "Drivers\I2C_Communication\WHS_Card\EEPROM\D_EEPROM.d" "Drivers\I2C_Communication\WHS_Card\EEPROM\WHS_EEPROM.d" "Drivers\I2C_Communication\WHS_Card\I2C_WHS_Fan_Mux.d" "Drivers\I2C_Communication\WHS_Card\I2C_WHS_Mux.d" "Drivers\I2C_Communication\WHS_Card\IO_Extender_Ports_TCA9555\TCA9555_Driver.d" "Drivers\I2C_Communication\WHS_Card\IO_Extender_Ports_TCA9555\WHS_IO.d" "Drivers\Motors\Motor.d" "Drivers\Motors\MotorActions.d" "Drivers\On_Chip_Flash\Flashstore.d" "Drivers\SPI\SPI_Comm.d" "Drivers\SSI_Comm\Dancer\Dancer.d" "Drivers\SSI_Comm\SSI_Comm.d" "Drivers\SSI_Comm\Speed_Sensor\Speed_Sensor.d" "Drivers\USB_Communication\USBCDCD.d" "Drivers\Uart_Comm\Uart.d" "Drivers\Uart_Comm\WHS_Controller_Comm\Shinko\ACS-13AC5E3.d" "Drivers\Uart_Comm\WHS_Controller_Comm\WHS_UART\WHS_Uart.d" "Drivers\Valves\Valve.d" "Drivers\flash_ram\FlashProgram.d" "Drivers\flash_ram\MCU_E2Prom.d" "Modules\AlarmHandling\AlarmHandling.d" "Modules\Control\DriverWithCallbackExample.d" "Modules\Control\MillisecTask.d" "Modules\Control\PIDAlgo.d" + -$(RM) "Modules\Control\control.d" "Modules\Diagnostics\DiagnosticActions.d" "Modules\Diagnostics\Diagnostics.d" "Modules\Diagnostics\DiagnosticsHoming.d" "Modules\Diagnostics\DiagnosticsJogging.d" "Modules\General\GeneralHardware.d" "Modules\General\MachineStatus.d" "Modules\General\Safety.d" "Modules\General\buttons.d" "Modules\General\process.d" "Modules\Heaters\Heaters_bit.d" "Modules\Heaters\Heaters_init.d" "Modules\Heaters\Heaters_maint.d" "Modules\Heaters\Heaters_print.d" "Modules\IDS\IDS_BIT.d" "Modules\IDS\IDS_Cleaning.d" "Modules\IDS\IDS_dispenser.d" "Modules\IDS\IDS_init.d" "Modules\IDS\IDS_maint.d" "Modules\IDS\IDS_print.d" "Modules\IFS\ifs.d" "Modules\Stubs_Handler\Calculate.d" "Modules\Stubs_Handler\Progress.d" "Modules\Stubs_Handler\StubRealTimeUsage.d" "Modules\Stubs_Handler\Stub_Cartridge.d" "Modules\Stubs_Handler\Stub_Dancer.d" "Modules\Stubs_Handler\Stub_Dispenser.d" "Modules\Stubs_Handler\Stub_ExtFlash.d" "Modules\Stubs_Handler\Stub_FPGARWReg.d" "Modules\Stubs_Handler\Stub_FPGAReadBackReg.d" + -$(RM) "Modules\Stubs_Handler\Stub_FPGAReadVersion.d" "Modules\Stubs_Handler\Stub_GPIO.d" "Modules\Stubs_Handler\Stub_HW_Version.d" "Modules\Stubs_Handler\Stub_Heater.d" "Modules\Stubs_Handler\Stub_I2C.d" "Modules\Stubs_Handler\Stub_IntADC.d" "Modules\Stubs_Handler\Stub_L6470.d" "Modules\Stubs_Handler\Stub_MidTankPressureSensor.d" "Modules\Stubs_Handler\Stub_Motor.d" "Modules\Stubs_Handler\Stub_OptLimitSwitch.d" "Modules\Stubs_Handler\Stub_ReadEmbeddedVersion.d" "Modules\Stubs_Handler\Stub_SpeedSensor.d" "Modules\Stubs_Handler\Stub_Status.d" "Modules\Stubs_Handler\Stub_SteperMotor.d" "Modules\Stubs_Handler\Stub_TempSensor.d" "Modules\Stubs_Handler\Stub_TivaReg.d" "Modules\Stubs_Handler\Stub_Valve.d" "Modules\Stubs_Handler\User_Leds.d" "Modules\Stubs_Handler\temperature_sensor.d" "Modules\Thread\ThreadLoad.d" "Modules\Thread\Thread_BIT.d" "Modules\Thread\Thread_Winder.d" "Modules\Thread\Thread_init.d" "Modules\Thread\Thread_maint.d" "Modules\Thread\Thread_print.d" "Modules\Waste\Waste_BIT.d" "Modules\Waste\Waste_init.d" + -$(RM) "Modules\Waste\Waste_maint.d" "Modules\Waste\newWHS_init.d" "StateMachines\Initialization\InitSequence.d" "StateMachines\Initialization\PowerIdle.d" "StateMachines\Initialization\PowerOffSequence.d" "StateMachines\Printing\JobSTM.d" "StateMachines\Printing\PrintingSTM.d" -@echo 'Finished clean' -@echo ' ' @@ -916,7 +887,7 @@ pre-build: -@echo ' ' post-build: - -"C:/TI/ccsv7/utils/tiobj2bin/tiobj2bin" "Embedded.out" "Embedded.bin" "C:/TI/ccsv7/tools/compiler/ti-cgt-arm_16.9.4.LTS/bin/armofd" "C:/TI/ccsv7/tools/compiler/ti-cgt-arm_16.9.4.LTS/bin/armhex" "C:/TI/ccsv7/utils/tiobj2bin/mkhex4bin" + -"C:/ti/ccsv7/utils/tiobj2bin/tiobj2bin" "Embedded.out" "Embedded.bin" "C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/bin/armofd" "C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/bin/armhex" "C:/ti/ccsv7/utils/tiobj2bin/mkhex4bin" -@echo ' ' .PHONY: all clean dependents diff --git a/Software/Embedded_SW/Embedded/debug_w_pmr/sources.mk b/Software/Embedded_SW/Embedded/debug_w_pmr/sources.mk index 5e25513c4..a7125af0d 100644 --- a/Software/Embedded_SW/Embedded/debug_w_pmr/sources.mk +++ b/Software/Embedded_SW/Embedded/debug_w_pmr/sources.mk @@ -171,8 +171,6 @@ Drivers/I2C_Communication/Head_Card/PT100 \ Drivers/I2C_Communication \ Drivers/I2C_Communication/Main_Board_EEPROM \ Drivers/I2C_Communication/RFID_NFC \ -Drivers/I2C_Communication/RFID_NFC/NFC_I2C \ -Drivers/I2C_Communication/RFID_NFC/PN7150 \ Drivers/I2C_Communication/RFID_NFC/logi-tag \ Drivers/I2C_Communication/Thermo_K \ Drivers/I2C_Communication/WHS_Card/D_AD5272_Rheostat \ @@ -192,11 +190,6 @@ Drivers/SSI_Comm \ Drivers/SSI_Comm/Speed_Sensor \ Drivers/USB_Communication \ Drivers/Uart_Comm \ -Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/ascii \ -Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/functions \ -Drivers/Uart_Comm/WHS_Controller_Comm/Modbus \ -Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/rtu \ -Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/tcp \ Drivers/Uart_Comm/WHS_Controller_Comm/Shinko \ Drivers/Uart_Comm/WHS_Controller_Comm/WHS_UART \ Drivers/Valves \ diff --git a/Software/Embedded_SW/Embedded/debug_w_pmr/subdir_rules.mk b/Software/Embedded_SW/Embedded/debug_w_pmr/subdir_rules.mk index c9da089bb..6ac9b689c 100644 --- a/Software/Embedded_SW/Embedded/debug_w_pmr/subdir_rules.mk +++ b/Software/Embedded_SW/Embedded/debug_w_pmr/subdir_rules.mk @@ -6,13 +6,13 @@ SHELL = cmd.exe # Each subdirectory must supply rules for building sources it contributes build-306001487: - @$(MAKE) -Onone -f subdir_rules.mk build-306001487-inproc + @$(MAKE) --no-print-directory -Onone -f subdir_rules.mk build-306001487-inproc build-306001487-inproc: ../Embedded.cfg - @echo 'Building file: $<' + @echo 'Building file: "$<"' @echo 'Invoking: XDCtools' - "C:/TI/xdctools_3_32_00_06_core/xs" --xdcpath="C:/ti/tirtos_tivac_2_16_00_08/packages;C:/ti/tirtos_tivac_2_16_00_08/products/tidrivers_tivac_2_16_00_08/packages;C:/ti/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages;C:/ti/tirtos_tivac_2_16_00_08/products/ndk_2_25_00_09/packages;C:/ti/tirtos_tivac_2_16_00_08/products/uia_2_00_05_50/packages;C:/ti/tirtos_tivac_2_16_00_08/products/ns_1_11_00_10/packages;C:/ti/TivaWare_C_Series-2.1.2.111;C:/TI/ccsv7/ccs_base;" xdc.tools.configuro -o configPkg -t ti.targets.arm.elf.M4F -p ti.platforms.tiva:TM4C129XNCZAD -r release -c "C:/TI/ccsv7/tools/compiler/ti-cgt-arm_16.9.4.LTS" --compileOptions "-mv7M4 --code_state=16 --float_support=FPv4SPD16 -me" "$<" - @echo 'Finished building: $<' + "C:/ti/xdctools_3_32_00_06_core/xs" --xdcpath="C:/ti/tirtos_tivac_2_16_00_08/packages;C:/ti/tirtos_tivac_2_16_00_08/products/tidrivers_tivac_2_16_00_08/packages;C:/ti/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages;C:/ti/tirtos_tivac_2_16_00_08/products/ndk_2_25_00_09/packages;C:/ti/tirtos_tivac_2_16_00_08/products/uia_2_00_05_50/packages;C:/ti/tirtos_tivac_2_16_00_08/products/ns_1_11_00_10/packages;C:/ti/TivaWare_C_Series-2.1.2.111;C:/ti/ccsv7/ccs_base;" xdc.tools.configuro -o configPkg -t ti.targets.arm.elf.M4F -p ti.platforms.tiva:TM4C129XNCZAD -r release -c "C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS" --compileOptions "-mv7M4 --code_state=16 --float_support=FPv4SPD16 -me" "$<" + @echo 'Finished building: "$<"' @echo ' ' configPkg/linker.cmd: build-306001487 ../Embedded.cfg @@ -20,17 +20,10 @@ configPkg/compiler.opt: build-306001487 configPkg/: build-306001487 Main.obj: ../Main.c $(GEN_OPTS) | $(GEN_HDRS) - @echo 'Building file: $<' + @echo 'Building file: "$<"' @echo 'Invoking: ARM Compiler' - "C:/TI/ccsv7/tools/compiler/ti-cgt-arm_16.9.4.LTS/bin/armcl" -mv7M4 --code_state=16 --float_support=FPv4SPD16 -me -Ooff --opt_for_speed=0 --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/ndk_2_25_00_09/packages/ti/ndk/inc/bsd" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Common/protobuf-c" --include_path="C:/Tango/Software/Embedded_SW/Embedded" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Hardware" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Printing" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Common" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Debugging" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Common" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Modules" --include_path="C:/ti/TivaWare_C_Series-2.1.2.111" --include_path="C:/ti/xdctools_3_32_00_06_core/include" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/TivaWare_C_Series-2.1.1.71b" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/ti/sysbios/posix" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/tidrivers_tivac_2_16_00_08" --include_path="C:/TI/ccsv7/tools/compiler/ti-cgt-arm_16.9.4.LTS/include" --define=ENABLE_LFN --define=DEBUG_TEST_FUNCTIONS --define=TARGET_IS_TM4C129_RA0 --define=ccs="ccs" --define=ccs --define=TIVAWARE --define=PART_TM4C129XNCZAD -g --gcc --diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number --abi=eabi --preproc_with_compile --preproc_dependency="Main.d_raw" $(GEN_OPTS__FLAG) "$<" - @echo 'Finished building: $<' - @echo ' ' - -delay.obj: ../delay.c $(GEN_OPTS) | $(GEN_HDRS) - @echo 'Building file: $<' - @echo 'Invoking: ARM Compiler' - "C:/TI/ccsv7/tools/compiler/ti-cgt-arm_16.9.4.LTS/bin/armcl" -mv7M4 --code_state=16 --float_support=FPv4SPD16 -me -Ooff --opt_for_speed=0 --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/ndk_2_25_00_09/packages/ti/ndk/inc/bsd" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Common/protobuf-c" --include_path="C:/Tango/Software/Embedded_SW/Embedded" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Hardware" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Printing" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Common" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Debugging" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Common" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Modules" --include_path="C:/ti/TivaWare_C_Series-2.1.2.111" --include_path="C:/ti/xdctools_3_32_00_06_core/include" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/TivaWare_C_Series-2.1.1.71b" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/ti/sysbios/posix" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/tidrivers_tivac_2_16_00_08" --include_path="C:/TI/ccsv7/tools/compiler/ti-cgt-arm_16.9.4.LTS/include" --define=ENABLE_LFN --define=DEBUG_TEST_FUNCTIONS --define=TARGET_IS_TM4C129_RA0 --define=ccs="ccs" --define=ccs --define=TIVAWARE --define=PART_TM4C129XNCZAD -g --gcc --diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number --abi=eabi --preproc_with_compile --preproc_dependency="delay.d_raw" $(GEN_OPTS__FLAG) "$<" - @echo 'Finished building: $<' + "C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/bin/armcl" -mv7M4 --code_state=16 --float_support=FPv4SPD16 -me -Ooff --opt_for_speed=0 --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/ndk_2_25_00_09/packages/ti/ndk/inc/bsd" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Common/protobuf-c" --include_path="C:/Tango/Software/Embedded_SW/Embedded" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Hardware" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Printing" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Common" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Debugging" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Common" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Modules" --include_path="C:/ti/TivaWare_C_Series-2.1.2.111" --include_path="C:/ti/xdctools_3_32_00_06_core/include" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/TivaWare_C_Series-2.1.1.71b" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/ti/sysbios/posix" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/tidrivers_tivac_2_16_00_08" --include_path="C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/include" --define=ENABLE_LFN --define=DEBUG_TEST_FUNCTIONS --define=TARGET_IS_TM4C129_RA0 --define=ccs="ccs" --define=ccs --define=TIVAWARE --define=PART_TM4C129XNCZAD -g --gcc --diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number --abi=eabi --preproc_with_compile --preproc_dependency="Main.d_raw" $(GEN_OPTS__FLAG) "$<" + @echo 'Finished building: "$<"' @echo ' ' diff --git a/Software/Embedded_SW/Embedded/debug_w_pmr/subdir_vars.mk b/Software/Embedded_SW/Embedded/debug_w_pmr/subdir_vars.mk index 7aa0e8205..9e69ad7a4 100644 --- a/Software/Embedded_SW/Embedded/debug_w_pmr/subdir_vars.mk +++ b/Software/Embedded_SW/Embedded/debug_w_pmr/subdir_vars.mk @@ -12,8 +12,7 @@ CMD_SRCS += \ ../tm4c129xnczad.cmd C_SRCS += \ -../Main.c \ -../delay.c +../Main.c GEN_CMDS += \ ./configPkg/linker.cmd @@ -26,33 +25,28 @@ GEN_MISC_DIRS += \ ./configPkg/ C_DEPS += \ -./Main.d \ -./delay.d +./Main.d GEN_OPTS += \ ./configPkg/compiler.opt OBJS += \ -./Main.obj \ -./delay.obj +./Main.obj GEN_MISC_DIRS__QUOTED += \ "configPkg\" OBJS__QUOTED += \ -"Main.obj" \ -"delay.obj" +"Main.obj" C_DEPS__QUOTED += \ -"Main.d" \ -"delay.d" +"Main.d" GEN_FILES__QUOTED += \ "configPkg\linker.cmd" \ "configPkg\compiler.opt" C_SRCS__QUOTED += \ -"../Main.c" \ -"../delay.c" +"../Main.c" diff --git a/Software/Embedded_SW/Embedded/src/makefile.libs b/Software/Embedded_SW/Embedded/src/makefile.libs index ae6999352..f262762ef 100644 --- a/Software/Embedded_SW/Embedded/src/makefile.libs +++ b/Software/Embedded_SW/Embedded/src/makefile.libs @@ -1,6 +1,6 @@ # # This file was generated based on the configuration script: -# C:\tango\Software\Embedded_SW\Embedded\Embedded.cfg +# C:\Tango\Software\Embedded_SW\Embedded\Embedded.cfg # # This makefile may be included in other makefiles that need to build # the libraries containing the compiled source files generated as @@ -14,7 +14,7 @@ # # The absolute path to the generated source directory (at the time the # sources were generated) is: -# C:\tango\Software\Embedded_SW\Embedded\src +# C:\Tango\Software\Embedded_SW\Embedded\src # GEN_SRC_DIR ?= ../src diff --git a/Software/Embedded_SW/Embedded/src/sysbios/makefile b/Software/Embedded_SW/Embedded/src/sysbios/makefile index a8280a913..b1ccf442b 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_Task_DISABLE_ALL_HOOKS -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=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_INC = -I"C:/ti/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/" @@ -18,9 +18,9 @@ TARGET_INC = -I"C:/ti/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/ INCS = $(BIOS_INC) $(TARGET_INC) -CC = C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.2.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.2.LTS/include -ASM = C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.2.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.2.LTS/include -AR = C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.2.LTS/bin/armar rq +CC = C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/include +ASM = C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/include +AR = C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/bin/armar rq DEL = C:/ti/xdctools_3_32_00_06_core/packages/../bin/rm -f CP = C:/ti/xdctools_3_32_00_06_core/packages/../bin/cp -f diff --git a/Software/Embedded_SW/Embedded/src/sysbios/sysbios.aem4f b/Software/Embedded_SW/Embedded/src/sysbios/sysbios.aem4f Binary files differindex 5708939be..41e969041 100644 --- a/Software/Embedded_SW/Embedded/src/sysbios/sysbios.aem4f +++ b/Software/Embedded_SW/Embedded/src/sysbios/sysbios.aem4f |