Commit Graph

517 Commits (master)

Author SHA1 Message Date
Tim Evers 22a8b9b11b adding debug message definition 2017-04-20 12:34:39 +02:00
Tim Evers 500259b6ea Merge pull request #68 from RickCarlino/master
Formatting update
2017-04-20 09:34:08 +02:00
Tim Evers 4eb51219cf Merge branch 'master' into master 2017-04-20 09:33:52 +02:00
Tim Evers 69f1b23228 Merge pull request #69 from gabrielburnworth/logs
suppress debugging messages
2017-04-20 09:28:17 +02:00
Gabriel Burnworth 560597f20e Merge pull request #67 from gabrielburnworth/master
add new parameters to readme
2017-04-19 15:04:32 -07:00
Gabriel Burnworth 0d3ad2a7c8 suppress debugging messages 2017-04-19 14:55:06 -07:00
Rick Carlino 3d573dca0c Formatting update 2017-04-19 09:12:12 -05:00
Gabriel Burnworth f882112182 add new parameters to readme 2017-04-18 15:26:34 -07:00
Tim Evers 413f5c868f Merge pull request #66 from TimEvWw/master
Many many things
2017-04-18 22:50:20 +02:00
Tim Evers 4792813e65 Merge branch 'master' into master 2017-04-18 22:50:02 +02:00
TimEversWw 65cc800a49 Fixing zeroing 2017-04-18 22:46:19 +02:00
Tim Evers a62f7595c4 Immediate deactivation on emergency stop 2017-04-17 22:18:47 +02:00
Tim Evers cc03dee8ff Modification emergency stop 2017-04-17 21:53:08 +02:00
Tim Evers 87e89a75f1 Fix for commands without parameters 2017-04-17 21:25:27 +02:00
Tim Evers f980c95967 making a visual studio solution 2017-04-17 11:56:18 +02:00
TimEversWw 54c7516390 * Merged code for setting axis to zero
* Disabled some new features and experimental encoder code
* Added code from updating motor settings without reboot
2017-04-15 23:32:01 +02:00
Gabriel Burnworth 0303f1b2f8 Merge pull request #64 from gabrielburnworth/master
keep z-axis motor powered
2017-04-10 18:48:01 -07:00
gabrielburnworth d501833472 [TEMP] keep Z motor enabled 2017-04-10 18:20:44 -07:00
Gabriel Burnworth c12303c6f1 remove duplicate parameters 2017-04-10 18:16:42 -07:00
Tim Evers dd73810090 Update README.md 2017-03-30 22:06:43 +02:00
TimEversWw a0de45b586 freeing up memory, adding a 'config approval' parameter 2017-03-30 21:34:29 +02:00
TimEversWw b45909ba5a adding memory free check 2017-03-27 21:58:25 +02:00
TimEversWw 0bb3889807 fixing bug in scaling 2017-03-21 22:40:09 +01:00
TimEversWw 85296b5bb4 adjusting encoder reading 2017-03-20 23:08:23 +01:00
Tim Evers 53217e1a42 Merge pull request #63 from FarmBot/readme
fix table formatting in README.md
2017-03-20 22:10:40 +01:00
TimEversWw cca1eeb26c adding encoder scaling 2017-03-18 23:04:08 +01:00
TimEversWw c906995ee8 fixing encoder reporting postion, adding encoder type 2017-03-18 22:52:10 +01:00
Gabriel Burnworth a6028a0fde fix table formatting in README.md 2017-03-17 18:03:32 -07:00
Tim Evers b4825bfecd Merge pull request #61 from TimEvWw/master
slower default maximum speed
2017-03-14 20:41:23 +01:00
TimEversWw ebcb37c8a1 slower default maximum speed 2017-03-14 20:37:27 +01:00
Tim Evers 3d5207c890 Update Config.h 2017-03-12 11:56:54 +01:00
Tim Evers f0bbc81ef0 Merge pull request #60 from TimEvWw/master
boot time check to set previous not used parameters to default value
2017-03-12 11:53:09 +01:00
TimEversWw 6d0aad1a9b boot time check to set previous not used parameters to default value 2017-03-12 11:49:45 +01:00
Tim Evers 9df67beb0d Update README.md 2017-03-12 11:15:15 +01:00
Tim Evers 640155553e Update README.md 2017-03-04 00:06:59 +01:00
Tim Evers 63c5346956 Merge pull request #59 from TimEvWw/master
Disabling of end stops
2017-02-28 23:22:08 +01:00
TimEversWw e0752c2df8 disabling end stops 2017-02-28 22:48:46 +01:00
TimEversWw 6dd8ef09a5 adding code for testing differential encoder 2017-02-09 20:37:44 +01:00
Connor Rigby 534f22e620 Merge pull request #57 from ConnorRigby/master
fix compile error
2017-02-08 07:36:55 -08:00
connor rigby a8f802837c fix compile error 2017-02-08 07:35:53 -08:00
Tim Evers 6c18297347 Merge pull request #56 from TimEvWw/master
More X2
2017-02-06 21:55:53 +01:00
TimEversWw a563b84eae one more change for x2 2017-02-06 21:51:09 +01:00
Tim Evers 7feb26ceb7 Merge pull request #55 from vaibhavgupta3110/patch-3
confirmed X2 now works with the above changes
2017-02-06 18:46:15 +01:00
vaibhavgupta3110 780a87d6fc confirmed X2 now works with the above changes 2017-02-06 22:09:52 +05:30
TimEversWw ed620c0ce8 adjusting pun number for motor X2 2017-02-03 22:59:16 +01:00
TimEversWw ccb2570634 correct parameter white list for motor x2 2017-02-01 22:03:49 +01:00
Tim Evers b512468612 Merge pull request #49 from fluffy/fixCompile
Fix compile warning and bug in getPoint
2017-01-26 21:27:26 +01:00
Tim Evers 42eba8b9cb Merge pull request #51 from fluffy/switch-pullup
add pullup for limit switches
2017-01-26 21:24:00 +01:00
TimEversWw 2cec83141c removing compile error 2017-01-26 21:18:03 +01:00
Tim Evers e05fb46ace Merge pull request #52 from TimEvWw/master
Q & X2
2017-01-19 20:43:25 +01:00