Skip to content

Commit c3535a2

Browse files
committed
Made requested changes
1 parent b34f153 commit c3535a2

File tree

1 file changed

+100
-194
lines changed

1 file changed

+100
-194
lines changed

adafruit_ht16k33/segments.py

+100-194
Original file line numberDiff line numberDiff line change
@@ -31,200 +31,106 @@
3131
__version__ = "0.0.0-auto.0"
3232
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_HT16K33.git"
3333

34+
# fmt: off
3435
CHARS = (
35-
0b00000000,
36-
0b00000000, #
37-
0b01000000,
38-
0b00000110, # !
39-
0b00000010,
40-
0b00100000, # "
41-
0b00010010,
42-
0b11001110, # #
43-
0b00010010,
44-
0b11101101, # $
45-
0b00001100,
46-
0b00100100, # %
47-
0b00100011,
48-
0b01011101, # &
49-
0b00000100,
50-
0b00000000, # '
51-
0b00100100,
52-
0b00000000, # (
53-
0b00001001,
54-
0b00000000, # )
55-
0b00111111,
56-
0b11000000, # *
57-
0b00010010,
58-
0b11000000, # +
59-
0b00001000,
60-
0b00000000, # ,
61-
0b00000000,
62-
0b11000000, # -
63-
0b00000000,
64-
0b00000000, # .
65-
0b00001100,
66-
0b00000000, # /
67-
0b00001100,
68-
0b00111111, # 0
69-
0b00000000,
70-
0b00000110, # 1
71-
0b00000000,
72-
0b11011011, # 2
73-
0b00000000,
74-
0b10001111, # 3
75-
0b00000000,
76-
0b11100110, # 4
77-
0b00100000,
78-
0b01101001, # 5
79-
0b00000000,
80-
0b11111101, # 6
81-
0b00000000,
82-
0b00000111, # 7
83-
0b00000000,
84-
0b11111111, # 8
85-
0b00000000,
86-
0b11101111, # 9
87-
0b00010010,
88-
0b00000000, # :
89-
0b00001010,
90-
0b00000000, # ;
91-
0b00100100,
92-
0b01000000, # <
93-
0b00000000,
94-
0b11001000, # =
95-
0b00001001,
96-
0b10000000, # >
97-
0b01100000,
98-
0b10100011, # ?
99-
0b00000010,
100-
0b10111011, # @
101-
0b00000000,
102-
0b11110111, # A
103-
0b00010010,
104-
0b10001111, # B
105-
0b00000000,
106-
0b00111001, # C
107-
0b00010010,
108-
0b00001111, # D
109-
0b00000000,
110-
0b11111001, # E
111-
0b00000000,
112-
0b01110001, # F
113-
0b00000000,
114-
0b10111101, # G
115-
0b00000000,
116-
0b11110110, # H
117-
0b00010010,
118-
0b00000000, # I
119-
0b00000000,
120-
0b00011110, # J
121-
0b00100100,
122-
0b01110000, # K
123-
0b00000000,
124-
0b00111000, # L
125-
0b00000101,
126-
0b00110110, # M
127-
0b00100001,
128-
0b00110110, # N
129-
0b00000000,
130-
0b00111111, # O
131-
0b00000000,
132-
0b11110011, # P
133-
0b00100000,
134-
0b00111111, # Q
135-
0b00100000,
136-
0b11110011, # R
137-
0b00000000,
138-
0b11101101, # S
139-
0b00010010,
140-
0b00000001, # T
141-
0b00000000,
142-
0b00111110, # U
143-
0b00001100,
144-
0b00110000, # V
145-
0b00101000,
146-
0b00110110, # W
147-
0b00101101,
148-
0b00000000, # X
149-
0b00010101,
150-
0b00000000, # Y
151-
0b00001100,
152-
0b00001001, # Z
153-
0b00000000,
154-
0b00111001, # [
155-
0b00100001,
156-
0b00000000, # \
157-
0b00000000,
158-
0b00001111, # ]
159-
0b00001100,
160-
0b00000011, # ^
161-
0b00000000,
162-
0b00001000, # _
163-
0b00000001,
164-
0b00000000, # `
165-
0b00010000,
166-
0b01011000, # a
167-
0b00100000,
168-
0b01111000, # b
169-
0b00000000,
170-
0b11011000, # c
171-
0b00001000,
172-
0b10001110, # d
173-
0b00001000,
174-
0b01011000, # e
175-
0b00000000,
176-
0b01110001, # f
177-
0b00000100,
178-
0b10001110, # g
179-
0b00010000,
180-
0b01110000, # h
181-
0b00010000,
182-
0b00000000, # i
183-
0b00000000,
184-
0b00001110, # j
185-
0b00110110,
186-
0b00000000, # k
187-
0b00000000,
188-
0b00110000, # l
189-
0b00010000,
190-
0b11010100, # m
191-
0b00010000,
192-
0b01010000, # n
193-
0b00000000,
194-
0b11011100, # o
195-
0b00000001,
196-
0b01110000, # p
197-
0b00000100,
198-
0b10000110, # q
199-
0b00000000,
200-
0b01010000, # r
201-
0b00100000,
202-
0b10001000, # s
203-
0b00000000,
204-
0b01111000, # t
205-
0b00000000,
206-
0b00011100, # u
207-
0b00100000,
208-
0b00000100, # v
209-
0b00101000,
210-
0b00010100, # w
211-
0b00101000,
212-
0b11000000, # x
213-
0b00100000,
214-
0b00001100, # y
215-
0b00001000,
216-
0b01001000, # z
217-
0b00001001,
218-
0b01001001, # {
219-
0b00010010,
220-
0b00000000, # |
221-
0b00100100,
222-
0b10001001, # }
223-
0b00000101,
224-
0b00100000, # ~
225-
0b00111111,
226-
0b11111111,
36+
0b00000000, 0b00000000, #
37+
0b01000000, 0b00000110, # !
38+
0b00000010, 0b00100000, # "
39+
0b00010010, 0b11001110, # #
40+
0b00010010, 0b11101101, # $
41+
0b00001100, 0b00100100, # %
42+
0b00100011, 0b01011101, # &
43+
0b00000100, 0b00000000, # '
44+
0b00100100, 0b00000000, # (
45+
0b00001001, 0b00000000, # )
46+
0b00111111, 0b11000000, # *
47+
0b00010010, 0b11000000, # +
48+
0b00001000, 0b00000000, # ,
49+
0b00000000, 0b11000000, # -
50+
0b00000000, 0b00000000, # .
51+
0b00001100, 0b00000000, # /
52+
0b00001100, 0b00111111, # 0
53+
0b00000000, 0b00000110, # 1
54+
0b00000000, 0b11011011, # 2
55+
0b00000000, 0b10001111, # 3
56+
0b00000000, 0b11100110, # 4
57+
0b00100000, 0b01101001, # 5
58+
0b00000000, 0b11111101, # 6
59+
0b00000000, 0b00000111, # 7
60+
0b00000000, 0b11111111, # 8
61+
0b00000000, 0b11101111, # 9
62+
0b00010010, 0b00000000, # :
63+
0b00001010, 0b00000000, # ;
64+
0b00100100, 0b01000000, # <
65+
0b00000000, 0b11001000, # =
66+
0b00001001, 0b10000000, # >
67+
0b01100000, 0b10100011, # ?
68+
0b00000010, 0b10111011, # @
69+
0b00000000, 0b11110111, # A
70+
0b00010010, 0b10001111, # B
71+
0b00000000, 0b00111001, # C
72+
0b00010010, 0b00001111, # D
73+
0b00000000, 0b11111001, # E
74+
0b00000000, 0b01110001, # F
75+
0b00000000, 0b10111101, # G
76+
0b00000000, 0b11110110, # H
77+
0b00010010, 0b00000000, # I
78+
0b00000000, 0b00011110, # J
79+
0b00100100, 0b01110000, # K
80+
0b00000000, 0b00111000, # L
81+
0b00000101, 0b00110110, # M
82+
0b00100001, 0b00110110, # N
83+
0b00000000, 0b00111111, # O
84+
0b00000000, 0b11110011, # P
85+
0b00100000, 0b00111111, # Q
86+
0b00100000, 0b11110011, # R
87+
0b00000000, 0b11101101, # S
88+
0b00010010, 0b00000001, # T
89+
0b00000000, 0b00111110, # U
90+
0b00001100, 0b00110000, # V
91+
0b00101000, 0b00110110, # W
92+
0b00101101, 0b00000000, # X
93+
0b00010101, 0b00000000, # Y
94+
0b00001100, 0b00001001, # Z
95+
0b00000000, 0b00111001, # [
96+
0b00100001, 0b00000000, # \
97+
0b00000000, 0b00001111, # ]
98+
0b00001100, 0b00000011, # ^
99+
0b00000000, 0b00001000, # _
100+
0b00000001, 0b00000000, # `
101+
0b00010000, 0b01011000, # a
102+
0b00100000, 0b01111000, # b
103+
0b00000000, 0b11011000, # c
104+
0b00001000, 0b10001110, # d
105+
0b00001000, 0b01011000, # e
106+
0b00000000, 0b01110001, # f
107+
0b00000100, 0b10001110, # g
108+
0b00010000, 0b01110000, # h
109+
0b00010000, 0b00000000, # i
110+
0b00000000, 0b00001110, # j
111+
0b00110110, 0b00000000, # k
112+
0b00000000, 0b00110000, # l
113+
0b00010000, 0b11010100, # m
114+
0b00010000, 0b01010000, # n
115+
0b00000000, 0b11011100, # o
116+
0b00000001, 0b01110000, # p
117+
0b00000100, 0b10000110, # q
118+
0b00000000, 0b01010000, # r
119+
0b00100000, 0b10001000, # s
120+
0b00000000, 0b01111000, # t
121+
0b00000000, 0b00011100, # u
122+
0b00100000, 0b00000100, # v
123+
0b00101000, 0b00010100, # w
124+
0b00101000, 0b11000000, # x
125+
0b00100000, 0b00001100, # y
126+
0b00001000, 0b01001000, # z
127+
0b00001001, 0b01001001, # {
128+
0b00010010, 0b00000000, # |
129+
0b00100100, 0b10001001, # }
130+
0b00000101, 0b00100000, # ~
131+
0b00111111, 0b11111111,
227132
)
133+
# fmt: on
228134
NUMBERS = (
229135
0x3F, # 0
230136
0x06, # 1
@@ -337,15 +243,15 @@ def _number(self, number, decimal=0):
337243
else:
338244
places = len(stnum[:dot])
339245

340-
if places <= 0 < decimal:
246+
if places <= 0 and decimal > 0:
341247
self.fill(False)
342248
places = 4
343249

344250
if "." in stnum:
345251
places += 1
346252

347253
# Set decimal places, if number of decimal places is specified (decimal > 0)
348-
if places > 0 < decimal < len(stnum[places:]) and dot > 0:
254+
if places > 0 and decimal > 0 and dot > 0 and (len(stnum[places:]) > decimal):
349255
txt = stnum[: dot + decimal + 1]
350256
elif places > 0:
351257
txt = stnum[:places]

0 commit comments

Comments
 (0)