procon_bypass_man 0.1.4 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8326aa72e03d6b2b8ebe7342778c357ba7595019617683e075694c93d870960c
-  data.tar.gz: fc1df85f7d880ec11c8b5f7d47d46c1a21e726d862cc18000310571e8a072011
+  metadata.gz: 3f5d2c0b9137168508351ca8a1492470cd1f03c31d7eb920010a32f08f92122e
+  data.tar.gz: c7f42dd711cb3d8932a8fd6d99ee0735084618411e6cd723eeee8860ca96cd8c
 SHA512:
-  metadata.gz: bc6aeb40ae12912216e0c40e4b538ab0337ef963c0bcc8e3ac46bafa858a56f44d140f8db694c2200eb1444bf53edf2e49ebc80e9ee63073af29287e556fcd7a
-  data.tar.gz: bdcb9405fe592e390073e70c2b7eb75d9336bf5f26a6ab08dc1db768e45217103abee62c06eb1dc847d80ff03a600135a0a8b3b41564d1ca68f5161b484df60a
+  metadata.gz: 71a45ddf739c64355197e1a0610d2441eb6445eb6d77eef8fd9cf711265d0a9fc23dfcf2d75075115bf1e546141fec7eab0e20c6469feff6b7dea238d4916951
+  data.tar.gz: 1bb4bc56c9310d94d682454b33c3d28ebc0a45753ee292c98cdee47bc94b3400c50ddbbb9c1f08b17ade330829760b4dbc1eef85ea22faf1aa8f9271e1b53e0f

data/.circleci/config.yml

@@ -2,19 +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: 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/.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/.rubocop.yml

@@ -0,0 +1,24 @@
+AllCops:
+  NewCops: enable
+  SuggestExtensions: false
+  Include:
+    - 'lib/**/*.rb'
+    - 'spec/**/*.rb'
+Style:
+  Enabled: false
+
+Metrics:
+  Enabled: false
+    
+Layout:
+  Enabled: false
+
+Naming:
+  Enabled: false
+
+Lint/ConstantDefinitionInBlock:
+    Enabled: false
+Lint/UselessAssignment:
+    Enabled: false
+Lint/EmptyBlock:
+    Enabled: false

data/CHANGELOG.md

@@ -1,4 +1,22 @@
-## [0.1.4] - 2021-0
+## [0.1.8] - 2021-09-19
+-  使える場合、GC.auto_compactを有効にする
+
+## [0.1.7] - 2021-09-11
+- Support pbmenv
+
+## [0.1.6] - 2021-08-19
+- 設定ファイルを読み込むと内容のmd5を `pbm_root_dir/.setting_yaml_digest` へ出力するようにしました
+
+## [0.1.5] - 2021-07-29
+- siwtch, proコンが電源OFF時にCPU使いまくるのを修正した
+- 連打中に無視するボタンを複数登録できるようにした
+- キーのリマップ先に複数ボタンを登録できるようにした
+- 1つのボタンへ連打とリマップをできないようにしました
+    - NG ex)
+        - flip :zr, if_pressed: [:y]
+        - remap :zr, to: [:x]
+
+## [0.1.4] - 2021-07-11
 - ProconBypassMan.rootの定義を、gem rootからproject rootへ変更した
 - 連打の頻度を変更できるようにした
 - シグナルで設定ファイルを読み直すとpid_pathが消滅する不具合を修正した

data/Gemfile

@@ -9,3 +9,4 @@ gem "rake", "~> 13.0"
 gem "rspec"
 gem "pry"
 gem "timecop"
+gem "rubocop", require: false

data/Gemfile.lock

@@ -1,18 +1,25 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.1.4)
+    procon_bypass_man (0.1.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.2)
     coderay (1.1.3)
     diff-lcs (1.4.4)
     method_source (1.0.0)
+    parallel (1.20.1)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rake (13.0.3)
+    rainbow (3.0.0)
+    rake (13.0.6)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -26,19 +33,34 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
+    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.9.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.11.0)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
     timecop (0.9.4)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   arm-linux
   arm64-darwin-20
   armv7l-linux
+  x86_64-linux
 
 DEPENDENCIES
   procon_bypass_man!
   pry
   rake (~> 13.0)
   rspec
+  rubocop
   timecop
 
 BUNDLED WITH
-   2.2.20
+   2.2.15

data/README.md

@@ -17,20 +17,20 @@ 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を用意する
-  * https://github.com/splaspla-hacker/procon_bypass_man/blob/master/docs/setup_raspi.md
+  * https://github.com/splaplapla/procon_bypass_man/blob/master/docs/setup_raspi.md
 * Raspberry Pi4で https://github.com/jiikko/procon_bypass_man_sample をclone して実行ファイルを動かす
-  * 実行ファイルと設定ファイルについては https://github.com/splaspla-hacker/procon_bypass_man/wiki に詳細を書いていますが、まず動かすためにはcloneしたほうが早いです
+  * 実行ファイルと設定ファイルについては https://github.com/splaplapla/procon_bypass_man/wiki に詳細を書いていますが、まず動かすためにはcloneしたほうが早いです
 
 ## Plugins
-* https://github.com/splaspla-hacker/procon_bypass_man-splatoon2
+* https://github.com/splaplapla/procon_bypass_man-splatoon2
 
 ## FAQ
 * どうやって動かすの?
@@ -38,7 +38,7 @@ Switch <-- (PBM): ZR連打
 * どうやって使うの？
     * ケーブルでそれらを接続した状態で、Raspberry Pi4にsshして本プログラムを起動することで使用します
 * ラズベリーパイ4のセットアップ方法は？
-    * https://github.com/splaspla-hacker/procon_bypass_man/tree/master/docs/setup_raspi.md
+    * https://github.com/splaplapla/procon_bypass_man/tree/master/docs/setup_raspi.md
 * モード, マクロの違いは？
     * modeはProconの入力をそのまま再現するため機能。レイヤーを切り替えるまで繰り返し続ける
     * マクロは特定のキーを順番に入れていく機能。キーの入力が終わったらマクロは終了する
@@ -52,17 +52,16 @@ Switch <-- (PBM): ZR連打
     * 操作するdeviceファイルの所有者がrootだから
 
 ## TODO
-* 設定ファイルをwebから反映できる
-* ラズパイのプロビジョニングを楽にしたい
 * レコーディング機能(プロコンの入力をマクロとして登録ができる)
 * マクロにdelayを入れれるようにする
+* 設定ファイル マクロの引数に、ボタンを取れるようにする
 
 ## 開発系
 ```ruby
 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
-  pbm.root = File.expand_path(__dir__)
 end
 ```
 
@@ -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/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.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,48 @@
+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 '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

@@ -0,0 +1,14 @@
+# 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を接続し、プロコンとして認識していることを確認する
+* sudo gem i pbmenv
+* sudo pbmenv install latest

data/examples/practical/app.rb

@@ -8,8 +8,8 @@ require 'bundler/inline'
 
 gemfile do
   source 'https://rubygems.org'
-  gem 'procon_bypass_man', github: 'splaspla-hacker/procon_bypass_man', branch: "edge"
-  gem 'procon_bypass_man-splatoon2', github: 'splaspla-hacker/procon_bypass_man-splatoon2', branch: "0.1.0"
+  gem 'procon_bypass_man', github: 'splaplapla/procon_bypass_man', branch: "edge"
+  gem 'procon_bypass_man-splatoon2', github: 'splaplapla/procon_bypass_man-splatoon2', branch: "0.1.0"
 end
 
 ProconBypassMan.tap do |pbm|

data/lib/procon_bypass_man/configuration/layer.rb

@@ -16,7 +16,7 @@ module ProconBypassMan
         case if_pressed
         when TrueClass
           if_pressed = [button]
-        when Symbol
+        when Symbol, String
           if_pressed = [if_pressed]
         when Array, FalseClass
           # sono mama
@@ -25,8 +25,16 @@ module ProconBypassMan
         end
         hash = { if_pressed: if_pressed }
         if force_neutral
-          hash[:force_neutral] = force_neutral
+          case force_neutral
+          when TrueClass, FalseClass
+            raise "ボタンを渡してください"
+          when Symbol, String
+            hash[:force_neutral] = [force_neutral]
+          when Array
+            hash[:force_neutral] = force_neutral
+          end
         end
+
         if flip_interval
           if /\A(\d+)F\z/i =~ flip_interval
             interval =  ((frame = $1.to_i) / 60.0).floor(2)
@@ -35,17 +43,33 @@ module ProconBypassMan
           end
           hash[:flip_interval] = interval
         end
-        self.flips[button] = hash
+        if self.flips[button]
+          raise "#{button}への設定をすでに割り当て済みです"
+        else
+          self.flips[button] = hash
+        end
       end
 
       PRESET_MACROS = [:fast_return]
       def macro(name, if_pressed: )
-        self.macros[name] = { if_pressed: if_pressed }
+        if name.respond_to?(:name)
+          macro_name = name.name.to_sym
+        else
+          macro_name = name
+        end
+        self.macros[macro_name] = { if_pressed: if_pressed }
       end
 
       def remap(button, to: )
-        raise "シンボル以外は設定できません" unless to.is_a?(Symbol)
-        self.remaps[button] = to
+        case to
+        when TrueClass, FalseClass
+          raise "ボタンを渡してください"
+        when Symbol, String
+          self.remaps[button] = { to: [to] }
+        when Array
+          raise "ボタンを渡してください" if to.size.zero?
+          self.remaps[button] = { to: to }
+        end
       end
 
       # @return [Array]

data/lib/procon_bypass_man/configuration/loader.rb

@@ -1,24 +1,22 @@
 module ProconBypassMan
   class Configuration
     module Loader
+      require 'digest/md5'
+
       def self.load(setting_path: )
-        validation_instance = ProconBypassMan::Configuration.switch_context(:validation) do |instance|
-          begin
-            yaml = YAML.load_file(setting_path) or raise "読み込みに失敗しました"
-            instance.instance_eval(yaml["setting"])
-          rescue SyntaxError
-            instance.errors[:base] << "Rubyのシンタックスエラーです"
-            next(instance)
-          rescue Psych::SyntaxError
-            instance.errors[:base] << "yamlのシンタックスエラーです"
-            next(instance)
+        ProconBypassMan::Configuration.switch_new_context(:validation) do |validation_instance|
+          yaml = YAML.load_file(setting_path) or raise "読み込みに失敗しました"
+          validation_instance.instance_eval(yaml["setting"])
+          validator = Validator.new(validation_instance)
+          if validator.valid?
+            next
+          else
+            raise ProconBypassMan::CouldNotLoadConfigError, validator.errors
           end
-          instance.valid?
-          next(instance)
-        end
-
-        if !validation_instance.errors.empty?
-          raise ProconBypassMan::CouldNotLoadConfigError, validation_instance.errors
+        rescue SyntaxError
+          raise ProconBypassMan::CouldNotLoadConfigError, "Rubyのシンタックスエラーです"
+        rescue Psych::SyntaxError
+          raise ProconBypassMan::CouldNotLoadConfigError, "yamlのシンタックスエラーです"
         end
 
         yaml = YAML.load_file(setting_path)
@@ -33,6 +31,9 @@ module ProconBypassMan
           ProconBypassMan.logger.warn "不明なバージョンです。failoverします"
           ProconBypassMan::Configuration.instance.instance_eval(yaml["setting"])
         end
+
+        File.write(ProconBypassMan.digest_path, Digest::MD5.hexdigest(yaml["setting"]))
+
         ProconBypassMan::Configuration.instance
       end
 

data/lib/procon_bypass_man/configuration/validator.rb

@@ -1,13 +1,19 @@
 module ProconBypassMan
   class Configuration
-    module Validator
+    class Validator
+      def initialize(config)
+        @layers = config.layers
+        @prefix_keys = config.prefix_keys
+      end
+
       # @return [Boolean]
       def valid?
         @errors = Hash.new {|h,k| h[k] = [] }
-        if prefix_keys.empty?
-          @errors[:prefix_keys] ||= []
-          @errors[:prefix_keys] << "prefix_keys_for_changing_layerに値が入っていません。"
-        end
+
+        validate_require_prefix_keys
+        validate_config_of_button_lonely
+        validate_verify_button_existence
+        validate_flip_and_remap_are_hate_each_other
 
         @errors.empty?
       end
@@ -21,6 +27,65 @@ module ProconBypassMan
       def errors
         @errors ||= Hash.new {|h,k| h[k] = [] }
       end
+
+      private
+
+      def validate_config_of_button_lonely
+        @layers.each do |layer_key, value|
+          if ProconBypassMan::Procon::ModeRegistry::PRESETS.key?(value.mode)
+            next
+          else
+            if !value.flips.empty? || !value.macros.empty?
+              @errors[:layers] << "#{layer_key}でmodeを設定しているのでボタンの設定はできません。"
+            end
+          end
+        end
+      end
+
+      def validate_require_prefix_keys
+        if @prefix_keys.empty?
+          @errors[:prefix_keys] ||= []
+          @errors[:prefix_keys] << "prefix_keys_for_changing_layerに値が入っていません。"
+        end
+      end
+
+      def validate_verify_button_existence
+        @layers.each do |layer_key, value|
+          unverified_buttons = []
+          # teplevel target button
+          value.flips.keys.map(&:to_sym).each { |b| unverified_buttons << b }
+          value.remaps.keys.map(&:to_sym).each { |b| unverified_buttons << b }
+          # internal target button
+          value.flips.flat_map { |_flip_button, flip_option|
+            flip_option.flat_map { |flip_option_key, flip_option_target_button|
+              next if flip_option_key == :flip_interval
+              next if flip_option_target_button.is_a?(FalseClass) || flip_option_target_button.is_a?(TrueClass)
+              flip_option_target_button
+            }
+          }.compact.each { |b| unverified_buttons << b }
+          value.remaps.flat_map { |_button, option|
+            option.flat_map { |_flip_option_key, flip_option_target_button|
+              next if flip_option_target_button.is_a?(FalseClass) || flip_option_target_button.is_a?(TrueClass)
+              flip_option_target_button
+            }
+          }.compact.each { |b| unverified_buttons << b }
+          unless(nunsupport_buttons = (unverified_buttons - ProconBypassMan::Procon::ButtonCollection::BUTTONS)).length.zero?
+            @errors[:layers] << "#{layer_key}で存在しないボタン#{nunsupport_buttons.join(", ")}があります"
+          end
+        end
+      end
+
+      def validate_flip_and_remap_are_hate_each_other
+        @layers.each do |layer_key, value|
+          flip_buttons = []
+          remap_buttons = []
+          value.flips.keys.map(&:to_sym).each { |b| flip_buttons << b }
+          value.remaps.keys.map(&:to_sym).each { |b| remap_buttons << b }
+          if(duplicated_buttons = flip_buttons & remap_buttons).length > 0
+            @errors[:layers] << "レイヤー#{layer_key}で、連打とリマップの定義が重複しているボタン#{duplicated_buttons.join(", ")}があります"
+          end
+        end
+      end
     end
   end
 end

data/lib/procon_bypass_man/configuration.rb

@@ -4,7 +4,6 @@ require "procon_bypass_man/configuration/layer"
 
 module ProconBypassMan
   class Configuration
-    include Validator
 
     attr_accessor :layers,
       :setting_path,
@@ -19,13 +18,12 @@ module ProconBypassMan
       @@context[@@current_context_key] ||= new
     end
 
-    def self.switch_context(key)
-      @@context[key] ||= new
+    def self.switch_new_context(key)
+      @@context[key] = new
       previous_key = @@current_context_key
       if block_given?
         @@current_context_key = key
         value = yield(@@context[key])
-        @@context[key].reset!
         @@current_context_key = previous_key
         return value
       else
@@ -39,11 +37,16 @@ module ProconBypassMan
 
     MODES = [:manual]
     def layer(direction, mode: :manual, &block)
-      unless (MODES + ProconBypassMan::Procon::ModeRegistry.plugins.keys).include?(mode)
-        raise("#{mode} mode is unknown")
+      if mode.respond_to?(:name)
+        mode_name = mode.name.to_sym
+      else
+        mode_name = mode
+      end
+      unless (MODES + ProconBypassMan::Procon::ModeRegistry.plugins.keys).include?(mode_name)
+        raise("#{mode_name} mode is unknown")
       end
 
-      layer = Layer.new(mode: mode)
+      layer = Layer.new(mode: mode_name)
       layer.instance_eval(&block) if block_given?
       self.layers[direction] = layer
       self