procon_bypass_man 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 556a827cf03895e4212aa4c524963ca7efd24499c2ea14edff2d692bc3e1e63f
-  data.tar.gz: bf7cf5a735fffa13e1ff99c259a329a4c6981be755440477884ece0246188f21
+  metadata.gz: 3d7e6a739dbaf4be4022b97c591828d5ccca8d947c0c3bc0a0a8ffa8097a2b95
+  data.tar.gz: f7ad824a4e34d051c3f3514d18f6c6ab4b3e23b0cf6d9c574af1038afe9118b0
 SHA512:
-  metadata.gz: 7bdfd9d2c5bee033c8f6a1f87acebcf3374e353c0ea4d373c76f86ee33b87b248665b087276998f20dee9f0d1258ab2c7c49906cc55b94b51a5e35d84712da5c
-  data.tar.gz: 176ac515a48935df2953c36fb747e09be71c31f7850b09397e338bc0685b5da25bcd7ff81795d235287f2a5870fcdec3fec5aa9334e12ba90ca26662fe8807e7
+  metadata.gz: 5ab67436d5d4dbca83ec68d42b0621d6737370388e10d5d86738914506dd6261aa6f495b7074f36ec685d1392b433ec1d7070f9417c2dfe4e7927b6840829633
+  data.tar.gz: 4c0034304beda74a99126b4dfd1cd35b2f0ac00b78c200dea9f6bfd64a19b0c39407a4e24afcd0914764e9899058a328e4a1c18130efc83421eb7202b2543e1c

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.3.1] - 2022-10-07
+* レイヤーを変更しているときにコントローラーを振動できるようになりました
+    * setting.yml で `enable(:rumble_on_layer_change)` と記述してください
+* イカロールをするマクロを追加しました
+    * 詳しい設定方法については docs/setting/splatoon2_macro_forward_ikarole.md を参照してください
+* スプラ用マクロ、惰性キャンセルを削除しました
+
 ## [0.3.0] - 2022-9-9
 * 表示入力機能を一時的に削除しました #185
 * バイパス処理中の小さなラグがほぼなくなりました #185

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.3.0)
+    procon_bypass_man (0.3.1)
       action_cable_client
       blue_green_process
       pbmenv (>= 0.1.9)

data/docs/setting/splatoon2_macro_forward_ikarole.md

@@ -0,0 +1,34 @@
+# スプラトゥーン2: イカロール マクロの設定方法
+
+* procon_bypass_man: 0.3.1以上が必要です
+* このマクロは、右から上へ高速にスティックを入れることでイカロールを行います
+* 後述する設定例では、左スティックを押し込むことでイカロールを発動してます
+
+https://user-images.githubusercontent.com/1664497/193837089-1c56af8d-2c1b-436a-b2a7-89c083a408d7.mov
+
+
+## 設定例1
+```yaml
+version: 1.0
+setting: |-
+  prefix_keys_for_changing_layer [:zr, :zl, :l]
+
+  layer :up do
+    open_macro :forward_ikarole, steps: [:forward_ikarole1], if_pressed: [:thumbl], force_neutral: []
+  end
+```
+
+## 設定例2
+pluginとして登録してあるので、 `macro` を使っても同じことができます。
+
+```yaml
+version: 1.0
+setting: |-
+  prefix_keys_for_changing_layer [:zr, :zl, :l]
+
+  install_macro_plugin(ProconBypassMan::Plugin::Splatoon2::Macro::ForwardIkarole)
+
+  layer :up do
+    macro ProconBypassMan::Plugin::Splatoon2::Macro::ForwardIkarole, if_pressed: [:thumbl], force_neutral: []
+  end
+```

data/docs/setup_raspi.md

@@ -1,41 +1,38 @@
 https://github.com/splaplapla/procon_bypass_man/blob/master/docs/setup_raspi_by_mitamae.md に半自動化した手順があります
 
 # Raspberry Pi4のセットアップ手順
-* SDカードにRaspberry Pi OS (32-bit)を焼く
+* SDカードにRaspberry Pi OS (32 or 64-bit)を焼く
 * SDカードをRaspberry Pi4本体に挿して起動する
 * ラズパイGUI
   * 無線LANに接続する
   * sshdを許可する
 * macからsshする
+  * sudo apt-get update
   * sudo apt-get dist-upgrade
-  * hostnameを変える
-      * sudo hostnamectl set-hostname raspizero
-      * /etc/hosts に追記する
-  * 仮想メモリを増やす(optional)
-      * /etc/dphys-swapfile を CONF_SWAPSIZE=1024 にする
-      * sudo /etc/init.d/dphys-swapfile restart && swapon -s
-  * tailscale をインストールする(optional)
   * sudo apt-get install vim rbenv git -y
   * rbenvでrubyを入れる
       * git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build
       * rbenv install 3.0.1
       * rbenv local 3.0.1
       * gem i bundler
-* sshkeyを作成する
-* github に鍵を登録する
-* ~/.ssh/authorized_keys に鍵を登録する
 * ガジェットモードで起動する
   * /boot/config.txtに、dtoverlay=dwc2を追記
   * echo "dwc2" | sudo tee -a /etc/modules
   * echo "libcomposite" | sudo tee -a /etc/modules
   * sudo cat /etc/modules
-  * cd ~ && wget https://gist.githubusercontent.com/jiikko/3f9fb3194c0cc7685e31fbfcb5b5f9ff/raw/23ddee29d94350be80b79d290ac3c8ce8400bd88/add_procon_gadget.sh
-  * chmod 755 ~/add_procon_gadget.sh
   * sudo reboot
-  * sudo sh ~/add_procon_gadget.sh の実行に成功させる
 * cd ~ && mkdir -p src && cd ~/src && git clone https://github.com/jiikko/procon_bypass_man_sample && cd procon_bypass_man_sample
 
-おわり. 起動する時は都度 sudo ruby app.rb を実行する
+おわりです.  
+  
+起動する時は下記を確認の上、`sudo /home/pi/.rbenv/versions/3.0.1/bin/ruby app.rb` を実行してください。
+
+* 「ラズパイとSwitch」と「ラズパイとプロコン」を **データ通信可能なケーブル** で接続する
+* **Proコントローラーの有線通信** をONにする
+
+
+![image](https://user-images.githubusercontent.com/1664497/193258615-1da27049-6d1f-4bfc-af1d-2f894f9c610e.png)
+
 
 ## 参考
 * https://mtosak-tech.hatenablog.jp/entry/2020/08/22/114622

data/lib/procon_bypass_man/buttons_setting_configuration/layer.rb

@@ -53,6 +53,7 @@ module ProconBypassMan
       end
 
       # @param [String, Class] プラグインのclass
+      # @param [Hash, NilClass] if_tilted_left_stick 非推奨
       def macro(name, if_pressed: nil, if_tilted_left_stick: nil, force_neutral: nil)
         case if_tilted_left_stick
         when Integer, String, Symbol, Array

data/lib/procon_bypass_man/buttons_setting_configuration/loader.rb

@@ -21,7 +21,7 @@ module ProconBypassMan
         rescue SyntaxError
           fallback_setting_if_has_backup(current_setting_path: setting_path)
           raise ProconBypassMan::CouldNotLoadConfigError, "Rubyスクリプトのシンタックスエラーです"
-        rescue NoMethodError
+        rescue NameError
           fallback_setting_if_has_backup(current_setting_path: setting_path)
           raise ProconBypassMan::CouldNotLoadConfigError, "Rubyスクリプトに未定義の定数・変数があります"
         rescue Psych::SyntaxError
@@ -52,6 +52,7 @@ module ProconBypassMan
       end
 
       def self.reload_setting
+        ProconBypassMan.ephemeral_config.reset!
         self.load(setting_path: ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path)
       end
 

data/lib/procon_bypass_man/buttons_setting_configuration.rb

@@ -98,6 +98,17 @@ module ProconBypassMan
       @prefix_keys_for_changing_layer
     end
 
+    # @param [Symbol, String] setting_name
+    # @return [void]
+    def enable(setting_name)
+      case setting_name.to_sym
+      when :rumble_on_layer_change
+        ProconBypassMan.ephemeral_config.enable_rumble_on_layer_change = true
+      else
+        warn "存在しないenable(#{setting_name.to_sym})が呼び出されました。"
+      end
+    end
+
     def reset!
       @prefix_keys_for_changing_layer = []
       self.mode_plugins = {}

data/lib/procon_bypass_man/bypass/bypass_command.rb

@@ -58,8 +58,8 @@ class ProconBypassMan::BypassCommand
         if $will_terminate_token
           if $will_terminate_token == WILL_TERMINATE_TOKEN::TERMINATE
             bypass.direct_connect_switch_via_bluetooth
-            process.shutdown
           end
+          process.shutdown
           break
         end
 

data/lib/procon_bypass_man/bypass/procon_to_switch.rb

@@ -53,9 +53,20 @@ class ProconBypassMan::Bypass::ProconToSwitch
               begin
                 # 終了処理を希望されているのでブロックを無視してメソッドを抜けてOK
                 return(false) if $will_terminate_token # rubocop:disable Lint/NoReturnInBeginEndBlocks
-                self.gadget.write_nonblock(
+                binary = ::ProconBypassMan::Procon::Rumbler.monitor do
                   ProconBypassMan::Processor.new(bypass_value.binary).process
-                )
+                end
+                self.gadget.write_nonblock(binary)
+
+                if ProconBypassMan.ephemeral_config.enable_rumble_on_layer_change && ProconBypassMan::Procon::Rumbler.must_rumble?
+                  begin
+                    self.procon.write_nonblock(ProconBypassMan::Procon::Rumbler.binary)
+                    ProconBypassMan.logger.debug { ProconBypassMan::Procon::Rumbler.binary.unpack('H*').first }
+                  rescue => e
+                    ProconBypassMan::SendErrorCommand.execute(error: e)
+                  end
+                end
+
                 next(true)
               rescue IO::EAGAINWaitReadable
                 return(false) if $will_terminate_token # rubocop:disable Lint/NoReturnInBeginEndBlocks

data/lib/procon_bypass_man/configuration.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# app.rbから設定される値。プロセスを起動してから不変
 class ProconBypassMan::Configuration
   module ClassMethods
     def root

data/lib/procon_bypass_man/device_connection/procon_setting_overrider.rb

@@ -5,17 +5,14 @@ class ProconBypassMan::DeviceConnection::ProconSettingOverrider
   SUB_COMMAND_VIBRATION = "48"
 
   SUB_COMMAND_ARG_HOME_LED_ON = "1FF0FF"
-  SUB_COMMAND_ARG_VIBRATION_OFF = "00"
 
   ALL_SETTINGS = {
     home_led_on: [SUB_COMMAND_HOME_LED_ON, SUB_COMMAND_ARG_HOME_LED_ON],
-    vibration_off: [SUB_COMMAND_VIBRATION, SUB_COMMAND_ARG_VIBRATION_OFF],
   }
 
   # TODO 自動生成する
   SPECIAL_SUB_COMMAND_ARGS =  {
     SUB_COMMAND_HOME_LED_ON => SUB_COMMAND_ARG_HOME_LED_ON,
-    SUB_COMMAND_VIBRATION => SUB_COMMAND_ARG_VIBRATION_OFF,
   }
 
   def initialize(procon: )

data/lib/procon_bypass_man/ephemeral_configuration.rb

@@ -0,0 +1,9 @@
+
+# setting.yamlから設定される値。設定ファイルを再読み込みするとすべて消える
+class ProconBypassMan::EphemeralConfiguration
+  attr_accessor :enable_rumble_on_layer_change
+
+  def reset!
+    self.enable_rumble_on_layer_change = false
+  end
+end

data/lib/procon_bypass_man/plugin/splatoon2/macro/{dasei_cancel.rb → forward_ikarole.rb}

@@ -2,17 +2,17 @@ module ProconBypassMan
   module Plugin
     module Splatoon2
       module Macro
-        module DaseiCancel
+        module ForwardIkarole
           def self.display_name
-            :dasei_cancel
+            :forward_ikarole
           end
 
           def self.steps
-            [:pressing_r_for_0_03sec, :pressing_r_and_pressing_zl_for_0_2sec].freeze
+            [:forward_ikarole1].freeze
           end
 
           def self.description
-            '惰性キャンセル'
+            '前方にイカロールをします'
           end
         end
       end

data/lib/procon_bypass_man/plugins.rb

@@ -4,7 +4,7 @@ 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/forward_ikarole"
 require_relative "plugin/splatoon2/macro/charge_tansan_bomb"
 require_relative "plugin/splatoon2/mode/guruguru"
 

data/lib/procon_bypass_man/procon/analog_stick_manipulator.rb

@@ -20,11 +20,23 @@ class ProconBypassMan::Procon::AnalogStickManipulator
         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
+
+      return
     end
+
+    if method =~ /tilt_left_stick_(completely)_to_(\d+)deg/
+      power_level = $1
+      arc_degree = $2.to_i
+      syahen = 1800 # 最大まで傾けた状態
+      neutral_position = ProconBypassMan::ButtonsSettingConfiguration.instance.neutral_position
+      self.manipulated_abs_x = (syahen * Math.cos(arc_degree * Math::PI / 180)).to_i - neutral_position.x
+      self.manipulated_abs_y = (syahen * Math.sin(arc_degree * Math::PI / 180)).to_i - neutral_position.y
+      return
+    end
+
+    warn "error stick manipulator"
+    self.manipulated_abs_x = analog_stick.abs_x
+    self.manipulated_abs_y = analog_stick.abs_y
   end
 
 

data/lib/procon_bypass_man/procon/macro_builder.rb

@@ -94,6 +94,17 @@ class ProconBypassMan::Procon::MacroBuilder
       ]
     end
 
+    # NOTE: マクロ構文で生成したいけど、スティックとボタン同時押しの構文が思いつかないので、ハードコードする
+    if /forward_ikarole1/ =~ step
+      # NOTE: 0degはx: 1, y: 0, 90degはx: 0, y: 1, 180degはx: -1, y: 0.
+      # NOTE: スティックを前方に倒している状態で270度回転させる
+      for_forward_ikarole_steps = [
+        [:tilt_left_stick_completely_to_0deg, :b],
+        [:tilt_left_stick_completely_to_90deg],
+      ]
+      return { steps: for_forward_ikarole_steps }
+    end
+
     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 {

data/lib/procon_bypass_man/procon/performance_measurement.rb

@@ -48,7 +48,7 @@ module ProconBypassMan::Procon::PerformanceMeasurement
   # 全部送ると負荷になるので適当にまびく
   def self.is_not_measure_with_random_or_if_fast(span: )
     return false if span.time_taken > 0.1
-    return true if rand(20) != 0 # 19/20は捨てる
+    return true if rand(100) != 0 # 99/100は捨てる
     return false
   end
 

data/lib/procon_bypass_man/procon/rumbler.rb

@@ -0,0 +1,18 @@
+class ProconBypassMan::Procon::Rumbler
+  def self.monitor
+    @@must_rumble = false
+    return yield
+  end
+
+  def self.rumble!
+    @@must_rumble = true
+  end
+
+  def self.must_rumble?
+    @@must_rumble
+  end
+
+  def self.binary
+    ["100c00000000" + "00001010"].pack("H*")
+  end
+end

data/lib/procon_bypass_man/procon/user_operation.rb

@@ -38,7 +38,7 @@ class ProconBypassMan::Procon::UserOperation
   # @param [Symbol, Array<Symbol>] macro_step
   def press_button_only_or_tilt_sticks(macro_step)
     macro_step = [macro_step] if not macro_step.is_a?(Array)
-    # スティック操作の時はボタン入力を通す
+    # スティック操作を含む時はボタン入力を通す
     binary.set_no_action! if is_button?(macro_step)
 
     macro_step.uniq.each do |ms|

data/lib/procon_bypass_man/procon.rb

@@ -22,6 +22,7 @@ class ProconBypassMan::Procon
   require "procon_bypass_man/procon/flip_cache"
   require "procon_bypass_man/procon/press_button_aware"
   require "procon_bypass_man/procon/suppress_rumble"
+  require "procon_bypass_man/procon/rumbler"
 
   attr_accessor :user_operation
 
@@ -32,7 +33,6 @@ class ProconBypassMan::Procon
     }
     BlueGreenProcess::SharedVariable.instance.data["buttons"] = {}
     BlueGreenProcess::SharedVariable.instance.data["current_layer_key"] = :up
-    @@left_stick_tilting_power_scaler = ProconBypassMan::AnalogStickTiltingPowerScaler.new
   end
   reset!
 
@@ -66,13 +66,15 @@ class ProconBypassMan::Procon
   def apply!
     layer_changer = ProconBypassMan::Procon::LayerChanger.new(binary: user_operation.binary)
     if layer_changer.change_layer?
-      self.current_layer_key = layer_changer.next_layer_key if layer_changer.pressed_next_layer?
+      if layer_changer.pressed_next_layer?
+        self.current_layer_key = layer_changer.next_layer_key
+        ProconBypassMan::Procon::Rumbler.rumble!
+      end
       user_operation.set_no_action!
       return
     end
 
     analog_stick = ProconBypassMan::Procon::AnalogStick.new(binary: user_operation.binary.raw)
-    dumped_tilting_power = @@left_stick_tilting_power_scaler.add_sample(analog_stick.relative_hypotenuse)
 
     enable_all_macro = true
     enable_macro_map = Hash.new {|h,k| h[k] = true }
@@ -90,16 +92,6 @@ class ProconBypassMan::Procon
       current_layer.macros.each do |macro_name, options|
         next unless enable_macro_map[macro_name]
 
-        if(if_tilted_left_stick_value = options[:if_tilted_left_stick])
-          threshold = (if_tilted_left_stick_value.is_a?(Hash) && if_tilted_left_stick_value[:threshold]) || ProconBypassMan::AnalogStickTiltingPowerScaler::DEFAULT_THRESHOLD
-          if dumped_tilting_power&.tilting?(threshold: threshold, current_position_x: analog_stick.relative_x, current_position_y: analog_stick.relative_y) && user_operation.pressing_all_buttons?(options[:if_pressed])
-            @@status[:ongoing_macro] = MacroRegistry.load(macro_name)
-            break
-          end
-
-          next
-        end
-
         if user_operation.pressing_all_buttons?(options[:if_pressed])
           @@status[:ongoing_macro] = MacroRegistry.load(macro_name, force_neutral_buttons: options[:force_neutral])
           break

data/lib/procon_bypass_man/runner.rb

@@ -19,7 +19,6 @@ class ProconBypassMan::Runner
     end
 
     loop do
-      # NOTE メインプロセスではThreadをいくつか起動しているので念のためパフォーマンスを優先するためにforkしていく
       child_pid = Kernel.fork do
         $will_terminate_token = false
         ProconBypassMan.after_fork_on_bypass_process

data/lib/procon_bypass_man/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ProconBypassMan
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/procon_bypass_man.rb

@@ -35,7 +35,6 @@ require_relative "procon_bypass_man/support/remote_macro_http_client"
 require_relative "procon_bypass_man/support/update_remote_pbm_action_status_http_client"
 require_relative "procon_bypass_man/support/send_device_stats_http_client"
 require_relative "procon_bypass_man/support/procon_performance_http_client"
-require_relative "procon_bypass_man/support/analog_stick_hypotenuse_tilting_power_scaler"
 require_relative "procon_bypass_man/support/never_exit_accidentally"
 require_relative "procon_bypass_man/support/cycle_sleep"
 require_relative "procon_bypass_man/support/can_over_process"
@@ -50,6 +49,7 @@ require_relative "procon_bypass_man/device_status"
 require_relative "procon_bypass_man/runner"
 require_relative "procon_bypass_man/processor"
 require_relative "procon_bypass_man/configuration"
+require_relative "procon_bypass_man/ephemeral_configuration"
 require_relative "procon_bypass_man/buttons_setting_configuration"
 require_relative "procon_bypass_man/procon"
 require_relative "procon_bypass_man/device_model"
@@ -143,6 +143,11 @@ module ProconBypassMan
     @@configuration ||= ProconBypassMan::Configuration.new
   end
 
+  # @return [ProconBypassMan::EphemeralConfiguration]
+  def self.ephemeral_config
+    @@ephemeral_configuration ||= ProconBypassMan::EphemeralConfiguration.new
+  end
+
   # @return [void]
   def self.reset!
     ProconBypassMan::Procon::MacroRegistry.reset!

data/project_template/app.rb

@@ -12,7 +12,7 @@ begin
   gemfile do
     source 'https://rubygems.org'
     git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-    gem 'procon_bypass_man', '0.3.0'
+    gem 'procon_bypass_man', '0.3.1'
   end
 rescue Bundler::Source::Git::GitCommandError => e
   retry_count_on_git_command_error = retry_count_on_git_command_error + 1

data/project_template/app.rb.erb

@@ -12,7 +12,7 @@ begin
   gemfile do
     source 'https://rubygems.org'
     git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-    gem 'procon_bypass_man', '0.3.0'
+    gem 'procon_bypass_man', '0.3.1'
   end
 rescue Bundler::Source::Git::GitCommandError => e
   retry_count_on_git_command_error = retry_count_on_git_command_error + 1

data/project_template/setting.yml

@@ -1,5 +1,8 @@
 version: 1.0
 setting: |-
+  # レイヤー変更時にコントローラーが振動する。有効にすると稀に、コントローラーが数秒間固まることがあります。
+  # enable(:rumble_on_layer_change)
+
   prefix_keys_for_changing_layer [:zr, :zl, :l]
 
   layer :up do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pbmenv
@@ -95,7 +95,7 @@ files:
 - docs/getting_started.md
 - docs/how_to_connect_procon.md
 - docs/setting/left-analogstick-cap.md
-- docs/setting/splatoon2_macro_dasei_cancel.md
+- docs/setting/splatoon2_macro_forward_ikarole.md
 - docs/setting/splatoon2_macro_sokuwari_bubble.md
 - docs/setting/splatoon2_recommended_setting.md
 - docs/setting/splatoon2_shake_tansan.md
@@ -161,9 +161,10 @@ files:
 - lib/procon_bypass_man/device_connection/spoofing_output_report_watcher.rb
 - lib/procon_bypass_man/device_model.rb
 - lib/procon_bypass_man/device_status.rb
+- lib/procon_bypass_man/ephemeral_configuration.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/charge_tansan_bomb.rb
-- lib/procon_bypass_man/plugin/splatoon2/macro/dasei_cancel.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/fast_return.rb
+- lib/procon_bypass_man/plugin/splatoon2/macro/forward_ikarole.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_left_key.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_right_key.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_up_key.rb
@@ -194,6 +195,7 @@ files:
 - lib/procon_bypass_man/procon/performance_measurement/span_queue.rb
 - lib/procon_bypass_man/procon/performance_measurement/span_transfer_buffer.rb
 - lib/procon_bypass_man/procon/press_button_aware.rb
+- lib/procon_bypass_man/procon/rumbler.rb
 - lib/procon_bypass_man/procon/suppress_rumble.rb
 - lib/procon_bypass_man/procon/user_operation.rb
 - lib/procon_bypass_man/procon/value_objects/analog_stick.rb
@@ -232,7 +234,6 @@ files:
 - lib/procon_bypass_man/remote_pbm_action/value_objects/remote_pbm_action_object.rb
 - lib/procon_bypass_man/runner.rb
 - lib/procon_bypass_man/scheduler.rb
-- lib/procon_bypass_man/support/analog_stick_hypotenuse_tilting_power_scaler.rb
 - lib/procon_bypass_man/support/callbacks.rb
 - lib/procon_bypass_man/support/can_over_process.rb
 - lib/procon_bypass_man/support/compress_array.rb

data/docs/setting/splatoon2_macro_dasei_cancel.md

@@ -1,77 +0,0 @@
-# スプラトゥーン2: 惰性キャンセル マクロの設定方法
-
-* 本マクロは実験段階で、オプション名などの仕様が変更される可能性が高いです
-* procon_bypass_man: 0.1.21以上が必要です
-
-## 1. install_macro_pluginでマクロを有効化します
-* `setting.yml` に`install_macro_plugin ProconBypassMan::Plugin::Splatoon2::Macro::DaseiCancel` と書きます
-* これを記述することで、layer内でmacroを呼び出せるようになります
-
-```ruby
-install_macro_plugin ProconBypassMan::Plugin::Splatoon2::Macro::DaseiCancel
-```
-
-## 2. どのlayerで発動するかを宣言します
-* `setting.yml` のlayer内に`macro ProconBypassMan::Plugin::Splatoon2::Macro::DaseiCancel, if_pressed: [:zl]` と書きます
-  * `if_pressed` がどのボタンを押したときにこのマクロが発動するかの設定です
-      * 惰性キャンセルなのでイカ状態になるためにzlを押します
-  * `if_tilted_left_stick` がスティックを倒した時に発動するオプションで、trueを渡すと有効になります
-      * また、傾けた時の閾値を変更することができて、trueの代わりに `{ threshold: 500 }` と書くことができます
-      * デフォルトが500で、ここの数値を上げると、スティックを倒した判定がより厳しくなります。最大1400くらいです。
-* 連打中に、マクロの発動を無効にしたい場合は `disable_macro` で無効にできます
-
-```ruby
-layer :up do
-  macro ProconBypassMan::Plugin::Splatoon2::Macro::DaseiCancel, if_tilted_left_stick: true, if_pressed: [:zl]
-end
-```
-```ruby
-layer :up do
-  macro ProconBypassMan::Plugin::Splatoon2::Macro::DaseiCancel, if_tilted_left_stick: { threshold: 500 }, if_pressed: [:zl]
-end
-```
-```ruby
-layer :up do
-  disable_macro :all, if_pressed: :a
-  disable_macro :all, if_pressed: :zr
-  macro ProconBypassMan::Plugin::Splatoon2::Macro::DaseiCancel, if_tilted_left_stick: true, if_pressed: [:zl]
-end
-```
-
-## 3. 設定を反映させる
-* 上記の記述を加えたsetting.ymlを起動中のprocon_bypass_manプロセスで読み込むには、プロセスにその旨を伝える必要があります
-    * ラズベリーパイを再起動して、プロセスを立ち上げ直す、でも目的は達成できますが、もっと簡単にsetting.ymlを再読み込みする必要があります
-* 書き換えたsetting.ymlを、起動中のprocon_bypass_manプロセスへ即時反映するには、procon_bypass_manプロセスを動かしたまま、別のshellから 以下をを実行してください
-    * setting.ymlのシンタックスが正しければ、switchとの接続が継続したままsetting.ymlの内容を読み込んでいるはずです
-
-```shell
-sudo kill -USR2 `cat ./pbm_pid`
-```
-
-## 設定例1
-```yaml
-version: 1.0
-setting: |-
-  prefix_keys_for_changing_layer [:zr, :zl, :l]
-  install_macro_plugin ProconBypassMan::Plugin::Splatoon2::Macro::DaseiCancel
-
-  layer :up do
-    disable_macro :all, if_pressed: :a
-    disable_macro :all, if_pressed: :zr
-    macro ProconBypassMan::Plugin::Splatoon2::Macro::DaseiCancel, if_tilted_left_stick: true, if_pressed: [:zl]
-  end
-```
-
-## 設定例2
-* `open_macro` キーワードを使っても同じことが実行可能です。
-* この場合は、 `install_macro_plugin` が不要です。
-
-```yaml
-version: 1.0
-setting: |-
-  prefix_keys_for_changing_layer [:zr, :zl, :l]
-
-  layer :up do
-    open_macro :dacan, steps: [:pressing_r_for_0_03sec, :pressing_r_and_pressing_zl_for_0_2sec], if_tilted_left_stick: true, if_pressed: [:zl]
-  end
-```

data/lib/procon_bypass_man/support/analog_stick_hypotenuse_tilting_power_scaler.rb

@@ -1,59 +0,0 @@
-class ProconBypassMan::AnalogStickTiltingPowerScaler
-  DEFAULT_THRESHOLD = 500
-
-  class PowerChunk
-    def initialize(list)
-      @list = list
-    end
-
-    def moving_power
-      max = @list.max
-      min = @list.min
-      moving_power = (max - min).abs
-    end
-
-    def tilting?(threshold: DEFAULT_THRESHOLD, current_position_x: , current_position_y: )
-      # スティックがニュートラルな時
-      if (-200..200).include?(current_position_x) && (-200..200).include?(current_position_y)
-        return false
-      end
-
-      moving_power >= threshold
-    end
-  end
-
-  def initialize
-    @map = {}
-  end
-
-  # @return [NilClass, Chunk] ローテトしたらvalueを返す
-  def add_sample(value)
-    rotated = nil
-    current_key = key
-    if @map[current_key].nil?
-      rotated = rotate
-      @map = { current_key => [] } # renew or initialize
-    end
-
-    @map[current_key] << value
-    rotated
-  end
-
-  private
-
-  # 0.1sec刻みで進行する
-  def key
-    time = Time.now
-    m1 = time.strftime('%L')[0]
-    [time.to_i, m1].join.to_i
-  end
-
-  def rotate
-    list = @map.values.first
-    if list
-      return PowerChunk.new(list)
-    else
-      return nil
-    end
-  end
-end