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

3 files changed, 32 insertions, 9 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
index c311e9787..d57d3b14b 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
@@ -86,7 +86,7 @@ uint32_t    FileUploadRequestFunc(MessageContainer* requestContainer)
         Fresult = FR_DENIED;
     else
     {
-        Fresult = f_open(UploadFileHandle,request->path,FA_READ | FA_WRITE |  FA_OPEN_ALWAYS );
+        Fresult = f_open(UploadFileHandle,request->path,FA_READ | FA_WRITE  |FA_OPEN_ALWAYS| FA_CREATE_ALWAYS);
         if (Fresult == FR_OK)
         {
             FileLength = request->length;
diff --git a/Software/Embedded_SW/Embedded/Common/report/distributor.c b/Software/Embedded_SW/Embedded/Common/report/distributor.c
index 0515b0472..c026ad4d2 100644
--- a/Software/Embedded_SW/Embedded/Common/report/distributor.c
+++ b/Software/Embedded_SW/Embedded/Common/report/distributor.c
@@ -242,7 +242,7 @@ Void reportService(UArg arg0, UArg arg1)
     ReportInitParams InitParams;
     InitParams.DistributorQueueMaxMsgs = 30;
     InitParams.DistributorTaskPriority = 6;
-    InitParams.MaxNumOfFilterNames = 1;
+    InitParams.MaxNumOfFilterNames = 1;//30
     InitParams.MaxNumberOfPrivateDistributors = 2;
     ReportInit (InitParams);
 
diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
index feb13504a..bc3cbe20b 100644
--- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c
+++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
@@ -38,6 +38,21 @@
 #include "PMR/debugging/StartDebugLogResponse.pb-c.h"
 #include "PMR/debugging/StopDebugLogResponse.pb-c.h"
 
+/*PackageHandle ControlFilter;
+PackageHandle HeatersFilter;
+PackageHandle JobFilter  ;
+PackageHandle WasteFilter  ;
+PackageHandle AlarmFilter  ;
+PackageHandle DiagnosticsFilter;
+PackageHandle IDSFilter;
+PackageHandle ThreadFilter;
+PackageHandle GeneralFilter;
+PackageHandle CommFilter;
+PackageHandle FPGAFilter;
+PackageHandle LoadFilter;
+PackageHandle InitFilter;
+PackageHandle MaintFilter;*/
+
 
 char protobufToken[36+1] = {0};
 int ReportResponseFunc(char *message,       /* The formatted message                */
@@ -115,11 +130,6 @@ uint32_t ReportInitMessage(MessageContainer* requestContainer)
 
     StartDebugLogRequest* request = start_debug_log_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
     ustrncpy (protobufToken, requestContainer->token,36);
- /*   InitParams.DistributorQueueMaxMsgs = 20;
-    InitParams.DistributorTaskPriority = 6;
-    InitParams.MaxNumOfFilterNames = 1;
-    InitParams.MaxNumberOfPrivateDistributors = 2;
-    status |= ReportInit (InitParams);*/
     DistributorHandle ReportHandle = ReportAddDistributor("ProtoBuf");
     if (ReportHandle == NULL) status |= 0x8;
     status |= ReportFunc(ReportResponseFunc , REPORT_ADD, ReportHandle);
@@ -166,7 +176,6 @@ void ReportStopReporting(void)
     protobufToken[0] = 0;
 }
 
-#define REPORT_RESERVED_NUM_OF_FILTER_PACKAGES 30 /* This reserved for swinfra packages */
 
 /***************************************************************************
  *
@@ -204,10 +213,24 @@ STATUS ReportInit(ReportInitParams InitParams)
     //ReportMonitorFunc(REPORT_ADD, 0);
 
     MaxNumOfFilterNames = InitParams.MaxNumOfFilterNames;
-    MaxNumOfFilterNames += REPORT_RESERVED_NUM_OF_FILTER_PACKAGES;
     status = filterTableInit(MaxNumOfFilterNames);
     if (status == OK)
         initialized = true;
+/*    ControlFilter  = ReportAddFilterPackage("Control");
+    HeatersFilter  = ReportAddFilterPackage("Heaters");
+    JobFilter  = ReportAddFilterPackage("Job");
+    WasteFilter  = ReportAddFilterPackage("Waste");
+    AlarmFilter  = ReportAddFilterPackage("Alarm");
+    DiagnosticsFilter  = ReportAddFilterPackage("Diagnostics");
+    IDSFilter  = ReportAddFilterPackage("IDS");
+    ThreadFilter  = ReportAddFilterPackage("Thread");
+    GeneralFilter  = ReportAddFilterPackage("General");
+    CommFilter  = ReportAddFilterPackage("Comm");
+    FPGAFilter  = ReportAddFilterPackage("FPGA");
+    LoadFilter  = ReportAddFilterPackage("Load");
+    InitFilter  = ReportAddFilterPackage("Init");
+    MaintFilter  = ReportAddFilterPackage("Maint");*/
+//    Filter  = ReportAddFilterPackage("");
 
     return status;
 }