New interpretation Mask and Enum

nmps/wbl/nmps/src/nmps_c_nmpscell.wb_load

@@ -130,7 +130,7 @@ SObject NMps:Class
       !*/
       Object Function $Intern 4
         Body SysBody
-          Attr TypeRef = "pwrs:Type-$Mask"
+          Attr TypeRef = "NMps:Type-CellFunctionMask"
         EndBody
       EndObject
       !/**

nmps/wbl/nmps/src/nmps_c_nmpsoutcell.wb_load

@@ -74,7 +74,7 @@ SObject NMps:Class
       !*/
       Object Function $Intern 4
         Body SysBody
-          Attr TypeRef = "pwrs:Type-$Mask"
+          Attr TypeRef = "NMps:Type-OutCellFunctionMask"
         EndBody
       EndObject
       Object ResetObject $Intern 5

nmps/wbl/nmps/src/nmps_c_nmpsstorecell.wb_load

@@ -122,7 +122,7 @@ SObject NMps:Class
       !*/
       Object Function $Intern 4
         Body SysBody
-          Attr TypeRef = "pwrs:Type-$Mask"
+          Attr TypeRef = "NMps:Type-StoreCellFunctionMask"
         EndBody
       EndObject
       !/**

nmps/wbl/nmps/src/nmps_c_nmpstrp.wb_load

@@ -175,7 +175,7 @@ SObject NMps:Class
       Object Function $Intern 8
         Body SysBody
           Attr PgmName = "Function"
-          Attr TypeRef = "pwrs:Type-$Mask"
+          Attr TypeRef = "NMps:Type-TrpFunctionMask"
         EndBody
       EndObject
       Object OldTriggForwFront $Intern 9

nmps/wbl/nmps/src/nmps_ch_nmpstypes.wb_load

+!  nmps_ch_nmpstypes.wb_load -- NMps:Type hierarchy.
+!
+!  PROVIEW/R
+!
+!  <Description>.
+!
+!
+SObject NMps:
+  Object Type $TypeHier
+  EndObject
+EndSObject

nmps/wbl/nmps/src/nmps_td_cellfunctionmask.wb_load

+!  nmps_td_cellfunctionmask.wb_load -- Defines the mask type CellFunctionMask
+!
+!  PROVIEW/R
+!  Copyright (C) 1996 by Comator Process AB.
+!
+!  <Description>.
+!
+SObject NMps:Type
+!/**
+!  @Version 1.0
+!  @Group Types
+!  Defines mask for a NMpsCell function
+!*/
+  Object CellFunctionMask $TypeDef 1
+    Body SysBody
+      Attr TypeRef = "pwrs:Type-$Mask"
+      Attr PgmName = "CellFunction"
+    EndBody
+    !/**
+    !  If an data object is removed from the cell by the extern function
+    !  (ExternOpType=2,3 or 4) the data object is also remove from the rtdb 
+    !  database.
+    !*/
+    Object DeleteWhenRemove $Bit
+     Body SysBody
+       Attr PgmName = "DeleteWhenRemove"
+       Attr Text = "DeleteWhenRemove"
+       Attr Value = 4
+     EndBody
+    EndObject
+    !/**
+    !  When the cell is reseted by the ResetObject, the dataobject is also
+    !  removed from the database rtdb.
+    !*/
+    Object DeleteWhenReset $Bit
+     Body SysBody
+       Attr PgmName = "DeleteWhenReset"
+       Attr Text = "DeleteWhenReset"
+       Attr Value = 8
+     EndBody
+    EndObject
+    !/**
+    !  Backup. The cell and data objects in the cell, is backed up by 
+    !  the nmps backup process.
+    !*/
+    Object Backup $Bit
+     Body SysBody
+       Attr PgmName = "Backup"
+       Attr Text = "Backup"
+       Attr Value = 16
+     EndBody
+    EndObject
+  EndObject
+EndSObject
+
+
+
+
+

nmps/wbl/nmps/src/nmps_td_outcellfunctionmask.wb_load

+!  nmps_td_outcellfunctionmask.wb_load -- Defines the mask type OutCellFunctionMask
+!
+!  PROVIEW/R
+!  Copyright (C) 1996 by Comator Process AB.
+!
+!  <Description>.
+!
+SObject NMps:Type
+!/**
+!  @Version 1.0
+!  @Group Types
+!  Defines mask for a NMpsOutCell function
+!*/
+  Object OutCellFunctionMask $TypeDef 2
+    Body SysBody
+      Attr TypeRef = "pwrs:Type-$Mask"
+      Attr PgmName = "OutCellFunction"
+    EndBody
+    !/**
+    !  Delete the data object in rtdb when the object is removed
+    !  from the cell.
+    !*/
+    Object DeleteWhenRemove $Bit
+     Body SysBody
+       Attr PgmName = "DeleteWhenRemove"
+       Attr Text = "DeleteWhenRemove"
+       Attr Value = 4
+     EndBody
+    EndObject
+  EndObject
+EndSObject
+
+
+
+

nmps/wbl/nmps/src/nmps_td_storecellfunctionmask.wb_load

+!  nmps_td_storecellfunctionmask.wb_load -- Defines the mask type StoreCellFunctionMask
+!
+!  PROVIEW/R
+!  Copyright (C) 1996 by Comator Process AB.
+!
+!  <Description>.
+!
+SObject NMps:Type
+!/**
+!  @Version 1.0
+!  @Group Types
+!  Defines mask for a NMpsStoreCell function
+!*/
+  Object StoreCellFunctionMask $TypeDef 3
+    Body SysBody
+      Attr TypeRef = "pwrs:Type-$Mask"
+      Attr PgmName = "StoreCellFunction"
+    EndBody
+    !/**
+    !  At most one selected object. 
+    !  If a new object is selected, the previously selected 
+    !  object will be unselected.
+    !*/
+    Object MaxOneSelected $Bit
+     Body SysBody
+       Attr PgmName = "MaxOneSelected"
+       Attr Text = "MaxOneSelected"
+       Attr Value = 1
+     EndBody
+    EndObject
+    !/**
+    !  Exactly one selected object. 
+    !  If a new object is selected, the previously selected object will be unselected.
+    !  If the currently selected object is removed from the cell, the
+    !  object with highest index will be selected.
+    !*/
+    Object AlwaysOneSelected $Bit
+     Body SysBody
+       Attr PgmName = "AlwaysOneSelected"
+       Attr Text = "AlwaysOneSelected"
+       Attr Value = 2
+     EndBody
+    EndObject
+    !/**
+    !  If an data object is removed from the cell by the extern function
+    !  (ExternOpType=2,3 or 4) the data object is also remove from the rtdb 
+    !  database.
+    !*/
+    Object DeleteWhenRemove $Bit
+     Body SysBody
+       Attr PgmName = "DeleteWhenRemove"
+       Attr Text = "DeleteWhenRemove"
+       Attr Value = 4
+     EndBody
+    EndObject
+    !/**
+    !  When the cell is reseted by the ResetObject, the dataobject is also
+    !  removed from the database rtdb.
+    !*/
+    Object DeleteWhenReset $Bit
+     Body SysBody
+       Attr PgmName = "DeleteWhenReset"
+       Attr Text = "DeleteWhenReset"
+       Attr Value = 8
+     EndBody
+    EndObject
+    !/**
+    !  Backup. The cell and data objects in the cell, is backed up by 
+    !  the nmps backup process.
+    !*/
+    Object Backup $Bit
+     Body SysBody
+       Attr PgmName = "Backup"
+       Attr Text = "Backup"
+       Attr Value = 16
+     EndBody
+    EndObject
+  EndObject
+EndSObject
+
+
+
+

nmps/wbl/nmps/src/nmps_td_trpfunctionmask.wb_load

+!  nmps_td_trpfunctionmask.wb_load -- Defines the mask type TrpFunctionMask
+!
+!  PROVIEW/R
+!  Copyright (C) 1996 by Comator Process AB.
+!
+!  <Description>.
+!
+SObject NMps:Type
+!/**
+!  @Version 1.0
+!  @Group Types
+!  Defines mask for a NMpsTrp function
+!*/
+  Object TrpFunctionMask $TypeDef 4
+    Body SysBody
+      Attr TypeRef = "pwrs:Type-$Mask"
+      Attr PgmName = "TrpFunction"
+    EndBody
+    !/**
+    !     An object is transported in two part, front and back.
+    !     - When a trigg on TriggForwFront is detected, the front of an object is
+    !       moved from the cell connected to In, to the cell connected to Out.
+    !     - When a trigg on TriggForwBack is detected, the back of an object is moved
+    !       from the In cell to the Out cell.
+    !     - When a trigg on TriggReverseFront is detected, the front of an object is moved
+    !       from the Out cell to the In cell.
+    !     - When a trigg on TriggReverseBack is detected, the back of an object is moved
+    !       from the Out cell to the In cell.
+    !*/
+    Object MoveFrontRear $Bit
+     Body SysBody
+       Attr PgmName = "MoveFrontRear"
+       Attr Text = "MoveFront/Rear"
+       Attr Value = 0
+     EndBody
+    EndObject
+    !/**
+    !     An object is transported between the cells.
+    !     Only the TriggForwFront and TriggReverseFront inputs should be used to move an object.
+    !     - When a trigg on TriggForwFront is detected, the object is moved from the In
+    !       cell to the Out cell.
+    !     - When a trigg on TriggReverseFront is detected, the object is moved from the
+    !       Out cell to the In cell.
+    !*/
+    Object MoveWholeObject $Bit
+     Body SysBody
+       Attr PgmName = "MoveWholeObject"
+       Attr Text = "MoveWholeObject"
+       Attr Value = 1
+     EndBody
+    EndObject
+    !/**
+    !     All the objects in the source cell are transported.
+    !     - When a trigg on TriggForwFront is detected, all the objects in the In cell are moved 
+    !       to the Out cell.
+    !     - When a trigg on TriggReverseFront is detected, all the objects in the Out cell are 
+    !       moved to the In cell.
+    !*/
+    Object MoveAllObjects $Bit
+     Body SysBody
+       Attr PgmName = "MoveAllObjects"
+       Attr Text = "MoveAllObjects"
+       Attr Value = 2
+     EndBody
+    EndObject
+    !/**
+    !     The same function as 2, with the differece that the transport is executed only
+    !     if the target cell is empty.
+    !*/
+    Object MoveAllObjectsIfEmpty $Bit
+     Body SysBody
+       Attr PgmName = "MoveAllObjectsIfEmpty"
+       Attr Text = "MoveAllObjectsIfEmpty"
+       Attr Value = 4
+     EndBody
+    EndObject
+    !/**
+    !     The trigg inputs are reseted, if they are not connected.
+    !*/
+    Object ResetTrigg $Bit
+     Body SysBody
+       Attr PgmName = "ResetTrigg"
+       Attr Text = "ResetTrigg"
+       Attr Value = 8
+     EndBody
+    EndObject
+    !/**
+    !     Trigg is detected on level instead of edge.
+    !*/
+    Object Slow $Bit
+     Body SysBody
+       Attr PgmName = "Slow"
+       Attr Text = "Slow"
+       Attr Value = 16
+     EndBody
+    EndObject
+    !/**
+    !*/
+    Object LevelTrigg $Bit
+     Body SysBody
+       Attr PgmName = "LevelTrigg"
+       Attr Text = "LevelTrigg"
+       Attr Value = 32
+     EndBody
+    EndObject
+  EndObject
+EndSObject
+
+
+
+
+

src/wbl/nmps/src/nmps_c_nmpscell.wb_load

@@ -130,7 +130,7 @@ SObject NMps:Class
       !*/
       Object Function $Intern 4
         Body SysBody
-          Attr TypeRef = "pwrs:Type-$Mask"
+          Attr TypeRef = "NMps:Type-CellFunctionMask"
         EndBody
       EndObject
       !/**

src/wbl/nmps/src/nmps_c_nmpsoutcell.wb_load

@@ -74,7 +74,7 @@ SObject NMps:Class
       !*/
       Object Function $Intern 4
         Body SysBody
-          Attr TypeRef = "pwrs:Type-$Mask"
+          Attr TypeRef = "NMps:Type-OutCellFunctionMask"
         EndBody
       EndObject
       Object ResetObject $Intern 5

src/wbl/nmps/src/nmps_c_nmpsstorecell.wb_load

@@ -122,7 +122,7 @@ SObject NMps:Class
       !*/
       Object Function $Intern 4
         Body SysBody
-          Attr TypeRef = "pwrs:Type-$Mask"
+          Attr TypeRef = "NMps:Type-StoreCellFunctionMask"
         EndBody
       EndObject
       !/**

src/wbl/nmps/src/nmps_c_nmpstrp.wb_load

@@ -175,7 +175,7 @@ SObject NMps:Class
       Object Function $Intern 8
         Body SysBody
           Attr PgmName = "Function"
-          Attr TypeRef = "pwrs:Type-$Mask"
+          Attr TypeRef = "NMps:Type-TrpFunctionMask"
         EndBody
       EndObject
       Object OldTriggForwFront $Intern 9

src/wbl/nmps/src/nmps_ch_nmpstypes.wb_load

+!  nmps_ch_nmpstypes.wb_load -- NMps:Type hierarchy.
+!
+!  PROVIEW/R
+!
+!  <Description>.
+!
+!
+SObject NMps:
+  Object Type $TypeHier
+  EndObject
+EndSObject

src/wbl/nmps/src/nmps_td_cellfunctionmask.wb_load

+!  nmps_td_cellfunctionmask.wb_load -- Defines the mask type CellFunctionMask
+!
+!  PROVIEW/R
+!  Copyright (C) 1996 by Comator Process AB.
+!
+!  <Description>.
+!
+SObject NMps:Type
+!/**
+!  @Version 1.0
+!  @Group Types
+!  Defines mask for a NMpsCell function
+!*/
+  Object CellFunctionMask $TypeDef 1
+    Body SysBody
+      Attr TypeRef = "pwrs:Type-$Mask"
+      Attr PgmName = "CellFunction"
+    EndBody
+    !/**
+    !  If an data object is removed from the cell by the extern function
+    !  (ExternOpType=2,3 or 4) the data object is also remove from the rtdb 
+    !  database.
+    !*/
+    Object DeleteWhenRemove $Bit
+     Body SysBody
+       Attr PgmName = "DeleteWhenRemove"
+       Attr Text = "DeleteWhenRemove"
+       Attr Value = 4
+     EndBody
+    EndObject
+    !/**
+    !  When the cell is reseted by the ResetObject, the dataobject is also
+    !  removed from the database rtdb.
+    !*/
+    Object DeleteWhenReset $Bit
+     Body SysBody
+       Attr PgmName = "DeleteWhenReset"
+       Attr Text = "DeleteWhenReset"
+       Attr Value = 8
+     EndBody
+    EndObject
+    !/**
+    !  Backup. The cell and data objects in the cell, is backed up by 
+    !  the nmps backup process.
+    !*/
+    Object Backup $Bit
+     Body SysBody
+       Attr PgmName = "Backup"
+       Attr Text = "Backup"
+       Attr Value = 16
+     EndBody
+    EndObject
+  EndObject
+EndSObject
+
+
+
+
+

src/wbl/nmps/src/nmps_td_outcellfunctionmask.wb_load

+!  nmps_td_outcellfunctionmask.wb_load -- Defines the mask type OutCellFunctionMask
+!
+!  PROVIEW/R
+!  Copyright (C) 1996 by Comator Process AB.
+!
+!  <Description>.
+!
+SObject NMps:Type
+!/**
+!  @Version 1.0
+!  @Group Types
+!  Defines mask for a NMpsOutCell function
+!*/
+  Object OutCellFunctionMask $TypeDef 2
+    Body SysBody
+      Attr TypeRef = "pwrs:Type-$Mask"
+      Attr PgmName = "OutCellFunction"
+    EndBody
+    !/**
+    !  Delete the data object in rtdb when the object is removed
+    !  from the cell.
+    !*/
+    Object DeleteWhenRemove $Bit
+     Body SysBody
+       Attr PgmName = "DeleteWhenRemove"
+       Attr Text = "DeleteWhenRemove"
+       Attr Value = 4
+     EndBody
+    EndObject
+  EndObject
+EndSObject
+
+
+
+

src/wbl/nmps/src/nmps_td_storecellfunctionmask.wb_load

+!  nmps_td_storecellfunctionmask.wb_load -- Defines the mask type StoreCellFunctionMask
+!
+!  PROVIEW/R
+!  Copyright (C) 1996 by Comator Process AB.
+!
+!  <Description>.
+!
+SObject NMps:Type
+!/**
+!  @Version 1.0
+!  @Group Types
+!  Defines mask for a NMpsStoreCell function
+!*/
+  Object StoreCellFunctionMask $TypeDef 3
+    Body SysBody
+      Attr TypeRef = "pwrs:Type-$Mask"
+      Attr PgmName = "StoreCellFunction"
+    EndBody
+    !/**
+    !  At most one selected object. 
+    !  If a new object is selected, the previously selected 
+    !  object will be unselected.
+    !*/
+    Object MaxOneSelected $Bit
+     Body SysBody
+       Attr PgmName = "MaxOneSelected"
+       Attr Text = "MaxOneSelected"
+       Attr Value = 1
+     EndBody
+    EndObject
+    !/**
+    !  Exactly one selected object. 
+    !  If a new object is selected, the previously selected object will be unselected.
+    !  If the currently selected object is removed from the cell, the
+    !  object with highest index will be selected.
+    !*/
+    Object AlwaysOneSelected $Bit
+     Body SysBody
+       Attr PgmName = "AlwaysOneSelected"
+       Attr Text = "AlwaysOneSelected"
+       Attr Value = 2
+     EndBody
+    EndObject
+    !/**
+    !  If an data object is removed from the cell by the extern function
+    !  (ExternOpType=2,3 or 4) the data object is also remove from the rtdb 
+    !  database.
+    !*/
+    Object DeleteWhenRemove $Bit
+     Body SysBody
+       Attr PgmName = "DeleteWhenRemove"
+       Attr Text = "DeleteWhenRemove"
+       Attr Value = 4
+     EndBody
+    EndObject
+    !/**
+    !  When the cell is reseted by the ResetObject, the dataobject is also
+    !  removed from the database rtdb.
+    !*/
+    Object DeleteWhenReset $Bit
+     Body SysBody
+       Attr PgmName = "DeleteWhenReset"
+       Attr Text = "DeleteWhenReset"
+       Attr Value = 8
+     EndBody
+    EndObject
+    !/**
+    !  Backup. The cell and data objects in the cell, is backed up by 
+    !  the nmps backup process.
+    !*/
+    Object Backup $Bit
+     Body SysBody
+       Attr PgmName = "Backup"
+       Attr Text = "Backup"
+       Attr Value = 16
+     EndBody
+    EndObject
+  EndObject
+EndSObject
+
+
+
+

src/wbl/nmps/src/nmps_td_trpfunctionmask.wb_load

+!  nmps_td_trpfunctionmask.wb_load -- Defines the mask type TrpFunctionMask
+!
+!  PROVIEW/R
+!  Copyright (C) 1996 by Comator Process AB.
+!
+!  <Description>.
+!
+SObject NMps:Type
+!/**
+!  @Version 1.0
+!  @Group Types
+!  Defines mask for a NMpsTrp function
+!*/
+  Object TrpFunctionMask $TypeDef 4
+    Body SysBody
+      Attr TypeRef = "pwrs:Type-$Mask"
+      Attr PgmName = "TrpFunction"
+    EndBody
+    !/**
+    !     An object is transported in two part, front and back.
+    !     - When a trigg on TriggForwFront is detected, the front of an object is
+    !       moved from the cell connected to In, to the cell connected to Out.
+    !     - When a trigg on TriggForwBack is detected, the back of an object is moved
+    !       from the In cell to the Out cell.
+    !     - When a trigg on TriggReverseFront is detected, the front of an object is moved
+    !       from the Out cell to the In cell.
+    !     - When a trigg on TriggReverseBack is detected, the back of an object is moved
+    !       from the Out cell to the In cell.
+    !*/
+    Object MoveFrontRear $Bit
+     Body SysBody
+       Attr PgmName = "MoveFrontRear"
+       Attr Text = "MoveFront/Rear"
+       Attr Value = 0
+     EndBody
+    EndObject
+    !/**
+    !     An object is transported between the cells.
+    !     Only the TriggForwFront and TriggReverseFront inputs should be used to move an object.
+    !     - When a trigg on TriggForwFront is detected, the object is moved from the In
+    !       cell to the Out cell.
+    !     - When a trigg on TriggReverseFront is detected, the object is moved from the
+    !       Out cell to the In cell.
+    !*/
+    Object MoveWholeObject $Bit
+     Body SysBody
+       Attr PgmName = "MoveWholeObject"
+       Attr Text = "MoveWholeObject"
+       Attr Value = 1
+     EndBody
+    EndObject
+    !/**
+    !     All the objects in the source cell are transported.
+    !     - When a trigg on TriggForwFront is detected, all the objects in the In cell are moved 
+    !       to the Out cell.
+    !     - When a trigg on TriggReverseFront is detected, all the objects in the Out cell are 
+    !       moved to the In cell.
+    !*/
+    Object MoveAllObjects $Bit
+     Body SysBody
+       Attr PgmName = "MoveAllObjects"
+       Attr Text = "MoveAllObjects"
+       Attr Value = 2
+     EndBody
+    EndObject
+    !/**
+    !     The same function as 2, with the differece that the transport is executed only
+    !     if the target cell is empty.
+    !*/
+    Object MoveAllObjectsIfEmpty $Bit
+     Body SysBody
+       Attr PgmName = "MoveAllObjectsIfEmpty"
+       Attr Text = "MoveAllObjectsIfEmpty"
+       Attr Value = 4
+     EndBody
+    EndObject
+    !/**
+    !     The trigg inputs are reseted, if they are not connected.
+    !*/
+    Object ResetTrigg $Bit
+     Body SysBody
+       Attr PgmName = "ResetTrigg"
+       Attr Text = "ResetTrigg"
+       Attr Value = 8
+     EndBody
+    EndObject
+    !/**
+    !     Trigg is detected on level instead of edge.
+    !*/
+    Object Slow $Bit
+     Body SysBody
+       Attr PgmName = "Slow"
+       Attr Text = "Slow"
+       Attr Value = 16
+     EndBody
+    EndObject
+    !/**
+    !*/
+    Object LevelTrigg $Bit
+     Body SysBody
+       Attr PgmName = "LevelTrigg"
+       Attr Text = "LevelTrigg"
+       Attr Value = 32
+     EndBody
+    EndObject
+  EndObject
+EndSObject
+
+
+
+
+

src/wbl/nmps/src/os_linux/hw_x86/makefile

@@ -50,15 +50,15 @@ $(load_dir)/nmps.dbs :
 
 $(inc_dir)/pwr_nmpsclasses.h :
 	@ echo "Generating struct files for nmps classes..."
-	@ co_convert -s -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_c_*.wb_load"
+	@ co_convert -s -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 
 $(inc_dir)/pwr_nmpsclasses.hpp :
 	@ echo "Generating hpp files for nmps classes..."
-	@ co_convert -po -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_c_*.wb_load"
+	@ co_convert -po -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 
 $(doc_dir)/orm/nmps_allclasses.html :
 	@ echo "Generating html files for nmps classes..."
-	@ co_convert -w -d $(doc_dir)/orm -g $(pwre_sroot)/wbl/nmps/src/cnv_setup.dat "$(pwre_sroot)/wbl/nmps/src/nmps_c_*.wb_load"
+	@ co_convert -w -d $(doc_dir)/orm -g $(pwre_sroot)/wbl/nmps/src/cnv_setup.dat "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 	@ echo "Generating html files for nmps structs..."
 	@ co_convert -c -d $(doc_dir)/orm $(inc_dir)/pwr_nmpsclasses.h
 	@ echo "Generating html files for nmps code..."