tim/OpenDisplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweaking, including reducing sig figs in weather

Browse Source
This commit is contained in:
Tim Meneely
2026-05-26 21:02:58 +00:00
parent e3338fc3f6
commit d74939cc0e
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
google_weather.py
View File

@@ -70,7 +70,7 @@ def get_google_weather():
humidity = current_data.get("relativeHumidity") humidity = current_data.get("relativeHumidity")
theweather["current"] = (f"{condition}") + (f", {temp.get('degrees')}°F")\ theweather["current"] = (f"{condition}") + (f", {temp.get('degrees')}°F")\
+ (f", {humidity}%") + (f" hum., Feels like: {feels_like.get('degrees')}°F") + (f", {humidity}%") + (f" hum., Feels like: {int(feels_like.get('degrees'))}°F")
else: # current_data not returned else: # current_data not returned
theweather["current"] = "Problem retrieving current weather" theweather["current"] = "Problem retrieving current weather"
@@ -81,12 +81,12 @@ def get_google_weather():
max_temp = day.get("maxTemperature", {}).get("degrees") max_temp = day.get("maxTemperature", {}).get("degrees")
min_temp = day.get("minTemperature", {}).get("degrees") min_temp = day.get("minTemperature", {}).get("degrees")
condition = day.get("daytimeForecast", {}).get("weatherCondition", {}).get("description", {}).get("text") condition = day.get("daytimeForecast", {}).get("weatherCondition", {}).get("description", {}).get("text")
theweather["forecast_today"] = (f"{condition}") + (f", {min_temp}°F-{max_temp}°F") theweather["forecast_today"] = (f"{condition}") + (f", {int(min_temp)}°F-{int(max_temp)}°F")
day = forecast_data.get("forecastDays", [])[1] day = forecast_data.get("forecastDays", [])[1]
max_temp = day.get("maxTemperature", {}).get("degrees") max_temp = day.get("maxTemperature", {}).get("degrees")
min_temp = day.get("minTemperature", {}).get("degrees") min_temp = day.get("minTemperature", {}).get("degrees")
condition = day.get("daytimeForecast", {}).get("weatherCondition", {}).get("description", {}).get("text") condition = day.get("daytimeForecast", {}).get("weatherCondition", {}).get("description", {}).get("text")
theweather["forecast_tomorrow"] = (f"{condition}") + (f", {min_temp}°F-{max_temp}°F") theweather["forecast_tomorrow"] = (f"{condition}") + (f", {int(min_temp)}°F-{int(max_temp)}°F")
else: else:
theweather["forecast_tomorrow"] = "Problem retrieving weather forecast" theweather["forecast_tomorrow"] = "Problem retrieving weather forecast"

12
imagegen.py
View File

@@ -20,10 +20,10 @@ row = 0 # current row to write at
out = Image.new("L", (displaysize[0], displaysize[1]),255) out = Image.new("L", (displaysize[0], displaysize[1]),255)
# get a font # get a font
HeightNormal = 25 #HeightNormal = 25
HeightBold = 35 #HeightBold = 35
MarginLeft = 1 MarginLeft = 1
MarginIndent = 5 MarginIndent = 10
# get a drawing context # get a drawing context
d = ImageDraw.Draw(out) d = ImageDraw.Draw(out)
@@ -35,7 +35,7 @@ row = WriteTextBlock(txt1,d,fntBigBold,displaysize[0]/2,row,"ma")
txt1a = "As of "+datetime.datetime.now(pytz.timezone('America/New_York')).strftime('%I:%M %p') txt1a = "As of "+datetime.datetime.now(pytz.timezone('America/New_York')).strftime('%I:%M %p')
row = WriteTextBlock(txt1a,d,fnt,displaysize[0]/2,row,"ma") row = WriteTextBlock(txt1a,d,fnt,displaysize[0]/2,row,"ma")
row = WriteTextBlock("Weather",d,fnt,MarginLeft,row,"la") row = WriteTextBlock("Weather",d,fntBold,MarginLeft,row,"la")
try: try:
weather = google_weather.get_google_weather() weather = google_weather.get_google_weather()
txt2 = "Current: "+weather["current"] \ txt2 = "Current: "+weather["current"] \
@@ -45,11 +45,9 @@ except: # Assume the weather API blew up
txt2 = "Problem getting weather (from ImageGen)" txt2 = "Problem getting weather (from ImageGen)"
row = WriteTextBlock(txt2,d,fnt,MarginIndent,row,"la") row = WriteTextBlock(txt2,d,fnt,MarginIndent,row,"la")
row = WriteTextBlock("Pirates",d,fnt,MarginLeft,row,"la") row = WriteTextBlock("Pirates",d,fntBold,MarginLeft,row,"la")
row = WriteTextBlock(mlb.get_pirates(),d,fnt,MarginIndent,row,"la") row = WriteTextBlock(mlb.get_pirates(),d,fnt,MarginIndent,row,"la")
row = WriteTextBlock("========== End =========",d,fnt,MarginLeft,row,"la") row = WriteTextBlock("========== End =========",d,fnt,MarginLeft,row,"la")
out.save("/mnt/nfs/HomeAutomation/ForHA.jpg","JPEG") out.save("/mnt/nfs/HomeAutomation/ForHA.jpg","JPEG")
#out.show()

9
mlb.py
View File

@@ -21,8 +21,10 @@ def process_game(game,mytz):
else: # game in progress else: # game in progress
if score_pirates > score_other: if score_pirates > score_other:
results += ", Pirates winning" results += ", Pirates winning"
else: elif score_pirates < score_other:
results += ", Pirates losing" results += ", Pirates losing"
else:
results += ", tied"
results += " "+str(game["away_score"])+" - "+str(game["home_score"]) results += " "+str(game["away_score"])+" - "+str(game["home_score"])
if game["status"] != "Final": if game["status"] != "Final":
gamedate = datetime.datetime.strptime(game["game_datetime"],"%Y-%m-%dT%H:%M:%SZ") gamedate = datetime.datetime.strptime(game["game_datetime"],"%Y-%m-%dT%H:%M:%SZ")
@@ -45,7 +47,12 @@ def get_pirates():
todaystr = datetime.datetime.now(tz=useastern_timezone).strftime("%Y-%m-%d") todaystr = datetime.datetime.now(tz=useastern_timezone).strftime("%Y-%m-%d")
tomorrow = datetime.datetime.now(tz=useastern_timezone)+datetime.timedelta(days=1) tomorrow = datetime.datetime.now(tz=useastern_timezone)+datetime.timedelta(days=1)
tomorrowstr = tomorrow.strftime("%Y-%m-%d") tomorrowstr = tomorrow.strftime("%Y-%m-%d")
yesterday = datetime.datetime.now(tz=useastern_timezone)+datetime.timedelta(days=-1)
yesterdaystr = yesterday.strftime("%Y-%m-%d")
piratesid = statsapi.lookup_team('pittsburgh')[0]['id'] piratesid = statsapi.lookup_team('pittsburgh')[0]['id']
yesterdaysgame = statsapi.schedule(team=piratesid,date=yesterdaystr)
if yesterdaysgame:
results+= "Yesterday: "+process_game(yesterdaysgame[0],useastern_timezone)+"\n"
todaysgame = statsapi.schedule(team=piratesid,date=todaystr) todaysgame = statsapi.schedule(team=piratesid,date=todaystr)
if todaysgame: if todaysgame:
results+= "Today: "+process_game(todaysgame[0],useastern_timezone)+"\n" results+= "Today: "+process_game(todaysgame[0],useastern_timezone)+"\n"