From 31e01015629e543c0e44792e1b9284d0a68ff4af Mon Sep 17 00:00:00 2001
From: Nicklas <145897592+nick7ass@users.noreply.github.com>
Date: Wed, 13 Mar 2024 17:10:54 +0100
Subject: [PATCH] Both Sensors and connection to unity/esp32 working properly
---
.DS_Store | Bin 10244 -> 10244 bytes
Assets/.DS_Store | Bin 16388 -> 16388 bytes
Assets/1OurESP32Scripts/.DS_Store | Bin 8196 -> 8196 bytes
.../TouchServo/TouchServo.ino | 25 +++++++++++-------
Assets/Lowpoly Flowers/.DS_Store | Bin 0 -> 6148 bytes
Assets/Lowpoly Flowers/Materials/blinn1.mat | 2 +-
Assets/Lowpoly Flowers/Materials/blinn2.mat | 2 +-
Assets/OurESP32Scripts/.DS_Store | Bin 0 -> 6148 bytes
Assets/OurESP32Scripts/TouchServo.meta | 8 ++++++
.../OurESP32Scripts/TouchServo/TouchServo.ino | 25 +++++++++++-------
.../TouchServo/TouchServo.ino.meta | 2 +-
Assets/Scenes/MainScene.unity | 14 +++++++++-
12 files changed, 56 insertions(+), 22 deletions(-)
create mode 100644 Assets/Lowpoly Flowers/.DS_Store
create mode 100644 Assets/OurESP32Scripts/.DS_Store
create mode 100644 Assets/OurESP32Scripts/TouchServo.meta
diff --git a/.DS_Store b/.DS_Store
index 719fe77324d89e0b481bba573c7a61123761dcef..b4a49e1a7dfb9ce0ab2e29719bc2160e5309856d 100644
GIT binary patch
delta 324
zcmZn(XbIS$DiGHgyM}>*frUYjA)O(Up(Hoo#U&{xKM5$tk=QA?`QL@3j;Qh}c;yQ+
z41<&Na|?ia7_|2pY;G1f$ift;JK0S%l}XKE@><a>=0%McCp(CVOx6?QVvGJ-vWNNN
zWIHhhHnliK5Hm$gfjKUI!{l}`CuSx_^T}t#q8I}<tBdzDv9(G)S<ifN^B&1POe_pW
z0zQ*#WF*)oo16n_n<XO!WA2iXVrDQpFqvOgcCwWu-()6Pb7n@ap2-5TGLu(H@@!6#
OeZWq+lP0T+-vt2Wq+}xi
delta 327
zcmZn(XbIS$DiBw%wu6CzfrUYjA)O(Up(Hoo#U&{xKM5$t5uaEkeC@(fM^yO~yz&JZ
zhQZ1CxdlKy4BEQ|Ha80#WMPukn(QW;%B1>X@><a>=4CpQCOe3UOx6?QVl&Q~5cBWC
zWIHhh7&ApofjRcrgvsq<PRxu?e@{Lm7R6|=SzWxJiFKnz)%vTGKT4`@ejqu6iG_XT
zHo?g?G7@a}7p?>uGD}7Z#@r<%#mv5H!eo9~*~wOte3O}E&6yegwM`a~m6^Osl4o;@
O>;rbnT{T%<{4M|my>6HQ
diff --git a/Assets/.DS_Store b/Assets/.DS_Store
index 6f1125cf742fad8fe72ba253f565cdfbf5cf85c7..0a25e5821bd7f4b3fbd0d2a5577e5b06f09ee840 100644
GIT binary patch
delta 115
zcmZo^U~Fk%+~B~-bySyufq@l>bteBc^V>Xw(MX7C%KOP@gk@OM(w<KKKUq*jc$0{b
z0F&#a$q$rOChs@q+3cc{%)`Vhuz97yCnhGvqR9@%N+5AoU5%IT|4+VPY{-)PCgtqp
T^TukEwN3aK12$WkoZ<!mkBuk(
delta 116
zcmZo^U~Fk%+~B~-wdOYi0|P4%>rDP@=C^qUqmdBPWR1yZgk@OoB`=TpH(5|bc$0{b
z0F%qp$q$rOChs@q+3cc{%)`X<Ve?9ZPfSc4qLUqrl|bUGF}8~*|C@Zl*bvTAovdxb
M$EdK`%H$L`0N!aRS^xk5
diff --git a/Assets/1OurESP32Scripts/.DS_Store b/Assets/1OurESP32Scripts/.DS_Store
index 7a8b3b135b609386db7f30ef8e9cc648fe5f5382..fe60681308d51e5ea8bab25d2cd461ddd0630546 100644
GIT binary patch
delta 21
ZcmZp1XmQveE6R9ivz+LEb};pf2>?|d2de-8
delta 21
ZcmZp1XmQveE6OOkSx)pnJD7UL1OP}!22lV2
diff --git a/Assets/1OurESP32Scripts/TouchServo/TouchServo.ino b/Assets/1OurESP32Scripts/TouchServo/TouchServo.ino
index 14db969..594df0f 100644
--- a/Assets/1OurESP32Scripts/TouchServo/TouchServo.ino
+++ b/Assets/1OurESP32Scripts/TouchServo/TouchServo.ino
@@ -15,6 +15,7 @@ WebsocketsClient client;
bool touchDetected = false; // Flag to track touch detection
bool touchHandled = false; // Flag to track if touch has been handled
+bool messageHasBeenSent = false;
int touchValue;
@@ -52,21 +53,21 @@ void loop() {
if (msg.data().equalsIgnoreCase("Need Touch")) {
Serial.println("Reading value from touch sensor!");
//touchValue = touchRead(4);
- Serial.println(touchRead(4));
+ //Serial.println(touchRead(4));
- while (touchRead(4) < 14000) {
- if (touchRead(4) >= 14000) {
+ while (touchRead(4) < 40000) {
+ if (touchRead(4) >= 40000) {
Serial.println("Value above threshold");
rotateServo();
- client.send(String(touchRead(4)));
+ client.send(String(40000));
break;
}
}
}
-
+ delay(500);
}
client.close();
}
@@ -76,8 +77,14 @@ void loop() {
void rotateServo() {
// Rotate the servo motor 180 degrees
- for (int posDegrees = 0; posDegrees <= 180; posDegrees++) {
- servo1.write(posDegrees);
- delay(10); // Adjust the delay for smooth rotation
- }
+
+ for (int posDegrees = 0; posDegrees <= 180; posDegrees++) {
+ servo1.write(posDegrees);
+ delay(10); // Adjust the delay for smooth rotation
+ }
+
+ for(int posDegrees = 180; posDegrees >= 0; posDegrees--) {
+ servo1.write(posDegrees);
+ delay(10);
+ }
}
\ No newline at end of file
diff --git a/Assets/Lowpoly Flowers/.DS_Store b/Assets/Lowpoly Flowers/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..759b2fde498a7313633ff9c8a0a25a9d6224059a
GIT binary patch
literal 6148
zcmeHKJ5B>J5S<|@7SW_cqOrsYasVU~EhP=P0E8ew+GryPz3;#ssHnID)SQ5ZgTNcl
z5M_naArwV3lKsY>kG)S?+e1V=dYBH021Hb$39={!k?Epo$DI2>&N=SrmM*BF`{ufk
zXcMPo@4Ix0T`%a0R`x#}U$(QkZu$AJ>@{oadeXELSgV7lm&dR7*W-1b)1~L<+sDz_
zTF?2-%F3LO&czvU2AlzBz!~^c25@JKRC|ivI|I&uGq7Yp&WC^|7!8wRK046l5&$UA
z=q%8smXMfW7!8vmED+XEpoX%Q7_8x#59SvQlcI(bTk*lR@=x)?d3EFu*_}8ldhZN4
z16>AsIvmLTe}Z48Smbv@eB=x`16#%b_v>*z!bjQN`s?%Lt_^7CXd>d5M1er>JOVI~
gb7Vgo)gDBLUo=dLl11ioIM5#gnGo-sfq!7&8^0+tPyhe`
literal 0
HcmV?d00001
diff --git a/Assets/Lowpoly Flowers/Materials/blinn1.mat b/Assets/Lowpoly Flowers/Materials/blinn1.mat
index fece2df..3f5bfc8 100644
--- a/Assets/Lowpoly Flowers/Materials/blinn1.mat
+++ b/Assets/Lowpoly Flowers/Materials/blinn1.mat
@@ -117,7 +117,7 @@ Material:
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.6343293, g: 0.39881203, b: 0.716, a: 1}
- - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 0.6343293, g: 0.398812, b: 0.716, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Lowpoly Flowers/Materials/blinn2.mat b/Assets/Lowpoly Flowers/Materials/blinn2.mat
index 4fb001e..6d9d182 100644
--- a/Assets/Lowpoly Flowers/Materials/blinn2.mat
+++ b/Assets/Lowpoly Flowers/Materials/blinn2.mat
@@ -117,7 +117,7 @@ Material:
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.77464443, g: 0.78431374, b: 0.55363315, a: 1}
- - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 0.77464443, g: 0.78431374, b: 0.55363315, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/OurESP32Scripts/.DS_Store b/Assets/OurESP32Scripts/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..236416ca5620108d2c1c12a1579779c33e0a6cfc
GIT binary patch
literal 6148
zcmeHKOG*Pl5UtXHgKn}BT=o@mgEovO7!M%Hh*=~|2*h>Y!6SGR!KL6?Jb?J>W60pd
zm54|cbieAZPxm~S?k*zY>9(B^jftp26J${aM5YH#NA5fVvgTM&L$|b{d+G)f{lzKS
z`zc*xzgwEq-u{<&lV;wn*0$;D>5$*5tLxdao55b4ytOayug{l<ecPSydGq-2o$q?F
zzkWi>kYFGf2nK?IVBkj>z@05pof$?S3<Lwgz>Wbq9}=2ib}WW^bfD7`04UFB73fk+
zNKA6fj>Qlb2wN!7LfK0Uws6cR_sfpO(87szW#sXdKZ_UE)iIycoj4mt9}ENoeFlzg
zIF|eW3ct)?k>3xAQ7{k;{4)l4R5$e$ALV!Jm(P>CHlf|1iHKhj1p>YI2*5zjkqb4N
bJ&6v#>{tvXi_B{{FdhO*NOZx#FEH={kWn+>
literal 0
HcmV?d00001
diff --git a/Assets/OurESP32Scripts/TouchServo.meta b/Assets/OurESP32Scripts/TouchServo.meta
new file mode 100644
index 0000000..fafbb8f
--- /dev/null
+++ b/Assets/OurESP32Scripts/TouchServo.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 391343d09cc454bf881e4464a3eeea0b
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/OurESP32Scripts/TouchServo/TouchServo.ino b/Assets/OurESP32Scripts/TouchServo/TouchServo.ino
index 14db969..594df0f 100644
--- a/Assets/OurESP32Scripts/TouchServo/TouchServo.ino
+++ b/Assets/OurESP32Scripts/TouchServo/TouchServo.ino
@@ -15,6 +15,7 @@ WebsocketsClient client;
bool touchDetected = false; // Flag to track touch detection
bool touchHandled = false; // Flag to track if touch has been handled
+bool messageHasBeenSent = false;
int touchValue;
@@ -52,21 +53,21 @@ void loop() {
if (msg.data().equalsIgnoreCase("Need Touch")) {
Serial.println("Reading value from touch sensor!");
//touchValue = touchRead(4);
- Serial.println(touchRead(4));
+ //Serial.println(touchRead(4));
- while (touchRead(4) < 14000) {
- if (touchRead(4) >= 14000) {
+ while (touchRead(4) < 40000) {
+ if (touchRead(4) >= 40000) {
Serial.println("Value above threshold");
rotateServo();
- client.send(String(touchRead(4)));
+ client.send(String(40000));
break;
}
}
}
-
+ delay(500);
}
client.close();
}
@@ -76,8 +77,14 @@ void loop() {
void rotateServo() {
// Rotate the servo motor 180 degrees
- for (int posDegrees = 0; posDegrees <= 180; posDegrees++) {
- servo1.write(posDegrees);
- delay(10); // Adjust the delay for smooth rotation
- }
+
+ for (int posDegrees = 0; posDegrees <= 180; posDegrees++) {
+ servo1.write(posDegrees);
+ delay(10); // Adjust the delay for smooth rotation
+ }
+
+ for(int posDegrees = 180; posDegrees >= 0; posDegrees--) {
+ servo1.write(posDegrees);
+ delay(10);
+ }
}
\ No newline at end of file
diff --git a/Assets/OurESP32Scripts/TouchServo/TouchServo.ino.meta b/Assets/OurESP32Scripts/TouchServo/TouchServo.ino.meta
index 2d206ab..51aea02 100644
--- a/Assets/OurESP32Scripts/TouchServo/TouchServo.ino.meta
+++ b/Assets/OurESP32Scripts/TouchServo/TouchServo.ino.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 4ea5e337c5c484077bd7704cb81b5270
+guid: 310824fe30798457f9bad04704b994bc
DefaultImporter:
externalObjects: {}
userData:
diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity
index ed29de0..7deaff0 100644
--- a/Assets/Scenes/MainScene.unity
+++ b/Assets/Scenes/MainScene.unity
@@ -4599,7 +4599,7 @@ Transform:
m_GameObject: {fileID: 297646202}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 6.388697, y: -2.6683073, z: -2.4067612}
+ m_LocalPosition: {x: 6.388697, y: -2.32, z: -2.4067612}
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_ConstrainProportionsScale: 1
m_Children:
@@ -4672,6 +4672,18 @@ MonoBehaviour:
_whenSelect:
m_PersistentCalls:
m_Calls:
+ - m_Target: {fileID: 1293977771}
+ m_TargetAssemblyTypeName: Oculus.Interaction.AudioTrigger, Oculus.Interaction.OVR.Samples
+ m_MethodName: PlayAudio
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
- m_Target: {fileID: 1726060523}
m_TargetAssemblyTypeName: BoundWaterScript, Assembly-CSharp
m_MethodName: stationCompleted