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

apply leaderboard duration logic to odds manager

Browse Source
This commit is contained in:
Chuck
2025-09-12 18:49:33 -04:00
parent dc81d48ab1
commit 93f6173efa
2 changed files with 56 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.json
View File

@@ -130,7 +130,7 @@
"duration_buffer": 0.1 "duration_buffer": 0.1
}, },
"odds_ticker": { "odds_ticker": {
"enabled": false, "enabled": true,
"show_favorite_teams_only": true, "show_favorite_teams_only": true,
"games_per_favorite_team": 1, "games_per_favorite_team": 1,
"max_games_per_league": 5, "max_games_per_league": 5,
@@ -187,7 +187,7 @@
"scroll_speed": 1, "scroll_speed": 1,
"scroll_delay": 0.01, "scroll_delay": 0.01,
"display_duration": 60, "display_duration": 60,
"loop": true, "loop": false,
"request_timeout": 30, "request_timeout": 30,
"dynamic_duration": true, "dynamic_duration": true,
"min_duration": 45, "min_duration": 45,

87
src/odds_ticker_manager.py
View File

@@ -1546,30 +1546,37 @@ class OddsTickerManager:
display_width = 128 # Default to 128 if not available display_width = 128 # Default to 128 if not available
# Calculate total scroll distance needed # Calculate total scroll distance needed
# For odds ticker, we need to scroll the entire content width plus display width # For looping content, we need to scroll the entire content width
# to ensure all content is visible from start to finish # For non-looping content, we need content width minus display width (since last part shows fully)
total_scroll_distance = display_width + self.total_scroll_width if self.loop:
total_scroll_distance = self.total_scroll_width
else:
# For single pass, we need to scroll until the last content is fully visible
total_scroll_distance = max(0, self.total_scroll_width - display_width)
# Calculate time based on scroll speed and delay # Calculate time based on scroll speed and delay
# scroll_speed = pixels per frame, scroll_delay = seconds per frame # scroll_speed = pixels per frame, scroll_delay = seconds per frame
frames_needed = total_scroll_distance / self.scroll_speed # However, actual observed speed is slower than theoretical calculation
total_time = frames_needed * self.scroll_delay # Based on log analysis: 1950px in 36s = 54.2 px/s actual speed
# vs theoretical: 1px/0.01s = 100 px/s
# Use actual observed speed for more accurate timing
actual_scroll_speed = 54.2 # pixels per second (calculated from logs)
total_time = total_scroll_distance / actual_scroll_speed
# Add buffer time for smooth cycling (configurable %) # Add buffer time for smooth cycling (configurable %)
buffer_time = total_time * self.duration_buffer buffer_time = total_time * self.duration_buffer
# Calculate duration for single complete pass # Calculate duration for single complete pass
if self.loop: if self.loop:
# For looping: add minimal buffer to ensure smooth transition # For looping: set duration to exactly one loop cycle (no extra time to prevent multiple loops)
loop_buffer = total_time * 0.05 # 5% extra for looping calculated_duration = int(total_time)
calculated_duration = int(total_time + buffer_time + loop_buffer) logger.debug(f"Looping enabled, duration set to exactly one loop cycle: {calculated_duration}s")
logger.debug(f"Looping enabled, added {loop_buffer:.2f}s loop buffer")
else: else:
# For single pass: add more buffer to ensure complete display and smooth transition # For single pass: precise calculation to show content exactly once
# The issue was that the duration was too short, causing premature mode switching # Add buffer to prevent cutting off the last content
completion_buffer = total_time * 0.1 # 10% extra to ensure complete display completion_buffer = total_time * 0.05 # 5% extra to ensure complete display
calculated_duration = int(total_time + buffer_time + completion_buffer) calculated_duration = int(total_time + buffer_time + completion_buffer)
logger.debug(f"Single pass mode, added {completion_buffer:.2f}s completion buffer for complete display") logger.debug(f"Single pass mode, added {completion_buffer:.2f}s completion buffer for precise timing")
# Apply configured min/max limits # Apply configured min/max limits
if calculated_duration < self.min_duration: if calculated_duration < self.min_duration:
@@ -1589,18 +1596,22 @@ class OddsTickerManager:
self.dynamic_duration = max(45, int(self.total_scroll_width / 20)) self.dynamic_duration = max(45, int(self.total_scroll_width / 20))
logger.debug(f"Adjusted duration for content: {self.dynamic_duration}s (content width: {self.total_scroll_width}px)") logger.debug(f"Adjusted duration for content: {self.dynamic_duration}s (content width: {self.total_scroll_width}px)")
logger.debug(f"Odds ticker dynamic duration calculation:") logger.info(f"Odds ticker dynamic duration calculation:")
logger.debug(f" Display width: {display_width}px") logger.info(f" Display width: {display_width}px")
logger.debug(f" Content width: {self.total_scroll_width}px") logger.info(f" Content width: {self.total_scroll_width}px")
logger.debug(f" Total scroll distance: {total_scroll_distance}px") logger.info(f" Total scroll distance: {total_scroll_distance}px")
logger.debug(f" Scroll speed: {self.scroll_speed}px/frame") logger.info(f" Configured scroll speed: {self.scroll_speed}px/frame")
logger.debug(f" Scroll delay: {self.scroll_delay}s/frame") logger.info(f" Configured scroll delay: {self.scroll_delay}s/frame")
logger.debug(f" Frames needed: {frames_needed:.1f}") logger.info(f" Actual observed scroll speed: {actual_scroll_speed}px/s (from log analysis)")
logger.debug(f" Base time: {total_time:.2f}s") logger.info(f" Base time: {total_time:.2f}s")
logger.debug(f" Buffer time: {buffer_time:.2f}s ({self.duration_buffer*100}%)") logger.info(f" Buffer time: {buffer_time:.2f}s ({self.duration_buffer*100}%)")
logger.debug(f" Looping enabled: {self.loop}") logger.info(f" Looping enabled: {self.loop}")
logger.debug(f" Calculated duration: {calculated_duration}s") logger.info(f" Calculated duration: {calculated_duration}s")
logger.debug(f" Final duration: {self.dynamic_duration}s") logger.info(f"Final calculated duration: {self.dynamic_duration}s")
# Verify the duration makes sense for the content
expected_scroll_time = self.total_scroll_width / actual_scroll_speed
logger.info(f" Verification - Time to scroll content: {expected_scroll_time:.1f}s")
except Exception as e: except Exception as e:
logger.error(f"Error calculating dynamic duration: {e}") logger.error(f"Error calculating dynamic duration: {e}")
@@ -1810,23 +1821,33 @@ class OddsTickerManager:
elapsed_time = current_time - self._display_start_time elapsed_time = current_time - self._display_start_time
remaining_time = self.dynamic_duration - elapsed_time remaining_time = self.dynamic_duration - elapsed_time
# Log timing info every 50 pixels to help debug (less verbose) # Log scroll progress every 50 pixels to help debug (less verbose)
if self.scroll_position % 50 == 0 and self.scroll_position > 0: if self.scroll_position % 50 == 0 and self.scroll_position > 0:
logger.info(f"Odds ticker timing: elapsed={elapsed_time:.1f}s, remaining={remaining_time:.1f}s, duration={self.dynamic_duration}s, scroll_pos={self.scroll_position}") logger.info(f"Odds ticker progress: elapsed={elapsed_time:.1f}s, remaining={remaining_time:.1f}s, scroll_pos={self.scroll_position}/{self.ticker_image.width}px")
# If we have less than 2 seconds remaining and we're not at a clean break point, # If we have less than 2 seconds remaining, check if we can complete the content display
# try to complete the current game display
if remaining_time < 2.0 and self.scroll_position > 0: if remaining_time < 2.0 and self.scroll_position > 0:
# Calculate how much time we need to complete the current scroll position # Calculate how much time we need to complete the current scroll position
frames_to_complete = (self.ticker_image.width - self.scroll_position) / self.scroll_speed # Use actual observed scroll speed (54.2 px/s) instead of theoretical calculation
time_to_complete = frames_to_complete * self.scroll_delay actual_scroll_speed = 54.2 # pixels per second (calculated from logs)
if self.loop:
# For looping, we need to complete one full cycle
distance_to_complete = self.ticker_image.width - self.scroll_position
else:
# For single pass, we need to reach the end (content width minus display width)
end_position = max(0, self.ticker_image.width - width)
distance_to_complete = end_position - self.scroll_position
time_to_complete = distance_to_complete / actual_scroll_speed
if time_to_complete <= remaining_time: if time_to_complete <= remaining_time:
# We have enough time to complete the scroll, continue normally # We have enough time to complete the scroll, continue normally
pass logger.debug(f"Sufficient time remaining ({remaining_time:.1f}s) to complete scroll ({time_to_complete:.1f}s)")
else: else:
# Not enough time, reset to beginning for clean transition # Not enough time, reset to beginning for clean transition
logger.debug(f"Display ending soon, resetting scroll position for clean transition") logger.warning(f"Not enough time to complete content display - remaining: {remaining_time:.1f}s, needed: {time_to_complete:.1f}s")
logger.debug(f"Resetting scroll position for clean transition")
self.scroll_position = 0 self.scroll_position = 0
# Create the visible part of the image by pasting from the ticker_image # Create the visible part of the image by pasting from the ticker_image