Skip to content

Commit 3a71fb0

Browse files
committed
Refactor how CV and Rates values are initialized
I think there's more room for improvement but I didn't want to make any drastic changes
1 parent ca5f78f commit 3a71fb0

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

adafruit_hts221.py

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,18 @@ class CV:
7171
"""struct helper"""
7272

7373
@classmethod
74-
def add_values(cls, value_tuples):
74+
def add_values(cls, value_tuples: Sequence[Tuple[str, int]]) -> None:
7575
"""creates CV entries"""
76-
cls.string = {}
77-
cls.lsb = {}
76+
cls.contents = {}
7877

7978
for value_tuple in value_tuples:
80-
name, value, string, lsb = value_tuple
79+
name, value = value_tuple
8180
setattr(cls, name, value)
82-
cls.string[value] = string
83-
cls.lsb[value] = lsb
8481

8582
@classmethod
86-
def is_valid(cls, value):
83+
def is_valid(cls, value: int) -> bool:
8784
"""Returns true if the given value is a member of the CV"""
88-
return value in cls.string
85+
return hasattr(cls, value)
8986

9087

9188
class Rate(CV):
@@ -111,10 +108,10 @@ class Rate(CV):
111108

112109
Rate.add_values(
113110
(
114-
("ONE_SHOT", 0, 0, None),
115-
("RATE_1_HZ", 1, 1, None),
116-
("RATE_7_HZ", 2, 7, None),
117-
("RATE_12_5_HZ", 3, 12.5, None),
111+
("ONE_SHOT", 0),
112+
("RATE_1_HZ", 1),
113+
("RATE_7_HZ", 2),
114+
("RATE_12_5_HZ", 3),
118115
)
119116
)
120117

0 commit comments

Comments
 (0)