mirror of
https://github.com/IoTManagerProject/IoTManager.git
synced 2026-03-26 22:22:16 +03:00
написал прием события кнопки из веб
This commit is contained in:
@@ -378,7 +378,7 @@
|
||||
"id": "btn",
|
||||
"widget": "toggle",
|
||||
"page": "Кнопки",
|
||||
"descr": "",
|
||||
"descr": "Освещение",
|
||||
"int": 0,
|
||||
"pin": 16,
|
||||
"execLevel": "1",
|
||||
@@ -394,7 +394,7 @@
|
||||
"id": "btn",
|
||||
"widget": "toggle",
|
||||
"page": "Кнопки",
|
||||
"descr": "",
|
||||
"descr": "Освещение",
|
||||
"int": 0,
|
||||
"inv": 0,
|
||||
"pin": 2,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
//Версия прошивки
|
||||
#define FIRMWARE_VERSION 408
|
||||
#define FIRMWARE_VERSION 410
|
||||
|
||||
#ifdef esp8266_4mb
|
||||
#define FIRMWARE_NAME "esp8266_4mb"
|
||||
@@ -41,7 +41,7 @@ enum TimerTask_t { WIFI_SCAN,
|
||||
TIME,
|
||||
TIME_SYNC,
|
||||
UPTIME,
|
||||
UDP, //UDPP
|
||||
UDP, // UDPP
|
||||
TIMES,
|
||||
PTASK };
|
||||
|
||||
|
||||
@@ -65,7 +65,6 @@ lib_deps =
|
||||
adafruit/Adafruit BusIO @ ^1.13.0
|
||||
dfrobot/DFRobotDFPlayerMini @ ^1.0.5
|
||||
marcoschwartz/LiquidCrystal_I2C@^1.1.4
|
||||
|
||||
build_src_filter =
|
||||
+<modules\virtual\Logging>
|
||||
+<modules\virtual\Timer>
|
||||
@@ -111,7 +110,6 @@ lib_deps =
|
||||
adafruit/Adafruit BusIO @ ^1.13.0
|
||||
dfrobot/DFRobotDFPlayerMini @ ^1.0.5
|
||||
marcoschwartz/LiquidCrystal_I2C@^1.1.4
|
||||
|
||||
build_src_filter =
|
||||
+<modules\virtual\Timer>
|
||||
+<modules\virtual\Variable>
|
||||
|
||||
@@ -48,12 +48,10 @@ void generateEvent(const String& id, const String& value) {
|
||||
void handleEvent() {
|
||||
if (eventBuf.length()) {
|
||||
String event = selectToMarker(eventBuf, ",");
|
||||
Serial.println("event: " + event);
|
||||
SerialPrint("i", F("EVENT"), event);
|
||||
|
||||
//здесь нужно пропускать данное событие через условия сценариев
|
||||
//и если оно есть в условии сценария и совподает
|
||||
//то нужно поместить все команды этого блока сценария в generateOrder(order1, order2, ....)
|
||||
//который в свою очередь их выполнит
|
||||
iotScen.ExecScenario(selectToMarker(event, " "));
|
||||
|
||||
eventBuf = deleteBeforeDelimiter(eventBuf, ",");
|
||||
|
||||
@@ -144,6 +144,12 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload, size_t length)
|
||||
upgrade_firmware(3);
|
||||
}
|
||||
|
||||
// cotrol ==============================================================================
|
||||
if (headerStr == "/control|") {
|
||||
String payloadStr;
|
||||
writeUint8tToString(payload, length, headerLenth, payloadStr);
|
||||
SerialPrint("i", F("=>WS"), "Msg from svelte web, WS No: " + String(num) + ", msg: " + payloadStr);
|
||||
}
|
||||
} break;
|
||||
|
||||
case WStype_BIN: {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
"id": "btn",
|
||||
"widget": "toggle",
|
||||
"page": "Кнопки",
|
||||
"descr": "",
|
||||
"descr": "Освещение",
|
||||
"int": 0,
|
||||
"pin": 16,
|
||||
"execLevel": "1",
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
"id": "btn",
|
||||
"widget": "toggle",
|
||||
"page": "Кнопки",
|
||||
"descr": "",
|
||||
"descr": "Освещение",
|
||||
"int": 0,
|
||||
"inv": 0,
|
||||
"pin": 2
|
||||
|
||||
@@ -16,12 +16,11 @@ class Loging : public IoTItem {
|
||||
// }
|
||||
|
||||
void doByInterval() {
|
||||
Serial.println("logging test " + logval);
|
||||
String value = getItemValue(logval);
|
||||
if (value == "") {
|
||||
SerialPrint("E", F("Logging"), F("no value set"));
|
||||
} else {
|
||||
Serial.println("value " + value);
|
||||
regEvent(value, "Logging");
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user