usb communication bugs fixed (?)

5 files changed, 17 insertions, 12 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
index 819abbdbb..2caf8d923 100644
--- a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
+++ b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
@@ -20,7 +20,7 @@ typedef struct
 } TangoVersion_t;
 
 
-TangoVersion_t _gTangoVersion = {001,000,002,002};
+TangoVersion_t _gTangoVersion = {001,000,002,003};
 #define BUILD_DATE __DATE__
 char Dat[50] = BUILD_DATE;
  char _gTangoName [MAX_STRING_LEN] = "Tango01 ";//d
diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
index e7f08e0e5..bb44de929 100644
--- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c
+++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
@@ -106,12 +106,16 @@ int ReportResponseFunc(char *message,       /* The formatted message
     response.message = message;
         responseContainer = createContainer(MESSAGE_TYPE__StartDebugLogResponse, protobufToken, false, &response, &start_debug_log_response__pack, &start_debug_log_response__get_packed_size);
         responseContainer.continuous = true;
-        uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
-        size_t container_size = message_container__pack(&responseContainer, container_buffer);
-        free(responseContainer.data.data);
-        //USBCDCD_sendData(container_buffer, container_size,10);
-        SendChars(container_buffer, container_size);
-        //free (container_buffer);
+        if (responseContainer.data.data)
+        {
+            uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+            if (container_buffer)
+            {
+                size_t container_size = message_container__pack(&responseContainer, container_buffer);
+                SendChars(container_buffer, container_size);
+            }
+            free(responseContainer.data.data);
+        }
 
     return OK;
 
diff --git a/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c b/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c
index a07924c84..9492876a2 100644
--- a/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c
+++ b/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c
@@ -31,9 +31,10 @@ struct serialBuffer {
   size_t used;
   size_t size;
 } typedef SerialBuffer;
-#define SHORT_BUFFER_SIZE 100
-char CommRxBuffer[COMM_MAX_BUFFER_SIZE];
+#define SHORT_BUFFER_SIZE 200
 char CommShortRxBuffer[10][SHORT_BUFFER_SIZE];
+char CommRxBuffer[COMM_MAX_BUFFER_SIZE];
+char DuplicateRxBuffer[2][2100];
 SerialBuffer inBuffer[11];
 bool SerialBufferUsed[11] = {false,false,false,false,false,false,false,false,false,false,false};
 uint32_t initArray(size_t initialSize)
diff --git a/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c b/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c
index b4da9afa9..e7828de1c 100644
--- a/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c
+++ b/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c
@@ -78,7 +78,7 @@ typedef volatile enum {
 
 /* Static variables and handles */
 static volatile USBCDCD_USBState state;
-extern unsigned char CommRxBuffer[COMM_MAX_BUFFER_SIZE];
+static unsigned char UsbRxBuffer[COMM_MAX_BUFFER_SIZE];
 //static unsigned char receiveBuffer[COMM_MAX_BUFFER_SIZE];
 static unsigned char transmitBuffer[COMM_MAX_BUFFER_SIZE];
 
@@ -214,7 +214,7 @@ tUSBBuffer rxBuffer =
     USBDCDCPacketRead,          /* pfnTransfer */
     USBDCDCRxPacketAvailable,   /* pfnAvailable */
     (void *)&g_sCDCDevice,      /* pvHandle */
-    CommRxBuffer,              /* pcBuffer */
+    UsbRxBuffer,              /* pcBuffer */
     COMM_MAX_BUFFER_SIZE,              /* ulBufferSize */
     {{0, 0, 0, 0}, 0, 0}        /* private data workspace */
 };
diff --git a/Software/Embedded_SW/Embedded/Embedded.cfg b/Software/Embedded_SW/Embedded/Embedded.cfg
index 47710100f..473250338 100644
--- a/Software/Embedded_SW/Embedded/Embedded.cfg
+++ b/Software/Embedded_SW/Embedded/Embedded.cfg
@@ -15,7 +15,7 @@ var GIO = xdc.useModule('ti.sysbios.io.GIO');
 var Semaphore = xdc.useModule('ti.sysbios.knl.Semaphore');
 var Task = xdc.useModule('ti.sysbios.knl.Task');
 
-BIOS.heapSize = 30767;   // bios heapmem
+//BIOS.heapSize = 30767;   // bios heapmem
 //Memory.defaultHeapSize = 48767;
 Program.heap = 30767;  //sysmem