Gina Häußge
cbde819e07
Better error reporting for timelapse rendering and system commands, updated pnotify and added possibility to add a "more" section to notifications
2014-05-26 22:51:45 +02:00
Gina Häußge
244128c7ed
Merge remote-tracking branch 'origin/devel' into devel
2014-05-25 20:19:03 +02:00
Gina Häußge
9c9b98dde4
Properly detect current file, forgot to adjust detection stuff in upload API after renaming things in the job tracking.
...
Thanks to Bryan Mayland for spotting this.
Closes #476
2014-05-25 20:18:41 +02:00
Gina Häußge
7bba1dc944
Merge pull request #473 from Salandora/EmergencyBug
...
Emergency Stop should not only trigger an event but also at least cancel the print
Closes #448
2014-05-22 12:33:32 +02:00
Salandora
59c859fb17
Bug fix for Emergency Stop
2014-05-22 11:46:42 +02:00
Gina Häußge
faa0521428
Renamed folder "watchdog" to "watched"
2014-05-19 18:02:24 +02:00
Gina Häußge
8886b20c01
And also forgot to push one more file
...
Kids, never code while on a moving train with a flaky internet connection, you tend to miss important things...
2014-05-19 18:00:57 +02:00
Gina Häußge
4810aec10d
Forgot to add new dependency on python watchdog
2014-05-19 17:55:52 +02:00
Salandora
deb1979ea9
Merge remote-tracking branch 'upstream/devel' into devel
2014-05-16 15:28:59 +02:00
Gina Häußge
4739c71ee0
Now using watchdog to monitor a "watchdog" folder for gcode or stl files being added
...
Use this to define a folder on your system from which to automatically import/move added files into OctoPrint.
Also now monitoring the uploads folder so that if files are removed externally during runtime, the metadata.yaml will be cleaned up.
2014-05-16 11:36:23 +02:00
Gina Häußge
030ffe6dce
GCODE viewer now interprets inverted axes for printer control and mirrors print bed accordingly.
...
Should enable people to set their axes origin so that the viewer matches what they see on their printer.
Should close #431
2014-05-14 22:48:56 +02:00
Gina Häußge
da19ad7943
Static endpoint in tornado for fetching the current webcam snaphot (authenticated users/apikey only)
2014-05-14 22:22:04 +02:00
Gina Häußge
e7088ef06c
Added automatic migration of old event subscription format to the new one
2014-05-14 12:59:57 +02:00
Gina Häußge
92c7f886df
Removed accidentally committed logging message
2014-05-14 09:36:20 +02:00
Gina Häußge
59727875db
Only interpret stand alone T{n} as a tool change command
...
Compare https://groups.google.com/forum/#!topic/octoprint/X8t1btetMmg
2014-05-14 09:19:50 +02:00
Gina Häußge
98063422de
Changed file search a bit (instant search) and made scroll bar adjust directly when file list changes
2014-05-13 17:59:24 +02:00
Gina Häußge
4ce4786a58
Also forgot to add md5 js lib
2014-05-13 16:26:41 +02:00
Gina Häußge
3eb9714e68
Forgot to add slimscroll jquery plugin
2014-05-13 16:25:56 +02:00
Gina Häußge
ee64dc38f6
Upgraded Font Awesome and introduced new file list
2014-04-28 22:11:56 +02:00
Salandora
6146c7e450
Merge pull request #4 from foosel/devel
...
Devel
2014-04-28 21:06:40 +02:00
Gina Häußge
73f0b9dabd
Always interpret negative duration as 0.
...
Negative durations, especially for print time left, might arise if estimation is estimating less than current print time. So we just erase that margin of error in the UI.
Closes #435
2014-04-18 14:21:27 +02:00
Gina Häußge
9ab4fa608a
Corrected typo for print bed command "offset", expected parameter is called "offset" not "offsets"
...
Compare #444
2014-04-18 14:03:38 +02:00
Gina Häußge
bf9d5efe43
Decrease image counter if an image could not be captured from webcam
...
Should keep rendering of timelapse from breaking if only a couple of images couldn't be captured due to whatever reason. Suggested by @midopple in #344
2014-04-01 22:32:10 +02:00
Gina Häußge
7b56b36564
Merge branch 'devel' into imrahil-print_time
2014-04-01 22:24:34 +02:00
Gina Häußge
6e107e6368
Start counting the layers at 1 instead of 0 in the gcode viewer.
...
Fixes #424
2014-04-01 22:18:35 +02:00
Gina Häußge
1a7a468eb6
Better error handling for capture issues during timelapsing
...
Should help debugging issue #425 and any future problems in that area.
2014-04-01 20:40:55 +02:00
Jarek Szczepanski
13e6070dd9
Added last print time to popover on file list
2014-03-31 13:14:18 +02:00
Gina Häußge
8cc8e45afd
Logging is now configurable via config-file
2014-03-31 12:16:42 +02:00
Gina Häußge
e373cde4f7
Some more work on the REST API documentation & set Location header on file upload response
2014-03-24 22:50:56 +01:00
Gina Häußge
072079df05
Further work on the REST API, documented most of /api/printer and while at it also fixed #365
2014-03-24 18:27:43 +01:00
Gina Häußge
22614f09a0
Merge branch 'devel' of github.com:foosel/OctoPrint into devel
2014-03-22 22:39:38 +01:00
Gina Häußge
c858c8f75b
Small adjustments to #407
...
- Refactored drawGrid into two functions drawRectangularGrid and drawCircularGrid
- Made sure grid for circular beds always "starts" at (0,0) so that e.g. for a radius of 105mm the center of the bed will be on the grid lines
- Made center on circular bed be better visible by making origin lines thicker
- Made initial focus on bed center properly
2014-03-22 22:36:11 +01:00
Gina Häußge
eb80aaf96d
Merge pull request #372 from brad/travis-ci
...
Basic travis config
2014-03-22 20:42:20 +01:00
Gina Häußge
ba7d0a60e4
Merge branch 'devel' into nullie-circular-beds
2014-03-22 20:39:42 +01:00
Gina Häußge
b266dc24d7
Merge pull request #419 from C-o-r-E/devel
...
Fix error where API state is requested and printer is offline
2014-03-22 20:35:03 +01:00
C-o-r-E
619fe9a0e7
Fix error where API state is requested and printer is offline
2014-03-17 23:04:57 -04:00
Gina Häußge
50cf776e70
Upped version
2014-03-15 20:37:17 +01:00
Gina Häußge
64dacc7c70
Merge remote-tracking branch 'origin/devel' into devel
2014-03-15 20:36:56 +01:00
Gina Häußge
f7c75442e7
Merge branch 'master' into devel
...
Conflicts:
src/octoprint/server/api/settings.py
src/octoprint/settings.py
src/octoprint/static/js/app/viewmodels/settings.js
src/octoprint/util/comm.py
2014-03-15 20:36:35 +01:00
Gina Häußge
293611287e
New setting for repetier to always assume SD card is present (since firmware does not report whether initialization succeeded via explicit message)
...
Fixes #289
2014-03-15 16:30:29 +01:00
Gina Häußge
6a2a1da5f9
Merge branch 'master' into devel
2014-03-15 10:20:37 +01:00
Gina Häußge
7ebbf5911c
Removed the scary start up message when called via run. I'll just keep that script around for sake of simplicity of running stand alone installations out of the pull dir, so why scare people...
2014-03-15 10:20:19 +01:00
Gina Häußge
254c3814d5
Merge pull request #415 from nullie/fix-temperature-table-size
...
Revert "Add box-sizing: border-box to temperature table th. Should fix #...
2014-03-14 16:50:39 +01:00
Gina Häußge
44c1920d9b
Merge pull request #414 from nullie/fix-actual-column-style
...
Fix style attribute for Actual column header, should fix #412
2014-03-14 16:17:07 +01:00
Ilya Novoselov
109372d10b
Fix style attribute for Actual column header, should fix #412
2014-03-14 21:01:04 +06:00
Ilya Novoselov
94847b846b
Revert "Add box-sizing: border-box to temperature table th. Should fix #412 "
...
This reverts commit 54b01d30da
2014-03-14 20:47:56 +06:00
Gina Häußge
3746332eb5
Merge pull request #413 from nullie/fix-temperature-table-size
...
Add box-sizing: border-box to temperature table th. Should fix #412
2014-03-14 14:36:37 +01:00
Ilya Novoselov
54b01d30da
Add box-sizing: border-box to temperature table th. Should fix #412
2014-03-14 16:52:07 +06:00
Gina Häußge
0509eb3f0a
Merge branch 'master' into devel
...
Conflicts:
setup.py
src/octoprint/gcodefiles.py
src/octoprint/printer.py
src/octoprint/server/ajax/control.py
src/octoprint/server/ajax/gcodefiles.py
src/octoprint/static/js/app/dataupdater.js
src/octoprint/static/js/app/main.js
src/octoprint/util/comm.py
2014-03-13 20:25:33 +01:00
Gina Häußge
d7e37cf658
origin is "sd" for files from the SD card, not "sdcard".
...
Fixes #411
2014-03-13 20:15:29 +01:00
