ladder_drive 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db50d1258ad8884768107cbbabcc791facfc9098
-  data.tar.gz: 2e822aa44401aea65ac329c661d2e31149bc450a
+  metadata.gz: ebbe6a801c62fb7bf390b50e904186de6c8a54d4
+  data.tar.gz: 65bc6883680145868f3bec1b333d76760fee2eb0
 SHA512:
-  metadata.gz: db25c044845435a432c6341ec030a888412b00074fb831501b1dc768915d4bdeaee7df76d953d65e395a2b4305a43007a5a38373d8a5a35a572d57074ebc8c73
-  data.tar.gz: 93e2bfa1422d6abb39b34791fbf0705ef734e4bf87464201ebc1bdbc5f56de133743ac13af8709886b2b3a532f34a6a97c5b59777074413c09b02dd2fe2d4468
+  metadata.gz: 2a78ed56aecb16bb8a4bdf5275acdf6b5f551cc62bce2efd6512160e79aa5c0d9757eb9eed6419f419bb5eba4f13fcc44e6ead4d4b9cc6cdb4cb4277b8ad150b
+  data.tar.gz: 885041e935159cc775be45f6f8d0d46a148f74739c7b24fea1ccf8c4f4e5627f3be0b0b1cbbdd2fb92c6176defefadb949e55cf8e25848a76d10dde54c577f49

data/lib/ladder_drive/protocol/mitsubishi/fx_protocol.rb

@@ -184,7 +184,8 @@ module Mitsubishi
     def device_by_name name
       case name
       when String
-        FxDevice.new name
+        d = FxDevice.new name
+        d.valid? ? d : nil
       when EscDevice
         local_device_of name
       else

data/lib/ladder_drive/protocol/mitsubishi/mc_protocol.rb

@@ -164,7 +164,8 @@ module Mitsubishi
     def device_by_name name
       case name
       when String
-        QDevice.new name
+        d = QDevice.new name
+        d.valid? ? d : nil
       when EscDevice
         local_device_of name
       else

data/lib/ladder_drive/protocol/mitsubishi/qdevice.rb

@@ -25,7 +25,7 @@ module LadderDrive
 module Protocol
 module Mitsubishi
 
-  class QDevice
+  class QDevice < PlcDevice
 
     attr_reader :suffix, :number
 
@@ -49,11 +49,10 @@ module Mitsubishi
             @suffix = [a[0,2].to_i(16), a[2,2].to_i(16)].pack "C*"
             @suffix.strip!
             @number = a[4,8].to_i(16)
-          elsif /(X|Y)(.+)/i =~ a
+          elsif /(X|Y|B|W|SB|SW|DX|DY)([0-9a-f]+)/i =~ a
             @suffix = $1.upcase
             @number = $2.to_i(p_adic_number)
-          else
-            /(M|L|S|B|F|T|C|D|W|R|ZR)(.+)/i =~ a
+          elsif /(M|L|S|F|T|C|D|R|ZR)([0-9]+)/i =~ a
             @suffix = $1.upcase
             @number = $2.to_i(p_adic_number)
           end
@@ -61,6 +60,10 @@ module Mitsubishi
       end
     end
 
+    def valid?
+      !!@suffix && !!@number
+    end
+
     def p_adic_number
       case @suffix
       when "X", "Y", "B", "W", "SB", "SW", "DX", "DY"

data/lib/ladder_drive/version.rb

@@ -22,5 +22,5 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module LadderDrive
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ladder_drive
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Katsuyoshi Ito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor