From 7b36213e3baa8e387ff9e067b79c99f7ec0deba2 Mon Sep 17 00:00:00 2001 From: Nathan Lee Date: Mon, 7 Sep 2020 17:14:15 -0700 Subject: [PATCH 1/2] Changed timetemp to display with openweathermap --- Adafruit_Thermal.py | 7 +++-- __pycache__/Adafruit_Thermal.cpython-37.pyc | Bin 0 -> 15557 bytes timetemp.py | 31 ++++++++++---------- 3 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 __pycache__/Adafruit_Thermal.cpython-37.pyc diff --git a/Adafruit_Thermal.py b/Adafruit_Thermal.py index 2043d5a..429d49b 100644 --- a/Adafruit_Thermal.py +++ b/Adafruit_Thermal.py @@ -548,8 +548,11 @@ def printBitmap(self, w, h, bitmap, LaaT=False): # the Imaging Library to perform such operations before # passing the result to this function. def printImage(self, image_file, LaaT=False): - from PIL import Image - image = Image.open(image_file) + image = image_file + + if isinstance(image_file, str): + image = Image.open(image_file) + if image.mode != '1': image = image.convert('1') diff --git a/__pycache__/Adafruit_Thermal.cpython-37.pyc b/__pycache__/Adafruit_Thermal.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..b87be734f5439d9da24143dad0d35f3146c1c06f GIT binary patch literal 15557 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 0: for winDirNum in range(len(DirAngle) - 1): if windDir < DirAngle[winDirNum]: break -winDirNum+=1 +winDirNum+=1 w = Humidity.size[0] + 5 + numWidth(s, HumiDigit) w2 = Wind.size[0] + 5 + numWidth(s2, HumiDigit) if windSpeed > 0: From 655d2ba69be1525da464f5881e34e83ffefd158b Mon Sep 17 00:00:00 2001 From: Nathan Lee Date: Mon, 7 Sep 2020 17:16:46 -0700 Subject: [PATCH 2/2] Removed change to thermal library --- Adafruit_Thermal.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Adafruit_Thermal.py b/Adafruit_Thermal.py index 429d49b..2043d5a 100644 --- a/Adafruit_Thermal.py +++ b/Adafruit_Thermal.py @@ -548,11 +548,8 @@ def printBitmap(self, w, h, bitmap, LaaT=False): # the Imaging Library to perform such operations before # passing the result to this function. def printImage(self, image_file, LaaT=False): - image = image_file - - if isinstance(image_file, str): - image = Image.open(image_file) - + from PIL import Image + image = Image.open(image_file) if image.mode != '1': image = image.convert('1')