0
0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-11-05 03:33:23 +01:00
Commit Graph

73 Commits

Author SHA1 Message Date
peteruithoven
abc9841bc7 Handling new print3d driver (using new api, printer states) 2013-10-11 12:39:05 +02:00
peteruithoven
d417a7454f Better network connecting feedback 2013-10-10 12:12:33 +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
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
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
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
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
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