Version 1.4.6.8: remove most of head/whs ifdefs, checked to be working. fix control for missed milliseconds calls and more

5 files changed, 84 insertions, 42 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
index 8aabafd2e..873c89b7e 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
@@ -715,8 +715,10 @@ FRESULT FileWrite(void * buffer, uint16_t size,char *path, uint32_t timeout)
                 Fresult = f_write(FileHandle,buffer,size,&Bytes );
                 if(Fresult != FR_OK)
                 {
-                    LOG_ERROR (Fresult,"fread error");
+                    LOG_ERROR (Fresult,"fwrite error");
                 }
+                //LOG_ERROR (Bytes,"f_write ok no of bytes");
+                 Report("f_write ok no of bytes", __FILE__, __LINE__, Bytes, RpWarning,   (int)size, 0);
                 f_close(FileHandle);
             }
             else
@@ -762,6 +764,7 @@ FRESULT FileRead(char *path, uint32_t *Size, void **Buffer)
                     {
                         *Buffer = buffer;
                         *Size = (uint32_t)fno->fsize;
+                        Report("f_read ok no of bytes", __FILE__, __LINE__, Bytes, RpWarning,   (int)fno->fsize, 0);
                     }
                     else
                     {
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 ec3bc602e..25f5927e7 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 = {1,4,6,7};
+TangoVersion_t _gTangoVersion = {1,4,6,8};
 #define BUILD_DATE __DATE__
 char Dat[50] = BUILD_DATE; 
  char _gTangoName [MAX_STRING_LEN] = "Tango01 ";//d
diff --git a/Software/Embedded_SW/Embedded/Common/Utilities/idle_task.c b/Software/Embedded_SW/Embedded/Common/Utilities/idle_task.c
index 437e06815..8d1040ea2 100644
--- a/Software/Embedded_SW/Embedded/Common/Utilities/idle_task.c
+++ b/Software/Embedded_SW/Embedded/Common/Utilities/idle_task.c
@@ -199,9 +199,12 @@ uint32_t unload_max_count=0;
       #endif
    }
 }
- void IdleTaskGetLoadTable (uint32_t *Buffer)
+ void IdleTaskGetLoadTable (uint32_t *aBuffer)
  {
-     memcpy (Buffer,idle_load_table,sizeof(idle_load_table));
+     int i;
+     for (i=0;i<100;i++)
+         aBuffer[i] = idle_load_table[i];
+     //memcpy (aBuffer,idle_load_table,sizeof(idle_load_table));
  }
  uint32_t MillisecCounter = 0;
  uint32_t ControlCounter = 0;
diff --git a/Software/Embedded_SW/Embedded/Common/report/filter.c b/Software/Embedded_SW/Embedded/Common/report/filter.c
index f0eb5a140..753123ee7 100644
--- a/Software/Embedded_SW/Embedded/Common/report/filter.c
+++ b/Software/Embedded_SW/Embedded/Common/report/filter.c
@@ -40,7 +40,7 @@ uint8_t filterTableSize;
 uint8_t filterNumOfCurrentEntries;
 
 /* The mask of currently enabled severity. */
-static ErrorSeverity SeverityLevel;
+ErrorSeverity SeverityLevel;
 
 /* flag allows or dennies filter usage */
 static bool filterDontUse;
diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
index a7d7c17ef..a9e940c8c 100644
--- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c
+++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
@@ -192,15 +192,54 @@ void SetupDebugDisributorsRequestFunc(MessageContainer* requestContainer)
     responseContainer = createContainer(MESSAGE_TYPE__SetupDebugDisributorsResponse, requestContainer->token, true, &response, &setup_debug_disributors_response__pack, &setup_debug_disributors_response__get_packed_size);
     container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
 
-
-    if (request->has_debugdistributor == true )
-    {
-        status|=ReportSwitchPackageFilter(request->debugdistributor   , request->distributoractive);
-    }
-    else
+    switch (request->debugdistributor  )
     {
-        status = ERROR_CODE__INVALID_PARAMETER;
-        ReportWithPackageFilter(GeneralFilter,"SetupDebugDisributorsRequest error",__FILE__,__LINE__,request->has_debugdistributor,RpWarning,0,  0);
+        case DEBUG_DISTRIBUTOR_TYPE__ControlFilter:
+            status|=ReportSwitchPackageFilter(ControlFilter   , request->distributoractive);
+            break;
+        case DEBUG_DISTRIBUTOR_TYPE__HeatersFilter:
+            status|=ReportSwitchPackageFilter(HeatersFilter   , request->distributoractive);
+            break;
+        case DEBUG_DISTRIBUTOR_TYPE__JobFilter:
+            status|=ReportSwitchPackageFilter(JobFilter   , request->distributoractive);
+            break;
+        case DEBUG_DISTRIBUTOR_TYPE__WasteFilter:
+            status|=ReportSwitchPackageFilter(WasteFilter   , request->distributoractive);
+            break;
+        case DEBUG_DISTRIBUTOR_TYPE__AlarmFilter:
+            status|=ReportSwitchPackageFilter(AlarmFilter   , request->distributoractive);
+            break;
+        case DEBUG_DISTRIBUTOR_TYPE__DiagnosticsFilter:
+            status|=ReportSwitchPackageFilter(DiagnosticsFilter   , request->distributoractive);
+            break;
+        case DEBUG_DISTRIBUTOR_TYPE__IDSFilter:
+            status|=ReportSwitchPackageFilter(IDSFilter   , request->distributoractive);
+            break;
+        case DEBUG_DISTRIBUTOR_TYPE__ThreadFilter:
+            status|=ReportSwitchPackageFilter(ThreadFilter   , request->distributoractive);
+            break;
+        case DEBUG_DISTRIBUTOR_TYPE__GeneralFilter:
+            status|=ReportSwitchPackageFilter(GeneralFilter   , request->distributoractive);
+            break;
+        case DEBUG_DISTRIBUTOR_TYPE__CommFilter:
+            status|=ReportSwitchPackageFilter(CommFilter   , request->distributoractive);
+            break;
+        case DEBUG_DISTRIBUTOR_TYPE__FPGAFilter:
+            status|=ReportSwitchPackageFilter(FPGAFilter   , request->distributoractive);
+            break;
+        case DEBUG_DISTRIBUTOR_TYPE__LoadFilter:
+            status|=ReportSwitchPackageFilter(LoadFilter   , request->distributoractive);
+            break;
+        case DEBUG_DISTRIBUTOR_TYPE__InitFilter:
+            status|=ReportSwitchPackageFilter(InitFilter   , request->distributoractive);
+            break;
+        case DEBUG_DISTRIBUTOR_TYPE__MaintFilter:
+            status|=ReportSwitchPackageFilter(MaintFilter   , request->distributoractive);
+            break;
+        default:
+            status = ERROR_CODE__INVALID_PARAMETER;
+            ReportWithPackageFilter(GeneralFilter,"SetupDebugDisributorsRequest error",__FILE__,__LINE__,request->has_debugdistributor,RpWarning,0,  0);
+            break;
     }
     if (status)
     {
@@ -310,36 +349,33 @@ uint32_t SetDebugLogCategoryFunc(MessageContainer* requestContainer)
     SetDebugLogCategoryResponse response = SET_DEBUG_LOG_CATEGORY_RESPONSE__INIT;
     uint32_t status = ERROR;
 
-    if (request->has_minimumcategory)
+    switch(request->minimumcategory)
     {
-        switch(request->minimumcategory)
-        {
-            case DEBUG_LOG_CATEGORY__Info:
-                ReportSeveritySet(RpMessage);
-                status = OK;
-                break;
-            case DEBUG_LOG_CATEGORY__Warning:
-                ReportSeveritySet(RpWarning);
-                status = OK;
-                break;
-            case DEBUG_LOG_CATEGORY__Error:
-                ReportSeveritySet(RpError);
-                status = OK;
-                break;
-            case DEBUG_LOG_CATEGORY__Critical:
-                ReportSeveritySet(RpFatalError);
-                status = OK;
-                break;
-            case DEBUG_LOG_CATEGORY__Debug:
-                ReportSeveritySet(RpPrivate);
-                status = OK;
-                break;
-            default:
-                break;
-        }
+        case DEBUG_LOG_CATEGORY__Info:
+            ReportSeveritySet(RpMessage);
+            status = OK;
+            break;
+        case DEBUG_LOG_CATEGORY__Warning:
+            ReportSeveritySet(RpWarning);
+            status = OK;
+            break;
+        case DEBUG_LOG_CATEGORY__Error:
+            ReportSeveritySet(RpError);
+            status = OK;
+            break;
+        case DEBUG_LOG_CATEGORY__Critical:
+            ReportSeveritySet(RpFatalError);
+            status = OK;
+            break;
+        case DEBUG_LOG_CATEGORY__Debug:
+            ReportSeveritySet(RpPrivate);
+            status = OK;
+            break;
+        default:
+            break;
     }
 
-    responseContainer = createContainer(MESSAGE_TYPE__SetDebugLogCategoryResponse, protobufToken, false, &response, &set_debug_log_category_response__pack, &set_debug_log_category_response__get_packed_size);
+    responseContainer = createContainer(MESSAGE_TYPE__SetDebugLogCategoryResponse, requestContainer->token, true, &response, &set_debug_log_category_response__pack, &set_debug_log_category_response__get_packed_size);
     responseContainer.continuous = false;
     if (status != OK)
     {
@@ -429,7 +465,7 @@ STATUS ReportInit(ReportInitParams InitParams)
     JobFilter  = ReportAddFilterPackage("Job");
     WasteFilter  = ReportAddFilterPackage("Waste");
     AlarmFilter  = ReportAddFilterPackage("Alarm");
-    DiagnosticsFilter  = ReportAddFilterPackage("Diagnostics");
+    DiagnosticsFilter  = ReportAddFilterPackage("Diagnost");
     IDSFilter  = ReportAddFilterPackage("IDS");
     ThreadFilter  = ReportAddFilterPackage("Thread");
     GeneralFilter  = ReportAddFilterPackage("General");
@@ -439,6 +475,6 @@ STATUS ReportInit(ReportInitParams InitParams)
     InitFilter  = ReportAddFilterPackage("Init");
     MaintFilter  = ReportAddFilterPackage("Maint");
 //    Filter  = ReportAddFilterPackage("");
-
+    ReportSwitchPackageFilter(WasteFilter,REPORT_OFF);
     return status;
 }