3diy
/
OctoprintKlipperPlugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gcodeoffset' into devel

This commit is contained in:
thelastWallE 2021-04-01 12:07:53 +02:00
parent 22c52ee376 2474dcf8de
commit e03fee54a4
3 changed files with 67 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
octoprint_klipper/static/js/klipper.js
View File

@ -165,7 +165,11 @@ $(function () {
}
};
self.logMessage = function (timestamp, type, message) {
self.logMessage = function (timestamp, type="info", message) {
if (!timestamp) {
var today = new Date();
var timestamp = today.getHours() + ":" + today.getMinutes() + ":" + today.getSeconds();
}
self.logMessages.push({
time: timestamp,
type: type,

96
octoprint_klipper/static/js/klipper_offset.js
View File

@ -4,47 +4,73 @@
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
$(function() {
function KlipperOffsetDialogViewModel(parameters) {
var self = this;
self.offsetX = ko.observable();
self.offsetY = ko.observable();
self.offsetZ = ko.observable();
self.adjust = ko.observable();
self.onStartup = function() {
self.offsetX(0);
self.offsetY(0);
self.offsetZ(0);
self.adjust(false);
}
self.setOffset = function() {
if(self.adjust()) {
OctoPrint.control.sendGcode("SET_GCODE_OFFSET X_ADJUST=" + self.offsetX() +
" Y_ADJUST=" + self.offsetY() +
" Z_ADJUST=" + self.offsetZ());
} else {
OctoPrint.control.sendGcode("SET_GCODE_OFFSET X=" + self.offsetX() +
" Y=" + self.offsetY() +
" Z=" + self.offsetZ());
}
}
}
$(function () {
function KlipperOffsetDialogViewModel(parameters) {
var self = this;
OCTOPRINT_VIEWMODELS.push({
construct: KlipperOffsetDialogViewModel,
dependencies: [],
elements: ["#klipper_offset_dialog"]
});
self.klipperViewModel = parameters[0];
self.offsetX = ko.observable();
self.offsetY = ko.observable();
self.offsetZ = ko.observable();
self.adjust = ko.observable();
self.onStartup = function () {
self.offsetX(0);
self.offsetY(0);
self.offsetZ(0);
self.adjust(false);
};
self.setOffset = function () {
if (self.adjust()) {
self.klipperViewModel.logMessage("","info", "SET_GCODE_OFFSET X_ADJUST=" +
self.offsetX() +
" Y_ADJUST=" +
self.offsetY() +
" Z_ADJUST=" +
self.offsetZ())
OctoPrint.control.sendGcode(
"SET_GCODE_OFFSET X_ADJUST=" +
self.offsetX() +
" Y_ADJUST=" +
self.offsetY() +
" Z_ADJUST=" +
self.offsetZ()
);
} else {
self.klipperViewModel.logMessage("","info", "SET_GCODE_OFFSET X=" +
self.offsetX() +
" Y=" +
self.offsetY() +
" Z=" +
self.offsetZ())
OctoPrint.control.sendGcode(
"SET_GCODE_OFFSET X=" +
self.offsetX() +
" Y=" +
self.offsetY() +
" Z=" +
self.offsetZ()
);
}
};
}
OCTOPRINT_VIEWMODELS.push({
construct: KlipperOffsetDialogViewModel,
dependencies: ["klipperViewModel"],
elements: ["#klipper_offset_dialog"],
});
});

2
octoprint_klipper/templates/klipper_offset_dialog.jinja2
View File

@ -28,7 +28,7 @@
</div>
<div class="control-group">
<div class="controls">
<button class="btn btn-block" data-bind="click: setOffset"><i class="icon-cross"></i> {{ _('Set Offset') }}</button>
<button class="btn btn-block" data-bind="click: setOffset" data-dismiss="modal"><i class="icon-cross"></i> {{ _('Set Offset') }}</button>
</div>
</div>
</div>