SevHist, Disable attribute added

src/exe/rt_sevhistmon/src/rt_sevhistmon.cpp

@@ -213,6 +213,7 @@ int rt_sevhistmon::init_objects()
     h.storagetime = h_p->StorageTime;
     h.deadband = h_p->DeadBand;
     h.options = h_p->Options;
+    h.disabled = h_p->Disable;
     strncpy( h.description, h_p->Description, sizeof(h.description));
 
     // Get unit from attribute object
@@ -298,6 +299,7 @@ int rt_sevhistmon::init_sevhistobjects()
     h.storagetime = h_p->StorageTime;
     h.deadband = h_p->DeadBand;
     h.options = h_p->Options;
+    h.disabled = h_p->Disable;
     strncpy( h.description, h_p->Description, sizeof(h.description));
 
     h.scantime = m_hs[hs_idx].scantime;
@@ -618,11 +620,13 @@ int rt_sevhistmon::send_data()
 
     dp = (sev_sHistData *) &msg->Data;
     for ( unsigned int j = 0; j < m_hs[i].sevhistlist.size(); j++) {
-      dp->sevid = m_hs[i].sevhistlist[j].sevid;
-      dp->type = m_hs[i].sevhistlist[j].type;
-      dp->size = m_hs[i].sevhistlist[j].size;
-      memcpy( &dp->data, m_hs[i].sevhistlist[j].datap, dp->size);
-      dp = (sev_sHistData *)((char *)dp + sizeof( *dp) - sizeof(dp->data) +  dp->size);
+      if ( !m_hs[i].sevhistlist[j].disabled) {
+	dp->sevid = m_hs[i].sevhistlist[j].sevid;
+	dp->type = m_hs[i].sevhistlist[j].type;
+	dp->size = m_hs[i].sevhistlist[j].size;
+	memcpy( &dp->data, m_hs[i].sevhistlist[j].datap, dp->size);
+	dp = (sev_sHistData *)((char *)dp + sizeof( *dp) - sizeof(dp->data) +  dp->size);
+      }
     }
 
     void *dpp;
@@ -631,13 +635,15 @@ int rt_sevhistmon::send_data()
       dp->size = m_hs[i].sevhistobjectlist[j].datasize;
       dpp = &(dp->data);
       for ( unsigned int k = 0; k < m_hs[i].sevhistobjectlist[j].sevhistobjectattrlist.size(); k++) {
-        //dp->type = m_hs[i].sevhistobjectlist[j].sevhistobjectattrlist[k].type;
-        //printf("sevhistobj[%d].attrlist[%d].aname: %s size:%d\n", j, k, m_hs[i].sevhistobjectlist[j].sevhistobjectattrlist[k].aname, m_hs[i].sevhistobjectlist[j].sevhistobjectattrlist[k].size);
-        //if( m_hs[i].sevhistobjectlist[j].sevhistobjectattrlist[k].type == pwr_eType_String ) {
-        //  printf("text:%s\n", (char*)m_hs[i].sevhistobjectlist[j].sevhistobjectattrlist[k].datap);
-        //}
-        memcpy( dpp, m_hs[i].sevhistobjectlist[j].sevhistobjectattrlist[k].datap, m_hs[i].sevhistobjectlist[j].sevhistobjectattrlist[k].size);
-        dpp = (sev_sHistData *)((char *)dpp + m_hs[i].sevhistobjectlist[j].sevhistobjectattrlist[k].size);
+	if ( !m_hs[i].sevhistobjectlist[j].disabled) {
+	  //dp->type = m_hs[i].sevhistobjectlist[j].sevhistobjectattrlist[k].type;
+	  //printf("sevhistobj[%d].attrlist[%d].aname: %s size:%d\n", j, k, m_hs[i].sevhistobjectlist[j].sevhistobjectattrlist[k].aname, m_hs[i].sevhistobjectlist[j].sevhistobjectattrlist[k].size);
+	  //if( m_hs[i].sevhistobjectlist[j].sevhistobjectattrlist[k].type == pwr_eType_String ) {
+	  //  printf("text:%s\n", (char*)m_hs[i].sevhistobjectlist[j].sevhistobjectattrlist[k].datap);
+	  //}
+	  memcpy( dpp, m_hs[i].sevhistobjectlist[j].sevhistobjectattrlist[k].datap, m_hs[i].sevhistobjectlist[j].sevhistobjectattrlist[k].size);
+	  dpp = (sev_sHistData *)((char *)dpp + m_hs[i].sevhistobjectlist[j].sevhistobjectattrlist[k].size);
+	}
       }
       dp = (sev_sHistData *)((char *)dp + sizeof( *dp) - sizeof(dp->data) +  dp->size);
     }

src/exe/rt_sevhistmon/src/rt_sevhistmon.h

@@ -40,6 +40,7 @@ class sev_sevhist {
   pwr_tString80 description;
   pwr_tString16 unit;
   pwr_tFloat32  scantime;
+  pwr_tBoolean  disabled;
 };
 
 class sev_sevhistobjectattr {
@@ -47,10 +48,10 @@ class sev_sevhistobjectattr {
   pwr_tAttrRef 	aref;
   pwr_tString80 description;
   pwr_tString16 unit;
-  pwr_tAName	  aname;
-  pwr_tRefId	  refid;
-  void 		      *datap;
-  pwr_eType	    type;
+  pwr_tAName	aname;
+  pwr_tRefId	refid;
+  void 	        *datap;
+  pwr_eType     type;
   unsigned int	size;
 };
 
@@ -61,10 +62,11 @@ class sev_sevhistobject {
   pwr_tDeltaTime storagetime;
   pwr_tFloat32  deadband;
   pwr_tMask  	options;
-  pwr_tRefId	  sevid;
+  pwr_tRefId	sevid;
   pwr_tString80 description;
   pwr_tFloat32  scantime;
   unsigned int  datasize;
+  pwr_tBoolean  disabled;
   vector<sev_sevhistobjectattr> sevhistobjectattrlist;  
 };
 

src/wbl/pwrb/src/pwrb_c_sevhist.wb_load

@@ -113,6 +113,14 @@ SObject pwrb:Class
           Attr TypeRef = "pwrb:Type-SevHistOptionsMask"
         EndBody
       EndObject
+      !/**
+      !  Disable storage.
+      !*/
+      Object Disable $Attribute 7 
+        Body SysBody
+          Attr TypeRef = "pwrs:Type-$Boolean"
+        EndBody
+      EndObject
     EndObject
     Object Template SevHist
       Body RtBody

src/wbl/pwrb/src/pwrb_c_sevhistobject.wb_load

@@ -108,6 +108,14 @@ SObject pwrb:Class
           Attr TypeRef = "pwrb:Type-SevHistOptionsMask"
         EndBody
       EndObject
+      !/**
+      !  Disable storage.
+      !*/
+      Object Disable $Attribute 7 
+        Body SysBody
+          Attr TypeRef = "pwrs:Type-$Boolean"
+        EndBody
+      EndObject
     EndObject
     Object Template SevHistObject
       Body RtBody