aboutsummaryrefslogtreecommitdiff
path: root/src/compileAndRun/pythonSupportFiles/entry.py
diff options
context:
space:
mode:
authorJakob Stendahl <jakob.stendahl@outlook.com>2019-09-22 13:12:44 +0200
committerJakob Stendahl <jakob.stendahl@outlook.com>2019-09-22 13:12:44 +0200
commite6880cd8ccf82d993f222cb14b4860581654acb8 (patch)
tree45f318f4ece2f0d6ca73fc3f775b9ba277ccdb77 /src/compileAndRun/pythonSupportFiles/entry.py
parente911f8029ca612d3b17ced300cdf5b6f13e20972 (diff)
parent2e60b25ae368b8c19ce5e982aa2672a6c56edf90 (diff)
downloadLuxcena-Neo-e6880cd8ccf82d993f222cb14b4860581654acb8.tar.gz
Luxcena-Neo-e6880cd8ccf82d993f222cb14b4860581654acb8.zip
Merge branch 'master' of https://github.com/JakobST1n/Luxcena-Neo
Diffstat (limited to 'src/compileAndRun/pythonSupportFiles/entry.py')
-rw-r--r--src/compileAndRun/pythonSupportFiles/entry.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/compileAndRun/pythonSupportFiles/entry.py b/src/compileAndRun/pythonSupportFiles/entry.py
index 4ba1031..45de822 100644
--- a/src/compileAndRun/pythonSupportFiles/entry.py
+++ b/src/compileAndRun/pythonSupportFiles/entry.py
@@ -49,16 +49,14 @@ def main():
print ("> Loading pixel-configuration...")
with open(config_dir + "strip.json", "r") as rawStripConf:
stripConf = json.load(rawStripConf)
- segments = stripConf["segments"]
- segmentConfiguration = stripConf["segmentConfiguration"]
print ("> Initializing script...")
moduleSc = importlib.import_module("script")
if ("LuxcenaNeo" in dir(moduleSc)):
- moduleSc.LuxcenaNeo.strip = moduleSc.LuxcenaNeo.Strip(segments, segmentConfiguration)
+ moduleSc.LuxcenaNeo.strip = moduleSc.LuxcenaNeo.Strip(stripConf)
elif ("neo" in dir(moduleSc)):
- moduleSc.neo.strip = moduleSc.neo.Strip(segments, segmentConfiguration)
+ moduleSc.neo.strip = moduleSc.neo.Strip(stripConf)
else:
raise Exception("Neither LuxcenaNeo nor neo found in script, check docs!")