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

Weather forecast drawing fix

Browse Source 
Fix from frozen temperature to actually forecast
This commit is contained in:
Chuck
2025-04-07 21:55:27 -05:00
parent 899d1223a8
commit 9573e4409b
2 changed files with 62 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/display_controller.py
View File

@@ -30,12 +30,12 @@ class DisplayController:
try: try:
while True: while True:
current_time = time.time() current_time = time.time()
rotation_interval = self.config['display'].get('rotation_interval', 15) rotation_interval = self.config['display'].get('rotation_interval', 30)
# Track if we're switching modes # Track if we're switching modes
switching_modes = False switching_modes = False
# Switch display if interval has passed # Check if we need to switch display mode
if current_time - self.last_switch > rotation_interval: if current_time - self.last_switch > rotation_interval:
# 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':
@@ -51,28 +51,28 @@ 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 switching_modes = True
self.display_manager.clear() # Clear display when switching modes
# Update scroll position for hourly forecast # 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' and current_time - self.last_scroll > self.scroll_interval:
self.scroll_position += self.scroll_speed self.scroll_position += self.scroll_speed
self.last_scroll = current_time self.last_scroll = current_time
switching_modes = True # Force clear for smooth scrolling
# 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
self.scroll_position = 0
# Display current screen # Display current screen (only force clear when switching modes)
if self.current_display == 'clock': if self.current_display == 'clock':
logger.debug("Updating clock display")
self.clock.display_time(force_clear=switching_modes) self.clock.display_time(force_clear=switching_modes)
elif self.current_display == 'weather': elif self.current_display == 'weather':
logger.debug("Updating current weather display")
self.weather.display_weather(force_clear=switching_modes) self.weather.display_weather(force_clear=switching_modes)
elif self.current_display == 'hourly': elif self.current_display == 'hourly':
logger.debug("Updating hourly forecast display")
self.weather.display_hourly_forecast(self.scroll_position, force_clear=switching_modes) self.weather.display_hourly_forecast(self.scroll_position, force_clear=switching_modes)
else: # daily else: # daily
logger.debug("Updating daily forecast display")
self.weather.display_daily_forecast(force_clear=switching_modes) self.weather.display_daily_forecast(force_clear=switching_modes)
# Sleep for a shorter interval to make scrolling smoother # Sleep for a short interval
time.sleep(0.02) time.sleep(0.02)
except KeyboardInterrupt: except KeyboardInterrupt:

71
src/weather_manager.py
View File

@@ -48,15 +48,28 @@ class WeatherManager:
country = self.location['country'] country = self.location['country']
units = self.weather_config.get('units', 'imperial') units = self.weather_config.get('units', 'imperial')
# Get current weather # First get coordinates using geocoding API
current_url = f"http://api.openweathermap.org/data/2.5/weather?q={city},{state},{country}&appid={api_key}&units={units}" geo_url = f"http://api.openweathermap.org/geo/1.0/direct?q={city},{state},{country}&limit=1&appid={api_key}"
# Get forecast data (includes hourly and daily)
forecast_url = f"http://api.openweathermap.org/data/2.5/forecast?q={city},{state},{country}&appid={api_key}&units={units}"
try: try:
# Get coordinates
response = requests.get(geo_url)
response.raise_for_status()
geo_data = response.json()
if not geo_data:
print(f"Could not find coordinates for {city}, {state}")
return
lat = geo_data[0]['lat']
lon = geo_data[0]['lon']
# Get current weather and forecast using coordinates
weather_url = f"https://api.openweathermap.org/data/2.5/weather?lat={lat}&lon={lon}&appid={api_key}&units={units}"
forecast_url = f"https://api.openweathermap.org/data/2.5/forecast?lat={lat}&lon={lon}&appid={api_key}&units={units}"
# Fetch current weather # Fetch current weather
response = requests.get(current_url) response = requests.get(weather_url)
response.raise_for_status() response.raise_for_status()
self.weather_data = response.json() self.weather_data = response.json()
@@ -69,6 +82,7 @@ class WeatherManager:
self._process_forecast_data(self.forecast_data) self._process_forecast_data(self.forecast_data)
self.last_update = time.time() self.last_update = time.time()
print("Weather data updated successfully")
except Exception as e: except Exception as e:
print(f"Error fetching weather data: {e}") print(f"Error fetching weather data: {e}")
self.weather_data = None self.weather_data = None
@@ -80,28 +94,45 @@ class WeatherManager:
return return
# Process hourly forecast (next 6 hours) # Process hourly forecast (next 6 hours)
hourly = forecast_data.get('hourly', [])[:6] hourly_list = forecast_data.get('list', [])[:6] # Get next 6 3-hour forecasts
self.hourly_forecast = [] self.hourly_forecast = []
for hour in hourly:
dt = datetime.fromtimestamp(hour['dt']) for hour_data in hourly_list:
temp = round(hour['temp']) dt = datetime.fromtimestamp(hour_data['dt'])
condition = hour['weather'][0]['main'] temp = round(hour_data['main']['temp'])
condition = hour_data['weather'][0]['main']
self.hourly_forecast.append({ self.hourly_forecast.append({
'hour': dt.strftime('%I%p'), 'hour': dt.strftime('%I%p').lstrip('0'), # Remove leading 0
'temp': temp, 'temp': temp,
'condition': condition 'condition': condition
}) })
# Process daily forecast (next 3 days) # Process daily forecast (next 3 days)
daily = forecast_data.get('daily', [])[1:4] # Skip today, get next 3 days daily_data = {}
for item in hourly_list:
date = datetime.fromtimestamp(item['dt']).strftime('%Y-%m-%d')
if date not in daily_data:
daily_data[date] = {
'temps': [],
'conditions': [],
'date': datetime.fromtimestamp(item['dt'])
}
daily_data[date]['temps'].append(item['main']['temp'])
daily_data[date]['conditions'].append(item['weather'][0]['main'])
# Calculate daily summaries
self.daily_forecast = [] self.daily_forecast = []
for day in daily: for date, data in list(daily_data.items())[:3]: # First 3 days
dt = datetime.fromtimestamp(day['dt']) temps = data['temps']
temp = round(day['temp']['day']) temp_high = round(max(temps))
condition = day['weather'][0]['main'] temp_low = round(min(temps))
condition = max(set(data['conditions']), key=data['conditions'].count)
self.daily_forecast.append({ self.daily_forecast.append({
'date': dt.strftime('%a'), 'date': data['date'].strftime('%a'), # Day name (Mon, Tue, etc.)
'temp': temp, 'date_str': data['date'].strftime('%m/%d'), # Date (4/8, 4/9, etc.)
'temp_high': temp_high,
'temp_low': temp_low,
'condition': condition 'condition': condition
}) })
@@ -192,7 +223,7 @@ class WeatherManager:
# Format the day, date, and temperature # Format the day, date, and temperature
day_str = day['date'] # Day name (Mon, Tue, etc.) day_str = day['date'] # Day name (Mon, Tue, etc.)
date_str = day['date'] # Date (4/8, 4/9, etc.) date_str = day['date_str'] # Date (4/8, 4/9, etc.)
temp_str = f"{day['temp_low']}°F / {day['temp_high']}°F" temp_str = f"{day['temp_low']}°F / {day['temp_high']}°F"
# Position the text and icon # Position the text and icon