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

Update to License to all match AGPL 

Some code was marked GPL and some was marked AGPL. Now it's all AGPL.
This commit is contained in:
Alice Grey 2020-08-29 17:23:22 -05:00
parent 35ad58006c
commit 89156d51f3
11 changed files with 502 additions and 420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

722
LICENSE.md
View File

File diff suppressed because it is too large Load Diff

19
octoprint_klipper/__init__.py
View File

@ -1,10 +1,17 @@
# coding=utf-8 # <Octoprint Klipper Plugin>
# OctoPrint Klipper Plugin
#
# Copyright (C) 2018 Martin Muehlhaeuser <github@mmone.de>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
# This program is free software: you can redistribute it and/or modify
# 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/>.
import datetime import datetime
import logging import logging

27
octoprint_klipper/modules/KlipperLogAnalyzer.py
View File

@ -1,4 +1,17 @@
# Copyright (C) 2016-2018 Kevin O'Connor <kevin@koconnor.net> # <Octoprint Klipper Plugin>
# This program is free software: you can redistribute it and/or modify
# 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/>.
import flask import flask
import optparse, datetime import optparse, datetime
@ -10,7 +23,7 @@ class KlipperLogAnalyzer():
TASK_MAX=0.0025 TASK_MAX=0.0025
APPLY_PREFIX = ['mcu_awake', 'mcu_task_avg', 'mcu_task_stddev', 'bytes_write', APPLY_PREFIX = ['mcu_awake', 'mcu_task_avg', 'mcu_task_stddev', 'bytes_write',
'bytes_read', 'bytes_retransmit', 'freq', 'adj'] 'bytes_read', 'bytes_retransmit', 'freq', 'adj']
def __init__(self, log_file): def __init__(self, log_file):
self.log_file = log_file self.log_file = log_file
@ -28,10 +41,10 @@ class KlipperLogAnalyzer():
mcu_prefix = mcu + ":" mcu_prefix = mcu + ":"
apply_prefix = { p: 1 for p in self.APPLY_PREFIX } apply_prefix = { p: 1 for p in self.APPLY_PREFIX }
out = [] out = []
try: try:
f = open(logname, 'rb') f = open(logname, 'rb')
for line in f: for line in f:
parts = line.split() parts = line.split()
if not parts or parts[0] not in ('Stats', 'INFO:root:Stats'): if not parts or parts[0] not in ('Stats', 'INFO:root:Stats'):
@ -122,7 +135,7 @@ class KlipperLogAnalyzer():
awake.append(100. * float(d.get('mcu_awake', 0.)) / self.STATS_INTERVAL) awake.append(100. * float(d.get('mcu_awake', 0.)) / self.STATS_INTERVAL)
lasttime = st lasttime = st
lastbw = bw lastbw = bw
result = dict( result = dict(
times= times, times= times,
bwdeltas= bwdeltas, bwdeltas= bwdeltas,
@ -131,7 +144,7 @@ class KlipperLogAnalyzer():
buffers= hostbuffers buffers= hostbuffers
) )
return result return result
def plot_frequency(self, data, mcu): def plot_frequency(self, data, mcu):
all_keys = {} all_keys = {}
for d in data: for d in data:
@ -148,5 +161,5 @@ class KlipperLogAnalyzer():
if val not in (None, '0', '1'): if val not in (None, '0', '1'):
times.append(st) times.append(st)
values.append(float(val)/1000000.0) values.append(float(val)/1000000.0)
return values return values

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

@ -1,8 +1,17 @@
// OctoPrint Klipper Plugin // <Octoprint Klipper Plugin>
//
// Copyright (C) 2018 Martin Muehlhaeuser <github@mmone.de> // This program is free software: you can redistribute it and/or modify
// // it under the terms of the GNU Affero General Public License as
// This file may be distributed under the terms of the GNU GPLv3 license. // 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() {
function KlipperViewModel(parameters) { function KlipperViewModel(parameters) {
@ -127,4 +136,4 @@ $(function() {
], ],
elements: ["#tab_plugin_klipper_main", "#sidebar_plugin_klipper", "#navbar_plugin_klipper"] elements: ["#tab_plugin_klipper_main", "#sidebar_plugin_klipper", "#navbar_plugin_klipper"]
}); });
}); });

19
octoprint_klipper/static/js/klipper_graph.js
View File

@ -1,8 +1,17 @@
// OctoPrint Klipper Plugin // <Octoprint Klipper Plugin>
//
// Copyright (C) 2018 Martin Muehlhaeuser <github@mmone.de> // This program is free software: you can redistribute it and/or modify
// // it under the terms of the GNU Affero General Public License as
// This file may be distributed under the terms of the GNU GPLv3 license. // 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() {

21
octoprint_klipper/static/js/klipper_leveling.js
View File

@ -1,8 +1,17 @@
// OctoPrint Klipper Plugin // <Octoprint Klipper Plugin>
//
// Copyright (C) 2018 Martin Muehlhaeuser <github@mmone.de> // This program is free software: you can redistribute it and/or modify
// // it under the terms of the GNU Affero General Public License as
// This file may be distributed under the terms of the GNU GPLv3 license. // 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() {
function KlipperLevelingViewModel(parameters) { function KlipperLevelingViewModel(parameters) {
@ -85,4 +94,4 @@ $(function() {
dependencies: ["settingsViewModel", "loginStateViewModel"], dependencies: ["settingsViewModel", "loginStateViewModel"],
elements: ["#klipper_leveling_dialog"] elements: ["#klipper_leveling_dialog"]
}); });
}); });

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

@ -1,8 +1,17 @@
// OctoPrint Klipper Plugin // <Octoprint Klipper Plugin>
//
// Copyright (C) 2018 Martin Muehlhaeuser <github@mmone.de> // This program is free software: you can redistribute it and/or modify
// // it under the terms of the GNU Affero General Public License as
// This file may be distributed under the terms of the GNU GPLv3 license. // 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() {
function KlipperOffsetDialogViewModel(parameters) { function KlipperOffsetDialogViewModel(parameters) {

19
octoprint_klipper/static/js/klipper_param_macro.js
View File

@ -1,8 +1,17 @@
// OctoPrint Klipper Plugin // <Octoprint Klipper Plugin>
//
// Copyright (C) 2018 Martin Muehlhaeuser <github@mmone.de> // This program is free software: you can redistribute it and/or modify
// // it under the terms of the GNU Affero General Public License as
// This file may be distributed under the terms of the GNU GPLv3 license. // 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() {
function KlipperMacroDialogViewModel(parameters) { function KlipperMacroDialogViewModel(parameters) {

19
octoprint_klipper/static/js/klipper_pid_tuning.js
View File

@ -1,8 +1,17 @@
// OctoPrint Klipper Plugin // <Octoprint Klipper Plugin>
//
// Copyright (C) 2018 Martin Muehlhaeuser <github@mmone.de> // This program is free software: you can redistribute it and/or modify
// // it under the terms of the GNU Affero General Public License as
// This file may be distributed under the terms of the GNU GPLv3 license. // 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() {
function KlipperPidTuningViewModel(parameters) { function KlipperPidTuningViewModel(parameters) {

21
octoprint_klipper/static/js/klipper_settings.js
View File

@ -1,8 +1,17 @@
// OctoPrint Klipper Plugin // <Octoprint Klipper Plugin>
//
// Copyright (C) 2018 Martin Muehlhaeuser <github@mmone.de> // This program is free software: you can redistribute it and/or modify
// // it under the terms of the GNU Affero General Public License as
// This file may be distributed under the terms of the GNU GPLv3 license. // 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() {
$('#klipper-settings a:first').tab('show'); $('#klipper-settings a:first').tab('show');
@ -74,4 +83,4 @@ $(function() {
dependencies: ["settingsViewModel"], dependencies: ["settingsViewModel"],
elements: ["#settings_plugin_klipper"] elements: ["#settings_plugin_klipper"]
}); });
}); });

15
setup.py
View File

@ -1,4 +1,17 @@
# coding=utf-8 # <Octoprint Klipper Plugin>
# This program is free software: you can redistribute it and/or modify
# 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/>.
plugin_identifier = "klipper" plugin_identifier = "klipper"