vmario
/
doodle3d-client
mirror of https://github.com/Doodle3D/doodle3d-client.git
0
0
Fork 0
Code Issues Releases Wiki Activity

Setting fixes, enabled enableRetraction setting

This commit is contained in:
peteruithoven 2013-09-17 15:14:59 +02:00
parent 198da6566d
commit 5d29d099ab
3 changed files with 11 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/SettingsWindow.js
View File

@ -4,7 +4,6 @@ var settings = {
"network.ap.address": "192.168.10.1",
"network.ap.netmask": "255.255.255.0",
"printer.temperature": 220,
"printer.objectHeight": 20,
"printer.maxObjectHeight": 150,
"printer.layerHeight": 0.2,
"printer.wallThickness": 0.7,

10
js/gcodeGenerating_v01.js
View File

@ -59,13 +59,13 @@ function generate_gcode(callback) {
var travelSpeed = settings["printer.travelSpeed"]
var filamentThickness = settings["printer.filamentThickness"];
var wallThickness = settings["printer.wallThickness"];
var screenToMillimeterScale = isNaN(settings["printer.screenToMillimeterScale"]) ? 0.3 : settings["printer.screenToMillimeterScale"]; // TODO add this item to the settings on 'kastje'
var screenToMillimeterScale = settings["printer.screenToMillimeterScale"];
var layerHeight = settings["printer.layerHeight"];
var objectHeight = settings["printer.objectHeight"];
var maxObjectHeight = isNaN(settings["printer.maxObjectHeight"]) ? 150 : settings["printer.maxObjectHeight"]; // TODO add this item to the settings on 'kastje'
var maxObjectHeight = settings["printer.maxObjectHeight"];
var temperature = settings["printer.temperature"];
var useSubLayers = settings["printer.useSubLayers"];
var enableTraveling = isNaN(settings["printer.enableTraveling"]) ? true : settings["printer.enableTraveling"]; // TODO add this item to the settings on 'kastje'
var enableTraveling = settings["printer.enableTraveling"];
var retractionEnabled = settings["printer.retraction.enabled"];
var retractionspeed = settings["printer.retraction.speed"];
var retractionminDistance = settings["printer.retraction.minDistance"];
var retractionamount = settings["printer.retraction.amount"];
@ -199,7 +199,7 @@ function generate_gcode(callback) {
var z = (sublayer + 1) * layerHeight; // 2013-09-06 removed zOffset (seemed to be useless)
var isTraveling = !isLoop && i==0;
var doRetract = prev.distance(to) > retractionminDistance;
var doRetract = retractionEnabled && prev.distance(to) > retractionminDistance;
if (enableTraveling && isTraveling) {
// console.log("enableTraveling && isTraveling >> doRetract: " + doRetract + ", retractionspeed: " + retractionspeed);

39
settings.html
View File

@ -11,7 +11,7 @@
<body>
<div>
<form id="settingsForm">
<fieldset>
<!--<fieldset>
<legend>3D printer</legend>
<label for="printerType">Type:</label>
<select id="printerType" name="printer.type">
@ -53,7 +53,7 @@
<option value="115200">115200 bps</option>
<option value="2500000">2500000 bps</option>
</select>
</fieldset>
</fieldset>-->
<fieldset id="printersettings">
<legend>Print settings</legend>
@ -64,7 +64,7 @@
<br>
<label for="speed">Speed:</label><input id="speed" type="number" name="printer.speed" class="small">mm/s<br>
<label for="travelSpeed">Travel speed:</label><input id="travelSpeed" type="number" name="printer.travelSpeed" class="small">mm/s<br>
<br>
<label for="enableTraveling">Enable traveling:</label><input id="enableTraveling" type="checkbox" name="printer.enableTraveling" value="enableTraveling"><br>
<label for="firstLayerSlow">First layer slow:</label><input id="firstLayerSlow" type="checkbox" name="printer.firstLayerSlow" value="firstLayerSlow"><br>
<label for="useSubLayers">Use sub-layers*:</label><input id="useSubLayers" type="checkbox" name="printer.useSubLayers" value="firstLayerSlow"><br>
<small>* Continuously move platform while printing instead of once per layer</small>
@ -80,8 +80,9 @@
<fieldset id="doodlesettings">
<legend>Doodle3D settings</legend>
<label for="objectHeight">Max object height:</label><input id="objectHeight" type="number" class="small" name="doodle3d.objectHeight">mm<br>
<label for="simplifyMinDistance">Minimal line distance:</label><input id="simplifyMinDistance" type="number" class="small" name="doodle3d.simplify.minDistance">px<br>
<label for="maxObjectHeight">Max object height:</label><input id="maxObjectHeight" type="number" class="small" name="printer.maxObjectHeight">mm<br>
<label for="screenToMillimeterScale">Pixels to mm scale:</label><input id="screenToMillimeterScale" type="number" step="0.1" class="small" name="printer.screenToMillimeterScale">px<br>
</fieldset>
<fieldset>
@ -137,32 +138,4 @@
</form>
</div>
</body>
</html>
<!--
implemented:
X network.ap.address: "192.168.10.1"
X network.ap.netmask: "255.255.255.0"
X network.ap.ssid: "d3d-ap-%%MAC_ADDR_TAIL%%"
X printer.autoWarmUp: true
printer.autoWarmUpCommand: "M104 S230"
X printer.filamentThickness: 2.89
X printer.firstLayerSlow: true
X printer.layerHeight: 0.3
printer.objectHeight: 20
X printer.retraction.amount: 3
X printer.retraction.minDistance: 5
X printer.retraction.speed: 50
printer.simplify.iterations: 10
printer.simplify.minDistance: 3
printer.simplify.minNumPoints: 15
X printer.speed: 70
printer.temperature: 230
X printer.travelSpeed: 200
X printer.useSubLayers: true
X printer.wallThickness: 0.5
X printer.temperature: 230
-->
</html>