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

HCoop / clinton / Smoothieware.git / history

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

2015-12-14	Jim Morris	Merge remote-tracking branch 'upstream/edge' into upstr...	blob \| commitdiff \| raw
2015-11-29	Arthur Wolf	Merge pull request #749 from justinledwards/patch-1	blob \| commitdiff \| raw
2015-11-22	errolt	Merge remote-tracking branch 'upstream/edge' into edge	blob \| commitdiff \| raw
2015-11-13	Jim Morris	Merge remote-tracking branch 'upstream/edge' into add...	blob \| commitdiff \| raw
2015-11-13	Jim Morris	Merge pull request #768 from Smoothieware/refactor...	blob \| commitdiff \| raw
2015-11-13	Jim Morris	Remove play/pause	blob \| commitdiff \| raw
2015-09-23	Jim Morris	Merge pull request #740 from wolfmanjm/feature/abort_he...	blob \| commitdiff \| raw \| diff to current
2015-09-23	Jim Morris	refactor ON_HALT, add THEKERNEL->is_halted() for module...	blob \| commitdiff \| raw \| diff to current
2015-09-13	Jim Morris	Merge branch 'feature/soft_soft_endstops' of https...	blob \| commitdiff \| raw \| diff to current
2015-09-13	Jim Morris	Merge remote-tracking branch 'upstream/edge' into devel...	blob \| commitdiff \| raw \| diff to current
2015-09-13	Jim Morris	Merge pull request #732 from wolfmanjm/refactor/get...	blob \| commitdiff \| raw \| diff to current
2015-09-13	Jim Morris	refactor get public data, to be slightly easier to...	blob \| commitdiff \| raw \| diff to current
2015-09-13	Jim Morris	Merge pull request #731 from wolfmanjm/refactor/switch...	blob \| commitdiff \| raw \| diff to current
2015-09-13	Jim Morris	Merge remote-tracking branch 'upstream/development...	blob \| commitdiff \| raw \| diff to current
2015-09-13	Jim Morris	have caller supply data location for returned state...	blob \| commitdiff \| raw \| diff to current
2015-09-13	Jim Morris	Merge pull request #727 from wolfmanjm/modify/temperatu...	blob \| commitdiff \| raw \| diff to current
2015-09-13	Jim Morris	Merge pull request #730 from wolfmanjm/fix/suspend...	blob \| commitdiff \| raw \| diff to current
2015-09-12	Jim Morris	Merge branch 'modify/temperature-switch-edge-detection...	blob \| commitdiff \| raw \| diff to current
2015-09-12	Jim Morris	Merge pull request #728 from Smoothieware/fix/temperatu...	blob \| commitdiff \| raw \| diff to current
2015-09-12	Jim Morris	Fix the order of parameters for temperature request	blob \| commitdiff \| raw \| diff to current
2015-09-12	Jim Morris	change the temperature public data access to pass in...	blob \| commitdiff \| raw \| diff to current
2015-09-12	Jim Morris	interating temperature controllers was done wrong....	blob \| commitdiff \| raw \| diff to current
2015-01-21	Arthur Wolf	Merge pull request #552 from lautr3k/module/Drills	blob \| commitdiff \| raw \| diff to current
2014-12-17	Jim Morris	Merge pull request #559 from wolfmanjm/feature/suspend...	blob \| commitdiff \| raw \| diff to current
2014-12-17	Jim Morris	add suspended status to panel	blob \| commitdiff \| raw \| diff to current
2014-12-16	Jim Morris	Added suspend and pause console commands	blob \| commitdiff \| raw \| diff to current
2014-12-09	Jim Morris	Merge pull request #553 from wolfmanjm/fix/abort	blob \| commitdiff \| raw \| diff to current
2014-12-09	Jim Morris	Merge remote-tracking branch 'upstream/edge' into fix...	blob \| commitdiff \| raw \| diff to current
2014-12-07	Jim Morris	call base class main loop	blob \| commitdiff \| raw \| diff to current
2014-11-29	Jim Morris	Merge branch 'edge'	blob \| commitdiff \| raw \| diff to current
2014-11-09	Jim Morris	Merge pull request #545 from Smoothieware/add/P1.23...	blob \| commitdiff \| raw \| diff to current
2014-11-05	Jim Morris	Merge pull request #542 from wolfmanjm/add/clear-block...	blob \| commitdiff \| raw \| diff to current
2014-11-05	Jim Morris	clean up some code, save some more ram	blob \| commitdiff \| raw \| diff to current
2014-11-03	Jim Morris	Add halt status to panel and a way to clear it	blob \| commitdiff \| raw \| diff to current
2014-11-03	Jim Morris	Merge remote-tracking branch 'upstream/edge' into featu...	blob \| commitdiff \| raw \| diff to current
2014-10-26	Jim Morris	Merge pull request #537 from wolfmanjm/upstreamedge	blob \| commitdiff \| raw \| diff to current
2014-10-26	Jim Morris	add icons for hotends 2 and 3	blob \| commitdiff \| raw \| diff to current
2014-10-26	Jim Morris	Merge pull request #536 from wolfmanjm/feature/more...	blob \| commitdiff \| raw \| diff to current
2014-10-26	Jim Morris	Add multiple temps to panel watchscreen if there are...	blob \| commitdiff \| raw \| diff to current
2014-09-30	Arthur Wolf	Merge branch 'edge' of https://github.com/Smoothieware...	blob \| commitdiff \| raw \| diff to current
2014-09-30	Jim Morris	Merge pull request #517 from wolfmanjm/add/viki2	blob \| commitdiff \| raw \| diff to current
2014-09-27	Jim Morris	add a LED_HOT that gets set if the temp of hotend or...	blob \| commitdiff \| raw \| diff to current
2014-09-15	Jim Morris	Merge pull request #511 from Smoothieware/edge	blob \| commitdiff \| raw \| diff to current
2014-08-20	Jim Morris	Merge pull request #491 from soldierkam/edge	blob \| commitdiff \| raw \| diff to current
2014-08-14	Jim Morris	Merge pull request #486 from wolfmanjm/optimize/optiona...	blob \| commitdiff \| raw \| diff to current
2014-08-14	Jim Morris	don't disdplay tmperatures on panel if no heaters	blob \| commitdiff \| raw \| diff to current
2014-08-13	Jim Morris	Merge pull request #484 from wolfmanjm/features/add...	blob \| commitdiff \| raw \| diff to current
2014-08-13	Jim Morris	add on_exit to panelscreen	blob \| commitdiff \| raw \| diff to current
2014-06-29	Jim Morris	Merge branch 'edge'	blob \| commitdiff \| raw \| diff to current
2014-06-15	Jim Morris	Merge pull request #425 from klocs/edge	blob \| commitdiff \| raw \| diff to current
2014-06-14	Jim Morris	Merge pull request #423 from wolfmanjm/upstreamedge	blob \| commitdiff \| raw \| diff to current
2014-06-14	Jim Morris	Public data does not need to be a module or have an...	blob \| commitdiff \| raw \| diff to current
2014-05-31	Jim Morris	Merge pull request #407 from wolfmanjm/panel/add-settin...	blob \| commitdiff \| raw \| diff to current
2014-05-31	Jim Morris	Enumerate hotends for display in panel temperature...	blob \| commitdiff \| raw \| diff to current
2014-05-30	Jim Morris	Initial addition of settings and temperature control...	blob \| commitdiff \| raw \| diff to current
2014-05-24	Jim Morris	Merge remote-tracking branch 'upstream/edge' into upstr...	blob \| commitdiff \| raw \| diff to current
2014-05-24	Jim Morris	Merge pull request #401 from wolfmanjm/fix/cleanup...	blob \| commitdiff \| raw \| diff to current
2014-05-24	Jim Morris	cleanup a bunch of fields that should be private	blob \| commitdiff \| raw \| diff to current
2014-05-24	Logxen	Merge pull request #399 from Smoothieware/edge	blob \| commitdiff \| raw \| diff to current
2014-04-23	Logxen	Merge branch 'edge' into multitool	blob \| commitdiff \| raw \| diff to current
2014-04-12	Jim Morris	Merge pull request #368 from wolfmanjm/add/universal...	blob \| commitdiff \| raw \| diff to current
2014-04-12	Jim Morris	Merge remote-tracking branch 'upstream/edge' into add...	blob \| commitdiff \| raw \| diff to current
2014-04-11	Jim Morris	Merge remote-tracking branch 'upstream/edge' into add...	blob \| commitdiff \| raw \| diff to current
2014-04-09	Jim Morris	enable led for fan	blob \| commitdiff \| raw \| diff to current
2014-04-01	Jim Morris	Merge pull request #355 from wolfmanjm/upstreamedge	blob \| commitdiff \| raw \| diff to current
2014-04-01	Jim Morris	on panel Only show fan icon if fan is on	blob \| commitdiff \| raw \| diff to current
2014-03-30	Jim Morris	Merge pull request #350 from wolfmanjm/fix/tabs-in...	blob \| commitdiff \| raw \| diff to current
2014-03-30	Jim Morris	Allow TABS in config	blob \| commitdiff \| raw \| diff to current
2014-02-19	Logxen	Merge branch 'switch' into edge	blob \| commitdiff \| raw \| diff to current
2014-01-24	Michael Moon	Merge branch 'master' into edge	blob \| commitdiff \| raw \| diff to current
2014-01-19	Michael Moon	Merge branch 'feature/ActionQueue_redux' into edge	blob \| commitdiff \| raw \| diff to current
2014-01-17	Michael Moon	Misc cleanups: turns out, conveyor can quite happily...	blob \| commitdiff \| raw \| diff to current
2013-12-27	Michael Moon	Replace all doubles with floats including some constants	blob \| commitdiff \| raw \| diff to current
2013-12-23	Jim Morris	Merge pull request #298 from wolfmanjm/upstreamedge	blob \| commitdiff \| raw \| diff to current
2013-12-23	Jim Morris	Panel displays Printing when getting gcodes from pronte...	blob \| commitdiff \| raw \| diff to current
2013-12-22	Jim Morris	Merge pull request #295 from wolfmanjm/feature/uip...	blob \| commitdiff \| raw \| diff to current
2013-12-22	Jim Morris	Merge Network code with webserver etc	blob \| commitdiff \| raw \| diff to current
2013-12-22	Jim Morris	Merge branch 'upstreamedge' into upstream-master	blob \| commitdiff \| raw \| diff to current
2013-11-07	Jim Morris	Merge pull request #271 from wolfmanjm/fix/panel-scrolling	blob \| commitdiff \| raw \| diff to current
2013-11-07	Jim Morris	Change the way the panel scrolls with long lists like...	blob \| commitdiff \| raw \| diff to current
2013-11-07	Jim Morris	Merge pull request #270 from wolfmanjm/upstreamedge	blob \| commitdiff \| raw \| diff to current
2013-11-07	Jim Morris	reformat and cleanup panel screen code	blob \| commitdiff \| raw \| diff to current
2013-10-03	Jim Morris	Merge pull request #244 from wolfmanjm/fix/lcd-progress	blob \| commitdiff \| raw \| diff to current
2013-10-03	Jim Morris	fix typo	blob \| commitdiff \| raw \| diff to current
2013-10-03	Jim Morris	Show printed sd filename even if started from console	blob \| commitdiff \| raw \| diff to current
2013-10-03	Jim Morris	convert playing counts to unsigne dlong	blob \| commitdiff \| raw \| diff to current
2013-10-03	Jim Morris	Merge pull request #234 from TopherMan/feature/M26	blob \| commitdiff \| raw \| diff to current
2013-09-24	Jim Morris	Merge pull request #240 from wolfmanjm/upstreamedge	blob \| commitdiff \| raw \| diff to current
2013-09-24	Jim Morris	add M117 to add an arbitrary LCD message	blob \| commitdiff \| raw \| diff to current
2013-09-13	Jim Morris	Merge pull request #230 from TopherMan/feature/M27more	blob \| commitdiff \| raw \| diff to current
2013-09-13	Jim Morris	Merge pull request #229 from wolfmanjm/upstreamedge	blob \| commitdiff \| raw \| diff to current
2013-09-13	Jim Morris	Fix speed changing via panel, just donlt swicth away...	blob \| commitdiff \| raw \| diff to current
2013-08-27	Jim Morris	Merge pull request #219 from wolfmanjm/fix/pid2	blob \| commitdiff \| raw \| diff to current
2013-08-27	Jim Morris	Make PID work like arduino pid library and more like...	blob \| commitdiff \| raw \| diff to current
2013-08-08	Jim Morris	Merge pull request #215 from wolfmanjm/upstreamedge	blob \| commitdiff \| raw \| diff to current
2013-08-08	Jim Morris	make minimum M220 speed 10% otherwise wierd things...	blob \| commitdiff \| raw \| diff to current
2013-08-07	Jim Morris	Merge pull request #212 from wolfmanjm/fix/glcd-frambuffer	blob \| commitdiff \| raw \| diff to current
2013-08-07	Jim Morris	move glcd framebuffer into USB RAM as there is not...	blob \| commitdiff \| raw \| diff to current
2013-08-03	Jim Morris	Merge pull request #207 from wolfmanjm/optimize/glcd...	blob \| commitdiff \| raw \| diff to current
2013-08-03	Jim Morris	Optimize graphic font rendering for glc, using x aligne...	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom