Fix on all Diagnostic error (#471)

robotology · Feb 23, 2024 · 5c1d78a · 5c1d78a
1 parent 6ad7f5a
commit 5c1d78a
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 23 deletions.
diff --git a/emBODY/eBcode/arch-arm/board/amc/application/v1/cfg/theApplication_config.h b/emBODY/eBcode/arch-arm/board/amc/application/v1/cfg/theApplication_config.h
@@ -38,8 +38,8 @@ namespace embot { namespace app { namespace eth {
         .property =
         {
             Process::eApplication,
-            {1, 13},
-            {2024, Month::Feb, Day::fifteen, 11, 00}
+            {1, 14},
+            {2024, Month::Feb, Day::twentythree, 13, 00}
         },
         .OStick = 1000*embot::core::time1microsec,
         .OSstacksizeinit = 10*1024,

diff --git a/emBODY/eBcode/arch-arm/board/ems004/appl/v2/cfg/eoemsappl/EOMtheEMSapplCfg_cfg.h b/emBODY/eBcode/arch-arm/board/ems004/appl/v2/cfg/eoemsappl/EOMtheEMSapplCfg_cfg.h
@@ -81,19 +81,19 @@ extern "C" {
 #define EOMTHEEMSAPPLCFG_VERSION_MAJOR          (VERSION_MAJOR_OFFSET+3)
 //  <o> minor           <0-255> 
 //  <o> minor           <0-255>
-#define EOMTHEEMSAPPLCFG_VERSION_MINOR          83
+#define EOMTHEEMSAPPLCFG_VERSION_MINOR          84
 
 //  </h>version
 
 //  <h> build date
 //  <o> year            <2010-2030>
 #define EOMTHEEMSAPPLCFG_BUILDDATE_YEAR         2024
 //  <o> month           <1-12>
-#define EOMTHEEMSAPPLCFG_BUILDDATE_MONTH        1
+#define EOMTHEEMSAPPLCFG_BUILDDATE_MONTH        2
 //  <o> day             <1-31>
-#define EOMTHEEMSAPPLCFG_BUILDDATE_DAY          8
+#define EOMTHEEMSAPPLCFG_BUILDDATE_DAY          23
 //  <o> hour            <0-23>
-#define EOMTHEEMSAPPLCFG_BUILDDATE_HOUR         18
+#define EOMTHEEMSAPPLCFG_BUILDDATE_HOUR         13
 //  <o> minute          <0-59>
 #define EOMTHEEMSAPPLCFG_BUILDDATE_MIN          00
 //  </h>build date

diff --git a/emBODY/eBcode/arch-arm/board/ems004/appl/v2/src/eoappservices/embot_app_eth_CANmonitor.cpp b/emBODY/eBcode/arch-arm/board/ems004/appl/v2/src/eoappservices/embot_app_eth_CANmonitor.cpp
@@ -39,6 +39,7 @@ struct embot::app::eth::CANmonitor::Impl
     embot::core::Time timeofdisappearance {0};
 
     MAP boards2touch {0, 0};
+    MAP boards2report {0, 0};
 
     bool transmissionisactive {false};
     bool allboardsarealive {false};    
@@ -109,7 +110,8 @@ bool embot::app::eth::CANmonitor::Impl::start()
         return false;
     }
 
-    boards2touch = _config.target;
+    boards2touch = boards2report = _config.target;
+
     state = State::OK;
     allboardsarealive = true;
     active = true;
@@ -121,6 +123,7 @@ bool embot::app::eth::CANmonitor::Impl::stop()
 {  
 //    log("stop()");  
     boards2touch.clear();
+    boards2report.clear();
     state = State::OK;
     allboardsarealive = false;
     active = false;
@@ -149,11 +152,10 @@ bool embot::app::eth::CANmonitor::Impl::tick()
     {
         regularreportnow = true;
     }  
-
-    MAP boards2report {};
 
     if(true == checknow)
     {
+        boards2report.clear();
         timeoflastcheck = timenow;
 
         bool allboardstouched = boards2touch.empty();
@@ -215,16 +217,16 @@ bool embot::app::eth::CANmonitor::Impl::tick()
             case State::OK:
             {
 //                alwayslog("OK");
-                errdes.par16 = 0;
+                errdes.par16 = _config.servicecategory;
                 errdes.par64 = boards2report.getcompact();        
                 errdes.code = eoerror_code_get(eoerror_category_System, eoerror_value_SYS_canservices_monitor_regularcontact);              
-                eo_errman_Error(eo_errman_GetHandle(), eo_errortype_info, NULL, _config.ownername, &errdes); 
+                eo_errman_Error(eo_errman_GetHandle(), eo_errortype_info, NULL, _config.ownername, &errdes);
             } break;
 
             case State::justLOST:
             {
 //                alwayslog("jLOST");
-                errdes.par16 = 0;
+                errdes.par16 = _config.servicecategory;
                 errdes.par64 = boards2report.getcompact();        
                 errdes.code = eoerror_code_get(eoerror_category_System, eoerror_value_SYS_canservices_monitor_lostcontact);              
                 eo_errman_Error(eo_errman_GetHandle(), eo_errortype_error, NULL, _config.ownername, &errdes);                
@@ -234,7 +236,7 @@ bool embot::app::eth::CANmonitor::Impl::tick()
             {
 //                alwayslog("JFOUND");
                 uint64_t mspassed = (timenow-timeofdisappearance)/1000;
-                errdes.par16 = 0;
+                errdes.par16 = _config.servicecategory;
                 errdes.par64 = (mspassed << 32) | boards2report.getcompact();        
                 errdes.code = eoerror_code_get(eoerror_category_System, eoerror_value_SYS_canservices_monitor_retrievedcontact);              
                 eo_errman_Error(eo_errman_GetHandle(), eo_errortype_warning, NULL, _config.ownername, &errdes);                
@@ -244,7 +246,7 @@ bool embot::app::eth::CANmonitor::Impl::tick()
             {
 //                alwayslog("sLOST");
                 uint64_t mspassed = (timenow-timeofdisappearance)/1000;
-                errdes.par16 = 0;
+                errdes.par16 = _config.servicecategory;
                 errdes.par64 = (mspassed << 32) | boards2report.getcompact();        
                 errdes.code = eoerror_code_get(eoerror_category_System, eoerror_value_SYS_canservices_monitor_stillnocontact);              
                 eo_errman_Error(eo_errman_GetHandle(), eo_errortype_error, NULL, _config.ownername, &errdes);

diff --git a/emBODY/eBcode/arch-arm/board/ems004/appl/v2/src/eoappservices/embot_app_eth_CANmonitor.h b/emBODY/eBcode/arch-arm/board/ems004/appl/v2/src/eoappservices/embot_app_eth_CANmonitor.h
@@ -169,7 +169,7 @@ and `justLOST` states may happen if some boards keep on disappearing and reappea
 
             constexpr Config(const MAP &map, embot::core::relTime rc, Report rm, embot::core::relTime rr, const char *o, eOmn_serv_category_t s)
             {
-                target = map; periodofcheck = rc; reportmode = rm; ownername = o; servicecategory = s; 
+                target = map; periodofcheck = rc; reportmode = rm; periodofreport = rr; ownername = o; servicecategory = s; 
             }  
 
             Config() = default;

diff --git a/emBODY/eBcode/arch-arm/board/mc2plus/appl/v2/cfg/eoemsappl/EOMtheEMSapplCfg_cfg.h b/emBODY/eBcode/arch-arm/board/mc2plus/appl/v2/cfg/eoemsappl/EOMtheEMSapplCfg_cfg.h
@@ -75,19 +75,19 @@ extern "C" {
 #define EOMTHEEMSAPPLCFG_VERSION_MAJOR          3
 //  <o> minor           <0-255> 
 //  <o> minor           <0-255>
-#define EOMTHEEMSAPPLCFG_VERSION_MINOR          65
+#define EOMTHEEMSAPPLCFG_VERSION_MINOR          66
 
 //  </h>version
 
 //  <h> build date
 //  <o> year            <2010-2030>
 #define EOMTHEEMSAPPLCFG_BUILDDATE_YEAR         2024
 //  <o> month           <1-12>
-#define EOMTHEEMSAPPLCFG_BUILDDATE_MONTH        1
+#define EOMTHEEMSAPPLCFG_BUILDDATE_MONTH        2
 //  <o> day             <1-31>
-#define EOMTHEEMSAPPLCFG_BUILDDATE_DAY          8
+#define EOMTHEEMSAPPLCFG_BUILDDATE_DAY          23
 //  <o> hour            <0-23>
-#define EOMTHEEMSAPPLCFG_BUILDDATE_HOUR         18
+#define EOMTHEEMSAPPLCFG_BUILDDATE_HOUR         13
 //  <o> minute          <0-59>
 #define EOMTHEEMSAPPLCFG_BUILDDATE_MIN          00
 //  </h>build date

diff --git a/emBODY/eBcode/arch-arm/board/mc4plus/appl/v2/cfg/eoemsappl/EOMtheEMSapplCfg_cfg.h b/emBODY/eBcode/arch-arm/board/mc4plus/appl/v2/cfg/eoemsappl/EOMtheEMSapplCfg_cfg.h
@@ -84,19 +84,19 @@ extern "C" {
 #define EOMTHEEMSAPPLCFG_VERSION_MAJOR          (VERSION_MAJOR_OFFSET+3)
 //  <o> minor           <0-255> 
 
-#define EOMTHEEMSAPPLCFG_VERSION_MINOR          86
+#define EOMTHEEMSAPPLCFG_VERSION_MINOR          87
 
 //  </h>version
 
 //  <h> build date
 //  <o> year            <2010-2030>
 #define EOMTHEEMSAPPLCFG_BUILDDATE_YEAR         2024
 //  <o> month           <1-12>
-#define EOMTHEEMSAPPLCFG_BUILDDATE_MONTH        1
+#define EOMTHEEMSAPPLCFG_BUILDDATE_MONTH        2
 //  <o> day             <1-31>
-#define EOMTHEEMSAPPLCFG_BUILDDATE_DAY          8
+#define EOMTHEEMSAPPLCFG_BUILDDATE_DAY          23
 //  <o> hour            <0-23>
-#define EOMTHEEMSAPPLCFG_BUILDDATE_HOUR         18
+#define EOMTHEEMSAPPLCFG_BUILDDATE_HOUR         13
 //  <o> minute          <0-59>
 #define EOMTHEEMSAPPLCFG_BUILDDATE_MIN          00