mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-04-10 21:03:01 +00:00
Update clock.py
Date format changes
This commit is contained in:
27
src/clock.py
27
src/clock.py
@@ -89,16 +89,17 @@ class Clock:
|
|||||||
# Get AM/PM
|
# Get AM/PM
|
||||||
ampm = current.strftime('%p')
|
ampm = current.strftime('%p')
|
||||||
|
|
||||||
# Format date with ordinal suffix - more compact format
|
# Format date with ordinal suffix - split into two lines
|
||||||
day_suffix = self._get_ordinal_suffix(current.day)
|
day_suffix = self._get_ordinal_suffix(current.day)
|
||||||
# Use %b for abbreviated month name and remove extra spaces
|
# Full weekday on first line, full month and day on second line
|
||||||
date_str = current.strftime(f'%a,%b %-d{day_suffix}')
|
weekday = current.strftime('%A')
|
||||||
|
date_str = current.strftime(f'%B %-d{day_suffix}')
|
||||||
|
|
||||||
return time_str, ampm, date_str
|
return time_str, ampm, weekday, date_str
|
||||||
|
|
||||||
def display_time(self, force_clear: bool = False) -> None:
|
def display_time(self, force_clear: bool = False) -> None:
|
||||||
"""Display the current time and date."""
|
"""Display the current time and date."""
|
||||||
time_str, ampm, date_str = self.get_current_time()
|
time_str, ampm, weekday, date_str = self.get_current_time()
|
||||||
|
|
||||||
# Only update if something has changed
|
# Only update if something has changed
|
||||||
if time_str != self.last_time or date_str != self.last_date or force_clear:
|
if time_str != self.last_time or date_str != self.last_date or force_clear:
|
||||||
@@ -112,7 +113,7 @@ class Clock:
|
|||||||
# Draw time (large, centered, near top)
|
# Draw time (large, centered, near top)
|
||||||
self.display_manager.draw_text(
|
self.display_manager.draw_text(
|
||||||
time_str,
|
time_str,
|
||||||
y=3, # Move down slightly from top
|
y=2, # Move up slightly to make room for two lines of date
|
||||||
color=self.COLORS['time'],
|
color=self.COLORS['time'],
|
||||||
small_font=False
|
small_font=False
|
||||||
)
|
)
|
||||||
@@ -123,15 +124,23 @@ class Clock:
|
|||||||
self.display_manager.draw_text(
|
self.display_manager.draw_text(
|
||||||
ampm,
|
ampm,
|
||||||
x=ampm_x,
|
x=ampm_x,
|
||||||
y=5, # Align with time
|
y=4, # Align with time
|
||||||
color=self.COLORS['ampm'],
|
color=self.COLORS['ampm'],
|
||||||
small_font=True
|
small_font=True
|
||||||
)
|
)
|
||||||
|
|
||||||
# Draw date (small, centered below time)
|
# Draw weekday on first line (small font)
|
||||||
|
self.display_manager.draw_text(
|
||||||
|
weekday,
|
||||||
|
y=display_height - 18, # First line of date
|
||||||
|
color=self.COLORS['date'],
|
||||||
|
small_font=True
|
||||||
|
)
|
||||||
|
|
||||||
|
# Draw month and day on second line (small font)
|
||||||
self.display_manager.draw_text(
|
self.display_manager.draw_text(
|
||||||
date_str,
|
date_str,
|
||||||
y=display_height - 9, # Move up more from bottom
|
y=display_height - 9, # Second line of date
|
||||||
color=self.COLORS['date'],
|
color=self.COLORS['date'],
|
||||||
small_font=True
|
small_font=True
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user