pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3877 commits 20 branches 22 tags 141 MiB
Commit graph

3877 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
e6d88a124d Merge branch 'maintenance' into devel 2016-07-28 15:21:06 +02:00
Gina Häußge
7c5cc8d256 Make sure we have at least two timestamps in lastmodified calculation 
Otherwise our max(*timestamps) call might fail
 2016-07-28 15:19:34 +02:00
Gina Häußge
aae01fe81b Merge branch 'maintenance' into devel 
Conflicts:
	CHANGELOG.md
	docs/api/fileops.rst
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/server/api/files.py
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/main.js
	src/octoprint/static/js/app/viewmodels/files.js
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/templates/sidebar/state.jinja2
	src/octoprint/util/comm.py
 2016-07-28 15:00:23 +02:00
Gina Häußge
e76a3ea54f maintenance is now 1.2.15.dev 2016-07-28 14:30:21 +02:00
Gina Häußge
14969e5508 Preparing release of 1.2.14 2016-07-28 12:15:22 +02:00
Gina Häußge
f671006582 Use circle instead of info symbol for print time left quality indicator 2016-07-28 11:37:27 +02:00
Gina Häußge
bd352f4658 Make sure to clear_to_send in timeout handling for active resends 2016-07-28 11:30:23 +02:00
Gina Häußge
046536dd70 If a line is filtered while printing, read next line to continue sending 
We want to make sure that while printing we always continue sending something,
either from the command queue or the printed file.
 2016-07-28 11:18:57 +02:00
Gina Häußge
f9cb29ac91 A bunch of documentation fixes and updates 2016-07-28 09:43:41 +02:00
Gina Häußge
fad2e8f1b8 Visual distinction of state panel UI clusters 2016-07-27 18:38:40 +02:00
Gina Häußge
f2ecb96c83 Add indicator of origin of print time left estimate to UI 2016-07-27 18:38:17 +02:00
Gina Häußge
0a81e8b161 Use centered text in progress bars 
* print progress shows percentage
  * upload progress shows what it always showed, but fully centered
  * GCODE viewer progress shows what it always showed, but fully centered
 2016-07-27 15:05:16 +02:00
Gina Häußge
eb822c83a3 Add LESS/CSS for (centered) text in progress bars & knockout helper 2016-07-27 15:04:07 +02:00
Gina Häußge
ec8427cbb8 Fix a bug causing the "Streaming ..." text to vanish on transfer to SD 2016-07-27 14:46:00 +02:00
Gina Häußge
3585eb05a2 Fix a tiny typo 2016-07-27 10:13:11 +02:00
Gina Häußge
1fd776153c Another attempt at saner print time estimation 
Seriously though, this topic is driving me nuts...

  * track origin of print time left estimate
  * less draconian threshold for estimation helper for all prints, not just
    sd prints
  * sanity check estimated/statistical total print time, if not sane force "dumb"
    estimate
  * force "dumb" estimate if no other estimate is available after set percentage or
    print time
 2016-07-26 18:06:21 +02:00
Gina Häußge
75012472a2 Revert "Synchronize access to selected file" 
This reverts commit b5e19f0676.
 2016-07-26 11:18:10 +02:00
Gina Häußge
55d5df7f14 Report CLOSED/CLOSED_WITH_ERROR states as "Offline" 
Provide error string for the latter case in state as well.
 2016-07-22 10:51:38 +02:00
Gina Häußge
6e73c31a68 Report correct printer state even after disconnecting 
Error string on close with error would get lost, that happens no longer
 2016-07-22 10:50:48 +02:00
Gina Häußge
d7ae147764 Tickle printer on timeout when idle and blocked 2016-07-22 09:46:58 +02:00
Gina Häußge
9eb1485e84 Add max timeouts configuration to settings 2016-07-21 18:46:54 +02:00
Gina Häußge
4f11f6362b Saner defaults for max timeouts 
10 max consecutive with 30s default communication timeout
is a bit too long to wait
 2016-07-21 18:46:34 +02:00
Gina Häußge
4f1a55c2df Added AWOL debug command to virtual printer 2016-07-21 16:25:49 +02:00
Gina Häußge
cfc5f45aa5 Merge branch 'maintenance' into fix/timeoutDetection 
Conflicts:
	src/octoprint/settings.py
	src/octoprint/util/comm.py
 2016-07-21 16:13:35 +02:00
Gina Häußge
2f26104b98 Better sleep debug command in virtual printer 2016-07-21 16:11:09 +02:00
Gina Häußge
b5e19f0676 Synchronize access to selected file 2016-07-21 16:10:57 +02:00
Gina Häußge
3614033b0d No endless circles if we can't write any bytes to serial 2016-07-21 16:10:00 +02:00
Gina Häußge
44ec821294 Track consecutive timeouts 
Should allow to detect if a device actually has gone missing.

See #1388
 2016-07-21 16:02:28 +02:00
Gina Häußge
c6225aa834 Introduce single output method in virtual printer for easier debugging 2016-07-21 13:25:39 +02:00
Gina Häußge
5d21399a73 Custom markdown filter, 3rd party one wasn't thread safe 2016-07-21 11:50:29 +02:00
Gina Häußge
b4e91c3ff8 Merge branch 'maintenance' into devel 2016-07-18 12:13:50 +02:00
Gina Häußge
d61371a495 Make sure to include all md files in manifest 2016-07-18 12:13:16 +02:00
Gina Häußge
6cbf189104 Added some developer information 2016-07-18 12:00:04 +02:00
Gina Häußge
cba742a94f Fix some more left-overs of py2<->py3 PRs 
Related to #1411, #1414 and #1415
 2016-07-15 12:46:53 +02:00
Gina Häußge
7ed1f4cb9e umask test also needs to use different octal syntax 
Related to #1414
 2016-07-15 12:37:11 +02:00
Gina Häußge
dc874d98ac Merge branch 'dev/python3E' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3E 
Conflicts:
	src/octoprint/server/__init__.py
	src/octoprint/users.py
	src/octoprint/util/jinja.py
 2016-07-15 12:32:24 +02:00
Gina Häußge
47b7acdfbc Merge branch 'dev/python3A' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3A 
Conflicts:
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/printer/standard.py
 2016-07-15 12:28:19 +02:00
Gina Häußge
e961234458 Explicitly use floor division where necessary 2016-07-15 11:42:01 +02:00
Gina Häußge
76a04cbe9d Merge branch 'dev/python3B' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3B 2016-07-15 11:28:55 +02:00
Gina Häußge
3cb045380e Merge pull request #1414 from ByReaL/dev/python3D 
python3: os.umask(002) to os.umask(0o002)
 2016-07-15 11:14:11 +02:00
Gina Häußge
31d56c11c1 Merge pull request #1413 from ByReaL/dev/python3C 
python3: xrange got removed from python 3
 2016-07-15 11:13:54 +02:00
MirceaDan
a48241d45e python3: iterators, bytes and next 
iteritems got removed items is to be used for python 2 and 3
compatibility , it returns a view in python 3 and must be casted to a
list if the list is needed.

bytes form builtins

using builtin function next is the compatible way between python 2 and 3
 2016-07-15 01:43:31 -07:00
MirceaDan
bf320a8c43 python3: os.umask(002) to os.umask(0o002) 
os.umask(0o002) is the python 2/3 way
 2016-07-15 01:18:11 -07:00
MirceaDan
3dae8d90d7 python3: xrange got removed from python 3 
python3 range is = python2 xrange
to make python 2 range = with python3 range i used teh future package
and did
from builtins import range
 2016-07-15 00:56:45 -07:00
MirceaDan
c33a9f9aa2 from __future__ import absolute_import, division, print_function 
changed the behavior to import division and print to be consistent
across all app and similar with python 3.x
 2016-07-15 00:16:58 -07:00
MirceaDan
149cc8c7c5 python 3 changes exceptions, queue and asesrtEqual 
1) import Queue is now lower caps

2) exceptions
except KeyError as e:

3) assertEquals is deprecated but assertEqual does exactly same thing
 2016-07-14 23:53:39 -07:00
Gina Häußge
c6a8e2beab Merge remote-tracking branch 'origin/devel' into devel 2016-07-14 19:49:08 +02:00
Gina Häußge
28814db207 Merge branch 'maintenance' into devel 
Conflicts:
	setup.py
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/printer/standard.py
 2016-07-14 19:47:38 +02:00
Gina Häußge
92f9ed465e Removed two unused locks from StateMonitor 2016-07-14 19:46:44 +02:00
Gina Häußge
0a8a7ba589 Fixed some imports 2016-07-14 19:43:22 +02:00