diff --git a/__pycache__/stockTicker.cpython-37.pyc b/__pycache__/stockTicker.cpython-37.pyc index 2e3e039..c2823e0 100644 Binary files a/__pycache__/stockTicker.cpython-37.pyc and b/__pycache__/stockTicker.cpython-37.pyc differ diff --git a/csv/settings.csv b/csv/settings.csv index 170284b..5643465 100644 --- a/csv/settings.csv +++ b/csv/settings.csv @@ -1 +1 @@ -f,9 \ No newline at end of file +m,4 \ No newline at end of file diff --git a/server.py b/server.py index fbdf429..087f1a5 100644 --- a/server.py +++ b/server.py @@ -57,7 +57,8 @@ def hello(): now = datetime.datetime.now() timeString = now.strftime("%Y-%m-%d %H:%M") - LogoList = os.listdir('logos') + logos_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'logos') + LogoList = os.listdir(logos_path) templateData = { 'title' : 'Stock Ticker Control Panel', 'time': timeString, diff --git a/startup.sh b/startup.sh new file mode 100755 index 0000000..00a4cfe --- /dev/null +++ b/startup.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cd /home/pi/fintic +python3 server.py diff --git a/stockTicker.py b/stockTicker.py index 0920866..89819ca 100644 --- a/stockTicker.py +++ b/stockTicker.py @@ -352,8 +352,8 @@ if __name__ == '__main__': #print(sys.stdin.readlines()) stock_ticker = StockTicker() - - f = open('csv/settings.csv') + csv_path = os.path.join(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'csv'), 'settings.csv') + f = open(csv_path) CSV = csv.reader(f) @@ -369,8 +369,8 @@ if __name__ == '__main__': #t = time.time() #api_caller = pexpect.spawn("sudo -E python3 api_caller.py") #print('time to call api', time.time()-t) - stock_ticker.getFullStockImage() - stock_ticker.displayMatrix() + #stock_ticker.getFullStockImage() + #stock_ticker.displayMatrix() while True: