diff --git a/data.txt b/data.txt index b55252d..e84d428 100644 --- a/data.txt +++ b/data.txt @@ -1,4 +1,4 @@ -kflg -6 +KCMH +7 3600 0 diff --git a/metar_settings.py b/metar_settings.py index fb00016..2594ad5 100644 --- a/metar_settings.py +++ b/metar_settings.py @@ -14,7 +14,7 @@ # For the same airports in the same locations on screen, place 12 airports in list. The 13th will be the default airport # For randomly selected airports, put more than 12 in list. 12 will randomly be displayed, 13th will be default # If you put less than 12 airports in list, it will pad the missing spots with the default airport above. -random_airports = ["KEYW","KDFW","KSEA","KORD", "KLAS","KCMR","KABQ","KDEN", \ - "KPHX","KNBC","KBKV","KTTS"] #, "KTPA", "KLAS","KGEU","KOLS", \ +random_airports = ["KEYW","KFVE","KSEA","KCVG", "KLAS","KCMR","KGRR","KMSN", \ + "KLAX","KNBC","KFVE","KBUF"] #, "KTPA", "KLAS","KGEU","KOLS", \ # "KSAN", "KPDX", "KBOI", "KMSP", "KSTL", "KBNA", "KTYS"] diff --git a/static/layout0.jpg b/static/layout0.jpg index 992962f..9ad58a8 100644 Binary files a/static/layout0.jpg and b/static/layout0.jpg differ diff --git a/static/layout1.jpg b/static/layout1.jpg index 47da2d0..4a1ecfa 100644 Binary files a/static/layout1.jpg and b/static/layout1.jpg differ diff --git a/static/layout2.jpg b/static/layout2.jpg index 2631f1d..3d43643 100644 Binary files a/static/layout2.jpg and b/static/layout2.jpg differ diff --git a/static/layout3.jpg b/static/layout3.jpg index 0f21d4b..59ee594 100644 Binary files a/static/layout3.jpg and b/static/layout3.jpg differ diff --git a/static/layout4.jpg b/static/layout4.jpg index f115e3a..8eee475 100644 Binary files a/static/layout4.jpg and b/static/layout4.jpg differ diff --git a/static/layout5.jpg b/static/layout5.jpg new file mode 100644 index 0000000..e17fdab Binary files /dev/null and b/static/layout5.jpg differ diff --git a/static/layout6.jpg b/static/layout6.jpg new file mode 100644 index 0000000..ca627d5 Binary files /dev/null and b/static/layout6.jpg differ diff --git a/static/layout7.jpg b/static/layout7.jpg new file mode 100644 index 0000000..2de5905 Binary files /dev/null and b/static/layout7.jpg differ diff --git a/static/metar_cmdline.jpg b/static/metar_cmdline.jpg new file mode 100644 index 0000000..6376cad Binary files /dev/null and b/static/metar_cmdline.jpg differ diff --git a/static/metar_collage.jpg b/static/metar_collage.jpg new file mode 100644 index 0000000..a8e8700 Binary files /dev/null and b/static/metar_collage.jpg differ diff --git a/static/metar_html.jpg b/static/metar_html.jpg new file mode 100644 index 0000000..f89d0f1 Binary files /dev/null and b/static/metar_html.jpg differ diff --git a/templates/metar.html b/templates/metar.html index c5119a6..c141377 100755 --- a/templates/metar.html +++ b/templates/metar.html @@ -24,7 +24,7 @@ .myDiv span{ text-align: center; background: #b1cafc; - padding: 6px 10px; + padding: 6px 6px; display: block; width: 400px; border: 1px solid blue; @@ -146,27 +146,42 @@

METAR E-Paper Display Selector

- Basic Display with Large Flight Category Letters and METAR String +

- METAR String with individual weather items with dynamic icons. +

- Formatted Weather Data with dynamic icons. +

- Basic Large Letter Flight Category. +

- 3-Area Display with Large Flight Category Letters and weather data. + +

+
+

+

+ +

+
+

+

+ +

+
+

+

+

diff --git a/webapp.py b/webapp.py index db536ef..8abb015 100644 --- a/webapp.py +++ b/webapp.py @@ -5,7 +5,7 @@ from flask import Flask, render_template, request, flash, redirect, url_for, send_file, Response import os import sys -from shutdown import * +from metar_poweroff import * from metar_settings import * app = Flask(__name__)