lexa/AHome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Door sens adapted

Browse Source
This commit is contained in:
lexa
2022-06-14 15:09:39 +03:00
parent 78063175ca
commit c2442ca3ee
6 changed files with 137 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ESP_Kor/.vscode/extensions.json vendored
View File

@@ -1,7 +1,10 @@
{ {
// See http://go.microsoft.com/fwlink/?LinkId=827846 // See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format // for the documentation about the extensions.json format
"recommendations": [ "recommendations": [
"platformio.platformio-ide" "platformio.platformio-ide"
] ],
} "unwantedRecommendations": [
"ms-vscode.cpptools-extension-pack"
]
}

17
MainDoor/.vscode/extensions.json vendored
View File

@@ -1,7 +1,10 @@
{ {
// See http://go.microsoft.com/fwlink/?LinkId=827846 // See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format // for the documentation about the extensions.json format
"recommendations": [ "recommendations": [
"platformio.platformio-ide" "platformio.platformio-ide"
] ],
} "unwantedRecommendations": [
"ms-vscode.cpptools-extension-pack"
]
}

6
MainDoor/platformio.ini
View File

@@ -16,4 +16,8 @@ board_build.f_cpu = 26000000L
board_build.ldscript = eagle.flash.1m.ld board_build.ldscript = eagle.flash.1m.ld
;board_build.flash_mode = dout ;board_build.flash_mode = dout
upload_protocol = espota upload_protocol = espota
upload_port = 192.168.1.133 upload_port = 192.168.1.25
lib_deps =
# RECOMMENDED
# Accept new functionality in a backwards compatible manner and patches
ottowinter/AsyncMqttClient-esphome @ ^0.8.6

1
MainDoor/src/leds.cpp
View File

@@ -6,6 +6,7 @@ leds::leds(int pinLED, int onms, bool inverse)
inv = inverse; inv = inverse;
onMS = onms; onMS = onms;
state = false; state = false;
pinMode(pinLED, OUTPUT);
} }
void leds::start() void leds::start()

157
MainDoor/src/main.cpp
View File

@@ -9,7 +9,8 @@
const char* ssid = "wf-home"; const char* ssid = "wf-home";
const char* password = "0ndthnrf"; const char* password = "0ndthnrf";
const char* mqtt_server = "192.168.1.250"; const char* mqtt_server = "192.168.1.111";
#define TOPIC "home/kor/"
AsyncMqttClient mqttClient; AsyncMqttClient mqttClient;
Ticker mqttReconnectTimer; Ticker mqttReconnectTimer;
@@ -18,15 +19,17 @@ WiFiEventHandler wifiConnectHandler;
WiFiEventHandler wifiDisconnectHandler; WiFiEventHandler wifiDisconnectHandler;
Ticker wifiReconnectTimer; Ticker wifiReconnectTimer;
#define L_TOP (2) #define L_TOP (0)
#define L_INT (3) #define L_INT (1)
#define L_DOWN (0) #define L_DOWN (3)
#define L_SMALL (1) #define L_SMALL (2)
#define DOOR (4) #define DOOR (4)
#define L_WIFI (2) //On board blue #define L_WIFI (2) //On board blue and Red
#define L_WIFI2 (14) //Green #define IRQ_PIN (14)
#define L_MQTT (13) //Blue //#define L_WIFI2 (14) //Green
#define L_MSG (12) //Red #define L_MQTT (13) //Yelow
#define L_MSG (12) //Green
leds msg = leds(L_MSG, 300, true);
unsigned long cRun = 0; unsigned long cRun = 0;
unsigned long l_run; unsigned long l_run;
@@ -37,10 +40,12 @@ uint8_t tP, iP, dP, sP, door, doorP;
// bool doorSent, lockSent; // bool doorSent, lockSent;
uint16_t nSec = 0; uint16_t nSec = 0;
leds r_led(L_MSG); leds r_led(L_MSG);
uint8_t pcfreg, opcfreg; uint8_t pcfreg;//, opcfreg;
PCF8574 pcf(0x3F); PCF8574 pcf(0x20);
bool l_m = false; bool l_m = false;
void trim(char *s);
void connectToWifi() { void connectToWifi() {
Serial.println("Connecting to Wi-Fi..."); Serial.println("Connecting to Wi-Fi...");
WiFi.begin(ssid, password); WiFi.begin(ssid, password);
@@ -56,14 +61,14 @@ void onWifiConnect(const WiFiEventStationModeGotIP& event) {
Serial.print("IP: "); Serial.print("IP: ");
Serial.println(WiFi.localIP()); Serial.println(WiFi.localIP());
digitalWrite(L_WIFI, HIGH); digitalWrite(L_WIFI, HIGH);
digitalWrite(L_WIFI2, LOW); //digitalWrite(L_WIFI2, HIGH);
connectToMqtt(); connectToMqtt();
} }
void onWifiDisconnect(const WiFiEventStationModeDisconnected& event) { void onWifiDisconnect(const WiFiEventStationModeDisconnected& event) {
Serial.println("Disconnected from Wi-Fi."); Serial.println("Disconnected from Wi-Fi.");
digitalWrite(L_WIFI, LOW); digitalWrite(L_WIFI, LOW);
digitalWrite(L_WIFI2, HIGH); //digitalWrite(L_WIFI2, LOW);
mqttReconnectTimer.detach(); // ensure we don't reconnect to MQTT while reconnecting to Wi-Fi mqttReconnectTimer.detach(); // ensure we don't reconnect to MQTT while reconnecting to Wi-Fi
wifiReconnectTimer.once(2, connectToWifi); wifiReconnectTimer.once(2, connectToWifi);
} }
@@ -73,18 +78,18 @@ void onMqttConnect(bool sessionPresent) {
Serial.print("Session present: "); Serial.print("Session present: ");
Serial.println(sessionPresent); Serial.println(sessionPresent);
//uint16_t packetIdSub = //uint16_t packetIdSub =
//mqttClient.subscribe("/home/kor/doortimeout_set", 1); //mqttClient.subscribe(TOPIC"doortimeout_set", 1);
mqttClient.publish("/home/kor/locker_top", 1, false, tP ? "0" : "1"); mqttClient.publish(TOPIC"locker_top", 1, false, tP ? "0" : "1");
mqttClient.publish("/home/kor/locker_int", 1, false, iP ? "0" : "1"); mqttClient.publish(TOPIC"locker_int", 1, false, iP ? "0" : "1");
mqttClient.publish("/home/kor/locker_down", 1, false, dP ? "0" : "1"); mqttClient.publish(TOPIC"locker_down", 1, false, dP ? "0" : "1");
mqttClient.publish("/home/kor/locker_small", 1, false, sP ? "0" : "1"); mqttClient.publish(TOPIC"locker_small", 1, false, sP ? "0" : "1");
mqttClient.publish("/home/kor/door", 1, false, doorP ? "0" : "1"); mqttClient.publish(TOPIC"door", 1, false, doorP ? "1" : "0");
//mqttClient.publish("/home/kor/doorlocker", 1, false, sP || dP || iP || tP ? "1" : "0"); //mqttClient.publish(TOPIC"doorlocker", 1, false, sP || dP || iP || tP ? "1" : "0");
/*char v[7]; /*char v[7];
itoa(timeAlm, v, 10); itoa(timeAlm, v, 10);
mqttClient.publish("/home/kor/doortimeout", 1, false, v);*/ mqttClient.publish(TOPIC"doortimeout", 1, false, v);*/
//digitalWrite(L_WIFI2, LOW); //digitalWrite(L_WIFI2, LOW);
digitalWrite(L_MQTT, LOW); digitalWrite(L_MQTT, HIGH);
} }
void onMqttDisconnect(AsyncMqttClientDisconnectReason reason) { void onMqttDisconnect(AsyncMqttClientDisconnectReason reason) {
@@ -93,7 +98,7 @@ void onMqttDisconnect(AsyncMqttClientDisconnectReason reason) {
if (WiFi.isConnected()) { if (WiFi.isConnected()) {
mqttReconnectTimer.once(2, connectToMqtt); mqttReconnectTimer.once(2, connectToMqtt);
} }
digitalWrite(L_MQTT, HIGH); digitalWrite(L_MQTT, LOW);
//if(WiFi.isConnected()) //if(WiFi.isConnected())
// digitalWrite(L_WIFI2, HIGH); // digitalWrite(L_WIFI2, HIGH);
} }
@@ -113,13 +118,13 @@ void onMqttUnsubscribe(uint16_t packetId) {
} }
void onMqttMessage(char* topic, char* payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total) { void onMqttMessage(char* topic, char* payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total) {
/* if(strcmp(topic, "/home/kor/doortimeout_set") == 0){ /* if(strcmp(topic, TOPIC"doortimeout_set") == 0){
char v[7]; char v[7];
timeAlm = atoi(payload); timeAlm = atoi(payload);
EEPROM.put(0, timeAlm); EEPROM.put(0, timeAlm);
EEPROM.commit(); EEPROM.commit();
itoa(timeAlm, v, 10); itoa(timeAlm, v, 10);
mqttClient.publish("/home/kor/doortimeout", 0, false, v); mqttClient.publish(TOPIC"doortimeout", 0, false, v);
Serial.print("New Timeout: "); Serial.print("New Timeout: ");
Serial.println(timeAlm); Serial.println(timeAlm);
}*/ }*/
@@ -129,6 +134,7 @@ void onMqttPublish(uint16_t packetId) {
Serial.println("Publish acknowledged."); Serial.println("Publish acknowledged.");
Serial.print(" packetId: "); Serial.print(" packetId: ");
Serial.println(packetId); Serial.println(packetId);
msg.start();
} }
void setup() { void setup() {
@@ -172,7 +178,7 @@ void setup() {
mqttClient.setServer(mqtt_server, 1883); mqttClient.setServer(mqtt_server, 1883);
mqttClient.setClientId("Door"); mqttClient.setClientId("Door");
Wire.begin(); Wire.begin(SCL, SDA);
// Serial.println("Begin Scan"); // Serial.println("Begin Scan");
// for (byte i = 8; i < 120; i++) // for (byte i = 8; i < 120; i++)
// { // {
@@ -188,10 +194,11 @@ void setup() {
// } // end of good response // } // end of good response
// } // end of for loop // } // end of for loop
// Serial.println("End Scan"); // Serial.println("End Scan");
Wire.beginTransmission(0x3F); //Wire.beginTransmission(0x3F);
Wire.beginTransmission(0x20);
if(Wire.endTransmission() == 0) Serial.println("PCF Found"); if(Wire.endTransmission() == 0) Serial.println("PCF Found");
else Serial.println("PCF Not Found"); else Serial.println("PCF Not Found");
pcf.begin(); pcf.begin(SCL, SDA);
// pinMode(L_TOP, INPUT_PULLUP); // pinMode(L_TOP, INPUT_PULLUP);
// pinMode(L_INT, INPUT_PULLUP); // pinMode(L_INT, INPUT_PULLUP);
@@ -199,14 +206,19 @@ void setup() {
// pinMode(L_SMALL, INPUT_PULLUP); // pinMode(L_SMALL, INPUT_PULLUP);
// pinMode(DOOR, INPUT_PULLUP); // pinMode(DOOR, INPUT_PULLUP);
pinMode(L_WIFI, OUTPUT); pinMode(L_WIFI, OUTPUT);
pinMode(L_WIFI2, OUTPUT); //pinMode(L_WIFI2, OUTPUT);
pinMode(L_MQTT, OUTPUT); pinMode(L_MQTT, OUTPUT);
pinMode(L_MSG, OUTPUT); //pinMode(L_MSG, OUTPUT);
digitalWrite(L_MQTT, HIGH);
digitalWrite(L_WIFI, HIGH);
digitalWrite(L_MQTT, LOW);
digitalWrite(L_WIFI, LOW);
//digitalWrite(L_MSG, HIGH);
Serial.printf("PCF Err=%d\n", pcf.lastError());
uint8_t pcfreg = pcf.read8(); uint8_t pcfreg = pcf.read8();
if(pcf.lastError() != 0)
Serial.printf("Read PCF Err=%d\n", pcf.lastError());
else
Serial.println("Read PCF OK");
tP = pcfreg & 0x1; tP = pcfreg & 0x1;
iP = (pcfreg >> L_INT) & 0x1; iP = (pcfreg >> L_INT) & 0x1;
dP = (pcfreg >> L_DOWN) & 0x1; dP = (pcfreg >> L_DOWN) & 0x1;
@@ -231,6 +243,7 @@ void loop() {
// uint8_t sC = digitalRead(L_SMALL); // uint8_t sC = digitalRead(L_SMALL);
uint8_t tC, iC, dC, sC; uint8_t tC, iC, dC, sC;
char v[10]; char v[10];
msg.tick();
//door = digitalRead(DOOR); //door = digitalRead(DOOR);
if(l_m && (l_run + 100) < millis()){ if(l_m && (l_run + 100) < millis()){
analogWrite(L_MSG, 0); analogWrite(L_MSG, 0);
@@ -248,60 +261,63 @@ void loop() {
dC = (pcfreg >> L_DOWN) & 0x1; dC = (pcfreg >> L_DOWN) & 0x1;
sC = (pcfreg >> L_SMALL) & 0x1; sC = (pcfreg >> L_SMALL) & 0x1;
door = (pcfreg >> DOOR) & 0x1; door = (pcfreg >> DOOR) & 0x1;
if(opcfreg != pcfreg){ // if(opcfreg != pcfreg){
itoa(pcfreg, v, 2); // itoa(pcfreg, v, 2);
mqttClient.publish("/home/kor/pcf", 1, false, v); // mqttClient.publish(TOPIC"pcf", 1, false, v);
opcfreg = pcfreg; // opcfreg = pcfreg;
} // }
if(tC != tP){ if(tC != tP){
Serial.println("Top Changed"); Serial.println("Top Changed");
if(mqttClient.connected()){ if(mqttClient.connected()){
mqttClient.publish("/home/kor/locker_top", 1, false, tC ? "0" : "1"); mqttClient.publish(TOPIC"locker_top", 1, false, tC ? "0" : "1");
} }
tP = tC; tP = tC;
} }
if(iC != iP){ if(iC != iP){
if(mqttClient.connected()){ if(mqttClient.connected()){
mqttClient.publish("/home/kor/locker_int", 1, false, iC ? "0" : "1"); mqttClient.publish(TOPIC"locker_int", 1, false, iC ? "0" : "1");
} }
iP = iC; iP = iC;
} }
if(dC != dP){ if(dC != dP){
if(mqttClient.connected()){ if(mqttClient.connected()){
mqttClient.publish("/home/kor/locker_down", 1, false, dC ? "0" : "1"); mqttClient.publish(TOPIC"locker_down", 1, false, dC ? "0" : "1");
} }
dP = dC; dP = dC;
} }
if(sC != sP){ if(sC != sP){
if(mqttClient.connected()){ if(mqttClient.connected()){
mqttClient.publish("/home/kor/locker_small", 1, false, sC ? "0" : "1"); mqttClient.publish(TOPIC"locker_small", 1, false, sC ? "0" : "1");
} }
sP = sC; sP = sC;
} }
if(door != doorP){ if(door != doorP){
if(mqttClient.connected()){ if(mqttClient.connected()){
mqttClient.publish("/home/kor/door", 1, false, door ? "0" : "1"); mqttClient.publish(TOPIC"door", 1, false, door ? "1" : "0");
} }
doorP = door; doorP = door;
} }
nSec++; nSec++;
// if(nSec % 10 == 0){ // if(nSec % 10 == 0){
// char v[11]; // Serial.println(pcfreg, 2);
// itoa(pcfreg, v, 2); // // char v[11];
// if(mqttClient.connected()) // // itoa(pcfreg, v, 2);
// mqttClient.publish("/home/test/pcfreg", 0, false, v); // // if(mqttClient.connected())
// // mqttClient.publish("/home/test/pcfreg", 0, false, v);
// } // }
if(nSec > 99){ if(nSec > 99){
if(mqttClient.connected()){ if(mqttClient.connected()){
char v[11]; char v[11];
ultoa(millis(), v, 10); dtostrf(millis() / 60000.0, 7, 1, v);
analogWrite(L_MSG, 1); trim(v);
l_run = millis(); //ultoa(millis(), v, 10);
l_m = true; //analogWrite(L_MSG, 1);
//l_run = millis();
//l_m = true;
//r_led.start(); //r_led.start();
mqttClient.publish("/home/kor/doormillis", 1, false, v); mqttClient.publish(TOPIC"doormin", 1, false, v);
Serial.print("Millis: "); Serial.print("Millis: ");
Serial.println(millis()); Serial.println(millis());
} }
@@ -313,12 +329,12 @@ void loop() {
if(mqttClient.connected()){ if(mqttClient.connected()){
if (door == 0){ //Door to long time open if (door == 0){ //Door to long time open
r_led.start(); r_led.start();
mqttClient.publish("/home/kor/doorlong", 1, false, "1"); mqttClient.publish(TOPIC"doorlong", 1, false, "1");
doorSent = true; doorSent = true;
} }
else{ //Not closed locker else{ //Not closed locker
r_led.start(); r_led.start();
mqttClient.publish("/home/kor/doorlocker", 1, false, "0"); mqttClient.publish(TOPIC"doorlocker", 1, false, "0");
lockSent = true; lockSent = true;
} }
} }
@@ -330,14 +346,43 @@ void loop() {
doorSent = false; doorSent = false;
if(mqttClient.connected()) if(mqttClient.connected())
r_led.start(); r_led.start();
mqttClient.publish("/home/kor/doorlong", 1, false, "0"); mqttClient.publish(TOPIC"doorlong", 1, false, "0");
} }
if(lockSent == true){ if(lockSent == true){
lockSent = false; lockSent = false;
if(mqttClient.connected()) if(mqttClient.connected())
r_led.start(); r_led.start();
mqttClient.publish("/home/kor/doorlocker", 1, false, "1"); mqttClient.publish(TOPIC"doorlocker", 1, false, "1");
} }
}*/ }*/
} }
} }
void trim(char *s)
{
// удаляем пробелы и табы с начала строки:
int i=0,j;
while((s[i]==' ')||(s[i]=='\t'))
{
i++;
}
if(i>0)
{
for(j=0; j < strlen(s); j++)
{
s[j]=s[j+i];
}
s[j]='\0';
}
// удаляем пробелы и табы с конца строки:
i=strlen(s)-1;
while((s[i]==' ')||(s[i]=='\t'))
{
i--;
}
if(i < (strlen(s)-1))
{
s[i+1]='\0';
}
}

17
MainDoorMyS/.vscode/extensions.json vendored
View File

@@ -1,7 +1,10 @@
{ {
// See http://go.microsoft.com/fwlink/?LinkId=827846 // See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format // for the documentation about the extensions.json format
"recommendations": [ "recommendations": [
"platformio.platformio-ide" "platformio.platformio-ide"
] ],
} "unwantedRecommendations": [
"ms-vscode.cpptools-extension-pack"
]
}