sicl 1.0.0 → 1.0.1
Sign up to get free protection for your applications and to get access to all the features.
- data/History.txt +8 -0
- data/README.txt +2 -2
- data/Rakefile +2 -2
- data/ext/sicl.c +5 -5
- metadata +5 -16
data/History.txt
CHANGED
data/README.txt
CHANGED
@@ -68,7 +68,7 @@ SICL/Ruby Reference : ((<English|URL:sicl.en.html>))/((<Japanese|URL:sicl.ja.htm
|
|
68
68
|
|
69
69
|
== REQUIREMENTS:
|
70
70
|
|
71
|
-
((<Aiglent IO Libraries Suite 14.2|URL:http://www.agilent.com/>))
|
71
|
+
((<Aiglent IO Libraries Suite 14.2 or later|URL:http://www.agilent.com/>))
|
72
72
|
|
73
73
|
== INSTALL:
|
74
74
|
|
@@ -90,4 +90,4 @@ Or not, Please build from the soruce code.
|
|
90
90
|
|
91
91
|
(GPL ver.2)
|
92
92
|
|
93
|
-
Copyright (c)
|
93
|
+
Copyright (c) 2011, Naoki Kobayashi
|
data/Rakefile
CHANGED
@@ -32,9 +32,9 @@ task :default => :package
|
|
32
32
|
|
33
33
|
spec = Gem::Specification.new do |s|
|
34
34
|
s.name = "sicl"
|
35
|
-
s.version = "1.0.
|
35
|
+
s.version = "1.0.1"
|
36
36
|
s.summary = "Agilent SICL API wrapper class for Ruby."
|
37
|
-
s.autorequire = "sicl"
|
37
|
+
# s.autorequire = "sicl"
|
38
38
|
s.files = PKG_FILES
|
39
39
|
s.default_executable = "ext/extconf.rb"
|
40
40
|
s.extensions = ["ext/extconf.rb"]
|
data/ext/sicl.c
CHANGED
@@ -305,7 +305,7 @@ static VALUE sicl_iopen(VALUE self, VALUE addr)
|
|
305
305
|
|
306
306
|
Check_Type(addr, T_STRING);
|
307
307
|
|
308
|
-
inst->id = iopen(
|
308
|
+
inst->id = iopen(RSTRING_PTR(addr));
|
309
309
|
itimeout(inst->id, 5000);
|
310
310
|
|
311
311
|
rb_hash_aset(gConfig, INT2FIX(inst->id), self);
|
@@ -392,8 +392,8 @@ static VALUE sicl_iwrite(VALUE self, VALUE cmd, VALUE eoi)
|
|
392
392
|
|
393
393
|
Data_Get_Struct(self, struct instrument, inst);
|
394
394
|
|
395
|
-
ptr =
|
396
|
-
len =
|
395
|
+
ptr = RSTRING_PTR(cmd);
|
396
|
+
len = RSTRING_LEN(cmd);
|
397
397
|
|
398
398
|
if (rb_ivar_get(self, s_buf_mode)==Qtrue) write_func = ifwrite;
|
399
399
|
|
@@ -416,7 +416,7 @@ static VALUE sicl_iwrite_op(VALUE self, VALUE cmd)
|
|
416
416
|
|
417
417
|
Check_Type(cmd, T_STRING);
|
418
418
|
|
419
|
-
ch =
|
419
|
+
ch = RSTRING_PTR(cmd)[RSTRING_LEN(cmd)-1];
|
420
420
|
|
421
421
|
if (ch == '\r' || ch == '\n') eoi = Qtrue;
|
422
422
|
|
@@ -468,7 +468,7 @@ static VALUE sicl_iread(VALUE self, VALUE max)
|
|
468
468
|
rb_str_cat(str, buf, actualcnt);
|
469
469
|
|
470
470
|
if (err==I_ERR_TIMEOUT) {
|
471
|
-
if (
|
471
|
+
if (RSTRING_LEN(str)>0) err = I_ERR_NOERROR;
|
472
472
|
break;
|
473
473
|
}
|
474
474
|
if (reason==I_TERM_END) break;
|
metadata
CHANGED
@@ -1,21 +1,16 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sicl
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
|
5
|
-
|
6
|
-
segments:
|
7
|
-
- 1
|
8
|
-
- 0
|
9
|
-
- 0
|
10
|
-
version: 1.0.0
|
4
|
+
prerelease:
|
5
|
+
version: 1.0.1
|
11
6
|
platform: ruby
|
12
7
|
authors: []
|
13
8
|
|
14
|
-
autorequire:
|
9
|
+
autorequire:
|
15
10
|
bindir: bin
|
16
11
|
cert_chain: []
|
17
12
|
|
18
|
-
date: 2011-
|
13
|
+
date: 2011-05-10 00:00:00 +09:00
|
19
14
|
default_executable: ext/extconf.rb
|
20
15
|
dependencies: []
|
21
16
|
|
@@ -52,23 +47,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
52
47
|
requirements:
|
53
48
|
- - ">="
|
54
49
|
- !ruby/object:Gem::Version
|
55
|
-
hash: 3
|
56
|
-
segments:
|
57
|
-
- 0
|
58
50
|
version: "0"
|
59
51
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
60
52
|
none: false
|
61
53
|
requirements:
|
62
54
|
- - ">="
|
63
55
|
- !ruby/object:Gem::Version
|
64
|
-
hash: 3
|
65
|
-
segments:
|
66
|
-
- 0
|
67
56
|
version: "0"
|
68
57
|
requirements: []
|
69
58
|
|
70
59
|
rubyforge_project:
|
71
|
-
rubygems_version: 1.
|
60
|
+
rubygems_version: 1.6.2
|
72
61
|
signing_key:
|
73
62
|
specification_version: 3
|
74
63
|
summary: Agilent SICL API wrapper class for Ruby.
|