spacecruft
/
farmbot_os
1
0
Fork 0
Code Issues Pull Requests Releases Activity
5,295 Commits
20 Branches
283 Tags
76 MiB
Commit Graph

5295 Commits (staging)

Author SHA1 Message Date
Rick Carlino 105fb31b30 Add reply() helper, fix handling of unknown message_types 2015-04-04 08:22:15 -05:00
Rick Carlino ba39e25ce5 Merge pull request #78 from RickCarlino/idea2 
Install MeshRuby and FarmBot-serial
 2015-04-04 08:02:42 -05:00
Rick Carlino 2251e9cee4 Upgrade farmbot-serial, add home_x/y/z/all, emergency_stop, error logging to bot, move_abs 2015-04-04 07:44:20 -05:00
Rick Carlino 126e1346e9 Upgrade farmbot-serial to 0.0.8 2015-04-03 17:42:36 -05:00
Rick Carlino 093ce8ecea Print UUID/Token whilst debugging 2015-04-03 16:20:39 -05:00
Rick Carlino d938114a6e Install MeshRuby and FarmBot-serial 2015-04-03 16:13:41 -05:00
Rick Carlino 9d5cc7213a Merge pull request #77 from TimEvWw/master 
Moving things around
 2015-03-23 10:11:27 -05:00
TimEvWw 9083ecd9fe Changed lib 2015-03-22 22:44:44 +01:00
Tim Evers 7d9a46c13c Merge pull request #7 from TimEvWw/RickCarlino-master 
Rick carlino master
 2015-03-22 22:40:57 +01:00
Tim Evers ed454d7e47 Merge pull request #6 from TimEvWw/TimEvWw-master 
Tim ev ww master
 2015-03-22 22:36:17 +01:00
TimEvWw a108bf300e Merge https://github.com/Farmbot/farmbot-raspberry-pi-controller into RickCarlino-master 
Conflicts:
	lib/controller.rb
	lib/controller_command_proc.rb
	lib/hardware/gcode/ramps.rb
	lib/messaging/messagehandler.rb
	lib/messaging/messagehandler.rb~
	lib/messaging/messagehandler_status.rb
	lib/messaging/messaging.rb
	lib/ramps_param.rb
	settings.rb
 2015-03-22 22:05:37 +01:00
TimEvWw 5acba2b11e moving all database actions to controller 2015-03-22 21:50:53 +01:00
Tim Evers 4a9773c7ca Merge pull request #76 from TimEvWw/master 
Report pin values over MeshBlu
 2015-03-19 23:11:19 +01:00
TimEvWw 56e143f95a Merge http://www.github.com/FarmBot/farmbot-raspberry-pi-controller 
Conflicts:
	menu.rb
 2015-03-19 21:04:59 -01:00
Tim Evers b0206e67f3 Merge pull request #75 from RickCarlino/refactor2 
Some minor fixes that didnt make it into the last PR
 2015-03-19 22:21:08 +01:00
Rick Carlino 64fbb2aafb [STABLE] Refactoring and tweaks to message handling 2015-03-19 16:17:12 -05:00
Rick Carlino bdc1994620 Fix nil var in handler 2015-03-19 16:07:02 -05:00
Rick Carlino 62841de793 Fix nil var in handler 2015-03-19 15:48:36 -05:00
Rick Carlino 6c8bdedb5b Disable tinyCommandLine, immediately execute single_commands 2015-03-19 15:39:24 -05:00
Tim Evers 6b1256cd57 Merge pull request #74 from RickCarlino/refactor2 
Refactored routing of incoming messages
 2015-03-19 21:38:44 +01:00
Rick Carlino 69779dce8e Bypass command queue 2015-03-19 12:21:57 -05:00
Rick Carlino c74121e29d pry statement 2015-03-19 11:43:25 -05:00
Rick Carlino 9a191ad3af Reference self when accessing WHITELIST (instead of parent class) 2015-03-19 11:16:03 -05:00
Rick Carlino e2b659620c Refactored routing of incoming messages 2015-03-19 08:23:49 -05:00
Tim Evers 1ea3f5d30f Merge pull request #73 from RickCarlino/refactor 
Remove more globals, pull things out into classes, temporarily disable logging.
 2015-03-18 21:19:01 +01:00
Tim Evers 08330e1c1a Merge pull request #71 from RickCarlino/testing 
Change URL from skynet.im to MeshBlu
 2015-03-18 21:14:37 +01:00
Rick Carlino 303c94e154 Refactoring of MessageHandler(s), Messenger, test suite and others 2015-03-18 12:48:13 -05:00
Rick Carlino a134e8f16a [UNSTABLE] Still refactoring. Messages no longer raise 2015-03-18 11:57:36 -05:00
Rick Carlino de7bfd2172 Add token uid to screen 2015-03-18 10:29:22 -05:00
Rick Carlino 0998ae08c3 Refactor of MessageHandler and MessageHandlerMessage 2015-03-18 10:25:07 -05:00
Rick Carlino a5b8a5321f Disable DB level logging 2015-03-18 08:02:00 -05:00
Rick Carlino c243d9e39a Change Skynet.im URL to new MeshBlu URL 2015-03-18 06:37:46 -05:00
Rick Carlino f420b0dc2e Add logger 2015-03-18 06:05:47 -05:00
TimEvWw 26e0ab383e throw away 2015-03-17 20:25:40 -01:00
Rick Carlino 3817363820 Update require paths for handlers 2015-03-17 16:08:08 -05:00
Tim Evers c24dab9ae9 Merge pull request #70 from RickCarlino/master 
Minor cleanup, Re-organize file structure
 2015-03-17 14:40:12 +01:00
Rick Carlino 042f7e6929 Merge branch 'master' of https://github.com/FarmBot/farmbot-raspberry-pi-controller 2015-03-17 07:10:30 -05:00
Rick Carlino fcc777de85 Re-organize file structure 2015-03-17 07:07:18 -05:00
TimEvWw c2a940236e Merge branch 'RickCarlino-master' 2015-03-16 22:02:59 +01:00
TimEvWw 0c4abaad18 remove read_hw_status 2015-03-16 22:02:21 +01:00
TimEvWw 3292d24ddf Merge branch 'master' of git://github.com/RickCarlino/farmbot-raspberry-pi-controller into RickCarlino-master 2015-03-16 21:38:33 +01:00
Rick Carlino 532cb785e7 un globalize Status object 2015-03-16 06:36:37 -05:00
Tim Evers fffdaf28af Merge pull request #67 from RickCarlino/master 
Wording change on status messages
 2015-03-15 23:19:25 +01:00
Rick Carlino fa6f5757da Wording change on status messages 2015-03-15 16:37:47 -05:00
TimEvWw 271645231e Merge branch 'RickCarlino-master' 2015-03-15 09:13:20 +01:00
TimEvWw 12afa43b7c Merge branch 'master' of git://github.com/RickCarlino/farmbot-raspberry-pi-controller into RickCarlino-master 2015-03-15 09:07:34 +01:00
Rick Carlino 22e86c912b Remove puts statement 2015-03-14 17:33:47 -05:00
Rick Carlino b668f1a763 Change the way comaprisons of incoming messages are handled 2015-03-14 17:28:38 -05:00
Rick Carlino 4f960937a9 Merge pull request #65 from RickCarlino/master 
Fix typo
 2015-03-14 11:50:59 -05:00
Rick Carlino ca1dc46b1d Fix typo 2015-03-14 11:48:40 -05:00