HCoop
/
clinton
/
Smoothieware.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Fixed bug where newlines were stripped by accident by putting them back in.
[clinton/Smoothieware.git]
/
src
/
main.cpp
2018-04-11
Jim Morris
Merge remote-tracking branch 'upstream/edge' into upstr...
blob
|
commitdiff
|
raw
2018-04-11
Jim Morris
Merge pull request #1305 from Smoothieware/fix/homing-ABC
blob
|
commitdiff
|
raw
2018-04-11
Jim Morris
make sure we define extruders before endstops for obscu...
blob
|
commitdiff
|
raw
2017-09-19
Grey Christoforo
Merge pull request #4 from JeffreyRodriguez/greyltc_ISR...
blob
|
commitdiff
|
raw
|
diff to current
2017-09-17
Jeff Rodriguez
Merged with current edge.
blob
|
commitdiff
|
raw
|
diff to current
2016-12-15
Jim Morris
Merge pull request #1055 from wolfmanjm/merge-abc-with...
blob
|
commitdiff
|
raw
|
diff to current
2016-12-15
Jim Morris
Merge remote-tracking branch 'upstream/edge' into merge...
blob
|
commitdiff
|
raw
|
diff to current
2016-12-11
Jim Morris
Merge remote-tracking branch 'upstream/edge' into merge...
blob
|
commitdiff
|
raw
|
diff to current
2016-11-27
Jim Morris
Merge remote-tracking branch 'upstream/edge' into merge...
blob
|
commitdiff
|
raw
|
diff to current
2016-11-15
Jim Morris
Merge remote-tracking branch 'upstream/edge' into merge...
blob
|
commitdiff
|
raw
|
diff to current
2016-11-13
Jim Morris
Merge remote-tracking branch 'upstream/edge' into merge...
blob
|
commitdiff
|
raw
|
diff to current
2016-11-12
Jim Morris
Merge remote-tracking branch 'upstream/edge' into merge...
blob
|
commitdiff
|
raw
|
diff to current
2016-11-11
Jim Morris
Merge remote-tracking branch 'upstream/edge' into merge...
blob
|
commitdiff
|
raw
|
diff to current
2016-11-09
Jim Morris
Merge remote-tracking branch 'upstream/edge' into upstr...
blob
|
commitdiff
|
raw
|
diff to current
2016-11-09
Jim Morris
Merge remote-tracking branch 'upstream/edge' into merge...
blob
|
commitdiff
|
raw
|
diff to current
2016-11-09
Jim Morris
Merge pull request #955 from Bouni/feature/spindle...
blob
|
commitdiff
|
raw
|
diff to current
2016-11-09
Jim Morris
Merge branch 'upstreamedge' into merge-abc-with-homing
blob
|
commitdiff
|
raw
|
diff to current
2016-11-09
Jim Morris
Merge remote-tracking branch 'upstream/edge' into merge...
blob
|
commitdiff
|
raw
|
diff to current
2016-11-01
Jim Morris
Merge branch 'feature/e-endstop' into merge-abc-with...
blob
|
commitdiff
|
raw
|
diff to current
2016-11-01
Jim Morris
Merge remote-tracking branch 'upstream/edge' into merge...
blob
|
commitdiff
|
raw
|
diff to current
2016-10-24
Jim Morris
Merge pull request #1048 from wolfmanjm/upstreamedge
blob
|
commitdiff
|
raw
|
diff to current
2016-10-24
Jim Morris
Make th enomsd build default to msd disabled
blob
|
commitdiff
|
raw
|
diff to current
2016-10-21
Jim Morris
Merge branch 'feature/e-endstop' into merge-abc-with...
blob
|
commitdiff
|
raw
|
diff to current
2016-10-21
Jim Morris
Merge remote-tracking branch 'upstream/edge' into featu...
blob
|
commitdiff
|
raw
|
diff to current
2016-09-05
Jim Morris
Merge remote-tracking branch 'upstream/edge' into featu...
blob
|
commitdiff
|
raw
|
diff to current
2016-08-08
Jim Morris
Merge remote-tracking branch 'upstream/edge' into featu...
blob
|
commitdiff
|
raw
|
diff to current
2016-08-08
Jim Morris
Merge remote-tracking branch 'upstream/edge' into featu...
blob
|
commitdiff
|
raw
|
diff to current
2016-08-07
Jim Morris
Merge remote-tracking branch 'upstream/edge' into featu...
blob
|
commitdiff
|
raw
|
diff to current
2016-08-07
Jim Morris
Merge pull request #994 from Smoothieware/add/new-laser
blob
|
commitdiff
|
raw
|
diff to current
2016-07-31
Jim Morris
initial implementation of new laser module
blob
|
commitdiff
|
raw
|
diff to current
2016-07-28
Jim Morris
implement parsing of A B C parameters for multi axis...
blob
|
commitdiff
|
raw
|
diff to current
2016-07-13
bouni
Merge branch 'edge' of github.com:Smoothieware/Smoothie...
blob
|
commitdiff
|
raw
|
diff to current
2016-07-04
bouni
merged latest edge branch and fixed the spindle module...
blob
|
commitdiff
|
raw
|
diff to current
2016-07-02
Jim Morris
Merge pull request #961 from wolfmanjm/upstreamedge
blob
|
commitdiff
|
raw
|
diff to current
2016-06-28
bouni
Merge branch 'edge' into feature/spindle-refactor
blob
|
commitdiff
|
raw
|
diff to current
2016-06-28
Jim Morris
Merge remote-tracking branch 'upstream/edge' into exper...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-28
Jim Morris
Merge pull request #907 from lordofhyphens/deltagrid_ca...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-27
bouni
merged latest edge
blob
|
commitdiff
|
raw
|
diff to current
2016-06-27
Jim Morris
comment out laser for now
blob
|
commitdiff
|
raw
|
diff to current
2016-06-26
Jim Morris
Merge remote-tracking branch 'upstream/edge' into featu...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-24
Jim Morris
Merge remote-tracking branch 'upstream/edge' into featu...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-21
Jim Morris
make the tick_info in Block a vector, assigning how...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-21
Jim Morris
move more modules to AHB0
blob
|
commitdiff
|
raw
|
diff to current
2016-06-21
bouni
Merge branch 'edge' of github.com:Smoothieware/Smoothie...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-17
Jim Morris
Merge remote-tracking branch 'upstream/edge' into featu...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-16
bouni
merged edge into feature/spindle-refactor branch
blob
|
commitdiff
|
raw
|
diff to current
2016-06-10
Jim Morris
Merge remote-tracking branch 'upstream/edge' into featu...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-07
Jim Morris
move where the stepticker debug pin is defined
blob
|
commitdiff
|
raw
|
diff to current
2016-06-06
Arthur Wolf
Merge pull request #933 from Smoothieware/edge
blob
|
commitdiff
|
raw
|
diff to current
2016-06-01
Jim Morris
Merge branch 'upstreamedge' into feature/acceleration...
blob
|
commitdiff
|
raw
|
diff to current
2016-05-30
Jim Morris
Merge remote-tracking branch 'upstream/edge' into featu...
blob
|
commitdiff
|
raw
|
diff to current
2016-05-28
Jim Morris
Merge remote-tracking branch 'upstream/edge' into merge...
blob
|
commitdiff
|
raw
|
diff to current
2016-05-28
Jim Morris
Merge pull request #921 from wolfmanjm/feature/cnc...
blob
|
commitdiff
|
raw
|
diff to current
2016-05-25
Jim Morris
attempt to fix the issues regarding the job q drying...
blob
|
commitdiff
|
raw
|
diff to current
2016-05-23
Arthur Wolf
Merge pull request #929 from Smoothieware/edge
blob
|
commitdiff
|
raw
|
diff to current
2016-05-14
Jim Morris
Inital rewrite of stepticker and associated code to...
blob
|
commitdiff
|
raw
|
diff to current
2016-05-13
Jim Morris
print out CNC build if a CNC build
blob
|
commitdiff
|
raw
|
diff to current
2016-03-08
Jim Morris
Merge remote-tracking branch 'upstream/edge' into upstr...
blob
|
commitdiff
|
raw
|
diff to current
2016-03-08
Jim Morris
Merge pull request #868 from tritao/typos
blob
|
commitdiff
|
raw
|
diff to current
2016-03-08
Joao Matos
Fixed some typos and minor consistency issues.
blob
|
commitdiff
|
raw
|
diff to current
2016-02-28
Jim Morris
Merge pull request #864 from wolfmanjm/rdelta/improve...
blob
|
commitdiff
|
raw
|
diff to current
2016-02-28
Jim Morris
create ROatryDEltaCalibration module
blob
|
commitdiff
|
raw
|
diff to current
2016-02-25
Jim Morris
Merge pull request #862 from wolfmanjm/upstreamedge
blob
|
commitdiff
|
raw
|
diff to current
2016-02-25
Jim Morris
make module.h include platform_memory.h so if any modul...
blob
|
commitdiff
|
raw
|
diff to current
2016-02-24
Jim Morris
Merge pull request #861 from wolfmanjm/upstreamedge
blob
|
commitdiff
|
raw
|
diff to current
2016-02-24
Jim Morris
fix more delete crashes when object is in AHB0
blob
|
commitdiff
|
raw
|
diff to current
2016-02-24
Jim Morris
Merge pull request #860 from wolfmanjm/upstreamedge
blob
|
commitdiff
|
raw
|
diff to current
2016-02-24
Jim Morris
fix discrepanceis in realtime postion vs last milestone...
blob
|
commitdiff
|
raw
|
diff to current
2016-02-22
Jim Morris
Merge pull request #851 from wolfmanjm/feature/correct...
blob
|
commitdiff
|
raw
|
diff to current
2016-02-21
Jim Morris
Merge remote-tracking branch 'upstream/edge' into featu...
blob
|
commitdiff
|
raw
|
diff to current
2016-02-21
Jim Morris
Merge pull request #854 from Smoothieware/fix/when...
blob
|
commitdiff
|
raw
|
diff to current
2016-02-21
Jim Morris
Merge branch 'fix/when-slow-ticker-is-started' into...
blob
|
commitdiff
|
raw
|
diff to current
2016-02-21
Jim Morris
fix when slow ticker gets started
blob
|
commitdiff
|
raw
|
diff to current
2016-02-21
Jim Morris
move some high memory use modules to AHB0 as we started...
blob
|
commitdiff
|
raw
|
diff to current
2016-02-19
Jim Morris
Fix command line error if command not handled in Simple...
blob
|
commitdiff
|
raw
|
diff to current
2016-01-12
Jim Morris
Merge pull request #811 from quillford/patch-1
origin/archive/touchprobe
blob
|
commitdiff
|
raw
|
diff to current
2016-01-12
Jim Morris
Merge pull request #823 from wolfmanjm/upstreamedge
blob
|
commitdiff
|
raw
|
diff to current
2016-01-07
Jim Morris
append NOMSD to version if a nomsd build
blob
|
commitdiff
|
raw
|
diff to current
2015-12-24
bouni
fixed minor merging problems
blob
|
commitdiff
|
raw
|
diff to current
2015-12-24
bouni
removed old commented out lines that are no longer...
blob
|
commitdiff
|
raw
|
diff to current
2015-12-24
bouni
merged Smothieware Master into spindle-refactor branch
blob
|
commitdiff
|
raw
|
diff to current
2015-12-14
Jim Morris
Merge remote-tracking branch 'upstream/edge' into upstr...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-29
Arthur Wolf
Merge pull request #749 from justinledwards/patch-1
blob
|
commitdiff
|
raw
|
diff to current
2015-11-29
Jim Morris
Merge pull request #773 from wolfmanjm/add/SPI-driver...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-29
Jim Morris
Merge remote-tracking branch 'upstream/edge' into add...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-23
Jim Morris
Merge remote-tracking branch 'upstream/edge' into add...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-22
Jim Morris
Merge remote-tracking branch 'upstream/edge' into add...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-22
errolt
Merge remote-tracking branch 'upstream/edge' into edge
blob
|
commitdiff
|
raw
|
diff to current
2015-11-20
Jim Morris
uppercse the exclusion define for motorcontrolsetup
blob
|
commitdiff
|
raw
|
diff to current
2015-11-13
Jim Morris
Merge remote-tracking branch 'upstream/edge' into add...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-13
Jim Morris
Merge remote-tracking branch 'upstream/edge' into add...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-13
Jim Morris
Merge pull request #768 from Smoothieware/refactor...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-13
Jim Morris
Remove play/pause
blob
|
commitdiff
|
raw
|
diff to current
2015-11-12
Jim Morris
added debug output
blob
|
commitdiff
|
raw
|
diff to current
2015-11-11
Jim Morris
Initial creation of th emotor controller module
blob
|
commitdiff
|
raw
|
diff to current
2015-11-10
Errol
Merge branch 'edge' of https://github.com/errolt/Smooth...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-10
Jim Morris
Merge pull request #763 from wolfmanjm/feature/enable...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-09
Jim Morris
allow both DFU and watchdog
blob
|
commitdiff
|
raw
|
diff to current
2015-11-09
Jim Morris
make watch dog timeout enter mri mode
blob
|
commitdiff
|
raw
|
diff to current
2015-11-09
Jim Morris
Merge remote-tracking branch 'upstream/edge' into featu...
blob
|
commitdiff
|
raw
|
diff to current
next