From 62d74f6f556ef65854f188e93b1666fea463653e Mon Sep 17 00:00:00 2001 From: derlole <122916573+derlole@users.noreply.github.com> Date: Tue, 13 May 2025 23:01:38 +0000 Subject: [PATCH] manage imports --- modules/db.py | 2 +- modules/other.py | 18 +++--------------- modules/socketio.py | 2 +- routes/esp_routes.py | 7 +++---- 4 files changed, 8 insertions(+), 21 deletions(-) diff --git a/modules/db.py b/modules/db.py index 766d7c9..0ad61c5 100644 --- a/modules/db.py +++ b/modules/db.py @@ -1,6 +1,5 @@ import sqlite3 import os -from datetime import datetime, timedelta from modules.socketio import resend_static_data import random @@ -42,6 +41,7 @@ def get_coffees(): conn.close() return coffees + def create_toggle_machine(): randID = random.randint(1000, 9999) fullCommand = {'command': 'toggle_machine', 'status': 'pending', 'command_id': randID} diff --git a/modules/other.py b/modules/other.py index d784625..ca4f071 100644 --- a/modules/other.py +++ b/modules/other.py @@ -7,11 +7,11 @@ # "fehler": [1/0], # "bohnen_voll": [1/0], # "Wasser_voll": [1/0], -# + # # ausgänge # "einschalten": [0/1], # "starten": [0/1], -# + # # status # "kaffee_machen": [0/1], # "vorbereitung": [0/1], @@ -21,10 +21,6 @@ from modules.persistence import load_dict, save_dict from modules.socketio import resend_static_data from modules.db import create_coffee_entry -import os -import sqlite3 - -# DB_PATH_COFFEE = os.path.join(os.path.dirname(__file__), '../db/coffee.db') def track_coffee_made(data, flanksUp, flanksDown): coffee_made = False @@ -32,15 +28,7 @@ def track_coffee_made(data, flanksUp, flanksDown): if coffee_made: create_coffee_entry() - #change to insert coffee at modules.db - # conn = sqlite3.connect(DB_PATH_COFFEE) - # cursor = conn.cursor() - # cursor.execute(""" - # INSERT INTO coffee (user, status) - # VALUES (?, ?) - # """, ("admin", "served")) - # conn.commit() - # conn.close() + print("Coffee made detected, data saved.") # update water fill and beans fill and coffeeOn water and beans return diff --git a/modules/socketio.py b/modules/socketio.py index d4f5e1a..7c9bebc 100644 --- a/modules/socketio.py +++ b/modules/socketio.py @@ -1,4 +1,4 @@ -# extensions.py + from flask_socketio import SocketIO from modules.persistence import esp_conn_infos,load_dict, save_dict from datetime import datetime diff --git a/routes/esp_routes.py b/routes/esp_routes.py index 44b97a9..9d5d67d 100644 --- a/routes/esp_routes.py +++ b/routes/esp_routes.py @@ -1,19 +1,18 @@ -from flask import Blueprint, render_template, request, jsonify -from flask import Flask, jsonify, request +from flask import Blueprint, request, jsonify import paho.mqtt.client as mqtt import json import random import sqlite3 import os from modules.persistence import esp_conn_infos -from datetime import datetime, timedelta +from datetime import datetime from modules.socketio import resend_static_data from modules.persistence import load_dict, save_dict from modules.db import create_toggle_machine, create_make_coffee esp = Blueprint('eps', __name__, url_prefix='/unsecure/esp') -MQTT_BROKER = "localhost" # oder IP/Domain +MQTT_BROKER = "localhost" MQTT_PORT = 1883 MQTT_TOPIC = "coffee/command"