derlole/gimmiCoffee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

soem reworks

Browse Source
This commit is contained in:
derlole
2025-05-13 19:24:06 +00:00
parent ab0448260c
commit 0cc3e7b0c3
5 changed files with 17 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
aaaSonstiges/prog_proj_sw_struct_full.pdf Normal file
View File

Binary file not shown.

BIN
db/commands.db
View File

Binary file not shown.

2
persistence/machine.json
View File

@@ -1,5 +1,5 @@
{ {
"state": "PENDING", "state": "OFF",
"connected": false, "connected": false,
"ready": false, "ready": false,
"peding_command": false, "peding_command": false,

27
routes/esp_routes.py
View File

@@ -13,8 +13,6 @@ 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')
# DB_PATH = os.path.join(os.path.dirname(__file__), '../db/commands.db')
MQTT_BROKER = "localhost" # oder IP/Domain MQTT_BROKER = "localhost" # oder IP/Domain
MQTT_PORT = 1883 MQTT_PORT = 1883
MQTT_TOPIC = "coffee/command" MQTT_TOPIC = "coffee/command"
@@ -36,25 +34,11 @@ def esp_online():
@esp.route('/toggle-machine', methods=['POST']) @esp.route('/toggle-machine', methods=['POST'])
def toggle_machine(): def toggle_machine():
fullCommand = create_toggle_machine() fullCommand = create_toggle_machine()
# randID = random.randint(1000, 9999)
# fullCommand = {'command': 'toggle_machine', 'status': 'pending', 'command_id': randID}
# conn = sqlite3.connect(DB_PATH)
# cursor = conn.cursor()
# cursor.execute("""
# INSERT INTO commands (command, status, command_id)
# VALUES (?, ?, ?)
# """, (fullCommand["command"], fullCommand["status"], fullCommand["command_id"]))
new_status = load_dict("machine") new_status = load_dict("machine")
new_status["state"] = "PENDING" new_status["state"] = "PENDING"
save_dict("machine", new_status) save_dict("machine", new_status)
# resend_static_data()
# conn.commit()
# conn.close()
client = mqtt.Client() client = mqtt.Client()
client.connect(MQTT_BROKER, MQTT_PORT, 60) client.connect(MQTT_BROKER, MQTT_PORT, 60)
@@ -66,18 +50,7 @@ def toggle_machine():
@esp.route('/make_coffee', methods=['POST']) @esp.route('/make_coffee', methods=['POST'])
def make_coffee(): def make_coffee():
fullCommand = create_make_coffee() fullCommand = create_make_coffee()
# randID = random.randint(1000, 9999)
# fullCommand = {'command': 'make_coffee', 'status': 'pending', 'command_id': randID}
# conn = sqlite3.connect(DB_PATH)
# cursor = conn.cursor()
# cursor.execute("""
# INSERT INTO commands (command, status, command_id)
# VALUES (?, ?, ?)
# """, (fullCommand["command"], fullCommand["status"], fullCommand["command_id"]))
# conn.commit()
# conn.close()
client = mqtt.Client() client = mqtt.Client()
client.connect(MQTT_BROKER, MQTT_PORT, 60) client.connect(MQTT_BROKER, MQTT_PORT, 60)
client.publish(MQTT_TOPIC, json.dumps(fullCommand)) client.publish(MQTT_TOPIC, json.dumps(fullCommand))

25
static/script.js
View File

@@ -80,22 +80,29 @@ switch (machine.state) {
} }
// All there // All there
function toggleMachine() { function toggleMachine() {
// if (gebId("machine-status-butt").classList.contains("deniePress")){ if (gebId("machine-status-butt").classList.contains("deniePress")){
// return; return;
// } }
// // console.log("toggleMachine");
// const result = confirm("Möchtest du den Vorgang wirklich ausführen?");
// if (!result) {
// return;
// }
// console.log("toggleMachine"); // console.log("toggleMachine");
const result = confirm("Möchtest du den Vorgang wirklich ausführen?");
if (!result) {
return;
}
console.log("toggleMachine");
fetch('/unsecure/esp/toggle-machine', { method: 'POST' }) fetch('/unsecure/esp/toggle-machine', { method: 'POST' })
.then(res => res.json()) .then(res => res.json())
.then(data => { .then(data => {
console.log(data); console.log(data);
}); });
} }
function makeCoffee(){
console.log("makeCoffee")
fetch('/unsecure/esp/make_coffee', {method: 'POST'})
.then(res => res.json())
.then(data =>{
console.log(data)
})
}
function waterRefill(){ function waterRefill(){
if (gebId("water-fill").parentElement.classList.contains("deniePress")){ if (gebId("water-fill").parentElement.classList.contains("deniePress")){
return; return;