procon_bypass_man 0.3.9 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9799933aa6f27812290fd75a4538b7ac0f334f548593a7365840c2a7256dd7ea
-  data.tar.gz: 7f8f101cc58b668d38297d220cfcdd06e650429bf1d8540e7f75d4cb66e374c9
+  metadata.gz: 7599b3687d6efc95875555ba97158421b94422f350b9bb049e80476aaffb9efa
+  data.tar.gz: fc62c5c839586c5149d89c3391bcaa0feb2bfbfa2662a0a20e6c9225a3a76c2b
 SHA512:
-  metadata.gz: 38af52cac3890ad462b1dfa99e2d8f278a74631561174a368789cb7ea779382c138baf17fd17ebf6eef815bdd40534af0618d811ee8bbd6c1907142ed06ddc94
-  data.tar.gz: 4b26dbfe8ac913f3cb957a8a93fdb535c8b9b3d8162a9c1837a9f3075390a54fbda3739f4986a91c84775ce633d7b0f1202320e3f7cf2903a8d79bcc9f3ec60d
+  metadata.gz: fd12efc1f2f10b8177177bd7aa179da834991939a4cd460d0b10b2e03c476482d5de747de588a98a05e917a0eef44bc17c58b1e14a699ea693a34cdff246be11
+  data.tar.gz: a60c477422fe598bb50cd0773e94a8de9fee9607a7bd32ffd7d25bc6ea466a930a6a9e311f2615ecf995d7d9b91fd9be599f52abce31f109200a6bf42fabe61e

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## unrelease
+* 起動時の安定性向上
+* systemd unit pbm.serviceのRestart=noにしました
+
+## [0.3.10] 2023-11-30
+* マクロを実行するとメモリ使用率が増え続ける不具合を修正しました
+
 ## [0.3.9] 2023-07-15
 * Lボタンを押すだけで簡単スニーキング(スプラ3)ができるようになりました
   * 例: `left_analog_stick_cap cap: 1100, if_pressed: [:l], combined_press_is_pressed: [:zl], force_neutral: [:l]`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.3.9)
+    procon_bypass_man (0.3.11)
       action_cable_client
       blue_green_process (= 0.1.4.2)
       pbmenv (>= 0.1.11)
@@ -56,7 +56,7 @@ GEM
     parallel (1.21.0)
     parser (3.0.3.2)
       ast (~> 2.4.1)
-    pbmenv (0.1.12)
+    pbmenv (0.1.13)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -147,7 +147,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
     webrick (1.7.0)
-    websocket (1.2.9)
+    websocket (1.2.10)
     websocket-eventmachine-base (1.2.0)
       eventmachine (~> 1.0)
       websocket (~> 1.0)

data/README.md

@@ -78,7 +78,7 @@ sudo kill -USR2 `cat ./pbm_pid`
   * `message = ProconBypassMan::BootMessage.new; ProconBypassMan::ReportBootJob.perform(body: message.to_hash)`
 
 ### リリース手順
-* project_template/web.rb, project_template/app.rb, lib/procon_bypass_man/version.rb のバージョンをあげる
+* project_template/app.rb.erb, lib/procon_bypass_man/version.rb のバージョンをあげる
 * CHANGELOG.md に日付を書く
 * be rake release
 * githubのreleaseを作成する

data/bin/generate_output_report

@@ -8,11 +8,4 @@ require "pry"
 # Usage:
 #  $ `generate_output_report x zl y` のように、引数にボタン名を渡す
 
-no_action_binary = ["30f28100800078c77448287509550274ff131029001b0022005a0271ff191028001e00210064027cff1410280020002100000000000000000000000000000000"].pack("H*")
-user_operation = ProconBypassMan::Procon::UserOperation.new(no_action_binary)
-
-ARGV.map { |x| x.to_sym }.each do |button|
-  user_operation.press_button(button)
-end
-
-puts user_operation.binary.unpack.first
+puts OutputReportGenerator.new(ARGV).execute

data/docs/setup_raspi_by_mitamae.md

@@ -5,15 +5,15 @@
     * sshをできる状態で焼いておく
 * SDカードをRaspberry Pi4本体に挿して起動する
 * sshする
-* wget -O - "https://github.com/itamae-kitchen/mitamae/releases/latest/download/mitamae-armhf-linux.tar.gz" | tar xvz
-* wget https://raw.githubusercontent.com/splaplapla/procon_bypass_man/master/docs/setup_raspi.mitamae.rb -O setup_raspi.mitamae.rb
-* sudo ./mitamae-armhf-linux local setup_raspi.mitamae.rb -l debug
-* sudo reboot
-* sudo sh /usr/share/pbm/shared/add_procon_gadget.sh の実行する
+* `wget -O - "https://github.com/itamae-kitchen/mitamae/releases/latest/download/mitamae-armhf-linux.tar.gz" | tar xvz`
+* `wget https://raw.githubusercontent.com/splaplapla/procon_bypass_man/master/docs/setup_raspi.mitamae.rb -O setup_raspi.mitamae.rb`
+* `sudo ./mitamae-armhf-linux local setup_raspi.mitamae.rb -l debug`
+* `sudo reboot`
+* `sudo sh /usr/share/pbm/shared/add_procon_gadget.sh` の実行する
   * 何も表示されなければOK
 * PCとRaspberry Pi4を接続し、プロコンとして認識していることを確認する
-* sudo gem i pbmenv
-* sudo pbmenv install latest
+* `sudo gem i pbmenv`
+* `sudo pbmenv install latest`
 
 Raspberry Piのセットアップは以上です。  
 次は、SwitchとRaspberry Piとプロコンにケーブルを接続した上で、次のコマンドをshellに入力し、procon_bypass_manの動作確認を行なってください。  

data/lib/procon_bypass_man/device_connection/command.rb

@@ -5,7 +5,7 @@ class ProconBypassMan::DeviceConnection::Command
   def self.execute!(retry_count: 0)
     begin
       gadget, procon = ProconBypassMan::DeviceConnection::Executer.execute!
-    rescue ProconBypassMan::DeviceConnection::TimeoutErrorInConditionalRoute
+    rescue ProconBypassMan::DeviceConnection::TimeoutErrorInConditionalRoute, ProconBypassMan::SafeTimeout::Timeout
       if retry_count >= MAX_RETRY_COUNT
         ProconBypassMan::SendErrorCommand.execute(error: "リトライしましたが、接続できませんでした")
         raise ProconBypassMan::DeviceConnection::TimeoutError
@@ -17,8 +17,6 @@ class ProconBypassMan::DeviceConnection::Command
       retry
     rescue ProconBypassMan::DeviceConnection::NotFoundProconError => e
       raise
-    rescue ProconBypassMan::SafeTimeout::Timeout
-      raise ProconBypassMan::DeviceConnection::TimeoutError
     end
 
     ProconBypassMan::DeviceConnection::PreBypass.new(gadget: gadget, procon: procon).execute!

data/lib/procon_bypass_man/device_connection/executor.rb

@@ -113,6 +113,7 @@ class ProconBypassMan::DeviceConnection::Executer
     end
   rescue ProconBypassMan::SafeTimeout::Timeout, Timeout::Error => e
     ProconBypassMan.logger.error "timeoutになりました(#{e.message})"
+    procon.write_nonblock(['8006'].pack("H*")) # 再実行時のケーブルの再接続を不要にするワークアラウンド. リセットしているらしい
     compressed_buffer_text = ProconBypassMan::CompressArray.new(debug_log_buffer).compress.join("\n")
     ProconBypassMan::SendErrorCommand.execute(error: compressed_buffer_text, stdout: false)
     raise ProconBypassMan::SafeTimeout::Timeout if @throw_error_if_timeout

data/lib/procon_bypass_man/device_connection/procon_setting_overrider.rb

@@ -2,7 +2,6 @@ class ProconBypassMan::DeviceConnection::ProconSettingOverrider
   attr_accessor :procon, :output_report_watcher, :output_report_generator
 
   SUB_COMMAND_HOME_LED_ON = "38"
-  SUB_COMMAND_VIBRATION = "48"
 
   SUB_COMMAND_ARG_HOME_LED_ON = "1FF0FF"
 

data/lib/procon_bypass_man/procon/value_objects/binary/base.rb

@@ -4,7 +4,7 @@ class ProconBypassMan::Domains::Binary::Base
     @binary = binary
   end
 
-  # @return [String] バイナリ
+  # @return [String]
   def binary
     raise NotImplementedError
   end

data/lib/procon_bypass_man/procon.rb

@@ -9,7 +9,6 @@ class ProconBypassMan::Procon
   require "procon_bypass_man/procon/value_objects/rumble_binary"
   require "procon_bypass_man/procon/value_objects/binary"
   require "procon_bypass_man/procon/value_objects/bypass_mode"
-  require "procon_bypass_man/procon/consts"
   require "procon_bypass_man/procon/performance_measurement"
   require "procon_bypass_man/procon/performance_measurement/queue_over_process"
   require "procon_bypass_man/procon/mode_registry"
@@ -215,6 +214,8 @@ class ProconBypassMan::Procon
       end
       user_operation.press_button_only_or_tilt_sticks(step)
       return user_operation.binary.raw
+    else
+      BlueGreenProcess::SharedVariable.extend_run_on_this_process = false
     end
 
     current_layer.disables.each do |button|

data/lib/procon_bypass_man/support/output_report_generator.rb

@@ -0,0 +1,18 @@
+class OutputReportGenerator
+  NO_ACTION = ["30f28100800078c77448287509550274ff131029001b0022005a0271ff191028001e00210064027cff1410280020002100000000000000000000000000000000"].pack("H*").freeze
+
+  # @param [Array<Symbol, String>, NilClass] pressed_buttons
+  def initialize(*pressed_buttons)
+    @buttons = pressed_buttons || []
+  end
+
+  # @return [String]
+  def execute
+    user_operation = ProconBypassMan::Procon::UserOperation.new(NO_ACTION.dup)
+    [@buttons].flatten.sort.uniq.each do |button|
+      user_operation.press_button(button.to_sym)
+    end
+
+    user_operation.binary.unpack.first
+  end
+end

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man.rb

@@ -46,6 +46,7 @@ require_relative "procon_bypass_man/support/watchdog"
 require_relative "procon_bypass_man/support/forever"
 require_relative "procon_bypass_man/support/simple_tcp_server"
 require_relative "procon_bypass_man/support/proccess_cheacker"
+require_relative "procon_bypass_man/support/output_report_generator"
 require_relative "procon_bypass_man/procon_display"
 require_relative "procon_bypass_man/background"
 require_relative "procon_bypass_man/commands"
@@ -73,7 +74,6 @@ Thread.abort_on_exception = true
 
 module ProconBypassMan
   extend ProconBypassMan::Configuration::ClassMethods
-  extend ProconBypassMan::NeverExitAccidentally
 
   class CouldNotLoadConfigError < StandardError; end
   class NotFoundProconError < StandardError; end

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.9'
+    gem 'procon_bypass_man', '0.3.11'
     # uncomment if you want to use master branch
     # gem 'procon_bypass_man', github: 'splaplapla/procon_bypass_man', branch: 'master'
     # uncomment if you want to use serial communication feature

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.9'
+    gem 'procon_bypass_man', '0.3.11'
     # uncomment if you want to use master branch
     # gem 'procon_bypass_man', github: 'splaplapla/procon_bypass_man', branch: 'master'
     # uncomment if you want to use serial communication feature

data/project_template/systemd_units/pbm.service

@@ -6,7 +6,7 @@ After=network.target
 Type=simple
 WorkingDirectory=/usr/share/pbm/current
 ExecStart=/bin/bash -c "/home/pi/.rbenv/versions/3.0.1/bin/ruby /usr/share/pbm/current/app.rb"
-Restart=always
+Restart=no
 Nice=-20
 
 [Install]

data/sig/main.rbs

@@ -339,12 +339,6 @@ class ProconBypassMan::Procon::ButtonCollection
   def self.load: (untyped button_key) -> untyped
 end
 
-class ProconBypassMan::Procon
-  module Data
-    NO_ACTION: untyped
-  end
-end
-
 class ProconBypassMan::Procon
   class FlipCache
     def self.fetch: (key: untyped key, expires_in: untyped expires_in) { () -> untyped } -> untyped

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.11
 platform: ruby
 authors:
 - jiikko
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-15 00:00:00.000000000 Z
+date: 2023-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: action_cable_client
@@ -216,7 +216,6 @@ files:
 - lib/procon_bypass_man/procon/analog_stick_manipulator.rb
 - lib/procon_bypass_man/procon/button.rb
 - lib/procon_bypass_man/procon/button_collection.rb
-- lib/procon_bypass_man/procon/consts.rb
 - lib/procon_bypass_man/procon/flip_cache.rb
 - lib/procon_bypass_man/procon/layer_changer.rb
 - lib/procon_bypass_man/procon/macro.rb
@@ -284,6 +283,7 @@ files:
 - lib/procon_bypass_man/support/load_agv.rb
 - lib/procon_bypass_man/support/never_exit_accidentally.rb
 - lib/procon_bypass_man/support/on_memory_cache.rb
+- lib/procon_bypass_man/support/output_report_generator.rb
 - lib/procon_bypass_man/support/proccess_cheacker.rb
 - lib/procon_bypass_man/support/procon_performance_http_client.rb
 - lib/procon_bypass_man/support/remote_macro_http_client.rb
@@ -323,7 +323,7 @@ metadata:
   homepage_uri: https://github.com/splaplapla/procon_bypass_man
   source_code_uri: https://github.com/splaplapla/procon_bypass_man
   changelog_uri: https://github.com/splaplapla/procon_bypass_man/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -338,8 +338,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: A programmable converter for Nintendo Switch Pro Controller
 test_files: []

data/lib/procon_bypass_man/procon/consts.rb

@@ -1,5 +0,0 @@
-class ProconBypassMan::Procon
-  module Consts
-    NO_ACTION = "30f28100800078c77448287509550274ff131029001b0022005a0271ff191028001e00210064027cff1410280020002100000000000000000000000000000000".freeze
-  end
-end