mirror of
https://github.com/Doodle3D/doodle3d-client.git
synced 2024-11-25 18:47:57 +01:00
aee5fecb88
# 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
93 lines
3.5 KiB
JavaScript
93 lines
3.5 KiB
JavaScript
var debugMode = false; // debug mode
|
|
var sendPrintCommands = true; // if Doodle3d should send print commands to the 3d printer
|
|
var communicateWithWifibox = true; // if Doodle3d should try interfacing with the wifibox (in case one is not connected)
|
|
var wifiboxIsRemote = false; // when you want to run the client on a computer and have it remotely connect to the wifibox
|
|
var autoUpdate = true; // auto retrieve updates about temperature and progress from printer
|
|
|
|
var printer = new Printer();
|
|
var thermometer = new Thermometer();
|
|
var settingsWindow = new SettingsWindow();
|
|
|
|
var $drawAreaContainer, $doodleCanvas, doodleCanvas, doodleCanvasContext, $previewContainer;
|
|
|
|
$(function() {
|
|
console.log("ready");
|
|
|
|
|
|
//TODO give this a more logical place in code
|
|
|
|
|
|
|
|
|
|
if (getURLParameter("d") != "null") debugMode = (getURLParameter("d") == "1");
|
|
if (getURLParameter("p") != "null") sendPrintCommands = (getURLParameter("p") == "1");
|
|
if (getURLParameter("c") != "null") communicateWithWifibox = (getURLParameter("c") == "1");
|
|
if (getURLParameter("r") != "null") wifiboxIsRemote = (getURLParameter("r") == "1");
|
|
if (getURLParameter("u") != "null") autoUpdate = (getURLParameter("u") == "1");
|
|
|
|
if (wifiboxIsRemote) {
|
|
wifiboxURL = "http://192.168.5.1/cgi-bin/d3dapi";
|
|
} else {
|
|
wifiboxURL = "http://" + window.location.host + "/cgi-bin/d3dapi";
|
|
}
|
|
|
|
if (!communicateWithWifibox) {
|
|
sendPrintCommands = false; // 'communicateWithWifibox = false' implies this
|
|
}
|
|
console.log("debugMode: " + debugMode);
|
|
console.log("sendPrintCommands: " + sendPrintCommands);
|
|
console.log("communicateWithWifibox: " + communicateWithWifibox);
|
|
console.log("wifiboxIsRemote: " + wifiboxIsRemote);
|
|
console.log("wifibox URL: " + wifiboxURL);
|
|
|
|
initLayouting();
|
|
initDoodleDrawing();
|
|
initPreviewRendering();
|
|
initButtonBehavior();
|
|
|
|
thermometer.init($("#thermometerCanvas"), $("#thermometerContainer"));
|
|
|
|
printer.init();
|
|
$(document).on(Printer.UPDATE,update);
|
|
|
|
settingsWindow.init(wifiboxURL);
|
|
$(document).on(SettingsWindow.SETTINGS_LOADED,settingsLoaded);
|
|
|
|
if(debugMode) {
|
|
console.log("debug mode is true");
|
|
$("body").css("overflow", "auto");
|
|
$("#debug_textArea").css("display", "block");
|
|
$("#preview_tmp").css("display", "block");
|
|
|
|
/* TEMP CODE!! -> artificially populates the startgcode and endgcode textareas in the settings window */
|
|
// todo remove this temporary code...
|
|
/*
|
|
setTimeout(function() {
|
|
$("#startgcode").text("");
|
|
$("#startgcode").append("G21 (mm) \n");
|
|
$("#startgcode").append("G91 (relative) \n");
|
|
$("#startgcode").append("G28 X0 Y0 Z0 (physical home) \n");
|
|
$("#startgcode").append("M104 S230 (temperature) \n");
|
|
$("#startgcode").append("G1 E10 F250 (flow) \n");
|
|
$("#startgcode").append("G92 X-100 Y-100 Z0 E10 \n");
|
|
$("#startgcode").append("G1 Z3 F5000 (prevent diagonal line) \n");
|
|
$("#startgcode").append("G90 (absolute) \n");
|
|
$("#startgcode").append("M106 (fan on)");
|
|
console.log("$('#startgcode'): " + $("#startgcode").val());
|
|
|
|
$("#endgcode").text("");
|
|
$("#endgcode").append("G1 X-100 Y-100 F15000 (fast homing) \n");
|
|
$("#endgcode").append("M107 \n");
|
|
$("#endgcode").append("M84 (disable axes) \n");
|
|
console.log("$('#endgcode'): " + $("#endgcode").val());
|
|
}, 1000);
|
|
//*/
|
|
}
|
|
})
|
|
function settingsLoaded() {
|
|
console.log("settingsLoaded");
|
|
console.log("autoWarmUp: ",settings["printer.autoWarmUp"]);
|
|
if(settings["printer.autoWarmUp"]) {
|
|
printer.preheat();
|
|
}
|
|
} |