rick/LEDMatrix
1
0
Fork 0
mirror of https://github.com/ChuckBuilds/LEDMatrix.git synced 2026-04-10 21:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

display buffer updates

Browse Source 
troubleshooting clarity
This commit is contained in:
Chuck
2025-04-08 18:21:21 -05:00
parent 448860d77d
commit ec11f57375
2 changed files with 63 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/display_controller.py
View File

@@ -22,8 +22,9 @@ class DisplayController:
self.scroll_position = 0
self.scroll_speed = 1 # Reduced scroll speed
self.last_scroll = time.time()
self.scroll_interval = 0.1 # Increased scroll interval for smoother scrolling
self.force_clear = False
self.scroll_interval = 0.2 # Increased scroll interval for smoother scrolling
self.force_clear = True # Start with a clear screen
self.update_interval = 0.1 # Consistent update interval
logger.info("DisplayController initialized with display_manager: %s", id(self.display_manager))
def run(self):
@@ -47,7 +48,8 @@ class DisplayController:
logger.info("Switching display to: %s", self.current_display)
self.last_switch = current_time
self.force_clear = True # Set force clear flag instead of clearing immediately
self.force_clear = True # Clear screen on mode switch
self.display_manager.clear() # Ensure clean transition
# Update scroll position for hourly forecast if needed
if self.current_display == 'hourly' and current_time - self.last_scroll > self.scroll_interval:
@@ -58,25 +60,28 @@ class DisplayController:
if self.scroll_position > self.display_manager.matrix.width * 3:
self.scroll_position = 0
self.force_clear = True
self.display_manager.clear()
# Display current screen
if self.current_display == 'clock':
self.clock.display_time(force_clear=self.force_clear)
elif self.current_display == 'weather':
self.weather.display_weather(force_clear=self.force_clear)
elif self.current_display == 'hourly':
self.weather.display_hourly_forecast(self.scroll_position, force_clear=self.force_clear)
else: # daily
self.weather.display_daily_forecast(force_clear=self.force_clear)
try:
if self.current_display == 'clock':
self.clock.display_time(force_clear=self.force_clear)
elif self.current_display == 'weather':
self.weather.display_weather(force_clear=self.force_clear)
elif self.current_display == 'hourly':
self.weather.display_hourly_forecast(self.scroll_position, force_clear=self.force_clear)
else: # daily
self.weather.display_daily_forecast(force_clear=self.force_clear)
except Exception as e:
logger.error(f"Error updating display: {e}")
time.sleep(1) # Wait a bit before retrying
continue
# Reset force clear flag after use
self.force_clear = False
# Sleep longer when not scrolling
if self.current_display == 'hourly':
time.sleep(self.scroll_interval) # Use scroll interval for consistent timing
else:
time.sleep(0.2) # Longer sleep for static displays
# Consistent sleep time for all modes
time.sleep(self.update_interval)
except KeyboardInterrupt:
print("\nDisplay stopped by user")

71
src/weather_manager.py
View File

@@ -181,6 +181,13 @@ class WeatherManager:
self._fetch_weather()
return self.weather_data
def _prepare_display(self, force_clear: bool = False):
"""Prepare the display for drawing."""
if force_clear:
self.display_manager.clear()
self.display_manager.image = Image.new('RGB', (self.display_manager.matrix.width, self.display_manager.matrix.height))
self.display_manager.draw = ImageDraw.Draw(self.display_manager.image)
def display_weather(self, force_clear: bool = False) -> None:
"""Display current weather information using an improved layout."""
weather_data = self.get_weather()
@@ -194,9 +201,8 @@ class WeatherManager:
# Only update display if forced or data changed
if force_clear or not hasattr(self, 'last_temp') or temp != self.last_temp or condition != self.last_condition:
# Reset buffer
self._init_buffer()
self._clear_buffer()
# Prepare display
self._prepare_display(force_clear)
# Calculate layout
display_width = self.display_manager.matrix.width
@@ -207,13 +213,14 @@ class WeatherManager:
x_pos = display_width // 4
y_pos = display_height // 2 - 4
# Draw to buffer
# Draw temperature
self.display_manager.draw_text(
temp_text,
x=x_pos,
y=y_pos,
color=self.COLORS['highlight'],
small_font=False
small_font=False,
force_clear=False # Don't clear since we already prepared the display
)
# Draw weather icon
@@ -228,11 +235,12 @@ class WeatherManager:
x=self.PADDING,
y=display_height - 8,
color=self.COLORS['text'],
small_font=True
small_font=True,
force_clear=False # Don't clear since we already prepared the display
)
# Update display once
self._update_display()
# Update display
self.display_manager.update_display()
# Update cache
self.last_temp = temp
@@ -249,9 +257,8 @@ class WeatherManager:
if not force_clear and current_time - self.last_draw_time < 0.1:
return
# Reset buffer
self._init_buffer()
self._clear_buffer()
# Prepare display
self._prepare_display(force_clear)
# Calculate layout parameters
display_width = self.display_manager.matrix.width
@@ -264,11 +271,12 @@ class WeatherManager:
header_text,
y=1,
color=self.COLORS['highlight'],
small_font=True
small_font=True,
force_clear=False # Don't clear since we already prepared the display
)
# Draw separator line
self.draw.line(
self.display_manager.draw.line(
[(0, 8), (display_width, 8)],
fill=self.COLORS['separator']
)
@@ -286,7 +294,8 @@ class WeatherManager:
x=x_pos + forecast_width // 2,
y=10,
color=self.COLORS['text'],
small_font=True
small_font=True,
force_clear=False # Don't clear since we already prepared the display
)
# Draw icon
@@ -306,20 +315,21 @@ class WeatherManager:
x=x_pos + forecast_width // 2,
y=display_height - 8,
color=self.COLORS['text'],
small_font=True
small_font=True,
force_clear=False # Don't clear since we already prepared the display
)
# Draw separator line
if i < len(self.hourly_forecast) - 1:
sep_x = x_pos + forecast_width - 1
if 0 <= sep_x <= display_width:
self.draw.line(
self.display_manager.draw.line(
[(sep_x, 8), (sep_x, display_height)],
fill=self.COLORS['separator']
)
# Update display once
self._update_display()
# Update display
self.display_manager.update_display()
self.last_draw_time = current_time
def display_daily_forecast(self, force_clear: bool = False) -> None:
@@ -333,9 +343,8 @@ class WeatherManager:
if not force_clear and current_time - self.last_draw_time < 0.1:
return
# Reset buffer
self._init_buffer()
self._clear_buffer()
# Prepare display
self._prepare_display(force_clear)
# Calculate layout parameters
display_width = self.display_manager.matrix.width
@@ -348,11 +357,12 @@ class WeatherManager:
header_text,
y=1,
color=self.COLORS['highlight'],
small_font=True
small_font=True,
force_clear=False # Don't clear since we already prepared the display
)
# Draw separator line
self.draw.line(
self.display_manager.draw.line(
[(0, 8), (display_width, 8)],
fill=self.COLORS['separator']
)
@@ -367,7 +377,8 @@ class WeatherManager:
x=x_base + section_width // 2,
y=10,
color=self.COLORS['text'],
small_font=True
small_font=True,
force_clear=False # Don't clear since we already prepared the display
)
# Draw weather icon
@@ -395,24 +406,26 @@ class WeatherManager:
x=low_x,
y=temp_y,
color=self.COLORS['temp_low'],
small_font=True
small_font=True,
force_clear=False # Don't clear since we already prepared the display
)
self.display_manager.draw_text(
high_text,
x=high_x,
y=temp_y,
color=self.COLORS['temp_high'],
small_font=True
small_font=True,
force_clear=False # Don't clear since we already prepared the display
)
# Draw separator lines
if i < len(self.daily_forecast) - 1:
sep_x = x_base + section_width - 1
self.draw.line(
self.display_manager.draw.line(
[(sep_x, 8), (sep_x, display_height)],
fill=self.COLORS['separator']
)
# Update display once
self._update_display()
# Update display
self.display_manager.update_display()
self.last_draw_time = current_time