rick/LEDMatrix
1
0
Fork 0
mirror of https://github.com/ChuckBuilds/LEDMatrix.git synced 2026-04-12 13:42:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display updates

Browse Source 
trying to fix weather icons
This commit is contained in:
Chuck
2025-04-08 18:03:17 -05:00
parent df94535316
commit a67aca5b45
2 changed files with 54 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/display_controller.py
View File

@@ -30,19 +30,15 @@ class DisplayController:
try: try:
while True: while True:
current_time = time.time() current_time = time.time()
rotation_interval = self.config['display'].get('rotation_interval', 30)
# Track if we're switching modes
switching_modes = False
# Check if we need to switch display mode # Check if we need to switch display mode
if current_time - self.last_switch > rotation_interval: if current_time - self.last_switch > self.config['display'].get('rotation_interval', 30):
# Cycle through: clock -> current weather -> hourly forecast -> daily forecast # Cycle through: clock -> current weather -> hourly forecast -> daily forecast
if self.current_display == 'clock': if self.current_display == 'clock':
self.current_display = 'weather' self.current_display = 'weather'
elif self.current_display == 'weather': elif self.current_display == 'weather':
self.current_display = 'hourly' self.current_display = 'hourly'
self.scroll_position = 0 self.scroll_position = 0 # Reset scroll position when switching to hourly
elif self.current_display == 'hourly': elif self.current_display == 'hourly':
self.current_display = 'daily' self.current_display = 'daily'
else: # daily else: # daily
@@ -50,30 +46,37 @@ class DisplayController:
logger.info("Switching display to: %s", self.current_display) logger.info("Switching display to: %s", self.current_display)
self.last_switch = current_time self.last_switch = current_time
switching_modes = True
self.display_manager.clear() # Clear display when switching modes self.display_manager.clear() # Clear display when switching modes
force_clear = True
else:
force_clear = False
# Update scroll position for hourly forecast if needed # Update scroll position for hourly forecast if needed
if self.current_display == 'hourly' and current_time - self.last_scroll > self.scroll_interval: if self.current_display == 'hourly':
self.scroll_position += self.scroll_speed if current_time - self.last_scroll > self.scroll_interval:
self.last_scroll = current_time self.scroll_position += self.scroll_speed
self.last_scroll = current_time
# Reset scroll position if we've gone through all forecasts # Reset scroll position if we've gone through all forecasts
if self.scroll_position > self.display_manager.matrix.width * 3: # Approximate width of all forecasts if self.scroll_position > self.display_manager.matrix.width * 3:
self.scroll_position = 0 self.scroll_position = 0
force_clear = True # Clear when resetting scroll
# Display current screen (only force clear when switching modes) # Display current screen
if self.current_display == 'clock': if self.current_display == 'clock':
self.clock.display_time(force_clear=switching_modes) self.clock.display_time(force_clear=force_clear)
elif self.current_display == 'weather': elif self.current_display == 'weather':
self.weather.display_weather(force_clear=switching_modes) self.weather.display_weather(force_clear=force_clear)
elif self.current_display == 'hourly': elif self.current_display == 'hourly':
self.weather.display_hourly_forecast(self.scroll_position, force_clear=switching_modes) self.weather.display_hourly_forecast(self.scroll_position, force_clear=force_clear)
else: # daily else: # daily
self.weather.display_daily_forecast(force_clear=switching_modes) self.weather.display_daily_forecast(force_clear=force_clear)
# Sleep for a short interval # Sleep longer when not scrolling
time.sleep(0.02) if self.current_display == 'hourly':
time.sleep(0.05) # 50ms for smooth scrolling
else:
time.sleep(0.1) # 100ms for static displays
except KeyboardInterrupt: except KeyboardInterrupt:
print("\nDisplay stopped by user") print("\nDisplay stopped by user")

33
src/weather_manager.py
View File

@@ -35,6 +35,7 @@ class WeatherManager:
self.hourly_forecast = None self.hourly_forecast = None
self.daily_forecast = None self.daily_forecast = None
self.scroll_position = 0 self.scroll_position = 0
self.last_draw_time = 0 # Add draw time tracking to reduce flickering
def _fetch_weather(self) -> None: def _fetch_weather(self) -> None:
"""Fetch current weather and forecast data from OpenWeatherMap API.""" """Fetch current weather and forecast data from OpenWeatherMap API."""
@@ -184,8 +185,14 @@ class WeatherManager:
if not self.hourly_forecast: if not self.hourly_forecast:
return return
# Always clear when drawing hourly forecast to prevent ghosting current_time = time.time()
self.display_manager.clear() # Only update if forced or enough time has passed (100ms minimum between updates)
if not force_clear and current_time - self.last_draw_time < 0.1:
return
# Clear display when starting new scroll
if force_clear:
self.display_manager.clear()
# Calculate base positions # Calculate base positions
display_width = self.display_manager.matrix.width display_width = self.display_manager.matrix.width
@@ -193,6 +200,10 @@ class WeatherManager:
forecast_width = display_width // 2 # Each forecast takes half the width forecast_width = display_width // 2 # Each forecast takes half the width
icon_size = 12 # Slightly smaller icons for better fit icon_size = 12 # Slightly smaller icons for better fit
# Create a new image for this frame
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)
# Create the forecast display # Create the forecast display
for i, forecast in enumerate(self.hourly_forecast): for i, forecast in enumerate(self.hourly_forecast):
# Calculate x position with scrolling # Calculate x position with scrolling
@@ -236,6 +247,10 @@ class WeatherManager:
fill=(64, 64, 64) # Dim gray line fill=(64, 64, 64) # Dim gray line
) )
# Update the display
self.display_manager.update_display()
self.last_draw_time = current_time
def display_daily_forecast(self, force_clear: bool = False) -> None: def display_daily_forecast(self, force_clear: bool = False) -> None:
"""Display 3-day forecast information.""" """Display 3-day forecast information."""
if not self.daily_forecast: if not self.daily_forecast:
@@ -243,8 +258,14 @@ class WeatherManager:
if not self.daily_forecast: if not self.daily_forecast:
return return
# Always clear when drawing daily forecast current_time = time.time()
self.display_manager.clear() # Only update if forced or enough time has passed
if not force_clear and current_time - self.last_draw_time < 0.1:
return
# Create new image for this frame
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)
# Calculate layout parameters # Calculate layout parameters
display_width = self.display_manager.matrix.width display_width = self.display_manager.matrix.width
@@ -291,3 +312,7 @@ class WeatherManager:
[(sep_x, 0), (sep_x, display_height)], [(sep_x, 0), (sep_x, display_height)],
fill=(64, 64, 64) # Dim gray line fill=(64, 64, 64) # Dim gray line
) )
# Update the display
self.display_manager.update_display()
self.last_draw_time = current_time