procon_bypass_man 0.1.20.2 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b74bbbe94f6c14a8e8cfbabb306e7229cab042ea9d5fae34ddfe134df0911528
-  data.tar.gz: b42ea9a421add0181270f5c957c9d10079598871634f5f20da8e7101349c981e
+  metadata.gz: 44670b11efa75a8b57df0580f3c796d65419ec87914d8458ab0fc426527fb58b
+  data.tar.gz: 883add3b8224f5490ba62ab2caabbb42b251a86197080bb7f8d3f219c89d465c
 SHA512:
-  metadata.gz: df4ce5c1fc721fe5aa06236a0909c143f49b3616b4c02ca4202f0de7519206a22f5de864e58e50390e47dfe631475cdf1a04c3b4e99ed492913825cf0315039f
-  data.tar.gz: 8fed8f7f1181bfb51b6b214984af09b0bc1d8b83573174fa276e97e857a0569affb14148aeabf52f0ba3b90cc30083548c191346649e8c534832fcba3b6aee25
+  metadata.gz: f9cf91dc93c58559217332670431f901a7eae8923476b26e63aca0908f52e3bdea1122df4fe00f533e80e556f91caa173c52dc27661c9ced4049fd7cbbc8f712
+  data.tar.gz: 17cf3cdaa06556ca4debb6ab7697a6946b6de69d197b8f9f217c1bd0786aa525c2fd8fb673ad81df089c08689bc8b238d1d8fbdea1b9c41a55684b32bca970db

data/.circleci/config.yml

@@ -96,7 +96,6 @@ build_jobs: &build_jobs
       matrix:
         parameters:
           ruby-version:
-            - "2.7"
             - "3.0.1"
             - "3.0.2"
             - "3.1.1"
@@ -104,7 +103,6 @@ build_jobs: &build_jobs
       matrix:
         parameters:
           ruby-version:
-            - "2.7"
             - "3.0.1"
             - "3.0.2"
             - "3.1.1"
@@ -112,7 +110,6 @@ build_jobs: &build_jobs
       matrix:
         parameters:
           ruby-version:
-            - "2.7"
             - "3.0.1"
             - "3.0.2"
             - "3.1.1"
@@ -122,7 +119,6 @@ build_jobs: &build_jobs
       matrix:
         parameters:
           ruby-version:
-            - "2.7"
             # - "3.0.1" # たまにSEGVするので
             - "3.0.2"
             - "3.1.1"
@@ -132,7 +128,6 @@ build_jobs: &build_jobs
       matrix:
         parameters:
           ruby-version:
-            - "2.7"
             - "3.0.1"
             - "3.0.2"
             - "3.1.1"

data/.github/workflows/ruby.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0.1']
+        ruby-version: ['3.0.1', '3.1.1']
 
     steps:
     - uses: actions/checkout@v2

data/.rspec

@@ -1 +1,2 @@
 --require spec_helper
+-f d

data/CHANGELOG.md

@@ -1,4 +1,19 @@
-## [0.1.20.2] - 2022-2-18
+## [0.1.21] - 2022-03-03
+- install_macro_pluginしていないマクロをlayer内で使うとクラッシュしていた問題を修正しました
+- 数十時間起動しっぱなしだとpbm-cloudとのwebsocketの接続が切断される問題を修正しました
+- 誤発動を防ぐために、マクロを無効にする設定ができるようになりました
+  - すべてのマクロを無効にする
+    - disable_macro :all
+    - disable_macro :all, if_pressed: [:a]
+  - 特定のマクロを無効にする
+    - disable_macro TheMacro
+    - disable_macro TheMacro, if_pressed: [:a]
+- スティックを傾けたタイミングでマクロを発動するオプションを実装しました
+  - これによってスプラトゥーン2の惰性キャンセルができるようになります
+      - ただし、精度がイマイチなので今後改善していきます
+  - 詳しくは `スプラトゥーン2: 惰性キャンセル マクロの設定方法` を参照してください
+
+## [0.1.20.2] - 2022-02-18
 - 起動時にreniceするようにしました
 - 起動時にusb gadgetモードを有効にするようにしました
 - pbm-cloudからprocon_bypass_manをアップグレードできるようになりました

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.1.20.2)
+    procon_bypass_man (0.1.21)
       action_cable_client
       pbmenv (>= 0.1.9)
       sorted_set

data/docs/getting_started.md

@@ -12,12 +12,12 @@
 * レイヤー
 * モード
 * マクロ
-* 左スティックの感度調整
+* [左スティックの感度調整](#左スティックの感度調整)
 * 設定ファイルの書き方
 * プラグインの書き方
-* 設定ファイルの書き方がわからない、エラーが起きるとき
+* [設定ファイルの書き方がわからない、エラーが起きるとき](#設定ファイルの書き方がわからない、エラーが起きるとき)
 * [procon_bypass_manのアップグレード方法](#procon_bypass_manのアップグレード方法)
-* procon_bypass_man_cloudについて
+* [procon_bypass_man_cloudについて](#procon_bypass_man_cloudについて)
 
 ## はじめに
 ### procon_bypass_manで解決したいこと
@@ -96,7 +96,7 @@ pbmenvを使っていない場合は、 https://github.com/splaplapla/procon_byp
 * 後で書きます
 
 ## 左スティックの感度調整
-* 後で書きます
+[左スティックの感度調整](/docs/setting/left-analogstick-cap.md)
 
 ## 設定ファイルの書き方
 * 後で書きます
@@ -106,11 +106,16 @@ pbmenvを使っていない場合は、 https://github.com/splaplapla/procon_byp
 
 ## 設定ファイルの書き方がわからない、エラーが起きるとき
 
-設定部分は、Rubyスクリプトになっているので構文エラーが起きることがあります。  
+設定ファイル(setting.yaml)は、内部がRubyスクリプトになっているので構文エラーが起きることがあります。  
 discordで質問してみてください。
 
 ## procon_bypass_manのアップグレード方法
-[/docs/upgrade_pbm.md](/docs/upgrade_pbm.md)
+[procon_bypass_manのアップグレード方法](/docs/upgrade_pbm.md)
 
 ## procon_bypass_man_cloudについて
-* 後で書きます
+https://pbm-cloud.herokuapp.com/  
+procon_bypass_man_cloudの運用をWEBで完結できるようになる無料のWEBサービスです。  
+  
+procon_bypass_man_cloudとの接続が完了後、Raspberry Piを起動時にprocon_bypass_man_cloudが自動で立ち上がるように設定すれば、Raspberry Piへのログインが不要で設定ファイルの変更やprocon_bypass_man_cloudのアップグレードができます。  
+セットアップ方法などでわからないことがあればdiscordで質問してみてください。  
+セットアップ方法は https://pbm-cloud.herokuapp.com/faq に書いています。

data/docs/setting/splatoon2_macro_dasei_cancel.md

@@ -0,0 +1,73 @@
+# スプラトゥーン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の内容を読み込んでいるはずです
+
+## 設定例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/buttons_setting_configuration/layer.rb

@@ -1,12 +1,13 @@
 module ProconBypassMan
   class ButtonsSettingConfiguration
     class Layer
-      attr_accessor :mode, :flips, :macros, :remaps, :left_analog_stick_caps, :disables
+      attr_accessor :mode, :flips, :macros, :disable_macros, :remaps, :left_analog_stick_caps, :disables
 
       def initialize(mode: :manual)
         self.mode = mode
         self.flips = {}
         self.macros = {}
+        self.disable_macros = []
         self.remaps = {}
         self.left_analog_stick_caps = []
         self.disables = []
@@ -54,18 +55,40 @@ module ProconBypassMan
       end
 
       # @param [String, Class] プラグインのclass
-      def macro(name, if_pressed: )
+      def macro(name, if_pressed: , if_tilted_left_stick: nil)
         macro_name = name.to_s.to_sym
-        self.macros[macro_name] = { if_pressed: if_pressed }
+        if ProconBypassMan::ButtonsSettingConfiguration.instance.macro_plugins[macro_name]
+          self.macros[macro_name] = { if_pressed: if_pressed, if_tilted_left_stick: if_tilted_left_stick }.compact
+        else
+          warn "#{macro_name}マクロがinstallされていません"
+        end
       end
 
       # 設定ファイルに直接マクロを打ち込める
       # @param [String, Class] macroの識別子
       # @paramh[Array<Symbol>] macroの本体. ボタンの配列
-      def open_macro(name, steps: , if_pressed: )
+      def open_macro(name, steps: , if_pressed: , if_tilted_left_stick: nil)
         macro_name = name || "OpenMacro-#{steps.join}".to_sym
         ProconBypassMan::Procon::MacroRegistry.install_plugin(macro_name, steps: steps)
-        self.macros[macro_name] = { if_pressed: if_pressed }
+        self.macros[macro_name] = { if_pressed: if_pressed, if_tilted_left_stick: if_tilted_left_stick }.compact
+      end
+
+      def disable_macro(name, if_pressed: nil)
+        hash = { name: name.to_s.to_sym, if_pressed: [] }
+        case if_pressed
+        when TrueClass, FalseClass
+          return # booleanはよくわからないのでreturn
+        when Symbol, String
+          hash[:if_pressed] = [if_pressed]
+        when Array
+          hash[:if_pressed] = if_pressed
+        when NilClass # 常に対象のmacroをdisableにする
+          hash[:if_pressed] = [true]
+        else
+          raise "not support value"
+        end
+
+        disable_macros << hash
       end
 
       def remap(button, to: )

data/lib/procon_bypass_man/buttons_setting_configuration.rb

@@ -65,7 +65,7 @@ module ProconBypassMan
       end
 
       unless ([ManualMode.name] + ProconBypassMan::Procon::ModeRegistry.plugins.keys).include?(mode_name)
-        raise("#{mode_name} mode is unknown")
+        warn "#{mode_name}モードがinstallされていません"
       end
 
       layer = Layer.new(mode: mode_name)

data/lib/procon_bypass_man/bypass.rb

@@ -1,5 +1,4 @@
 require "procon_bypass_man/bypass/usb_hid_logger"
-require "procon_bypass_man/bypass/bypass_mode"
 
 class ProconBypassMan::Bypass
   include ProconBypassMan::Bypass::UsbHidLogger

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

@@ -45,7 +45,7 @@ class ProconBypassMan::Domains::ProcessingProconBinary < ProconBypassMan::Domain
 
   # @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/domains.rb

@@ -4,6 +4,7 @@ module ProconBypassMan
   end
 end
 
+require_relative "domains/bypass_mode"
 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/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/plugins.rb

@@ -4,6 +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/mode/guruguru"
 
 module ProconBypassMan

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/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,30 +65,13 @@ 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
@@ -69,8 +88,14 @@ 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を破棄する
         return next_step
       else

data/lib/procon_bypass_man/procon/macro_builder.rb

@@ -56,7 +56,7 @@ class ProconBypassMan::Procon::MacroBuilder
 
   # @return [Arary<Symbol>]
   def build
-    steps = @steps.map { |step|
+    steps = @steps.flat_map { |step|
       if is_reserved?(step: step) || v1_format?(step: step)
         step.to_sym
       elsif value = build_if_v2_format?(step: step)
@@ -65,7 +65,8 @@ class ProconBypassMan::Procon::MacroBuilder
         nil
       end
     }
-    steps.compact.flatten
+
+    steps.compact
   end
 
   private
@@ -81,31 +82,40 @@ class ProconBypassMan::Procon::MacroBuilder
   end
 
   def build_if_v2_format?(step: )
-    # 時間指定なし
-    if(match = step.match(%r!\Atoggle_(\w+)\z!)) && (button_candidate = match[1]) && is_button(button_candidate)
-      button = button_candidate
-      return [button.to_sym, :none]
-    end
-
-    # 時間指定あり
-    if %r!^(pressing_|toggle_)! =~ step && (subjects = step.scan(%r!pressing_[^_]+|toggle_[^_]+!)) && (match = step.match(%r!_for_([\d_]+)(sec)?\z!))
-      sec = match[1]
-      return [
-        { continue_for: to_num(sec),
-          steps: SubjectMerger.merge(subjects.map { |x| Subject.new(x) }),
-        }
-      ]
-    end
-
     # no-op command
     if(match = step.match(%r!wait_for_([\d_]+)(sec)?\z!))
       sec = match[1]
       return [
-        { continue_for: to_num(sec),
+        { continue_for: to_f(sec),
           steps: [:none],
         }
       ]
     end
+
+    if %r!^(pressing_|toggle_)! =~ step && (subjects = step.scan(%r!pressing_[^_]+|toggle_[^_]+!)) && (match = step.match(%r!_for_([\d_]+)(sec)?\z!))
+      if sec = match[1]
+        return {
+          continue_for: to_f(sec),
+          steps: 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 }
+            else
+              is_button(x) || RESERVED_WORD_NONE == x
+            end
+          },
+        }
+      end
+    end
+
+    if %r!^(pressing_|toggle_)! =~ step && (subjects = step.scan(%r!pressing_[^_]+|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 }
+        else
+          is_button(x) || RESERVED_WORD_NONE == x
+        end
+      }
+    end
   end
 
   # @return [Boolean]
@@ -113,11 +123,11 @@ class ProconBypassMan::Procon::MacroBuilder
     !!ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP[step.to_sym]
   end
 
-  def to_num(value)
+  def to_f(value)
     if value.include?("_")
       value.sub("_", ".").to_f
     else
-      value.to_i
+      value.to_f
     end
   end
 end

data/lib/procon_bypass_man/procon/macro_registry.rb

@@ -13,9 +13,14 @@ class ProconBypassMan::Procon::MacroRegistry
     }
   end
 
+  # @return [ProconBypassMan::Procon::Macro]
   def self.load(name)
-    steps = PRESETS[name] || plugins[name].call || raise("unknown macro")
-    ProconBypassMan::Procon::Macro.new(name: name, steps: steps.dup)
+    if(steps = PRESETS[name] || plugins[name]&.call)
+      return ProconBypassMan::Procon::Macro.new(name: name, steps: steps.dup)
+    else
+      warn "installされていないマクロ(#{name})を使うことはできません"
+      return self.load(:null)
+    end
   end
 
   def self.reset!

data/lib/procon_bypass_man/procon/user_operation.rb

@@ -62,7 +62,7 @@ class ProconBypassMan::Procon::UserOperation
   # @param [Symbol] button
   # @return [Boolean]
   def pressing_button?(button)
-    ProconBypassMan::PressButtonAware.new(@binary.raw).pressing_button?(button)
+    pressing_all_buttons?([button])
   end
 
   # @param [Array<Symbol>] buttons

data/lib/procon_bypass_man/procon/value_objects/analog_stick.rb

@@ -1,6 +1,6 @@
 class ProconBypassMan::Procon::AnalogStick
   attr_accessor :neutral_position
-  attr_accessor :bin_x, :bin_y
+  attr_writer :bin_x, :bin_y
 
   def initialize(binary: )
     @neutral_position = ProconBypassMan::ButtonsSettingConfiguration.instance.neutral_position
@@ -13,18 +13,22 @@ class ProconBypassMan::Procon::AnalogStick
   end
 
   def abs_x
-    bin_x.to_i(2)
+    @bin_x.to_i(2)
   end
 
   def abs_y
-    bin_y.to_i(2)
+    @bin_y.to_i(2)
   end
 
   def relative_x
-    bin_x.to_i(2) - neutral_position.x
+    @bin_x.to_i(2) - neutral_position.x
   end
 
   def relative_y
-    bin_y.to_i(2) - neutral_position.y
+    @bin_y.to_i(2) - neutral_position.y
+  end
+
+  def relative_hypotenuse
+    Math.sqrt((relative_x**2) + (relative_y**2)).floor(6)
   end
 end

data/lib/procon_bypass_man/procon.rb

@@ -19,6 +19,7 @@ class ProconBypassMan::Procon
       ongoing_macro: MacroRegistry.load(:null),
       ongoing_mode: ModeRegistry.load(:manual),
     }
+    @@left_stick_tilting_power_scaler = ProconBypassMan::AnalogStickTiltingPowerScaler.new
   end
   reset!
 
@@ -38,6 +39,7 @@ class ProconBypassMan::Procon
     ProconBypassMan::ButtonsSettingConfiguration.instance.layers[current_layer_key]
   end
 
+  # 内部ステータスを書き換えるフェーズ
   def apply!
     layer_changer = ProconBypassMan::Procon::LayerChanger.new(binary: user_operation.binary)
     if layer_changer.change_layer?
@@ -46,10 +48,38 @@ class ProconBypassMan::Procon
       return
     end
 
-    if ongoing_macro.finished?
+    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 }
+    current_layer.disable_macros.each do |disable_macro|
+      if (disable_macro[:if_pressed] == [true] || user_operation.pressing_all_buttons?(disable_macro[:if_pressed]))
+        if disable_macro[:name] == :all
+          enable_all_macro = false
+        else
+          enable_macro_map[disable_macro[:name]] = false
+        end
+      end
+    end
+
+    if ongoing_macro.finished? && enable_all_macro
       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)
+          break
         end
       end
     end
@@ -88,7 +118,7 @@ class ProconBypassMan::Procon
     status
   end
 
-  # @return [ProconBypassMan::Domains::ProcessingProconBinary]
+  # @return [String]
   def to_binary
     if ongoing_mode.name != :manual
       return user_operation.binary.raw
@@ -143,14 +173,4 @@ class ProconBypassMan::Procon
 
     user_operation.binary.raw
   end
-
-  private
-
-  def method_missing(name)
-    if name.to_s =~ /\Apressed_[a-z]+\?\z/
-      user_operation.public_send(name)
-    else
-      super
-    end
-  end
 end

data/lib/procon_bypass_man/support/analog_stick_hypotenuse_tilting_power_scaler.rb

@@ -0,0 +1,59 @@
+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

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man/websocket/forever.rb

@@ -0,0 +1,47 @@
+module ProconBypassMan
+  module Websocket
+    class Forever
+      # 動作確認方法
+      # - 10秒ごとにrefreshするのでタイムアウトは起きない
+      #   - ProconBypassMan::Websocket::Forever.run { loop { puts(:hi); sleep(10); ProconBypassMan::Websocket::Watchdog.active!  } }
+      # - タイムアウトが起きること
+      #   - ProconBypassMan::Websocket::Forever.run { puts(:hi); sleep(3000);  }
+      # - ブロックを1回評価するとThreadが死ぬので100秒後にタイムアウトが起きること
+      #   - ProconBypassMan::Websocket::Forever.run { puts(:hi); sleep(10); ProconBypassMan::Websocket::Watchdog.active!  }
+      def self.run(&block)
+        loop do
+          new.run(&block)
+        end
+      end
+
+      def run(&block)
+        raise("need a block") unless block_given?
+
+        ws_thread = work_one(callable: block)
+        wait_and_kill_if_outdated(ws_thread)
+      end
+
+      # @return [Thread]
+      def work_one(callable: )
+        Thread.start do
+          callable.call
+        rescue => e
+          ProconBypassMan.logger.error("websocket client with forever: #{e.full_message}")
+        end
+      end
+
+      def wait_and_kill_if_outdated(thread)
+        loop do
+          if Watchdog.outdated?
+            Watchdog.active!
+            ProconBypassMan.logger.error("watchdog timeout!!")
+            thread.kill
+            return
+          end
+
+          sleep(10)
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/websocket/pbm_job_client.rb

@@ -7,12 +7,7 @@ module ProconBypassMan
         return unless ProconBypassMan.config.enable_ws?
 
         Thread.start do
-          loop do
-            run
-          rescue => e
-            ProconBypassMan.logger.error("websocket client: #{e.full_message}")
-            retry
-          end
+          Forever.run { run }
         end
       end
 
@@ -55,6 +50,8 @@ module ProconBypassMan
             sleep 2
           }
           client.pinged { |msg|
+            Watchdog.active!
+
             ProconBypassMan.cache.fetch key: 'ws_pinged', expires_in: 10 do
               ProconBypassMan.logger.info('websocket client: pinged!!')
               ProconBypassMan.logger.info(msg)

data/lib/procon_bypass_man/websocket/watchdog.rb

@@ -0,0 +1,19 @@
+module ProconBypassMan
+  module Websocket
+    class Watchdog
+      def self.outdated?
+        @@time < Time.now
+      end
+
+      def self.time
+        @@time
+      end
+
+      def self.active!
+        @@time = Time.now + 100
+      end
+
+      active!
+    end
+  end
+end

data/lib/procon_bypass_man.rb

@@ -25,11 +25,12 @@ require_relative "procon_bypass_man/support/report_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/server_pool"
+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/background"
 require_relative "procon_bypass_man/commands"
 require_relative "procon_bypass_man/bypass"
 require_relative "procon_bypass_man/domains"
-require_relative "procon_bypass_man/never_exit_accidentally"
 require_relative "procon_bypass_man/device_connector"
 require_relative "procon_bypass_man/device_procon_finder"
 require_relative "procon_bypass_man/device_status"
@@ -47,6 +48,8 @@ require_relative "procon_bypass_man/remote_pbm_action/value_objects/remote_pbm_a
 require_relative "procon_bypass_man/scheduler"
 require_relative "procon_bypass_man/plugins"
 require_relative "procon_bypass_man/websocket/pbm_job_client"
+require_relative "procon_bypass_man/websocket/watchdog"
+require_relative "procon_bypass_man/websocket/forever"
 
 STDOUT.sync = true
 Thread.abort_on_exception = true

data/project_template/app.rb

@@ -5,7 +5,7 @@ require 'bundler/inline'
 gemfile do
   source 'https://rubygems.org'
   git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-  gem 'procon_bypass_man', '0.1.20.2'
+  gem 'procon_bypass_man', '0.1.21'
 end
 
 ProconBypassMan.configure do |config|

data/sig/main.rbs

@@ -531,6 +531,26 @@ module ProconBypassMan
   end
 end
 
+class ProconBypassMan::BypassMode
+  TYPE_NORMAL: ::Symbol
+
+  TYPE_AGGRESSIVE: ::Symbol
+
+  TYPES: ::Array[::Symbol]
+
+  DEFAULT_GADGET_TO_PROCON_INTERVAL: ::Float
+
+  attr_accessor mode: ::Symbol
+
+  attr_accessor gadget_to_procon_interval: ::Float
+
+  def self.default_value: () -> ::ProconBypassMan::BypassMode
+
+  def initialize: (mode: ::Symbol mode, gadget_to_procon_interval: ::Float gadget_to_procon_interval) -> void
+
+  def to_s: () -> ::String
+end
+
 class ProconBypassMan::Domains::Binary::Base
   # @param [String] binary
   def initialize: (binary: untyped binary) -> void

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.1.20.2
+  version: 0.1.21
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-19 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pbmenv
@@ -79,6 +79,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_sokuwari_bubble.md
 - docs/setting/splatoon2_recommended_setting.md
 - docs/setup_raspi.md
@@ -110,7 +111,6 @@ files:
 - lib/procon_bypass_man/buttons_setting_configuration/loader.rb
 - lib/procon_bypass_man/buttons_setting_configuration/validator.rb
 - lib/procon_bypass_man/bypass.rb
-- lib/procon_bypass_man/bypass/bypass_mode.rb
 - lib/procon_bypass_man/bypass/usb_hid_logger.rb
 - lib/procon_bypass_man/commands.rb
 - lib/procon_bypass_man/commands/bypass_command.rb
@@ -132,8 +132,9 @@ files:
 - lib/procon_bypass_man/domains/binary/has_mutable_binary.rb
 - lib/procon_bypass_man/domains/binary/inbound_procon_binary.rb
 - lib/procon_bypass_man/domains/binary/processing_procon_binary.rb
+- lib/procon_bypass_man/domains/bypass_mode.rb
 - lib/procon_bypass_man/io_monitor.rb
-- lib/procon_bypass_man/never_exit_accidentally.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/jump_to_left_key.rb
 - lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_right_key.rb
@@ -168,9 +169,11 @@ 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/compress_array.rb
 - lib/procon_bypass_man/support/http_client.rb
+- lib/procon_bypass_man/support/never_exit_accidentally.rb
 - lib/procon_bypass_man/support/on_memory_cache.rb
 - lib/procon_bypass_man/support/report_http_client.rb
 - lib/procon_bypass_man/support/safe_timeout.rb
@@ -182,7 +185,9 @@ files:
 - lib/procon_bypass_man/support/yaml_writer.rb
 - lib/procon_bypass_man/usb_device_controller.rb
 - lib/procon_bypass_man/version.rb
+- lib/procon_bypass_man/websocket/forever.rb
 - lib/procon_bypass_man/websocket/pbm_job_client.rb
+- lib/procon_bypass_man/websocket/watchdog.rb
 - procon_bypass_man.gemspec
 - project_template/README.md
 - project_template/app.rb