Merge pull request #152 from riffnshred/dev

VERSION

@@ -1 +1 @@
-1.4.1
+1.5.0

assets/animations/goal/general/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

assets/animations/goal/opposing/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

assets/animations/goal/preferred/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

assets/animations/screensaver/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

config/colors/layout.json

@@ -23,7 +23,13 @@
   },
   "wx_curr_temp": {
     "temp": [0,255,0],
-    "temp_app": [255,0,0]
+    "temp_app": [0,255,0],
+    "temp_app_hi": [255,0,0],
+    "temp_app_lo": [0,0,255],
+    "forecast_temp_hi": [255,0,0],
+    "forecast_temp_lo": [0,0,255],
+    "forecast_hi": [255,0,0],
+    "forecast_lo": [0,0,255]
   },
   "wx_curr_wind": {
     "wind": [255,255,0],

config/config.json.sample

@@ -1,27 +1,27 @@
 {
-	"debug": true,
+	"debug": false,
+	"loglevel": "INFO",
 	"live_mode": false,
 	"preferences": {
-		"time_format": "24h",
+		"time_format": "12h",
 		"end_of_day": "8:00",
-		"location": "Winnipeg, MB",
+		"location": "",
 		"live_game_refresh_rate": 10,
 		"teams": [
-			"Flames",
-			"Oilers"
+			"Canadiens"
 		],
-		"sog_display_frequency": 4
-	},
-
-	"goal_animations": {
-		"pref_team_only": true
+		"sog_display_frequency": 4,
+		"goal_animations": {
+        	"pref_team_only": true
+    	}
 	},
 
 	"states":{
 		"off_day": [
-			"covid_19",
+			"scoreticker",
+			"team_summary",
+			"standings",
 			"clock"
-
 		],
 		"scheduled": [
 			"team_summary",
@@ -30,7 +30,8 @@
 			"clock"
 		],
 		"intermission": [
-			"scoreticker"
+			"scoreticker",
+			"team_summary"
 		],
 		"post_game": [
 			"team_summary",
@@ -57,11 +58,15 @@
 		},
 		"clock": {
 			"duration": 15,
-			"hide_indicator": false
+			"hide_indicator": false,
+			"preferred_team_colors": true,
+            "clock_rgb": "",
+            "date_rgb": "",
+            "flash_seconds": true
 		},
         "covid19": {
             "worldwide_enabled": false,
-            "country_enabled": true,
+            "country_enabled": false,
             "country": [
                 "USA"
             ],
@@ -75,38 +80,55 @@
             ]
 		},
 		"weather": {
-			"enabled": true,
+			"enabled": false,
 			"view": "full",
 			"units": "metric",
 			"duration": 60,
 			"data_feed": "EC",
 			"owm_apikey": "",
 			"update_freq": 5,
-			"show_on_clock": true
+			"show_on_clock": true,
+			"forecast_enabled": true,
+			"forecast_days": 3,
+			"forecast_update": 1
 		},
         "wxalert": {
             "alert_feed": "EC",
             "update_freq": 5,
             "show_alerts": true,
+			"nws_show_expire": false,
             "alert_title": true,
             "scroll_alert": true,
             "alert_duration": 5,
 			"show_on_clock": true
-        }	
+        }
 	},
 	"sbio": {
+		"screensaver": {
+            "enabled": true,
+			"animations": true,
+            "start": "22:00",
+            "stop": "22:05",
+            "data_updates": false,
+			"motionsensor": true,
+            "pin": 24,
+            "delay": 30
+        },
 		"dimmer": {
 			"enabled": false,
 			"source": "software",
+			"daytime": "",
+            "nighttime": "",
+            "offset": 90,
 			"frequency": 5,
 			"light_level_lux": 400,
 			"mode": "always",
 			"sunset_brightness": 5,
 			"sunrise_brightness": 40
 		},
 		"pushbutton": {
-			"enabled": true,
-			"bonnet": true,
+			"enabled": false,
+			"bonnet": false,
 			"pin": 25,
 			"reboot_duration": 2,
 			"reboot_override_process": "",