diff --git a/ArtemisRemoteControl.spec b/ArtemisRemoteControl.spec index 6091c46..d9f611a 100644 --- a/ArtemisRemoteControl.spec +++ b/ArtemisRemoteControl.spec @@ -7,7 +7,7 @@ a = Analysis(['run.py'], pathex=['C:\\Users\\Yama\\Documents\\Python\\ArtemisRemoteControl'], binaries=[], datas=[], - hiddenimports=['numpy', 'artemisremotecontrol', 'artemisremotecontrol.config'], + hiddenimports=['artemisremotecontrol', 'artemisremotecontrol.config'], hookspath=[], runtime_hooks=[], excludes=[], diff --git a/artemisremotecontrol/__init__.py b/artemisremotecontrol/__init__.py index 7ca2aab..66fb252 100644 --- a/artemisremotecontrol/__init__.py +++ b/artemisremotecontrol/__init__.py @@ -4,7 +4,7 @@ from os import environ from json import loads, dumps -logging.basicConfig(filename='error.log', level=logging.WARNING) +logging.basicConfig(filename='error.log', format='%(asctime)s %(levelname)s:%(message)s', level=logging.WARNING) def _getapiurl(ep): diff --git a/requirements.txt b/requirements.txt index 6f94136..d222406 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ requests>=2.25.1 simple-plugin-loader>=1.6 -numpy>=1.20.2 diff --git a/scripts/tasmota.py b/scripts/tasmota.py index fc028ae..5a9360e 100644 --- a/scripts/tasmota.py +++ b/scripts/tasmota.py @@ -3,7 +3,6 @@ import logging from json import loads from time import sleep -from numpy import interp from threading import Thread from requests import get from requests.exceptions import ConnectionError @@ -38,8 +37,8 @@ def loop(): text = loads(response.content.decode('utf-8')) logging.debug(text) if isinstance(uri['value'], list): - percent = interp(int(text[uri['key']]), uri['value'], [0, 100]) - logging.debug(percent) + percent = (int(text[uri['key']]) - uri['value'][0])/((uri['value'][1] - uri['value'][0])/100) + logging.debug(f'Percent: {percent}') if len(uri['leds']) == 1: decimal = 255 / 100 * percent # 255 is FF in hex alpha = f'#{hex(decimal)}'