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
Tim Evers 64d49b709e Merge pull request #64 from RickCarlino/master 
Fix bug with MeshBlu authentication
 2015-03-14 17:11:16 +01:00
Rick Carlino ed5da54274 Fix bug with MeshBlu authentication 2015-03-14 11:04:32 -05:00
Tim Evers 6e47c0114b Merge pull request #63 from RickCarlino/master 
Rename messaging to messenger
 2015-03-13 19:49:38 +01:00
Rick Carlino 47cee4ca52 Rename messaging to messenger 2015-03-13 09:07:42 -05:00
Rick Carlino b2a301feba Merge pull request #62 from RickCarlino/master 
Use constructor injection for MessageHandler class
 2015-03-13 09:02:32 -05:00
Rick Carlino 65bfee0ac4 Use constructor injection for MessageHandler class 2015-03-13 08:57:33 -05:00
TimEvWw 3624ae370f Merge branch 'RickCarlino-conflicts' 2015-03-12 22:21:16 +01:00
TimEvWw aee23a7622 pass messaging trough constructor injection 2015-03-12 22:19:04 +01:00
TimEvWw 3355c54913 Merge branch 'conflicts' of git://github.com/RickCarlino/farmbot-raspberry-pi-controller into RickCarlino-conflicts 2015-03-12 17:30:28 +01:00
Rick Carlino 6f6e67054b Fixed most merge conflicts- possible coupling issues 2015-03-12 08:39:55 -05:00
Rick Carlino 8a2b205a88 Merge pull request #59 from RickCarlino/master 
Revert MessageHandlerMessage to the way it used to be
 2015-03-12 07:44:19 -05:00
TimEvWw 0c0b15464a getting tests up top 99.8% 2015-03-11 22:32:24 +01:00
Rick Carlino e3f9fb229f Revert MessageHandlerMessage to the way it used to be 2015-03-11 15:56:45 -05:00
Tim Evers a57219f946 Merge pull request #58 from RickCarlino/master 
Add home_* methods back in, Phase out more global var usage ($bot_hardware, $dbaccess), NullDatabase stub class
 2015-03-11 21:49:48 +01:00
Rick Carlino 973a735cbe Remove NullDatabase stub class 2015-03-11 15:31:33 -05:00
Rick Carlino 976dfc34db Phase out several global variables 2015-03-11 15:28:53 -05:00
Tim Evers ac76948927 Merge pull request #57 from RickCarlino/master 
Refactor out global variables in Messaging class
 2015-03-10 20:52:21 +01:00
Rick Carlino 391808b796 Refactor out global vars in Messaging class 2015-03-10 04:02:42 -05:00
Rick Carlino f11c66ca2a Refactor out global variables in Messaging class 2015-03-10 03:50:17 -05:00
TimEvWw 46ac94cfac stub for simulating serial port 2015-03-01 23:14:53 +01:00
Tim Evers 4f04e1d9ac Merge pull request #56 from TimEvWw/master 
added separate process for messages
 2015-02-26 20:11:32 +01:00
TimEvWw 97de45eeb2 added separate process for messages 2015-02-26 20:05:31 +01:00
Tim Evers 98a5a63cd8 Merge pull request #54 from RickCarlino/websocket-fixes 
Re-enable MOVE_REL
 2015-02-26 13:56:39 +01:00
Rick Carlino 061b2cdf54 Add status require statemnt back 2015-02-26 13:29:50 +07:00
Rick Carlino 18620f35a8 Remove artifacts 2015-02-26 13:14:56 +07:00
Rick Carlino df40592224 Re-enable MOVE_REL 2015-02-26 13:08:39 +07:00
Tim Evers fda703bc82 Merge pull request #53 from TimEvWw/master 
Refresh
 2015-02-25 22:52:20 +01:00
TimEvWw 47ff85f0ca Merge branch 'master' of https://github.com/TimEvWw/farmbot-raspberry-pi-controller 2015-02-25 22:43:32 +01:00
TimEvWw bb2fd3f0f5 fixing issue with refreshes 2015-02-25 22:39:21 +01:00
Tim Evers c3f9e1967d Merge pull request #49 from TimEvWw/master 
More testing
 2015-02-01 23:25:11 +01:00
TimEvWw ef73a88121 fixing testing param 2015-02-01 23:19:26 +01:00
TimEvWw 973203639f de-commenting testing default var 2015-02-01 20:54:26 -01:00
TimEvWw e651bf4493 fix issue in menu 2015-02-01 19:57:15 -01:00
TimEvWw c2d81b3b3a fix test mode issue 2015-01-31 23:22:37 +01:00
TimEvWw 7033398b57 unit tests 2015-01-31 22:42:15 +01:00
TimEvWw 04cb65f55a unit test for ramps 2015-01-31 21:05:21 +01:00
TimEvWw dcee6d9eb9 forgot to merge db log 2015-01-18 01:15:01 +01:00
TimEvWw 7efd3c2908 Merge branch 'TimEvWw-master' 2015-01-18 01:11:31 +01:00
TimEvWw b9d9395567 Merge branch 'master' of https://github.com/TimEvWw/farmbot-raspberry-pi-controller into TimEvWw-master 
Conflicts:
	.gitignore
	Gemfile
	README.md
	lib/database/dbaccess_logs.rb
	protocols.md
 2015-01-18 01:10:22 +01:00
Tim Evers 67c6d3737f Merge pull request #47 from laurawhalin/patch-1 
Fixed a few typos in README
 2015-01-18 01:02:30 +01:00
Tim Evers 885b020741 Merge pull request #46 from laurawhalin/patch-2 
fixed a few typos in protocols.md
 2015-01-18 01:02:13 +01:00
TimEvWw 2b8ea88234 unit tests 2015-01-18 00:52:46 +01:00
Laura Whalin 2c864f1e67 fixed a few typos in protocols.md 2015-01-16 12:28:41 -07:00
Laura Whalin 65a6e8a93e Fixed a few typos in README 2015-01-16 10:47:31 -07:00
TimEvWw 4977bd01e4 test code ramps arduino 2015-01-14 21:40:23 +01:00
TimEvWw 5ffbbcf6eb adding status message test 2015-01-11 15:55:56 +01:00
TimEvWw 78dd2fd3f0 save command lines added to test 2015-01-10 23:06:34 +01:00
TimEvWw eef9dda17d adding schedule save test 2014-12-29 00:24:50 +01:00
TimEvWw 28fd50075c emergency stop tests 2014-12-24 23:02:13 +01:00
TimEvWw 68b88ff4ce dbaccess tests done 2014-12-17 22:13:30 +01:00