vmario/doodle3d-client
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-11-22 17:27:57 +01:00
Code Issues Releases Wiki Activity
421 Commits 8 Branches 37 Tags 2.6 MiB
2457ce656e
Commit Graph

208 Commits

Author SHA1 Message Date
peteruithoven
828a6a3b0a new extruder algorithm and retrieving gcodestart and end from settings 2013-10-16 14:28:19 +02:00
peteruithoven
6419af4055 Using cgi-bin for network/openap and network/associate 2013-10-16 12:31:22 +02:00
peteruithoven
50cb44b865 Wait for heating 2013-10-16 12:30:36 +02:00
peteruithoven
51e4394491 Slight delay for gcode generation so that display is updated first. Hide stop untill gcode is send completely. 2013-10-14 18:51:37 +02:00
Wouter R
e29dd1576c Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into HEAD 2013-10-14 17:47:33 +02:00
Wouter R
356630e7ba NOTE: hack! this is temporary. 
Hide stop button after print is started, until gcode sending is completed (to prevent sending gcode after stopping).
 2013-10-14 17:46:55 +02:00
peteruithoven
9fb9ee2bc4 More robust state override 2013-10-14 17:42:23 +02:00
Wouter R
07fa1f62e8 NOTE: this commit is temporary and should be reverted! 
Add confirmation dialog when stop print button is pressed.
Add modal alert when print is started to prevent repeated clicking of button (which in turn corrupts gcode buffering).
Change preheat M109 to M104 to speed up printing cycle.
 2013-10-14 16:40:48 +02:00
peteruithoven
bd341d6ff7 Also send next gcode part when buffering 2013-10-14 15:09:06 +02:00
peteruithoven
f84b1639d5 Stop sending print parts when print is stopped 2013-10-14 14:55:22 +02:00
peteruithoven
399c55f84f Only send a start argument with api:printer/print on the first send 2013-10-12 17:46:15 +02:00
peteruithoven
af325f4bd3 Remove event handler from stop butten when disabled 2013-10-12 17:30:44 +02:00
Adriaan Wormgoor
12337f6ceb in debugmode, canvas should be manipulable through touch 2013-10-12 15:34:57 +02:00
Adriaan Wormgoor
613be4e619 fixed Firefox layouting issue of settings popup 2013-10-11 23:33:19 +02:00
Adriaan Wormgoor
632a0a0895 ..removed too much 2013-10-11 18:42:33 +02:00
Adriaan Wormgoor
aea89d3422 - fixed canvasdrawing bug w.r.t. touch-enabled devices 
- removed some superfluous lines
 2013-10-11 18:40:03 +02:00
Adriaan Wormgoor
53e9a7e4a4 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver 
# By peteruithoven
# Via peteruithoven
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  Readded print and stop button disabled css
  hasControl feedback
 2013-10-11 18:00:17 +02:00
Adriaan Wormgoor
fe53e31c27 removed unnecessary files, but moreover fixed a bug which was badly affecting the settings popup 2013-10-11 18:00:10 +02:00
peteruithoven
253561210d hasControl feedback 2013-10-11 16:18:41 +02:00
Adriaan Wormgoor
d61b9cb0d8 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver 
# By peteruithoven
# Via peteruithoven
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  Fixing double printer.print call
  Starting print right away, remove some target temp display hacks
 2013-10-11 15:44:22 +02:00
peteruithoven
8ff028dce1 Fixing double printer.print call 2013-10-11 15:34:18 +02:00
peteruithoven
1c930efdf5 Starting print right away, remove some target temp display hacks 2013-10-11 15:34:18 +02:00
Adriaan Wormgoor
88c6845592 some js files were postfixed with version numbers (eg. v01, v02, etc), but this is bullshit from source control perspective, hence removed the postfixes 2013-10-11 15:06:32 +02:00
Adriaan Wormgoor
58b3a12c6b massive commit due to merging branch 'new_layouting_approach' into feature/printerdriver 
----------------------------------------------------------------------

Merge branch 'new_layouting_approach' into feature/printerdriver

* new_layouting_approach: (22 commits)
  changed chmod
  adjustments to make preview be initialized and updated better (when resizing)
  updates css styles
  changes to how the draw and preview canvasses are positioned and initted
  many updates CSS and LESS files and generally a responsive scaling overhaul of the settings page
  new LESS
  simple js lib for managing the folded in/out state of the sidebars on the minimal interface
  arrow file used in the minimal doodle3d interface
  the resulting css files which LESS outputs
  removed this because it's being rolled into the styles.css by LESS
  moved logos to their own dir + removed a few redundant ones
  copy normalize.css to the LESS dir since it's a source file
  smallest size of the doodle3d logo
  started using LESS for stylesheeting
  commit of current state of this branch. It's a work-in-progress (comitting because I need to change to other branch)
  a lot of changes -> almost there but the drawing is not consistent yet across devices. Drawing on the draw canvas is going OK but the preview is not drawing well now. Giving up for now.
  changes (sry)
  intermediary progress
  commented out part of the css (not final solution)
  added todo for future
  ...
 2013-10-11 15:02:26 +02:00
Adriaan Wormgoor
759616a8d4 changed chmod 2013-10-11 14:07:15 +02:00
Adriaan Wormgoor
080cc5670c adjustments to make preview be initialized and updated better (when resizing) 2013-10-11 13:42:12 +02:00
peteruithoven
abc9841bc7 Handling new print3d driver (using new api, printer states) 2013-10-11 12:39:05 +02:00
Adriaan Wormgoor
0a44087989 changes to how the draw and preview canvasses are positioned and initted 2013-10-11 11:42:27 +02:00
peteruithoven
d417a7454f Better network connecting feedback 2013-10-10 12:12:33 +02:00
Adriaan Wormgoor
23fdaeaaa0 simple js lib for managing the folded in/out state of the sidebars on the minimal interface 2013-10-09 18:53:49 +02:00
peteruithoven
79e2fe1a8a Show current ip in settings window 2013-10-02 14:47:33 +02:00
peteruithoven
b6dca873e7 Use uhttpd lua handler 2013-10-02 14:47:33 +02:00
Adriaan Wormgoor
dd2ca8a1cb commit of current state of this branch. It's a work-in-progress (comitting because I need to change to other branch) 2013-09-27 18:15:33 +02:00
Wouter R
a45d1ad8ed Bugfix for heatup change. 2013-09-27 16:04:56 +02:00
peteruithoven
ce8e306994 Preventing OS X / iOS captive portal popup altogether 2013-09-25 19:01:08 +02:00
peteruithoven
80b4a53d5a Raw captive portal detected popup 2013-09-25 16:19:40 +02:00
Adriaan Wormgoor
1842ec01b2 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client 
# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client:
  Slightly longer allowed temp mod time
 2013-09-18 22:35:59 +02:00
Adriaan Wormgoor
267587fe2f vertical shapes implemented 2013-09-18 22:35:38 +02:00
peteruithoven
6c7018a00d Slightly longer allowed temp mod time 2013-09-18 20:59:35 +02:00
Adriaan Wormgoor
6cf58db7a3 reduced maximem rotation slightly, to reduce risk of overlapping 2013-09-18 20:42:32 +02:00
Adriaan Wormgoor
3d318bb56e gcode changes submitted by Rick, w.r.t. centering the doodle for Ultimakers (means: doodle is only in positive space, i.e. there are no negative coordinates) 2013-09-18 20:15:58 +02:00
peteruithoven
979403826a another hack to show targetTemp 2013-09-18 19:20:44 +02:00
Adriaan Wormgoor
6e32a36e12 a lot of changes -> almost there but the drawing is not consistent yet across devices. 
Drawing on the draw canvas is going OK but the preview is not drawing well now.
Giving up for now.
 2013-09-18 19:08:58 +02:00
peteruithoven
a692976be6 Only preheat the first time the settings where saved 2013-09-18 18:56:57 +02:00
peteruithoven
6c7b832a30 update timing hacks 2013-09-18 18:56:57 +02:00
Adriaan Wormgoor
aee5fecb88 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client into new_layouting_approach 
# By Adriaan Wormgoor (6) and peteruithoven (4)
# Via Adriaan Wormgoor (2) and peteruithoven (2)
* 'master' of https://github.com/Doodle3D/doodle3d-client:
  objectHeight and twist fix and temp display fix
  minor repositioning of temp-guage so that it doesn't overlap with the info-button
  gcode generated twist now complies with the doodle preview
  made the 'ok' button have a mouseover 'hand' cursor
  commented out call to missing setPrintprogress()
  removed wrong unit in settings
  Removed unused draw logic
  additions to Thermometer to allow the general Update function to show() and hide() the Thermometer's container DIV
  new favicon (for Firefox)
  a few new favicons and homescreen icons

Conflicts:
	js/Thermometer.js
	js/gcodeGenerating_v01.js
 2013-09-18 17:44:26 +02:00
peteruithoven
ac5f129e47 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client 
Conflicts:
	js/gcodeGenerating_v01.js
 2013-09-18 17:01:45 +02:00
peteruithoven
0b49256fd5 objectHeight and twist fix and temp display fix 2013-09-18 16:59:48 +02:00
Adriaan Wormgoor
8a88c173e5 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client 
# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client:
  commented out call to missing setPrintprogress()
  removed wrong unit in settings
  Removed unused draw logic
 2013-09-18 16:10:47 +02:00
Adriaan Wormgoor
001428f349 gcode generated twist now complies with the doodle preview 2013-09-18 16:10:22 +02:00
Adriaan Wormgoor
066eb182f0 intermediary progress 2013-09-18 16:02:51 +02:00
Adriaan Wormgoor
d7c32c926f added todo for future 2013-09-18 12:04:06 +02:00
Adriaan Wormgoor
51aabf56c1 tiny, tiny indent change 2013-09-18 11:39:34 +02:00
peteruithoven
fa0a610a8c commented out call to missing setPrintprogress() 2013-09-18 11:34:36 +02:00
peteruithoven
287518c6cf Removed unused draw logic 2013-09-18 11:28:21 +02:00
Adriaan Wormgoor
82165c585b additions to Thermometer to allow the general Update function to show() and hide() the Thermometer's container DIV 2013-09-18 10:57:46 +02:00
Adriaan Wormgoor
6eddb1835c first implementation of different layouting. Doesn't work well yet.. 2013-09-18 10:46:36 +02:00
peteruithoven
5d29d099ab Setting fixes, enabled enableRetraction setting 2013-09-17 15:15:44 +02:00
Adriaan Wormgoor
ee7d3357d4 small update: method name change to better reflect what it does 2013-09-17 13:12:51 +02:00
Adriaan Wormgoor
0a40895509 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client 
# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client:
  Always dump gcode in textarea
 2013-09-17 13:10:38 +02:00
Adriaan Wormgoor
84ee0c259a updated Thermometer code (should be final for now) 2013-09-17 13:10:27 +02:00
Adriaan Wormgoor
ebf84cad42 added maximum rotation of preview and resetted height and rotation when a new doodle is made 2013-09-17 13:09:54 +02:00
Adriaan Wormgoor
95bedd09f1 Thermometer class plus the changes necessary to implement it 2013-09-17 13:08:52 +02:00
peteruithoven
a57a36f420 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client 
Conflicts:
	js/buttonbehaviors.js
 2013-09-13 16:06:27 +02:00
peteruithoven
b830205a73 Always dump gcode in textarea 2013-09-13 16:03:04 +02:00
Adriaan Wormgoor
3a11106535 code for new printprogressmeter and new thermometer 2013-09-07 17:08:52 +02:00
Adriaan Wormgoor
bd6417f71a minor changes -> slightly more abstracted 2013-09-07 16:09:09 +02:00
Adriaan Wormgoor
df8c202ad8 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client 
# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client:
  Network ui tweaks
 2013-09-07 16:07:18 +02:00
Adriaan Wormgoor
edf24d45d2 - additional items added to the settings array (which is set from wifibox) 
- gcode generation takes more settings from that settings array (making gcode generation more configurable by the user)
 2013-09-07 16:06:59 +02:00
Adriaan Wormgoor
7bd05d4f1f Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client 
# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client:
  Network ui
 2013-09-06 11:03:50 +02:00
peteruithoven
a0b5c92b2f Network ui tweaks 2013-09-04 19:24:52 +02:00
peteruithoven
200052dae0 Network ui 2013-09-02 18:07:22 +02:00
Adriaan Wormgoor
44c46b47b8 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client 
# By peteruithoven (3) and Wouter R (1)
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client:
  Properly reading all the values from the form when saving
  Settings improvements
  Settings refactoring
  Add redirect.html (only used as 404 page in captive portal mode).
 2013-08-30 09:52:28 +02:00
Adriaan Wormgoor
6803837ce2 a little cleanup 2013-08-30 09:52:02 +02:00
peteruithoven
4d53a2ee19 Properly reading all the values from the form when saving 2013-08-29 01:41:18 +02:00
peteruithoven
2deec18072 Settings improvements 2013-08-28 18:33:25 +02:00
peteruithoven
c15c023829 Settings refactoring 2013-08-27 15:34:28 +02:00
Adriaan Wormgoor
a1bac028cd some additional details to the preview rendering 2013-08-21 18:08:32 +02:00
Adriaan Wormgoor
69df58c054 Updated preview rendering. onMouseUp / onTouchEnd the preview is now cached to an Image() object (image/png) (via a proxy Canvas element (id='preview_tmp') and used to draw the preview. This allows for much faster move up/down and twist left/right behavior. 2013-08-21 17:37:20 +02:00
peteruithoven
5c7e226caf wifiboxIsRemote default to false 2013-08-20 10:55:08 +02:00
peteruithoven
96e14615c8 fixed isRemote mode. Pressing stop button brings interface directly in IDLE mode. 2013-08-19 17:55:01 +02:00
peteruithoven
b13f9f541b When proces can't be retrieved printing = false 2013-08-19 16:52:18 +02:00
Adriaan Wormgoor
62689b007c temp rollback to fix the iPad freaking out onOrientationChange event 2013-08-16 23:10:05 +02:00
Adriaan Wormgoor
93a4bc2fd3 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client 
# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client:
  Sending end GCode at manual stop
 2013-08-16 22:29:46 +02:00
Adriaan Wormgoor
65fbe62e6b Now looks for querystring variables which allow us to control Doodle3D's behavior, such as disabling the attempt to communicatie with the wifibox or disabling printcommands (i.e.: debug stuff and such). 2013-08-16 22:28:58 +02:00
Adriaan Wormgoor
ed8ceb7879 Changes to how we draw to the canvas and how the preview is rendered. This has massive speedup results for tablets and phones. 2013-08-16 22:27:26 +02:00
Adriaan Wormgoor
aa82d6daa8 small change improving the resizing on iPads 2013-08-16 22:26:32 +02:00
Adriaan Wormgoor
d420bde380 added if-statements for the new variables which are grabbed from the query string (these allow us to enable/disable certain behaviors such as communicating with the wifibox, or being allowed to print) 2013-08-16 22:25:25 +02:00
Adriaan Wormgoor
70b59c923a new utils file for general methods. This first method grabs the query string variables from the URL 2013-08-16 22:23:24 +02:00
peteruithoven
4c0e927480 Sending end GCode at manual stop 2013-08-16 19:27:48 +02:00
peteruithoven
7da38d2e98 Did a ajax calls and the gcode sending overhaul/rewrite. All failed calls (temp, process check, preheat, print and stop) are retried automatically. All printer communication is now handled in Printer.js. 2013-08-14 20:54:48 +02:00
peteruithoven
8ec49ed475 Better gcode. autoWarmUpCommand in settings. 2013-08-12 21:54:30 +02:00
peteruithoven
6ea0dd6a84 Added timeout & retry to preheat/heatup 2013-08-12 16:52:31 +02:00
peteruithoven
c6818eae45 oops 2013-08-09 22:36:18 +02:00
peteruithoven
85d91a2f36 Checking printing progress and disabling/enabling print and stop buttons 
Cleaning up a bit of the mess
 2013-08-09 22:25:14 +02:00
peteruithoven
de8af029c5 Simpler settings window layout 2013-08-08 00:22:23 +02:00
peteruithoven
6df5e255c2 Basic feedback and more control 
Display temperature
Only show temperature when connected with printer
Move index.html javascript to main.js
stop button (Still having issues in firmware)
OOP style printer control
Added a proxy.php file to forward cross domain posts and get's. (should
not be necessary)
 2013-08-07 20:47:47 +02:00
Wouter R
4f080ef1e4 Merge github.com:Doodle3D/doodle3d-client into HEAD 
Conflicts:
	js/gcodeGenerating_v01.js
 2013-08-02 13:59:00 +02:00
Wouter R
d13051e40f Add temperature setting to config interface; move temperature setting from start code and use configuration. 2013-08-01 20:01:52 +02:00
peteruithoven
7a28b1d641 More comments 2013-07-30 14:21:04 +02:00
Wouter R
d78317ecd6 Use host as API base URL. 2013-07-29 19:07:41 +02:00
Wouter R
7972273e27 Enable sending gcode. It prints! 2013-07-29 16:48:13 +02:00
Adriaan Wormgoor
cbbe820d77 added a settings popup -> the gearbox icon botomright is now clickable -> a settings popup will appear, showing various 3d printer settings. These settings are partially loaded from and saved back to the wifibox 2013-07-28 02:47:42 +02:00
Adriaan Wormgoor
f439592faf adjusted css and htmls 2013-07-28 02:46:32 +02:00
Adriaan Wormgoor
6990cf37ab lower text wasn't always showing (put it higher) and the text was iPad specific. It's generic now. 2013-07-27 18:19:50 +02:00
Adriaan Wormgoor
7ccfff04f0 adjusted js -> less automatic adjustments going on (for now) 2013-07-26 23:53:07 +02:00
Adriaan Wormgoor
83237b9a38 bunch of javascript 2013-07-26 22:39:28 +02:00
Adriaan Wormgoor
ae4e8e080b - interfaces scales vertically 
- on tablets and smartphones it automatically fills the width
- doesn't *do* much yet
- drawing doesn't scale to the viewport of the draw area yet
- preview on the right doesn't either.
 2013-07-05 19:23:28 +02:00