tilman/smart-home
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lotsa changes

Browse Source
This commit is contained in:
Tilman
2023-10-02 19:34:12 +02:00
parent ef21ad3cf1
commit ca16024a30
7 changed files with 2200 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doorbell/klingel_sender_nano_serial/doorbell.py
+2 -1
View File
@@ -38,7 +38,8 @@ while True:
"Authorization": "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJjYjY5NjA5NmY0N2E0NmZlOGEzYjczOGYzYmUzOTk5ZSIsImlhdCI6MTY2MTM0NDgxOSwiZXhwIjoxOTc2NzA0ODE5fQ.z9fzbVOA1Pbur3Zb07481n-SoYesj8cetw-CX6WPmTs" "Authorization": "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJjYjY5NjA5NmY0N2E0NmZlOGEzYjczOGYzYmUzOTk5ZSIsImlhdCI6MTY2MTM0NDgxOSwiZXhwIjoxOTc2NzA0ODE5fQ.z9fzbVOA1Pbur3Zb07481n-SoYesj8cetw-CX6WPmTs"
} }
data = json.dumps({'payload': 'RING', 'topic': 'lewe/doorbell', 'retain': 'False'}).encode('utf8') data = json.dumps({'payload': 'RING', 'topic': 'lewe/doorbell', 'retain': 'False'}).encode('utf8')
reqest = urllib.request.Request("https://www.nodebucket.de:8123/api/services/mqtt/publish", data, headers) request = urllib.request.Request("localhost:8123/api/services/mqtt/publish", data, headers)
# request = urllib.request.Request("https://www.nodebucket.de:8123/api/services/mqtt/publish", data, headers)
response = urllib.request.urlopen(reqest) response = urllib.request.urlopen(reqest)
except Exception: except Exception:
logger.error("Could not ring doorbell") logger.error("Could not ring doorbell")
doorbell/klingel_sender_nano_serial/klingel_sender_nano_serial.ino
+1 -1
View File
@@ -13,7 +13,7 @@
const int ledPin = LED_BUILTIN; const int ledPin = LED_BUILTIN;
const int buttonPin = 2; // Button connected to D2 const int buttonPin = 2; // Button connected to D2
const int flare_threshold = 20; const int flare_threshold = 120;
bool active = false; bool active = false;
garage/Buttons.svg
+2094 -4
View File
File diff suppressed because it is too large Load Diff
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 202 KiB

After

Width:  |  Height:  |  Size: 291 KiB

garage/Garage_-_RasPi.fzz
BIN
View File
Binary file not shown.
garage/garage_esp32/garage_esp32.fzz
BIN
View File
Binary file not shown.
garage/garage_esp32/garage_esp32.ino
+61 -63
View File
@@ -1,8 +1,8 @@
/* /*
* Sources: Sources:
* https://randomnerdtutorials.com/esp32-esp8266-web-server-physical-button/ https://randomnerdtutorials.com/esp32-esp8266-web-server-physical-button/
* https://randomnerdtutorials.com/esp32-pushover-notifications-arduino/ https://randomnerdtutorials.com/esp32-pushover-notifications-arduino/
*/ */
#include <WiFi.h> #include <WiFi.h>
#include <AsyncTCP.h> #include <AsyncTCP.h>
@@ -19,27 +19,27 @@ const char* userToken = "ukja84pd2n2cmxvdrnfwdrf8eo1wc5";
const char* pushoverApiEndpoint = "https://api.pushover.net/1/messages.json"; const char* pushoverApiEndpoint = "https://api.pushover.net/1/messages.json";
const char *PUSHOVER_ROOT_CA = "-----BEGIN CERTIFICATE-----\n" const char *PUSHOVER_ROOT_CA = "-----BEGIN CERTIFICATE-----\n"
"MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh\n" "MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh\n"
"MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3\n" "MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3\n"
"d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD\n" "d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD\n"
"QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT\n" "QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT\n"
"MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j\n" "MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j\n"
"b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG\n" "b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG\n"
"9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB\n" "9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB\n"
"CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97\n" "CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97\n"
"nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt\n" "nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt\n"
"43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P\n" "43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P\n"
"T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4\n" "T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4\n"
"gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO\n" "gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO\n"
"BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR\n" "BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR\n"
"TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw\n" "TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw\n"
"DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr\n" "DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr\n"
"hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg\n" "hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg\n"
"06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF\n" "06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF\n"
"PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls\n" "PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls\n"
"YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk\n" "YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk\n"
"CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=\n" "CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=\n"
"-----END CERTIFICATE-----\n"; "-----END CERTIFICATE-----\n";
const int PIN_LED = 2; // esp32 dev board integrated LED const int PIN_LED = 2; // esp32 dev board integrated LED
@@ -50,7 +50,7 @@ const int PIN_GARAGE = 22; // relais pin for garage door
const int PIN_GATE = 23; // relais pin for gate const int PIN_GATE = 23; // relais pin for gate
const int PIN_DOOR_OPEN = 18; // sensor pin for garage door in position 'open' const int PIN_DOOR_OPEN = 18; // sensor pin for garage door in position 'open'
const int PIN_DOOR_CLOSED = 19; // sensor pin for garage door in position 'closed' const int PIN_DOOR_CLOSED = 19; // sensor pin for garage door in position 'closed'
const int PIN_SENSOR_GATE= 21; // sensor pin for gate (HIGH is open) const int PIN_SENSOR_GATE = 21; // sensor pin for gate (HIGH is open)
const int PIN_SPRINKLER1 = 25; // relais pin for sprinkler 1 const int PIN_SPRINKLER1 = 25; // relais pin for sprinkler 1
const int PIN_SPRINKLER2 = 33; // relais pin for sprinkler 2 const int PIN_SPRINKLER2 = 33; // relais pin for sprinkler 2
const int PIN_SPRINKLER3 = 32; // relais pin for sprinkler 3 const int PIN_SPRINKLER3 = 32; // relais pin for sprinkler 3
@@ -104,28 +104,28 @@ void notFound(AsyncWebServerRequest *request) {
void pinStatus(AsyncWebServerRequest *request) { void pinStatus(AsyncWebServerRequest *request) {
String status = "esp32garage\n\nPIN_LED (" + String(PIN_LED) + ") = " + String(digitalRead(PIN_LED)) + "\n" + String status = "esp32garage\n\nPIN_LED (" + String(PIN_LED) + ") = " + String(digitalRead(PIN_LED)) + "\n" +
"PIN_GARAGE_BUTTON (" + String(PIN_GARAGE_BUTTON) + ") = " + String(digitalRead(PIN_GARAGE_BUTTON)) + "\n" + "PIN_GARAGE_BUTTON (" + String(PIN_GARAGE_BUTTON) + ") = " + String(digitalRead(PIN_GARAGE_BUTTON)) + "\n" +
"PIN_GATE_BUTTON (" + String(PIN_GATE_BUTTON) + ") = " + String(digitalRead(PIN_GATE_BUTTON)) + "\n" + "PIN_GATE_BUTTON (" + String(PIN_GATE_BUTTON) + ") = " + String(digitalRead(PIN_GATE_BUTTON)) + "\n" +
"PIN_MOWER_ACTIVE (" + String(PIN_MOWER_ACTIVE) + ") = " + String(digitalRead(PIN_MOWER_ACTIVE)) + "\n" + "PIN_MOWER_ACTIVE (" + String(PIN_MOWER_ACTIVE) + ") = " + String(digitalRead(PIN_MOWER_ACTIVE)) + "\n" +
"PIN_GARAGE (" + String(PIN_GARAGE) + ") = " + String(digitalRead(PIN_GARAGE)) + "\n" + "PIN_GARAGE (" + String(PIN_GARAGE) + ") = " + String(digitalRead(PIN_GARAGE)) + "\n" +
"PIN_GATE (" + String(PIN_GATE) + ") = " + String(digitalRead(PIN_GATE)) + "\n" + "PIN_GATE (" + String(PIN_GATE) + ") = " + String(digitalRead(PIN_GATE)) + "\n" +
"PIN_DOOR_OPEN (" + String(PIN_DOOR_OPEN) + ") = " + String(digitalRead(PIN_DOOR_OPEN)) + "\n" + "PIN_DOOR_OPEN (" + String(PIN_DOOR_OPEN) + ") = " + String(digitalRead(PIN_DOOR_OPEN)) + "\n" +
"PIN_DOOR_CLOSED (" + String(PIN_DOOR_CLOSED) + ") = " + String(digitalRead(PIN_DOOR_CLOSED)) + "\n" + "PIN_DOOR_CLOSED (" + String(PIN_DOOR_CLOSED) + ") = " + String(digitalRead(PIN_DOOR_CLOSED)) + "\n" +
"PIN_SENSOR_GATE (" + String(PIN_SENSOR_GATE) + ") = " + String(digitalRead(PIN_SENSOR_GATE)) + "\n" + "PIN_SENSOR_GATE (" + String(PIN_SENSOR_GATE) + ") = " + String(digitalRead(PIN_SENSOR_GATE)) + "\n" +
"PIN_SPRINKLER1 (" + String(PIN_SPRINKLER1) + ") = " + String(digitalRead(PIN_SPRINKLER1)) + "\n" + "PIN_SPRINKLER1 (" + String(PIN_SPRINKLER1) + ") = " + String(digitalRead(PIN_SPRINKLER1)) + "\n" +
"PIN_SPRINKLER2 (" + String(PIN_SPRINKLER2) + ") = " + String(digitalRead(PIN_SPRINKLER2)) + "\n" + "PIN_SPRINKLER2 (" + String(PIN_SPRINKLER2) + ") = " + String(digitalRead(PIN_SPRINKLER2)) + "\n" +
"PIN_SPRINKLER3 (" + String(PIN_SPRINKLER3) + ") = " + String(digitalRead(PIN_SPRINKLER3)) + "\n" + "PIN_SPRINKLER3 (" + String(PIN_SPRINKLER3) + ") = " + String(digitalRead(PIN_SPRINKLER3)) + "\n" +
"PIN_SPRINKLER4 (" + String(PIN_SPRINKLER4) + ") = " + String(digitalRead(PIN_SPRINKLER4)) + "\n" + "PIN_SPRINKLER4 (" + String(PIN_SPRINKLER4) + ") = " + String(digitalRead(PIN_SPRINKLER4)) + "\n" +
"PIN_MOISTURE_ANALOG (" + String(PIN_MOISTURE_ANALOG) + ") = " + String(analogRead(PIN_MOISTURE_ANALOG)) + "\n" + "PIN_MOISTURE_ANALOG (" + String(PIN_MOISTURE_ANALOG) + ") = " + String(analogRead(PIN_MOISTURE_ANALOG)) + "\n" +
"PIN_MOISTURE_DIGITAL (" + String(PIN_MOISTURE_DIGITAL) + ") = " + String(digitalRead(PIN_MOISTURE_DIGITAL)) + "\n\n" + "PIN_MOISTURE_DIGITAL (" + String(PIN_MOISTURE_DIGITAL) + ") = " + String(digitalRead(PIN_MOISTURE_DIGITAL)) + "\n\n" +
"programStatus = " + String(programStatus) + "\n" + "programStatus = " + String(programStatus) + "\n" +
"sprinklerDuration = " + String(sprinklerDuration) + "\n" + "sprinklerDuration = " + String(sprinklerDuration) + "\n" +
"sprinklerStartMillis = " + String(sprinklerStartMillis) + "\n\n" + "sprinklerStartMillis = " + String(sprinklerStartMillis) + "\n\n" +
"/ \n" + "/ \n" +
"/garage[?action=(open|close)] \n" + "/garage[?action=(open|close)] \n" +
"/gate[?action=(open|close)] \n" + "/gate[?action=(open|close)] \n" +
"/sprinkler[?action=(stop|(start&device={int}&duration={int}))] \n" + "/sprinkler[?action=(stop|(start&device={int}&duration={int}))] \n" +
"/sprinkler/program[?action=(stop|(start&duration={int}))] \n"; "/sprinkler/program[?action=(stop|(start&duration={int}))] \n";
request->send(200, "text/plain", status); request->send(200, "text/plain", status);
} }
@@ -282,11 +282,11 @@ void setup() {
WiFi.setAutoReconnect(true); WiFi.setAutoReconnect(true);
WiFi.persistent(true); WiFi.persistent(true);
server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){ server.on("/", HTTP_GET, [](AsyncWebServerRequest * request) {
pinStatus(request); pinStatus(request);
}); });
server.on("/garage", HTTP_GET, [] (AsyncWebServerRequest *request) { server.on("/garage", HTTP_GET, [] (AsyncWebServerRequest * request) {
String action; String action;
if (request->hasParam("action")) { if (request->hasParam("action")) {
action = request->getParam("action")->value(); action = request->getParam("action")->value();
@@ -313,7 +313,7 @@ void setup() {
} }
}); });
server.on("/gate", HTTP_GET, [] (AsyncWebServerRequest *request) { server.on("/gate", HTTP_GET, [] (AsyncWebServerRequest * request) {
String action; String action;
if (request->hasParam("action")) { if (request->hasParam("action")) {
action = request->getParam("action")->value(); action = request->getParam("action")->value();
@@ -340,7 +340,7 @@ void setup() {
} }
}); });
server.on("/sprinkler", HTTP_GET, [] (AsyncWebServerRequest *request) { server.on("/sprinkler", HTTP_GET, [] (AsyncWebServerRequest * request) {
String action; String action;
if (request->hasParam("action")) { if (request->hasParam("action")) {
action = request->getParam("action")->value(); action = request->getParam("action")->value();
@@ -377,30 +377,23 @@ void setup() {
} }
} }
else { else {
stopSprinklers(); stopSprinklers();
request->send(200, "application/json", "{ \"action\": \"stop\" }"); request->send(200, "application/json", "{ \"action\": \"stop\" }");
} }
}); });
server.on("/irrigation", HTTP_GET, [] (AsyncWebServerRequest *request) { server.on("/irrigation", HTTP_GET, [] (AsyncWebServerRequest * request) {
String action; String action;
if (request->hasParam("action")) { if (request->hasParam("action")) {
Serial.println("action");
action = request->getParam("action")->value(); action = request->getParam("action")->value();
Serial.println(action.equals("start"));
Serial.println(request->hasParam("duration"));
if (action.equals("start") and request->hasParam("duration")) { if (action.equals("start") and request->hasParam("duration")) {
String duration = request->getParam("duration")->value(); String duration = request->getParam("duration")->value();
sprinklerDuration = duration.toInt(); sprinklerDuration = duration.toInt();
sprinklerDuration = sprinklerDuration * 60 * 1000; sprinklerDuration = sprinklerDuration * 60 * 500; // XXX Terrasse nur halb so lange bewässern
sprinklerStartMillis = millis(); sprinklerStartMillis = millis();
programStatus = 4; programStatus = 4;
digitalWrite(PIN_SPRINKLER4, LOW); digitalWrite(PIN_SPRINKLER4, LOW);
sprinklerStartMillis = sprinklerStartMillis + ((sprinklerDuration / 2) * 60 * 1000); // XXX Terrasse nur halb so lange bewässern
request->send(200, "application/json", "{ \"action\": \"start\" }"); request->send(200, "application/json", "{ \"action\": \"start\" }");
} }
else { else {
@@ -436,6 +429,11 @@ void loop() {
if ((sprinklerDuration > 0) and ((millis() - sprinklerStartMillis) > sprinklerDuration)) { if ((sprinklerDuration > 0) and ((millis() - sprinklerStartMillis) > sprinklerDuration)) {
stopSprinklers(); stopSprinklers();
if (programStatus > 0) { if (programStatus > 0) {
if (programStatus == 4) {
sprinklerDuration = sprinklerDuration * 2; // XXX Terrasse nur halb so lange bewässern
}
programStatus--; programStatus--;
sprinklerStartMillis = millis(); sprinklerStartMillis = millis();
irrigation/irrigation.ino
+18
View File
@@ -0,0 +1,18 @@
/*
* Soil moisture sensor on Wemos D1
*/
// the analog input on the Wemos D1 accepts up to 3.3V
const int analogPin = A2;
int val = 0;
void setup() {
Serial.begin(9600);
Serial.println("Starting moisture measurement");
}
void loop() {
val = analogRead(analogPin);
Serial.println(val);
delay(1000);
}