LazGem 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '08f6fffa6b77049482ddd2d3d0f528afcb888d96'
-  data.tar.gz: 6941a5872fd535880ed6d3b535a8154408200be3
+SHA256:
+  metadata.gz: 76dd58cb44646e65529a4b39b7d1df1c683e706012f8246bc019da1785f91546
+  data.tar.gz: eaeef35b2ba4e6d51c43df459b7f63d5bc1a7d4c04e6fc2fee75da2f0c156eec
 SHA512:
-  metadata.gz: cbe7dbd97981a6fa873a7549531fab804a3bd58752703d6622efd3c80980813deb41c07ab1efb47af66db0da04599cb02be2bc622712808ad91b9fdfc839876d
-  data.tar.gz: 53406120d64d5f80e4b0c6bd31c60f97d4c77504c447a0f84de72c6218d086ceb5902050f98f91ea7262b3e47e256be1b392c1c4555aca134df4a6c8df1afffa
+  metadata.gz: 3b6f8f43d5aaea14bf5a40c4e1864d09a26f8af0db87f5a7d5d6cd2d0cfd300e5f1da94b36e108b466bcf728cf7cdd838c53274e0c328abad85129ab3492d8b3
+  data.tar.gz: bdb3cad3dd35987602654dfa32d85fcf29979e406b0f3e39e7c64a1c7601f3a91c169b28979d262dd0e008ca6486fa22b3ff6dd2d31b908350a0e9a3dc0d8d33

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 tags
 tags.lock
+sample/log

data/lib/LazGem/device.rb

@@ -21,6 +21,7 @@ class LazGem::Device
 
 	def init(module_test=0x0000)
 		cmd = "sudo insmod /home/pi/driver/LazDriver/lazdriver.ko module_test="+module_test.to_s
+#		cmd = "sudo modprobe lazdriver module_test="+module_test.to_s
 		p cmd
 		result = system(cmd)
 		lzgw_dev = "/dev/lzgw"
@@ -52,13 +53,14 @@ class LazGem::Device
 			p e
 		end
 		begin
-		@@device_wr.close
+			@@device_wr.close
 		rescue Exception => e
 			p e
 		end
 		@@devie_rd = nil
 		@@device_wr = nil
 		cmd = "sudo rmmod lazdriver"
+#		cmd = "sudo modprobe -r lazdriver"
 		system(cmd)
 		p cmd
 	end
@@ -66,33 +68,33 @@ class LazGem::Device
 	def available()
 		size = 2
 		len = @@device_rd.read(size)
-    	if ((len == "") || (len == nil)) then # read result is empty
-      		return 0
+		if ((len == "") || (len == nil)) then # read result is empty
+			return 0
 		end
-    	size =  len.unpack("S*")[0]
+		size =  len.unpack("S*")[0]
 		return size
 	end
 
-	def readBin()
+	def read()
 		size = 2
 		len = @@device_rd.read(size)
-    	if ((len == "") || (len == nil)) then # read result is empty
-      		return 0
-    	end
-    	size =  len.unpack("S*")[0]
+		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
+		# 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
+		src_addr_type = (header>>14) & 0x03
 		frame_ver = (header >> 12) & 0x03
-		src_addr_type = (header >> 10) & 0x03
+		dst_addr_type = (header >> 10) & 0x03
 		ielist = (header >> 9) & 0x01
 		seq_comp = (header >> 8) & 0x01
 		panid_comp = (header >> 6) & 0x01
@@ -104,199 +106,38 @@ class LazGem::Device
 		offset = 2
 
 		if seq_comp == 0 then
-			seq_num = raw[offset..offset+1].unpack("C")[0]
-			offset = offset + 1
+			seq_num = raw[offset].unpack("C")[0]
+			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
+		if dst_addr_type != 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
+			addr_type = 0
 		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)
-    	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
+		if src_addr_type != 0 then
+			addr_type += 2
 		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
+		if panid_comp != 0 then
+			addr_type += 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
+		case addr_type
+		when 1, 4, 6 then
+			dst_panid = raw[offset..offset+1].unpack("S*")[0]
+			offset += 2
+		else
 			dst_panid = nil
-			src_panid = nil
 		end
-
-		if dst_addr_type == 0 then
-			dst_addr = nil
-		elsif dst_addr_type == 1 then
+		# dst_addr
+		case dst_addr_type
+		when 1 then
 			dst_addr = raw[offset].unpack("C")[0]
-			offset = offset+1
-		elsif dst_addr_type == 2 then
+			offset += 1
+		when 2 then
 			dst_addr = raw[offset..offset+1].unpack("S*")[0]
-			offset = offset+2
-		else
+			offset += 2
+		when 3 then
 			dst_addr = raw[offset+7].unpack("H2")[0] +
 				raw[offset+6].unpack("H2")[0] +
 				raw[offset+5].unpack("H2")[0] +
@@ -305,18 +146,26 @@ class LazGem::Device
 				raw[offset+2].unpack("H2")[0] +
 				raw[offset+1].unpack("H2")[0] +
 				raw[offset+0].unpack("H2")[0]
-			offset = offset+8
+			offset += 8
+		else
 		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
+		# src_panid
+		case addr_type
+		when 2 then
+			src_panid = raw[offset..offset+1].unpack("S*")[0]
+			offset += 2
 		else
+			src_panid = nil
+		end
+		# src_addr
+		case src_addr_type
+		when 1 then
+			src_addr = raw[offset].unpack("C")[0]
+			offset += 1
+		when 2 then
+			src_addr = raw[offset..offset+1].unpack("S*")[0]
+			offset += 2
+		when 3 then
 			src_addr = raw[offset+7].unpack("H2")[0] +
 				raw[offset+6].unpack("H2")[0] +
 				raw[offset+5].unpack("H2")[0] +
@@ -325,7 +174,8 @@ class LazGem::Device
 				raw[offset+2].unpack("H2")[0] +
 				raw[offset+1].unpack("H2")[0] +
 				raw[offset+0].unpack("H2")[0]
-			offset = offset+8
+			offset += 8
+		else
 		end
 
 		payload = raw[offset..len-1]
@@ -333,9 +183,9 @@ class LazGem::Device
 		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["frame_ver"] = frame_ver
+		rcv["dst_addr_type"] = dst_addr_type
 		rcv["ielist"] = ielist
 		rcv["seq_comp"] = seq_comp
 		rcv["panid_comp"] = panid_comp
@@ -367,7 +217,11 @@ class LazGem::Device
 	def send(panid,addr,payload)
 		set_dst_panid(panid)
 		set_dst_addr0(addr)
-		@@device_wr.write(payload)
+		begin
+			@@device_wr.write(payload)
+		rescue Exception => e
+			p e
+		end
 		sleep 0.001
 	end
 end

data/lib/LazGem/ioctl.rb

@@ -66,9 +66,14 @@ class LazGem::Device
 	IOCTL_SET_EACK_ENB=		IOCTL_PARAM+0x3F
 	IOCTL_GET_EACK=			IOCTL_PARAM+0x40
 	IOCTL_SET_ACK_INTERVAL=	IOCTL_PARAM+0x43
+	IOCTL_GET_ED_VALUE=	IOCTL_PARAM+0x44
+	IOCTL_SET_ANT_SWITCH=	IOCTL_PARAM+0x45
+	IOCTL_SET_DSSS_MODE=	IOCTL_PARAM+0x80
+	IOCTL_SET_DSSS_SF=	    IOCTL_PARAM+0x81
+	IOCTL_SET_DSSS_SIZE=	IOCTL_PARAM+0x82
 	IOCTL_RF=			0x2000
-	IOCTL_RF_READ=		IOCTL_RF+0x0000
-	IOCTL_RF_WRITE=		IOCTL_RF+0x8000
+	IOCTL_RF_READ=		IOCTL_RF
+	IOCTL_RF_WRITE=		IOCTL_RF
 	IOCTL_EEPROM=		0x3000
 	IOCTL_RX_LED=		0x4000
 	IOCTL_TX_LED=		0x4000
@@ -136,6 +141,12 @@ class LazGem::Device
 	def setAckTxInterval(interval)
 		size = @@device_wr.ioctl(IOCTL_SET_ACK_INTERVAL,interval)
 	end
+	def getEdValue()
+		ret = @@device_wr.ioctl(IOCTL_GET_ED_VALUE,0)
+	end
+	def setAntSw(antsw)
+		ret = @@device_wr.ioctl(IOCTL_SET_ANT_SWITCH,andsw)
+	end
 	def close()
 		data = 0
 		ret = @@device_wr.ioctl(IOCTL_SET_CLOSE,data)
@@ -262,8 +273,14 @@ class LazGem::Device
 		return ret
 	end
 	def set_dst_panid(panid)
-		ret = @@device_wr.ioctl(IOCTL_SET_DST_PANID,panid)
-		return ret
+#		ret = @@device_wr.ioctl(IOCTL_SET_DST_PANID,panid)
+#		return ret
+        begin
+		  @@device_wr.ioctl(IOCTL_SET_DST_PANID,panid)
+        rescue Exception => e
+          p e
+        end
+		return 0
 	end
 	def get_my_addr0()
 		addr = 0;
@@ -291,8 +308,14 @@ class LazGem::Device
 		return ret
 	end
 	def set_dst_addr0(addr)
-		ret = @@device_wr.ioctl(IOCTL_SET_DST_ADDR0,addr)
-		return ret
+#		ret = @@device_wr.ioctl(IOCTL_SET_DST_ADDR0,addr)
+#		return ret
+        begin 
+		  @@device_wr.ioctl(IOCTL_SET_DST_ADDR0,addr)
+        rescue Exception => e
+          p e
+        end
+		return 0
 	end
 	def get_dst_addr1()
 		addr = 0;
@@ -403,6 +426,19 @@ class LazGem::Device
 		return rssi
 	end
 
+
+	def setModulation(mode)
+		ret = @@device_wr.ioctl(IOCTL_SET_DSSS_MODE,mode)
+	end
+	def setDsssSpreadFactor(sf)
+		ret = @@device_wr.ioctl(IOCTL_SET_DSSS_SF,sf)
+	end
+	def setDsssSize(size,addrmode)
+		size_mode = (size << 8 | addrmode)
+		ret = @@device_wr.ioctl(IOCTL_SET_DSSS_SIZE,size_mode)
+	end
+
+
 	def rf_reg_read(addr)
 		data = 0;
 		if addr >= 0 || addr <= 0xff then
@@ -411,8 +447,8 @@ class LazGem::Device
 		end
 	end
 	def rf_reg_write(addr,data)
-		if addr >= 0 || ch <= 0xff || data >= 0 || data <= 0xff then
-			ret = @@device_wr.ioctl(IOCTL_RF_WRITE+addr ,data)
+		if addr >= 0 || addr <= 0xff || data >= 0 || data <= 0xff then
+			ret = @@device_wr.ioctl(IOCTL_RF_WRITE + addr + 0x80, data)
 			return ret
 		end
 	end
@@ -427,7 +463,7 @@ class LazGem::Device
 
 	def rx_led(time)
 		if time >= 0 || time <= 0xffff then
-			ret = @@device_wr.ioctl(IOCTL_RX_LED,time)
+			ret = @@device_wr.ioctl(IOCTL_RX_LED + 0x0800,time)
 			return ret
 		end
 	end

data/lib/LazGem/version.rb

@@ -1,3 +1,3 @@
 module LazGem
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: LazGem
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - NaotakaSaito
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,10 +78,8 @@ 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
 homepage: https://github.com/LAPIS-Lazurite/LazGem
 licenses:
 - MIT
@@ -102,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Lazurite ruby gem

data/sample/sample_rxBin.rb

@@ -1,74 +0,0 @@
-#! /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()
-
-