Commit graph

4553 commits

Author SHA1 Message Date
Gina Häußge
c7fd4809fd Fixed bug that made browser crash when trying to log in
Trying to serialize view models or browser events as username/password probably was not the best of ideas ;)
2015-08-24 16:57:08 +02:00
Gina Häußge
6de7eabca2 Fixed another merge error 2015-08-24 15:59:49 +02:00
Gina Häußge
2247f30c87 Fixed indentation after a merge error 2015-08-24 15:30:26 +02:00
Gina Häußge
ba6a6723a6 Settings dialog for new resend setting
(cherry picked from commit 4525a3a)
2015-08-24 14:59:51 +02:00
Gina Häußge
f9a0cb94f7 Moved new resend setting into feature section
That's where all other protocol specific settings are currently located.
Will be migrated at a later date into the printer profile instead (that
makes way more sense).
(cherry picked from commit d0f61e5)
2015-08-24 14:59:44 +02:00
Gina Häußge
e689a2c733 Handle Repetier resend repetitions
Repetier might resend the same resend request to make sure it arrives.
This commit makes OctoPrint not react to such a repeated request and
instead ignore up to a configurable amount of repeated requests for
the same (current) line.
(cherry picked from commit 6f83695)
2015-08-24 14:59:11 +02:00
Gina Häußge
d07c81f312 Fixed regex groups for GCODE parameters
(cherry picked from commit 168d32e)
2015-08-24 14:56:40 +02:00
Gina Häußge
32f4f8d95b Added warning to UI regarding Z timelapses and spiralized objects
(cherry picked from commit d956773)
2015-08-24 14:56:18 +02:00
Gina Häußge
7f2e0161a8 atomic_write context to save configs first to temp file, then move
Should prevent corruption of files
(cherry picked from commit c6d0290)
2015-08-24 14:56:12 +02:00
Gina Häußge
59993bfca4 Fixed & refactored temperature parsing
T-only lines were not properly parsed. Should now be fixed to
be associated to currently selected extruder. Also added unit
tests for the temperature parsing.

While at it also extracted regexes and added unit tests for command
parsing (gcode & parameters)
(cherry picked from commit f6a259f)
2015-08-24 14:55:42 +02:00
Salandora
0782dda20f Add Repetier's Format Error to exception whitelist
(cherry picked from commit d037379)
2015-08-24 14:54:28 +02:00
Gina Häußge
8c1a79558b Always include timelapse view model in bundled js files
Even if the webcam URLs and the FFMPEG path is not yet configured. Otherwise
setting those URLs and the path will require a restart of OctoPrint to enable properly -
that's overkill.
(cherry picked from commit 1425b20)
2015-08-24 14:52:50 +02:00
Mark Walker
0705a7054c Hint about why timelapse configuration is disabled
while printing.

Fixes #1028
(cherry picked from commit 8496827)
2015-08-24 14:51:55 +02:00
Gina Häußge
54bd7766b9 SWU: Don't use display versions for "current" in github_commit configs
(cherry picked from commit 58c6abc)
2015-08-24 14:51:25 +02:00
Gina Häußge
ed215fc5fa FileMgr: Only remove callback if it exists.
(cherry picked from commit 4a49948)
2015-08-24 14:45:14 +02:00
Gina Häußge
5f53b704dd Use connection closing flag only for exception handling
Otherwise we kill the beforePrinterDisconnected gcode script...

See #1021
(cherry picked from commit 2fe956e)
2015-08-24 14:44:56 +02:00
Gina Häußge
e8ef0ba8a4 Properly handle serial close on Macs
Readline could still be stuck in a read loop, leading to an exception on Mac
when closing the connection from another thread. This should now be captured
correctly.

Fixes #1021
(cherry picked from commit c829b27)
2015-08-24 14:44:31 +02:00
Salandora
49f62bc655 Fix positioning of ContextMenu
(cherry picked from commit 2bf5624)
2015-08-24 14:40:52 +02:00
Gina Häußge
4525a3a805 Settings dialog for new resend setting 2015-08-24 14:30:32 +02:00
Gina Häußge
d0f61e5073 Moved new resend setting into feature section
That's where all other protocol specific settings are currently located.
Will be migrated at a later date into the printer profile instead (that
makes way more sense).
2015-08-24 14:28:42 +02:00
Gina Häußge
168d32eb63 Fixed regex groups for GCODE parameters 2015-08-24 13:44:09 +02:00
Gina Häußge
6271bcfe05 Virtual printer now supports resend repetitions
If a new config setting is set, the virtual printer will now
resend the same resend request twice to allow testing the
comm layer behaviour in OctoPrint for being able to cope with
these possible repetitions like they can happen with Repetier.
2015-08-24 13:41:56 +02:00
Gina Häußge
6f836951b5 Handle Repetier resend repetitions
Repetier might resend the same resend request to make sure it arrives.
This commit makes OctoPrint not react to such a repeated request and
instead ignore up to a configurable amount of repeated requests for
the same (current) line.
2015-08-24 13:40:00 +02:00
Mark Walker
f519070d9c Clean up the comment 2015-08-22 18:38:01 -07:00
Mark Walker
e7584cdaac ClearableQueue redundant with self.close
Closing the printer connection and then reopening (when the users clicks
connect) will create a new fresh MachineCom object so the queues will
start out empty.  Plus ClearableQueue was even more tied to the Queue
implementation that the current _get/_put overrides.
2015-08-22 18:20:37 -07:00
Mark Walker
3d1d745581 Send M112 to printer immediately
Address #1031 with an immediate send of M112 followed by closing the
serial connection to reset the host state
2015-08-22 18:03:55 -07:00
Gina Häußge
d956773f04 Added warning to UI regarding Z timelapses and spiralized objects 2015-08-21 19:58:32 +02:00
Gina Häußge
c6d02903fa atomic_write context to save configs first to temp file, then move
Should prevent corruption of files
2015-08-21 19:52:31 +02:00
Gina Häußge
8dfb0cadd7 Forgot the contents of the ffmpegThreads template... 2015-08-21 19:10:17 +02:00
Gina Häußge
f1b2c43286 Merge branch 'devel' into dev/firstRunWizard 2015-08-21 18:40:21 +02:00
Gina Häußge
08c14e2e45 Wizard templates can now indicate they are mandatory
This will only style them in a special way and influence sorting. Plugins still need
to ensure that a step is not skipped through the use of the onWizardTabChange callback
in the view model.
2015-08-21 18:24:25 +02:00
Gina Häußge
990a44c7c9 Refactored cura settings dialog & fixed path check bug 2015-08-21 16:57:32 +02:00
Gina Häußge
9f591cbebe Merge pull request #1032 from Salandora/fixResend1
Fix Repetier Resend Request v2
2015-08-21 16:11:15 +02:00
Gina Häußge
d90c03377c Merge branch 'fixContextMenu' of https://github.com/Salandora/OctoPrint into pr/Salandora/fixContextMenu 2015-08-21 16:02:46 +02:00
Gina Häußge
f6a259fde3 Fixed & refactored temperature parsing
T-only lines were not properly parsed. Should now be fixed to
be associated to currently selected extruder. Also added unit
tests for the temperature parsing.

While at it also extracted regexes and added unit tests for command
parsing (gcode & parameters)
2015-08-21 15:47:03 +02:00
Salandora
d0373799ae Add Repetier's Format Error to exception whitelist 2015-08-21 12:51:09 +02:00
Gina Häußge
c5cc3d0394 DRY - let's use some snippets in the webcam settings
Makes the dialog components reusable for our wizard. Should probably
be done throughout...
2015-08-21 10:50:33 +02:00
Gina Häußge
b8fb16a074 flipH, flipV and rotate90 might be useful not only for the webcam_container 2015-08-21 10:44:30 +02:00
Gina Häußge
1007d18fd0 Reorganization of the webcam settings dialog 2015-08-21 10:32:11 +02:00
Gina Häußge
74e33cef01 Final touches to the core wizards and the cura wizard 2015-08-21 10:31:53 +02:00
Gina Häußge
1425b20bd6 Always include timelapse view model in bundled js files
Even if the webcam URLs and the FFMPEG path is not yet configured. Otherwise
setting those URLs and the path will require a restart of OctoPrint to enable properly -
that's overkill.
2015-08-21 10:30:03 +02:00
Gina Häußge
6691cc00a5 Documentation of the wizard plugins & slight refactoring 2015-08-20 12:50:45 +02:00
Gina Häußge
92c666400b If firstRun is true, ignore any seen wizards 2015-08-20 10:27:48 +02:00
Gina Häußge
9aa51d4f74 The settings enqueuing stuff for wizards was a stupid idea
Always save all settings from the client instead. Otherwise EVERY wizard needs its
own view model just to call that method...
2015-08-20 10:27:25 +02:00
Gina Häußge
3a6d577924 Fixed acl status handling & ffmpeg path in corewizard 2015-08-19 17:30:41 +02:00
Gina Häußge
3d5eb18530 Less verbose logging for view model calling helper 2015-08-19 17:30:07 +02:00
Gina Häußge
370231e128 Moved some things around and fixed a bug 2015-08-19 17:29:46 +02:00
Gina Häußge
b6b1bfd33b Allow programmatic login in the UI 2015-08-19 17:29:25 +02:00
Gina Häußge
c33fcdb124 Track already seen wizards 2015-08-19 17:28:23 +02:00
Gina Häußge
f4a952ebe6 Use new view model calling helper where possible 2015-08-19 11:48:22 +02:00