HCoop Git - clinton/Smoothieware.git/history - src/modules/utils/panel/screens/cnc/WatchScreen.cpp

HCoop / clinton / Smoothieware.git / history

[clinton/Smoothieware.git] / src / modules / utils / panel / screens / cnc / WatchScreen.cpp

2018-07-15	Jim Morris	Add Clear HOLD and HOLD display to panel (in cnc mode)	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-12-11	Jim Morris	Merge pull request #1071 from wolfmanjm/upstreamedge	blob \| commitdiff \| raw \| diff to current
2016-12-11	Jim Morris	ignore ! and ~ as pause and resume do not work	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 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 remote-tracking branch 'upstream/edge' into merge...	blob \| commitdiff \| raw \| diff to current
2016-10-23	Jim Morris	Merge remote-tracking branch 'upstream/edge' into featu...	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-10-16	Jim Morris	Merge remote-tracking branch 'upstream/edge' into featu...	blob \| commitdiff \| raw \| diff to current
2016-10-16	Jim Morris	Merge remote-tracking branch 'upstream/edge' into featu...	blob \| commitdiff \| raw \| diff to current
2016-10-14	Jim Morris	Merge remote-tracking branch 'upstream/edge' into featu...	blob \| commitdiff \| raw \| diff to current
2016-10-14	Jim Morris	Merge remote-tracking branch 'upstream/edge' into featu...	blob \| commitdiff \| raw \| diff to current
2016-10-13	Jim Morris	Merge remote-tracking branch 'upstream/edge' into featu...	blob \| commitdiff \| raw \| diff to current
2016-10-09	Jim Morris	Merge remote-tracking branch 'upstream/edge' into featu...	blob \| commitdiff \| raw \| diff to current
2016-10-07	Jim Morris	Merge remote-tracking branch 'upstream/edge' into featu...	blob \| commitdiff \| raw \| diff to current
2016-10-02	Jim Morris	Introduce concept of homed or not	blob \| commitdiff \| raw \| diff to current
2016-09-22	Jim Morris	Merge pull request #1029 from wolfmanjm/upstreamedge	blob \| commitdiff \| raw \| diff to current
2016-09-22	Jim Morris	Merge branch 'upstreamedge' into fix/inverse-transform	blob \| commitdiff \| raw \| diff to current
2016-09-22	Jim Morris	fix single entry ModifyValuesScreen when not immediate set	blob \| commitdiff \| raw \| diff to current
2016-09-21	Jim Morris	Merge branch 'upstreamedge' into fix/inverse-transform	blob \| commitdiff \| raw \| diff to current
2016-09-21	Jim Morris	Merge pull request #1028 from wolfmanjm/upstreamedge	blob \| commitdiff \| raw \| diff to current
2016-09-21	Jim Morris	fix watchscree	blob \| commitdiff \| raw \| diff to current
2016-09-13	Jim Morris	Merge pull request #1022 from wolfmanjm/features/laser...	blob \| commitdiff \| raw \| diff to current
2016-09-13	Jim Morris	update control screen for both 3dprinter and cnc uses...	blob \| commitdiff \| raw \| diff to current
2016-09-13	Jim Morris	Add laser menu	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-03	Jim Morris	Merge pull request #962 from wolfmanjm/upstreamedge	blob \| commitdiff \| raw \| diff to current
2016-07-03	Jim Morris	potentiall fix issue when filemant diamted or flow...	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	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-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-24	Jim Morris	fix using is queue empty when it should be is_idle	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-17	Jim Morris	Implement endstops using new motion control	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-06	Arthur Wolf	Merge pull request #933 from Smoothieware/edge	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-11	Jim Morris	Merge remote-tracking branch 'upstream/edge' into featu...	blob \| commitdiff \| raw \| diff to current
2016-05-09	Jim Morris	fix the actualy feedrate display on panel for cnc pendant	blob \| commitdiff \| raw \| diff to current
2016-05-08	Jim Morris	display in CNC pendant the requested feedrate and the...	blob \| commitdiff \| raw \| diff to current
2016-05-05	Jim Morris	Indicate if in inch or mm mode in watch screen	blob \| commitdiff \| raw \| diff to current
2016-04-30	Jim Morris	Merge branch 'upstreamedge' into test/encoder-direct...	blob \| commitdiff \| raw \| diff to current
2016-04-29	Jim Morris	add feed hold to status	blob \| commitdiff \| raw \| diff to current
2016-04-24	Jim Morris	allow for a default_excludes.mk file in src that will...	blob \| commitdiff \| raw \| diff to current
2016-04-24	Jim Morris	Make a CNC based watchscreen for panel, shows WCS and MCS	blob \| commitdiff \| raw \| diff to current
2016-04-24	Jim Morris	refactor panel screens into 3dprinter and cnc	blob \| commitdiff \| raw \| diff to current

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom