procon_bypass_man 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21149148015d5d8194ba9b0dc35fc1699ba1fe4eff6aaf1dd0956e0b35856e14
-  data.tar.gz: 6af893ef0a8ff0fdad56b53d9bd117f6cbd39ec7bdb5c216d44cf2d773b9974f
+  metadata.gz: 59fe04b1f616674f3f4a500fbc0abf1dce166482b2e7c880e94d0247a7162877
+  data.tar.gz: 55217706d204a06777fb9c9bfe87a64113dc2bdcfd0efa1079e79afc266690ce
 SHA512:
-  metadata.gz: 7185d5bf2246b3c1e2ae00eb08e170db017e78b7ed43fecde3757f2fc99bf1132f01b4e541ba669b9fc2ef39ee17e035368eabe7d4b973728c8ae49fd2873a0a
-  data.tar.gz: 6c3152904d3f4af9e3e3e4f519d4fbe3391cf7d727c3ee42966d9492672bb9ead227ce451e8b97088d8b5e27176e9427939009ff59873fac507cbdabeb7fa61a
+  metadata.gz: 1c57e7ca180ec142258a4725197e928cf073358743c8e98a78cbd87c4419b05f47859d97428f86dabcaee68f7856596a697a9f211b1f928efd3bb88b9a840c2a
+  data.tar.gz: fa60bd01934dc80f811bd8871ba256c2cc70fb6cc6cbaa33fd180922fdde5bc70476234d00ce28303acb37229cace8137de540e29483af9d7dce926cd7e75fc6

data/.circleci/config.yml

@@ -2,22 +2,46 @@ version: 2.1
 orbs:
   ruby: circleci/ruby@0.1.2 
 
-jobs:
-  build:
+executors:
+  ruby:
+    parameters:
+      tag:
+        type: string
+        default: "latest"
     docker:
-      - image: circleci/ruby:3.0.1
-    executor: ruby/default
+      - image: ruby:<< parameters.tag >>
+    environment:
+      BUNDLE_PATH: vendor/bundle
+      BUNDLE_JOBS: 4
+    working_directory: ~/app
+
+jobs:
+  rspec:
+    parameters:
+      version:
+        type: string
+    executor:
+      name: ruby
+      tag: << parameters.version >>
     steps:
       - checkout
-      - run:
-          name: install bundler
-          command: gem install bundler:2.2.20
-      - run:
-          name: bundle install
-          command: bundle install --jobs 4
-      - run:
-          name: rubocop
-          command: bundle exec rubocop
-      - run:
-          name: run test
-          command: bundle exec rspec
+      - run: ruby --version
+      - run: bundle --version
+      - run: gem --version
+      - run: gem install bundler
+      - run: bundle install --jobs 4
+      - run: bundle exec rubocop
+      - run: bundle exec rspec
+
+build_jobs: &build_jobs
+  - rspec:
+      matrix:
+        parameters:
+          version:
+            - "2.5"
+            - "2.7"
+            - "3.0"
+workflows:
+  version: 2
+  build:
+    jobs: *build_jobs

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## [0.1.7] - 2021-09-11
+- Support pbmenv
+
 ## [0.1.6] - 2021-08-19
 - 設定ファイルを読み込むと内容のmd5を `pbm_root_dir/.setting_yaml_digest` へ出力するようにしました
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.1.6)
+    procon_bypass_man (0.1.7)
 
 GEM
   remote: https://rubygems.org/
@@ -17,7 +17,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.3)
+    rake (13.0.6)
     regexp_parser (2.1.1)
     rexml (3.2.5)
     rspec (3.10.0)
@@ -33,16 +33,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.18.4)
+    rubocop (1.20.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.8.0, < 2.0)
+      rubocop-ast (>= 1.9.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.8.0)
+    rubocop-ast (1.11.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     timecop (0.9.4)
@@ -62,4 +62,4 @@ DEPENDENCIES
   timecop
 
 BUNDLED WITH
-   2.2.20
+   2.2.15

data/README.md

@@ -17,11 +17,11 @@ Switch <-- (PBM): ZR連打
 * Switch本体とドック
 * Raspberry Pi4 Model B/4GB(Raspberry Pi OS (32-bit))
     * 他のシリーズは未確認です
+        * zeroは非対応
 * データ通信が可能なUSBケーブル
 
 ## 使うソフトウェア
-* 必須
-  * ruby-3.0.x
+* ruby-3.0.x
 
 ## Usage
 * USBガジェットモードで起動するRaspberry Pi4を用意する
@@ -52,7 +52,6 @@ Switch <-- (PBM): ZR連打
     * 操作するdeviceファイルの所有者がrootだから
 
 ## TODO
-* ラズパイのプロビジョニングを楽にしたい
 * レコーディング機能(プロコンの入力をマクロとして登録ができる)
 * マクロにdelayを入れれるようにする
 * 設定ファイル マクロの引数に、ボタンを取れるようにする
@@ -71,6 +70,10 @@ end
 sudo kill -USR2 `cat ./pbm_pid`
 ```
 
+### リリース手順
+* project_template/app.rb, lib/procon_bypass_man/version.rb のバージョンをあげる
+* be rake release
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/docs/setup_raspi.md

@@ -13,7 +13,7 @@
       * /etc/dphys-swapfile を CONF_SWAPSIZE=1024 にする
       * sudo /etc/init.d/dphys-swapfile restart && swapon -s
   * tailscale をインストールする(optional)
-  * sudo apt-get install vim rbenv
+  * 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
@@ -22,20 +22,25 @@
 * sshkeyを作成する
 * github に鍵を登録する
 * ~/.ssh/authorized_keys に鍵を登録する
-* sudo pip3 install fluent-logger pytz
 * ガジェットモードで起動する
   * /boot/config.txtに、dtoverlay=dwc2を追記
-　* echo "dwc2" | sudo tee -a /etc/modules
-　* echo "libcomposite" | sudo tee -a /etc/modules
-　* sudo cat /etc/modules
+  * 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 の実行に成功させる
   *  /etc/rc.local に sh /home/pi/add_procon_gadget.sh って書く
-* cd ~ && mkdir -p src && cd ~/src && git clone https://github.com/jiikko/procon_bypass_man_sample && cd procon_bypass_man && sudo bundle install
+* 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 ruby app.rb を実行する
 
 ## 参考
 * https://mtosak-tech.hatenablog.jp/entry/2020/08/22/114622
+
+# TIPS
+* SDカードにイメージを焼くときは、ImagerのAdvanced Optionsを使うとセットアップが楽になる
+* raspios_liteにした方が起動が早くなりそう
+    * https://qiita.com/Liesegang/items/dcdc669f80d1bf721c21
+    * http://ftp.jaist.ac.jp/pub/raspberrypi/raspios_lite_armhf

data/docs/setup_raspi.mitamae.rb

@@ -0,0 +1,45 @@
+run_command "apt-get update"
+
+package 'ruby' do
+  action :install
+end
+
+package 'vim' do
+  action :install
+end
+
+package 'git' do
+  action :install
+end
+
+gem_package 'bundler' do
+  action :install
+end
+
+# OTG
+execute "append dtoverlay=dwc2 to /boot/config.txt" do
+  not_if "grep dtoverlay=dwc2 /boot/config.txt"
+  command "echo 'dtoverlay=dwc2' >> /boot/config.txt"
+end
+
+execute "append dwc2 to /etc/modules" do
+  not_if "grep dwc2 /etc/modules"
+  command "echo dwc2 >> /etc/modules"
+end
+
+execute "append libcomposite to /etc/modules" do
+  not_if "grep libcomposite /etc/modules"
+  command "echo libcomposite >> /etc/modules"
+end
+
+# PBM
+execute "Initialize PBM" do
+  command <<~SHELL
+    sudo mkdir -p /usr/share/pbm/shared
+    wget https://gist.githubusercontent.com/jiikko/3f9fb3194c0cc7685e31fbfcb5b5f9ff/raw/23ddee29d94350be80b79d290ac3c8ce8400bd88/add_procon_gadget.sh -O /usr/share/pbm/shared/add_procon_gadget.sh
+    chmod +x /usr/share/pbm/shared/add_procon_gadget.sh
+ SHELL
+end
+
+run_command 'systemctl disable triggerhappy'
+run_command 'systemctl disable bluetooth'

data/docs/setup_raspi_by_mitamae.md

@@ -0,0 +1,13 @@
+# Raspberry Pi4のセットアップ手順 With mitamae
+* SDカードにRaspberry Pi OS lite (32-bit)を焼く
+    * sshをできる状態で焼いておく
+* SDカードをRaspberry Pi4本体に挿して起動する
+* sshする
+* curl -L 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 の実行に成功させる
+* /etc/rc.local に sh /usr/share/pbm/shared/add_procon_gadget.sh って書く
+* PCとRaspberry Pi4を接続し、プロコンとして認識していることを確認する
+* TOOD install pbmenv

data/lib/procon_bypass_man/version.rb

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

data/project_template/README.md

@@ -0,0 +1,16 @@
+# Project Template
+https://github.com/splaplapla/pbmenv で使っているファイルです
+
+## systemd
+* sudo ln -s /usr/share/pbm/current/systemd_units/pbm.service /etc/systemd/system/pbm.service
+* commnds
+  * systemctl daemon-reload
+  * systemctl enable pbm.service
+  * systemctl disable pbm.service
+  * systemctl start pbm.service
+  * systemctl status pbm.service
+  * systemctl restart pbm.service
+
+### ログ
+* journalctl -xe -f
+

data/project_template/app.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+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-splatoon2', github: 'splaplapla/procon_bypass_man-splatoon2', tag: "0.1.1"
+end
+
+ProconBypassMan.tap do |pbm|
+  pbm.root = File.expand_path(__dir__)
+  pbm.logger = Logger.new("#{ProconBypassMan.root}/app.log", 5, 1024 * 1024 * 10)
+  pbm.logger.level = :debug
+end
+
+ProconBypassMan.run(setting_path: "./setting.yml")

data/project_template/setting.yml

@@ -0,0 +1,35 @@
+version: 1.0
+setting: |-
+  fast_return = ProconBypassMan::Splatoon2::Macro::FastReturn
+  guruguru = ProconBypassMan::Splatoon2::Mode::Guruguru
+
+  install_macro_plugin fast_return
+  install_macro_plugin ProconBypassMan::Splatoon2::Macro::JumpToUpKey
+  install_macro_plugin ProconBypassMan::Splatoon2::Macro::JumpToRightKey
+  install_macro_plugin ProconBypassMan::Splatoon2::Macro::JumpToLeftKey
+  install_mode_plugin guruguru
+
+  prefix_keys_for_changing_layer [:zr, :zl, :l]
+
+  layer :up, mode: :manual do
+    # flip :zr, if_pressed: :zr, force_neutral: :zl
+    flip :zr, if_pressed: :zr, force_neutral: :zl
+    flip :zl, if_pressed: [:y, :b, :zl]
+    flip :a, if_pressed: [:a]
+    flip :down, if_pressed: :down
+    macro fast_return.name, if_pressed: [:y, :b, :down]
+    macro ProconBypassMan::Splatoon2::Macro::JumpToUpKey, if_pressed: [:y, :b, :up]
+    macro ProconBypassMan::Splatoon2::Macro::JumpToRightKey, if_pressed: [:y, :b, :right]
+    macro ProconBypassMan::Splatoon2::Macro::JumpToLeftKey, if_pressed: [:y, :b, :left]
+    remap :l, to: :zr
+  end
+  layer :right, mode: guruguru.name
+  layer :left do
+  # flip :zr, if_pressed: :zr, force_neutral: :zl
+    remap :l, to: :zr
+  end
+  layer :down do
+    # flip :zl
+    # flip :zr, if_pressed: :zr, force_neutral: :zl, flip_interval: "1F"
+    remap :l, to: :zr
+  end

data/project_template/systemd_units/pbm.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=PBM
+After=network.target
+
+[Service]
+Type=simple
+WorkingDirectory=/usr/share/pbm/current
+ExecStart=/bin/bash -c "ruby /usr/share/pbm/current/app.rb"
+Restart=always
+Nice=-19
+
+[Install]
+WantedBy=multi-user.target

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - jiikko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2021-09-11 00:00:00.000000000 Z
 dependencies: []
 description: extension for Nintendo Switch Pro Controller
 email:
@@ -32,10 +32,10 @@ files:
 - bin/setup
 - docs/how_to_connect_procon.md
 - docs/setup_raspi.md
-- examples/pbm.service
+- docs/setup_raspi.mitamae.rb
+- docs/setup_raspi_by_mitamae.md
 - examples/practical/app.rb
 - examples/practical/setting.yml
-- examples/simple.rb
 - lib/procon_bypass_man.rb
 - lib/procon_bypass_man/bypass.rb
 - lib/procon_bypass_man/configuration.rb
@@ -58,6 +58,10 @@ files:
 - lib/procon_bypass_man/timer.rb
 - lib/procon_bypass_man/version.rb
 - procon_bypass_man.gemspec
+- project_template/README.md
+- project_template/app.rb
+- project_template/setting.yml
+- project_template/systemd_units/pbm.service
 homepage: https://github.com/splaplapla/procon_bypass_man
 licenses:
 - MIT

data/examples/pbm.service

@@ -1,27 +0,0 @@
-# sudo ln -s /home/pi/src/procon_bypass_man/examples/pbm.service /etc/systemd/system/pbm.service
-# Usage:
-#   systemctl daemon-reload
-#   systemctl enable pbm.service
-#   systemctl start pbm.service
-#   systemctl status pbm.service
-#   systemctl restart pbm.service
-# Debug:
-#   journalctl -xe -f
-# TODO:
-#   do not make PIDFILE
-
-[Unit]
-Description=PBM
-# After=network-online.target
-After=network.target
-
-[Service]
-Type=simple
-# PIDFile=/home/pi/src/procon_bypass_man/pbm_pid
-# WatchdogSec=60
-WorkingDirectory=/home/pi/src/procon_bypass_man
-ExecStart=/home/pi/.rbenv/versions/3.0.1/bin/ruby examples/practical/app.rb
-Restart=always
-
-[Install]
-WantedBy=multi-user.target

data/examples/simple.rb

@@ -1,13 +0,0 @@
-ProconBypassMan.run do
-  prefix_keys_for_changing_layer [:zr, :r, :zl, :l]
-
-  layer :up, mode: :manual do
-    flip :zr, if_pressed: :zr
-  end
-  layer :right
-  layer :left
-  layer :down do
-    flip :zl
-  end
-end
-