summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2014-06-18Merge branch '2.6'HEADmasterChris Radek3-2/+30
2014-06-18Fix crash on debian wheezy + gcc4.7.2Chris Radek2-2/+2
2014-06-18Remove unused prototypeChris Radek1-4/+0
2014-06-18Fix many prototypesChris Radek1-27/+27
2014-06-15gscreen -fix combobox not following keyboard increment changesChris Morley2-16/+38
2014-06-15gscreen -fix keybinding blocking MDI/Gcode entryChris Morley1-5/+18
2014-06-12Docs: add info on trajectory planner ini optionsJohn Thornton2-0/+126
2014-06-11Update changelog & VERSION for 2.6.0~pre4Sebastian Kuzminsky2-1/+29
2014-06-11Merge branch '2.6'Chris Radek2-9/+13
2014-06-11pickconfig: speed automatic closing of other branchesJeff Epler1-2/+2
2014-06-11Merge branch 'v2.5_branch' into 2.6Chris Radek1-7/+11
2014-06-11linuxcnctop: fix the crawling scrollbar in many casesJeff Epler1-7/+11
2014-06-11Make the new planner honor the separate feed and rapid overridesChris Radek1-2/+5
2014-06-11Fix for F-word limit in position syncRobert W. Ellenberg2-7/+17
2014-06-11Turn on blending by defaultChris Radek1-3/+3
2014-06-11canon: disabled debug output after verifying ARC_FEED changesRobert W. Ellenberg1-7/+7
2014-06-11canon: Added compile flag for debug statementsRobert W. Ellenberg1-40/+49
2014-06-11Housekeeping of circular arc testsRobert W. Ellenberg12-77/+24
2014-06-11canon: Fix for zero-angle bug in ARC_FEED causing rare maxvel violationRobert W. Ellenberg2-4/+11
2014-06-11Larger velocity tolerance on blend testRobert W. Ellenberg1-1/+1
2014-06-11canon: refactoring of some functions to use CANON_POSITION operatorsRobert W. Ellenberg1-63/+21
2014-06-11canon: Fixed full turn bug in ARC_FEEDRobert W. Ellenberg1-1/+4
2014-06-11Reverted to symmetrical test case valuesRobert W. Ellenberg1-4/+4
2014-06-11canon: bug fixes in ARC_FEED overhaulRobert W. Ellenberg1-39/+38
2014-06-11canon: Fixed difference operator in CANON_POSITIONRobert W. Ellenberg2-13/+12
2014-06-11Bulk overhaul of emccanonRobert W. Ellenberg1-317/+417
2014-06-11canon: Added set_xyz function in CANON_POSITIONRobert W. Ellenberg2-0/+10
2014-06-11canon: Added max function for CANON_POSITIONRobert W. Ellenberg2-0/+14
2014-06-11canon: Fixed subscript operator in CANON_POSITION to return proper referenceRobert W. Ellenberg2-13/+6
2014-06-11canon: Fixed XYZ function in CANON_POSITION to output correct valuesRobert W. Ellenberg1-2/+2
2014-06-11canon: added index operator to CANON_POSITION to return position of 0-index axisRobert W. Ellenberg2-0/+37
2014-06-11canon: moved CANON_POSITION to separate source file and added operatorsRobert W. Ellenberg7-45/+306
2014-06-11canon: refactor to simplify some operations without functional changesRobert W. Ellenberg2-39/+40
2014-06-11posemath: Misc. fixes to PM_CARTESIAN and other posemath operatorsRobert W. Ellenberg2-36/+51
2014-06-11Posemath overhaul: safe pass by constant reference where possibleRobert W. Ellenberg2-199/+97
2014-06-11Added some additional debug informationRobert W. Ellenberg1-1/+3
2014-06-11Fixed remaining maxvel violation due to incorrect angle in altitude calculationRobert W. Ellenberg5-1/+58
2014-06-11Slight maxvel violations found still in line-line blendingRobert W. Ellenberg1-4/+4
2014-06-11Fixed maxvel bug by correcting axis index for normal axisRobert W. Ellenberg1-5/+8
2014-06-11Canon trailing whitespace cleanupRobert W. Ellenberg1-10/+8
2014-06-11Corrected helical_length calculation bug introduced in canon refactorRobert W. Ellenberg1-16/+49
2014-06-11Added missing test files for uneven axis velRobert W. Ellenberg3-0/+230
2014-06-11Figure out the actual problem with canon / axis_lenRobert W. Ellenberg2-12/+13
2014-06-11Removed temp canon debug messagesRobert W. Ellenberg1-9/+0
2014-06-11Troubleshooting canonRobert W. Ellenberg2-17/+25
2014-06-11TP: mostly fixed maxvel issue, traced to canon changesRobert W. Ellenberg4-6/+34
2014-06-11Fixed div. by zero error in max velocity calculationRobert W. Ellenberg1-3/+6
2014-06-11Added default max feed scale valueRobert W. Ellenberg1-1/+1
2014-06-11Refactored vLimit into target velocity calculationRobert W. Ellenberg1-20/+12
2014-06-11TP: Switched feed override to drive requested velocityRobert W. Ellenberg1-10/+20