LazGem 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7a8d7dac05ffcb6c0bf725000a26eaf203f6359
-  data.tar.gz: 1b0ef77cc92e7f31995676a9f0d485ded976f998
+  metadata.gz: 9a6b7695ed6a72efd75da15ce2dcfe395c254330
+  data.tar.gz: fa335a47e4699024c185f6b3c3ab7c6323a44896
 SHA512:
-  metadata.gz: 93c879be719de4f2fdfbda59ce9a740dd6c2153f1ab60d94473f5cc124d3ce14291dc979d1e47a245ed84f5fe7168be3a591c71393e05a102e097b3eb20a452a
-  data.tar.gz: 448b5ea510c8f318920fc97859108ddb969d5ee1bde3dd5a99ad3646d04511fc101a4f6bbe51a0f3d58a3fd5af00440e2496d368037bf56cba3c24a6f3315bd6
+  metadata.gz: ac308c0aefe25db25a77b6a7f9a3b8024d64eeb5ecc2d5d1f886bbbe7c47a4d3caf2dda360e568d5a5e20b788448881182cb28a9fc3e47a8cb6e587213dab91f
+  data.tar.gz: 0aaff4a10e5ecb6fb0e2fddd76aaefbba680c61b0ca5d66ada18bdcf69626136c4c63e4de1b7d19c4e272261f89e5bf8d808af9fdd85d86e0794f3e3c7ded69f

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 tags
+tags.lock

data/lib/LazGem/device.rb

@@ -73,6 +73,148 @@ class LazGem::Device
 		return size
 	end
 
+	def readBin()
+		size = 2
+		len = @@device_rd.read(size)
+    	if ((len == "") || (len == nil)) then # read result is empty
+      		return 0
+    	end
+    	size =  len.unpack("S*")[0]
+
+    	# The received data is read
+    	raw = @@device_rd.read(size)
+    	if ((raw == "") || (raw == nil)) then # read result is empty
+      		return -1
+		end
+		
+		len = raw.length
+		header = raw.unpack("S*")[0]
+
+		dst_addr_type = (header>>14) & 0x03
+		frame_ver = (header >> 12) & 0x03
+		src_addr_type = (header >> 10) & 0x03
+		ielist = (header >> 9) & 0x01
+		seq_comp = (header >> 8) & 0x01
+		panid_comp = (header >> 6) & 0x01
+		ack_req = (header >> 5) & 0x01
+		pending = (header >> 4) & 0x01
+		sec_enb = (header >> 3) & 0x01
+		frame_type = (header >> 0) & 0x07
+
+		offset = 2
+
+		if seq_comp == 0 then
+			seq_num = raw[offset..offset+1].unpack("C")[0]
+			offset = offset + 1
+		end
+
+		if dst_addr_type == 0 && src_addr_type == 0 && panid_comp == 0 then
+			addr_type = 0
+			dst_panid = nil
+			src_panid = nil
+		elsif dst_addr_type == 0 && src_addr_type == 0 && panid_comp != 0 then
+			addr_type = 1
+			dst_panid = raw[offset..offset+2].unpack("S*")[0]
+			offset = offset + 2
+			dst_panid = nil
+		elsif dst_addr_type == 0 && src_addr_type != 0 && panid_comp == 0 then
+			addr_type = 2
+			dst_panid = nil
+			src_panid = raw[offset..offset+2].unpack("S*")[0]
+			offset = offset + 2
+		elsif dst_addr_type == 0 && src_addr_type != 0 && panid_comp != 0 then
+			addr_type = 3
+			dst_panid = nil
+			src_panid = nil
+		elsif dst_addr_type != 0 && src_addr_type == 0 && panid_comp == 0 then
+			addr_type = 4
+			dst_panid = raw[offset..offset+2].unpack("S*")[0]
+			offset = offset + 2
+			src_panid = nil
+		elsif dst_addr_type != 0 && src_addr_type == 0 && panid_comp != 0 then
+			addr_type = 5
+			dst_panid = nil
+			src_panid = nil
+		elsif dst_addr_type != 0 && src_addr_type != 0 && panid_comp == 0 then
+			addr_type = 6
+			dst_panid = raw[offset..offset+2].unpack("S*")[0]
+			offset = offset + 2
+			src_panid = nil
+		elsif dst_addr_type != 0 && src_addr_type != 0 && panid_comp != 0 then
+			addr_type = 7
+			dst_panid = nil
+			src_panid = nil
+		end
+
+		if dst_addr_type == 0 then
+			dst_addr = nil
+		elsif dst_addr_type == 1 then
+			dst_addr = raw[offset].unpack("C")[0]
+			offset = offset+1
+		elsif dst_addr_type == 2 then
+			dst_addr = raw[offset..offset+1].unpack("S*")[0]
+			offset = offset+2
+		else
+			dst_addr = raw[offset+7].unpack("H2")[0] +
+				raw[offset+6].unpack("H2")[0] +
+				raw[offset+5].unpack("H2")[0] +
+				raw[offset+4].unpack("H2")[0] +
+				raw[offset+3].unpack("H2")[0] +
+				raw[offset+2].unpack("H2")[0] +
+				raw[offset+1].unpack("H2")[0] +
+				raw[offset+0].unpack("H2")[0]
+			offset = offset+8
+		end
+
+		if src_addr_type == 0 then
+			src_addr = nil
+		elsif src_addr_type == 1 then
+			src_addr = raw[offset].unpack("C")[0]
+			offset = offset+1
+		elsif src_addr_type == 2 then
+			src_addr = raw[offset..offset+1].unpack("S")[0]
+			offset = offset+2
+		else
+			src_addr = raw[offset+7].unpack("H2")[0] +
+				raw[offset+6].unpack("H2")[0] +
+				raw[offset+5].unpack("H2")[0] +
+				raw[offset+4].unpack("H2")[0] +
+				raw[offset+3].unpack("H2")[0] +
+				raw[offset+2].unpack("H2")[0] +
+				raw[offset+1].unpack("H2")[0] +
+				raw[offset+0].unpack("H2")[0]
+			offset = offset+8
+		end
+
+		payload = raw[offset..len-1]
+
+		rcv = Hash.new()
+
+		rcv["header"] = header
+		rcv["dst_addr_type"] = dst_addr_type
+		rcv["frame_ver"] = frame_ver
+		rcv["src_addr_type"] = src_addr_type
+		rcv["ielist"] = ielist
+		rcv["seq_comp"] = seq_comp
+		rcv["panid_comp"] = panid_comp
+		rcv["ack_req"] = ack_req
+		rcv["pending"] = pending
+		rcv["sec_enb"] = sec_enb
+		rcv["frame_type"] = frame_type
+		rcv["addr_type"] = addr_type
+		rcv["dst_panid"] = dst_panid
+		rcv["src_panid"] = src_panid
+		rcv["dst_addr"] = dst_addr
+		rcv["src_addr"] = src_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
+
 	def read()
 		size = 2
 		len = @@device_rd.read(size)
@@ -212,8 +354,7 @@ class LazGem::Device
 		rcv["sec"]=sec
 		rcv["nsec"]=nsec
 		rcv["rssi"]=get_rx_rssi()
-			
-    	return rcv
+		return rcv
 	end
 	def send64(addr,payload)
 		set_dst_addr0((addr >>  0)&0x000000000000ffff)

data/lib/LazGem/version.rb

@@ -1,3 +1,3 @@
 module LazGem
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
 end

data/sample/sample_rxBin.rb

@@ -0,0 +1,74 @@
+#! /usr/bin/ruby
+# -*- coding: utf-8; mode: ruby -*-
+# Function:
+#   Lazurite Sub-GHz/Lazurite Pi Gateway Sample program
+#   SerialMonitor.rb
+require 'LazGem'
+
+laz = LazGem::Device.new
+
+# Halt process when CTRL+C is pushed.
+finish_flag=0
+Signal.trap(:INT){
+	finish_flag=1
+}
+
+if ARGV.size == 0
+	printf("please input argument of ch at least\n")
+	printf("command format is shown below...\n")
+	printf("./sample_rx.rb ch panid baud pwr\n")
+	printf("  ch:    24-61\n")
+	printf("  panid: 0-0xffff\n")
+	printf("  baud:  50 or 100\n")
+	printf("  pwr:   1 or 20\n")
+	exit 0
+end
+
+# open device deriver
+
+dst_addr = 0xffff
+ch = 36
+panid = 0xabcd
+baud = 100
+pwr = 20
+
+if ARGV.size > 0
+	ch=Integer(ARGV[0])
+end
+if ARGV.size > 1
+	panid = Integer(ARGV[1])
+end
+if ARGV.size > 2
+	baud = Integer(ARGV[2])
+end
+if ARGV.size > 3
+	pwr = Integer(ARGV[3])
+end
+
+laz.init()
+
+print(sprintf("myAddress=0x%016x\n",laz.getMyAddr64()))
+print(sprintf("myAddress=0x%04x\n",laz.getMyAddress()))
+
+laz.begin(ch,panid,baud,pwr)
+laz.rxEnable()
+
+# printing header of receiving log
+print(sprintf("time\t\t\t\t\t[ns]\trxPanid\trxAddr\ttxAddr\trssi\tpayload\n"))
+print(sprintf("------------------------------------------------------------------------------------------\n"))
+
+# main routine
+while finish_flag == 0 do
+	if laz.available() <= 0
+		sleep 0.01
+		next
+	end
+	rcv = laz.readBin()
+	# printing data
+	p rcv
+end
+
+# finishing process
+laz.remove()
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: LazGem
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - NaotakaSaito
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-18 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,6 +78,7 @@ files:
 - release.log
 - sample/sample_promiscuous.rb
 - sample/sample_rx.rb
+- sample/sample_rxBin.rb
 - sample/sample_tx.rb
 - sample/sample_tx64.rb
 - sample/tags
@@ -101,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Lazurite ruby gem