LazGem 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 985405454252520def5e31a7afae9187704aa1c4
-  data.tar.gz: 03699e93b777b3b52de11603b2fa40df4bce8c12
+  metadata.gz: c3656381c62a56251075c9f8a2100fa659d9f9df
+  data.tar.gz: b166421e3ca0a2f91d03873e18958bf13331ba1e
 SHA512:
-  metadata.gz: feae049a0705ecdac98751f784c75ef733b49d49b5ae3f2e2c180863ed028681b28711b9aa353411e2965bdf34a84f931c59e02b4328f2e23690b3a40b561445
-  data.tar.gz: 7fff6cd541ccb21472487dd82dd9c90db8c97469da5fd0e901b9fc2620e41b283a8321da52e178ed7df06b47198aedf3c9c0c40a072b3d6b33d9e7f30603c3fb
+  metadata.gz: b3b0402b79744b9c2a1636aed88739311c1f07fb0c7c7a3d6b0e6b9f9e02ed255209c893aa4d396653015eff0259496bc75796c4355101f6ad1131ef080f662e
+  data.tar.gz: 1e2a2ed8fd02d8eb2b6ac7ee0be18ae95bfa3f8569168dc8ecaa471a7aaa2637032090892434c6ec1554a0c1fbb5c50f872f698e347efdae7b1be0f62e01f2e3

data/lib/LazGem/device.rb

@@ -63,11 +63,20 @@ class LazGem::Device
 		p cmd
 	end
 
+	def available()
+		size = 2
+		len = @@device_rd.read(size)
+    	if ((len == "") || (len == nil)) then # read result is empty
+      		return 0
+		end
+		return size
+	end
+
 	def read()
 		size = 2
 		len = @@device_rd.read(size)
     	if ((len == "") || (len == nil)) then # read result is empty
-      		return -1
+      		return 0
     	end
     	size =  len.unpack("S*")[0]
 
@@ -94,7 +103,7 @@ class LazGem::Device
 		offset = 2
 
 		if seq_comp == 0 then
-			seq = raw[offset..offset+1].unpack("C")[0]
+			seq_num = raw[offset..offset+1].unpack("C")[0]
 			offset = offset + 1
 		end
 
@@ -178,7 +187,12 @@ class LazGem::Device
 		rcv["tx_panid"] = tx_panid
 		rcv["rx_addr"] = rx_addr
 		rcv["tx_addr"] = tx_addr
+		rcv["seq_num"] = seq_num
 		rcv["payload"] = payload
+		sec,nsec = get_rx_time()
+		rcv["sec"]=sec
+		rcv["nsec"]=nsec
+		rcv["rssi"]=get_rx_rssi()
 			
     	return rcv
 	end

data/lib/LazGem/ioctl.rb

@@ -140,6 +140,28 @@ class LazGem::Device
 		return ret
 	end
 
+	def getAddrType()
+		ret = @@device_wr.ioctl(IOCTL_GET_SEND_MODE,0)
+		return get_addr_type()
+	end
+	def setAddrType(addr_type)
+		ret = @@device_wr.ioctl(IOCTL_GET_SEND_MODE,0)
+		ret = set_addr_type(addr_type)
+		ret = @@device_wr.ioctl(IOCTL_SET_SEND_MODE,0)
+		return ret
+	end
+
+	def getTxRetry()
+		ret = @@device_wr.ioctl(IOCTL_GET_SEND_MODE,0)
+		return get_tx_retry()
+	end
+	def setTxRetry(cycle)
+		ret = @@device_wr.ioctl(IOCTL_GET_SEND_MODE,0)
+		ret = set_tx_retry(cycle)
+		ret = @@device_wr.ioctl(IOCTL_SET_SEND_MODE,0)
+		return ret
+	end
+
 ###			Libraries
 	def set_begin()
 		data = 0;
@@ -331,10 +353,7 @@ class LazGem::Device
 		rx_sec = rx_sec * 65536 + @@device_wr.ioctl(IOCTL_GET_RX_SEC0,tmp)
 		rx_nsec = @@device_wr.ioctl(IOCTL_GET_RX_NSEC1,tmp)
 		rx_nsec = rx_nsec *65536 + @@device_wr.ioctl(IOCTL_GET_RX_NSEC0,tmp)
-		rx_time = Hash.new()
-		rx_time["sec"] = rx_sec
-		rx_time["nsec"] = rx_nsec
-		return rx_time
+		return rx_sec,rx_nsec
 	end
 	def get_rx_rssi()
 		tmp = 0;

data/lib/LazGem/version.rb

@@ -1,3 +1,3 @@
 module LazGem
-    VERSION = "0.0.6"
+    VERSION = "0.0.8"
 end

data/sample/sample_rx.rb

@@ -33,15 +33,13 @@ print(sprintf("-----------------------------------------------------------------
 
 # main routine
 while finish_flag == 0 do
-	rcv = laz.read()
-	if rcv == -1 then
+	if laz.available() <= 0
 		next
 	end
+	rcv = laz.read()
 	# printing data
-	p rcv
-	rx_time = laz.get_rx_time()
-	rssi = laz.get_rx_rssi()
-	print(sprintf("rx_time= %s\trx_nsec=%d\trssi=%d\n",Time.at(rx_time["sec"]),rx_time["nsec"],rssi));
+	#p rcv
+	print(sprintf("rx_time= %s\trx_nsec=%d\trssi=%d %s\n",Time.at(rcv["sec"]),rcv["nsec"],rcv["rssi"],rcv["payload"]));
 end
 
 # finishing process

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: LazGem
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - NaotakaSaito
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler