procon_bypass_man 0.1.21 → 0.1.22

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,
@@ -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

data/lib/procon_bypass_man/configuration.rb

@@ -156,7 +156,14 @@ class ProconBypassMan::Configuration
   end
 
   # @return [Boolean]
-  def enable_ws?; !!current_server; end
+  def enable_ws?
+    !!current_server
+  end
+
+  # @return [Boolean]
+  def enable_remote_macro?
+    enable_ws?
+  end
 
   # @return [Array<String>]
   def api_servers

data/lib/procon_bypass_man/device_connector.rb

@@ -10,16 +10,13 @@ class ProconBypassMan::DeviceConnector
     end
   end
 
-  PROCON_PATH = "/dev/hidraw0"
-  PROCON2_PATH = "/dev/hidraw1"
-
   def self.connect
     s = new(throw_error_if_timeout: true, enable_at_exit: false)
     s.add([
       ["0000"],
       ["0000"],
       ["8005"],
-      ["0010"],
+      ["0000"],
     ], read_from: :switch)
     # 1. Sends current connection status, and if the Joy-Con are connected,
     s.add([["8001"]], read_from: :switch)

data/lib/procon_bypass_man/device_procon_finder.rb

@@ -31,8 +31,6 @@ class ProconBypassMan::DeviceProconFinder
 
   def get_list_shell
     <<~SHELL
-      #!/bin/bash
-
       FILES=/dev/hidraw*
       for f in $FILES
       do

data/lib/procon_bypass_man/domains/analog_stick_position.rb

@@ -0,0 +1,18 @@
+class ProconBypassMan::AnalogStickPosition
+  attr_accessor :x, :y
+
+  def initialize(x:, y:)
+    @x = x.to_i
+    @y = y.to_i
+  end
+
+  def to_binary
+    analog_stick_data = [
+      (@x & "0xff".to_i(16)),
+      ((@y << 4) & "0xf0".to_i(16)) | ((@x >> 8) & "0x0f".to_i(16)),
+      (@y >> 4) & "0xff".to_i(16),
+    ]
+    hex = analog_stick_data.map{ |x| x.to_s(16).rjust(2, "0") }.join
+    [hex].pack("H*")
+  end
+end

data/lib/procon_bypass_man/domains/binary/processing_procon_binary.rb

@@ -36,13 +36,18 @@ class ProconBypassMan::Domains::ProcessingProconBinary < ProconBypassMan::Domain
 
   # @param [Symbol] button
   def write_as_press_button(button)
-    raise "already pressing button(#{button})" if ProconBypassMan::PressButtonAware.new(binary).pressing_button?(button)
+    return if ProconBypassMan::PressButtonAware.new(binary).pressing_button?(button)
 
     button_obj = ProconBypassMan::Procon::Button.new(button)
     value = binary[button_obj.byte_position].unpack("C").first + (2**button_obj.bit_position)
     binary[button_obj.byte_position] = ["%02X" % value.to_s].pack("H*")
   end
 
+  # @param [Symbol] stick method
+  def write_as_tilt_left_stick(step)
+    binary[6..8] = ProconBypassMan::Procon::AnalogStickManipulator.new(binary, method: step).to_binary
+  end
+
   # @param [Symbol] button
   def write_as_unpress_button(button)
     raise "do not press button(#{button}) yet" if not ProconBypassMan::PressButtonAware.new(binary).pressing_button?(button)

data/lib/procon_bypass_man/domains.rb

@@ -5,6 +5,7 @@ module ProconBypassMan
 end
 
 require_relative "domains/bypass_mode"
+require_relative "domains/analog_stick_position"
 require_relative "domains/binary/base"
 require_relative "domains/binary/has_mutable_binary"
 require_relative "domains/binary/has_immutable_binary"

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

@@ -0,0 +1,21 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      module Macro
+        module ChargeTansanBomb
+          def self.display_name
+            :charge_tansan_bomb
+          end
+
+          def self.steps
+            [:shake_left_stick_and_toggle_b_for_0_1sec].freeze
+          end
+
+          def self.description
+            'タンサンボムのチャージ'
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 module ProconBypassMan
   module Plugin
     module Splatoon2
-      VERSION = "0.1.3"
+      VERSION = "0.1.5"
     end
   end
 end

data/lib/procon_bypass_man/plugins.rb

@@ -5,6 +5,7 @@ require_relative "plugin/splatoon2/macro/jump_to_up_key"
 require_relative "plugin/splatoon2/macro/jump_to_left_key"
 require_relative "plugin/splatoon2/macro/sokuwari_for_splash_bomb"
 require_relative "plugin/splatoon2/macro/dasei_cancel"
+require_relative "plugin/splatoon2/macro/charge_tansan_bomb"
 require_relative "plugin/splatoon2/mode/guruguru"
 
 module ProconBypassMan

data/lib/procon_bypass_man/procon/analog_stick_cap.rb

@@ -1,36 +1,17 @@
 class ProconBypassMan::Procon::AnalogStickCap
-  class Position
-    attr_accessor :x, :y
-
-    def initialize(x:, y:)
-      @x = x.to_i
-      @y = y.to_i
-    end
-
-    def to_binary
-      analog_stick_data = [
-        (@x & "0xff".to_i(16)),
-        ((@y << 4) & "0xf0".to_i(16)) | ((@x >> 8) & "0x0f".to_i(16)),
-        (@y >> 4) & "0xff".to_i(16),
-      ]
-      hex = analog_stick_data.map{ |x| x.to_s(16).rjust(2, "0") }.join
-      [hex].pack("H*")
-    end
-  end
-
   def initialize(binary)
     @binary = binary
     @analog_stick = ProconBypassMan::Procon::AnalogStick.new(binary: binary)
   end
 
-  # @return [ProconBypassMan::Procon::AnalogStickCap::Position]
+  # @return [ProconBypassMan::AnalogStickPosition]
   def capped_position(cap_hypotenuse: )
     if hypotenuse > cap_hypotenuse
       relative_capped_x = cap_hypotenuse * Math.cos(rad * Math::PI / 180).abs
       relative_capped_y = cap_hypotenuse * Math.sin(rad * Math::PI / 180).abs
       relative_capped_x = -(relative_capped_x.abs) if relative_x.negative?
       relative_capped_y = -(relative_capped_y.abs) if relative_y.negative?
-      return Position.new(
+      return ProconBypassMan::AnalogStickPosition.new(
         x: relative_capped_x + @analog_stick.neutral_position.x,
         y: relative_capped_y + @analog_stick.neutral_position.y,
       )
@@ -39,9 +20,9 @@ class ProconBypassMan::Procon::AnalogStickCap
     end
   end
 
-  # @return [ProconBypassMan::Procon::AnalogStickCap::Position]
+  # @return [ProconBypassMan::AnalogStickPosition]
   def position
-    Position.new(x: abs_x, y: abs_y)
+    ProconBypassMan::AnalogStickPosition.new(x: abs_x, y: abs_y)
   end
 
   def abs_x; @analog_stick.abs_x; end # 0, 0からのx

data/lib/procon_bypass_man/procon/analog_stick_manipulator.rb

@@ -0,0 +1,36 @@
+class ProconBypassMan::Procon::AnalogStickManipulator
+  attr_accessor :manipulated_abs_x, :manipulated_abs_y
+
+  def initialize(binary, method: )
+    analog_stick = ProconBypassMan::Procon::AnalogStick.new(binary: binary)
+
+    if method =~ /tilt_left_stick_(completely)_to_(left|right)/
+      power_level = $1
+      direction = $2
+
+      case direction
+      when 'left'
+        self.manipulated_abs_x = 400
+        # yを引き継ぐとタンサンボムの溜まりが悪くなったので固定値を入れる
+        self.manipulated_abs_y = analog_stick.abs_y
+        # self.manipulated_abs_y = 1808
+      when 'right'
+        self.manipulated_abs_x = 3400
+        self.manipulated_abs_y = 1808
+      end
+    else
+      warn "error stick manipulator"
+      self.manipulated_abs_x = analog_stick.abs_x
+      self.manipulated_abs_y = analog_stick.abs_y
+    end
+  end
+
+
+  # @return [String]
+  def to_binary
+    ProconBypassMan::AnalogStickPosition.new(
+      x: self.manipulated_abs_x,
+      y: self.manipulated_abs_y,
+    ).to_binary
+  end
+end

data/lib/procon_bypass_man/procon/layer_changer.rb

@@ -24,7 +24,10 @@ class ProconBypassMan::Procon::LayerChanger
   # @return [Boolean]
   def change_layer?
     if ProconBypassMan::ButtonsSettingConfiguration.instance.prefix_keys.empty?
-      raise "prefix_keysが未設定です"
+      ProconBypassMan.cache.fetch key: 'unknown prefix_keys', expires_in: 60 do
+        warn "prefix_keysが未設定です"
+      end
+      return false
     end
     ProconBypassMan::ButtonsSettingConfiguration.instance.prefix_keys.map { |b| pressed?(button: b) }.all?
   end

data/lib/procon_bypass_man/procon/macro.rb

@@ -74,11 +74,13 @@ class ProconBypassMan::Procon::Macro
     end
   end
 
-  attr_accessor :name, :steps
+  attr_accessor :name, :steps, :after_callback_block, :force_neutral_buttons
 
-  def initialize(name: , steps: )
+  def initialize(name: , steps: , force_neutral_buttons: [], &after_callback_block)
     self.name = name
     self.steps = steps
+    self.after_callback_block = after_callback_block
+    self.force_neutral_buttons = force_neutral_buttons # 外部から呼ばれるだけ
   end
 
   def next_step
@@ -97,6 +99,7 @@ class ProconBypassMan::Procon::Macro
 
       if nested_step.over?
         steps.shift # NestedStepを破棄する
+        self.after_callback_block.call if self.after_callback_block
         return next_step
       else
         return nested_step.next_step

data/lib/procon_bypass_man/procon/macro_builder.rb

@@ -13,34 +13,32 @@ class ProconBypassMan::Procon::MacroBuilder
 
   class Subject
     def initialize(value)
-      @button =
-        if match = value.match(/_(\w+)\z/)
-          match[1]
-        else
-          :unknown
-        end
+      if not /^shake_/ =~ value
+        @button =
+          if match = value.match(/_(\w+)\z/)
+            match[1]
+          else
+            :unknown
+          end
+      end
       @type =
         if value.start_with?("toggle_")
           :toggle
+        elsif value.start_with?("shake_left_stick")
+          :shake_left_stick
         else
           :pressing
         end
     end
 
-    def toggle?
-      @type == :toggle
-    end
-
-    def pressing?
-      not toggle?
-    end
-
     def to_steps
       case @type
       when :toggle
         [@button.to_sym, :none]
       when :pressing
         [@button.to_sym, @button.to_sym]
+      when :shake_left_stick
+        [:tilt_left_stick_completely_to_left, :tilt_left_stick_completely_to_right]
       end
     end
   end
@@ -92,7 +90,7 @@ class ProconBypassMan::Procon::MacroBuilder
       ]
     end
 
-    if %r!^(pressing_|toggle_)! =~ step && (subjects = step.scan(%r!pressing_[^_]+|toggle_[^_]+!)) && (match = step.match(%r!_for_([\d_]+)(sec)?\z!))
+    if %r!^(pressing_|toggle_|shake_left_stick_)! =~ step && (subjects = step.scan(%r!pressing_[^_]+|shake_left_stick|toggle_[^_]+!)) && (match = step.match(%r!_for_([\d_]+)(sec)?\z!))
       if sec = match[1]
         return {
           continue_for: to_f(sec),
@@ -100,14 +98,14 @@ class ProconBypassMan::Procon::MacroBuilder
             if x.is_a?(Array)
               x.select { |y| is_button(y) || RESERVED_WORD_NONE == y }
             else
-              is_button(x) || RESERVED_WORD_NONE == x
+              is_button(x) || RESERVED_WORD_NONE == x || :tilt_left_stick_completely_to_left == x || :tilt_left_stick_completely_to_right == x
             end
           },
         }
       end
     end
 
-    if %r!^(pressing_|toggle_)! =~ step && (subjects = step.scan(%r!pressing_[^_]+|toggle_[^_]+!))
+    if %r!^(pressing_|toggle_|shake_left_stick_)! =~ step && (subjects = step.scan(%r!pressing_[^_]+|shake_left_stick|toggle_[^_]+!))
       return SubjectMerger.merge(subjects.map { |x| Subject.new(x) }).select { |x|
         if x.is_a?(Array)
           x.select { |y| is_button(y) || RESERVED_WORD_NONE == y }

data/lib/procon_bypass_man/procon/macro_plugin_map.rb

@@ -0,0 +1,23 @@
+module ProconBypassMan
+  class Procon
+    # macroキーにメタデータを埋め込んでいる. 通常の処理ではメタデータを露出したくないので露出しないためのクラス
+    class MacroPluginMap < ::Hash
+      def [](value)
+        self.fetch([value, :normal], nil)
+      end
+
+      def each
+        transform_keys(&:first).each { |x| yield(x[0], x[1]) }
+      end
+
+      alias_method :original_keys, :keys
+      def keys
+        super.map(&:first)
+      end
+
+      def raw_keys
+        self.original_keys
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/procon/macro_registry.rb

@@ -3,20 +3,23 @@ class ProconBypassMan::Procon::MacroRegistry
     null: [],
   }
 
-  def self.install_plugin(klass, steps: nil)
-    if plugins[klass.to_s.to_sym]
-      raise "#{klass} macro is already registered"
+  def self.install_plugin(klass, steps: nil, macro_type: :normal)
+    if plugins.fetch([klass.to_s.to_sym, macro_type], nil)
+      Kernel.warn "#{klass} macro is already registered"
+      return
     end
 
-    plugins[klass.to_s.to_sym] = ->{
-      ProconBypassMan::Procon::MacroBuilder.new(steps || klass.steps).build
-    }
+    plugins.store(
+      [klass.to_s.to_sym, macro_type], ->{
+        ProconBypassMan::Procon::MacroBuilder.new(steps || klass.steps).build
+      }
+    )
   end
 
   # @return [ProconBypassMan::Procon::Macro]
-  def self.load(name)
-    if(steps = PRESETS[name] || plugins[name]&.call)
-      return ProconBypassMan::Procon::Macro.new(name: name, steps: steps.dup)
+  def self.load(name, macro_type: :normal, force_neutral_buttons: [], &after_callback_block)
+    if(steps = PRESETS[name] || plugins.fetch([name.to_s.to_sym, macro_type], nil)&.call)
+      return ProconBypassMan::Procon::Macro.new(name: name, steps: steps.dup, force_neutral_buttons: force_neutral_buttons, &after_callback_block)
     else
       warn "installされていないマクロ(#{name})を使うことはできません"
       return self.load(:null)
@@ -24,12 +27,20 @@ class ProconBypassMan::Procon::MacroRegistry
   end
 
   def self.reset!
-    ProconBypassMan::ButtonsSettingConfiguration.instance.macro_plugins = {}
+    ProconBypassMan::ButtonsSettingConfiguration.instance.macro_plugins = ProconBypassMan::Procon::MacroPluginMap.new
   end
 
   def self.plugins
     ProconBypassMan::ButtonsSettingConfiguration.instance.macro_plugins
   end
 
+  def self.cleanup_remote_macros!
+    remote_keys = ProconBypassMan::Procon::MacroRegistry.plugins.original_keys.select { |_, y| y == :remote }
+    remote_keys.each do |remote_key|
+      ProconBypassMan::Procon::MacroRegistry.plugins.delete(remote_key)
+    end
+    ProconBypassMan::Procon::MacroRegistry.plugins
+  end
+
   reset!
 end