Skip to content

Develop #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Espablo merged 6 commits into from
Nov 15, 2020
Merged

Develop #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4eeb944
restart wifi jeżeli moduł nie może się połączyć
krycha88 Nov 14, 2020
04158db
CONFIG_MODE Presses 10
krycha88 Nov 14, 2020
4683b98
Poprawa nazewnictwa MONOSTABILNY BISTABILNY
krycha88 Nov 14, 2020
c025241
Poprawa szablów płytek
krycha88 Nov 14, 2020
a5fa69c
delay(25)
krycha88 Nov 14, 2020
acee3ad
Update SuplaWebPageRelay.h
krycha88 Nov 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions GUI-Generic.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,5 +199,6 @@ void setup() {

void loop() {
SuplaDevice.iterate();
delay(25);
drd.loop();
}
9 changes: 4 additions & 5 deletions SuplaCommonPROGMEM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,13 @@ const char ODWROCONE[] PROGMEM = "LOW";
const char NORMALNE[] PROGMEM = "HIGH";
const char* const LEVEL_P[] PROGMEM = {ODWROCONE, NORMALNE};

//const char WYLACZONY[] PROGMEM = "WYŁĄCZONY";
const char PAMIETAJSTAN[] PROGMEM = "PAMIĘTAJ STAN";
const char* const MEMORY_P[] PROGMEM = {OFF, ON, PAMIETAJSTAN};

const char WCISNIECIE[] PROGMEM = "WCIŚNIĘCIE";
const char ZWOLNIENIE[] PROGMEM = "ZWOLNIENIE";
const char ZMIANASTANU[] PROGMEM = "ZMIANA STANU";
const char* const TRIGGER_P[] PROGMEM = {WCISNIECIE, ZWOLNIENIE, ZMIANASTANU};
const char ON_PRESS[] PROGMEM = "MONOSTABILNY";
const char ON_RELEASE[] PROGMEM = "ZWOLNIENIE";
const char ON_CHANGE[] PROGMEM = "BISTABILNY";
const char* const TRIGGER_P[] PROGMEM = {ON_PRESS, ON_RELEASE, ON_CHANGE};

String GIPOString(uint8_t gpio);
String BME280String(uint8_t adr);
Expand Down
2 changes: 1 addition & 1 deletion SuplaConfigESP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void SuplaConfigESP::runAction(int event, int action) {
}
countPresses++;

if (countPresses == 3) {
if (countPresses == 10) {
// Serial.println(F("CONFIG_MODE_3_PRESSES"));
configModeInit();
countPresses = 0;
Expand Down
68 changes: 39 additions & 29 deletions SuplaGuiWiFi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,36 +59,46 @@ class GUIESPWifi : public Supla::ESPWifi {

void setup() {
if (ConfigESP->configModeESP == NORMAL_MODE) {
gotIpEventHandler = WiFi.onStationModeGotIP([](const WiFiEventStationModeGotIP &event) {
Serial.print(F("local IP: "));
Serial.println(WiFi.localIP());
Serial.print(F("subnetMask: "));
Serial.println(WiFi.subnetMask());
Serial.print(F("gatewayIP: "));
Serial.println(WiFi.gatewayIP());
long rssi = WiFi.RSSI();
Serial.print(F("Signal strength (RSSI): "));
Serial.print(rssi);
Serial.println(F(" dBm"));
});
disconnectedEventHandler =
WiFi.onStationModeDisconnected([](const WiFiEventStationModeDisconnected &event) { Serial.println(F("WiFi station disconnected")); });

Serial.print(F("WiFi: establishing connection with SSID: \""));
Serial.print(ssid);
Serial.println(F("\""));
WiFi.hostname(hostname);
Serial.print(F("Host name: "));
Serial.println(WiFi.hostname());

WiFi.softAPdisconnect(true);
WiFi.setAutoConnect(false);
WiFi.mode(WIFI_STA);

if (!isReady()) {
WiFi.begin(ssid, password);
if (!wifiConfigured) {
wifiConfigured = true;
gotIpEventHandler = WiFi.onStationModeGotIP([](const WiFiEventStationModeGotIP &event) {
Serial.print(F("local IP: "));
Serial.println(WiFi.localIP());
Serial.print(F("subnetMask: "));
Serial.println(WiFi.subnetMask());
Serial.print(F("gatewayIP: "));
Serial.println(WiFi.gatewayIP());
long rssi = WiFi.RSSI();
Serial.print(F("Signal strength (RSSI): "));
Serial.print(rssi);
Serial.println(F(" dBm"));
});
disconnectedEventHandler =
WiFi.onStationModeDisconnected([](const WiFiEventStationModeDisconnected &event) { Serial.println(F("WiFi station disconnected")); });

Serial.print(F("WiFi: establishing connection with SSID: \""));
Serial.print(ssid);
Serial.println(F("\""));
WiFi.hostname(hostname);
Serial.print(F("Host name: "));
Serial.println(WiFi.hostname());

WiFi.softAPdisconnect(true);
WiFi.setAutoConnect(false);
WiFi.mode(WIFI_STA);

if (!isReady()) {
WiFi.begin(ssid, password);
}
}
else {
Serial.println(F("WiFi: resetting WiFi connection"));
if (client) {
delete client;
client = nullptr;
}
WiFi.reconnect();
}

yield();
}
}
Expand Down
16 changes: 8 additions & 8 deletions SuplaTemplateBoard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ void chooseTemplateBoard(uint8_t board) {
ConfigESP->setGpio(13, FUNCTION_CFG_LED, HIGH);

ConfigManager->set(KEY_MAX_BUTTON, "1");
ConfigESP->setGpio(14, 1, FUNCTION_BUTTON, Supla::ON_CHANGE);
ConfigESP->setGpio(0, 1, FUNCTION_BUTTON, Supla::ON_PRESS);

ConfigManager->set(KEY_MAX_RELAY, "1");
ConfigESP->setGpio(12, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
Expand All @@ -19,7 +19,7 @@ void chooseTemplateBoard(uint8_t board) {
ConfigESP->setGpio(13, FUNCTION_CFG_LED, HIGH);

ConfigManager->set(KEY_MAX_BUTTON, "1");
ConfigESP->setGpio(0, 1, FUNCTION_BUTTON, Supla::ON_CHANGE);
ConfigESP->setGpio(0, 1, FUNCTION_BUTTON, Supla::ON_PRESS);

ConfigManager->set(KEY_MAX_RELAY, "1");
ConfigESP->setGpio(12, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
Expand All @@ -31,7 +31,7 @@ void chooseTemplateBoard(uint8_t board) {
ConfigESP->setGpio(13, FUNCTION_CFG_LED, HIGH);

ConfigManager->set(KEY_MAX_BUTTON, "1");
ConfigESP->setGpio(0, 1, FUNCTION_BUTTON, Supla::ON_CHANGE);
ConfigESP->setGpio(0, 1, FUNCTION_BUTTON, Supla::ON_PRESS);

ConfigManager->set(KEY_MAX_RELAY, "1");
ConfigESP->setGpio(12, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
Expand All @@ -41,8 +41,8 @@ void chooseTemplateBoard(uint8_t board) {
ConfigESP->setGpio(13, FUNCTION_CFG_LED, HIGH);

ConfigManager->set(KEY_MAX_BUTTON, "2");
ConfigESP->setGpio(0, 1, FUNCTION_BUTTON, Supla::ON_CHANGE);
ConfigESP->setGpio(9, 2, FUNCTION_BUTTON, Supla::ON_CHANGE);
ConfigESP->setGpio(0, 1, FUNCTION_BUTTON, Supla::ON_PRESS);
ConfigESP->setGpio(9, 2, FUNCTION_BUTTON, Supla::ON_PRESS);

ConfigManager->set(KEY_MAX_RELAY, "2");
ConfigESP->setGpio(12, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
Expand All @@ -53,9 +53,9 @@ void chooseTemplateBoard(uint8_t board) {
ConfigESP->setGpio(13, FUNCTION_CFG_LED, HIGH);

ConfigManager->set(KEY_MAX_BUTTON, "3");
ConfigESP->setGpio(0, 1, FUNCTION_BUTTON, Supla::ON_CHANGE);
ConfigESP->setGpio(9, 2, FUNCTION_BUTTON, Supla::ON_CHANGE);
ConfigESP->setGpio(10, 3, FUNCTION_BUTTON, Supla::ON_CHANGE);
ConfigESP->setGpio(0, 1, FUNCTION_BUTTON, Supla::ON_PRESS);
ConfigESP->setGpio(9, 2, FUNCTION_BUTTON, Supla::ON_PRESS);
ConfigESP->setGpio(10, 3, FUNCTION_BUTTON, Supla::ON_PRESS);

ConfigManager->set(KEY_MAX_RELAY, "3");
ConfigESP->setGpio(12, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
Expand Down
4 changes: 2 additions & 2 deletions SuplaWebPageRelay.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
#define INPUT_RELAY_DURATION "ird"
#define INPUT_ROLLERSHUTTER "irsr"

#if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)

enum _memory_relay {
MEMORY_RELAY_OFF,
MEMORY_RELAY_ON,
MEMORY_RELAY_RESTORE
};

#if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)

class SuplaWebPageRelay {
public:
SuplaWebPageRelay();
Expand Down