From 9f116547d03eb36923e0d14aeca1846e12c4d8f1 Mon Sep 17 00:00:00 2001 From: Arvid Norlander Date: Thu, 6 Aug 2020 11:35:54 +0200 Subject: [PATCH] Simplify blob design --- validitysensor/blobs.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/validitysensor/blobs.py b/validitysensor/blobs.py index 16550e1..edde185 100644 --- a/validitysensor/blobs.py +++ b/validitysensor/blobs.py @@ -1,14 +1,4 @@ -from enum import Enum, auto - - -class Blobs(Enum): - init_hardcoded = auto() - init_hardcoded_clean_slate = auto() - reset_blob = auto() - db_write_enable = auto() - - -def __load_blob(blob): +def __load_blob(blob: str) -> bytes: from .usb import usb if usb.usb_dev().idVendor == 0x138a: @@ -24,6 +14,7 @@ def __load_blob(blob): return globals()[blob] -for p in dir(Blobs): - if isinstance(getattr(Blobs, p), Blobs): - globals()[p] = lambda bname=p: __load_blob(bname) +init_hardcoded = lambda: __load_blob('init_hardcoded') +init_hardcoded_clean_slate = lambda: __load_blob('init_hardcoded_clean_slate') +reset_blob = lambda: __load_blob('reset_blob') +db_write_enable = lambda: __load_blob('db_write_enable')