procon_bypass_man 0.3.0 → 0.3.2

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

@@ -0,0 +1,63 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon3
+      module Mode
+        module Guruguru
+          def self.description
+            '適当に動きます'
+          end
+
+          def self.binaries
+            [ "309481408000362d684658750968f71cfe2c0e51000001480053f71ffedf0d4b000a013d00caf6ecfd4c0d480003011c00000000000000000000000000000000",
+              "30978140800037dd6748687509fdf6adfded0d6d0081005d00eef68dfdef0d6d00830059001bf791fd140e720090005400000000000000000000000000000000",
+              "309a8140800038cd67495875099af821fe120e40006400880042f8fcfdfd0d470067008900d4f7e0fdf20d4e006a008c00000000000000000000000000000000",
+              "309c8140800036ed67466875099bf878fe4a0e35005b004c00c1f875fe400e35005d004c00c4f856fe2d0e390063006c00000000000000000000000000000000",
+              "30a081408000371d6847587509b9f71bfee70d22002c002300e3f73afe150e2b003500280014f854fe300e2d0038002900000000000000000000000000000000",
+              "30a38140800039fd6743587509def70ffea10d1a0031001f00d1f70ffeb10d19002c002200c5f711feb80d18002c002500000000000000000000000000000000",
+              "30a58140800037dd6746687509d8f70bfe980d270035001200ddf70dfe980d240038001900dff70ffe9b0d1f0035001a00000000000000000000000000000000",
+              "30a98140800037ed67484875099cf7edfdb00d310020000d009ef7eefda30d310022000c00adf7f2fd980d300028000a00000000000000000000000000000000",
+              "30ac8140800036ed67484875099cf709fed40d3a002400160097f7fafdd30d39002200150096f7f0fdc80d380022001400000000000000000000000000000000",
+              "30ae8140800038fd674558750987f72efed40d360021001c0089f729fed50d39002400180092f715fed10d390022001800000000000000000000000000000000",
+              "30b18140800037dd6747487509b8f705fea90d19001d002000c5f70dfeb00d210019002200bff71efec20d280018002400000000000000000000000000000000",
+              "30b48140800038fd684868750980f7e9fdd40d0200080024007df7f1fdba0d060011001e0084f7f8fdaa0d12001a001a00000000000000000000000000000000",
+              "30b7814080003fdd694958750918f6a9fd510f0d00d1ff370024f7b0fda90e0100ecff30006cf7d1fd210efffff5ff2c00000000000000000000000000000000",
+              "30ba81408080482d744768750963f71ffe190f5e00d9fea100ccf62dfe650f510009ff980015f702fe580f4b002eff8400000000000000000000000000000000",
+              "30bd814080802f7d864758750974f70efe4c0f5e00c0fea000d1f726fe1c0f5d00c5fea30028f859fe0e0f5c00cafea800000000000000000000000000000000",
+              "30bf8140808057cc984758750961f73afe630f99009dfeae0050f738fe710f7500adfea40050f721fe720f6e00b2fea300000000000000000000000000000000",
+              "30c281408080f479bd483875092ef8b6feab0f0a0180feba00f1f798fe900f000181febd00c2f77dfe7c0fdb008efebd00000000000000000000000000000000",
+              "30c581408080ad87d846487509e1f80000a6107e0178fea2004ef88dff54106c0185fea70063f826ffe60f520182feae00000000000000000000000000000000",
+              "30c8810080800797d84868750995f8e1fe4b0f7a0161fe88000df96dffd00f700149fe990035f9cdff361088016afea000000000000000000000000000000000",
+              "30cb810080804586d848487509cef672fe8a0f6d0217ff42002df63cfe280f1d0219ff410059f61cfe070fed01f5fe4a00000000000000000000000000000000",
+              "30d08100808002c5d745687509d8f5aaff830f5e03e6fe3e01fbf55bffc30f3f03e4fe100158f600ff3e102903e5fee700000000000000000000000000000000",
+              "30d3810080807b94d14838750991f6cd00690f9903f0fff10147f6e200560f7e038fffc60101f6c900560f71033bffa901000000000000000000000000000000",
+              "30d681008080b743ca475875095af7f2009c0fca03a400320242f7ca00950fb503820028020af7b000820fa4034e001a02000000000000000000000000000000",
+              "30d9810080805be3c047587509e7f77a03c70f0e04bb00410258f79801940f0004b800410251f74401910fd803b3003602000000000000000000000000000000",
+              "30dc810080808a02b245587509c0fbd5086a10710475020a03b0fb8d085d106c042102e8027efb660876106a04bc01af02000000000000000000000000000000",
+              "30de8100808036d2a14568750970fbbf09ad103704af038003a9fb600989105c0459036103c2fb2a097210690412034603000000000000000000000000000000",
+              "30e281008000cbb18d4738750989f8b40b2812380341044c0429f99e0bef11510340043704f2f93c0b7911b0033704f003000000000000000000000000000000",
+              "30e581008000c9c18945587509a5f7ca0a2e13e400c6024c0547f7fd0a941264011703270578f74a0b6012e40168030205000000000000000000000000000000",
+              "30e781008000c6618948687509acf86909e813d0fe2801a1057cf8cf09ed130fff6301990516f8710aaa13ccff13028205000000000000000000000000000000",
+              "30ea81008000c77189475875093af93b0762136efbaeff19060cf90107b113a9fb99ff0906e1f85b07b113bafc9fffcd05000000000000000000000000000000",
+              "30ed81008000c791894568750950f9ce047c1432f900026007a5f9a6051f146ef9bb013707bff99206a813fef9ce00c606000000000000000000000000000000",
+              "30ef81008000c6d1894558750944f8ad0358143ef81c02f10780f8b403841484f84102d107ccf801049314bcf84202ad07000000000000000000000000000000",
+              "30f381008000c761884868750914f72105e4134cf6d001c00743f71a05f11391f6bf01e407a0f7c904fa13faf6b3011008000000000000000000000000000000",
+              "30f681008000c7718344587509eaf54a04c812a6f40002500627f66d041313f2f40d02940682f6a60468133ef51a02d806000000000000000000000000000000",
+              "30f881008000c4e1814668750b5cf5f803b51125f3b5000d0560f50f04e8118cf33c015d057df525042c1210f4b101cc05000000000000000000000000000000",
+              "30fb81008000c5e1814458750b19f65a02a410acf29effb804e2f5db02df10b7f2c0ffbf04a9f55c032011dcf22400d804000000000000000000000000000000",
+              "30fe8100800035e2814858750b81f65c00f80f8df231fe940471f6e6001f1088f2a6fe92044ef6b1015a1092f21fffa004000000000000000000000000000000",
+              "3001810080004b03814868750b69f6e6fdad0ffef20efdd40479f678feb40fd9f249fdc40484f6f4fec00fb0f29ffdad04000000000000000000000000000000",
+              "30048100800079e47d4858750b17f64cfb5f0f46f46afb430529f6c4fb710ff1f3d4fb300538f64bfc830fbbf315fc1d05000000000000000000000000000000",
+              "300781008000a7057e4668750bb1f5d3f9fb0e8ef5ccf96405cdf5fcf90c0f44f52dfa6505e1f52dfa210f29f550fa6305000000000000000000000000000000",
+              "30098100800041f67d4668750bcdf4b0f9ab0e21f602f955057ef5adf9d00ee1f559f95f05b1f5d3f9fb0e8ef5ccf96405000000000000000000000000000000",
+              "300d810080003d877c4838750b84f458f7dd0c89f6d0f8fc0436f4e2f7620d83f614f8430526f4c0f8a00e71f666f85c05000000000000000000000000000000",
+              "30108100800058e77a4668750bf7f2c3f57c0c9cf6abfa0a0470f30ef6790c89f65dfa420414f476f67e0c80f6d0f98a04000000000000000000000000000000",
+              "30128100800059f77a4658750b7ef249f5580cd9f69bfaa40389f269f56c0cd1f6a9fab503a3f286f5760cacf6c9faeb03000000000000000000000000000000",
+              "3016810080005b177b4868750ba9f298f4450b2cf774fa3102b8f2a5f47a0b24f765fa6e02b8f2b8f4b10b1df755faac02000000000000000000000000000000",
+              "30198100800057777a4558750b39f258f4480a80f73efaf40016f26af4940a5ef76bfa37014ef275f4d40a46f780fa8401000000000000000000000000000000",
+            ].map(&:freeze).freeze
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ProconBypassMan
+  module Plugin
+    module Splatoon3
+      VERSION = "0.1.0"
+    end
+  end
+end

data/lib/procon_bypass_man/plugins.rb

@@ -4,10 +4,20 @@ 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"
 
+require_relative "plugin/splatoon3/version"
+require_relative "plugin/splatoon3/macro/fast_return"
+require_relative "plugin/splatoon3/macro/jump_to_right_key"
+require_relative "plugin/splatoon3/macro/jump_to_up_key"
+require_relative "plugin/splatoon3/macro/jump_to_left_key"
+require_relative "plugin/splatoon3/macro/sokuwari_for_splash_bomb"
+require_relative "plugin/splatoon3/macro/forward_ikarole"
+require_relative "plugin/splatoon3/macro/charge_tansan_bomb"
+require_relative "plugin/splatoon3/mode/guruguru"
+
 module ProconBypassMan
   module Plugin
   end

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/support/http_client.rb

@@ -96,13 +96,14 @@ module ProconBypassMan
         sleep(10)
         retry
       end
+      raise if respond_to?(:raise_if_failed) && raise_if_failed
     rescue Timeout::Error
       ProconBypassMan.logger.error(e)
       sleep(10)
-      retry
+      raise if respond_to?(:raise_if_failed) && raise_if_failed
     rescue => e
-      puts e
       ProconBypassMan.logger.error(e)
+      raise if respond_to?(:raise_if_failed) && raise_if_failed
     end
   end
 end

data/lib/procon_bypass_man/support/remote_macro_http_client.rb

@@ -5,5 +5,9 @@ module ProconBypassMan
         job_id: job_id,
       })
     end
+
+    def raise_if_failed
+      true
+    end
   end
 end

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man/worker.rb

@@ -6,24 +6,32 @@ module ProconBypassMan
       new.run
     end
 
-    # @param [Boolean]
+    # @return [Worker]
     def run
       return self if @thread
       @thread = Thread.new do
         while(item = ProconBypassMan::Background::JobQueue.pop)
-          begin
-            # プロセスを越えるので、文字列でenqueueしてくれる前提. evalしてクラスにする
-            ProconBypassMan::Background::JobPerformer.new(klass: eval(item[:job_class]), args: item[:args]).perform
-          rescue => e
-            ProconBypassMan.logger.error(e)
-            sleep(0.2) # busy loopしないように
-          end
+          # プロセスを越えるので文字列になっている. evalしてクラスにする
+          work(job_class: eval(item[:job_class]), args: item[:args])
+          sleep(0.2) # busy loopしないように
         end
       end
 
       return self
     end
 
+    def work(job_class: , args: )
+      begin
+        job_class.perform(*args)
+      rescue => e
+        ProconBypassMan.logger.error(e)
+        if job_class.respond_to?(:re_enqueue_if_failed) && job_class.re_enqueue_if_failed
+          job_class.perform_async(args)
+          ProconBypassMan.logger.error("エラーが起きたので#{job_class}を積み直しました。")
+        end
+      end
+    end
+
     # 重要な非同期ジョブは存在しないのでqueueが捌けるのを待たずにkill
     def shutdown
       @thread&.kill

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.2'
   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.2'
   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.2
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pbmenv
@@ -95,10 +95,12 @@ 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
+- docs/setting/splatoon3_macro_forward_ikarole.md
+- docs/setting/splatoon3_recommended_setting.md
 - docs/setup_raspi.md
 - docs/setup_raspi.mitamae.rb
 - docs/setup_raspi_by_mitamae.md
@@ -107,7 +109,6 @@ files:
 - lib/ext/module.rb
 - lib/procon_bypass_man.rb
 - lib/procon_bypass_man/background.rb
-- lib/procon_bypass_man/background/job_performer.rb
 - lib/procon_bypass_man/background/job_queue.rb
 - lib/procon_bypass_man/background/jobs/base_job.rb
 - lib/procon_bypass_man/background/jobs/concerns/has_external_api_setting.rb
@@ -161,15 +162,25 @@ 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
 - lib/procon_bypass_man/plugin/splatoon2/macro/sokuwari_for_splash_bomb.rb
 - lib/procon_bypass_man/plugin/splatoon2/mode/guruguru.rb
 - lib/procon_bypass_man/plugin/splatoon2/version.rb
+- lib/procon_bypass_man/plugin/splatoon3/macro/charge_tansan_bomb.rb
+- lib/procon_bypass_man/plugin/splatoon3/macro/fast_return.rb
+- lib/procon_bypass_man/plugin/splatoon3/macro/forward_ikarole.rb
+- lib/procon_bypass_man/plugin/splatoon3/macro/jump_to_left_key.rb
+- lib/procon_bypass_man/plugin/splatoon3/macro/jump_to_right_key.rb
+- lib/procon_bypass_man/plugin/splatoon3/macro/jump_to_up_key.rb
+- lib/procon_bypass_man/plugin/splatoon3/macro/sokuwari_for_splash_bomb.rb
+- lib/procon_bypass_man/plugin/splatoon3/mode/guruguru.rb
+- lib/procon_bypass_man/plugin/splatoon3/version.rb
 - lib/procon_bypass_man/plugins.rb
 - lib/procon_bypass_man/processor.rb
 - lib/procon_bypass_man/procon.rb
@@ -194,6 +205,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 +244,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/background/job_performer.rb

@@ -1,15 +0,0 @@
-module ProconBypassMan
-  module Background
-    class JobPerformer
-      def initialize(klass: , args: )
-        @klass = klass
-        @args = args
-      end
-
-      # @raise [any]
-      def perform
-        @klass.perform(*@args)
-      end
-    end
-  end
-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