comunika_gsm 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7b71d21aced1962e1255d937dcf8be013eba3b4
-  data.tar.gz: 21210af97b88dee957a2afb2c3584965a93454db
+  metadata.gz: bb1b333cccb5acb38a35fb33bb91b1cdea85cef4
+  data.tar.gz: 9af089271d67cdf3eaffdff2800d699fb345df56
 SHA512:
-  metadata.gz: 14861593cd7ef508a6a03df08a39190294d2b28d30d2c6d96458783c78bda5780df2b1d52ac2eba5504c7d5209693fc1e50751e9c6d1fc756e0ca9f2d5f9447a
-  data.tar.gz: 5c90bc8be68e91ea4965aedebb55b9fa49ff46067a7b123cb95a9dbe6f2f2b343a41d2ba6b17488bb598bd9036fef95ef5af1dadc55aa3383bce592bf58b9503
+  metadata.gz: 9b7cf6ea9fcfd12abfc261c5273c66066afde4d8e6d10bbbd1e152b5abfcbd7aeac2cb1c465bd704ff31c4352af4706e37aa9aa2b2c1793524bcb11ad5f03172
+  data.tar.gz: 7b2ae64ab3ed30e426d9b10eee91dd45b4d3592f4248ff870ace40f659678d6b8e9e8e486548bcc8c609c421278ad5b1e36e0638297d873d863af4f0ca929a4d

data/lib/comunika_gsm/gsm2.rb

@@ -1,54 +1,61 @@
 module ComunikaGsm
   class GSM2
-    def initialize(options = {})
-      begin
-        @port = SerialPort.new("/dev/#{options[:port]}",19200,8,1, SerialPort::NONE)
-        @port.read_timeout = 500
-        @debug = options[:debug]
-        @status = true
-
-        ##cmd("ATE0\r\n")
-        cmd("ATE0\r\n")
-        #cmd("AT+CMGF=1\r\n")
-        cmd("AT+CMGF=0\r\n")
-
+    include Celluloid
+    attr_accessor :status, :imei, :iccid, :provider, :signal_level, :msgs
 
-        # Set SMSC number
-        #cmd("AT+CSCA=\"#{SMSC}\"")
+    def initialize(params = {})
+      raise "Invalid params" if params.empty?
+      
+      begin
+        @@port = SerialPort.new("/dev/#{params[:port]}",19200,8,1, SerialPort::NONE)
+        @@port.read_timeout = params[:read_timeout] || 150 ## Set timeout of command
+
+        @@debug = params[:debug] || false
+
+        res = cmd("ATE0\r\n") ## Set echo off
+        if res.length > 0
+          cmd("AT+CMGF=0\r\n") ## Set PDU mode
+          @status = true
+
+          if params[:load_settings]
+            async.alpha(:imei)
+            async.alpha(:iccid)
+            async.alpha(:provider)
+            async.alpha(:signal_level)
+          end
+        else
+          return @status = false
+        end
       rescue => ex
-        puts ex.message
-        @status = false
+        puts ex.message if @debug
+        return @status = false
       end
     end
 
-    def status
-      @status
-    end
-
-    def set_status(status)
-      @status = status
-    end
-
-    def close
-      @port.close
-    end
-
-    def cmd(cmd)
+    def cmd(c)
       begin
-        @port.flush()
-        @port.write(cmd)
-        normalize(cmd,wait)
+        @@port.write(c)
+        normalize(c,wait)
       rescue => ex
+        puts ex
         @status = false
+        #close
       end
     end
 
     def wait
-      buffer = @port.read
-      puts buffer if @debug
+      buffer = @@port.read
+      puts buffer if @@debug
+      @@port.flush()
       buffer
     end
 
+    def close
+      puts "Fechando conexão"
+      @@port.close
+      @status = false
+    end
+
     def send_sms(msg)
       return {id: nil, status: "ERROR", code: "304"} if msg[:number].length == 0
       return {id: nil, status: "ERROR", code: "304"} if msg[:number].length < 11
@@ -82,16 +89,31 @@ module ComunikaGsm
 
     def messages
       sms = cmd("AT+CMGL=4\r\n")
-      msgs = sms.scan(/\+CMGL\:\s*?(\d+),\s*?(\d+),.*?\,s*?(\d+)\r\n(.*)/)
+      @msgs = sms.scan(/\+CMGL\:\s*?(\d+),\s*?(\d+),.*?\,s*?(\d+)\r\n(.*)/)
 
       ## IDS: 0 - ID, 1 -- ,2 - size, 3 - PDU
-      msgs.collect!{ |m| PDU::PDUDecode.new(connection: self, id: m[0], size: m[2], pdu: m[3].chomp).decode }# rescue nil
+      @msgs.collect!{ |m| PDU::PDUDecode.new(connection: self, id: m[0], size: m[2], pdu: m[3].chomp).decode }# rescue nil
+    end
+
+    def alpha(type)
+      case type
+      when :imei
+        @imei = cmd("AT+CGSN\r\n")
+      when :iccid
+        @iccid = cmd("AT+CRSM=176,12258,0,0,10\r\n")
+      when :provider
+        @provider = cmd("AT+COPS?\r\n")
+      when :signal_level
+        @signal_level = cmd("AT+CSQ\r\n")
+      else
+        cmd("AT\r\n")
+      end
     end
 
     private
     def normalize(cmd,res)
       case cmd.gsub(/\r\n/,'')
-      when 'AT'
+      when 'AT' || 'ATE0'
         res.scan(/\r\n(\S+)\r\n/)[0].first unless res.empty?
       when 'AT+COPS?'
         res.scan(/\"(.*?)\"/)[0].first

data/lib/comunika_gsm/modem.rb

@@ -1,6 +1,5 @@
 module ComunikaGsm
   module Device
-    #TODO run methed of the usb_modeswith
     @@devices = []
 
     def self.ports

data/lib/comunika_gsm/version.rb

@@ -1,3 +1,3 @@
 module ComunikaGsm
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

data/lib/comunika_gsm.rb

@@ -1,6 +1,7 @@
 require 'serialport'
 require 'time'
 require 'execjs'
+require 'celluloid'
 
 require "comunika_gsm/version"
 require "comunika_gsm/gsm"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comunika_gsm
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Jefferson Silva
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: celluloid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.3
 description: Comunication of with GSM modem
 email:
 - jefferson.silva@assertivasolucoes.com.br