diff --git a/.gitignore b/.gitignore index e5b6e11..92bdb75 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ __pycache__/ *.iml .idea/ -.venv/ \ No newline at end of file +.venv/ +debug.log \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 050396c..501d18b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "MeterFeeder"] path = MeterFeeder url = git@github.com:TheRandonauts/MeterFeeder.git + shallow = true diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..ef83f48 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "githubPullRequests.ignoredPullRequestBranches": [ + "develop" + ] +} \ No newline at end of file diff --git a/LICENSE b/LICENSE index 2105aad..23eab68 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,8 @@ MIT License Copyright (c) 2020 Andika Wasisto +Modified by randogoth / Randonauts Co. +Modified by soliax / fp2.dev Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/MeterFeeder b/MeterFeeder index f33f7b2..6b8de4b 160000 --- a/MeterFeeder +++ b/MeterFeeder @@ -1 +1 @@ -Subproject commit f33f7b266cfa69a73cba481c4c2b875e72066ae8 +Subproject commit 6b8de4bd2c8fc0c483c1988b1d99694d8ad31d8d diff --git a/debug.log b/debug.log deleted file mode 100644 index 2398904..0000000 --- a/debug.log +++ /dev/null @@ -1 +0,0 @@ -[0917/192900.742:ERROR:registration_protocol_win.cc(103)] CreateFile: The system cannot find the file specified. (0x2) diff --git a/libmeterfeeder.dylib b/libmeterfeeder.dylib deleted file mode 100755 index 7968ec6..0000000 Binary files a/libmeterfeeder.dylib and /dev/null differ diff --git a/libmeterfeeder.so b/libmeterfeeder.so deleted file mode 100644 index 7b1073e..0000000 Binary files a/libmeterfeeder.so and /dev/null differ diff --git a/meterfeeder.dll b/meterfeeder.dll deleted file mode 100644 index 3bdb168..0000000 Binary files a/meterfeeder.dll and /dev/null differ diff --git a/quanttp/__main__.py b/quanttp/__main__.py index 1b6ecfc..f7a61bc 100644 --- a/quanttp/__main__.py +++ b/quanttp/__main__.py @@ -1,5 +1,5 @@ # Copyright (c) 2020 Andika Wasisto -# Modified by Tobias Raayoni Last +# Modified by randogoth # Modified by soliax # # Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/quanttp/data/meterfeeder_wrapper.py b/quanttp/data/meterfeeder_wrapper.py index 86aa006..f8cb3cb 100644 --- a/quanttp/data/meterfeeder_wrapper.py +++ b/quanttp/data/meterfeeder_wrapper.py @@ -1,7 +1,7 @@ ## # MeterFeeder Library Wrapper # - # by soliax + # by soliax, randogoth ## from platform import os @@ -15,13 +15,13 @@ class MeterFeederWrapper: def __init__(self): if platform == "linux" or platform == "linux2": # Linux - self._meterfeeder = cdll.LoadLibrary(os.getcwd() + '/libmeterfeeder.so') + self._meterfeeder = cdll.LoadLibrary(os.getcwd() + '/MeterFeeder/builds/linux/libmeterfeeder.so') elif platform == "darwin": # OS X - self._meterfeeder = cdll.LoadLibrary(os.getcwd() + '/libmeterfeeder.dylib') + self._meterfeeder = cdll.LoadLibrary(os.getcwd() + '/MeterFeeder/builds/mac/libmeterfeeder.dylib') elif platform == "win32": # Windows - self._meterfeeder = cdll.LoadLibrary(os.getcwd() + '/meterfeeder.dll') + self._meterfeeder = cdll.LoadLibrary(os.getcwd() + '/MeterFeeder/builds/windows/meterfeeder.dll') # Declare function bridging self._meterfeeder.MF_Initialize.argtypes = c_char_p,