procon_bypass_man 0.1.20.2 → 0.1.23

data/lib/procon_bypass_man/buttons_setting_configuration/layer.rb

@@ -1,12 +1,13 @@
 module ProconBypassMan
   class ButtonsSettingConfiguration
     class Layer
-      attr_accessor :mode, :flips, :macros, :remaps, :left_analog_stick_caps, :disables
+      attr_accessor :mode, :flips, :macros, :disable_macros, :remaps, :left_analog_stick_caps, :disables
 
       def initialize(mode: :manual)
         self.mode = mode
         self.flips = {}
         self.macros = {}
+        self.disable_macros = []
         self.remaps = {}
         self.left_analog_stick_caps = []
         self.disables = []
@@ -14,31 +15,29 @@ module ProconBypassMan
 
       # @param [Symbol] button
       def flip(button, if_pressed: false, force_neutral: nil, flip_interval: nil)
-        case if_pressed
-        when TrueClass
-          if_pressed = [button]
-        when Symbol, String
-          if_pressed = [if_pressed]
-        when Array
-          # if_pressed = if_pressed
-        when FalseClass, NilClass
-          # no-op
-        else
-          raise "not support class"
+        begin
+          button = ParamNormalizer::Button.new(button).to_value!
+        rescue ParamNormalizer::UnSupportValueError
+          Kernel.warn "設定ファイルに記述ミスがあります. flipの第一引数にはボタンを渡してください."
+          return
+        end
+
+        begin
+          if_pressed = ParamNormalizer::FlipIfPressed.new(if_pressed, button: button).to_value!
+        rescue ParamNormalizer::UnSupportValueError
+          Kernel.warn "設定ファイルに記述ミスがあります. flipのif_pressedにはボタンを渡してください."
+          return
         end
 
         hash = { if_pressed: if_pressed }
-        case force_neutral
-        when TrueClass
-          raise "ボタンを渡してください"
-        when Symbol, String
-          hash[:force_neutral] = [force_neutral]
-        when Array
-          hash[:force_neutral] = force_neutral
-        when FalseClass, NilClass
-          # no-op
-        else
-          raise "not support value"
+
+        begin
+          if(force_neutral = ParamNormalizer::ForceNeutral.new(force_neutral).to_value!)
+            hash[:force_neutral] = force_neutral
+          end
+        rescue ParamNormalizer::UnSupportValueError
+          Kernel.warn "設定ファイルに記述ミスがあります. flipのforce_neutralにはボタンを渡してください."
+          return
         end
 
         if flip_interval
@@ -54,79 +53,165 @@ module ProconBypassMan
       end
 
       # @param [String, Class] プラグインのclass
-      def macro(name, if_pressed: )
+      def macro(name, if_pressed: nil, if_tilted_left_stick: nil, force_neutral: nil)
+        case if_tilted_left_stick
+        when Integer, String, Symbol, Array
+          warn "macro #{name}のif_tilted_left_stickで想定外の値です"
+          if_tilted_left_stick = nil
+        when TrueClass, NilClass, FalseClass
+          # OK
+        else
+          Kernel.warn "設定ファイルに記述ミスがあります. 未対応の値を受け取りました."
+          return
+        end
+
+        begin
+          if(fn = ParamNormalizer::ForceNeutral.new(force_neutral).to_value!)
+            force_neutral = fn
+          end
+        rescue ParamNormalizer::UnSupportValueError
+          Kernel.warn "設定ファイルに記述ミスがあります. macroのforce_neutralにはボタンを渡してください."
+          return
+        end
+
+        begin
+          if_pressed = ParamNormalizer::IfPressed.new(if_pressed).to_value!
+        rescue ParamNormalizer::UnSupportValueError
+          Kernel.warn "設定ファイルに記述ミスがあります. macroのif_pressedにはボタンを渡してください."
+          return
+        end
+
         macro_name = name.to_s.to_sym
-        self.macros[macro_name] = { if_pressed: if_pressed }
+        if ProconBypassMan::ButtonsSettingConfiguration.instance.macro_plugins[macro_name]
+          self.macros[macro_name] = { if_pressed: if_pressed, if_tilted_left_stick: if_tilted_left_stick, force_neutral: force_neutral }.compact
+        else
+          warn "#{macro_name}マクロがinstallされていません"
+        end
       end
 
       # 設定ファイルに直接マクロを打ち込める
       # @param [String, Class] macroの識別子
       # @paramh[Array<Symbol>] macroの本体. ボタンの配列
-      def open_macro(name, steps: , if_pressed: )
+      def open_macro(name, steps: [], if_pressed: nil, if_tilted_left_stick: nil, force_neutral: nil)
+        if name.nil?
+          Kernel.warn "設定ファイルに記述ミスがあります. open_macroのnameには一意になる名前を渡してください."
+          return
+        end
+
+        begin
+          steps = ParamNormalizer::OpenMacroSteps.new(steps).to_value!
+        rescue ParamNormalizer::UnSupportValueError
+          Kernel.warn "設定ファイルに記述ミスがあります. open_macroのstepsには文字列の配列を渡してください."
+          return
+        end
+
+        case if_tilted_left_stick
+        when Integer, String, Symbol, Array
+          warn "open_macro #{name}のif_tilted_left_stickで想定外の値です"
+          if_tilted_left_stick = nil
+        when TrueClass, NilClass, FalseClass, Hash
+          # OK
+        else
+          Kernel.warn "設定ファイルに記述ミスがあります. 未対応の値を受け取りました."
+          return
+        end
+
+        begin
+          force_neutral = ParamNormalizer::ForceNeutral.new(force_neutral).to_value!
+        rescue ParamNormalizer::UnSupportValueError
+          Kernel.warn "設定ファイルに記述ミスがあります. open_macroのforce_neutralにはボタンを渡してください."
+          return
+        end
+
+        begin
+          if_pressed = ParamNormalizer::IfPressed.new(if_pressed).to_value!
+        rescue ParamNormalizer::UnSupportValueError
+          Kernel.warn "設定ファイルに記述ミスがあります. open_macroのif_pressedにはボタンを渡してください."
+          return
+        end
+
         macro_name = name || "OpenMacro-#{steps.join}".to_sym
         ProconBypassMan::Procon::MacroRegistry.install_plugin(macro_name, steps: steps)
-        self.macros[macro_name] = { if_pressed: if_pressed }
+        self.macros[macro_name] = { if_pressed: if_pressed, if_tilted_left_stick: if_tilted_left_stick, force_neutral: force_neutral }.compact
       end
 
-      def remap(button, to: )
-        case to
-        when TrueClass, FalseClass, NilClass
-          raise "ボタンを渡してください"
-        when Symbol, String
-          self.remaps[button] = { to: [to] }
-        when Array
-          raise "ボタンを渡してください" if to.size.zero?
-          self.remaps[button] = { to: to }
+      def disable_macro(name, if_pressed: nil)
+        if name.nil?
+          Kernel.warn "設定ファイルに記述ミスがあります. disable_macroのnameにはmacro nameかクラス名の名前を渡してください."
+          return
         end
+
+        hash = { name: name.to_s.to_sym, if_pressed: [] }
+        begin
+          if(if_pressed = ParamNormalizer::DisableMacroIfPressed.new(if_pressed).to_value!)
+            hash[:if_pressed] = if_pressed
+          end
+        rescue ParamNormalizer::UnSupportValueError
+          Kernel.warn "設定ファイルに記述ミスがあります. disable_macroのif_pressedにはボタンを渡してください."
+          return
+        end
+
+        disable_macros << hash
       end
 
-      def left_analog_stick_cap(cap: , if_pressed: nil, force_neutral: nil)
-        hash = { cap: cap }
+      def remap(button, to: )
+        begin
+          button = ParamNormalizer::Button.new(button).to_value!
+        rescue ParamNormalizer::UnSupportValueError
+          Kernel.warn "設定ファイルに記述ミスがあります. remapにはボタンを渡してください."
+          return
+        end
+
+        begin
+          self.remaps[button] = { to: ParamNormalizer::ButtonList.new(to).to_value! }
+        rescue ParamNormalizer::UnSupportValueError
+          Kernel.warn "設定ファイルに記述ミスがあります. remapのtoにはボタンを渡してください."
+          return
+        end
+      end
 
-        case if_pressed
-        when TrueClass, FalseClass
-          raise "ボタンを渡してください"
-        when Symbol, String
-          if_pressed = [if_pressed]
-        when Array, NilClass
-          # no-op
+      def left_analog_stick_cap(cap: nil, if_pressed: nil, force_neutral: nil)
+        case cap
+        when Integer
+          # OK
+        when Float
+          cap = cap.to_i
         else
-          raise "not support value"
+          Kernel.warn "設定ファイルに記述ミスがあります. left_analog_stick_capのcapで未対応の値を受け取りました."
+          return
         end
 
-        if if_pressed
-          hash[:if_pressed] = if_pressed
+        hash = { cap: cap }
+
+        begin
+          if(if_pressed = ParamNormalizer::IfPressedAllowsFalsy.new(if_pressed).to_value!)
+            hash[:if_pressed] = if_pressed
+          end
+        rescue ParamNormalizer::UnSupportValueError
+          Kernel.warn "設定ファイルに記述ミスがあります. left_analog_stick_capのif_pressedにはボタンを渡してください."
+          return
         end
 
-        case force_neutral
-        when TrueClass
-          raise "ボタンを渡してください"
-        when Symbol, String
-          hash[:force_neutral] = [force_neutral]
-        when Array
-          hash[:force_neutral] = force_neutral
-        when FalseClass, NilClass
-          # no-op
-        else
-          raise "not support value"
+        begin
+          if(force_neutral = ParamNormalizer::ForceNeutral.new(force_neutral).to_value!)
+            hash[:force_neutral] = force_neutral
+          end
+        rescue ParamNormalizer::UnSupportValueError
+          Kernel.warn "設定ファイルに記述ミスがあります. left_analog_stick_capのforce_neutralにはボタンを渡してください."
+          return
         end
 
         left_analog_stick_caps << hash
       end
 
       def disable(button)
-        case button
-        when TrueClass, FalseClass, NilClass
-          raise "not support class"
-        when Symbol
-          disables << button
-        when String
-          disables << button.to_sym
-        when Array
-          button.each { |b| disables << b }
-        else
-          raise "not support value"
+        ParamNormalizer::ButtonList.new(button).to_value!.each do |disable|
+          disables << disable
         end
+        disables.uniq!
+      rescue ParamNormalizer::UnSupportValueError
+        Kernel.warn "設定ファイルに記述ミスがあります. disableにはボタンを渡してください."
+        return
       end
 
       # @return [Array]

data/lib/procon_bypass_man/buttons_setting_configuration/loader.rb

@@ -1,3 +1,5 @@
+require "procon_bypass_man/buttons_setting_configuration/param_normalizer"
+
 module ProconBypassMan
   class ButtonsSettingConfiguration
     module Loader

data/lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/button.rb

@@ -0,0 +1,28 @@
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    module ParamNormalizer
+      class Button
+        attr_reader :button
+
+        def initialize(button)
+          @button = button
+        end
+
+        def to_value!
+          case button
+          when TrueClass, FalseClass, NilClass, Array, Integer
+            raise UnSupportValueError
+          when Symbol, String
+            unless !!ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP[button.to_sym]
+              raise UnexpectedValueError
+            end
+
+            return button.to_sym
+          else
+            raise UnexpectedValueError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/button_list.rb

@@ -0,0 +1,31 @@
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    module ParamNormalizer
+      class ButtonList
+        attr_reader :button
+
+        def initialize(button)
+          @button = button
+        end
+
+        # @return [Array]
+        # @raise [UnSupportValueError]
+        # @raise [UnexpectedValueError]
+        def to_value!
+          case button
+          when Integer, TrueClass, FalseClass, NilClass
+            raise UnSupportValueError
+          when Symbol
+            return [button]
+          when String
+            return [button.to_sym]
+          when Array
+            return button.map(&:to_sym).uniq
+          else
+            raise UnexpectedValueError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/disable_macro_if_pressed.rb

@@ -0,0 +1,28 @@
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    module ParamNormalizer
+      class DisableMacroIfPressed
+        attr_reader :value
+
+        def initialize(value)
+          @value = value
+        end
+
+        def to_value!
+          case value
+          when FalseClass, Integer, TrueClass
+            raise UnSupportValueError
+          when Symbol, String
+            return [value.to_sym]
+          when Array
+            return value.map(&:to_sym).uniq
+          when NilClass # 常に対象のmacroをdisableにする
+            return [true]
+          else
+            raise UnexpectedValueError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/flip_if_pressed.rb

@@ -0,0 +1,31 @@
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    module ParamNormalizer
+      class FlipIfPressed
+        attr_reader :value
+
+        def initialize(value, button: )
+          @value = value
+          @button = button
+        end
+
+        def to_value!
+          case value
+          when Integer
+            raise UnSupportValueError
+          when TrueClass
+            return [@button]
+          when Symbol, String
+            return [value.to_sym]
+          when Array
+            return value.map(&:to_sym).uniq
+          when FalseClass, NilClass
+            return false
+          else
+            raise UnexpectedValueError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/force_neutral.rb

@@ -0,0 +1,28 @@
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    module ParamNormalizer
+      class ForceNeutral
+        attr_reader :force_neutral
+
+        def initialize(force_neutral)
+          @force_neutral = force_neutral
+        end
+
+        def to_value!
+          case force_neutral
+          when Integer, TrueClass
+            raise UnSupportValueError
+          when Symbol, String
+            return [force_neutral.to_sym]
+          when Array
+            return force_neutral.map(&:to_sym).uniq
+          when FalseClass, NilClass
+            return nil
+          else
+            raise UnexpectedValueError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/if_pressed.rb

@@ -0,0 +1,26 @@
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    module ParamNormalizer
+      class IfPressed
+        attr_reader :value
+
+        def initialize(value)
+          @value = value
+        end
+
+        def to_value!
+          case value
+          when Integer, TrueClass, FalseClass, NilClass
+            raise UnSupportValueError
+          when Symbol, String
+            return [value.to_sym]
+          when Array
+            return value.map(&:to_sym).uniq
+          else
+            raise UnexpectedValueError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/if_pressed_allows_nil.rb

@@ -0,0 +1,28 @@
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    module ParamNormalizer
+      class IfPressedAllowsFalsy
+        attr_reader :value
+
+        def initialize(value)
+          @value = value
+        end
+
+        def to_value!
+          case value
+          when Integer, TrueClass
+            raise UnSupportValueError
+          when Symbol, String
+            return [value.to_sym]
+          when Array
+            return value.map(&:to_sym).uniq
+          when FalseClass, NilClass
+            # OK
+          else
+            raise UnexpectedValueError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/buttons_setting_configuration/param_normalizer/open_macro_steps.rb

@@ -0,0 +1,26 @@
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    module ParamNormalizer
+      class OpenMacroSteps
+        attr_reader :steps
+
+        def initialize(steps)
+          @steps = steps
+        end
+
+        def to_value!
+          case steps
+          when Integer, TrueClass, FalseClass, NilClass
+            raise UnSupportValueError
+          when String, Symbol
+            return [steps.to_sym]
+          when Array
+            return steps.map(&:to_sym)
+          else
+            raise UnexpectedValueError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/buttons_setting_configuration/param_normalizer.rb

@@ -0,0 +1,17 @@
+require "procon_bypass_man/buttons_setting_configuration/param_normalizer/button_list"
+require "procon_bypass_man/buttons_setting_configuration/param_normalizer/button"
+require "procon_bypass_man/buttons_setting_configuration/param_normalizer/force_neutral"
+require "procon_bypass_man/buttons_setting_configuration/param_normalizer/if_pressed_allows_nil"
+require "procon_bypass_man/buttons_setting_configuration/param_normalizer/flip_if_pressed"
+require "procon_bypass_man/buttons_setting_configuration/param_normalizer/disable_macro_if_pressed"
+require "procon_bypass_man/buttons_setting_configuration/param_normalizer/if_pressed"
+require "procon_bypass_man/buttons_setting_configuration/param_normalizer/open_macro_steps"
+
+module ProconBypassMan
+  class ButtonsSettingConfiguration
+    module ParamNormalizer
+      class UnSupportValueError < StandardError; end
+      class UnexpectedValueError < UnSupportValueError; end
+    end
+  end
+end

data/lib/procon_bypass_man/buttons_setting_configuration.rb

@@ -3,7 +3,7 @@ require "procon_bypass_man/buttons_setting_configuration/loader"
 require "procon_bypass_man/buttons_setting_configuration/layer"
 
 module ProconBypassMan
-  class AnalogStickPosition < Struct.new(:x, :y); end
+  class Position < Struct.new(:x, :y); end
 
   class ButtonsSettingConfiguration
     attr_accessor :layers,
@@ -65,7 +65,7 @@ module ProconBypassMan
       end
 
       unless ([ManualMode.name] + ProconBypassMan::Procon::ModeRegistry.plugins.keys).include?(mode_name)
-        raise("#{mode_name} mode is unknown")
+        warn "#{mode_name}モードがinstallされていません"
       end
 
       layer = Layer.new(mode: mode_name)
@@ -90,7 +90,7 @@ module ProconBypassMan
     end
 
     def set_neutral_position(x, y)
-      self.neutral_position = AnalogStickPosition.new(x, y).freeze
+      self.neutral_position = Position.new(x, y).freeze
       self
     end
 
@@ -103,14 +103,15 @@ module ProconBypassMan
       self.mode_plugins = {}
       # プロセスを一度起動するとsetting_pathは変わらない、という想定なので適当に扱う. resetでは初期化しない
       # self.setting_path = nil
-      self.macro_plugins = {}
+      # どこかで初期化している気がするのでコメントアウト
+      self.macro_plugins = ProconBypassMan::Procon::MacroPluginMap.new # ProconBypassMan::Procon::MacroRegistry.reset!と重複している
       self.layers = {
         up: Layer.new,
         down: Layer.new,
         left: Layer.new,
         right: Layer.new,
       }
-      @neutral_position = AnalogStickPosition.new(2124, 1808).freeze
+      @neutral_position = Position.new(2124, 1808).freeze
     end
   end
 end

data/lib/procon_bypass_man/bypass/usb_hid_logger.rb

@@ -10,6 +10,8 @@ class ProconBypassMan::Bypass
     set_callback :send_procon_to_gadget, :after, :log_procon_to_gadget
 
     def log_send_gadget_to_procon
+      return unless bypass_value.to_text
+
       if ProconBypassMan.config.verbose_bypass_log
         ProconBypassMan.logger.debug { ">>> #{bypass_value.to_text}" }
       else
@@ -20,6 +22,8 @@ class ProconBypassMan::Bypass
     end
 
     def log_procon_to_gadget
+      return unless bypass_value.to_text
+
       if ProconBypassMan.config.verbose_bypass_log
         ProconBypassMan.logger.debug { "<<< #{bypass_value.to_text}" }
       else