hidg0 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c57ae2c3727fbfefb5bc51a77d94646515464674474c30f803f6b797f0077b59
-  data.tar.gz: 3fdc7dd21062adff5d6b975a8cf51ef5139b4f8939cd14f94a62f85736b5fde4
+  metadata.gz: ed5e0205a0076670f8d7daa2a0b3d2f435c201b39182761380863f1bc81a4751
+  data.tar.gz: d035c0286f3214cdf202245b2581e0de020079564b12ab0356dbee00a99896d4
 SHA512:
-  metadata.gz: d7a7d93727b2a73b2eabd6910345fbdb898e63c984dde56a6b7b69806b4295dcb8129b95e8c6a91a10d36c4294cbe48c1a8d1b14ee566b997593ce3b1400d4dc
-  data.tar.gz: c51c07fb6006ec43bcb9aa4fcf524856beec4f46d787e76a07eeeb7de94e84f41b7050d69f2e0b0735e7ceac928327328561588f19ebef71e8b705ba315be2a4
+  metadata.gz: a0b5ebbfbedfbf3ef8b3a1d036afa193ce715de54b0f1362e06dd6bf4a20305470a340e15e0cff59968bc50ce0c0e722600c1766c7ae62667208fe5e9abce7ec
+  data.tar.gz: 10ee00392668a9d176ffab716894b5522a4ddb8fad5e2f42d956716743ceb7d7f89336d87b0cf5c35c47e8bd5f282dc5505885e37b6e9ab73b8fc53b541a1c7a

data/lib/hidg0.rb

@@ -52,7 +52,8 @@ h = %i(right_gui rightalt rightshift rightctrl left_gui left_alt leftshift leftc
     reverse.map.with_index {|x,i| [x, (2 ** i)]}.to_h
 
 MODIFIERS = h.merge({shift: h[:leftshift], alt: h[:left_alt], 
-                     ctrl: h[:leftctrl], control: h[:leftctrl]})
+                     ctrl: h[:leftctrl], control: h[:leftctrl], 
+                     windows_key: h[:right_gui]})
 
 =begin
                               byte1    byte2   byte3   bytes4...bytes8    
@@ -102,6 +103,7 @@ KEYS = {
   :'0' => 39,  # Keyboard 0 and )
   enter: 40,  # Keyboard Return (ENTER)
   :"\n" => 40,
+  cr: 40,  
   esc: 41,  # Keyboard ESCAPE
   backspace: 42,  # Keyboard DELETE (Backspace)
   tab: 43,  # Keyboard Tab
@@ -297,7 +299,8 @@ KEYS = {
   left_arrow: :kp4, 
   right_arrow: :kp6, 
   up_arrow: :kp8, 
-  page_up: :kp9
+  page_up: :kp9,
+  windows_key: 0
 }
 
 class HidG0
@@ -310,7 +313,7 @@ class HidG0
 
   def keypress(key, duration: 0)
 
-    keydown(key); sleep(duration); release_keys()
+    keydown(key.strip); sleep(duration); release_keys()
 
   end
 
@@ -319,10 +322,12 @@ class HidG0
     # current keymapping is for en-gb
     
     # £ is "\u{00A3}" in unicode
-    [["\n",'{enter}'],["\u{00A3}","{shift+3}"],['"','{shift+2}']]\
+    [["\u{00A3}","{shift+3}"],['"','{shift+2}']]\
         .map {|x,y| s.gsub!(x,y) }
     
-    s.scan(/\{[^\}]+\}|./).each do |x|
+    s.gsub(/\s*(?=\{)|(?<=\})\s*/,'').scan(/\{[^\}]+\}|./).each do |x|
+      
+      puts ('x: ' + x.inspect).debug if @debug
       
       if x.length == 1 and x[0] != '{' then
         
@@ -330,28 +335,46 @@ class HidG0
         
       else
         
-        keys = x[1..-2].split('+')
-        puts ('keys: ' +keys.inspect).debug if @debug
+        # split by semicolon
+        
+        x[1..-2].split(/\s*;\s*/).each do |instruction|
         
-        if keys.length > 1 then
+          keys = instruction.split('+')        
+        
+
+          puts ('keys: ' + keys.inspect).debug if @debug              
           
-          # e.g. keys #=> ['ctrl', 's']
-         
-          key = KEYS[keys.pop.to_sym]          
-          modifier = keys.map {|x| MODIFIERS[x.to_sym]}.inject(:+)
+          if keys.length > 1 then
+                        
+            # e.g. keys #=> ['ctrl', 's']
           
-          if @debug then
-            puts ('key: ' + key.inspect).debug
-            puts ('modifier: ' + modifier.inspect).debug
+            key = KEYS[keys.pop.to_sym]          
+            modifier = keys.map {|x| MODIFIERS[x.to_sym]}.inject(:+)
+            
+            if @debug then
+              puts ('key: ' + key.inspect).debug
+              puts ('modifier: ' + modifier.inspect).debug
+            end
+            
+            write_report(modifier.chr + NULL_CHAR + key.chr + NULL_CHAR*5)
+            release_keys()
+            
+          else
+               
+            key = keys.first
+            
+            if key =~ /sleep/ then
+              
+              seconds = key[/(?<=sleep )\d+(?:\.\d+)/]
+              puts ('sleeping for ' + seconds + 'seconds').info if @debug
+              sleep seconds.to_f
+              
+            else
+            
+              keypress key, duration: @duration
+            end
           end
-          
-          write_report(modifier.chr + NULL_CHAR + key.chr + NULL_CHAR*5)
-          release_keys()
-          
-        else
-          keypress keys.first, duration: @duration
         end
-        
       end
     end
     
@@ -363,6 +386,8 @@ class HidG0
     
     puts 'keydown | key: ' + key.inspect if @debug
     
+    return write_report(8.chr + NULL_CHAR*7) if key.to_s =~ /^windows_key$/
+    
     if KEYS[key.to_sym].is_a? Integer then 
 
       write_report(NULL_CHAR*2 + KEYS[key.to_sym].chr + NULL_CHAR*5)

metadata

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