Merge pull request #59 from RickCarlino/master

Revert MessageHandlerMessage to the way it used to be
pull/62/head
Rick Carlino 2015-03-12 07:44:19 -05:00
commit 8a2b205a88
1 changed files with 0 additions and 101 deletions

View File

@ -10,105 +10,4 @@ class MessageHandlerMessage
handled = false
end
# Handle the message received from skynet
#
def handle_message(message)
if authorized?(message)
self.send(translate_action_name(message), message)
message.handled = true
end
end
# Ensure that the attempted command is allowed and also implemented.
def authorized?(message)
cmd = translate_action_name(message)
is_command = ControllerCommandProc::WHITELIST.include?(cmd)
is_method = self.respond_to?(cmd)
is_command && is_method
end
# PROBLEM: There are numerous spelling of commands and names for commands
# throughout the application. Sometimes it is move_rel, other times it is
# "MOVE RELATIVE". Sometimes we call it a message, other times an action.
# This method is a quick fix. Maybe we should make a uniform naming convention
def translate_action_name(message)
(message.payload["command"]["action"] || '').downcase.gsub(' ', '_')
end
def move_absolute(*)
raise 'Not implemented yet.'
end
def move_relative(message)
inputs = message.payload["command"] || {}
# {"action"=>"MOVE RELATIVE", "x"=>0, "y"=>0, "z"=>0, "speed"=>100, "delay"=>0}
DbAccess.current.create_command *[
'MOVE RELATIVE', # action
inputs['x'] || 0, # x
inputs['y'] || 0, # y
inputs['z'] || 0, # z
inputs['speed'] || 100, # speed
0, # amount
0, # pin_nr
0, # value1
0, # value2
0, # mode
0, # time
0, # external_info
]
rescue => e
puts e.message, e.backtrace.first
end
def home_x(*)
HardwareInterface.current.move_home_x
end
def home_y(*)
HardwareInterface.current.move_home_y
end
def home_z(*)
HardwareInterface.current.move_home_z
end
def calibrate_x(*)
raise 'Not implemented yet.'
end
def calibrate_y(*)
raise 'Not implemented yet.'
end
def calibrate_z(*)
raise 'Not implemented yet.'
end
def dose_water(*)
raise 'Not implemented yet.'
end
def set_speed(*)
raise 'Not implemented yet.'
end
def pin_write(*)
raise 'Not implemented yet.'
end
def pin_read
raise 'Not implemented yet.'
end
def pin_mode
raise 'Not implemented yet.'
end
def pin_pulse
raise 'Not implemented yet.'
end
def servo_move
raise 'Not implemented yet.'
end
end