Merge pull request #56 from TimEvWw/master

added separate process for messages
pull/57/head
Tim Evers 2015-02-26 20:11:32 +01:00
commit 4f04e1d9ac
4 changed files with 43 additions and 4 deletions

36
farmtalk.rb 100644
View File

@ -0,0 +1,36 @@
# FarmBot Controller
require_relative 'settings.rb'
system('clear')
puts ''
puts ' /\ '
puts '----------'
puts ' FarmTalk '
puts '----------'
puts ' \/ '
puts ''
require_relative 'lib/status'
$status = Status.new
$shutdown = 0
$db_write_sync = Mutex.new
print 'database '
require 'active_record'
require_relative 'lib/database/dbaccess'
$bot_dbaccess = DbAccess.new('development')
puts 'OK'
print 'synchronization '
require_relative 'lib/messaging'
puts 'OK'
puts "uuid #{$info_uuid}"
puts "token #{$info_token}"
puts 'press key to stop'
gets.chomp

View File

@ -49,6 +49,8 @@ class MessageHandler
sender = ""
time_stamp = nil
puts "received at #{Time.now.strftime("%Y-%m-%d %H:%M:%S")}: #{message}" if $mesh_msg_print == 1
err_msg = ""
err_trc = ""
err_snd = false

View File

@ -42,6 +42,8 @@ class MessageHandler
sender = ""
time_stamp = nil
puts "received at #{Time.now.strftime("%Y-%m-%d %H:%M:%S")}: #{message}" if $messages_print == 1
err_msg = ""
err_trc = ""
err_snd = false

View File

@ -1,7 +1,6 @@
$status_debug_msg = false
$hardware_sim = 0
#$hardware_type = "lib/hardware/firmata/ramps"
#$hardware_type = "lib/hardware/gcode/ramps"
$hardware_type = nil
$hardware_type = "lib/hardware/gcode/ramps"
#$hardware_type = nil
$mesh_msg_print = 1
$controller_disable = 0