diff --git a/make_desktop_file.bat b/make_desktop_file.bat index 8ac5c12..7e87391 100644 --- a/make_desktop_file.bat +++ b/make_desktop_file.bat @@ -2,7 +2,7 @@ set SCRIPT="%TEMP%\%RANDOM%-%RANDOM%-%RANDOM%-%RANDOM%.vbs" echo Set oWS = WScript.CreateObject("WScript.Shell") >> %SCRIPT% echo sLinkFile = "%USERPROFILE%\Desktop\AVVIO PROGRAMMA COLLAUDO.lnk" >> %SCRIPT% echo Set oLink = oWS.CreateShortcut(sLinkFile) >> %SCRIPT% -echo oLink.TargetPath = "%userprofile%\PycharmProjects\st-ten-1\runme.sh" >> %SCRIPT% +echo oLink.TargetPath = "%userprofile%\PycharmProjects\st-ten-1\runme.bat" >> %SCRIPT% echo oLink.IconLocation = "%userprofile%\PycharmProjects\st-ten-1\src\ui\imgs\neo.ico" echo oLink.Save >> %SCRIPT% cscript /nologo %SCRIPT% diff --git a/runme.bat b/runme.bat new file mode 100644 index 0000000..2bd6bf6 --- /dev/null +++ b/runme.bat @@ -0,0 +1,4 @@ +echo on +SET mypath=%~dp0 +cd %mypath% +.\venv\Scripts\activate.bat && python -O "./src/main.py" --no-edgetpu --no-tflite diff --git a/src/components/dummies/libbiodaq/libbiodaq.py b/src/components/dummies/libbiodaq/libbiodaq.py index c03b0c1..53c39a0 100644 --- a/src/components/dummies/libbiodaq/libbiodaq.py +++ b/src/components/dummies/libbiodaq/libbiodaq.py @@ -1,7 +1,7 @@ from ctypes import (CFUNCTYPE, POINTER, byref, c_char, c_int32, c_uint8, c_void_p, cast, create_string_buffer, pointer) - +from src.components.Automation.BDaq import * buffer = {} out_data =[0b00000101,0b00000101] @@ -25,7 +25,7 @@ def InstantDoCtrl_WriteBit(useless, byte, bit, val): b = int(int.from_bytes(val, "big") != 0) << bit buffer[byte] &= 0b11111111 & ~(1 << bit) buffer[byte] |= b - return 0 + return ErrorCode.Success @CFUNCTYPE(c_void_p) diff --git a/src/components/usb_586x.py b/src/components/usb_586x.py index fe436cd..4a08205 100644 --- a/src/components/usb_586x.py +++ b/src/components/usb_586x.py @@ -12,14 +12,14 @@ is_win = platform.system() == "Windows" if "--sim-io" not in sys.argv: if is_win: - from Automation.BDaq import * - from Automation.BDaq.InstantDoCtrl import InstantDoCtrl - from Automation.BDaq.InstantDiCtrl import InstantDiCtrl + from components.Automation.BDaq import * + from components.Automation.BDaq.InstantDoCtrl import InstantDoCtrl + from components.Automation.BDaq.InstantDiCtrl import InstantDiCtrl else: libbiodaq = ctypes.CDLL("/opt/advantech/libs/libbiodaq.so") else: is_win=False - import src.components.dummies.libbiodaq as libbiodaq + import components.dummies.libbiodaq as libbiodaq class USB_586x(Component): @@ -36,7 +36,7 @@ class USB_586x(Component): def __init__(self, config=None, name=None, period=1, lazy=True, paused=False, threaded=True): super().__init__(config=config, name=name, period=period, lazy=lazy, paused=paused, threaded=threaded) self.mutex = QMutex() - + self.simulate="--sim-io" in sys.argv # DEVICE INFORMATION self.id=config["digital_io"]["id"] if "5860" in self.id: @@ -193,7 +193,7 @@ class USB_586x(Component): max_retry = 3 while not ok and retry