a692976be6
Only preheat the first time the settings where saved
2013-09-18 18:56:57 +02:00
6c7b832a30
update timing hacks
2013-09-18 18:56:57 +02:00
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
ac5f129e47
Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client
...
Conflicts:
js/gcodeGenerating_v01.js
2013-09-18 17:01:45 +02:00
0b49256fd5
objectHeight and twist fix and temp display fix
2013-09-18 16:59:48 +02:00
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
001428f349
gcode generated twist now complies with the doodle preview
2013-09-18 16:10:22 +02:00
066eb182f0
intermediary progress
2013-09-18 16:02:51 +02:00
d7c32c926f
added todo for future
2013-09-18 12:04:06 +02:00
51aabf56c1
tiny, tiny indent change
2013-09-18 11:39:34 +02:00
fa0a610a8c
commented out call to missing setPrintprogress()
2013-09-18 11:34:36 +02:00
287518c6cf
Removed unused draw logic
2013-09-18 11:28:21 +02:00
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
6eddb1835c
first implementation of different layouting. Doesn't work well yet..
2013-09-18 10:46:36 +02:00
5d29d099ab
Setting fixes, enabled enableRetraction setting
2013-09-17 15:15:44 +02:00
ee7d3357d4
small update: method name change to better reflect what it does
2013-09-17 13:12:51 +02:00
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
84ee0c259a
updated Thermometer code (should be final for now)
2013-09-17 13:10:27 +02:00
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
95bedd09f1
Thermometer class plus the changes necessary to implement it
2013-09-17 13:08:52 +02:00
a57a36f420
Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client
...
Conflicts:
js/buttonbehaviors.js
2013-09-13 16:06:27 +02:00
b830205a73
Always dump gcode in textarea
2013-09-13 16:03:04 +02:00
3a11106535
code for new printprogressmeter and new thermometer
2013-09-07 17:08:52 +02:00
bd6417f71a
minor changes -> slightly more abstracted
2013-09-07 16:09:09 +02:00
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
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
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
a0b5c92b2f
Network ui tweaks
2013-09-04 19:24:52 +02:00
200052dae0
Network ui
2013-09-02 18:07:22 +02:00
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
6803837ce2
a little cleanup
2013-08-30 09:52:02 +02:00
4d53a2ee19
Properly reading all the values from the form when saving
2013-08-29 01:41:18 +02:00
2deec18072
Settings improvements
2013-08-28 18:33:25 +02:00
c15c023829
Settings refactoring
2013-08-27 15:34:28 +02:00
a1bac028cd
some additional details to the preview rendering
2013-08-21 18:08:32 +02:00
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
5c7e226caf
wifiboxIsRemote default to false
2013-08-20 10:55:08 +02:00
96e14615c8
fixed isRemote mode. Pressing stop button brings interface directly in IDLE mode.
2013-08-19 17:55:01 +02:00
b13f9f541b
When proces can't be retrieved printing = false
2013-08-19 16:52:18 +02:00
62689b007c
temp rollback to fix the iPad freaking out onOrientationChange event
2013-08-16 23:10:05 +02:00
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
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
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
aa82d6daa8
small change improving the resizing on iPads
2013-08-16 22:26:32 +02:00
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
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
4c0e927480
Sending end GCode at manual stop
2013-08-16 19:27:48 +02:00
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
8ec49ed475
Better gcode. autoWarmUpCommand in settings.
2013-08-12 21:54:30 +02:00
6ea0dd6a84
Added timeout & retry to preheat/heatup
2013-08-12 16:52:31 +02:00
