Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 9 insertions, 3 deletions

diff --git a/Software/Embedded_SW/Embedded/Communication/Container.c b/Software/Embedded_SW/Embedded/Communication/Container.c
index 7b5e44860..50a3153a9 100644
--- a/Software/Embedded_SW/Embedded/Communication/Container.c
+++ b/Software/Embedded_SW/Embedded/Communication/Container.c
@@ -50,7 +50,7 @@
 uint32_t TxmsgId[MAX_CONT_LOG+1] = {0};
 uint32_t TxLength[MAX_CONT_LOG+1] = {0};
 uint32_t TxAddr[MAX_CONT_LOG+1] = {0};
-byte Txindex = 0;
+uint16_t Txindex = 0;
 /*uint32_t msgId[50] = {0};
 uint32_t Length[50] = {0};
 uint32_t DataLength[50] = {0};
@@ -66,8 +66,6 @@ MessageContainer createContainer(MessageType type, char* token, protobuf_c_boole
     container.has_type = true;
     container.type = type;
 
-
-
     uint8_t* response_buffer = my_malloc((*sizePtr)(response));
     size_t response_size = 0;
     if (response_buffer)
@@ -83,6 +81,11 @@ MessageContainer createContainer(MessageType type, char* token, protobuf_c_boole
     if (Txindex++>=MAX_CONT_LOG)
         Txindex = 0;
 
+/*    if (SuspendLargeMessages == true)
+    {
+        Report("EndJobMessage",__FILE__,__LINE__,(int)type,RpWarning,(int)response_size,0);
+    }*/
+
     //free(response);
     return container;
 }
@@ -312,6 +315,9 @@ void receive_callback(char* buffer, size_t length)
          case MESSAGE_TYPE__SetDigitalOutRequest:
              SetDigitalOutRequestRequestFunc(requestContainer);
              break;
+         case MESSAGE_TYPE__SetValveStateRequest:
+             SetValveStateRequestFunc(requestContainer);
+             break;
          case MESSAGE_TYPE__ThreadJoggingRequest:
              ThreadJoggingRequestFunc(requestContainer);
              break;