From bf11ced32f46c713256b5793eef0b50cbf976550 Mon Sep 17 00:00:00 2001
From: "yoann.archier" <yoann.archier@hesge.ch>
Date: Thu, 6 Jul 2023 14:54:32 +0200
Subject: [PATCH] Last commit of the Bachelor project web server
---
HapticControl_Webserver/VolumeControl.py | 3 +++
HapticControl_Webserver/main.py | 10 ++++++++--
HapticControl_Webserver/static/css/style.css | 10 ++++++++--
HapticControl_Webserver/static/js/param.js | 5 +++++
HapticControl_Webserver/templates/config.html | 10 +++++++++-
HapticControl_Webserver/templates/index.html | 2 +-
6 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/HapticControl_Webserver/VolumeControl.py b/HapticControl_Webserver/VolumeControl.py
index 5357594..590818b 100644
--- a/HapticControl_Webserver/VolumeControl.py
+++ b/HapticControl_Webserver/VolumeControl.py
@@ -42,8 +42,11 @@ class VolumeControl:
#simulate SPI communication MSB first
for i in range(0, 16):
GPIO.output(MOSI, value & 0x8000)
+ time.sleep(0.0001)
GPIO.output(CLK, 1)
+ time.sleep(0.0005)
GPIO.output(CLK, 0)
+ time.sleep(0.0005)
value <<= 1
GPIO.output(CS, 1)
diff --git a/HapticControl_Webserver/main.py b/HapticControl_Webserver/main.py
index 2f2d828..e19d06e 100644
--- a/HapticControl_Webserver/main.py
+++ b/HapticControl_Webserver/main.py
@@ -68,7 +68,7 @@ def background_thread():
'nbDet': nbDet,
}
socketio.emit("updateSensorData", json.dumps(datasend))
- socketio.sleep(0.2)
+ socketio.sleep(0.15)
"""
Function receive input from client
@@ -122,10 +122,16 @@ def detent(message):
valuePos = nbDet
hapticControl.setPos(valuePos)
+ if scaleBtn < 45:
+ scaleBtn = 45
hapticControl.setMax(nbDet)
hapticControl.setDistDet(math.radians(scaleBtn/nbDet))
-
+@socketio.on('resetPos')
+def resetPos(data):
+ global valuePos
+ valuePos = data
+ hapticControl.setPos(valuePos)
"""
Server root index file
"""
diff --git a/HapticControl_Webserver/static/css/style.css b/HapticControl_Webserver/static/css/style.css
index fbd54f9..76c7760 100644
--- a/HapticControl_Webserver/static/css/style.css
+++ b/HapticControl_Webserver/static/css/style.css
@@ -47,6 +47,12 @@ body {
font-size: 35px;
color: black;
}
+.btn-primary:hover {
+ background-color: #b28958;
+ border-color: #b28958;
+ font-size: 35px;
+ color: white;
+}
.lead {
display: inline-block;
}
@@ -157,14 +163,14 @@ input[type="range"] {
pointer-events: none;
display: inline-flex;
}
-.btn-save {
+.btn-dartzeel {
background-color: #c6c6c6;
border-color: none;
color: black;
font-size: 20px;
width: 75px;
}
-.btn-save:hover {
+.btn-dartzeel:hover {
background-color: #b28958;
border-color: none;
color: white;
diff --git a/HapticControl_Webserver/static/js/param.js b/HapticControl_Webserver/static/js/param.js
index 7e0386e..613c31b 100644
--- a/HapticControl_Webserver/static/js/param.js
+++ b/HapticControl_Webserver/static/js/param.js
@@ -69,6 +69,7 @@ $(document).ready(function () {
if (value > document.getElementById('InputDetent').max){
SliderDetent.value = document.getElementById('InputDetent').max;
}
+ InputDetent.value = SliderDetent.value;
sendDetentParam();
}
@@ -109,6 +110,8 @@ $(document).ready(function () {
const InputStrenghtDet = document.getElementById('InputStrenghtDet');
const InputSnapPoint = document.getElementById('InputSnap');
+ const BtnResetPos = document.getElementById('ResetButton');
+
SliderMin.oninput = () => controlFromSlider(SliderMin, SliderMax, InputMin);
SliderMax.oninput = () => controlToSlider(SliderMin, SliderMax, InputMax);
InputMin.oninput = () => controlFromInput(SliderMin, InputMin, InputMax, SliderMax);
@@ -121,6 +124,8 @@ $(document).ready(function () {
InputStrenghtDet.oninput = () => sendMessage("strenghtDet", InputStrenghtDet);
InputStrenghtEnd.oninput = () => sendMessage("strenghtEnd", InputStrenghtEnd);
InputSnapPoint.oninput = () => sendMessage("snapPoint", InputSnapPoint);
+
+ BtnResetPos.onclick = () => sendMessage("resetPos", 0);
/*
socket io
*/
diff --git a/HapticControl_Webserver/templates/config.html b/HapticControl_Webserver/templates/config.html
index 13ed155..cf23025 100644
--- a/HapticControl_Webserver/templates/config.html
+++ b/HapticControl_Webserver/templates/config.html
@@ -136,10 +136,18 @@
<div class="form_control_container__time lead">
Sauvegarder la configuration :
</div>
- <button type="button" class="btn btn-save right-cell" id="SaveButton" >
+ <button type="button" class="btn btn-dartzeel right-cell" id="SaveButton" >
<i class='bi bi-save2'></i>
</button>
</div>
+ <div class="form_control_container__time form_control">
+ <div class="form_control_container__time lead">
+ Remise à zéro de la position :
+ </div>
+ <button type="button" class="btn btn-dartzeel right-cell" id="ResetButton" >
+ <i class='bi bi-arrow-counterclockwise'></i>
+ </button>
+ </div>
<p></p>
</div>
</div>
diff --git a/HapticControl_Webserver/templates/index.html b/HapticControl_Webserver/templates/index.html
index faa1bae..0941c3d 100644
--- a/HapticControl_Webserver/templates/index.html
+++ b/HapticControl_Webserver/templates/index.html
@@ -53,7 +53,7 @@
<div class="lead" id="Volume" style="display: inline-block;"> Volume : </div>
<div class="number" id="VolumeValue" style="display: inline-block;">0 dB </div>
<!-- add button mute-->
- <button type="button" class="btn btn-primary right-cell" id="MuteButton">
+ <button type="button" class="btn btn-primary btn-primary right-cell" id="MuteButton">
<i class='bi bi-volume-up'></i>
</button>
</div>
--
GitLab