procon_bypass_man 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59fe04b1f616674f3f4a500fbc0abf1dce166482b2e7c880e94d0247a7162877
-  data.tar.gz: 55217706d204a06777fb9c9bfe87a64113dc2bdcfd0efa1079e79afc266690ce
+  metadata.gz: 3f5d2c0b9137168508351ca8a1492470cd1f03c31d7eb920010a32f08f92122e
+  data.tar.gz: c7f42dd711cb3d8932a8fd6d99ee0735084618411e6cd723eeee8860ca96cd8c
 SHA512:
-  metadata.gz: 1c57e7ca180ec142258a4725197e928cf073358743c8e98a78cbd87c4419b05f47859d97428f86dabcaee68f7856596a697a9f211b1f928efd3bb88b9a840c2a
-  data.tar.gz: fa60bd01934dc80f811bd8871ba256c2cc70fb6cc6cbaa33fd180922fdde5bc70476234d00ce28303acb37229cace8137de540e29483af9d7dce926cd7e75fc6
+  metadata.gz: 71a45ddf739c64355197e1a0610d2441eb6445eb6d77eef8fd9cf711265d0a9fc23dfcf2d75075115bf1e546141fec7eab0e20c6469feff6b7dea238d4916951
+  data.tar.gz: 1bb4bc56c9310d94d682454b33c3d28ebc0a45753ee292c98cdee47bc94b3400c50ddbbb9c1f08b17ade330829760b4dbc1eef85ea22faf1aa8f9271e1b53e0f

data/.github/workflows/ruby.yml

@@ -0,0 +1,33 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  [push]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.5', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rubocop
+      run: bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## [0.1.8] - 2021-09-19
+-  使える場合、GC.auto_compactを有効にする
+
 ## [0.1.7] - 2021-09-11
 - Support pbmenv
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.1.7)
+    procon_bypass_man (0.1.8)
 
 GEM
   remote: https://rubygems.org/
@@ -52,6 +52,7 @@ PLATFORMS
   arm-linux
   arm64-darwin-20
   armv7l-linux
+  x86_64-linux
 
 DEPENDENCIES
   procon_bypass_man!

data/Rakefile

@@ -1,4 +1,13 @@
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"
-task default: %i[]
+
+begin
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec)
+
+  task default: :spec
+rescue LoadError
+  # no rspec available
+end

data/docs/setup_raspi.mitamae.rb

@@ -41,5 +41,8 @@ execute "Initialize PBM" do
  SHELL
 end
 
-run_command 'systemctl disable triggerhappy'
-run_command 'systemctl disable bluetooth'
+run_command 'sudo systemctl disable triggerhappy.socket'
+run_command 'sudo systemctl disable triggerhappy.service'
+run_command 'sudo systemctl disable bluetooth'
+run_command 'sudo systemctl disable apt-daily-upgrade.timer'
+run_command 'sudo systemctl disable apt-daily.timer'

data/docs/setup_raspi_by_mitamae.md

@@ -10,4 +10,5 @@
 * sudo sh /usr/share/pbm/shared/add_procon_gadget.sh の実行に成功させる
 * /etc/rc.local に sh /usr/share/pbm/shared/add_procon_gadget.sh って書く
 * PCとRaspberry Pi4を接続し、プロコンとして認識していることを確認する
-* TOOD install pbmenv
+* sudo gem i pbmenv
+* sudo pbmenv install latest

data/lib/procon_bypass_man/device_connector.rb

@@ -37,16 +37,16 @@ class ProconBypassMan::DeviceConnector
       ["8005"],
       ["0010"],
     ], read_from: :switch)
-    # 1
+    # 1. Sends current connection status, and if the Joy-Con are connected,
     s.add([["8001"]], read_from: :switch)
     s.add([/^8101/], read_from: :procon) # <<< 81010003176d96e7a5480000000, macaddressとコントローラー番号を返す
-    # 2
+    # 2. Sends handshaking packets over UART to the Joy-Con or Pro Controller Broadcom chip. This command can only be called once per session.
     s.add([["8002"]], read_from: :switch)
     s.add([/^8102/], read_from: :procon)
     # 3
     s.add([/^0100/], read_from: :switch)
     s.add([/^21/], read_from: :procon)
-    # 4
+    # 4. Forces the Joy-Con or Pro Controller to only talk over USB HID without any timeouts. This is required for the Pro Controller to not time out and revert to Bluetooth.
     s.add([["8004"]], read_from: :switch)
     s.drain_all
     return [s.switch, s.procon]

data/lib/procon_bypass_man/runner.rb

@@ -1,4 +1,5 @@
 require_relative "io_monitor"
+require_relative "uptime"
 
 class ProconBypassMan::Runner
   class InterruptForRestart < StandardError; end
@@ -134,8 +135,6 @@ class ProconBypassMan::Runner
   end
 
   def first_negotiation
-    return if $will_terminate_token
-
     @gadget, @procon = ProconBypassMan::DeviceConnector.connect
   rescue ProconBypassMan::Timer::Timeout
     ::ProconBypassMan.logger.error "デバイスとの通信でタイムアウトが起きて接続ができませんでした。"
@@ -164,6 +163,7 @@ class ProconBypassMan::Runner
       root: #{ProconBypassMan.root}
       pid_path: #{ProconBypassMan.pid_path}
       setting_path: #{ProconBypassMan::Configuration.instance.setting_path}
+      uptime from boot: #{ProconBypassMan::Uptime.from_boot} sec
       ----
     EOF
     ProconBypassMan.logger.info(booted_message)

data/lib/procon_bypass_man/uptime.rb

@@ -0,0 +1,13 @@
+require "time"
+
+module ProconBypassMan
+  class Uptime
+    def self.from_boot
+      boot_time = Time.parse(`uptime -s`.chomp).to_i
+      return Time.now.to_i - boot_time.to_i
+    rescue => e
+      ProconBypassMan.logger.error(e)
+      return "error!"
+    end
+  end
+end

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man.rb

@@ -14,6 +14,11 @@ require_relative "procon_bypass_man/procon"
 STDOUT.sync = true
 Thread.abort_on_exception = true
 
+# new feature from ruby3.0's
+if GC.respond_to?(:auto_compact)
+  GC.auto_compact = true
+end
+
 module ProconBypassMan
   class ProConRejected < StandardError; end
   class CouldNotLoadConfigError < StandardError; end

data/project_template/README.md

@@ -3,13 +3,14 @@ https://github.com/splaplapla/pbmenv で使っているファイルです
 
 ## systemd
 * sudo ln -s /usr/share/pbm/current/systemd_units/pbm.service /etc/systemd/system/pbm.service
-* commnds
+* commands
   * systemctl daemon-reload
   * systemctl enable pbm.service
   * systemctl disable pbm.service
   * systemctl start pbm.service
   * systemctl status pbm.service
   * systemctl restart pbm.service
+  * systemctl list-unit-files --type=service
 
 ### ログ
 * journalctl -xe -f

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.7'
+  gem 'procon_bypass_man', '0.1.8'
   gem 'procon_bypass_man-splatoon2', github: 'splaplapla/procon_bypass_man-splatoon2', tag: "0.1.1"
 end
 
@@ -15,4 +15,4 @@ ProconBypassMan.tap do |pbm|
   pbm.logger.level = :debug
 end
 
-ProconBypassMan.run(setting_path: "./setting.yml")
+ProconBypassMan.run(setting_path: "/usr/share/pbm/current/setting.yml")

data/project_template/systemd_units/pbm.service

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - jiikko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-11 00:00:00.000000000 Z
+date: 2021-09-19 00:00:00.000000000 Z
 dependencies: []
 description: extension for Nintendo Switch Pro Controller
 email:
@@ -18,6 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -56,6 +57,7 @@ files:
 - lib/procon_bypass_man/procon/user_operation.rb
 - lib/procon_bypass_man/runner.rb
 - lib/procon_bypass_man/timer.rb
+- lib/procon_bypass_man/uptime.rb
 - lib/procon_bypass_man/version.rb
 - procon_bypass_man.gemspec
 - project_template/README.md