From 6a24f89a513cd4bc6201a256f941c64619574300 Mon Sep 17 00:00:00 2001 From: Viktor Dragomiretskyy Date: Thu, 9 Jul 2020 16:28:38 +1200 Subject: [PATCH] Refactor package name --- dbus-service.py | 12 ++++++------ factory-reset.py | 4 ++-- led-dance.py | 8 ++++---- pair.py | 14 +++++++------- prototype.py | 14 +++++++------- validity-sensors-initializer.py | 16 ++++++++-------- {proto9x => validitysensor}/blobs.py | 0 {proto9x => validitysensor}/blobs_90.py | 0 {proto9x => validitysensor}/blobs_97.py | 0 {proto9x => validitysensor}/blobs_9a.py | 0 {proto9x => validitysensor}/db.py | 0 {proto9x => validitysensor}/flash.py | 0 {proto9x => validitysensor}/generated_tables.py | 0 {proto9x => validitysensor}/hw_tables.py | 0 {proto9x => validitysensor}/init.py | 10 +++++----- {proto9x => validitysensor}/init_db.py | 0 {proto9x => validitysensor}/init_flash.py | 0 {proto9x => validitysensor}/sensor.py | 0 {proto9x => validitysensor}/sid.py | 0 {proto9x => validitysensor}/table_types.py | 0 {proto9x => validitysensor}/timeslot.py | 0 {proto9x => validitysensor}/tls.py | 0 {proto9x => validitysensor}/upload_fwext.py | 0 {proto9x => validitysensor}/usb.py | 0 {proto9x => validitysensor}/util.py | 0 25 files changed, 39 insertions(+), 39 deletions(-) rename {proto9x => validitysensor}/blobs.py (100%) rename {proto9x => validitysensor}/blobs_90.py (100%) rename {proto9x => validitysensor}/blobs_97.py (100%) rename {proto9x => validitysensor}/blobs_9a.py (100%) rename {proto9x => validitysensor}/db.py (100%) rename {proto9x => validitysensor}/flash.py (100%) rename {proto9x => validitysensor}/generated_tables.py (100%) rename {proto9x => validitysensor}/hw_tables.py (100%) rename {proto9x => validitysensor}/init.py (77%) rename {proto9x => validitysensor}/init_db.py (100%) rename {proto9x => validitysensor}/init_flash.py (100%) rename {proto9x => validitysensor}/sensor.py (100%) rename {proto9x => validitysensor}/sid.py (100%) rename {proto9x => validitysensor}/table_types.py (100%) rename {proto9x => validitysensor}/timeslot.py (100%) rename {proto9x => validitysensor}/tls.py (100%) rename {proto9x => validitysensor}/upload_fwext.py (100%) rename {proto9x => validitysensor}/usb.py (100%) rename {proto9x => validitysensor}/util.py (100%) diff --git a/dbus-service.py b/dbus-service.py index 0e743cc..fa1c68b 100644 --- a/dbus-service.py +++ b/dbus-service.py @@ -6,12 +6,12 @@ dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) from gi.repository import GObject, GLib import logging -from proto9x import init -from proto9x.tls import tls -from proto9x.usb import usb -from proto9x.sid import sid_from_string -from proto9x.db import subtype_to_string, db -from proto9x.sensor import sensor, reboot +from validitysensor import init +from validitysensor.tls import tls +from validitysensor.usb import usb +from validitysensor.sid import sid_from_string +from validitysensor.db import subtype_to_string, db +from validitysensor.sensor import sensor, reboot import pwd import atexit import signal diff --git a/factory-reset.py b/factory-reset.py index 9ff94c9..8589616 100644 --- a/factory-reset.py +++ b/factory-reset.py @@ -1,6 +1,6 @@ -from proto9x.usb import usb -from proto9x.sensor import factory_reset +from validitysensor.usb import usb +from validitysensor.sensor import factory_reset usb.open() factory_reset() diff --git a/led-dance.py b/led-dance.py index cf0e21f..8ca6d84 100644 --- a/led-dance.py +++ b/led-dance.py @@ -4,10 +4,10 @@ import os from binascii import unhexlify from enum import Enum -from proto9x.flash import read_flash -from proto9x.sensor import * -from proto9x.tls import tls as vfs_tls -from proto9x.usb import usb as vfs_usb +from validitysensor.flash import read_flash +from validitysensor.sensor import * +from validitysensor.tls import tls as vfs_tls +from validitysensor.usb import usb as vfs_usb from time import sleep from usb import core as usb_core diff --git a/pair.py b/pair.py index 1c70b35..a16d694 100644 --- a/pair.py +++ b/pair.py @@ -1,13 +1,13 @@ from time import sleep -from proto9x.usb import usb -from proto9x.tls import tls -from proto9x.flash import read_tls_flash -from proto9x.init_flash import init_flash -from proto9x.upload_fwext import upload_fwext -from proto9x.init_db import init_db -from proto9x.sensor import sensor, reboot +from validitysensor.usb import usb +from validitysensor.tls import tls +from validitysensor.flash import read_tls_flash +from validitysensor.init_flash import init_flash +from validitysensor.upload_fwext import upload_fwext +from validitysensor.init_db import init_db +from validitysensor.sensor import sensor, reboot #usb.trace_enabled=True #tls.trace_enabled=True diff --git a/prototype.py b/prototype.py index 8fa0e08..b83782b 100644 --- a/prototype.py +++ b/prototype.py @@ -1,10 +1,10 @@ -from proto9x.tls import tls -from proto9x.usb import usb -from proto9x.db import db -from proto9x.flash import read_flash -from proto9x.sensor import * -from proto9x.sid import * -from proto9x.init import open as open9x +from validitysensor.tls import tls +from validitysensor.usb import usb +from validitysensor.db import db +from validitysensor.flash import read_flash +from validitysensor.sensor import * +from validitysensor.sid import * +from validitysensor.init import open as open9x from threading import Condition from time import sleep import code diff --git a/validity-sensors-initializer.py b/validity-sensors-initializer.py index 81e6ee1..83c8db4 100644 --- a/validity-sensors-initializer.py +++ b/validity-sensors-initializer.py @@ -30,14 +30,14 @@ from enum import Enum, auto from time import sleep from usb import core as usb_core -from proto9x.flash import read_flash -from proto9x.init_db import init_db -from proto9x.init_flash import init_flash -from proto9x.sensor import sensor as vfs_sensor -from proto9x.sensor import factory_reset -from proto9x.tls import tls as vfs_tls -from proto9x.upload_fwext import upload_fwext -from proto9x.usb import usb as vfs_usb +from validitysensor.flash import read_flash +from validitysensor.init_db import init_db +from validitysensor.init_flash import init_flash +from validitysensor.sensor import sensor as vfs_sensor +from validitysensor.sensor import factory_reset +from validitysensor.tls import tls as vfs_tls +from validitysensor.upload_fwext import upload_fwext +from validitysensor.usb import usb as vfs_usb class VFS(Enum): DEV_90 = (0x138a, 0x0090) diff --git a/proto9x/blobs.py b/validitysensor/blobs.py similarity index 100% rename from proto9x/blobs.py rename to validitysensor/blobs.py diff --git a/proto9x/blobs_90.py b/validitysensor/blobs_90.py similarity index 100% rename from proto9x/blobs_90.py rename to validitysensor/blobs_90.py diff --git a/proto9x/blobs_97.py b/validitysensor/blobs_97.py similarity index 100% rename from proto9x/blobs_97.py rename to validitysensor/blobs_97.py diff --git a/proto9x/blobs_9a.py b/validitysensor/blobs_9a.py similarity index 100% rename from proto9x/blobs_9a.py rename to validitysensor/blobs_9a.py diff --git a/proto9x/db.py b/validitysensor/db.py similarity index 100% rename from proto9x/db.py rename to validitysensor/db.py diff --git a/proto9x/flash.py b/validitysensor/flash.py similarity index 100% rename from proto9x/flash.py rename to validitysensor/flash.py diff --git a/proto9x/generated_tables.py b/validitysensor/generated_tables.py similarity index 100% rename from proto9x/generated_tables.py rename to validitysensor/generated_tables.py diff --git a/proto9x/hw_tables.py b/validitysensor/hw_tables.py similarity index 100% rename from proto9x/hw_tables.py rename to validitysensor/hw_tables.py diff --git a/proto9x/init.py b/validitysensor/init.py similarity index 77% rename from proto9x/init.py rename to validitysensor/init.py index abcbb22..7457f6e 100644 --- a/proto9x/init.py +++ b/validitysensor/init.py @@ -1,11 +1,11 @@ import atexit -from proto9x.usb import usb -from proto9x.tls import tls -from proto9x.sensor import sensor -from proto9x.sensor import reboot -from proto9x.flash import read_tls_flash +from validitysensor.usb import usb +from validitysensor.tls import tls +from validitysensor.sensor import sensor +from validitysensor.sensor import reboot +from validitysensor.flash import read_tls_flash def close(): if usb.dev is not None: diff --git a/proto9x/init_db.py b/validitysensor/init_db.py similarity index 100% rename from proto9x/init_db.py rename to validitysensor/init_db.py diff --git a/proto9x/init_flash.py b/validitysensor/init_flash.py similarity index 100% rename from proto9x/init_flash.py rename to validitysensor/init_flash.py diff --git a/proto9x/sensor.py b/validitysensor/sensor.py similarity index 100% rename from proto9x/sensor.py rename to validitysensor/sensor.py diff --git a/proto9x/sid.py b/validitysensor/sid.py similarity index 100% rename from proto9x/sid.py rename to validitysensor/sid.py diff --git a/proto9x/table_types.py b/validitysensor/table_types.py similarity index 100% rename from proto9x/table_types.py rename to validitysensor/table_types.py diff --git a/proto9x/timeslot.py b/validitysensor/timeslot.py similarity index 100% rename from proto9x/timeslot.py rename to validitysensor/timeslot.py diff --git a/proto9x/tls.py b/validitysensor/tls.py similarity index 100% rename from proto9x/tls.py rename to validitysensor/tls.py diff --git a/proto9x/upload_fwext.py b/validitysensor/upload_fwext.py similarity index 100% rename from proto9x/upload_fwext.py rename to validitysensor/upload_fwext.py diff --git a/proto9x/usb.py b/validitysensor/usb.py similarity index 100% rename from proto9x/usb.py rename to validitysensor/usb.py diff --git a/proto9x/util.py b/validitysensor/util.py similarity index 100% rename from proto9x/util.py rename to validitysensor/util.py