<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -86,15 +86,15 @@ Also, because I'm a lefty, the default mappings are set up assuming you hold the
 
 h3. Wiimote
 
-|**|Left|Middle|Right|
-|Swing|Crash|Snare|Hi-tom|
-|Heel|Crash|Snare rimshot|Hi-tom|
+|**|Left|Middle|Slight Right|Hard Right|
+|Swing|Crash|Snare|Hi-tom|Low-tom|
+|Heel|Crash|Snare rimshot|Hi-tom|Low-tom|
 
 h3. Nunchuk
 
-|**|Left|Middle|Right|
-|Swing|Hi-hat|Snare|Low-tom|
-|Heel|Hi-hat &amp; Kick|Kick|Low-tom|
+|**|Left|Middle|Slight Right|Hard Right
+|Swing|Hi-hat|Snare|Hi-tom|Low-tom|
+|Heel|Hi-hat &amp; Kick|Kick|Hi-tom|Low-tom|
 
 h3. Buttons:
 </diff>
      <filename>README.textile</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-# Version 0.4.  More cowbell.
+# Version 0.5.  More cowbell.
 
 # This is where you set up your trigger mappings.
 
@@ -20,7 +20,7 @@ require 'trigger'
 include DrumChuk::NoteNumbers
 
 # Does your tone generator have a rimshot sample?  If not, true is good.
-SUPPRESS_RIMSHOT = false
+SUPPRESS_RIMSHOT = true
 
 # A spoonful of syntax sugar
 def returning(value)
@@ -33,29 +33,43 @@ midi_interface = DrumChuk::MidiInterface.new
 quiet_hat_stomp = {:hit_note =&gt; GM_HATS_STOMP, :hit_velocity =&gt; 64}
 
 buttons = DrumChuk::ButtonSet.new(midi_interface, {
-  :b_button =&gt; quiet_hat_stomp,
-  :z_button =&gt; quiet_hat_stomp
+  :b_button =&gt; quiet_hat_stomp
 })
 midi_interface.register_listener(buttons)
 
 left_hand = lambda do |velocity, roll, pitch, buttons|
   returning [] do |notes|
-    case roll
-    when -90..-16
-      # Pick up wide mis-hits as rimshots
-      if pitch &gt; 10 or SUPPRESS_RIMSHOT
+    if buttons.down?(:z_button)
+      case roll
+      when -90..20
         notes &lt;&lt; GM_CRASH_1
       else
-        notes &lt;&lt; RIMSHOT
-      end      
-    when -15..45
-      if pitch &gt; 10 or SUPPRESS_RIMSHOT
-        notes &lt;&lt; GM_SNARE
-      else
-        notes &lt;&lt; RIMSHOT
-      end      
-    when 46..100
-      notes &lt;&lt; GM_HI_TOM
+        notes &lt;&lt; GM_CRASH_2
+      end
+      # Always kick with crash... (cheating)
+      notes &lt;&lt; GM_KICK
+    else
+      case roll
+      when -90..-16
+        # Pick up wide mis-hits as rimshots
+        if pitch &gt; 10 or SUPPRESS_RIMSHOT
+          notes &lt;&lt; GM_CRASH_1
+          # Always kick with crash... (cheating)
+          notes &lt;&lt; GM_KICK
+        else
+          notes &lt;&lt; RIMSHOT
+        end      
+      when -15..30
+        if pitch &gt; 10 or SUPPRESS_RIMSHOT
+          notes &lt;&lt; GM_SNARE
+        else
+          notes &lt;&lt; RIMSHOT
+        end      
+      when 31..50
+        notes &lt;&lt; GM_HI_TOM
+      when 51..90
+        notes &lt;&lt; GM_LOW_TOM
+      end
     end
   end
 end
@@ -63,20 +77,22 @@ end
 right_hand = lambda { |velocity, roll, pitch, buttons|
   returning [] do |notes|
     case roll
-    when -100..-36
+    when -100..-31
       if pitch &gt; -55
-        notes &lt;&lt; (buttons.down?(:b_button) || buttons.down?(:z_button) ? GM_HATS_CLOSED : GM_HATS_OPEN)
+        notes &lt;&lt; (buttons.down?(:b_button) ? GM_HATS_CLOSED : GM_HATS_OPEN)
       end
       if pitch &lt; 35
         notes &lt;&lt; GM_KICK
       end      
-    when -35..20
+    when -30..19
       if pitch &gt; 35
         notes &lt;&lt; SNARE_RIGHT
       else
         notes &lt;&lt; GM_KICK
       end      
-    when 21..100
+    when 20..45
+      notes &lt;&lt; GM_HI_TOM
+    when 46..90
       notes &lt;&lt; GM_LOW_TOM
     end
   end</diff>
      <filename>drumchuk.rb</filename>
    </modified>
    <modified>
      <diff>@@ -5,7 +5,8 @@ module DrumChuk
     GM_HATS_CLOSED = 42
     GM_HATS_STOMP = 44
     GM_HATS_OPEN = 46
-    GM_LOW_TOM = 45
+    GM_HATS_HALF_OPEN = 81
+    GM_LOW_TOM = 43
     GM_MID_TOM = 47
     GM_HI_TOM = 48
     GM_CRASH_1 = 49</diff>
      <filename>note_numbers.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,7 +1,7 @@
 module DrumChuk
   class Trigger
     SWING_THRESHOLD = -0.25 # in G
-    STRIKE_THRESHOLD = -0.0 # in G
+    STRIKE_THRESHOLD = -0.1 # in G
     FULL_VELOCITY = 6.1 # in m/s (this is really approximate...)
 
     VEL_RANGE = 0.7 # in % of full dynamic range (can be &gt;1).  Lower == narrower dynamic range, but FULL_VELOCITY still == 127
@@ -43,7 +43,7 @@ module DrumChuk
 
     def trigger(midi_interface)
       # Keep the previous radius value around to compare for fall-offs in 
-      @radius = Math::sqrt(@x**2 + @y**2 + @z**2) * (@z &gt; 0 ? 1 : -1)
+      @radius = Math::sqrt(@x**2 + @y**2 + @z **2) * (@z &gt; 0 ? 1 : -1)
 
       @prev_roll = @roll
       @roll = theta(@x, @z)</diff>
      <filename>trigger.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>21f8e573d88c4fe20647fc9b358898575ce218c0</id>
    </parent>
  </parents>
  <author>
    <name>John Mileham</name>
    <email>jmileham@berklee.edu</email>
  </author>
  <url>http://github.com/jmileham/drumchuk/commit/d56b06cc46d4fa1638f3ade0fb65712f2eb68e65</url>
  <id>d56b06cc46d4fa1638f3ade0fb65712f2eb68e65</id>
  <committed-date>2009-05-13T09:18:23-07:00</committed-date>
  <authored-date>2009-05-13T09:18:23-07:00</authored-date>
  <message>Added high and low tom to both hands, changed up some roll/pitch thresholds.</message>
  <tree>1d63511dddad35ddf948807aeb463e313d5c5e56</tree>
  <committer>
    <name>John Mileham</name>
    <email>jmileham@berklee.edu</email>
  </committer>
</commit>
