q3k/OctoPrint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1389 commits 1 branch 0 tags 18 MiB
Commit graph

361 commits

Author SHA1 Message Date
Gina Häußge
ae438ca03f Fixed evaluation of "remember login" function 2013-06-25 20:09:40 +02:00
Gina Häußge
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
Gina Häußge
c9fb4e1ded Also send identity_changed event on passive login 
(cherry picked from commit 695f3f3)
 2013-06-25 19:32:05 +02:00
Gina Häußge
695f3f391c Also send identity_changed event on passive login 2013-06-25 19:07:43 +02:00
Gina Häußge
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
Gina Häußge
e5389d0f0f Reverted bbad030a92 
Correct in devel branch, wrong in master branch (different counting).

Closes #166
 2013-06-24 18:24:45 +02:00
Gina Häußge
bd61d45e27 Missed the settings when changing api -> allow to api -> enabled 2013-06-24 17:48:13 +02:00
Gina Häußge
6989613b99 Moved printer state to API endpoint, made apikey instead of login necessary 2013-06-23 21:24:19 +02:00
Gina Häußge
599bca12a9 Changed api > allow to api > enabled for consistency 2013-06-23 19:48:12 +02:00
Gina Häußge
e17fa031c8 Return proper http status codes in case of problems 2013-06-23 16:57:38 +02:00
Gina Häußge
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
Gina Häußge
31045b4c25 Merge branch 'peteruithoven-master' into devel 
Conflicts:
	octoprint/timelapse.py
 2013-06-23 14:58:58 +02:00
Bryan Mayland
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
Bryan Mayland
a9ec4336de More errors == more error events 2013-06-22 15:13:44 +02:00
Gina Häußge
79f2cd0e31 Merge branch 'devel' into events 
Conflicts:
	octoprint/util/comm.py
 2013-06-22 15:08:53 +02:00
Bryan Mayland
50914df07a Made communication mode more error resilient 2013-06-22 15:03:01 +02:00
Bryan Mayland
66ddf77be8 Be able to cope with M999 causing a Resend: 1 
(cherry picked from commit 8b702db)
 2013-06-22 09:39:13 +02:00
Bryan Mayland
8b702db0d0 Be able to cope with M999 causing a Resend: 1 2013-06-22 09:36:21 +02:00
Gina Häußge
40b4bfad85 Merge branch 'feedbackCommands' into devel 2013-06-21 23:19:25 +02:00
Bryan Mayland
6600eea1a2 Feedback commands now work 2013-06-21 23:19:15 +02:00
Bryan Mayland
bbad030a92 Resend correct gcode line when resend is requested 
(manually cherry picked from commit c8875fd)
 2013-06-21 21:09:39 +02:00
Gina Häußge
94316fbcc1 Merge remote-tracking branch 'CapnBry/resendfix' into devel 2013-06-21 21:03:59 +02:00
Gina Häußge
f041c6b4f3 First work on custom controls with printer feedback evaluation and presentation in the UI 2013-06-21 20:50:57 +02:00
Gina Häußge
5bf5d24dfc Also include /dev/ttyAMA* in glob patterns for serial port 2013-06-21 15:03:32 +02:00
Bryan Mayland
c8875fd0f1 Resend correct gcode line when resend is requested 2013-06-20 11:41:10 -04:00
Gina Häußge
7e015e6e18 Merge branch 'devel' into events 2013-06-19 20:39:01 +02:00
Gina Häußge
f9beb28b1d Merge branch 'master' into devel 2013-06-19 20:38:38 +02:00
Gina Häußge
c24a66c361 Fixed signature for user view model. Closes #157 2013-06-19 20:36:50 +02:00
peteruithoven
ecfdb37f93 Adding classes according to flipX, flipY settings and flipping using css 2013-06-19 02:39:49 +02:00
peteruithoven
e8913e3141 Adding settings for webcam flipX and flipY 2013-06-19 00:42:43 +02:00
Gina Häußge
0e294ef8fd Merge branch 'devel' into events 2013-06-18 21:44:30 +02:00
Gina Häußge
a4aacf6108 Merge branch 'CapnBry-extrudevol' into devel 2013-06-18 21:28:13 +02:00
Gina Häußge
7c85013389 Added filament diameter retrieval from gcode generated by Cura, fixed Slic3r version 2013-06-18 21:28:05 +02:00
Gina Häußge
e96765bc39 Merge branch 'master' into devel 
Conflicts:
	octoprint/static/css/octoprint.less
 2013-06-17 22:12:45 +02:00
Gina Häußge
bcf8d54ff3 Merge remote-tracking branch 'origin/master' 2013-06-17 22:10:48 +02:00
Gina Häußge
6876438783 Fix for #153 backported from events branch 2013-06-17 22:10:14 +02:00
Bryan Mayland
e32afe147a Add extrusion volume calculation for Slic3r gcode files 2013-06-17 14:39:52 +00:00
Gina Häußge
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
algspd
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
Gina Häußge
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
Gina Häußge
236e26979f Switched Timelapses to using Eventbus instead of direct connection 2013-06-16 21:50:50 +02:00
Gina Häußge
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
Gina Häußge
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
Gina Häußge
ee3bc84242 Use span instead of button for upload buttons, otherwise FF and IE hiccup... 2013-06-16 11:38:52 +02:00
Gina Häußge
e27b34a9f3 Hopefully fixed a off-by-one error... 2013-06-15 17:33:03 +02:00
Gina Häußge
d6ad8dca00 Indentation still wrong, caused another funny behaviour 2013-06-11 18:45:57 +02:00
Gina Häußge
25802ddb66 Fixed wrong indentation that caused a rather funny behaviour... 2013-06-09 19:30:42 +02:00
Gina Häußge
d0035c3f3a Removed reference to remove feedratemodifier 2013-06-09 19:05:37 +02:00
Gina Häußge
8917d2e607 strip, not trim 2013-06-09 18:58:03 +02:00
Gina Häußge
b099bb443b Trim sd filenames 2013-06-09 18:53:23 +02:00
Gina Häußge
ac4a0f772d Fixed whitespace 2013-06-09 18:29:28 +02:00
Gina Häußge
8be1329a71 Merge branch 'devel' into gcodestreaming 
Conflicts:
	octoprint/printer.py
	octoprint/static/js/ui.js
	octoprint/templates/index.jinja2
	octoprint/util/comm.py
 2013-06-09 18:28:40 +02:00
Gina Häußge
edff311351 Merge branch 'master' into devel 2013-06-09 18:18:57 +02:00
Gina Häußge
9963c523c0 Do not display -1mm when printing from sd 2013-06-09 18:13:12 +02:00
Gina Häußge
4509eab816 Enable sd support by default 2013-06-09 18:04:25 +02:00
Gina Häußge
d5a620f476 Introduced new function matchesGcode to properly test if a line contains a specific gcode 2013-06-09 18:03:41 +02:00
Gina Häußge
c36e39909e Always reset heatingUp flag when receiving an ok 2013-06-09 17:44:06 +02:00
Gina Häußge
5b15d42881 Only send M105/M27 during sd printing when not currently heating up 2013-06-09 17:08:12 +02:00
Gina Häußge
90a1edbbcf Testing out a space between the N-prefix and the command 2013-06-09 16:33:59 +02:00
Gina Häußge
30a57e21f4 Fixed line count incrementation for gcode streaming 2013-06-09 15:55:55 +02:00
Gina Häußge
003109d59e Made gcode viewer capable of handling progress information 
GCode viewer now updates its visualization (during printing) based on the current progress percentage, not based on the current line (which will not be available any more as part of the progress tuple with gcode streaming)
 2013-06-09 14:00:15 +02:00
Dale Price
add073a6cb Add black color setting 2013-06-08 19:05:09 -05:00
Dale Price
719c4fab57 Define brand image in CSS instead of an <img> tag to allow it to be styled; add high resolution tentacle brand image for retina/high-res displays; create non-clashing light version of tentacle brand image to be used when darker custom colors are chosen in settings 2013-06-08 18:43:17 -05:00
Dale Price
7662023223 Improve appearance of text-shadow when dark navbar colors are used; adjust color of carets in navbar menus according to the navbar color 2013-06-06 20:11:35 -05:00
Dale Price
57932ff78c Check for localStorage with Modernizr before attempting to use it. Solves foosel/OctoPrint#91 2013-06-06 00:23:30 -05:00
Gina Häußge
8d4f7e2ba7 M20 on startup (2nd try) 2013-06-03 22:37:08 +02:00
Gina Häußge
480f0aef6f M20 on startup 2013-06-03 22:32:23 +02:00
Gina Häußge
1441a7dbd8 Added missing image resource 2013-06-03 22:25:23 +02:00
Gina Häußge
107ff01b29 Merge branch 'gcodestreaming' into devel 2013-06-03 22:18:00 +02:00
Gina Häußge
b0891b4d16 Added resource for retrieving a JSON representation of the current printer state (basically most of what's available on socket.io) 
Endpoint is <baseurl>/ajax/state
 2013-05-31 23:24:21 +02:00
Gina Häußge
56cb1c294c Changed to GCODE streaming instead of loading it all into memory -- no more loading times. Also better file handling. 2013-05-31 22:41:53 +02:00
Gina Häußge
8d53f313fe Removed debug log output 2013-05-27 19:48:17 +02:00
Gina Häußge
16befc84d2 Brought up to date with sdcard branch 2013-05-27 01:45:52 +02:00
Gina Häußge
d571aa588a Merge branch 'sdcard' into events 
Conflicts:
	octoprint/printer.py
	octoprint/server.py
	octoprint/util/comm.py
 2013-05-27 01:33:54 +02:00
Gina Häußge
3130c0c30b Fixed jobData key 2013-05-27 01:20:45 +02:00
Gina Häußge
624630ac63 Updated documentation of events 2013-05-27 01:03:53 +02:00
Gina Häußge
be99930021 Refactoring of event management 2013-05-27 00:56:57 +02:00
Gina Häußge
c836c79179 Merge branch 'norpchen-master' into events 
Conflicts:
	octoprint/printer.py
 2013-05-26 20:24:51 +02:00
Gina Häußge
b645073f1d Added SD state evaluation and SD commands 2013-05-26 18:53:43 +02:00
Gina Häußge
16f5e54bd7 Merge branch 'devel' into sdcard 
Conflicts:
	octoprint/server.py
	octoprint/settings.py
	octoprint/static/js/ui.js
	octoprint/util/comm.py
 2013-05-23 22:53:34 +02:00
Gina Häußge
08229598e6 Merge branch 'repetier' into devel 2013-05-23 22:45:21 +02:00
Gina Häußge
5b72be31ba Minor cleanup 2013-05-23 22:45:00 +02:00
Gina Häußge
da90b2d738 Try to remove timing issues when preparing next line to send 2013-05-23 22:37:02 +02:00
Lars Norpchen
535de9f12e redundant start event trigger removed 2013-05-22 21:41:37 -06:00
Gina Häußge
622e1f2ee7 Do not display the filename that was just streamed to SD, suggests that it is already selected for printing 2013-05-22 23:27:51 +02:00
Gina Häußge
fa584d59c5 Made progress calculation more resilient, do not hit printer with commands like a freight train during warm up 2013-05-22 18:56:02 +02:00
Gina Häußge
6ce7fed96d Removed cause of NPE 2013-05-22 18:32:19 +02:00
Gina Häußge
75f53b8ab9 Properly parse Marlin's "opened file x" message 2013-05-22 18:25:26 +02:00
Gina Häußge
33bcf284a9 Always send all lower case filenames to the printer for sd card commands 2013-05-22 18:20:21 +02:00
Lars Norpchen
3f98e0c687 Bug Fixes for Event Manager 2013-05-21 19:48:38 -07:00
Gina Häußge
bb954c50d2 Properly switch between file and sd printing 2013-05-21 23:41:18 +02:00
Gina Häußge
45fef79e3d Use M26 to reset SD position to 0 when cancelling and restarting a print, preprocess gcode before sending to printer 2013-05-21 23:30:29 +02:00
Gina Häußge
eeddf0ae1a Reset SD file data when disconnecting or when losing/regaining connection to the backend 2013-05-21 23:08:34 +02:00
Gina Häußge
38ec0b96b2 Started refactoring to match coding style and simplify things a bit. 2013-05-21 22:59:13 +02:00
Gina Häußge
96adc0dc85 Merge branch 'norpchen-master' into events 
Conflicts:
	octoprint/server.py
	octoprint/settings.py
 2013-05-21 22:38:56 +02:00
Lars Norpchen
525d73a20b Event Manager 
Added event manager to trigger system and gcode commands.
 2013-05-20 20:04:21 -07:00
Gina Häußge
b048cc390b Proper uploading incl. drag-n-drop for both local storage and SD card 2013-05-20 23:31:17 +02:00
Gina Häußge
783b3b8166 Merge branch 'master' into devel 2013-05-20 20:19:26 +02:00
Gina Häußge
039a17d923 First try at SD card support 2013-05-20 19:18:03 +02:00
Richard Mitchell
8c8101bf62 Forgot to simplify the success after testing 2013-05-18 18:21:33 +00:00
Richard Mitchell
e831ced2da simple change so the url loads from http or https whichever is in use 2013-05-18 18:13:17 +00:00
Richard Mitchell
c1760c9940 A very simple API endpoint for loading and printing files direct. This is by default turned off and it "allowed" via the settings 
From within Slic3r adding a post-processing script .bat containing

c:\curl\curl "http://192.168.0.7:5000/api/load?apikey=D96FA6A216CB44F78705D4506689D0EC&print=true" -F file=@%*
 2013-05-18 17:47:31 +00:00
Richard Mitchell
3f79faf55b Merge remote-tracking branch 'upstream/master' into devel 2013-05-18 06:32:04 +00:00
Marlon Wünnemann
b61db6dc0f jQuery over SSL and GoogleCDN 
Issue #127
 2013-05-16 16:43:09 +03:00
Lars Norpchen
c6363ea046 External commands on events 
These changes address issues 87 and 22 by adding the ability to trigger
external commands on print start, done, cancel and z-height change.
 2013-05-09 14:31:54 -07:00
Lars Norpchen
b609123d8a Revert "Added external system commands support for events" 
This reverts commit 3b66f63ff2.
 2013-05-09 14:22:40 -07:00
Lars Norpchen
3b66f63ff2 Added external system commands support for events 
Print start, print end, print cancel, and Z  height change can now
trigger external system commands.  These are set in config.yaml and take
_FILE_, _PERCENT_, _LINES_ and _ZHEIGHT_  tokens to be passed to
external commands.

system_commands:
  cancelled: echo cancelled _FILE_ at _PROGRESS_
percent done.
  print_done: echo done with _FILE_
  print_started: echo
starting _FILE_
  z_change: echo _LINE_ _PROGRESS_ _ZHEIGHT_
 2013-05-09 14:05:48 -07:00
Lars Norpchen
957213321e Print 'unknown G/M code' warnings to console once 2013-05-09 08:07:33 -07:00
Gina Häußge
fc56744705 Fixed URL for setting timelapse configuration. 
Closes #110
 2013-05-01 20:17:30 +02:00
Gina Häußge
245d9651b6 Merge branch 'devel' into repetier 2013-04-28 11:51:29 +02:00
Gina Häußge
9e9705f1ce Follow up to commit b9d467d 
Forgot to change session key to new Flask-Principal attribute name, which caused issues on logout sometimes (but weirdly not always).

Closes #107
 2013-04-26 22:26:19 +02:00
Gina Häußge
d721e5edc2 Merge branch 'devel' into repetier 
Conflicts:
	octoprint/util/comm.py
 2013-04-16 15:14:18 +02:00
Gina Häußge
0bb17818e1 Do not convert command to send to upper case after checksum was calculated 
Removed for the time being until I have a better idea on how allow stuff like "g28 x0 y0" to be autoconverted to "G28 X0 Y0" but autoconvert something like "m117 Some case sensitive text" only to "M117 Some case sensitive text"

Should fix #103
(cherry picked from commit 628ffb5)
 2013-04-16 14:46:22 +02:00
Gina Häußge
628ffb5600 Do not convert command to send to upper case after checksum was calculated 
Removed for the time being until I have a better idea on how allow stuff like "g28 x0 y0" to be autoconverted to "G28 X0 Y0" but autoconvert something like "m117 Some case sensitive text" only to "M117 Some case sensitive text"

Should fix #103
 2013-04-16 14:45:25 +02:00
Gina Häußge
b9d467d23f Upgraded to most recent Flask-Principal version, since an attribute name was changed there which OctoPrint uses 2013-04-14 15:33:11 +02:00
Gina Häußge
d7d8bba2e9 Fixed access to admin-only resources in case of disabled access control 2013-04-14 15:04:39 +02:00
Gina Häußge
552048efbe Fixed Modernizr queries by gcode renderer 2013-04-14 13:42:30 +02:00
Gina Häußge
7e82214d75 Added missing files 2013-04-14 13:15:54 +02:00
Gina Häußge
f7334ef65f Fixed some merge bugs 2013-04-13 22:26:23 +02:00
Gina Häußge
19dc238f06 User management now working 
Also reorganized javascripts a bit (as preparation for some refactoring coming up) and renamed templates from ".html" to ".jinja2".
 2013-04-13 22:21:53 +02:00
Gina Häußge
244ff25e2f Fixed settings for gcode file list 2013-04-13 22:20:41 +02:00
Gina Häußge
3e5a6d3679 Furhter work on user management 2013-04-13 22:20:41 +02:00
Gina Häußge
93a73a0ad8 Added roles (user and admin) and according requirements 2013-04-13 22:19:17 +02:00
Gina Häußge
1febcd671a "Writing" backend methods now protected (need logged in user (or dummy user if access control is disabled) to perform action), most "writing" frontend controls disabled if no logged in (or dummy) user returned from backend. 2013-04-13 22:19:17 +02:00
Gina Häußge
b27e1ce15e User factory method for creating SocketConnection object for Tornadio2 2013-04-13 21:45:20 +02:00
Gina Häußge
874a7421e9 Login and logout working for the first time 2013-04-13 21:45:20 +02:00
Gina Häußge
150d6cb53d First work on login and user management 2013-04-13 21:42:53 +02:00
Gina Häußge
34a860efda Added confirmation dialog and different logo for print job restart 
Closes #98
 2013-04-10 16:37:12 +02:00
Gina Häußge
46173bc35e Merge branch 'webcamMove' into devel 2013-04-07 22:15:15 +02:00
Gina Häußge
3174559072 Moved webcam view to Control tab 2013-04-07 22:15:04 +02:00
Gina Häußge
656aeb0189 Fixed evaluation of boolean argument for loadAndPrint from UI 
Closes #96.
 2013-04-07 22:06:17 +02:00
Gina Häußge
e70071f6c1 Removed waitForWait again (that didn't make much sense to begin with...) 2013-04-01 17:31:02 +02:00
Gina Häußge
9618407aed Merge branch 'devel' into repetier 
Conflicts:
	octoprint/server.py
 2013-04-01 17:25:08 +02:00
Gina Häußge
d20aae6474 Added homepage to footer 2013-04-01 17:23:56 +02:00
Gina Häußge
edea3789b2 Made Webcam omnipresent 2013-04-01 17:20:25 +02:00
Gina Häußge
c01b49fbc7 Forgot to commit Font Awesome 2013-03-30 18:29:13 +01:00
Gina Häußge
cfdfad1c06 Changed color and font-size of footer 2013-03-30 18:28:24 +01:00
Gina Häußge
b5b023a29c Merge remote-tracking branch 'splitbrain/footer' into devel 2013-03-30 18:22:33 +01:00
Gina Häußge
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
Gina Häußge
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
daftscience
48a2fd71a7 More reliable initialization of communication with repetier 2013-03-26 07:25:16 +00:00
Dale Price
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
Dale Price
71f3dbbdcc add tooltips to file controls 2013-03-25 23:55:53 -05:00
Tom
9b2d166c6c Prevents manual commands from interupting other commands 2013-03-25 14:01:48 -04:00
Andreas Gohr
9314e83665 added footer 
makes it faster, to refer to the OctoPrint site when problems occur.
 2013-03-24 16:11:54 +01:00
Gina Häußge
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
Gina Häußge
1477fb31fb Merge branch 'devel' 2013-03-17 16:42:48 +01:00
Gina Häußge
192952c03f Logging statements for timelapse creation 2013-03-17 16:31:20 +01:00
Gina Häußge
456ded3f36 Fixed off by one error in resend loop 2013-03-17 13:53:38 +01:00
Gina Häußge
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