Skip to content

P
proview
Commit 8a52e0d0 authored by claes's avatar claes
Browse files
Options

New types Status and NetStatus added

parent f4da6e39
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 0 deletions
java/jpwr/jop/src/DynamicObj.java
View file @ 8a52e0d0
...@@ -45,6 +45,10 @@ public class DynamicObj extends TreeObj ...@@ -45,6 +45,10 @@ public class DynamicObj extends TreeObj
case Pwr.eType_UInt16: case Pwr.eType_UInt16:
case Pwr.eType_UInt32: case Pwr.eType_UInt32:
case Pwr.eType_UInt64: case Pwr.eType_UInt64:
case Pwr.eType_Status:
case Pwr.eType_NetStatus:
case Pwr.eType_Enum:
case Pwr.eType_Mask:
Logg.logg("getObjectRefInfoInt(" + obj.refObj.id + ")", 6); Logg.logg("getObjectRefInfoInt(" + obj.refObj.id + ")", 6);
obj.setValue(en.gdh.getObjectRefInfoInt(obj.refObj.id)); obj.setValue(en.gdh.getObjectRefInfoInt(obj.refObj.id));
break; break;
...@@ -97,6 +101,18 @@ public class DynamicObj extends TreeObj ...@@ -97,6 +101,18 @@ public class DynamicObj extends TreeObj
case Pwr.eType_UInt8: case Pwr.eType_UInt8:
suffix += "UINT8"; suffix += "UINT8";
break; break;
case Pwr.eType_Status:
suffix += "STATUS";
break;
case Pwr.eType_NetStatus:
suffix += "NETSTATUS";
break;
case Pwr.eType_Enum:
suffix += "ENUM";
break;
case Pwr.eType_Mask:
suffix += "MASK";
break;
case Pwr.eType_Char: case Pwr.eType_Char:
suffix += "CHAR"; suffix += "CHAR";
break; break;
......
java/jpwr/jop/src/XttTree.java
View file @ 8a52e0d0
...@@ -556,6 +556,10 @@ public class XttTree extends JPanel ...@@ -556,6 +556,10 @@ public class XttTree extends JPanel
case Pwr.eType_UInt16: case Pwr.eType_UInt16:
case Pwr.eType_UInt32: case Pwr.eType_UInt32:
case Pwr.eType_UInt64: case Pwr.eType_UInt64:
case Pwr.eType_Status:
case Pwr.eType_NetStatus:
case Pwr.eType_Enum:
case Pwr.eType_Mask:
Logg.logg("XttTree.changeValue: innan setObjectInfo(string, int);", 6); Logg.logg("XttTree.changeValue: innan setObjectInfo(string, int);", 6);
try try
{ {
......
java/jpwr/rt/src/Pwr.java
View file @ 8a52e0d0
...@@ -38,6 +38,8 @@ public class Pwr { ...@@ -38,6 +38,8 @@ public class Pwr {
public static final int eTix_ObjectIx = 26; public static final int eTix_ObjectIx = 26;
public static final int eTix_RefId = 27; public static final int eTix_RefId = 27;
public static final int eTix_DeltaTime = 28; public static final int eTix_DeltaTime = 28;
public static final int eTix_Status = 29;
public static final int eTix_NetStatus = 30;
public static final int eType_Unknown = 0; public static final int eType_Unknown = 0;
public static final int eType_Boolean = (1 << 16) + (1 << 15) + eTix_Boolean; public static final int eType_Boolean = (1 << 16) + (1 << 15) + eTix_Boolean;
public static final int eType_Float32 = (1 << 16) + (1 << 15) + eTix_Float32; public static final int eType_Float32 = (1 << 16) + (1 << 15) + eTix_Float32;
...@@ -67,6 +69,8 @@ public class Pwr { ...@@ -67,6 +69,8 @@ public class Pwr {
public static final int eType_ObjectIx = (1 << 16) + (1 << 15) + eTix_ObjectIx; public static final int eType_ObjectIx = (1 << 16) + (1 << 15) + eTix_ObjectIx;
public static final int eType_RefId = (1 << 16) + (1 << 15) + eTix_RefId; public static final int eType_RefId = (1 << 16) + (1 << 15) + eTix_RefId;
public static final int eType_DeltaTime = (1 << 16) + (1 << 15) + eTix_DeltaTime; public static final int eType_DeltaTime = (1 << 16) + (1 << 15) + eTix_DeltaTime;
public static final int eType_Status = (1 << 16) + (1 << 15) + eTix_Status;
public static final int eType_NetStatus = (1 << 16) + (1 << 15) + eTix_NetStatus;
public static final int mPrv_RtRead = 1 << 0; public static final int mPrv_RtRead = 1 << 0;
public static final int mPrv_RtWrite = 1 << 1; public static final int mPrv_RtWrite = 1 << 1;
...@@ -135,3 +139,8 @@ public class Pwr { ...@@ -135,3 +139,8 @@ public class Pwr {
} }
java/jpwr/rt/src/Sub.java
View file @ 8a52e0d0
...@@ -54,6 +54,10 @@ ...@@ -54,6 +54,10 @@
case Pwr.eType_UInt16: case Pwr.eType_UInt16:
case Pwr.eType_Int8: case Pwr.eType_Int8:
case Pwr.eType_UInt8: case Pwr.eType_UInt8:
case Pwr.eType_Status:
case Pwr.eType_NetStatus:
case Pwr.eType_Enum:
case Pwr.eType_Mask:
if(elements > 1) if(elements > 1)
{ {
//its an array //its an array
......
src/jpwr/jop/src/DynamicObj.java
View file @ 8a52e0d0
...@@ -45,6 +45,10 @@ public class DynamicObj extends TreeObj ...@@ -45,6 +45,10 @@ public class DynamicObj extends TreeObj
case Pwr.eType_UInt16: case Pwr.eType_UInt16:
case Pwr.eType_UInt32: case Pwr.eType_UInt32:
case Pwr.eType_UInt64: case Pwr.eType_UInt64:
case Pwr.eType_Status:
case Pwr.eType_NetStatus:
case Pwr.eType_Enum:
case Pwr.eType_Mask:
Logg.logg("getObjectRefInfoInt(" + obj.refObj.id + ")", 6); Logg.logg("getObjectRefInfoInt(" + obj.refObj.id + ")", 6);
obj.setValue(en.gdh.getObjectRefInfoInt(obj.refObj.id)); obj.setValue(en.gdh.getObjectRefInfoInt(obj.refObj.id));
break; break;
...@@ -97,6 +101,18 @@ public class DynamicObj extends TreeObj ...@@ -97,6 +101,18 @@ public class DynamicObj extends TreeObj
case Pwr.eType_UInt8: case Pwr.eType_UInt8:
suffix += "UINT8"; suffix += "UINT8";
break; break;
case Pwr.eType_Status:
suffix += "STATUS";
break;
case Pwr.eType_NetStatus:
suffix += "NETSTATUS";
break;
case Pwr.eType_Enum:
suffix += "ENUM";
break;
case Pwr.eType_Mask:
suffix += "MASK";
break;
case Pwr.eType_Char: case Pwr.eType_Char:
suffix += "CHAR"; suffix += "CHAR";
break; break;
......
src/jpwr/jop/src/XttTree.java
View file @ 8a52e0d0
...@@ -556,6 +556,10 @@ public class XttTree extends JPanel ...@@ -556,6 +556,10 @@ public class XttTree extends JPanel
case Pwr.eType_UInt16: case Pwr.eType_UInt16:
case Pwr.eType_UInt32: case Pwr.eType_UInt32:
case Pwr.eType_UInt64: case Pwr.eType_UInt64:
case Pwr.eType_Status:
case Pwr.eType_NetStatus:
case Pwr.eType_Enum:
case Pwr.eType_Mask:
Logg.logg("XttTree.changeValue: innan setObjectInfo(string, int);", 6); Logg.logg("XttTree.changeValue: innan setObjectInfo(string, int);", 6);
try try
{ {
......
src/jpwr/rt/src/Pwr.java
View file @ 8a52e0d0
...@@ -38,6 +38,8 @@ public class Pwr { ...@@ -38,6 +38,8 @@ public class Pwr {
public static final int eTix_ObjectIx = 26; public static final int eTix_ObjectIx = 26;
public static final int eTix_RefId = 27; public static final int eTix_RefId = 27;
public static final int eTix_DeltaTime = 28; public static final int eTix_DeltaTime = 28;
public static final int eTix_Status = 29;
public static final int eTix_NetStatus = 30;
public static final int eType_Unknown = 0; public static final int eType_Unknown = 0;
public static final int eType_Boolean = (1 << 16) + (1 << 15) + eTix_Boolean; public static final int eType_Boolean = (1 << 16) + (1 << 15) + eTix_Boolean;
public static final int eType_Float32 = (1 << 16) + (1 << 15) + eTix_Float32; public static final int eType_Float32 = (1 << 16) + (1 << 15) + eTix_Float32;
...@@ -67,6 +69,8 @@ public class Pwr { ...@@ -67,6 +69,8 @@ public class Pwr {
public static final int eType_ObjectIx = (1 << 16) + (1 << 15) + eTix_ObjectIx; public static final int eType_ObjectIx = (1 << 16) + (1 << 15) + eTix_ObjectIx;
public static final int eType_RefId = (1 << 16) + (1 << 15) + eTix_RefId; public static final int eType_RefId = (1 << 16) + (1 << 15) + eTix_RefId;
public static final int eType_DeltaTime = (1 << 16) + (1 << 15) + eTix_DeltaTime; public static final int eType_DeltaTime = (1 << 16) + (1 << 15) + eTix_DeltaTime;
public static final int eType_Status = (1 << 16) + (1 << 15) + eTix_Status;
public static final int eType_NetStatus = (1 << 16) + (1 << 15) + eTix_NetStatus;
public static final int mPrv_RtRead = 1 << 0; public static final int mPrv_RtRead = 1 << 0;
public static final int mPrv_RtWrite = 1 << 1; public static final int mPrv_RtWrite = 1 << 1;
...@@ -135,3 +139,8 @@ public class Pwr { ...@@ -135,3 +139,8 @@ public class Pwr {
} }
src/jpwr/rt/src/Sub.java
View file @ 8a52e0d0
...@@ -54,6 +54,10 @@ ...@@ -54,6 +54,10 @@
case Pwr.eType_UInt16: case Pwr.eType_UInt16:
case Pwr.eType_Int8: case Pwr.eType_Int8:
case Pwr.eType_UInt8: case Pwr.eType_UInt8:
case Pwr.eType_Status:
case Pwr.eType_NetStatus:
case Pwr.eType_Enum:
case Pwr.eType_Mask:
if(elements > 1) if(elements > 1)
{ {
//its an array //its an array
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7