hidg0 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18bb1d1ce3cc1772d08c9174f3b74fa72854063298be6ff49179dfea00f60dc5
-  data.tar.gz: 44c366862cf4516459158d628b1ef2e7fc4e68fa48ca37dfec2cc60b0f9abfa8
+  metadata.gz: d0c91653b0bfe7b9f36b262a8f7dc434cd97e329a7bf6a63c4c5d027d8ec1e71
+  data.tar.gz: ab1c3db4a4d942e0dcfd75307633642ddb803a81811a69e9a28fd97161d500ac
 SHA512:
-  metadata.gz: 459c736b804d8b8c061fb85a8d5bb322c5dd6b246890dc7f9caf535d2dccfc15ffc2fc375e543e5baf72161b042747760065e0e589ed0caf6108547621781fd6
-  data.tar.gz: c104f3d0ec5e172a9c7c996f2e65e83b236cd840d1ed26105457bc70e9f62d27f7baf19ca9e7e04c6526fa34f2102a466601b0dd71d0adc32fa3cb7efeac242d
+  metadata.gz: d1e85d10a3450298718f0be33857266bb29b9702f4553c927c0475668e79c112ea936a4e1b81ae35f38a98ae70d2394d1adf8b9b35d4e96710abb2f6abb165ec
+  data.tar.gz: 2e9405866f8b02b21d9fa97ee32ac19b6f2aaa945fcb4528862cfd574978fea818045239e721c925708ca7ed8da24588ec3b18c42c910e18be1b6b34c3786134

data/lib/hidg0.rb

@@ -308,7 +308,7 @@ class HidG0
 
   def initialize(dev='/dev/hidg0', debug: false, humanspeed: true)
     @dev, @debug = dev, debug
-    @duration = humanspeed ? 0.3 : 0
+    @duration = humanspeed ? 0.22 : 0
   end
 
   def keypress(raw_key, duration: 0)
@@ -335,7 +335,7 @@ class HidG0
         
         # split by semicolon
         
-        x[1..-2].split(/\s*;\s*/).each do |instruction|
+        x[1..-2].split(/\s*[;,]\s*/).each do |instruction|
         
           if instruction =~ /\*\s*\d+/ then
             key, n = instruction.split('*',2)
@@ -425,18 +425,20 @@ class HidG0
   end
 
   def write_report(report)
-    open(@dev, 'wb+') {|f| f.write report }
+    open(@dev, 'wb+') {|f| f.write report } if @dev
   end
 end
 
 class HidG0Plus < HidG0
   
-  def initialize(instructions='', dev: '/dev/hidg0', debug: false)
+  def initialize(instructions='', dev: '/dev/hidg0', debug: false, 
+                 progress_units: 100, chunk: true)
     
-    super(dev, debug: debug, humanspeed: false)
-    @index= 0
+    humanspeed = chunk == true
+    super(dev, debug: debug, humanspeed: humanspeed)
+    @index, @progress_units = 0, progress_units
     
-    @keys = parse_keys(instructions).map do |x|
+    a = parse_keys(instructions).map do |x|
       
       puts 'x: ' + x.inspect if @debug
       
@@ -465,32 +467,42 @@ class HidG0Plus < HidG0
       
     end.flatten
     
+    @keys = chunk ? a.chunk_while {|x| x.length == 1}.map(&:join) : a
+    
   end
   
   def index()
     @index
   end
   
-  def keys()
-    
-    @keys
-    
+  def keys()    
+    @keys    
   end
-  
-  def sendkey()
     
-    key = @keys[@index]
-    key[0] == '{' ? sendkeys(key) : keypress(key)
-    @index+=1
-    
-  end
-  
   def next_key()
     @keys[@index]
   end
   
   def prev_key()
     @keys[@index-1] unless @index == 0
+  end  
+  
+  def progress(units=@progress_units)
+    (units / (@keys.length / @index.to_f)).round
+  end
+  
+  def reset()
+    @index = 0
   end
   
+  def sendkey()
+    
+    return if @index >= @keys.length
+    key = @keys[@index]
+    key.length > 1 ? sendkeys(key) : keypress(key) 
+    @index+=1
+    progress()
+    
+  end  
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hidg0
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   PwTg5+TqjQvWRfpf4tDWra3/fS6sXSuA4aoh28J3YpuAS2upGYuCk61X4iEDYerh
   INwakAqcXQ4/4DC0SoRunSvJ
   -----END CERTIFICATE-----
-date: 2019-03-30 00:00:00.000000000 Z
+date: 2019-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: c32