merge

1 files changed, 8 insertions, 7 deletions

diff --git a/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c b/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c
index c846ae0a3..4874e82c3 100644
--- a/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c
+++ b/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c
@@ -9,7 +9,7 @@
 #include "drivers/Uart_Comm/uart.h"
 #include "communicationTask.h"
 #include <Container.h>
-#include "delay.h"
+#include <Utilities/delay.h>
 #include "modules/Diagnostics/Diagnostics.h"
 #include "drivers/Uart_Comm/uart.h"
 
@@ -37,15 +37,16 @@ struct serialBuffer {
 } typedef SerialBuffer;
 #define SHORT_BUFFER_SIZE 100
 char CommShortRxBuffer[10][SHORT_BUFFER_SIZE];
-char CommRxBuffer[2][COMM_MAX_BUFFER_SIZE];
-SerialBuffer inBuffer[12];
-bool SerialBufferUsed[12] = {false,false,false,false,false,false,false,false,false,false,false,false};
+char CommRxBuffer[COMM_MAX_BUFFER_SIZE];
+SerialBuffer inBuffer[11];
+bool SerialBufferUsed[11] = {false,false,false,false,false,false,false,false,false,false,false};
 uint32_t initArray(size_t initialSize)
 {
   if (initialSize >= COMM_MAX_BUFFER_SIZE) return 0xFF;
   if (initialSize > SHORT_BUFFER_SIZE)
   {
-      if ((SerialBufferUsed[10] == true)&&(SerialBufferUsed[11] == true))
+      //if ((SerialBufferUsed[10] == true)&&(SerialBufferUsed[11] == true))
+      if (SerialBufferUsed[10] == true)
       {
           return 0xFF;
       }
@@ -60,7 +61,7 @@ uint32_t initArray(size_t initialSize)
               //Report("initArray", __FILE__, 10, inBuffer[10].size, RpWarning,   (int)0, 0);
               return 10;
           }
-          else if (SerialBufferUsed[11] == false)
+          /*else if (SerialBufferUsed[11] == false)
           {
               SerialBufferUsed[11] = true;
               inBuffer[11].buffer = CommRxBuffer;
@@ -68,7 +69,7 @@ uint32_t initArray(size_t initialSize)
               inBuffer[11].size = initialSize;
               //Report("initArray", __FILE__, 10, inBuffer[10].size, RpWarning,   (int)0, 0);
               return 11;
-          }
+          }*/
           else return 0xFF;
       }
   }