hidg0 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed5e0205a0076670f8d7daa2a0b3d2f435c201b39182761380863f1bc81a4751
-  data.tar.gz: d035c0286f3214cdf202245b2581e0de020079564b12ab0356dbee00a99896d4
+  metadata.gz: 18bb1d1ce3cc1772d08c9174f3b74fa72854063298be6ff49179dfea00f60dc5
+  data.tar.gz: 44c366862cf4516459158d628b1ef2e7fc4e68fa48ca37dfec2cc60b0f9abfa8
 SHA512:
-  metadata.gz: a0b5ebbfbedfbf3ef8b3a1d036afa193ce715de54b0f1362e06dd6bf4a20305470a340e15e0cff59968bc50ce0c0e722600c1766c7ae62667208fe5e9abce7ec
-  data.tar.gz: 10ee00392668a9d176ffab716894b5522a4ddb8fad5e2f42d956716743ceb7d7f89336d87b0cf5c35c47e8bd5f282dc5505885e37b6e9ab73b8fc53b541a1c7a
+  metadata.gz: 459c736b804d8b8c061fb85a8d5bb322c5dd6b246890dc7f9caf535d2dccfc15ffc2fc375e543e5baf72161b042747760065e0e589ed0caf6108547621781fd6
+  data.tar.gz: c104f3d0ec5e172a9c7c996f2e65e83b236cd840d1ed26105457bc70e9f62d27f7baf19ca9e7e04c6526fa34f2102a466601b0dd71d0adc32fa3cb7efeac242d

data/lib/hidg0.rb

@@ -311,9 +311,10 @@ class HidG0
     @duration = humanspeed ? 0.3 : 0
   end
 
-  def keypress(key, duration: 0)
+  def keypress(raw_key, duration: 0)
 
-    keydown(key.strip); sleep(duration); release_keys()
+    key = raw_key.strip.empty? ? raw_key : raw_key.strip
+    keydown(key); sleep(duration); release_keys()
 
   end
 
@@ -322,10 +323,7 @@ class HidG0
     # current keymapping is for en-gb
     
     # £ is "\u{00A3}" in unicode
-    [["\u{00A3}","{shift+3}"],['"','{shift+2}']]\
-        .map {|x,y| s.gsub!(x,y) }
-    
-    s.gsub(/\s*(?=\{)|(?<=\})\s*/,'').scan(/\{[^\}]+\}|./).each do |x|
+    parse_keys(s).each do |x|
       
       puts ('x: ' + x.inspect).debug if @debug
       
@@ -339,6 +337,12 @@ class HidG0
         
         x[1..-2].split(/\s*;\s*/).each do |instruction|
         
+          if instruction =~ /\*\s*\d+/ then
+            key, n = instruction.split('*',2)
+            n.to_i.times {keypress(key, duration: @duration) }
+            next
+          end
+          
           keys = instruction.split('+')        
         
 
@@ -379,6 +383,19 @@ class HidG0
     end
     
   end
+  
+  protected
+  
+  def parse_keys(raw_s)
+    
+    s = raw_s.clone
+    
+    [["\u{00A3}","{shift+3}"],['"','{shift+2}']]\
+        .map {|x,y| s.gsub!(x,y) }
+    
+    s.gsub(/\s*(?=\{)|(?<=\})\s*/,'').scan(/\{[^\}]+\}|./)
+    
+  end
 
   private
   
@@ -412,3 +429,68 @@ class HidG0
   end
 end
 
+class HidG0Plus < HidG0
+  
+  def initialize(instructions='', dev: '/dev/hidg0', debug: false)
+    
+    super(dev, debug: debug, humanspeed: false)
+    @index= 0
+    
+    @keys = parse_keys(instructions).map do |x|
+      
+      puts 'x: ' + x.inspect if @debug
+      
+      if x[0] == '{' then
+
+        x[1..-2].strip.split(/[;,]/).map do |item|
+          
+          if item.strip  =~ /^sleep /
+          
+            next
+            
+          elsif item =~ /\w+\s*\*\s*\d+/
+            
+            key, n = item.split(/\*/,2)
+            [key] * n.to_i
+            
+          else
+            "{%s}" % item.strip
+          end
+          
+        end.compact
+        
+      else
+        x
+      end
+      
+    end.flatten
+    
+  end
+  
+  def index()
+    @index
+  end
+  
+  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
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hidg0
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson