Long anticipated merge of the joints/axes separation branch!

Merge branch 'joints_axes16'
LinuxCNC · Jun 27, 2016 · a2f0de5 · a2f0de5
2 parents 44c5fb9 + 619da03
commit a2f0de5
Show file tree

Hide file tree

Showing 795 changed files with 41,595 additions and 48,058 deletions.
diff --git a/TODO b/TODO
@@ -1,3 +1,10 @@
+TODO for the joints_axes branch
+
+* clean up joints/axes throughout the whole code (lots of parts already done)
+* define a unified jogging way (both for joints and axes)
+* implement joint-limits for carthesian moves (requires simulating the speed in userspace)
+* update configs
+(and many other probably..)
 
 TODO     sort out axis/joints issues: 
 	    * limits need to be imposed on joints (tricky with kins)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.8.0~pre1
+2.8.0~pre1-ja