|
|
|
@ -21,7 +21,6 @@ class Display(threading.Thread):
|
|
|
|
|
|
|
|
|
|
def __del__(self):
|
|
|
|
|
if (not self.screensaver == None):
|
|
|
|
|
self.screensaver.terminate()
|
|
|
|
|
self.screensaver = None
|
|
|
|
|
|
|
|
|
|
if (not self.serialport == None):
|
|
|
|
@ -79,17 +78,15 @@ class Display(threading.Thread):
|
|
|
|
|
#print "Starting Display thread"
|
|
|
|
|
self.screensaver.start()
|
|
|
|
|
while(self.runme):
|
|
|
|
|
#print("display thread loop\n")
|
|
|
|
|
print("display thread loop\n")
|
|
|
|
|
self.mutex_get()
|
|
|
|
|
#print("display got mutex and handles scroll\n")
|
|
|
|
|
self.offset_line1 = self.display_handle_scroll(1,self.scroll_line1,self.offset_line1)
|
|
|
|
|
self.offset_line2 = self.display_handle_scroll(2,self.scroll_line2,self.offset_line2)
|
|
|
|
|
self.mutex_release()
|
|
|
|
|
time.sleep(.5)
|
|
|
|
|
#print "Exiting Display thread"
|
|
|
|
|
print "Exiting Display thread"
|
|
|
|
|
|
|
|
|
|
def terminate(self):
|
|
|
|
|
self.runme = False
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -223,6 +220,7 @@ class Display(threading.Thread):
|
|
|
|
|
self.portlock.release()
|
|
|
|
|
|
|
|
|
|
def terminate(self):
|
|
|
|
|
self.runme=False
|
|
|
|
|
if (not self.screensaver == None):
|
|
|
|
|
self.screensaver.terminate()
|
|
|
|
|
self.screensaver = None
|
|
|
|
|