Merge pull request #886 from adafruit/revert-865-master

Revert "Blank display when quitting via CTRL-C (Catch SIGINT)"

Author: ladyada

Pi_Hole_Ad_Blocker/fonts/readme.txt

@@ -39,34 +39,11 @@
 # Import Python Imaging Library
 from PIL import Image, ImageDraw, ImageFont
 
-# Signal/sys are used to catch SIGINT.
-import signal
-import sys
-
-# URL of Pi Hole
 api_url = 'http://localhost/admin/api.php'
 
-# Load nice silkscreen font
-font = ImageFont.truetype('fonts/slkscr.ttf', 8)
-
 # Create the I2C interface.
 i2c = busio.I2C(SCL, SDA)
 
-# Blanks the Pi OLED display.
-def blank_screen(display):
-  display.fill(0)
-  display.show()
-
-def SIGINT(sig, frame):
-  print('Ctrl+C detected. Quitting.')
-  # Clear display.
-  blank_screen(disp)
-  sys.exit(0)
-
-# Catch SIGINT (ctrl-c) and blank the screen.
-# This ensures that the screen will be blank when we exit.
-signal.signal(signal.SIGINT, SIGINT)
-
 # Create the SSD1306 OLED class.
 # The first two parameters are the pixel width and pixel height.  Change these
 # to the right size for your display!
@@ -78,7 +55,8 @@ def SIGINT(sig, frame):
 DISPLAY_OFF = 50 # off time in seconds
 
 # Clear display.
-blank_screen(disp)
+disp.fill(0)
+disp.show()
 
 # Create blank image for drawing.
 # Make sure to create image with mode '1' for 1-bit color.
@@ -101,6 +79,9 @@ def SIGINT(sig, frame):
 # for drawing shapes.
 x = 0
 
+# Load nice silkscreen font
+font = ImageFont.truetype('/home/pi/slkscr.ttf', 8)
+
 while True:
     # Draw a black filled box to clear the image.
     draw.rectangle((0, 0, width, height), outline=0, fill=0)
@@ -150,6 +131,6 @@ def SIGINT(sig, frame):
     disp.image(image)
     disp.show()
     time.sleep(DISPLAY_ON)
-    # Clear display.
-    blank_screen(disp)
+    disp.fill(0)
+    disp.show()
     time.sleep(DISPLAY_OFF)