Merge pull request #36 from aceisace/master

Syncing changes

Calendar/E-Paper.py

@@ -41,26 +41,28 @@ EPD_WIDTH = 640
 EPD_HEIGHT = 384
 
 if language in ['ja','zh','zh_tw','ko']:
-    default = ImageFont.truetype(fpath+'NotoSansCJK/NotoSansCJKsc-Light.otf', 18)
+    default = ImageFont.truetype(fpath+NotoSansCJK+'Light.otf', 18)
-    semi = ImageFont.truetype(fpath+'NotoSansCJK/NotoSansCJKsc-DemiLight.otf', 18)
+    semi = ImageFont.truetype(fpath+NotoSansCJK+'DemiLight.otf', 18)
-    bold = ImageFont.truetype(fpath+'NotoSansCJK/NotoSansCJKsc-Regular.otf', 18)
+    bold = ImageFont.truetype(fpath+NotoSansCJK+'Regular.otf', 18)
-    month_font = ImageFont.truetype(fpath+'NotoSansCJK/NotoSansCJKsc-DemiLight.otf', 40)
+    month_font = ImageFont.truetype(fpath+NotoSansCJK+'DemiLight.otf', 40)
 else:
-    default = ImageFont.truetype(fpath+'NotoSans/NotoSans-SemiCondensedLight.ttf', 18)
+    default = ImageFont.truetype(fpath+NotoSans+'Light.ttf', 18)
-    semi = ImageFont.truetype(fpath+'NotoSans/NotoSans-SemiCondensed.ttf', 18)
+    semi = ImageFont.truetype(fpath+NotoSans+'.ttf', 18)
-    bold = ImageFont.truetype(fpath+'NotoSans/NotoSans-SemiCondensedMedium.ttf', 18)
+    bold = ImageFont.truetype(fpath+NotoSans+'Medium.ttf', 18)
-    month_font = ImageFont.truetype(fpath+'NotoSans/NotoSans-SemiCondensedLight.ttf', 40)
+    month_font = ImageFont.truetype(fpath+NotoSans+'Light.ttf', 40)
+
+w_font_l = ImageFont.truetype(fpath+weather_font, 60)
+w_font_s = ImageFont.truetype(fpath+weather_font, 22)
 
 im_open = Image.open
 
 '''Get system timezone and set timezone accordingly'''
-file = open('/etc/timezone','r')
+with open('/etc/timezone','r') as file:
-lines = file.readlines()
+    lines = file.readlines()
-system_tz = lines[0].rstrip()
+    system_tz = lines[0].rstrip()
-local_tz = timezone(system_tz)
+    local_tz = timezone(system_tz)
 
-
+owm = pyowm.OWM(api_key, language=language)
-owm = pyowm.OWM(api_key)
 
 """Main loop starts from here"""
 def main():
@@ -72,7 +74,7 @@ def main():
         year = int(time.now().strftime('%Y'))
         mins = int(time.strftime("%M"))
         seconds = int(time.strftime("%S"))
-        now = arrow.now()
+        now = arrow.now(tz=system_tz)
 
         for i in range(1):
             print('_________Starting new loop___________'+'\n')
@@ -127,7 +129,7 @@ def main():
                     weathericon = weather.get_weather_icon_name()
                     Humidity = str(weather.get_humidity())
                     cloudstatus = str(weather.get_clouds())
-                    weather_description = (str(weather.get_status()))
+                    weather_description = (str(weather.get_detailed_status()))
 
                     if units is "metric":
                         Temperature = str(int(weather.get_temperature(unit='celsius')['temp']))
@@ -141,54 +143,57 @@ def main():
                         write_text(50, 35, Temperature + " °F", (334, 0))
                         write_text(100, 35, windspeed+" mph", (114, 0))
 
-                    if hours is "24":
+                    sunrisetime = arrow.get(weather.get_sunrise_time()).to(system_tz)
-                        sunrisetime = str(datetime.fromtimestamp(int(weather.get_sunrise_time(timeformat='unix'))).strftime('%-H:%M'))
+                    sunsettime = arrow.get(weather.get_sunset_time()).to(system_tz)
-                        sunsettime = str(datetime.fromtimestamp(int(weather.get_sunset_time(timeformat='unix'))).strftime('%-H:%M'))
-
-                    if hours is "12":
-                        sunrisetime = str(datetime.fromtimestamp(int(weather.get_sunrise_time(timeformat='unix'))).strftime('%-I:%M'))
-                        sunsettime = str(datetime.fromtimestamp(int(weather.get_sunset_time(timeformat='unix'))).strftime('%-I:%M'))
 
                     """Show the fetched weather data"""
-                    print('Temperature: '+ Temperature+' °C')
+                    print('Temperature:',Temperature, '°C')
-                    print('Humidity: '+ Humidity+'%')
+                    print('Humidity:', Humidity, '%')
-                    print('weather-icon name: '+weathericons[weathericon])
+                    print('Wind speed:', windspeed, 'km/h')
-                    print('Wind speed: '+ windspeed+'km/h')
+                    print('Sunrise-time:', sunrisetime.format('HH:mm'))
-                    print('Sunrise-time: '+ sunrisetime)
+                    print('Sunset time:', sunsettime.format('HH:mm'))
-                    print('Sunset time: '+ sunsettime)
+                    print('Cloudiness:', cloudstatus, '%')
-                    print('Cloudiness: ' + cloudstatus+'%')
+                    print('Weather description:', weather_description, '\n')
-                    print('Weather description: '+ weather_description+'\n')
 
                     """Add the weather icon at the top left corner"""
-                    image.paste(im_open(wpath + weathericons[weathericon] +'.jpeg'), wiconplace)
+                    write_text(70,70, weathericons[weathericon], wiconplace, font = w_font_l)
 
                     """Add the temperature icon at it's position"""
-                    image.paste(tempicon, tempplace)
+                    write_text(35,35, '\uf055', tempplace, font = w_font_s)
 
                     """Add the humidity icon and display the humidity"""
-                    image.paste(humicon, humplace)
+                    write_text(35,35, '\uf07a', humplace, font = w_font_s)
                     write_text(50, 35, Humidity + " %", (334, 35))
 
-                    """Add the sunrise icon and display the sunrise time"""
+                    """Add the sunrise/sunset icon and display the time"""
-                    image.paste(sunriseicon, sunriseplace)
+                    if (now <= sunrisetime and now <= sunsettime) or (now >= sunrisetime and now >= sunsettime):
-                    write_text(50, 35, sunrisetime, (249, 0))
+                        write_text(35,35, '\uf051', sunriseplace, font = w_font_s)
+                        print('sunrise coming next')
+                        if hours is "24":
+                            write_text(50, 35, sunrisetime.format('H:mm'), (249, 0))
+                        if hours is "12":
+                            write_text(50, 35, sunrisetime.format('h:mm'), (249, 0))
 
-                    """Add the sunset icon and display the sunrise time"""
+                    if now >= sunrisetime and now <= sunsettime:
-                    image.paste(sunseticon, sunsetplace)
+                        write_text(35,35, '\uf052', sunriseplace, font = w_font_s)
-                    write_text(50, 35, sunsettime, (249, 35))
+                        print('sunset coming next')
+                        if hours is "24":
+                            write_text(50, 35, sunsettime.format('H:mm'), (249, 0))
+                        if hours is "12":
+                            write_text(50, 35, sunsettime.format('h:mm'), (249, 0))
 
                     """Add the wind icon at it's position"""
-                    image.paste(windicon, windiconspace)
+                    write_text(35,35, '\uf050', windiconspace, font = w_font_s)
 
                     """Add a short weather description"""
-                    write_text(144, 35, weather_description, (70, 35))
+                    write_text(229, 35, weather_description, (70, 35))
 
                 except Exception as e:
                     """If no response was received from the openweathermap
                     api server, add the cloud with question mark"""
                     print('__________OWM-ERROR!__________'+'\n')
                     print('Reason: ',e,'\n')
-                    image.paste(no_response, wiconplace)
+                    write_text(70,70, '\uf07b', wiconplace, font = w_font_l)
                     pass
 
             """Set the Calendar to start on the day specified by the settings file """
@@ -453,12 +458,12 @@ def main():
             buffer = np.array(image)
             r,g,b = buffer[:,:,0], buffer[:,:,1], buffer[:,:,2]
             if display_colours is "bwr":
-                buffer[np.logical_and(r > 240, g > 240)] = [255,255,255] #white
+                buffer[np.logical_and(r > 245, g > 245)] = [255,255,255] #white
-                buffer[np.logical_and(r > 240, g < 240)] = [255,0,0] #red
+                buffer[np.logical_and(r > 245, g < 245)] = [255,0,0] #red
                 buffer[np.logical_and(r != 255, r == g )] = [0,0,0] #black
 
             if display_colours is "bw":
-                buffer[np.logical_and(r > 240, g > 240)] = [255,255,255] #white
+                buffer[np.logical_and(r > 245, g > 245)] = [255,255,255] #white
                 buffer[g < 255] = [0,0,0] #black
 
             improved_image = Image.fromarray(buffer).rotate(270, expand=True)

Calendar/image_data.py

@@ -18,17 +18,15 @@ dpath = path+'days/'
 opath = path+'other/'
 fpath = path+'fonts/'
 
+NotoSansCJK = 'NotoSansCJK/NotoSansCJKsc-'
+NotoSans = 'NotoSans/NotoSans-SemiCondensed'
+weather_font = 'WeatherFont/weathericons-regular-webfont.ttf'
+
 weekday = im_open(opath+'weekday.png')
 eventicon = im_open(opath+'event.png')
 dateicon = im_open(opath+'today.png')
 seperator = im_open(opath+'seperator.jpeg')
 seperator2 = im_open(opath+'seperator2.jpeg')
-tempicon = im_open(opath+'temperature.jpeg')
-humicon = im_open(opath+'humidity.jpeg')
-no_response = im_open(opath+'cloud-no-response.jpeg')
-sunriseicon = im_open(opath+'wi-sunrise.jpeg')
-sunseticon = im_open(opath+'wi-sunset.jpeg')
-windicon = im_open(opath+'wi-strong-wind.jpeg')
 black = im_open(opath+'black.jpeg')
 white = im_open(opath+'white.jpeg')
 red = im_open(opath+'red.jpeg')
@@ -129,12 +127,10 @@ weekday_pos = {
     }
 
 weathericons = {
-    '01d': 'wi-day-sunny', '02d':'wi-day-cloudy', '03d': 'wi-cloudy',
+    '01d': '\uf00d', '02d': '\uf002', '03d': '\uf013',
-    '04d': 'wi-cloudy-windy', '09d': 'wi-showers', '10d':'wi-rain',
+    '04d': '\uf012', '09d': '\uf01a', '10d': '\uf019',
-    '11d':'wi-thunderstorm', '13d':'wi-snow', '50d': 'wi-fog',
+    '11d': '\uf01e', '13d': '\uf01b', '50d': '\uf014',
-    '01n': 'wi-night-clear', '02n':'wi-night-cloudy',
+    '01n': '\uf02e', '02n': '\uf013', '03n': '\uf013',
-    '03n': 'wi-night-cloudy', '04n': 'wi-night-cloudy',
+    '04n': '\uf013', '09n': '\uf037', '10n': '\uf036',
-    '09n': 'wi-night-showers', '10n':'wi-night-rain',
+    '11n': '\uf03b', '13n': '\uf038', '50n': '\uf023'
-    '11n':'wi-night-thunderstorm', '13n':'wi-night-snow',
-    '50n': 'wi-night-alt-cloudy-windy'
     }