Fix input gain control, use fates native norn-matron, clean-up

Lcchy · Dec 19, 2020 · 12fb9a5 · 12fb9a5
1 parent e6d0d15
commit 12fb9a5
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 139 deletions.
diff --git a/Eyesy_Norns/norns-matron-launcher.sh b/Eyesy_Norns/norns-matron-launcher.sh
diff --git a/Eyesy_Norns/run.sh b/Eyesy_Norns/run.sh
@@ -4,15 +4,11 @@
 touch /tmp/video.log
 
 echo Starting norns
-sudo systemctl start norns-jack.service
-sudo systemctl start norns-crone.service
-sudo systemctl start norns-sclang.service
-sudo systemctl start eyesy_norns-matron.service
-sudo systemctl start norns-maiden.service
+bash /home/we/sidekick/patches/Norns/run.sh
 sleep 4
 
 echo Starting Eyesy
 systemctl start eyesy_norns-python.service
 systemctl start eyesy-web.service
 systemctl start eyesy-web-socket.service
-# systemctl start eyesy-pd.service # Deactivated to let norns take over the hardware
+# systemctl start eyesy-pd.service # Deactivated to let norns take over the hardware
diff --git a/Eyesy_Norns/stop.sh b/Eyesy_Norns/stop.sh
@@ -6,10 +6,5 @@ systemctl stop eyesy-web-socket.service
 # systemctl stop eyesy-pd.service
 
 echo Stoping norns
-mv ~/dust/data/system.state /tmp/ ; sed 's/norns.state.clean_shutdown = false/norns.state.clean_shutdown = true/' < /tmp/system.state > ~/dust/data/system.state
-sudo systemctl stop norns-maiden.service
-sudo systemctl stop eyesy_norns-matron.service
-sudo systemctl stop norns-sclang.service
-sudo systemctl stop norns-crone.service
-sudo systemctl stop norns-jack.service
-sleep 1
+bash /home/we/sidekick/patches/Norns/stop.sh
+sleep 1
diff --git a/deploy.sh b/deploy.sh
@@ -26,4 +26,5 @@ cp pd/externals/*.pd_linux ../../pdexternals
 sudo systemctl daemon-reload
 
 # Put the Eyesy_Norns one folder up for a cleaner Sidekick menu
-mv Eyesy_Norns ..
+rm -rf ../Eyesy_Norns
+cp -rf Eyesy_Norns ..
diff --git a/deploy.sh.bak b/deploy.sh.bak
diff --git a/engines/python/osc-test2.py b/engines/python/osc-test2.py
diff --git a/engines/python/serial-check.py b/engines/python/serial-check.py
diff --git a/pd/main.pd b/pd/main.pd
@@ -1,5 +1,5 @@
-#N canvas 353 187 2366 1475 10;
-#X obj 190 393 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+#N canvas 15 106 1890 974 10;
+#X obj 190 393 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
 1;
 #X obj 190 321 packOSC;
 #X obj 190 357 udpsend;
@@ -14,7 +14,7 @@
 #X obj 169 241 r oscConnected;
 #X obj 444 239 delay 100;
 #X obj 595 166 delay 200;
-#N canvas 128 1273 2421 1610 fatesHardwareInput 0;
+#N canvas 15 106 1890 974 fatesHardwareInput 0;
 #X obj 754 816 outlet oscOut;
 #X msg 1075 575 sendtyped /knobs iiiiii \$1 \$2 \$3 \$4 \$5 0;
 #X obj 1200 231 r enc0;
@@ -374,9 +374,9 @@
 #X connect 26 0 19 0;
 #X connect 29 0 23 0;
 #X restore 800 27 pd getValuesFromHardware;
-#X msg 659 383 sendtyped /ascale i \$1;
 #X obj 863 406 s trigSource;
 #X obj 1033 410 s midiCh;
+#X msg 659 383 sendtyped /ascale f \$1;
 #X connect 1 0 0 0;
 #X connect 2 0 63 0;
 #X connect 3 0 14 0;
@@ -467,11 +467,11 @@
 #X connect 86 0 81 0;
 #X connect 87 0 86 0;
 #X connect 89 0 94 0;
-#X connect 89 0 142 0;
+#X connect 89 0 141 0;
 #X connect 90 0 91 0;
 #X connect 91 0 89 0;
 #X connect 92 0 95 0;
-#X connect 92 0 141 0;
+#X connect 92 0 140 0;
 #X connect 93 0 92 0;
 #X connect 96 0 113 0;
 #X connect 97 0 112 0;
@@ -481,7 +481,7 @@
 #X connect 101 0 61 1;
 #X connect 102 0 96 1;
 #X connect 103 0 97 1;
-#X connect 104 0 140 0;
+#X connect 104 0 142 0;
 #X connect 106 0 118 0;
 #X connect 107 0 129 0;
 #X connect 108 0 129 1;
@@ -532,6 +532,7 @@
 #X connect 137 1 110 0;
 #X connect 138 0 134 0;
 #X connect 138 1 111 0;
+#X connect 142 0 0 0;
 #X restore 452 406 pd fatesHardwareInput;
 #X text 246 38 This patch controls the video engine via osc;
 #N canvas 366 175 1251 1076 metro-and-trig 0;
@@ -688,7 +689,7 @@ numbered 0-359., f 40;
 #X connect 23 0 14 0;
 #X restore 965 390 pd metro-and-trig;
 #X obj 698 559 s oscOut;
-#N canvas 275 180 1448 851 midiInput 0;
+#N canvas 452 106 1448 974 midiInput 0;
 #X obj 687 888 outlet oscOut;
 #X msg 974 837 sendtyped /key ii 1 \$1;
 #X text 1121 835 Info Disp;
@@ -761,13 +762,13 @@ numbered 0-359., f 40;
 #X obj 120 666 > 63;
 #X obj 119 765 s shiftKey;
 #X obj 456 781 s trigSource;
-#X msg 260 768 sendtyped /ascale i \$1;
 #X obj 317 726 / 100;
+#X msg 260 768 sendtyped /ascale f \$1;
 #X connect 1 0 0 0;
 #X connect 4 0 0 0;
 #X connect 9 0 0 0;
 #X connect 10 0 0 0;
-#X connect 12 0 73 0;
+#X connect 12 0 72 0;
 #X connect 13 0 71 0;
 #X connect 14 0 13 0;
 #X connect 15 0 14 0;
@@ -847,8 +848,8 @@ numbered 0-359., f 40;
 #X connect 66 0 0 0;
 #X connect 67 0 0 0;
 #X connect 69 0 70 0;
-#X connect 72 0 0 0;
-#X connect 73 0 72 0;
+#X connect 72 0 73 0;
+#X connect 73 0 0 0;
 #X restore 827 342 pd midiInput;
 #X obj 862 130 unpackOSC;
 #X obj 861 91 udpreceive 4001;

diff --git a/systemd/eyesy_norns-matron.service b/systemd/eyesy_norns-matron.service