escalator 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96df485214287d8eb979038fb09affe48df28e64
-  data.tar.gz: e4373e1835a8b56cad7fed3d576fa2174e1b3537
+  metadata.gz: 0b2afd20d0ae308c9860d8f624da6b01527813d8
+  data.tar.gz: 85d0a57ddb918e4cb100d10330634142b18b003d
 SHA512:
-  metadata.gz: 8aa906b7ecf76177535701a6a2d98a140f23e83d8758a38442f393e3cd8b1d0777cf3c2818aed377eb852ba3ae9d6a493c467147cbf7c728c817ef5a541a3533
-  data.tar.gz: 6af629c1378af4bfde276e48640e9a28b6add1661a399c57a527ba96d5c6d7f266f28fe25a82a22898a84fdaaa8521de6d82c5e509083d7b4e8c1420e0bfbb78
+  metadata.gz: c6c7c73fcbe4ccfe40e139d62bdeab9f5b0e4d7351dbfc3458c1f9622980f1f26f8ac42822e02902d20b5bc88f8a07115aa5996f04ec6cd2ea70780c2b5e96e8
+  data.tar.gz: 9fa0bd2d21ca5c5e31739dbddfdd38eae24a18a0f369777d51e5e7c3efc3f57d27cc190c39ac045ffea85306ead13608f14496c63cdb4cf579b24f6833c4f0f8

data/lib/escalator/protocol/emulator/emu_protocol.rb

@@ -42,6 +42,11 @@ module Emulator
       def device_class
         EscDevice
       end
+
+      def local_device device
+        device
+      end
+
   end
 
 end

data/lib/escalator/protocol/keyence/kv_protocol.rb

@@ -31,6 +31,7 @@ module Keyence
       super
       @host = options[:host] || "192.168.0.10"
       @port = options[:port] || 8501
+      prepare_device_map
     end
 
     def open
@@ -91,7 +92,7 @@ module Keyence
     end
 
     def get_words_from_device(count, device)
-      device = device_by_name device
+      device = local_device device
       packet = "RDS #{device.name} #{count}\r"
       @logger.debug("> #{dump_packet packet}")
       open
@@ -145,15 +146,40 @@ module Keyence
 
     private
 
-      def local_device device
-        # TODO:
-        device
-      end
-
       def device_class
         KvDevice
       end
 
+      def prepare_device_map
+        @conv_dev_dict ||= begin
+          h = {}
+          [
+            ["X", "R0", 1024],
+            ["Y", "R0", 1024],
+            ["M", "MR0", 1024],
+            ["C", "C0", 256],
+            ["T", "T0", 256],
+            ["L", "L0", 1024],
+            ["SC", "MR1024", 1024],
+            ["D", "DM0", 1024],
+            ["H", "DM1024", 1024],
+            ["SD", "DM2048", 1024],
+            ["PRG", "DM3072", 1024]    # ..D4095
+          ].each do |s,d,c|
+            h[s] = [KvDevice.new(d), c]
+          end
+          h
+        end
+      end
+
+      def local_device device
+        return device if device.is_a? KvDevice
+        d, c = @conv_dev_dict[device.suffix]
+        return nil unless device.number < c
+        ld = KvDevice.new(d.suffix, d.number + device.number)
+        device_by_name ld.name
+      end
+
   end
 
 end

data/lib/escalator/version.rb

@@ -22,5 +22,5 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Escalator
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/plc/keyence/kv-5000/kv-5000/DocumentWindowInfo.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<DocumentWindowInfoForTab xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <All>
+    <DocumentWindowInfoForTabElement>
+      <Name>Escalator</Name>
+      <SaveKey>[Ladder]Escalator</SaveKey>
+      <DockingBarState>
+        <Key>Document@Ladder-346816872</Key>
+        <Usable>true</Usable>
+        <IsFloating>false</IsFloating>
+        <DockingInfo>
+          <IsCenter>true</IsCenter>
+          <DockingSide>Left</DockingSide>
+          <IsAutoHide>false</IsAutoHide>
+          <Size>
+            <Width>1074</Width>
+            <Height>790</Height>
+          </Size>
+          <LeftIndex>-1</LeftIndex>
+          <TopIndex>-1</TopIndex>
+          <RightIndex>-1</RightIndex>
+          <BottomIndex>-1</BottomIndex>
+          <MergeInfo>
+            <TabIndex>-1</TabIndex>
+            <IsTabSelected>true</IsTabSelected>
+            <TilePosition />
+          </MergeInfo>
+        </DockingInfo>
+        <FloatingInfo>
+          <DockingKey>0</DockingKey>
+          <Location>
+            <X>0</X>
+            <Y>0</Y>
+          </Location>
+          <Size>
+            <Width>624</Width>
+            <Height>326</Height>
+          </Size>
+          <MergeInfo>
+            <TabIndex>-1</TabIndex>
+            <IsTabSelected>false</IsTabSelected>
+            <TilePosition />
+          </MergeInfo>
+        </FloatingInfo>
+      </DockingBarState>
+    </DocumentWindowInfoForTabElement>
+  </All>
+</DocumentWindowInfoForTab>

data/lib/plc/keyence/kv-5000/kv-5000/MonEnv.kmu

@@ -0,0 +1 @@
+��

data/lib/plc/keyence/kv-5000/kv-5000/SensorMonitorInfo.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<SensorSpecialMonitorFileData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <XG />
+</SensorSpecialMonitorFileData>

data/lib/plc/keyence/kv-5000/kv-5000/WsTreeEnv.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Root>
+	<Expanded>0</Expanded>
+	<Child>
+		<value.first>ユニット構成</value.first>
+		<value.second>
+			<Expanded>1</Expanded>
+			<Child>
+				<value.first>[0]  KV-5000     R000/R500</value.first>
+				<value.second>
+					<Expanded>0</Expanded>
+					<Child>
+						<value.first>Ethernet      R30000 DM10000</value.first>
+						<value.second>
+							<Expanded>0</Expanded>
+						</value.second>
+					</Child>
+				</value.second>
+			</Child>
+			<Child>
+				<value.first>ユニット構成切替</value.first>
+				<value.second>
+					<Expanded>0</Expanded>
+				</value.second>
+			</Child>
+		</value.second>
+	</Child>
+</Root>

data/lib/plc/keyence/kv-5000/kv-5000/operand-history.txt

@@ -0,0 +1,16 @@
+req_pause
+cycle_running
+ack_pause
+req_clear_program
+#0
+ack_clear_program
+cycle_end
+#9
+#1
+operand_bits
+#2
+#3
+#4
+current_bit_value
+operand
+opr_end

data/lib/plc/keyence/kv-5000/kv-5000/sample.al2

@@ -0,0 +1,2 @@
+##al2file
+sample=2:192.168.0.10:8500/0/1/0:0:0/0:0::0/

data/template/escalator/config/plc.yml

@@ -3,18 +3,22 @@
 
 # plc section
 plc:
+  # MITSUBISHI iQ-R
   iq-r:                     # It's a target name
     cpu: iq-r               # It's just a comment.
     protocol: mc_protocol   # It's a protocol to communicate with PLC.
     host: 192.168.0.10      # It's PLC's IP address or dns name.
-    port: 5007              # It's PLC's port no.
+    # port: 5007              # It's PLC's port no. If it's not descript here, use default port.
 
   # You can describe targets multiply.
-  #
-  # plc2:
-  #   cpu: kv-5000
-  #   protocl: kv_protocol
-  #   ...
+
+  # Keyence KV-5000
+  kv5000:
+    cpu: kv-5000
+    protocol: kv_protocol
+    host: 192.168.0.11
+    # port: 8501 
+
 
 # default section
 default:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escalator
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Katsuyoshi Ito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-26 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -112,6 +112,27 @@ files:
 - lib/plc/emulator/emu_plc.rb
 - lib/plc/emulator/emu_plc_server.rb
 - lib/plc/emulator/emulator.rb
+- lib/plc/keyence/kv-5000/kv-5000/DocumentWindowInfo.xml
+- lib/plc/keyence/kv-5000/kv-5000/Escalator.mod
+- lib/plc/keyence/kv-5000/kv-5000/KvsMon.ini
+- lib/plc/keyence/kv-5000/kv-5000/LbkMdm.ini
+- lib/plc/keyence/kv-5000/kv-5000/Main.mod
+- lib/plc/keyence/kv-5000/kv-5000/MonEnv.kmu
+- lib/plc/keyence/kv-5000/kv-5000/PlcSended.dky
+- lib/plc/keyence/kv-5000/kv-5000/SensorMonitorInfo.xml
+- lib/plc/keyence/kv-5000/kv-5000/TransInfo.tif
+- lib/plc/keyence/kv-5000/kv-5000/UnitSet.ue2
+- lib/plc/keyence/kv-5000/kv-5000/UnitSet.ue2.old
+- lib/plc/keyence/kv-5000/kv-5000/WsTreeEnv.xml
+- lib/plc/keyence/kv-5000/kv-5000/kv-5000.cm1
+- lib/plc/keyence/kv-5000/kv-5000/kv-5000.cm2
+- lib/plc/keyence/kv-5000/kv-5000/kv-5000.ftc
+- lib/plc/keyence/kv-5000/kv-5000/kv-5000.kpr
+- lib/plc/keyence/kv-5000/kv-5000/kv-5000.lbl
+- lib/plc/keyence/kv-5000/kv-5000/kv-5000.mil
+- lib/plc/keyence/kv-5000/kv-5000/kv-5000.spl
+- lib/plc/keyence/kv-5000/kv-5000/operand-history.txt
+- lib/plc/keyence/kv-5000/kv-5000/sample.al2
 - lib/plc/mitsubishi/iq-r/r08/LICENSE
 - lib/plc/mitsubishi/iq-r/r08/r08.gx3
 - lib/plc/plc.rb