1caba2d634
Added git information to website
2013-06-29 13:41:39 +02: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
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
f041c6b4f3
First work on custom controls with printer feedback evaluation and presentation in the UI
2013-06-21 20:50:57 +02:00
5bf5d24dfc
Also include /dev/ttyAMA* in glob patterns for serial port
2013-06-21 15:03:32 +02:00
c8875fd0f1
Resend correct gcode line when resend is requested
2013-06-20 11:41:10 -04:00
7e015e6e18
Merge branch 'devel' into events
2013-06-19 20:39:01 +02:00
f9beb28b1d
Merge branch 'master' into devel
2013-06-19 20:38:38 +02:00
c24a66c361
Fixed signature for user view model. Closes #157
2013-06-19 20:36:50 +02:00
ecfdb37f93
Adding classes according to flipX, flipY settings and flipping using css
2013-06-19 02:39:49 +02:00
e8913e3141
Adding settings for webcam flipX and flipY
2013-06-19 00:42:43 +02:00
0e294ef8fd
Merge branch 'devel' into events
2013-06-18 21:44:30 +02:00
a4aacf6108
Merge branch 'CapnBry-extrudevol' into devel
2013-06-18 21:28:13 +02:00
7c85013389
Added filament diameter retrieval from gcode generated by Cura, fixed Slic3r version
2013-06-18 21:28:05 +02:00
e96765bc39
Merge branch 'master' into devel
...
Conflicts:
octoprint/static/css/octoprint.less
2013-06-17 22:12:45 +02:00
bcf8d54ff3
Merge remote-tracking branch 'origin/master'
2013-06-17 22:10:48 +02:00
6876438783
Fix for #153 backported from events branch
2013-06-17 22:10:14 +02:00
e32afe147a
Add extrusion volume calculation for Slic3r gcode files
2013-06-17 14:39:52 +00:00
33731464e5
Merge pull request #145 from daprice/master
...
Improve nav bar appearance when custom colors are used
2013-06-17 04:56:10 -07:00
d9fb3bb8f6
Added jquery.min.js locally to avoid depending on
...
internet connection on clients which may be
locally and offline
2013-06-17 00:11:17 +02:00
0e56952913
Finalized decoupling of timelapse from printer module, made sure timelapse is properly unregistered from eventbus on change
2013-06-16 22:42:18 +02:00
236e26979f
Switched Timelapses to using Eventbus instead of direct connection
2013-06-16 21:50:50 +02:00
ed9e93f379
Merge branch 'devel' into events
...
Conflicts:
octoprint/printer.py
octoprint/server.py
octoprint/util/comm.py
2013-06-16 11:50:52 +02:00
4994d488cf
Use span instead of button for upload buttons, otherwise FF and IE hiccup...
...
(cherry picked from commit ee3bc84
2013-06-16 11:39:20 +02:00
ee3bc84242
Use span instead of button for upload buttons, otherwise FF and IE hiccup...
2013-06-16 11:38:52 +02:00
e27b34a9f3
Hopefully fixed a off-by-one error...
2013-06-15 17:33:03 +02:00
Gina Häußge