From 24dfd16b228dab1e0780cddd07f0d06c75caec1e Mon Sep 17 00:00:00 2001 From: Tower Date: Thu, 16 Apr 2026 17:50:30 +0200 Subject: [PATCH] fixes --- librarys.bat | 1 + raspi/.env | 8 ++++---- raspi/docker-compose.yml | 2 +- raspi/requirements.txt | 2 +- upload.sh | 35 ----------------------------------- 5 files changed, 7 insertions(+), 41 deletions(-) create mode 100644 librarys.bat delete mode 100644 upload.sh diff --git a/librarys.bat b/librarys.bat new file mode 100644 index 0000000..10eb112 --- /dev/null +++ b/librarys.bat @@ -0,0 +1 @@ +xcopy ".\librarys\*" "%HOMEDRIVE%%HOMEPATH%\Documents\Arduino\libraries\" /E /I /Y \ No newline at end of file diff --git a/raspi/.env b/raspi/.env index ab56e9b..3d9a6fa 100644 --- a/raspi/.env +++ b/raspi/.env @@ -2,11 +2,11 @@ SERIAL_PORT=/dev/ttyUSB0 # Externer MySQL-Server -DB_HOST=192.168.1.100 +DB_HOST=10.233.1.244 DB_PORT=3306 -DB_USER=heizung -DB_PASSWORD=heizung_pw -DB_NAME=heizung +DB_USER=worker +DB_PASSWORD=bBHofurUJWKzPE8Z +DB_NAME=HEIZUNG # Wie oft Messwerte in die DB geschrieben werden (Sekunden) DB_WRITE_INTERVAL=60 diff --git a/raspi/docker-compose.yml b/raspi/docker-compose.yml index d971347..6eab533 100644 --- a/raspi/docker-compose.yml +++ b/raspi/docker-compose.yml @@ -10,7 +10,7 @@ services: # Serial-Port zum Arduino durchreichen # Falls /dev/ttyACM0 genutzt wird: beide Zeilen anpassen devices: - - /dev/ttyUSB0:/dev/ttyUSB0 + - /dev/ttyACM0:/dev/ttyACM0 # Privileged-Modus damit der Container auf das Serial-Device zugreifen kann # Alternativ: group_add mit der dialout-GID (auf Raspi OS meist 20) diff --git a/raspi/requirements.txt b/raspi/requirements.txt index 547163c..a88b2e0 100644 --- a/raspi/requirements.txt +++ b/raspi/requirements.txt @@ -1,4 +1,4 @@ flask>=3.0 pyserial>=3.5 # PyMySQL ist optional – nur benötigt wenn DB_HOST gesetzt ist -# PyMySQL>=1.1 +PyMySQL>=1.1 diff --git a/upload.sh b/upload.sh deleted file mode 100644 index e2d7ab7..0000000 --- a/upload.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -set -e # Script bricht bei Fehlern sofort ab - -PORT="/dev/ttyACM0" -FQBN="arduino:avr:mega" - -echo "==> Prüfe angeschlossene Boards" -arduino-cli board list - -echo "==> Installiere benötigte Libraries" -LIBS=( - "OneWire" - "DallasTemperature" - "RTClib" - "LiquidCrystal" - "max6675" - "ArduinoJson" -) - -for LIB in "${LIBS[@]}"; do - echo "Installiere $LIB..." - arduino-cli lib install "$LIB" -done - -echo "==> Installierte Libraries:" -arduino-cli lib list - -echo "==> Kompiliere Sketch" -arduino-cli compile --fqbn "$FQBN" . --warnings all - -echo "==> Lade Sketch hoch auf $PORT" -arduino-cli upload -p "$PORT" --fqbn "$FQBN" . - -echo "==> Fertig!" \ No newline at end of file