@@ -8,16 +8,7 @@ class Arduino def initialize(tty_path) @tty_path = tty_path logger.info "Arduino Init: #{@tty_path}" - end - - def send_message(message_type, *args) connect! - send(message_type, *args) - sleep(1) - rescue => e - logger.error e.message - ensure - disconnect! end def demo_mode @@ -33,12 +24,18 @@ class Arduino end def display_graph(graph, msg) - value = (msg.to_f / 100.0) * 254.0 - write(3, "#{graph}#{value.to_i}") + min, max = case graph + when '1' then [1, 170] + else [0, 254] + end + + value = (((msg.to_f / 100.0) * max) + min).to_i + value = value.to_s.rjust(3, '0'); + write(3, "#{graph}#{value}") end def clear_graph(graph) - write(4, "#{graph}000") + write(4, graph) end def connect! @@ -52,7 +49,7 @@ class Arduino end def write(m_type, m_body = "") - m_type = (m_type < 10 ? "0#{m_type}" : m_type.to_s) + m_type = m_type.to_s.rjust(2, '0') msg = "[#{m_type}#{m_body}]" logger.info "Sending: #{msg}" arduino.rb @@ -52,8 +52,10 @@ def write_setup(setup, chosen_path) return setup end -setup = load_setup_from_yaml -arduino = setup ? Arduino.new(setup['serial_path']) : false +if setup = load_setup_from_yaml + arduino = Arduino.new(setup['serial_path']) +end + loop do choose do |menu| @@ -62,34 +64,38 @@ loop do menu.prompt = "What would you like to do: " if arduino - menu.choice(green("Demo Mode"), "Runs a simple demo") { arduino.send_message(:demo_mode) } + menu.choice(green("Demo Mode"), "Runs a simple demo") { arduino.demo_mode } menu.choice(green("Display Digits")) do msg = ask "Message: " - arduino.send_message(:display_digits, msg) + arduino.display_digits(msg) end - menu.choice(green("Clear Digits")) { arduino.send_message(:clear_digits) } + menu.choice(green("Clear Digits")) { arduino.clear_digits } menu.choice(green("Display Graph")) do graph = ask "Graph #: " value = ask "Value (0-100): " - arduino.send_message(:display_graph, graph, value) + arduino.display_graph(graph, value) end menu.choice(green("Clear Graph")) do graph = ask "Graph #: " - arduino.send_message(:clear_graph, graph) + arduino.clear_graph(graph) end end menu.choice(magenta("Setup")) do say "\n\n" setup = write_setup(setup, serial_port_menu) + arduino.disconnect! if arduino arduino = Arduino.new(setup['serial_path']) end - menu.choice(red("Quit")) { exit } + menu.choice(red("Quit")) do + arduino.disconnect! if arduino + exit + end end say "\n\n" steam.rb c702ebdff7e575314e9ef53ba2851e5e35741da0 Andrew Bloom andrew@andrewkbloom.com http://github.com/abloom/arduino_messaging/commit/9eec7ac3c2697a6995d7514b6b2d7eb9f0b28aed 9eec7ac3c2697a6995d7514b6b2d7eb9f0b28aed 2009-05-20T19:48:35-07:00 2009-05-20T19:48:35-07:00 fixed ruby client! a6a33e92490122099d9c8cf4e623e39e38fb9ef8 Andrew Bloom andrew@andrewkbloom.com