procon_bypass_man 0.1.20.1 → 0.1.22

data/lib/procon_bypass_man/commands/print_boot_message_command.rb

@@ -4,6 +4,7 @@ class ProconBypassMan::PrintBootMessageCommand
       @table = {}
       @table[:ruby_version] = RUBY_VERSION
       @table[:pbm_version] = ProconBypassMan::VERSION
+      @table[:pbmenv_version] = Pbmenv::VERSION
       @table[:pid] = $$
       @table[:root_path] = ProconBypassMan.root
       @table[:pid_path] = ProconBypassMan.pid_path
@@ -12,6 +13,9 @@ class ProconBypassMan::PrintBootMessageCommand
       @table[:use_pbmenv] = !(!!`which pbmenv`.empty?)
       @table[:session_id] = ProconBypassMan.session_id
       @table[:device_id] = ProconBypassMan.device_id
+      @table[:bypass_mode] = ProconBypassMan.config.bypass_mode.to_s
+      @table[:never_exit_accidentally] = ProconBypassMan.config.never_exit_accidentally
+      @table[:uname] = `uname -a`.chomp
 
       # 開発中のHEADを取りたかったけど、Gem::Specification経由から取得する必要がありそう
       # build_version = `git rev-parse --short HEAD`.chomp
@@ -30,6 +34,7 @@ class ProconBypassMan::PrintBootMessageCommand
       ----
       RUBY_VERSION: #{@table[:ruby_version]}
       ProconBypassMan::VERSION: #{@table[:pbm_version]}
+      Pbmenv::VERSION: #{@table[:pbmenv_version]}
       pid: #{@table[:pid]}
       root: #{@table[:root_path]}
       pid_path: #{@table[:pid_path]}
@@ -38,6 +43,7 @@ class ProconBypassMan::PrintBootMessageCommand
       use_pbmenv: #{@table[:use_pbmenv]}
       session_id: #{ProconBypassMan.session_id}
       device_id: #{ProconBypassMan.device_id}
+      bypass_mode: #{ProconBypassMan.config.bypass_mode}
       ----
       EOF
     end

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)
@@ -61,9 +58,9 @@ class ProconBypassMan::DeviceConnector
         begin
           timer.throw_if_timeout!
           data = from_device(item).read_nonblock(64)
-          debug_log_buffer << "read_from(#{item.read_from}): #{data}"
+          debug_log_buffer << "read_from(#{item.read_from}): #{data.unpack("H*")}"
         rescue IO::EAGAINWaitReadable
-          debug_log_buffer << "read_from(#{item.read_from}): IO::EAGAINWaitReadable"
+          # debug_log_buffer << "read_from(#{item.read_from}): IO::EAGAINWaitReadable"
           retry
         end
 
@@ -267,6 +264,7 @@ class ProconBypassMan::DeviceConnector
     if @initialized_devices
       return
     end
+    ProconBypassMan::UsbDeviceController.init
 
     if path = ProconBypassMan::DeviceProconFinder.find
       @procon = File.open(path, "w+b")
@@ -276,9 +274,7 @@ class ProconBypassMan::DeviceConnector
     end
     @gadget = File.open('/dev/hidg0', "w+b")
 
-    system('echo > /sys/kernel/config/usb_gadget/procon/UDC')
-    system('ls /sys/class/udc > /sys/kernel/config/usb_gadget/procon/UDC')
-    sleep 0.5
+    ProconBypassMan::UsbDeviceController.reset
 
     @initialized_devices = true
 
@@ -290,10 +286,8 @@ class ProconBypassMan::DeviceConnector
     end
   rescue Errno::ENXIO => e
     # /dev/hidg0 をopenできないときがある
-    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 0.5
+    ProconBypassMan::SendErrorCommand.execute(error: "Errno::ENXIO (No such device or address @ rb_sysopen - /dev/hidg0)が起きました。resetします.\n #{e.full_message}")
+    ProconBypassMan::UsbDeviceController.reset
     retry
   end
 end

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
@@ -42,24 +40,4 @@ class ProconBypassMan::DeviceProconFinder
       done
     SHELL
   end
-
-  # これいる？
-  def is_available_device?(path)
-    return false if !File.exist?(path)
-
-    system('echo > /sys/kernel/config/usb_gadget/procon/UDC')
-    system('ls /sys/class/udc > /sys/kernel/config/usb_gadget/procon/UDC')
-    sleep 0.5
-
-    file = File.open(path, "w+")
-    begin
-      file.read_nonblock(64)
-    rescue EOFError
-      file.close
-      return false
-    rescue IO::EAGAINWaitReadable
-      file.close
-      return true
-    end
-  end
 end

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,16 +36,21 @@ 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 "not press button(#{button}) yet" if not ProconBypassMan::PressButtonAware.new(binary).pressing_button?(button)
+    raise "do not press button(#{button}) yet" if not 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)

data/lib/procon_bypass_man/{bypass → domains}/bypass_mode.rb

@@ -18,4 +18,12 @@ class ProconBypassMan::BypassMode
     @mode = mode.to_sym
     @gadget_to_procon_interval = gadget_to_procon_interval
   end
+
+  def to_s
+    if mode == TYPE_NORMAL
+      "#{mode}(#{gadget_to_procon_interval})"
+    else
+      mode.to_s
+    end
+  end
 end

data/lib/procon_bypass_man/domains.rb

@@ -4,6 +4,8 @@ module ProconBypassMan
   end
 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/macro/dasei_cancel.rb

@@ -0,0 +1,21 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      module Macro
+        module DaseiCancel
+          def self.display_name
+            :dasei_cancel
+          end
+
+          def self.steps
+            [:pressing_r_for_0_03sec, :pressing_r_and_pressing_zl_for_0_2sec].freeze
+          end
+
+          def self.description
+            '惰性キャンセル'
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -10,6 +10,10 @@ module ProconBypassMan
           def self.steps
             [:x, :down, :a, :a].freeze
           end
+
+          def self.description
+            '試合中にリスポーンにスーパージャンプ'
+          end
         end
       end
     end

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

@@ -10,6 +10,10 @@ module ProconBypassMan
           def self.steps
             [:x, :left, :a, :a].freeze
           end
+
+          def self.description
+            '試合中に左キーに割り当てられている味方へのスーパージャンプ'
+          end
         end
       end
     end

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

@@ -10,6 +10,10 @@ module ProconBypassMan
           def self.steps
             [:x, :right, :a, :a].freeze
           end
+
+          def self.description
+            '試合中に右キーに割り当てられている味方へのスーパージャンプ'
+          end
         end
       end
     end

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

@@ -10,6 +10,10 @@ module ProconBypassMan
           def self.steps
             [:x, :up, :a, :a].freeze
           end
+
+          def self.description
+            '試合中に上キーに割り当てられている味方へのスーパージャンプ'
+          end
         end
       end
     end

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

@@ -15,6 +15,10 @@ module ProconBypassMan
               :toggle_r_for_1sec,
             ].freeze
           end
+
+          def self.description
+            'バブル即割'
+          end
         end
       end
     end

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

@@ -3,6 +3,10 @@ module ProconBypassMan
     module Splatoon2
       module Mode
         module Guruguru
+          def self.description
+            '適当に動きます'
+          end
+
           def self.binaries
             [ "309481408000362d684658750968f71cfe2c0e51000001480053f71ffedf0d4b000a013d00caf6ecfd4c0d480003011c00000000000000000000000000000000",
               "30978140800037dd6748687509fdf6adfded0d6d0081005d00eef68dfdef0d6d00830059001bf791fd140e720090005400000000000000000000000000000000",

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

@@ -4,6 +4,8 @@ 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/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/button_collection.rb

@@ -37,12 +37,4 @@ class ProconBypassMan::Procon::ButtonCollection
   BUTTONS = ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP.keys.freeze
 
   LEFT_ANALOG_STICK = { byte_position: 6..8 }
-
-  # @param [Array<Symbol>] buttons
-  # @return [Array<Symbol>]
-  def self.normalize(buttons)
-    buttons.select { |x|
-      !!ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP[x]
-    }
-  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

@@ -1,13 +1,51 @@
 class ProconBypassMan::Procon::Macro
-  class NestedStep
+  class BaseNestedStep
     def initialize(value)
       @hash = value
+    end
+
+    private
+
+    def incr_step_index!
+      if step_index
+        @hash[:step_index] += 1
+      else
+        @hash[:step_index] = 0
+      end
+    end
+
+    def current_step
+      @hash[:steps][step_index]
+    end
+  end
+
+  class OnetimeNestedStep < BaseNestedStep
+    def over?
+      current_step.nil?
+    end
+
+    def next_step
+      step = current_step
+      incr_step_index!
+      step
+    end
+
+    private
+
+    def step_index
+      @hash[:step_index] ||= 0
+    end
+  end
+
+  class NestedStep < BaseNestedStep
+    def initialize(value)
+      super
       unless @hash[:end_at]
         @hash[:end_at] = (Time.now + @hash[:continue_for]).round(4)
       end
     end
 
-    def over_end_at?
+    def over?
       (@hash[:end_at] < Time.now).tap do |result|
         if result
           ProconBypassMan.logger.debug { "[Macro] nested step is finished(#{@hash})" }
@@ -17,8 +55,6 @@ class ProconBypassMan::Procon::Macro
 
     def next_step
       incr_step_index!
-
-      debug_incr_called_count!
       if step = current_step
         return step
       else
@@ -29,37 +65,22 @@ class ProconBypassMan::Procon::Macro
 
     private
 
-    def current_step
-      @hash[:steps][step_index]
-    end
-
     def step_index
       @hash[:step_index]
     end
 
-    def incr_step_index!
-      if step_index
-        @hash[:step_index] += 1
-      else
-        @hash[:step_index] = 0
-      end
-    end
-
     def reset_step_index!
       @hash[:step_index] = 0
     end
-
-    def debug_incr_called_count!
-      @hash[:debug_called_count] ||= 0
-      @hash[:debug_called_count] += 1
-    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
@@ -69,9 +90,16 @@ class ProconBypassMan::Procon::Macro
     end
 
     if step.is_a?(Hash)
-      nested_step = NestedStep.new(step)
-      if nested_step.over_end_at?
+      nested_step =
+        if step[:continue_for]
+          NestedStep.new(step)
+        else
+          OnetimeNestedStep.new(step)
+        end
+
+      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