カウンターが1バイトをこえないようにする

Author: jiikko

Gemfile

@@ -5,5 +5,6 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in switch_connection_manager.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
+gem "rake"
 gem "rspec"
+gem "pry"

Gemfile.lock

@@ -6,7 +6,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.3)
     diff-lcs (1.5.0)
+    method_source (1.0.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rake (13.0.6)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
@@ -26,7 +31,8 @@ PLATFORMS
   arm64-darwin-20
 
 DEPENDENCIES
-  rake (~> 13.0)
+  pry
+  rake
   rspec
   switch_connection_manager!
 

README.md

@@ -25,7 +25,6 @@ TODO: Write usage instructions here
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 
 ## TODO:
-* procon_simulatorを起動するとバッテリーが動きまくるのを直す
 * PBMとプロコンをbluetoothで接続する
 * usb gadgetをresetしてからすぐにavailableになる時と、数秒開けないとavailableにならない時がある.
   * readとかすれば状態を認知できて適切なインターバルがわかるかも

lib/switch_connection_manager/procon_simulator.rb

@@ -124,12 +124,12 @@ def response(data)
   end
 
   def response_counter
+    @response_counter = @response_counter + 1
     if @response_counter >= 256
-      @response_counter = 0
+      @response_counter = "0"
     else
-      @response_counter = @response_counter + 1
+      @response_counter.to_s
     end
-    @response_counter.to_s.rjust(2, "0")
   end
 
   def write(data)

spec/procon_simulator_spec.rb

@@ -6,13 +6,12 @@
   let(:simulator) { described_class.new }
 
   describe '#response_counter' do
-    it '256の次は0になること' do
-      255.times do
+    it '255の次は0になること' do
+      254.times do
         simulator.send(:response_counter)
       end
-
-      expect(simulator.send(:response_counter)).to eq("256")
-      expect(simulator.send(:response_counter)).to eq("00")
+      expect(simulator.send(:response_counter)).to eq("255")
+      expect(simulator.send(:response_counter)).to eq("0")
     end
   end
 
@@ -72,26 +71,26 @@
         expect(simulator.read_once).to eq("0000")
         expect(simulator.read_once).to match("8101000300005e00535e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
         expect(simulator.read_once).to match("81020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-        expect(simulator.read_once).to match(/^21..#{initial_input}800300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-03
-          expect(simulator.read_once).to match(nil)
-        expect(simulator.read_once).to match(/^21..#{initial_input}804800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-48
-          expect(simulator.read_once).to match(/^21..#{initial_input}820203480302#{procon_mac_addr.reverse}030100000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-02
-          expect(simulator.read_once).to match(/^21..#{initial_input}800800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-08
-          expect(simulator.read_once).to match(/^21..#{initial_input}90100060000010ffffffffffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000/) # 01-10-0060, Serial number
-          expect(simulator.read_once).to match(/^21..#{initial_input}90105060000010bc114275a928ffffffffffffff00000000000000000000000000000000000000000000000000000000000000/) # Controller Color
-          expect(simulator.read_once).to match(/^21..#{initial_input}810103000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-01, Bluetooth manual pairing
-          expect(simulator.read_once).to match(/^21..#{initial_input}83040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-04, Trigger buttons elapsed time
-          expect(simulator.read_once).to match(/^21..#{initial_input}9010806000001050fd0000c60f0f30619630f3d41454411554c7799c333663000000000000000000000000000000000000000/) # 01-10-8060, Factory Sensor and Stick device parameters
-          expect(simulator.read_once).to match(/^21..#{initial_input}901098600000100f30619630f3d41454411554c7799c333663000000000000000000000000000000000000000000000000000/) # 01-10-9860, Factory Stick device parameters 2
-          expect(simulator.read_once).to match(/^21..#{initial_input}90101080000010ffffffffffffffffffffffffffffffffffffffffffffb2a1000000000000000000000000000000000000000/) # 01-10-1080, User Analog sticks calibration
-          expect(simulator.read_once).to be_nil # unkown
-        expect(simulator.read_once).to match(/^21..#{initial_input}90103d60000010ba156211b87f29065bffe77e0e36569e8560ff323232ffffff0000000000000000000000000000000000000/) # 01-10-3d60, Factory configuration & calibration 2
-          expect(simulator.read_once).to match(/^21..#{initial_input}90102880000010beff3e00f001004000400040fefffeff0800e73be73be73b000000000000000000000000000000000000000/) # 01-10-2880, User 6-Axis Motion Sensor calibration
-          expect(simulator.read_once).to match(/^21..#{initial_input}80400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-40
-          expect(simulator.read_once).to be_nil # unkown
-        expect(simulator.read_once).to match(/^21..#{initial_input}80480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-40
-          expect(simulator.read_once).to match(/^21..#{initial_input}80480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-40
-          expect(simulator.read_once).to match(/^21..#{initial_input}80300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-40
+        expect(simulator.read_once).to match(/^21.#{initial_input}8003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-03
+        expect(simulator.read_once).to match(nil)
+        expect(simulator.read_once).to match(/^21.#{initial_input}804800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-48
+        expect(simulator.read_once).to match(/^21.#{initial_input}820203480302#{procon_mac_addr.reverse}0301000000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-02
+        expect(simulator.read_once).to match(/^21.#{initial_input}8008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-08
+        expect(simulator.read_once).to match(/^21.#{initial_input}90100060000010ffffffffffffffffffffffffffffffff000000000000000000000000000000000000000000000000000000000/) # 01-10-0060, Serial number
+        expect(simulator.read_once).to match(/^21.#{initial_input}90105060000010bc114275a928ffffffffffffff000000000000000000000000000000000000000000000000000000000000000/) # Controller Color
+        expect(simulator.read_once).to match(/^21.#{initial_input}8101030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-01, Bluetooth manual pairing
+        expect(simulator.read_once).to match(/^21.#{initial_input}830400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-04, Trigger buttons elapsed time
+        expect(simulator.read_once).to match(/^21.#{initial_input}9010806000001050fd0000c60f0f30619630f3d41454411554c7799c3336630000000000000000000000000000000000000000/) # 01-10-8060, Factory Sensor and Stick device parameters
+        expect(simulator.read_once).to match(/^21..?#{initial_input}901098600000100f30619630f3d41454411554c7799c3336630000000000000000000000000000000000000000000000000000/) # 01-10-9860, Factory Stick device parameters 2
+        expect(simulator.read_once).to match(/^21..?#{initial_input}90101080000010ffffffffffffffffffffffffffffffffffffffffffffb2a10000000000000000000000000000000000000000/) # 01-10-1080, User Analog sticks calibration
+        expect(simulator.read_once).to be_nil # unkown
+        expect(simulator.read_once).to match(/^21..?#{initial_input}90103d60000010ba156211b87f29065bffe77e0e36569e8560ff323232ffffff00000000000000000000000000000000000000/) # 01-10-3d60, Factory configuration & calibration 2
+        expect(simulator.read_once).to match(/^21..?#{initial_input}90102880000010beff3e00f001004000400040fefffeff0800e73be73be73b0000000000000000000000000000000000000000/) # 01-10-2880, User 6-Axis Motion Sensor calibration
+        expect(simulator.read_once).to match(/^21..?#{initial_input}804000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-40
+        expect(simulator.read_once).to be_nil # unkown
+        expect(simulator.read_once).to match(/^21..?#{initial_input}804800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-40
+        expect(simulator.read_once).to match(/^21..?#{initial_input}804800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-40
+        expect(simulator.read_once).to match(/^21..?#{initial_input}803000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/) # 01-40
       end
     end
   end

spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require "pry"
 require "switch_connection_manager"
 
 # This file was generated by the `rspec --init` command. Conventionally, all