manage imports
This commit is contained in:
@@ -1,6 +1,5 @@
|
|||||||
import sqlite3
|
import sqlite3
|
||||||
import os
|
import os
|
||||||
from datetime import datetime, timedelta
|
|
||||||
from modules.socketio import resend_static_data
|
from modules.socketio import resend_static_data
|
||||||
import random
|
import random
|
||||||
|
|
||||||
@@ -42,6 +41,7 @@ def get_coffees():
|
|||||||
|
|
||||||
conn.close()
|
conn.close()
|
||||||
return coffees
|
return coffees
|
||||||
|
|
||||||
def create_toggle_machine():
|
def create_toggle_machine():
|
||||||
randID = random.randint(1000, 9999)
|
randID = random.randint(1000, 9999)
|
||||||
fullCommand = {'command': 'toggle_machine', 'status': 'pending', 'command_id': randID}
|
fullCommand = {'command': 'toggle_machine', 'status': 'pending', 'command_id': randID}
|
||||||
|
|||||||
@@ -7,11 +7,11 @@
|
|||||||
# "fehler": [1/0],
|
# "fehler": [1/0],
|
||||||
# "bohnen_voll": [1/0],
|
# "bohnen_voll": [1/0],
|
||||||
# "Wasser_voll": [1/0],
|
# "Wasser_voll": [1/0],
|
||||||
#
|
|
||||||
# # ausgänge
|
# # ausgänge
|
||||||
# "einschalten": [0/1],
|
# "einschalten": [0/1],
|
||||||
# "starten": [0/1],
|
# "starten": [0/1],
|
||||||
#
|
|
||||||
# # status
|
# # status
|
||||||
# "kaffee_machen": [0/1],
|
# "kaffee_machen": [0/1],
|
||||||
# "vorbereitung": [0/1],
|
# "vorbereitung": [0/1],
|
||||||
@@ -21,10 +21,6 @@
|
|||||||
from modules.persistence import load_dict, save_dict
|
from modules.persistence import load_dict, save_dict
|
||||||
from modules.socketio import resend_static_data
|
from modules.socketio import resend_static_data
|
||||||
from modules.db import create_coffee_entry
|
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):
|
def track_coffee_made(data, flanksUp, flanksDown):
|
||||||
coffee_made = False
|
coffee_made = False
|
||||||
@@ -32,15 +28,7 @@ def track_coffee_made(data, flanksUp, flanksDown):
|
|||||||
|
|
||||||
if coffee_made:
|
if coffee_made:
|
||||||
create_coffee_entry()
|
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.")
|
print("Coffee made detected, data saved.")
|
||||||
# update water fill and beans fill and coffeeOn water and beans
|
# update water fill and beans fill and coffeeOn water and beans
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# extensions.py
|
|
||||||
from flask_socketio import SocketIO
|
from flask_socketio import SocketIO
|
||||||
from modules.persistence import esp_conn_infos,load_dict, save_dict
|
from modules.persistence import esp_conn_infos,load_dict, save_dict
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|||||||
@@ -1,19 +1,18 @@
|
|||||||
from flask import Blueprint, render_template, request, jsonify
|
from flask import Blueprint, request, jsonify
|
||||||
from flask import Flask, jsonify, request
|
|
||||||
import paho.mqtt.client as mqtt
|
import paho.mqtt.client as mqtt
|
||||||
import json
|
import json
|
||||||
import random
|
import random
|
||||||
import sqlite3
|
import sqlite3
|
||||||
import os
|
import os
|
||||||
from modules.persistence import esp_conn_infos
|
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.socketio import resend_static_data
|
||||||
from modules.persistence import load_dict, save_dict
|
from modules.persistence import load_dict, save_dict
|
||||||
from modules.db import create_toggle_machine, create_make_coffee
|
from modules.db import create_toggle_machine, create_make_coffee
|
||||||
|
|
||||||
esp = Blueprint('eps', __name__, url_prefix='/unsecure/esp')
|
esp = Blueprint('eps', __name__, url_prefix='/unsecure/esp')
|
||||||
|
|
||||||
MQTT_BROKER = "localhost" # oder IP/Domain
|
MQTT_BROKER = "localhost"
|
||||||
MQTT_PORT = 1883
|
MQTT_PORT = 1883
|
||||||
MQTT_TOPIC = "coffee/command"
|
MQTT_TOPIC = "coffee/command"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user