work on offset dialog

-show offset command in the logger
-hide the offsetdialog
This commit is contained in:
thelastWallE 2021-04-01 12:05:50 +02:00
parent 22c52ee376
commit 2474dcf8de
3 changed files with 67 additions and 37 deletions

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({ self.logMessages.push({
time: timestamp, time: timestamp,
type: type, type: type,

View File

@ -13,38 +13,64 @@
// You should have received a copy of the GNU Affero General Public License // 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/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
$(function() { $(function () {
function KlipperOffsetDialogViewModel(parameters) { function KlipperOffsetDialogViewModel(parameters) {
var self = this; var self = this;
self.klipperViewModel = parameters[0];
self.offsetX = ko.observable(); self.offsetX = ko.observable();
self.offsetY = ko.observable(); self.offsetY = ko.observable();
self.offsetZ = ko.observable(); self.offsetZ = ko.observable();
self.adjust = ko.observable(); self.adjust = ko.observable();
self.onStartup = function() { self.onStartup = function () {
self.offsetX(0); self.offsetX(0);
self.offsetY(0); self.offsetY(0);
self.offsetZ(0); self.offsetZ(0);
self.adjust(false); self.adjust(false);
} };
self.setOffset = function() { self.setOffset = function () {
if(self.adjust()) { if (self.adjust()) {
OctoPrint.control.sendGcode("SET_GCODE_OFFSET X_ADJUST=" + self.offsetX() + self.klipperViewModel.logMessage("","info", "SET_GCODE_OFFSET X_ADJUST=" +
" Y_ADJUST=" + self.offsetY() + self.offsetX() +
" Z_ADJUST=" + self.offsetZ()); " 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 { } else {
OctoPrint.control.sendGcode("SET_GCODE_OFFSET X=" + self.offsetX() + self.klipperViewModel.logMessage("","info", "SET_GCODE_OFFSET X=" +
" Y=" + self.offsetY() + self.offsetX() +
" Z=" + self.offsetZ()); " Y=" +
} self.offsetY() +
" Z=" +
self.offsetZ())
OctoPrint.control.sendGcode(
"SET_GCODE_OFFSET X=" +
self.offsetX() +
" Y=" +
self.offsetY() +
" Z=" +
self.offsetZ()
);
} }
};
} }
OCTOPRINT_VIEWMODELS.push({ OCTOPRINT_VIEWMODELS.push({
construct: KlipperOffsetDialogViewModel, construct: KlipperOffsetDialogViewModel,
dependencies: [], dependencies: ["klipperViewModel"],
elements: ["#klipper_offset_dialog"] elements: ["#klipper_offset_dialog"],
}); });
}); });

View File

@ -28,7 +28,7 @@
</div> </div>
<div class="control-group"> <div class="control-group">
<div class="controls"> <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> </div>
</div> </div>