From ed317860178fe187a97fddda3d7b98fa5412a0b2 Mon Sep 17 00:00:00 2001
From: Jacob McDonnell <jacob@simplelittledream.com>
Date: Thu, 29 Sep 2022 20:05:07 -0400
Subject: Fixed Circular Import

---
 main.py     | 21 ++++++++++++++++++---
 settings.py | 15 ---------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/main.py b/main.py
index f041408..34fdd35 100644
--- a/main.py
+++ b/main.py
@@ -7,7 +7,9 @@ import datetime
 from settings import modules, general, lineWidth
 from time import sleep
 from Adafruit_Thermal import *
-import textwrap
+from textwrap import fill
+from ipqr import getQrCode
+from PIL import Image
 
 name = general["name"]
 today = datetime.date.today().strftime("%A %m-%d-%Y")
@@ -30,21 +32,34 @@ def main():
         if modules[module]:
             for line in mods[module]:
                 line = line.replace("\n", "")
-                printer.println(textwrap.fill(line, lineWidth))
+                printer.println(fill(line, lineWidth))
             printer.feed(1)
 
 
+def printSettingsPage():
+    printer.println("Settings")
+    try:
+        getQrCode()
+        qr = Image.open(r"ipqr.png")
+        printer.println(fill("Scan the QR Code below to access settings", lineWidth))
+        printer.printImage(qr)
+    except:
+        printer.println("No Network Connection")
+
+
 printer.wake()
 printer.setSize('M')
 sleep(10)
 
 for line in output:
-    printer.println(textwrap.fill(line, lineWidth))
+    printer.println(fill(line, lineWidth))
 try:
     main()
 except:
     sleep(30)
     main()
 
+printSettingsPage()
+
 printer.feed(6)
 printer.sleep()
diff --git a/settings.py b/settings.py
index af93b33..c5ed5c7 100644
--- a/settings.py
+++ b/settings.py
@@ -1,8 +1,4 @@
 import json
-from main import printer
-from ipqr import getQrCode
-from PIL import Image
-from textwrap import fill
 
 settingsJSON = open('settings.json')
 
@@ -16,14 +12,3 @@ general = settings["general"]
 lineWidth = settings["general"]["Line Width"]
 
 settingsJSON.close()
-
-
-def printSettingsPage():
-    printer.println("Settings")
-    try:
-        getQrCode()
-        qr = Image.open(r"ipqr.png")
-        printer.println(fill("Scan the QR Code below to access settings", lineWidth))
-        printer.printImage(qr)
-    except:
-        printer.println("No Network Connection")
-- 
cgit v1.2.3