@@ -71,21 +71,18 @@ class CV:
71
71
"""struct helper"""
72
72
73
73
@classmethod
74
- def add_values (cls , value_tuples ) :
74
+ def add_values (cls , value_tuples : Sequence [ Tuple [ str , int ]]) -> None :
75
75
"""creates CV entries"""
76
- cls .string = {}
77
- cls .lsb = {}
76
+ cls .contents = {}
78
77
79
78
for value_tuple in value_tuples :
80
- name , value , string , lsb = value_tuple
79
+ name , value = value_tuple
81
80
setattr (cls , name , value )
82
- cls .string [value ] = string
83
- cls .lsb [value ] = lsb
84
81
85
82
@classmethod
86
- def is_valid (cls , value ) :
83
+ def is_valid (cls , value : int ) -> bool :
87
84
"""Returns true if the given value is a member of the CV"""
88
- return value in cls . string
85
+ return hasattr ( cls , value )
89
86
90
87
91
88
class Rate (CV ):
@@ -111,10 +108,10 @@ class Rate(CV):
111
108
112
109
Rate .add_values (
113
110
(
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 ),
118
115
)
119
116
)
120
117
0 commit comments