Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: iss11 Conversion of .tim files #61

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

WIP: iss11 Conversion of .tim files #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9dfa327
iss11 Conversion of .tim files
Oct 22, 2018
c41c8b5
Add basic parsing of systemConfig.xml
Nov 11, 2019
36a876f
Set level simple
Nov 21, 2019
9fe438a
Got first complicated set level test case working
Nov 22, 2019
a81f3b4
Very complicated almost working
Nov 22, 2019
4cf3116
Fix minor timing problem wiht multiplication with javascript
Nov 23, 2019
5862c35
Get long tim conversion working in under 1 minute
Nov 23, 2019
41a9205
stage for later
Nov 24, 2019
05c1593
Get pulse basic working
Nov 24, 2019
d09611d
get new basic pulse working
Nov 24, 2019
ed75ee7
Push up current state for josh
Nov 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 62 additions & 0 deletions diff.txt
View file
Open in desktop

Large diffs are not rendered by default.

150 changes: 137 additions & 13 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,25 @@
"dependencies": {
"ajv": "^6.5.5",
"chromedriver": "^2.42.0",
"color-convert": "^2.0.1",
"convert-array-to-csv": "^1.0.9",
"cubic-spline": "^3.0.0",
"dmx": "^0.1.1",
"electron-first-run": "^2.0.0",
"fast-xml-parser": "^3.14.0",
"fs-extra": "^7.0.0",
"he": "^1.2.0",
"hex-rgb": "^4.1.0",
"howler": "^2.0.15",
"line-interpolate-points": "^1.0.5",
"nanotimer": "^0.3.15",
"rgb-hex": "^3.0.0",
"serialport": "^7.0.2",
"socket.io": "^2.3.0",
"sudo-prompt": "^8.2.3",
"web-midi-api": "^2.0.2",
"xml-js": "^1.6.11",
"xml-stream": "^0.4.5",
"xml2js": "^0.4.19"
}
}
52 changes: 52 additions & 0 deletions testTimConversion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#!/bin/bash -eu

# node timConversion.js ../gallium-test-files/basicEffects/allon_setLevel.tim ../gallium-test-files/basicEffects/SystemConfig.xml ../gallium-test-files/basicEffects/ModuleStore.xml 100
# diff ./test.csv ../gallium-test-files/basicEffects/allon_setLevel_100.csv --strip-trailing-cr | wc -l

# node timConversion.js ../gallium-test-files/basicEffects/complicated_setLevel.tim ../gallium-test-files/basicEffects/SystemConfig.xml ../gallium-test-files/basicEffects/ModuleStore.xml 25
# diff ./test.csv ../gallium-test-files/basicEffects/complicated_setLevel_25.csv --strip-trailing-cr | wc -l

# node timConversion.js ../gallium-test-files/basicEffects/verycomplicated_setLevel.tim ../gallium-test-files/basicEffects/SystemConfig.xml ../gallium-test-files/basicEffects/ModuleStore.xml 100
# diff ./test.csv ../gallium-test-files/basicEffects/verycomplicated_setLevel_100.csv --strip-trailing-cr | wc -l

# node timConversion.js ../gallium-test-files/basicEffects/verycomplicated_setLevel.tim ../gallium-test-files/basicEffects/SystemConfig.xml ../gallium-test-files/basicEffects/ModuleStore.xml 50
# diff ./test.csv ../gallium-test-files/basicEffects/verycomplicated_setLevel_50.csv --strip-trailing-cr | wc -l

# node timConversion.js ../gallium-test-files/basicEffects/verycomplicated_setLevel.tim ../gallium-test-files/basicEffects/SystemConfig.xml ../gallium-test-files/basicEffects/ModuleStore.xml 25
# diff ./test.csv ../gallium-test-files/basicEffects/verycomplicated_setLevel_25.csv --strip-trailing-cr | wc -l

# node timConversion.js ../gallium-test-files/basicEffects/verycomplicated_long_setLevel.tim ../gallium-test-files/basicEffects/SystemConfig.xml ../gallium-test-files/basicEffects/ModuleStore.xml 100
# diff ./test.csv ../gallium-test-files/basicEffects/verycomplicated_long_setLevel_100.csv --strip-trailing-cr | wc -l

# node timConversion.js ../gallium-test-files/basicEffects/verycomplicated_long_setLevel.tim ../gallium-test-files/basicEffects/SystemConfig.xml ../gallium-test-files/basicEffects/ModuleStore.xml 25
# diff ./test.csv ../gallium-test-files/basicEffects/verycomplicated_long_setLevel_25.csv --strip-trailing-cr | wc -l



# node timConversion.js ../gallium-test-files/basicEffects/basic_pulse.tim ../gallium-test-files/basicEffects/SystemConfig.xml ../gallium-test-files/basicEffects/ModuleStore.xml 100
# diff ./test.csv ../gallium-test-files/basicEffects/basic_pulse_100.csv --strip-trailing-cr | wc -l

# node timConversion.js ../gallium-test-files/basicEffects/basic_pulse.tim ../gallium-test-files/basicEffects/SystemConfig.xml ../gallium-test-files/basicEffects/ModuleStore.xml 25
# diff ./test.csv ../gallium-test-files/basicEffects/basic_pulse_25.csv --strip-trailing-cr | wc -l


# node timConversion.js ../gallium-test-files/basicEffects/complicated_pulse.tim ../gallium-test-files/basicEffects/SystemConfig.xml ../gallium-test-files/basicEffects/ModuleStore.xml 100
# diff ./test.csv ../gallium-test-files/basicEffects/complicated_pulse_100.csv --strip-trailing-cr | wc -l

# node timConversion.js ../gallium-test-files/basicEffects/complicated_pulse.tim ../gallium-test-files/basicEffects/SystemConfig.xml ../gallium-test-files/basicEffects/ModuleStore.xml 25
# diff ./test.csv ../gallium-test-files/basicEffects/complicated_pulse_25.csv --strip-trailing-cr | wc -l


node timConversion.js ../gallium-test-files/basicEffects/basic_chase.tim ../gallium-test-files/basicEffects/SystemConfig.xml ../gallium-test-files/basicEffects/ModuleStore.xml 100
diff ./test.csv ../gallium-test-files/basicEffects/basic_chase_100.csv --strip-trailing-cr | wc -l


# node timConversion.js ../gallium-test-files/basicEffects/basic_chase.tim ../gallium-test-files/basicEffects/SystemConfig.xml ../gallium-test-files/basicEffects/ModuleStore.xml 25
# diff ./test.csv ../gallium-test-files/basicEffects/basic_chase_25.csv --strip-trailing-cr | wc -l


# node timConversion.js ../gallium-test-files/basicEffects/basic_spin.tim ../gallium-test-files/basicEffects/SystemConfig.xml ../gallium-test-files/basicEffects/ModuleStore.xml 100
# diff ./test.csv ../gallium-test-files/basicEffects/basic_spin_100.csv --strip-trailing-cr | wc -l

# node timConversion.js ../gallium-test-files/basicEffects/basic_spin.tim ../gallium-test-files/basicEffects/SystemConfig.xml ../gallium-test-files/basicEffects/ModuleStore.xml 25
# diff ./test.csv ../gallium-test-files/basicEffects/basic_spin_25.csv --strip-trailing-cr | wc -l
Loading