diff options
Diffstat (limited to 'Software')
7 files changed, 20 insertions, 100 deletions
diff --git a/Software/Embedded_SW/Embedded/Common/Utilities/Utils.c b/Software/Embedded_SW/Embedded/Common/Utilities/Utils.c index 0a586d9cb..10bfdc8d9 100644 --- a/Software/Embedded_SW/Embedded/Common/Utilities/Utils.c +++ b/Software/Embedded_SW/Embedded/Common/Utilities/Utils.c @@ -130,9 +130,6 @@ void InitWatchdog(uint32_t clock) void utilsInit(uint32_t ui32SysClock) { - cb_init(); -// SysTickPeriodSet(120000); -// SysTickEnable(); // Configure Hibernate module clock. // HibernateEnableExpClk(ui32SysClock); @@ -180,70 +177,4 @@ void UtilsSetCommunicationOk(void) sendDataToHost = true; } -typedef struct circular_buffer -{ - void *buffer; // data buffer - void *buffer_end; // end of data buffer - uint16_t capacity; // maximum number of items in the buffer - uint16_t count; // number of items in the buffer - uint16_t sz; // size of each item in the buffer - void *head; // pointer to head - void *tail; // pointer to tail -} circular_buffer; - -uint8_t LogBuffer[8002]; -circular_buffer cb; -void cb_init() -{ - //cb.buffer = malloc(capacity * sz); - //if(cb.buffer == NULL) - // handle error - cb.buffer = LogBuffer; - cb.buffer_end = &LogBuffer[3950]; - cb.capacity = 4000; - cb.count = 0; - cb.sz = 60; - cb.head = cb.buffer; - cb.tail = cb.buffer; -} - -void cb_free(circular_buffer *cb) -{ - //free(cb.buffer); - // clear out other fields too, just to be safe -} -void cb_push_back(/*circular_buffer *cb,*/ const void *item, int size) -{ - return; - /* - if(cb.count == cb.capacity){ - return; - // handle error - } - if ((int)(cb.head) + size > (int)(cb.buffer_end)){ - size = (int)(cb.buffer_end) - (int)(cb.head); - } - - memcpy(cb.head, item, size); - cb.head = (char*)cb.head + size; - if(cb.head >= cb.buffer_end) - cb.head = cb.buffer; - cb.count++; -// if (sendDataToHost) -// SendMessageToHost(DEBUG_LOG,item); - - */ -} - -void cb_pop_front(/*circular_buffer *cb,*/ void *item) -{ - if(cb.count == 0){ - // handle error - } - memcpy(item, cb.tail, cb.sz); - cb.tail = (char*)cb.tail + cb.sz; - if(cb.tail == cb.buffer_end) - cb.tail = cb.buffer; - cb.count--; -} diff --git a/Software/Embedded_SW/Embedded/Common/Utilities/Utils.h b/Software/Embedded_SW/Embedded/Common/Utilities/Utils.h index 363cf6eec..37eade5c4 100644 --- a/Software/Embedded_SW/Embedded/Common/Utilities/Utils.h +++ b/Software/Embedded_SW/Embedded/Common/Utilities/Utils.h @@ -21,8 +21,6 @@ typedef enum }Danser_t; -void cb_init(); -void cb_push_back(/*void *cb,*/ const void *item, int size); void utilsInit(uint32_t ui32SysClock); uint32_t UsersysTickGet (void); bool DanserCheckPosition(uint16_t position , Danser_t danser, bool test); diff --git a/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c b/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c index 60ef7feb3..2c9e6e154 100644 --- a/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c +++ b/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c @@ -858,17 +858,12 @@ void USBCDCD_Reinit(void) //----------------------------------------------------------- void USBCDC_close(void) { - uint32_t tick = 0; - char str[60]; - uint8_t len = 0; tick = UsersysTickGet(); USBDCompositeTerm(USBDComposite); USBCDCD_Reinit(); - len = usnprintf(str, 60, "\r\n USBCDCD_Reinit tick %d state %d",tick, state ); - cb_push_back (str, len); } /************************************************************** diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c index d575b0b6e..db4dbb1f0 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c @@ -12,7 +12,7 @@ DispenserConfigStruc DispensersCfg[ MAX_SYSTEM_DISPENSERS]; -uint32_t DispenserIdToMotorId[MAX_SYSTEM_DISPENSERS] = {MOTOR_DISPENSER_1,MOTOR_DISPENSER_2,MOTOR_DISPENSER_3,MOTOR_DISPENSER_4,MOTOR_DISPENSER_5,MOTOR_DISPENSER_6,MOTOR_DISPENSER_7,MOTOR_DISPENSER_8,}; +uint32_t DispenserIdToMotorId[MAX_SYSTEM_DISPENSERS] = {MOTOR_DISPENSER_1,MOTOR_DISPENSER_2,MOTOR_DISPENSER_3,MOTOR_DISPENSER_4,MOTOR_DISPENSER_5,MOTOR_DISPENSER_6,MOTOR_DISPENSER_7,MOTOR_DISPENSER_8}; diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h b/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h index f0dd35da9..f568f9816 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h @@ -45,7 +45,18 @@ typedef struct int32_t pulsepermmspring; int id; //HardwareDancerType }DancerConfigStruc; -#define MAX_THREAD_MOTORS_NUM HARDWARE_MOTOR_TYPE__WinderMotor +1 + +typedef enum threadMotorsEnum +{ + FEEDER_MOTOR, + DRYER_MOTOR, + POOLER_MOTOR, + WINDER_MOTOR, + SCREW_MOTOR, + MAX_THREAD_MOTORS_NUM +}threadMotorsEnum; + +extern uint32_t ThreadMotorIdToMotorId[MAX_THREAD_MOTORS_NUM]; extern MotorConfigStruc MotorsCfg[MAX_THREAD_MOTORS_NUM]; diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index 44e5c8936..89ff63363 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -26,6 +26,9 @@ typedef enum Stop } ReturnCode; + +uint32_t ThreadMotorIdToMotorId[MAX_THREAD_MOTORS_NUM] = {MOTOR_RDRIVING,MOTOR_DRYER_DRIVING,MOTOR_LDRIVING,MOTOR_WINDER,MOTOR_SCREW}; + /******************************************************************************************** * functions describes motor operation flow and movement state during profile execution * used to operate in runtime correct profileflow execution @@ -282,20 +285,9 @@ bool ThreadPrintingIterate(void *JobDetails) // screw_movement[gPrintingState[_motorId]]++; ReturnCode returnCode = state_fun(JobDetails); - /*if ((_motorId == SCREW_MOTOR)&&(pause_active)) - { - tick = UsersysTickGet(); - len = usnprintf(str, 60, "\r\n PrintingIterate tick %d state %d retcode %d ",tick, gPrintingState[_motorId],returnCode); - cb_push_back (str, len); - //SendInterruptMessageToHost(10+gPrintingState[_motorId],returnCode); - }*/ gPrintingState = LookupTransitions(gPrintingState, returnCode); - if (keepstate != gPrintingState){ - tick = UsersysTickGet(); - len = usnprintf(str, 60, "\r\n changed state tick %d state %d retcode %d ", tick, gPrintingState,returnCode); - cb_push_back (str, len); - - } +// if (keepstate != gPrintingState){ +// } // // Enable all interrupts. diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c index a3e810127..e1635c048 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c @@ -195,21 +195,14 @@ bool PrintingIterate(void *JobDetails) // screw_movement[gPrintingState]++; ReturnCode returnCode = state_fun(JobDetails); - /*if ((_motorId == SCREW_MOTOR)&&(pause_active)) - { - tick = UsersysTickGet(); - len = usnprintf(str, 60, "\r\n PrintingIterate tick %d state %d retcode %d ",tick, gPrintingState,returnCode); - cb_push_back (str, len); - //SendInterruptMessageToHost(10+gPrintingState,returnCode); - }*/ gPrintingState = LookupTransitions(gPrintingState, returnCode); - if (keepstate != gPrintingState){ +/* if (keepstate != gPrintingState){ tick = UsersysTickGet(); len = usnprintf(str, 60, "\r\n changed state tick %d state %d retcode %d ", tick, gPrintingState,returnCode); cb_push_back (str, len); } - +*/ // // Enable all interrupts. // |