From 4d5c619b8eb7aa530a87304cc26734f42e2d2b0d Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Mon, 2 Aug 2021 12:36:38 -0400 Subject: [PATCH] scripts: Update graphing scripts to work with either python2 or python3 Signed-off-by: Kevin O'Connor --- scripts/graph_extruder.py | 4 ++-- scripts/graph_motion.py | 4 ++-- scripts/graph_shaper.py | 2 +- scripts/graphstats.py | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/graph_extruder.py b/scripts/graph_extruder.py index 241f727f..6f31ed3c 100755 --- a/scripts/graph_extruder.py +++ b/scripts/graph_extruder.py @@ -1,7 +1,7 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python # Generate extruder pressure advance motion graphs # -# Copyright (C) 2019-2020 Kevin O'Connor +# Copyright (C) 2019-2021 Kevin O'Connor # # This file may be distributed under the terms of the GNU GPLv3 license. import math, optparse, datetime diff --git a/scripts/graph_motion.py b/scripts/graph_motion.py index 29a5410b..0520343f 100755 --- a/scripts/graph_motion.py +++ b/scripts/graph_motion.py @@ -1,7 +1,7 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python # Script to graph motion results # -# Copyright (C) 2019-2020 Kevin O'Connor +# Copyright (C) 2019-2021 Kevin O'Connor # Copyright (C) 2020 Dmitry Butyugin # # This file may be distributed under the terms of the GNU GPLv3 license. diff --git a/scripts/graph_shaper.py b/scripts/graph_shaper.py index bf94afc1..0ea19458 100755 --- a/scripts/graph_shaper.py +++ b/scripts/graph_shaper.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python # Script to plot input shapers # # Copyright (C) 2020 Kevin O'Connor diff --git a/scripts/graphstats.py b/scripts/graphstats.py index d9915036..b00477f9 100755 --- a/scripts/graphstats.py +++ b/scripts/graphstats.py @@ -1,7 +1,7 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python # Script to parse a logging file, extract the stats, and graph them # -# Copyright (C) 2016-2019 Kevin O'Connor +# Copyright (C) 2016-2021 Kevin O'Connor # # This file may be distributed under the terms of the GNU GPLv3 license. import optparse, datetime @@ -23,7 +23,7 @@ def parse_log(logname, mcu): mcu = "mcu" mcu_prefix = mcu + ":" apply_prefix = { p: 1 for p in APPLY_PREFIX } - f = open(logname, 'rb') + f = open(logname, 'r') out = [] for line in f: parts = line.split()