denko 0.13.6 → 0.14.0

data/tutorial/02-button/button.rb

@@ -11,21 +11,21 @@ board = Denko::Board.new(Denko::Connection::Serial.new)
 # Create an object for a momentary button, giving the board, and the pin that
 # the ungrounded side of the button is connected to.
 #
-# `pullup: true` tells the board to keep the input pin high (logical 1) when the
+# `mode: :input_pullup` keeps the input pin high (logical 1) when the
 # button is not pressed. Without this (or an external pullup resistor), the pin
 # might float between 0 and 1, giving incorrect readings. When the button is
 # pressed, it pulls the input pin down to ground (0).
 #
 # See button.pdf in this folder for a hook-up diagram.
 #
-button = Denko::DigitalIO::Button.new(board: board, pin: 7, pullup: true)
+button = Denko::DigitalIO::Button.new(board: board, pin: 7, mode: :input_pullup)
 
 #
 # As soon as a Button (or any DigitalInput) is created, the board starts
 # listening for changes to the physical button. When that happens, our button
 # object is notified. To catch these notifications, we have to use a callback.
 # button.add_callback saves a block of code to run each time the button state changes.
-# 
+#
 # The callback below checks if the state is 0 (the button went from up to down),
 # then counts and prints the number of times pressed.
 #
@@ -38,6 +38,7 @@ button.add_callback(:count_presses) do |state|
 end
 
 # Wait for the button to be pressed 3 times.
+puts "Press button 3 times to continue..."
 sleep 0.005 while presses < 3
 
 # Button keeps its callbacks in a Hash. We can be specific and use keys to add and remove.
@@ -56,7 +57,7 @@ button.remove_callbacks
 #
 led = Denko::LED.new(board: board, pin: 13)
 
-button.up   { led.off } 
+button.up   { led.off }
 button.down { led.on }
 
 puts "Press the button to turn on the LED... (Ctrl+C to exit)"

data/tutorial/03-potentiometer/potentiometer.rb

@@ -13,7 +13,7 @@ board = Denko::Board.new(Denko::Connection::Serial.new)
 # pins. On most boards these pins start with 'A' and can be given as strings.
 #
 # See potentiometer.pdf in this folder for a hook-up diagram.
-# 
+#
 potentiometer = Denko::AnalogIO::Potentiometer.new(pin: 'A0', board: board)
 
 #
@@ -33,7 +33,7 @@ potentiometer.remove_callbacks
 # The default resolution for Analog Input is 10-bits, so you should have seen
 # values from 0 - 1023. We can use the value to control the blinking
 # speed of the LED from the earlier example.
-# 
+#
 led = Denko::LED.new(board: board, pin: 13)
 
 # Helper method to calculate the blink time.
@@ -46,17 +46,21 @@ def map_pot_value(value)
   k = 5
   linearized = (fraction * (k + 1)) / ((k * fraction) + 1)
   # Use this for linear potentiometers instead.
-  # linearized = fraction 
-  
+  # linearized = fraction
+
   # Map to the 0.1 to 0.5 seconds range in reverse. Clockwise = faster.
   0.5 - (linearized * 0.4)
 end
 
+# Start blinking with interval of 0.3
+led.blink(0.3)
+
 # Callback that calculates the blink interval and tells the LED.
 potentiometer.on_change do |value|
   interval = map_pot_value(value)
   print "LED blink interval: #{interval.round(4)} seconds    \r"
-  led.blink(interval)
+  # Update the LED's blink interval without stopping the blink.
+  led.blink_interval = interval
 end
 puts "Turn potentiometer to control the LED blink. Press Ctrl+C to exit..."
 sleep

data/tutorial/04-pwm_led/pwm_led.rb

@@ -13,11 +13,11 @@ board = Denko::Board.new(Denko::Connection::Serial.new)
 # set a duty cycle, telling the LED what fraction of those cycles to be on for.
 #
 # Eg. 1 cycle on, 4 cycles off = 20% duty cycle.
-# This happens so fast that it looks like 20% brightness to the naked eye. 
-# 
+# This happens so fast that it looks like 20% brightness to the naked eye.
+#
 # Depending on your board, some pins may not be PWM capable. Pin 13 on Arduinos
 # isn't, so the earlier example was limited to on/off. There might be a wave
-# symbol printed next to the pin number, but check your documentation. 
+# symbol printed next to the pin number, but check your documentation.
 #
 # Note: If you have pins labeled "DAC", do not use them here. DACs generate steady
 # analog voltages, not pulses.
@@ -26,11 +26,10 @@ board = Denko::Board.new(Denko::Connection::Serial.new)
 #
 led = Denko::LED.new(board: board, pin: 11)
 
-# led.pwm_write sets duty cycle from 0 to 255, where 255 maps to 100%.
-[0, 63, 127, 191, 255].each do |duty|
-  led.pwm_write duty
-  percentage = (((duty+1)/256.to_f) * 100).floor
-  print "LED at #{percentage}% duty cycle. Press Enter..."; gets
+# led.duty= sets duty cycle from 0 to 100, in percentage.
+[0, 20, 40, 60, 80, 100].each do |duty|
+  led.duty = duty
+  print "LED at #{duty}% duty cycle. Press Enter..."; gets
 end
 puts
 
@@ -48,18 +47,17 @@ def map_pot_value(value)
   # linearized = (fraction * (k + 1)) / ((k * fraction) + 1)
 
   # Use this for linear potentiometers instead.
-  linearized = fraction 
-  
-  # Map to the linearized 0-1 range to a 0-255 range for 8-bit PWM.
-  (linearized * 255).floor
+  linearized = fraction
+
+  # x100 to get percentage out of 100.
+  (linearized * 100).round
 end
 
 # Callback to change brightness.
 potentiometer.on_change do |value|
-  duty = map_pot_value(value)
-  led.pwm_write(duty)
-  percentage = (((duty+1)/256.to_f) * 100).floor
-  print "LED brightness: #{percentage}%  \r"
+  duty     = map_pot_value(value)
+  led.duty = duty
+  print "LED brightness: #{duty}%  \r"
 end
 
 puts "Turn potentiometer to control the LED brightness. Press Ctrl+C to exit..."

data/tutorial/05-rgb_led/rgb_led.rb

@@ -32,8 +32,8 @@ end
 # Or we can access the individual Leds through the #red, #green and #blue methods.
 # This makes an orange color with them.
 #
-rgb_led.red.write 255
-rgb_led.green.write 100
+rgb_led.red.duty = 100
+rgb_led.green.duty = 40
 rgb_led.blue.off
 print "Done. Changed to orange. Press Enter to continue..."; gets
 
@@ -47,10 +47,10 @@ potentiometer = Denko::AnalogIO::Potentiometer.new(pin: 'A0', board: board)
 require_relative 'rgb_mapping'
 potentiometer.on_change do |pot_value|
   # Use the mapping methods to calculate values and write them.
-  rgb_led.red.write   map_red(pot_value)
-  rgb_led.green.write map_green(pot_value)
-  rgb_led.blue.write  map_blue(pot_value)
-  
+  rgb_led.red.duty   = map_red(pot_value)
+  rgb_led.green.duty = map_green(pot_value)
+  rgb_led.blue.duty  = map_blue(pot_value)
+
   print "Potentiometer value: #{pot_value}   \r"
 end
 

data/tutorial/05-rgb_led/rgb_mapping.rb

@@ -1,5 +1,5 @@
 # Maximum and minimum PWM values.
-OUT_MAX = 255
+OUT_MAX = 100
 OUT_MIN = 0
 
 def map_value(value, input_steps, reverse=false)
@@ -8,10 +8,10 @@ def map_value(value, input_steps, reverse=false)
 
   # Reverse if needed.
   fraction = 1 - fraction if reverse
-  
+
   # Map to the output range
   value = (fraction * OUT_MAX).floor
-  
+
   # Clamp within the range just in case.
   value = OUT_MAX if value > OUT_MAX
   value = OUT_MIN if value < OUT_MIN
@@ -21,20 +21,20 @@ end
 def map_red(pot_value)
   # Red full on at low end.
   return OUT_MAX if pot_value < 171
-  
+
   # Red fades out from 171-341
   if (171..341).include? pot_value
     return map_value(pot_value - 171, 170, true)
   end
-  
+
   # Red full off in the middle third.
   return OUT_MIN if (342..682).include? pot_value
-  
+
   # Red fades in from 683-853
   if (683..853).include? pot_value
     return map_value(pot_value - 683, 170, false)
   end
-  
+
   # Red full on at high end.
   return OUT_MAX if pot_value > 853
 end
@@ -47,12 +47,12 @@ def map_green(pot_value)
 
   # Green full on from 1/6 to 1/2.
   return OUT_MAX if (171..511).include? pot_value
-  
+
   # Green fades out from 512-682
   if (512..682).include? pot_value
     return map_value(pot_value - 512, 170, true)
   end
-  
+
   # Geen full off above 2/3.
   return OUT_MIN if pot_value > 682
 end
@@ -60,12 +60,12 @@ end
 def map_blue(pot_value)
   # Blue full off until 1/3
   return OUT_MIN if pot_value < 342
-  
+
   # Blue fades in from 342-512 (170 steps)
   if (342..542).include? pot_value
     return map_value(pot_value - 342, 170, false)
   end
-  
+
   # Blue full on from 513 to 852
   return OUT_MAX if (513..852).include? pot_value