From e5b5f3ab3ed5f232c6b0154ec6c5995824095228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurij=20Podgor=C5=A1ek?= <jurij@kompot.si>
Date: Mon, 21 Oct 2024 23:24:59 +0200
Subject: [PATCH] Nekaj posodobitev

---
 AHRSensor/AHRSensor.sc      |  2 --
 linux-receiver/manifest.scm |  2 ++
 linux-receiver/pozeni.sh    |  2 +-
 manifest.scm                |  6 ++++++
 src/sprejemnik2.cpp         |  4 ++--
 utopia.scd                  | 11 ++++++++---
 utopia_mapiranje.scd        |  3 ++-
 7 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 linux-receiver/manifest.scm
 create mode 100644 manifest.scm

diff --git a/AHRSensor/AHRSensor.sc b/AHRSensor/AHRSensor.sc
index 3a50673..d06143b 100644
--- a/AHRSensor/AHRSensor.sc
+++ b/AHRSensor/AHRSensor.sc
@@ -231,7 +231,6 @@ AHRSensor {
         gEps,
         gQr
       ],
-      /*
 	  [
 		StaticText().string_("quaternion: "),
 		[StaticText().string_("w: "), align: \right],
@@ -243,7 +242,6 @@ AHRSensor {
 		[StaticText().string_("z: "), align: \right],
 		gQz,
 	  ],
-      */
       [
         [StaticText().string_("e"), align: \right],
         [gExl, columns: 2],
diff --git a/linux-receiver/manifest.scm b/linux-receiver/manifest.scm
new file mode 100644
index 0000000..3bc0b31
--- /dev/null
+++ b/linux-receiver/manifest.scm
@@ -0,0 +1,2 @@
+(package-specification
+  (list liblo))
diff --git a/linux-receiver/pozeni.sh b/linux-receiver/pozeni.sh
index 629c30e..1da4d4c 100755
--- a/linux-receiver/pozeni.sh
+++ b/linux-receiver/pozeni.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 dev=${1:-wlp3s0}
 oscport=${1:-57120}
diff --git a/manifest.scm b/manifest.scm
new file mode 100644
index 0000000..f9cf139
--- /dev/null
+++ b/manifest.scm
@@ -0,0 +1,6 @@
+(specifications->manifest
+  (list "gcc-cross-avr-toolchain"
+        "meson"
+        "ninja"
+        "avrdude"
+        "python-esptool"))
diff --git a/src/sprejemnik2.cpp b/src/sprejemnik2.cpp
index e22031e..18a37c5 100644
--- a/src/sprejemnik2.cpp
+++ b/src/sprejemnik2.cpp
@@ -19,9 +19,9 @@ SLIPEncodedUSBSerial SLIPSerial(Serial);
  
 // Set your new MAC Address
 // MAC naslov sprejemnika: 08:3A:F2:50:EF:6C
-//uint8_t newMACAddress[] = {0x08, 0x3A, 0xF2, 0x50, 0xEF, 0x6C};
+uint8_t newMACAddress[] = {0x08, 0x3A, 0xF2, 0x50, 0xEF, 0x6C};
 // MAC naslov sprejemnika2: 08:3A:F2:50:EF:6D
-uint8_t newMACAddress[] = {0x08, 0x3A, 0xF2, 0x50, 0xEF, 0x6D};
+//uint8_t newMACAddress[] = {0x08, 0x3A, 0xF2, 0x50, 0xEF, 0x6D};
 
 // MAC naslov laptopa (linux sprejemnik)
 //uint8_t newMACAddress[] = { 0x9c, 0xb6, 0xd0, 0xc4, 0xe8, 0xb9 };
diff --git a/utopia.scd b/utopia.scd
index 895a700..ab8faa8 100644
--- a/utopia.scd
+++ b/utopia.scd
@@ -6,10 +6,15 @@
 Quarks.install("https://github.com/cappelnord/OSCRecorder.git");
 
 OSCRecorderGUI();
-
 NetAddr.langPort;
 OSCFunc.trace(true);
 OSCFunc.trace(false);
+
+Platform.userExtensionDir;   // Extensions available only to your user account
+"AHRSensor.sc".resolveRelative.load;
+AHRSensor;
+s.boot;
+
 (
 
 // To send OSC
@@ -231,7 +236,7 @@ AppClock.sched(0, {
  * SOUND! *
  *********/
 
-~e = Env([1, 0.2, 0]);
+~e = Env([1, 1, 0.2]);
 s.boot;
-{[SinOsc.ar(90), SinOsc.ar(122.3)]}.play;// * EnvGen.kr(~e, doneAction: Done.freeSelf)}.play;
+{SinOsc.ar(290) * EnvGen.kr(~e, doneAction: Done.freeSelf)}.play;
 
diff --git a/utopia_mapiranje.scd b/utopia_mapiranje.scd
index 4301d50..f80ea71 100644
--- a/utopia_mapiranje.scd
+++ b/utopia_mapiranje.scd
@@ -9,7 +9,8 @@ NetAddr.langPort;
  **********************************/
 (
 
-~simonIP = "10.42.1.2";
+//~simonIP = "10.42.1.2";
+~simonIP = "192.168.0.171";
 ~oscS = NetAddr.new(~simonIP, 57120);
 OSCFunc.trace(true); // debug osc
 OSCFunc.trace(false); // debug osc