diff --git a/build_deb.sh b/build_deb.sh index e0ba84a..9326730 100644 --- a/build_deb.sh +++ b/build_deb.sh @@ -7,6 +7,7 @@ fpm -s python --python-bin python3 --python-pip pip3 --python-package-name-prefi --license 'proprietary' \ --description 'Library for robot used in the competition' \ --after-install postinstall.sh \ + --after-upgrade postinstall.sh \ --deb-generate-changes \ --deb-priority "optional" \ --deb-systemd "complib.service" \ @@ -32,7 +33,8 @@ fpm -s python --python-bin python3 --python-pip pip3 --python-package-name-prefi -d "python-pigpio" \ -d "python3-pigpio" \ -d "python3-numpy" \ - -v 0.0.4-6 -t deb setup.py + -d "ffmpeg" \ + -v 0.0.4-16 -t deb setup.py # --deb-changelog changelog \ # --deb-upstream-changelog changelog \ diff --git a/compLib/Vision.py b/compLib/Vision.py index 8978cdf..88937bf 100644 --- a/compLib/Vision.py +++ b/compLib/Vision.py @@ -2,7 +2,7 @@ import os import cv2 import logging import threading -import LogstashLogging +from compLib.LogstashLogging import Logging from flask import Flask, Response @@ -51,7 +51,7 @@ class __Streaming: # self.__camera_stream = cv2.VideoCapture(0) self.__newest_frame = None self.__lock = threading.Lock() - logging.info("Initialized vision") + Logging.get_logger().info("Initialized vision") def get_frame(self): """ @@ -104,7 +104,7 @@ Streaming = None if BUILDING_DOCS == "false": # instantiate private class __Streaming Streaming = __Streaming() - logging.info("created instance of streaming class") + Logging.get_logger().info("created instance of streaming class") @app.route("/live") @@ -134,7 +134,7 @@ def __start_flask(): :return: """ - logging.info("starting flask server") + Logging.get_logger().info("starting flask server") app.run(host="0.0.0.0", port=9898, debug=True, threaded=True, use_reloader=False) diff --git a/compLib/VisionDaemon.py b/compLib/VisionDaemon.py index c9b8d97..880ecad 100644 --- a/compLib/VisionDaemon.py +++ b/compLib/VisionDaemon.py @@ -7,8 +7,12 @@ import LogstashLogging from LogstashLogging import logstash_logger from threading import Thread import logging -from Battery import Battery -from Buzzer import Buzzer + +try: + from Battery import Battery + from Buzzer import Buzzer +except Exception as e: + logstash_logger.error("unable to import battery or buzzer in daemon") __run = """raspivid -t 0 -b 5000000 -w 1280 -h 720 -fps 30 -n -o - | gst-launch-1.0 fdsrc ! video/x-h264,width=1280,height=720,framerate=30/1,noise-reduction=1,profile=high,stream-format=byte-stream ! h264parse ! queue ! flvmux streamable=true ! rtmpsink location=\"rtmp://localhost/live/stream\"""" @@ -21,7 +25,7 @@ def check_battery(): battery = Battery.percent() except Exception as e: logstash_logger.error(f"could not check battery -> {str(e)}") - if battery <= 15: + if -100 <= battery <= 15: logstash_logger.warning(f"LOW BATTERY DETECTED: '{battery}'") Buzzer.set(True) time.sleep(1) diff --git a/compLib/__init__.py b/compLib/__init__.py index f0b933e..93dfcc1 100644 --- a/compLib/__init__.py +++ b/compLib/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.0.4-6" +__version__ = "0.0.4-16" import compLib.LogstashLogging import logging diff --git a/postinstall.sh b/postinstall.sh index 2122420..1d67a3a 100644 --- a/postinstall.sh +++ b/postinstall.sh @@ -43,9 +43,8 @@ echo "Starting pigpiod daemon" sudo systemctl start pigpiod sudo systemctl enable pigpiod -echo "Enabling camera via raspi-conf" -raspi-config nonint do_camera 1 - -RED='\033[0;31m' -NC='\033[0m' -echo -e "${RED}IF THIS IS THE FIRST INSTALL REBOOT YOUR PIE NOW!${NC}" +base64 -d << UPD +CiBfX19fX18gICAgIF9fX19fXyAgICAgX18gICAgX18gICAgIF9fX19fXyAgIF9fICAgICAgICAgX18gICAgIF9fX19fXyAgICAgICAgICAgICAgICAgIAovXCAgX19fXCAgIC9cICBfXyBcICAgL1wgIi0uLyAgXCAgIC9cICA9PSBcIC9cIFwgICAgICAgL1wgXCAgIC9cICA9PSBcICAgICAgICAgICAgICAgICAKXCBcIFxfX19fICBcIFwgXC9cIFwgIFwgXCBcLS4vXCBcICBcIFwgIF8tLyBcIFwgXF9fX18gIFwgXCBcICBcIFwgIF9fPCAgICAgICAgICAgICAgICAgCiBcIFxfX19fX1wgIFwgXF9fX19fXCAgXCBcX1wgXCBcX1wgIFwgXF9cICAgIFwgXF9fX19fXCAgXCBcX1wgIFwgXF9fX19fXCAgICAgICAgICAgICAgIAogIFwvX19fX18vICAgXC9fX19fXy8gICBcL18vICBcL18vICAgXC9fLyAgICAgXC9fX19fXy8gICBcL18vICAgXC9fX19fXy8gICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiBfXyAgX18gICAgIF9fX19fXyAgICAgIF9fX19fXyAgIF9fX19fXyAgICAgICAgX19fX18gICAgIF9fX19fXyAgICAgX19fX19fICAgX19fX19fICAgIAovXCBcL1wgXCAgIC9cICA9PSBcICAgIC9cX18gIF9cIC9cICBfXyBcICAgICAgL1wgIF9fLS4gIC9cICBfXyBcICAgL1xfXyAgX1wgL1wgIF9fX1wgICAKXCBcIFxfXCBcICBcIFwgIF8tLyAgICBcL18vXCBcLyBcIFwgXC9cIFwgICAgIFwgXCBcL1wgXCBcIFwgIF9fIFwgIFwvXy9cIFwvIFwgXCAgX19cICAgCiBcIFxfX19fX1wgIFwgXF9cICAgICAgICAgXCBcX1wgIFwgXF9fX19fXCAgICAgXCBcX19fXy0gIFwgXF9cIFxfXCAgICBcIFxfXCAgXCBcX19fX19cIAogIFwvX19fX18vICAgXC9fLyAgICAgICAgICBcL18vICAgXC9fX19fXy8gICAgICBcL19fX18vICAgXC9fL1wvXy8gICAgIFwvXy8gICBcL19fX19fLyA= +UPD +echo "" +echo "" diff --git a/setup.py b/setup.py index 896299d..b78ea6a 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ else: setuptools.setup( name="complib", - version="0.0.4-6", + version="0.0.4-16", author="F-WuTs", author_email="--", description="",