procon_bypass_man 0.1.6 → 0.1.10

data/lib/procon_bypass_man.rb

@@ -1,39 +1,54 @@
 require "logger"
 require 'yaml'
+require "json"
+require "net/http"
 require "fileutils"
 
 require_relative "procon_bypass_man/version"
+require_relative "procon_bypass_man/callbacks"
+require_relative "procon_bypass_man/analog_stick_position"
 require_relative "procon_bypass_man/timer"
 require_relative "procon_bypass_man/bypass"
 require_relative "procon_bypass_man/device_connector"
 require_relative "procon_bypass_man/runner"
 require_relative "procon_bypass_man/processor"
 require_relative "procon_bypass_man/configuration"
+require_relative "procon_bypass_man/buttons_setting_configuration"
 require_relative "procon_bypass_man/procon"
+require_relative "procon_bypass_man/procon/debug_dumper"
+require_relative "procon_bypass_man/procon/analog_stick_cap"
+require_relative "procon_bypass_man/outbound/reporter"
+require_relative "procon_bypass_man/outbound/error_reporter"
+require_relative "procon_bypass_man/outbound/usb_hid_data_reporter"
+require_relative "procon_bypass_man/on_memory_cache"
 
 STDOUT.sync = true
 Thread.abort_on_exception = true
 
 module ProconBypassMan
+  extend ProconBypassMan::Configuration::ClassAttributes
+
   class ProConRejected < StandardError; end
   class CouldNotLoadConfigError < StandardError; end
   class FirstConnectionError < StandardError; end
   class EternalConnectionError < StandardError; end
 
-  def self.configure(setting_path: nil, &block)
+  def self.buttons_setting_configure(setting_path: nil, &block)
     unless setting_path
       logger.warn "setting_pathが未設定です。設定ファイルのライブリロードが使えません。"
     end
 
     if block_given?
-      ProconBypassMan::Configuration.instance.instance_eval(&block)
+      ProconBypassMan::ButtonsSettingConfiguration.instance.instance_eval(&block)
     else
-      ProconBypassMan::Configuration::Loader.load(setting_path: setting_path)
+      ProconBypassMan::ButtonsSettingConfiguration::Loader.load(setting_path: setting_path)
     end
   end
 
   def self.run(setting_path: nil, &block)
-    configure(setting_path: setting_path, &block)
+    ProconBypassMan.logger.info "PBMを起動しています"
+    puts "PBMを起動しています"
+    buttons_setting_configure(setting_path: setting_path, &block)
     File.write(pid_path, $$)
     Runner.new.run
   rescue CouldNotLoadConfigError
@@ -52,43 +67,21 @@ module ProconBypassMan
     retry
   end
 
-  def self.logger=(logger)
-    @@logger = logger
+  def self.configure(&block)
+    @@configuration = ProconBypassMan::Configuration.new
+    @@configuration.instance_eval(&block)
+    @@configuration
   end
 
-  def self.logger
-    if defined?(@@logger)
-      @@logger
-    else
-      Logger.new(nil)
-    end
-  end
-
-  def self.pid_path
-    @@pid_path ||= File.expand_path("#{root}/pbm_pid", __dir__).freeze
+  def self.config
+    @@configuration ||= ProconBypassMan::Configuration.new
   end
 
   def self.reset!
     ProconBypassMan::Procon::MacroRegistry.reset!
     ProconBypassMan::Procon::ModeRegistry.reset!
     ProconBypassMan::Procon.reset!
-    ProconBypassMan::Configuration.instance.reset!
+    ProconBypassMan::ButtonsSettingConfiguration.instance.reset!
     ProconBypassMan::IOMonitor.reset!
   end
-
-  def self.root
-    if defined?(@@root)
-      @@root
-    else
-      File.expand_path('..', __dir__).freeze
-    end
-  end
-
-  def self.root=(path)
-    @@root = path
-  end
-
-  def self.digest_path
-    "#{root}/.setting_yaml_digest"
-  end
 end

data/project_template/README.md

@@ -0,0 +1,17 @@
+# Project Template
+https://github.com/splaplapla/pbmenv で使っているファイルです
+
+## systemd
+* sudo ln -s /usr/share/pbm/current/systemd_units/pbm.service /etc/systemd/system/pbm.service
+* sudo ln -s /usr/share/pbm/current/systemd_units/pbm_web.service /etc/systemd/system/pbm_web.service
+* 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

@@ -0,0 +1,20 @@
+#!/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.9'
+  gem 'procon_bypass_man-splatoon2', github: 'splaplapla/procon_bypass_man-splatoon2', tag: "0.1.1"
+end
+
+ProconBypassMan.configure do |config|
+  config.root = File.expand_path(__dir__)
+  config.logger = Logger.new("#{ProconBypassMan.root}/app.log", 5, 1024 * 1024 * 10)
+  config.logger.level = :debug
+  # pbm.api_server = 'https://...'
+  config.enable_critical_error_logging!
+end
+
+ProconBypassMan.run(setting_path: "/usr/share/pbm/current/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 "/home/pi/.rbenv/versions/3.0.1/bin/ruby /usr/share/pbm/current/app.rb"
+Restart=always
+Nice=-19
+
+[Install]
+WantedBy=multi-user.target

data/project_template/systemd_units/pbm_web.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=PBM WEB
+
+[Service]
+Type=simple
+WorkingDirectory=/home/pi/src/procon_bypass_man_sample
+ExecStart=/bin/bash -c "/home/pi/.rbenv/versions/3.0.1/bin/ruby /usr/share/pbm/current/web.rb"
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

data/project_template/web.rb

@@ -0,0 +1,16 @@
+#!/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-web', '0.1.2'
+end
+
+ProconBypassMan::Web.configure do |config|
+  config.root = File.expand_path(__dir__)
+  config.logger = Logger.new("#{ProconBypassMan::Web.root}/web.log", 1, 1024 * 1024 * 10)
+end
+
+ProconBypassMan::Web::Server.start

data/sig/README.rb

@@ -0,0 +1,4 @@
+# SIG
+```
+bundle exec rbs prototype rb lib/**/*.rb > sig/main.rbs
+```