procon_bypass_man 0.1.11 → 0.1.15

data/lib/procon_bypass_man/device_connector.rb

@@ -1,5 +1,6 @@
 class ProconBypassMan::DeviceConnector
   class BytesMismatchError < StandardError; end
+  class NotFoundProconError < StandardError; end
 
   class Value
     attr_accessor :read_from, :values
@@ -48,6 +49,7 @@ class ProconBypassMan::DeviceConnector
   end
 
   def drain_all
+    debug_log_buffer = []
     unless @initialized_devices
       init_devices
     end
@@ -55,11 +57,13 @@ class ProconBypassMan::DeviceConnector
     while(item = @stack.shift)
       item.values.each do |value|
         data = nil
-        timer = ProconBypassMan::Timer.new
+        timer = ProconBypassMan::SafeTimeout.new
         begin
           timer.throw_if_timeout!
           data = from_device(item).read_nonblock(64)
+          debug_log_buffer << "read_from(#{item.read_from}): #{data}"
         rescue IO::EAGAINWaitReadable
+          debug_log_buffer << "read_from(#{item.read_from}): IO::EAGAINWaitReadable"
           retry
         end
 
@@ -74,15 +78,19 @@ class ProconBypassMan::DeviceConnector
           end
         if result
           ProconBypassMan.logger.info "OK(expected: #{value}, got: #{data.unpack("H*")})"
+          debug_log_buffer << "OK(expected: #{value}, got: #{data.unpack("H*")})"
         else
           ProconBypassMan.logger.info "NG(expected: #{value}, got: #{data.unpack("H*")})"
+          debug_log_buffer << "NG(expected: #{value}, got: #{data.unpack("H*")})"
           raise BytesMismatchError if @throw_error_if_mismatch
         end
         to_device(item).write_nonblock(data)
       end
     end
-  rescue ProconBypassMan::Timer::Timeout
+  rescue ProconBypassMan::SafeTimeout::Timeout
     ProconBypassMan.logger.error "timeoutになりました"
+    copressed_buffer_text = ProconBypassMan::CompressArray.new(debug_log_buffer).compress.join("\n")
+    ProconBypassMan::SendErrorCommand.execute(error: copressed_buffer_text)
     raise if @throw_error_if_timeout
   end
 
@@ -95,31 +103,31 @@ class ProconBypassMan::DeviceConnector
       init_devices
     end
 
-    timer = ProconBypassMan::Timer.new
+    timer = ProconBypassMan::SafeTimeout.new
     data = nil
     begin
       timer.throw_if_timeout!
       switch.write_nonblock(data)
     rescue IO::EAGAINWaitReadable
       retry
-    rescue ProconBypassMan::Timer::Timeout
+    rescue ProconBypassMan::SafeTimeout::Timeout
       ProconBypassMan.logger.error "writeでtimeoutになりました"
       raise
     end
     return(data.unpack("H*")) if only_write
 
-    timer = ProconBypassMan::Timer.new
+    timer = ProconBypassMan::SafeTimeout.new
     begin
       timer.throw_if_timeout!
       data = switch.read_nonblock(64)
       ProconBypassMan.logger.debug { " >>> #{data.unpack("H*")})" }
     rescue IO::EAGAINWaitReadable
       retry
-    rescue ProconBypassMan::Timer::Timeout
+    rescue ProconBypassMan::SafeTimeout::Timeout
       ProconBypassMan.logger.error "readでtimeoutになりました"
       raise
     end
-  rescue ProconBypassMan::Timer::Timeout
+  rescue ProconBypassMan::SafeTimeout::Timeout
     raise if @throw_error_if_timeout
   end
 
@@ -131,30 +139,30 @@ class ProconBypassMan::DeviceConnector
       init_devices
     end
 
-    timer = ProconBypassMan::Timer.new
+    timer = ProconBypassMan::SafeTimeout.new
     begin
       timer.throw_if_timeout!
       procon.write_nonblock(data)
     rescue IO::EAGAINWaitReadable
       retry
-    rescue ProconBypassMan::Timer::Timeout
+    rescue ProconBypassMan::SafeTimeout::Timeout
       ProconBypassMan.logger.error "writeでtimeoutになりました"
       raise
     end
     return(data.unpack("H*")) if only_write
 
-    timer = ProconBypassMan::Timer.new
+    timer = ProconBypassMan::SafeTimeout.new
     begin
       timer.throw_if_timeout!
       data = procon.read_nonblock(64)
       ProconBypassMan.logger.error " <<< #{data.unpack("H*")})"
     rescue IO::EAGAINWaitReadable
       retry
-    rescue ProconBypassMan::Timer::Timeout
+    rescue ProconBypassMan::SafeTimeout::Timeout
       ProconBypassMan.logger.error "readでtimeoutになりました"
       raise
     end
-  rescue ProconBypassMan::Timer::Timeout
+  rescue ProconBypassMan::SafeTimeout::Timeout
     raise if @throw_error_if_timeout
   end
 
@@ -164,30 +172,30 @@ class ProconBypassMan::DeviceConnector
     end
 
     data = nil
-    timer = ProconBypassMan::Timer.new
+    timer = ProconBypassMan::SafeTimeout.new
     begin
       timer.throw_if_timeout!
       data = procon.read_nonblock(64)
       ProconBypassMan.logger.debug { " <<< #{data.unpack("H*")})" }
     rescue IO::EAGAINWaitReadable
       retry
-    rescue ProconBypassMan::Timer::Timeout
+    rescue ProconBypassMan::SafeTimeout::Timeout
       ProconBypassMan.logger.error "readでtimeoutになりました"
       raise
     end
     return(data.unpack("H*")) if only_read
 
-    timer = ProconBypassMan::Timer.new
+    timer = ProconBypassMan::SafeTimeout.new
     begin
       timer.throw_if_timeout!
       switch.write_nonblock(data)
     rescue IO::EAGAINWaitReadable
       retry
-    rescue ProconBypassMan::Timer::Timeout
+    rescue ProconBypassMan::SafeTimeout::Timeout
       ProconBypassMan.logger.error "writeでtimeoutになりました"
       raise
     end
-  rescue ProconBypassMan::Timer::Timeout
+  rescue ProconBypassMan::SafeTimeout::Timeout
     raise if @throw_error_if_timeout
   end
 
@@ -197,30 +205,30 @@ class ProconBypassMan::DeviceConnector
     end
 
     data = nil
-    timer = ProconBypassMan::Timer.new
+    timer = ProconBypassMan::SafeTimeout.new
     begin
       timer.throw_if_timeout!
       data = switch.read_nonblock(64)
       ProconBypassMan.logger.debug { " >>> #{data.unpack("H*")})" }
     rescue IO::EAGAINWaitReadable
       retry
-    rescue ProconBypassMan::Timer::Timeout
+    rescue ProconBypassMan::SafeTimeout::Timeout
       ProconBypassMan.logger.error "readでtimeoutになりました"
       raise
     end
     return(data.unpack("H*")) if only_read
 
-    timer = ProconBypassMan::Timer.new
+    timer = ProconBypassMan::SafeTimeout.new
     begin
       timer.throw_if_timeout!
       procon.write_nonblock(data)
     rescue IO::EAGAINWaitReadable
       retry
-    rescue ProconBypassMan::Timer::Timeout
+    rescue ProconBypassMan::SafeTimeout::Timeout
       ProconBypassMan.logger.error "writeでtimeoutになりました"
       raise
     end
-  rescue ProconBypassMan::Timer::Timeout
+  rescue ProconBypassMan::SafeTimeout::Timeout
     raise if @throw_error_if_timeout
   end
 
@@ -293,7 +301,7 @@ class ProconBypassMan::DeviceConnector
       @procon = File.open(PROCON2_PATH, "w+b")
       @gadget = File.open('/dev/hidg0', "w+b")
     else
-      raise "/dev/hidraw0, /dev/hidraw1の両方見つかりませんでした"
+      raise NotFoundProconError, "/dev/hidraw0, /dev/hidraw1の両方見つかりませんでした"
     end
     system('echo > /sys/kernel/config/usb_gadget/procon/UDC')
     system('ls /sys/class/udc > /sys/kernel/config/usb_gadget/procon/UDC')
@@ -309,11 +317,10 @@ class ProconBypassMan::DeviceConnector
     end
   rescue Errno::ENXIO => e
     # /dev/hidg0 をopenできないときがある
-    ProconBypassMan.logger.error "Errno::ENXIO (No such device or address @ rb_sysopen - /dev/hidg0)が起きました。resetします"
-    ProconBypassMan.logger.error e
+    ProconBypassMan::SendErrorCommand.execute(error: "Errno::ENXIO (No such device or address @ rb_sysopen - /dev/hidg0)が起きました。resetします. #{e.full_message}")
     system('echo > /sys/kernel/config/usb_gadget/procon/UDC')
     system('ls /sys/class/udc > /sys/kernel/config/usb_gadget/procon/UDC')
-    sleep 2
+    sleep 0.5
     retry
   end
 end

data/lib/procon_bypass_man/device_status.rb

@@ -0,0 +1,44 @@
+class ProconBypassMan::DeviceStatus
+  INITIALIZED = :initialized
+  RUNNING = :running
+  CONNECTED_BUT_SLEEPING = :connected_but_sleeping # コードはつながっているが、switchがsleepしているとき
+  PROCON_NOT_FOUND_ERROR = :procon_not_found_error # 繋がっていないとか、デバイスが使えない時
+  CONNECTED_BUT_ERROR = :connected_but_error # 実行時エラーあたり
+  SETTING_SYNTAX_ERROR_AND_SHUTDOWN = :setting_syntax_error_and_shutdown
+
+  @@status = nil
+
+  def self.current
+    @@status || INITIALIZED
+  end
+
+  def self.change_to_running!
+    @@status = RUNNING
+    ProconBypassMan::SyncDeviceStatsJob.perform_async(ProconBypassMan::DeviceStatus.current)
+  end
+
+  def self.change_to_connected_but_sleeping!
+    @@status = CONNECTED_BUT_SLEEPING
+    ProconBypassMan::SyncDeviceStatsJob.perform_async(ProconBypassMan::DeviceStatus.current)
+  end
+
+  def self.change_to_procon_not_found_error!
+    @@status = PROCON_NOT_FOUND_ERROR
+    ProconBypassMan::SyncDeviceStatsJob.perform_async(ProconBypassMan::DeviceStatus.current)
+  end
+
+  def self.change_to_device_error!
+    @@status = DEVICE_ERROR
+    ProconBypassMan::SyncDeviceStatsJob.perform_async(ProconBypassMan::DeviceStatus.current)
+  end
+
+  def self.change_to_connected_but_error!
+    @@status = CONNECTED_BUT_ERROR
+    ProconBypassMan::SyncDeviceStatsJob.perform_async(ProconBypassMan::DeviceStatus.current)
+  end
+
+  def self.change_to_setting_syntax_error_and_shutdown!
+    @@status = SETTING_SYNTAX_ERROR_AND_SHUTDOWN
+    ProconBypassMan::SyncDeviceStatsJob.perform_async(ProconBypassMan::DeviceStatus.current)
+  end
+end

data/lib/procon_bypass_man/io_monitor.rb

@@ -1,11 +1,12 @@
 module ProconBypassMan
   class Counter
-    attr_accessor :label, :table, :previous_table
+    attr_accessor :label, :table, :previous_table, :active
 
     def initialize(label: )
       self.label = label
       self.table = {}
       self.previous_table = {}
+      self.active = true
     end
 
     # アクティブなバケットは1つだけ
@@ -24,7 +25,7 @@ module ProconBypassMan
       self
     end
 
-    def formated_previous_table
+    def formatted_previous_table
       t = previous_table.dup
       start_function = t[:start_function] || 0
       end_function = t[:end_function] || 0
@@ -32,6 +33,10 @@ module ProconBypassMan
       eagain_wait_readable_on_write = t[:eagain_wait_readable_on_write] || 0
       "(#{(end_function / start_function.to_f * 100).floor(1)}%(#{end_function}/#{start_function}), loss: #{eagain_wait_readable_on_read}, #{eagain_wait_readable_on_write})"
     end
+
+    def shutdown
+      self.active = false
+    end
   end
 
   module IOMonitor
@@ -51,14 +56,14 @@ module ProconBypassMan
       Thread.start do
         max_output_length = 0
         loop do
-          list = @@list.dup
+          list = @@list.select(&:active).dup
           unless list.all? { |x| x&.previous_table.is_a?(Hash) }
             sleep 0.5
             next
           end
 
           line = list.map { |counter|
-            "#{counter.label}(#{counter.formated_previous_table})"
+            "#{counter.label}(#{counter.formatted_previous_table})"
           }.join(", ")
           max_output_length = line.length
           sleep 0.7

data/lib/procon_bypass_man/plugin/splatoon2/macro/fast_return.rb

@@ -0,0 +1,17 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      module Macro
+        module FastReturn
+          def self.name
+            :fast_return
+          end
+
+          def self.steps
+            [:x, :down, :a, :a].freeze
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_left_key.rb

@@ -0,0 +1,17 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      module Macro
+        module JumpToLeftKey
+          def self.name
+            :jump_to_left_key
+          end
+
+          def self.steps
+            [:x, :left, :a, :a].freeze
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_right_key.rb

@@ -0,0 +1,17 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      module Macro
+        module JumpToRightKey
+          def self.name
+            :jump_to_right_key
+          end
+
+          def self.steps
+            [:x, :right, :a, :a].freeze
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_up_key.rb

@@ -0,0 +1,17 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      module Macro
+        module JumpToUpKey
+          def self.name
+            :jump_to_up_key
+          end
+
+          def self.steps
+            [:x, :up, :a, :a].freeze
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/plugin/splatoon2/mode/guruguru.rb

@@ -0,0 +1,59 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      module Mode
+        module Guruguru
+          def self.binaries
+            [ "309481408000362d684658750968f71cfe2c0e51000001480053f71ffedf0d4b000a013d00caf6ecfd4c0d480003011c00000000000000000000000000000000",
+              "30978140800037dd6748687509fdf6adfded0d6d0081005d00eef68dfdef0d6d00830059001bf791fd140e720090005400000000000000000000000000000000",
+              "309a8140800038cd67495875099af821fe120e40006400880042f8fcfdfd0d470067008900d4f7e0fdf20d4e006a008c00000000000000000000000000000000",
+              "309c8140800036ed67466875099bf878fe4a0e35005b004c00c1f875fe400e35005d004c00c4f856fe2d0e390063006c00000000000000000000000000000000",
+              "30a081408000371d6847587509b9f71bfee70d22002c002300e3f73afe150e2b003500280014f854fe300e2d0038002900000000000000000000000000000000",
+              "30a38140800039fd6743587509def70ffea10d1a0031001f00d1f70ffeb10d19002c002200c5f711feb80d18002c002500000000000000000000000000000000",
+              "30a58140800037dd6746687509d8f70bfe980d270035001200ddf70dfe980d240038001900dff70ffe9b0d1f0035001a00000000000000000000000000000000",
+              "30a98140800037ed67484875099cf7edfdb00d310020000d009ef7eefda30d310022000c00adf7f2fd980d300028000a00000000000000000000000000000000",
+              "30ac8140800036ed67484875099cf709fed40d3a002400160097f7fafdd30d39002200150096f7f0fdc80d380022001400000000000000000000000000000000",
+              "30ae8140800038fd674558750987f72efed40d360021001c0089f729fed50d39002400180092f715fed10d390022001800000000000000000000000000000000",
+              "30b18140800037dd6747487509b8f705fea90d19001d002000c5f70dfeb00d210019002200bff71efec20d280018002400000000000000000000000000000000",
+              "30b48140800038fd684868750980f7e9fdd40d0200080024007df7f1fdba0d060011001e0084f7f8fdaa0d12001a001a00000000000000000000000000000000",
+              "30b7814080003fdd694958750918f6a9fd510f0d00d1ff370024f7b0fda90e0100ecff30006cf7d1fd210efffff5ff2c00000000000000000000000000000000",
+              "30ba81408080482d744768750963f71ffe190f5e00d9fea100ccf62dfe650f510009ff980015f702fe580f4b002eff8400000000000000000000000000000000",
+              "30bd814080802f7d864758750974f70efe4c0f5e00c0fea000d1f726fe1c0f5d00c5fea30028f859fe0e0f5c00cafea800000000000000000000000000000000",
+              "30bf8140808057cc984758750961f73afe630f99009dfeae0050f738fe710f7500adfea40050f721fe720f6e00b2fea300000000000000000000000000000000",
+              "30c281408080f479bd483875092ef8b6feab0f0a0180feba00f1f798fe900f000181febd00c2f77dfe7c0fdb008efebd00000000000000000000000000000000",
+              "30c581408080ad87d846487509e1f80000a6107e0178fea2004ef88dff54106c0185fea70063f826ffe60f520182feae00000000000000000000000000000000",
+              "30c8810080800797d84868750995f8e1fe4b0f7a0161fe88000df96dffd00f700149fe990035f9cdff361088016afea000000000000000000000000000000000",
+              "30cb810080804586d848487509cef672fe8a0f6d0217ff42002df63cfe280f1d0219ff410059f61cfe070fed01f5fe4a00000000000000000000000000000000",
+              "30d08100808002c5d745687509d8f5aaff830f5e03e6fe3e01fbf55bffc30f3f03e4fe100158f600ff3e102903e5fee700000000000000000000000000000000",
+              "30d3810080807b94d14838750991f6cd00690f9903f0fff10147f6e200560f7e038fffc60101f6c900560f71033bffa901000000000000000000000000000000",
+              "30d681008080b743ca475875095af7f2009c0fca03a400320242f7ca00950fb503820028020af7b000820fa4034e001a02000000000000000000000000000000",
+              "30d9810080805be3c047587509e7f77a03c70f0e04bb00410258f79801940f0004b800410251f74401910fd803b3003602000000000000000000000000000000",
+              "30dc810080808a02b245587509c0fbd5086a10710475020a03b0fb8d085d106c042102e8027efb660876106a04bc01af02000000000000000000000000000000",
+              "30de8100808036d2a14568750970fbbf09ad103704af038003a9fb600989105c0459036103c2fb2a097210690412034603000000000000000000000000000000",
+              "30e281008000cbb18d4738750989f8b40b2812380341044c0429f99e0bef11510340043704f2f93c0b7911b0033704f003000000000000000000000000000000",
+              "30e581008000c9c18945587509a5f7ca0a2e13e400c6024c0547f7fd0a941264011703270578f74a0b6012e40168030205000000000000000000000000000000",
+              "30e781008000c6618948687509acf86909e813d0fe2801a1057cf8cf09ed130fff6301990516f8710aaa13ccff13028205000000000000000000000000000000",
+              "30ea81008000c77189475875093af93b0762136efbaeff19060cf90107b113a9fb99ff0906e1f85b07b113bafc9fffcd05000000000000000000000000000000",
+              "30ed81008000c791894568750950f9ce047c1432f900026007a5f9a6051f146ef9bb013707bff99206a813fef9ce00c606000000000000000000000000000000",
+              "30ef81008000c6d1894558750944f8ad0358143ef81c02f10780f8b403841484f84102d107ccf801049314bcf84202ad07000000000000000000000000000000",
+              "30f381008000c761884868750914f72105e4134cf6d001c00743f71a05f11391f6bf01e407a0f7c904fa13faf6b3011008000000000000000000000000000000",
+              "30f681008000c7718344587509eaf54a04c812a6f40002500627f66d041313f2f40d02940682f6a60468133ef51a02d806000000000000000000000000000000",
+              "30f881008000c4e1814668750b5cf5f803b51125f3b5000d0560f50f04e8118cf33c015d057df525042c1210f4b101cc05000000000000000000000000000000",
+              "30fb81008000c5e1814458750b19f65a02a410acf29effb804e2f5db02df10b7f2c0ffbf04a9f55c032011dcf22400d804000000000000000000000000000000",
+              "30fe8100800035e2814858750b81f65c00f80f8df231fe940471f6e6001f1088f2a6fe92044ef6b1015a1092f21fffa004000000000000000000000000000000",
+              "3001810080004b03814868750b69f6e6fdad0ffef20efdd40479f678feb40fd9f249fdc40484f6f4fec00fb0f29ffdad04000000000000000000000000000000",
+              "30048100800079e47d4858750b17f64cfb5f0f46f46afb430529f6c4fb710ff1f3d4fb300538f64bfc830fbbf315fc1d05000000000000000000000000000000",
+              "300781008000a7057e4668750bb1f5d3f9fb0e8ef5ccf96405cdf5fcf90c0f44f52dfa6505e1f52dfa210f29f550fa6305000000000000000000000000000000",
+              "30098100800041f67d4668750bcdf4b0f9ab0e21f602f955057ef5adf9d00ee1f559f95f05b1f5d3f9fb0e8ef5ccf96405000000000000000000000000000000",
+              "300d810080003d877c4838750b84f458f7dd0c89f6d0f8fc0436f4e2f7620d83f614f8430526f4c0f8a00e71f666f85c05000000000000000000000000000000",
+              "30108100800058e77a4668750bf7f2c3f57c0c9cf6abfa0a0470f30ef6790c89f65dfa420414f476f67e0c80f6d0f98a04000000000000000000000000000000",
+              "30128100800059f77a4658750b7ef249f5580cd9f69bfaa40389f269f56c0cd1f6a9fab503a3f286f5760cacf6c9faeb03000000000000000000000000000000",
+              "3016810080005b177b4868750ba9f298f4450b2cf774fa3102b8f2a5f47a0b24f765fa6e02b8f2b8f4b10b1df755faac02000000000000000000000000000000",
+              "30198100800057777a4558750b39f258f4480a80f73efaf40016f26af4940a5ef76bfa37014ef275f4d40a46f780fa8401000000000000000000000000000000",
+            ].map(&:freeze).freeze
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/plugin/splatoon2/version.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      VERSION = "0.1.2"
+    end
+  end
+end

data/lib/procon_bypass_man/plugin.rb

@@ -0,0 +1,11 @@
+require_relative "plugin/splatoon2/version"
+require_relative "plugin/splatoon2/macro/fast_return"
+require_relative "plugin/splatoon2/macro/jump_to_right_key"
+require_relative "plugin/splatoon2/macro/jump_to_up_key"
+require_relative "plugin/splatoon2/macro/jump_to_left_key"
+require_relative "plugin/splatoon2/mode/guruguru"
+
+module ProconBypassMan
+  module Plugin
+  end
+end

data/lib/procon_bypass_man/procon/analog_stick_cap.rb

@@ -60,6 +60,6 @@ class ProconBypassMan::Procon::AnalogStickCap
   end
 
   def hypotenuse
-    Math.sqrt(relative_x**2 + relative_y**2).floor(6)
+    Math.sqrt((relative_x**2) + (relative_y**2)).floor(6)
   end
 end

data/lib/procon_bypass_man/procon/{data.rb → consts.rb}

@@ -1,5 +1,5 @@
 class ProconBypassMan::Procon
-  module Data
+  module Consts
     NO_ACTION = "30f28100800078c77448287509550274ff131029001b0022005a0271ff191028001e00210064027cff1410280020002100000000000000000000000000000000".freeze
   end
 end

data/lib/procon_bypass_man/procon/layer_changer.rb

@@ -0,0 +1,40 @@
+class ProconBypassMan::Procon::LayerChanger
+  def initialize(binary: )
+    @procon_reader = ProconBypassMan::ProconReader.new(binary: binary).freeze
+  end
+
+  # @return [Symbol]
+  def next_layer_key
+    case
+    when pressed?(button: :up)
+      :up
+    when pressed?(button: :right)
+      :right
+    when pressed?(button: :left)
+      :left
+    when pressed?(button: :down)
+      :down
+    else
+      ProconBypassMan.logger.warn("next_layer_key is unknown")
+      :up
+    end
+  end
+
+  # @return [Boolean]
+  def change_layer?
+    if ProconBypassMan::ButtonsSettingConfiguration.instance.prefix_keys.empty?
+      raise "prefix_keysが未設定です"
+    end
+    ProconBypassMan::ButtonsSettingConfiguration.instance.prefix_keys.map { |b| pressed?(button: b) }.all?
+  end
+
+  # @return [Boolean]
+  def pressed_next_layer?
+    change_layer? && (pressed?(button: :up) || pressed?(button: :right) || pressed?(button: :left) || pressed?(button: :down))
+  end
+
+  # @return [Boolean]
+  def pressed?(button: )
+    @procon_reader.pressed.include?(button)
+  end
+end

data/lib/procon_bypass_man/procon/user_operation.rb

@@ -1,12 +1,14 @@
 class ProconBypassMan::Procon
   class UserOperation
-    include LayerChangeable
-    extend PressedButtonHelper::Dynamic
-
     attr_reader :binary
 
+    ::ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP.each do |button, _value|
+      define_method "pressed_#{button}?" do
+        pressed_button?(button)
+      end
+    end
+
     def initialize(binary)
-      self.class.compile_if_not_compile_yet!
       unless binary.encoding.name == ASCII_ENCODING
         raise "おかしいです"
       end
@@ -16,20 +18,16 @@ class ProconBypassMan::Procon
     ZERO_BIT = ["0"].pack("H*").freeze
     ASCII_ENCODING = "ASCII-8BIT"
 
-    # @depilicate
-    def binary=(binary)
-      unless binary.encoding.name == ASCII_ENCODING
-        raise "おかしいです"
-      end
-      @binary = binary
-    end
-
     def set_no_action!
       binary[3] = ZERO_BIT
       binary[4] = ZERO_BIT
       binary[5] = ZERO_BIT
     end
 
+    def apply_left_analog_stick_cap(cap: )
+      binary[6..8] = ProconBypassMan::Procon::AnalogStickCap.new(binary).capped_position(cap_hypotenuse: cap).to_binary
+    end
+
     def unpress_button(button)
       return if not pressed_button?(button)
 
@@ -38,10 +36,6 @@ class ProconBypassMan::Procon
       binary[byte_position] = ["%02X" % value.to_s].pack("H*")
     end
 
-    def apply_left_analog_stick_cap(cap: )
-      binary[6..8] = ProconBypassMan::Procon::AnalogStickCap.new(binary).capped_position(cap_hypotenuse: cap).to_binary
-    end
-
     def press_button(button)
       return if pressed_button?(button)
 
@@ -51,7 +45,7 @@ class ProconBypassMan::Procon
     end
 
     def press_button_only(button)
-      [ProconBypassMan::Procon::Data::NO_ACTION.dup].pack("H*").tap do |no_action_binary|
+      [ProconBypassMan::Procon::Consts::NO_ACTION.dup].pack("H*").tap do |no_action_binary|
         ButtonCollection.load(button).byte_position
         byte_position = ButtonCollection.load(button).byte_position
         value = 2**ButtonCollection.load(button).bit_position

data/lib/procon_bypass_man/procon.rb

@@ -1,10 +1,9 @@
 class ProconBypassMan::Procon
-  require "procon_bypass_man/procon/data"
+  require "procon_bypass_man/procon/consts"
   require "procon_bypass_man/procon/mode_registry"
   require "procon_bypass_man/procon/macro_registry"
-  require "procon_bypass_man/procon/layer_changeable"
+  require "procon_bypass_man/procon/layer_changer"
   require "procon_bypass_man/procon/button_collection"
-  require "procon_bypass_man/procon/pressed_button_helper"
   require "procon_bypass_man/procon/user_operation"
   require "procon_bypass_man/procon/flip_cache"
   require "procon_bypass_man/procon/press_button_aware"
@@ -35,8 +34,9 @@ class ProconBypassMan::Procon
   end
 
   def apply!
-    if user_operation.change_layer?
-      @@status[:current_layer_key] = user_operation.next_layer_key if user_operation.pressed_next_layer?
+    layer_changer = ProconBypassMan::Procon::LayerChanger.new(binary: user_operation.binary)
+    if layer_changer.change_layer?
+      @@status[:current_layer_key] = layer_changer.next_layer_key if layer_changer.pressed_next_layer?
       user_operation.set_no_action!
       return
     end
@@ -137,13 +137,7 @@ class ProconBypassMan::Procon
       end
     end
 
-    b = user_operation.binary
-    ProconBypassMan.cache.fetch key: 'user_operation.binary', expires_in: 60 do
-      left_analog_stick = ProconBypassMan::ReadonlyProcon.new(binary: b).left_analog_stick
-      ProconBypassMan.logger.debug "x: #{left_analog_stick[:x]}, val: #{left_analog_stick[:x].to_s(2)}"
-      ProconBypassMan.logger.debug "y: #{left_analog_stick[:y]}, val: #{left_analog_stick[:y].to_s(2)}"
-    end
-    b
+    user_operation.binary
   end
 
   private

data/lib/procon_bypass_man/{readonly_procon.rb → procon_reader.rb}

@@ -1,15 +1,14 @@
-# read
-class ProconBypassMan::ReadonlyProcon
+class ProconBypassMan::ProconReader
   def initialize(binary: )
     @binary = binary
-    @user_operation = ProconBypassMan::Procon::UserOperation.new(binary.dup)
     @analog_stick = ProconBypassMan::Procon::AnalogStick.new(binary: binary)
   end
 
   # @return [Array<Symbol>]
   def pressed
+    aware = ProconBypassMan::PpressButtonAware.new(@binary)
     pressed_table = ::ProconBypassMan::Procon::ButtonCollection::BUTTONS.reduce({}) do |acc, button|
-      acc[button] = @user_operation.pressed_button?(button)
+      acc[button] = aware.pressed_button?(button)
       acc
     end
     pressed_table.select { |_key, value| value }.keys