escalator 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7090d0538de1f61b6ea04dbf1506275138c16bd
-  data.tar.gz: 354bedc84a43edfeb2a560bcd55dce137d13e643
+  metadata.gz: 96df485214287d8eb979038fb09affe48df28e64
+  data.tar.gz: e4373e1835a8b56cad7fed3d576fa2174e1b3537
 SHA512:
-  metadata.gz: 3ab6fd9adbc1c2cd896ad6497f743783ae9dc47776192b0cf7364870da113fc4ea7900d240d328a02654f9fcace9f4f6f4b039d928d6fee5d08297d71d8102e8
-  data.tar.gz: 0fffaf803b79336a8f6bde8be7715b6ecec60253bb87feb18042654b17ac2b5c6b0f80ea667ffb3b6f5d7d057f542c7e9367c372e828ed30f24aedb456ed30eb
+  metadata.gz: 8aa906b7ecf76177535701a6a2d98a140f23e83d8758a38442f393e3cd8b1d0777cf3c2818aed377eb852ba3ae9d6a493c467147cbf7c728c817ef5a541a3533
+  data.tar.gz: 6af629c1378af4bfde276e48640e9a28b6add1661a399c57a527ba96d5c6d7f266f28fe25a82a22898a84fdaaa8521de6d82c5e509083d7b4e8c1420e0bfbb78

data/README.md

@@ -47,8 +47,6 @@ Created files are consisted like the tree below.
                 └── r08.gx3
 ```
 
-[![](http://img.youtube.com/vi/aFEtOIgKLvQ/0.jpg)](https://youtu.be/aFEtOIgKLvQ)
-
 # Connection configuration
 
 ## PLC configuration
@@ -92,6 +90,7 @@ Refer [Wiki](https://github.com/ito-soft-design/escalator/wiki/mnemonic) to chec
 
 ```
 # main.esc
+# |M0|-|M1|----(M2)
 LD  M0
 AND M1
 OUT M2
@@ -158,8 +157,27 @@ Below example writes values to devices from M0 to M7.
 > w m0 0 0 0 1 1 0 1 1
 ```
 
+If you want to turn on and off the device like pushing a button, use p command.
+
+```sh
+> p m0
+```
+
+You can describe turn on time duration after a device. The unit is sec.
+
+```sh
+> p m0 1.5
+```
+
+```
+# |M0|---(M1)
+LD  M0
+OUT M1
+```
+
+[![https://gyazo.com/565d24a35887503281a46775f6ccd747](https://i.gyazo.com/565d24a35887503281a46775f6ccd747.gif)](https://gyazo.com/565d24a35887503281a46775f6ccd747)
 
-[![](http://img.youtube.com/vi/qGbicGLB7Gs/0.jpg)](https://youtu.be/qGbicGLB7Gs)
+<!-- [![](http://img.youtube.com/vi/qGbicGLB7Gs/0.jpg)](https://youtu.be/qGbicGLB7Gs) -->
 
 
 # Information related escalator

data/README_jp.md

@@ -94,6 +94,7 @@ PLC側の実装がまだ進んでいないので実行できるニーモニッ
 
 ```
 # main.esc
+# |M0|-|M1|----(M2)
 LD  M0
 AND M1
 OUT M2
@@ -160,7 +161,7 @@ done uploading
 > w m0 0 0 0 1 1 0 1 1
 ```
 
-ボタンを押した様にパルス状にデバイスをオンにするにはpwコマンドを使用します。
+ボタンを押した様にパルス状にデバイスをオンにするにはpコマンドを使用します。
 
 ```sh
 > p m0
@@ -172,9 +173,15 @@ done uploading
 > p m0 1.5
 ```
 
+```
+# |M0|---(M1)
+LD  M0
+OUT M1
+```
 
+[![https://gyazo.com/565d24a35887503281a46775f6ccd747](https://i.gyazo.com/565d24a35887503281a46775f6ccd747.gif)](https://gyazo.com/565d24a35887503281a46775f6ccd747)
 
-[![](http://img.youtube.com/vi/qGbicGLB7Gs/0.jpg)](https://youtu.be/qGbicGLB7Gs)
+<!-- [![](http://img.youtube.com/vi/qGbicGLB7Gs/0.jpg)](https://youtu.be/qGbicGLB7Gs) -->
 
 ## エスカレーターに関する情報
 

data/lib/escalator/console.rb

@@ -46,13 +46,14 @@ module Escalator
             d = protocol.device_by_name EscDevice.new($1)
             c = $2 ? $2.to_i : 1
             values = protocol.get_from_devices d, c
+            values = values.map{|v| case v;  when true; 1; when false; 0; else; v; end}
             puts values.join(" ")
           when /^p\s+(\w+)(\s+(\d+))?/
             d = protocol.device_by_name EscDevice.new($1)
             t = $2 ? $2.to_f : 0.1
-            protocol.set_to_devices d, 1
+            protocol.set_to_devices d, true
             sleep t
-            protocol.set_to_devices d, 0
+            protocol.set_to_devices d, false
           when /^w\s+(\w+)/
             d = protocol.device_by_name EscDevice.new($1)
             v = $'.scan(/\d+/).map{|e| e.to_i}

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

@@ -55,7 +55,7 @@ module Keyence
 
     def get_bits_from_device count, device
       values = get_words_from_device count, device
-      values.map{|v| v == 0 ? false : true}
+      values = values.map{|v| v == 0 ? false : true}
       values.each do |v|
         device.bool = v
         device = device_by_name (device+1).name

data/lib/escalator/protocol/protocol.rb

@@ -86,8 +86,10 @@ module Protocol
     end
 
     def set_to_devices device, values
+      values = [values] unless values.is_a? Array
       d = device_by_name device
       if d.bit_device?
+        values = values.map{|v| case v;  when 1; true; when 0; false; else; v; end}
         set_bits_to_device values, d
       else
         set_words_to_device values, d

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.3"
+  VERSION = "0.2.4"
 end

data/lib/plc/emulator/emu_plc.rb

@@ -45,6 +45,10 @@ module Emulator
 
     CYCLE_RUN_FLAG        = 2
 
+    INDEX_BIT_STACK_COUNT = 4
+    INDEX_BIT_STACK       = 5
+    SIZE_OF_BIT_STACK     = 3
+
     def initialize
       SUFFIXES.each do |k|
         eval "@#{k}_devices = []"
@@ -95,7 +99,7 @@ module Emulator
       when 0
         status_form_plc.value = CYCLE_RUN_FLAG
         @program_pointer = 0
-        @stacks = [[]]
+        clear_stacks
         while fetch_and_execution; end
         sleep 0.0001
       else
@@ -105,18 +109,14 @@ module Emulator
     end
 
     def bool
-      unless @stacks.empty?
-        !!@stacks.last.last
-      else
-        nil
-      end
+      (stack_device.word & 1) != 0 ? true : false
     end
 
     def bool= value
-      if stack.empty?
-        stack << value
+      if value
+        stack_device.word |= 1
       else
-        stack[-1] = value
+        stack_device.word &= 0xfffe;
       end
     end
 
@@ -196,10 +196,71 @@ module Emulator
 
     private
 
-      def stack
-        @stacks.last
+      # ----------------
+      # stack operations
+      def stack_device index=0
+        device_by_name (device_by_name("SD0") + INDEX_BIT_STACK + index).name
+      end
+
+      def stack_count_device
+        device_by_name (device_by_name("SD0") + INDEX_BIT_STACK_COUNT).name
+      end
+
+      def push_stack flag = false
+        stack_device.word <<= 1
+        if flag
+          stack_device.word |= 1
+        else
+          stack_device.word &= 0xfffe
+        end
+        stack_device.word &= 0xffff
+      end
+
+      def pop_stack
+        stack_device.word >>= 1
+        stack_device.word |= 0x8000
       end
 
+      def clear_stacks
+        stack_device.word = 0xffff
+        stack_count_device.word = 0
+      end
+
+      def push_stacks
+        if stack_count_device.word > SIZE_OF_BIT_STACK
+          puts "ERROR: stacks overflow pc: H#{program_pointer.to_s(16).rjust(4, "0")}"
+          return
+        end
+        values = []
+        (SIZE_OF_BIT_STACK - 1).downto 0 do |i|
+          values << stack_device(i).word
+        end
+        values.shift
+        values << 0xffff
+        SIZE_OF_BIT_STACK.times do |i|
+          stack_device(i).word = values.pop
+        end
+        stack_count_device.word += 1
+      end
+
+      def pop_stacks
+        if stack_count_device.word <= 0
+          puts "ERROR: stacks underflow pc: H#{program_pointer.to_s(16).rjust(4, "0")}"
+          return
+        end
+        values = []
+        (SIZE_OF_BIT_STACK - 1).downto 0 do |i|
+          values << stack_device(i).word
+        end
+        v = values.pop
+        values.each_with_index do |v, i|
+          stack_device(i).word = v
+        end
+        stack_count_device.word -= 1
+        v
+      end
+      # ----------------
+
       def sync_input
         @lock.synchronize {
           device_dict.values.each do |d|
@@ -217,7 +278,10 @@ module Emulator
       end
 
       def and_join_stack
-        @stacks[-1] = [@stacks.last.inject(true){|r,b| r & b}]
+        d = stack_device
+        b = d.word == 0xffff
+        d.word = 0xffff
+        push_stack b
       end
 
       def mnenonic_table
@@ -324,7 +388,7 @@ EOB
       def ld inverse=false
         b = fetch_bool_value inverse
         return false if b.nil?
-        stack << b
+        push_stack b
         true
       end
       def ldi; ld true; end
@@ -352,12 +416,15 @@ EOB
       def ori; send :or, true; end
 
       def anb
+        b = self.bool
+        pop_stack
+        self.bool &= b
         true
       end
 
       def orb
         b = self.bool
-        stack.pop
+        pop_stack
         self.bool |= b
         true
       end
@@ -366,13 +433,17 @@ EOB
 
       def mps
         and_join_stack
-        @stacks << [self.bool]
+        b = self.bool
+        push_stacks
+        push_stack b
         true
       end
 
       def mrd
-        @stacks.pop
-        @stacks << [self.bool]
+        b = self.bool
+        pop_stacks
+        push_stacks
+        push_stack b
         true
       end
       def mpp; mrd; end
@@ -385,7 +456,7 @@ EOB
           return false
         end
         d.bool = inverse ? !self.bool : self.bool unless d.input?
-        stack.pop
+        pop_stack
         true
       end
       def outi; out true; end
@@ -398,7 +469,7 @@ EOB
           return false
         end
         d.bool = !inverse if self.bool unless d.input?
-        stack.pop
+        pop_stack
         true
       end
       def rst; set true; end

data/template/escalator/asm/main.esc

@@ -1,5 +1,5 @@
-# |-|X0|-+-|/X1|-|/Y1|---(Y0)
-# |-|Y0|-+
+# |X0|-+-|/X1|-|/Y1|---(Y0)
+# |Y0|-+
 LD   X0
 OR   Y0
 ANI  X1
@@ -49,4 +49,22 @@ OUT  Y2
 MPP
 OUTI Y3
 
+# |M14|---[SET M17]
+# SET is not implement completely.
+# If both conditions of set and rst turn on same time, output is not stable.
+LD   M14
+SET  M17
+
+# |M15|---[RST M17]
+# RST is not implement completely.
+# If both conditions of set and rst turn on same time, output is not stable.
+LD   M15
+RST  M17
+
+# |M16|---[FF M17]
+# Currently ff is not supported.
+#LD   M16
+#FF   M17
+
+NOP
 END

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escalator
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Katsuyoshi Ito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2016-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor