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

Power to MAX

Browse Source
This commit is contained in:
lexa
2021-01-04 17:12:20 +03:00
parent 8bd7f648fa
commit dea3e1e391
4 changed files with 98 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Rozetka/src/main.cpp
View File

@@ -2,7 +2,8 @@
#define MY_DEBUG
#define MY_RADIO_RF24
#define MY_RF24_CHANNEL (105)
#define MY_RF24_PA_LEVEL RF24_PA_HIGH
#define MY_RF24_PA_LEVEL RF24_PA_MAX
#define MY_REPEATER_FEATURE
#define SOCK1 2
#define SOCK2 3
@@ -21,9 +22,10 @@
// #undef MY_NODE_ID
// #define MY_NODE_ID 14
bool stat1, stat2;
bool stat1, stat2, Ack;
void presentation();
void sendData(MyMessage msg, bool status, mysensors_data_t msd);
void sendData(MyMessage msg, bool status);
void sendData(MyMessage msg, uint32_t status);
void receive(const MyMessage &message);
MyMessage msgMillis(2, V_VAR1);
@@ -49,13 +51,13 @@ void setup() {
stat2 = loadState(1);
digitalWrite(SOCK2, stat2);
digitalWrite(RELAY2, !stat2);
sendData(msgSock1s, !stat1, V_STATUS);
sendData(msgSock1s, !stat1);
wait(100);
sendData(msgSock2s, !stat2, V_STATUS);
sendData(msgSock2s, !stat2);
wait(100);
sendData(msgSock1, !stat1, V_VAR2);
sendData(msgSock1, !stat1);
wait(100);
sendData(msgSock2, !stat2, V_VAR3);
sendData(msgSock2, !stat2);
}
void loop() {
@@ -66,8 +68,8 @@ void loop() {
stat1 = !stat1;
digitalWrite(SOCK1, stat1);
digitalWrite(RELAY1, !stat1);
sendData(msgSock1s, !stat1, V_STATUS);
sendData(msgSock1, !stat1, V_VAR2);
sendData(msgSock1s, !stat1);
sendData(msgSock1, !stat1);
saveState(0, stat1);
Serial.print(F("Change Sock1: ")); Serial.println(stat1);
}
@@ -75,8 +77,8 @@ void loop() {
stat2 = !stat2;
digitalWrite(SOCK2, stat2);
digitalWrite(RELAY2, !stat2);
sendData(msgSock2s, !stat2, V_VAR3);
sendData(msgSock2, !stat2, V_STATUS);
sendData(msgSock2s, !stat2);
sendData(msgSock2, !stat2);
saveState(1, stat2);
Serial.print(F("Change Sock2: ")); Serial.println(stat2);
}
@@ -86,19 +88,20 @@ void loop() {
digitalWrite(SOCK1, stat1);
digitalWrite(RELAY1, !stat1);
saveState(0, digitalRead(SOCK1));
sendData(msgSock1, !stat1, V_VAR2);
sendData(msgSock1, !stat1);
}
if(stat2 != digitalRead(SOCK2)){
Serial.print(F("Curr Sock2: ")); Serial.println(digitalRead(SOCK2));
digitalWrite(SOCK2, stat2);
digitalWrite(RELAY2, !stat2);
saveState(1, digitalRead(SOCK2));
sendData(msgSock2, !stat2, V_VAR3);
sendData(msgSock2, !stat2);
Serial.print(F("Change Sock2: ")); Serial.println(stat2);
}
if((cRun + 60000) <= millis()){
cRun = millis();
send(msgMillis.set(cRun));
sendData(msgMillis, cRun);
//send(msgMillis.set(cRun));
}
}
@@ -110,14 +113,14 @@ void presentation()
present(2, S_CUSTOM, "ESMillis");
}
void sendData(MyMessage msg, bool status, mysensors_data_t msd)
void sendData(MyMessage msg, bool status)
{
bool send_data = false;
uint8_t count = 0;
while(send_data == false){
count++;
send_data = send(msg.set(status));
wait(100, C_SET, msg.type);
send_data = send(msg.set(status), true);
wait(1000, C_SET, msg.type);
if ((count == 3 )&&(send_data == 0)){ // Если сделано 3 попытки и нет подтверждения отправки
count = 0; // Обнуляем счётчик
send_data = 1; // Выходим из цикла
@@ -125,8 +128,33 @@ void sendData(MyMessage msg, bool status, mysensors_data_t msd)
}
}
void sendData(MyMessage msg, uint32_t val)
{
bool send_data = false;
uint8_t count = 0;
Ack = false;
//Serial.print(millis());
//Serial.println(" Send UINT32 Enter");
while(send_data == false){
count++;
send_data = send(msg.set(val), true);
wait(1000, C_SET, msg.type);
//Serial.print(millis());
//Serial.println(" Send UINT32");
if ((count == 3) && (send_data == 0)){ // Если сделано 3 попытки и нет подтверждения отправки
count = 0; // Обнуляем счётчик
send_data = 1; // Выходим из цикла
}
}
// if(Ack){
// Serial.print(millis());
// Serial.println(" Send UINT32 OK");
// }
}
void receive(const MyMessage &message)
{
if(message.isAck()) {Ack = true; return;}
if(message.getType() != V_STATUS) return;
switch (message.sensor)
{