Skip to content

Added auto rounding if auto_round=True. Still rounds according to dec… #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 27, 2021
Merged

Added auto rounding if auto_round=True. Still rounds according to dec… #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions examples/ht16k33_segments_simpletest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,17 @@
# display.fill(0)
sleep(DELAY_BETWEEN_SEC)

# Can just print an integer number
int_number = 6358
# Can just print a floating point number
int_number = 33.14546
print("Printing an integer number {0}".format(int_number))
display.print(int_number)
display.print(int_number, auto_round=True)
sleep(DELAY_BETWEEN_SEC)
display.fill(0)

# Can just print a floating point number
float_number = 2172.5475
float_number = 179.2545
print("Printing a floating point number {0}".format(float_number))
display.print(float_number, 1)
display.print(float_number, decimal=1)
sleep(DELAY_BETWEEN_SEC)
display.fill(0)

Expand Down
83 changes: 35 additions & 48 deletions hybotics_ht16k33/segments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,12 @@ def __init__(self, i2c, address=0x70, auto_write=True):
# Use colon for controling two-dots indicator at the center (index 0)
self._colon = Colon(self)

def print(self, value, decimal=0):
def print(self, value, decimal=0, auto_round=False):
"""Print the value to the display."""
if isinstance(value, (str)):
self._text(value)
elif isinstance(value, (int, float)):
self._number(value, decimal)
self._number(value, decimal, auto_round)
else:
raise ValueError("Unsupported display value type: {}".format(type(value)))
if self._auto_write:
Expand Down Expand Up @@ -189,7 +189,7 @@ def _text(self, text):
for character in text:
self._push(character)

def _number(self, number, decimal=0):
def _number(self, number, decimal=None, auto_round=False):
"""
Display a floating point or integer number on the Adafruit HT16K33 based displays

Expand All @@ -201,10 +201,15 @@ def _number(self, number, decimal=0):

Returns: The output text string to be displayed.
"""
if number < 0:
raise ValueError("Input underflow: {0} is negative - unable to display!".format(number))

# Initialize
auto_write = self._auto_write
self._auto_write = False
txt = ""
places = 0
dec_places = 0
num = number

# Check for floating point numbers (dot > 0)
stnum = str(number)
Expand All @@ -217,66 +222,48 @@ def _number(self, number, decimal=0):
else:
whole = stnum_len
dec_places = 0

# Handle floats < 1 and > 0
num = number

# Round the number if the decimal places are too long
while whole + dec_places > 4 and dec_places >= 0:
dec_places -= 1 ##################
num = round(num, dec_places) #dec_places)

print("(1) number = {0}, num = {1}, dot = {2}, whole = {3}, dec_places = {4}".format(number, num, dot, whole, dec_places))

stnum = str(num)
stnum_len = len(stnum)
dot = stnum.find(".")

if dot > 0:
whole = len(stnum[:dot])
dec_places = len(stnum[dot + 1:])

print("(1.5) stnum = '{0}', stnum_len = {1}, dot = {2}, whole = {3}, dec_places = {4}".format(stnum, stnum_len, dot, whole, dec_places))

if stnum[dot:] == ".0":
stnum = stnum[:dot]
dot = stnum.find(".")
if auto_round:
# Automatically round up to when there is no decimal part
while whole + dec_places > 4 and dec_places >= 0:
dec_places -= 1
num = round(num, dec_places) #dec_places)

if dot > 0:
whole = len(stnum[:dot])
dec_places = len(stnum[dot + 1:])

stnum_len = len(stnum)
stnum = str(num)
stnum_len = len(stnum)
elif decimal >= 1:
# Round according to the number of decimal places requested
num = round(number, decimal)
dec_places = decimal
stnum = str(num)
dot = stnum.find(".")

if dot > 0:
whole = len(stnum[:dot])
stnum = stnum[:dot + decimal + 1]
stnum_len = len(stnum)

print("(2) stnum = '{0}', stnum_len = {1}, dot = {2}, whole = {3}, dec_places = {4}".format(stnum, stnum_len, dot, whole, dec_places))
print("(1) number = {0}, num = {1}, decimal = {2}, dot = {3}, whole = {4}, dec_places = {5}".format(number, num, decimal, dot, whole, dec_places))
print("(1) stnum = '{0}', stnum_len = {1}".format(stnum, stnum_len))

if whole + dec_places > 5:
raise ValueError(
"Input overflow - {0} is too large for the display!".format(number)
)
raise ValueError("Input overflow - '{0}' is too large for the display!".format(number))

print("(3) whole = {0}, dec_places = {1}, decimal = {2}".format(whole, dec_places, decimal))

if dec_places < 1 < decimal:
self.fill(False)
dec_places = 4

if "." in stnum:
dec_places += 1

print("(4) dec_places = {0}, places = {1}, decimal = {2}".format(dec_places, places, decimal))
print("(2) whole = {0}, dec_places = {1}, decimal = {2}".format(whole, dec_places, decimal))

print("(3) dec_places = {0}, decimal = {1}".format(dec_places, decimal))

# Set decimal places, if number of decimal places is specified (decimal > 0)
if dec_places > 0 and dot > 0 and stnum[0] == ".":
txt = "0" + stnum[dot:]
else:
txt = stnum

print("(5) txt = '{0}' len(txt) = {1}".format(txt, len(txt)))
print("(4) txt = '{0}' len(txt) = {1}".format(txt, len(txt)))
print()

if len(txt) > 5:
raise ValueError("Output string ('{0}') is too long!".format(txt))
raise ValueError("Output string '{0}' is too long!".format(txt))

self._text(txt)
self._auto_write = auto_write
Expand Down