0ed8f0f28d
Fixed typo, better error handling.
2013-06-29 20:39:49 +02:00
42f2398ac1
Only auto-connect if configured port is available at server startup. Also bugfixes.
2013-06-29 20:28:37 +02:00
8231e70b44
Added tab in settings for serial connection options
2013-06-29 20:20:27 +02:00
b0518a71a3
Also provide access to the auto-connect setting in the connection and the settings dialog
2013-06-29 19:57:46 +02:00
30e1624127
Merge remote-tracking branch 'CapnBry/autoconnect' into devel
2013-06-29 19:16:10 +02:00
9607de7d17
Removed matchesGcode again since it's not needed anymore
2013-06-29 19:09:55 +02:00
a9c35e5cf9
Changed gcode regex slightly to be on the safe side (we don't want to accidentally capture comments etc)
2013-06-29 19:06:14 +02:00
5b976b5300
Merge branch 'devel' into CapnBry-sendperf
...
Conflicts:
octoprint/util/__init__.py
2013-06-29 18:38:23 +02:00
530cdcd26a
Some refactoring (grouping methods, extracting classes, etc)
2013-06-29 18:37:47 +02:00
747fc4acc4
More in-source documentation for events
2013-06-29 14:33:05 +02:00
5ee2b41bfa
Merge branch 'master' into devel
2013-06-29 14:32:40 +02:00
2992438249
Just in case something goes wrong during reading the git repo information...
...
(cherry picked from commit 04ce284
2013-06-29 13:46:22 +02:00
e2bfdfd10c
Added git information to website
...
(cherry picked from commit 1caba2d
2013-06-29 13:46:12 +02:00
04ce284085
Just in case something goes wrong during reading the git repo information...
2013-06-29 13:43:45 +02:00
1caba2d634
Added git information to website
2013-06-29 13:41:39 +02:00
eb565645eb
Remove profiling code
2013-06-28 14:19:35 -04:00
b9144c2edc
Microoptimization to not build the same string twice
2013-06-28 14:19:34 -04:00
cb30d1fdd0
Refactor send command gcode handlers into individual functions. Very little gain if any.
2013-06-28 14:19:34 -04:00
b1c5c58f02
Rename gfunc -> gcode
2013-06-28 14:19:34 -04:00
715eb142f8
gcodeToEvent can only fire one event per gcode function anyway. <1% performance increase.
2013-06-28 14:19:33 -04:00
b5661c6f5e
Remove unused comm logQueue. 18% performance increase (12% vs baseline)
2013-06-28 14:19:33 -04:00
905923cc4c
Switch ringbuffer lists for deques. 6% performance boost (4.5% vs baseline)
2013-06-28 14:19:33 -04:00
9dd754fdae
Remove matchesGcode and instead just parse the code once. 29% performance increase
2013-06-28 14:19:32 -04:00
1b45d15430
Merge branch 'master' into devel
...
Conflicts:
octoprint/util/comm.py
2013-06-27 21:51:09 +02:00
dd3e9030fa
Yet another fix for the M999 resend issue
...
Should hopefully now be also fixed in case of a newly established connection with the printer, which was a regression due to the fix of the resending code.
2013-06-27 21:12:06 +02:00
24bb0fdf05
Added missing return statement that caused an exception
2013-06-27 21:05:01 +02:00
b75a0ec5c3
Add a serial.autoconnect setting to connect to the printer on startup
2013-06-26 10:19:32 -04:00
8b384ef530
Small rewording
2013-06-25 22:00:52 +02:00
ae438ca03f
Fixed evaluation of "remember login" function
2013-06-25 20:09:40 +02:00
09ae8fcdc2
Always send M110 with the new line number (default 0)
...
Previously it worked since the first command of every print was forced to be an M110 and the line number at the beginning of each print was always forced back to 0 as well. Now it just uses the actual line number (increased on each sent of a checksumed/numbered line) and resets that when an M110 is encountered. What was missing was forcing the line number of the actual M110 command to the desired line number as well. Should be "more correct" than before now, and work.
2013-06-25 20:05:31 +02:00
c9fb4e1ded
Also send identity_changed event on passive login
...
(cherry picked from commit 695f3f3
2013-06-25 19:32:05 +02:00
695f3f391c
Also send identity_changed event on passive login
2013-06-25 19:07:43 +02:00
ce9557798b
Fixing #166 showed a deeper rooted issue with line number handling introduced with repetier/sdcard/gcodestreaming
...
Something like three wrongs led to one right. Core issue (not starting with line 0 but line 1 and not using the current line but the current line from the gcode file being sent, regardless of reset by M110) should now be rooted out.
2013-06-24 22:09:40 +02:00
e5389d0f0f
Reverted bbad030a92
...
Correct in devel branch, wrong in master branch (different counting).
Closes #166
2013-06-24 18:24:45 +02:00
bd61d45e27
Missed the settings when changing api -> allow to api -> enabled
2013-06-24 17:48:13 +02:00
6989613b99
Moved printer state to API endpoint, made apikey instead of login necessary
2013-06-23 21:24:19 +02:00
599bca12a9
Changed api > allow to api > enabled for consistency
2013-06-23 19:48:12 +02:00
e17fa031c8
Return proper http status codes in case of problems
2013-06-23 16:57:38 +02:00
c6e15a7d32
Merge branch 'richardjm-devel' into devel
...
Conflicts:
octoprint/server.py
octoprint/settings.py
octoprint/templates/index.jinja2
2013-06-23 16:09:31 +02:00
31045b4c25
Merge branch 'peteruithoven-master' into devel
...
Conflicts:
octoprint/timelapse.py
2013-06-23 14:58:58 +02:00
329656837a
Renamed flipX, flipY to flipH, flipV, made update upon change instant, also made timelapse video reflect flipped webcam
2013-06-23 14:57:48 +02:00
a9ec4336de
More errors == more error events
2013-06-22 15:13:44 +02:00
79f2cd0e31
Merge branch 'devel' into events
...
Conflicts:
octoprint/util/comm.py
2013-06-22 15:08:53 +02:00
50914df07a
Made communication mode more error resilient
2013-06-22 15:03:01 +02:00
66ddf77be8
Be able to cope with M999 causing a Resend: 1
...
(cherry picked from commit 8b702db
2013-06-22 09:39:13 +02:00
8b702db0d0
Be able to cope with M999 causing a Resend: 1
2013-06-22 09:36:21 +02:00
40b4bfad85
Merge branch 'feedbackCommands' into devel
2013-06-21 23:19:25 +02:00
6600eea1a2
Feedback commands now work
2013-06-21 23:19:15 +02:00
bbad030a92
Resend correct gcode line when resend is requested
...
(manually cherry picked from commit c8875fd
2013-06-21 21:09:39 +02:00
94316fbcc1
Merge remote-tracking branch 'CapnBry/resendfix' into devel
2013-06-21 21:03:59 +02:00
Gina Häußge