procon_bypass_man 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7820b087d86ac7338128dbfdebba48f8e3100d4a2163894962296e6526ea6b6e
-  data.tar.gz: 43d3bd4d0b3d18a61edc2df29320ad345f6d9313de79b6bb732a2bf526a18e5a
+  metadata.gz: ece30577af00d56afa2e2e0be7e09d8328c9d7f8cc96c2e49d207a2bb423b867
+  data.tar.gz: faf86731651a110fd63ce977f65b76f46c31fe6215a2512d4c3a1ba545fd4f81
 SHA512:
-  metadata.gz: 78f98474a1a3d6bf7a6a6420c36c51bc4c9ba835d35361b5bcd45623b3c9c5e3b8ef173d341bd026d324f78787bc020b6536e6deff658c8f073767d3ff0f664e
-  data.tar.gz: 341d4645b6650594533dcf23b32e24a8e5acd8413fea428d21fa2d2a2b4af1636d312a1ebc3472d5dbcbce193157a4da459eb1314619c27342b93dd30b8a96b3
+  metadata.gz: 313d36b543a7c539effaabb6fca121a5112b4076a196ad52386924f3e043ad25e52c5c880a710c1d8aafc66d4a647b3387cebe0b82391eb4ccffa10dd1f4af65
+  data.tar.gz: 55e7a87c35f972e8537654b86a1f5e1815ed22144a4097e1993ad986666f1111972ce8ce1a744e56196c16957a56c328ba510b6b19af4ff8961ac989d216af20

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## [0.1.16] - 202
+- websocket経由で外部サーバからの命令を受け取れるようになりました
+
 ## [0.1.15] - 2021-12-08
 - 外部サーバから設定ファイルのリストアができるようになりました
 - splatoon2 pluginのネームスペースを変更しました

data/Gemfile.lock

@@ -1,12 +1,16 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.1.15)
+    procon_bypass_man (0.1.16)
+      action_cable_client
       pbmenv
+      sorted_set
 
 GEM
   remote: https://rubygems.org/
   specs:
+    action_cable_client (3.1.0)
+      websocket-eventmachine-client (>= 1.2.0)
     activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
@@ -17,6 +21,7 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
+    eventmachine (1.2.7)
     ffi (1.15.4)
     i18n (1.8.11)
       concurrent-ruby (~> 1.0)
@@ -29,7 +34,7 @@ GEM
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     parallel (1.21.0)
-    parser (3.0.2.0)
+    parser (3.0.3.2)
       ast (~> 2.4.1)
     pbmenv (0.1.6)
     pry (0.14.1)
@@ -44,7 +49,8 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbs (1.7.1)
-    regexp_parser (2.1.1)
+    rbtree (0.4.4)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -68,23 +74,27 @@ GEM
       rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.13.0)
+    rubocop-ast (1.14.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
+    set (1.0.2)
     sinatra (2.1.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
       rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    steep (0.46.0)
+    sorted_set (1.0.3)
+      rbtree
+      set (~> 1.0)
+    steep (0.47.0)
       activesupport (>= 5.1)
       language_server-protocol (>= 3.15, < 4.0)
       listen (~> 3.0)
       parallel (>= 1.0.0)
       parser (>= 3.0)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 1.2.0)
+      rbs (~> 1.7.0)
       terminal-table (>= 2, < 4)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -94,6 +104,14 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
     webrick (1.7.0)
+    websocket (1.2.9)
+    websocket-eventmachine-base (1.2.0)
+      eventmachine (~> 1.0)
+      websocket (~> 1.0)
+      websocket-native (~> 1.0)
+    websocket-eventmachine-client (1.3.0)
+      websocket-eventmachine-base (~> 1.0)
+    websocket-native (1.0.0)
     zeitwerk (2.5.1)
 
 PLATFORMS

data/README.md

@@ -34,6 +34,14 @@ Switch <-- (PBM): ZR連打
 ## Plugins
 * https://github.com/splaplapla/procon_bypass_man-splatoon2
 
+## 関連ソフトウェア
+* サーバソフトウェア(WIP)
+  * https://github.com/splaplapla/procon_bypass_man_cloud
+  * このサーバからOS自体の再起動、設定ファイルの変更、PBMのバージョンアップができます
+  * 自分でホストティングしてください
+* pbmenv
+  * バージョンマネージャー
+
 ## FAQ
 * どうやって動かすの?
     * このツールはRaspberry Pi4をUSBガジェットモードで起動して有線でプロコンとSwitchに接続して使います

data/lib/ext/em_pure_ruby.rb

@@ -0,0 +1,25 @@
+# https://github.com/eventmachine/eventmachine/pull/929 is not released yet.
+# i will delete this patch if released.
+module EventMachine
+  # @private
+  class Reactor
+    def run_timers
+      timers_to_delete = []
+      @timers.each {|t|
+        if t.first <= @current_loop_time
+          #@timers.delete t
+          timers_to_delete << t
+          EventMachine::event_callback "", TimerFired, t.last
+        else
+          break
+        end
+      }
+      timers_to_delete.map{|c| @timers.delete c}
+      timers_to_delete = nil
+      #while @timers.length > 0 and @timers.first.first <= now
+      #  t = @timers.shift
+      #  EventMachine::event_callback "", TimerFired, t.last
+      #end
+    end
+  end
+end

data/lib/procon_bypass_man/background.rb

@@ -10,5 +10,4 @@ require "procon_bypass_man/background/jobs/report_reload_config_job"
 require "procon_bypass_man/background/jobs/report_load_config_job"
 require "procon_bypass_man/background/jobs/report_error_job"
 require "procon_bypass_man/background/jobs/report_pressed_buttons_job"
-require "procon_bypass_man/background/jobs/fetch_and_run_remote_pbm_action_job"
 require "procon_bypass_man/background/jobs/sync_device_stats_job"

data/lib/procon_bypass_man/buttons_setting_configuration/layer.rb

@@ -10,7 +10,6 @@ module ProconBypassMan
         self.remaps = {}
         self.left_analog_stick_caps = {}
         self.disables = []
-        instance_eval(&block) if block_given?
       end
 
       # @param [Symbol] button
@@ -50,11 +49,8 @@ module ProconBypassMan
           end
           hash[:flip_interval] = interval
         end
-        if self.flips[button]
-          raise "#{button}への設定をすでに割り当て済みです"
-        else
-          self.flips[button] = hash
-        end
+
+        self.flips[button] = hash
       end
 
       def macro(name, if_pressed: )

data/lib/procon_bypass_man/bypass/usb_hid_logger.rb

@@ -30,7 +30,7 @@ class ProconBypassMan::Bypass
 
       ProconBypassMan.cache.fetch key: 'pressed_buttons_reporter', expires_in: 5 do
         ProconBypassMan::ReportPressedButtonsJob.perform_async(
-          ProconBypassMan::ProconReader.new(binary: bypass_value.binary).to_hash
+          bypass_value.binary.to_procon_reader.to_hash
         )
       end
     end

data/lib/procon_bypass_man/bypass.rb

@@ -5,7 +5,7 @@ class ProconBypassMan::Bypass
 
   class BypassValue < Struct.new(:binary, :sent)
     def to_text
-      "#{binary.unpack("H*").first} #{'x' unless sent}"
+      "#{binary.unpack.first} #{'x' unless sent}"
     end
   end
 
@@ -21,14 +21,14 @@ class ProconBypassMan::Bypass
   def send_gadget_to_procon!
     monitor.record(:start_function)
     input = nil
-    self.bypass_value = BypassValue.new(input, sent = false)
+    self.bypass_value = BypassValue.new(nil, sent = false)
 
     run_callbacks(:send_gadget_to_procon) do
       begin
         break if $will_terminate_token
         # TODO blocking readにしたいが、接続時のフェーズによって長さが違うので厳しい
         input = self.gadget.read_nonblock(64)
-        self.bypass_value.binary = input
+        self.bypass_value.binary = ProconBypassMan::Domains::InboundProconBinary.new(binary: input)
       rescue IO::EAGAINWaitReadable
         monitor.record(:eagain_wait_readable_on_read)
         sleep(0.001)
@@ -50,14 +50,14 @@ class ProconBypassMan::Bypass
   def send_procon_to_gadget!
     monitor.record(:start_function)
     output = nil
-    self.bypass_value = BypassValue.new(output, sent = false)
+    self.bypass_value = BypassValue.new(nil, sent = false)
 
     run_callbacks(:send_procon_to_gadget) do
       begin
         break if $will_terminate_token
         Timeout.timeout(1) do
           output = self.procon.read(64)
-          self.bypass_value.binary = output
+          self.bypass_value.binary = ProconBypassMan::Domains::InboundProconBinary.new(binary: output)
         end
       rescue Timeout::Error
         ProconBypassMan.logger.debug { "read timeout! do sleep. by send_procon_to_gadget!" }
@@ -72,8 +72,15 @@ class ProconBypassMan::Bypass
         retry
       end
 
+      # blocking readをしているのでnilが入ることはないが、雑なテストでnilが通るので分岐を入れる。できれば消したい
+      break if output.nil?
+
       begin
-        self.gadget.write_nonblock(ProconBypassMan::Processor.new(output).process)
+        self.gadget.write_nonblock(
+          ProconBypassMan::Processor.new(
+            ProconBypassMan::Domains::InboundProconBinary.new(binary: output)
+          ).process
+        )
         self.bypass_value.sent = true
       rescue IO::EAGAINWaitReadable
         monitor.record(:eagain_wait_readable_on_write)

data/lib/procon_bypass_man/commands/print_boot_message_command.rb

@@ -1,7 +1,56 @@
 class ProconBypassMan::PrintBootMessageCommand
+  class BootMessage
+    def initialize
+      @table = {}
+      @table[:ruby_version] = RUBY_VERSION
+      @table[:pbm_version] = ProconBypassMan::VERSION
+      @table[:pid] = $$
+      @table[:root_path] = ProconBypassMan.root
+      @table[:pid_path] = ProconBypassMan.pid_path
+      @table[:setting_path] = ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path
+      @table[:uptime_from_boot] = ProconBypassMan::Uptime.from_boot
+      @table[:use_pbmenv] = !(!!`which pbmenv`.empty?)
+      @table[:session_id] = ProconBypassMan.session_id
+      @table[:device_id] = ProconBypassMan.device_id
+
+      # 開発中のHEADを取りたかったけど、Gem::Specification経由から取得する必要がありそう
+      # build_version = `git rev-parse --short HEAD`.chomp
+      # if build_version.empty?
+      #   @table[:build_version] = 'release version'
+      # else
+      #   @table[:build_version] = build_version
+      # end
+
+      # build version: #{@table[:build_version]}
+    end
+
+    # @return [String]
+    def to_s
+      booted_message = <<~EOF
+      ----
+      RUBY_VERSION: #{@table[:ruby_version]}
+      ProconBypassMan::VERSION: #{@table[:pbm_version]}
+      pid: #{@table[:pid]}
+      root: #{@table[:root_path]}
+      pid_path: #{@table[:pid_path]}
+      setting_path: #{@table[:setting_path]}
+      uptime from boot: #{@table[:uptime_from_boot]} sec
+      use_pbmenv: #{@table[:use_pbmenv]}
+      session_id: #{ProconBypassMan.session_id}
+      device_id: #{ProconBypassMan.device_id}
+      ----
+      EOF
+    end
+
+    # @return [Hash]
+    def to_hash
+      @table
+    end
+  end
+
   # @return [void]
   def self.execute
-    message = ProconBypassMan::BootMessage.new
+    message = BootMessage.new
     ProconBypassMan::ReportBootJob.perform_async(message.to_hash)
     ProconBypassMan::ReportLoadConfigJob.perform_async(ProconBypassMan.config.raw_setting)
     puts message.to_s

data/lib/procon_bypass_man/commands/print_message_command.rb

@@ -0,0 +1,8 @@
+class ProconBypassMan::PrintMessageCommand
+  # @return [void]
+  # @param [String] text
+  def self.execute(text: )
+    ProconBypassMan.logger.info text
+    puts text
+  end
+end

data/lib/procon_bypass_man/commands/run_remote_pbm_action_dispatch_command.rb

@@ -13,7 +13,7 @@ class ProconBypassMan::RunRemotePbmActionDispatchCommand
     when ProconBypassMan::RemotePbmAction::ACTION_RESTORE_SETTING
       ProconBypassMan::RemotePbmAction::RestorePbmSettingAction.new(pbm_job_uuid: uuid).run!(job_args: job_args)
     else
-      ProconBypassMan::SendErrorCommand.execute(error: "#{action}は対応していないアクションです")
+      raise "#{action}は対応していないアクションです"
     end
   rescue ProconBypassMan::RemotePbmAction::ActionUnexpectedError => e
     ProconBypassMan::SendErrorCommand.execute(error: e)

data/lib/procon_bypass_man/commands/send_reload_config_event_command.rb

@@ -1,8 +1,7 @@
 class ProconBypassMan::SendReloadConfigEventCommand
   # @return [void]
   def self.execute
-    puts "設定ファイルの再読み込みができました"
-    ProconBypassMan.logger.info "設定ファイルの再読み込みができました"
+    ProconBypassMan::PrintMessageCommand.execute(text: "設定ファイルの再読み込みができました")
     ProconBypassMan::ReportReloadConfigJob.perform_async(
       ProconBypassMan.config.raw_setting
     )

data/lib/procon_bypass_man/commands.rb

@@ -1,4 +1,5 @@
 require "procon_bypass_man/commands/print_boot_message_command"
+require "procon_bypass_man/commands/print_message_command"
 require "procon_bypass_man/commands/write_session_id_command"
 require "procon_bypass_man/commands/write_device_id_command"
 require "procon_bypass_man/commands/send_reload_config_event_command"

data/lib/procon_bypass_man/configuration.rb

@@ -111,6 +111,33 @@ class ProconBypassMan::Configuration
     @server_pool ||= ProconBypassMan::ServerPool.new(servers: api_servers)
   end
 
+  # @return [String, NilClass]
+  def current_server
+    server_pool.server
+  end
+
+  # @return [String, NilClass]
+  def current_ws_server
+    if (uri = URI.parse(server_pool.server))
+      if uri.port == 443
+        return "ws://#{uri.host}"
+      else
+        return "ws://#{uri.host}:#{uri.port}"
+      end
+    end
+  rescue URI::InvalidURIError
+    nil
+  end
+
+  # @return [String, NilClass]
+  def current_ws_server_url
+    return unless current_ws_server
+    "#{current_ws_server}/websocket/"
+  end
+
+  # @return [Boolean]
+  def enable_ws?; !!current_server; end
+
   # @return [Array<String>]
   def api_servers
     if !!ENV["API_SERVER"]

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

@@ -0,0 +1,11 @@
+class ProconBypassMan::Domains::Binary::Base
+  # @param [String] binary
+  def initialize(binary: )
+    @binary = binary
+  end
+
+  # @return [String] バイナリ
+  def binary
+    raise NotImplementedError
+  end
+end

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

@@ -0,0 +1,5 @@
+module ProconBypassMan::Domains::HasImmutableBinary
+  def binary
+    @binary.freeze
+  end
+end

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

@@ -0,0 +1,5 @@
+module ProconBypassMan::Domains::HasMutableBinary
+  def binary
+    @binary
+  end
+end

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

@@ -0,0 +1,23 @@
+# proconから取得したばかりのバイナリ
+class ProconBypassMan::Domains::InboundProconBinary < ProconBypassMan::Domains::Binary::Base
+  include ProconBypassMan::Domains::HasImmutableBinary
+
+  # @return [String]
+  def raw
+    binary.dup
+  end
+
+  def unpack
+    binary.unpack("H*")
+  end
+
+  # @return [ProconBypassMan::ProconReader]
+  def to_procon_reader
+    ProconBypassMan::ProconReader.new(binary: binary)
+  end
+
+  # @return [Boolean]
+  def user_operation_data?
+    binary[0] == "\x30".b
+  end
+end

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

@@ -0,0 +1,80 @@
+# バイナリの書き換えのみをする
+class ProconBypassMan::Domains::ProcessingProconBinary < ProconBypassMan::Domains::Binary::Base
+  include ProconBypassMan::Domains::HasMutableBinary
+
+  ALL_ZERO_BIT = ["0"].pack("H*").freeze
+
+  # @return [String]
+  def raw
+    binary
+  end
+
+  def unpack
+    binary.unpack("H*")
+  end
+
+  def set_no_action!
+    binary[3] = ALL_ZERO_BIT
+    binary[4] = ALL_ZERO_BIT
+    binary[5] = ALL_ZERO_BIT
+  end
+
+  # @param [ProconBypassMan::Domains::ProcessingProconBinary]
+  # @return [ProconBypassMan::Domains::ProcessingProconBinary]
+  # アナログスティックは上書きし、ボタンだけマージする
+  def write_as_merge!(target_binary)
+    current_buttons = ProconBypassMan::ProconReader.new(binary: binary).pressing
+    target_buttons = ProconBypassMan::ProconReader.new(binary: target_binary.raw).pressing
+
+    set_no_action!
+    (current_buttons + target_buttons).uniq.each do |button|
+      write_as_press_button(button)
+    end
+
+    # override analog stick
+    tb = [target_binary.raw].pack("H*")
+    binary[6] = tb[6]
+    binary[7] = tb[7]
+    binary[8] = tb[8]
+    binary[9] = tb[9]
+    binary[10] = tb[10]
+    binary[11] = tb[11]
+
+    self
+  end
+
+  # @param [Symbol] button
+  def write_as_press_button(button)
+    raise "already pressing button(#{button})" if ProconBypassMan::PressButtonAware.new(binary).pressing_button?(button)
+
+    button_obj = ProconBypassMan::Procon::Button.new(button)
+    value = binary[button_obj.byte_position].unpack("H*").first.to_i(16) + (2**button_obj.bit_position)
+    binary[button_obj.byte_position] = ["%02X" % value.to_s].pack("H*")
+  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)
+
+    button_obj = ProconBypassMan::Procon::Button.new(button)
+    value = binary[button_obj.byte_position].unpack("H*").first.to_i(16) - (2**button_obj.bit_position)
+    binary[button_obj.byte_position] = ["%02X" % value.to_s].pack("H*")
+  end
+
+  # @param [Symbol] button
+  def write_as_press_button_only(button)
+    set_no_action!
+    write_as_press_button(button)
+  end
+
+  # @param [Integer] cap
+  def write_as_apply_left_analog_stick_cap(cap: )
+    analog_stick_cap = ProconBypassMan::Procon::AnalogStickCap.new(binary)
+    binary[6..8] = analog_stick_cap.capped_position(cap_hypotenuse: cap).to_binary
+  end
+
+  # @return [ProconBypassMan::ProconReader]
+  def to_procon_reader
+    ProconBypassMan::ProconReader.new(binary: binary)
+  end
+end

data/lib/procon_bypass_man/domains.rb

@@ -0,0 +1,11 @@
+module ProconBypassMan
+  module Domains
+    module Binary; end
+  end
+end
+
+require_relative "domains/binary/base"
+require_relative "domains/binary/has_mutable_binary"
+require_relative "domains/binary/has_immutable_binary"
+require_relative "domains/binary/inbound_procon_binary"
+require_relative "domains/binary/processing_procon_binary"

data/lib/procon_bypass_man/processor.rb

@@ -1,16 +1,15 @@
 class ProconBypassMan::Processor
-  # @return [String] binary
+
+  # @param [ProconBypassMan::Domains::InboundProconBinary] binary
   def initialize(binary)
     @binary = binary
   end
 
   # @return [String] 加工後の入力データ
   def process
-    unless @binary[0] == "\x30".b
-      return @binary
-    end
+    return @binary.raw unless @binary.user_operation_data?
 
-    procon = ProconBypassMan::Procon.new(@binary)
+    procon = ProconBypassMan::Procon.new(@binary.raw)
     procon.apply!
     procon.to_binary
   end

data/lib/procon_bypass_man/procon/button.rb

@@ -0,0 +1,11 @@
+class ProconBypassMan::Procon::Button
+  class UnknownButtonFoundError < StandardError; end
+
+  attr_accessor :byte_position, :bit_position
+
+  def initialize(key)
+    b = ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP[key] or raise(UnknownButtonFoundError, '定義にないボタンです')
+    self.byte_position = b[:byte_position]
+    self.bit_position = b[:bit_position]
+  end
+end

data/lib/procon_bypass_man/procon/button_collection.rb

@@ -1,13 +1,4 @@
 class ProconBypassMan::Procon::ButtonCollection
-  class Button
-    attr_accessor :byte_position, :bit_position
-    def initialize(key)
-      b = BUTTONS_MAP[key] or raise("undefined button")
-      self.byte_position = b[:byte_position]
-      self.bit_position = b[:bit_position]
-    end
-  end
-
   # https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering/blob/ac8093c84194b3232acb675ac1accce9bcb456a3/bluetooth_hid_notes.md
   #0) Input report ID
   #1) Timer. Increments very fast. Can be used to estimate excess Bluetooth latency.
@@ -42,9 +33,8 @@ class ProconBypassMan::Procon::ButtonCollection
     end
     acc
   }.freeze
+
   BUTTONS = ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP.keys.freeze
 
-  def self.load(button_key)
-    Button.new(button_key)
-  end
+  LEFT_ANALOG_STICK = { byte_position: 6..8 }
 end

data/lib/procon_bypass_man/procon/layer_changer.rb

@@ -1,6 +1,7 @@
 class ProconBypassMan::Procon::LayerChanger
+  # @param [ProconBypassMan::Domains::ProcessingProconBinary] binary
   def initialize(binary: )
-    @procon_reader = ProconBypassMan::ProconReader.new(binary: binary).freeze
+    @procon_reader = binary.to_procon_reader
   end
 
   # @return [Symbol]
@@ -35,6 +36,6 @@ class ProconBypassMan::Procon::LayerChanger
 
   # @return [Boolean]
   def pressed?(button: )
-    @procon_reader.pressed.include?(button)
+    @procon_reader.pressing.include?(button)
   end
 end

data/lib/procon_bypass_man/procon/press_button_aware.rb

@@ -1,13 +1,14 @@
-class ProconBypassMan::PpressButtonAware
+class ProconBypassMan::PressButtonAware
   def initialize(binary)
     @binary = binary
   end
 
-  def pressed_button?(button)
+  def pressing_button?(button)
+    button_obj = ProconBypassMan::Procon::Button.new(button)
     @binary[
-      ::ProconBypassMan::Procon::ButtonCollection.load(button).byte_position
+      button_obj.byte_position
     ].unpack("H*").first.to_i(16).to_s(2).reverse[
-      ::ProconBypassMan::Procon::ButtonCollection.load(button).bit_position
+      button_obj.bit_position
     ] == '1'
   end
 end