Update enclosure.js
Unlimited GPIO Outputs Unlimited Trigggger actions based on events (Temeprature, fillament or GPIO) Showing status of GPIO on enclosure tab Shutdown timeout reset after print start Default temperature for enclosure
This commit is contained in:
Vitor de Miranda Henrique
committed by
GitHub
GitHub
parent
2d0d5168ad
commit
9cb05cf442
@@ -2,31 +2,98 @@ $(function() {
|
||||
function EnclosureViewModel(parameters) {
|
||||
var self = this;
|
||||
|
||||
self.settings = parameters[0];
|
||||
self.global_settings = parameters[0];
|
||||
self.connection = parameters[1];
|
||||
self.printerStateViewModel = parameters[2];
|
||||
|
||||
self.temperature_reading = ko.observableArray();
|
||||
self.temperature_control = ko.observableArray();
|
||||
self.rpi_outputs = ko.observableArray();
|
||||
self.rpi_inputs = ko.observableArray();
|
||||
self.filamentSensorGcode = ko.observable();
|
||||
|
||||
self.enclosureTemp = ko.observable();
|
||||
self.enclosureSetTemperature = ko.observable();
|
||||
self.enclosureHumidity = ko.observable();
|
||||
|
||||
self.onStartupComplete = function () {
|
||||
fixUI();
|
||||
};
|
||||
|
||||
self.previousGpioStatus;
|
||||
|
||||
self.onDataUpdaterPluginMessage = function(plugin, data) {
|
||||
if (plugin != "enclosure") {
|
||||
return;
|
||||
}
|
||||
self.enclosureTemp(data.enclosuretemp);
|
||||
self.enclosureHumidity(data.enclosureHumidity);
|
||||
|
||||
if (data.hasOwnProperty("enclosuretemp")) {
|
||||
self.enclosureTemp(data.enclosuretemp);
|
||||
}
|
||||
if (data.hasOwnProperty("enclosureHumidity")) {
|
||||
self.enclosureHumidity(data.enclosureHumidity);
|
||||
}
|
||||
|
||||
if (data.hasOwnProperty("enclosureSetTemp")){
|
||||
if (parseFloat(data.enclosureSetTemp)>0.0){
|
||||
$("#enclosureSetTemp").attr("placeholder", data.enclosureSetTemp);
|
||||
}else{
|
||||
$("#enclosureSetTemp").attr("placeholder", "off");
|
||||
}
|
||||
}
|
||||
|
||||
if(!data.rpi_output){
|
||||
data.rpi_output = self.previousGpioStatus;
|
||||
}
|
||||
|
||||
if(data.rpi_output){
|
||||
data.rpi_output.forEach(function(gpio) {
|
||||
key = Object.keys(gpio)[0];
|
||||
if(gpio[key]){
|
||||
$("#btn_off_"+key).removeClass('active');
|
||||
$("#btn_on_"+key).addClass('active');
|
||||
}else{
|
||||
$("#btn_off_"+key).addClass('active');
|
||||
$("#btn_on_"+key).removeClass('active');
|
||||
}
|
||||
});
|
||||
self.previousGpioStatus = data.rpi_output;
|
||||
}
|
||||
|
||||
if (data.isMsg) {
|
||||
new PNotify({title:"Enclosure", text:data.msg, type: "error"});
|
||||
}
|
||||
};
|
||||
|
||||
self.isConnected = ko.computed(function() {
|
||||
self.enableBtn = ko.computed(function() {
|
||||
// return self.connection.loginState.isUser() && self.printerStateViewModel.isOperational();
|
||||
return self.connection.loginState.isUser();
|
||||
});
|
||||
|
||||
self.onBeforeBinding = function () {
|
||||
self.settings = self.global_settings.settings.plugins.enclosure;
|
||||
self.temperature_reading(self.settings.temperature_reading());
|
||||
// self.temperature_control(self.settings.temperature_control.slice(0));
|
||||
self.rpi_outputs(self.settings.rpi_outputs());
|
||||
self.rpi_inputs(self.settings.rpi_inputs());
|
||||
self.filamentSensorGcode(self.settings.filamentSensorGcode());
|
||||
};
|
||||
|
||||
self.onStartupComplete = function () {
|
||||
self.getUpdateBtnStatus();
|
||||
};
|
||||
|
||||
self.onSettingsShown = function(){
|
||||
self.fixUI();
|
||||
}
|
||||
|
||||
self.save = function(){
|
||||
$.ajax({
|
||||
url: "/plugin/enclosure/save",
|
||||
type: "GET"
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
self.setTemperature = function(){
|
||||
if(isNumeric($("#enclosureSetTemp").val())){
|
||||
if(self.isNumeric($("#enclosureSetTemp").val())){
|
||||
$.ajax({
|
||||
url: "/plugin/enclosure/setEnclosureTemperature",
|
||||
type: "GET",
|
||||
@@ -40,7 +107,29 @@ $(function() {
|
||||
}else{
|
||||
alert("Temperature is not a number");
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
self.addRpiOutput = function(){
|
||||
self.global_settings.settings.plugins.enclosure.rpi_outputs.push({label: ko.observable("Ouput "+
|
||||
(self.global_settings.settings.plugins.enclosure.rpi_outputs().length+1)) ,
|
||||
gpioPin: 0,activeLow: true,
|
||||
autoStartup:false, startupTimeDelay:0, autoShutdown:false,shutdownTimeDelay:0,active:false});
|
||||
};
|
||||
|
||||
self.removeRpiOutput = function(definition) {
|
||||
self.global_settings.settings.plugins.enclosure.rpi_outputs.remove(definition);
|
||||
};
|
||||
|
||||
self.addRpiInput = function(){
|
||||
self.global_settings.settings.plugins.enclosure.rpi_inputs.push({label:ko.observable( "Input "+
|
||||
(self.global_settings.settings.plugins.enclosure.rpi_inputs().length+1)), gpioPin: 0,inputPull: "inputPullUp",
|
||||
eventType:ko.observable("temperature"),setTemp:100,controlledIO:ko.observable(""),setControlledIO:"low",
|
||||
edge:"fall",printerAction:"filament"});
|
||||
};
|
||||
|
||||
self.removeRpiInput = function(definition) {
|
||||
self.global_settings.settings.plugins.enclosure.rpi_inputs.remove(definition);
|
||||
};
|
||||
|
||||
self.turnOffHeater = function(){
|
||||
$.ajax({
|
||||
@@ -53,7 +142,25 @@ $(function() {
|
||||
$("#enclosureSetTemp").attr("placeholder", self.getStatusHeater(data.enclosureSetTemperature,data.enclosureCurrentTemperature));
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
self.clearGPIOMode = function(){
|
||||
$.ajax({
|
||||
url: "/plugin/enclosure/clearGPIOMode",
|
||||
type: "GET",
|
||||
dataType: "json",
|
||||
success: function(data) {
|
||||
new PNotify({title:"Enclosure", text:"GPIO Mode cleared successfully", type: "success"});
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
self.getUpdateBtnStatus = function(){
|
||||
$.ajax({
|
||||
url: "/plugin/enclosure/getUpdateBtnStatus",
|
||||
type: "GET"
|
||||
});
|
||||
};
|
||||
|
||||
self.requestEnclosureTemperature = function(){
|
||||
return $.ajax({
|
||||
@@ -61,7 +168,7 @@ $(function() {
|
||||
url: "/plugin/enclosure/getEnclosureTemperature",
|
||||
async: false
|
||||
}).responseText;
|
||||
}
|
||||
};
|
||||
|
||||
self.requestEnclosureSetTemperature = function(){
|
||||
return $.ajax({
|
||||
@@ -69,14 +176,14 @@ $(function() {
|
||||
url: "/plugin/enclosure/getEnclosureSetTemperature",
|
||||
async: false
|
||||
}).responseText;
|
||||
}
|
||||
};
|
||||
|
||||
self.getStatusHeater = function(setTemp,currentTemp){
|
||||
if (parseFloat(setTemp)>parseFloat(currentTemp)){
|
||||
if (parseFloat(setTemp)>0.0){
|
||||
return cleanTemperature(setTemp);
|
||||
}
|
||||
return "off";
|
||||
}
|
||||
};
|
||||
|
||||
self.handleIO = function(data, event){
|
||||
$.ajax({
|
||||
@@ -86,63 +193,84 @@ $(function() {
|
||||
url: "/plugin/enclosure/setIO",
|
||||
async: false
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
self.fixUI = function(){
|
||||
if($('#enableTemperatureReading').is(':checked')){
|
||||
$('#enableHeater').prop('disabled', false);
|
||||
$('#temperature_reading_content').show("blind");
|
||||
// $('#temperature_control_content').show("blind");
|
||||
}else{
|
||||
$('#enableHeater').prop('disabled', true);
|
||||
$('#enableHeater').prop('checked', false);
|
||||
$('#temperature_reading_content').hide("blind");
|
||||
// $('#temperature_control_content').hide("blind");
|
||||
}
|
||||
|
||||
if($('#enableHeater').is(':checked')){
|
||||
$('#temperature_control_content').show("blind");
|
||||
}else{
|
||||
$('#temperature_control_content').hide("blind");
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
// self.fixEventTypeUI = function(){
|
||||
// $('[name^="eventType_"]').each(function() {
|
||||
// if($( this ).is(':checked')){
|
||||
// selectedType = $( this ).val();
|
||||
// idNumber = $( this ).attr('name').replace("eventType_", "");
|
||||
// self.eventTypeUI(idNumber,selectedType);
|
||||
// }
|
||||
// });
|
||||
// };
|
||||
//
|
||||
// self.eventTypeUI = function(idNumber,selectedType){
|
||||
//
|
||||
// $('#input_io_'+idNumber).hide();
|
||||
// $('#temp_controlled_'+idNumber).hide();
|
||||
// $('#filament_controlled_'+idNumber).hide();
|
||||
// $('#gpio_controlled_'+idNumber).hide();
|
||||
//
|
||||
// if(selectedType=='temperature'){
|
||||
// $('#temp_controlled_'+idNumber).show();
|
||||
// console.log("temperature");
|
||||
// }else if(selectedType=='filament'){
|
||||
// $('#filament_controlled_'+idNumber).show();
|
||||
// $('#input_io_'+idNumber).show();
|
||||
// console.log("filament");
|
||||
// }else if(selectedType=='gpio'){
|
||||
// $('#gpio_controlled_'+idNumber).show();
|
||||
// $('#input_io_'+idNumber).show();
|
||||
// console.log("gpio");
|
||||
// }
|
||||
// };
|
||||
|
||||
|
||||
self.fixAutoStartupUI = function(idNumber){
|
||||
if($('#autoStartup_'+idNumber).is(':checked')){
|
||||
$('#autoStartupField_'+idNumber).show("blind");
|
||||
}else{
|
||||
$('#autoStartupField_'+idNumber).hide("blind");
|
||||
}
|
||||
};
|
||||
|
||||
self.fixAutoShutdownUI = function(idNumber){
|
||||
if($('#autoShutdown_'+idNumber).is(':checked')){
|
||||
$('#autoShutdownField_'+idNumber).show("blind");
|
||||
}else{
|
||||
$('#autoShutdownField_'+idNumber).hide("blind");
|
||||
}
|
||||
};
|
||||
|
||||
self.isNumeric = function(n){
|
||||
return !isNaN(parseFloat(n)) && isFinite(n);
|
||||
};
|
||||
}
|
||||
|
||||
ADDITIONAL_VIEWMODELS.push([
|
||||
OCTOPRINT_VIEWMODELS.push([
|
||||
EnclosureViewModel,
|
||||
["settingsViewModel","connectionViewModel"],
|
||||
[document.getElementById("tab_plugin_enclosure")]
|
||||
["settingsViewModel","connectionViewModel","printerStateViewModel"],
|
||||
["#tab_plugin_enclosure","#settings_plugin_enclosure"]
|
||||
]);
|
||||
});
|
||||
|
||||
function isNumeric(n) {
|
||||
return !isNaN(parseFloat(n)) && isFinite(n);
|
||||
}
|
||||
|
||||
function fixUI() {
|
||||
if($('#enableTemperatureReading').is(':checked')){
|
||||
$('#enableHeater').prop('disabled', false);
|
||||
$('#temperature_reading_content').show("blind");
|
||||
}else{
|
||||
$('#enableHeater').prop('disabled', true);
|
||||
$('#enableHeater').prop('checked', false);
|
||||
$('#temperature_reading_content').hide("blind");
|
||||
}
|
||||
|
||||
if($('#enableHeater').is(':checked')){
|
||||
$('#heater_content').show("blind");
|
||||
}else{
|
||||
$('#heater_content').hide("blind");
|
||||
}
|
||||
|
||||
if($('#io1_enabled').is(':checked')){
|
||||
$('#io1_content').show("blind");
|
||||
}else{
|
||||
$('#io1_content').hide("blind");
|
||||
}
|
||||
|
||||
if($('#io2_enabled').is(':checked')){
|
||||
$('#io2_content').show("blind");
|
||||
}else{
|
||||
$('#io2_content').hide("blind");
|
||||
}
|
||||
|
||||
if($('#io3_enabled').is(':checked')){
|
||||
$('#io3_content').show("blind");
|
||||
}else{
|
||||
$('#io3_content').hide("blind");
|
||||
}
|
||||
|
||||
if($('#io4_enabled').is(':checked')){
|
||||
$('#io4_content').show("blind");
|
||||
}else{
|
||||
$('#io4_content').hide("blind");
|
||||
}
|
||||
|
||||
if($('#filament_sensor_enable').is(':checked')){
|
||||
$('#filament_sensor_content').show("blind");
|
||||
}else{
|
||||
$('#filament_sensor_content').hide("blind");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user