Merge pull request #45 from hdumcke/better_display

Better display

Author: mangdangroboticsclub

FuelGauge/battery_monitor

@@ -13,6 +13,7 @@ do
 		echo 0 > /sys/class/gpio/gpio21/value
 		# install scrip will replace BASEDIR
 		mpg123 BASEDIR/Audio/low_power.mp3
+		/usr/bin/display_low_battery.py 
 	fi
 	sleep 8
-done
+done

FuelGauge/display_low_battery.py

@@ -0,0 +1,6 @@
+#!/usr/bin/python
+from MangDang.mini_pupper.display import Display, BehaviorState
+
+
+disp = Display()
+disp.show_state(BehaviorState.LOWBATTERY)

FuelGauge/install.sh

@@ -8,6 +8,7 @@ set -x
 BASEDIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 sudo cp battery_monitor /usr/bin/
+sudo cp display_low_battery.py /usr/bin/
 sudo sed -i "s|BASEDIR|$BASEDIR/..|" /usr/bin/battery_monitor
 sudo cp battery_monitor.service /lib/systemd/system/
 sudo systemctl enable  battery_monitor.service

Python_Module/MangDang/mini_pupper/display.py

@@ -1,15 +1,12 @@
 import netifaces as ni
 from PIL import Image, ImageDraw, ImageFont
-from threading import Thread
 from enum import Enum
 from MangDang.LCD.ST7789 import ST7789
 
 
 def show_image(image):
 
     # init st7789 device
-    disp = ST7789()
-    disp.begin()
 
     # show picture
     disp.display(image)
@@ -31,6 +28,8 @@ class Display:
 
     def __init__(self, image_dir='/var/lib/mini_pupper_bsp'):
         self.image_dir = image_dir
+        self.disp = ST7789()
+        self.disp.begin()
         self.thread = None
         self.current_state = None
 
@@ -43,13 +42,13 @@ def show_state(self, state):
             return
         self.current_state = state.name
         image_path = "%s/%s" % (self.image_dir, self.state_to_image(state))
-        self.show_image(image_path)
+        image = Image.open(image_path)
+        self.disp.display(image)
 
     def show_image(self, image_path):
         image = Image.open(image_path)
         image.resize((320, 240))
-        self.thread = Thread(target=show_image, args=(image,))
-        self.thread.start()
+        self.disp.display(image)
 
     def show_ip(self):
         image_path = "%s/%s" % (self.image_dir, self.state_to_image(BehaviorState.IP))
@@ -65,5 +64,13 @@ def show_ip(self):
         draw = ImageDraw.Draw(image)
         text = "IP: %s" % str(ip)
         draw.text((20, 95), text, font=font, fill="#000000", spacing=0, align='left')
-        self.thread = Thread(target=show_image, args=(image,))
-        self.thread.start()
+        self.disp.display(image)
+
+
+if __name__ == "__main__":
+    disp = Display()
+    disp.show_ip()
+    disp.show_image('/var/lib/mini_pupper_bsp/test.png')
+    disp.show_state(BehaviorState.REST)
+    disp.show_state(BehaviorState.TROT)
+    disp.show_state(BehaviorState.LOWBATTERY)

demos/python_api_display.py

@@ -0,0 +1,15 @@
+#!/usr/bin/python
+from MangDang.mini_pupper.display import Display, BehaviorState
+import time
+
+disp = Display()
+
+disp.show_image('/var/lib/mini_pupper_bsp/test.png')
+time.sleep(5)
+disp.show_state(BehaviorState.REST)
+time.sleep(5)
+disp.show_state(BehaviorState.TROT)
+time.sleep(5)
+disp.show_state(BehaviorState.LOWBATTERY)
+time.sleep(5)
+disp.show_ip()