Merge pull request #53 from TheFinalJoke/add_more_time

More options for time

Author: TheFinalJoke

lib/config/ohmyoled.conf

@@ -1,4 +1,5 @@
 [basic]
+testing = False 
 # Log Level for Python
 # Critcal = 50
 # Error = 40
@@ -8,56 +9,52 @@
 loglevel = 20
 # Tokens will have to be Supported used with Approriate Modules
 #### Not Supported Yet #####
-# sport_token = 'SPORT_TOKEN'
+# sport_token =  
 ##############################
 # Stock Token based in FINN TOKEN https://finnhub.io/docs/api/introduction
-# stock_api_token = YOUR_FINN_TOKEN
+#stock_api_token = 
 
 # Open Weather Token in https://openweathermap.org/
-open_weather_token = 80ce462129470ef2f5d55e6f65d32eef 
+# open_weather_token = 
 
 [matrix]
 chain_length = 1
 parallel = 1
 # Brightness from 0-100
-brightness = 60
+brightness = 20
 oled_slowdown = 3
 
-[weather]
+[time]
 Run=True
+color = (255,255,255)
+
+[weather]
+Run=False
 # Build the city as Dallas, US, For more accurate data, use zipcode
 current_location=True
 #city = 
-zipcode =  
+# zipcode =  
 # Format
 # The Units, The options are standard, metric, imperial
 format = imperial
 
 [stock]
 Run=False
-
-# symbol=
-
-# Runs Quote data for stocks
-# quote=True
-
-# Historical and days need
-# historical=True
-# days_ago=30
+symbol=fb
 
 ##### Sports Not Supported it #####
-# [sport]
-# Run=False
+[sport]
+Run=False
 # football
 # baseball
 # hockey
 # basketball
 # formula 1
-# sport=baseball
+sport=baseball
 # For Team IDs Baseball https://dashboard.api-football.com/baseball/ids/teams
 # For Team IDs Basketball https://dashboard.api-football.com/basketball/ids/teams/USA
 # Only Support USA
-# team_id = 6
+team_id = 6
 # optional Will pull all data for all unless specified
 
 # Baseball

main.py

@@ -55,6 +55,9 @@ def get_modules_to_run(self):
         self.logger.info("Getting Modules")
         for section, runtime in parsed.items():
             if runtime:
+                if section == 'time':
+                    self.logger.debug("Time midule selected from config")
+                    api_modules.update({'time': " "})
                 if section == 'weather':
                     self.logger.debug("Weather Module Selected From Config")
                     api_modules.update({'weather': WeatherApi(self.config)})
@@ -79,8 +82,11 @@ def poll_rgbmatrix(self):
         return rgboptions
 
     async def init_matrix(self, matrix):
-        verified_modules = [TimeMatrix(matrix)]
+        verified_modules = []
         modules = self.get_modules_to_run()
+        if 'time' in modules:
+            self.logger.debug("Initialized Time")
+            verified_modules.append(TimeMatrix(matrix, self.config['time']))
         if 'weather' in modules:
             self.logger.debug("Initialized Weather")
             verified_modules.append(WeatherMatrix(matrix, modules['weather'], logger))

matrix/time.py

@@ -1,18 +1,22 @@
 #!/usr/bin/env python3
 
 from PIL.Image import Image
-from matrix.matrix import Matrix, MatrixBase, FontException
-from datetime import date, datetime
-from rgbmatrix import RGBMatrix, RGBMatrixOptions, graphics
+from matrix.matrix import MatrixBase
+from datetime import datetime
 from PIL import Image, ImageDraw, ImageFont
-import sys
+from enum import Enum
 import time 
 
+class TimeFormat(Enum):
+    TWELEVE = 1
+    TWENTYFOUR = 2
 class TimeMatrix(MatrixBase):
-    def __init__(self, matrix) -> None:
+    def __init__(self, matrix, config) -> None:
         super().__init__(matrix)
         self.matrix = matrix
+        self.config = config
         self.logger.debug("Time Matrix Initalized")
+    
     def return_time(self, fmt: str):
         return datetime.now().strftime(fmt) 
 
@@ -22,17 +26,21 @@ async def poll_api(self):
         """
         self.logger.debug("No Api call reqiured for time module")
         return None
+    
+    def build_fmt(self):
+        return "%I:%M:%S %p" if TimeFormat.TWELEVE else "%H:%M:%S"  
+
     def render(self, poll):
         # Build something that Loads in corner for all the modules loaded
         self.logger.info("Running Module TimeMatrix")
         counter = 0
-        while counter < 15:
+        while counter < 30:
             self.logger.debug(f'Counter for module run {counter}')
             font = ImageFont.truetype("/usr/share/fonts/truetype/noto/NotoMono-Regular.ttf", 10)
             self.set_image(Image.new("RGB", (64, 32)))
             self.set_draw(ImageDraw.Draw(self.get_image))
-            self.draw_text((3, 5), f"{self.return_time('%m/%d/%Y')}", font=font, fill=(71, 181, 214,255))
-            self.draw_text((8, 16), f"{self.return_time('%I:%M:%S')}", font=font, fill=(71, 181, 214,255))
+            self.draw_text((3, 5), f"{self.return_time('%m/%d/%Y')}", font=font, fill=eval(self.config.get('color')))
+            self.draw_text((8, 16), f"{self.return_time('%I:%M:%S')}", font=font, fill=eval(self.config.get('color')))
             self.render_image()
             counter = counter + 1
             time.sleep(1)