LazGem 0.0.2 → 0.0.3

data/README.md

@@ -22,7 +22,12 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+please try to execute sample program
+tx:	sample\sample_tx.rb
+rx:	sample\sample_rx.rb
+
+document(Japanese only):
+  http://www.lapis-semi.com/lazurite-jp/contents/gateway/ruby/LazGem.html
 
 ## Development
 
@@ -32,7 +37,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/LazGem. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/LAPIS-Lazurite/LazGem. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/lib/LazGem/device.rb

@@ -27,7 +27,7 @@ class LazGem::Device
 #	mode:	must be 2
 # return
 #	none
-	def device_open(ch=36, panid=0xabcd, pwr=20, rate=100, mode=2, callback=nil)
+	def device_open(ch=36, panid=0xabcd, pwr=20, rate=100, mode=2)
 		if(ch < 24) || (ch > 61) then
 			puts "ch is invalid. it must be 24-61"
 			raise LAZURITE_ERROR
@@ -43,7 +43,7 @@ class LazGem::Device
 			raise LAZURITE_ERROR
 			return
 		end
-		cmd = "sudo insmod /home/pi/driver/sub-ghz/DRV_802154.ko ch=" +ch.to_s+" panid=0x"+panid.to_s(16)+ " pwr="+pwr.to_s+" rate="+rate.to_s + " mode="+mode.to_s(16)
+		cmd = "sudo insmod /home/pi/driver/LazDriver/DRV_802154.ko ch=" +ch.to_s+" panid=0x"+panid.to_s(16)+ " pwr="+pwr.to_s+" rate="+rate.to_s + " mode="+mode.to_s(16)
 		result = system(cmd)
 		bp3596_dev = "/dev/bp3596"
 		sleep(0.1)
@@ -218,7 +218,8 @@ class LazGem::Device
 		#payload
 		payload =packet["payload"]
 		if payload.length > 235 then
-			raise PAYLOAD_SIZE_OVER
+			puts "Payload size over. maximum length is less than 235"
+			raise LAZURITE_ERROR
 			return
 		end
 
@@ -228,7 +229,8 @@ class LazGem::Device
 		begin
 			len = @@device_wr.write(raw)
 		rescue
-			raise EACK
+			puts "Doesn't receive ACK"
+			raise LAZURITE_ERROR
 		end
 		return len
 	end

data/lib/LazGem/version.rb

@@ -1,3 +1,3 @@
 module LazGem
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
 end

data/lib/LazGem.rb

@@ -1,5 +1,5 @@
 module LazGem; end
 
 require_relative "LazGem/version"
-require_relative "LazGem/device
+require_relative "LazGem/device"
 

data/sample/sample_tx.rb

@@ -3,14 +3,10 @@
 # Function:
 #   Lazurite Sub-GHz/Lazurite Pi Gateway Sample program
 #   SerialMonitor.rb
-require './lazurite'
+require 'LazGem'
 
 laz = LazGem::Device.new
 
-#laz.open(ch=10)
-#laz.open()
-##laz.open(ch=24)
-
 finish_flag=0
 Signal.trap(:INT){
 	finish_flag=1
@@ -21,7 +17,10 @@ laz.device_open()
 while finish_flag == 0 do
 	tx = Hash["rxAddr" => 0x902b]
 	tx["payload"] = "Welcome SubGHz\n"
-	laz.write(tx)
+	begin
+		laz.write(tx)
+	rescue LAZURITE_ERROR
+	end
 end
 
 laz.device_close()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: LazGem
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,7 +72,6 @@ files:
 - .travis.yml
 - CODE_OF_CONDUCT.md
 - Gemfile
-- LICENSE
 - LICENSE.txt
 - LazGem.gemspec
 - README.md

data/LICENSE

@@ -1,7 +0,0 @@
-The MIT License (MIT)
-Copyright (c) <year> <copyright holders>
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-