From ddde99ac703d1e4ccfdea5030042fbf85dfcec38 Mon Sep 17 00:00:00 2001
From: Shlomo Hecht <shlomo@twine-s.com>
Date: Tue, 23 Oct 2018 18:34:18 +0300
Subject: infrastructure for file system commands. rockers disabled

---
 Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Software/Embedded_SW/Embedded/Modules/Thread')

diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index 54309a187..21a4a23c1 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -666,8 +666,8 @@ uint32_t ThreadPreSegmentState(void *JobDetails)
  //only for testing - when control works, these motors will take their speed from the dryer
     //MotorSetSpeed(HARDWARE_MOTOR_TYPE__MOTO_RDRIVING, OriginalMotorSpd_2PPS[FEEDER_MOTOR]);
 
-//#warning rocker disabled
-    if (MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_RLOADING].maxfrequency > 0)
+#warning rocker disabled
+/*    if (MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_RLOADING].maxfrequency > 0)
     {
         MotorSetDirection((TimerMotors_t)HARDWARE_MOTOR_TYPE__MOTO_RLOADING,MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_RLOADING].directionthreadwize);
         MotorSetSpeed(HARDWARE_MOTOR_TYPE__MOTO_RLOADING, 2);
@@ -676,8 +676,8 @@ uint32_t ThreadPreSegmentState(void *JobDetails)
     {
         MotorSetDirection((TimerMotors_t)HARDWARE_MOTOR_TYPE__MOTO_LLOADING,MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_LLOADING].directionthreadwize);
         MotorSetSpeed(HARDWARE_MOTOR_TYPE__MOTO_LLOADING, 2);
-    }
- //#warning rocker disabled
+    }*/
+ #warning rocker disabled
 
 //    MotorMovetoLimitSwitch (HARDWARE_MOTOR_TYPE__MOTO_RDRIVING,MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_RDRIVING].directionthreadwize, 0, GPI_LS_RLOADMOTOR_UP, EndState); //TODO
 
-- 
cgit v1.3.1


From 28ed912cd2237978bd9f2b19ae6713c32566bb5f Mon Sep 17 00:00:00 2001
From: Shlomo Hecht <shlomo@twine-s.com>
Date: Wed, 24 Oct 2018 09:11:54 +0300
Subject: flush messages from coomTx, reduce mailbox size to 20

---
 .../Embedded_SW/Embedded/Common/report/reportInit.c    |  6 +++++-
 .../Embedded/Communication/CommunicationTask.c         | 18 ++++++++++++++++--
 .../Embedded/Communication/CommunicationTask.h         |  3 +++
 .../Embedded_SW/Embedded/Modules/Thread/Thread_print.c |  1 +
 4 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'Software/Embedded_SW/Embedded/Modules/Thread')

diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
index bb44de929..5d010bc1e 100644
--- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c
+++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
@@ -112,7 +112,11 @@ int ReportResponseFunc(char *message,       /* The formatted message
             if (container_buffer)
             {
                 size_t container_size = message_container__pack(&responseContainer, container_buffer);
-                SendChars(container_buffer, container_size);
+                if (SendChars(container_buffer, container_size) == false) //comm tx mailbox full
+                {
+                    CommunicationMailboxFlush();
+                    //protobufToken[0] = 0;
+                }
             }
             free(responseContainer.data.data);
         }
diff --git a/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c b/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c
index f2ecb16b4..b63c74fee 100644
--- a/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c
+++ b/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c
@@ -12,7 +12,7 @@ static void (*callback)(char* buffer, size_t length);
 
 Mailbox_Handle          CommunicationRxMsgQ = NULL;
 Mailbox_Handle          CommunicationTxMsgQ = NULL;
-
+#define COMMUNICATION_NUM_MSGS 20
 typedef struct CommRxMessage{
     //uint16_t messageId;
     uint16_t msgSize;
@@ -184,6 +184,20 @@ bool CommunicationTaskSendMessage(char* buffer,size_t length)
 
     return retcode;
 }
+void CommunicationMailboxFlush(void)
+{
+    int i;
+    CommTxMessageStruc Message;
+    for (i=0;i<COMMUNICATION_NUM_MSGS;i++)
+    {
+        if (Mailbox_pend(CommunicationTxMsgQ , &Message, BIOS_NO_WAIT))
+        {
+            UnSentMessages--;
+            LOG_ERROR(Message.msgSize,"Flushing Message");
+            free (Message.Buff);
+        }
+    }
+}
 int32_t SetCommunicationPath(bool UARTorUSB)
 {
     CommType = UARTorUSB;
@@ -201,7 +215,7 @@ void communicationTxTask(UArg arg0, UArg arg1)
 
     CommTxMessageStruc Message;
     //initArray(1);
-    CommunicationTxMsgQ = Mailbox_create(sizeof(CommTxMessageStruc), 100, NULL,NULL);
+    CommunicationTxMsgQ = Mailbox_create(sizeof(CommTxMessageStruc), COMMUNICATION_NUM_MSGS, NULL,NULL);
 
     while(1)
     {
diff --git a/Software/Embedded_SW/Embedded/Communication/CommunicationTask.h b/Software/Embedded_SW/Embedded/Communication/CommunicationTask.h
index 27907ee07..09278580c 100644
--- a/Software/Embedded_SW/Embedded/Communication/CommunicationTask.h
+++ b/Software/Embedded_SW/Embedded/Communication/CommunicationTask.h
@@ -23,6 +23,9 @@ extern uint32_t CommunicationTaskMessageReceived(uint32_t buffer,uint16_t msgSiz
 
 extern bool CommunicationTaskSendMessage(char* buffer,size_t length);
 
+void CommunicationMailboxFlush(void);
+
+
 #define isUART true
 #define isUSB false
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index 21a4a23c1..ec2ba407a 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -442,6 +442,7 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue)
             usnprintf(Message, 60, "Dancer %d limit %d value %d Zero %d",DancerId,DancerStopActivityLimit[index],avreageSampleValue,DancersCfg[DancerId].zeropoint);
             //JobAbortedByUser = true;
             ThreadControlActive = false;
+            MotorGetStatusFromFPGA(ThreadMotorIdToMotorId[index]);
             JobEndReason = JOB_WINDER_DANCER_FAIL+DancerId;
             SendJobProgress(0.0,0,false, Message);
             //EndState(CurrentJob,Message );
-- 
cgit v1.3.1