rollback
Browse files- server.py +4 -40
- static/sinus-io.js +1 -1
server.py
CHANGED
|
@@ -1,25 +1,10 @@
|
|
| 1 |
-
|
| 2 |
|
| 3 |
-
|
| 4 |
-
import eventlet
|
| 5 |
-
|
| 6 |
-
eventlet.monkey_patch()
|
| 7 |
-
|
| 8 |
-
# 2️⃣ Now import everything else
|
| 9 |
-
from flask import Flask, request, send_from_directory
|
| 10 |
-
from flask_cors import CORS
|
| 11 |
-
from flask_socketio import SocketIO
|
| 12 |
-
|
| 13 |
-
# 3️⃣ Create app as before
|
| 14 |
-
app = Flask(__name__, static_folder="static", static_url_path="/static")
|
| 15 |
-
CORS(app)
|
| 16 |
-
socketio = SocketIO(app, cors_allowed_origins="*")
|
| 17 |
-
|
| 18 |
-
motor_states = {f"motor_{i}": 0.0 for i in range(6)}
|
| 19 |
|
| 20 |
|
| 21 |
@app.route("/")
|
| 22 |
-
def
|
| 23 |
return send_from_directory("static", "index.html")
|
| 24 |
|
| 25 |
|
|
@@ -28,26 +13,5 @@ def sinus():
|
|
| 28 |
return send_from_directory("static", "sinus.html")
|
| 29 |
|
| 30 |
|
| 31 |
-
@app.route("/motor_control", methods=["POST"])
|
| 32 |
-
def http_control():
|
| 33 |
-
data = request.json or {}
|
| 34 |
-
motor_states.update(data)
|
| 35 |
-
print("HTTP POST:", data)
|
| 36 |
-
return {"status": "ok", "motor_states": motor_states}
|
| 37 |
-
|
| 38 |
-
|
| 39 |
-
@socketio.on("connect")
|
| 40 |
-
def on_connect():
|
| 41 |
-
print("Client connected")
|
| 42 |
-
|
| 43 |
-
|
| 44 |
-
@socketio.on("motor_control")
|
| 45 |
-
def on_ws_control(data):
|
| 46 |
-
motor_states.update(data)
|
| 47 |
-
print("WS:", data)
|
| 48 |
-
socketio.emit("motor_states", motor_states)
|
| 49 |
-
|
| 50 |
-
|
| 51 |
if __name__ == "__main__":
|
| 52 |
-
|
| 53 |
-
socketio.run(app, host="0.0.0.0", port=7860)
|
|
|
|
| 1 |
+
from flask import Flask, send_from_directory
|
| 2 |
|
| 3 |
+
app = Flask(__name__, static_url_path="", static_folder="static")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 4 |
|
| 5 |
|
| 6 |
@app.route("/")
|
| 7 |
+
def root():
|
| 8 |
return send_from_directory("static", "index.html")
|
| 9 |
|
| 10 |
|
|
|
|
| 13 |
return send_from_directory("static", "sinus.html")
|
| 14 |
|
| 15 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 16 |
if __name__ == "__main__":
|
| 17 |
+
app.run(host="0.0.0.0", port=7860)
|
|
|
static/sinus-io.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
| 1 |
window.onload = () => {
|
| 2 |
-
const socket = io();
|
| 3 |
let connected = false;
|
| 4 |
|
| 5 |
socket.on("connect", () => {
|
|
|
|
| 1 |
window.onload = () => {
|
| 2 |
+
const socket = io("127.0.0.1:5001");
|
| 3 |
let connected = false;
|
| 4 |
|
| 5 |
socket.on("connect", () => {
|