9618407aed
Merge branch 'devel' into repetier
...
Conflicts:
octoprint/server.py
2013-04-01 17:25:08 +02:00
d20aae6474
Added homepage to footer
2013-04-01 17:23:56 +02:00
1f06faa167
Update README.md
2013-03-30 18:31:17 +01:00
c01b49fbc7
Forgot to commit Font Awesome
2013-03-30 18:29:13 +01:00
cfdfad1c06
Changed color and font-size of footer
2013-03-30 18:28:24 +01:00
b5b023a29c
Merge remote-tracking branch 'splitbrain/footer' into devel
2013-03-30 18:22:33 +01:00
f70649b0d2
Removed a couple of redundancies for loadAndPrint button, actions are now disabled if they don't make sense
2013-03-30 18:21:49 +01:00
52bd2bee49
Merge remote-tracking branch 'daprice/load-and-print' into devel
2013-03-30 17:30:25 +01:00
f050567a1c
User thread lock instead of boolean to ensure only one concurrent sending thread, introduced wait flag for repetier printers
2013-03-29 22:17:44 +01:00
48a2fd71a7
More reliable initialization of communication with repetier
2013-03-26 07:25:16 +00:00
021f413c12
add "Load and Print" button which automatically starts printing when a gcode file is done loading.
...
Solves foosel/OctoPrint#91
2013-03-26 00:09:36 -05:00
71f3dbbdcc
add tooltips to file controls
2013-03-25 23:55:53 -05:00
9b2d166c6c
Prevents manual commands from interupting other commands
2013-03-25 14:01:48 -04:00
9314e83665
added footer
...
makes it faster, to refer to the OctoPrint site when problems occur.
2013-03-24 16:11:54 +01:00
4af360bbac
Merge pull request #85 from splitbrain/initscript
...
added init script
2013-03-24 06:16:04 -07:00
06cbe6081f
added init script
2013-03-24 13:16:17 +01:00
178b2f36d7
Only log the terminal output to disk if the "--debug" commandline switch is given
...
Otherwise slowdowns might be caused on Raspberry Pi when dumping all printer communication to SD
2013-03-17 22:32:35 +01:00
1477fb31fb
Merge branch 'devel'
2013-03-17 16:42:48 +01:00
192952c03f
Logging statements for timelapse creation
2013-03-17 16:31:20 +01:00
456ded3f36
Fixed off by one error in resend loop
2013-03-17 13:53:38 +01:00
ad1cbca22a
Added known error messages for checksum mismatches or expected line issues from Repetier to recognized "auto-correction" errors, made code around all that a bit more readable.
2013-03-17 10:58:34 +01:00
d6a83d174f
Overhauled resend handling to also work with alwaysSendChecksum feature. Also introduced new feature flag resetLineNumbersWithPrefixedN to make M110 commands send the target line number as part of their N prefix (Repetier), not as a separate N parameter (Marlin & co)
2013-03-16 18:25:39 +01:00
5e22b4b096
Reset currentLine when changing state to printing
...
This keeps gcodePos and current line in sync when changing status to "Printing"
2013-03-16 05:30:02 -03:00
e1d4832026
Moved configuration description to wiki and removed obsolete information regarding the repository rename.
2013-03-16 02:40:42 +01:00
45419422d7
Merge branch 'devel' into repetier
2013-03-16 02:26:00 +01:00
8543d628b5
New serial log at ~/.octoprint/logs/serial.log
...
Logs the same content as the terminal tab and is restricted to 2MB in size (hopefully).
Closes #77
2013-03-16 02:24:33 +01:00
8ef580cfd9
Two changes to try to achieve repetier firmware compatibility
...
- Read a "wait" as an empty line in order to send keep alive temperature updates
- Added option to add a checksum to all commands. Needed to add current line tracking for this, let's hope that we'll never get out of synch here...
2013-03-16 01:57:05 +01:00
7e595b27ed
Bugfix: configfile parameter was not properly used for settings in all cases
2013-03-16 01:48:28 +01:00
1e381cc793
Moved setup instructions for Raspbian to a wiki page.
2013-03-16 00:34:40 +01:00
3350b48a76
Merge remote-tracking branch 'origin/master' into devel
2013-03-16 00:32:18 +01:00
e08783c8bf
Merge remote-tracking branch 'daprice/master' into devel
2013-03-16 00:28:37 +01:00
dc5b8d9606
Update README.md
2013-03-16 00:17:12 +01:00
088253e564
work around a bug in iOS 6 where ajax requests get cached and only work once
2013-03-14 20:55:02 -05:00
625ad32f6c
Merge pull request #75 from daprice/master
...
Fix storing of ItemListHelper sorting/filtering in localStorage
2013-03-13 02:36:10 -07:00
d564176c9c
fix localStorage bug by not trying (and failing) to make it a multidimensional array; use JSON to store array of filters in localStorage
2013-03-13 03:01:18 -05:00
4b8260b933
Fixed some indentation
2013-03-11 21:46:05 +01:00
e2798de727
Merge branch 'daftscience-master' into devel
2013-03-11 21:15:27 +01:00
1afb690b8f
... it's been a long day.
2013-03-11 21:05:52 +01:00
b7a3105655
Smallish fixes for argparser
2013-03-11 21:04:56 +01:00
363f00775b
New config options for daemonization, configfile location and basedir location
...
Using --daemon {start|stop|restart} OctoPrint can now be daemonized/controlled in daemon mode. Via --pidfile it's possible to set the pidfile to use, --configfile allows specification of the config.yaml to use, --basedir specifies the location of the basedir from which to base off the upload, timelapse and log folders. I also updated the README to include some config file settings which were previously undocumented.
2013-03-11 21:00:43 +01:00
8570f73794
Merge branch 'master' into devel
2013-03-11 18:41:35 +01:00
f10e10f5b3
Converts commands uppercase
2013-03-11 10:39:03 -04:00
2904bd62d7
Enter key sends command
...
Sending a command also clears the field.
2013-03-11 10:38:41 -04:00
b23098a265
Fixed TimedTimelapse
...
Fixed access of interval attribute
2013-03-11 09:39:54 +01:00
09adb8dfda
Fixed TimedTimelapse
...
Interval parameter gets now accessed correctly
2013-03-11 09:38:36 +01:00
1ebc0c0ce9
Temporary workaround for the gcode viewer options not cooperating until those are integrated a bit more.
...
Targets #35 .
2013-03-10 22:06:08 +01:00
fe1e02a1de
Added run-as-daemon to the readme.
2013-03-10 21:33:45 +01:00
53d6ee2484
Added credits to daemon.py
2013-03-10 21:08:14 +01:00
54dcbd3cc6
Fixed some identation and an obsolete import
2013-03-10 21:02:47 +01:00
1b1f118646
Merge branch 'richardjm-daemon' into daemon
...
Conflicts:
octoprint/server.py
2013-03-10 19:11:16 +01:00
Gina Häußge