opcua_client 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d5c48f943609a5cff626ade2e52495427fc8c3b3af175c2ac9b7231146209ec
-  data.tar.gz: f0ec2ea830a866681352b2048950382a06d199ea1f53b47a31857b1f066a3c2f
+  metadata.gz: 7fd39e3b07294cf1cf3f7e037c6bb31e202f8d4279e7ff59c06ec1f709641654
+  data.tar.gz: a2385d369880786ae3e970625c2a9419ab6c97bf63f861e496b90161aa280cf1
 SHA512:
-  metadata.gz: 54bacd20dd2f8f73c10dacd29f1b9ab3776ee1cec0933aa1c56423a9cc077161c5d1c0fb676111b679f80eae434640cbeb5cce2d12d254fd5877927d18142acc
-  data.tar.gz: 270a0757c4d3469e7e3e6cbf57e874d4ec13911d221bc3befb4a257abf237b0b7307bed5f14960b5381d3ddcf74e4c77d014e778d09efb389c75a957056bb9f3
+  metadata.gz: 5652899ac7728aa8b2efc6ed0fcd9b9021f9d864cb68f98aafe7665026215b740afda38557e05f1c714dd77199ff8c38f984ad0605adc21371e9f3d727408b5f
+  data.tar.gz: e6a3bef6175e9ebef8b4422e2f97f48a856d873349520470f700cb05200419a22ca95e98e1d0c6aa2cfa73465ddd96e149c5c86cdbe004fa453cc37654d0c9c5

data/README.md

@@ -53,11 +53,15 @@ end
 All methods raise OPCUAClient::Error if unsuccessful.
 
 * ```client.read_int16(Fixnum ns, String name) => Fixnum```
+* ```client.read_uint16(Fixnum ns, String name) => Fixnum```
 * ```client.read_int32(Fixnum ns, String name) => Fixnum```
+* ```client.read_uint32(Fixnum ns, String name) => Fixnum```
 * ```client.read_float(Fixnum ns, String name) => Float```
 * ```client.read_boolean(Fixnum ns, String name) => true/false```
 * ```client.write_int16(Fixnum ns, String name, Fixnum value)```
+* ```client.write_uint16(Fixnum ns, String name, Fixnum value)```
 * ```client.write_int32(Fixnum ns, String name, Fixnum value)```
+* ```client.write_uint32(Fixnum ns, String name, Fixnum value)```
 * ```client.write_float(Fixnum ns, String name, Float value)```
 * ```client.write_boolean(Fixnum ns, String name, bool value)```
 * ```client.multi_write_int16(Fixnum ns, Array[String] names, Array[Fixnum] values)```
@@ -121,4 +125,5 @@ bundle
 $ rake compile
 $ bin/console
 pry> client = OPCUAClient::Client.new
+pry> client.connect("opc.tcp://127.0.0.1:4840")
 ```

data/ext/opcua_client/opcua_client.c

@@ -421,11 +421,21 @@ static VALUE rb_writeUaValue(VALUE self, VALUE v_nsIndex, VALUE v_name, VALUE v_
         value.data = UA_malloc(sizeof(UA_Int16));
         *(UA_Int16*)value.data = newValue;
         value.type = &UA_TYPES[UA_TYPES_INT16];
+    } else if (uaType == UA_TYPES_UINT16) {
+        UA_UInt16 newValue = NUM2USHORT(v_newValue);
+        value.data = UA_malloc(sizeof(UA_UInt16));
+        *(UA_UInt16*)value.data = newValue;
+        value.type = &UA_TYPES[UA_TYPES_UINT16];
     } else if (uaType == UA_TYPES_INT32) {
         UA_Int32 newValue = NUM2INT(v_newValue);
         value.data = UA_malloc(sizeof(UA_Int32));
         *(UA_Int32*)value.data = newValue;
         value.type = &UA_TYPES[UA_TYPES_INT32];
+    } else if (uaType == UA_TYPES_UINT32) {
+        UA_UInt32 newValue = NUM2UINT(v_newValue);
+        value.data = UA_malloc(sizeof(UA_UInt32));
+        *(UA_UInt32*)value.data = newValue;
+        value.type = &UA_TYPES[UA_TYPES_UINT32];
     } else if (uaType == UA_TYPES_FLOAT) {
         UA_Float newValue = NUM2DBL(v_newValue);
         value.data = UA_malloc(sizeof(UA_Float));
@@ -456,6 +466,12 @@ static VALUE rb_writeUaValue(VALUE self, VALUE v_nsIndex, VALUE v_name, VALUE v_
     return Qnil;
 }
 
+static VALUE rb_writeUInt16Value(VALUE self, VALUE v_nsIndex, VALUE v_name, VALUE v_newValue) {
+    return rb_writeUaValue(self, v_nsIndex, v_name, v_newValue, UA_TYPES_UINT16);
+}
+
+// TODO: multi UINT16
+
 static VALUE rb_writeInt16Value(VALUE self, VALUE v_nsIndex, VALUE v_name, VALUE v_newValue) {
     return rb_writeUaValue(self, v_nsIndex, v_name, v_newValue, UA_TYPES_INT16);
 }
@@ -472,6 +488,12 @@ static VALUE rb_writeInt32Values(VALUE self, VALUE v_nsIndex, VALUE v_aryNames,
     return rb_writeUaValues(self, v_nsIndex, v_aryNames, v_aryNewValues, UA_TYPES_INT32);
 }
 
+static VALUE rb_writeUInt32Value(VALUE self, VALUE v_nsIndex, VALUE v_name, VALUE v_newValue) {
+    return rb_writeUaValue(self, v_nsIndex, v_name, v_newValue, UA_TYPES_UINT32);
+}
+
+// TODO: multi UINT32
+
 static VALUE rb_writeBooleanValue(VALUE self, VALUE v_nsIndex, VALUE v_name, VALUE v_newValue) {
     return rb_writeUaValue(self, v_nsIndex, v_name, v_newValue, UA_TYPES_BOOLEAN);
 }
@@ -522,9 +544,16 @@ static VALUE rb_readUaValue(VALUE self, VALUE v_nsIndex, VALUE v_name, int type)
         UA_Int16 val =*(UA_Int16*)value.data;
         // printf("the value is: %i\n", val);
         result = INT2FIX(val);
+    } else if (type == UA_TYPES_UINT16 && UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_UINT16])) {
+        UA_UInt16 val =*(UA_UInt16*)value.data;
+        // printf("the value is: %i\n", val);
+        result = INT2FIX(val);
     } else if (type == UA_TYPES_INT32 && UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_INT32])) {
         UA_Int32 val =*(UA_Int32*)value.data;
         result = INT2FIX(val);
+    } else if (type == UA_TYPES_UINT32 && UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_UINT32])) {
+        UA_UInt32 val =*(UA_UInt32*)value.data;
+        result = INT2FIX(val);
     } else if (type == UA_TYPES_BOOLEAN && UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_BOOLEAN])) {
         UA_Boolean val =*(UA_Boolean*)value.data;
         result = val ? Qtrue : Qfalse;
@@ -532,7 +561,7 @@ static VALUE rb_readUaValue(VALUE self, VALUE v_nsIndex, VALUE v_name, int type)
         UA_Float val =*(UA_Float*)value.data;
         result = DBL2NUM(val);
     } else {
-        rb_raise(cError, "Not an int16");
+        rb_raise(cError, "UA type mismatch");
         return Qnil;
     }
     
@@ -546,10 +575,18 @@ static VALUE rb_readInt16Value(VALUE self, VALUE v_nsIndex, VALUE v_name) {
     return rb_readUaValue(self, v_nsIndex, v_name, UA_TYPES_INT16);
 }
 
+static VALUE rb_readUInt16Value(VALUE self, VALUE v_nsIndex, VALUE v_name) {
+    return rb_readUaValue(self, v_nsIndex, v_name, UA_TYPES_UINT16);
+}
+
 static VALUE rb_readInt32Value(VALUE self, VALUE v_nsIndex, VALUE v_name) {
     return rb_readUaValue(self, v_nsIndex, v_name, UA_TYPES_INT32);
 }
 
+static VALUE rb_readUInt32Value(VALUE self, VALUE v_nsIndex, VALUE v_name) {
+    return rb_readUaValue(self, v_nsIndex, v_name, UA_TYPES_UINT32);
+}
+
 static VALUE rb_readBooleanValue(VALUE self, VALUE v_nsIndex, VALUE v_name) {
     return rb_readUaValue(self, v_nsIndex, v_name, UA_TYPES_BOOLEAN);
 }
@@ -637,13 +674,17 @@ void Init_opcua_client()
     rb_define_method(cClient, "state", rb_state, 0);
     
     rb_define_method(cClient, "read_int16", rb_readInt16Value, 2);
+    rb_define_method(cClient, "read_uint16", rb_readUInt16Value, 2);
     rb_define_method(cClient, "read_int32", rb_readInt32Value, 2);
+    rb_define_method(cClient, "read_uint32", rb_readUInt32Value, 2);
     rb_define_method(cClient, "read_float", rb_readFloatValue, 2);
     rb_define_method(cClient, "read_boolean", rb_readBooleanValue, 2);
     rb_define_method(cClient, "read_bool", rb_readBooleanValue, 2);
     
     rb_define_method(cClient, "write_int16", rb_writeInt16Value, 3);
+    rb_define_method(cClient, "write_uint16", rb_writeUInt16Value, 3);
     rb_define_method(cClient, "write_int32", rb_writeInt32Value, 3);
+    rb_define_method(cClient, "write_uint32", rb_writeUInt32Value, 3);
     rb_define_method(cClient, "write_float", rb_writeFloatValue, 3);
     rb_define_method(cClient, "write_boolean", rb_writeBooleanValue, 3);
     rb_define_method(cClient, "write_bool", rb_writeBooleanValue, 3);

data/lib/opcua_client/version.rb

@@ -1,3 +1,3 @@
 module OPCUAClient
-  VERSION = "0.0.2".freeze
+  VERSION = "0.0.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opcua_client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ritvars Rundzans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: