From c60c8af237eb8cb3140a9a653c2eeb72505c926c Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 2 Mar 2018 15:38:37 +0100 Subject: [PATCH 001/136] v5.12.0d - Add alternative MQTT libraries 5.12.0d * Add support for optional MQTT drivers to be selected in user_config.h (#1992) --- lib/TasmotaMqtt-1.1.0/.gitignore | 28 + lib/TasmotaMqtt-1.1.0/README.md | 8 + .../examples/mqtt_pub/mqtt_pub.ino | 102 ++ .../examples/mqtt_sub/mqtt_sub.ino | 97 ++ lib/TasmotaMqtt-1.1.0/keywords.txt | 39 + lib/TasmotaMqtt-1.1.0/library.properties | 9 + lib/TasmotaMqtt-1.1.0/src/TasmotaMqtt.cpp | 193 +++ lib/TasmotaMqtt-1.1.0/src/TasmotaMqtt.h | 88 ++ lib/TasmotaMqtt-1.1.0/src/mqtt/debug.h | 19 + lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt.c | 997 ++++++++++++++++ lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt.h | 148 +++ lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt_msg.c | 487 ++++++++ lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt_msg.h | 141 +++ lib/TasmotaMqtt-1.1.0/src/mqtt/proto.c | 129 ++ lib/TasmotaMqtt-1.1.0/src/mqtt/proto.h | 32 + lib/TasmotaMqtt-1.1.0/src/mqtt/queue.c | 75 ++ lib/TasmotaMqtt-1.1.0/src/mqtt/queue.h | 44 + lib/TasmotaMqtt-1.1.0/src/mqtt/ringbuf.c | 67 ++ lib/TasmotaMqtt-1.1.0/src/mqtt/ringbuf.h | 19 + lib/TasmotaMqtt-1.1.0/src/mqtt/typedef.h | 17 + lib/TasmotaMqtt-1.1.0/src/mqtt/user_config.h | 15 + lib/TasmotaMqtt-1.1.0/src/mqtt/utils.c | 149 +++ lib/TasmotaMqtt-1.1.0/src/mqtt/utils.h | 9 + lib/esp-mqtt-arduino-1.0.1.02.1/.gitignore | 28 + lib/esp-mqtt-arduino-1.0.1.02.1/README.md | 15 + .../examples/mqtt_pub/mqtt_pub.ino | 102 ++ .../examples/mqtt_sub/mqtt_sub.ino | 95 ++ lib/esp-mqtt-arduino-1.0.1.02.1/keywords.txt | 43 + .../library.properties | 9 + lib/esp-mqtt-arduino-1.0.1.02.1/src/MQTT.cpp | 269 +++++ lib/esp-mqtt-arduino-1.0.1.02.1/src/MQTT.h | 93 ++ .../src/mqtt/debug.h | 19 + .../src/mqtt/mqtt.c | 1048 +++++++++++++++++ .../src/mqtt/mqtt.h | 152 +++ .../src/mqtt/mqtt_config.h | 19 + .../src/mqtt/mqtt_msg.c | 487 ++++++++ .../src/mqtt/mqtt_msg.h | 141 +++ .../src/mqtt/proto.c | 129 ++ .../src/mqtt/proto.h | 32 + .../src/mqtt/queue.c | 75 ++ .../src/mqtt/queue.h | 44 + .../src/mqtt/ringbuf.c | 67 ++ .../src/mqtt/ringbuf.h | 19 + .../src/mqtt/typedef.h | 17 + .../src/mqtt/utils.c | 149 +++ .../src/mqtt/utils.h | 9 + sonoff/_releasenotes.ino | 2 +- sonoff/sonoff.ino | 259 ++-- sonoff/user_config.h | 14 +- sonoff/xdrv_00_mqtt.ino | 381 +++--- sonoff/xdrv_interface.ino | 5 +- sonoff/xsns_interface.ino | 4 +- 52 files changed, 6234 insertions(+), 404 deletions(-) create mode 100644 lib/TasmotaMqtt-1.1.0/.gitignore create mode 100644 lib/TasmotaMqtt-1.1.0/README.md create mode 100644 lib/TasmotaMqtt-1.1.0/examples/mqtt_pub/mqtt_pub.ino create mode 100644 lib/TasmotaMqtt-1.1.0/examples/mqtt_sub/mqtt_sub.ino create mode 100644 lib/TasmotaMqtt-1.1.0/keywords.txt create mode 100644 lib/TasmotaMqtt-1.1.0/library.properties create mode 100644 lib/TasmotaMqtt-1.1.0/src/TasmotaMqtt.cpp create mode 100644 lib/TasmotaMqtt-1.1.0/src/TasmotaMqtt.h create mode 100644 lib/TasmotaMqtt-1.1.0/src/mqtt/debug.h create mode 100644 lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt.c create mode 100644 lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt.h create mode 100644 lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt_msg.c create mode 100644 lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt_msg.h create mode 100644 lib/TasmotaMqtt-1.1.0/src/mqtt/proto.c create mode 100644 lib/TasmotaMqtt-1.1.0/src/mqtt/proto.h create mode 100644 lib/TasmotaMqtt-1.1.0/src/mqtt/queue.c create mode 100644 lib/TasmotaMqtt-1.1.0/src/mqtt/queue.h create mode 100644 lib/TasmotaMqtt-1.1.0/src/mqtt/ringbuf.c create mode 100644 lib/TasmotaMqtt-1.1.0/src/mqtt/ringbuf.h create mode 100644 lib/TasmotaMqtt-1.1.0/src/mqtt/typedef.h create mode 100644 lib/TasmotaMqtt-1.1.0/src/mqtt/user_config.h create mode 100644 lib/TasmotaMqtt-1.1.0/src/mqtt/utils.c create mode 100644 lib/TasmotaMqtt-1.1.0/src/mqtt/utils.h create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/.gitignore create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/README.md create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/examples/mqtt_pub/mqtt_pub.ino create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/examples/mqtt_sub/mqtt_sub.ino create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/keywords.txt create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/library.properties create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/src/MQTT.cpp create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/src/MQTT.h create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/debug.h create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt.c create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt.h create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt_config.h create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt_msg.c create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt_msg.h create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/proto.c create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/proto.h create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/queue.c create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/queue.h create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/ringbuf.c create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/ringbuf.h create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/typedef.h create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/utils.c create mode 100644 lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/utils.h diff --git a/lib/TasmotaMqtt-1.1.0/.gitignore b/lib/TasmotaMqtt-1.1.0/.gitignore new file mode 100644 index 000000000..2ee75414c --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/.gitignore @@ -0,0 +1,28 @@ +# C++ objects and libs + +*.slo +*.lo +*.o +#*.a +*.la +*.lai +*.so +*.dll +*.dylib + +#Makefile +*-build-* +build-* +*.autosave + +# .log files (usually created by QtTest - thanks to VestniK) +*.log + + +# Editors temporary files +*~ + + +#OSX +.DS_Store +._* diff --git a/lib/TasmotaMqtt-1.1.0/README.md b/lib/TasmotaMqtt-1.1.0/README.md new file mode 100644 index 000000000..db197299e --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/README.md @@ -0,0 +1,8 @@ +MQTT +==== + +A Wrapper around mqtt for Arduino to be used with esp8266 modules. + +It wraps a slightly modified version of mqtt for esp8266 ported by Tuan PM. +Original code for esp: https://github.com/tuanpmt/esp_mqtt +Original code for contiki: https://github.com/esar/contiki-mqtt diff --git a/lib/TasmotaMqtt-1.1.0/examples/mqtt_pub/mqtt_pub.ino b/lib/TasmotaMqtt-1.1.0/examples/mqtt_pub/mqtt_pub.ino new file mode 100644 index 000000000..17b3be8db --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/examples/mqtt_pub/mqtt_pub.ino @@ -0,0 +1,102 @@ +#include +#include + +void myDataCb(String& topic, String& data); +void myPublishedCb(); +void myDisconnectedCb(); +void myConnectedCb(); + +#define CLIENT_ID "client1" + +// create MQTT object +MQTT myMqtt(CLIENT_ID, "192.168.0.1", 1883); + +// +const char* ssid = "ssid"; +const char* password = "ssid_password"; + + +// +void setup() { + Serial.begin(115200); + delay(1000); + + Serial.println(); + Serial.println(); + Serial.print("Connecting to "); + Serial.println(ssid); + + WiFi.begin(ssid, password); + + while (WiFi.status() != WL_CONNECTED) { + delay(500); + Serial.print("."); + } + + Serial.println(""); + Serial.println("WiFi connected"); + Serial.println("IP address: "); + Serial.println(WiFi.localIP()); + + Serial.println("Connecting to MQTT server"); + + // setup callbacks + myMqtt.onConnected(myConnectedCb); + myMqtt.onDisconnected(myDisconnectedCb); + myMqtt.onPublished(myPublishedCb); + myMqtt.onData(myDataCb); + + Serial.println("connect mqtt..."); + myMqtt.connect(); + + delay(10); +} + +// +void loop() { + + int value = analogRead(A0); + + String topic("/"); + topic += CLIENT_ID; + topic += "/value"; + + String valueStr(value); + + // publish value to topic + boolean result = myMqtt.publish(topic, valueStr); + + delay(1000); +} + + +/* + * + */ +void myConnectedCb() +{ + Serial.println("connected to MQTT server"); +} + +void myDisconnectedCb() +{ + Serial.println("disconnected. try to reconnect..."); + delay(500); + myMqtt.connect(); +} + +void myPublishedCb() +{ + //Serial.println("published."); +} + +void myDataCb(String& topic, String& data) +{ + + Serial.print(topic); + Serial.print(": "); + Serial.println(data); +} + + + diff --git a/lib/TasmotaMqtt-1.1.0/examples/mqtt_sub/mqtt_sub.ino b/lib/TasmotaMqtt-1.1.0/examples/mqtt_sub/mqtt_sub.ino new file mode 100644 index 000000000..e88e0a7bb --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/examples/mqtt_sub/mqtt_sub.ino @@ -0,0 +1,97 @@ +#include +#include + +// This needs testing + +void myDataCb(char* topic, uint8_t* data, unsigned int data_len); +void myPublishedCb(); +void myDisconnectedCb(); +void myConnectedCb(); + +#define CLIENT_ID "client3" +#define TOPIC "/client1/value" + +// create MQTT +TasmotaMqtt myMqtt(); + +const char* ssid = "ssid"; +const char* password = "ssid_password"; + +// +void setup() { + Serial.begin(115200); + delay(1000); + + Serial.println(); + Serial.println(); + Serial.print("Connecting to "); + Serial.println(ssid); + + WiFi.begin(ssid, password); + + while (WiFi.status() != WL_CONNECTED) { + delay(500); + Serial.print("."); + } + + Serial.println(""); + Serial.println("WiFi connected"); + Serial.println("IP address: "); + Serial.println(WiFi.localIP()); + + + Serial.println("Connecting to MQTT server"); + + myMqtt.InitConnection("192.168.0.1", 1883); + myMqtt.InitClient(CLIENT_ID, "", ""); + myMqtt.InitLWT("/lwt", "offline"); + + // setup callbacks + myMqtt.OnConnected(myConnectedCb); + myMqtt.OnDisconnected(myDisconnectedCb); + myMqtt.OnPublished(myPublishedCb); + myMqtt.OnData(myDataCb); + + Serial.println("connect mqtt..."); + myMqtt.Connect(); + + Serial.println("subscribe to topic..."); + myMqtt.Subscribe(TOPIC); + + delay(10); +} + +// +void loop() { +} + + +/* + * + */ +void myConnectedCb() +{ + Serial.println("connected to MQTT server"); +} + +void myDisconnectedCb() +{ + Serial.println("disconnected. try to reconnect..."); + delay(500); + myMqtt.Connect(); +} + +void myPublishedCb() +{ + //Serial.println("published."); +} + +void myDataCb(char* topic, uint8_t* data, unsigned int data_len) +{ + Serial.print(topic); + Serial.print(": "); + Serial.println(data); +} + + + diff --git a/lib/TasmotaMqtt-1.1.0/keywords.txt b/lib/TasmotaMqtt-1.1.0/keywords.txt new file mode 100644 index 000000000..198919125 --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/keywords.txt @@ -0,0 +1,39 @@ +####################################### +# Syntax Coloring Map For Test +####################################### + +####################################### +# Datatypes (KEYWORD1) +####################################### + +TasmotaMqtt.h KEYWORD1 +TasmotaMqtt KEYWORD1 + +####################################### +# Methods and Functions (KEYWORD2) +####################################### + +InitConnection KEYWORD2 +InitClient KEYWORD2 +InitLWT KEYWORD2 + +Connect KEYWORD2 +Disconnect KEYWORD2 +Connected KEYWORD2 + +Publish KEYWORD2 +Subscribe KEYWORD2 + +#general +OnConnected KEYWORD2 +OnDisconnected KEYWORD2 +OnData KEYWORD2 + +####################################### +# Instances (KEYWORD2) +####################################### + +####################################### +# Constants (LITERAL1) +####################################### + diff --git a/lib/TasmotaMqtt-1.1.0/library.properties b/lib/TasmotaMqtt-1.1.0/library.properties new file mode 100644 index 000000000..5a3802f35 --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/library.properties @@ -0,0 +1,9 @@ +name=TasmotaMqtt +version=1.0.0 +author=Theo Arends +maintainer=Theo Arends +sentence=A Wrapper around mqtt for Arduino to be used with esp8266 modules. +paragraph=It wraps a slightly modified version of mqtt for esp8266 ported by Tuan PM. Original code for esp: https://github.com/tuanpmt/esp_mqtt Original code for contiki: https://github.com/esar/contiki-mqtt +category=Communication +url= +architectures=esp8266 \ No newline at end of file diff --git a/lib/TasmotaMqtt-1.1.0/src/TasmotaMqtt.cpp b/lib/TasmotaMqtt-1.1.0/src/TasmotaMqtt.cpp new file mode 100644 index 000000000..91a49e0f6 --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/src/TasmotaMqtt.cpp @@ -0,0 +1,193 @@ +/* + TasmotaMqtt.cpp - Wrapper for mqtt for esp8266 by Tuan PM for Tasmota + + Copyright (C) 2018 Theo Arends and Ingo Randolf + + This library is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#include "TasmotaMqtt.h" + +#include "user_interface.h" +#include "osapi.h" +#include "os_type.h" + +/*********************************************************************************************\ + * Prerequisite + * + * Copy .c and .h files from https://github.com/tuanpmt/esp_mqtt folder mqtt to folder mqtt + * - Replace BOOL with bool + * - Remove variables certificate and private_key from file mqtt.c + * - Add file user_config.h with default defines for + * MQTT_BUF_SIZE 256, MQTT_RECONNECT_TIMEOUT 5, QUEUE_BUFFER_SIZE 2048 and PROTOCOL_NAMEv311 +\*********************************************************************************************/ + +/*********************************************************************************************\ + * Mqtt internal callbacks +\*********************************************************************************************/ + +static void mqttConnectedCb(uint32_t *args) +{ + MQTT_Client* client = (MQTT_Client*)args; + TasmotaMqtt* _this = (TasmotaMqtt*)client->user_data; + if (_this && _this->onMqttConnectedCb) _this->onMqttConnectedCb(); +} + +static void mqttDisconnectedCb(uint32_t *args) +{ + MQTT_Client* client = (MQTT_Client*)args; + TasmotaMqtt* _this = (TasmotaMqtt*)client->user_data; + if (_this && _this->onMqttDisconnectedCb) _this->onMqttDisconnectedCb(); +} + +static void mqttPublishedCb(uint32_t *args) +{ + MQTT_Client* client = (MQTT_Client*)args; + TasmotaMqtt* _this = (TasmotaMqtt*)client->user_data; + if (_this && _this->onMqttPublishedCb) _this->onMqttPublishedCb(); +} + +static void mqttTimeoutCb(uint32_t *args) +{ + MQTT_Client* client = (MQTT_Client*)args; + TasmotaMqtt* _this = (TasmotaMqtt*)client->user_data; + if (_this && _this->onMqttTimeoutCb) _this->onMqttTimeoutCb(); +} + +static void mqttDataCb(uint32_t *args, const char* topic, uint32_t topic_len, const char *data, uint32_t data_len) +{ + MQTT_Client* client = (MQTT_Client*)args; + TasmotaMqtt* _this = (TasmotaMqtt*)client->user_data; + if (_this) _this->_onMqttDataCb(topic, topic_len, data, data_len); +} + +/*********************************************************************************************\ + * TasmotaMqtt class implementation +\*********************************************************************************************/ + +TasmotaMqtt::TasmotaMqtt() : + onMqttConnectedCb(0), + onMqttDisconnectedCb(0), + onMqttPublishedCb(0), + onMqttTimeoutCb(0), + onMqttDataCb(0) +{ +} + +TasmotaMqtt::~TasmotaMqtt() +{ + MQTT_DeleteClient(&mqttClient); +} + +void TasmotaMqtt::InitConnection(const char* host, uint32_t port, uint8_t security) +{ + MQTT_InitConnection(&mqttClient, (uint8_t*)host, port, security); + + // set user data + mqttClient.user_data = (void*)this; + + MQTT_OnConnected(&mqttClient, mqttConnectedCb); + MQTT_OnDisconnected(&mqttClient, mqttDisconnectedCb); + MQTT_OnPublished(&mqttClient, mqttPublishedCb); + MQTT_OnTimeout(&mqttClient, mqttTimeoutCb); + MQTT_OnData(&mqttClient, mqttDataCb); +} + +void TasmotaMqtt::InitClient(const char* client_id, const char* client_user, const char* client_pass, uint32_t keep_alive_time, uint8_t clean_session) +{ + MQTT_InitClient(&mqttClient, (uint8_t*)client_id, (uint8_t*)client_user, (uint8_t*)client_pass, keep_alive_time, clean_session); +} + +void TasmotaMqtt::DeleteClient() +{ + MQTT_DeleteClient(&mqttClient); +} + +void TasmotaMqtt::InitLWT(const char* will_topic, const char* will_msg, uint8_t will_qos, bool will_retain) +{ + MQTT_InitLWT(&mqttClient, (uint8_t*)will_topic, (uint8_t*)will_msg, will_qos, (uint8_t)will_retain); +} + +void TasmotaMqtt::OnConnected( void (*function)(void) ) +{ + onMqttConnectedCb = function; +} + +void TasmotaMqtt::OnDisconnected( void (*function)(void) ) +{ + onMqttDisconnectedCb = function; +} + +void TasmotaMqtt::OnPublished( void (*function)(void) ) +{ + onMqttPublishedCb = function; +} + +void TasmotaMqtt::OnTimeout( void (*function)(void) ) +{ + onMqttTimeoutCb = function; +} + +void TasmotaMqtt::OnData( void (*function)(char*, uint8_t*, unsigned int) ) +{ + onMqttDataCb = function; +} + +bool TasmotaMqtt::Subscribe(const char* topic, uint8_t qos) +{ + return MQTT_Subscribe(&mqttClient, (char*)topic, qos); +} + +bool TasmotaMqtt::Unsubscribe(const char* topic) +{ + return MQTT_UnSubscribe(&mqttClient, (char*)topic); +} + +void TasmotaMqtt::Connect() +{ + MQTT_Connect(&mqttClient); +} + +void TasmotaMqtt::Connect(const char* client_id, const char* client_user, const char* client_pass, const char* will_topic, const char* will_msg, uint8_t will_qos, bool will_retain) +{ + MQTT_InitClient(&mqttClient, (uint8_t*)client_id, (uint8_t*)client_user, (uint8_t*)client_pass, MQTT_KEEPALIVE, 1); + MQTT_InitLWT(&mqttClient, (uint8_t*)will_topic, (uint8_t*)will_msg, will_qos, (uint8_t)will_retain); + MQTT_Connect(&mqttClient); +} + +void TasmotaMqtt::Disconnect() +{ + MQTT_Disconnect(&mqttClient); +} + +bool TasmotaMqtt::Publish(const char* topic, const char* data, int data_length, int qos, bool retain) +{ + return MQTT_Publish(&mqttClient, topic, data, data_length, qos, (int)retain); +} + +bool TasmotaMqtt::Connected() +{ + return (mqttClient.connState > TCP_CONNECTED); +} + +/*********************************************************************************************/ + +void TasmotaMqtt::_onMqttDataCb(const char* topic, uint32_t topic_len, const char* data, uint32_t data_len) +{ + char topic_copy[topic_len]; + + memcpy(topic_copy, topic, topic_len); + topic_copy[topic_len] = 0; + onMqttDataCb((char*)topic_copy, (byte*)data, data_len); +} diff --git a/lib/TasmotaMqtt-1.1.0/src/TasmotaMqtt.h b/lib/TasmotaMqtt-1.1.0/src/TasmotaMqtt.h new file mode 100644 index 000000000..e512d8d5a --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/src/TasmotaMqtt.h @@ -0,0 +1,88 @@ +/* + TasmotaMqtt.h - Wrapper for mqtt for esp8266 by Tuan PM for Tasmota + + Copyright (C) 2018 Theo Arends and Ingo Randolf + + This library is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef TasmotaMqtt_h +#define TasmotaMqtt_h +/*********************************************************************************************\ + * TasmotaMqtt supports currently only non-TLS MQTT + * + * Adapted from esp-mqtt-arduino by Ingo Randolf (https://github.com/i-n-g-o/esp-mqtt-arduino) +\*********************************************************************************************/ + +#include + +#include +#include +#include +#include +#include + +extern "C" { + #include + #include "mqtt/mqtt.h" +} + +// MQTT_KEEPALIVE : keepAlive interval in Seconds +#ifndef MQTT_KEEPALIVE +#define MQTT_KEEPALIVE 15 +#endif + +class TasmotaMqtt { +public: + TasmotaMqtt(); + ~TasmotaMqtt(); + + void InitConnection(const char* host, uint32_t port, uint8_t security = 0); + void InitClient(const char* client_id, const char* client_user, const char* client_pass, uint32_t keep_alive_time = MQTT_KEEPALIVE, uint8_t clean_session = 1); + void DeleteClient(); + void InitLWT(const char* will_topic, const char* will_msg, uint8_t will_qos = 0, bool will_retain = false); + + void OnConnected( void (*)(void) ); + void OnDisconnected( void (*)(void) ); + void OnPublished( void (*)(void) ); + void OnTimeout( void (*)(void) ); + void OnData( void (*)(char*, uint8_t*, unsigned int) ); + + bool Subscribe(const char* topic, uint8_t qos = 0); + bool Unsubscribe(const char* topic); + + void Connect(); + void Connect(const char* client_id, const char* client_user, const char* client_pass, const char* will_topic, const char* will_msg, uint8_t will_qos = 0, bool will_retain = false); + void Disconnect(); + + bool Publish(const char* topic, const char* data, int data_length, int qos = 0, bool retain = false); + + bool Connected(); + + int State() { return mqttClient.connState; }; + + void (*onMqttConnectedCb)(void); + void (*onMqttDisconnectedCb)(void); + void (*onMqttPublishedCb)(void); + void (*onMqttTimeoutCb)(void); + void (*onMqttDataCb) (char*, uint8_t*, unsigned int); + + // internal callback + void _onMqttDataCb(const char*, uint32_t, const char*, uint32_t); + +private: + MQTT_Client mqttClient; +}; + +#endif // TasmotaMqtt_h \ No newline at end of file diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/debug.h b/lib/TasmotaMqtt-1.1.0/src/mqtt/debug.h new file mode 100644 index 000000000..f45dd6d8d --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/src/mqtt/debug.h @@ -0,0 +1,19 @@ +/* + * debug.h + * + * Created on: Dec 4, 2014 + * Author: Minh + */ + +#ifndef USER_DEBUG_H_ +#define USER_DEBUG_H_ + + +#if defined(MQTT_DEBUG_ON) +#define MQTT_INFO( format, ... ) os_printf( format, ## __VA_ARGS__ ) +#else +#define MQTT_INFO( format, ... ) +#endif + + +#endif /* USER_DEBUG_H_ */ diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt.c b/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt.c new file mode 100644 index 000000000..06609fe4a --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt.c @@ -0,0 +1,997 @@ +/* mqtt.c +* Protocol: http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html +* +* Copyright (c) 2014-2015, Tuan PM +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* +* * Redistributions of source code must retain the above copyright notice, +* this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of Redis nor the names of its contributors may be used +* to endorse or promote products derived from this software without +* specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +*/ + +#include "user_interface.h" +#include "osapi.h" +#include "espconn.h" +#include "os_type.h" +#include "mem.h" +#include "mqtt_msg.h" +#include "debug.h" +#include "user_config.h" +#include "mqtt.h" +#include "queue.h" + +#define MQTT_TASK_PRIO 2 +#define MQTT_TASK_QUEUE_SIZE 1 +#define MQTT_SEND_TIMOUT 5 + +#ifndef MQTT_SSL_SIZE +#define MQTT_SSL_SIZE 5120 +#endif + +#ifndef QUEUE_BUFFER_SIZE +#define QUEUE_BUFFER_SIZE 2048 +#endif + +/* +unsigned char *default_certificate; +unsigned int default_certificate_len = 0; +unsigned char *default_private_key; +unsigned int default_private_key_len = 0; +*/ + +os_event_t mqtt_procTaskQueue[MQTT_TASK_QUEUE_SIZE]; + +#ifdef PROTOCOL_NAMEv311 +LOCAL uint8_t zero_len_id[2] = { 0, 0 }; +#endif + +LOCAL void ICACHE_FLASH_ATTR +mqtt_dns_found(const char *name, ip_addr_t *ipaddr, void *arg) +{ + struct espconn *pConn = (struct espconn *)arg; + MQTT_Client* client = (MQTT_Client *)pConn->reverse; + + + if (ipaddr == NULL) + { + MQTT_INFO("DNS: Found, but got no ip, try to reconnect\r\n"); + client->connState = TCP_RECONNECT_REQ; + return; + } + + MQTT_INFO("DNS: found ip %d.%d.%d.%d\n", + *((uint8 *) &ipaddr->addr), + *((uint8 *) &ipaddr->addr + 1), + *((uint8 *) &ipaddr->addr + 2), + *((uint8 *) &ipaddr->addr + 3)); + + if (client->ip.addr == 0 && ipaddr->addr != 0) + { + os_memcpy(client->pCon->proto.tcp->remote_ip, &ipaddr->addr, 4); + if (client->security) { +#ifdef MQTT_SSL_ENABLE + espconn_secure_set_size(ESPCONN_CLIENT, MQTT_SSL_SIZE); + espconn_secure_connect(client->pCon); +#else + MQTT_INFO("TCP: Do not support SSL\r\n"); +#endif + } + else { + espconn_connect(client->pCon); + } + + client->connState = TCP_CONNECTING; + MQTT_INFO("TCP: connecting...\r\n"); + } + + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); +} + + + +LOCAL void ICACHE_FLASH_ATTR +deliver_publish(MQTT_Client* client, uint8_t* message, int length) +{ + mqtt_event_data_t event_data; + + event_data.topic_length = length; + event_data.topic = mqtt_get_publish_topic(message, &event_data.topic_length); + event_data.data_length = length; + event_data.data = mqtt_get_publish_data(message, &event_data.data_length); + + if (client->dataCb) + client->dataCb((uint32_t*)client, event_data.topic, event_data.topic_length, event_data.data, event_data.data_length); + +} + +void ICACHE_FLASH_ATTR +mqtt_send_keepalive(MQTT_Client *client) +{ + MQTT_INFO("\r\nMQTT: Send keepalive packet to %s:%d!\r\n", client->host, client->port); + client->mqtt_state.outbound_message = mqtt_msg_pingreq(&client->mqtt_state.mqtt_connection); + client->mqtt_state.pending_msg_type = MQTT_MSG_TYPE_PINGREQ; + client->mqtt_state.pending_msg_type = mqtt_get_type(client->mqtt_state.outbound_message->data); + client->mqtt_state.pending_msg_id = mqtt_get_id(client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length); + + + client->sendTimeout = MQTT_SEND_TIMOUT; + MQTT_INFO("MQTT: Sending, type: %d, id: %04X\r\n", client->mqtt_state.pending_msg_type, client->mqtt_state.pending_msg_id); + err_t result = ESPCONN_OK; + if (client->security) { +#ifdef MQTT_SSL_ENABLE + result = espconn_secure_send(client->pCon, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length); +#else + MQTT_INFO("TCP: Do not support SSL\r\n"); +#endif + } + else { + result = espconn_send(client->pCon, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length); + } + + client->mqtt_state.outbound_message = NULL; + if (ESPCONN_OK == result) { + client->keepAliveTick = 0; + client->connState = MQTT_DATA; + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); + } + else { + client->connState = TCP_RECONNECT_DISCONNECTING; + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); + } +} + +/** + * @brief Delete tcp client and free all memory + * @param mqttClient: The mqtt client which contain TCP client + * @retval None + */ +void ICACHE_FLASH_ATTR +mqtt_tcpclient_delete(MQTT_Client *mqttClient) +{ + if (mqttClient->pCon != NULL) { + MQTT_INFO("TCP: Free memory\r\n"); + // Force abort connections + espconn_abort(mqttClient->pCon); + // Delete connections + espconn_delete(mqttClient->pCon); + + if (mqttClient->pCon->proto.tcp) { + os_free(mqttClient->pCon->proto.tcp); + mqttClient->pCon->proto.tcp = NULL; + } + os_free(mqttClient->pCon); + mqttClient->pCon = NULL; + } +} + +/** + * @brief Delete MQTT client and free all memory + * @param mqttClient: The mqtt client + * @retval None + */ +void ICACHE_FLASH_ATTR +mqtt_client_delete(MQTT_Client *mqttClient) +{ + if (mqttClient == NULL) + return; + + if (mqttClient->pCon != NULL) { + mqtt_tcpclient_delete(mqttClient); + } + + if (mqttClient->host != NULL) { + os_free(mqttClient->host); + mqttClient->host = NULL; + } + + if (mqttClient->user_data != NULL) { + os_free(mqttClient->user_data); + mqttClient->user_data = NULL; + } + + if (mqttClient->mqtt_state.in_buffer != NULL) { + os_free(mqttClient->mqtt_state.in_buffer); + mqttClient->mqtt_state.in_buffer = NULL; + } + + if (mqttClient->mqtt_state.out_buffer != NULL) { + os_free(mqttClient->mqtt_state.out_buffer); + mqttClient->mqtt_state.out_buffer = NULL; + } + + if (mqttClient->mqtt_state.outbound_message != NULL) { + if (mqttClient->mqtt_state.outbound_message->data != NULL) + { + os_free(mqttClient->mqtt_state.outbound_message->data); + mqttClient->mqtt_state.outbound_message->data = NULL; + } + } + + if (mqttClient->mqtt_state.mqtt_connection.buffer != NULL) { + // Already freed but not NULL + mqttClient->mqtt_state.mqtt_connection.buffer = NULL; + } + + if (mqttClient->connect_info.client_id != NULL) { +#ifdef PROTOCOL_NAMEv311 + /* Don't attempt to free if it's the zero_len array */ + if ( ((uint8_t*)mqttClient->connect_info.client_id) != zero_len_id ) + os_free(mqttClient->connect_info.client_id); +#else + os_free(mqttClient->connect_info.client_id); +#endif + mqttClient->connect_info.client_id = NULL; + } + + if (mqttClient->connect_info.username != NULL) { + os_free(mqttClient->connect_info.username); + mqttClient->connect_info.username = NULL; + } + + if (mqttClient->connect_info.password != NULL) { + os_free(mqttClient->connect_info.password); + mqttClient->connect_info.password = NULL; + } + + if (mqttClient->connect_info.will_topic != NULL) { + os_free(mqttClient->connect_info.will_topic); + mqttClient->connect_info.will_topic = NULL; + } + + if (mqttClient->connect_info.will_message != NULL) { + os_free(mqttClient->connect_info.will_message); + mqttClient->connect_info.will_message = NULL; + } + + if (mqttClient->msgQueue.buf != NULL) { + os_free(mqttClient->msgQueue.buf); + mqttClient->msgQueue.buf = NULL; + } + + // Initialize state + mqttClient->connState = WIFI_INIT; + // Clear callback functions to avoid abnormal callback + mqttClient->connectedCb = NULL; + mqttClient->disconnectedCb = NULL; + mqttClient->publishedCb = NULL; + mqttClient->timeoutCb = NULL; + mqttClient->dataCb = NULL; + + MQTT_INFO("MQTT: client already deleted\r\n"); +} + + +/** + * @brief Client received callback function. + * @param arg: contain the ip link information + * @param pdata: received data + * @param len: the lenght of received data + * @retval None + */ +void ICACHE_FLASH_ATTR +mqtt_tcpclient_recv(void *arg, char *pdata, unsigned short len) +{ + uint8_t msg_type; + uint8_t msg_qos; + uint16_t msg_id; + uint8_t msg_conn_ret; + + struct espconn *pCon = (struct espconn*)arg; + MQTT_Client *client = (MQTT_Client *)pCon->reverse; + +READPACKET: + MQTT_INFO("TCP: data received %d bytes\r\n", len); + // MQTT_INFO("STATE: %d\r\n", client->connState); + if (len < MQTT_BUF_SIZE && len > 0) { + os_memcpy(client->mqtt_state.in_buffer, pdata, len); + + msg_type = mqtt_get_type(client->mqtt_state.in_buffer); + msg_qos = mqtt_get_qos(client->mqtt_state.in_buffer); + msg_id = mqtt_get_id(client->mqtt_state.in_buffer, client->mqtt_state.in_buffer_length); + switch (client->connState) { + case MQTT_CONNECT_SENDING: + if (msg_type == MQTT_MSG_TYPE_CONNACK) { + if (client->mqtt_state.pending_msg_type != MQTT_MSG_TYPE_CONNECT) { + MQTT_INFO("MQTT: Invalid packet\r\n"); + if (client->security) { +#ifdef MQTT_SSL_ENABLE + espconn_secure_disconnect(client->pCon); +#else + MQTT_INFO("TCP: Do not support SSL\r\n"); +#endif + } + else { + espconn_disconnect(client->pCon); + } + } else { + msg_conn_ret = mqtt_get_connect_return_code(client->mqtt_state.in_buffer); + switch (msg_conn_ret) { + case CONNECTION_ACCEPTED: + MQTT_INFO("MQTT: Connected to %s:%d\r\n", client->host, client->port); + client->connState = MQTT_DATA; + if (client->connectedCb) + client->connectedCb((uint32_t*)client); + break; + case CONNECTION_REFUSE_PROTOCOL: + case CONNECTION_REFUSE_SERVER_UNAVAILABLE: + case CONNECTION_REFUSE_BAD_USERNAME: + case CONNECTION_REFUSE_NOT_AUTHORIZED: + MQTT_INFO("MQTT: Connection refuse, reason code: %d\r\n", msg_conn_ret); + default: + if (client->security) { +#ifdef MQTT_SSL_ENABLE + espconn_secure_disconnect(client->pCon); +#else + MQTT_INFO("TCP: Do not support SSL\r\n"); +#endif + } + else { + espconn_disconnect(client->pCon); + } + + } + + } + + } + break; + case MQTT_DATA: + case MQTT_KEEPALIVE_SEND: + client->mqtt_state.message_length_read = len; + client->mqtt_state.message_length = mqtt_get_total_length(client->mqtt_state.in_buffer, client->mqtt_state.message_length_read); + + + switch (msg_type) + { + + case MQTT_MSG_TYPE_SUBACK: + if (client->mqtt_state.pending_msg_type == MQTT_MSG_TYPE_SUBSCRIBE && client->mqtt_state.pending_msg_id == msg_id) + MQTT_INFO("MQTT: Subscribe successful\r\n"); + break; + case MQTT_MSG_TYPE_UNSUBACK: + if (client->mqtt_state.pending_msg_type == MQTT_MSG_TYPE_UNSUBSCRIBE && client->mqtt_state.pending_msg_id == msg_id) + MQTT_INFO("MQTT: UnSubscribe successful\r\n"); + break; + case MQTT_MSG_TYPE_PUBLISH: + if (msg_qos == 1) + client->mqtt_state.outbound_message = mqtt_msg_puback(&client->mqtt_state.mqtt_connection, msg_id); + else if (msg_qos == 2) + client->mqtt_state.outbound_message = mqtt_msg_pubrec(&client->mqtt_state.mqtt_connection, msg_id); + if (msg_qos == 1 || msg_qos == 2) { + MQTT_INFO("MQTT: Queue response QoS: %d\r\n", msg_qos); + if (QUEUE_Puts(&client->msgQueue, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length) == -1) { + MQTT_INFO("MQTT: Queue full\r\n"); + } + } + + deliver_publish(client, client->mqtt_state.in_buffer, client->mqtt_state.message_length_read); + break; + case MQTT_MSG_TYPE_PUBACK: + if (client->mqtt_state.pending_msg_type == MQTT_MSG_TYPE_PUBLISH && client->mqtt_state.pending_msg_id == msg_id) { + MQTT_INFO("MQTT: received MQTT_MSG_TYPE_PUBACK, finish QoS1 publish\r\n"); + } + + break; + case MQTT_MSG_TYPE_PUBREC: + client->mqtt_state.outbound_message = mqtt_msg_pubrel(&client->mqtt_state.mqtt_connection, msg_id); + if (QUEUE_Puts(&client->msgQueue, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length) == -1) { + MQTT_INFO("MQTT: Queue full\r\n"); + } + break; + case MQTT_MSG_TYPE_PUBREL: + client->mqtt_state.outbound_message = mqtt_msg_pubcomp(&client->mqtt_state.mqtt_connection, msg_id); + if (QUEUE_Puts(&client->msgQueue, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length) == -1) { + MQTT_INFO("MQTT: Queue full\r\n"); + } + break; + case MQTT_MSG_TYPE_PUBCOMP: + if (client->mqtt_state.pending_msg_type == MQTT_MSG_TYPE_PUBLISH && client->mqtt_state.pending_msg_id == msg_id) { + MQTT_INFO("MQTT: receive MQTT_MSG_TYPE_PUBCOMP, finish QoS2 publish\r\n"); + } + break; + case MQTT_MSG_TYPE_PINGREQ: + client->mqtt_state.outbound_message = mqtt_msg_pingresp(&client->mqtt_state.mqtt_connection); + if (QUEUE_Puts(&client->msgQueue, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length) == -1) { + MQTT_INFO("MQTT: Queue full\r\n"); + } + break; + case MQTT_MSG_TYPE_PINGRESP: + // Ignore + break; + } + // NOTE: this is done down here and not in the switch case above + // because the PSOCK_READBUF_LEN() won't work inside a switch + // statement due to the way protothreads resume. + if (msg_type == MQTT_MSG_TYPE_PUBLISH) + { + len = client->mqtt_state.message_length_read; + + if (client->mqtt_state.message_length < client->mqtt_state.message_length_read) + { + //client->connState = MQTT_PUBLISH_RECV; + //Not Implement yet + len -= client->mqtt_state.message_length; + pdata += client->mqtt_state.message_length; + + MQTT_INFO("Get another published message\r\n"); + goto READPACKET; + } + + } + break; + } + } else { + MQTT_INFO("ERROR: Message too long\r\n"); + } + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); +} + +/** + * @brief Client send over callback function. + * @param arg: contain the ip link information + * @retval None + */ +void ICACHE_FLASH_ATTR +mqtt_tcpclient_sent_cb(void *arg) +{ + struct espconn *pCon = (struct espconn *)arg; + MQTT_Client* client = (MQTT_Client *)pCon->reverse; + MQTT_INFO("TCP: Sent\r\n"); + client->sendTimeout = 0; + client->keepAliveTick = 0; + + if ((client->connState == MQTT_DATA || client->connState == MQTT_KEEPALIVE_SEND) + && client->mqtt_state.pending_msg_type == MQTT_MSG_TYPE_PUBLISH) { + if (client->publishedCb) + client->publishedCb((uint32_t*)client); + } + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); +} + +void ICACHE_FLASH_ATTR mqtt_timer(void *arg) +{ + MQTT_Client* client = (MQTT_Client*)arg; + + if (client->connState == MQTT_DATA) { + client->keepAliveTick ++; + if (client->keepAliveTick > (client->mqtt_state.connect_info->keepalive / 2)) { + client->connState = MQTT_KEEPALIVE_SEND; + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); + } + + } else if (client->connState == TCP_RECONNECT_REQ) { + client->reconnectTick ++; + if (client->reconnectTick > MQTT_RECONNECT_TIMEOUT) { + client->reconnectTick = 0; + client->connState = TCP_RECONNECT; + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); + if (client->timeoutCb) + client->timeoutCb((uint32_t*)client); + } + } + if (client->sendTimeout > 0) + client->sendTimeout --; +} + +void ICACHE_FLASH_ATTR +mqtt_tcpclient_discon_cb(void *arg) +{ + + struct espconn *pespconn = (struct espconn *)arg; + MQTT_Client* client = (MQTT_Client *)pespconn->reverse; + MQTT_INFO("TCP: Disconnected callback\r\n"); + if (TCP_DISCONNECTING == client->connState) { + client->connState = TCP_DISCONNECTED; + } + else if (MQTT_DELETING == client->connState) { + client->connState = MQTT_DELETED; + } + else { + client->connState = TCP_RECONNECT_REQ; + } + if (client->disconnectedCb) + client->disconnectedCb((uint32_t*)client); + + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); +} + + + +/** + * @brief Tcp client connect success callback function. + * @param arg: contain the ip link information + * @retval None + */ +void ICACHE_FLASH_ATTR +mqtt_tcpclient_connect_cb(void *arg) +{ + struct espconn *pCon = (struct espconn *)arg; + MQTT_Client* client = (MQTT_Client *)pCon->reverse; + + espconn_regist_disconcb(client->pCon, mqtt_tcpclient_discon_cb); + espconn_regist_recvcb(client->pCon, mqtt_tcpclient_recv);//////// + espconn_regist_sentcb(client->pCon, mqtt_tcpclient_sent_cb);/////// + MQTT_INFO("MQTT: Connected to broker %s:%d\r\n", client->host, client->port); + + mqtt_msg_init(&client->mqtt_state.mqtt_connection, client->mqtt_state.out_buffer, client->mqtt_state.out_buffer_length); + client->mqtt_state.outbound_message = mqtt_msg_connect(&client->mqtt_state.mqtt_connection, client->mqtt_state.connect_info); + client->mqtt_state.pending_msg_type = mqtt_get_type(client->mqtt_state.outbound_message->data); + client->mqtt_state.pending_msg_id = mqtt_get_id(client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length); + + + client->sendTimeout = MQTT_SEND_TIMOUT; + MQTT_INFO("MQTT: Sending, type: %d, id: %04X\r\n", client->mqtt_state.pending_msg_type, client->mqtt_state.pending_msg_id); + if (client->security) { +#ifdef MQTT_SSL_ENABLE + espconn_secure_send(client->pCon, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length); +#else + MQTT_INFO("TCP: Do not support SSL\r\n"); +#endif + } + else { + espconn_send(client->pCon, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length); + } + + client->mqtt_state.outbound_message = NULL; + client->connState = MQTT_CONNECT_SENDING; + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); +} + +/** + * @brief Tcp client connect repeat callback function. + * @param arg: contain the ip link information + * @retval None + */ +void ICACHE_FLASH_ATTR +mqtt_tcpclient_recon_cb(void *arg, sint8 errType) +{ + struct espconn *pCon = (struct espconn *)arg; + MQTT_Client* client = (MQTT_Client *)pCon->reverse; + + MQTT_INFO("TCP: Reconnect to %s:%d\r\n", client->host, client->port); + + client->connState = TCP_RECONNECT_REQ; + + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); + +} + +/** + * @brief MQTT publish function. + * @param client: MQTT_Client reference + * @param topic: string topic will publish to + * @param data: buffer data send point to + * @param data_length: length of data + * @param qos: qos + * @param retain: retain + * @retval TRUE if success queue + */ +bool ICACHE_FLASH_ATTR +MQTT_Publish(MQTT_Client *client, const char* topic, const char* data, int data_length, int qos, int retain) +{ + uint8_t dataBuffer[MQTT_BUF_SIZE]; + uint16_t dataLen; + client->mqtt_state.outbound_message = mqtt_msg_publish(&client->mqtt_state.mqtt_connection, + topic, data, data_length, + qos, retain, + &client->mqtt_state.pending_msg_id); + if (client->mqtt_state.outbound_message->length == 0) { + MQTT_INFO("MQTT: Queuing publish failed\r\n"); + return FALSE; + } + MQTT_INFO("MQTT: queuing publish, length: %d, queue size(%d/%d)\r\n", client->mqtt_state.outbound_message->length, client->msgQueue.rb.fill_cnt, client->msgQueue.rb.size); + while (QUEUE_Puts(&client->msgQueue, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length) == -1) { + MQTT_INFO("MQTT: Queue full\r\n"); + if (QUEUE_Gets(&client->msgQueue, dataBuffer, &dataLen, MQTT_BUF_SIZE) == -1) { + MQTT_INFO("MQTT: Serious buffer error\r\n"); + return FALSE; + } + } + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); + return TRUE; +} + +/** + * @brief MQTT subscibe function. + * @param client: MQTT_Client reference + * @param topic: string topic will subscribe + * @param qos: qos + * @retval TRUE if success queue + */ +bool ICACHE_FLASH_ATTR +MQTT_Subscribe(MQTT_Client *client, char* topic, uint8_t qos) +{ + uint8_t dataBuffer[MQTT_BUF_SIZE]; + uint16_t dataLen; + + client->mqtt_state.outbound_message = mqtt_msg_subscribe(&client->mqtt_state.mqtt_connection, + topic, qos, + &client->mqtt_state.pending_msg_id); + MQTT_INFO("MQTT: queue subscribe, topic\"%s\", id: %d\r\n", topic, client->mqtt_state.pending_msg_id); + while (QUEUE_Puts(&client->msgQueue, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length) == -1) { + MQTT_INFO("MQTT: Queue full\r\n"); + if (QUEUE_Gets(&client->msgQueue, dataBuffer, &dataLen, MQTT_BUF_SIZE) == -1) { + MQTT_INFO("MQTT: Serious buffer error\r\n"); + return FALSE; + } + } + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); + + return TRUE; +} + +/** + * @brief MQTT un-subscibe function. + * @param client: MQTT_Client reference + * @param topic: String topic will un-subscribe + * @retval TRUE if success queue + */ +bool ICACHE_FLASH_ATTR +MQTT_UnSubscribe(MQTT_Client *client, char* topic) +{ + uint8_t dataBuffer[MQTT_BUF_SIZE]; + uint16_t dataLen; + client->mqtt_state.outbound_message = mqtt_msg_unsubscribe(&client->mqtt_state.mqtt_connection, + topic, + &client->mqtt_state.pending_msg_id); + MQTT_INFO("MQTT: queue un-subscribe, topic\"%s\", id: %d\r\n", topic, client->mqtt_state.pending_msg_id); + while (QUEUE_Puts(&client->msgQueue, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length) == -1) { + MQTT_INFO("MQTT: Queue full\r\n"); + if (QUEUE_Gets(&client->msgQueue, dataBuffer, &dataLen, MQTT_BUF_SIZE) == -1) { + MQTT_INFO("MQTT: Serious buffer error\r\n"); + return FALSE; + } + } + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); + return TRUE; +} + +/** + * @brief MQTT ping function. + * @param client: MQTT_Client reference + * @retval TRUE if success queue + */ +bool ICACHE_FLASH_ATTR +MQTT_Ping(MQTT_Client *client) +{ + uint8_t dataBuffer[MQTT_BUF_SIZE]; + uint16_t dataLen; + client->mqtt_state.outbound_message = mqtt_msg_pingreq(&client->mqtt_state.mqtt_connection); + if (client->mqtt_state.outbound_message->length == 0) { + MQTT_INFO("MQTT: Queuing publish failed\r\n"); + return FALSE; + } + MQTT_INFO("MQTT: queuing publish, length: %d, queue size(%d/%d)\r\n", client->mqtt_state.outbound_message->length, client->msgQueue.rb.fill_cnt, client->msgQueue.rb.size); + while (QUEUE_Puts(&client->msgQueue, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length) == -1) { + MQTT_INFO("MQTT: Queue full\r\n"); + if (QUEUE_Gets(&client->msgQueue, dataBuffer, &dataLen, MQTT_BUF_SIZE) == -1) { + MQTT_INFO("MQTT: Serious buffer error\r\n"); + return FALSE; + } + } + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); + return TRUE; +} + +void ICACHE_FLASH_ATTR +MQTT_Task(os_event_t *e) +{ + MQTT_Client* client = (MQTT_Client*)e->par; + uint8_t dataBuffer[MQTT_BUF_SIZE]; + uint16_t dataLen; + if (e->par == 0) + return; + switch (client->connState) { + + case TCP_RECONNECT_REQ: + break; + case TCP_RECONNECT: + mqtt_tcpclient_delete(client); + MQTT_Connect(client); + MQTT_INFO("TCP: Reconnect to: %s:%d\r\n", client->host, client->port); + client->connState = TCP_CONNECTING; + break; + case MQTT_DELETING: + case TCP_DISCONNECTING: + case TCP_RECONNECT_DISCONNECTING: + if (client->security) { +#ifdef MQTT_SSL_ENABLE + espconn_secure_disconnect(client->pCon); +#else + MQTT_INFO("TCP: Do not support SSL\r\n"); +#endif + } + else { + espconn_disconnect(client->pCon); + } + break; + case TCP_DISCONNECTED: + MQTT_INFO("MQTT: Disconnected\r\n"); + mqtt_tcpclient_delete(client); + break; + case MQTT_DELETED: + MQTT_INFO("MQTT: Deleted client\r\n"); + mqtt_client_delete(client); + break; + case MQTT_KEEPALIVE_SEND: + mqtt_send_keepalive(client); + break; + case MQTT_DATA: + if (QUEUE_IsEmpty(&client->msgQueue) || client->sendTimeout != 0) { + break; + } + if (QUEUE_Gets(&client->msgQueue, dataBuffer, &dataLen, MQTT_BUF_SIZE) == 0) { + client->mqtt_state.pending_msg_type = mqtt_get_type(dataBuffer); + client->mqtt_state.pending_msg_id = mqtt_get_id(dataBuffer, dataLen); + + + client->sendTimeout = MQTT_SEND_TIMOUT; + MQTT_INFO("MQTT: Sending, type: %d, id: %04X\r\n", client->mqtt_state.pending_msg_type, client->mqtt_state.pending_msg_id); + client->keepAliveTick = 0; + if (client->security) { +#ifdef MQTT_SSL_ENABLE + espconn_secure_send(client->pCon, dataBuffer, dataLen); +#else + MQTT_INFO("TCP: Do not support SSL\r\n"); +#endif + } + else { + espconn_send(client->pCon, dataBuffer, dataLen); + } + + client->mqtt_state.outbound_message = NULL; + break; + } + break; + } +} + +/** + * @brief MQTT initialization connection function + * @param client: MQTT_Client reference + * @param host: Domain or IP string + * @param port: Port to connect + * @param security: 1 for ssl, 0 for none + * @retval None + */ +void ICACHE_FLASH_ATTR +MQTT_InitConnection(MQTT_Client *mqttClient, uint8_t* host, uint32_t port, uint8_t security) +{ + uint32_t temp; + MQTT_INFO("MQTT:InitConnection\r\n"); + os_memset(mqttClient, 0, sizeof(MQTT_Client)); + temp = os_strlen(host); + mqttClient->host = (uint8_t*)os_zalloc(temp + 1); + os_strcpy(mqttClient->host, host); + mqttClient->host[temp] = 0; + mqttClient->port = port; + mqttClient->security = security; + +} + +/** + * @brief MQTT initialization mqtt client function + * @param client: MQTT_Client reference + * @param clientid: MQTT client id + * @param client_user:MQTT client user + * @param client_pass:MQTT client password + * @param client_pass:MQTT keep alive timer, in second + * @retval None + */ +bool ICACHE_FLASH_ATTR +MQTT_InitClient(MQTT_Client *mqttClient, uint8_t* client_id, uint8_t* client_user, uint8_t* client_pass, uint32_t keepAliveTime, uint8_t cleanSession) +{ + uint32_t temp; + MQTT_INFO("MQTT:InitClient\r\n"); + + os_memset(&mqttClient->connect_info, 0, sizeof(mqtt_connect_info_t)); + + if ( !client_id ) + { + /* Should be allowed by broker, but clean session flag must be set. */ + #ifdef PROTOCOL_NAMEv311 + if (cleanSession) + { + mqttClient->connect_info.client_id = zero_len_id; + } else { + MQTT_INFO("cleanSession must be set to use 0 length client_id\r\n"); + return false; + } + /* Not supported. Return. */ + #else + MQTT_INFO("Client ID required for MQTT < 3.1.1!\r\n"); + return false; + #endif + } + + /* If connect_info's client_id is still NULL and we get here, we can * + * assume the passed client_id is non-NULL. */ + if ( !(mqttClient->connect_info.client_id) ) + { + temp = os_strlen(client_id); + mqttClient->connect_info.client_id = (uint8_t*)os_zalloc(temp + 1); + os_strcpy(mqttClient->connect_info.client_id, client_id); + mqttClient->connect_info.client_id[temp] = 0; + } + + if (client_user) + { + temp = os_strlen(client_user); + mqttClient->connect_info.username = (uint8_t*)os_zalloc(temp + 1); + os_strcpy(mqttClient->connect_info.username, client_user); + mqttClient->connect_info.username[temp] = 0; + } + + if (client_pass) + { + temp = os_strlen(client_pass); + mqttClient->connect_info.password = (uint8_t*)os_zalloc(temp + 1); + os_strcpy(mqttClient->connect_info.password, client_pass); + mqttClient->connect_info.password[temp] = 0; + } + + + mqttClient->connect_info.keepalive = keepAliveTime; + mqttClient->connect_info.clean_session = cleanSession; + + mqttClient->mqtt_state.in_buffer = (uint8_t *)os_zalloc(MQTT_BUF_SIZE); + mqttClient->mqtt_state.in_buffer_length = MQTT_BUF_SIZE; + mqttClient->mqtt_state.out_buffer = (uint8_t *)os_zalloc(MQTT_BUF_SIZE); + mqttClient->mqtt_state.out_buffer_length = MQTT_BUF_SIZE; + mqttClient->mqtt_state.connect_info = &mqttClient->connect_info; + + mqtt_msg_init(&mqttClient->mqtt_state.mqtt_connection, mqttClient->mqtt_state.out_buffer, mqttClient->mqtt_state.out_buffer_length); + + QUEUE_Init(&mqttClient->msgQueue, QUEUE_BUFFER_SIZE); + + system_os_task(MQTT_Task, MQTT_TASK_PRIO, mqtt_procTaskQueue, MQTT_TASK_QUEUE_SIZE); + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)mqttClient); + return true; +} +void ICACHE_FLASH_ATTR +MQTT_InitLWT(MQTT_Client *mqttClient, uint8_t* will_topic, uint8_t* will_msg, uint8_t will_qos, uint8_t will_retain) +{ + uint32_t temp; + temp = os_strlen(will_topic); + mqttClient->connect_info.will_topic = (uint8_t*)os_zalloc(temp + 1); + os_strcpy(mqttClient->connect_info.will_topic, will_topic); + mqttClient->connect_info.will_topic[temp] = 0; + + temp = os_strlen(will_msg); + mqttClient->connect_info.will_message = (uint8_t*)os_zalloc(temp + 1); + os_strcpy(mqttClient->connect_info.will_message, will_msg); + mqttClient->connect_info.will_message[temp] = 0; + + + mqttClient->connect_info.will_qos = will_qos; + mqttClient->connect_info.will_retain = will_retain; +} +/** + * @brief Begin connect to MQTT broker + * @param client: MQTT_Client reference + * @retval None + */ +void ICACHE_FLASH_ATTR +MQTT_Connect(MQTT_Client *mqttClient) +{ + if (mqttClient->pCon) { + // Clean up the old connection forcefully - using MQTT_Disconnect + // does not actually release the old connection until the + // disconnection callback is invoked. + mqtt_tcpclient_delete(mqttClient); + } + mqttClient->pCon = (struct espconn *)os_zalloc(sizeof(struct espconn)); + mqttClient->pCon->type = ESPCONN_TCP; + mqttClient->pCon->state = ESPCONN_NONE; + mqttClient->pCon->proto.tcp = (esp_tcp *)os_zalloc(sizeof(esp_tcp)); + mqttClient->pCon->proto.tcp->local_port = espconn_port(); + mqttClient->pCon->proto.tcp->remote_port = mqttClient->port; + mqttClient->pCon->reverse = mqttClient; + espconn_regist_connectcb(mqttClient->pCon, mqtt_tcpclient_connect_cb); + espconn_regist_reconcb(mqttClient->pCon, mqtt_tcpclient_recon_cb); + + mqttClient->keepAliveTick = 0; + mqttClient->reconnectTick = 0; + + + os_timer_disarm(&mqttClient->mqttTimer); + os_timer_setfn(&mqttClient->mqttTimer, (os_timer_func_t *)mqtt_timer, mqttClient); + os_timer_arm(&mqttClient->mqttTimer, 1000, 1); + + if (UTILS_StrToIP(mqttClient->host, &mqttClient->pCon->proto.tcp->remote_ip)) { + MQTT_INFO("TCP: Connect to ip %s:%d\r\n", mqttClient->host, mqttClient->port); + if (mqttClient->security) + { +#ifdef MQTT_SSL_ENABLE + espconn_secure_set_size(ESPCONN_CLIENT, MQTT_SSL_SIZE); + espconn_secure_connect(mqttClient->pCon); +#else + MQTT_INFO("TCP: Do not support SSL\r\n"); +#endif + } + else + { + espconn_connect(mqttClient->pCon); + } + } + else { + MQTT_INFO("TCP: Connect to domain %s:%d\r\n", mqttClient->host, mqttClient->port); + espconn_gethostbyname(mqttClient->pCon, mqttClient->host, &mqttClient->ip, mqtt_dns_found); + } + mqttClient->connState = TCP_CONNECTING; +} + +void ICACHE_FLASH_ATTR +MQTT_Disconnect(MQTT_Client *mqttClient) +{ + mqttClient->connState = TCP_DISCONNECTING; + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)mqttClient); + os_timer_disarm(&mqttClient->mqttTimer); +} + +void ICACHE_FLASH_ATTR +MQTT_DeleteClient(MQTT_Client *mqttClient) +{ + if (NULL == mqttClient) + return; + + mqttClient->connState = MQTT_DELETED; + // if(TCP_DISCONNECTED == mqttClient->connState) { + // mqttClient->connState = MQTT_DELETED; + // } else if(MQTT_DELETED != mqttClient->connState) { + // mqttClient->connState = MQTT_DELETING; + // } + + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)mqttClient); + os_timer_disarm(&mqttClient->mqttTimer); +} + +void ICACHE_FLASH_ATTR +MQTT_OnConnected(MQTT_Client *mqttClient, MqttCallback connectedCb) +{ + mqttClient->connectedCb = connectedCb; +} + +void ICACHE_FLASH_ATTR +MQTT_OnDisconnected(MQTT_Client *mqttClient, MqttCallback disconnectedCb) +{ + mqttClient->disconnectedCb = disconnectedCb; +} + +void ICACHE_FLASH_ATTR +MQTT_OnData(MQTT_Client *mqttClient, MqttDataCallback dataCb) +{ + mqttClient->dataCb = dataCb; +} + +void ICACHE_FLASH_ATTR +MQTT_OnPublished(MQTT_Client *mqttClient, MqttCallback publishedCb) +{ + mqttClient->publishedCb = publishedCb; +} + +void ICACHE_FLASH_ATTR +MQTT_OnTimeout(MQTT_Client *mqttClient, MqttCallback timeoutCb) +{ + mqttClient->timeoutCb = timeoutCb; +} diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt.h b/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt.h new file mode 100644 index 000000000..96489107e --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt.h @@ -0,0 +1,148 @@ +/* mqtt.h +* +* Copyright (c) 2014-2015, Tuan PM +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* +* * Redistributions of source code must retain the above copyright notice, +* this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of Redis nor the names of its contributors may be used +* to endorse or promote products derived from this software without +* specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +*/ +#ifndef USER_AT_MQTT_H_ +#define USER_AT_MQTT_H_ +#include "user_config.h" +#include "mqtt_msg.h" +#include "user_interface.h" + +#include "queue.h" +typedef struct mqtt_event_data_t +{ + uint8_t type; + const char* topic; + const char* data; + uint16_t topic_length; + uint16_t data_length; + uint16_t data_offset; +} mqtt_event_data_t; + +typedef struct mqtt_state_t +{ + uint16_t port; + int auto_reconnect; + mqtt_connect_info_t* connect_info; + uint8_t* in_buffer; + uint8_t* out_buffer; + int in_buffer_length; + int out_buffer_length; + uint16_t message_length; + uint16_t message_length_read; + mqtt_message_t* outbound_message; + mqtt_connection_t mqtt_connection; + uint16_t pending_msg_id; + int pending_msg_type; + int pending_publish_qos; +} mqtt_state_t; + +typedef enum { + WIFI_INIT, + WIFI_CONNECTING, + WIFI_CONNECTING_ERROR, + WIFI_CONNECTED, + DNS_RESOLVE, + TCP_DISCONNECTING, + TCP_DISCONNECTED, + TCP_RECONNECT_DISCONNECTING, + TCP_RECONNECT_REQ, + TCP_RECONNECT, + TCP_CONNECTING, + TCP_CONNECTING_ERROR, + TCP_CONNECTED, + MQTT_CONNECT_SEND, + MQTT_CONNECT_SENDING, + MQTT_SUBSCIBE_SEND, + MQTT_SUBSCIBE_SENDING, + MQTT_DATA, + MQTT_KEEPALIVE_SEND, + MQTT_PUBLISH_RECV, + MQTT_PUBLISHING, + MQTT_DELETING, + MQTT_DELETED, +} tConnState; + +typedef void (*MqttCallback)(uint32_t *args); +typedef void (*MqttDataCallback)(uint32_t *args, const char* topic, uint32_t topic_len, const char *data, uint32_t lengh); + +typedef struct { + struct espconn *pCon; + uint8_t security; + uint8_t* host; + uint32_t port; + ip_addr_t ip; + mqtt_state_t mqtt_state; + mqtt_connect_info_t connect_info; + MqttCallback connectedCb; + MqttCallback disconnectedCb; + MqttCallback publishedCb; + MqttCallback timeoutCb; + MqttDataCallback dataCb; + ETSTimer mqttTimer; + uint32_t keepAliveTick; + uint32_t reconnectTick; + uint32_t sendTimeout; + tConnState connState; + QUEUE msgQueue; + void* user_data; +} MQTT_Client; + +#define SEC_NONSSL 0 +#define SEC_SSL 1 + +#define MQTT_FLAG_CONNECTED 1 +#define MQTT_FLAG_READY 2 +#define MQTT_FLAG_EXIT 4 + +#define MQTT_EVENT_TYPE_NONE 0 +#define MQTT_EVENT_TYPE_CONNECTED 1 +#define MQTT_EVENT_TYPE_DISCONNECTED 2 +#define MQTT_EVENT_TYPE_SUBSCRIBED 3 +#define MQTT_EVENT_TYPE_UNSUBSCRIBED 4 +#define MQTT_EVENT_TYPE_PUBLISH 5 +#define MQTT_EVENT_TYPE_PUBLISHED 6 +#define MQTT_EVENT_TYPE_EXITED 7 +#define MQTT_EVENT_TYPE_PUBLISH_CONTINUATION 8 + +void ICACHE_FLASH_ATTR MQTT_InitConnection(MQTT_Client *mqttClient, uint8_t* host, uint32_t port, uint8_t security); +bool ICACHE_FLASH_ATTR MQTT_InitClient(MQTT_Client *mqttClient, uint8_t* client_id, uint8_t* client_user, uint8_t* client_pass, uint32_t keepAliveTime, uint8_t cleanSession); +void ICACHE_FLASH_ATTR MQTT_DeleteClient(MQTT_Client *mqttClient); +void ICACHE_FLASH_ATTR MQTT_InitLWT(MQTT_Client *mqttClient, uint8_t* will_topic, uint8_t* will_msg, uint8_t will_qos, uint8_t will_retain); +void ICACHE_FLASH_ATTR MQTT_OnConnected(MQTT_Client *mqttClient, MqttCallback connectedCb); +void ICACHE_FLASH_ATTR MQTT_OnDisconnected(MQTT_Client *mqttClient, MqttCallback disconnectedCb); +void ICACHE_FLASH_ATTR MQTT_OnPublished(MQTT_Client *mqttClient, MqttCallback publishedCb); +void ICACHE_FLASH_ATTR MQTT_OnTimeout(MQTT_Client *mqttClient, MqttCallback timeoutCb); +void ICACHE_FLASH_ATTR MQTT_OnData(MQTT_Client *mqttClient, MqttDataCallback dataCb); +bool ICACHE_FLASH_ATTR MQTT_Subscribe(MQTT_Client *client, char* topic, uint8_t qos); +bool ICACHE_FLASH_ATTR MQTT_UnSubscribe(MQTT_Client *client, char* topic); +void ICACHE_FLASH_ATTR MQTT_Connect(MQTT_Client *mqttClient); +void ICACHE_FLASH_ATTR MQTT_Disconnect(MQTT_Client *mqttClient); +bool ICACHE_FLASH_ATTR MQTT_Publish(MQTT_Client *client, const char* topic, const char* data, int data_length, int qos, int retain); + +#endif /* USER_AT_MQTT_H_ */ diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt_msg.c b/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt_msg.c new file mode 100644 index 000000000..57dcbac27 --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt_msg.c @@ -0,0 +1,487 @@ +/* +* Copyright (c) 2014, Stephen Robinson +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* +* 1. Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* 2. Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* 3. Neither the name of the copyright holder nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +* +*/ + +#include +#include "mqtt_msg.h" +#include "user_config.h" +#define MQTT_MAX_FIXED_HEADER_SIZE 3 + +enum mqtt_connect_flag +{ + MQTT_CONNECT_FLAG_USERNAME = 1 << 7, + MQTT_CONNECT_FLAG_PASSWORD = 1 << 6, + MQTT_CONNECT_FLAG_WILL_RETAIN = 1 << 5, + MQTT_CONNECT_FLAG_WILL = 1 << 2, + MQTT_CONNECT_FLAG_CLEAN_SESSION = 1 << 1 +}; + +struct __attribute((__packed__)) mqtt_connect_variable_header +{ + uint8_t lengthMsb; + uint8_t lengthLsb; +#if defined(PROTOCOL_NAMEv31) + uint8_t magic[6]; +#elif defined(PROTOCOL_NAMEv311) + uint8_t magic[4]; +#else +#error "Please define protocol name" +#endif + uint8_t version; + uint8_t flags; + uint8_t keepaliveMsb; + uint8_t keepaliveLsb; +}; + +static int ICACHE_FLASH_ATTR append_string(mqtt_connection_t* connection, const char* string, int len) +{ + if (connection->message.length + len + 2 > connection->buffer_length) + return -1; + + connection->buffer[connection->message.length++] = len >> 8; + connection->buffer[connection->message.length++] = len & 0xff; + memcpy(connection->buffer + connection->message.length, string, len); + connection->message.length += len; + + return len + 2; +} + +static uint16_t ICACHE_FLASH_ATTR append_message_id(mqtt_connection_t* connection, uint16_t message_id) +{ + // If message_id is zero then we should assign one, otherwise + // we'll use the one supplied by the caller + while (message_id == 0) + message_id = ++connection->message_id; + + if (connection->message.length + 2 > connection->buffer_length) + return 0; + + connection->buffer[connection->message.length++] = message_id >> 8; + connection->buffer[connection->message.length++] = message_id & 0xff; + + return message_id; +} + +static int ICACHE_FLASH_ATTR init_message(mqtt_connection_t* connection) +{ + connection->message.length = MQTT_MAX_FIXED_HEADER_SIZE; + return MQTT_MAX_FIXED_HEADER_SIZE; +} + +static mqtt_message_t* ICACHE_FLASH_ATTR fail_message(mqtt_connection_t* connection) +{ + connection->message.data = connection->buffer; + connection->message.length = 0; + return &connection->message; +} + +static mqtt_message_t* ICACHE_FLASH_ATTR fini_message(mqtt_connection_t* connection, int type, int dup, int qos, int retain) +{ + int remaining_length = connection->message.length - MQTT_MAX_FIXED_HEADER_SIZE; + + if (remaining_length > 127) + { + connection->buffer[0] = ((type & 0x0f) << 4) | ((dup & 1) << 3) | ((qos & 3) << 1) | (retain & 1); + connection->buffer[1] = 0x80 | (remaining_length % 128); + connection->buffer[2] = remaining_length / 128; + connection->message.length = remaining_length + 3; + connection->message.data = connection->buffer; + } + else + { + connection->buffer[1] = ((type & 0x0f) << 4) | ((dup & 1) << 3) | ((qos & 3) << 1) | (retain & 1); + connection->buffer[2] = remaining_length; + connection->message.length = remaining_length + 2; + connection->message.data = connection->buffer + 1; + } + + return &connection->message; +} + +void ICACHE_FLASH_ATTR mqtt_msg_init(mqtt_connection_t* connection, uint8_t* buffer, uint16_t buffer_length) +{ + memset(connection, 0, sizeof(mqtt_connection_t)); + connection->buffer = buffer; + connection->buffer_length = buffer_length; +} + +int ICACHE_FLASH_ATTR mqtt_get_total_length(uint8_t* buffer, uint16_t length) +{ + int i; + int totlen = 0; + + for (i = 1; i < length; ++i) + { + totlen += (buffer[i] & 0x7f) << (7 * (i - 1)); + if ((buffer[i] & 0x80) == 0) + { + ++i; + break; + } + } + totlen += i; + + return totlen; +} + +const char* ICACHE_FLASH_ATTR mqtt_get_publish_topic(uint8_t* buffer, uint16_t* length) +{ + int i; + int totlen = 0; + int topiclen; + + for (i = 1; i < *length; ++i) + { + totlen += (buffer[i] & 0x7f) << (7 * (i - 1)); + if ((buffer[i] & 0x80) == 0) + { + ++i; + break; + } + } + totlen += i; + + if (i + 2 >= *length) + return NULL; + topiclen = buffer[i++] << 8; + topiclen |= buffer[i++]; + + if (i + topiclen > *length) + return NULL; + + *length = topiclen; + return (const char*)(buffer + i); +} + +const char* ICACHE_FLASH_ATTR mqtt_get_publish_data(uint8_t* buffer, uint16_t* length) +{ + int i; + int totlen = 0; + int topiclen; + int blength = *length; + *length = 0; + + for (i = 1; i < blength; ++i) + { + totlen += (buffer[i] & 0x7f) << (7 * (i - 1)); + if ((buffer[i] & 0x80) == 0) + { + ++i; + break; + } + } + totlen += i; + + if (i + 2 >= blength) + return NULL; + topiclen = buffer[i++] << 8; + topiclen |= buffer[i++]; + + if (i + topiclen >= blength) + return NULL; + + i += topiclen; + + if (mqtt_get_qos(buffer) > 0) + { + if (i + 2 >= blength) + return NULL; + i += 2; + } + + if (totlen < i) + return NULL; + + if (totlen <= blength) + *length = totlen - i; + else + *length = blength - i; + return (const char*)(buffer + i); +} + +uint16_t ICACHE_FLASH_ATTR mqtt_get_id(uint8_t* buffer, uint16_t length) +{ + if (length < 1) + return 0; + + switch (mqtt_get_type(buffer)) + { + case MQTT_MSG_TYPE_PUBLISH: + { + int i; + int topiclen; + + for (i = 1; i < length; ++i) + { + if ((buffer[i] & 0x80) == 0) + { + ++i; + break; + } + } + + if (i + 2 >= length) + return 0; + topiclen = buffer[i++] << 8; + topiclen |= buffer[i++]; + + if (i + topiclen >= length) + return 0; + i += topiclen; + + if (mqtt_get_qos(buffer) > 0) + { + if (i + 2 >= length) + return 0; + //i += 2; + } else { + return 0; + } + + return (buffer[i] << 8) | buffer[i + 1]; + } + case MQTT_MSG_TYPE_PUBACK: + case MQTT_MSG_TYPE_PUBREC: + case MQTT_MSG_TYPE_PUBREL: + case MQTT_MSG_TYPE_PUBCOMP: + case MQTT_MSG_TYPE_SUBACK: + case MQTT_MSG_TYPE_UNSUBACK: + case MQTT_MSG_TYPE_SUBSCRIBE: + { + // This requires the remaining length to be encoded in 1 byte, + // which it should be. + if (length >= 4 && (buffer[1] & 0x80) == 0) + return (buffer[2] << 8) | buffer[3]; + else + return 0; + } + + default: + return 0; + } +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_connect(mqtt_connection_t* connection, mqtt_connect_info_t* info) +{ + struct mqtt_connect_variable_header* variable_header; + + init_message(connection); + + if (connection->message.length + sizeof(*variable_header) > connection->buffer_length) + return fail_message(connection); + variable_header = (void*)(connection->buffer + connection->message.length); + connection->message.length += sizeof(*variable_header); + + variable_header->lengthMsb = 0; +#if defined(PROTOCOL_NAMEv31) + variable_header->lengthLsb = 6; + memcpy(variable_header->magic, "MQIsdp", 6); + variable_header->version = 3; +#elif defined(PROTOCOL_NAMEv311) + variable_header->lengthLsb = 4; + memcpy(variable_header->magic, "MQTT", 4); + variable_header->version = 4; +#else +#error "Please define protocol name" +#endif + + variable_header->flags = 0; + variable_header->keepaliveMsb = info->keepalive >> 8; + variable_header->keepaliveLsb = info->keepalive & 0xff; + + if (info->clean_session) + variable_header->flags |= MQTT_CONNECT_FLAG_CLEAN_SESSION; + + if (info->client_id == NULL) + { + /* Never allowed */ + return fail_message(connection); + } + else if (info->client_id[0] == '\0') + { +#ifdef PROTOCOL_NAMEv311 + /* Allowed. Format 0 Length ID */ + append_string(connection, info->client_id, 2) ; +#else + /* 0 Length not allowed */ + return fail_message(connection); +#endif + } + else + { + /* No 0 data and at least 1 long. Good to go. */ + if(append_string(connection, info->client_id, strlen(info->client_id)) < 0) + return fail_message(connection); + } + + if (info->will_topic != NULL && info->will_topic[0] != '\0') + { + if (append_string(connection, info->will_topic, strlen(info->will_topic)) < 0) + return fail_message(connection); + + if (append_string(connection, info->will_message, strlen(info->will_message)) < 0) + return fail_message(connection); + + variable_header->flags |= MQTT_CONNECT_FLAG_WILL; + if (info->will_retain) + variable_header->flags |= MQTT_CONNECT_FLAG_WILL_RETAIN; + variable_header->flags |= (info->will_qos & 3) << 3; + } + + if (info->username != NULL && info->username[0] != '\0') + { + if (append_string(connection, info->username, strlen(info->username)) < 0) + return fail_message(connection); + + variable_header->flags |= MQTT_CONNECT_FLAG_USERNAME; + } + + if (info->password != NULL && info->password[0] != '\0') + { + if (append_string(connection, info->password, strlen(info->password)) < 0) + return fail_message(connection); + + variable_header->flags |= MQTT_CONNECT_FLAG_PASSWORD; + } + + return fini_message(connection, MQTT_MSG_TYPE_CONNECT, 0, 0, 0); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_publish(mqtt_connection_t* connection, const char* topic, const char* data, int data_length, int qos, int retain, uint16_t* message_id) +{ + init_message(connection); + + if (topic == NULL || topic[0] == '\0') + return fail_message(connection); + + if (append_string(connection, topic, strlen(topic)) < 0) + return fail_message(connection); + + if (qos > 0) + { + if ((*message_id = append_message_id(connection, 0)) == 0) + return fail_message(connection); + } + else + *message_id = 0; + + if (connection->message.length + data_length > connection->buffer_length) + return fail_message(connection); + memcpy(connection->buffer + connection->message.length, data, data_length); + connection->message.length += data_length; + + return fini_message(connection, MQTT_MSG_TYPE_PUBLISH, 0, qos, retain); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_puback(mqtt_connection_t* connection, uint16_t message_id) +{ + init_message(connection); + if (append_message_id(connection, message_id) == 0) + return fail_message(connection); + return fini_message(connection, MQTT_MSG_TYPE_PUBACK, 0, 0, 0); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pubrec(mqtt_connection_t* connection, uint16_t message_id) +{ + init_message(connection); + if (append_message_id(connection, message_id) == 0) + return fail_message(connection); + return fini_message(connection, MQTT_MSG_TYPE_PUBREC, 0, 0, 0); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pubrel(mqtt_connection_t* connection, uint16_t message_id) +{ + init_message(connection); + if (append_message_id(connection, message_id) == 0) + return fail_message(connection); + return fini_message(connection, MQTT_MSG_TYPE_PUBREL, 0, 1, 0); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pubcomp(mqtt_connection_t* connection, uint16_t message_id) +{ + init_message(connection); + if (append_message_id(connection, message_id) == 0) + return fail_message(connection); + return fini_message(connection, MQTT_MSG_TYPE_PUBCOMP, 0, 0, 0); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_subscribe(mqtt_connection_t* connection, const char* topic, int qos, uint16_t* message_id) +{ + init_message(connection); + + if (topic == NULL || topic[0] == '\0') + return fail_message(connection); + + if ((*message_id = append_message_id(connection, 0)) == 0) + return fail_message(connection); + + if (append_string(connection, topic, strlen(topic)) < 0) + return fail_message(connection); + + if (connection->message.length + 1 > connection->buffer_length) + return fail_message(connection); + connection->buffer[connection->message.length++] = qos; + + return fini_message(connection, MQTT_MSG_TYPE_SUBSCRIBE, 0, 1, 0); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_unsubscribe(mqtt_connection_t* connection, const char* topic, uint16_t* message_id) +{ + init_message(connection); + + if (topic == NULL || topic[0] == '\0') + return fail_message(connection); + + if ((*message_id = append_message_id(connection, 0)) == 0) + return fail_message(connection); + + if (append_string(connection, topic, strlen(topic)) < 0) + return fail_message(connection); + + return fini_message(connection, MQTT_MSG_TYPE_UNSUBSCRIBE, 0, 1, 0); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pingreq(mqtt_connection_t* connection) +{ + init_message(connection); + return fini_message(connection, MQTT_MSG_TYPE_PINGREQ, 0, 0, 0); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pingresp(mqtt_connection_t* connection) +{ + init_message(connection); + return fini_message(connection, MQTT_MSG_TYPE_PINGRESP, 0, 0, 0); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_disconnect(mqtt_connection_t* connection) +{ + init_message(connection); + return fini_message(connection, MQTT_MSG_TYPE_DISCONNECT, 0, 0, 0); +} diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt_msg.h b/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt_msg.h new file mode 100644 index 000000000..be3cc55cb --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt_msg.h @@ -0,0 +1,141 @@ +/* + * File: mqtt_msg.h + * Author: Minh Tuan + * + * Created on July 12, 2014, 1:05 PM + */ + +#ifndef MQTT_MSG_H +#define MQTT_MSG_H +#include "user_config.h" +#include "c_types.h" +#ifdef __cplusplus +extern "C" { +#endif + +/* +* Copyright (c) 2014, Stephen Robinson +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* +* 1. Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* 2. Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* 3. Neither the name of the copyright holder nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +* +*/ +/* 7 6 5 4 3 2 1 0*/ +/*| --- Message Type---- | DUP Flag | QoS Level | Retain | +/* Remaining Length */ + + +enum mqtt_message_type +{ + MQTT_MSG_TYPE_CONNECT = 1, + MQTT_MSG_TYPE_CONNACK = 2, + MQTT_MSG_TYPE_PUBLISH = 3, + MQTT_MSG_TYPE_PUBACK = 4, + MQTT_MSG_TYPE_PUBREC = 5, + MQTT_MSG_TYPE_PUBREL = 6, + MQTT_MSG_TYPE_PUBCOMP = 7, + MQTT_MSG_TYPE_SUBSCRIBE = 8, + MQTT_MSG_TYPE_SUBACK = 9, + MQTT_MSG_TYPE_UNSUBSCRIBE = 10, + MQTT_MSG_TYPE_UNSUBACK = 11, + MQTT_MSG_TYPE_PINGREQ = 12, + MQTT_MSG_TYPE_PINGRESP = 13, + MQTT_MSG_TYPE_DISCONNECT = 14 +}; + +enum mqtt_connect_return_code +{ + CONNECTION_ACCEPTED = 0, + CONNECTION_REFUSE_PROTOCOL, + CONNECTION_REFUSE_ID_REJECTED, + CONNECTION_REFUSE_SERVER_UNAVAILABLE, + CONNECTION_REFUSE_BAD_USERNAME, + CONNECTION_REFUSE_NOT_AUTHORIZED +}; + +typedef struct mqtt_message +{ + uint8_t* data; + uint16_t length; + +} mqtt_message_t; + +typedef struct mqtt_connection +{ + mqtt_message_t message; + + uint16_t message_id; + uint8_t* buffer; + uint16_t buffer_length; + +} mqtt_connection_t; + +typedef struct mqtt_connect_info +{ + char* client_id; + char* username; + char* password; + char* will_topic; + char* will_message; + uint32_t keepalive; + int will_qos; + int will_retain; + int clean_session; + +} mqtt_connect_info_t; + + +static inline int ICACHE_FLASH_ATTR mqtt_get_type(uint8_t* buffer) { return (buffer[0] & 0xf0) >> 4; } +static inline int ICACHE_FLASH_ATTR mqtt_get_connect_return_code(uint8_t* buffer) { return buffer[3]; } +static inline int ICACHE_FLASH_ATTR mqtt_get_dup(uint8_t* buffer) { return (buffer[0] & 0x08) >> 3; } +static inline int ICACHE_FLASH_ATTR mqtt_get_qos(uint8_t* buffer) { return (buffer[0] & 0x06) >> 1; } +static inline int ICACHE_FLASH_ATTR mqtt_get_retain(uint8_t* buffer) { return (buffer[0] & 0x01); } + +void ICACHE_FLASH_ATTR mqtt_msg_init(mqtt_connection_t* connection, uint8_t* buffer, uint16_t buffer_length); +int ICACHE_FLASH_ATTR mqtt_get_total_length(uint8_t* buffer, uint16_t length); +const char* ICACHE_FLASH_ATTR mqtt_get_publish_topic(uint8_t* buffer, uint16_t* length); +const char* ICACHE_FLASH_ATTR mqtt_get_publish_data(uint8_t* buffer, uint16_t* length); +uint16_t ICACHE_FLASH_ATTR mqtt_get_id(uint8_t* buffer, uint16_t length); + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_connect(mqtt_connection_t* connection, mqtt_connect_info_t* info); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_publish(mqtt_connection_t* connection, const char* topic, const char* data, int data_length, int qos, int retain, uint16_t* message_id); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_puback(mqtt_connection_t* connection, uint16_t message_id); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pubrec(mqtt_connection_t* connection, uint16_t message_id); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pubrel(mqtt_connection_t* connection, uint16_t message_id); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pubcomp(mqtt_connection_t* connection, uint16_t message_id); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_subscribe(mqtt_connection_t* connection, const char* topic, int qos, uint16_t* message_id); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_unsubscribe(mqtt_connection_t* connection, const char* topic, uint16_t* message_id); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pingreq(mqtt_connection_t* connection); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pingresp(mqtt_connection_t* connection); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_disconnect(mqtt_connection_t* connection); + + +#ifdef __cplusplus +} +#endif + +#endif /* MQTT_MSG_H */ + diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/proto.c b/lib/TasmotaMqtt-1.1.0/src/mqtt/proto.c new file mode 100644 index 000000000..84078b233 --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/src/mqtt/proto.c @@ -0,0 +1,129 @@ +#include "proto.h" +#include "ringbuf.h" +I8 ICACHE_FLASH_ATTR PROTO_Init(PROTO_PARSER *parser, PROTO_PARSE_CALLBACK *completeCallback, U8 *buf, U16 bufSize) +{ + parser->buf = buf; + parser->bufSize = bufSize; + parser->dataLen = 0; + parser->callback = completeCallback; + parser->isEsc = 0; + return 0; +} + +I8 ICACHE_FLASH_ATTR PROTO_ParseByte(PROTO_PARSER *parser, U8 value) +{ + switch (value) { + case 0x7D: + parser->isEsc = 1; + break; + + case 0x7E: + parser->dataLen = 0; + parser->isEsc = 0; + parser->isBegin = 1; + break; + + case 0x7F: + if (parser->callback != NULL) + parser->callback(); + parser->isBegin = 0; + return 0; + break; + + default: + if (parser->isBegin == 0) break; + + if (parser->isEsc) { + value ^= 0x20; + parser->isEsc = 0; + } + + if (parser->dataLen < parser->bufSize) + parser->buf[parser->dataLen++] = value; + + break; + } + return -1; +} + +I8 ICACHE_FLASH_ATTR PROTO_Parse(PROTO_PARSER *parser, U8 *buf, U16 len) +{ + while (len--) + PROTO_ParseByte(parser, *buf++); + + return 0; +} +I16 ICACHE_FLASH_ATTR PROTO_ParseRb(RINGBUF* rb, U8 *bufOut, U16* len, U16 maxBufLen) +{ + U8 c; + + PROTO_PARSER proto; + PROTO_Init(&proto, NULL, bufOut, maxBufLen); + while (RINGBUF_Get(rb, &c) == 0) { + if (PROTO_ParseByte(&proto, c) == 0) { + *len = proto.dataLen; + return 0; + } + } + return -1; +} +I16 ICACHE_FLASH_ATTR PROTO_Add(U8 *buf, const U8 *packet, I16 bufSize) +{ + U16 i = 2; + U16 len = *(U16*) packet; + + if (bufSize < 1) return -1; + + *buf++ = 0x7E; + bufSize--; + + while (len--) { + switch (*packet) { + case 0x7D: + case 0x7E: + case 0x7F: + if (bufSize < 2) return -1; + *buf++ = 0x7D; + *buf++ = *packet++ ^ 0x20; + i += 2; + bufSize -= 2; + break; + default: + if (bufSize < 1) return -1; + *buf++ = *packet++; + i++; + bufSize--; + break; + } + } + + if (bufSize < 1) return -1; + *buf++ = 0x7F; + + return i; +} + +I16 ICACHE_FLASH_ATTR PROTO_AddRb(RINGBUF *rb, const U8 *packet, I16 len) +{ + U16 i = 2; + if (RINGBUF_Put(rb, 0x7E) == -1) return -1; + while (len--) { + switch (*packet) { + case 0x7D: + case 0x7E: + case 0x7F: + if (RINGBUF_Put(rb, 0x7D) == -1) return -1; + if (RINGBUF_Put(rb, *packet++ ^ 0x20) == -1) return -1; + i += 2; + break; + default: + if (RINGBUF_Put(rb, *packet++) == -1) return -1; + i++; + break; + } + } + if (RINGBUF_Put(rb, 0x7F) == -1) return -1; + + return i; +} + diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/proto.h b/lib/TasmotaMqtt-1.1.0/src/mqtt/proto.h new file mode 100644 index 000000000..a405bcb95 --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/src/mqtt/proto.h @@ -0,0 +1,32 @@ +/* + * File: proto.h + * Author: ThuHien + * + * Created on November 23, 2012, 8:57 AM + */ + +#ifndef _PROTO_H_ +#define _PROTO_H_ +#include +#include "typedef.h" +#include "ringbuf.h" + +typedef void(PROTO_PARSE_CALLBACK)(); + +typedef struct { + U8 *buf; + U16 bufSize; + U16 dataLen; + U8 isEsc; + U8 isBegin; + PROTO_PARSE_CALLBACK* callback; +} PROTO_PARSER; + +I8 ICACHE_FLASH_ATTR PROTO_Init(PROTO_PARSER *parser, PROTO_PARSE_CALLBACK *completeCallback, U8 *buf, U16 bufSize); +I8 ICACHE_FLASH_ATTR PROTO_Parse(PROTO_PARSER *parser, U8 *buf, U16 len); +I16 ICACHE_FLASH_ATTR PROTO_Add(U8 *buf, const U8 *packet, I16 bufSize); +I16 ICACHE_FLASH_ATTR PROTO_AddRb(RINGBUF *rb, const U8 *packet, I16 len); +I8 ICACHE_FLASH_ATTR PROTO_ParseByte(PROTO_PARSER *parser, U8 value); +I16 ICACHE_FLASH_ATTR PROTO_ParseRb(RINGBUF *rb, U8 *bufOut, U16* len, U16 maxBufLen); +#endif + diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/queue.c b/lib/TasmotaMqtt-1.1.0/src/mqtt/queue.c new file mode 100644 index 000000000..5e4216d0f --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/src/mqtt/queue.c @@ -0,0 +1,75 @@ +/* str_queue.c +* +* Copyright (c) 2014-2015, Tuan PM +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* +* * Redistributions of source code must retain the above copyright notice, +* this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of Redis nor the names of its contributors may be used +* to endorse or promote products derived from this software without +* specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +*/ +#include "queue.h" + +#include "user_interface.h" +#include "osapi.h" +#include "os_type.h" +#include "mem.h" +#include "proto.h" + +uint8_t *last_rb_p_r; +uint8_t *last_rb_p_w; +uint32_t last_fill_cnt; + +void ICACHE_FLASH_ATTR QUEUE_Init(QUEUE *queue, int bufferSize) +{ + queue->buf = (uint8_t*)os_zalloc(bufferSize); + RINGBUF_Init(&queue->rb, queue->buf, bufferSize); +} +int32_t ICACHE_FLASH_ATTR QUEUE_Puts(QUEUE *queue, uint8_t* buffer, uint16_t len) +{ + uint32_t ret; + + last_rb_p_r = queue->rb.p_r; + last_rb_p_w = queue->rb.p_w; + last_fill_cnt = queue->rb.fill_cnt; + + ret = PROTO_AddRb(&queue->rb, buffer, len); + if (ret == -1) { + // rolling ring buffer back + queue->rb.p_r = last_rb_p_r; + queue->rb.p_w = last_rb_p_w; + queue->rb.fill_cnt = last_fill_cnt; + } + return ret; +} +int32_t ICACHE_FLASH_ATTR QUEUE_Gets(QUEUE *queue, uint8_t* buffer, uint16_t* len, uint16_t maxLen) +{ + + return PROTO_ParseRb(&queue->rb, buffer, len, maxLen); +} + +bool ICACHE_FLASH_ATTR QUEUE_IsEmpty(QUEUE *queue) +{ + if (queue->rb.fill_cnt <= 0) + return TRUE; + return FALSE; +} diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/queue.h b/lib/TasmotaMqtt-1.1.0/src/mqtt/queue.h new file mode 100644 index 000000000..79107f2d5 --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/src/mqtt/queue.h @@ -0,0 +1,44 @@ +/* str_queue.h -- +* +* Copyright (c) 2014-2015, Tuan PM +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* +* * Redistributions of source code must retain the above copyright notice, +* this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of Redis nor the names of its contributors may be used +* to endorse or promote products derived from this software without +* specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef USER_QUEUE_H_ +#define USER_QUEUE_H_ +#include "os_type.h" +#include "ringbuf.h" +typedef struct { + uint8_t *buf; + RINGBUF rb; +} QUEUE; + +void ICACHE_FLASH_ATTR QUEUE_Init(QUEUE *queue, int bufferSize); +int32_t ICACHE_FLASH_ATTR QUEUE_Puts(QUEUE *queue, uint8_t* buffer, uint16_t len); +int32_t ICACHE_FLASH_ATTR QUEUE_Gets(QUEUE *queue, uint8_t* buffer, uint16_t* len, uint16_t maxLen); +bool ICACHE_FLASH_ATTR QUEUE_IsEmpty(QUEUE *queue); +#endif /* USER_QUEUE_H_ */ diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/ringbuf.c b/lib/TasmotaMqtt-1.1.0/src/mqtt/ringbuf.c new file mode 100644 index 000000000..fc882fd5c --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/src/mqtt/ringbuf.c @@ -0,0 +1,67 @@ +/** +* \file +* Ring Buffer library +*/ + +#include "ringbuf.h" + + +/** +* \brief init a RINGBUF object +* \param r pointer to a RINGBUF object +* \param buf pointer to a byte array +* \param size size of buf +* \return 0 if successfull, otherwise failed +*/ +I16 ICACHE_FLASH_ATTR RINGBUF_Init(RINGBUF *r, U8* buf, I32 size) +{ + if (r == NULL || buf == NULL || size < 2) return -1; + + r->p_o = r->p_r = r->p_w = buf; + r->fill_cnt = 0; + r->size = size; + + return 0; +} +/** +* \brief put a character into ring buffer +* \param r pointer to a ringbuf object +* \param c character to be put +* \return 0 if successfull, otherwise failed +*/ +I16 ICACHE_FLASH_ATTR RINGBUF_Put(RINGBUF *r, U8 c) +{ + if (r->fill_cnt >= r->size)return -1; // ring buffer is full, this should be atomic operation + + + r->fill_cnt++; // increase filled slots count, this should be atomic operation + + + *r->p_w++ = c; // put character into buffer + + if (r->p_w >= r->p_o + r->size) // rollback if write pointer go pass + r->p_w = r->p_o; // the physical boundary + + return 0; +} +/** +* \brief get a character from ring buffer +* \param r pointer to a ringbuf object +* \param c read character +* \return 0 if successfull, otherwise failed +*/ +I16 ICACHE_FLASH_ATTR RINGBUF_Get(RINGBUF *r, U8* c) +{ + if (r->fill_cnt <= 0)return -1; // ring buffer is empty, this should be atomic operation + + + r->fill_cnt--; // decrease filled slots count + + + *c = *r->p_r++; // get the character out + + if (r->p_r >= r->p_o + r->size) // rollback if write pointer go pass + r->p_r = r->p_o; // the physical boundary + + return 0; +} diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/ringbuf.h b/lib/TasmotaMqtt-1.1.0/src/mqtt/ringbuf.h new file mode 100644 index 000000000..f1a4f7e8b --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/src/mqtt/ringbuf.h @@ -0,0 +1,19 @@ +#ifndef _RING_BUF_H_ +#define _RING_BUF_H_ + +#include +#include +#include "typedef.h" + +typedef struct { + U8* p_o; /**< Original pointer */ + U8* volatile p_r; /**< Read pointer */ + U8* volatile p_w; /**< Write pointer */ + volatile I32 fill_cnt; /**< Number of filled slots */ + I32 size; /**< Buffer size */ +} RINGBUF; + +I16 ICACHE_FLASH_ATTR RINGBUF_Init(RINGBUF *r, U8* buf, I32 size); +I16 ICACHE_FLASH_ATTR RINGBUF_Put(RINGBUF *r, U8 c); +I16 ICACHE_FLASH_ATTR RINGBUF_Get(RINGBUF *r, U8* c); +#endif diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/typedef.h b/lib/TasmotaMqtt-1.1.0/src/mqtt/typedef.h new file mode 100644 index 000000000..887001ace --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/src/mqtt/typedef.h @@ -0,0 +1,17 @@ +/** +* \file +* Standard Types definition +*/ + +#ifndef _TYPE_DEF_H_ +#define _TYPE_DEF_H_ + +typedef char I8; +typedef unsigned char U8; +typedef short I16; +typedef unsigned short U16; +typedef long I32; +typedef unsigned long U32; +typedef unsigned long long U64; + +#endif diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/user_config.h b/lib/TasmotaMqtt-1.1.0/src/mqtt/user_config.h new file mode 100644 index 000000000..125353ed0 --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/src/mqtt/user_config.h @@ -0,0 +1,15 @@ +#ifndef __MQTT_CONFIG_H__ +#define __MQTT_CONFIG_H__ + +//#define MQTT_SSL_ENABLE + +#define MQTT_RECONNECT_TIMEOUT 5 /*second*/ + +//#define MQTT_BUF_SIZE 1024 +#define MQTT_BUF_SIZE 512 +#define QUEUE_BUFFER_SIZE 2048 + +//#define PROTOCOL_NAMEv31 /*MQTT version 3.1 compatible with Mosquitto v0.15*/ +#define PROTOCOL_NAMEv311 /*MQTT version 3.11 compatible with https://eclipse.org/paho/clients/testing/*/ + +#endif // __MQTT_CONFIG_H__ \ No newline at end of file diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/utils.c b/lib/TasmotaMqtt-1.1.0/src/mqtt/utils.c new file mode 100644 index 000000000..ac4c9272b --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/src/mqtt/utils.c @@ -0,0 +1,149 @@ +/* +* Copyright (c) 2014, Tuan PM +* Email: tuanpm@live.com +* +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* +* 1. Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* 2. Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* 3. Neither the name of the copyright holder nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +* +*/ +#include +#include +#include +#include +#include +#include "utils.h" + + +uint8_t ICACHE_FLASH_ATTR UTILS_IsIPV4 (int8_t *str) +{ + uint8_t segs = 0; /* Segment count. */ + uint8_t chcnt = 0; /* Character count within segment. */ + uint8_t accum = 0; /* Accumulator for segment. */ + /* Catch NULL pointer. */ + if (str == 0) + return 0; + /* Process every character in string. */ + + while (*str != '\0') { + /* Segment changeover. */ + + if (*str == '.') { + /* Must have some digits in segment. */ + if (chcnt == 0) + return 0; + /* Limit number of segments. */ + if (++segs == 4) + return 0; + /* Reset segment values and restart loop. */ + chcnt = accum = 0; + str++; + continue; + } + + /* Check numeric. */ + if ((*str < '0') || (*str > '9')) + return 0; + + /* Accumulate and check segment. */ + + if ((accum = accum * 10 + *str - '0') > 255) + return 0; + /* Advance other segment specific stuff and continue loop. */ + + chcnt++; + str++; + } + + /* Check enough segments and enough characters in last segment. */ + + if (segs != 3) + return 0; + if (chcnt == 0) + return 0; + /* Address okay. */ + + return 1; +} +uint8_t ICACHE_FLASH_ATTR UTILS_StrToIP(const int8_t* str, void *ip) +{ + + /* The count of the number of bytes processed. */ + int i; + /* A pointer to the next digit to process. */ + const char * start; + + start = str; + for (i = 0; i < 4; i++) { + /* The digit being processed. */ + char c; + /* The value of this byte. */ + int n = 0; + while (1) { + c = * start; + start++; + if (c >= '0' && c <= '9') { + n *= 10; + n += c - '0'; + } + /* We insist on stopping at "." if we are still parsing + the first, second, or third numbers. If we have reached + the end of the numbers, we will allow any character. */ + else if ((i < 3 && c == '.') || i == 3) { + break; + } + else { + return 0; + } + } + if (n >= 256) { + return 0; + } + ((uint8_t*)ip)[i] = n; + } + return 1; + +} +uint32_t ICACHE_FLASH_ATTR UTILS_Atoh(const int8_t *s) +{ + uint32_t value = 0, digit; + int8_t c; + + while ((c = *s++)) { + if ('0' <= c && c <= '9') + digit = c - '0'; + else if ('A' <= c && c <= 'F') + digit = c - 'A' + 10; + else if ('a' <= c && c <= 'f') + digit = c - 'a' + 10; + else break; + + value = (value << 4) | digit; + } + + return value; +} + diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/utils.h b/lib/TasmotaMqtt-1.1.0/src/mqtt/utils.h new file mode 100644 index 000000000..fe2874803 --- /dev/null +++ b/lib/TasmotaMqtt-1.1.0/src/mqtt/utils.h @@ -0,0 +1,9 @@ +#ifndef _UTILS_H_ +#define _UTILS_H_ + +#include "c_types.h" + +uint32_t ICACHE_FLASH_ATTR UTILS_Atoh(const int8_t *s); +uint8_t ICACHE_FLASH_ATTR UTILS_StrToIP(const int8_t* str, void *ip); +uint8_t ICACHE_FLASH_ATTR UTILS_IsIPV4 (int8_t *str); +#endif diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/.gitignore b/lib/esp-mqtt-arduino-1.0.1.02.1/.gitignore new file mode 100644 index 000000000..2ee75414c --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/.gitignore @@ -0,0 +1,28 @@ +# C++ objects and libs + +*.slo +*.lo +*.o +#*.a +*.la +*.lai +*.so +*.dll +*.dylib + +#Makefile +*-build-* +build-* +*.autosave + +# .log files (usually created by QtTest - thanks to VestniK) +*.log + + +# Editors temporary files +*~ + + +#OSX +.DS_Store +._* diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/README.md b/lib/esp-mqtt-arduino-1.0.1.02.1/README.md new file mode 100644 index 000000000..a7ddbecac --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/README.md @@ -0,0 +1,15 @@ +MQTT +==== + +A Wrapper around mqtt for Arduino to be used with esp8266 modules. + +It wraps a slightly modified version of mqtt for esp8266 ported by Tuan PM. +Original code for esp: https://github.com/tuanpmt/esp_mqtt +Original code for contiki: https://github.com/esar/contiki-mqtt + + +==== + +**secure libssl:** + +If you want to use secure communication, please use the `secure`-branch! diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/examples/mqtt_pub/mqtt_pub.ino b/lib/esp-mqtt-arduino-1.0.1.02.1/examples/mqtt_pub/mqtt_pub.ino new file mode 100644 index 000000000..17b3be8db --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/examples/mqtt_pub/mqtt_pub.ino @@ -0,0 +1,102 @@ +#include +#include + +void myDataCb(String& topic, String& data); +void myPublishedCb(); +void myDisconnectedCb(); +void myConnectedCb(); + +#define CLIENT_ID "client1" + +// create MQTT object +MQTT myMqtt(CLIENT_ID, "192.168.0.1", 1883); + +// +const char* ssid = "ssid"; +const char* password = "ssid_password"; + + +// +void setup() { + Serial.begin(115200); + delay(1000); + + Serial.println(); + Serial.println(); + Serial.print("Connecting to "); + Serial.println(ssid); + + WiFi.begin(ssid, password); + + while (WiFi.status() != WL_CONNECTED) { + delay(500); + Serial.print("."); + } + + Serial.println(""); + Serial.println("WiFi connected"); + Serial.println("IP address: "); + Serial.println(WiFi.localIP()); + + Serial.println("Connecting to MQTT server"); + + // setup callbacks + myMqtt.onConnected(myConnectedCb); + myMqtt.onDisconnected(myDisconnectedCb); + myMqtt.onPublished(myPublishedCb); + myMqtt.onData(myDataCb); + + Serial.println("connect mqtt..."); + myMqtt.connect(); + + delay(10); +} + +// +void loop() { + + int value = analogRead(A0); + + String topic("/"); + topic += CLIENT_ID; + topic += "/value"; + + String valueStr(value); + + // publish value to topic + boolean result = myMqtt.publish(topic, valueStr); + + delay(1000); +} + + +/* + * + */ +void myConnectedCb() +{ + Serial.println("connected to MQTT server"); +} + +void myDisconnectedCb() +{ + Serial.println("disconnected. try to reconnect..."); + delay(500); + myMqtt.connect(); +} + +void myPublishedCb() +{ + //Serial.println("published."); +} + +void myDataCb(String& topic, String& data) +{ + + Serial.print(topic); + Serial.print(": "); + Serial.println(data); +} + + + diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/examples/mqtt_sub/mqtt_sub.ino b/lib/esp-mqtt-arduino-1.0.1.02.1/examples/mqtt_sub/mqtt_sub.ino new file mode 100644 index 000000000..1f7591617 --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/examples/mqtt_sub/mqtt_sub.ino @@ -0,0 +1,95 @@ +#include +#include + +void myDataCb(String& topic, String& data); +void myPublishedCb(); +void myDisconnectedCb(); +void myConnectedCb(); + +#define CLIENT_ID "client3" +#define TOPIC "/client1/value" + + +// create MQTT +MQTT myMqtt(CLIENT_ID, "192.168.0.1", 1883); + + +const char* ssid = "ssid"; +const char* password = "ssid_password"; + + +// +void setup() { + Serial.begin(115200); + delay(1000); + + Serial.println(); + Serial.println(); + Serial.print("Connecting to "); + Serial.println(ssid); + + WiFi.begin(ssid, password); + + while (WiFi.status() != WL_CONNECTED) { + delay(500); + Serial.print("."); + } + + Serial.println(""); + Serial.println("WiFi connected"); + Serial.println("IP address: "); + Serial.println(WiFi.localIP()); + + + Serial.println("Connecting to MQTT server"); + + // setup callbacks + myMqtt.onConnected(myConnectedCb); + myMqtt.onDisconnected(myDisconnectedCb); + myMqtt.onPublished(myPublishedCb); + myMqtt.onData(myDataCb); + + Serial.println("connect mqtt..."); + myMqtt.connect(); + + Serial.println("subscribe to topic..."); + myMqtt.subscribe(TOPIC); + + delay(10); +} + +// +void loop() { +} + + +/* + * + */ +void myConnectedCb() +{ + Serial.println("connected to MQTT server"); +} + +void myDisconnectedCb() +{ + Serial.println("disconnected. try to reconnect..."); + delay(500); + myMqtt.connect(); +} + +void myPublishedCb() +{ + //Serial.println("published."); +} + +void myDataCb(String& topic, String& data) +{ + + Serial.print(topic); + Serial.print(": "); + Serial.println(data); +} + + + diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/keywords.txt b/lib/esp-mqtt-arduino-1.0.1.02.1/keywords.txt new file mode 100644 index 000000000..527b5bf0c --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/keywords.txt @@ -0,0 +1,43 @@ +####################################### +# Syntax Coloring Map For Test +####################################### + +####################################### +# Datatypes (KEYWORD1) +####################################### + +MQTT.h KEYWORD1 + +MQTT KEYWORD1 + + +####################################### +# Methods and Functions (KEYWORD2) +####################################### + +setClientId KEYWORD2 +setUserPwd KEYWORD2 + +connect KEYWORD2 +disconnect KEYWORD2 +isConnected KEYWORD2 + +publish KEYWORD2 +subscribe KEYWORD2 + +getState KEYWORD2 + +#general +onConnected KEYWORD2 +onDisconnected KEYWORD2 +onPublished KEYWORD2 +onData KEYWORD2 + +####################################### +# Instances (KEYWORD2) +####################################### + +####################################### +# Constants (LITERAL1) +####################################### + diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/library.properties b/lib/esp-mqtt-arduino-1.0.1.02.1/library.properties new file mode 100644 index 000000000..110da0ac4 --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/library.properties @@ -0,0 +1,9 @@ +name=ESP MQTT +version=1.0.1 +author=Ingo Randolf +maintainer=Ingo Randolf +sentence=A Wrapper around mqtt for Arduino to be used with esp8266 modules. +paragraph=It wraps a slightly modified version of mqtt for esp8266 ported by Tuan PM. Original code for esp: https://github.com/tuanpmt/esp_mqtt (7ec2ef8e1df0422b77348fe1da7885568e0c9d01) Original code for contiki: https://github.com/esar/contiki-mqtt +category=Communication +url=https://github.com/i-n-g-o/esp-mqtt-arduino +architectures=esp8266 \ No newline at end of file diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/src/MQTT.cpp b/lib/esp-mqtt-arduino-1.0.1.02.1/src/MQTT.cpp new file mode 100644 index 000000000..b330bad4b --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/src/MQTT.cpp @@ -0,0 +1,269 @@ +/*//------------------------------------------------------------------------------- + * MQTT.cpp + * + * Implementation file for MQTT Wrapper + * + * Wrapper for Arduino written by Ingo Randolf during + * eTextiles Summercamp 2015. + * + * This library is intended to be used with esp8266 modules. + * + * + * This class wraps a slightly modified version of mqtt + * for esp8266 written by Tuan PM. + * Original code: https://github.com/tuanpmt/esp_mqtt + * + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + //-------------------------------------------------------------------------------*/ +#include "MQTT.h" + +#include "user_interface.h" +#include "osapi.h" +#include "os_type.h" +#include "mqtt/debug.h" + + +//------------------------------------------------------------------------------------ +// mqtt internal callbacks +//------------------------------------------------------------------------------------ +static void mqttConnectedCb(uint32_t *args) +{ + MQTT_Client* client = (MQTT_Client*)args; + + MQTT* _this = (MQTT*)client->user_data; + + if (_this && _this->onMqttConnectedCb) { + _this->onMqttConnectedCb(); + } +} + +static void mqttDisconnectedCb(uint32_t *args) +{ + MQTT_Client* client = (MQTT_Client*)args; + + MQTT* _this = (MQTT*)client->user_data; + + if (_this && _this->onMqttDisconnectedCb) { + _this->onMqttDisconnectedCb(); + } +} + +static void mqttPublishedCb(uint32_t *args) +{ + MQTT_Client* client = (MQTT_Client*)args; + + MQTT* _this = (MQTT*)client->user_data; + + if (_this && _this->onMqttPublishedCb) { + _this->onMqttPublishedCb(); + } +} + +static void mqttDataCb(uint32_t *args, const char* topic, uint32_t topic_len, const char *data, uint32_t data_len) +{ + MQTT_Client* client = (MQTT_Client*)args; + + MQTT* _this = (MQTT*)client->user_data; + + if (_this) { + + _this->_onMqttDataCb(topic, topic_len, data, data_len); + } +} + +static void mqttTimeoutCb(uint32_t *args) +{ + MQTT_Client* client = (MQTT_Client*)args; + + MQTT* _this = (MQTT*)client->user_data; + +// if (_this && _this->onMqttTimeoutCb) { +// _this->onMqttTimeoutCb(); +// } +} + + +//------------------------------------------------------------------------------------ +// MQTT class implementation +//------------------------------------------------------------------------------------ + +//MQTT::MQTT(const char* client_id, const char* host, uint32_t port) : +MQTT::MQTT(const char* client_id, const char* host, uint32_t port, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage) : + onMqttConnectedCb(0) + ,onMqttDisconnectedCb(0) + ,onMqttPublishedCb(0) + ,onMqttDataCb(0) + ,onMqttDataRawCb(0) +{ + // init connections + MQTT_InitConnection(&mqttClient, (uint8_t*)host, port, 0); + + // init client + if ( !MQTT_InitClient(&mqttClient, (uint8_t*)client_id, (uint8_t*)"", (uint8_t*)"", 15, 1) ) { + MQTT_INFO("Failed to initialize properly. Check MQTT version.\r\n"); + } + + // init LWT +// MQTT_InitLWT(&mqttClient, (uint8_t*)"/lwt", (uint8_t*)"offline", 0, 0); + MQTT_InitLWT(&mqttClient, (uint8_t*)willTopic, (uint8_t*)willMessage, willQos, (uint8_t)willRetain); + + // set user data + mqttClient.user_data = (void*)this; + + // setup callbacks + MQTT_OnConnected(&mqttClient, mqttConnectedCb); + MQTT_OnDisconnected(&mqttClient, mqttDisconnectedCb); + MQTT_OnPublished(&mqttClient, mqttPublishedCb); + MQTT_OnData(&mqttClient, mqttDataCb); + + MQTT_OnTimeout(&mqttClient, mqttTimeoutCb); +} + + +MQTT::~MQTT() +{ + MQTT_DeleteClient(&mqttClient); +} + + +/* + */ +void MQTT::setClientId(const char* client_id) +{ + MQTT_SetUserId(&mqttClient, client_id); +} + +void MQTT::setUserPwd(const char* user, const char* pwd) +{ + MQTT_SetUserPwd(&mqttClient, user, pwd); +} + + +/* + */ +void MQTT::connect() +{ + MQTT_Connect(&mqttClient); +} + +void MQTT::disconnect() +{ + MQTT_Disconnect(&mqttClient); +} + +bool MQTT::isConnected() +{ + return (mqttClient.connState >= TCP_CONNECTED); +} + +/* + */ +bool MQTT::publish(const char* topic, const char* buf, uint32_t buf_len, int qos, int retain) +{ + return MQTT_Publish(&mqttClient, topic, buf, buf_len, qos, retain); +} + +bool MQTT::publish(String& topic, String& data, int qos, int retain) +{ + return publish(topic.c_str(), data.c_str(), data.length(), qos, retain); +} + +bool MQTT::publish(String& topic, const char* buf, uint32_t buf_len, int qos, int retain) +{ + return publish(topic.c_str(), buf, buf_len, qos, retain); +} + +bool MQTT::publish(const char* topic, String& data, int qos, int retain) +{ + return publish(topic, data.c_str(), data.length(), qos, retain); +} + + +/* + */ +bool MQTT::subscribe(const char* topic, uint8_t qos) +{ + return MQTT_Subscribe(&mqttClient, (char*)topic, qos); +} + +bool MQTT::subscribe(const String& topic, uint8_t qos) +{ + return MQTT_Subscribe(&mqttClient, (char*)topic.c_str(), qos); +} + + + +//------------------------------------------------------------------------------- +// set user callback functions +//------------------------------------------------------------------------------- +void MQTT::onConnected( void (*function)(void) ) +{ + onMqttConnectedCb = function; +} + +void MQTT::onDisconnected( void (*function)(void) ) +{ + onMqttDisconnectedCb = function; +} + +void MQTT::onPublished( void (*function)(void) ) +{ + onMqttPublishedCb = function; +} + +void MQTT::onData( void (*function)(String&, String&) ) +{ + onMqttDataCb = function; +} + +void MQTT::onData( void (*function)(const char*, uint32_t, const char*, uint32_t) ) +{ + onMqttDataRawCb = function; +} + + +// internal callback, calling user CB +void MQTT::_onMqttDataCb(const char* topic, uint32_t topic_len, const char* buf, uint32_t buf_len) +{ + if (onMqttDataRawCb) { + onMqttDataRawCb(topic, topic_len, buf, buf_len); + } + + if (onMqttDataCb) { + + char* topicCpy = (char*)malloc(topic_len+1); + memcpy(topicCpy, topic, topic_len); + topicCpy[topic_len] = 0; + // string it + String topicStr(topicCpy); + + char* bufCpy = (char*)malloc(buf_len+1); + memcpy(bufCpy, buf, buf_len); + bufCpy[buf_len] = 0; + // string it + String bufStr(bufCpy); + + onMqttDataCb(topicStr, bufStr); + + free(topicCpy); + free(bufCpy); + } +} + + + + + + + + + diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/src/MQTT.h b/lib/esp-mqtt-arduino-1.0.1.02.1/src/MQTT.h new file mode 100644 index 000000000..8838ef482 --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/src/MQTT.h @@ -0,0 +1,93 @@ +/*//------------------------------------------------------------------------------- + * MQTT.h + * + * Header file for MQTT Wrapper + * + * Wrapper for Arduino written by Ingo Randolf during + * eTextiles Summercamp 2015. + * + * This library is intended to be used with esp8266 modules. + * + * + * This class wraps a slightly modified version of mqtt + * for esp8266 written by Tuan PM. + * Original code: https://github.com/tuanpmt/esp_mqtt + * + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + //-------------------------------------------------------------------------------*/ +#ifndef MQTT_WRAPPER_H +#define MQTT_WRAPPER_H + +#include + +#include +#include +#include +#include +#include + +extern "C" { + #include + #include "mqtt/mqtt.h" +} + +class MQTT +{ +public: +// MQTT(const char* client_id, const char* host, uint32_t port); + MQTT(const char* client_id, const char* host, uint32_t port, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage); + + ~MQTT(); + + void setClientId(const char* client_id); + void setUserPwd(const char* user, const char* pwd); + + void connect(); + void disconnect(); + bool isConnected(); + + bool publish(const char* topic, const char* buf, uint32_t buf_len, int qos = 0, int retain = 0); + bool publish(String& topic, String& data, int qos = 0, int retain = 0); + bool publish(String& topic, const char* buf, uint32_t buf_len, int qos = 0, int retain = 0); + bool publish(const char* topic, String& data, int qos = 0, int retain = 0); + + bool subscribe(const char* topic, uint8_t qos = 0); + bool subscribe(const String& topic, uint8_t qos = 0); + + int getState() { return mqttClient.connState; }; + + // set callbacks + void onConnected( void (*)(void) ); + void onDisconnected( void (*)(void) ); + void onPublished( void (*)(void) ); + void onData( void (*)(String&, String&) ); + void onData( void (*)(const char*, uint32_t, const char*, uint32_t) ); + + // user callbacks + void (*onMqttConnectedCb)(void); + void (*onMqttDisconnectedCb)(void); + void (*onMqttPublishedCb)(void); + void (*onMqttDataCb) (String&, String&); + void (*onMqttDataRawCb) (const char*, uint32_t, const char*, uint32_t); + + // internal callback + void _onMqttDataCb(const char*, uint32_t, const char*, uint32_t); + +private: + MQTT_Client mqttClient; + +}; + + + + +#endif \ No newline at end of file diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/debug.h b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/debug.h new file mode 100644 index 000000000..f45dd6d8d --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/debug.h @@ -0,0 +1,19 @@ +/* + * debug.h + * + * Created on: Dec 4, 2014 + * Author: Minh + */ + +#ifndef USER_DEBUG_H_ +#define USER_DEBUG_H_ + + +#if defined(MQTT_DEBUG_ON) +#define MQTT_INFO( format, ... ) os_printf( format, ## __VA_ARGS__ ) +#else +#define MQTT_INFO( format, ... ) +#endif + + +#endif /* USER_DEBUG_H_ */ diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt.c b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt.c new file mode 100644 index 000000000..ed63d713a --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt.c @@ -0,0 +1,1048 @@ +/* mqtt.c +* Protocol: http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html +* +* Copyright (c) 2014-2015, Tuan PM +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* +* * Redistributions of source code must retain the above copyright notice, +* this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of Redis nor the names of its contributors may be used +* to endorse or promote products derived from this software without +* specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +*/ + +#include "user_interface.h" +#include "osapi.h" +#include "espconn.h" +#include "os_type.h" +#include "mem.h" +#include "mqtt_msg.h" +#include "debug.h" +#include "user_config.h" +#include "mqtt.h" +#include "queue.h" + +#define MQTT_TASK_PRIO 1 +#define MQTT_TASK_QUEUE_SIZE 1 +#define MQTT_SEND_TIMOUT 5 + +#ifndef MQTT_SSL_SIZE +#define MQTT_SSL_SIZE 5120 +#endif + +#ifndef QUEUE_BUFFER_SIZE +#define QUEUE_BUFFER_SIZE 2048 +#endif + + +os_event_t mqtt_procTaskQueue[MQTT_TASK_QUEUE_SIZE]; + +#ifdef PROTOCOL_NAMEv311 +LOCAL uint8_t zero_len_id[2] = { 0, 0 }; +#endif + +LOCAL void ICACHE_FLASH_ATTR +mqtt_dns_found(const char *name, ip_addr_t *ipaddr, void *arg) +{ + struct espconn *pConn = (struct espconn *)arg; + MQTT_Client* client = (MQTT_Client *)pConn->reverse; + + + if (ipaddr == NULL) + { + MQTT_INFO("DNS: Found, but got no ip, try to reconnect\r\n"); + client->connState = TCP_RECONNECT_REQ; + return; + } + + MQTT_INFO("DNS: found ip %d.%d.%d.%d\n", + *((uint8 *) &ipaddr->addr), + *((uint8 *) &ipaddr->addr + 1), + *((uint8 *) &ipaddr->addr + 2), + *((uint8 *) &ipaddr->addr + 3)); + + if (client->ip.addr == 0 && ipaddr->addr != 0) + { + os_memcpy(client->pCon->proto.tcp->remote_ip, &ipaddr->addr, 4); + if (client->security) { +#ifdef MQTT_SSL_ENABLE + espconn_secure_set_size(ESPCONN_CLIENT, MQTT_SSL_SIZE); + espconn_secure_connect(client->pCon); +#else + MQTT_INFO("TCP: Do not support SSL\r\n"); +#endif + } + else { + espconn_connect(client->pCon); + } + + client->connState = TCP_CONNECTING; + MQTT_INFO("TCP: connecting...\r\n"); + } + + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); +} + + + +LOCAL void ICACHE_FLASH_ATTR +deliver_publish(MQTT_Client* client, uint8_t* message, int length) +{ + mqtt_event_data_t event_data; + + event_data.topic_length = length; + event_data.topic = mqtt_get_publish_topic(message, &event_data.topic_length); + event_data.data_length = length; + event_data.data = mqtt_get_publish_data(message, &event_data.data_length); + + if (client->dataCb) + client->dataCb((uint32_t*)client, event_data.topic, event_data.topic_length, event_data.data, event_data.data_length); + +} + +void ICACHE_FLASH_ATTR +mqtt_send_keepalive(MQTT_Client *client) +{ + MQTT_INFO("\r\nMQTT: Send keepalive packet to %s:%d!\r\n", client->host, client->port); + client->mqtt_state.outbound_message = mqtt_msg_pingreq(&client->mqtt_state.mqtt_connection); + client->mqtt_state.pending_msg_type = MQTT_MSG_TYPE_PINGREQ; + client->mqtt_state.pending_msg_type = mqtt_get_type(client->mqtt_state.outbound_message->data); + client->mqtt_state.pending_msg_id = mqtt_get_id(client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length); + + + client->sendTimeout = MQTT_SEND_TIMOUT; + MQTT_INFO("MQTT: Sending, type: %d, id: %04X\r\n", client->mqtt_state.pending_msg_type, client->mqtt_state.pending_msg_id); + err_t result = ESPCONN_OK; + if (client->security) { +#ifdef MQTT_SSL_ENABLE + result = espconn_secure_send(client->pCon, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length); +#else + MQTT_INFO("TCP: Do not support SSL\r\n"); +#endif + } + else { + result = espconn_send(client->pCon, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length); + } + + client->mqtt_state.outbound_message = NULL; + if (ESPCONN_OK == result) { + client->keepAliveTick = 0; + client->connState = MQTT_DATA; + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); + } + else { + client->connState = TCP_RECONNECT_DISCONNECTING; + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); + } +} + +/** + * @brief Delete tcp client and free all memory + * @param mqttClient: The mqtt client which contain TCP client + * @retval None + */ +void ICACHE_FLASH_ATTR +mqtt_tcpclient_delete(MQTT_Client *mqttClient) +{ + if (mqttClient->pCon != NULL) { + MQTT_INFO("TCP: Free memory\r\n"); + // Force abort connections + espconn_abort(mqttClient->pCon); + // Delete connections + espconn_delete(mqttClient->pCon); + + if (mqttClient->pCon->proto.tcp) { + os_free(mqttClient->pCon->proto.tcp); + mqttClient->pCon->proto.tcp = NULL; + } + os_free(mqttClient->pCon); + mqttClient->pCon = NULL; + } +} + +/** + * @brief Delete MQTT client and free all memory + * @param mqttClient: The mqtt client + * @retval None + */ +void ICACHE_FLASH_ATTR +mqtt_client_delete(MQTT_Client *mqttClient) +{ + if (mqttClient == NULL) + return; + + if (mqttClient->pCon != NULL) { + mqtt_tcpclient_delete(mqttClient); + } + + if (mqttClient->host != NULL) { + os_free(mqttClient->host); + mqttClient->host = NULL; + } + + if (mqttClient->user_data != NULL) { + os_free(mqttClient->user_data); + mqttClient->user_data = NULL; + } + + if (mqttClient->mqtt_state.in_buffer != NULL) { + os_free(mqttClient->mqtt_state.in_buffer); + mqttClient->mqtt_state.in_buffer = NULL; + } + + if (mqttClient->mqtt_state.out_buffer != NULL) { + os_free(mqttClient->mqtt_state.out_buffer); + mqttClient->mqtt_state.out_buffer = NULL; + } + + if (mqttClient->mqtt_state.outbound_message != NULL) { + if (mqttClient->mqtt_state.outbound_message->data != NULL) + { + os_free(mqttClient->mqtt_state.outbound_message->data); + mqttClient->mqtt_state.outbound_message->data = NULL; + } + } + + if (mqttClient->mqtt_state.mqtt_connection.buffer != NULL) { + // Already freed but not NULL + mqttClient->mqtt_state.mqtt_connection.buffer = NULL; + } + + if (mqttClient->connect_info.client_id != NULL) { +#ifdef PROTOCOL_NAMEv311 + /* Don't attempt to free if it's the zero_len array */ + if ( ((uint8_t*)mqttClient->connect_info.client_id) != zero_len_id ) + os_free(mqttClient->connect_info.client_id); +#else + os_free(mqttClient->connect_info.client_id); +#endif + mqttClient->connect_info.client_id = NULL; + } + + if (mqttClient->connect_info.username != NULL) { + os_free(mqttClient->connect_info.username); + mqttClient->connect_info.username = NULL; + } + + if (mqttClient->connect_info.password != NULL) { + os_free(mqttClient->connect_info.password); + mqttClient->connect_info.password = NULL; + } + + if (mqttClient->connect_info.will_topic != NULL) { + os_free(mqttClient->connect_info.will_topic); + mqttClient->connect_info.will_topic = NULL; + } + + if (mqttClient->connect_info.will_message != NULL) { + os_free(mqttClient->connect_info.will_message); + mqttClient->connect_info.will_message = NULL; + } + + if (mqttClient->msgQueue.buf != NULL) { + os_free(mqttClient->msgQueue.buf); + mqttClient->msgQueue.buf = NULL; + } + + // Initialize state + mqttClient->connState = WIFI_INIT; + // Clear callback functions to avoid abnormal callback + mqttClient->connectedCb = NULL; + mqttClient->disconnectedCb = NULL; + mqttClient->publishedCb = NULL; + mqttClient->timeoutCb = NULL; + mqttClient->dataCb = NULL; + + MQTT_INFO("MQTT: client already deleted\r\n"); +} + + +/** + * @brief Client received callback function. + * @param arg: contain the ip link information + * @param pdata: received data + * @param len: the lenght of received data + * @retval None + */ +void ICACHE_FLASH_ATTR +mqtt_tcpclient_recv(void *arg, char *pdata, unsigned short len) +{ + uint8_t msg_type; + uint8_t msg_qos; + uint16_t msg_id; + uint8_t msg_conn_ret; + + struct espconn *pCon = (struct espconn*)arg; + MQTT_Client *client = (MQTT_Client *)pCon->reverse; + +READPACKET: + MQTT_INFO("TCP: data received %d bytes\r\n", len); + // MQTT_INFO("STATE: %d\r\n", client->connState); + if (len < MQTT_BUF_SIZE && len > 0) { + os_memcpy(client->mqtt_state.in_buffer, pdata, len); + + msg_type = mqtt_get_type(client->mqtt_state.in_buffer); + msg_qos = mqtt_get_qos(client->mqtt_state.in_buffer); + msg_id = mqtt_get_id(client->mqtt_state.in_buffer, client->mqtt_state.in_buffer_length); + switch (client->connState) { + case MQTT_CONNECT_SENDING: + if (msg_type == MQTT_MSG_TYPE_CONNACK) { + if (client->mqtt_state.pending_msg_type != MQTT_MSG_TYPE_CONNECT) { + MQTT_INFO("MQTT: Invalid packet\r\n"); + if (client->security) { +#ifdef MQTT_SSL_ENABLE + espconn_secure_disconnect(client->pCon); +#else + MQTT_INFO("TCP: Do not support SSL\r\n"); +#endif + } + else { + espconn_disconnect(client->pCon); + } + } else { + msg_conn_ret = mqtt_get_connect_return_code(client->mqtt_state.in_buffer); + switch (msg_conn_ret) { + case CONNECTION_ACCEPTED: + MQTT_INFO("MQTT: Connected to %s:%d\r\n", client->host, client->port); + client->connState = MQTT_DATA; + if (client->connectedCb) + client->connectedCb((uint32_t*)client); + break; + case CONNECTION_REFUSE_PROTOCOL: + case CONNECTION_REFUSE_SERVER_UNAVAILABLE: + case CONNECTION_REFUSE_BAD_USERNAME: + case CONNECTION_REFUSE_NOT_AUTHORIZED: + MQTT_INFO("MQTT: Connection refuse, reason code: %d\r\n", msg_conn_ret); + default: + if (client->security) { +#ifdef MQTT_SSL_ENABLE + espconn_secure_disconnect(client->pCon); +#else + MQTT_INFO("TCP: Do not support SSL\r\n"); +#endif + } + else { + espconn_disconnect(client->pCon); + } + + } + + } + + } + break; + case MQTT_DATA: + case MQTT_KEEPALIVE_SEND: + client->mqtt_state.message_length_read = len; + client->mqtt_state.message_length = mqtt_get_total_length(client->mqtt_state.in_buffer, client->mqtt_state.message_length_read); + + + switch (msg_type) + { + + case MQTT_MSG_TYPE_SUBACK: + if (client->mqtt_state.pending_msg_type == MQTT_MSG_TYPE_SUBSCRIBE && client->mqtt_state.pending_msg_id == msg_id) + MQTT_INFO("MQTT: Subscribe successful\r\n"); + break; + case MQTT_MSG_TYPE_UNSUBACK: + if (client->mqtt_state.pending_msg_type == MQTT_MSG_TYPE_UNSUBSCRIBE && client->mqtt_state.pending_msg_id == msg_id) + MQTT_INFO("MQTT: UnSubscribe successful\r\n"); + break; + case MQTT_MSG_TYPE_PUBLISH: + if (msg_qos == 1) + client->mqtt_state.outbound_message = mqtt_msg_puback(&client->mqtt_state.mqtt_connection, msg_id); + else if (msg_qos == 2) + client->mqtt_state.outbound_message = mqtt_msg_pubrec(&client->mqtt_state.mqtt_connection, msg_id); + if (msg_qos == 1 || msg_qos == 2) { + MQTT_INFO("MQTT: Queue response QoS: %d\r\n", msg_qos); + if (QUEUE_Puts(&client->msgQueue, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length) == -1) { + MQTT_INFO("MQTT: Queue full\r\n"); + } + } + + deliver_publish(client, client->mqtt_state.in_buffer, client->mqtt_state.message_length_read); + break; + case MQTT_MSG_TYPE_PUBACK: + if (client->mqtt_state.pending_msg_type == MQTT_MSG_TYPE_PUBLISH && client->mqtt_state.pending_msg_id == msg_id) { + MQTT_INFO("MQTT: received MQTT_MSG_TYPE_PUBACK, finish QoS1 publish\r\n"); + } + + break; + case MQTT_MSG_TYPE_PUBREC: + client->mqtt_state.outbound_message = mqtt_msg_pubrel(&client->mqtt_state.mqtt_connection, msg_id); + if (QUEUE_Puts(&client->msgQueue, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length) == -1) { + MQTT_INFO("MQTT: Queue full\r\n"); + } + break; + case MQTT_MSG_TYPE_PUBREL: + client->mqtt_state.outbound_message = mqtt_msg_pubcomp(&client->mqtt_state.mqtt_connection, msg_id); + if (QUEUE_Puts(&client->msgQueue, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length) == -1) { + MQTT_INFO("MQTT: Queue full\r\n"); + } + break; + case MQTT_MSG_TYPE_PUBCOMP: + if (client->mqtt_state.pending_msg_type == MQTT_MSG_TYPE_PUBLISH && client->mqtt_state.pending_msg_id == msg_id) { + MQTT_INFO("MQTT: receive MQTT_MSG_TYPE_PUBCOMP, finish QoS2 publish\r\n"); + } + break; + case MQTT_MSG_TYPE_PINGREQ: + client->mqtt_state.outbound_message = mqtt_msg_pingresp(&client->mqtt_state.mqtt_connection); + if (QUEUE_Puts(&client->msgQueue, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length) == -1) { + MQTT_INFO("MQTT: Queue full\r\n"); + } + break; + case MQTT_MSG_TYPE_PINGRESP: + // Ignore + break; + } + // NOTE: this is done down here and not in the switch case above + // because the PSOCK_READBUF_LEN() won't work inside a switch + // statement due to the way protothreads resume. + if (msg_type == MQTT_MSG_TYPE_PUBLISH) + { + len = client->mqtt_state.message_length_read; + + if (client->mqtt_state.message_length < client->mqtt_state.message_length_read) + { + //client->connState = MQTT_PUBLISH_RECV; + //Not Implement yet + len -= client->mqtt_state.message_length; + pdata += client->mqtt_state.message_length; + + MQTT_INFO("Get another published message\r\n"); + goto READPACKET; + } + + } + break; + } + } else { + MQTT_INFO("ERROR: Message too long\r\n"); + } + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); +} + +/** + * @brief Client send over callback function. + * @param arg: contain the ip link information + * @retval None + */ +void ICACHE_FLASH_ATTR +mqtt_tcpclient_sent_cb(void *arg) +{ + struct espconn *pCon = (struct espconn *)arg; + MQTT_Client* client = (MQTT_Client *)pCon->reverse; + MQTT_INFO("TCP: Sent\r\n"); + client->sendTimeout = 0; + client->keepAliveTick = 0; + + if ((client->connState == MQTT_DATA || client->connState == MQTT_KEEPALIVE_SEND) + && client->mqtt_state.pending_msg_type == MQTT_MSG_TYPE_PUBLISH) { + if (client->publishedCb) + client->publishedCb((uint32_t*)client); + } + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); +} + +void ICACHE_FLASH_ATTR mqtt_timer(void *arg) +{ + MQTT_Client* client = (MQTT_Client*)arg; + + if (client->connState == MQTT_DATA) { + client->keepAliveTick ++; + if (client->keepAliveTick > (client->mqtt_state.connect_info->keepalive / 2)) { + client->connState = MQTT_KEEPALIVE_SEND; + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); + } + + } else if (client->connState == TCP_RECONNECT_REQ) { + client->reconnectTick ++; + if (client->reconnectTick > MQTT_RECONNECT_TIMEOUT) { + client->reconnectTick = 0; + client->connState = TCP_RECONNECT; + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); + if (client->timeoutCb) + client->timeoutCb((uint32_t*)client); + } + } + if (client->sendTimeout > 0) + client->sendTimeout --; +} + +void ICACHE_FLASH_ATTR +mqtt_tcpclient_discon_cb(void *arg) +{ + + struct espconn *pespconn = (struct espconn *)arg; + MQTT_Client* client = (MQTT_Client *)pespconn->reverse; + MQTT_INFO("TCP: Disconnected callback\r\n"); + if (TCP_DISCONNECTING == client->connState) { + client->connState = TCP_DISCONNECTED; + } + else if (MQTT_DELETING == client->connState) { + client->connState = MQTT_DELETED; + } + else { + client->connState = TCP_RECONNECT_REQ; + } + if (client->disconnectedCb) + client->disconnectedCb((uint32_t*)client); + + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); +} + + + +/** + * @brief Tcp client connect success callback function. + * @param arg: contain the ip link information + * @retval None + */ +void ICACHE_FLASH_ATTR +mqtt_tcpclient_connect_cb(void *arg) +{ + struct espconn *pCon = (struct espconn *)arg; + MQTT_Client* client = (MQTT_Client *)pCon->reverse; + + espconn_regist_disconcb(client->pCon, mqtt_tcpclient_discon_cb); + espconn_regist_recvcb(client->pCon, mqtt_tcpclient_recv);//////// + espconn_regist_sentcb(client->pCon, mqtt_tcpclient_sent_cb);/////// + MQTT_INFO("MQTT: Connected to broker %s:%d\r\n", client->host, client->port); + + mqtt_msg_init(&client->mqtt_state.mqtt_connection, client->mqtt_state.out_buffer, client->mqtt_state.out_buffer_length); + client->mqtt_state.outbound_message = mqtt_msg_connect(&client->mqtt_state.mqtt_connection, client->mqtt_state.connect_info); + client->mqtt_state.pending_msg_type = mqtt_get_type(client->mqtt_state.outbound_message->data); + client->mqtt_state.pending_msg_id = mqtt_get_id(client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length); + + + client->sendTimeout = MQTT_SEND_TIMOUT; + MQTT_INFO("MQTT: Sending, type: %d, id: %04X\r\n", client->mqtt_state.pending_msg_type, client->mqtt_state.pending_msg_id); + if (client->security) { +#ifdef MQTT_SSL_ENABLE + espconn_secure_send(client->pCon, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length); +#else + MQTT_INFO("TCP: Do not support SSL\r\n"); +#endif + } + else { + espconn_send(client->pCon, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length); + } + + client->mqtt_state.outbound_message = NULL; + client->connState = MQTT_CONNECT_SENDING; + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); +} + +/** + * @brief Tcp client connect repeat callback function. + * @param arg: contain the ip link information + * @retval None + */ +void ICACHE_FLASH_ATTR +mqtt_tcpclient_recon_cb(void *arg, sint8 errType) +{ + struct espconn *pCon = (struct espconn *)arg; + MQTT_Client* client = (MQTT_Client *)pCon->reverse; + + MQTT_INFO("TCP: Reconnect to %s:%d\r\n", client->host, client->port); + + client->connState = TCP_RECONNECT_REQ; + + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); + +} + +/** + * @brief MQTT publish function. + * @param client: MQTT_Client reference + * @param topic: string topic will publish to + * @param data: buffer data send point to + * @param data_length: length of data + * @param qos: qos + * @param retain: retain + * @retval TRUE if success queue + */ +BOOL ICACHE_FLASH_ATTR +MQTT_Publish(MQTT_Client *client, const char* topic, const char* data, int data_length, int qos, int retain) +{ + uint8_t dataBuffer[MQTT_BUF_SIZE]; + uint16_t dataLen; + client->mqtt_state.outbound_message = mqtt_msg_publish(&client->mqtt_state.mqtt_connection, + topic, data, data_length, + qos, retain, + &client->mqtt_state.pending_msg_id); + if (client->mqtt_state.outbound_message->length == 0) { + MQTT_INFO("MQTT: Queuing publish failed\r\n"); + return FALSE; + } + MQTT_INFO("MQTT: queuing publish, length: %d, queue size(%d/%d)\r\n", client->mqtt_state.outbound_message->length, client->msgQueue.rb.fill_cnt, client->msgQueue.rb.size); + while (QUEUE_Puts(&client->msgQueue, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length) == -1) { + MQTT_INFO("MQTT: Queue full\r\n"); + if (QUEUE_Gets(&client->msgQueue, dataBuffer, &dataLen, MQTT_BUF_SIZE) == -1) { + MQTT_INFO("MQTT: Serious buffer error\r\n"); + return FALSE; + } + } + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); + return TRUE; +} + +/** + * @brief MQTT subscibe function. + * @param client: MQTT_Client reference + * @param topic: string topic will subscribe + * @param qos: qos + * @retval TRUE if success queue + */ +BOOL ICACHE_FLASH_ATTR +MQTT_Subscribe(MQTT_Client *client, char* topic, uint8_t qos) +{ + uint8_t dataBuffer[MQTT_BUF_SIZE]; + uint16_t dataLen; + + client->mqtt_state.outbound_message = mqtt_msg_subscribe(&client->mqtt_state.mqtt_connection, + topic, qos, + &client->mqtt_state.pending_msg_id); + MQTT_INFO("MQTT: queue subscribe, topic\"%s\", id: %d\r\n", topic, client->mqtt_state.pending_msg_id); + while (QUEUE_Puts(&client->msgQueue, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length) == -1) { + MQTT_INFO("MQTT: Queue full\r\n"); + if (QUEUE_Gets(&client->msgQueue, dataBuffer, &dataLen, MQTT_BUF_SIZE) == -1) { + MQTT_INFO("MQTT: Serious buffer error\r\n"); + return FALSE; + } + } + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); + + return TRUE; +} + +/** + * @brief MQTT un-subscibe function. + * @param client: MQTT_Client reference + * @param topic: String topic will un-subscribe + * @retval TRUE if success queue + */ +BOOL ICACHE_FLASH_ATTR +MQTT_UnSubscribe(MQTT_Client *client, char* topic) +{ + uint8_t dataBuffer[MQTT_BUF_SIZE]; + uint16_t dataLen; + client->mqtt_state.outbound_message = mqtt_msg_unsubscribe(&client->mqtt_state.mqtt_connection, + topic, + &client->mqtt_state.pending_msg_id); + MQTT_INFO("MQTT: queue un-subscribe, topic\"%s\", id: %d\r\n", topic, client->mqtt_state.pending_msg_id); + while (QUEUE_Puts(&client->msgQueue, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length) == -1) { + MQTT_INFO("MQTT: Queue full\r\n"); + if (QUEUE_Gets(&client->msgQueue, dataBuffer, &dataLen, MQTT_BUF_SIZE) == -1) { + MQTT_INFO("MQTT: Serious buffer error\r\n"); + return FALSE; + } + } + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); + return TRUE; +} + +/** + * @brief MQTT ping function. + * @param client: MQTT_Client reference + * @retval TRUE if success queue + */ +BOOL ICACHE_FLASH_ATTR +MQTT_Ping(MQTT_Client *client) +{ + uint8_t dataBuffer[MQTT_BUF_SIZE]; + uint16_t dataLen; + client->mqtt_state.outbound_message = mqtt_msg_pingreq(&client->mqtt_state.mqtt_connection); + if (client->mqtt_state.outbound_message->length == 0) { + MQTT_INFO("MQTT: Queuing publish failed\r\n"); + return FALSE; + } + MQTT_INFO("MQTT: queuing publish, length: %d, queue size(%d/%d)\r\n", client->mqtt_state.outbound_message->length, client->msgQueue.rb.fill_cnt, client->msgQueue.rb.size); + while (QUEUE_Puts(&client->msgQueue, client->mqtt_state.outbound_message->data, client->mqtt_state.outbound_message->length) == -1) { + MQTT_INFO("MQTT: Queue full\r\n"); + if (QUEUE_Gets(&client->msgQueue, dataBuffer, &dataLen, MQTT_BUF_SIZE) == -1) { + MQTT_INFO("MQTT: Serious buffer error\r\n"); + return FALSE; + } + } + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)client); + return TRUE; +} + +void ICACHE_FLASH_ATTR +MQTT_Task(os_event_t *e) +{ + MQTT_Client* client = (MQTT_Client*)e->par; + uint8_t dataBuffer[MQTT_BUF_SIZE]; + uint16_t dataLen; + if (e->par == 0) + return; + switch (client->connState) { + + case TCP_RECONNECT_REQ: + break; + case TCP_RECONNECT: + mqtt_tcpclient_delete(client); + MQTT_Connect(client); + MQTT_INFO("TCP: Reconnect to: %s:%d\r\n", client->host, client->port); + client->connState = TCP_CONNECTING; + break; + case MQTT_DELETING: + case TCP_DISCONNECTING: + case TCP_RECONNECT_DISCONNECTING: + if (client->security) { +#ifdef MQTT_SSL_ENABLE + espconn_secure_disconnect(client->pCon); +#else + MQTT_INFO("TCP: Do not support SSL\r\n"); +#endif + } + else { + espconn_disconnect(client->pCon); + } + break; + case TCP_DISCONNECTED: + MQTT_INFO("MQTT: Disconnected\r\n"); + mqtt_tcpclient_delete(client); + break; + case MQTT_DELETED: + MQTT_INFO("MQTT: Deleted client\r\n"); + mqtt_client_delete(client); + break; + case MQTT_KEEPALIVE_SEND: + mqtt_send_keepalive(client); + break; + case MQTT_DATA: + if (QUEUE_IsEmpty(&client->msgQueue) || client->sendTimeout != 0) { + break; + } + if (QUEUE_Gets(&client->msgQueue, dataBuffer, &dataLen, MQTT_BUF_SIZE) == 0) { + client->mqtt_state.pending_msg_type = mqtt_get_type(dataBuffer); + client->mqtt_state.pending_msg_id = mqtt_get_id(dataBuffer, dataLen); + + + client->sendTimeout = MQTT_SEND_TIMOUT; + MQTT_INFO("MQTT: Sending, type: %d, id: %04X\r\n", client->mqtt_state.pending_msg_type, client->mqtt_state.pending_msg_id); + client->keepAliveTick = 0; + if (client->security) { +#ifdef MQTT_SSL_ENABLE + espconn_secure_send(client->pCon, dataBuffer, dataLen); +#else + MQTT_INFO("TCP: Do not support SSL\r\n"); +#endif + } + else { + espconn_send(client->pCon, dataBuffer, dataLen); + } + + client->mqtt_state.outbound_message = NULL; + break; + } + break; + } +} + +/** + * @brief MQTT initialization connection function + * @param client: MQTT_Client reference + * @param host: Domain or IP string + * @param port: Port to connect + * @param security: 1 for ssl, 0 for none + * @retval None + */ +void ICACHE_FLASH_ATTR +MQTT_InitConnection(MQTT_Client *mqttClient, uint8_t* host, uint32_t port, uint8_t security) +{ + uint32_t temp; + MQTT_INFO("MQTT:InitConnection\r\n"); + os_memset(mqttClient, 0, sizeof(MQTT_Client)); + temp = os_strlen(host); + mqttClient->host = (uint8_t*)os_zalloc(temp + 1); + os_strcpy(mqttClient->host, host); + mqttClient->host[temp] = 0; + mqttClient->port = port; + mqttClient->security = security; + +} + +/** + * @brief MQTT initialization mqtt client function + * @param client: MQTT_Client reference + * @param clientid: MQTT client id + * @param client_user:MQTT client user + * @param client_pass:MQTT client password + * @param client_pass:MQTT keep alive timer, in second + * @retval None + */ +BOOL ICACHE_FLASH_ATTR +MQTT_InitClient(MQTT_Client *mqttClient, uint8_t* client_id, uint8_t* client_user, uint8_t* client_pass, uint32_t keepAliveTime, uint8_t cleanSession) +{ + uint32_t temp; + MQTT_INFO("MQTT:InitClient\r\n"); + + os_memset(&mqttClient->connect_info, 0, sizeof(mqtt_connect_info_t)); + + if ( !client_id ) + { + /* Should be allowed by broker, but clean session flag must be set. */ + #ifdef PROTOCOL_NAMEv311 + if (cleanSession) + { + mqttClient->connect_info.client_id = zero_len_id; + } else { + MQTT_INFO("cleanSession must be set to use 0 length client_id\r\n"); + return false; + } + /* Not supported. Return. */ + #else + MQTT_INFO("Client ID required for MQTT < 3.1.1!\r\n"); + return false; + #endif + } + + /* If connect_info's client_id is still NULL and we get here, we can * + * assume the passed client_id is non-NULL. */ + if ( !(mqttClient->connect_info.client_id) ) + { + temp = os_strlen(client_id); + mqttClient->connect_info.client_id = (uint8_t*)os_zalloc(temp + 1); + os_strcpy(mqttClient->connect_info.client_id, client_id); + mqttClient->connect_info.client_id[temp] = 0; + } + + if (client_user) + { + temp = os_strlen(client_user); + mqttClient->connect_info.username = (uint8_t*)os_zalloc(temp + 1); + os_strcpy(mqttClient->connect_info.username, client_user); + mqttClient->connect_info.username[temp] = 0; + } + + if (client_pass) + { + temp = os_strlen(client_pass); + mqttClient->connect_info.password = (uint8_t*)os_zalloc(temp + 1); + os_strcpy(mqttClient->connect_info.password, client_pass); + mqttClient->connect_info.password[temp] = 0; + } + + + mqttClient->connect_info.keepalive = keepAliveTime; + mqttClient->connect_info.clean_session = cleanSession; + + mqttClient->mqtt_state.in_buffer = (uint8_t *)os_zalloc(MQTT_BUF_SIZE); + mqttClient->mqtt_state.in_buffer_length = MQTT_BUF_SIZE; + mqttClient->mqtt_state.out_buffer = (uint8_t *)os_zalloc(MQTT_BUF_SIZE); + mqttClient->mqtt_state.out_buffer_length = MQTT_BUF_SIZE; + mqttClient->mqtt_state.connect_info = &mqttClient->connect_info; + + mqtt_msg_init(&mqttClient->mqtt_state.mqtt_connection, mqttClient->mqtt_state.out_buffer, mqttClient->mqtt_state.out_buffer_length); + + QUEUE_Init(&mqttClient->msgQueue, QUEUE_BUFFER_SIZE); + + system_os_task(MQTT_Task, MQTT_TASK_PRIO, mqtt_procTaskQueue, MQTT_TASK_QUEUE_SIZE); + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)mqttClient); + return true; +} +void ICACHE_FLASH_ATTR +MQTT_InitLWT(MQTT_Client *mqttClient, uint8_t* will_topic, uint8_t* will_msg, uint8_t will_qos, uint8_t will_retain) +{ + uint32_t temp; + temp = os_strlen(will_topic); + mqttClient->connect_info.will_topic = (uint8_t*)os_zalloc(temp + 1); + os_strcpy(mqttClient->connect_info.will_topic, will_topic); + mqttClient->connect_info.will_topic[temp] = 0; + + temp = os_strlen(will_msg); + mqttClient->connect_info.will_message = (uint8_t*)os_zalloc(temp + 1); + os_strcpy(mqttClient->connect_info.will_message, will_msg); + mqttClient->connect_info.will_message[temp] = 0; + + + mqttClient->connect_info.will_qos = will_qos; + mqttClient->connect_info.will_retain = will_retain; +} +/** + * @brief Begin connect to MQTT broker + * @param client: MQTT_Client reference + * @retval None + */ +void ICACHE_FLASH_ATTR +MQTT_Connect(MQTT_Client *mqttClient) +{ + if (mqttClient->pCon) { + // Clean up the old connection forcefully - using MQTT_Disconnect + // does not actually release the old connection until the + // disconnection callback is invoked. + mqtt_tcpclient_delete(mqttClient); + } + mqttClient->pCon = (struct espconn *)os_zalloc(sizeof(struct espconn)); + mqttClient->pCon->type = ESPCONN_TCP; + mqttClient->pCon->state = ESPCONN_NONE; + mqttClient->pCon->proto.tcp = (esp_tcp *)os_zalloc(sizeof(esp_tcp)); + mqttClient->pCon->proto.tcp->local_port = espconn_port(); + mqttClient->pCon->proto.tcp->remote_port = mqttClient->port; + mqttClient->pCon->reverse = mqttClient; + espconn_regist_connectcb(mqttClient->pCon, mqtt_tcpclient_connect_cb); + espconn_regist_reconcb(mqttClient->pCon, mqtt_tcpclient_recon_cb); + + mqttClient->keepAliveTick = 0; + mqttClient->reconnectTick = 0; + + + os_timer_disarm(&mqttClient->mqttTimer); + os_timer_setfn(&mqttClient->mqttTimer, (os_timer_func_t *)mqtt_timer, mqttClient); + os_timer_arm(&mqttClient->mqttTimer, 1000, 1); + + if (UTILS_StrToIP(mqttClient->host, &mqttClient->pCon->proto.tcp->remote_ip)) { + MQTT_INFO("TCP: Connect to ip %s:%d\r\n", mqttClient->host, mqttClient->port); + if (mqttClient->security) + { +#ifdef MQTT_SSL_ENABLE + espconn_secure_set_size(ESPCONN_CLIENT, MQTT_SSL_SIZE); + espconn_secure_connect(mqttClient->pCon); +#else + MQTT_INFO("TCP: Do not support SSL\r\n"); +#endif + } + else + { + espconn_connect(mqttClient->pCon); + } + } + else { + MQTT_INFO("TCP: Connect to domain %s:%d\r\n", mqttClient->host, mqttClient->port); + espconn_gethostbyname(mqttClient->pCon, mqttClient->host, &mqttClient->ip, mqtt_dns_found); + } + mqttClient->connState = TCP_CONNECTING; +} + +void ICACHE_FLASH_ATTR +MQTT_Disconnect(MQTT_Client *mqttClient) +{ + mqttClient->connState = TCP_DISCONNECTING; + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)mqttClient); + os_timer_disarm(&mqttClient->mqttTimer); +} + +void ICACHE_FLASH_ATTR +MQTT_DeleteClient(MQTT_Client *mqttClient) +{ + if (NULL == mqttClient) + return; + + mqttClient->connState = MQTT_DELETED; + // if(TCP_DISCONNECTED == mqttClient->connState) { + // mqttClient->connState = MQTT_DELETED; + // } else if(MQTT_DELETED != mqttClient->connState) { + // mqttClient->connState = MQTT_DELETING; + // } + + system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)mqttClient); + os_timer_disarm(&mqttClient->mqttTimer); +} + +void ICACHE_FLASH_ATTR +MQTT_OnConnected(MQTT_Client *mqttClient, MqttCallback connectedCb) +{ + mqttClient->connectedCb = connectedCb; +} + +void ICACHE_FLASH_ATTR +MQTT_OnDisconnected(MQTT_Client *mqttClient, MqttCallback disconnectedCb) +{ + mqttClient->disconnectedCb = disconnectedCb; +} + +void ICACHE_FLASH_ATTR +MQTT_OnData(MQTT_Client *mqttClient, MqttDataCallback dataCb) +{ + mqttClient->dataCb = dataCb; +} + +void ICACHE_FLASH_ATTR +MQTT_OnPublished(MQTT_Client *mqttClient, MqttCallback publishedCb) +{ + mqttClient->publishedCb = publishedCb; +} + +void ICACHE_FLASH_ATTR +MQTT_OnTimeout(MQTT_Client *mqttClient, MqttCallback timeoutCb) +{ + mqttClient->timeoutCb = timeoutCb; +} + + + +void ICACHE_FLASH_ATTR +MQTT_SetUserId(MQTT_Client *mqttClient, const char* client_id) +{ + if (mqttClient->connect_info.client_id != 0) { + os_free(mqttClient->connect_info.client_id); + mqttClient->connect_info.client_id = 0; + } + + + uint32_t len = os_strlen(client_id); + + mqttClient->connect_info.client_id = (uint8_t*)os_zalloc(len + 1); + if (len) { + os_strcpy(mqttClient->connect_info.client_id, client_id); + } + mqttClient->connect_info.client_id[len] = 0; +} + +void ICACHE_FLASH_ATTR +MQTT_SetUserPwd(MQTT_Client *mqttClient, const char* user, const char* pwd) +{ + uint32_t len; + + // free username + if (mqttClient->connect_info.username != 0) { + os_free(mqttClient->connect_info.username); + mqttClient->connect_info.username = 0; + } + // free password + if (mqttClient->connect_info.password != 0) { + os_free(mqttClient->connect_info.password); + mqttClient->connect_info.password = 0; + } + + + // copy username + len = os_strlen(user); + mqttClient->connect_info.username = (uint8_t*)os_zalloc(len + 1); + if (len) { + os_strcpy(mqttClient->connect_info.username, user); + } + mqttClient->connect_info.username[len] = 0; + + + // copy password + len = os_strlen(pwd); + mqttClient->connect_info.password = (uint8_t*)os_zalloc(len + 1); + if (len) { + os_strcpy(mqttClient->connect_info.password, pwd); + } + mqttClient->connect_info.password[len] = 0; + +} + diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt.h b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt.h new file mode 100644 index 000000000..6ef619433 --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt.h @@ -0,0 +1,152 @@ +/* mqtt.h +* +* Copyright (c) 2014-2015, Tuan PM +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* +* * Redistributions of source code must retain the above copyright notice, +* this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of Redis nor the names of its contributors may be used +* to endorse or promote products derived from this software without +* specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +*/ +#ifndef USER_AT_MQTT_H_ +#define USER_AT_MQTT_H_ +#include "mqtt_config.h" +#include "mqtt_msg.h" +#include "user_interface.h" + +#include "queue.h" +typedef struct mqtt_event_data_t +{ + uint8_t type; + const char* topic; + const char* data; + uint16_t topic_length; + uint16_t data_length; + uint16_t data_offset; +} mqtt_event_data_t; + +typedef struct mqtt_state_t +{ + uint16_t port; + int auto_reconnect; + mqtt_connect_info_t* connect_info; + uint8_t* in_buffer; + uint8_t* out_buffer; + int in_buffer_length; + int out_buffer_length; + uint16_t message_length; + uint16_t message_length_read; + mqtt_message_t* outbound_message; + mqtt_connection_t mqtt_connection; + uint16_t pending_msg_id; + int pending_msg_type; + int pending_publish_qos; +} mqtt_state_t; + +typedef enum { + WIFI_INIT, + WIFI_CONNECTING, + WIFI_CONNECTING_ERROR, + WIFI_CONNECTED, + DNS_RESOLVE, + TCP_DISCONNECTING, + TCP_DISCONNECTED, + TCP_RECONNECT_DISCONNECTING, + TCP_RECONNECT_REQ, + TCP_RECONNECT, + TCP_CONNECTING, + TCP_CONNECTING_ERROR, + TCP_CONNECTED, + MQTT_CONNECT_SEND, + MQTT_CONNECT_SENDING, + MQTT_SUBSCIBE_SEND, + MQTT_SUBSCIBE_SENDING, + MQTT_DATA, + MQTT_KEEPALIVE_SEND, + MQTT_PUBLISH_RECV, + MQTT_PUBLISHING, + MQTT_DELETING, + MQTT_DELETED, +} tConnState; + +typedef void (*MqttCallback)(uint32_t *args); +typedef void (*MqttDataCallback)(uint32_t *args, const char* topic, uint32_t topic_len, const char *data, uint32_t lengh); + +typedef struct { + struct espconn *pCon; + uint8_t security; + uint8_t* host; + uint32_t port; + ip_addr_t ip; + mqtt_state_t mqtt_state; + mqtt_connect_info_t connect_info; + MqttCallback connectedCb; + MqttCallback disconnectedCb; + MqttCallback publishedCb; + MqttCallback timeoutCb; + MqttDataCallback dataCb; + ETSTimer mqttTimer; + uint32_t keepAliveTick; + uint32_t reconnectTick; + uint32_t sendTimeout; + tConnState connState; + QUEUE msgQueue; + void* user_data; +} MQTT_Client; + +#define SEC_NONSSL 0 +#define SEC_SSL 1 + +#define MQTT_FLAG_CONNECTED 1 +#define MQTT_FLAG_READY 2 +#define MQTT_FLAG_EXIT 4 + +#define MQTT_EVENT_TYPE_NONE 0 +#define MQTT_EVENT_TYPE_CONNECTED 1 +#define MQTT_EVENT_TYPE_DISCONNECTED 2 +#define MQTT_EVENT_TYPE_SUBSCRIBED 3 +#define MQTT_EVENT_TYPE_UNSUBSCRIBED 4 +#define MQTT_EVENT_TYPE_PUBLISH 5 +#define MQTT_EVENT_TYPE_PUBLISHED 6 +#define MQTT_EVENT_TYPE_EXITED 7 +#define MQTT_EVENT_TYPE_PUBLISH_CONTINUATION 8 + +void ICACHE_FLASH_ATTR MQTT_InitConnection(MQTT_Client *mqttClient, uint8_t* host, uint32_t port, uint8_t security); +bool ICACHE_FLASH_ATTR MQTT_InitClient(MQTT_Client *mqttClient, uint8_t* client_id, uint8_t* client_user, uint8_t* client_pass, uint32_t keepAliveTime, uint8_t cleanSession); +void ICACHE_FLASH_ATTR MQTT_DeleteClient(MQTT_Client *mqttClient); +void ICACHE_FLASH_ATTR MQTT_InitLWT(MQTT_Client *mqttClient, uint8_t* will_topic, uint8_t* will_msg, uint8_t will_qos, uint8_t will_retain); + +void ICACHE_FLASH_ATTR MQTT_SetUserId(MQTT_Client *mqttClient, const char* client_id); +void ICACHE_FLASH_ATTR MQTT_SetUserPwd(MQTT_Client *mqttClient, const char* user_id, const char* pwd); + +void ICACHE_FLASH_ATTR MQTT_OnConnected(MQTT_Client *mqttClient, MqttCallback connectedCb); +void ICACHE_FLASH_ATTR MQTT_OnDisconnected(MQTT_Client *mqttClient, MqttCallback disconnectedCb); +void ICACHE_FLASH_ATTR MQTT_OnPublished(MQTT_Client *mqttClient, MqttCallback publishedCb); +void ICACHE_FLASH_ATTR MQTT_OnTimeout(MQTT_Client *mqttClient, MqttCallback timeoutCb); +void ICACHE_FLASH_ATTR MQTT_OnData(MQTT_Client *mqttClient, MqttDataCallback dataCb); +bool ICACHE_FLASH_ATTR MQTT_Subscribe(MQTT_Client *client, char* topic, uint8_t qos); +bool ICACHE_FLASH_ATTR MQTT_UnSubscribe(MQTT_Client *client, char* topic); +void ICACHE_FLASH_ATTR MQTT_Connect(MQTT_Client *mqttClient); +void ICACHE_FLASH_ATTR MQTT_Disconnect(MQTT_Client *mqttClient); +bool ICACHE_FLASH_ATTR MQTT_Publish(MQTT_Client *client, const char* topic, const char* data, int data_length, int qos, int retain); + +#endif /* USER_AT_MQTT_H_ */ diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt_config.h b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt_config.h new file mode 100644 index 000000000..5332f82ee --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt_config.h @@ -0,0 +1,19 @@ +#ifndef __MQTT_CONFIG_H__ +#define __MQTT_CONFIG_H__ + +//#define MQTT_SSL_ENABLE + +/*DEFAULT CONFIGURATIONS*/ + +#define MQTT_BUF_SIZE 1024 +//#define MQTT_KEEPALIVE 120 /*second*/ +#define MQTT_KEEPALIVE 15 /*second*/ + +#define MQTT_RECONNECT_TIMEOUT 5 /*second*/ + +#define QUEUE_BUFFER_SIZE 2048 + +//#define PROTOCOL_NAMEv31 /*MQTT version 3.1 compatible with Mosquitto v0.15*/ +#define PROTOCOL_NAMEv311 /*MQTT version 3.11 compatible with https://eclipse.org/paho/clients/testing/*/ + +#endif // __MQTT_CONFIG_H__ \ No newline at end of file diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt_msg.c b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt_msg.c new file mode 100644 index 000000000..c2b320311 --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt_msg.c @@ -0,0 +1,487 @@ +/* +* Copyright (c) 2014, Stephen Robinson +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* +* 1. Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* 2. Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* 3. Neither the name of the copyright holder nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +* +*/ + +#include +#include "mqtt_msg.h" +#include "mqtt_config.h" +#define MQTT_MAX_FIXED_HEADER_SIZE 3 + +enum mqtt_connect_flag +{ + MQTT_CONNECT_FLAG_USERNAME = 1 << 7, + MQTT_CONNECT_FLAG_PASSWORD = 1 << 6, + MQTT_CONNECT_FLAG_WILL_RETAIN = 1 << 5, + MQTT_CONNECT_FLAG_WILL = 1 << 2, + MQTT_CONNECT_FLAG_CLEAN_SESSION = 1 << 1 +}; + +struct __attribute((__packed__)) mqtt_connect_variable_header +{ + uint8_t lengthMsb; + uint8_t lengthLsb; +#if defined(PROTOCOL_NAMEv31) + uint8_t magic[6]; +#elif defined(PROTOCOL_NAMEv311) + uint8_t magic[4]; +#else +#error "Please define protocol name" +#endif + uint8_t version; + uint8_t flags; + uint8_t keepaliveMsb; + uint8_t keepaliveLsb; +}; + +static int ICACHE_FLASH_ATTR append_string(mqtt_connection_t* connection, const char* string, int len) +{ + if (connection->message.length + len + 2 > connection->buffer_length) + return -1; + + connection->buffer[connection->message.length++] = len >> 8; + connection->buffer[connection->message.length++] = len & 0xff; + memcpy(connection->buffer + connection->message.length, string, len); + connection->message.length += len; + + return len + 2; +} + +static uint16_t ICACHE_FLASH_ATTR append_message_id(mqtt_connection_t* connection, uint16_t message_id) +{ + // If message_id is zero then we should assign one, otherwise + // we'll use the one supplied by the caller + while (message_id == 0) + message_id = ++connection->message_id; + + if (connection->message.length + 2 > connection->buffer_length) + return 0; + + connection->buffer[connection->message.length++] = message_id >> 8; + connection->buffer[connection->message.length++] = message_id & 0xff; + + return message_id; +} + +static int ICACHE_FLASH_ATTR init_message(mqtt_connection_t* connection) +{ + connection->message.length = MQTT_MAX_FIXED_HEADER_SIZE; + return MQTT_MAX_FIXED_HEADER_SIZE; +} + +static mqtt_message_t* ICACHE_FLASH_ATTR fail_message(mqtt_connection_t* connection) +{ + connection->message.data = connection->buffer; + connection->message.length = 0; + return &connection->message; +} + +static mqtt_message_t* ICACHE_FLASH_ATTR fini_message(mqtt_connection_t* connection, int type, int dup, int qos, int retain) +{ + int remaining_length = connection->message.length - MQTT_MAX_FIXED_HEADER_SIZE; + + if (remaining_length > 127) + { + connection->buffer[0] = ((type & 0x0f) << 4) | ((dup & 1) << 3) | ((qos & 3) << 1) | (retain & 1); + connection->buffer[1] = 0x80 | (remaining_length % 128); + connection->buffer[2] = remaining_length / 128; + connection->message.length = remaining_length + 3; + connection->message.data = connection->buffer; + } + else + { + connection->buffer[1] = ((type & 0x0f) << 4) | ((dup & 1) << 3) | ((qos & 3) << 1) | (retain & 1); + connection->buffer[2] = remaining_length; + connection->message.length = remaining_length + 2; + connection->message.data = connection->buffer + 1; + } + + return &connection->message; +} + +void ICACHE_FLASH_ATTR mqtt_msg_init(mqtt_connection_t* connection, uint8_t* buffer, uint16_t buffer_length) +{ + memset(connection, 0, sizeof(mqtt_connection_t)); + connection->buffer = buffer; + connection->buffer_length = buffer_length; +} + +int ICACHE_FLASH_ATTR mqtt_get_total_length(uint8_t* buffer, uint16_t length) +{ + int i; + int totlen = 0; + + for (i = 1; i < length; ++i) + { + totlen += (buffer[i] & 0x7f) << (7 * (i - 1)); + if ((buffer[i] & 0x80) == 0) + { + ++i; + break; + } + } + totlen += i; + + return totlen; +} + +const char* ICACHE_FLASH_ATTR mqtt_get_publish_topic(uint8_t* buffer, uint16_t* length) +{ + int i; + int totlen = 0; + int topiclen; + + for (i = 1; i < *length; ++i) + { + totlen += (buffer[i] & 0x7f) << (7 * (i - 1)); + if ((buffer[i] & 0x80) == 0) + { + ++i; + break; + } + } + totlen += i; + + if (i + 2 >= *length) + return NULL; + topiclen = buffer[i++] << 8; + topiclen |= buffer[i++]; + + if (i + topiclen > *length) + return NULL; + + *length = topiclen; + return (const char*)(buffer + i); +} + +const char* ICACHE_FLASH_ATTR mqtt_get_publish_data(uint8_t* buffer, uint16_t* length) +{ + int i; + int totlen = 0; + int topiclen; + int blength = *length; + *length = 0; + + for (i = 1; i < blength; ++i) + { + totlen += (buffer[i] & 0x7f) << (7 * (i - 1)); + if ((buffer[i] & 0x80) == 0) + { + ++i; + break; + } + } + totlen += i; + + if (i + 2 >= blength) + return NULL; + topiclen = buffer[i++] << 8; + topiclen |= buffer[i++]; + + if (i + topiclen >= blength) + return NULL; + + i += topiclen; + + if (mqtt_get_qos(buffer) > 0) + { + if (i + 2 >= blength) + return NULL; + i += 2; + } + + if (totlen < i) + return NULL; + + if (totlen <= blength) + *length = totlen - i; + else + *length = blength - i; + return (const char*)(buffer + i); +} + +uint16_t ICACHE_FLASH_ATTR mqtt_get_id(uint8_t* buffer, uint16_t length) +{ + if (length < 1) + return 0; + + switch (mqtt_get_type(buffer)) + { + case MQTT_MSG_TYPE_PUBLISH: + { + int i; + int topiclen; + + for (i = 1; i < length; ++i) + { + if ((buffer[i] & 0x80) == 0) + { + ++i; + break; + } + } + + if (i + 2 >= length) + return 0; + topiclen = buffer[i++] << 8; + topiclen |= buffer[i++]; + + if (i + topiclen >= length) + return 0; + i += topiclen; + + if (mqtt_get_qos(buffer) > 0) + { + if (i + 2 >= length) + return 0; + //i += 2; + } else { + return 0; + } + + return (buffer[i] << 8) | buffer[i + 1]; + } + case MQTT_MSG_TYPE_PUBACK: + case MQTT_MSG_TYPE_PUBREC: + case MQTT_MSG_TYPE_PUBREL: + case MQTT_MSG_TYPE_PUBCOMP: + case MQTT_MSG_TYPE_SUBACK: + case MQTT_MSG_TYPE_UNSUBACK: + case MQTT_MSG_TYPE_SUBSCRIBE: + { + // This requires the remaining length to be encoded in 1 byte, + // which it should be. + if (length >= 4 && (buffer[1] & 0x80) == 0) + return (buffer[2] << 8) | buffer[3]; + else + return 0; + } + + default: + return 0; + } +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_connect(mqtt_connection_t* connection, mqtt_connect_info_t* info) +{ + struct mqtt_connect_variable_header* variable_header; + + init_message(connection); + + if (connection->message.length + sizeof(*variable_header) > connection->buffer_length) + return fail_message(connection); + variable_header = (void*)(connection->buffer + connection->message.length); + connection->message.length += sizeof(*variable_header); + + variable_header->lengthMsb = 0; +#if defined(PROTOCOL_NAMEv31) + variable_header->lengthLsb = 6; + memcpy(variable_header->magic, "MQIsdp", 6); + variable_header->version = 3; +#elif defined(PROTOCOL_NAMEv311) + variable_header->lengthLsb = 4; + memcpy(variable_header->magic, "MQTT", 4); + variable_header->version = 4; +#else +#error "Please define protocol name" +#endif + + variable_header->flags = 0; + variable_header->keepaliveMsb = info->keepalive >> 8; + variable_header->keepaliveLsb = info->keepalive & 0xff; + + if (info->clean_session) + variable_header->flags |= MQTT_CONNECT_FLAG_CLEAN_SESSION; + + if (info->client_id == NULL) + { + /* Never allowed */ + return fail_message(connection); + } + else if (info->client_id[0] == '\0') + { +#ifdef PROTOCOL_NAMEv311 + /* Allowed. Format 0 Length ID */ + append_string(connection, info->client_id, 2) ; +#else + /* 0 Length not allowed */ + return fail_message(connection); +#endif + } + else + { + /* No 0 data and at least 1 long. Good to go. */ + if(append_string(connection, info->client_id, strlen(info->client_id)) < 0) + return fail_message(connection); + } + + if (info->will_topic != NULL && info->will_topic[0] != '\0') + { + if (append_string(connection, info->will_topic, strlen(info->will_topic)) < 0) + return fail_message(connection); + + if (append_string(connection, info->will_message, strlen(info->will_message)) < 0) + return fail_message(connection); + + variable_header->flags |= MQTT_CONNECT_FLAG_WILL; + if (info->will_retain) + variable_header->flags |= MQTT_CONNECT_FLAG_WILL_RETAIN; + variable_header->flags |= (info->will_qos & 3) << 3; + } + + if (info->username != NULL && info->username[0] != '\0') + { + if (append_string(connection, info->username, strlen(info->username)) < 0) + return fail_message(connection); + + variable_header->flags |= MQTT_CONNECT_FLAG_USERNAME; + } + + if (info->password != NULL && info->password[0] != '\0') + { + if (append_string(connection, info->password, strlen(info->password)) < 0) + return fail_message(connection); + + variable_header->flags |= MQTT_CONNECT_FLAG_PASSWORD; + } + + return fini_message(connection, MQTT_MSG_TYPE_CONNECT, 0, 0, 0); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_publish(mqtt_connection_t* connection, const char* topic, const char* data, int data_length, int qos, int retain, uint16_t* message_id) +{ + init_message(connection); + + if (topic == NULL || topic[0] == '\0') + return fail_message(connection); + + if (append_string(connection, topic, strlen(topic)) < 0) + return fail_message(connection); + + if (qos > 0) + { + if ((*message_id = append_message_id(connection, 0)) == 0) + return fail_message(connection); + } + else + *message_id = 0; + + if (connection->message.length + data_length > connection->buffer_length) + return fail_message(connection); + memcpy(connection->buffer + connection->message.length, data, data_length); + connection->message.length += data_length; + + return fini_message(connection, MQTT_MSG_TYPE_PUBLISH, 0, qos, retain); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_puback(mqtt_connection_t* connection, uint16_t message_id) +{ + init_message(connection); + if (append_message_id(connection, message_id) == 0) + return fail_message(connection); + return fini_message(connection, MQTT_MSG_TYPE_PUBACK, 0, 0, 0); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pubrec(mqtt_connection_t* connection, uint16_t message_id) +{ + init_message(connection); + if (append_message_id(connection, message_id) == 0) + return fail_message(connection); + return fini_message(connection, MQTT_MSG_TYPE_PUBREC, 0, 0, 0); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pubrel(mqtt_connection_t* connection, uint16_t message_id) +{ + init_message(connection); + if (append_message_id(connection, message_id) == 0) + return fail_message(connection); + return fini_message(connection, MQTT_MSG_TYPE_PUBREL, 0, 1, 0); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pubcomp(mqtt_connection_t* connection, uint16_t message_id) +{ + init_message(connection); + if (append_message_id(connection, message_id) == 0) + return fail_message(connection); + return fini_message(connection, MQTT_MSG_TYPE_PUBCOMP, 0, 0, 0); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_subscribe(mqtt_connection_t* connection, const char* topic, int qos, uint16_t* message_id) +{ + init_message(connection); + + if (topic == NULL || topic[0] == '\0') + return fail_message(connection); + + if ((*message_id = append_message_id(connection, 0)) == 0) + return fail_message(connection); + + if (append_string(connection, topic, strlen(topic)) < 0) + return fail_message(connection); + + if (connection->message.length + 1 > connection->buffer_length) + return fail_message(connection); + connection->buffer[connection->message.length++] = qos; + + return fini_message(connection, MQTT_MSG_TYPE_SUBSCRIBE, 0, 1, 0); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_unsubscribe(mqtt_connection_t* connection, const char* topic, uint16_t* message_id) +{ + init_message(connection); + + if (topic == NULL || topic[0] == '\0') + return fail_message(connection); + + if ((*message_id = append_message_id(connection, 0)) == 0) + return fail_message(connection); + + if (append_string(connection, topic, strlen(topic)) < 0) + return fail_message(connection); + + return fini_message(connection, MQTT_MSG_TYPE_UNSUBSCRIBE, 0, 1, 0); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pingreq(mqtt_connection_t* connection) +{ + init_message(connection); + return fini_message(connection, MQTT_MSG_TYPE_PINGREQ, 0, 0, 0); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pingresp(mqtt_connection_t* connection) +{ + init_message(connection); + return fini_message(connection, MQTT_MSG_TYPE_PINGRESP, 0, 0, 0); +} + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_disconnect(mqtt_connection_t* connection) +{ + init_message(connection); + return fini_message(connection, MQTT_MSG_TYPE_DISCONNECT, 0, 0, 0); +} diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt_msg.h b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt_msg.h new file mode 100644 index 000000000..be3cc55cb --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/mqtt_msg.h @@ -0,0 +1,141 @@ +/* + * File: mqtt_msg.h + * Author: Minh Tuan + * + * Created on July 12, 2014, 1:05 PM + */ + +#ifndef MQTT_MSG_H +#define MQTT_MSG_H +#include "user_config.h" +#include "c_types.h" +#ifdef __cplusplus +extern "C" { +#endif + +/* +* Copyright (c) 2014, Stephen Robinson +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* +* 1. Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* 2. Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* 3. Neither the name of the copyright holder nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +* +*/ +/* 7 6 5 4 3 2 1 0*/ +/*| --- Message Type---- | DUP Flag | QoS Level | Retain | +/* Remaining Length */ + + +enum mqtt_message_type +{ + MQTT_MSG_TYPE_CONNECT = 1, + MQTT_MSG_TYPE_CONNACK = 2, + MQTT_MSG_TYPE_PUBLISH = 3, + MQTT_MSG_TYPE_PUBACK = 4, + MQTT_MSG_TYPE_PUBREC = 5, + MQTT_MSG_TYPE_PUBREL = 6, + MQTT_MSG_TYPE_PUBCOMP = 7, + MQTT_MSG_TYPE_SUBSCRIBE = 8, + MQTT_MSG_TYPE_SUBACK = 9, + MQTT_MSG_TYPE_UNSUBSCRIBE = 10, + MQTT_MSG_TYPE_UNSUBACK = 11, + MQTT_MSG_TYPE_PINGREQ = 12, + MQTT_MSG_TYPE_PINGRESP = 13, + MQTT_MSG_TYPE_DISCONNECT = 14 +}; + +enum mqtt_connect_return_code +{ + CONNECTION_ACCEPTED = 0, + CONNECTION_REFUSE_PROTOCOL, + CONNECTION_REFUSE_ID_REJECTED, + CONNECTION_REFUSE_SERVER_UNAVAILABLE, + CONNECTION_REFUSE_BAD_USERNAME, + CONNECTION_REFUSE_NOT_AUTHORIZED +}; + +typedef struct mqtt_message +{ + uint8_t* data; + uint16_t length; + +} mqtt_message_t; + +typedef struct mqtt_connection +{ + mqtt_message_t message; + + uint16_t message_id; + uint8_t* buffer; + uint16_t buffer_length; + +} mqtt_connection_t; + +typedef struct mqtt_connect_info +{ + char* client_id; + char* username; + char* password; + char* will_topic; + char* will_message; + uint32_t keepalive; + int will_qos; + int will_retain; + int clean_session; + +} mqtt_connect_info_t; + + +static inline int ICACHE_FLASH_ATTR mqtt_get_type(uint8_t* buffer) { return (buffer[0] & 0xf0) >> 4; } +static inline int ICACHE_FLASH_ATTR mqtt_get_connect_return_code(uint8_t* buffer) { return buffer[3]; } +static inline int ICACHE_FLASH_ATTR mqtt_get_dup(uint8_t* buffer) { return (buffer[0] & 0x08) >> 3; } +static inline int ICACHE_FLASH_ATTR mqtt_get_qos(uint8_t* buffer) { return (buffer[0] & 0x06) >> 1; } +static inline int ICACHE_FLASH_ATTR mqtt_get_retain(uint8_t* buffer) { return (buffer[0] & 0x01); } + +void ICACHE_FLASH_ATTR mqtt_msg_init(mqtt_connection_t* connection, uint8_t* buffer, uint16_t buffer_length); +int ICACHE_FLASH_ATTR mqtt_get_total_length(uint8_t* buffer, uint16_t length); +const char* ICACHE_FLASH_ATTR mqtt_get_publish_topic(uint8_t* buffer, uint16_t* length); +const char* ICACHE_FLASH_ATTR mqtt_get_publish_data(uint8_t* buffer, uint16_t* length); +uint16_t ICACHE_FLASH_ATTR mqtt_get_id(uint8_t* buffer, uint16_t length); + +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_connect(mqtt_connection_t* connection, mqtt_connect_info_t* info); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_publish(mqtt_connection_t* connection, const char* topic, const char* data, int data_length, int qos, int retain, uint16_t* message_id); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_puback(mqtt_connection_t* connection, uint16_t message_id); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pubrec(mqtt_connection_t* connection, uint16_t message_id); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pubrel(mqtt_connection_t* connection, uint16_t message_id); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pubcomp(mqtt_connection_t* connection, uint16_t message_id); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_subscribe(mqtt_connection_t* connection, const char* topic, int qos, uint16_t* message_id); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_unsubscribe(mqtt_connection_t* connection, const char* topic, uint16_t* message_id); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pingreq(mqtt_connection_t* connection); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_pingresp(mqtt_connection_t* connection); +mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_disconnect(mqtt_connection_t* connection); + + +#ifdef __cplusplus +} +#endif + +#endif /* MQTT_MSG_H */ + diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/proto.c b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/proto.c new file mode 100644 index 000000000..84078b233 --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/proto.c @@ -0,0 +1,129 @@ +#include "proto.h" +#include "ringbuf.h" +I8 ICACHE_FLASH_ATTR PROTO_Init(PROTO_PARSER *parser, PROTO_PARSE_CALLBACK *completeCallback, U8 *buf, U16 bufSize) +{ + parser->buf = buf; + parser->bufSize = bufSize; + parser->dataLen = 0; + parser->callback = completeCallback; + parser->isEsc = 0; + return 0; +} + +I8 ICACHE_FLASH_ATTR PROTO_ParseByte(PROTO_PARSER *parser, U8 value) +{ + switch (value) { + case 0x7D: + parser->isEsc = 1; + break; + + case 0x7E: + parser->dataLen = 0; + parser->isEsc = 0; + parser->isBegin = 1; + break; + + case 0x7F: + if (parser->callback != NULL) + parser->callback(); + parser->isBegin = 0; + return 0; + break; + + default: + if (parser->isBegin == 0) break; + + if (parser->isEsc) { + value ^= 0x20; + parser->isEsc = 0; + } + + if (parser->dataLen < parser->bufSize) + parser->buf[parser->dataLen++] = value; + + break; + } + return -1; +} + +I8 ICACHE_FLASH_ATTR PROTO_Parse(PROTO_PARSER *parser, U8 *buf, U16 len) +{ + while (len--) + PROTO_ParseByte(parser, *buf++); + + return 0; +} +I16 ICACHE_FLASH_ATTR PROTO_ParseRb(RINGBUF* rb, U8 *bufOut, U16* len, U16 maxBufLen) +{ + U8 c; + + PROTO_PARSER proto; + PROTO_Init(&proto, NULL, bufOut, maxBufLen); + while (RINGBUF_Get(rb, &c) == 0) { + if (PROTO_ParseByte(&proto, c) == 0) { + *len = proto.dataLen; + return 0; + } + } + return -1; +} +I16 ICACHE_FLASH_ATTR PROTO_Add(U8 *buf, const U8 *packet, I16 bufSize) +{ + U16 i = 2; + U16 len = *(U16*) packet; + + if (bufSize < 1) return -1; + + *buf++ = 0x7E; + bufSize--; + + while (len--) { + switch (*packet) { + case 0x7D: + case 0x7E: + case 0x7F: + if (bufSize < 2) return -1; + *buf++ = 0x7D; + *buf++ = *packet++ ^ 0x20; + i += 2; + bufSize -= 2; + break; + default: + if (bufSize < 1) return -1; + *buf++ = *packet++; + i++; + bufSize--; + break; + } + } + + if (bufSize < 1) return -1; + *buf++ = 0x7F; + + return i; +} + +I16 ICACHE_FLASH_ATTR PROTO_AddRb(RINGBUF *rb, const U8 *packet, I16 len) +{ + U16 i = 2; + if (RINGBUF_Put(rb, 0x7E) == -1) return -1; + while (len--) { + switch (*packet) { + case 0x7D: + case 0x7E: + case 0x7F: + if (RINGBUF_Put(rb, 0x7D) == -1) return -1; + if (RINGBUF_Put(rb, *packet++ ^ 0x20) == -1) return -1; + i += 2; + break; + default: + if (RINGBUF_Put(rb, *packet++) == -1) return -1; + i++; + break; + } + } + if (RINGBUF_Put(rb, 0x7F) == -1) return -1; + + return i; +} + diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/proto.h b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/proto.h new file mode 100644 index 000000000..a405bcb95 --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/proto.h @@ -0,0 +1,32 @@ +/* + * File: proto.h + * Author: ThuHien + * + * Created on November 23, 2012, 8:57 AM + */ + +#ifndef _PROTO_H_ +#define _PROTO_H_ +#include +#include "typedef.h" +#include "ringbuf.h" + +typedef void(PROTO_PARSE_CALLBACK)(); + +typedef struct { + U8 *buf; + U16 bufSize; + U16 dataLen; + U8 isEsc; + U8 isBegin; + PROTO_PARSE_CALLBACK* callback; +} PROTO_PARSER; + +I8 ICACHE_FLASH_ATTR PROTO_Init(PROTO_PARSER *parser, PROTO_PARSE_CALLBACK *completeCallback, U8 *buf, U16 bufSize); +I8 ICACHE_FLASH_ATTR PROTO_Parse(PROTO_PARSER *parser, U8 *buf, U16 len); +I16 ICACHE_FLASH_ATTR PROTO_Add(U8 *buf, const U8 *packet, I16 bufSize); +I16 ICACHE_FLASH_ATTR PROTO_AddRb(RINGBUF *rb, const U8 *packet, I16 len); +I8 ICACHE_FLASH_ATTR PROTO_ParseByte(PROTO_PARSER *parser, U8 value); +I16 ICACHE_FLASH_ATTR PROTO_ParseRb(RINGBUF *rb, U8 *bufOut, U16* len, U16 maxBufLen); +#endif + diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/queue.c b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/queue.c new file mode 100644 index 000000000..95bbec0cd --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/queue.c @@ -0,0 +1,75 @@ +/* str_queue.c +* +* Copyright (c) 2014-2015, Tuan PM +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* +* * Redistributions of source code must retain the above copyright notice, +* this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of Redis nor the names of its contributors may be used +* to endorse or promote products derived from this software without +* specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +*/ +#include "queue.h" + +#include "user_interface.h" +#include "osapi.h" +#include "os_type.h" +#include "mem.h" +#include "proto.h" + +uint8_t *last_rb_p_r; +uint8_t *last_rb_p_w; +uint32_t last_fill_cnt; + +void ICACHE_FLASH_ATTR QUEUE_Init(QUEUE *queue, int bufferSize) +{ + queue->buf = (uint8_t*)os_zalloc(bufferSize); + RINGBUF_Init(&queue->rb, queue->buf, bufferSize); +} +int32_t ICACHE_FLASH_ATTR QUEUE_Puts(QUEUE *queue, uint8_t* buffer, uint16_t len) +{ + uint32_t ret; + + last_rb_p_r = queue->rb.p_r; + last_rb_p_w = queue->rb.p_w; + last_fill_cnt = queue->rb.fill_cnt; + + ret = PROTO_AddRb(&queue->rb, buffer, len); + if (ret == -1) { + // rolling ring buffer back + queue->rb.p_r = last_rb_p_r; + queue->rb.p_w = last_rb_p_w; + queue->rb.fill_cnt = last_fill_cnt; + } + return ret; +} +int32_t ICACHE_FLASH_ATTR QUEUE_Gets(QUEUE *queue, uint8_t* buffer, uint16_t* len, uint16_t maxLen) +{ + + return PROTO_ParseRb(&queue->rb, buffer, len, maxLen); +} + +BOOL ICACHE_FLASH_ATTR QUEUE_IsEmpty(QUEUE *queue) +{ + if (queue->rb.fill_cnt <= 0) + return TRUE; + return FALSE; +} diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/queue.h b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/queue.h new file mode 100644 index 000000000..79107f2d5 --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/queue.h @@ -0,0 +1,44 @@ +/* str_queue.h -- +* +* Copyright (c) 2014-2015, Tuan PM +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* +* * Redistributions of source code must retain the above copyright notice, +* this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of Redis nor the names of its contributors may be used +* to endorse or promote products derived from this software without +* specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef USER_QUEUE_H_ +#define USER_QUEUE_H_ +#include "os_type.h" +#include "ringbuf.h" +typedef struct { + uint8_t *buf; + RINGBUF rb; +} QUEUE; + +void ICACHE_FLASH_ATTR QUEUE_Init(QUEUE *queue, int bufferSize); +int32_t ICACHE_FLASH_ATTR QUEUE_Puts(QUEUE *queue, uint8_t* buffer, uint16_t len); +int32_t ICACHE_FLASH_ATTR QUEUE_Gets(QUEUE *queue, uint8_t* buffer, uint16_t* len, uint16_t maxLen); +bool ICACHE_FLASH_ATTR QUEUE_IsEmpty(QUEUE *queue); +#endif /* USER_QUEUE_H_ */ diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/ringbuf.c b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/ringbuf.c new file mode 100644 index 000000000..fc882fd5c --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/ringbuf.c @@ -0,0 +1,67 @@ +/** +* \file +* Ring Buffer library +*/ + +#include "ringbuf.h" + + +/** +* \brief init a RINGBUF object +* \param r pointer to a RINGBUF object +* \param buf pointer to a byte array +* \param size size of buf +* \return 0 if successfull, otherwise failed +*/ +I16 ICACHE_FLASH_ATTR RINGBUF_Init(RINGBUF *r, U8* buf, I32 size) +{ + if (r == NULL || buf == NULL || size < 2) return -1; + + r->p_o = r->p_r = r->p_w = buf; + r->fill_cnt = 0; + r->size = size; + + return 0; +} +/** +* \brief put a character into ring buffer +* \param r pointer to a ringbuf object +* \param c character to be put +* \return 0 if successfull, otherwise failed +*/ +I16 ICACHE_FLASH_ATTR RINGBUF_Put(RINGBUF *r, U8 c) +{ + if (r->fill_cnt >= r->size)return -1; // ring buffer is full, this should be atomic operation + + + r->fill_cnt++; // increase filled slots count, this should be atomic operation + + + *r->p_w++ = c; // put character into buffer + + if (r->p_w >= r->p_o + r->size) // rollback if write pointer go pass + r->p_w = r->p_o; // the physical boundary + + return 0; +} +/** +* \brief get a character from ring buffer +* \param r pointer to a ringbuf object +* \param c read character +* \return 0 if successfull, otherwise failed +*/ +I16 ICACHE_FLASH_ATTR RINGBUF_Get(RINGBUF *r, U8* c) +{ + if (r->fill_cnt <= 0)return -1; // ring buffer is empty, this should be atomic operation + + + r->fill_cnt--; // decrease filled slots count + + + *c = *r->p_r++; // get the character out + + if (r->p_r >= r->p_o + r->size) // rollback if write pointer go pass + r->p_r = r->p_o; // the physical boundary + + return 0; +} diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/ringbuf.h b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/ringbuf.h new file mode 100644 index 000000000..f1a4f7e8b --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/ringbuf.h @@ -0,0 +1,19 @@ +#ifndef _RING_BUF_H_ +#define _RING_BUF_H_ + +#include +#include +#include "typedef.h" + +typedef struct { + U8* p_o; /**< Original pointer */ + U8* volatile p_r; /**< Read pointer */ + U8* volatile p_w; /**< Write pointer */ + volatile I32 fill_cnt; /**< Number of filled slots */ + I32 size; /**< Buffer size */ +} RINGBUF; + +I16 ICACHE_FLASH_ATTR RINGBUF_Init(RINGBUF *r, U8* buf, I32 size); +I16 ICACHE_FLASH_ATTR RINGBUF_Put(RINGBUF *r, U8 c); +I16 ICACHE_FLASH_ATTR RINGBUF_Get(RINGBUF *r, U8* c); +#endif diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/typedef.h b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/typedef.h new file mode 100644 index 000000000..887001ace --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/typedef.h @@ -0,0 +1,17 @@ +/** +* \file +* Standard Types definition +*/ + +#ifndef _TYPE_DEF_H_ +#define _TYPE_DEF_H_ + +typedef char I8; +typedef unsigned char U8; +typedef short I16; +typedef unsigned short U16; +typedef long I32; +typedef unsigned long U32; +typedef unsigned long long U64; + +#endif diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/utils.c b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/utils.c new file mode 100644 index 000000000..ac4c9272b --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/utils.c @@ -0,0 +1,149 @@ +/* +* Copyright (c) 2014, Tuan PM +* Email: tuanpm@live.com +* +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* +* 1. Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* 2. Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* 3. Neither the name of the copyright holder nor the names of its +* contributors may be used to endorse or promote products derived +* from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +* +*/ +#include +#include +#include +#include +#include +#include "utils.h" + + +uint8_t ICACHE_FLASH_ATTR UTILS_IsIPV4 (int8_t *str) +{ + uint8_t segs = 0; /* Segment count. */ + uint8_t chcnt = 0; /* Character count within segment. */ + uint8_t accum = 0; /* Accumulator for segment. */ + /* Catch NULL pointer. */ + if (str == 0) + return 0; + /* Process every character in string. */ + + while (*str != '\0') { + /* Segment changeover. */ + + if (*str == '.') { + /* Must have some digits in segment. */ + if (chcnt == 0) + return 0; + /* Limit number of segments. */ + if (++segs == 4) + return 0; + /* Reset segment values and restart loop. */ + chcnt = accum = 0; + str++; + continue; + } + + /* Check numeric. */ + if ((*str < '0') || (*str > '9')) + return 0; + + /* Accumulate and check segment. */ + + if ((accum = accum * 10 + *str - '0') > 255) + return 0; + /* Advance other segment specific stuff and continue loop. */ + + chcnt++; + str++; + } + + /* Check enough segments and enough characters in last segment. */ + + if (segs != 3) + return 0; + if (chcnt == 0) + return 0; + /* Address okay. */ + + return 1; +} +uint8_t ICACHE_FLASH_ATTR UTILS_StrToIP(const int8_t* str, void *ip) +{ + + /* The count of the number of bytes processed. */ + int i; + /* A pointer to the next digit to process. */ + const char * start; + + start = str; + for (i = 0; i < 4; i++) { + /* The digit being processed. */ + char c; + /* The value of this byte. */ + int n = 0; + while (1) { + c = * start; + start++; + if (c >= '0' && c <= '9') { + n *= 10; + n += c - '0'; + } + /* We insist on stopping at "." if we are still parsing + the first, second, or third numbers. If we have reached + the end of the numbers, we will allow any character. */ + else if ((i < 3 && c == '.') || i == 3) { + break; + } + else { + return 0; + } + } + if (n >= 256) { + return 0; + } + ((uint8_t*)ip)[i] = n; + } + return 1; + +} +uint32_t ICACHE_FLASH_ATTR UTILS_Atoh(const int8_t *s) +{ + uint32_t value = 0, digit; + int8_t c; + + while ((c = *s++)) { + if ('0' <= c && c <= '9') + digit = c - '0'; + else if ('A' <= c && c <= 'F') + digit = c - 'A' + 10; + else if ('a' <= c && c <= 'f') + digit = c - 'a' + 10; + else break; + + value = (value << 4) | digit; + } + + return value; +} + diff --git a/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/utils.h b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/utils.h new file mode 100644 index 000000000..fe2874803 --- /dev/null +++ b/lib/esp-mqtt-arduino-1.0.1.02.1/src/mqtt/utils.h @@ -0,0 +1,9 @@ +#ifndef _UTILS_H_ +#define _UTILS_H_ + +#include "c_types.h" + +uint32_t ICACHE_FLASH_ATTR UTILS_Atoh(const int8_t *s); +uint8_t ICACHE_FLASH_ATTR UTILS_StrToIP(const int8_t* str, void *ip); +uint8_t ICACHE_FLASH_ATTR UTILS_IsIPV4 (int8_t *str); +#endif diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index b6c50343b..f18747ba0 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,5 +1,5 @@ /* 5.12.0d - * Prep for optional MQTT drivers by separating mqtt code from sonoff.ino to file xdrv_00_mqtt.ino + * Add support for optional MQTT drivers to be selected in user_config.h (#1992) * Add Portuguese language file * Add compiler check for stable lwIP version v1.4 (#1940) * Add diacritics to Polish language file (#2005) diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 973a9fca9..099bedd9f 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -221,9 +221,7 @@ char* GetMqttClient(char* output, const char* input, int size) } } } - if (!digits) { - strlcpy(output, input, size); - } + if (!digits) strlcpy(output, input, size); return output; } @@ -270,17 +268,13 @@ void GetTopic_P(char *stopic, byte prefix, char *topic, const char* subtopic) } fulltopic.replace(F("#"), ""); fulltopic.replace(F("//"), "/"); - if (!fulltopic.endsWith("/")) { - fulltopic += "/"; - } + if (!fulltopic.endsWith("/")) fulltopic += "/"; snprintf_P(stopic, TOPSZ, PSTR("%s%s"), fulltopic.c_str(), romram); } char* GetStateText(byte state) { - if (state > 3) { - state = 1; - } + if (state > 3) state = 1; return Settings.state_text[state]; } @@ -315,9 +309,7 @@ void SetDevicePower(power_t rpower) power_t mask = 1; uint8_t count = 0; for (byte i = 0; i < devices_present; i++) { - if (rpower & mask) { - count++; - } + if (rpower & mask) count++; mask <<= 1; } if (count > 1) { @@ -352,9 +344,7 @@ void SetDevicePower(power_t rpower) void SetLedPower(uint8_t state) { - if (state) { - state = 1; - } + if (state) state = 1; digitalWrite(pin[GPIO_LED1], (bitRead(led_inverted, 0)) ? !state : state); } @@ -392,9 +382,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) strncpy(topicBuf, topic, sizeof(topicBuf)); for (i = 0; i < data_len; i++) { - if (!isspace(data[i])) { - break; - } + if (!isspace(data[i])) break; } data_len -= i; memcpy(dataBuf, data +i, sizeof(dataBuf)); @@ -419,9 +407,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) while (isdigit(type[i-1])) { i--; } - if (i < strlen(type)) { - index = atoi(type +i); - } + if (i < strlen(type)) index = atoi(type +i); type[i] = '\0'; } @@ -431,13 +417,9 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) if (type != NULL) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_JSON_COMMAND "\":\"" D_JSON_ERROR "\"}")); - if (Settings.ledstate &0x02) { - blinks++; - } + if (Settings.ledstate &0x02) blinks++; - if (!strcmp(dataBuf,"?")) { - data_len = 0; - } + if (!strcmp(dataBuf,"?")) data_len = 0; int16_t payload = -99; // No payload uint16_t payload16 = 0; long lnum = strtol(dataBuf, &p, 10); @@ -489,23 +471,17 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) } } else if (CMND_DELAY == command_code) { - if ((payload >= MIN_BACKLOG_DELAY) && (payload <= 3600)) { - backlog_delay = payload; - } + if ((payload >= MIN_BACKLOG_DELAY) && (payload <= 3600)) backlog_delay = payload; snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, backlog_delay); } else if ((CMND_POWER == command_code) && (index > 0) && (index <= devices_present)) { - if ((payload < 0) || (payload > 4)) { - payload = 9; - } + if ((payload < 0) || (payload > 4)) payload = 9; ExecuteCommandPower(index, payload); fallback_topic_flag = 0; return; } else if (CMND_STATUS == command_code) { - if ((payload < 0) || (payload > MAX_STATUS)) { - payload = 99; - } + if ((payload < 0) || (payload > MAX_STATUS)) payload = 99; PublishStatus(payload); fallback_topic_flag = 0; return; @@ -542,18 +518,14 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) else if (CMND_BLINKTIME == command_code) { if ((payload > 2) && (payload <= 3600)) { Settings.blinktime = payload; - if (blink_timer) { - blink_timer = Settings.blinktime; - } + if (blink_timer) blink_timer = Settings.blinktime; } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, Settings.blinktime); } else if (CMND_BLINKCOUNT == command_code) { if (data_len > 0) { Settings.blinkcount = payload16; // 0 - 65535 - if (blink_counter) { - blink_counter = Settings.blinkcount *2; - } + if (blink_counter) blink_counter = Settings.blinkcount *2; } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, Settings.blinkcount); } @@ -569,15 +541,15 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, (Settings.save_data > 1) ? stemp1 : GetStateText(Settings.save_data)); } else if (CMND_SENSOR == command_code) { - XdrvMailbox.topic = command; XdrvMailbox.index = index; - XdrvMailbox.payload = payload; XdrvMailbox.data_len = data_len; + XdrvMailbox.payload16 = payload16; + XdrvMailbox.payload = payload; + XdrvMailbox.grpflg = grpflg; + XdrvMailbox.topic = command; XdrvMailbox.data = dataBuf; XsnsCall(FUNC_COMMAND); -// if (!XsnsCall(FUNC_COMMAND)) { -// type = NULL; -// } +// if (!XsnsCall(FUNC_COMMAND)) type = NULL; } else if ((CMND_SETOPTION == command_code) && ((index <= 21) || ((index > 31) && (index <= P_MAX_PARAM8 + 31)))) { if (index <= 31) { @@ -632,9 +604,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) } } } - if (ptype) { - snprintf_P(stemp1, sizeof(stemp1), PSTR("%d"), Settings.param[index]); - } + if (ptype) snprintf_P(stemp1, sizeof(stemp1), PSTR("%d"), Settings.param[index]); snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_SVALUE, command, (ptype) ? index +32 : index, (ptype) ? stemp1 : GetStateText(bitRead(Settings.flag.data, index))); } else if (CMND_TEMPERATURE_RESOLUTION == command_code) { @@ -729,9 +699,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) byte jsflg = 0; for (byte i = 0; i < MAX_GPIO_PIN; i++) { if (GPIO_USER == cmodule.gp.io[i]) { - if (jsflg) { - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,"), mqtt_data); - } + if (jsflg) snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,"), mqtt_data); jsflg = 1; snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_GPIO "%d\":\"%d (%s)\""), mqtt_data, i, Settings.my_gp.io[i], GetTextIndexed(stemp1, sizeof(stemp1), Settings.my_gp.io[i], kSensorNames)); @@ -769,7 +737,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_PWM "\":{")); bool first = true; for (byte i = 0; i < MAX_PWMS; i++) { - if(pin[GPIO_PWM1 + i] < 99) { + if (pin[GPIO_PWM1 + i] < 99) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s%s\"" D_CMND_PWM "%d\":%d"), mqtt_data, first ? "" : ",", i+1, Settings.pwm_value[i]); first = false; } @@ -818,9 +786,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) } else if (CMND_SLEEP == command_code) { if ((payload >= 0) && (payload < 251)) { - if ((!Settings.sleep && payload) || (Settings.sleep && !payload)) { - restart_flag = 2; - } + if ((!Settings.sleep && payload) || (Settings.sleep && !payload)) restart_flag = 2; Settings.sleep = payload; sleep = payload; } @@ -867,9 +833,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, Settings.syslog_host); } else if (CMND_LOGPORT == command_code) { - if (payload16 > 0) { - Settings.syslog_port = (1 == payload16) ? SYS_LOG_PORT : payload16; - } + if (payload16 > 0) Settings.syslog_port = (1 == payload16) ? SYS_LOG_PORT : payload16; snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, Settings.syslog_port); } else if ((CMND_IPADDRESS == command_code) && (index > 0) && (index <= 4)) { @@ -884,9 +848,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) if ((data_len > 0) && (data_len < sizeof(Settings.ntp_server[0]))) { strlcpy(Settings.ntp_server[index -1], (!strcmp(dataBuf,"0")) ? "" : (1 == payload) ? (1==index)?NTP_SERVER1:(2==index)?NTP_SERVER2:NTP_SERVER3 : dataBuf, sizeof(Settings.ntp_server[0])); for (i = 0; i < strlen(Settings.ntp_server[index -1]); i++) { - if (Settings.ntp_server[index -1][i] == ',') { - Settings.ntp_server[index -1][i] = '.'; - } + if (Settings.ntp_server[index -1][i] == ',') Settings.ntp_server[index -1][i] = '.'; } restart_flag = 2; } @@ -959,16 +921,12 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_SVALUE, command, index, Settings.friendlyname[index -1]); } else if ((CMND_SWITCHMODE == command_code) && (index > 0) && (index <= MAX_SWITCHES)) { - if ((payload >= 0) && (payload < MAX_SWITCH_OPTION)) { - Settings.switchmode[index -1] = payload; - } + if ((payload >= 0) && (payload < MAX_SWITCH_OPTION)) Settings.switchmode[index -1] = payload; snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_NVALUE, command, index, Settings.switchmode[index-1]); } #ifdef USE_WEBSERVER else if (CMND_WEBSERVER == command_code) { - if ((payload >= 0) && (payload <= 2)) { - Settings.webserver = payload; - } + if ((payload >= 0) && (payload <= 2)) Settings.webserver = payload; if (Settings.webserver) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_WEBSERVER "\":\"" D_JSON_ACTIVE_FOR " %s " D_JSON_ON_DEVICE " %s " D_JSON_WITH_IP_ADDRESS " %s\"}"), (2 == Settings.webserver) ? D_ADMIN : D_USER, my_hostname, WiFi.localIP().toString().c_str()); @@ -983,9 +941,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, Settings.web_password); } else if (CMND_WEBLOG == command_code) { - if ((payload >= LOG_LEVEL_NONE) && (payload <= LOG_LEVEL_ALL)) { - Settings.weblog_level = payload; - } + if ((payload >= LOG_LEVEL_NONE) && (payload <= LOG_LEVEL_ALL)) Settings.weblog_level = payload; snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, Settings.weblog_level); } #ifdef USE_EMULATION @@ -1001,9 +957,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) else if (CMND_TELEPERIOD == command_code) { if ((payload >= 0) && (payload < 3601)) { Settings.tele_period = (1 == payload) ? TELE_PERIOD : payload; - if ((Settings.tele_period > 0) && (Settings.tele_period < 10)) { - Settings.tele_period = 10; // Do not allow periods < 10 seconds - } + if ((Settings.tele_period > 0) && (Settings.tele_period < 10)) Settings.tele_period = 10; // Do not allow periods < 10 seconds tele_period = Settings.tele_period; } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE_UNIT, command, Settings.tele_period, (Settings.flag.value_units) ? " " D_UNIT_SECOND : ""); @@ -1038,15 +992,11 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) } } else if (CMND_TIMEZONE == command_code) { - if ((data_len > 0) && (((payload >= -13) && (payload <= 13)) || (99 == payload))) { - Settings.timezone = payload; - } + if ((data_len > 0) && (((payload >= -13) && (payload <= 13)) || (99 == payload))) Settings.timezone = payload; snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, Settings.timezone); } else if (CMND_ALTITUDE == command_code) { - if ((data_len > 0) && ((payload >= -30000) && (payload <= 30000))) { - Settings.altitude = payload; - } + if ((data_len > 0) && ((payload >= -30000) && (payload <= 30000))) Settings.altitude = payload; snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, Settings.altitude); } else if (CMND_LEDPOWER == command_code) { @@ -1069,9 +1019,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) else if (CMND_LEDSTATE ==command_code) { if ((payload >= 0) && (payload < MAX_LED_OPTION)) { Settings.ledstate = payload; - if (!Settings.ledstate) { - SetLedPower(0); - } + if (!Settings.ledstate) SetLedPower(0); } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, Settings.ledstate); } @@ -1084,17 +1032,12 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) I2cScan(mqtt_data, sizeof(mqtt_data)); } #endif // USE_I2C -// else if (Settings.flag.mqtt_enabled && MqttCommand(grpflg, type, index, dataBuf, data_len, payload, payload16)) { - // Serviced -// } else if (XdrvCommand(grpflg, type, index, dataBuf, data_len, payload, payload16)) { // Serviced } #ifdef DEBUG_THEO else if (CMND_EXCEPTION == command_code) { - if (data_len > 0) { - ExceptionTest(payload); - } + if (data_len > 0) ExceptionTest(payload); snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, D_JSON_DONE); } #endif // DEBUG_THEO @@ -1108,9 +1051,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_JSON_COMMAND "\":\"" D_JSON_UNKNOWN "\"}")); type = (char*)topicBuf; } - if (mqtt_data[0] != '\0') { - MqttPublishPrefixTopic_P(RESULT_OR_STAT, type); - } + if (mqtt_data[0] != '\0') MqttPublishPrefixTopic_P(RESULT_OR_STAT, type); fallback_topic_flag = 0; } @@ -1132,9 +1073,7 @@ boolean send_button_power(byte key, byte device, byte state) char *key_topic = (key) ? Settings.switch_topic : Settings.button_topic; if (Settings.flag.mqtt_enabled && MqttIsConnected() && (strlen(key_topic) != 0) && strcmp(key_topic, "0")) { - if (!key && (device > devices_present)) { - device = 1; - } + if (!key && (device > devices_present)) device = 1; GetTopic_P(stopic, CMND, key_topic, GetPowerDevice(scommand, device, sizeof(scommand), key)); if (9 == state) { mqtt_data[0] = '\0'; @@ -1173,12 +1112,8 @@ void ExecuteCommandPower(byte device, byte state) state &= 1; publish_power = 0; } - if ((device < 1) || (device > devices_present)) { - device = 1; - } - if (device <= MAX_PULSETIMERS) { - pulse_timer[(device -1)] = 0; - } + if ((device < 1) || (device > devices_present)) device = 1; + if (device <= MAX_PULSETIMERS) pulse_timer[(device -1)] = 0; power_t mask = 1 << (device -1); if (state <= POWER_TOGGLE) { if ((blink_mask & mask)) { @@ -1189,9 +1124,7 @@ void ExecuteCommandPower(byte device, byte state) interlock_mutex = 1; for (byte i = 0; i < devices_present; i++) { power_t imask = 1 << i; - if ((power & imask) && (mask != imask)) { - ExecuteCommandPower(i +1, POWER_OFF); - } + if ((power & imask) && (mask != imask)) ExecuteCommandPower(i +1, POWER_OFF); } interlock_mutex = 0; } @@ -1229,14 +1162,10 @@ void ExecuteCommandPower(byte device, byte state) byte flag = (blink_mask & mask); blink_mask &= (POWER_MASK ^ mask); // Clear device mask MqttPublishPowerBlinkState(device); - if (flag) { - ExecuteCommandPower(device, (blink_powersave >> (device -1))&1); // Restore state - } + if (flag) ExecuteCommandPower(device, (blink_powersave >> (device -1))&1); // Restore state return; } - if (publish_power) { - MqttPublishPowerState(device); - } + if (publish_power) MqttPublishPowerState(device); } void StopAllPowerBlink() @@ -1263,9 +1192,7 @@ void ExecuteCommand(char *cmnd) token = strtok(cmnd, " "); if (token != NULL) { start = strrchr(token, '/'); // Skip possible cmnd/sonoff/ preamble - if (start) { - token = start +1; - } + if (start) token = start +1; } snprintf_P(stopic, sizeof(stopic), PSTR("/%s"), (token == NULL) ? "" : token); token = strtok(NULL, ""); @@ -1279,16 +1206,10 @@ void PublishStatus(uint8_t payload) uint8_t option = 1; // Workaround MQTT - TCP/IP stack queueing when SUB_PREFIX = PUB_PREFIX - if (!strcmp(Settings.mqtt_prefix[0],Settings.mqtt_prefix[1]) && (!payload)) { - option++; - } + if (!strcmp(Settings.mqtt_prefix[0],Settings.mqtt_prefix[1]) && (!payload)) option++; - if ((!Settings.flag.mqtt_enabled) && (6 == payload)) { - payload = 99; - } - if (!energy_flg && (9 == payload)) { - payload = 99; - } + if ((!Settings.flag.mqtt_enabled) && (6 == payload)) payload = 99; + if (!energy_flg && (9 == payload)) payload = 99; if ((0 == payload) || (99 == payload)) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_STATUS "\":{\"" D_CMND_MODULE "\":%d,\"" D_CMND_FRIENDLYNAME "\":\"%s\",\"" D_CMND_TOPIC "\":\"%s\",\"" D_CMND_BUTTONTOPIC "\":\"%s\",\"" D_CMND_POWER "\":%d,\"" D_CMND_POWERONSTATE "\":%d,\"" D_CMND_LEDSTATE "\":%d,\"" D_CMND_SAVEDATA "\":%d,\"" D_JSON_SAVESTATE "\":%d,\"" D_CMND_BUTTONRETAIN "\":%d,\"" D_CMND_POWERRETAIN "\":%d}}"), @@ -1328,8 +1249,8 @@ void PublishStatus(uint8_t payload) } if (((0 == payload) || (6 == payload)) && Settings.flag.mqtt_enabled) { - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_STATUS D_STATUS6_MQTT "\":{\"" D_CMND_MQTTHOST "\":\"%s\",\"" D_CMND_MQTTPORT "\":%d,\"" D_CMND_MQTTCLIENT D_JSON_MASK "\":\"%s\",\"" D_CMND_MQTTCLIENT "\":\"%s\",\"" D_CMND_MQTTUSER "\":\"%s\",\"MAX_PACKET_SIZE\":%d,\"KEEPALIVE\":%d}}"), - Settings.mqtt_host, Settings.mqtt_port, Settings.mqtt_client, mqtt_client, Settings.mqtt_user, MQTT_MAX_PACKET_SIZE, MQTT_KEEPALIVE); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_STATUS D_STATUS6_MQTT "\":{\"" D_CMND_MQTTHOST "\":\"%s\",\"" D_CMND_MQTTPORT "\":%d,\"" D_CMND_MQTTCLIENT D_JSON_MASK "\":\"%s\",\"" D_CMND_MQTTCLIENT "\":\"%s\",\"" D_CMND_MQTTUSER "\":\"%s\",\"MqttType\":%d,\"MAX_PACKET_SIZE\":%d,\"KEEPALIVE\":%d}}"), + Settings.mqtt_host, Settings.mqtt_port, Settings.mqtt_client, mqtt_client, Settings.mqtt_user, MqttLibraryType(), MQTT_MAX_PACKET_SIZE, MQTT_KEEPALIVE); MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "6")); } @@ -1406,9 +1327,7 @@ boolean MqttShowSensor() } snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}"), mqtt_data); - if (json_data_available) { - XdrvCall(FUNC_SHOW_SENSOR); - } + if (json_data_available) XdrvCall(FUNC_SHOW_SENSOR); return json_data_available; } @@ -1418,14 +1337,10 @@ void PerformEverySecond() { uptime++; - if (blockgpio0) { - blockgpio0--; - } + if (blockgpio0) blockgpio0--; for (byte i = 0; i < MAX_PULSETIMERS; i++) { - if (pulse_timer[i] > 111) { - pulse_timer[i]--; - } + if (pulse_timer[i] > 111) pulse_timer[i]--; } if (seriallog_timer) { @@ -1470,10 +1385,7 @@ void PerformEverySecond() MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_STATE)); mqtt_data[0] = '\0'; - if (MqttShowSensor()) { - MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); - } - + if (MqttShowSensor()) MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); } } @@ -1485,9 +1397,7 @@ void PerformEverySecond() snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_JSON_TIME "\":\"%s\",\"" D_JSON_UPTIME "\":\"%s\"}"), GetDateAndTime(DT_LOCAL).c_str(), GetDateAndTime(DT_UPTIME).c_str()); MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_UPTIME)); } - if ((3 == RtcTime.minute) && !latest_uptime_flag) { - latest_uptime_flag = true; - } + if ((3 == RtcTime.minute) && !latest_uptime_flag) latest_uptime_flag = true; } /*********************************************************************************************\ @@ -1525,9 +1435,7 @@ void ButtonHandler() if (button_present) { if (SONOFF_4CHPRO == Settings.module) { - if (holdbutton[button_index]) { - holdbutton[button_index]--; - } + if (holdbutton[button_index]) holdbutton[button_index]--; boolean button_pressed = false; if ((PRESSED == button) && (NOT_PRESSED == lastbutton[button_index])) { @@ -1539,9 +1447,7 @@ void ButtonHandler() if ((NOT_PRESSED == button) && (PRESSED == lastbutton[button_index])) { snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_APPLICATION D_BUTTON "%d " D_LEVEL_01), button_index +1); AddLog(LOG_LEVEL_DEBUG); - if (!holdbutton[button_index]) { // Do not allow within 1 second - button_pressed = true; - } + if (!holdbutton[button_index]) button_pressed = true; // Do not allow within 1 second } if (button_pressed) { if (!send_button_power(0, button_index +1, POWER_TOGGLE)) { // Execute Toggle command via MQTT if ButtonTopic is set @@ -1733,15 +1639,11 @@ void StateLoop() if (!(state % (STATES/10))) { - if (mqtt_cmnd_publish) { - mqtt_cmnd_publish--; // Clean up - } + if (mqtt_cmnd_publish) mqtt_cmnd_publish--; // Clean up if (latching_relay_pulse) { latching_relay_pulse--; - if (!latching_relay_pulse) { - SetLatchingRelay(0, 0); - } + if (!latching_relay_pulse) SetLatchingRelay(0, 0); } for (byte i = 0; i < MAX_PULSETIMERS; i++) { @@ -1770,9 +1672,7 @@ void StateLoop() } // Backlog - if (backlog_delay) { - backlog_delay--; - } + if (backlog_delay) backlog_delay--; if ((backlog_pointer != backlog_index) && !backlog_delay && !backlog_mutex) { backlog_mutex = 1; ExecuteCommand((char*)backlog[backlog_pointer].c_str()); @@ -1813,9 +1713,7 @@ void StateLoop() } if (!blinkstate) { blinks--; - if (200 == blinks) { - blinks = 0; - } + if (200 == blinks) blinks = 0; } } else { if (Settings.ledstate &1) { @@ -1845,9 +1743,7 @@ void StateLoop() } if (ota_state_flag <= 0) { #ifdef USE_WEBSERVER - if (Settings.webserver) { - StopWebserver(); - } + if (Settings.webserver) StopWebserver(); #endif // USE_WEBSERVER #ifdef USE_ARILUX_RF AriluxRfDisable(); // Prevent restart exception on Arilux Interrupt routine @@ -1861,9 +1757,7 @@ void StateLoop() if (RtcSettings.ota_loader) { char *pch = strrchr(mqtt_data, '-'); // Change from filename-DE.bin into filename-minimal.bin char *ech = strrchr(mqtt_data, '.'); // Change from filename.bin into filename-minimal.bin - if (!pch) { - pch = ech; - } + if (!pch) pch = ech; if (pch) { mqtt_data[pch - mqtt_data] = '\0'; char *ech = strrchr(Settings.ota_url, '.'); // Change from filename.bin into filename-minimal.bin @@ -1901,9 +1795,7 @@ void StateLoop() } break; case (STATES/10)*4: - if (MidnightNow()) { - CounterSaveState(); - } + if (MidnightNow()) CounterSaveState(); if (save_data_counter && (backlog_pointer == backlog_index)) { save_data_counter--; if (save_data_counter <= 0) { @@ -1948,6 +1840,9 @@ void StateLoop() WifiCheck(wifi_state_flag); wifi_state_flag = WIFI_RESTART; break; + case (STATES/10)*8: + if (WL_CONNECTED == WiFi.status()) MqttCheck(); + break; } } @@ -2100,14 +1995,10 @@ void GpioInit() } #endif // USE_DHT } - if (mpin) { - pin[mpin] = i; - } + if (mpin) pin[mpin] = i; } - if (2 == pin[GPIO_TXD]) { - Serial.set_tx(2); - } + if (2 == pin[GPIO_TXD]) Serial.set_tx(2); analogWriteRange(Settings.pwm_range); // Default is 1023 (Arduino.h) analogWriteFreq(Settings.pwm_frequency); // Default is 1000 (core_esp8266_wiring_pwm.c) @@ -2116,9 +2007,7 @@ void GpioInit() spi_flg = ((((pin[GPIO_SPI_CS] < 99) && (pin[GPIO_SPI_CS] > 14)) || (pin[GPIO_SPI_CS] < 12)) || (((pin[GPIO_SPI_DC] < 99) && (pin[GPIO_SPI_DC] > 14)) || (pin[GPIO_SPI_DC] < 12))); if (spi_flg) { for (byte i = 0; i < GPIO_MAX; i++) { - if ((pin[i] >= 12) && (pin[i] <=14)) { - pin[i] = 99; - } + if ((pin[i] >= 12) && (pin[i] <=14)) pin[i] = 99; } my_module.gp.io[12] = GPIO_SPI_MISO; pin[GPIO_SPI_MISO] = 12; @@ -2131,9 +2020,7 @@ void GpioInit() #ifdef USE_I2C i2c_flg = ((pin[GPIO_I2C_SCL] < 99) && (pin[GPIO_I2C_SDA] < 99)); - if (i2c_flg) { - Wire.begin(pin[GPIO_I2C_SDA], pin[GPIO_I2C_SCL]); - } + if (i2c_flg) Wire.begin(pin[GPIO_I2C_SDA], pin[GPIO_I2C_SCL]); #endif // USE_I2C devices_present = 1; @@ -2141,9 +2028,7 @@ void GpioInit() light_type = LT_BASIC; // Use basic PWM control if SetOption15 = 0 if (Settings.flag.pwm_control) { for (byte i = 0; i < MAX_PWMS; i++) { - if (pin[GPIO_PWM1 +i] < 99) { - light_type++; // Use Dimmer/Color control for all PWM as SetOption15 = 1 - } + if (pin[GPIO_PWM1 +i] < 99) light_type++; // Use Dimmer/Color control for all PWM as SetOption15 = 1 } } @@ -2176,9 +2061,7 @@ void GpioInit() light_type = LT_RGBWC; } else { - if (!light_type) { - devices_present = 0; - } + if (!light_type) devices_present = 0; for (byte i = 0; i < MAX_RELAYS; i++) { if (pin[GPIO_REL1 +i] < 99) { pinMode(pin[GPIO_REL1 +i], OUTPUT); @@ -2287,9 +2170,7 @@ void setup() } WifiConnect(); - if (MOTOR == Settings.module) { - Settings.poweronstate = POWER_ALL_ON; // Needs always on else in limbo! - } + if (MOTOR == Settings.module) Settings.poweronstate = POWER_ALL_ON; // Needs always on else in limbo! if (POWER_ALL_ALWAYS_ON == Settings.poweronstate) { SetDevicePower(1); } else { diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 9033cc7e5..d2e8aa9e7 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -72,13 +72,23 @@ // -- Ota ----------------------------------------- #define OTA_URL "http://sonoff.maddox.co.uk/tasmota/sonoff.ino.bin" // [OtaUrl] +/*********************************************************************************************\ + * Select ONE of possible MQTT library types below +\*********************************************************************************************/ +// Default MQTT driver for both non-TLS and TLS connections. Blocks network if MQTT server is unavailable. +#define MQTT_LIBRARY_TYPE 1 // Use PubSubClient library +// Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support +//#define MQTT_LIBRARY_TYPE 2 // Use TasmotaMqtt library (+4k4 code, +4k mem) - non-TLS only +// Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support +//#define MQTT_LIBRARY_TYPE 3 // Use (patched) esp-mqtt-arduino library (+4k8 code, +4k mem) - non-TLS only + // -- MQTT ---------------------------------------- #define MQTT_USE 1 // [SetOption3] Select default MQTT use (0 = Off, 1 = On) + // !!! TLS uses a LOT OF MEMORY (20k) so be careful to enable other options at the same time !!! -//#define USE_MQTT_TLS // EXPERIMENTAL Use TLS for MQTT connection (+53k code, +15k mem) - Disable by // +//#define USE_MQTT_TLS // Use TLS for MQTT connection (+53k code, +15k mem) - Disable by // // Needs Fingerprint, TLS Port, UserId and Password #ifdef USE_MQTT_TLS -// #define MQTT_HOST "m20.cloudmqtt.com" // [MqttHost] #define MQTT_HOST "" // [MqttHost] #define MQTT_FINGERPRINT "A5 02 FF 13 99 9F 8B 39 8E F1 83 4F 11 23 65 0B 32 36 FC 07" // [MqttFingerprint] #define MQTT_PORT 20123 // [MqttPort] MQTT TLS port diff --git a/sonoff/xdrv_00_mqtt.ino b/sonoff/xdrv_00_mqtt.ino index 670dcfe5e..c4196817d 100644 --- a/sonoff/xdrv_00_mqtt.ino +++ b/sonoff/xdrv_00_mqtt.ino @@ -18,17 +18,25 @@ */ /*********************************************************************************************\ - * Select only ONE of the defines below - Not supported yet + * Select ONE of possible MQTT libraries below \*********************************************************************************************/ - // Default MQTT driver for both non-TLS and TLS connections. Blocks network if MQTT server is unavailable. -#define USE_MQTT_CLIENT 1 // Use PubSubClient library +//#define MQTT_LIBRARY_TYPE 1 // Use PubSubClient library +// Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support +//#define MQTT_LIBRARY_TYPE 2 // Use TasmotaMqtt library (+4k4 code, +4k mem) - non-TLS only +// Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support +//#define MQTT_LIBRARY_TYPE 3 // Use (patched) esp-mqtt-arduino library (+4k8 code, +4k mem) - non-TLS only -// Replaces PubSubClient solving network hangs when MQTT server is unavailable. No TLS support -//#define USE_MQTT_CLIENT 2 // Use (patched) esp-mqtt-arduino library (+4k8 code) - non-TLS only - -// Only TLS support. Unstable due to lack of memory -//#define USE_MQTT_CLIENT 3 // Use ESP8266MQTTClient library (+52k code, +15k mem) - TLS only and unstable +#ifdef USE_MQTT_TLS +#ifdef MQTT_LIBRARY_TYPE +#undef MQTT_LIBRARY_TYPE +#endif +#define MQTT_LIBRARY_TYPE 1 // Use PubSubClient library as it only supports TLS +#else +#ifndef MQTT_LIBRARY_TYPE +#define MQTT_LIBRARY_TYPE 1 // Use PubSubClient library as default +#endif +#endif /*********************************************************************************************/ @@ -41,8 +49,9 @@ const char kMqttCommands[] PROGMEM = D_CMND_MQTTUSER "|" D_CMND_MQTTPASSWORD "|" D_CMND_FULLTOPIC "|" D_CMND_PREFIX "|" D_CMND_GROUPTOPIC "|" D_CMND_TOPIC "|" D_CMND_BUTTONTOPIC "|" D_CMND_SWITCHTOPIC "|" D_CMND_BUTTONRETAIN "|" D_CMND_SWITCHRETAIN "|" D_CMND_POWERRETAIN "|" D_CMND_SENSORRETAIN ; -uint8_t mqtt_retry_counter = 0; // MQTT connection retry counter -uint8_t mqtt_connection_flag = 2; // MQTT connection messages flag +uint8_t mqtt_retry_counter = 1; // MQTT connection retry counter +uint8_t mqtt_initial_connection_state = 2; // MQTT connection messages state +bool mqtt_connected = false; // MQTT virtual connection status /*********************************************************************************************\ * MQTT driver specific code need to provide the following functions: @@ -51,11 +60,10 @@ uint8_t mqtt_connection_flag = 2; // MQTT connection messages flag * void MqttDisconnect() * void MqttSubscribeLib(char *topic) * bool MqttPublishLib(const char* topic, boolean retained) - * void MqttCheckConnection() * void MqttLoop() \*********************************************************************************************/ -#if (1 == USE_MQTT_CLIENT) /*****************************************************************/ +#if (1 == MQTT_LIBRARY_TYPE) /*****************************************************************/ #include @@ -87,38 +95,53 @@ bool MqttPublishLib(const char* topic, boolean retained) return MqttClient.publish(topic, mqtt_data, retained); } -void MqttCheckConnection() -{ - if (Settings.flag.mqtt_enabled) { - if (!MqttIsConnected()) { - if (!mqtt_retry_counter) { - MqttReconnect(); - } else { - mqtt_retry_counter--; - } - } - } else { - if (!mqtt_retry_counter) { - MqttReconnect(); - } - } -} - void MqttLoop() { MqttClient.loop(); } -#elif (2 == USE_MQTT_CLIENT) /***************************************************************/ +#elif (2 == MQTT_LIBRARY_TYPE) /*****************************************************************/ + +#include +TasmotaMqtt MqttClient; + +bool MqttIsConnected() +{ + return mqtt_connected; +} + +void MqttDisconnect() +{ + MqttClient.Disconnect(); +} + +void MqttDisconnectedCb() +{ + MqttDisconnected(MqttClient.State()); // status codes are documented in file mqtt.h as tConnState +} + +void MqttSubscribeLib(char *topic) +{ + MqttClient.Subscribe(topic, 0); +} + +bool MqttPublishLib(const char* topic, boolean retained) +{ + return MqttClient.Publish(topic, mqtt_data, strlen(mqtt_data), 0, retained); +} + +void MqttLoop() +{ +} + +#elif (3 == MQTT_LIBRARY_TYPE) /***************************************************************/ #include MQTT *MqttClient = NULL; bool MqttIsConnected() { - bool result = false; - if (MqttClient) result = (MqttClient->isConnected() && !mqtt_retry_counter); - return result; + return mqtt_connected; } void MqttDisconnect() @@ -126,6 +149,11 @@ void MqttDisconnect() if (MqttClient) MqttClient->disconnect(); } +void MqttDisconnectedCb() +{ + MqttDisconnected(MqttClient->getState()); // status codes are documented in file mqtt.h as tConnState +} + void MqttMyDataCb(const char* topic, uint32_t topic_len, const char *data, uint32_t data_len) { char topicCpy[topic_len]; @@ -134,11 +162,6 @@ void MqttMyDataCb(const char* topic, uint32_t topic_len, const char *data, uint3 MqttDataHandler((char*)topicCpy, (byte*)data, data_len); } -void MqttMyNoneCb() -{ - // Do nothing -} - void MqttSubscribeLib(char *topic) { MqttClient->subscribe(topic); @@ -149,74 +172,19 @@ bool MqttPublishLib(const char* topic, boolean retained) return MqttClient->publish(topic, mqtt_data, strlen(mqtt_data), 0, retained); } -void MqttCheckConnection() -{ - if (Settings.flag.mqtt_enabled) { - if (!MqttIsConnected()) { - if (!mqtt_retry_counter) { - MqttReconnect(); - } else { - mqtt_retry_counter--; - } - } - MqttReconnect(); - } else { - if (!mqtt_retry_counter) { - MqttReconnect(); - } - } -} - void MqttLoop() { - // No action } -#elif (3 == USE_MQTT_CLIENT) /***************************************************************/ - -#include -MQTTClient MqttClient; - -bool MqttIsConnected() -{ - return true; -} - -void MqttDisconnect() -{ - // No action -} - -void MqttSubscribeLib(char *topic) -{ - MqttClient.subscribe(topic, 0); -} - -bool MqttPublishLib(const char* topic, boolean retained) -{ - return MqttClient.publish(topic, mqtt_data, 0, retained); -} - -void MqttCheckConnection() -{ - if (Settings.flag.mqtt_enabled) { - MqttReconnect(); - } else { - if (!mqtt_retry_counter) { - MqttReconnect(); - } - } -} - -void MqttLoop() -{ - MqttClient.handle(); -} - -#endif // USE_MQTT_CLIENT +#endif // MQTT_LIBRARY_TYPE /*********************************************************************************************/ +int MqttLibraryType() +{ + return (int)MQTT_LIBRARY_TYPE; +} + void MqttRetryCounter(uint8_t value) { mqtt_retry_counter = value; @@ -238,10 +206,12 @@ void MqttPublishDirect(const char* topic, boolean retained) snprintf_P(slog_type, sizeof(slog_type), PSTR(D_LOG_RESULT)); if (Settings.flag.mqtt_enabled) { - if (MqttPublishLib(topic, retained)) { - snprintf_P(slog_type, sizeof(slog_type), PSTR(D_LOG_MQTT)); - if (retained) { - snprintf_P(sretained, sizeof(sretained), PSTR(" (" D_RETAINED ")")); + if (MqttIsConnected()) { + if (MqttPublishLib(topic, retained)) { + snprintf_P(slog_type, sizeof(slog_type), PSTR(D_LOG_MQTT)); + if (retained) { + snprintf_P(sretained, sizeof(sretained), PSTR(" (" D_RETAINED ")")); + } } } } @@ -336,11 +306,28 @@ void MqttPublishPowerBlinkState(byte device) /*********************************************************************************************/ +void MqttDisconnected(int state) +{ + mqtt_connected = false; + mqtt_retry_counter = Settings.mqtt_retry; + + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MQTT D_CONNECT_FAILED_TO " %s:%d, rc %d. " D_RETRY_IN " %d " D_UNIT_SECOND), + Settings.mqtt_host, Settings.mqtt_port, state, mqtt_retry_counter); + AddLog(LOG_LEVEL_INFO); +} + void MqttConnected() { char stopic[TOPSZ]; if (Settings.flag.mqtt_enabled) { + AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_CONNECTED)); + mqtt_connected = true; + mqtt_retry_counter = 0; + + GetTopic_P(stopic, TELE, mqtt_topic, S_LWT); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR(D_ONLINE)); + MqttPublish(stopic, true); // Satisfy iobroker (#299) mqtt_data[0] = '\0'; @@ -360,7 +347,7 @@ void MqttConnected() XdrvCall(FUNC_MQTT_SUBSCRIBE); } - if (mqtt_connection_flag) { + if (mqtt_initial_connection_state) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_MODULE "\":\"%s\",\"" D_JSON_VERSION "\":\"%s\",\"" D_JSON_FALLBACKTOPIC "\":\"%s\",\"" D_CMND_GROUPTOPIC "\":\"%s\"}"), my_module.name, my_version, mqtt_client, Settings.mqtt_grptopic); MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_INFO "1")); @@ -381,48 +368,49 @@ void MqttConnected() XdrvCall(FUNC_MQTT_INIT); } - mqtt_connection_flag = 0; + mqtt_initial_connection_state = 0; } +#ifdef USE_MQTT_TLS +boolean MqttCheckTls() +{ + boolean result = false; + + AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_FINGERPRINT)); + if (!EspClient.connect(Settings.mqtt_host, Settings.mqtt_port)) { + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MQTT D_TLS_CONNECT_FAILED_TO " %s:%d. " D_RETRY_IN " %d " D_UNIT_SECOND), + Settings.mqtt_host, Settings.mqtt_port, mqtt_retry_counter); + AddLog(LOG_LEVEL_DEBUG); + } else if (!EspClient.verify(Settings.mqtt_fingerprint, Settings.mqtt_host)) { + AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_INSECURE)); + } else { + AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_VERIFIED)); + result = true; + } + EspClient.stop(); + yield(); + return result; +} +#endif // USE_MQTT_TLS + void MqttReconnect() { char stopic[TOPSZ]; - mqtt_retry_counter = Settings.mqtt_retry; - if (!Settings.flag.mqtt_enabled) { MqttConnected(); return; } + #ifdef USE_EMULATION UdpDisconnect(); #endif // USE_EMULATION - if (mqtt_connection_flag > 1) { // Executed once just after power on and wifi is connected - Initial TLS check -#ifdef USE_MQTT_TLS - AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_FINGERPRINT)); - if (!EspClient.connect(Settings.mqtt_host, Settings.mqtt_port)) { - snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MQTT D_TLS_CONNECT_FAILED_TO " %s:%d. " D_RETRY_IN " %d " D_UNIT_SECOND), - Settings.mqtt_host, Settings.mqtt_port, mqtt_retry_counter); - AddLog(LOG_LEVEL_DEBUG); - EspClient.stop(); - return; - } - if (EspClient.verify(Settings.mqtt_fingerprint, Settings.mqtt_host)) { - AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_VERIFIED)); - } else { - AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_INSECURE)); - EspClient.stop(); - return; - } - EspClient.stop(); - yield(); -#endif // USE_MQTT_TLS - mqtt_connection_flag = 1; -// mqtt_retry_counter = 1; -// return; - } AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_ATTEMPTING_CONNECTION)); + + mqtt_connected = false; + mqtt_retry_counter = Settings.mqtt_retry; + #ifndef USE_MQTT_TLS #ifdef USE_DISCOVERY #ifdef MQTT_HOST_DISCOVERY @@ -441,63 +429,57 @@ void MqttReconnect() GetTopic_P(stopic, TELE, mqtt_topic, S_LWT); snprintf_P(mqtt_data, sizeof(mqtt_data), S_OFFLINE); -#if (1 == USE_MQTT_CLIENT) + if (2 == mqtt_initial_connection_state) { // Executed once just after power on and wifi is connected +#ifdef USE_MQTT_TLS + if (!MqttCheckTls()) return; +#endif // USE_MQTT_TLS + +#if (2 == MQTT_LIBRARY_TYPE) + MqttClient.InitConnection(Settings.mqtt_host, Settings.mqtt_port); + MqttClient.InitClient(mqtt_client, mqtt_user, mqtt_pwd, MQTT_KEEPALIVE); + MqttClient.InitLWT(stopic, mqtt_data, 1, true); + MqttClient.OnConnected(MqttConnected); + MqttClient.OnDisconnected(MqttDisconnectedCb); + MqttClient.OnData(MqttDataHandler); +#elif (3 == MQTT_LIBRARY_TYPE) + MqttClient = new MQTT(mqtt_client, Settings.mqtt_host, Settings.mqtt_port, stopic, 1, true, mqtt_data); + MqttClient->setUserPwd(mqtt_user, mqtt_pwd); + MqttClient->onConnected(MqttConnected); + MqttClient->onDisconnected(MqttDisconnectedCb); + MqttClient->onData(MqttMyDataCb); +#endif + + mqtt_initial_connection_state = 1; + } + +#if (1 == MQTT_LIBRARY_TYPE) MqttClient.setCallback(MqttDataHandler); MqttClient.setServer(Settings.mqtt_host, Settings.mqtt_port); if (MqttClient.connect(mqtt_client, mqtt_user, mqtt_pwd, stopic, 1, true, mqtt_data)) { - AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_CONNECTED)); - mqtt_retry_counter = 0; - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR(D_ONLINE)); - MqttPublish(stopic, true); MqttConnected(); } else { - snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MQTT D_CONNECT_FAILED_TO " %s:%d, rc %d. " D_RETRY_IN " %d " D_UNIT_SECOND), - Settings.mqtt_host, Settings.mqtt_port, MqttClient.state(), mqtt_retry_counter); //status codes are documented here http://pubsubclient.knolleary.net/api.html#state - AddLog(LOG_LEVEL_INFO); - } -#elif (2 == USE_MQTT_CLIENT) - if (!MqttClient) { - MqttClient = new MQTT(mqtt_client, Settings.mqtt_host, Settings.mqtt_port, stopic, 1, true, mqtt_data); -// MqttClient->onConnected(MqttMyNoneCb); -// MqttClient->onDisconnected(MqttMyNoneCb); -// MqttClient->onPublished(MqttMyNoneCb); - MqttClient->onData(MqttMyDataCb); - MqttClient->setUserPwd(mqtt_user, mqtt_pwd); + MqttDisconnected(MqttClient.state()); // status codes are documented here http://pubsubclient.knolleary.net/api.html#state } +#elif (2 == MQTT_LIBRARY_TYPE) + MqttClient.Connect(); +#elif (3 == MQTT_LIBRARY_TYPE) MqttClient->connect(); - uint16_t mqtt_timeout = 50; - while (!MqttClient->isConnected() && mqtt_timeout--) delay(1); - if (MqttClient->isConnected()) { - AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_CONNECTED)); - mqtt_retry_counter = 0; - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR(D_ONLINE)); - MqttPublish(stopic, true); - MqttConnected(); - } else { - snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MQTT D_CONNECT_FAILED_TO " %s:%d. " D_RETRY_IN " %d " D_UNIT_SECOND), - Settings.mqtt_host, Settings.mqtt_port, mqtt_retry_counter); - AddLog(LOG_LEVEL_INFO); - } -#elif (3 == USE_MQTT_CLIENT) - //topic, data, data is continuing - MqttClient.onData([](String topic, String data, bool cont) { - MqttDataHandler((char*)topic.c_str(), (byte*)data.c_str(), strlen(data.c_str())); - }); - char uri[200]; - snprintf_P(uri, sizeof(uri), PSTR("mqtt://%s:%s@%s:%d#%s"), mqtt_user, mqtt_pwd, Settings.mqtt_host, Settings.mqtt_port, mqtt_client); +#endif // MQTT_LIBRARY_TYPE +} - if (MqttClient.begin(String(uri), {.lwtTopic = stopic, .lwtMsg = mqtt_data, .lwtQos = 1, .lwtRetain = 1}, MQTT_KEEPALIVE, true)) { - AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_CONNECTED)); - mqtt_retry_counter = 0; - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR(D_ONLINE)); - MqttPublish(stopic, true); - MqttConnected(); +void MqttCheck() +{ + if (Settings.flag.mqtt_enabled) { + if (!MqttIsConnected()) { + if (!mqtt_retry_counter) { + MqttReconnect(); + } else { + mqtt_retry_counter--; + } + } } else { - snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MQTT D_CONNECT_FAILED_TO " %s:%d. " D_RETRY_IN " %d " D_UNIT_SECOND), - Settings.mqtt_host, Settings.mqtt_port, mqtt_retry_counter); //status codes are documented here http://pubsubclient.knolleary.net/api.html#state - AddLog(LOG_LEVEL_INFO); + if (mqtt_initial_connection_state) MqttReconnect(); } -#endif // USE_MQTT_CLIENT } /*********************************************************************************************/ @@ -543,9 +525,7 @@ bool MqttCommand() else if ((CMND_STATETEXT == command_code) && (index > 0) && (index <= 4)) { if ((data_len > 0) && (data_len < sizeof(Settings.state_text[0]))) { for(i = 0; i <= data_len; i++) { - if (dataBuf[i] == ' ') { - dataBuf[i] = '_'; - } + if (dataBuf[i] == ' ') dataBuf[i] = '_'; } strlcpy(Settings.state_text[index -1], dataBuf, sizeof(Settings.state_text[0])); } @@ -584,9 +564,7 @@ bool MqttCommand() else if (CMND_FULLTOPIC == command_code) { if ((data_len > 0) && (data_len < sizeof(Settings.mqtt_fulltopic))) { MakeValidMqtt(1, dataBuf); - if (!strcmp(dataBuf, mqtt_client)) { - payload = 1; - } + if (!strcmp(dataBuf, mqtt_client)) payload = 1; strlcpy(stemp1, (1 == payload) ? MQTT_FULLTOPIC : dataBuf, sizeof(stemp1)); if (strcmp(stemp1, Settings.mqtt_fulltopic)) { snprintf_P(mqtt_data, sizeof(mqtt_data), (Settings.flag.mqtt_offline) ? S_OFFLINE : ""); @@ -609,9 +587,7 @@ bool MqttCommand() else if (CMND_GROUPTOPIC == command_code) { if ((data_len > 0) && (data_len < sizeof(Settings.mqtt_grptopic))) { MakeValidMqtt(0, dataBuf); - if (!strcmp(dataBuf, mqtt_client)) { - payload = 1; - } + if (!strcmp(dataBuf, mqtt_client)) payload = 1; strlcpy(Settings.mqtt_grptopic, (1 == payload) ? MQTT_GRPTOPIC : dataBuf, sizeof(Settings.mqtt_grptopic)); restart_flag = 2; } @@ -620,9 +596,7 @@ bool MqttCommand() else if ((CMND_TOPIC == command_code) && !grpflg) { if ((data_len > 0) && (data_len < sizeof(Settings.mqtt_topic))) { MakeValidMqtt(0, dataBuf); - if (!strcmp(dataBuf, mqtt_client)) { - payload = 1; - } + if (!strcmp(dataBuf, mqtt_client)) payload = 1; strlcpy(stemp1, (1 == payload) ? MQTT_TOPIC : dataBuf, sizeof(stemp1)); if (strcmp(stemp1, Settings.mqtt_topic)) { snprintf_P(mqtt_data, sizeof(mqtt_data), (Settings.flag.mqtt_offline) ? S_OFFLINE : ""); @@ -636,9 +610,7 @@ bool MqttCommand() else if ((CMND_BUTTONTOPIC == command_code) && !grpflg) { if ((data_len > 0) && (data_len < sizeof(Settings.button_topic))) { MakeValidMqtt(0, dataBuf); - if (!strcmp(dataBuf, mqtt_client)) { - payload = 1; - } + if (!strcmp(dataBuf, mqtt_client)) payload = 1; strlcpy(Settings.button_topic, (!strcmp(dataBuf,"0")) ? "" : (1 == payload) ? mqtt_topic : dataBuf, sizeof(Settings.button_topic)); } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, Settings.button_topic); @@ -646,9 +618,7 @@ bool MqttCommand() else if (CMND_SWITCHTOPIC == command_code) { if ((data_len > 0) && (data_len < sizeof(Settings.switch_topic))) { MakeValidMqtt(0, dataBuf); - if (!strcmp(dataBuf, mqtt_client)) { - payload = 1; - } + if (!strcmp(dataBuf, mqtt_client)) payload = 1; strlcpy(Settings.switch_topic, (!strcmp(dataBuf,"0")) ? "" : (1 == payload) ? mqtt_topic : dataBuf, sizeof(Settings.switch_topic)); } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, Settings.switch_topic); @@ -715,16 +685,15 @@ boolean Xdrv00(byte function) { boolean result = false; - switch (function) { - case FUNC_LOOP: - if (Settings.flag.mqtt_enabled) MqttLoop(); - break; - case FUNC_EVERY_SECOND: - if (WL_CONNECTED == WiFi.status()) MqttCheckConnection(); - break; - case FUNC_COMMAND: - if (Settings.flag.mqtt_enabled) result = MqttCommand(); - break; + if (Settings.flag.mqtt_enabled) { + switch (function) { + case FUNC_LOOP: + MqttLoop(); + break; + case FUNC_COMMAND: + result = MqttCommand(); + break; + } } return result; } diff --git a/sonoff/xdrv_interface.ino b/sonoff/xdrv_interface.ino index 15df24a13..09f056ece 100644 --- a/sonoff/xdrv_interface.ino +++ b/sonoff/xdrv_interface.ino @@ -179,6 +179,7 @@ boolean XdrvMqttData(char *topicBuf, uint16_t stopicBuf, char *dataBuf, uint16_t * Function call to all xdrv * * FUNC_INIT + * FUNC_LOOP * FUNC_MQTT_SUBSCRIBE * FUNC_MQTT_INIT * return FUNC_MQTT_DATA @@ -195,9 +196,7 @@ boolean XdrvCall(byte Function) for (byte x = 0; x < xdrv_present; x++) { result = xdrv_func_ptr[x](Function); - if (result) { - break; - } + if (result) break; } return result; diff --git a/sonoff/xsns_interface.ino b/sonoff/xsns_interface.ino index 02e380a95..20488dc92 100644 --- a/sonoff/xsns_interface.ino +++ b/sonoff/xsns_interface.ino @@ -206,9 +206,7 @@ boolean XsnsCall(byte Function) for (byte x = 0; x < xsns_present; x++) { result = xsns_func_ptr[x](Function); - if (result) { - break; - } + if (result) break; } return result; From 8cca9dd6b2c25faa5f2a040b8b30e3cf00276b76 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 3 Mar 2018 12:35:33 +0100 Subject: [PATCH 002/136] Add Issue template --- .github/ISSUE_TEMPLATE.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 000000000..cb8cd1d03 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,6 @@ +Make sure these boxes are checked before submitting your issue - Thank you! + +- [ ] What hardware you are using +- [ ] Provide the output of command ``status 0`` +- [ ] If you have a stack dump decode it: https://github.com/esp8266/Arduino/blob/master/doc/Troubleshooting/stack_dump.rst +- [ ] For better debug messages: https://github.com/esp8266/Arduino/blob/master/doc/Troubleshooting/debugging.rst From a16e2316b39f7e0295724ce113c92d9dac362eea Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 3 Mar 2018 15:28:30 +0100 Subject: [PATCH 003/136] v5.12.0d - Add support for Nova Fitness SDS011 5.12.0d * Add support for Nova Fitness SDS011 and possibly SDS021 particle concentration sensor (#2070) --- sonoff/_releasenotes.ino | 1 + sonoff/language/de-DE.h | 1 + sonoff/language/en-GB.h | 1 + sonoff/language/es-AR.h | 1 + sonoff/language/fr-FR.h | 1 + sonoff/language/hu-HU.h | 1 + sonoff/language/it-IT.h | 1 + sonoff/language/nl-NL.h | 1 + sonoff/language/pl-PL.h | 1 + sonoff/language/pt-PT.h | 1 + sonoff/language/ru-RU.h | 1 + sonoff/language/zh-CN.h | 1 + sonoff/sonoff_post.h | 3 +- sonoff/sonoff_template.h | 3 +- sonoff/user_config.h | 1 + sonoff/xsns_20_novasds.ino | 143 +++++++++++++++++++++++++++++++++++++ 16 files changed, 160 insertions(+), 2 deletions(-) create mode 100644 sonoff/xsns_20_novasds.ino diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index f18747ba0..51ebe785b 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -4,6 +4,7 @@ * Add compiler check for stable lwIP version v1.4 (#1940) * Add diacritics to Polish language file (#2005) * Add Hungarian language file (#2024) + * Add support for Nova Fitness SDS011 and possibly SDS021 particle concentration sensor (#2070) * Fix MQTT TLS fingerprint validation (#2033) * * 5.12.0c diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index 09877893c..f1eed0dac 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -407,6 +407,7 @@ #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" +#define D_SENSOR_SDS0X1 "SDS0X1" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h index 77db37009..987d0ccda 100644 --- a/sonoff/language/en-GB.h +++ b/sonoff/language/en-GB.h @@ -407,6 +407,7 @@ #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" +#define D_SENSOR_SDS0X1 "SDS0X1" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index e54098edf..8386dd605 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -407,6 +407,7 @@ #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" +#define D_SENSOR_SDS0X1 "SDS0X1" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h index 78afc0677..9364bc102 100644 --- a/sonoff/language/fr-FR.h +++ b/sonoff/language/fr-FR.h @@ -407,6 +407,7 @@ #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" +#define D_SENSOR_SDS0X1 "SDS0X1" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h index 3f283f7e5..f1fb99c61 100644 --- a/sonoff/language/hu-HU.h +++ b/sonoff/language/hu-HU.h @@ -407,6 +407,7 @@ #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "Háttérvil" #define D_SENSOR_PMS5003 "PMS5003" +#define D_SENSOR_SDS0X1 "SDS0X1" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index 6ab442ca1..ea6ce9804 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -407,6 +407,7 @@ #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" +#define D_SENSOR_SDS0X1 "SDS0X1" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h index 6f9d39f72..c260553a0 100644 --- a/sonoff/language/nl-NL.h +++ b/sonoff/language/nl-NL.h @@ -407,6 +407,7 @@ #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" +#define D_SENSOR_SDS0X1 "SDS0X1" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h index 12496e9a6..334934a12 100644 --- a/sonoff/language/pl-PL.h +++ b/sonoff/language/pl-PL.h @@ -407,6 +407,7 @@ #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" +#define D_SENSOR_SDS0X1 "SDS0X1" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h index cf4b7ee09..7fd9bac23 100644 --- a/sonoff/language/pt-PT.h +++ b/sonoff/language/pt-PT.h @@ -407,6 +407,7 @@ #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "Luz negra" #define D_SENSOR_PMS5003 "PMS5003" +#define D_SENSOR_SDS0X1 "SDS0X1" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h index f6bab7d90..b0f5cd764 100644 --- a/sonoff/language/ru-RU.h +++ b/sonoff/language/ru-RU.h @@ -408,6 +408,7 @@ #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" +#define D_SENSOR_SDS0X1 "SDS0X1" // Units #define D_UNIT_AMPERE "А" diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h index 76c271ee9..feff61a23 100644 --- a/sonoff/language/zh-CN.h +++ b/sonoff/language/zh-CN.h @@ -407,6 +407,7 @@ #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" +#define D_SENSOR_SDS0X1 "SDS0X1" // Units #define D_UNIT_AMPERE "安" diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h index d7b55030a..0a023ea6f 100644 --- a/sonoff/sonoff_post.h +++ b/sonoff/sonoff_post.h @@ -61,6 +61,7 @@ void WifiWpsStatusCallback(wps_cb_status status); #define CO2_HIGH 1200 // Above this CO2 value show red light (needs PWM or WS2812 RG(B) led and enable with SetOption18 1) #endif #define USE_PMS5003 // Add support for PMS5003 and PMS7003 particle concentration sensor (+1k3 code) +#define USE_NOVA_SDS // Add support for SDS011 and SDS021 particle concentration sensor (+0k7 code) #define USE_PZEM004T // Add support for PZEM004T Energy monitor (+2k code) #define USE_IR_REMOTE // Send IR remote commands using library IRremoteESP8266 and ArduinoJson (+4k code, 0k3 mem, 48 iram) #define USE_IR_HVAC // Support for HVAC system using IR (+2k code) @@ -170,4 +171,4 @@ void WifiWpsStatusCallback(wps_cb_status status); #define ARDUINO_ESP8266_RELEASE "STAGE" #endif -#endif // _SONOFF_POST_H_ \ No newline at end of file +#endif // _SONOFF_POST_H_ diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h index 1a8206c08..6a0e2cd97 100644 --- a/sonoff/sonoff_template.h +++ b/sonoff/sonoff_template.h @@ -88,6 +88,7 @@ enum UserSelectablePins { GPIO_SPI_DC, // SPI Data Direction GPIO_BACKLIGHT, // Display backlight control GPIO_PMS5003, // Plantower PMS5003 Serial interface + GPIO_SDS0X1, // Nova Fitness SDS011 Serial interface GPIO_SENSOR_END }; // Programmer selectable GPIO functionality offset by user selectable GPIOs @@ -129,7 +130,7 @@ const char kSensorNames[] PROGMEM = D_SENSOR_PZEM_TX "|" D_SENSOR_PZEM_RX "|" D_SENSOR_SAIR_TX "|" D_SENSOR_SAIR_RX "|" D_SENSOR_SPI_CS "|" D_SENSOR_SPI_DC "|" D_SENSOR_BACKLIGHT "|" - D_SENSOR_PMS5003; + D_SENSOR_PMS5003 "|" D_SENSOR_SDS0X1; /********************************************************************************************/ diff --git a/sonoff/user_config.h b/sonoff/user_config.h index d2e8aa9e7..f5f7acdc7 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -215,6 +215,7 @@ #define CO2_LOW 800 // Below this CO2 value show green light (needs PWM or WS2812 RG(B) led and enable with SetOption18 1) #define CO2_HIGH 1200 // Above this CO2 value show red light (needs PWM or WS2812 RG(B) led and enable with SetOption18 1) #define USE_PMS5003 // Add support for PMS5003 and PMS7003 particle concentration sensor (+1k3 code) +#define USE_NOVA_SDS // Add support for SDS011 and SDS021 particle concentration sensor (+0k7 code) #define USE_PZEM004T // Add support for PZEM004T Energy monitor (+2k code) // -- Low level interface devices ----------------- diff --git a/sonoff/xsns_20_novasds.ino b/sonoff/xsns_20_novasds.ino new file mode 100644 index 000000000..ed877fd2f --- /dev/null +++ b/sonoff/xsns_20_novasds.ino @@ -0,0 +1,143 @@ +/* + xsns_20_novasds.ino - Nova SDS011/SDS021 particle concentration sensor support for Sonoff-Tasmota + + Copyright (C) 2018 Theo Arends + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifdef USE_NOVA_SDS +/*********************************************************************************************\ + * Nova Fitness SDS011 (and possibly SDS021) particle concentration sensor + * For background information see http://aqicn.org/sensor/sds011/ +\*********************************************************************************************/ + +#include + +TasmotaSerial *NovaSdsSerial; + +uint8_t novasds_type = 1; +uint8_t novasds_valid = 0; + +struct sds011data { + uint16_t pm100; + uint16_t pm25; +} novasds_data; + +bool NovaSdsReadData() +{ + if (! NovaSdsSerial->available()) return false; + + while ((NovaSdsSerial->peek() != 0xAA) && NovaSdsSerial->available()) { + NovaSdsSerial->read(); + } + + byte d[8] = { 0 }; + NovaSdsSerial->read(); // skip 0xAA + NovaSdsSerial->readBytes(d, 8); + NovaSdsSerial->flush(); + + AddLogSerial(LOG_LEVEL_DEBUG_MORE, d, 8); + + if (d[7] == ((d[1] + d[2] + d[3] + d[4] + d[5] + d[6]) & 0xFF)) { + novasds_data.pm25 = (d[1] + 256 * d[2]); + novasds_data.pm100 = (d[3] + 256 * d[4]); + } else { + AddLog_P(LOG_LEVEL_DEBUG, PSTR("SDS: " D_CHECKSUM_FAILURE)); + return false; + } + + novasds_valid = 10; + + return true; +} + +/*********************************************************************************************/ + +void NovaSdsSecond() // Every second +{ + if (NovaSdsReadData()) { + novasds_valid = 10; + } else { + if (novasds_valid) { + novasds_valid--; + } + } +} + +/*********************************************************************************************/ + +void NovaSdsInit() +{ + novasds_type = 0; + + if (pin[GPIO_SDS0X1] < 99) { + NovaSdsSerial = new TasmotaSerial(pin[GPIO_SDS0X1], -1); + if (NovaSdsSerial->begin()) { + novasds_type = 1; + } + } +} + +#ifdef USE_WEBSERVER +const char HTTP_SDS0X1_SNS[] PROGMEM = "%s" + "{s}SDS0X1 " D_ENVIRONMENTAL_CONCENTRATION " 2.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}" + "{s}SDS0X1 " D_ENVIRONMENTAL_CONCENTRATION " 10 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"; // {s} = , {m} = , {e} = +#endif // USE_WEBSERVER + +void NovaSdsShow(boolean json) +{ + if (novasds_valid) { + if (json) { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"SDS0X1\":{\"PM2.5\":%d,\"PM10\":%d}"), mqtt_data, novasds_data.pm25, novasds_data.pm100); +#ifdef USE_WEBSERVER + } else { + snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SDS0X1_SNS, mqtt_data, novasds_data.pm25/10, novasds_data.pm100/10); +#endif // USE_WEBSERVER + } + } +} + +/*********************************************************************************************\ + * Interface +\*********************************************************************************************/ + +#define XSNS_20 + +boolean Xsns20(byte function) +{ + boolean result = false; + + if (novasds_type) { + switch (function) { + case FUNC_INIT: + NovaSdsInit(); + break; + case FUNC_EVERY_SECOND: + NovaSdsSecond(); + break; + case FUNC_JSON_APPEND: + NovaSdsShow(1); + break; +#ifdef USE_WEBSERVER + case FUNC_WEB_APPEND: + NovaSdsShow(0); + break; +#endif // USE_WEBSERVER + } + } + return result; +} + +#endif // USE_NOVA_SDS \ No newline at end of file From 15886c1df316b5f763a68b04f6ba58bdc90778e5 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 3 Mar 2018 19:04:33 +0100 Subject: [PATCH 004/136] Fix exception if no MQTT data --- .../.gitignore | 0 .../README.md | 0 .../examples/mqtt_pub/mqtt_pub.ino | 0 .../examples/mqtt_sub/mqtt_sub.ino | 0 .../keywords.txt | 0 .../library.properties | 0 .../src/TasmotaMqtt.cpp | 7 ++++--- .../src/TasmotaMqtt.h | 0 .../src/mqtt/debug.h | 0 .../src/mqtt/mqtt.c | 0 .../src/mqtt/mqtt.h | 0 .../src/mqtt/mqtt_msg.c | 0 .../src/mqtt/mqtt_msg.h | 0 .../src/mqtt/proto.c | 0 .../src/mqtt/proto.h | 0 .../src/mqtt/queue.c | 0 .../src/mqtt/queue.h | 0 .../src/mqtt/ringbuf.c | 0 .../src/mqtt/ringbuf.h | 0 .../src/mqtt/typedef.h | 0 .../src/mqtt/user_config.h | 0 .../src/mqtt/utils.c | 0 .../src/mqtt/utils.h | 0 sonoff/xdrv_00_mqtt.ino | 12 +++++++----- 24 files changed, 11 insertions(+), 8 deletions(-) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/.gitignore (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/README.md (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/examples/mqtt_pub/mqtt_pub.ino (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/examples/mqtt_sub/mqtt_sub.ino (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/keywords.txt (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/library.properties (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/src/TasmotaMqtt.cpp (97%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/src/TasmotaMqtt.h (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/src/mqtt/debug.h (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/src/mqtt/mqtt.c (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/src/mqtt/mqtt.h (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/src/mqtt/mqtt_msg.c (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/src/mqtt/mqtt_msg.h (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/src/mqtt/proto.c (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/src/mqtt/proto.h (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/src/mqtt/queue.c (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/src/mqtt/queue.h (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/src/mqtt/ringbuf.c (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/src/mqtt/ringbuf.h (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/src/mqtt/typedef.h (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/src/mqtt/user_config.h (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/src/mqtt/utils.c (100%) rename lib/{TasmotaMqtt-1.1.0 => TasmotaMqtt-1.1.1}/src/mqtt/utils.h (100%) diff --git a/lib/TasmotaMqtt-1.1.0/.gitignore b/lib/TasmotaMqtt-1.1.1/.gitignore similarity index 100% rename from lib/TasmotaMqtt-1.1.0/.gitignore rename to lib/TasmotaMqtt-1.1.1/.gitignore diff --git a/lib/TasmotaMqtt-1.1.0/README.md b/lib/TasmotaMqtt-1.1.1/README.md similarity index 100% rename from lib/TasmotaMqtt-1.1.0/README.md rename to lib/TasmotaMqtt-1.1.1/README.md diff --git a/lib/TasmotaMqtt-1.1.0/examples/mqtt_pub/mqtt_pub.ino b/lib/TasmotaMqtt-1.1.1/examples/mqtt_pub/mqtt_pub.ino similarity index 100% rename from lib/TasmotaMqtt-1.1.0/examples/mqtt_pub/mqtt_pub.ino rename to lib/TasmotaMqtt-1.1.1/examples/mqtt_pub/mqtt_pub.ino diff --git a/lib/TasmotaMqtt-1.1.0/examples/mqtt_sub/mqtt_sub.ino b/lib/TasmotaMqtt-1.1.1/examples/mqtt_sub/mqtt_sub.ino similarity index 100% rename from lib/TasmotaMqtt-1.1.0/examples/mqtt_sub/mqtt_sub.ino rename to lib/TasmotaMqtt-1.1.1/examples/mqtt_sub/mqtt_sub.ino diff --git a/lib/TasmotaMqtt-1.1.0/keywords.txt b/lib/TasmotaMqtt-1.1.1/keywords.txt similarity index 100% rename from lib/TasmotaMqtt-1.1.0/keywords.txt rename to lib/TasmotaMqtt-1.1.1/keywords.txt diff --git a/lib/TasmotaMqtt-1.1.0/library.properties b/lib/TasmotaMqtt-1.1.1/library.properties similarity index 100% rename from lib/TasmotaMqtt-1.1.0/library.properties rename to lib/TasmotaMqtt-1.1.1/library.properties diff --git a/lib/TasmotaMqtt-1.1.0/src/TasmotaMqtt.cpp b/lib/TasmotaMqtt-1.1.1/src/TasmotaMqtt.cpp similarity index 97% rename from lib/TasmotaMqtt-1.1.0/src/TasmotaMqtt.cpp rename to lib/TasmotaMqtt-1.1.1/src/TasmotaMqtt.cpp index 91a49e0f6..9beddd452 100644 --- a/lib/TasmotaMqtt-1.1.0/src/TasmotaMqtt.cpp +++ b/lib/TasmotaMqtt-1.1.1/src/TasmotaMqtt.cpp @@ -185,9 +185,10 @@ bool TasmotaMqtt::Connected() void TasmotaMqtt::_onMqttDataCb(const char* topic, uint32_t topic_len, const char* data, uint32_t data_len) { - char topic_copy[topic_len]; + char topic_copy[topic_len +1]; - memcpy(topic_copy, topic, topic_len); - topic_copy[topic_len] = 0; + memcpy(topic_copy, topic, topic_len); + topic_copy[topic_len] = 0; + if (0 == data_len) data = (const char*)&topic_copy + topic_len; onMqttDataCb((char*)topic_copy, (byte*)data, data_len); } diff --git a/lib/TasmotaMqtt-1.1.0/src/TasmotaMqtt.h b/lib/TasmotaMqtt-1.1.1/src/TasmotaMqtt.h similarity index 100% rename from lib/TasmotaMqtt-1.1.0/src/TasmotaMqtt.h rename to lib/TasmotaMqtt-1.1.1/src/TasmotaMqtt.h diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/debug.h b/lib/TasmotaMqtt-1.1.1/src/mqtt/debug.h similarity index 100% rename from lib/TasmotaMqtt-1.1.0/src/mqtt/debug.h rename to lib/TasmotaMqtt-1.1.1/src/mqtt/debug.h diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt.c b/lib/TasmotaMqtt-1.1.1/src/mqtt/mqtt.c similarity index 100% rename from lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt.c rename to lib/TasmotaMqtt-1.1.1/src/mqtt/mqtt.c diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt.h b/lib/TasmotaMqtt-1.1.1/src/mqtt/mqtt.h similarity index 100% rename from lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt.h rename to lib/TasmotaMqtt-1.1.1/src/mqtt/mqtt.h diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt_msg.c b/lib/TasmotaMqtt-1.1.1/src/mqtt/mqtt_msg.c similarity index 100% rename from lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt_msg.c rename to lib/TasmotaMqtt-1.1.1/src/mqtt/mqtt_msg.c diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt_msg.h b/lib/TasmotaMqtt-1.1.1/src/mqtt/mqtt_msg.h similarity index 100% rename from lib/TasmotaMqtt-1.1.0/src/mqtt/mqtt_msg.h rename to lib/TasmotaMqtt-1.1.1/src/mqtt/mqtt_msg.h diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/proto.c b/lib/TasmotaMqtt-1.1.1/src/mqtt/proto.c similarity index 100% rename from lib/TasmotaMqtt-1.1.0/src/mqtt/proto.c rename to lib/TasmotaMqtt-1.1.1/src/mqtt/proto.c diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/proto.h b/lib/TasmotaMqtt-1.1.1/src/mqtt/proto.h similarity index 100% rename from lib/TasmotaMqtt-1.1.0/src/mqtt/proto.h rename to lib/TasmotaMqtt-1.1.1/src/mqtt/proto.h diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/queue.c b/lib/TasmotaMqtt-1.1.1/src/mqtt/queue.c similarity index 100% rename from lib/TasmotaMqtt-1.1.0/src/mqtt/queue.c rename to lib/TasmotaMqtt-1.1.1/src/mqtt/queue.c diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/queue.h b/lib/TasmotaMqtt-1.1.1/src/mqtt/queue.h similarity index 100% rename from lib/TasmotaMqtt-1.1.0/src/mqtt/queue.h rename to lib/TasmotaMqtt-1.1.1/src/mqtt/queue.h diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/ringbuf.c b/lib/TasmotaMqtt-1.1.1/src/mqtt/ringbuf.c similarity index 100% rename from lib/TasmotaMqtt-1.1.0/src/mqtt/ringbuf.c rename to lib/TasmotaMqtt-1.1.1/src/mqtt/ringbuf.c diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/ringbuf.h b/lib/TasmotaMqtt-1.1.1/src/mqtt/ringbuf.h similarity index 100% rename from lib/TasmotaMqtt-1.1.0/src/mqtt/ringbuf.h rename to lib/TasmotaMqtt-1.1.1/src/mqtt/ringbuf.h diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/typedef.h b/lib/TasmotaMqtt-1.1.1/src/mqtt/typedef.h similarity index 100% rename from lib/TasmotaMqtt-1.1.0/src/mqtt/typedef.h rename to lib/TasmotaMqtt-1.1.1/src/mqtt/typedef.h diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/user_config.h b/lib/TasmotaMqtt-1.1.1/src/mqtt/user_config.h similarity index 100% rename from lib/TasmotaMqtt-1.1.0/src/mqtt/user_config.h rename to lib/TasmotaMqtt-1.1.1/src/mqtt/user_config.h diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/utils.c b/lib/TasmotaMqtt-1.1.1/src/mqtt/utils.c similarity index 100% rename from lib/TasmotaMqtt-1.1.0/src/mqtt/utils.c rename to lib/TasmotaMqtt-1.1.1/src/mqtt/utils.c diff --git a/lib/TasmotaMqtt-1.1.0/src/mqtt/utils.h b/lib/TasmotaMqtt-1.1.1/src/mqtt/utils.h similarity index 100% rename from lib/TasmotaMqtt-1.1.0/src/mqtt/utils.h rename to lib/TasmotaMqtt-1.1.1/src/mqtt/utils.h diff --git a/sonoff/xdrv_00_mqtt.ino b/sonoff/xdrv_00_mqtt.ino index c4196817d..b8e76ca7e 100644 --- a/sonoff/xdrv_00_mqtt.ino +++ b/sonoff/xdrv_00_mqtt.ino @@ -154,12 +154,14 @@ void MqttDisconnectedCb() MqttDisconnected(MqttClient->getState()); // status codes are documented in file mqtt.h as tConnState } -void MqttMyDataCb(const char* topic, uint32_t topic_len, const char *data, uint32_t data_len) +void MqttMyDataCb(const char* topic, uint32_t topic_len, const char* data, uint32_t data_len) { - char topicCpy[topic_len]; - memcpy(topicCpy, topic, topic_len); - topicCpy[topic_len] = 0; - MqttDataHandler((char*)topicCpy, (byte*)data, data_len); + char topic_copy[topic_len +1]; + + memcpy(topic_copy, topic, topic_len); + topic_copy[topic_len] = 0; + if (0 == data_len) data = (const char*)&topic_copy + topic_len; + MqttDataHandler((char*)topic_copy, (byte*)data, data_len); } void MqttSubscribeLib(char *topic) From 9538dfb585de86a046efddbf50389b97b05f8bbf Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 8 Mar 2018 14:02:00 +0100 Subject: [PATCH 005/136] v5.12.0d - Add Czech and Taiwan language 5.12.0d * Add Czech language file * Add Chinese (Traditional) in Taiwan language file (#2108) --- sonoff/_releasenotes.ino | 2 + sonoff/language/cz-CZ.h | 458 +++++++++++++++++++++++++++++++++++++++ sonoff/language/zh-TW.h | 458 +++++++++++++++++++++++++++++++++++++++ sonoff/user_config.h | 2 + 4 files changed, 920 insertions(+) create mode 100644 sonoff/language/cz-CZ.h create mode 100644 sonoff/language/zh-TW.h diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 51ebe785b..721498160 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -4,6 +4,8 @@ * Add compiler check for stable lwIP version v1.4 (#1940) * Add diacritics to Polish language file (#2005) * Add Hungarian language file (#2024) + * Add Czech language file + * Add Chinese (Traditional) in Taiwan language file (#2108) * Add support for Nova Fitness SDS011 and possibly SDS021 particle concentration sensor (#2070) * Fix MQTT TLS fingerprint validation (#2033) * diff --git a/sonoff/language/cz-CZ.h b/sonoff/language/cz-CZ.h new file mode 100644 index 000000000..6eeb3237b --- /dev/null +++ b/sonoff/language/cz-CZ.h @@ -0,0 +1,458 @@ +/* + cz-CZ.h - localization for Czech without fonetick - Czech for Sonoff-Tasmota + + Copyright (C) 2018 Theo Arends (translated by vs) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef _LANGUAGE_CZ_CZ_H_ +#define _LANGUAGE_CZ_CZ_H_ + +/*************************** ATTENTION *******************************\ + * + * Due to memory constraints only UTF-8 is supported. + * To save code space keep text as short as possible. + * Time and Date provided by SDK can not be localized (yet). + * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. + * Use online command Prefix to translate cmnd, stat and tele. + * +\*********************************************************************/ + +//#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) + +// "2017-03-07T11:08:02" - ISO8601:2004 +#define D_YEAR_MONTH_SEPARATOR "-" +#define D_MONTH_DAY_SEPARATOR "-" +#define D_DATE_TIME_SEPARATOR "T" +#define D_HOUR_MINUTE_SEPARATOR ":" +#define D_MINUTE_SECOND_SEPARATOR ":" + +#define D_DAY3LIST "PonUteStrCtvPatSobNed" +#define D_MONTH3LIST "LedUnoBreDubKveCerCevSrpZarRijLisPro" + +// Non JSON decimal separator +#define D_DECIMAL_SEPARATOR "," + +// Common +#define D_ADMIN "Admin" +#define D_AIR_QUALITY "Kvalita vzduchu" +#define D_AP "AP" // Access Point +#define D_AS "jako" +#define D_AUTO "AUTO" +#define D_BLINK "Blikani" +#define D_BLINKOFF "BlikaniVyp" +#define D_BOOT_COUNT "Pocitadlo spusteni" +#define D_BRIGHTLIGHT "Svetly" +#define D_BUTTON "Tlacitko" +#define D_BY "by" // Written by me +#define D_BYTES "Bytu" +#define D_CELSIUS "Celsia" +#define D_CO2 "Kyslicniku uhliciteho" +#define D_CODE "kod" // Button code +#define D_COLDLIGHT "Studeny" +#define D_COMMAND "Prikaz" +#define D_CONNECTED "Pripojeny" +#define D_COUNT "Pocitej" +#define D_COUNTER "Pocitadlo" +#define D_CURRENT "Aktualni" // As in Voltage and Current +#define D_DATA "Data" +#define D_DARKLIGHT "Tmavy" +#define D_DEBUG "Debug" +#define D_DISABLED "Zablokovany" +#define D_DNS_SERVER "Server DNS" +#define D_DONE "Provedeno" +#define D_DST_TIME "DST" +#define D_EMULATION "Emulace" +#define D_ENABLED "Otevrene" +#define D_ERASE "Vymaz" +#define D_ERROR "Chyba" +#define D_FAHRENHEIT "Fahrenheita" +#define D_FAILED "Chybny" +#define D_FALLBACK "Nahradni" +#define D_FALLBACK_TOPIC "Nahradni topic" +#define D_FALSE "Nepravda" +#define D_FILE "Soubor" +#define D_FREE_MEMORY "Volna pamet" +#define D_GAS "Gas" +#define D_GATEWAY "Brana" +#define D_GROUP "Skupina" +#define D_HOST "Server" +#define D_HOSTNAME "Nazev serveru" +#define D_HUMIDITY "Vlhkost" +#define D_ILLUMINANCE "Osvetleni" +#define D_IMMEDIATE "Okamzite" // Button immediate +#define D_INDEX "Index" +#define D_INFO "Informace" +#define D_INITIALIZED "Inicializovany" +#define D_IP_ADDRESS "Adresa IP" +#define D_LIGHT "Svetlo" +#define D_LWT "LWT" +#define D_MODULE "Modul" +#define D_MQTT "MQTT" +#define D_MULTI_PRESS "nekolikere-stisknuti" +#define D_NOISE "Hluk" +#define D_NONE "Neni" +#define D_OFF "Vypnuty" +#define D_OFFLINE "Neaktivni" +#define D_OK "Ok" +#define D_ON "Sepnuty" +#define D_ONLINE "Aktivni" +#define D_PASSWORD "Heslo" +#define D_PORT "Port" +#define D_POWER_FACTOR "Soucinitel prikonu" +#define D_POWERUSAGE "Prikon" +#define D_PRESSURE "Tlak" +#define D_PRESSUREATSEALEVEL "Tlak na urovni hladiny more" +#define D_PROGRAM_FLASH_SIZE "Velikost programu flash" +#define D_PROGRAM_SIZE "Velikost programu" +#define D_PROJECT "Projekt" +#define D_RECEIVED "Obdrzeny" +#define D_RESTART "Restart" +#define D_RESTARTING "Restartovani" +#define D_RESTART_REASON "Pricina restartu" +#define D_RESTORE "Nacteni" +#define D_RETAINED "Ulozene" +#define D_SAVE "Uloz" +#define D_SENSOR "Sensor" +#define D_SSID "SSID" +#define D_START "Start" +#define D_STD_TIME "STD" +#define D_STOP "Stop" +#define D_SUBNET_MASK "Maska podsite" +#define D_SUBSCRIBE_TO "Prihlas se do" +#define D_SUCCESSFUL "uspesne." +#define D_TEMPERATURE "Teplota" +#define D_TO "do" +#define D_TOGGLE "Prepni" +#define D_TOPIC "Topic" +#define D_TRANSMIT "Odesli" +#define D_TRUE "Pravda" +#define D_UPGRADE "aktualizace" +#define D_UPLOAD "Nahrani..." +#define D_UPTIME "Uptime" +#define D_USER "Uzivatel" +#define D_UTC_TIME "UTC" +#define D_UV_LEVEL "Uroven UV" +#define D_VERSION "Verze" +#define D_VOLTAGE "Napeti" +#define D_WARMLIGHT "Ohrev" +#define D_WEB_SERVER "Web Server" + +// sonoff.ino +#define D_WARNING_MINIMAL_VERSION "WARNING This version does not support persistent settings" +#define D_LEVEL_10 "uroven 1-0" +#define D_LEVEL_01 "uroven 0-1" +#define D_SERIAL_LOGGING_DISABLED "Vypnute logovani na seriovem portu" +#define D_SYSLOG_LOGGING_REENABLED "Obnoven zapis do Syslog" + +#define D_SET_BAUDRATE_TO "Nastaveni rychlosti prenosu na" +#define D_RECEIVED_TOPIC "Obdrzeny topic" +#define D_DATA_SIZE "Velikost dat" +#define D_ANALOG_INPUT "Analogovy vstup" + +#define D_FINGERPRINT "Verifikuj otisk TLS..." +#define D_TLS_CONNECT_FAILED_TO "Nepripojeno TLS do" +#define D_RETRY_IN "Zopakuji za" +#define D_VERIFIED "Zverifikovano" +#define D_INSECURE "Nespravne pripojeni z duvodu chybneho otisku TLS" +#define D_CONNECT_FAILED_TO "Spojeni se nepodarilo navazat" + +// support.ino +#define D_OSWATCH "osWatch" +#define D_BLOCKED_LOOP "Zablokovani smycky" +#define D_WPS_FAILED_WITH_STATUS "Chyba WPSconfig se statusem" +#define D_ACTIVE_FOR_3_MINUTES "aktivni 3 minuty" +#define D_FAILED_TO_START "nezdarilo se spustit" +#define D_PATCH_ISSUE_2186 "Chyba 2186" +#define D_CONNECTING_TO_AP "Pripojovani k AP" +#define D_IN_MODE "v modu" +#define D_CONNECT_FAILED_NO_IP_ADDRESS "Chyba pripojeni, nebyla obdrzena IP adresa" +#define D_CONNECT_FAILED_AP_NOT_REACHED "Chyba pripojeni, nedostupny AP" +#define D_CONNECT_FAILED_WRONG_PASSWORD "Chyba pripojeni, nespravne heslo pro AP" +#define D_CONNECT_FAILED_AP_TIMEOUT "Chyba pripojeni, uplynul AP timeout" +#define D_ATTEMPTING_CONNECTION "Zkouska pripojeni..." +#define D_CHECKING_CONNECTION "Zkouska spojeni..." +#define D_QUERY_DONE "Vyslan dotaz. Nalezena sluzba MQTT" +#define D_MQTT_SERVICE_FOUND "Sluzba MQTT byla nalezena" +#define D_FOUND_AT "znalezeno v" +#define D_SYSLOG_HOST_NOT_FOUND "Syslog Host nebyl nalezen" + +// settings.ino +#define D_SAVED_TO_FLASH_AT "Ulozeno do pameti flash v" +#define D_LOADED_FROM_FLASH_AT "Stazeno z pameti flash z" +#define D_USE_DEFAULTS "Pouzij defaultni hodnoty" +#define D_ERASED_SECTOR "Smazany sektor" + +// webserver.ino +#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Oprogramowanie MINIMAL - prosze uaktualnic" +#define D_WEBSERVER_ACTIVE_ON "Aktivni Web server" +#define D_WITH_IP_ADDRESS "na adrese IP" +#define D_WEBSERVER_STOPPED "Web server zastaven" +#define D_FILE_NOT_FOUND "Soubor nebyl nalezen" +#define D_REDIRECTED "Presmerovani na vlastni portal" +#define D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION "Wi-Fi manager nastavi AP a zachova STA" +#define D_WIFIMANAGER_SET_ACCESSPOINT "Wi-Fi manager nastavi Access Point" +#define D_TRYING_TO_CONNECT "Zkousim pripojit zarizeni k siti" + +#define D_RESTART_IN "Restart" +#define D_SECONDS "sekund" +#define D_DEVICE_WILL_RESTART "Zarizeni bude restartovano behem nekolika sekund" +#define D_BUTTON_TOGGLE "Prepinac" +#define D_CONFIGURATION "Nastaveni" +#define D_INFORMATION "Informace" +#define D_FIRMWARE_UPGRADE "Aktualizace firmware" +#define D_CONSOLE "Konzole" +#define D_CONFIRM_RESTART "Potvrzeni restartu" + +#define D_CONFIGURE_MODULE "Nastaveni modulu" +#define D_CONFIGURE_WIFI "Nastaveni WiFi" +#define D_CONFIGURE_MQTT "Nastaveni MQTT" +#define D_CONFIGURE_DOMOTICZ "Nastaveni Domoticz" +#define D_CONFIGURE_LOGGING "Nastaveni logovani" +#define D_CONFIGURE_OTHER "Jina nastaveni" +#define D_CONFIRM_RESET_CONFIGURATION "Potvrzeni resetu nastaveni" +#define D_RESET_CONFIGURATION "Reset nastaveni" +#define D_BACKUP_CONFIGURATION "Zaloha nastaveni" +#define D_RESTORE_CONFIGURATION "Obnoveni nastaveni" +#define D_MAIN_MENU "Hlavni menu" + +#define D_MODULE_PARAMETERS "Parametry modulu" +#define D_MODULE_TYPE "Typ modulu" +#define D_GPIO "GPIO" +#define D_SERIAL_IN "Serial In" +#define D_SERIAL_OUT "Serial Out" + +#define D_WIFI_PARAMETERS "Parametry WiFi" +#define D_SCAN_FOR_WIFI_NETWORKS "Scan siti WiFi" +#define D_SCAN_DONE "Scan dokoncen" +#define D_NO_NETWORKS_FOUND "Sit nebyla nalezena" +#define D_REFRESH_TO_SCAN_AGAIN "Zopakovat scan" +#define D_DUPLICATE_ACCESSPOINT "Kopie AP" +#define D_SKIPPING_LOW_QUALITY "Preskoceni z duvodu kvality signalu" +#define D_RSSI "RSSI" +#define D_WEP "WEP" +#define D_WPA_PSK "WPA PSK" +#define D_WPA2_PSK "WPA2 PSK" +#define D_AP1_SSID "AP1 SSID" +#define D_AP1_PASSWORD "Heslo AP1" +#define D_AP2_SSID "AP2 SSID" +#define D_AP2_PASSWORD "Heslo AP2" + +#define D_MQTT_PARAMETERS "Parametry MQTT" +#define D_CLIENT "Klient" +#define D_FULL_TOPIC "Cely topic" + +#define D_LOGGING_PARAMETERS "Volby logovani" +#define D_SERIAL_LOG_LEVEL "Serial uroven logu" +#define D_WEB_LOG_LEVEL "Webova uroven logu" +#define D_SYS_LOG_LEVEL "Systemova uroven logu" +#define D_MORE_DEBUG "Vice debug informaci" +#define D_SYSLOG_HOST "Syslog host" +#define D_SYSLOG_PORT "Syslog port" +#define D_TELEMETRY_PERIOD "Interval telemetrie" + +#define D_OTHER_PARAMETERS "Jine parametry" +#define D_WEB_ADMIN_PASSWORD "Heslo Web administratora" +#define D_MQTT_ENABLE "MQTT aktivni" +#define D_FRIENDLY_NAME "Friendly Name" +#define D_BELKIN_WEMO "Belkin WeMo" +#define D_HUE_BRIDGE "Hue Bridge" +#define D_SINGLE_DEVICE "single device" +#define D_MULTI_DEVICE "multi device" + +#define D_SAVE_CONFIGURATION "Uloz nastaveni" +#define D_CONFIGURATION_SAVED "Nastaveni ulozena" +#define D_CONFIGURATION_RESET "Nastaveni resetovano" + +#define D_PROGRAM_VERSION "Verze programu" +#define D_BUILD_DATE_AND_TIME "Datum a cas kompilace" +#define D_CORE_AND_SDK_VERSION "Verze Core/SDK" +#define D_FLASH_WRITE_COUNT "Pocet zapisu do pameti" +#define D_MAC_ADDRESS "Adres Mac" +#define D_MQTT_HOST "Host MQTT" +#define D_MQTT_PORT "Port MQTT" +#define D_MQTT_CLIENT "Klient MQTT" +#define D_MQTT_USER "Uzivatel MQTT" +#define D_MQTT_TOPIC "Topic MQTT" +#define D_MQTT_GROUP_TOPIC "Topic skupiny MQTT" +#define D_MQTT_FULL_TOPIC "Cely topic MQTT" +#define D_MDNS_DISCOVERY "Ziskavani mDNS" +#define D_MDNS_ADVERTISE "Rozesilani mDNS" +#define D_ESP_CHIP_ID "ID systemu ESP" +#define D_FLASH_CHIP_ID "ID systemu pameti flash" +#define D_FLASH_CHIP_SIZE "Velikost flash" +#define D_FREE_PROGRAM_SPACE "Volne misto programu" + +#define D_UPGRADE_BY_WEBSERVER "Aktualizace z Web serveru" +#define D_OTA_URL "URL OTA" +#define D_START_UPGRADE "Start aktualizace" +#define D_UPGRADE_BY_FILE_UPLOAD "Aktualizace nahranim souboru" +#define D_UPLOAD_STARTED "Nahravani zahajeno" +#define D_UPGRADE_STARTED "Zahajeni aktualizace" +#define D_UPLOAD_DONE "Nahravani ukonceno" +#define D_UPLOAD_ERR_1 "Soubor nebyl vybran" +#define D_UPLOAD_ERR_2 "Malo mista" +#define D_UPLOAD_ERR_3 "Magicky byte ma jinou hodnotu nez 0xE9" +#define D_UPLOAD_ERR_4 "Velikost programu je vetsi nez skutecna velikost pameti flash" +#define D_UPLOAD_ERR_5 "Chyba nahravani, nesouhlasi porovnavane bity" +#define D_UPLOAD_ERR_6 "Chyba nahravani. Spusten zapis do logu na urovni 3" +#define D_UPLOAD_ERR_7 "Nahravani preruseno" +#define D_UPLOAD_ERR_8 "Spatny soubor" +#define D_UPLOAD_ERR_9 "Soubor je prilis velky" +#define D_UPLOAD_ERROR_CODE "Chyba nahravani" + +#define D_ENTER_COMMAND "Vloz prikaz" +#define D_ENABLE_WEBLOG_FOR_RESPONSE "Zapni uroven 2 zapisu Weblog, pokud je ocekavana odpoved" +#define D_NEED_USER_AND_PASSWORD "Vyzadovany uzivatel=&heslo=" + +// xdrv_wemohue.ino +#define D_MULTICAST_DISABLED "Multicast je vypnuty" +#define D_MULTICAST_REJOINED "Multicast opet pripojeny" +#define D_MULTICAST_JOIN_FAILED "Multicast neuspesny" +#define D_FAILED_TO_SEND_RESPONSE "Nepodarilo se odeslat odpoved" + +#define D_WEMO "WeMo" +#define D_WEMO_BASIC_EVENT "WeMo zakladni udalost" +#define D_WEMO_EVENT_SERVICE "WeMo servisni udalost" +#define D_WEMO_META_SERVICE "WeMo meta udalost" +#define D_WEMO_SETUP "WeMo setup" +#define D_RESPONSE_SENT "Odpoved odeslana" + +#define D_HUE "Hue" +#define D_HUE_BRIDGE_SETUP "Hue setup" +#define D_HUE_API_NOT_IMPLEMENTED "Hue API neni implementovano" +#define D_HUE_API "Hue API" +#define D_HUE_POST_ARGS "Hue POST args" +#define D_3_RESPONSE_PACKETS_SENT "3 pakety odpovedi odeslany" + +// xdrv_05_domoticz.ino +#define D_DOMOTICZ_PARAMETERS "Parametry Domoticz" +#define D_DOMOTICZ_IDX "Idx" +#define D_DOMOTICZ_KEY_IDX "Key idx" +#define D_DOMOTICZ_SWITCH_IDX "Spinac idx" +#define D_DOMOTICZ_SENSOR_IDX "Sensor idx" + #define D_DOMOTICZ_TEMP "Temp" + #define D_DOMOTICZ_TEMP_HUM "Temp,Vlhk" + #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Vlhk,Tlak" + #define D_DOMOTICZ_POWER_ENERGY "Prikon,Energie" + #define D_DOMOTICZ_ILLUMINANCE "Osvetleni" + #define D_DOMOTICZ_COUNT "Pocitadlo" + #define D_DOMOTICZ_VOLTAGE "Napeti" + #define D_DOMOTICZ_CURRENT "Proud" + #define D_DOMOTICZ_AIRQUALITY "AirQuality" +#define D_DOMOTICZ_UPDATE_TIMER "Aktualizace stopek" + +// xdrv_03_energy.ino +#define D_ENERGY_TODAY "Energie Dnes" +#define D_ENERGY_YESTERDAY "Energie Vcera" +#define D_ENERGY_TOTAL "Energie Soucet" + +// xsns_05_ds18b20.ino +#define D_SENSOR_BUSY "Sensor DS18x20 obsazen" +#define D_SENSOR_CRC_ERROR "Sensor DS18x20 chyba CRC" +#define D_SENSORS_FOUND "Nalezen sensor DS18x20" + +// xsns_06_dht.ino +#define D_TIMEOUT_WAITING_FOR "Cekani na" +#define D_START_SIGNAL_LOW "signal� startovni nizky" +#define D_START_SIGNAL_HIGH "signal� startovni vysoky" +#define D_PULSE "puls" +#define D_CHECKSUM_FAILURE "Chybny kontrolni soucet" + +// xsns_07_sht1x.ino +#define D_SENSOR_DID_NOT_ACK_COMMAND "Sensor neobdrzel prikaz ACK" +#define D_SHT1X_FOUND "SHT1X nalezen" + +// xsns_18_pms5003.ino +#define D_STANDARD_CONCENTRATION "CF-1 PM" // Standard Particle CF-1 Particle Matter +#define D_ENVIRONMENTAL_CONCENTRATION "PM" // Environmetal Particle Matter +#define D_PARTICALS_BEYOND "Particals" + +// sonoff_template.h +#define D_SENSOR_NONE "Neni" +#define D_SENSOR_DHT11 "DHT11" +#define D_SENSOR_AM2301 "AM2301" +#define D_SENSOR_SI7021 "SI7021" +#define D_SENSOR_DS18X20 "DS18x20" +#define D_SENSOR_I2C_SCL "I2C SCL" +#define D_SENSOR_I2C_SDA "I2C SDA" +#define D_SENSOR_WS2812 "WS2812" +#define D_SENSOR_IRSEND "IRsend" +#define D_SENSOR_SWITCH "Spinac" // Suffix "1" +#define D_SENSOR_BUTTON "Tlacit" // Suffix "1" +#define D_SENSOR_RELAY "Rele" // Suffix "1i" +#define D_SENSOR_LED "Led" // Suffix "1i" +#define D_SENSOR_PWM "PWM" // Suffix "1" +#define D_SENSOR_COUNTER "Pocita" // Suffix "1" +#define D_SENSOR_IRRECV "IRrecv" +#define D_SENSOR_MHZ_RX "MHZ Rx" +#define D_SENSOR_MHZ_TX "MHZ Tx" +#define D_SENSOR_PZEM_RX "PZEM Rx" +#define D_SENSOR_PZEM_TX "PZEM Tx" +#define D_SENSOR_SAIR_RX "SAir Rx" +#define D_SENSOR_SAIR_TX "SAir Tx" +#define D_SENSOR_SPI_CS "SPI CS" +#define D_SENSOR_SPI_DC "SPI DC" +#define D_SENSOR_BACKLIGHT "BkLight" +#define D_SENSOR_PMS5003 "PMS5003" +#define D_SENSOR_SDS0X1 "SDS0X1" + +// Units +#define D_UNIT_AMPERE "A" +#define D_UNIT_HOUR "Hod" +#define D_UNIT_KILOOHM "kOhm" +#define D_UNIT_KILOWATTHOUR "kWh" +#define D_UNIT_LUX "lx" +#define D_UNIT_MICROGRAM_PER_CUBIC_METER "ug/m3" +#define D_UNIT_MICROMETER "um" +#define D_UNIT_MICROSECOND "us" +#define D_UNIT_MILLIAMPERE "mA" +#define D_UNIT_MILLISECOND "ms" +#define D_UNIT_MINUTE "Min" +#define D_UNIT_PARTS_PER_DECILITER "ppd" +#define D_UNIT_PARTS_PER_MILLION "ppm" +#define D_UNIT_PRESSURE "hPa" +#define D_UNIT_SECOND "sec" +#define D_UNIT_SECTORS "sektory" +#define D_UNIT_VOLT "V" +#define D_UNIT_WATT "W" +#define D_UNIT_WATTHOUR "Wh" + +// Log message prefix +#define D_LOG_APPLICATION "APP: " // Application +#define D_LOG_BRIDGE "BRG: " // Bridge +#define D_LOG_CONFIG "CFG: " // Settings +#define D_LOG_COMMAND "CMD: " // Command +#define D_LOG_DEBUG "DBG: " // Debug +#define D_LOG_DHT "DHT: " // DHT sensor +#define D_LOG_DOMOTICZ "DOM: " // Domoticz +#define D_LOG_DSB "DSB: " // DS18xB20 sensor +#define D_LOG_HTTP "HTP: " // HTTP webserver +#define D_LOG_I2C "I2C: " // I2C +#define D_LOG_IRR "IRR: " // Infra Red Received +#define D_LOG_LOG "LOG: " // Logging +#define D_LOG_MODULE "MOD: " // Module +#define D_LOG_MDNS "DNS: " // mDNS +#define D_LOG_MQTT "MQT: " // MQTT +#define D_LOG_OTHER "OTH: " // Other +#define D_LOG_RESULT "RSL: " // Result +#define D_LOG_RFR "RFR: " // RF Received +#define D_LOG_SERIAL "SER: " // Serial +#define D_LOG_SHT1 "SHT: " // SHT1x sensor +#define D_LOG_UPLOAD "UPL: " // Upload +#define D_LOG_UPNP "UPP: " // UPnP +#define D_LOG_WIFI "WIF: " // Wifi + +#endif // _LANGUAGE_CZ_CZ_H_ diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h new file mode 100644 index 000000000..8ae1618c6 --- /dev/null +++ b/sonoff/language/zh-TW.h @@ -0,0 +1,458 @@ +/* + zh-TW.h - localization for Chinese (Traditional) - Taiwan for Sonoff-Tasmota + + Copyright (C) 2018 Theo Arends (translated by dannydu) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef _LANGUAGE_ZH_TW_H_ +#define _LANGUAGE_ZH_TW_H_ + +/*************************** ATTENTION *******************************\ + * + * Due to memory constraints only UTF-8 is supported. + * To save code space keep text as short as possible. + * Time and Date provided by SDK can not be localized (yet). + * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. + * Use online command Prefix to translate cmnd, stat and tele. + * +\*********************************************************************/ + +//#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) + +// "2017-03-07T11:08:02" - ISO8601:2004 +#define D_YEAR_MONTH_SEPARATOR "-" +#define D_MONTH_DAY_SEPARATOR "-" +#define D_DATE_TIME_SEPARATOR "T" +#define D_HOUR_MINUTE_SEPARATOR ":" +#define D_MINUTE_SECOND_SEPARATOR ":" + +#define D_DAY3LIST "SunMonTueWedThuFriSat" +#define D_MONTH3LIST "JanFebMarAprMayJunJulAugSepOctNovDec" + +// Non JSON decimal separator +#define D_DECIMAL_SEPARATOR "." + +// Common +#define D_ADMIN "Admin" +#define D_AIR_QUALITY "空氣品質" +#define D_AP "AP" // Access Point +#define D_AS "名稱:" +#define D_AUTO "自動" +#define D_BLINK "閃爍" +#define D_BLINKOFF "閃爍關" +#define D_BOOT_COUNT "啟動次數" +#define D_BRIGHTLIGHT "亮度" +#define D_BUTTON "按鈕" +#define D_BY "by" // Written by me +#define D_BYTES "大小:" +#define D_CELSIUS "攝氏" +#define D_CO2 "二氧化碳" +#define D_CODE "代碼" // Button code +#define D_COLDLIGHT "冷" +#define D_COMMAND "命令:" +#define D_CONNECTED "已連接" +#define D_COUNT "數量:" +#define D_COUNTER "Counter" +#define D_CURRENT "電流" // As in Voltage and Current +#define D_DATA "數據:" +#define D_DARKLIGHT "Dark" +#define D_DEBUG "除錯" +#define D_DISABLED "停用" +#define D_DNS_SERVER "DNS伺服器" +#define D_DONE "完成" +#define D_DST_TIME "DST" +#define D_EMULATION "設備模擬" +#define D_ENABLED "啟用" +#define D_ERASE "刪除" +#define D_ERROR "錯誤" +#define D_FAHRENHEIT "華氏" +#define D_FAILED "失敗" +#define D_FALLBACK "Fallback" +#define D_FALLBACK_TOPIC "Fallback Topic" +#define D_FALSE "False" +#define D_FILE "文件:" +#define D_FREE_MEMORY "可用記憶體" +#define D_GAS "氣體" +#define D_GATEWAY "網關" +#define D_GROUP "組:" +#define D_HOST "主機" +#define D_HOSTNAME "主機名" +#define D_HUMIDITY "濕度" +#define D_ILLUMINANCE "照度" +#define D_IMMEDIATE "immediate" // Button immediate +#define D_INDEX "索引:" +#define D_INFO "信息" +#define D_INITIALIZED "初始化完成" +#define D_IP_ADDRESS "IP地址" +#define D_LIGHT "燈" +#define D_LWT "LWT" +#define D_MODULE "模組" +#define D_MQTT "MQTT" +#define D_MULTI_PRESS "多次按鍵" +#define D_NOISE "雜訊" +#define D_NONE "無" +#define D_OFF "關" +#define D_OFFLINE "離線" +#define D_OK "好" +#define D_ON "開" +#define D_ONLINE "在線" +#define D_PASSWORD "密碼" +#define D_PORT "端口" +#define D_POWER_FACTOR "功率因數" +#define D_POWERUSAGE "功率" +#define D_PRESSURE "氣壓" +#define D_PRESSUREATSEALEVEL "海平面氣壓" +#define D_PROGRAM_FLASH_SIZE "韌體 Flash 大小" +#define D_PROGRAM_SIZE "韌體大小" +#define D_PROJECT "項目:" +#define D_RECEIVED "已接收" +#define D_RESTART "重啟" +#define D_RESTARTING "正在重啟" +#define D_RESTART_REASON "重啟原因" +#define D_RESTORE "恢覆" +#define D_RETAINED "已保留" +#define D_SAVE "存檔" +#define D_SENSOR "感測器" +#define D_SSID "名稱" +#define D_START "開始" +#define D_STD_TIME "STD" +#define D_STOP "停止" +#define D_SUBNET_MASK "子網遮罩" +#define D_SUBSCRIBE_TO "訂閱" +#define D_SUCCESSFUL "成功" +#define D_TEMPERATURE "溫度" +#define D_TO "to" +#define D_TOGGLE "切換" +#define D_TOPIC "主題" +#define D_TRANSMIT "發送" +#define D_TRUE "True" +#define D_UPGRADE "升級" +#define D_UPLOAD "上傳" +#define D_UPTIME "運行時間" +#define D_USER "用戶名" +#define D_UTC_TIME "UTC" +#define D_UV_LEVEL "紫外線等級" +#define D_VERSION "版本" +#define D_VOLTAGE "電壓" +#define D_WARMLIGHT "暖" +#define D_WEB_SERVER "Web Server" + +// sonoff.ino +#define D_WARNING_MINIMAL_VERSION "警告：精簡產品不支持配置寫入保存" +#define D_LEVEL_10 "level 1-0" +#define D_LEVEL_01 "level 0-1" +#define D_SERIAL_LOGGING_DISABLED "串口日誌已禁用" +#define D_SYSLOG_LOGGING_REENABLED "Syslog 日誌已開啟" + +#define D_SET_BAUDRATE_TO "設置波特率為:" +#define D_RECEIVED_TOPIC "接收到的主題:" +#define D_DATA_SIZE "數據大小:" +#define D_ANALOG_INPUT "Analog" + +#define D_FINGERPRINT "驗證 TLS 指紋..." +#define D_TLS_CONNECT_FAILED_TO "TLS 連接失敗" +#define D_RETRY_IN "重試倒計時:" +#define D_VERIFIED "驗證成功" +#define D_INSECURE "指紋無效導致連接不安全" +#define D_CONNECT_FAILED_TO "連接失敗:" + +// support.ino +#define D_OSWATCH "osWatch" +#define D_BLOCKED_LOOP "Blocked Loop" +#define D_WPS_FAILED_WITH_STATUS "WPSconfig FAILED with status" +#define D_ACTIVE_FOR_3_MINUTES "active for 3 minutes" +#define D_FAILED_TO_START "未能啟動" +#define D_PATCH_ISSUE_2186 "Patch issue 2186" +#define D_CONNECTING_TO_AP "連接到 AP" +#define D_IN_MODE "模式:" +#define D_CONNECT_FAILED_NO_IP_ADDRESS "連接失敗，因為沒有獲取到IP地址" +#define D_CONNECT_FAILED_AP_NOT_REACHED "連接失敗，無法連接AP" +#define D_CONNECT_FAILED_WRONG_PASSWORD "連接失敗，AP密碼不正確" +#define D_CONNECT_FAILED_AP_TIMEOUT "連接失敗，AP超時" +#define D_ATTEMPTING_CONNECTION "嘗試連接..." +#define D_CHECKING_CONNECTION "檢查連接..." +#define D_QUERY_DONE "查詢完成。 發現MQTT服務" +#define D_MQTT_SERVICE_FOUND "發現MQTT服務:" +#define D_FOUND_AT "found at" +#define D_SYSLOG_HOST_NOT_FOUND "Syslog主機未找到" + +// settings.ino +#define D_SAVED_TO_FLASH_AT "保存到 flash:" +#define D_LOADED_FROM_FLASH_AT "從 flash 載入" +#define D_USE_DEFAULTS "使用默認設置" +#define D_ERASED_SECTOR "擦除刪除" + +// webserver.ino +#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "固件版本過低 - 請升級" +#define D_WEBSERVER_ACTIVE_ON "Web服務器:" +#define D_WITH_IP_ADDRESS "IP地址:" +#define D_WEBSERVER_STOPPED "Web 服務器已停止" +#define D_FILE_NOT_FOUND "文件未找到" +#define D_REDIRECTED "重定向到認證頁面" +#define D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION "Wifimanager set AccessPoint and keep Station" +#define D_WIFIMANAGER_SET_ACCESSPOINT "Wifimanager 設置接入點" +#define D_TRYING_TO_CONNECT "嘗試將設備連接到網絡" + +#define D_RESTART_IN "重啟需要" +#define D_SECONDS "秒" +#define D_DEVICE_WILL_RESTART "設備將在幾分鐘內重啟" +#define D_BUTTON_TOGGLE "狀態切換" +#define D_CONFIGURATION "設置" +#define D_INFORMATION "信息" +#define D_FIRMWARE_UPGRADE "固件升級" +#define D_CONSOLE "控制台" +#define D_CONFIRM_RESTART "確認重啟" + +#define D_CONFIGURE_MODULE "模塊設置" +#define D_CONFIGURE_WIFI "WiFi設置" +#define D_CONFIGURE_MQTT "MQTT設置" +#define D_CONFIGURE_DOMOTICZ "Domoticz設置" +#define D_CONFIGURE_LOGGING "日志設置" +#define D_CONFIGURE_OTHER "其他設置" +#define D_CONFIRM_RESET_CONFIGURATION "確認重置配置" +#define D_RESET_CONFIGURATION "重置配置" +#define D_BACKUP_CONFIGURATION "備份配置" +#define D_RESTORE_CONFIGURATION "還原配置" +#define D_MAIN_MENU "主菜單" + +#define D_MODULE_PARAMETERS "模塊設置" +#define D_MODULE_TYPE "模塊類型" +#define D_GPIO "GPIO" +#define D_SERIAL_IN "串口輸入(RX)" +#define D_SERIAL_OUT "串口輸出(TX)" + +#define D_WIFI_PARAMETERS "Wifi設置" +#define D_SCAN_FOR_WIFI_NETWORKS "掃描無線網絡" +#define D_SCAN_DONE "掃描完畢" +#define D_NO_NETWORKS_FOUND "未找到任何網絡" +#define D_REFRESH_TO_SCAN_AGAIN "刷新並重試" +#define D_DUPLICATE_ACCESSPOINT "重覆AP" +#define D_SKIPPING_LOW_QUALITY "忽略弱信號網絡" +#define D_RSSI "RSSI" +#define D_WEP "WEP" +#define D_WPA_PSK "WPA PSK" +#define D_WPA2_PSK "WPA2 PSK" +#define D_AP1_SSID "AP1 名稱" +#define D_AP1_PASSWORD "AP1 密碼" +#define D_AP2_SSID "AP2 名稱" +#define D_AP2_PASSWORD "AP2 密碼" + +#define D_MQTT_PARAMETERS "MQTT設置" +#define D_CLIENT "客戶端" +#define D_FULL_TOPIC "完整主題" + +#define D_LOGGING_PARAMETERS "日志設置" +#define D_SERIAL_LOG_LEVEL "串口日志級別" +#define D_WEB_LOG_LEVEL "Web 日志級別" +#define D_SYS_LOG_LEVEL "Syslog 日志級別" +#define D_MORE_DEBUG "全部調試" +#define D_SYSLOG_HOST "Syslog 主機地址" +#define D_SYSLOG_PORT "Syslog 端口" +#define D_TELEMETRY_PERIOD "上報周期" + +#define D_OTHER_PARAMETERS "其他設置" +#define D_WEB_ADMIN_PASSWORD "WEB管理密碼" +#define D_MQTT_ENABLE "啟用MQTT" +#define D_FRIENDLY_NAME "昵稱" +#define D_BELKIN_WEMO "貝爾金 WeMo" +#define D_HUE_BRIDGE "飛利浦 Hue 網橋" +#define D_SINGLE_DEVICE "單設備" +#define D_MULTI_DEVICE "多設備" + +#define D_SAVE_CONFIGURATION "保存設置" +#define D_CONFIGURATION_SAVED "設置已保存" +#define D_CONFIGURATION_RESET "設置已重置" + +#define D_PROGRAM_VERSION "固件版本" +#define D_BUILD_DATE_AND_TIME "編譯時間" +#define D_CORE_AND_SDK_VERSION "內核版本" +#define D_FLASH_WRITE_COUNT "刷機次數" +#define D_MAC_ADDRESS "MAC地址" +#define D_MQTT_HOST "MQTT主機" +#define D_MQTT_PORT "MQTT端口" +#define D_MQTT_CLIENT "MQTT客戶端" +#define D_MQTT_USER "MQTT用戶名" +#define D_MQTT_TOPIC "MQTT 主題(Topic)" +#define D_MQTT_GROUP_TOPIC "MQTT 主題組(Group Topic)" +#define D_MQTT_FULL_TOPIC "MQTT 完整主題(Full Topic)" +#define D_MDNS_DISCOVERY "mDNS 發現" +#define D_MDNS_ADVERTISE "mDNS 廣播" +#define D_ESP_CHIP_ID "ESP芯片ID" +#define D_FLASH_CHIP_ID "Flash芯片ID" +#define D_FLASH_CHIP_SIZE "Flash大小" +#define D_FREE_PROGRAM_SPACE "空閑程序空間" + +#define D_UPGRADE_BY_WEBSERVER "通過Web升級" +#define D_OTA_URL "OTA地址" +#define D_START_UPGRADE "開始升級" +#define D_UPGRADE_BY_FILE_UPLOAD "通過文件升級" +#define D_UPLOAD_STARTED "開始上傳" +#define D_UPGRADE_STARTED "開始升級" +#define D_UPLOAD_DONE "上傳完成" +#define D_UPLOAD_ERR_1 "沒有選擇文件" +#define D_UPLOAD_ERR_2 "沒有足夠空間" +#define D_UPLOAD_ERR_3 "固件頭不是 0xE9" +#define D_UPLOAD_ERR_4 "固件太大" +#define D_UPLOAD_ERR_5 "上傳緩沖區不匹配" +#define D_UPLOAD_ERR_6 "上傳失敗。 啟用日志記錄 3" +#define D_UPLOAD_ERR_7 "上傳取消" +#define D_UPLOAD_ERR_8 "錯誤的固件" +#define D_UPLOAD_ERR_9 "固件太大" +#define D_UPLOAD_ERROR_CODE "上傳錯誤代碼" + +#define D_ENTER_COMMAND "輸入命令" +#define D_ENABLE_WEBLOG_FOR_RESPONSE "如果預期響應，則啟用Weblog 2" +#define D_NEED_USER_AND_PASSWORD "需要 user=<用戶名>&password=<密碼>" + +// xdrv_wemohue.ino +#define D_MULTICAST_DISABLED "組播已禁用" +#define D_MULTICAST_REJOINED "組播已(重新)加入" +#define D_MULTICAST_JOIN_FAILED "組播加入失敗" +#define D_FAILED_TO_SEND_RESPONSE "請求發送失敗" + +#define D_WEMO "WeMo" +#define D_WEMO_BASIC_EVENT "WeMo 基礎事件" +#define D_WEMO_EVENT_SERVICE "WeMo 事件服務" +#define D_WEMO_META_SERVICE "WeMo meta 服務" +#define D_WEMO_SETUP "WeMo 設置" +#define D_RESPONSE_SENT "發送請求" + +#define D_HUE "Hue" +#define D_HUE_BRIDGE_SETUP "Hue 設置" +#define D_HUE_API_NOT_IMPLEMENTED "Hue API 未實現" +#define D_HUE_API "Hue API" +#define D_HUE_POST_ARGS "Hue POST 參數" +#define D_3_RESPONSE_PACKETS_SENT "3 請求包發送" + +// xdrv_05_domoticz.ino +#define D_DOMOTICZ_PARAMETERS "Domoticz 設置" +#define D_DOMOTICZ_IDX "Idx" +#define D_DOMOTICZ_KEY_IDX "Key idx" +#define D_DOMOTICZ_SWITCH_IDX "開關 idx" +#define D_DOMOTICZ_SENSOR_IDX "傳感器 idx" + #define D_DOMOTICZ_TEMP "溫度" + #define D_DOMOTICZ_TEMP_HUM "溫度,濕度" + #define D_DOMOTICZ_TEMP_HUM_BARO "溫度,濕度,氣壓" + #define D_DOMOTICZ_POWER_ENERGY "功率,電量" + #define D_DOMOTICZ_ILLUMINANCE "照度" + #define D_DOMOTICZ_COUNT "數值" + #define D_DOMOTICZ_VOLTAGE "電壓" + #define D_DOMOTICZ_CURRENT "電流" + #define D_DOMOTICZ_AIRQUALITY "空氣品質" +#define D_DOMOTICZ_UPDATE_TIMER "更新計時器" + +// xdrv_03_energy.ino +#define D_ENERGY_TODAY "今日用電量" +#define D_ENERGY_YESTERDAY "昨日用電量" +#define D_ENERGY_TOTAL "總用電量" + +// xsns_05_ds18b20.ino +#define D_SENSOR_BUSY "傳感器正忙" +#define D_SENSOR_CRC_ERROR "傳感器 CRC 校驗錯誤" +#define D_SENSORS_FOUND "發現傳感器" + +// xsns_06_dht.ino +#define D_TIMEOUT_WAITING_FOR "等待超時" +#define D_START_SIGNAL_LOW "開始低電平" +#define D_START_SIGNAL_HIGH "開始高電平" +#define D_PULSE "pulse" +#define D_CHECKSUM_FAILURE "校驗失敗" + +// xsns_07_sht1x.ino +#define D_SENSOR_DID_NOT_ACK_COMMAND "傳感器沒有確認命令" +#define D_SHT1X_FOUND "發現 SHT1X 傳感器" + +// xsns_18_pms5003.ino +#define D_STANDARD_CONCENTRATION "CF-1 PM" // Standard Particle CF-1 Particle Matter +#define D_ENVIRONMENTAL_CONCENTRATION "PM" // Environmetal Particle Matter +#define D_PARTICALS_BEYOND "顆粒物直徑大於" + +// sonoff_template.h +#define D_SENSOR_NONE "None" +#define D_SENSOR_DHT11 "DHT11" +#define D_SENSOR_AM2301 "AM2301" +#define D_SENSOR_SI7021 "SI7021" +#define D_SENSOR_DS18X20 "DS18x20" +#define D_SENSOR_I2C_SCL "I2C SCL" +#define D_SENSOR_I2C_SDA "I2C SDA" +#define D_SENSOR_WS2812 "WS2812" +#define D_SENSOR_IRSEND "IRsend" +#define D_SENSOR_SWITCH "Switch" // Suffix "1" +#define D_SENSOR_BUTTON "Button" // Suffix "1" +#define D_SENSOR_RELAY "Relay" // Suffix "1i" +#define D_SENSOR_LED "Led" // Suffix "1i" +#define D_SENSOR_PWM "PWM" // Suffix "1" +#define D_SENSOR_COUNTER "Counter" // Suffix "1" +#define D_SENSOR_IRRECV "IRrecv" +#define D_SENSOR_MHZ_RX "MHZ Rx" +#define D_SENSOR_MHZ_TX "MHZ Tx" +#define D_SENSOR_PZEM_RX "PZEM Rx" +#define D_SENSOR_PZEM_TX "PZEM Tx" +#define D_SENSOR_SAIR_RX "SAir Rx" +#define D_SENSOR_SAIR_TX "SAir Tx" +#define D_SENSOR_SPI_CS "SPI CS" +#define D_SENSOR_SPI_DC "SPI DC" +#define D_SENSOR_BACKLIGHT "BkLight" +#define D_SENSOR_PMS5003 "PMS5003" +#define D_SENSOR_SDS0X1 "SDS0X1" + +// Units +#define D_UNIT_AMPERE "安" +#define D_UNIT_HOUR "時" +#define D_UNIT_KILOOHM "千歐" +#define D_UNIT_KILOWATTHOUR "千瓦時" +#define D_UNIT_LUX "勒克斯" +#define D_UNIT_MICROGRAM_PER_CUBIC_METER "微克/立方米" +#define D_UNIT_MICROMETER "微米" +#define D_UNIT_MICROSECOND "微秒" +#define D_UNIT_MILLIAMPERE "毫安" +#define D_UNIT_MILLISECOND "毫秒" +#define D_UNIT_MINUTE "分" +#define D_UNIT_PARTS_PER_DECILITER "每分升" +#define D_UNIT_PARTS_PER_MILLION "ppm" +#define D_UNIT_PRESSURE "百帕" +#define D_UNIT_SECOND "秒" +#define D_UNIT_SECTORS "扇區" +#define D_UNIT_VOLT "伏" +#define D_UNIT_WATT "瓦" +#define D_UNIT_WATTHOUR "瓦時" + +// Log message prefix +#define D_LOG_APPLICATION "APP: " // Application +#define D_LOG_BRIDGE "BRG: " // Bridge +#define D_LOG_CONFIG "CFG: " // Settings +#define D_LOG_COMMAND "CMD: " // Command +#define D_LOG_DEBUG "DBG: " // Debug +#define D_LOG_DHT "DHT: " // DHT sensor +#define D_LOG_DOMOTICZ "DOM: " // Domoticz +#define D_LOG_DSB "DSB: " // DS18xB20 sensor +#define D_LOG_HTTP "HTP: " // HTTP webserver +#define D_LOG_I2C "I2C: " // I2C +#define D_LOG_IRR "IRR: " // Infra Red Received +#define D_LOG_LOG "LOG: " // Logging +#define D_LOG_MODULE "MOD: " // Module +#define D_LOG_MDNS "DNS: " // mDNS +#define D_LOG_MQTT "MQT: " // MQTT +#define D_LOG_OTHER "OTH: " // Other +#define D_LOG_RESULT "RSL: " // Result +#define D_LOG_RFR "RFR: " // RF Received +#define D_LOG_SERIAL "SER: " // Serial +#define D_LOG_SHT1 "SHT: " // SHT1x sensor +#define D_LOG_UPLOAD "UPL: " // Upload +#define D_LOG_UPNP "UPP: " // UPnP +#define D_LOG_WIFI "WIF: " // Wifi + +#endif // _LANGUAGE_ZH_TW_H_ diff --git a/sonoff/user_config.h b/sonoff/user_config.h index f5f7acdc7..15cfb6fbf 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -29,6 +29,7 @@ \*********************************************************************************************/ // -- Localization -------------------------------- +//#define MY_LANGUAGE cz-CZ // Czech without fonetick in Czech //#define MY_LANGUAGE de-DE // German in Germany //#define MY_LANGUAGE en-GB // English in Great Britain. Enabled by Default //#define MY_LANGUAGE es-AR // Spanish in Argentina @@ -40,6 +41,7 @@ //#define MY_LANGUAGE pt-PT // Portuguese in Portugal //#define MY_LANGUAGE ru-RU // Russian in Russia //#define MY_LANGUAGE zh-CN // Chinese (Simplified) in China +//#define MY_LANGUAGE zh-TW // Chinese (Traditional) in Taiwan // -- Project ------------------------------------- #define PROJECT "sonoff" // PROJECT is used as the default topic delimiter and OTA file name From 76a74cc4278d6e0f74d68f139a904ed2c9d4b0aa Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 8 Mar 2018 17:53:02 +0100 Subject: [PATCH 006/136] v5.12.0d - Add Mqtt discovery suffix and precision 5.12.0d * Add always suffix with device number in Mqtt discovery topic (#1962) * Add single decimal precision to Nova Fitness SDS0x1 sensor values (#2093) --- sonoff/_releasenotes.ino | 2 ++ sonoff/xdrv_07_home_assistant.ino | 4 ++-- sonoff/xsns_20_novasds.ino | 14 ++++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 721498160..86ef2e694 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -2,11 +2,13 @@ * Add support for optional MQTT drivers to be selected in user_config.h (#1992) * Add Portuguese language file * Add compiler check for stable lwIP version v1.4 (#1940) + * Add always suffix with device number in Mqtt discovery topic (#1962) * Add diacritics to Polish language file (#2005) * Add Hungarian language file (#2024) * Add Czech language file * Add Chinese (Traditional) in Taiwan language file (#2108) * Add support for Nova Fitness SDS011 and possibly SDS021 particle concentration sensor (#2070) + * Add single decimal precision to Nova Fitness SDS0x1 sensor values (#2093) * Fix MQTT TLS fingerprint validation (#2033) * * 5.12.0c diff --git a/sonoff/xdrv_07_home_assistant.ino b/sonoff/xdrv_07_home_assistant.ino index d377fe535..84a218bd9 100644 --- a/sonoff/xdrv_07_home_assistant.ino +++ b/sonoff/xdrv_07_home_assistant.ino @@ -93,9 +93,9 @@ void HAssDiscovery() snprintf_P(sidx, sizeof(sidx), PSTR("_%d"), i); // Clear "other" topic first in case the device has been reconfigured - snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/%s/%s%s/config"), (is_light) ? "switch" : "light", mqtt_topic, (1 == devices_present) ? "" : sidx); + snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/%s/%s%s/config"), (is_light) ? "switch" : "light", mqtt_topic, sidx); MqttPublish(stopic, true); - snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/%s/%s%s/config"), (is_light) ? "light" : "switch", mqtt_topic, (1 == devices_present) ? "" : sidx); + snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/%s/%s%s/config"), (is_light) ? "light" : "switch", mqtt_topic, sidx); if (Settings.flag.hass_discovery) { char name[33]; diff --git a/sonoff/xsns_20_novasds.ino b/sonoff/xsns_20_novasds.ino index ed877fd2f..56d896c5e 100644 --- a/sonoff/xsns_20_novasds.ino +++ b/sonoff/xsns_20_novasds.ino @@ -92,18 +92,24 @@ void NovaSdsInit() #ifdef USE_WEBSERVER const char HTTP_SDS0X1_SNS[] PROGMEM = "%s" - "{s}SDS0X1 " D_ENVIRONMENTAL_CONCENTRATION " 2.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}" - "{s}SDS0X1 " D_ENVIRONMENTAL_CONCENTRATION " 10 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"; // {s} = , {m} = , {e} = + "{s}SDS0X1 " D_ENVIRONMENTAL_CONCENTRATION " 2.5 " D_UNIT_MICROMETER "{m}%s " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}" + "{s}SDS0X1 " D_ENVIRONMENTAL_CONCENTRATION " 10 " D_UNIT_MICROMETER "{m}%s " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"; // {s} = , {m} = , {e} = #endif // USE_WEBSERVER void NovaSdsShow(boolean json) { if (novasds_valid) { + char pm10[10]; + char pm2_5[10]; + float pm10f = (float)(novasds_data.pm100) / 10.0f; + float pm2_5f = (float)(novasds_data.pm25) / 10.0f; + dtostrfd(pm10f, 1, pm10); + dtostrfd(pm2_5f, 1, pm2_5); if (json) { - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"SDS0X1\":{\"PM2.5\":%d,\"PM10\":%d}"), mqtt_data, novasds_data.pm25, novasds_data.pm100); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"SDS0X1\":{\"PM2.5\":%s,\"PM10\":%s}"), mqtt_data, pm2_5, pm10); #ifdef USE_WEBSERVER } else { - snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SDS0X1_SNS, mqtt_data, novasds_data.pm25/10, novasds_data.pm100/10); + snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SDS0X1_SNS, mqtt_data, pm2_5, pm10); #endif // USE_WEBSERVER } } From 34fc03d6f89f6636a73aa26b979ecb251f5a17d2 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 9 Mar 2018 12:13:40 +0100 Subject: [PATCH 007/136] v5.12.0d - Add support for multiple SHT3X 5.12.0d * Add support for multiple SHT3X sensors (#1949, #2110) --- sonoff/_releasenotes.ino | 1 + sonoff/xsns_14_sht3x.ino | 67 +++++++++++++++++++++------------------- 2 files changed, 37 insertions(+), 31 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 86ef2e694..92e179b86 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -9,6 +9,7 @@ * Add Chinese (Traditional) in Taiwan language file (#2108) * Add support for Nova Fitness SDS011 and possibly SDS021 particle concentration sensor (#2070) * Add single decimal precision to Nova Fitness SDS0x1 sensor values (#2093) + * Add support for multiple SHT3X sensors (#1949, #2110) * Fix MQTT TLS fingerprint validation (#2033) * * 5.12.0c diff --git a/sonoff/xsns_14_sht3x.ino b/sonoff/xsns_14_sht3x.ino index 381e2d204..afedf31fc 100644 --- a/sonoff/xsns_14_sht3x.ino +++ b/sonoff/xsns_14_sht3x.ino @@ -20,7 +20,7 @@ #ifdef USE_I2C #ifdef USE_SHT3X /*********************************************************************************************\ - * SHT3X and SHTC3 - Temperature and Humidy + * SHT3X and SHTC3 - Temperature and Humidity * * I2C Address: 0x44, 0x45 or 0x70 (SHTC3) \*********************************************************************************************/ @@ -29,14 +29,18 @@ #define SHT3X_ADDR_VDD 0x45 // address pin high (VDD) #define SHTC3_ADDR 0x70 // address for shtc3 sensor +#define SHT3X_MAX_SENSORS 3 + const char kShtTypes[] PROGMEM = "SHT3X|SHT3X|SHTC3"; - -uint8_t sht3x_type = 0; -uint8_t sht3x_address; uint8_t sht3x_addresses[] = { SHT3X_ADDR_GND, SHT3X_ADDR_VDD, SHTC3_ADDR }; -char sht3x_types[6]; -bool Sht3xRead(float &t, float &h) +uint8_t sht3x_count = 0; +struct SHT3XSTRUCT { + uint8_t address; // I2C bus address + char types[6]; // Sensor type name and address - "SHT3X-0xXX" +} sht3x_sensors[SHT3X_MAX_SENSORS]; + +bool Sht3xRead(float &t, float &h, uint8_t sht3x_address) { unsigned int data[6]; @@ -49,7 +53,7 @@ bool Sht3xRead(float &t, float &h) Wire.write(0x17); // sleep Wire.endTransmission(); Wire.beginTransmission(sht3x_address); - Wire.write(0x78); // Dissable clock stretching ( I don't think that wire library support clock stretching ) + Wire.write(0x78); // Disable clock stretching ( I don't think that wire library support clock stretching ) Wire.write(0x66); // High resolution } else { Wire.write(0x2C); // Enable clock stretching @@ -72,46 +76,47 @@ bool Sht3xRead(float &t, float &h) void Sht3xDetect() { - if (sht3x_type) { - return; - } + if (sht3x_count) return; float t; float h; - sht3x_type = 1; - for (byte i = 0; i < sizeof(sht3x_addresses); i++) { - sht3x_address = sht3x_addresses[i]; - if (Sht3xRead(t, h)) { - GetTextIndexed(sht3x_types, sizeof(sht3x_types), i, kShtTypes); - snprintf_P(log_data, sizeof(log_data), S_LOG_I2C_FOUND_AT, sht3x_types, htu_address); + for (byte i = 0; i < SHT3X_MAX_SENSORS; i++) { + if (Sht3xRead(t, h, sht3x_addresses[i])) { + sht3x_sensors[sht3x_count].address = sht3x_addresses[i]; + GetTextIndexed(sht3x_sensors[sht3x_count].types, sizeof(sht3x_sensors[sht3x_count].types), i, kShtTypes); + snprintf_P(log_data, sizeof(log_data), S_LOG_I2C_FOUND_AT, sht3x_sensors[sht3x_count].types, sht3x_sensors[sht3x_count].address); AddLog(LOG_LEVEL_DEBUG); - return; + sht3x_count++; } } - sht3x_type = 0; } void Sht3xShow(boolean json) { - if (sht3x_type) { + if (sht3x_count) { float t; float h; - if (Sht3xRead(t, h)) { - char temperature[10]; - char humidity[10]; - dtostrfd(t, Settings.flag2.temperature_resolution, temperature); - dtostrfd(h, Settings.flag2.humidity_resolution, humidity); - - if (json) { - snprintf_P(mqtt_data, sizeof(mqtt_data), JSON_SNS_TEMPHUM, mqtt_data, sht3x_types, temperature, humidity); + char temperature[10]; + char humidity[10]; + char types[11]; + for (byte i = 0; i < sht3x_count; i++) { + if (Sht3xRead(t, h, sht3x_sensors[i].address)) { + dtostrfd(t, Settings.flag2.temperature_resolution, temperature); + dtostrfd(h, Settings.flag2.humidity_resolution, humidity); + snprintf_P(types, sizeof(types), PSTR("%s-0x%02X"), sht3x_sensors[i].types, sht3x_sensors[i].address); // "SHT3X-0xXX" + if (json) { + snprintf_P(mqtt_data, sizeof(mqtt_data), JSON_SNS_TEMPHUM, mqtt_data, types, temperature, humidity); #ifdef USE_DOMOTICZ - DomoticzTempHumSensor(temperature, humidity); + if (0 == i) { // We want the same first sensor to report to Domoticz in case a read is missed + DomoticzTempHumSensor(temperature, humidity); + } #endif // USE_DOMOTICZ #ifdef USE_WEBSERVER - } else { - snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_TEMP, mqtt_data, sht3x_types, temperature, TempUnit()); - snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_HUM, mqtt_data, sht3x_types, humidity); + } else { + snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_TEMP, mqtt_data, types, temperature, TempUnit()); + snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_HUM, mqtt_data, types, humidity); #endif // USE_WEBSERVER + } } } } From ba3fc63265985404bad8ee8da874630309112d96 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 9 Mar 2018 13:47:44 +0100 Subject: [PATCH 008/136] v5.12.0d - Add more Sonoff Sc Domoticz support 5.12.0d * Add Sonoff SC domoticz support for Sound level as Counter and Air quality (#2118) --- sonoff/_releasenotes.ino | 1 + sonoff/xsns_04_snfsc.ino | 2 ++ 2 files changed, 3 insertions(+) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 92e179b86..066180638 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -10,6 +10,7 @@ * Add support for Nova Fitness SDS011 and possibly SDS021 particle concentration sensor (#2070) * Add single decimal precision to Nova Fitness SDS0x1 sensor values (#2093) * Add support for multiple SHT3X sensors (#1949, #2110) + * Add Sonoff SC domoticz support for Sound level as Counter and Air quality (#2118) * Fix MQTT TLS fingerprint validation (#2033) * * 5.12.0c diff --git a/sonoff/xsns_04_snfsc.ino b/sonoff/xsns_04_snfsc.ino index 51e3e1b3a..944dff985 100644 --- a/sonoff/xsns_04_snfsc.ino +++ b/sonoff/xsns_04_snfsc.ino @@ -125,6 +125,8 @@ void SonoffScShow(boolean json) #ifdef USE_DOMOTICZ DomoticzTempHumSensor(temperature, humidity); DomoticzSensor(DZ_ILLUMINANCE, sc_value[2]); + DomoticzSensor(DZ_COUNT, sc_value[3]); + DomoticzSensor(DZ_AIRQUALITY, 500 + ((100 - sc_value[4]) * 20)); #endif // USE_DOMOTICZ #ifdef USE_WEBSERVER } else { From b51f060e0456e7c0d42d0a0e65380afb03323970 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 9 Mar 2018 18:08:17 +0100 Subject: [PATCH 009/136] v5.12.0e - Add second TLS fingerprint 5.12.0e * Add a second TLS fingerprint to allow switching keys in TLS mode (#2033, #2102) --- README.md | 2 +- sonoff/_releasenotes.ino | 5 ++++- sonoff/language/cz-CZ.h | 2 +- sonoff/language/de-DE.h | 2 +- sonoff/language/en-GB.h | 2 +- sonoff/language/es-AR.h | 2 +- sonoff/language/fr-FR.h | 2 +- sonoff/language/hu-HU.h | 2 +- sonoff/language/it-IT.h | 2 +- sonoff/language/nl-NL.h | 2 +- sonoff/language/pl-PL.h | 2 +- sonoff/language/pt-PT.h | 2 +- sonoff/language/ru-RU.h | 2 +- sonoff/settings.h | 7 ++++++- sonoff/settings.ino | 23 +++++++++++++++++++++-- sonoff/sonoff.ino | 2 +- sonoff/sonoff_post.h | 8 ++++++-- sonoff/user_config.h | 3 ++- sonoff/xdrv_00_mqtt.ino | 40 ++++++++++++++++++++++++++++++++-------- 19 files changed, 84 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 1559bd7b5..1c1b625dc 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## Sonoff-Tasmota Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE. -Current version is **5.12.0d** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.12.0e** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### ATTENTION All versions diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 066180638..721b8d376 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,7 @@ -/* 5.12.0d +/* 5.12.0e + * Add a second TLS fingerprint to allow switching keys in TLS mode (#2033, #2102) + * + * 5.12.0d * Add support for optional MQTT drivers to be selected in user_config.h (#1992) * Add Portuguese language file * Add compiler check for stable lwIP version v1.4 (#1940) diff --git a/sonoff/language/cz-CZ.h b/sonoff/language/cz-CZ.h index 6eeb3237b..a3cae2bbc 100644 --- a/sonoff/language/cz-CZ.h +++ b/sonoff/language/cz-CZ.h @@ -165,7 +165,7 @@ #define D_FINGERPRINT "Verifikuj otisk TLS..." #define D_TLS_CONNECT_FAILED_TO "Nepripojeno TLS do" #define D_RETRY_IN "Zopakuji za" -#define D_VERIFIED "Zverifikovano" +#define D_VERIFIED "Zverifikovano otisk" #define D_INSECURE "Nespravne pripojeni z duvodu chybneho otisku TLS" #define D_CONNECT_FAILED_TO "Spojeni se nepodarilo navazat" diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index f1eed0dac..d43055b67 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -165,7 +165,7 @@ #define D_FINGERPRINT "TLS-Fingerabdruck wird verifiziert..." #define D_TLS_CONNECT_FAILED_TO "TLS-Verbindung fehlgeschlagen an" #define D_RETRY_IN "Wiederversuch in" -#define D_VERIFIED "verifiziert" +#define D_VERIFIED "verifiziert mit Fingerabdruck" #define D_INSECURE "unsichere Verbindung aufgrund ungültigen Fingerabdrucks" #define D_CONNECT_FAILED_TO "Verbindung fehlgeschlagen aufgrund von" diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h index 987d0ccda..905ed5d9b 100644 --- a/sonoff/language/en-GB.h +++ b/sonoff/language/en-GB.h @@ -165,7 +165,7 @@ #define D_FINGERPRINT "Verify TLS fingerprint..." #define D_TLS_CONNECT_FAILED_TO "TLS Connect failed to" #define D_RETRY_IN "Retry in" -#define D_VERIFIED "Verified" +#define D_VERIFIED "Verified using Fingerprint" #define D_INSECURE "Insecure connection due to invalid Fingerprint" #define D_CONNECT_FAILED_TO "Connect failed to" diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index 8386dd605..c46bfa1d5 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -165,7 +165,7 @@ #define D_FINGERPRINT "Verificar TLS fingerprint..." #define D_TLS_CONNECT_FAILED_TO "Falló Conección TLS a" #define D_RETRY_IN "Reintentando" -#define D_VERIFIED "Verificado" +#define D_VERIFIED "Verificado Fingerprint" #define D_INSECURE "Conección insegura por Fingerprint no válido" #define D_CONNECT_FAILED_TO "Falló Conección a" diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h index 9364bc102..653887508 100644 --- a/sonoff/language/fr-FR.h +++ b/sonoff/language/fr-FR.h @@ -165,7 +165,7 @@ #define D_FINGERPRINT "Verification empreinte TLS ..." #define D_TLS_CONNECT_FAILED_TO "Echec de connexion TLS à" #define D_RETRY_IN "Nouvelle tentative dans" -#define D_VERIFIED "Verifié" +#define D_VERIFIED "Verifié empreinte " #define D_INSECURE "Connexion non sécurisée car empreinte non vérifée" #define D_CONNECT_FAILED_TO "Echec de connexion à" diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h index f1fb99c61..9ce316cf9 100644 --- a/sonoff/language/hu-HU.h +++ b/sonoff/language/hu-HU.h @@ -165,7 +165,7 @@ #define D_FINGERPRINT "TLS fingerprint hitelesítése..." #define D_TLS_CONNECT_FAILED_TO "TLS Csatlakozás sikertelen a" #define D_RETRY_IN "Újrapróbálás" -#define D_VERIFIED "Hitelesítve" +#define D_VERIFIED "Hitelesítve Fingerprint" #define D_INSECURE "Nem biztonságos kapcsolat érvénytelen Fingerprint miatt" #define D_CONNECT_FAILED_TO "Sikertelen csatlakozás a" diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index ea6ce9804..0e0f4594f 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -165,7 +165,7 @@ #define D_FINGERPRINT "Verifica TLS fingerprint..." #define D_TLS_CONNECT_FAILED_TO "Connessione TLS fallita a" #define D_RETRY_IN "Nuovo tentativo in" -#define D_VERIFIED "Verificato" +#define D_VERIFIED "Verificato Fingerprint" #define D_INSECURE "Connessione insicura a causa di Fingerprint non valido" #define D_CONNECT_FAILED_TO "Connessione Fallita a" diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h index c260553a0..0932a7326 100644 --- a/sonoff/language/nl-NL.h +++ b/sonoff/language/nl-NL.h @@ -165,7 +165,7 @@ #define D_FINGERPRINT "Controleer TLS vingerafdruk..." #define D_TLS_CONNECT_FAILED_TO "TLS Verbinding mislukt naar" #define D_RETRY_IN "Opnieuw proberen over" -#define D_VERIFIED "Gecontroleerd" +#define D_VERIFIED "Gecontroleerd met vingerafdruk" #define D_INSECURE "Door ongeldige vingerafdruk een onveilige verbinding" #define D_CONNECT_FAILED_TO "Verbinding mislukt naar" diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h index 334934a12..1b2bbb099 100644 --- a/sonoff/language/pl-PL.h +++ b/sonoff/language/pl-PL.h @@ -165,7 +165,7 @@ #define D_FINGERPRINT "Weryfikuj odcisk TLS..." #define D_TLS_CONNECT_FAILED_TO "Nieudane połączenie TLS do" #define D_RETRY_IN "Spróbuj ponownie" -#define D_VERIFIED "Zweryfikowano" +#define D_VERIFIED "Zweryfikowano odcisku" #define D_INSECURE "Nieprawidłowe połączenie z powodu błędnego odcisku TLS" #define D_CONNECT_FAILED_TO "Nie udało się nawiązać połączenia" diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h index 7fd9bac23..cc3b74a04 100644 --- a/sonoff/language/pt-PT.h +++ b/sonoff/language/pt-PT.h @@ -165,7 +165,7 @@ #define D_FINGERPRINT "Verifique a impressão digital TLS..." #define D_TLS_CONNECT_FAILED_TO "TLS não conseguiu ligar" #define D_RETRY_IN "Tentativa em" -#define D_VERIFIED "Verificado" +#define D_VERIFIED "Verificado impressão digital " #define D_INSECURE "Ligação insegura devido à impressão digital inválida" #define D_CONNECT_FAILED_TO "A ligação falhou ao" diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h index b0f5cd764..d5483b504 100644 --- a/sonoff/language/ru-RU.h +++ b/sonoff/language/ru-RU.h @@ -165,7 +165,7 @@ #define D_FINGERPRINT "Проверка TLS Fingerprint..." #define D_TLS_CONNECT_FAILED_TO "Сбой подключения TLS к" #define D_RETRY_IN "Повторить" -#define D_VERIFIED "Проверено" +#define D_VERIFIED "Проверено Fingerprint" #define D_INSECURE "Небезопасное соединение, недействительный Fingerprint" #define D_CONNECT_FAILED_TO "Ошибка подключения к" diff --git a/sonoff/settings.h b/sonoff/settings.h index dab308503..a3049dbca 100644 --- a/sonoff/settings.h +++ b/sonoff/settings.h @@ -116,7 +116,12 @@ struct SYSCFG { byte syslog_level; // 1AA uint8_t webserver; // 1AB byte weblog_level; // 1AC - char mqtt_fingerprint[60]; // 1AD To be freed by binary fingerprint + +// char mqtt_fingerprint[60]; // 1AD + uint8_t mqtt_fingerprint[2][20]; // 1AD + + byte free_1D5[20]; // 1D5 + char mqtt_host[33]; // 1E9 uint16_t mqtt_port; // 20A char mqtt_client[33]; // 20C diff --git a/sonoff/settings.ino b/sonoff/settings.ino index c702d16c2..b0d6c444e 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -472,7 +472,18 @@ void SettingsDefaultSet2() Settings.webserver = WEB_SERVER; Settings.weblog_level = WEB_LOG_LEVEL; - strlcpy(Settings.mqtt_fingerprint, MQTT_FINGERPRINT, sizeof(Settings.mqtt_fingerprint)); + char fingerprint[60]; + strlcpy(fingerprint, MQTT_FINGERPRINT1, sizeof(fingerprint)); + char *p = fingerprint; + for (byte i = 0; i < 20; i++) { + Settings.mqtt_fingerprint[0][i] = strtol(p, &p, 16); + } + strlcpy(fingerprint, MQTT_FINGERPRINT2, sizeof(fingerprint)); + p = fingerprint; + for (byte i = 0; i < 20; i++) { + Settings.mqtt_fingerprint[1][i] = strtol(p, &p, 16); + } + strlcpy(Settings.mqtt_host, MQTT_HOST, sizeof(Settings.mqtt_host)); Settings.mqtt_port = MQTT_PORT; strlcpy(Settings.mqtt_client, MQTT_CLIENT_ID, sizeof(Settings.mqtt_client)); @@ -875,7 +886,15 @@ void SettingsDelta() if (Settings.version < 0x050B0107) { Settings.flag.not_power_linked = 0; } - + if (Settings.version < 0x050C0005) { + char fingerprint[60]; + memcpy(fingerprint, Settings.mqtt_fingerprint, sizeof(fingerprint)); + char *p = fingerprint; + for (byte i = 0; i < 20; i++) { + Settings.mqtt_fingerprint[0][i] = strtol(p, &p, 16); + Settings.mqtt_fingerprint[1][i] = Settings.mqtt_fingerprint[0][i]; + } + } Settings.version = VERSION; SettingsSave(1); diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 099bedd9f..5f3ce3ea4 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050C0004 // 5.12.0d +#define VERSION 0x050C0005 // 5.12.0e // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h index 0a023ea6f..b6ab9e999 100644 --- a/sonoff/sonoff_post.h +++ b/sonoff/sonoff_post.h @@ -145,8 +145,12 @@ void WifiWpsStatusCallback(wps_cb_status status); #define SWITCH_MODE TOGGLE // TOGGLE, FOLLOW or FOLLOW_INV (the wall switch state) #endif -#ifndef MQTT_FINGERPRINT -#define MQTT_FINGERPRINT "A5 02 FF 13 99 9F 8B 39 8E F1 83 4F 11 23 65 0B 32 36 FC 07" +#ifndef MQTT_FINGERPRINT1 +#define MQTT_FINGERPRINT1 "A5 02 FF 13 99 9F 8B 39 8E F1 83 4F 11 23 65 0B 32 36 FC 07" +#endif + +#ifndef MQTT_FINGERPRINT2 +#define MQTT_FINGERPRINT2 "A5 02 FF 13 99 9F 8B 39 8E F1 83 4F 11 23 65 0B 32 36 FC 07" #endif #ifndef WS2812_LEDS diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 15cfb6fbf..a59d451fd 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -92,7 +92,8 @@ // Needs Fingerprint, TLS Port, UserId and Password #ifdef USE_MQTT_TLS #define MQTT_HOST "" // [MqttHost] - #define MQTT_FINGERPRINT "A5 02 FF 13 99 9F 8B 39 8E F1 83 4F 11 23 65 0B 32 36 FC 07" // [MqttFingerprint] + #define MQTT_FINGERPRINT1 "A5 02 FF 13 99 9F 8B 39 8E F1 83 4F 11 23 65 0B 32 36 FC 07" // [MqttFingerprint1] + #define MQTT_FINGERPRINT2 "A5 02 FF 13 99 9F 8B 39 8E F1 83 4F 11 23 65 0B 32 36 FC 07" // [MqttFingerprint2] #define MQTT_PORT 20123 // [MqttPort] MQTT TLS port #define MQTT_USER "cloudmqttuser" // [MqttUser] Mandatory user #define MQTT_PASS "cloudmqttpassword" // [MqttPassword] Mandatory password diff --git a/sonoff/xdrv_00_mqtt.ino b/sonoff/xdrv_00_mqtt.ino index b8e76ca7e..9f89eb259 100644 --- a/sonoff/xdrv_00_mqtt.ino +++ b/sonoff/xdrv_00_mqtt.ino @@ -376,19 +376,33 @@ void MqttConnected() #ifdef USE_MQTT_TLS boolean MqttCheckTls() { + char fingerprint1[60]; + char fingerprint2[60]; boolean result = false; + fingerprint1[0] = '\0'; + fingerprint2[0] = '\0'; + for (byte i = 0; i < sizeof(Settings.mqtt_fingerprint[0]); i++) { + snprintf_P(fingerprint1, sizeof(fingerprint1), PSTR("%s%s%02X"), fingerprint1, (i) ? " " : "", Settings.mqtt_fingerprint[0][i]); + snprintf_P(fingerprint2, sizeof(fingerprint2), PSTR("%s%s%02X"), fingerprint2, (i) ? " " : "", Settings.mqtt_fingerprint[1][i]); + } + AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_FINGERPRINT)); if (!EspClient.connect(Settings.mqtt_host, Settings.mqtt_port)) { snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MQTT D_TLS_CONNECT_FAILED_TO " %s:%d. " D_RETRY_IN " %d " D_UNIT_SECOND), Settings.mqtt_host, Settings.mqtt_port, mqtt_retry_counter); AddLog(LOG_LEVEL_DEBUG); - } else if (!EspClient.verify(Settings.mqtt_fingerprint, Settings.mqtt_host)) { - AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_INSECURE)); } else { - AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_VERIFIED)); - result = true; + if (EspClient.verify(fingerprint1, Settings.mqtt_host)) { + AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_VERIFIED "1")); + result = true; + } + else if (EspClient.verify(fingerprint2, Settings.mqtt_host)) { + AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_VERIFIED "2")); + result = true; + } } + if (!result) AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_FAILED)); EspClient.stop(); yield(); return result; @@ -534,12 +548,22 @@ bool MqttCommand() snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_SVALUE, command, index, GetStateText(index -1)); } #ifdef USE_MQTT_TLS - else if (CMND_MQTTFINGERPRINT == command_code) { - if ((data_len > 0) && (data_len < sizeof(Settings.mqtt_fingerprint))) { - strlcpy(Settings.mqtt_fingerprint, (!strcmp(dataBuf,"0")) ? "" : (1 == payload) ? MQTT_FINGERPRINT : dataBuf, sizeof(Settings.mqtt_fingerprint)); + else if ((CMND_MQTTFINGERPRINT == command_code) && (index > 0) && (index <= 2)) { + char fingerprint[60]; + if ((data_len > 0) && (data_len < sizeof(fingerprint))) { + strlcpy(fingerprint, (!strcmp(dataBuf,"0")) ? "" : (1 == payload) ? (1 == index) ? MQTT_FINGERPRINT1 : MQTT_FINGERPRINT2 : dataBuf, sizeof(fingerprint)); + char *p = fingerprint; + for (byte i = 0; i < 20; i++) { + Settings.mqtt_fingerprint[index -1][i] = strtol(p, &p, 16); + } restart_flag = 2; } - snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, Settings.mqtt_fingerprint); + + fingerprint[0] = '\0'; + for (byte i = 0; i < sizeof(Settings.mqtt_fingerprint[index -1]); i++) { + snprintf_P(fingerprint, sizeof(fingerprint), PSTR("%s%s%02X"), fingerprint, (i) ? " " : "", Settings.mqtt_fingerprint[index -1][i]); + } + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_SVALUE, command, index, fingerprint); } #endif else if ((CMND_MQTTCLIENT == command_code) && !grpflg) { From a72aa2c9c5f4340a9e144d20695e2d4c3c8d3309 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 10 Mar 2018 12:14:11 +0100 Subject: [PATCH 010/136] v5.12.0e - update language Cz --- sonoff/language/cz-CZ.h | 356 ++++++++++++++++++++-------------------- 1 file changed, 178 insertions(+), 178 deletions(-) diff --git a/sonoff/language/cz-CZ.h b/sonoff/language/cz-CZ.h index a3cae2bbc..f017e9de5 100644 --- a/sonoff/language/cz-CZ.h +++ b/sonoff/language/cz-CZ.h @@ -1,5 +1,5 @@ /* - cz-CZ.h - localization for Czech without fonetick - Czech for Sonoff-Tasmota + cz-CZ.h - localization for Czech with fonetick - Czech for Sonoff-Tasmota Copyright (C) 2018 Theo Arends (translated by vs) @@ -39,8 +39,8 @@ #define D_HOUR_MINUTE_SEPARATOR ":" #define D_MINUTE_SECOND_SEPARATOR ":" -#define D_DAY3LIST "PonUteStrCtvPatSobNed" -#define D_MONTH3LIST "LedUnoBreDubKveCerCevSrpZarRijLisPro" +#define D_DAY3LIST "PonÚteStřČtvPátSobNed" +#define D_MONTH3LIST "LedÚnoBřeDubKvěČerČevSrpZářŘíjLisPro" // Non JSON decimal separator #define D_DECIMAL_SEPARATOR "," @@ -51,182 +51,182 @@ #define D_AP "AP" // Access Point #define D_AS "jako" #define D_AUTO "AUTO" -#define D_BLINK "Blikani" -#define D_BLINKOFF "BlikaniVyp" -#define D_BOOT_COUNT "Pocitadlo spusteni" -#define D_BRIGHTLIGHT "Svetly" -#define D_BUTTON "Tlacitko" +#define D_BLINK "Blikání" +#define D_BLINKOFF "BlikáníVyp" +#define D_BOOT_COUNT "Počítadlo spuštění" +#define D_BRIGHTLIGHT "Světlý" +#define D_BUTTON "Tlačítko" #define D_BY "by" // Written by me #define D_BYTES "Bytu" #define D_CELSIUS "Celsia" -#define D_CO2 "Kyslicniku uhliciteho" -#define D_CODE "kod" // Button code -#define D_COLDLIGHT "Studeny" -#define D_COMMAND "Prikaz" -#define D_CONNECTED "Pripojeny" -#define D_COUNT "Pocitej" -#define D_COUNTER "Pocitadlo" -#define D_CURRENT "Aktualni" // As in Voltage and Current +#define D_CO2 "Kysličníku uhličitého" +#define D_CODE "kód" // Button code +#define D_COLDLIGHT "Studený" +#define D_COMMAND "Příkaz" +#define D_CONNECTED "...připojeno" +#define D_COUNT "Počítej" +#define D_COUNTER "Počítadlo" +#define D_CURRENT "Proud" // As in Voltage and Current #define D_DATA "Data" -#define D_DARKLIGHT "Tmavy" +#define D_DARKLIGHT "Tmavý" #define D_DEBUG "Debug" -#define D_DISABLED "Zablokovany" +#define D_DISABLED "Zablokováno" #define D_DNS_SERVER "Server DNS" #define D_DONE "Provedeno" #define D_DST_TIME "DST" #define D_EMULATION "Emulace" -#define D_ENABLED "Otevrene" -#define D_ERASE "Vymaz" +#define D_ENABLED "Otevřený" +#define D_ERASE "Smaž" #define D_ERROR "Chyba" #define D_FAHRENHEIT "Fahrenheita" -#define D_FAILED "Chybny" -#define D_FALLBACK "Nahradni" -#define D_FALLBACK_TOPIC "Nahradni topic" +#define D_FAILED "chyba" +#define D_FALLBACK "Záložní" +#define D_FALLBACK_TOPIC "Záložní topic" #define D_FALSE "Nepravda" #define D_FILE "Soubor" -#define D_FREE_MEMORY "Volna pamet" +#define D_FREE_MEMORY "Volná paměť" #define D_GAS "Gas" -#define D_GATEWAY "Brana" +#define D_GATEWAY "Výchozí brána" #define D_GROUP "Skupina" #define D_HOST "Server" -#define D_HOSTNAME "Nazev serveru" +#define D_HOSTNAME "Název serveru" #define D_HUMIDITY "Vlhkost" -#define D_ILLUMINANCE "Osvetleni" -#define D_IMMEDIATE "Okamzite" // Button immediate +#define D_ILLUMINANCE "Osvětlení" +#define D_IMMEDIATE "Mžikové" // Button immediate #define D_INDEX "Index" #define D_INFO "Informace" -#define D_INITIALIZED "Inicializovany" +#define D_INITIALIZED "Inicializovaný" #define D_IP_ADDRESS "Adresa IP" -#define D_LIGHT "Svetlo" +#define D_LIGHT "Světlo" #define D_LWT "LWT" #define D_MODULE "Modul" #define D_MQTT "MQTT" -#define D_MULTI_PRESS "nekolikere-stisknuti" +#define D_MULTI_PRESS "několikeré-stisknutí" #define D_NOISE "Hluk" -#define D_NONE "Neni" -#define D_OFF "Vypnuty" -#define D_OFFLINE "Neaktivni" -#define D_OK "Ok" -#define D_ON "Sepnuty" -#define D_ONLINE "Aktivni" +#define D_NONE "Není" +#define D_OFF "Vypnutý" +#define D_OFFLINE "Neaktivní" +#define D_OK "OK" +#define D_ON "Sepnutý" +#define D_ONLINE "Aktivní" #define D_PASSWORD "Heslo" #define D_PORT "Port" -#define D_POWER_FACTOR "Soucinitel prikonu" -#define D_POWERUSAGE "Prikon" +#define D_POWER_FACTOR "Součinitel příkonu" +#define D_POWERUSAGE "Příkon" #define D_PRESSURE "Tlak" -#define D_PRESSUREATSEALEVEL "Tlak na urovni hladiny more" -#define D_PROGRAM_FLASH_SIZE "Velikost programu flash" +#define D_PRESSUREATSEALEVEL "Tlak na úrovni hladiny moře" +#define D_PROGRAM_FLASH_SIZE "Velikost flash programu" #define D_PROGRAM_SIZE "Velikost programu" #define D_PROJECT "Projekt" -#define D_RECEIVED "Obdrzeny" +#define D_RECEIVED "Obdržený" #define D_RESTART "Restart" -#define D_RESTARTING "Restartovani" -#define D_RESTART_REASON "Pricina restartu" -#define D_RESTORE "Nacteni" -#define D_RETAINED "Ulozene" -#define D_SAVE "Uloz" +#define D_RESTARTING "Restartování" +#define D_RESTART_REASON "Příčina restartu" +#define D_RESTORE "Načtený" +#define D_RETAINED "Uloženo" +#define D_SAVE "Ulož" #define D_SENSOR "Sensor" #define D_SSID "SSID" #define D_START "Start" #define D_STD_TIME "STD" #define D_STOP "Stop" -#define D_SUBNET_MASK "Maska podsite" -#define D_SUBSCRIBE_TO "Prihlas se do" -#define D_SUCCESSFUL "uspesne." +#define D_SUBNET_MASK "Maska podsítě" +#define D_SUBSCRIBE_TO "Přihlaš se do" +#define D_SUCCESSFUL "úspěšné." #define D_TEMPERATURE "Teplota" #define D_TO "do" -#define D_TOGGLE "Prepni" +#define D_TOGGLE "Přepni" #define D_TOPIC "Topic" -#define D_TRANSMIT "Odesli" +#define D_TRANSMIT "Odešli" #define D_TRUE "Pravda" #define D_UPGRADE "aktualizace" -#define D_UPLOAD "Nahrani..." +#define D_UPLOAD "Nahrání..." #define D_UPTIME "Uptime" -#define D_USER "Uzivatel" +#define D_USER "Uživatel" #define D_UTC_TIME "UTC" -#define D_UV_LEVEL "Uroven UV" +#define D_UV_LEVEL "úroveň UV" #define D_VERSION "Verze" -#define D_VOLTAGE "Napeti" -#define D_WARMLIGHT "Ohrev" +#define D_VOLTAGE "Napětí" +#define D_WARMLIGHT "Ohřev" #define D_WEB_SERVER "Web Server" // sonoff.ino -#define D_WARNING_MINIMAL_VERSION "WARNING This version does not support persistent settings" -#define D_LEVEL_10 "uroven 1-0" -#define D_LEVEL_01 "uroven 0-1" -#define D_SERIAL_LOGGING_DISABLED "Vypnute logovani na seriovem portu" -#define D_SYSLOG_LOGGING_REENABLED "Obnoven zapis do Syslog" +#define D_WARNING_MINIMAL_VERSION "WARNING Tato verze nepodporuje trvalé nastavení" +#define D_LEVEL_10 "úroveň 1-0" +#define D_LEVEL_01 "úroveň 0-1" +#define D_SERIAL_LOGGING_DISABLED "Logování na sériovém portu ukončeno" +#define D_SYSLOG_LOGGING_REENABLED "Obnoven zápis do Syslog" -#define D_SET_BAUDRATE_TO "Nastaveni rychlosti prenosu na" -#define D_RECEIVED_TOPIC "Obdrzeny topic" +#define D_SET_BAUDRATE_TO "Nastavení rychlosti přenosu na" +#define D_RECEIVED_TOPIC "Obdržený topic" #define D_DATA_SIZE "Velikost dat" -#define D_ANALOG_INPUT "Analogovy vstup" +#define D_ANALOG_INPUT "Analogový vstup" #define D_FINGERPRINT "Verifikuj otisk TLS..." -#define D_TLS_CONNECT_FAILED_TO "Nepripojeno TLS do" +#define D_TLS_CONNECT_FAILED_TO "Nepřipojeno TLS do" #define D_RETRY_IN "Zopakuji za" -#define D_VERIFIED "Zverifikovano otisk" -#define D_INSECURE "Nespravne pripojeni z duvodu chybneho otisku TLS" -#define D_CONNECT_FAILED_TO "Spojeni se nepodarilo navazat" +#define D_VERIFIED "Ověřeno otisk " +#define D_INSECURE "Nesprávné připojení z důvodu chybného otisku TLS" +#define D_CONNECT_FAILED_TO "Spojení se nepodařilo navázat" // support.ino #define D_OSWATCH "osWatch" -#define D_BLOCKED_LOOP "Zablokovani smycky" +#define D_BLOCKED_LOOP "Zablokování smyčky" #define D_WPS_FAILED_WITH_STATUS "Chyba WPSconfig se statusem" -#define D_ACTIVE_FOR_3_MINUTES "aktivni 3 minuty" -#define D_FAILED_TO_START "nezdarilo se spustit" +#define D_ACTIVE_FOR_3_MINUTES "aktivní 3 minuty" +#define D_FAILED_TO_START "nepodařilo se spustit" #define D_PATCH_ISSUE_2186 "Chyba 2186" -#define D_CONNECTING_TO_AP "Pripojovani k AP" -#define D_IN_MODE "v modu" -#define D_CONNECT_FAILED_NO_IP_ADDRESS "Chyba pripojeni, nebyla obdrzena IP adresa" -#define D_CONNECT_FAILED_AP_NOT_REACHED "Chyba pripojeni, nedostupny AP" -#define D_CONNECT_FAILED_WRONG_PASSWORD "Chyba pripojeni, nespravne heslo pro AP" -#define D_CONNECT_FAILED_AP_TIMEOUT "Chyba pripojeni, uplynul AP timeout" -#define D_ATTEMPTING_CONNECTION "Zkouska pripojeni..." -#define D_CHECKING_CONNECTION "Zkouska spojeni..." -#define D_QUERY_DONE "Vyslan dotaz. Nalezena sluzba MQTT" -#define D_MQTT_SERVICE_FOUND "Sluzba MQTT byla nalezena" +#define D_CONNECTING_TO_AP "Připojování k AP" +#define D_IN_MODE "v módu" +#define D_CONNECT_FAILED_NO_IP_ADDRESS "Chyba připojení, nebyla obdržena IP adresa" +#define D_CONNECT_FAILED_AP_NOT_REACHED "Chyba připojení, nedostupný AP" +#define D_CONNECT_FAILED_WRONG_PASSWORD "Chyba připojení, nesprávné heslo pro AP" +#define D_CONNECT_FAILED_AP_TIMEOUT "Chyba připojení, uplynul AP timeout" +#define D_ATTEMPTING_CONNECTION "Připojování..." +#define D_CHECKING_CONNECTION "Zkouška spojení..." +#define D_QUERY_DONE "Vyslání dotazu. Nalezena služba MQTT" +#define D_MQTT_SERVICE_FOUND "Služba MQTT byla nalezena" #define D_FOUND_AT "znalezeno v" #define D_SYSLOG_HOST_NOT_FOUND "Syslog Host nebyl nalezen" // settings.ino -#define D_SAVED_TO_FLASH_AT "Ulozeno do pameti flash v" -#define D_LOADED_FROM_FLASH_AT "Stazeno z pameti flash z" -#define D_USE_DEFAULTS "Pouzij defaultni hodnoty" -#define D_ERASED_SECTOR "Smazany sektor" +#define D_SAVED_TO_FLASH_AT "Uloženo do paměti flash v" +#define D_LOADED_FROM_FLASH_AT "Staženo z paměti flash z" +#define D_USE_DEFAULTS "Použij defaultní hodnoty" +#define D_ERASED_SECTOR "Smazaný sektor" // webserver.ino -#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Oprogramowanie MINIMAL - prosze uaktualnic" -#define D_WEBSERVER_ACTIVE_ON "Aktivni Web server" -#define D_WITH_IP_ADDRESS "na adrese IP" +#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware MINIMÁLNÍ - prosím zaktualizujte" +#define D_WEBSERVER_ACTIVE_ON "Aktivní Web server" +#define D_WITH_IP_ADDRESS "na IP adrese" #define D_WEBSERVER_STOPPED "Web server zastaven" #define D_FILE_NOT_FOUND "Soubor nebyl nalezen" -#define D_REDIRECTED "Presmerovani na vlastni portal" -#define D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION "Wi-Fi manager nastavi AP a zachova STA" -#define D_WIFIMANAGER_SET_ACCESSPOINT "Wi-Fi manager nastavi Access Point" -#define D_TRYING_TO_CONNECT "Zkousim pripojit zarizeni k siti" +#define D_REDIRECTED "Přesměrování na vlastní portál" +#define D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION "Wi-Fi manager nastaví AP a zachová STA" +#define D_WIFIMANAGER_SET_ACCESSPOINT "Wi-Fi manager nastaví Access Point" +#define D_TRYING_TO_CONNECT "Zkouším připojit zařízení k síti" #define D_RESTART_IN "Restart" #define D_SECONDS "sekund" -#define D_DEVICE_WILL_RESTART "Zarizeni bude restartovano behem nekolika sekund" -#define D_BUTTON_TOGGLE "Prepinac" -#define D_CONFIGURATION "Nastaveni" +#define D_DEVICE_WILL_RESTART "Zařízení bude zrestartováno během několika sekund" +#define D_BUTTON_TOGGLE "Přepínač" +#define D_CONFIGURATION "Nastavení" #define D_INFORMATION "Informace" #define D_FIRMWARE_UPGRADE "Aktualizace firmware" #define D_CONSOLE "Konzole" -#define D_CONFIRM_RESTART "Potvrzeni restartu" +#define D_CONFIRM_RESTART "Potvrzení restartu" -#define D_CONFIGURE_MODULE "Nastaveni modulu" -#define D_CONFIGURE_WIFI "Nastaveni WiFi" -#define D_CONFIGURE_MQTT "Nastaveni MQTT" -#define D_CONFIGURE_DOMOTICZ "Nastaveni Domoticz" -#define D_CONFIGURE_LOGGING "Nastaveni logovani" -#define D_CONFIGURE_OTHER "Jina nastaveni" -#define D_CONFIRM_RESET_CONFIGURATION "Potvrzeni resetu nastaveni" -#define D_RESET_CONFIGURATION "Reset nastaveni" -#define D_BACKUP_CONFIGURATION "Zaloha nastaveni" -#define D_RESTORE_CONFIGURATION "Obnoveni nastaveni" -#define D_MAIN_MENU "Hlavni menu" +#define D_CONFIGURE_MODULE "Nastavení modulu" +#define D_CONFIGURE_WIFI "Nastavení WiFi" +#define D_CONFIGURE_MQTT "Nastavení MQTT" +#define D_CONFIGURE_DOMOTICZ "Nastavení Domoticz" +#define D_CONFIGURE_LOGGING "Nastavení logování" +#define D_CONFIGURE_OTHER "Jiná nastavení" +#define D_CONFIRM_RESET_CONFIGURATION "Potvrzení resetu nastavení" +#define D_RESET_CONFIGURATION "Reset nastavení" +#define D_BACKUP_CONFIGURATION "Záloha nastavení" +#define D_RESTORE_CONFIGURATION "Obnovení nastavení" +#define D_MAIN_MENU "Hlavní menu" #define D_MODULE_PARAMETERS "Parametry modulu" #define D_MODULE_TYPE "Typ modulu" @@ -235,12 +235,12 @@ #define D_SERIAL_OUT "Serial Out" #define D_WIFI_PARAMETERS "Parametry WiFi" -#define D_SCAN_FOR_WIFI_NETWORKS "Scan siti WiFi" -#define D_SCAN_DONE "Scan dokoncen" -#define D_NO_NETWORKS_FOUND "Sit nebyla nalezena" +#define D_SCAN_FOR_WIFI_NETWORKS "Scan sítí WiFi" +#define D_SCAN_DONE "Scan dokončen" +#define D_NO_NETWORKS_FOUND "Síť nebyla nalezena" #define D_REFRESH_TO_SCAN_AGAIN "Zopakovat scan" #define D_DUPLICATE_ACCESSPOINT "Kopie AP" -#define D_SKIPPING_LOW_QUALITY "Preskoceni z duvodu kvality signalu" +#define D_SKIPPING_LOW_QUALITY "Přeskočení z důvodu kvality signálu" #define D_RSSI "RSSI" #define D_WEP "WEP" #define D_WPA_PSK "WPA PSK" @@ -252,90 +252,90 @@ #define D_MQTT_PARAMETERS "Parametry MQTT" #define D_CLIENT "Klient" -#define D_FULL_TOPIC "Cely topic" +#define D_FULL_TOPIC "Celý topic" -#define D_LOGGING_PARAMETERS "Volby logovani" -#define D_SERIAL_LOG_LEVEL "Serial uroven logu" -#define D_WEB_LOG_LEVEL "Webova uroven logu" -#define D_SYS_LOG_LEVEL "Systemova uroven logu" -#define D_MORE_DEBUG "Vice debug informaci" +#define D_LOGGING_PARAMETERS "Volby logování" +#define D_SERIAL_LOG_LEVEL "Seriová úroveň logu" +#define D_WEB_LOG_LEVEL "Webová úroveň logu" +#define D_SYS_LOG_LEVEL "Systemová úroveň logu" +#define D_MORE_DEBUG "Více debug informací" #define D_SYSLOG_HOST "Syslog host" #define D_SYSLOG_PORT "Syslog port" #define D_TELEMETRY_PERIOD "Interval telemetrie" -#define D_OTHER_PARAMETERS "Jine parametry" -#define D_WEB_ADMIN_PASSWORD "Heslo Web administratora" -#define D_MQTT_ENABLE "MQTT aktivni" +#define D_OTHER_PARAMETERS "Jiné parametry" +#define D_WEB_ADMIN_PASSWORD "Heslo Web administrátora" +#define D_MQTT_ENABLE "MQTT aktivní" #define D_FRIENDLY_NAME "Friendly Name" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" #define D_SINGLE_DEVICE "single device" #define D_MULTI_DEVICE "multi device" -#define D_SAVE_CONFIGURATION "Uloz nastaveni" -#define D_CONFIGURATION_SAVED "Nastaveni ulozena" -#define D_CONFIGURATION_RESET "Nastaveni resetovano" +#define D_SAVE_CONFIGURATION "Ulož nastavení" +#define D_CONFIGURATION_SAVED "Nastavení uloženo" +#define D_CONFIGURATION_RESET "Nastavení resetováno" #define D_PROGRAM_VERSION "Verze programu" -#define D_BUILD_DATE_AND_TIME "Datum a cas kompilace" +#define D_BUILD_DATE_AND_TIME "Datum a čas kompilace" #define D_CORE_AND_SDK_VERSION "Verze Core/SDK" -#define D_FLASH_WRITE_COUNT "Pocet zapisu do pameti" -#define D_MAC_ADDRESS "Adres Mac" +#define D_FLASH_WRITE_COUNT "Počet zápisů do paměti" +#define D_MAC_ADDRESS "Adresa MAC" #define D_MQTT_HOST "Host MQTT" #define D_MQTT_PORT "Port MQTT" #define D_MQTT_CLIENT "Klient MQTT" -#define D_MQTT_USER "Uzivatel MQTT" +#define D_MQTT_USER "Uživatel MQTT" #define D_MQTT_TOPIC "Topic MQTT" #define D_MQTT_GROUP_TOPIC "Topic skupiny MQTT" -#define D_MQTT_FULL_TOPIC "Cely topic MQTT" -#define D_MDNS_DISCOVERY "Ziskavani mDNS" -#define D_MDNS_ADVERTISE "Rozesilani mDNS" -#define D_ESP_CHIP_ID "ID systemu ESP" -#define D_FLASH_CHIP_ID "ID systemu pameti flash" +#define D_MQTT_FULL_TOPIC "Celý topic MQTT" +#define D_MDNS_DISCOVERY "Získávání mDNS" +#define D_MDNS_ADVERTISE "Rozesílání mDNS" +#define D_ESP_CHIP_ID "ID systému ESP" +#define D_FLASH_CHIP_ID "ID systému paměti flash" #define D_FLASH_CHIP_SIZE "Velikost flash" -#define D_FREE_PROGRAM_SPACE "Volne misto programu" +#define D_FREE_PROGRAM_SPACE "Volné místo pro program" #define D_UPGRADE_BY_WEBSERVER "Aktualizace z Web serveru" #define D_OTA_URL "URL OTA" #define D_START_UPGRADE "Start aktualizace" -#define D_UPGRADE_BY_FILE_UPLOAD "Aktualizace nahranim souboru" -#define D_UPLOAD_STARTED "Nahravani zahajeno" -#define D_UPGRADE_STARTED "Zahajeni aktualizace" -#define D_UPLOAD_DONE "Nahravani ukonceno" -#define D_UPLOAD_ERR_1 "Soubor nebyl vybran" -#define D_UPLOAD_ERR_2 "Malo mista" -#define D_UPLOAD_ERR_3 "Magicky byte ma jinou hodnotu nez 0xE9" -#define D_UPLOAD_ERR_4 "Velikost programu je vetsi nez skutecna velikost pameti flash" -#define D_UPLOAD_ERR_5 "Chyba nahravani, nesouhlasi porovnavane bity" -#define D_UPLOAD_ERR_6 "Chyba nahravani. Spusten zapis do logu na urovni 3" -#define D_UPLOAD_ERR_7 "Nahravani preruseno" -#define D_UPLOAD_ERR_8 "Spatny soubor" -#define D_UPLOAD_ERR_9 "Soubor je prilis velky" -#define D_UPLOAD_ERROR_CODE "Chyba nahravani" +#define D_UPGRADE_BY_FILE_UPLOAD "Aktualizace nahráním souboru" +#define D_UPLOAD_STARTED "Nahrávání zahájeno" +#define D_UPGRADE_STARTED "Zahájení aktualizace" +#define D_UPLOAD_DONE "Nahrávání ukončeno" +#define D_UPLOAD_ERR_1 "Soubor nebyl vybrán" +#define D_UPLOAD_ERR_2 "Málo místa" +#define D_UPLOAD_ERR_3 "Magický byte má hodnotu jinou než 0xE9" +#define D_UPLOAD_ERR_4 "Velikost programu je větší než skutečná velikost paměti flash" +#define D_UPLOAD_ERR_5 "Chyba nahrávání, nesouhlasí porovnávané bity" +#define D_UPLOAD_ERR_6 "Chyba nahrávání. Spuštěn zápis do logu na úrovni 3" +#define D_UPLOAD_ERR_7 "Nahrávání přerušeno" +#define D_UPLOAD_ERR_8 "Špatný soubor" +#define D_UPLOAD_ERR_9 "Soubor je příliš velký" +#define D_UPLOAD_ERROR_CODE "Chyba nahrávání" -#define D_ENTER_COMMAND "Vloz prikaz" -#define D_ENABLE_WEBLOG_FOR_RESPONSE "Zapni uroven 2 zapisu Weblog, pokud je ocekavana odpoved" -#define D_NEED_USER_AND_PASSWORD "Vyzadovany uzivatel=&heslo=" +#define D_ENTER_COMMAND "Vlož příkaz" +#define D_ENABLE_WEBLOG_FOR_RESPONSE "Zapni úroveň 2 zápisu Weblog, pokud je očekávána odpověď" +#define D_NEED_USER_AND_PASSWORD "Vyžadován uživatel=&heslo=" // xdrv_wemohue.ino -#define D_MULTICAST_DISABLED "Multicast je vypnuty" -#define D_MULTICAST_REJOINED "Multicast opet pripojeny" -#define D_MULTICAST_JOIN_FAILED "Multicast neuspesny" -#define D_FAILED_TO_SEND_RESPONSE "Nepodarilo se odeslat odpoved" +#define D_MULTICAST_DISABLED "Multicast je vypnutý" +#define D_MULTICAST_REJOINED "Multicast opět připojený" +#define D_MULTICAST_JOIN_FAILED "Multicast neúspěšný" +#define D_FAILED_TO_SEND_RESPONSE "Nepodařilo se odeslat odpověď" #define D_WEMO "WeMo" -#define D_WEMO_BASIC_EVENT "WeMo zakladni udalost" -#define D_WEMO_EVENT_SERVICE "WeMo servisni udalost" -#define D_WEMO_META_SERVICE "WeMo meta udalost" +#define D_WEMO_BASIC_EVENT "WeMo základní událost" +#define D_WEMO_EVENT_SERVICE "WeMo servisní událost" +#define D_WEMO_META_SERVICE "WeMo meta událost" #define D_WEMO_SETUP "WeMo setup" -#define D_RESPONSE_SENT "Odpoved odeslana" +#define D_RESPONSE_SENT "Odpověď odeslána" #define D_HUE "Hue" #define D_HUE_BRIDGE_SETUP "Hue setup" -#define D_HUE_API_NOT_IMPLEMENTED "Hue API neni implementovano" +#define D_HUE_API_NOT_IMPLEMENTED "Hue API není implementováno" #define D_HUE_API "Hue API" #define D_HUE_POST_ARGS "Hue POST args" -#define D_3_RESPONSE_PACKETS_SENT "3 pakety odpovedi odeslany" +#define D_3_RESPONSE_PACKETS_SENT "3 pakety odpovědi odeslány" // xdrv_05_domoticz.ino #define D_DOMOTICZ_PARAMETERS "Parametry Domoticz" @@ -346,18 +346,18 @@ #define D_DOMOTICZ_TEMP "Temp" #define D_DOMOTICZ_TEMP_HUM "Temp,Vlhk" #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Vlhk,Tlak" - #define D_DOMOTICZ_POWER_ENERGY "Prikon,Energie" - #define D_DOMOTICZ_ILLUMINANCE "Osvetleni" - #define D_DOMOTICZ_COUNT "Pocitadlo" - #define D_DOMOTICZ_VOLTAGE "Napeti" + #define D_DOMOTICZ_POWER_ENERGY "Příkon,Energie" + #define D_DOMOTICZ_ILLUMINANCE "Osvětlení" + #define D_DOMOTICZ_COUNT "Počítadlo" + #define D_DOMOTICZ_VOLTAGE "Napětí" #define D_DOMOTICZ_CURRENT "Proud" #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Aktualizace stopek" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energie Dnes" -#define D_ENERGY_YESTERDAY "Energie Vcera" -#define D_ENERGY_TOTAL "Energie Soucet" +#define D_ENERGY_YESTERDAY "Energie Včera" +#define D_ENERGY_TOTAL "Energie Součet" // xsns_05_ds18b20.ino #define D_SENSOR_BUSY "Sensor DS18x20 obsazen" @@ -365,14 +365,14 @@ #define D_SENSORS_FOUND "Nalezen sensor DS18x20" // xsns_06_dht.ino -#define D_TIMEOUT_WAITING_FOR "Cekani na" -#define D_START_SIGNAL_LOW "signal� startovni nizky" -#define D_START_SIGNAL_HIGH "signal� startovni vysoky" +#define D_TIMEOUT_WAITING_FOR "Čekání na" +#define D_START_SIGNAL_LOW "signál, startovní nízký" +#define D_START_SIGNAL_HIGH "signál, startovní vysoký" #define D_PULSE "puls" -#define D_CHECKSUM_FAILURE "Chybny kontrolni soucet" +#define D_CHECKSUM_FAILURE "Chybný kontrolní součet" // xsns_07_sht1x.ino -#define D_SENSOR_DID_NOT_ACK_COMMAND "Sensor neobdrzel prikaz ACK" +#define D_SENSOR_DID_NOT_ACK_COMMAND "Sensor neobdržel pžíkaz ACK" #define D_SHT1X_FOUND "SHT1X nalezen" // xsns_18_pms5003.ino @@ -381,7 +381,7 @@ #define D_PARTICALS_BEYOND "Particals" // sonoff_template.h -#define D_SENSOR_NONE "Neni" +#define D_SENSOR_NONE "Není" #define D_SENSOR_DHT11 "DHT11" #define D_SENSOR_AM2301 "AM2301" #define D_SENSOR_SI7021 "SI7021" @@ -390,12 +390,12 @@ #define D_SENSOR_I2C_SDA "I2C SDA" #define D_SENSOR_WS2812 "WS2812" #define D_SENSOR_IRSEND "IRsend" -#define D_SENSOR_SWITCH "Spinac" // Suffix "1" -#define D_SENSOR_BUTTON "Tlacit" // Suffix "1" -#define D_SENSOR_RELAY "Rele" // Suffix "1i" +#define D_SENSOR_SWITCH "Spínač" // Suffix "1" +#define D_SENSOR_BUTTON "Tlačít" // Suffix "1" +#define D_SENSOR_RELAY "Relé" // Suffix "1i" #define D_SENSOR_LED "Led" // Suffix "1i" -#define D_SENSOR_PWM "PWM" // Suffix "1" -#define D_SENSOR_COUNTER "Pocita" // Suffix "1" +#define D_SENSOR_PWM "PWM" // Suffix "1", +#define D_SENSOR_COUNTER "Počíta" // Suffix "1" #define D_SENSOR_IRRECV "IRrecv" #define D_SENSOR_MHZ_RX "MHZ Rx" #define D_SENSOR_MHZ_TX "MHZ Tx" From 02108927ccefe9dc653495611c4498d46595229a Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 10 Mar 2018 13:05:31 +0100 Subject: [PATCH 011/136] Add esp8266/Arduino 2.4.1 support --- arduino/version 2.4.1/boards.txt | 3796 ++++++++++++++++++++++++++++ arduino/version 2.4.1/platform.txt | 137 + 2 files changed, 3933 insertions(+) create mode 100644 arduino/version 2.4.1/boards.txt create mode 100644 arduino/version 2.4.1/platform.txt diff --git a/arduino/version 2.4.1/boards.txt b/arduino/version 2.4.1/boards.txt new file mode 100644 index 000000000..0d948f012 --- /dev/null +++ b/arduino/version 2.4.1/boards.txt @@ -0,0 +1,3796 @@ +# +# this file is script-generated and is likely to be overwritten by boards.txt.py +# + +menu.BoardModel=Model +menu.UploadSpeed=Upload Speed +menu.UploadTool=Upload Using +menu.CpuFrequency=CPU Frequency +menu.CrystalFreq=Crystal Frequency +menu.FlashSize=Flash Size +menu.FlashMode=Flash Mode +menu.FlashFreq=Flash Frequency +menu.ResetMethod=Reset Method +menu.ESPModule=Module +menu.Debug=Debug port +menu.DebugLevel=Debug Level +menu.LwIPVariant=lwIP Variant +menu.led=Builtin Led +menu.FlashErase=Erase Flash + +############################################################## +generic.name=Generic ESP8266 Module +generic.build.board=ESP8266_GENERIC +generic.upload.tool=esptool +generic.upload.maximum_data_size=81920 +generic.upload.wait_for_upload_port=true +generic.upload.erase_cmd= +generic.serial.disableDTR=true +generic.serial.disableRTS=true +generic.build.mcu=esp8266 +generic.build.core=esp8266 +generic.build.variant=generic +generic.build.spiffs_pagesize=256 +generic.build.debug_port= +generic.build.debug_level= + +generic.menu.UploadTool.esptool=Serial +generic.menu.UploadTool.esptool.upload.tool=esptool +generic.menu.UploadTool.esptool.upload.verbose=-vv +generic.menu.UploadTool.espupload=OTA_upload +generic.menu.UploadTool.espupload.upload.tool=espupload + +generic.menu.CpuFrequency.80=80 MHz +generic.menu.CpuFrequency.80.build.f_cpu=80000000L +generic.menu.CpuFrequency.160=160 MHz +generic.menu.CpuFrequency.160.build.f_cpu=160000000L +generic.menu.ResetMethod.ck=ck +generic.menu.ResetMethod.ck.upload.resetmethod=ck +generic.menu.ResetMethod.nodemcu=nodemcu +generic.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu +generic.menu.ResetMethod.none=none +generic.menu.ResetMethod.none.upload.resetmethod=none +generic.menu.ResetMethod.dtrset=dtrset +generic.menu.ResetMethod.dtrset.upload.resetmethod=dtrset +generic.menu.CrystalFreq.26=26 MHz +generic.menu.CrystalFreq.40=40 MHz +generic.menu.CrystalFreq.40.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266 +generic.menu.FlashFreq.40=40MHz +generic.menu.FlashFreq.40.build.flash_freq=40 +generic.menu.FlashFreq.80=80MHz +generic.menu.FlashFreq.80.build.flash_freq=80 +generic.menu.FlashMode.qio=QIO +generic.menu.FlashMode.qio.build.flash_mode=qio +generic.menu.FlashMode.qout=QOUT +generic.menu.FlashMode.qout.build.flash_mode=qout +generic.menu.FlashMode.dio=DIO +generic.menu.FlashMode.dio.build.flash_mode=dio +generic.menu.FlashMode.dout=DOUT +generic.menu.FlashMode.dout.build.flash_mode=dout +generic.menu.FlashSize.512K0=512K (no SPIFFS) +generic.menu.FlashSize.512K0.build.flash_size=512K +generic.menu.FlashSize.512K0.build.flash_size_bytes=0x80000 +generic.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld +generic.menu.FlashSize.512K0.build.spiffs_pagesize=256 +generic.menu.FlashSize.512K0.upload.maximum_size=499696 +generic.menu.FlashSize.512K0.build.rfcal_addr=0x7C000 +generic.menu.FlashSize.512K64=512K (64K SPIFFS) +generic.menu.FlashSize.512K64.build.flash_size=512K +generic.menu.FlashSize.512K64.build.flash_size_bytes=0x80000 +generic.menu.FlashSize.512K64.build.flash_ld=eagle.flash.512k64.ld +generic.menu.FlashSize.512K64.build.spiffs_pagesize=256 +generic.menu.FlashSize.512K64.upload.maximum_size=434160 +generic.menu.FlashSize.512K64.build.rfcal_addr=0x7C000 +generic.menu.FlashSize.512K64.build.spiffs_start=0x6B000 +generic.menu.FlashSize.512K64.build.spiffs_end=0x7B000 +generic.menu.FlashSize.512K64.build.spiffs_blocksize=4096 +generic.menu.FlashSize.512K128=512K (128K SPIFFS) +generic.menu.FlashSize.512K128.build.flash_size=512K +generic.menu.FlashSize.512K128.build.flash_size_bytes=0x80000 +generic.menu.FlashSize.512K128.build.flash_ld=eagle.flash.512k128.ld +generic.menu.FlashSize.512K128.build.spiffs_pagesize=256 +generic.menu.FlashSize.512K128.upload.maximum_size=368624 +generic.menu.FlashSize.512K128.build.rfcal_addr=0x7C000 +generic.menu.FlashSize.512K128.build.spiffs_start=0x5B000 +generic.menu.FlashSize.512K128.build.spiffs_end=0x7B000 +generic.menu.FlashSize.512K128.build.spiffs_blocksize=4096 +generic.menu.FlashSize.1M0=1M (no SPIFFS) +generic.menu.FlashSize.1M0.build.flash_size=1M +generic.menu.FlashSize.1M0.build.flash_size_bytes=0x100000 +generic.menu.FlashSize.1M0.build.flash_ld=eagle.flash.1m0.ld +generic.menu.FlashSize.1M0.build.spiffs_pagesize=256 +generic.menu.FlashSize.1M0.upload.maximum_size=1023984 +generic.menu.FlashSize.1M0.build.rfcal_addr=0xFC000 +generic.menu.FlashSize.1M64=1M (64K SPIFFS) +generic.menu.FlashSize.1M64.build.flash_size=1M +generic.menu.FlashSize.1M64.build.flash_size_bytes=0x100000 +generic.menu.FlashSize.1M64.build.flash_ld=eagle.flash.1m64.ld +generic.menu.FlashSize.1M64.build.spiffs_pagesize=256 +generic.menu.FlashSize.1M64.upload.maximum_size=958448 +generic.menu.FlashSize.1M64.build.rfcal_addr=0xFC000 +generic.menu.FlashSize.1M64.build.spiffs_start=0xEB000 +generic.menu.FlashSize.1M64.build.spiffs_end=0xFB000 +generic.menu.FlashSize.1M64.build.spiffs_blocksize=4096 +generic.menu.FlashSize.1M128=1M (128K SPIFFS) +generic.menu.FlashSize.1M128.build.flash_size=1M +generic.menu.FlashSize.1M128.build.flash_size_bytes=0x100000 +generic.menu.FlashSize.1M128.build.flash_ld=eagle.flash.1m128.ld +generic.menu.FlashSize.1M128.build.spiffs_pagesize=256 +generic.menu.FlashSize.1M128.upload.maximum_size=892912 +generic.menu.FlashSize.1M128.build.rfcal_addr=0xFC000 +generic.menu.FlashSize.1M128.build.spiffs_start=0xDB000 +generic.menu.FlashSize.1M128.build.spiffs_end=0xFB000 +generic.menu.FlashSize.1M128.build.spiffs_blocksize=4096 +generic.menu.FlashSize.1M144=1M (144K SPIFFS) +generic.menu.FlashSize.1M144.build.flash_size=1M +generic.menu.FlashSize.1M144.build.flash_size_bytes=0x100000 +generic.menu.FlashSize.1M144.build.flash_ld=eagle.flash.1m144.ld +generic.menu.FlashSize.1M144.build.spiffs_pagesize=256 +generic.menu.FlashSize.1M144.upload.maximum_size=876528 +generic.menu.FlashSize.1M144.build.rfcal_addr=0xFC000 +generic.menu.FlashSize.1M144.build.spiffs_start=0xD7000 +generic.menu.FlashSize.1M144.build.spiffs_end=0xFB000 +generic.menu.FlashSize.1M144.build.spiffs_blocksize=4096 +generic.menu.FlashSize.1M160=1M (160K SPIFFS) +generic.menu.FlashSize.1M160.build.flash_size=1M +generic.menu.FlashSize.1M160.build.flash_size_bytes=0x100000 +generic.menu.FlashSize.1M160.build.flash_ld=eagle.flash.1m160.ld +generic.menu.FlashSize.1M160.build.spiffs_pagesize=256 +generic.menu.FlashSize.1M160.upload.maximum_size=860144 +generic.menu.FlashSize.1M160.build.rfcal_addr=0xFC000 +generic.menu.FlashSize.1M160.build.spiffs_start=0xD3000 +generic.menu.FlashSize.1M160.build.spiffs_end=0xFB000 +generic.menu.FlashSize.1M160.build.spiffs_blocksize=4096 +generic.menu.FlashSize.1M192=1M (192K SPIFFS) +generic.menu.FlashSize.1M192.build.flash_size=1M +generic.menu.FlashSize.1M192.build.flash_size_bytes=0x100000 +generic.menu.FlashSize.1M192.build.flash_ld=eagle.flash.1m192.ld +generic.menu.FlashSize.1M192.build.spiffs_pagesize=256 +generic.menu.FlashSize.1M192.upload.maximum_size=827376 +generic.menu.FlashSize.1M192.build.rfcal_addr=0xFC000 +generic.menu.FlashSize.1M192.build.spiffs_start=0xCB000 +generic.menu.FlashSize.1M192.build.spiffs_end=0xFB000 +generic.menu.FlashSize.1M192.build.spiffs_blocksize=4096 +generic.menu.FlashSize.1M256=1M (256K SPIFFS) +generic.menu.FlashSize.1M256.build.flash_size=1M +generic.menu.FlashSize.1M256.build.flash_size_bytes=0x100000 +generic.menu.FlashSize.1M256.build.flash_ld=eagle.flash.1m256.ld +generic.menu.FlashSize.1M256.build.spiffs_pagesize=256 +generic.menu.FlashSize.1M256.upload.maximum_size=761840 +generic.menu.FlashSize.1M256.build.rfcal_addr=0xFC000 +generic.menu.FlashSize.1M256.build.spiffs_start=0xBB000 +generic.menu.FlashSize.1M256.build.spiffs_end=0xFB000 +generic.menu.FlashSize.1M256.build.spiffs_blocksize=4096 +generic.menu.FlashSize.1M512=1M (512K SPIFFS) +generic.menu.FlashSize.1M512.build.flash_size=1M +generic.menu.FlashSize.1M512.build.flash_size_bytes=0x100000 +generic.menu.FlashSize.1M512.build.flash_ld=eagle.flash.1m512.ld +generic.menu.FlashSize.1M512.build.spiffs_pagesize=256 +generic.menu.FlashSize.1M512.upload.maximum_size=499696 +generic.menu.FlashSize.1M512.build.rfcal_addr=0xFC000 +generic.menu.FlashSize.1M512.build.spiffs_start=0x7B000 +generic.menu.FlashSize.1M512.build.spiffs_end=0xFB000 +generic.menu.FlashSize.1M512.build.spiffs_blocksize=8192 +generic.menu.FlashSize.2M=2M (1M SPIFFS) +generic.menu.FlashSize.2M.build.flash_size=2M +generic.menu.FlashSize.2M.build.flash_size_bytes=0x200000 +generic.menu.FlashSize.2M.build.flash_ld=eagle.flash.2m.ld +generic.menu.FlashSize.2M.build.spiffs_pagesize=256 +generic.menu.FlashSize.2M.upload.maximum_size=1044464 +generic.menu.FlashSize.2M.build.rfcal_addr=0x1FC000 +generic.menu.FlashSize.2M.build.spiffs_start=0x100000 +generic.menu.FlashSize.2M.build.spiffs_end=0x1FB000 +generic.menu.FlashSize.2M.build.spiffs_blocksize=8192 +generic.menu.FlashSize.4M1M=4M (1M SPIFFS) +generic.menu.FlashSize.4M1M.build.flash_size=4M +generic.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000 +generic.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld +generic.menu.FlashSize.4M1M.build.spiffs_pagesize=256 +generic.menu.FlashSize.4M1M.upload.maximum_size=1044464 +generic.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000 +generic.menu.FlashSize.4M1M.build.spiffs_start=0x300000 +generic.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000 +generic.menu.FlashSize.4M1M.build.spiffs_blocksize=8192 +generic.menu.FlashSize.4M3M=4M (3M SPIFFS) +generic.menu.FlashSize.4M3M.build.flash_size=4M +generic.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000 +generic.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld +generic.menu.FlashSize.4M3M.build.spiffs_pagesize=256 +generic.menu.FlashSize.4M3M.upload.maximum_size=1044464 +generic.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000 +generic.menu.FlashSize.4M3M.build.spiffs_start=0x100000 +generic.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000 +generic.menu.FlashSize.4M3M.build.spiffs_blocksize=8192 +generic.menu.FlashSize.8M7M=8M (7M SPIFFS) +generic.menu.FlashSize.8M7M.build.flash_size=8M +generic.menu.FlashSize.8M7M.build.flash_size_bytes=0x800000 +generic.menu.FlashSize.8M7M.build.flash_ld=eagle.flash.8m.ld +generic.menu.FlashSize.8M7M.build.spiffs_pagesize=256 +generic.menu.FlashSize.8M7M.upload.maximum_size=1044464 +generic.menu.FlashSize.8M7M.build.rfcal_addr=0x7FC000 +generic.menu.FlashSize.8M7M.build.spiffs_start=0x100000 +generic.menu.FlashSize.8M7M.build.spiffs_end=0x7FB000 +generic.menu.FlashSize.8M7M.build.spiffs_blocksize=8192 +generic.menu.FlashSize.16M15M=16M (15M SPIFFS) +generic.menu.FlashSize.16M15M.build.flash_size=16M +generic.menu.FlashSize.16M15M.build.flash_size_bytes=0x1000000 +generic.menu.FlashSize.16M15M.build.flash_ld=eagle.flash.16m.ld +generic.menu.FlashSize.16M15M.build.spiffs_pagesize=256 +generic.menu.FlashSize.16M15M.upload.maximum_size=1044464 +generic.menu.FlashSize.16M15M.build.rfcal_addr=0xFFC000 +generic.menu.FlashSize.16M15M.build.spiffs_start=0x100000 +generic.menu.FlashSize.16M15M.build.spiffs_end=0xFFB000 +generic.menu.FlashSize.16M15M.build.spiffs_blocksize=8192 +generic.menu.led.2=2 +generic.menu.led.2.build.led=-DLED_BUILTIN=2 +generic.menu.led.0=0 +generic.menu.led.0.build.led=-DLED_BUILTIN=0 +generic.menu.led.1=1 +generic.menu.led.1.build.led=-DLED_BUILTIN=1 +generic.menu.led.3=3 +generic.menu.led.3.build.led=-DLED_BUILTIN=3 +generic.menu.led.4=4 +generic.menu.led.4.build.led=-DLED_BUILTIN=4 +generic.menu.led.5=5 +generic.menu.led.5.build.led=-DLED_BUILTIN=5 +generic.menu.led.6=6 +generic.menu.led.6.build.led=-DLED_BUILTIN=6 +generic.menu.led.7=7 +generic.menu.led.7.build.led=-DLED_BUILTIN=7 +generic.menu.led.8=8 +generic.menu.led.8.build.led=-DLED_BUILTIN=8 +generic.menu.led.9=9 +generic.menu.led.9.build.led=-DLED_BUILTIN=9 +generic.menu.led.10=10 +generic.menu.led.10.build.led=-DLED_BUILTIN=10 +generic.menu.led.11=11 +generic.menu.led.11.build.led=-DLED_BUILTIN=11 +generic.menu.led.12=12 +generic.menu.led.12.build.led=-DLED_BUILTIN=12 +generic.menu.led.13=13 +generic.menu.led.13.build.led=-DLED_BUILTIN=13 +generic.menu.led.14=14 +generic.menu.led.14.build.led=-DLED_BUILTIN=14 +generic.menu.led.15=15 +generic.menu.led.15.build.led=-DLED_BUILTIN=15 +generic.menu.LwIPVariant.v2mss536=v2 Lower Memory +generic.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +generic.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +generic.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +generic.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +generic.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +generic.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +generic.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +generic.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +generic.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +generic.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +generic.menu.LwIPVariant.OpenSource=v1.4 Compile from source +generic.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +generic.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +generic.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +generic.menu.Debug.Disabled=Disabled +generic.menu.Debug.Disabled.build.debug_port= +generic.menu.Debug.Serial=Serial +generic.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +generic.menu.Debug.Serial1=Serial1 +generic.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +generic.menu.DebugLevel.None____=None +generic.menu.DebugLevel.None____.build.debug_level= +generic.menu.DebugLevel.SSL=SSL +generic.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +generic.menu.DebugLevel.TLS_MEM=TLS_MEM +generic.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +generic.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +generic.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +generic.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +generic.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +generic.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +generic.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +generic.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +generic.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +generic.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +generic.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +generic.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +generic.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +generic.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +generic.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +generic.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +generic.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +generic.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +generic.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +generic.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +generic.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +generic.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +generic.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +generic.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +generic.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +generic.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +generic.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +generic.menu.DebugLevel.CORE=CORE +generic.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +generic.menu.DebugLevel.WIFI=WIFI +generic.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +generic.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +generic.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +generic.menu.DebugLevel.UPDATER=UPDATER +generic.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +generic.menu.DebugLevel.OTA=OTA +generic.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +generic.menu.DebugLevel.OOM=OOM +generic.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +generic.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +generic.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +generic.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +generic.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +generic.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +generic.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +generic.menu.FlashErase.none=Only Sketch +generic.menu.FlashErase.none.upload.erase_cmd= +generic.menu.FlashErase.sdk=Sketch + WiFi Settings +generic.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +generic.menu.FlashErase.all=All Flash Contents +generic.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +generic.menu.UploadSpeed.115200=115200 +generic.menu.UploadSpeed.115200.upload.speed=115200 +generic.menu.UploadSpeed.9600=9600 +generic.menu.UploadSpeed.9600.upload.speed=9600 +generic.menu.UploadSpeed.57600=57600 +generic.menu.UploadSpeed.57600.upload.speed=57600 +generic.menu.UploadSpeed.230400.linux=230400 +generic.menu.UploadSpeed.230400.macosx=230400 +generic.menu.UploadSpeed.230400.upload.speed=230400 +generic.menu.UploadSpeed.256000.windows=256000 +generic.menu.UploadSpeed.256000.upload.speed=256000 +generic.menu.UploadSpeed.460800.linux=460800 +generic.menu.UploadSpeed.460800.macosx=460800 +generic.menu.UploadSpeed.460800.upload.speed=460800 +generic.menu.UploadSpeed.512000.windows=512000 +generic.menu.UploadSpeed.512000.upload.speed=512000 +generic.menu.UploadSpeed.921600=921600 +generic.menu.UploadSpeed.921600.upload.speed=921600 + +############################################################## +esp8285.name=Generic ESP8285 Module +esp8285.build.board=ESP8266_ESP01 +esp8285.upload.tool=esptool +esp8285.upload.maximum_data_size=81920 +esp8285.upload.wait_for_upload_port=true +esp8285.upload.erase_cmd= +esp8285.serial.disableDTR=true +esp8285.serial.disableRTS=true +esp8285.build.mcu=esp8266 +esp8285.build.core=esp8266 +esp8285.build.variant=generic +esp8285.build.spiffs_pagesize=256 +esp8285.build.debug_port= +esp8285.build.debug_level= +esp8285.menu.CpuFrequency.80=80 MHz +esp8285.menu.CpuFrequency.80.build.f_cpu=80000000L +esp8285.menu.CpuFrequency.160=160 MHz +esp8285.menu.CpuFrequency.160.build.f_cpu=160000000L +esp8285.menu.ResetMethod.ck=ck +esp8285.menu.ResetMethod.ck.upload.resetmethod=ck +esp8285.menu.ResetMethod.nodemcu=nodemcu +esp8285.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu +esp8285.menu.ResetMethod.none=none +esp8285.menu.ResetMethod.none.upload.resetmethod=none +esp8285.menu.ResetMethod.dtrset=dtrset +esp8285.menu.ResetMethod.dtrset.upload.resetmethod=dtrset +esp8285.menu.CrystalFreq.26=26 MHz +esp8285.menu.CrystalFreq.40=40 MHz +esp8285.menu.CrystalFreq.40.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266 +esp8285.build.flash_mode=dout +esp8285.build.flash_freq=40 +esp8285.menu.FlashSize.1M0=1M (no SPIFFS) +esp8285.menu.FlashSize.1M0.build.flash_size=1M +esp8285.menu.FlashSize.1M0.build.flash_size_bytes=0x100000 +esp8285.menu.FlashSize.1M0.build.flash_ld=eagle.flash.1m0.ld +esp8285.menu.FlashSize.1M0.build.spiffs_pagesize=256 +esp8285.menu.FlashSize.1M0.upload.maximum_size=1023984 +esp8285.menu.FlashSize.1M0.build.rfcal_addr=0xFC000 +esp8285.menu.FlashSize.1M64=1M (64K SPIFFS) +esp8285.menu.FlashSize.1M64.build.flash_size=1M +esp8285.menu.FlashSize.1M64.build.flash_size_bytes=0x100000 +esp8285.menu.FlashSize.1M64.build.flash_ld=eagle.flash.1m64.ld +esp8285.menu.FlashSize.1M64.build.spiffs_pagesize=256 +esp8285.menu.FlashSize.1M64.upload.maximum_size=958448 +esp8285.menu.FlashSize.1M64.build.rfcal_addr=0xFC000 +esp8285.menu.FlashSize.1M64.build.spiffs_start=0xEB000 +esp8285.menu.FlashSize.1M64.build.spiffs_end=0xFB000 +esp8285.menu.FlashSize.1M64.build.spiffs_blocksize=4096 +esp8285.menu.FlashSize.1M128=1M (128K SPIFFS) +esp8285.menu.FlashSize.1M128.build.flash_size=1M +esp8285.menu.FlashSize.1M128.build.flash_size_bytes=0x100000 +esp8285.menu.FlashSize.1M128.build.flash_ld=eagle.flash.1m128.ld +esp8285.menu.FlashSize.1M128.build.spiffs_pagesize=256 +esp8285.menu.FlashSize.1M128.upload.maximum_size=892912 +esp8285.menu.FlashSize.1M128.build.rfcal_addr=0xFC000 +esp8285.menu.FlashSize.1M128.build.spiffs_start=0xDB000 +esp8285.menu.FlashSize.1M128.build.spiffs_end=0xFB000 +esp8285.menu.FlashSize.1M128.build.spiffs_blocksize=4096 +esp8285.menu.FlashSize.1M144=1M (144K SPIFFS) +esp8285.menu.FlashSize.1M144.build.flash_size=1M +esp8285.menu.FlashSize.1M144.build.flash_size_bytes=0x100000 +esp8285.menu.FlashSize.1M144.build.flash_ld=eagle.flash.1m144.ld +esp8285.menu.FlashSize.1M144.build.spiffs_pagesize=256 +esp8285.menu.FlashSize.1M144.upload.maximum_size=876528 +esp8285.menu.FlashSize.1M144.build.rfcal_addr=0xFC000 +esp8285.menu.FlashSize.1M144.build.spiffs_start=0xD7000 +esp8285.menu.FlashSize.1M144.build.spiffs_end=0xFB000 +esp8285.menu.FlashSize.1M144.build.spiffs_blocksize=4096 +esp8285.menu.FlashSize.1M160=1M (160K SPIFFS) +esp8285.menu.FlashSize.1M160.build.flash_size=1M +esp8285.menu.FlashSize.1M160.build.flash_size_bytes=0x100000 +esp8285.menu.FlashSize.1M160.build.flash_ld=eagle.flash.1m160.ld +esp8285.menu.FlashSize.1M160.build.spiffs_pagesize=256 +esp8285.menu.FlashSize.1M160.upload.maximum_size=860144 +esp8285.menu.FlashSize.1M160.build.rfcal_addr=0xFC000 +esp8285.menu.FlashSize.1M160.build.spiffs_start=0xD3000 +esp8285.menu.FlashSize.1M160.build.spiffs_end=0xFB000 +esp8285.menu.FlashSize.1M160.build.spiffs_blocksize=4096 +esp8285.menu.FlashSize.1M192=1M (192K SPIFFS) +esp8285.menu.FlashSize.1M192.build.flash_size=1M +esp8285.menu.FlashSize.1M192.build.flash_size_bytes=0x100000 +esp8285.menu.FlashSize.1M192.build.flash_ld=eagle.flash.1m192.ld +esp8285.menu.FlashSize.1M192.build.spiffs_pagesize=256 +esp8285.menu.FlashSize.1M192.upload.maximum_size=827376 +esp8285.menu.FlashSize.1M192.build.rfcal_addr=0xFC000 +esp8285.menu.FlashSize.1M192.build.spiffs_start=0xCB000 +esp8285.menu.FlashSize.1M192.build.spiffs_end=0xFB000 +esp8285.menu.FlashSize.1M192.build.spiffs_blocksize=4096 +esp8285.menu.FlashSize.1M256=1M (256K SPIFFS) +esp8285.menu.FlashSize.1M256.build.flash_size=1M +esp8285.menu.FlashSize.1M256.build.flash_size_bytes=0x100000 +esp8285.menu.FlashSize.1M256.build.flash_ld=eagle.flash.1m256.ld +esp8285.menu.FlashSize.1M256.build.spiffs_pagesize=256 +esp8285.menu.FlashSize.1M256.upload.maximum_size=761840 +esp8285.menu.FlashSize.1M256.build.rfcal_addr=0xFC000 +esp8285.menu.FlashSize.1M256.build.spiffs_start=0xBB000 +esp8285.menu.FlashSize.1M256.build.spiffs_end=0xFB000 +esp8285.menu.FlashSize.1M256.build.spiffs_blocksize=4096 +esp8285.menu.FlashSize.1M512=1M (512K SPIFFS) +esp8285.menu.FlashSize.1M512.build.flash_size=1M +esp8285.menu.FlashSize.1M512.build.flash_size_bytes=0x100000 +esp8285.menu.FlashSize.1M512.build.flash_ld=eagle.flash.1m512.ld +esp8285.menu.FlashSize.1M512.build.spiffs_pagesize=256 +esp8285.menu.FlashSize.1M512.upload.maximum_size=499696 +esp8285.menu.FlashSize.1M512.build.rfcal_addr=0xFC000 +esp8285.menu.FlashSize.1M512.build.spiffs_start=0x7B000 +esp8285.menu.FlashSize.1M512.build.spiffs_end=0xFB000 +esp8285.menu.FlashSize.1M512.build.spiffs_blocksize=8192 +esp8285.menu.led.2=2 +esp8285.menu.led.2.build.led=-DLED_BUILTIN=2 +esp8285.menu.led.0=0 +esp8285.menu.led.0.build.led=-DLED_BUILTIN=0 +esp8285.menu.led.1=1 +esp8285.menu.led.1.build.led=-DLED_BUILTIN=1 +esp8285.menu.led.3=3 +esp8285.menu.led.3.build.led=-DLED_BUILTIN=3 +esp8285.menu.led.4=4 +esp8285.menu.led.4.build.led=-DLED_BUILTIN=4 +esp8285.menu.led.5=5 +esp8285.menu.led.5.build.led=-DLED_BUILTIN=5 +esp8285.menu.led.6=6 +esp8285.menu.led.6.build.led=-DLED_BUILTIN=6 +esp8285.menu.led.7=7 +esp8285.menu.led.7.build.led=-DLED_BUILTIN=7 +esp8285.menu.led.8=8 +esp8285.menu.led.8.build.led=-DLED_BUILTIN=8 +esp8285.menu.led.9=9 +esp8285.menu.led.9.build.led=-DLED_BUILTIN=9 +esp8285.menu.led.10=10 +esp8285.menu.led.10.build.led=-DLED_BUILTIN=10 +esp8285.menu.led.11=11 +esp8285.menu.led.11.build.led=-DLED_BUILTIN=11 +esp8285.menu.led.12=12 +esp8285.menu.led.12.build.led=-DLED_BUILTIN=12 +esp8285.menu.led.13=13 +esp8285.menu.led.13.build.led=-DLED_BUILTIN=13 +esp8285.menu.led.14=14 +esp8285.menu.led.14.build.led=-DLED_BUILTIN=14 +esp8285.menu.led.15=15 +esp8285.menu.led.15.build.led=-DLED_BUILTIN=15 +esp8285.menu.LwIPVariant.v2mss536=v2 Lower Memory +esp8285.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +esp8285.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +esp8285.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +esp8285.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +esp8285.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +esp8285.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +esp8285.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +esp8285.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +esp8285.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +esp8285.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +esp8285.menu.LwIPVariant.OpenSource=v1.4 Compile from source +esp8285.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +esp8285.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +esp8285.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +esp8285.menu.Debug.Disabled=Disabled +esp8285.menu.Debug.Disabled.build.debug_port= +esp8285.menu.Debug.Serial=Serial +esp8285.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +esp8285.menu.Debug.Serial1=Serial1 +esp8285.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +esp8285.menu.DebugLevel.None____=None +esp8285.menu.DebugLevel.None____.build.debug_level= +esp8285.menu.DebugLevel.SSL=SSL +esp8285.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +esp8285.menu.DebugLevel.TLS_MEM=TLS_MEM +esp8285.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +esp8285.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +esp8285.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +esp8285.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +esp8285.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +esp8285.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +esp8285.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +esp8285.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +esp8285.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +esp8285.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +esp8285.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +esp8285.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +esp8285.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +esp8285.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +esp8285.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +esp8285.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +esp8285.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +esp8285.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +esp8285.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +esp8285.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +esp8285.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +esp8285.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +esp8285.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +esp8285.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +esp8285.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +esp8285.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +esp8285.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +esp8285.menu.DebugLevel.CORE=CORE +esp8285.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +esp8285.menu.DebugLevel.WIFI=WIFI +esp8285.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +esp8285.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +esp8285.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +esp8285.menu.DebugLevel.UPDATER=UPDATER +esp8285.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +esp8285.menu.DebugLevel.OTA=OTA +esp8285.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +esp8285.menu.DebugLevel.OOM=OOM +esp8285.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +esp8285.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +esp8285.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +esp8285.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +esp8285.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +esp8285.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +esp8285.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +esp8285.menu.FlashErase.none=Only Sketch +esp8285.menu.FlashErase.none.upload.erase_cmd= +esp8285.menu.FlashErase.sdk=Sketch + WiFi Settings +esp8285.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +esp8285.menu.FlashErase.all=All Flash Contents +esp8285.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +esp8285.menu.UploadSpeed.115200=115200 +esp8285.menu.UploadSpeed.115200.upload.speed=115200 +esp8285.menu.UploadSpeed.9600=9600 +esp8285.menu.UploadSpeed.9600.upload.speed=9600 +esp8285.menu.UploadSpeed.57600=57600 +esp8285.menu.UploadSpeed.57600.upload.speed=57600 +esp8285.menu.UploadSpeed.230400.linux=230400 +esp8285.menu.UploadSpeed.230400.macosx=230400 +esp8285.menu.UploadSpeed.230400.upload.speed=230400 +esp8285.menu.UploadSpeed.256000.windows=256000 +esp8285.menu.UploadSpeed.256000.upload.speed=256000 +esp8285.menu.UploadSpeed.460800.linux=460800 +esp8285.menu.UploadSpeed.460800.macosx=460800 +esp8285.menu.UploadSpeed.460800.upload.speed=460800 +esp8285.menu.UploadSpeed.512000.windows=512000 +esp8285.menu.UploadSpeed.512000.upload.speed=512000 +esp8285.menu.UploadSpeed.921600=921600 +esp8285.menu.UploadSpeed.921600.upload.speed=921600 + +############################################################## +espduino.name=ESPDuino (ESP-13 Module) +espduino.build.board=ESP8266_ESP13 +espduino.build.variant=ESPDuino +espduino.menu.ResetMethod.v2=ESPduino-V2 +espduino.menu.ResetMethod.v2.upload.resetmethod=nodemcu +espduino.menu.ResetMethod.v1=ESPduino-V1 +espduino.menu.ResetMethod.v1.upload.resetmethod=ck +espduino.menu.UploadTool.esptool=Serial +espduino.menu.UploadTool.esptool.upload.tool=esptool +espduino.menu.UploadTool.esptool.upload.verbose=-vv +espduino.menu.UploadTool.espota=OTA +espduino.menu.UploadTool.espota.upload.tool=espota +espduino.upload.tool=esptool +espduino.upload.maximum_data_size=81920 +espduino.upload.wait_for_upload_port=true +espduino.upload.erase_cmd= +espduino.serial.disableDTR=true +espduino.serial.disableRTS=true +espduino.build.mcu=esp8266 +espduino.build.core=esp8266 +espduino.build.spiffs_pagesize=256 +espduino.build.debug_port= +espduino.build.debug_level= +espduino.menu.CpuFrequency.80=80 MHz +espduino.menu.CpuFrequency.80.build.f_cpu=80000000L +espduino.menu.CpuFrequency.160=160 MHz +espduino.menu.CpuFrequency.160.build.f_cpu=160000000L +espduino.build.flash_mode=dio +espduino.build.flash_freq=40 +espduino.menu.FlashSize.4M1M=4M (1M SPIFFS) +espduino.menu.FlashSize.4M1M.build.flash_size=4M +espduino.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000 +espduino.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld +espduino.menu.FlashSize.4M1M.build.spiffs_pagesize=256 +espduino.menu.FlashSize.4M1M.upload.maximum_size=1044464 +espduino.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000 +espduino.menu.FlashSize.4M1M.build.spiffs_start=0x300000 +espduino.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000 +espduino.menu.FlashSize.4M1M.build.spiffs_blocksize=8192 +espduino.menu.FlashSize.4M3M=4M (3M SPIFFS) +espduino.menu.FlashSize.4M3M.build.flash_size=4M +espduino.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000 +espduino.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld +espduino.menu.FlashSize.4M3M.build.spiffs_pagesize=256 +espduino.menu.FlashSize.4M3M.upload.maximum_size=1044464 +espduino.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000 +espduino.menu.FlashSize.4M3M.build.spiffs_start=0x100000 +espduino.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000 +espduino.menu.FlashSize.4M3M.build.spiffs_blocksize=8192 +espduino.menu.LwIPVariant.v2mss536=v2 Lower Memory +espduino.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +espduino.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +espduino.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +espduino.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +espduino.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +espduino.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +espduino.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +espduino.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +espduino.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +espduino.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +espduino.menu.LwIPVariant.OpenSource=v1.4 Compile from source +espduino.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +espduino.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +espduino.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +espduino.menu.Debug.Disabled=Disabled +espduino.menu.Debug.Disabled.build.debug_port= +espduino.menu.Debug.Serial=Serial +espduino.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +espduino.menu.Debug.Serial1=Serial1 +espduino.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +espduino.menu.DebugLevel.None____=None +espduino.menu.DebugLevel.None____.build.debug_level= +espduino.menu.DebugLevel.SSL=SSL +espduino.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +espduino.menu.DebugLevel.TLS_MEM=TLS_MEM +espduino.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +espduino.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +espduino.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +espduino.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +espduino.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +espduino.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +espduino.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +espduino.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +espduino.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +espduino.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +espduino.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +espduino.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +espduino.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +espduino.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +espduino.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +espduino.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +espduino.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espduino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +espduino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +espduino.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +espduino.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +espduino.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +espduino.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espduino.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +espduino.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espduino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +espduino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espduino.menu.DebugLevel.CORE=CORE +espduino.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +espduino.menu.DebugLevel.WIFI=WIFI +espduino.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +espduino.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +espduino.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +espduino.menu.DebugLevel.UPDATER=UPDATER +espduino.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +espduino.menu.DebugLevel.OTA=OTA +espduino.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +espduino.menu.DebugLevel.OOM=OOM +espduino.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +espduino.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +espduino.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +espduino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +espduino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +espduino.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +espduino.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +espduino.menu.FlashErase.none=Only Sketch +espduino.menu.FlashErase.none.upload.erase_cmd= +espduino.menu.FlashErase.sdk=Sketch + WiFi Settings +espduino.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +espduino.menu.FlashErase.all=All Flash Contents +espduino.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +espduino.menu.UploadSpeed.115200=115200 +espduino.menu.UploadSpeed.115200.upload.speed=115200 +espduino.menu.UploadSpeed.9600=9600 +espduino.menu.UploadSpeed.9600.upload.speed=9600 +espduino.menu.UploadSpeed.57600=57600 +espduino.menu.UploadSpeed.57600.upload.speed=57600 +espduino.menu.UploadSpeed.230400.linux=230400 +espduino.menu.UploadSpeed.230400.macosx=230400 +espduino.menu.UploadSpeed.230400.upload.speed=230400 +espduino.menu.UploadSpeed.256000.windows=256000 +espduino.menu.UploadSpeed.256000.upload.speed=256000 +espduino.menu.UploadSpeed.460800.linux=460800 +espduino.menu.UploadSpeed.460800.macosx=460800 +espduino.menu.UploadSpeed.460800.upload.speed=460800 +espduino.menu.UploadSpeed.512000.windows=512000 +espduino.menu.UploadSpeed.512000.upload.speed=512000 +espduino.menu.UploadSpeed.921600=921600 +espduino.menu.UploadSpeed.921600.upload.speed=921600 + +############################################################## +huzzah.name=Adafruit Feather HUZZAH ESP8266 +huzzah.build.board=ESP8266_ESP12 +huzzah.build.variant=adafruit +huzzah.upload.tool=esptool +huzzah.upload.maximum_data_size=81920 +huzzah.upload.wait_for_upload_port=true +huzzah.upload.erase_cmd= +huzzah.serial.disableDTR=true +huzzah.serial.disableRTS=true +huzzah.build.mcu=esp8266 +huzzah.build.core=esp8266 +huzzah.build.spiffs_pagesize=256 +huzzah.build.debug_port= +huzzah.build.debug_level= +huzzah.menu.CpuFrequency.80=80 MHz +huzzah.menu.CpuFrequency.80.build.f_cpu=80000000L +huzzah.menu.CpuFrequency.160=160 MHz +huzzah.menu.CpuFrequency.160.build.f_cpu=160000000L +huzzah.upload.resetmethod=nodemcu +huzzah.build.flash_mode=qio +huzzah.build.flash_freq=40 +huzzah.menu.FlashSize.4M1M=4M (1M SPIFFS) +huzzah.menu.FlashSize.4M1M.build.flash_size=4M +huzzah.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000 +huzzah.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld +huzzah.menu.FlashSize.4M1M.build.spiffs_pagesize=256 +huzzah.menu.FlashSize.4M1M.upload.maximum_size=1044464 +huzzah.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000 +huzzah.menu.FlashSize.4M1M.build.spiffs_start=0x300000 +huzzah.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000 +huzzah.menu.FlashSize.4M1M.build.spiffs_blocksize=8192 +huzzah.menu.FlashSize.4M3M=4M (3M SPIFFS) +huzzah.menu.FlashSize.4M3M.build.flash_size=4M +huzzah.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000 +huzzah.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld +huzzah.menu.FlashSize.4M3M.build.spiffs_pagesize=256 +huzzah.menu.FlashSize.4M3M.upload.maximum_size=1044464 +huzzah.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000 +huzzah.menu.FlashSize.4M3M.build.spiffs_start=0x100000 +huzzah.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000 +huzzah.menu.FlashSize.4M3M.build.spiffs_blocksize=8192 +huzzah.menu.LwIPVariant.v2mss536=v2 Lower Memory +huzzah.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +huzzah.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +huzzah.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +huzzah.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +huzzah.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +huzzah.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +huzzah.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +huzzah.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +huzzah.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +huzzah.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +huzzah.menu.LwIPVariant.OpenSource=v1.4 Compile from source +huzzah.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +huzzah.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +huzzah.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +huzzah.menu.Debug.Disabled=Disabled +huzzah.menu.Debug.Disabled.build.debug_port= +huzzah.menu.Debug.Serial=Serial +huzzah.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +huzzah.menu.Debug.Serial1=Serial1 +huzzah.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +huzzah.menu.DebugLevel.None____=None +huzzah.menu.DebugLevel.None____.build.debug_level= +huzzah.menu.DebugLevel.SSL=SSL +huzzah.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +huzzah.menu.DebugLevel.TLS_MEM=TLS_MEM +huzzah.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +huzzah.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +huzzah.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +huzzah.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +huzzah.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +huzzah.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +huzzah.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +huzzah.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +huzzah.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +huzzah.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +huzzah.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +huzzah.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +huzzah.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +huzzah.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +huzzah.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +huzzah.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +huzzah.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +huzzah.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +huzzah.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +huzzah.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +huzzah.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +huzzah.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +huzzah.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +huzzah.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +huzzah.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +huzzah.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +huzzah.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +huzzah.menu.DebugLevel.CORE=CORE +huzzah.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +huzzah.menu.DebugLevel.WIFI=WIFI +huzzah.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +huzzah.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +huzzah.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +huzzah.menu.DebugLevel.UPDATER=UPDATER +huzzah.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +huzzah.menu.DebugLevel.OTA=OTA +huzzah.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +huzzah.menu.DebugLevel.OOM=OOM +huzzah.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +huzzah.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +huzzah.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +huzzah.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +huzzah.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +huzzah.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +huzzah.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +huzzah.menu.FlashErase.none=Only Sketch +huzzah.menu.FlashErase.none.upload.erase_cmd= +huzzah.menu.FlashErase.sdk=Sketch + WiFi Settings +huzzah.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +huzzah.menu.FlashErase.all=All Flash Contents +huzzah.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +huzzah.menu.UploadSpeed.115200=115200 +huzzah.menu.UploadSpeed.115200.upload.speed=115200 +huzzah.menu.UploadSpeed.9600=9600 +huzzah.menu.UploadSpeed.9600.upload.speed=9600 +huzzah.menu.UploadSpeed.57600=57600 +huzzah.menu.UploadSpeed.57600.upload.speed=57600 +huzzah.menu.UploadSpeed.230400.linux=230400 +huzzah.menu.UploadSpeed.230400.macosx=230400 +huzzah.menu.UploadSpeed.230400.upload.speed=230400 +huzzah.menu.UploadSpeed.256000.windows=256000 +huzzah.menu.UploadSpeed.256000.upload.speed=256000 +huzzah.menu.UploadSpeed.460800.linux=460800 +huzzah.menu.UploadSpeed.460800.macosx=460800 +huzzah.menu.UploadSpeed.460800.upload.speed=460800 +huzzah.menu.UploadSpeed.512000.windows=512000 +huzzah.menu.UploadSpeed.512000.upload.speed=512000 +huzzah.menu.UploadSpeed.921600=921600 +huzzah.menu.UploadSpeed.921600.upload.speed=921600 + +############################################################## +espresso_lite_v1.name=ESPresso Lite 1.0 +espresso_lite_v1.build.board=ESP8266_ESPRESSO_LITE_V1 +espresso_lite_v1.build.variant=espresso_lite_v1 +espresso_lite_v1.upload.tool=esptool +espresso_lite_v1.upload.maximum_data_size=81920 +espresso_lite_v1.upload.wait_for_upload_port=true +espresso_lite_v1.upload.erase_cmd= +espresso_lite_v1.serial.disableDTR=true +espresso_lite_v1.serial.disableRTS=true +espresso_lite_v1.build.mcu=esp8266 +espresso_lite_v1.build.core=esp8266 +espresso_lite_v1.build.spiffs_pagesize=256 +espresso_lite_v1.build.debug_port= +espresso_lite_v1.build.debug_level= +espresso_lite_v1.menu.CpuFrequency.80=80 MHz +espresso_lite_v1.menu.CpuFrequency.80.build.f_cpu=80000000L +espresso_lite_v1.menu.CpuFrequency.160=160 MHz +espresso_lite_v1.menu.CpuFrequency.160.build.f_cpu=160000000L +espresso_lite_v1.build.flash_mode=dio +espresso_lite_v1.build.flash_freq=40 +espresso_lite_v1.menu.FlashSize.4M1M=4M (1M SPIFFS) +espresso_lite_v1.menu.FlashSize.4M1M.build.flash_size=4M +espresso_lite_v1.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000 +espresso_lite_v1.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld +espresso_lite_v1.menu.FlashSize.4M1M.build.spiffs_pagesize=256 +espresso_lite_v1.menu.FlashSize.4M1M.upload.maximum_size=1044464 +espresso_lite_v1.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000 +espresso_lite_v1.menu.FlashSize.4M1M.build.spiffs_start=0x300000 +espresso_lite_v1.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000 +espresso_lite_v1.menu.FlashSize.4M1M.build.spiffs_blocksize=8192 +espresso_lite_v1.menu.FlashSize.4M3M=4M (3M SPIFFS) +espresso_lite_v1.menu.FlashSize.4M3M.build.flash_size=4M +espresso_lite_v1.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000 +espresso_lite_v1.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld +espresso_lite_v1.menu.FlashSize.4M3M.build.spiffs_pagesize=256 +espresso_lite_v1.menu.FlashSize.4M3M.upload.maximum_size=1044464 +espresso_lite_v1.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000 +espresso_lite_v1.menu.FlashSize.4M3M.build.spiffs_start=0x100000 +espresso_lite_v1.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000 +espresso_lite_v1.menu.FlashSize.4M3M.build.spiffs_blocksize=8192 +espresso_lite_v1.menu.ResetMethod.ck=ck +espresso_lite_v1.menu.ResetMethod.ck.upload.resetmethod=ck +espresso_lite_v1.menu.ResetMethod.nodemcu=nodemcu +espresso_lite_v1.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu +espresso_lite_v1.menu.LwIPVariant.v2mss536=v2 Lower Memory +espresso_lite_v1.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +espresso_lite_v1.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +espresso_lite_v1.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +espresso_lite_v1.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +espresso_lite_v1.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +espresso_lite_v1.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +espresso_lite_v1.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +espresso_lite_v1.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +espresso_lite_v1.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +espresso_lite_v1.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +espresso_lite_v1.menu.LwIPVariant.OpenSource=v1.4 Compile from source +espresso_lite_v1.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +espresso_lite_v1.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +espresso_lite_v1.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +espresso_lite_v1.menu.Debug.Disabled=Disabled +espresso_lite_v1.menu.Debug.Disabled.build.debug_port= +espresso_lite_v1.menu.Debug.Serial=Serial +espresso_lite_v1.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +espresso_lite_v1.menu.Debug.Serial1=Serial1 +espresso_lite_v1.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +espresso_lite_v1.menu.DebugLevel.None____=None +espresso_lite_v1.menu.DebugLevel.None____.build.debug_level= +espresso_lite_v1.menu.DebugLevel.SSL=SSL +espresso_lite_v1.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +espresso_lite_v1.menu.DebugLevel.TLS_MEM=TLS_MEM +espresso_lite_v1.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +espresso_lite_v1.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +espresso_lite_v1.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +espresso_lite_v1.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +espresso_lite_v1.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +espresso_lite_v1.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +espresso_lite_v1.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +espresso_lite_v1.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +espresso_lite_v1.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +espresso_lite_v1.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +espresso_lite_v1.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +espresso_lite_v1.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +espresso_lite_v1.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +espresso_lite_v1.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +espresso_lite_v1.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +espresso_lite_v1.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +espresso_lite_v1.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espresso_lite_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +espresso_lite_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +espresso_lite_v1.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +espresso_lite_v1.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +espresso_lite_v1.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +espresso_lite_v1.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espresso_lite_v1.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +espresso_lite_v1.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espresso_lite_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +espresso_lite_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espresso_lite_v1.menu.DebugLevel.CORE=CORE +espresso_lite_v1.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +espresso_lite_v1.menu.DebugLevel.WIFI=WIFI +espresso_lite_v1.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +espresso_lite_v1.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +espresso_lite_v1.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +espresso_lite_v1.menu.DebugLevel.UPDATER=UPDATER +espresso_lite_v1.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +espresso_lite_v1.menu.DebugLevel.OTA=OTA +espresso_lite_v1.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +espresso_lite_v1.menu.DebugLevel.OOM=OOM +espresso_lite_v1.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +espresso_lite_v1.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +espresso_lite_v1.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +espresso_lite_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +espresso_lite_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +espresso_lite_v1.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +espresso_lite_v1.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +espresso_lite_v1.menu.FlashErase.none=Only Sketch +espresso_lite_v1.menu.FlashErase.none.upload.erase_cmd= +espresso_lite_v1.menu.FlashErase.sdk=Sketch + WiFi Settings +espresso_lite_v1.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +espresso_lite_v1.menu.FlashErase.all=All Flash Contents +espresso_lite_v1.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +espresso_lite_v1.menu.UploadSpeed.115200=115200 +espresso_lite_v1.menu.UploadSpeed.115200.upload.speed=115200 +espresso_lite_v1.menu.UploadSpeed.9600=9600 +espresso_lite_v1.menu.UploadSpeed.9600.upload.speed=9600 +espresso_lite_v1.menu.UploadSpeed.57600=57600 +espresso_lite_v1.menu.UploadSpeed.57600.upload.speed=57600 +espresso_lite_v1.menu.UploadSpeed.230400.linux=230400 +espresso_lite_v1.menu.UploadSpeed.230400.macosx=230400 +espresso_lite_v1.menu.UploadSpeed.230400.upload.speed=230400 +espresso_lite_v1.menu.UploadSpeed.256000.windows=256000 +espresso_lite_v1.menu.UploadSpeed.256000.upload.speed=256000 +espresso_lite_v1.menu.UploadSpeed.460800.linux=460800 +espresso_lite_v1.menu.UploadSpeed.460800.macosx=460800 +espresso_lite_v1.menu.UploadSpeed.460800.upload.speed=460800 +espresso_lite_v1.menu.UploadSpeed.512000.windows=512000 +espresso_lite_v1.menu.UploadSpeed.512000.upload.speed=512000 +espresso_lite_v1.menu.UploadSpeed.921600=921600 +espresso_lite_v1.menu.UploadSpeed.921600.upload.speed=921600 + +############################################################## +espresso_lite_v2.name=ESPresso Lite 2.0 +espresso_lite_v2.build.board=ESP8266_ESPRESSO_LITE_V2 +espresso_lite_v2.build.variant=espresso_lite_v2 +espresso_lite_v2.upload.tool=esptool +espresso_lite_v2.upload.maximum_data_size=81920 +espresso_lite_v2.upload.wait_for_upload_port=true +espresso_lite_v2.upload.erase_cmd= +espresso_lite_v2.serial.disableDTR=true +espresso_lite_v2.serial.disableRTS=true +espresso_lite_v2.build.mcu=esp8266 +espresso_lite_v2.build.core=esp8266 +espresso_lite_v2.build.spiffs_pagesize=256 +espresso_lite_v2.build.debug_port= +espresso_lite_v2.build.debug_level= +espresso_lite_v2.menu.CpuFrequency.80=80 MHz +espresso_lite_v2.menu.CpuFrequency.80.build.f_cpu=80000000L +espresso_lite_v2.menu.CpuFrequency.160=160 MHz +espresso_lite_v2.menu.CpuFrequency.160.build.f_cpu=160000000L +espresso_lite_v2.build.flash_mode=dio +espresso_lite_v2.build.flash_freq=40 +espresso_lite_v2.menu.FlashSize.4M1M=4M (1M SPIFFS) +espresso_lite_v2.menu.FlashSize.4M1M.build.flash_size=4M +espresso_lite_v2.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000 +espresso_lite_v2.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld +espresso_lite_v2.menu.FlashSize.4M1M.build.spiffs_pagesize=256 +espresso_lite_v2.menu.FlashSize.4M1M.upload.maximum_size=1044464 +espresso_lite_v2.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000 +espresso_lite_v2.menu.FlashSize.4M1M.build.spiffs_start=0x300000 +espresso_lite_v2.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000 +espresso_lite_v2.menu.FlashSize.4M1M.build.spiffs_blocksize=8192 +espresso_lite_v2.menu.FlashSize.4M3M=4M (3M SPIFFS) +espresso_lite_v2.menu.FlashSize.4M3M.build.flash_size=4M +espresso_lite_v2.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000 +espresso_lite_v2.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld +espresso_lite_v2.menu.FlashSize.4M3M.build.spiffs_pagesize=256 +espresso_lite_v2.menu.FlashSize.4M3M.upload.maximum_size=1044464 +espresso_lite_v2.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000 +espresso_lite_v2.menu.FlashSize.4M3M.build.spiffs_start=0x100000 +espresso_lite_v2.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000 +espresso_lite_v2.menu.FlashSize.4M3M.build.spiffs_blocksize=8192 +espresso_lite_v2.menu.ResetMethod.ck=ck +espresso_lite_v2.menu.ResetMethod.ck.upload.resetmethod=ck +espresso_lite_v2.menu.ResetMethod.nodemcu=nodemcu +espresso_lite_v2.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu +espresso_lite_v2.menu.LwIPVariant.v2mss536=v2 Lower Memory +espresso_lite_v2.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +espresso_lite_v2.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +espresso_lite_v2.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +espresso_lite_v2.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +espresso_lite_v2.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +espresso_lite_v2.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +espresso_lite_v2.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +espresso_lite_v2.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +espresso_lite_v2.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +espresso_lite_v2.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +espresso_lite_v2.menu.LwIPVariant.OpenSource=v1.4 Compile from source +espresso_lite_v2.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +espresso_lite_v2.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +espresso_lite_v2.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +espresso_lite_v2.menu.Debug.Disabled=Disabled +espresso_lite_v2.menu.Debug.Disabled.build.debug_port= +espresso_lite_v2.menu.Debug.Serial=Serial +espresso_lite_v2.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +espresso_lite_v2.menu.Debug.Serial1=Serial1 +espresso_lite_v2.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +espresso_lite_v2.menu.DebugLevel.None____=None +espresso_lite_v2.menu.DebugLevel.None____.build.debug_level= +espresso_lite_v2.menu.DebugLevel.SSL=SSL +espresso_lite_v2.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +espresso_lite_v2.menu.DebugLevel.TLS_MEM=TLS_MEM +espresso_lite_v2.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +espresso_lite_v2.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +espresso_lite_v2.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +espresso_lite_v2.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +espresso_lite_v2.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +espresso_lite_v2.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +espresso_lite_v2.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +espresso_lite_v2.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +espresso_lite_v2.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +espresso_lite_v2.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +espresso_lite_v2.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +espresso_lite_v2.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +espresso_lite_v2.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +espresso_lite_v2.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +espresso_lite_v2.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +espresso_lite_v2.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +espresso_lite_v2.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espresso_lite_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +espresso_lite_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +espresso_lite_v2.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +espresso_lite_v2.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +espresso_lite_v2.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +espresso_lite_v2.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espresso_lite_v2.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +espresso_lite_v2.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espresso_lite_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +espresso_lite_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espresso_lite_v2.menu.DebugLevel.CORE=CORE +espresso_lite_v2.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +espresso_lite_v2.menu.DebugLevel.WIFI=WIFI +espresso_lite_v2.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +espresso_lite_v2.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +espresso_lite_v2.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +espresso_lite_v2.menu.DebugLevel.UPDATER=UPDATER +espresso_lite_v2.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +espresso_lite_v2.menu.DebugLevel.OTA=OTA +espresso_lite_v2.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +espresso_lite_v2.menu.DebugLevel.OOM=OOM +espresso_lite_v2.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +espresso_lite_v2.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +espresso_lite_v2.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +espresso_lite_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +espresso_lite_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +espresso_lite_v2.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +espresso_lite_v2.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +espresso_lite_v2.menu.FlashErase.none=Only Sketch +espresso_lite_v2.menu.FlashErase.none.upload.erase_cmd= +espresso_lite_v2.menu.FlashErase.sdk=Sketch + WiFi Settings +espresso_lite_v2.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +espresso_lite_v2.menu.FlashErase.all=All Flash Contents +espresso_lite_v2.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +espresso_lite_v2.menu.UploadSpeed.115200=115200 +espresso_lite_v2.menu.UploadSpeed.115200.upload.speed=115200 +espresso_lite_v2.menu.UploadSpeed.9600=9600 +espresso_lite_v2.menu.UploadSpeed.9600.upload.speed=9600 +espresso_lite_v2.menu.UploadSpeed.57600=57600 +espresso_lite_v2.menu.UploadSpeed.57600.upload.speed=57600 +espresso_lite_v2.menu.UploadSpeed.230400.linux=230400 +espresso_lite_v2.menu.UploadSpeed.230400.macosx=230400 +espresso_lite_v2.menu.UploadSpeed.230400.upload.speed=230400 +espresso_lite_v2.menu.UploadSpeed.256000.windows=256000 +espresso_lite_v2.menu.UploadSpeed.256000.upload.speed=256000 +espresso_lite_v2.menu.UploadSpeed.460800.linux=460800 +espresso_lite_v2.menu.UploadSpeed.460800.macosx=460800 +espresso_lite_v2.menu.UploadSpeed.460800.upload.speed=460800 +espresso_lite_v2.menu.UploadSpeed.512000.windows=512000 +espresso_lite_v2.menu.UploadSpeed.512000.upload.speed=512000 +espresso_lite_v2.menu.UploadSpeed.921600=921600 +espresso_lite_v2.menu.UploadSpeed.921600.upload.speed=921600 + +############################################################## +phoenix_v1.name=Phoenix 1.0 +phoenix_v1.build.board=ESP8266_PHOENIX_V1 +phoenix_v1.build.variant=phoenix_v1 +phoenix_v1.upload.tool=esptool +phoenix_v1.upload.maximum_data_size=81920 +phoenix_v1.upload.wait_for_upload_port=true +phoenix_v1.upload.erase_cmd= +phoenix_v1.serial.disableDTR=true +phoenix_v1.serial.disableRTS=true +phoenix_v1.build.mcu=esp8266 +phoenix_v1.build.core=esp8266 +phoenix_v1.build.spiffs_pagesize=256 +phoenix_v1.build.debug_port= +phoenix_v1.build.debug_level= +phoenix_v1.menu.CpuFrequency.80=80 MHz +phoenix_v1.menu.CpuFrequency.80.build.f_cpu=80000000L +phoenix_v1.menu.CpuFrequency.160=160 MHz +phoenix_v1.menu.CpuFrequency.160.build.f_cpu=160000000L +phoenix_v1.build.flash_mode=dio +phoenix_v1.build.flash_freq=40 +phoenix_v1.menu.FlashSize.4M1M=4M (1M SPIFFS) +phoenix_v1.menu.FlashSize.4M1M.build.flash_size=4M +phoenix_v1.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000 +phoenix_v1.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld +phoenix_v1.menu.FlashSize.4M1M.build.spiffs_pagesize=256 +phoenix_v1.menu.FlashSize.4M1M.upload.maximum_size=1044464 +phoenix_v1.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000 +phoenix_v1.menu.FlashSize.4M1M.build.spiffs_start=0x300000 +phoenix_v1.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000 +phoenix_v1.menu.FlashSize.4M1M.build.spiffs_blocksize=8192 +phoenix_v1.menu.FlashSize.4M3M=4M (3M SPIFFS) +phoenix_v1.menu.FlashSize.4M3M.build.flash_size=4M +phoenix_v1.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000 +phoenix_v1.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld +phoenix_v1.menu.FlashSize.4M3M.build.spiffs_pagesize=256 +phoenix_v1.menu.FlashSize.4M3M.upload.maximum_size=1044464 +phoenix_v1.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000 +phoenix_v1.menu.FlashSize.4M3M.build.spiffs_start=0x100000 +phoenix_v1.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000 +phoenix_v1.menu.FlashSize.4M3M.build.spiffs_blocksize=8192 +phoenix_v1.menu.ResetMethod.ck=ck +phoenix_v1.menu.ResetMethod.ck.upload.resetmethod=ck +phoenix_v1.menu.ResetMethod.nodemcu=nodemcu +phoenix_v1.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu +phoenix_v1.menu.LwIPVariant.v2mss536=v2 Lower Memory +phoenix_v1.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +phoenix_v1.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +phoenix_v1.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +phoenix_v1.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +phoenix_v1.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +phoenix_v1.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +phoenix_v1.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +phoenix_v1.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +phoenix_v1.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +phoenix_v1.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +phoenix_v1.menu.LwIPVariant.OpenSource=v1.4 Compile from source +phoenix_v1.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +phoenix_v1.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +phoenix_v1.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +phoenix_v1.menu.Debug.Disabled=Disabled +phoenix_v1.menu.Debug.Disabled.build.debug_port= +phoenix_v1.menu.Debug.Serial=Serial +phoenix_v1.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +phoenix_v1.menu.Debug.Serial1=Serial1 +phoenix_v1.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +phoenix_v1.menu.DebugLevel.None____=None +phoenix_v1.menu.DebugLevel.None____.build.debug_level= +phoenix_v1.menu.DebugLevel.SSL=SSL +phoenix_v1.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +phoenix_v1.menu.DebugLevel.TLS_MEM=TLS_MEM +phoenix_v1.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +phoenix_v1.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +phoenix_v1.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +phoenix_v1.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +phoenix_v1.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +phoenix_v1.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +phoenix_v1.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +phoenix_v1.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +phoenix_v1.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +phoenix_v1.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +phoenix_v1.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +phoenix_v1.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +phoenix_v1.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +phoenix_v1.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +phoenix_v1.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +phoenix_v1.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +phoenix_v1.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +phoenix_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +phoenix_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +phoenix_v1.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +phoenix_v1.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +phoenix_v1.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +phoenix_v1.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +phoenix_v1.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +phoenix_v1.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +phoenix_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +phoenix_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +phoenix_v1.menu.DebugLevel.CORE=CORE +phoenix_v1.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +phoenix_v1.menu.DebugLevel.WIFI=WIFI +phoenix_v1.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +phoenix_v1.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +phoenix_v1.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +phoenix_v1.menu.DebugLevel.UPDATER=UPDATER +phoenix_v1.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +phoenix_v1.menu.DebugLevel.OTA=OTA +phoenix_v1.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +phoenix_v1.menu.DebugLevel.OOM=OOM +phoenix_v1.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +phoenix_v1.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +phoenix_v1.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +phoenix_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +phoenix_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +phoenix_v1.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +phoenix_v1.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +phoenix_v1.menu.FlashErase.none=Only Sketch +phoenix_v1.menu.FlashErase.none.upload.erase_cmd= +phoenix_v1.menu.FlashErase.sdk=Sketch + WiFi Settings +phoenix_v1.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +phoenix_v1.menu.FlashErase.all=All Flash Contents +phoenix_v1.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +phoenix_v1.menu.UploadSpeed.115200=115200 +phoenix_v1.menu.UploadSpeed.115200.upload.speed=115200 +phoenix_v1.menu.UploadSpeed.9600=9600 +phoenix_v1.menu.UploadSpeed.9600.upload.speed=9600 +phoenix_v1.menu.UploadSpeed.57600=57600 +phoenix_v1.menu.UploadSpeed.57600.upload.speed=57600 +phoenix_v1.menu.UploadSpeed.230400.linux=230400 +phoenix_v1.menu.UploadSpeed.230400.macosx=230400 +phoenix_v1.menu.UploadSpeed.230400.upload.speed=230400 +phoenix_v1.menu.UploadSpeed.256000.windows=256000 +phoenix_v1.menu.UploadSpeed.256000.upload.speed=256000 +phoenix_v1.menu.UploadSpeed.460800.linux=460800 +phoenix_v1.menu.UploadSpeed.460800.macosx=460800 +phoenix_v1.menu.UploadSpeed.460800.upload.speed=460800 +phoenix_v1.menu.UploadSpeed.512000.windows=512000 +phoenix_v1.menu.UploadSpeed.512000.upload.speed=512000 +phoenix_v1.menu.UploadSpeed.921600=921600 +phoenix_v1.menu.UploadSpeed.921600.upload.speed=921600 + +############################################################## +phoenix_v2.name=Phoenix 2.0 +phoenix_v2.build.board=ESP8266_PHOENIX_V2 +phoenix_v2.build.variant=phoenix_v2 +phoenix_v2.upload.tool=esptool +phoenix_v2.upload.maximum_data_size=81920 +phoenix_v2.upload.wait_for_upload_port=true +phoenix_v2.upload.erase_cmd= +phoenix_v2.serial.disableDTR=true +phoenix_v2.serial.disableRTS=true +phoenix_v2.build.mcu=esp8266 +phoenix_v2.build.core=esp8266 +phoenix_v2.build.spiffs_pagesize=256 +phoenix_v2.build.debug_port= +phoenix_v2.build.debug_level= +phoenix_v2.menu.CpuFrequency.80=80 MHz +phoenix_v2.menu.CpuFrequency.80.build.f_cpu=80000000L +phoenix_v2.menu.CpuFrequency.160=160 MHz +phoenix_v2.menu.CpuFrequency.160.build.f_cpu=160000000L +phoenix_v2.build.flash_mode=dio +phoenix_v2.build.flash_freq=40 +phoenix_v2.menu.FlashSize.4M1M=4M (1M SPIFFS) +phoenix_v2.menu.FlashSize.4M1M.build.flash_size=4M +phoenix_v2.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000 +phoenix_v2.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld +phoenix_v2.menu.FlashSize.4M1M.build.spiffs_pagesize=256 +phoenix_v2.menu.FlashSize.4M1M.upload.maximum_size=1044464 +phoenix_v2.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000 +phoenix_v2.menu.FlashSize.4M1M.build.spiffs_start=0x300000 +phoenix_v2.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000 +phoenix_v2.menu.FlashSize.4M1M.build.spiffs_blocksize=8192 +phoenix_v2.menu.FlashSize.4M3M=4M (3M SPIFFS) +phoenix_v2.menu.FlashSize.4M3M.build.flash_size=4M +phoenix_v2.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000 +phoenix_v2.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld +phoenix_v2.menu.FlashSize.4M3M.build.spiffs_pagesize=256 +phoenix_v2.menu.FlashSize.4M3M.upload.maximum_size=1044464 +phoenix_v2.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000 +phoenix_v2.menu.FlashSize.4M3M.build.spiffs_start=0x100000 +phoenix_v2.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000 +phoenix_v2.menu.FlashSize.4M3M.build.spiffs_blocksize=8192 +phoenix_v2.menu.ResetMethod.ck=ck +phoenix_v2.menu.ResetMethod.ck.upload.resetmethod=ck +phoenix_v2.menu.ResetMethod.nodemcu=nodemcu +phoenix_v2.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu +phoenix_v2.menu.LwIPVariant.v2mss536=v2 Lower Memory +phoenix_v2.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +phoenix_v2.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +phoenix_v2.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +phoenix_v2.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +phoenix_v2.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +phoenix_v2.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +phoenix_v2.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +phoenix_v2.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +phoenix_v2.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +phoenix_v2.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +phoenix_v2.menu.LwIPVariant.OpenSource=v1.4 Compile from source +phoenix_v2.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +phoenix_v2.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +phoenix_v2.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +phoenix_v2.menu.Debug.Disabled=Disabled +phoenix_v2.menu.Debug.Disabled.build.debug_port= +phoenix_v2.menu.Debug.Serial=Serial +phoenix_v2.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +phoenix_v2.menu.Debug.Serial1=Serial1 +phoenix_v2.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +phoenix_v2.menu.DebugLevel.None____=None +phoenix_v2.menu.DebugLevel.None____.build.debug_level= +phoenix_v2.menu.DebugLevel.SSL=SSL +phoenix_v2.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +phoenix_v2.menu.DebugLevel.TLS_MEM=TLS_MEM +phoenix_v2.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +phoenix_v2.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +phoenix_v2.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +phoenix_v2.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +phoenix_v2.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +phoenix_v2.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +phoenix_v2.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +phoenix_v2.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +phoenix_v2.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +phoenix_v2.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +phoenix_v2.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +phoenix_v2.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +phoenix_v2.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +phoenix_v2.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +phoenix_v2.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +phoenix_v2.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +phoenix_v2.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +phoenix_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +phoenix_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +phoenix_v2.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +phoenix_v2.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +phoenix_v2.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +phoenix_v2.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +phoenix_v2.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +phoenix_v2.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +phoenix_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +phoenix_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +phoenix_v2.menu.DebugLevel.CORE=CORE +phoenix_v2.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +phoenix_v2.menu.DebugLevel.WIFI=WIFI +phoenix_v2.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +phoenix_v2.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +phoenix_v2.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +phoenix_v2.menu.DebugLevel.UPDATER=UPDATER +phoenix_v2.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +phoenix_v2.menu.DebugLevel.OTA=OTA +phoenix_v2.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +phoenix_v2.menu.DebugLevel.OOM=OOM +phoenix_v2.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +phoenix_v2.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +phoenix_v2.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +phoenix_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +phoenix_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +phoenix_v2.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +phoenix_v2.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +phoenix_v2.menu.FlashErase.none=Only Sketch +phoenix_v2.menu.FlashErase.none.upload.erase_cmd= +phoenix_v2.menu.FlashErase.sdk=Sketch + WiFi Settings +phoenix_v2.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +phoenix_v2.menu.FlashErase.all=All Flash Contents +phoenix_v2.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +phoenix_v2.menu.UploadSpeed.115200=115200 +phoenix_v2.menu.UploadSpeed.115200.upload.speed=115200 +phoenix_v2.menu.UploadSpeed.9600=9600 +phoenix_v2.menu.UploadSpeed.9600.upload.speed=9600 +phoenix_v2.menu.UploadSpeed.57600=57600 +phoenix_v2.menu.UploadSpeed.57600.upload.speed=57600 +phoenix_v2.menu.UploadSpeed.230400.linux=230400 +phoenix_v2.menu.UploadSpeed.230400.macosx=230400 +phoenix_v2.menu.UploadSpeed.230400.upload.speed=230400 +phoenix_v2.menu.UploadSpeed.256000.windows=256000 +phoenix_v2.menu.UploadSpeed.256000.upload.speed=256000 +phoenix_v2.menu.UploadSpeed.460800.linux=460800 +phoenix_v2.menu.UploadSpeed.460800.macosx=460800 +phoenix_v2.menu.UploadSpeed.460800.upload.speed=460800 +phoenix_v2.menu.UploadSpeed.512000.windows=512000 +phoenix_v2.menu.UploadSpeed.512000.upload.speed=512000 +phoenix_v2.menu.UploadSpeed.921600=921600 +phoenix_v2.menu.UploadSpeed.921600.upload.speed=921600 + +############################################################## +nodemcu.name=NodeMCU 0.9 (ESP-12 Module) +nodemcu.build.board=ESP8266_NODEMCU +nodemcu.build.variant=nodemcu +nodemcu.upload.tool=esptool +nodemcu.upload.maximum_data_size=81920 +nodemcu.upload.wait_for_upload_port=true +nodemcu.upload.erase_cmd= +nodemcu.serial.disableDTR=true +nodemcu.serial.disableRTS=true +nodemcu.build.mcu=esp8266 +nodemcu.build.core=esp8266 +nodemcu.build.spiffs_pagesize=256 +nodemcu.build.debug_port= +nodemcu.build.debug_level= +nodemcu.menu.CpuFrequency.80=80 MHz +nodemcu.menu.CpuFrequency.80.build.f_cpu=80000000L +nodemcu.menu.CpuFrequency.160=160 MHz +nodemcu.menu.CpuFrequency.160.build.f_cpu=160000000L +nodemcu.upload.resetmethod=nodemcu +nodemcu.build.flash_mode=qio +nodemcu.build.flash_freq=40 +nodemcu.menu.FlashSize.4M1M=4M (1M SPIFFS) +nodemcu.menu.FlashSize.4M1M.build.flash_size=4M +nodemcu.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000 +nodemcu.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld +nodemcu.menu.FlashSize.4M1M.build.spiffs_pagesize=256 +nodemcu.menu.FlashSize.4M1M.upload.maximum_size=1044464 +nodemcu.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000 +nodemcu.menu.FlashSize.4M1M.build.spiffs_start=0x300000 +nodemcu.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000 +nodemcu.menu.FlashSize.4M1M.build.spiffs_blocksize=8192 +nodemcu.menu.FlashSize.4M3M=4M (3M SPIFFS) +nodemcu.menu.FlashSize.4M3M.build.flash_size=4M +nodemcu.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000 +nodemcu.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld +nodemcu.menu.FlashSize.4M3M.build.spiffs_pagesize=256 +nodemcu.menu.FlashSize.4M3M.upload.maximum_size=1044464 +nodemcu.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000 +nodemcu.menu.FlashSize.4M3M.build.spiffs_start=0x100000 +nodemcu.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000 +nodemcu.menu.FlashSize.4M3M.build.spiffs_blocksize=8192 +nodemcu.menu.LwIPVariant.v2mss536=v2 Lower Memory +nodemcu.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +nodemcu.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +nodemcu.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +nodemcu.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +nodemcu.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +nodemcu.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +nodemcu.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +nodemcu.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +nodemcu.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +nodemcu.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +nodemcu.menu.LwIPVariant.OpenSource=v1.4 Compile from source +nodemcu.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +nodemcu.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +nodemcu.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +nodemcu.menu.Debug.Disabled=Disabled +nodemcu.menu.Debug.Disabled.build.debug_port= +nodemcu.menu.Debug.Serial=Serial +nodemcu.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +nodemcu.menu.Debug.Serial1=Serial1 +nodemcu.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +nodemcu.menu.DebugLevel.None____=None +nodemcu.menu.DebugLevel.None____.build.debug_level= +nodemcu.menu.DebugLevel.SSL=SSL +nodemcu.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +nodemcu.menu.DebugLevel.TLS_MEM=TLS_MEM +nodemcu.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +nodemcu.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +nodemcu.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +nodemcu.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +nodemcu.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +nodemcu.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +nodemcu.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +nodemcu.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +nodemcu.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +nodemcu.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +nodemcu.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +nodemcu.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +nodemcu.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +nodemcu.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +nodemcu.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +nodemcu.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +nodemcu.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +nodemcu.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +nodemcu.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +nodemcu.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +nodemcu.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +nodemcu.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +nodemcu.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +nodemcu.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +nodemcu.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +nodemcu.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +nodemcu.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +nodemcu.menu.DebugLevel.CORE=CORE +nodemcu.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +nodemcu.menu.DebugLevel.WIFI=WIFI +nodemcu.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +nodemcu.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +nodemcu.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +nodemcu.menu.DebugLevel.UPDATER=UPDATER +nodemcu.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +nodemcu.menu.DebugLevel.OTA=OTA +nodemcu.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +nodemcu.menu.DebugLevel.OOM=OOM +nodemcu.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +nodemcu.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +nodemcu.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +nodemcu.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +nodemcu.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +nodemcu.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +nodemcu.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +nodemcu.menu.FlashErase.none=Only Sketch +nodemcu.menu.FlashErase.none.upload.erase_cmd= +nodemcu.menu.FlashErase.sdk=Sketch + WiFi Settings +nodemcu.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +nodemcu.menu.FlashErase.all=All Flash Contents +nodemcu.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +nodemcu.menu.UploadSpeed.115200=115200 +nodemcu.menu.UploadSpeed.115200.upload.speed=115200 +nodemcu.menu.UploadSpeed.9600=9600 +nodemcu.menu.UploadSpeed.9600.upload.speed=9600 +nodemcu.menu.UploadSpeed.57600=57600 +nodemcu.menu.UploadSpeed.57600.upload.speed=57600 +nodemcu.menu.UploadSpeed.230400.linux=230400 +nodemcu.menu.UploadSpeed.230400.macosx=230400 +nodemcu.menu.UploadSpeed.230400.upload.speed=230400 +nodemcu.menu.UploadSpeed.256000.windows=256000 +nodemcu.menu.UploadSpeed.256000.upload.speed=256000 +nodemcu.menu.UploadSpeed.460800.linux=460800 +nodemcu.menu.UploadSpeed.460800.macosx=460800 +nodemcu.menu.UploadSpeed.460800.upload.speed=460800 +nodemcu.menu.UploadSpeed.512000.windows=512000 +nodemcu.menu.UploadSpeed.512000.upload.speed=512000 +nodemcu.menu.UploadSpeed.921600=921600 +nodemcu.menu.UploadSpeed.921600.upload.speed=921600 + +############################################################## +nodemcuv2.name=NodeMCU 1.0 (ESP-12E Module) +nodemcuv2.build.board=ESP8266_NODEMCU +nodemcuv2.build.variant=nodemcu +nodemcuv2.upload.tool=esptool +nodemcuv2.upload.maximum_data_size=81920 +nodemcuv2.upload.wait_for_upload_port=true +nodemcuv2.upload.erase_cmd= +nodemcuv2.serial.disableDTR=true +nodemcuv2.serial.disableRTS=true +nodemcuv2.build.mcu=esp8266 +nodemcuv2.build.core=esp8266 +nodemcuv2.build.spiffs_pagesize=256 +nodemcuv2.build.debug_port= +nodemcuv2.build.debug_level= +nodemcuv2.menu.CpuFrequency.80=80 MHz +nodemcuv2.menu.CpuFrequency.80.build.f_cpu=80000000L +nodemcuv2.menu.CpuFrequency.160=160 MHz +nodemcuv2.menu.CpuFrequency.160.build.f_cpu=160000000L +nodemcuv2.upload.resetmethod=nodemcu +nodemcuv2.build.flash_mode=dio +nodemcuv2.build.flash_freq=40 +nodemcuv2.menu.FlashSize.4M1M=4M (1M SPIFFS) +nodemcuv2.menu.FlashSize.4M1M.build.flash_size=4M +nodemcuv2.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000 +nodemcuv2.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld +nodemcuv2.menu.FlashSize.4M1M.build.spiffs_pagesize=256 +nodemcuv2.menu.FlashSize.4M1M.upload.maximum_size=1044464 +nodemcuv2.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000 +nodemcuv2.menu.FlashSize.4M1M.build.spiffs_start=0x300000 +nodemcuv2.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000 +nodemcuv2.menu.FlashSize.4M1M.build.spiffs_blocksize=8192 +nodemcuv2.menu.FlashSize.4M3M=4M (3M SPIFFS) +nodemcuv2.menu.FlashSize.4M3M.build.flash_size=4M +nodemcuv2.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000 +nodemcuv2.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld +nodemcuv2.menu.FlashSize.4M3M.build.spiffs_pagesize=256 +nodemcuv2.menu.FlashSize.4M3M.upload.maximum_size=1044464 +nodemcuv2.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000 +nodemcuv2.menu.FlashSize.4M3M.build.spiffs_start=0x100000 +nodemcuv2.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000 +nodemcuv2.menu.FlashSize.4M3M.build.spiffs_blocksize=8192 +nodemcuv2.menu.LwIPVariant.v2mss536=v2 Lower Memory +nodemcuv2.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +nodemcuv2.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +nodemcuv2.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +nodemcuv2.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +nodemcuv2.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +nodemcuv2.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +nodemcuv2.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +nodemcuv2.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +nodemcuv2.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +nodemcuv2.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +nodemcuv2.menu.LwIPVariant.OpenSource=v1.4 Compile from source +nodemcuv2.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +nodemcuv2.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +nodemcuv2.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +nodemcuv2.menu.Debug.Disabled=Disabled +nodemcuv2.menu.Debug.Disabled.build.debug_port= +nodemcuv2.menu.Debug.Serial=Serial +nodemcuv2.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +nodemcuv2.menu.Debug.Serial1=Serial1 +nodemcuv2.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +nodemcuv2.menu.DebugLevel.None____=None +nodemcuv2.menu.DebugLevel.None____.build.debug_level= +nodemcuv2.menu.DebugLevel.SSL=SSL +nodemcuv2.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +nodemcuv2.menu.DebugLevel.TLS_MEM=TLS_MEM +nodemcuv2.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +nodemcuv2.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +nodemcuv2.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +nodemcuv2.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +nodemcuv2.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +nodemcuv2.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +nodemcuv2.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +nodemcuv2.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +nodemcuv2.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +nodemcuv2.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +nodemcuv2.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +nodemcuv2.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +nodemcuv2.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +nodemcuv2.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +nodemcuv2.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +nodemcuv2.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +nodemcuv2.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +nodemcuv2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +nodemcuv2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +nodemcuv2.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +nodemcuv2.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +nodemcuv2.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +nodemcuv2.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +nodemcuv2.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +nodemcuv2.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +nodemcuv2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +nodemcuv2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +nodemcuv2.menu.DebugLevel.CORE=CORE +nodemcuv2.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +nodemcuv2.menu.DebugLevel.WIFI=WIFI +nodemcuv2.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +nodemcuv2.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +nodemcuv2.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +nodemcuv2.menu.DebugLevel.UPDATER=UPDATER +nodemcuv2.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +nodemcuv2.menu.DebugLevel.OTA=OTA +nodemcuv2.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +nodemcuv2.menu.DebugLevel.OOM=OOM +nodemcuv2.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +nodemcuv2.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +nodemcuv2.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +nodemcuv2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +nodemcuv2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +nodemcuv2.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +nodemcuv2.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +nodemcuv2.menu.FlashErase.none=Only Sketch +nodemcuv2.menu.FlashErase.none.upload.erase_cmd= +nodemcuv2.menu.FlashErase.sdk=Sketch + WiFi Settings +nodemcuv2.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +nodemcuv2.menu.FlashErase.all=All Flash Contents +nodemcuv2.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +nodemcuv2.menu.UploadSpeed.115200=115200 +nodemcuv2.menu.UploadSpeed.115200.upload.speed=115200 +nodemcuv2.menu.UploadSpeed.9600=9600 +nodemcuv2.menu.UploadSpeed.9600.upload.speed=9600 +nodemcuv2.menu.UploadSpeed.57600=57600 +nodemcuv2.menu.UploadSpeed.57600.upload.speed=57600 +nodemcuv2.menu.UploadSpeed.230400.linux=230400 +nodemcuv2.menu.UploadSpeed.230400.macosx=230400 +nodemcuv2.menu.UploadSpeed.230400.upload.speed=230400 +nodemcuv2.menu.UploadSpeed.256000.windows=256000 +nodemcuv2.menu.UploadSpeed.256000.upload.speed=256000 +nodemcuv2.menu.UploadSpeed.460800.linux=460800 +nodemcuv2.menu.UploadSpeed.460800.macosx=460800 +nodemcuv2.menu.UploadSpeed.460800.upload.speed=460800 +nodemcuv2.menu.UploadSpeed.512000.windows=512000 +nodemcuv2.menu.UploadSpeed.512000.upload.speed=512000 +nodemcuv2.menu.UploadSpeed.921600=921600 +nodemcuv2.menu.UploadSpeed.921600.upload.speed=921600 + +############################################################## +modwifi.name=Olimex MOD-WIFI-ESP8266(-DEV) +modwifi.build.board=MOD_WIFI_ESP8266 +modwifi.upload.tool=esptool +modwifi.upload.maximum_data_size=81920 +modwifi.upload.wait_for_upload_port=true +modwifi.upload.erase_cmd= +modwifi.serial.disableDTR=true +modwifi.serial.disableRTS=true +modwifi.build.mcu=esp8266 +modwifi.build.core=esp8266 +modwifi.build.variant=generic +modwifi.build.spiffs_pagesize=256 +modwifi.build.debug_port= +modwifi.build.debug_level= +modwifi.menu.CpuFrequency.80=80 MHz +modwifi.menu.CpuFrequency.80.build.f_cpu=80000000L +modwifi.menu.CpuFrequency.160=160 MHz +modwifi.menu.CpuFrequency.160.build.f_cpu=160000000L +modwifi.upload.resetmethod=ck +modwifi.build.flash_mode=qio +modwifi.build.flash_freq=40 +modwifi.menu.FlashSize.2M=2M (1M SPIFFS) +modwifi.menu.FlashSize.2M.build.flash_size=2M +modwifi.menu.FlashSize.2M.build.flash_size_bytes=0x200000 +modwifi.menu.FlashSize.2M.build.flash_ld=eagle.flash.2m.ld +modwifi.menu.FlashSize.2M.build.spiffs_pagesize=256 +modwifi.menu.FlashSize.2M.upload.maximum_size=1044464 +modwifi.menu.FlashSize.2M.build.rfcal_addr=0x1FC000 +modwifi.menu.FlashSize.2M.build.spiffs_start=0x100000 +modwifi.menu.FlashSize.2M.build.spiffs_end=0x1FB000 +modwifi.menu.FlashSize.2M.build.spiffs_blocksize=8192 +modwifi.menu.LwIPVariant.v2mss536=v2 Lower Memory +modwifi.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +modwifi.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +modwifi.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +modwifi.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +modwifi.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +modwifi.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +modwifi.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +modwifi.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +modwifi.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +modwifi.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +modwifi.menu.LwIPVariant.OpenSource=v1.4 Compile from source +modwifi.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +modwifi.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +modwifi.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +modwifi.menu.Debug.Disabled=Disabled +modwifi.menu.Debug.Disabled.build.debug_port= +modwifi.menu.Debug.Serial=Serial +modwifi.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +modwifi.menu.Debug.Serial1=Serial1 +modwifi.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +modwifi.menu.DebugLevel.None____=None +modwifi.menu.DebugLevel.None____.build.debug_level= +modwifi.menu.DebugLevel.SSL=SSL +modwifi.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +modwifi.menu.DebugLevel.TLS_MEM=TLS_MEM +modwifi.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +modwifi.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +modwifi.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +modwifi.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +modwifi.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +modwifi.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +modwifi.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +modwifi.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +modwifi.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +modwifi.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +modwifi.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +modwifi.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +modwifi.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +modwifi.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +modwifi.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +modwifi.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +modwifi.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +modwifi.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +modwifi.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +modwifi.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +modwifi.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +modwifi.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +modwifi.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +modwifi.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +modwifi.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +modwifi.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +modwifi.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +modwifi.menu.DebugLevel.CORE=CORE +modwifi.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +modwifi.menu.DebugLevel.WIFI=WIFI +modwifi.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +modwifi.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +modwifi.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +modwifi.menu.DebugLevel.UPDATER=UPDATER +modwifi.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +modwifi.menu.DebugLevel.OTA=OTA +modwifi.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +modwifi.menu.DebugLevel.OOM=OOM +modwifi.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +modwifi.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +modwifi.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +modwifi.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +modwifi.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +modwifi.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +modwifi.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +modwifi.menu.FlashErase.none=Only Sketch +modwifi.menu.FlashErase.none.upload.erase_cmd= +modwifi.menu.FlashErase.sdk=Sketch + WiFi Settings +modwifi.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +modwifi.menu.FlashErase.all=All Flash Contents +modwifi.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +modwifi.menu.UploadSpeed.115200=115200 +modwifi.menu.UploadSpeed.115200.upload.speed=115200 +modwifi.menu.UploadSpeed.9600=9600 +modwifi.menu.UploadSpeed.9600.upload.speed=9600 +modwifi.menu.UploadSpeed.57600=57600 +modwifi.menu.UploadSpeed.57600.upload.speed=57600 +modwifi.menu.UploadSpeed.230400.linux=230400 +modwifi.menu.UploadSpeed.230400.macosx=230400 +modwifi.menu.UploadSpeed.230400.upload.speed=230400 +modwifi.menu.UploadSpeed.256000.windows=256000 +modwifi.menu.UploadSpeed.256000.upload.speed=256000 +modwifi.menu.UploadSpeed.460800.linux=460800 +modwifi.menu.UploadSpeed.460800.macosx=460800 +modwifi.menu.UploadSpeed.460800.upload.speed=460800 +modwifi.menu.UploadSpeed.512000.windows=512000 +modwifi.menu.UploadSpeed.512000.upload.speed=512000 +modwifi.menu.UploadSpeed.921600=921600 +modwifi.menu.UploadSpeed.921600.upload.speed=921600 + +############################################################## +thing.name=SparkFun ESP8266 Thing +thing.build.board=ESP8266_THING +thing.build.variant=thing +thing.upload.tool=esptool +thing.upload.maximum_data_size=81920 +thing.upload.wait_for_upload_port=true +thing.upload.erase_cmd= +thing.serial.disableDTR=true +thing.serial.disableRTS=true +thing.build.mcu=esp8266 +thing.build.core=esp8266 +thing.build.spiffs_pagesize=256 +thing.build.debug_port= +thing.build.debug_level= +thing.menu.CpuFrequency.80=80 MHz +thing.menu.CpuFrequency.80.build.f_cpu=80000000L +thing.menu.CpuFrequency.160=160 MHz +thing.menu.CpuFrequency.160.build.f_cpu=160000000L +thing.upload.resetmethod=ck +thing.build.flash_mode=qio +thing.build.flash_freq=40 +thing.menu.FlashSize.512K0=512K (no SPIFFS) +thing.menu.FlashSize.512K0.build.flash_size=512K +thing.menu.FlashSize.512K0.build.flash_size_bytes=0x80000 +thing.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld +thing.menu.FlashSize.512K0.build.spiffs_pagesize=256 +thing.menu.FlashSize.512K0.upload.maximum_size=499696 +thing.menu.FlashSize.512K0.build.rfcal_addr=0x7C000 +thing.menu.FlashSize.512K64=512K (64K SPIFFS) +thing.menu.FlashSize.512K64.build.flash_size=512K +thing.menu.FlashSize.512K64.build.flash_size_bytes=0x80000 +thing.menu.FlashSize.512K64.build.flash_ld=eagle.flash.512k64.ld +thing.menu.FlashSize.512K64.build.spiffs_pagesize=256 +thing.menu.FlashSize.512K64.upload.maximum_size=434160 +thing.menu.FlashSize.512K64.build.rfcal_addr=0x7C000 +thing.menu.FlashSize.512K64.build.spiffs_start=0x6B000 +thing.menu.FlashSize.512K64.build.spiffs_end=0x7B000 +thing.menu.FlashSize.512K64.build.spiffs_blocksize=4096 +thing.menu.FlashSize.512K128=512K (128K SPIFFS) +thing.menu.FlashSize.512K128.build.flash_size=512K +thing.menu.FlashSize.512K128.build.flash_size_bytes=0x80000 +thing.menu.FlashSize.512K128.build.flash_ld=eagle.flash.512k128.ld +thing.menu.FlashSize.512K128.build.spiffs_pagesize=256 +thing.menu.FlashSize.512K128.upload.maximum_size=368624 +thing.menu.FlashSize.512K128.build.rfcal_addr=0x7C000 +thing.menu.FlashSize.512K128.build.spiffs_start=0x5B000 +thing.menu.FlashSize.512K128.build.spiffs_end=0x7B000 +thing.menu.FlashSize.512K128.build.spiffs_blocksize=4096 +thing.menu.LwIPVariant.v2mss536=v2 Lower Memory +thing.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +thing.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +thing.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +thing.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +thing.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +thing.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +thing.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +thing.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +thing.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +thing.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +thing.menu.LwIPVariant.OpenSource=v1.4 Compile from source +thing.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +thing.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +thing.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +thing.menu.Debug.Disabled=Disabled +thing.menu.Debug.Disabled.build.debug_port= +thing.menu.Debug.Serial=Serial +thing.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +thing.menu.Debug.Serial1=Serial1 +thing.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +thing.menu.DebugLevel.None____=None +thing.menu.DebugLevel.None____.build.debug_level= +thing.menu.DebugLevel.SSL=SSL +thing.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +thing.menu.DebugLevel.TLS_MEM=TLS_MEM +thing.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +thing.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +thing.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +thing.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +thing.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +thing.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +thing.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +thing.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +thing.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +thing.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +thing.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +thing.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +thing.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +thing.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +thing.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +thing.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +thing.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +thing.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +thing.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +thing.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +thing.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +thing.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +thing.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +thing.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +thing.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +thing.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +thing.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +thing.menu.DebugLevel.CORE=CORE +thing.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +thing.menu.DebugLevel.WIFI=WIFI +thing.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +thing.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +thing.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +thing.menu.DebugLevel.UPDATER=UPDATER +thing.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +thing.menu.DebugLevel.OTA=OTA +thing.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +thing.menu.DebugLevel.OOM=OOM +thing.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +thing.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +thing.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +thing.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +thing.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +thing.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +thing.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +thing.menu.FlashErase.none=Only Sketch +thing.menu.FlashErase.none.upload.erase_cmd= +thing.menu.FlashErase.sdk=Sketch + WiFi Settings +thing.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +thing.menu.FlashErase.all=All Flash Contents +thing.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +thing.menu.UploadSpeed.115200=115200 +thing.menu.UploadSpeed.115200.upload.speed=115200 +thing.menu.UploadSpeed.9600=9600 +thing.menu.UploadSpeed.9600.upload.speed=9600 +thing.menu.UploadSpeed.57600=57600 +thing.menu.UploadSpeed.57600.upload.speed=57600 +thing.menu.UploadSpeed.230400.linux=230400 +thing.menu.UploadSpeed.230400.macosx=230400 +thing.menu.UploadSpeed.230400.upload.speed=230400 +thing.menu.UploadSpeed.256000.windows=256000 +thing.menu.UploadSpeed.256000.upload.speed=256000 +thing.menu.UploadSpeed.460800.linux=460800 +thing.menu.UploadSpeed.460800.macosx=460800 +thing.menu.UploadSpeed.460800.upload.speed=460800 +thing.menu.UploadSpeed.512000.windows=512000 +thing.menu.UploadSpeed.512000.upload.speed=512000 +thing.menu.UploadSpeed.921600=921600 +thing.menu.UploadSpeed.921600.upload.speed=921600 + +############################################################## +thingdev.name=SparkFun ESP8266 Thing Dev +thingdev.build.board=ESP8266_THING_DEV +thingdev.build.variant=thing +thingdev.upload.tool=esptool +thingdev.upload.maximum_data_size=81920 +thingdev.upload.wait_for_upload_port=true +thingdev.upload.erase_cmd= +thingdev.serial.disableDTR=true +thingdev.serial.disableRTS=true +thingdev.build.mcu=esp8266 +thingdev.build.core=esp8266 +thingdev.build.spiffs_pagesize=256 +thingdev.build.debug_port= +thingdev.build.debug_level= +thingdev.menu.CpuFrequency.80=80 MHz +thingdev.menu.CpuFrequency.80.build.f_cpu=80000000L +thingdev.menu.CpuFrequency.160=160 MHz +thingdev.menu.CpuFrequency.160.build.f_cpu=160000000L +thingdev.upload.resetmethod=nodemcu +thingdev.build.flash_mode=dio +thingdev.build.flash_freq=40 +thingdev.menu.FlashSize.512K0=512K (no SPIFFS) +thingdev.menu.FlashSize.512K0.build.flash_size=512K +thingdev.menu.FlashSize.512K0.build.flash_size_bytes=0x80000 +thingdev.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld +thingdev.menu.FlashSize.512K0.build.spiffs_pagesize=256 +thingdev.menu.FlashSize.512K0.upload.maximum_size=499696 +thingdev.menu.FlashSize.512K0.build.rfcal_addr=0x7C000 +thingdev.menu.FlashSize.512K64=512K (64K SPIFFS) +thingdev.menu.FlashSize.512K64.build.flash_size=512K +thingdev.menu.FlashSize.512K64.build.flash_size_bytes=0x80000 +thingdev.menu.FlashSize.512K64.build.flash_ld=eagle.flash.512k64.ld +thingdev.menu.FlashSize.512K64.build.spiffs_pagesize=256 +thingdev.menu.FlashSize.512K64.upload.maximum_size=434160 +thingdev.menu.FlashSize.512K64.build.rfcal_addr=0x7C000 +thingdev.menu.FlashSize.512K64.build.spiffs_start=0x6B000 +thingdev.menu.FlashSize.512K64.build.spiffs_end=0x7B000 +thingdev.menu.FlashSize.512K64.build.spiffs_blocksize=4096 +thingdev.menu.FlashSize.512K128=512K (128K SPIFFS) +thingdev.menu.FlashSize.512K128.build.flash_size=512K +thingdev.menu.FlashSize.512K128.build.flash_size_bytes=0x80000 +thingdev.menu.FlashSize.512K128.build.flash_ld=eagle.flash.512k128.ld +thingdev.menu.FlashSize.512K128.build.spiffs_pagesize=256 +thingdev.menu.FlashSize.512K128.upload.maximum_size=368624 +thingdev.menu.FlashSize.512K128.build.rfcal_addr=0x7C000 +thingdev.menu.FlashSize.512K128.build.spiffs_start=0x5B000 +thingdev.menu.FlashSize.512K128.build.spiffs_end=0x7B000 +thingdev.menu.FlashSize.512K128.build.spiffs_blocksize=4096 +thingdev.menu.LwIPVariant.v2mss536=v2 Lower Memory +thingdev.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +thingdev.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +thingdev.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +thingdev.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +thingdev.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +thingdev.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +thingdev.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +thingdev.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +thingdev.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +thingdev.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +thingdev.menu.LwIPVariant.OpenSource=v1.4 Compile from source +thingdev.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +thingdev.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +thingdev.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +thingdev.menu.Debug.Disabled=Disabled +thingdev.menu.Debug.Disabled.build.debug_port= +thingdev.menu.Debug.Serial=Serial +thingdev.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +thingdev.menu.Debug.Serial1=Serial1 +thingdev.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +thingdev.menu.DebugLevel.None____=None +thingdev.menu.DebugLevel.None____.build.debug_level= +thingdev.menu.DebugLevel.SSL=SSL +thingdev.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +thingdev.menu.DebugLevel.TLS_MEM=TLS_MEM +thingdev.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +thingdev.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +thingdev.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +thingdev.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +thingdev.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +thingdev.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +thingdev.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +thingdev.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +thingdev.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +thingdev.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +thingdev.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +thingdev.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +thingdev.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +thingdev.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +thingdev.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +thingdev.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +thingdev.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +thingdev.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +thingdev.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +thingdev.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +thingdev.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +thingdev.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +thingdev.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +thingdev.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +thingdev.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +thingdev.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +thingdev.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +thingdev.menu.DebugLevel.CORE=CORE +thingdev.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +thingdev.menu.DebugLevel.WIFI=WIFI +thingdev.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +thingdev.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +thingdev.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +thingdev.menu.DebugLevel.UPDATER=UPDATER +thingdev.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +thingdev.menu.DebugLevel.OTA=OTA +thingdev.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +thingdev.menu.DebugLevel.OOM=OOM +thingdev.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +thingdev.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +thingdev.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +thingdev.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +thingdev.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +thingdev.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +thingdev.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +thingdev.menu.FlashErase.none=Only Sketch +thingdev.menu.FlashErase.none.upload.erase_cmd= +thingdev.menu.FlashErase.sdk=Sketch + WiFi Settings +thingdev.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +thingdev.menu.FlashErase.all=All Flash Contents +thingdev.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +thingdev.menu.UploadSpeed.115200=115200 +thingdev.menu.UploadSpeed.115200.upload.speed=115200 +thingdev.menu.UploadSpeed.9600=9600 +thingdev.menu.UploadSpeed.9600.upload.speed=9600 +thingdev.menu.UploadSpeed.57600=57600 +thingdev.menu.UploadSpeed.57600.upload.speed=57600 +thingdev.menu.UploadSpeed.230400.linux=230400 +thingdev.menu.UploadSpeed.230400.macosx=230400 +thingdev.menu.UploadSpeed.230400.upload.speed=230400 +thingdev.menu.UploadSpeed.256000.windows=256000 +thingdev.menu.UploadSpeed.256000.upload.speed=256000 +thingdev.menu.UploadSpeed.460800.linux=460800 +thingdev.menu.UploadSpeed.460800.macosx=460800 +thingdev.menu.UploadSpeed.460800.upload.speed=460800 +thingdev.menu.UploadSpeed.512000.windows=512000 +thingdev.menu.UploadSpeed.512000.upload.speed=512000 +thingdev.menu.UploadSpeed.921600=921600 +thingdev.menu.UploadSpeed.921600.upload.speed=921600 + +############################################################## +esp210.name=SweetPea ESP-210 +esp210.build.board=ESP8266_ESP210 +esp210.upload.tool=esptool +esp210.upload.maximum_data_size=81920 +esp210.upload.wait_for_upload_port=true +esp210.upload.erase_cmd= +esp210.serial.disableDTR=true +esp210.serial.disableRTS=true +esp210.build.mcu=esp8266 +esp210.build.core=esp8266 +esp210.build.variant=generic +esp210.build.spiffs_pagesize=256 +esp210.build.debug_port= +esp210.build.debug_level= +esp210.menu.CpuFrequency.80=80 MHz +esp210.menu.CpuFrequency.80.build.f_cpu=80000000L +esp210.menu.CpuFrequency.160=160 MHz +esp210.menu.CpuFrequency.160.build.f_cpu=160000000L +esp210.upload.resetmethod=ck +esp210.build.flash_mode=qio +esp210.build.flash_freq=40 +esp210.menu.FlashSize.4M1M=4M (1M SPIFFS) +esp210.menu.FlashSize.4M1M.build.flash_size=4M +esp210.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000 +esp210.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld +esp210.menu.FlashSize.4M1M.build.spiffs_pagesize=256 +esp210.menu.FlashSize.4M1M.upload.maximum_size=1044464 +esp210.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000 +esp210.menu.FlashSize.4M1M.build.spiffs_start=0x300000 +esp210.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000 +esp210.menu.FlashSize.4M1M.build.spiffs_blocksize=8192 +esp210.menu.FlashSize.4M3M=4M (3M SPIFFS) +esp210.menu.FlashSize.4M3M.build.flash_size=4M +esp210.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000 +esp210.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld +esp210.menu.FlashSize.4M3M.build.spiffs_pagesize=256 +esp210.menu.FlashSize.4M3M.upload.maximum_size=1044464 +esp210.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000 +esp210.menu.FlashSize.4M3M.build.spiffs_start=0x100000 +esp210.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000 +esp210.menu.FlashSize.4M3M.build.spiffs_blocksize=8192 +esp210.menu.LwIPVariant.v2mss536=v2 Lower Memory +esp210.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +esp210.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +esp210.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +esp210.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +esp210.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +esp210.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +esp210.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +esp210.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +esp210.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +esp210.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +esp210.menu.LwIPVariant.OpenSource=v1.4 Compile from source +esp210.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +esp210.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +esp210.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +esp210.menu.Debug.Disabled=Disabled +esp210.menu.Debug.Disabled.build.debug_port= +esp210.menu.Debug.Serial=Serial +esp210.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +esp210.menu.Debug.Serial1=Serial1 +esp210.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +esp210.menu.DebugLevel.None____=None +esp210.menu.DebugLevel.None____.build.debug_level= +esp210.menu.DebugLevel.SSL=SSL +esp210.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +esp210.menu.DebugLevel.TLS_MEM=TLS_MEM +esp210.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +esp210.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +esp210.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +esp210.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +esp210.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +esp210.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +esp210.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +esp210.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +esp210.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +esp210.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +esp210.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +esp210.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +esp210.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +esp210.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +esp210.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +esp210.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +esp210.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +esp210.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +esp210.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +esp210.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +esp210.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +esp210.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +esp210.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +esp210.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +esp210.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +esp210.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +esp210.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +esp210.menu.DebugLevel.CORE=CORE +esp210.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +esp210.menu.DebugLevel.WIFI=WIFI +esp210.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +esp210.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +esp210.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +esp210.menu.DebugLevel.UPDATER=UPDATER +esp210.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +esp210.menu.DebugLevel.OTA=OTA +esp210.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +esp210.menu.DebugLevel.OOM=OOM +esp210.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +esp210.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +esp210.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +esp210.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +esp210.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +esp210.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +esp210.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +esp210.menu.FlashErase.none=Only Sketch +esp210.menu.FlashErase.none.upload.erase_cmd= +esp210.menu.FlashErase.sdk=Sketch + WiFi Settings +esp210.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +esp210.menu.FlashErase.all=All Flash Contents +esp210.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +esp210.menu.UploadSpeed.57600=57600 +esp210.menu.UploadSpeed.57600.upload.speed=57600 +esp210.menu.UploadSpeed.9600=9600 +esp210.menu.UploadSpeed.9600.upload.speed=9600 +esp210.menu.UploadSpeed.115200=115200 +esp210.menu.UploadSpeed.115200.upload.speed=115200 +esp210.menu.UploadSpeed.230400.linux=230400 +esp210.menu.UploadSpeed.230400.macosx=230400 +esp210.menu.UploadSpeed.230400.upload.speed=230400 +esp210.menu.UploadSpeed.256000.windows=256000 +esp210.menu.UploadSpeed.256000.upload.speed=256000 +esp210.menu.UploadSpeed.460800.linux=460800 +esp210.menu.UploadSpeed.460800.macosx=460800 +esp210.menu.UploadSpeed.460800.upload.speed=460800 +esp210.menu.UploadSpeed.512000.windows=512000 +esp210.menu.UploadSpeed.512000.upload.speed=512000 +esp210.menu.UploadSpeed.921600=921600 +esp210.menu.UploadSpeed.921600.upload.speed=921600 + +############################################################## +d1_mini.name=WeMos D1 R2 & mini +d1_mini.build.board=ESP8266_WEMOS_D1MINI +d1_mini.build.variant=d1_mini +d1_mini.upload.tool=esptool +d1_mini.upload.maximum_data_size=81920 +d1_mini.upload.wait_for_upload_port=true +d1_mini.upload.erase_cmd= +d1_mini.serial.disableDTR=true +d1_mini.serial.disableRTS=true +d1_mini.build.mcu=esp8266 +d1_mini.build.core=esp8266 +d1_mini.build.spiffs_pagesize=256 +d1_mini.build.debug_port= +d1_mini.build.debug_level= +d1_mini.menu.CpuFrequency.80=80 MHz +d1_mini.menu.CpuFrequency.80.build.f_cpu=80000000L +d1_mini.menu.CpuFrequency.160=160 MHz +d1_mini.menu.CpuFrequency.160.build.f_cpu=160000000L +d1_mini.upload.resetmethod=nodemcu +d1_mini.build.flash_mode=dio +d1_mini.build.flash_freq=40 +d1_mini.menu.FlashSize.4M1M=4M (1M SPIFFS) +d1_mini.menu.FlashSize.4M1M.build.flash_size=4M +d1_mini.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000 +d1_mini.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld +d1_mini.menu.FlashSize.4M1M.build.spiffs_pagesize=256 +d1_mini.menu.FlashSize.4M1M.upload.maximum_size=1044464 +d1_mini.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000 +d1_mini.menu.FlashSize.4M1M.build.spiffs_start=0x300000 +d1_mini.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000 +d1_mini.menu.FlashSize.4M1M.build.spiffs_blocksize=8192 +d1_mini.menu.FlashSize.4M3M=4M (3M SPIFFS) +d1_mini.menu.FlashSize.4M3M.build.flash_size=4M +d1_mini.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000 +d1_mini.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld +d1_mini.menu.FlashSize.4M3M.build.spiffs_pagesize=256 +d1_mini.menu.FlashSize.4M3M.upload.maximum_size=1044464 +d1_mini.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000 +d1_mini.menu.FlashSize.4M3M.build.spiffs_start=0x100000 +d1_mini.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000 +d1_mini.menu.FlashSize.4M3M.build.spiffs_blocksize=8192 +d1_mini.menu.LwIPVariant.v2mss536=v2 Lower Memory +d1_mini.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +d1_mini.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +d1_mini.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +d1_mini.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +d1_mini.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +d1_mini.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +d1_mini.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +d1_mini.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +d1_mini.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +d1_mini.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +d1_mini.menu.LwIPVariant.OpenSource=v1.4 Compile from source +d1_mini.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +d1_mini.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +d1_mini.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +d1_mini.menu.Debug.Disabled=Disabled +d1_mini.menu.Debug.Disabled.build.debug_port= +d1_mini.menu.Debug.Serial=Serial +d1_mini.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +d1_mini.menu.Debug.Serial1=Serial1 +d1_mini.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +d1_mini.menu.DebugLevel.None____=None +d1_mini.menu.DebugLevel.None____.build.debug_level= +d1_mini.menu.DebugLevel.SSL=SSL +d1_mini.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +d1_mini.menu.DebugLevel.TLS_MEM=TLS_MEM +d1_mini.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +d1_mini.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +d1_mini.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +d1_mini.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +d1_mini.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +d1_mini.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +d1_mini.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +d1_mini.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +d1_mini.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +d1_mini.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +d1_mini.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +d1_mini.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +d1_mini.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +d1_mini.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +d1_mini.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +d1_mini.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +d1_mini.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +d1_mini.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +d1_mini.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +d1_mini.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +d1_mini.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +d1_mini.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +d1_mini.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +d1_mini.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +d1_mini.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +d1_mini.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +d1_mini.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +d1_mini.menu.DebugLevel.CORE=CORE +d1_mini.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +d1_mini.menu.DebugLevel.WIFI=WIFI +d1_mini.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +d1_mini.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +d1_mini.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +d1_mini.menu.DebugLevel.UPDATER=UPDATER +d1_mini.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +d1_mini.menu.DebugLevel.OTA=OTA +d1_mini.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +d1_mini.menu.DebugLevel.OOM=OOM +d1_mini.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +d1_mini.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +d1_mini.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +d1_mini.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +d1_mini.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +d1_mini.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +d1_mini.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +d1_mini.menu.FlashErase.none=Only Sketch +d1_mini.menu.FlashErase.none.upload.erase_cmd= +d1_mini.menu.FlashErase.sdk=Sketch + WiFi Settings +d1_mini.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +d1_mini.menu.FlashErase.all=All Flash Contents +d1_mini.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +d1_mini.menu.UploadSpeed.921600=921600 +d1_mini.menu.UploadSpeed.921600.upload.speed=921600 +d1_mini.menu.UploadSpeed.9600=9600 +d1_mini.menu.UploadSpeed.9600.upload.speed=9600 +d1_mini.menu.UploadSpeed.57600=57600 +d1_mini.menu.UploadSpeed.57600.upload.speed=57600 +d1_mini.menu.UploadSpeed.115200=115200 +d1_mini.menu.UploadSpeed.115200.upload.speed=115200 +d1_mini.menu.UploadSpeed.230400.linux=230400 +d1_mini.menu.UploadSpeed.230400.macosx=230400 +d1_mini.menu.UploadSpeed.230400.upload.speed=230400 +d1_mini.menu.UploadSpeed.256000.windows=256000 +d1_mini.menu.UploadSpeed.256000.upload.speed=256000 +d1_mini.menu.UploadSpeed.460800.linux=460800 +d1_mini.menu.UploadSpeed.460800.macosx=460800 +d1_mini.menu.UploadSpeed.460800.upload.speed=460800 +d1_mini.menu.UploadSpeed.512000.windows=512000 +d1_mini.menu.UploadSpeed.512000.upload.speed=512000 + +############################################################## +d1_mini_pro.name=WeMos D1 mini Pro +d1_mini_pro.build.board=ESP8266_WEMOS_D1MINIPRO +d1_mini_pro.build.variant=d1_mini +d1_mini_pro.upload.tool=esptool +d1_mini_pro.upload.maximum_data_size=81920 +d1_mini_pro.upload.wait_for_upload_port=true +d1_mini_pro.upload.erase_cmd= +d1_mini_pro.serial.disableDTR=true +d1_mini_pro.serial.disableRTS=true +d1_mini_pro.build.mcu=esp8266 +d1_mini_pro.build.core=esp8266 +d1_mini_pro.build.spiffs_pagesize=256 +d1_mini_pro.build.debug_port= +d1_mini_pro.build.debug_level= +d1_mini_pro.menu.CpuFrequency.80=80 MHz +d1_mini_pro.menu.CpuFrequency.80.build.f_cpu=80000000L +d1_mini_pro.menu.CpuFrequency.160=160 MHz +d1_mini_pro.menu.CpuFrequency.160.build.f_cpu=160000000L +d1_mini_pro.upload.resetmethod=nodemcu +d1_mini_pro.build.flash_mode=dio +d1_mini_pro.build.flash_freq=40 +d1_mini_pro.menu.FlashSize.16M15M=16M (15M SPIFFS) +d1_mini_pro.menu.FlashSize.16M15M.build.flash_size=16M +d1_mini_pro.menu.FlashSize.16M15M.build.flash_size_bytes=0x1000000 +d1_mini_pro.menu.FlashSize.16M15M.build.flash_ld=eagle.flash.16m.ld +d1_mini_pro.menu.FlashSize.16M15M.build.spiffs_pagesize=256 +d1_mini_pro.menu.FlashSize.16M15M.upload.maximum_size=1044464 +d1_mini_pro.menu.FlashSize.16M15M.build.rfcal_addr=0xFFC000 +d1_mini_pro.menu.FlashSize.16M15M.build.spiffs_start=0x100000 +d1_mini_pro.menu.FlashSize.16M15M.build.spiffs_end=0xFFB000 +d1_mini_pro.menu.FlashSize.16M15M.build.spiffs_blocksize=8192 +d1_mini_pro.menu.LwIPVariant.v2mss536=v2 Lower Memory +d1_mini_pro.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +d1_mini_pro.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +d1_mini_pro.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +d1_mini_pro.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +d1_mini_pro.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +d1_mini_pro.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +d1_mini_pro.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +d1_mini_pro.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +d1_mini_pro.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +d1_mini_pro.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +d1_mini_pro.menu.LwIPVariant.OpenSource=v1.4 Compile from source +d1_mini_pro.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +d1_mini_pro.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +d1_mini_pro.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +d1_mini_pro.menu.Debug.Disabled=Disabled +d1_mini_pro.menu.Debug.Disabled.build.debug_port= +d1_mini_pro.menu.Debug.Serial=Serial +d1_mini_pro.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +d1_mini_pro.menu.Debug.Serial1=Serial1 +d1_mini_pro.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +d1_mini_pro.menu.DebugLevel.None____=None +d1_mini_pro.menu.DebugLevel.None____.build.debug_level= +d1_mini_pro.menu.DebugLevel.SSL=SSL +d1_mini_pro.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +d1_mini_pro.menu.DebugLevel.TLS_MEM=TLS_MEM +d1_mini_pro.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +d1_mini_pro.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +d1_mini_pro.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +d1_mini_pro.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +d1_mini_pro.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +d1_mini_pro.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +d1_mini_pro.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +d1_mini_pro.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +d1_mini_pro.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +d1_mini_pro.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +d1_mini_pro.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +d1_mini_pro.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +d1_mini_pro.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +d1_mini_pro.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +d1_mini_pro.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +d1_mini_pro.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +d1_mini_pro.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +d1_mini_pro.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +d1_mini_pro.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +d1_mini_pro.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +d1_mini_pro.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +d1_mini_pro.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +d1_mini_pro.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +d1_mini_pro.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +d1_mini_pro.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +d1_mini_pro.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +d1_mini_pro.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +d1_mini_pro.menu.DebugLevel.CORE=CORE +d1_mini_pro.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +d1_mini_pro.menu.DebugLevel.WIFI=WIFI +d1_mini_pro.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +d1_mini_pro.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +d1_mini_pro.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +d1_mini_pro.menu.DebugLevel.UPDATER=UPDATER +d1_mini_pro.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +d1_mini_pro.menu.DebugLevel.OTA=OTA +d1_mini_pro.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +d1_mini_pro.menu.DebugLevel.OOM=OOM +d1_mini_pro.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +d1_mini_pro.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +d1_mini_pro.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +d1_mini_pro.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +d1_mini_pro.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +d1_mini_pro.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +d1_mini_pro.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +d1_mini_pro.menu.FlashErase.none=Only Sketch +d1_mini_pro.menu.FlashErase.none.upload.erase_cmd= +d1_mini_pro.menu.FlashErase.sdk=Sketch + WiFi Settings +d1_mini_pro.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +d1_mini_pro.menu.FlashErase.all=All Flash Contents +d1_mini_pro.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +d1_mini_pro.menu.UploadSpeed.921600=921600 +d1_mini_pro.menu.UploadSpeed.921600.upload.speed=921600 +d1_mini_pro.menu.UploadSpeed.9600=9600 +d1_mini_pro.menu.UploadSpeed.9600.upload.speed=9600 +d1_mini_pro.menu.UploadSpeed.57600=57600 +d1_mini_pro.menu.UploadSpeed.57600.upload.speed=57600 +d1_mini_pro.menu.UploadSpeed.115200=115200 +d1_mini_pro.menu.UploadSpeed.115200.upload.speed=115200 +d1_mini_pro.menu.UploadSpeed.230400.linux=230400 +d1_mini_pro.menu.UploadSpeed.230400.macosx=230400 +d1_mini_pro.menu.UploadSpeed.230400.upload.speed=230400 +d1_mini_pro.menu.UploadSpeed.256000.windows=256000 +d1_mini_pro.menu.UploadSpeed.256000.upload.speed=256000 +d1_mini_pro.menu.UploadSpeed.460800.linux=460800 +d1_mini_pro.menu.UploadSpeed.460800.macosx=460800 +d1_mini_pro.menu.UploadSpeed.460800.upload.speed=460800 +d1_mini_pro.menu.UploadSpeed.512000.windows=512000 +d1_mini_pro.menu.UploadSpeed.512000.upload.speed=512000 + +############################################################## +d1_mini_lite.name=WeMos D1 mini Lite +d1_mini_lite.build.board=ESP8266_WEMOS_D1MINILITE +d1_mini_lite.build.variant=d1_mini +d1_mini_lite.upload.tool=esptool +d1_mini_lite.upload.maximum_data_size=81920 +d1_mini_lite.upload.wait_for_upload_port=true +d1_mini_lite.upload.erase_cmd= +d1_mini_lite.serial.disableDTR=true +d1_mini_lite.serial.disableRTS=true +d1_mini_lite.build.mcu=esp8266 +d1_mini_lite.build.core=esp8266 +d1_mini_lite.build.spiffs_pagesize=256 +d1_mini_lite.build.debug_port= +d1_mini_lite.build.debug_level= +d1_mini_lite.menu.CpuFrequency.80=80 MHz +d1_mini_lite.menu.CpuFrequency.80.build.f_cpu=80000000L +d1_mini_lite.menu.CpuFrequency.160=160 MHz +d1_mini_lite.menu.CpuFrequency.160.build.f_cpu=160000000L +d1_mini_lite.upload.resetmethod=nodemcu +d1_mini_lite.build.flash_mode=dout +d1_mini_lite.build.flash_freq=40 +d1_mini_lite.menu.FlashSize.1M0=1M (no SPIFFS) +d1_mini_lite.menu.FlashSize.1M0.build.flash_size=1M +d1_mini_lite.menu.FlashSize.1M0.build.flash_size_bytes=0x100000 +d1_mini_lite.menu.FlashSize.1M0.build.flash_ld=eagle.flash.1m0.ld +d1_mini_lite.menu.FlashSize.1M0.build.spiffs_pagesize=256 +d1_mini_lite.menu.FlashSize.1M0.upload.maximum_size=1023984 +d1_mini_lite.menu.FlashSize.1M0.build.rfcal_addr=0xFC000 +d1_mini_lite.menu.FlashSize.1M64=1M (64K SPIFFS) +d1_mini_lite.menu.FlashSize.1M64.build.flash_size=1M +d1_mini_lite.menu.FlashSize.1M64.build.flash_size_bytes=0x100000 +d1_mini_lite.menu.FlashSize.1M64.build.flash_ld=eagle.flash.1m64.ld +d1_mini_lite.menu.FlashSize.1M64.build.spiffs_pagesize=256 +d1_mini_lite.menu.FlashSize.1M64.upload.maximum_size=958448 +d1_mini_lite.menu.FlashSize.1M64.build.rfcal_addr=0xFC000 +d1_mini_lite.menu.FlashSize.1M64.build.spiffs_start=0xEB000 +d1_mini_lite.menu.FlashSize.1M64.build.spiffs_end=0xFB000 +d1_mini_lite.menu.FlashSize.1M64.build.spiffs_blocksize=4096 +d1_mini_lite.menu.FlashSize.1M128=1M (128K SPIFFS) +d1_mini_lite.menu.FlashSize.1M128.build.flash_size=1M +d1_mini_lite.menu.FlashSize.1M128.build.flash_size_bytes=0x100000 +d1_mini_lite.menu.FlashSize.1M128.build.flash_ld=eagle.flash.1m128.ld +d1_mini_lite.menu.FlashSize.1M128.build.spiffs_pagesize=256 +d1_mini_lite.menu.FlashSize.1M128.upload.maximum_size=892912 +d1_mini_lite.menu.FlashSize.1M128.build.rfcal_addr=0xFC000 +d1_mini_lite.menu.FlashSize.1M128.build.spiffs_start=0xDB000 +d1_mini_lite.menu.FlashSize.1M128.build.spiffs_end=0xFB000 +d1_mini_lite.menu.FlashSize.1M128.build.spiffs_blocksize=4096 +d1_mini_lite.menu.FlashSize.1M144=1M (144K SPIFFS) +d1_mini_lite.menu.FlashSize.1M144.build.flash_size=1M +d1_mini_lite.menu.FlashSize.1M144.build.flash_size_bytes=0x100000 +d1_mini_lite.menu.FlashSize.1M144.build.flash_ld=eagle.flash.1m144.ld +d1_mini_lite.menu.FlashSize.1M144.build.spiffs_pagesize=256 +d1_mini_lite.menu.FlashSize.1M144.upload.maximum_size=876528 +d1_mini_lite.menu.FlashSize.1M144.build.rfcal_addr=0xFC000 +d1_mini_lite.menu.FlashSize.1M144.build.spiffs_start=0xD7000 +d1_mini_lite.menu.FlashSize.1M144.build.spiffs_end=0xFB000 +d1_mini_lite.menu.FlashSize.1M144.build.spiffs_blocksize=4096 +d1_mini_lite.menu.FlashSize.1M160=1M (160K SPIFFS) +d1_mini_lite.menu.FlashSize.1M160.build.flash_size=1M +d1_mini_lite.menu.FlashSize.1M160.build.flash_size_bytes=0x100000 +d1_mini_lite.menu.FlashSize.1M160.build.flash_ld=eagle.flash.1m160.ld +d1_mini_lite.menu.FlashSize.1M160.build.spiffs_pagesize=256 +d1_mini_lite.menu.FlashSize.1M160.upload.maximum_size=860144 +d1_mini_lite.menu.FlashSize.1M160.build.rfcal_addr=0xFC000 +d1_mini_lite.menu.FlashSize.1M160.build.spiffs_start=0xD3000 +d1_mini_lite.menu.FlashSize.1M160.build.spiffs_end=0xFB000 +d1_mini_lite.menu.FlashSize.1M160.build.spiffs_blocksize=4096 +d1_mini_lite.menu.FlashSize.1M192=1M (192K SPIFFS) +d1_mini_lite.menu.FlashSize.1M192.build.flash_size=1M +d1_mini_lite.menu.FlashSize.1M192.build.flash_size_bytes=0x100000 +d1_mini_lite.menu.FlashSize.1M192.build.flash_ld=eagle.flash.1m192.ld +d1_mini_lite.menu.FlashSize.1M192.build.spiffs_pagesize=256 +d1_mini_lite.menu.FlashSize.1M192.upload.maximum_size=827376 +d1_mini_lite.menu.FlashSize.1M192.build.rfcal_addr=0xFC000 +d1_mini_lite.menu.FlashSize.1M192.build.spiffs_start=0xCB000 +d1_mini_lite.menu.FlashSize.1M192.build.spiffs_end=0xFB000 +d1_mini_lite.menu.FlashSize.1M192.build.spiffs_blocksize=4096 +d1_mini_lite.menu.FlashSize.1M256=1M (256K SPIFFS) +d1_mini_lite.menu.FlashSize.1M256.build.flash_size=1M +d1_mini_lite.menu.FlashSize.1M256.build.flash_size_bytes=0x100000 +d1_mini_lite.menu.FlashSize.1M256.build.flash_ld=eagle.flash.1m256.ld +d1_mini_lite.menu.FlashSize.1M256.build.spiffs_pagesize=256 +d1_mini_lite.menu.FlashSize.1M256.upload.maximum_size=761840 +d1_mini_lite.menu.FlashSize.1M256.build.rfcal_addr=0xFC000 +d1_mini_lite.menu.FlashSize.1M256.build.spiffs_start=0xBB000 +d1_mini_lite.menu.FlashSize.1M256.build.spiffs_end=0xFB000 +d1_mini_lite.menu.FlashSize.1M256.build.spiffs_blocksize=4096 +d1_mini_lite.menu.FlashSize.1M512=1M (512K SPIFFS) +d1_mini_lite.menu.FlashSize.1M512.build.flash_size=1M +d1_mini_lite.menu.FlashSize.1M512.build.flash_size_bytes=0x100000 +d1_mini_lite.menu.FlashSize.1M512.build.flash_ld=eagle.flash.1m512.ld +d1_mini_lite.menu.FlashSize.1M512.build.spiffs_pagesize=256 +d1_mini_lite.menu.FlashSize.1M512.upload.maximum_size=499696 +d1_mini_lite.menu.FlashSize.1M512.build.rfcal_addr=0xFC000 +d1_mini_lite.menu.FlashSize.1M512.build.spiffs_start=0x7B000 +d1_mini_lite.menu.FlashSize.1M512.build.spiffs_end=0xFB000 +d1_mini_lite.menu.FlashSize.1M512.build.spiffs_blocksize=8192 +d1_mini_lite.menu.LwIPVariant.v2mss536=v2 Lower Memory +d1_mini_lite.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +d1_mini_lite.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +d1_mini_lite.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +d1_mini_lite.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +d1_mini_lite.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +d1_mini_lite.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +d1_mini_lite.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +d1_mini_lite.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +d1_mini_lite.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +d1_mini_lite.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +d1_mini_lite.menu.LwIPVariant.OpenSource=v1.4 Compile from source +d1_mini_lite.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +d1_mini_lite.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +d1_mini_lite.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +d1_mini_lite.menu.Debug.Disabled=Disabled +d1_mini_lite.menu.Debug.Disabled.build.debug_port= +d1_mini_lite.menu.Debug.Serial=Serial +d1_mini_lite.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +d1_mini_lite.menu.Debug.Serial1=Serial1 +d1_mini_lite.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +d1_mini_lite.menu.DebugLevel.None____=None +d1_mini_lite.menu.DebugLevel.None____.build.debug_level= +d1_mini_lite.menu.DebugLevel.SSL=SSL +d1_mini_lite.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +d1_mini_lite.menu.DebugLevel.TLS_MEM=TLS_MEM +d1_mini_lite.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +d1_mini_lite.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +d1_mini_lite.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +d1_mini_lite.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +d1_mini_lite.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +d1_mini_lite.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +d1_mini_lite.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +d1_mini_lite.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +d1_mini_lite.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +d1_mini_lite.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +d1_mini_lite.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +d1_mini_lite.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +d1_mini_lite.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +d1_mini_lite.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +d1_mini_lite.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +d1_mini_lite.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +d1_mini_lite.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +d1_mini_lite.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +d1_mini_lite.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +d1_mini_lite.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +d1_mini_lite.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +d1_mini_lite.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +d1_mini_lite.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +d1_mini_lite.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +d1_mini_lite.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +d1_mini_lite.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +d1_mini_lite.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +d1_mini_lite.menu.DebugLevel.CORE=CORE +d1_mini_lite.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +d1_mini_lite.menu.DebugLevel.WIFI=WIFI +d1_mini_lite.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +d1_mini_lite.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +d1_mini_lite.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +d1_mini_lite.menu.DebugLevel.UPDATER=UPDATER +d1_mini_lite.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +d1_mini_lite.menu.DebugLevel.OTA=OTA +d1_mini_lite.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +d1_mini_lite.menu.DebugLevel.OOM=OOM +d1_mini_lite.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +d1_mini_lite.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +d1_mini_lite.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +d1_mini_lite.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +d1_mini_lite.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +d1_mini_lite.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +d1_mini_lite.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +d1_mini_lite.menu.FlashErase.none=Only Sketch +d1_mini_lite.menu.FlashErase.none.upload.erase_cmd= +d1_mini_lite.menu.FlashErase.sdk=Sketch + WiFi Settings +d1_mini_lite.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +d1_mini_lite.menu.FlashErase.all=All Flash Contents +d1_mini_lite.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +d1_mini_lite.menu.UploadSpeed.921600=921600 +d1_mini_lite.menu.UploadSpeed.921600.upload.speed=921600 +d1_mini_lite.menu.UploadSpeed.9600=9600 +d1_mini_lite.menu.UploadSpeed.9600.upload.speed=9600 +d1_mini_lite.menu.UploadSpeed.57600=57600 +d1_mini_lite.menu.UploadSpeed.57600.upload.speed=57600 +d1_mini_lite.menu.UploadSpeed.115200=115200 +d1_mini_lite.menu.UploadSpeed.115200.upload.speed=115200 +d1_mini_lite.menu.UploadSpeed.230400.linux=230400 +d1_mini_lite.menu.UploadSpeed.230400.macosx=230400 +d1_mini_lite.menu.UploadSpeed.230400.upload.speed=230400 +d1_mini_lite.menu.UploadSpeed.256000.windows=256000 +d1_mini_lite.menu.UploadSpeed.256000.upload.speed=256000 +d1_mini_lite.menu.UploadSpeed.460800.linux=460800 +d1_mini_lite.menu.UploadSpeed.460800.macosx=460800 +d1_mini_lite.menu.UploadSpeed.460800.upload.speed=460800 +d1_mini_lite.menu.UploadSpeed.512000.windows=512000 +d1_mini_lite.menu.UploadSpeed.512000.upload.speed=512000 + +############################################################## +d1.name=WeMos D1 R1 +d1.build.board=ESP8266_WEMOS_D1R1 +d1.build.variant=d1 +d1.upload.tool=esptool +d1.upload.maximum_data_size=81920 +d1.upload.wait_for_upload_port=true +d1.upload.erase_cmd= +d1.serial.disableDTR=true +d1.serial.disableRTS=true +d1.build.mcu=esp8266 +d1.build.core=esp8266 +d1.build.spiffs_pagesize=256 +d1.build.debug_port= +d1.build.debug_level= +d1.menu.CpuFrequency.80=80 MHz +d1.menu.CpuFrequency.80.build.f_cpu=80000000L +d1.menu.CpuFrequency.160=160 MHz +d1.menu.CpuFrequency.160.build.f_cpu=160000000L +d1.upload.resetmethod=nodemcu +d1.build.flash_mode=dio +d1.build.flash_freq=40 +d1.menu.FlashSize.4M1M=4M (1M SPIFFS) +d1.menu.FlashSize.4M1M.build.flash_size=4M +d1.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000 +d1.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld +d1.menu.FlashSize.4M1M.build.spiffs_pagesize=256 +d1.menu.FlashSize.4M1M.upload.maximum_size=1044464 +d1.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000 +d1.menu.FlashSize.4M1M.build.spiffs_start=0x300000 +d1.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000 +d1.menu.FlashSize.4M1M.build.spiffs_blocksize=8192 +d1.menu.FlashSize.4M3M=4M (3M SPIFFS) +d1.menu.FlashSize.4M3M.build.flash_size=4M +d1.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000 +d1.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld +d1.menu.FlashSize.4M3M.build.spiffs_pagesize=256 +d1.menu.FlashSize.4M3M.upload.maximum_size=1044464 +d1.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000 +d1.menu.FlashSize.4M3M.build.spiffs_start=0x100000 +d1.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000 +d1.menu.FlashSize.4M3M.build.spiffs_blocksize=8192 +d1.menu.LwIPVariant.v2mss536=v2 Lower Memory +d1.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +d1.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +d1.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +d1.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +d1.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +d1.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +d1.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +d1.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +d1.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +d1.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +d1.menu.LwIPVariant.OpenSource=v1.4 Compile from source +d1.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +d1.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +d1.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +d1.menu.Debug.Disabled=Disabled +d1.menu.Debug.Disabled.build.debug_port= +d1.menu.Debug.Serial=Serial +d1.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +d1.menu.Debug.Serial1=Serial1 +d1.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +d1.menu.DebugLevel.None____=None +d1.menu.DebugLevel.None____.build.debug_level= +d1.menu.DebugLevel.SSL=SSL +d1.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +d1.menu.DebugLevel.TLS_MEM=TLS_MEM +d1.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +d1.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +d1.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +d1.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +d1.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +d1.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +d1.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +d1.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +d1.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +d1.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +d1.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +d1.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +d1.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +d1.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +d1.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +d1.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +d1.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +d1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +d1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +d1.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +d1.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +d1.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +d1.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +d1.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +d1.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +d1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +d1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +d1.menu.DebugLevel.CORE=CORE +d1.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +d1.menu.DebugLevel.WIFI=WIFI +d1.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +d1.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +d1.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +d1.menu.DebugLevel.UPDATER=UPDATER +d1.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +d1.menu.DebugLevel.OTA=OTA +d1.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +d1.menu.DebugLevel.OOM=OOM +d1.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +d1.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +d1.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +d1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +d1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +d1.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +d1.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +d1.menu.FlashErase.none=Only Sketch +d1.menu.FlashErase.none.upload.erase_cmd= +d1.menu.FlashErase.sdk=Sketch + WiFi Settings +d1.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +d1.menu.FlashErase.all=All Flash Contents +d1.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +d1.menu.UploadSpeed.921600=921600 +d1.menu.UploadSpeed.921600.upload.speed=921600 +d1.menu.UploadSpeed.9600=9600 +d1.menu.UploadSpeed.9600.upload.speed=9600 +d1.menu.UploadSpeed.57600=57600 +d1.menu.UploadSpeed.57600.upload.speed=57600 +d1.menu.UploadSpeed.115200=115200 +d1.menu.UploadSpeed.115200.upload.speed=115200 +d1.menu.UploadSpeed.230400.linux=230400 +d1.menu.UploadSpeed.230400.macosx=230400 +d1.menu.UploadSpeed.230400.upload.speed=230400 +d1.menu.UploadSpeed.256000.windows=256000 +d1.menu.UploadSpeed.256000.upload.speed=256000 +d1.menu.UploadSpeed.460800.linux=460800 +d1.menu.UploadSpeed.460800.macosx=460800 +d1.menu.UploadSpeed.460800.upload.speed=460800 +d1.menu.UploadSpeed.512000.windows=512000 +d1.menu.UploadSpeed.512000.upload.speed=512000 + +############################################################## +espino.name=ESPino (ESP-12 Module) +espino.build.board=ESP8266_ESP12 +espino.build.variant=espino +espino.upload.tool=esptool +espino.upload.maximum_data_size=81920 +espino.upload.wait_for_upload_port=true +espino.upload.erase_cmd= +espino.serial.disableDTR=true +espino.serial.disableRTS=true +espino.build.mcu=esp8266 +espino.build.core=esp8266 +espino.build.spiffs_pagesize=256 +espino.build.debug_port= +espino.build.debug_level= +espino.menu.CpuFrequency.80=80 MHz +espino.menu.CpuFrequency.80.build.f_cpu=80000000L +espino.menu.CpuFrequency.160=160 MHz +espino.menu.CpuFrequency.160.build.f_cpu=160000000L +espino.menu.ResetMethod.ck=ck +espino.menu.ResetMethod.ck.upload.resetmethod=ck +espino.menu.ResetMethod.nodemcu=nodemcu +espino.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu +espino.build.flash_mode=qio +espino.build.flash_freq=40 +espino.menu.FlashSize.4M1M=4M (1M SPIFFS) +espino.menu.FlashSize.4M1M.build.flash_size=4M +espino.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000 +espino.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld +espino.menu.FlashSize.4M1M.build.spiffs_pagesize=256 +espino.menu.FlashSize.4M1M.upload.maximum_size=1044464 +espino.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000 +espino.menu.FlashSize.4M1M.build.spiffs_start=0x300000 +espino.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000 +espino.menu.FlashSize.4M1M.build.spiffs_blocksize=8192 +espino.menu.FlashSize.4M3M=4M (3M SPIFFS) +espino.menu.FlashSize.4M3M.build.flash_size=4M +espino.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000 +espino.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld +espino.menu.FlashSize.4M3M.build.spiffs_pagesize=256 +espino.menu.FlashSize.4M3M.upload.maximum_size=1044464 +espino.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000 +espino.menu.FlashSize.4M3M.build.spiffs_start=0x100000 +espino.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000 +espino.menu.FlashSize.4M3M.build.spiffs_blocksize=8192 +espino.menu.LwIPVariant.v2mss536=v2 Lower Memory +espino.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +espino.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +espino.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +espino.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +espino.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +espino.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +espino.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +espino.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +espino.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +espino.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +espino.menu.LwIPVariant.OpenSource=v1.4 Compile from source +espino.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +espino.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +espino.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +espino.menu.Debug.Disabled=Disabled +espino.menu.Debug.Disabled.build.debug_port= +espino.menu.Debug.Serial=Serial +espino.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +espino.menu.Debug.Serial1=Serial1 +espino.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +espino.menu.DebugLevel.None____=None +espino.menu.DebugLevel.None____.build.debug_level= +espino.menu.DebugLevel.SSL=SSL +espino.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +espino.menu.DebugLevel.TLS_MEM=TLS_MEM +espino.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +espino.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +espino.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +espino.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +espino.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +espino.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +espino.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +espino.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +espino.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +espino.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +espino.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +espino.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +espino.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +espino.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +espino.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +espino.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +espino.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +espino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +espino.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +espino.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +espino.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +espino.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espino.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +espino.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +espino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espino.menu.DebugLevel.CORE=CORE +espino.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +espino.menu.DebugLevel.WIFI=WIFI +espino.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +espino.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +espino.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +espino.menu.DebugLevel.UPDATER=UPDATER +espino.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +espino.menu.DebugLevel.OTA=OTA +espino.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +espino.menu.DebugLevel.OOM=OOM +espino.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +espino.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +espino.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +espino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +espino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +espino.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +espino.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +espino.menu.FlashErase.none=Only Sketch +espino.menu.FlashErase.none.upload.erase_cmd= +espino.menu.FlashErase.sdk=Sketch + WiFi Settings +espino.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +espino.menu.FlashErase.all=All Flash Contents +espino.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +espino.menu.UploadSpeed.115200=115200 +espino.menu.UploadSpeed.115200.upload.speed=115200 +espino.menu.UploadSpeed.9600=9600 +espino.menu.UploadSpeed.9600.upload.speed=9600 +espino.menu.UploadSpeed.57600=57600 +espino.menu.UploadSpeed.57600.upload.speed=57600 +espino.menu.UploadSpeed.230400.linux=230400 +espino.menu.UploadSpeed.230400.macosx=230400 +espino.menu.UploadSpeed.230400.upload.speed=230400 +espino.menu.UploadSpeed.256000.windows=256000 +espino.menu.UploadSpeed.256000.upload.speed=256000 +espino.menu.UploadSpeed.460800.linux=460800 +espino.menu.UploadSpeed.460800.macosx=460800 +espino.menu.UploadSpeed.460800.upload.speed=460800 +espino.menu.UploadSpeed.512000.windows=512000 +espino.menu.UploadSpeed.512000.upload.speed=512000 +espino.menu.UploadSpeed.921600=921600 +espino.menu.UploadSpeed.921600.upload.speed=921600 + +############################################################## +espinotee.name=ThaiEasyElec's ESPino +espinotee.build.board=ESP8266_ESP13 +espinotee.build.variant=espinotee +espinotee.upload.tool=esptool +espinotee.upload.maximum_data_size=81920 +espinotee.upload.wait_for_upload_port=true +espinotee.upload.erase_cmd= +espinotee.serial.disableDTR=true +espinotee.serial.disableRTS=true +espinotee.build.mcu=esp8266 +espinotee.build.core=esp8266 +espinotee.build.spiffs_pagesize=256 +espinotee.build.debug_port= +espinotee.build.debug_level= +espinotee.menu.CpuFrequency.80=80 MHz +espinotee.menu.CpuFrequency.80.build.f_cpu=80000000L +espinotee.menu.CpuFrequency.160=160 MHz +espinotee.menu.CpuFrequency.160.build.f_cpu=160000000L +espinotee.upload.resetmethod=nodemcu +espinotee.build.flash_mode=qio +espinotee.build.flash_freq=40 +espinotee.menu.FlashSize.4M1M=4M (1M SPIFFS) +espinotee.menu.FlashSize.4M1M.build.flash_size=4M +espinotee.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000 +espinotee.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld +espinotee.menu.FlashSize.4M1M.build.spiffs_pagesize=256 +espinotee.menu.FlashSize.4M1M.upload.maximum_size=1044464 +espinotee.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000 +espinotee.menu.FlashSize.4M1M.build.spiffs_start=0x300000 +espinotee.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000 +espinotee.menu.FlashSize.4M1M.build.spiffs_blocksize=8192 +espinotee.menu.FlashSize.4M3M=4M (3M SPIFFS) +espinotee.menu.FlashSize.4M3M.build.flash_size=4M +espinotee.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000 +espinotee.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld +espinotee.menu.FlashSize.4M3M.build.spiffs_pagesize=256 +espinotee.menu.FlashSize.4M3M.upload.maximum_size=1044464 +espinotee.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000 +espinotee.menu.FlashSize.4M3M.build.spiffs_start=0x100000 +espinotee.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000 +espinotee.menu.FlashSize.4M3M.build.spiffs_blocksize=8192 +espinotee.menu.LwIPVariant.v2mss536=v2 Lower Memory +espinotee.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +espinotee.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +espinotee.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +espinotee.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +espinotee.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +espinotee.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +espinotee.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +espinotee.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +espinotee.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +espinotee.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +espinotee.menu.LwIPVariant.OpenSource=v1.4 Compile from source +espinotee.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +espinotee.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +espinotee.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +espinotee.menu.Debug.Disabled=Disabled +espinotee.menu.Debug.Disabled.build.debug_port= +espinotee.menu.Debug.Serial=Serial +espinotee.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +espinotee.menu.Debug.Serial1=Serial1 +espinotee.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +espinotee.menu.DebugLevel.None____=None +espinotee.menu.DebugLevel.None____.build.debug_level= +espinotee.menu.DebugLevel.SSL=SSL +espinotee.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +espinotee.menu.DebugLevel.TLS_MEM=TLS_MEM +espinotee.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +espinotee.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +espinotee.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +espinotee.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +espinotee.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +espinotee.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +espinotee.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +espinotee.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +espinotee.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +espinotee.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +espinotee.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +espinotee.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +espinotee.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +espinotee.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +espinotee.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +espinotee.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +espinotee.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espinotee.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +espinotee.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +espinotee.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +espinotee.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +espinotee.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +espinotee.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espinotee.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +espinotee.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espinotee.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +espinotee.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +espinotee.menu.DebugLevel.CORE=CORE +espinotee.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +espinotee.menu.DebugLevel.WIFI=WIFI +espinotee.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +espinotee.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +espinotee.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +espinotee.menu.DebugLevel.UPDATER=UPDATER +espinotee.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +espinotee.menu.DebugLevel.OTA=OTA +espinotee.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +espinotee.menu.DebugLevel.OOM=OOM +espinotee.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +espinotee.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +espinotee.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +espinotee.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +espinotee.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +espinotee.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +espinotee.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +espinotee.menu.FlashErase.none=Only Sketch +espinotee.menu.FlashErase.none.upload.erase_cmd= +espinotee.menu.FlashErase.sdk=Sketch + WiFi Settings +espinotee.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +espinotee.menu.FlashErase.all=All Flash Contents +espinotee.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +espinotee.menu.UploadSpeed.115200=115200 +espinotee.menu.UploadSpeed.115200.upload.speed=115200 +espinotee.menu.UploadSpeed.9600=9600 +espinotee.menu.UploadSpeed.9600.upload.speed=9600 +espinotee.menu.UploadSpeed.57600=57600 +espinotee.menu.UploadSpeed.57600.upload.speed=57600 +espinotee.menu.UploadSpeed.230400.linux=230400 +espinotee.menu.UploadSpeed.230400.macosx=230400 +espinotee.menu.UploadSpeed.230400.upload.speed=230400 +espinotee.menu.UploadSpeed.256000.windows=256000 +espinotee.menu.UploadSpeed.256000.upload.speed=256000 +espinotee.menu.UploadSpeed.460800.linux=460800 +espinotee.menu.UploadSpeed.460800.macosx=460800 +espinotee.menu.UploadSpeed.460800.upload.speed=460800 +espinotee.menu.UploadSpeed.512000.windows=512000 +espinotee.menu.UploadSpeed.512000.upload.speed=512000 +espinotee.menu.UploadSpeed.921600=921600 +espinotee.menu.UploadSpeed.921600.upload.speed=921600 + +############################################################## +wifinfo.name=WifInfo +wifinfo.menu.ESPModule.ESP12.build.board=ESP8266_ESP12 +wifinfo.menu.ESPModule.ESP12.upload.maximum_size=1044464 +wifinfo.menu.ESPModule.ESP12.build.spiffs_pagesize=256 +wifinfo.menu.ESPModule.ESP12.build.flash_ld=eagle.flash.4m1m.ld +wifinfo.menu.ESPModule.ESP07192.build.spiffs_blocksize=4096 +wifinfo.menu.ESPModule.ESP07192.build.spiffs_end=0xFB000 +wifinfo.menu.ESPModule.ESP12=ESP12 (4M/1M SPIFFS) +wifinfo.menu.ESPModule.ESP12.build.spiffs_start=0x300000 +wifinfo.menu.ESPModule.ESP12.build.spiffs_end=0x3FB000 +wifinfo.menu.ESPModule.ESP07192.build.spiffs_start=0xCB000 +wifinfo.menu.ESPModule.ESP07192.build.board=ESP8266_ESP07 +wifinfo.menu.ESPModule.ESP12.build.spiffs_blocksize=8192 +wifinfo.menu.ESPModule.ESP12.build.flash_size=4M +wifinfo.build.board=WIFINFO +wifinfo.build.variant=wifinfo +wifinfo.menu.ESPModule.ESP07192.build.flash_ld=eagle.flash.1m192.ld +wifinfo.menu.ESPModule.ESP07192.build.flash_size=1M +wifinfo.menu.ESPModule.ESP07192=ESP07 (1M/192K SPIFFS) +wifinfo.menu.ESPModule.ESP07192.upload.maximum_size=827376 +wifinfo.upload.tool=esptool +wifinfo.upload.maximum_data_size=81920 +wifinfo.upload.wait_for_upload_port=true +wifinfo.upload.erase_cmd= +wifinfo.serial.disableDTR=true +wifinfo.serial.disableRTS=true +wifinfo.build.mcu=esp8266 +wifinfo.build.core=esp8266 +wifinfo.build.spiffs_pagesize=256 +wifinfo.build.debug_port= +wifinfo.build.debug_level= +wifinfo.menu.CpuFrequency.80=80 MHz +wifinfo.menu.CpuFrequency.80.build.f_cpu=80000000L +wifinfo.menu.CpuFrequency.160=160 MHz +wifinfo.menu.CpuFrequency.160.build.f_cpu=160000000L +wifinfo.upload.resetmethod=nodemcu +wifinfo.build.flash_mode=qio +wifinfo.menu.FlashFreq.40=40MHz +wifinfo.menu.FlashFreq.40.build.flash_freq=40 +wifinfo.menu.FlashFreq.80=80MHz +wifinfo.menu.FlashFreq.80.build.flash_freq=80 +wifinfo.menu.FlashSize.1M0=1M (no SPIFFS) +wifinfo.menu.FlashSize.1M0.build.flash_size=1M +wifinfo.menu.FlashSize.1M0.build.flash_size_bytes=0x100000 +wifinfo.menu.FlashSize.1M0.build.flash_ld=eagle.flash.1m0.ld +wifinfo.menu.FlashSize.1M0.build.spiffs_pagesize=256 +wifinfo.menu.FlashSize.1M0.upload.maximum_size=1023984 +wifinfo.menu.FlashSize.1M0.build.rfcal_addr=0xFC000 +wifinfo.menu.FlashSize.1M64=1M (64K SPIFFS) +wifinfo.menu.FlashSize.1M64.build.flash_size=1M +wifinfo.menu.FlashSize.1M64.build.flash_size_bytes=0x100000 +wifinfo.menu.FlashSize.1M64.build.flash_ld=eagle.flash.1m64.ld +wifinfo.menu.FlashSize.1M64.build.spiffs_pagesize=256 +wifinfo.menu.FlashSize.1M64.upload.maximum_size=958448 +wifinfo.menu.FlashSize.1M64.build.rfcal_addr=0xFC000 +wifinfo.menu.FlashSize.1M64.build.spiffs_start=0xEB000 +wifinfo.menu.FlashSize.1M64.build.spiffs_end=0xFB000 +wifinfo.menu.FlashSize.1M64.build.spiffs_blocksize=4096 +wifinfo.menu.FlashSize.1M128=1M (128K SPIFFS) +wifinfo.menu.FlashSize.1M128.build.flash_size=1M +wifinfo.menu.FlashSize.1M128.build.flash_size_bytes=0x100000 +wifinfo.menu.FlashSize.1M128.build.flash_ld=eagle.flash.1m128.ld +wifinfo.menu.FlashSize.1M128.build.spiffs_pagesize=256 +wifinfo.menu.FlashSize.1M128.upload.maximum_size=892912 +wifinfo.menu.FlashSize.1M128.build.rfcal_addr=0xFC000 +wifinfo.menu.FlashSize.1M128.build.spiffs_start=0xDB000 +wifinfo.menu.FlashSize.1M128.build.spiffs_end=0xFB000 +wifinfo.menu.FlashSize.1M128.build.spiffs_blocksize=4096 +wifinfo.menu.FlashSize.1M144=1M (144K SPIFFS) +wifinfo.menu.FlashSize.1M144.build.flash_size=1M +wifinfo.menu.FlashSize.1M144.build.flash_size_bytes=0x100000 +wifinfo.menu.FlashSize.1M144.build.flash_ld=eagle.flash.1m144.ld +wifinfo.menu.FlashSize.1M144.build.spiffs_pagesize=256 +wifinfo.menu.FlashSize.1M144.upload.maximum_size=876528 +wifinfo.menu.FlashSize.1M144.build.rfcal_addr=0xFC000 +wifinfo.menu.FlashSize.1M144.build.spiffs_start=0xD7000 +wifinfo.menu.FlashSize.1M144.build.spiffs_end=0xFB000 +wifinfo.menu.FlashSize.1M144.build.spiffs_blocksize=4096 +wifinfo.menu.FlashSize.1M160=1M (160K SPIFFS) +wifinfo.menu.FlashSize.1M160.build.flash_size=1M +wifinfo.menu.FlashSize.1M160.build.flash_size_bytes=0x100000 +wifinfo.menu.FlashSize.1M160.build.flash_ld=eagle.flash.1m160.ld +wifinfo.menu.FlashSize.1M160.build.spiffs_pagesize=256 +wifinfo.menu.FlashSize.1M160.upload.maximum_size=860144 +wifinfo.menu.FlashSize.1M160.build.rfcal_addr=0xFC000 +wifinfo.menu.FlashSize.1M160.build.spiffs_start=0xD3000 +wifinfo.menu.FlashSize.1M160.build.spiffs_end=0xFB000 +wifinfo.menu.FlashSize.1M160.build.spiffs_blocksize=4096 +wifinfo.menu.FlashSize.1M192=1M (192K SPIFFS) +wifinfo.menu.FlashSize.1M192.build.flash_size=1M +wifinfo.menu.FlashSize.1M192.build.flash_size_bytes=0x100000 +wifinfo.menu.FlashSize.1M192.build.flash_ld=eagle.flash.1m192.ld +wifinfo.menu.FlashSize.1M192.build.spiffs_pagesize=256 +wifinfo.menu.FlashSize.1M192.upload.maximum_size=827376 +wifinfo.menu.FlashSize.1M192.build.rfcal_addr=0xFC000 +wifinfo.menu.FlashSize.1M192.build.spiffs_start=0xCB000 +wifinfo.menu.FlashSize.1M192.build.spiffs_end=0xFB000 +wifinfo.menu.FlashSize.1M192.build.spiffs_blocksize=4096 +wifinfo.menu.FlashSize.1M256=1M (256K SPIFFS) +wifinfo.menu.FlashSize.1M256.build.flash_size=1M +wifinfo.menu.FlashSize.1M256.build.flash_size_bytes=0x100000 +wifinfo.menu.FlashSize.1M256.build.flash_ld=eagle.flash.1m256.ld +wifinfo.menu.FlashSize.1M256.build.spiffs_pagesize=256 +wifinfo.menu.FlashSize.1M256.upload.maximum_size=761840 +wifinfo.menu.FlashSize.1M256.build.rfcal_addr=0xFC000 +wifinfo.menu.FlashSize.1M256.build.spiffs_start=0xBB000 +wifinfo.menu.FlashSize.1M256.build.spiffs_end=0xFB000 +wifinfo.menu.FlashSize.1M256.build.spiffs_blocksize=4096 +wifinfo.menu.FlashSize.1M512=1M (512K SPIFFS) +wifinfo.menu.FlashSize.1M512.build.flash_size=1M +wifinfo.menu.FlashSize.1M512.build.flash_size_bytes=0x100000 +wifinfo.menu.FlashSize.1M512.build.flash_ld=eagle.flash.1m512.ld +wifinfo.menu.FlashSize.1M512.build.spiffs_pagesize=256 +wifinfo.menu.FlashSize.1M512.upload.maximum_size=499696 +wifinfo.menu.FlashSize.1M512.build.rfcal_addr=0xFC000 +wifinfo.menu.FlashSize.1M512.build.spiffs_start=0x7B000 +wifinfo.menu.FlashSize.1M512.build.spiffs_end=0xFB000 +wifinfo.menu.FlashSize.1M512.build.spiffs_blocksize=8192 +wifinfo.menu.LwIPVariant.v2mss536=v2 Lower Memory +wifinfo.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +wifinfo.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +wifinfo.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +wifinfo.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +wifinfo.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +wifinfo.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +wifinfo.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +wifinfo.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +wifinfo.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +wifinfo.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +wifinfo.menu.LwIPVariant.OpenSource=v1.4 Compile from source +wifinfo.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +wifinfo.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +wifinfo.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +wifinfo.menu.Debug.Disabled=Disabled +wifinfo.menu.Debug.Disabled.build.debug_port= +wifinfo.menu.Debug.Serial=Serial +wifinfo.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +wifinfo.menu.Debug.Serial1=Serial1 +wifinfo.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +wifinfo.menu.DebugLevel.None____=None +wifinfo.menu.DebugLevel.None____.build.debug_level= +wifinfo.menu.DebugLevel.SSL=SSL +wifinfo.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +wifinfo.menu.DebugLevel.TLS_MEM=TLS_MEM +wifinfo.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +wifinfo.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +wifinfo.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +wifinfo.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +wifinfo.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +wifinfo.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +wifinfo.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +wifinfo.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +wifinfo.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +wifinfo.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +wifinfo.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +wifinfo.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +wifinfo.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +wifinfo.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +wifinfo.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +wifinfo.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +wifinfo.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +wifinfo.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +wifinfo.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +wifinfo.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +wifinfo.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +wifinfo.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +wifinfo.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +wifinfo.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +wifinfo.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +wifinfo.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +wifinfo.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +wifinfo.menu.DebugLevel.CORE=CORE +wifinfo.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +wifinfo.menu.DebugLevel.WIFI=WIFI +wifinfo.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +wifinfo.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +wifinfo.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +wifinfo.menu.DebugLevel.UPDATER=UPDATER +wifinfo.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +wifinfo.menu.DebugLevel.OTA=OTA +wifinfo.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +wifinfo.menu.DebugLevel.OOM=OOM +wifinfo.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +wifinfo.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +wifinfo.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +wifinfo.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +wifinfo.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +wifinfo.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +wifinfo.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +wifinfo.menu.FlashErase.none=Only Sketch +wifinfo.menu.FlashErase.none.upload.erase_cmd= +wifinfo.menu.FlashErase.sdk=Sketch + WiFi Settings +wifinfo.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +wifinfo.menu.FlashErase.all=All Flash Contents +wifinfo.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +wifinfo.menu.UploadSpeed.115200=115200 +wifinfo.menu.UploadSpeed.115200.upload.speed=115200 +wifinfo.menu.UploadSpeed.9600=9600 +wifinfo.menu.UploadSpeed.9600.upload.speed=9600 +wifinfo.menu.UploadSpeed.57600=57600 +wifinfo.menu.UploadSpeed.57600.upload.speed=57600 +wifinfo.menu.UploadSpeed.230400.linux=230400 +wifinfo.menu.UploadSpeed.230400.macosx=230400 +wifinfo.menu.UploadSpeed.230400.upload.speed=230400 +wifinfo.menu.UploadSpeed.256000.windows=256000 +wifinfo.menu.UploadSpeed.256000.upload.speed=256000 +wifinfo.menu.UploadSpeed.460800.linux=460800 +wifinfo.menu.UploadSpeed.460800.macosx=460800 +wifinfo.menu.UploadSpeed.460800.upload.speed=460800 +wifinfo.menu.UploadSpeed.512000.windows=512000 +wifinfo.menu.UploadSpeed.512000.upload.speed=512000 +wifinfo.menu.UploadSpeed.921600=921600 +wifinfo.menu.UploadSpeed.921600.upload.speed=921600 + +############################################################## +arduino-esp8266.name=Arduino +arduino-esp8266.menu.BoardModel.starottodeved.build.board=ESP8266_ARDUINO_STAR_OTTO +arduino-esp8266.menu.BoardModel.primo.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266 +arduino-esp8266.menu.BoardModel.starottodeved.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266 +arduino-esp8266.menu.BoardModel.starottodeved.build.variant=arduino_uart +arduino-esp8266.menu.BoardModel.unowifideved.build.board=ESP8266_ARDUINO_UNOWIFI +arduino-esp8266.menu.BoardModel.unowifideved.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266 +arduino-esp8266.menu.BoardModel.primo=Primo +arduino-esp8266.menu.BoardModel.unowifideved.build.variant=arduino_uart +arduino-esp8266.menu.BoardModel.primo.build.variant=arduino_spi +arduino-esp8266.menu.BoardModel.starottodeved=Star OTTO +arduino-esp8266.build.board=ESP8266_ARDUINO +arduino-esp8266.menu.BoardModel.primo.build.board=ESP8266_ARDUINO_PRIMO +arduino-esp8266.menu.BoardModel.unowifideved=Uno WiFi +arduino-esp8266.upload.tool=esptool +arduino-esp8266.upload.maximum_data_size=81920 +arduino-esp8266.upload.wait_for_upload_port=true +arduino-esp8266.upload.erase_cmd= +arduino-esp8266.serial.disableDTR=true +arduino-esp8266.serial.disableRTS=true +arduino-esp8266.build.mcu=esp8266 +arduino-esp8266.build.core=esp8266 +arduino-esp8266.build.variant=generic +arduino-esp8266.build.spiffs_pagesize=256 +arduino-esp8266.build.debug_port= +arduino-esp8266.build.debug_level= +arduino-esp8266.menu.CpuFrequency.80=80 MHz +arduino-esp8266.menu.CpuFrequency.80.build.f_cpu=80000000L +arduino-esp8266.menu.CpuFrequency.160=160 MHz +arduino-esp8266.menu.CpuFrequency.160.build.f_cpu=160000000L +arduino-esp8266.upload.resetmethod=ck +arduino-esp8266.build.flash_mode=qio +arduino-esp8266.build.flash_freq=40 +arduino-esp8266.menu.FlashSize.4M1M=4M (1M SPIFFS) +arduino-esp8266.menu.FlashSize.4M1M.build.flash_size=4M +arduino-esp8266.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000 +arduino-esp8266.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld +arduino-esp8266.menu.FlashSize.4M1M.build.spiffs_pagesize=256 +arduino-esp8266.menu.FlashSize.4M1M.upload.maximum_size=1044464 +arduino-esp8266.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000 +arduino-esp8266.menu.FlashSize.4M1M.build.spiffs_start=0x300000 +arduino-esp8266.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000 +arduino-esp8266.menu.FlashSize.4M1M.build.spiffs_blocksize=8192 +arduino-esp8266.menu.FlashSize.4M3M=4M (3M SPIFFS) +arduino-esp8266.menu.FlashSize.4M3M.build.flash_size=4M +arduino-esp8266.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000 +arduino-esp8266.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld +arduino-esp8266.menu.FlashSize.4M3M.build.spiffs_pagesize=256 +arduino-esp8266.menu.FlashSize.4M3M.upload.maximum_size=1044464 +arduino-esp8266.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000 +arduino-esp8266.menu.FlashSize.4M3M.build.spiffs_start=0x100000 +arduino-esp8266.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000 +arduino-esp8266.menu.FlashSize.4M3M.build.spiffs_blocksize=8192 +arduino-esp8266.menu.LwIPVariant.v2mss536=v2 Lower Memory +arduino-esp8266.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +arduino-esp8266.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +arduino-esp8266.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +arduino-esp8266.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +arduino-esp8266.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +arduino-esp8266.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +arduino-esp8266.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +arduino-esp8266.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +arduino-esp8266.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +arduino-esp8266.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +arduino-esp8266.menu.LwIPVariant.OpenSource=v1.4 Compile from source +arduino-esp8266.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +arduino-esp8266.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +arduino-esp8266.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +arduino-esp8266.menu.Debug.Disabled=Disabled +arduino-esp8266.menu.Debug.Disabled.build.debug_port= +arduino-esp8266.menu.Debug.Serial=Serial +arduino-esp8266.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +arduino-esp8266.menu.Debug.Serial1=Serial1 +arduino-esp8266.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +arduino-esp8266.menu.DebugLevel.None____=None +arduino-esp8266.menu.DebugLevel.None____.build.debug_level= +arduino-esp8266.menu.DebugLevel.SSL=SSL +arduino-esp8266.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +arduino-esp8266.menu.DebugLevel.TLS_MEM=TLS_MEM +arduino-esp8266.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +arduino-esp8266.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +arduino-esp8266.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +arduino-esp8266.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +arduino-esp8266.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +arduino-esp8266.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +arduino-esp8266.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +arduino-esp8266.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +arduino-esp8266.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +arduino-esp8266.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +arduino-esp8266.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +arduino-esp8266.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +arduino-esp8266.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +arduino-esp8266.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +arduino-esp8266.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +arduino-esp8266.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +arduino-esp8266.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +arduino-esp8266.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +arduino-esp8266.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +arduino-esp8266.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +arduino-esp8266.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +arduino-esp8266.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +arduino-esp8266.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +arduino-esp8266.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +arduino-esp8266.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +arduino-esp8266.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +arduino-esp8266.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +arduino-esp8266.menu.DebugLevel.CORE=CORE +arduino-esp8266.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +arduino-esp8266.menu.DebugLevel.WIFI=WIFI +arduino-esp8266.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +arduino-esp8266.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +arduino-esp8266.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +arduino-esp8266.menu.DebugLevel.UPDATER=UPDATER +arduino-esp8266.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +arduino-esp8266.menu.DebugLevel.OTA=OTA +arduino-esp8266.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +arduino-esp8266.menu.DebugLevel.OOM=OOM +arduino-esp8266.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +arduino-esp8266.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +arduino-esp8266.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +arduino-esp8266.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +arduino-esp8266.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +arduino-esp8266.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +arduino-esp8266.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +arduino-esp8266.menu.FlashErase.none=Only Sketch +arduino-esp8266.menu.FlashErase.none.upload.erase_cmd= +arduino-esp8266.menu.FlashErase.sdk=Sketch + WiFi Settings +arduino-esp8266.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +arduino-esp8266.menu.FlashErase.all=All Flash Contents +arduino-esp8266.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +arduino-esp8266.menu.UploadSpeed.115200=115200 +arduino-esp8266.menu.UploadSpeed.115200.upload.speed=115200 +arduino-esp8266.menu.UploadSpeed.9600=9600 +arduino-esp8266.menu.UploadSpeed.9600.upload.speed=9600 +arduino-esp8266.menu.UploadSpeed.57600=57600 +arduino-esp8266.menu.UploadSpeed.57600.upload.speed=57600 +arduino-esp8266.menu.UploadSpeed.230400.linux=230400 +arduino-esp8266.menu.UploadSpeed.230400.macosx=230400 +arduino-esp8266.menu.UploadSpeed.230400.upload.speed=230400 +arduino-esp8266.menu.UploadSpeed.256000.windows=256000 +arduino-esp8266.menu.UploadSpeed.256000.upload.speed=256000 +arduino-esp8266.menu.UploadSpeed.460800.linux=460800 +arduino-esp8266.menu.UploadSpeed.460800.macosx=460800 +arduino-esp8266.menu.UploadSpeed.460800.upload.speed=460800 +arduino-esp8266.menu.UploadSpeed.512000.windows=512000 +arduino-esp8266.menu.UploadSpeed.512000.upload.speed=512000 +arduino-esp8266.menu.UploadSpeed.921600=921600 +arduino-esp8266.menu.UploadSpeed.921600.upload.speed=921600 + +############################################################## +gen4iod.name=4D Systems gen4 IoD Range +gen4iod.build.board=GEN4_IOD +gen4iod.build.f_cpu=160000000L +gen4iod.build.variant=generic +gen4iod.upload.tool=esptool +gen4iod.upload.maximum_data_size=81920 +gen4iod.upload.wait_for_upload_port=true +gen4iod.upload.erase_cmd= +gen4iod.serial.disableDTR=true +gen4iod.serial.disableRTS=true +gen4iod.build.mcu=esp8266 +gen4iod.build.core=esp8266 +gen4iod.build.spiffs_pagesize=256 +gen4iod.build.debug_port= +gen4iod.build.debug_level= +gen4iod.menu.CpuFrequency.80=80 MHz +gen4iod.menu.CpuFrequency.80.build.f_cpu=80000000L +gen4iod.menu.CpuFrequency.160=160 MHz +gen4iod.menu.CpuFrequency.160.build.f_cpu=160000000L +gen4iod.upload.resetmethod=nodemcu +gen4iod.build.flash_mode=qio +gen4iod.build.flash_freq=80 +gen4iod.menu.FlashSize.512K0=512K (no SPIFFS) +gen4iod.menu.FlashSize.512K0.build.flash_size=512K +gen4iod.menu.FlashSize.512K0.build.flash_size_bytes=0x80000 +gen4iod.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld +gen4iod.menu.FlashSize.512K0.build.spiffs_pagesize=256 +gen4iod.menu.FlashSize.512K0.upload.maximum_size=499696 +gen4iod.menu.FlashSize.512K0.build.rfcal_addr=0x7C000 +gen4iod.menu.FlashSize.512K64=512K (64K SPIFFS) +gen4iod.menu.FlashSize.512K64.build.flash_size=512K +gen4iod.menu.FlashSize.512K64.build.flash_size_bytes=0x80000 +gen4iod.menu.FlashSize.512K64.build.flash_ld=eagle.flash.512k64.ld +gen4iod.menu.FlashSize.512K64.build.spiffs_pagesize=256 +gen4iod.menu.FlashSize.512K64.upload.maximum_size=434160 +gen4iod.menu.FlashSize.512K64.build.rfcal_addr=0x7C000 +gen4iod.menu.FlashSize.512K64.build.spiffs_start=0x6B000 +gen4iod.menu.FlashSize.512K64.build.spiffs_end=0x7B000 +gen4iod.menu.FlashSize.512K64.build.spiffs_blocksize=4096 +gen4iod.menu.FlashSize.512K128=512K (128K SPIFFS) +gen4iod.menu.FlashSize.512K128.build.flash_size=512K +gen4iod.menu.FlashSize.512K128.build.flash_size_bytes=0x80000 +gen4iod.menu.FlashSize.512K128.build.flash_ld=eagle.flash.512k128.ld +gen4iod.menu.FlashSize.512K128.build.spiffs_pagesize=256 +gen4iod.menu.FlashSize.512K128.upload.maximum_size=368624 +gen4iod.menu.FlashSize.512K128.build.rfcal_addr=0x7C000 +gen4iod.menu.FlashSize.512K128.build.spiffs_start=0x5B000 +gen4iod.menu.FlashSize.512K128.build.spiffs_end=0x7B000 +gen4iod.menu.FlashSize.512K128.build.spiffs_blocksize=4096 +gen4iod.menu.LwIPVariant.v2mss536=v2 Lower Memory +gen4iod.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +gen4iod.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +gen4iod.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +gen4iod.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +gen4iod.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +gen4iod.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +gen4iod.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +gen4iod.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +gen4iod.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +gen4iod.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +gen4iod.menu.LwIPVariant.OpenSource=v1.4 Compile from source +gen4iod.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +gen4iod.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +gen4iod.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +gen4iod.menu.Debug.Disabled=Disabled +gen4iod.menu.Debug.Disabled.build.debug_port= +gen4iod.menu.Debug.Serial=Serial +gen4iod.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +gen4iod.menu.Debug.Serial1=Serial1 +gen4iod.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +gen4iod.menu.DebugLevel.None____=None +gen4iod.menu.DebugLevel.None____.build.debug_level= +gen4iod.menu.DebugLevel.SSL=SSL +gen4iod.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +gen4iod.menu.DebugLevel.TLS_MEM=TLS_MEM +gen4iod.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +gen4iod.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +gen4iod.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +gen4iod.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +gen4iod.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +gen4iod.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +gen4iod.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +gen4iod.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +gen4iod.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +gen4iod.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +gen4iod.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +gen4iod.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +gen4iod.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +gen4iod.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +gen4iod.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +gen4iod.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +gen4iod.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +gen4iod.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +gen4iod.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +gen4iod.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +gen4iod.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +gen4iod.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +gen4iod.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +gen4iod.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +gen4iod.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +gen4iod.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +gen4iod.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +gen4iod.menu.DebugLevel.CORE=CORE +gen4iod.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +gen4iod.menu.DebugLevel.WIFI=WIFI +gen4iod.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +gen4iod.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +gen4iod.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +gen4iod.menu.DebugLevel.UPDATER=UPDATER +gen4iod.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +gen4iod.menu.DebugLevel.OTA=OTA +gen4iod.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +gen4iod.menu.DebugLevel.OOM=OOM +gen4iod.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +gen4iod.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +gen4iod.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +gen4iod.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +gen4iod.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +gen4iod.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +gen4iod.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +gen4iod.menu.FlashErase.none=Only Sketch +gen4iod.menu.FlashErase.none.upload.erase_cmd= +gen4iod.menu.FlashErase.sdk=Sketch + WiFi Settings +gen4iod.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +gen4iod.menu.FlashErase.all=All Flash Contents +gen4iod.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +gen4iod.menu.UploadSpeed.115200=115200 +gen4iod.menu.UploadSpeed.115200.upload.speed=115200 +gen4iod.menu.UploadSpeed.9600=9600 +gen4iod.menu.UploadSpeed.9600.upload.speed=9600 +gen4iod.menu.UploadSpeed.57600=57600 +gen4iod.menu.UploadSpeed.57600.upload.speed=57600 +gen4iod.menu.UploadSpeed.230400.linux=230400 +gen4iod.menu.UploadSpeed.230400.macosx=230400 +gen4iod.menu.UploadSpeed.230400.upload.speed=230400 +gen4iod.menu.UploadSpeed.256000.windows=256000 +gen4iod.menu.UploadSpeed.256000.upload.speed=256000 +gen4iod.menu.UploadSpeed.460800.linux=460800 +gen4iod.menu.UploadSpeed.460800.macosx=460800 +gen4iod.menu.UploadSpeed.460800.upload.speed=460800 +gen4iod.menu.UploadSpeed.512000.windows=512000 +gen4iod.menu.UploadSpeed.512000.upload.speed=512000 +gen4iod.menu.UploadSpeed.921600=921600 +gen4iod.menu.UploadSpeed.921600.upload.speed=921600 + +############################################################## +oak.name=Digistump Oak +oak.build.board=ESP8266_OAK +oak.build.variant=oak +oak.upload.maximum_size=1040368 +oak.upload.tool=esptool +oak.upload.maximum_data_size=81920 +oak.upload.wait_for_upload_port=true +oak.upload.erase_cmd= +oak.serial.disableDTR=true +oak.serial.disableRTS=true +oak.build.mcu=esp8266 +oak.build.core=esp8266 +oak.build.spiffs_pagesize=256 +oak.build.debug_port= +oak.build.debug_level= +oak.menu.CpuFrequency.80=80 MHz +oak.menu.CpuFrequency.80.build.f_cpu=80000000L +oak.menu.CpuFrequency.160=160 MHz +oak.menu.CpuFrequency.160.build.f_cpu=160000000L +oak.upload.resetmethod=none +oak.build.flash_mode=dio +oak.build.flash_freq=40 +oak.menu.FlashSize.4M1M=4M (1M SPIFFS) +oak.menu.FlashSize.4M1M.build.flash_size=4M +oak.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000 +oak.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld +oak.menu.FlashSize.4M1M.build.spiffs_pagesize=256 +oak.menu.FlashSize.4M1M.upload.maximum_size=1044464 +oak.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000 +oak.menu.FlashSize.4M1M.build.spiffs_start=0x300000 +oak.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000 +oak.menu.FlashSize.4M1M.build.spiffs_blocksize=8192 +oak.menu.FlashSize.4M3M=4M (3M SPIFFS) +oak.menu.FlashSize.4M3M.build.flash_size=4M +oak.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000 +oak.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld +oak.menu.FlashSize.4M3M.build.spiffs_pagesize=256 +oak.menu.FlashSize.4M3M.upload.maximum_size=1044464 +oak.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000 +oak.menu.FlashSize.4M3M.build.spiffs_start=0x100000 +oak.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000 +oak.menu.FlashSize.4M3M.build.spiffs_blocksize=8192 +oak.menu.LwIPVariant.v2mss536=v2 Lower Memory +oak.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include +oak.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2 +oak.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 +oak.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth +oak.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include +oak.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460 +oak.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 +oak.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth +oak.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc +oak.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC +oak.menu.LwIPVariant.OpenSource=v1.4 Compile from source +oak.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src +oak.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC +oak.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-" +oak.menu.Debug.Disabled=Disabled +oak.menu.Debug.Disabled.build.debug_port= +oak.menu.Debug.Serial=Serial +oak.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial +oak.menu.Debug.Serial1=Serial1 +oak.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1 +oak.menu.DebugLevel.None____=None +oak.menu.DebugLevel.None____.build.debug_level= +oak.menu.DebugLevel.SSL=SSL +oak.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL +oak.menu.DebugLevel.TLS_MEM=TLS_MEM +oak.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM +oak.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT +oak.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT +oak.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER +oak.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER +oak.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM +oak.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM +oak.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT +oak.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT +oak.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER +oak.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER +oak.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT +oak.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +oak.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER +oak.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +oak.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER +oak.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +oak.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT +oak.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT +oak.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER +oak.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER +oak.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER +oak.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +oak.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER +oak.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +oak.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER +oak.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER +oak.menu.DebugLevel.CORE=CORE +oak.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE +oak.menu.DebugLevel.WIFI=WIFI +oak.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI +oak.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE +oak.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE +oak.menu.DebugLevel.UPDATER=UPDATER +oak.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER +oak.menu.DebugLevel.OTA=OTA +oak.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA +oak.menu.DebugLevel.OOM=OOM +oak.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +oak.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +oak.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +oak.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM +oak.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -include "umm_malloc/umm_malloc_cfg.h" +oak.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG +oak.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG +oak.menu.FlashErase.none=Only Sketch +oak.menu.FlashErase.none.upload.erase_cmd= +oak.menu.FlashErase.sdk=Sketch + WiFi Settings +oak.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000 +oak.menu.FlashErase.all=All Flash Contents +oak.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}" +oak.menu.UploadSpeed.921600=921600 +oak.menu.UploadSpeed.921600.upload.speed=921600 +oak.menu.UploadSpeed.9600=9600 +oak.menu.UploadSpeed.9600.upload.speed=9600 +oak.menu.UploadSpeed.57600=57600 +oak.menu.UploadSpeed.57600.upload.speed=57600 +oak.menu.UploadSpeed.115200=115200 +oak.menu.UploadSpeed.115200.upload.speed=115200 +oak.menu.UploadSpeed.230400.linux=230400 +oak.menu.UploadSpeed.230400.macosx=230400 +oak.menu.UploadSpeed.230400.upload.speed=230400 +oak.menu.UploadSpeed.256000.windows=256000 +oak.menu.UploadSpeed.256000.upload.speed=256000 +oak.menu.UploadSpeed.460800.linux=460800 +oak.menu.UploadSpeed.460800.macosx=460800 +oak.menu.UploadSpeed.460800.upload.speed=460800 +oak.menu.UploadSpeed.512000.windows=512000 +oak.menu.UploadSpeed.512000.upload.speed=512000 + diff --git a/arduino/version 2.4.1/platform.txt b/arduino/version 2.4.1/platform.txt new file mode 100644 index 000000000..2ddeb0065 --- /dev/null +++ b/arduino/version 2.4.1/platform.txt @@ -0,0 +1,137 @@ + +# ESP8266 platform +# ------------------------------ + +# For more info: +# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification + +name=ESP8266 Modules +version=2.4.1 + + + + +compiler.warning_flags=-w +compiler.warning_flags.none=-w +compiler.warning_flags.default= +compiler.warning_flags.more=-Wall +compiler.warning_flags.all=-Wall -Wextra + +build.lwip_lib=-llwip_gcc +build.lwip_include=lwip/include +build.lwip_flags=-DLWIP_OPEN_SRC + +#build.float=-u _printf_float -u _scanf_float +build.float= +build.led= + +compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/ +compiler.sdk.path={runtime.platform.path}/tools/sdk +compiler.libc.path={runtime.platform.path}/tools/sdk/libc/xtensa-lx106-elf +compiler.cpreprocessor.flags=-D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I{compiler.sdk.path}/include" "-I{compiler.sdk.path}/{build.lwip_include}" "-I{compiler.libc.path}/include" "-I{build.path}/core" + +compiler.c.cmd=xtensa-lx106-elf-gcc +compiler.c.flags=-c {compiler.warning_flags} -Os -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -falign-functions=4 -MMD -std=gnu99 -ffunction-sections -fdata-sections + +compiler.S.cmd=xtensa-lx106-elf-gcc +compiler.S.flags=-c -g -x assembler-with-cpp -MMD -mlongcalls + +compiler.c.elf.flags=-g {compiler.warning_flags} -Os -nostdlib -Wl,--no-check-sections -u call_user_start {build.float} -Wl,-static "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" "-L{compiler.libc.path}/lib" "-T{build.flash_ld}" -Wl,--gc-sections -Wl,-wrap,system_restart_local -Wl,-wrap,spi_flash_read + +compiler.c.elf.cmd=xtensa-lx106-elf-gcc +compiler.c.elf.libs=-lhal -lphy -lpp -lnet80211 {build.lwip_lib} -lwpa -lcrypto -lmain -lwps -laxtls -lespnow -lsmartconfig -lairkiss -lwpa2 -lstdc++ -lm -lc -lgcc + +compiler.cpp.cmd=xtensa-lx106-elf-g++ +compiler.cpp.flags=-c {compiler.warning_flags} -Os -g -mlongcalls -mtext-section-literals -fno-exceptions -fno-rtti -falign-functions=4 -std=c++11 -MMD -ffunction-sections -fdata-sections + +compiler.as.cmd=xtensa-lx106-elf-as + +compiler.ar.cmd=xtensa-lx106-elf-ar +compiler.ar.flags=cru + +compiler.elf2hex.cmd=esptool +compiler.elf2hex.flags= + +compiler.size.cmd=xtensa-lx106-elf-size + +compiler.esptool.cmd=esptool +compiler.esptool.cmd.windows=esptool.exe + +# This can be overriden in boards.txt +build.extra_flags=-DESP8266 + +# These can be overridden in platform.local.txt +compiler.c.extra_flags= +compiler.c.elf.extra_flags= +compiler.S.extra_flags= +compiler.cpp.extra_flags= +compiler.ar.extra_flags= +compiler.objcopy.eep.extra_flags= +compiler.elf2hex.extra_flags= + +## generate file with git version number +## needs bash, git, and echo + + +## windows-compatible version without git + + + +## Compile c files +recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}" + +## Compile c++ files +recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}" + +## Compile S files +recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}" + +## Create archives +recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/arduino.ar" "{object_file}" + +## Combine gc-sections, archives, and objects +recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" -Wl,--start-group {object_files} "{build.path}/arduino.ar" {compiler.c.elf.libs} -Wl,--end-group "-L{build.path}" + +## Create eeprom +recipe.objcopy.eep.pattern= + +## Create hex +#recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.hex" + +recipe.objcopy.hex.pattern="{runtime.tools.esptool.path}/{compiler.esptool.cmd}" -eo "{runtime.platform.path}/bootloaders/eboot/eboot.elf" -bo "{build.path}/{build.project_name}.bin" -bm {build.flash_mode} -bf {build.flash_freq} -bz {build.flash_size} -bs .text -bp 4096 -ec -eo "{build.path}/{build.project_name}.elf" -bs .irom0.text -bs .text -bs .data -bs .rodata -bc -ec + +## Save hex +recipe.output.tmp_file={build.project_name}.bin +recipe.output.save_file={build.project_name}.{build.variant}.bin + +## Compute size +recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf" +recipe.size.regex=^(?:\.irom0\.text|\.text|\.data|\.rodata|)\s+([0-9]+).* +recipe.size.regex.data=^(?:\.data|\.rodata|\.bss)\s+([0-9]+).* +#recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* + +# ------------------------------ + +tools.esptool.cmd=esptool +tools.esptool.cmd.windows=esptool.exe +tools.esptool.path={runtime.tools.esptool.path} +tools.esptool.network_cmd=python +tools.esptool.network_cmd.windows=python.exe + +tools.esptool.upload.protocol=esp +tools.esptool.upload.params.verbose=-vv +tools.esptool.upload.params.quiet= +tools.esptool.upload.pattern="{path}/{cmd}" {upload.verbose} -cd {upload.resetmethod} -cb {upload.speed} -cp "{serial.port}" {upload.erase_cmd} -ca 0x00000 -cf "{build.path}/{build.project_name}.bin" +tools.esptool.upload.network_pattern="{network_cmd}" "{runtime.platform.path}/tools/espota.py" -i "{serial.port}" -p "{network.port}" "--auth={network.password}" -f "{build.path}/{build.project_name}.bin" + +tools.mkspiffs.cmd=mkspiffs +tools.mkspiffs.cmd.windows=mkspiffs.exe +tools.mkspiffs.path={runtime.tools.mkspiffs.path} + +tools.espupload.cmd=python +tools.espupload.cmd.windows=python.exe +tools.espupload.path={runtime.platform.path}/tools +tools.espupload.upload.protocol=espupload +tools.espupload.upload.params.verbose= +tools.espupload.upload.params.quiet= +tools.espupload.upload.pattern="{cmd}" "{path}/espupload.py" -f "{build.path}/{build.project_name}.bin" From f30135791d9f7e365bf00b597924387c439c9393 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 10 Mar 2018 14:51:40 +0100 Subject: [PATCH 012/136] v5.12.0e - Add HTML local language header 5.12.0e * Add HTML language header in local language (#2123) --- sonoff/_releasenotes.ino | 1 + sonoff/language/{cz-CZ.h => cs-CZ.h} | 11 +++++++---- sonoff/language/de-DE.h | 3 +++ sonoff/language/en-GB.h | 3 +++ sonoff/language/es-AR.h | 3 +++ sonoff/language/fr-FR.h | 3 +++ sonoff/language/hu-HU.h | 3 +++ sonoff/language/it-IT.h | 3 +++ sonoff/language/nl-NL.h | 3 +++ sonoff/language/pl-PL.h | 3 +++ sonoff/language/pt-PT.h | 3 +++ sonoff/language/ru-RU.h | 3 +++ sonoff/language/zh-CN.h | 3 +++ sonoff/language/zh-TW.h | 3 +++ sonoff/user_config.h | 2 +- sonoff/webserver.ino | 2 +- 16 files changed, 46 insertions(+), 6 deletions(-) rename sonoff/language/{cz-CZ.h => cs-CZ.h} (98%) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 721b8d376..1ad9bb410 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,5 +1,6 @@ /* 5.12.0e * Add a second TLS fingerprint to allow switching keys in TLS mode (#2033, #2102) + * Add HTML language header in local language (#2123) * * 5.12.0d * Add support for optional MQTT drivers to be selected in user_config.h (#1992) diff --git a/sonoff/language/cz-CZ.h b/sonoff/language/cs-CZ.h similarity index 98% rename from sonoff/language/cz-CZ.h rename to sonoff/language/cs-CZ.h index f017e9de5..c799d9a37 100644 --- a/sonoff/language/cz-CZ.h +++ b/sonoff/language/cs-CZ.h @@ -1,5 +1,5 @@ /* - cz-CZ.h - localization for Czech with fonetick - Czech for Sonoff-Tasmota + cz-CZ.h - localization for Czech with diacritics - Czech for Sonoff-Tasmota Copyright (C) 2018 Theo Arends (translated by vs) @@ -17,8 +17,8 @@ along with this program. If not, see . */ -#ifndef _LANGUAGE_CZ_CZ_H_ -#define _LANGUAGE_CZ_CZ_H_ +#ifndef _LANGUAGE_CS_CZ_H_ +#define _LANGUAGE_CS_CZ_H_ /*************************** ATTENTION *******************************\ * @@ -32,6 +32,9 @@ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) +// HTML (ISO 639-1) Language Code +#define D_HTML_LANGUAGE "cs" + // "2017-03-07T11:08:02" - ISO8601:2004 #define D_YEAR_MONTH_SEPARATOR "-" #define D_MONTH_DAY_SEPARATOR "-" @@ -455,4 +458,4 @@ #define D_LOG_UPNP "UPP: " // UPnP #define D_LOG_WIFI "WIF: " // Wifi -#endif // _LANGUAGE_CZ_CZ_H_ +#endif // _LANGUAGE_CS_CZ_H_ diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index d43055b67..14c525a75 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -32,6 +32,9 @@ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) +// HTML (ISO 639-1) Language Code +#define D_HTML_LANGUAGE "de" + // "2017-03-07T11:08:02" - ISO8601:2004 #define D_YEAR_MONTH_SEPARATOR "." #define D_MONTH_DAY_SEPARATOR "." diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h index 905ed5d9b..80c8518df 100644 --- a/sonoff/language/en-GB.h +++ b/sonoff/language/en-GB.h @@ -32,6 +32,9 @@ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) +// HTML (ISO 639-1) Language Code +#define D_HTML_LANGUAGE "en" + // "2017-03-07T11:08:02" - ISO8601:2004 #define D_YEAR_MONTH_SEPARATOR "-" #define D_MONTH_DAY_SEPARATOR "-" diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index c46bfa1d5..fee5c40ea 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -32,6 +32,9 @@ #define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) +// HTML (ISO 639-1) Language Code +#define D_HTML_LANGUAGE "es" + // "2017-03-07T11:08:02" - ISO8601:2004 #define D_YEAR_MONTH_SEPARATOR "-" #define D_MONTH_DAY_SEPARATOR "-" diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h index 653887508..8ec6cd1f7 100644 --- a/sonoff/language/fr-FR.h +++ b/sonoff/language/fr-FR.h @@ -32,6 +32,9 @@ #define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) +// HTML (ISO 639-1) Language Code +#define D_HTML_LANGUAGE "fr" + // "2017-03-07T11:08:02" - ISO8601:2004 #define D_YEAR_MONTH_SEPARATOR "-" #define D_MONTH_DAY_SEPARATOR "-" diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h index 9ce316cf9..c07024f11 100644 --- a/sonoff/language/hu-HU.h +++ b/sonoff/language/hu-HU.h @@ -32,6 +32,9 @@ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) +// HTML (ISO 639-1) Language Code +#define D_HTML_LANGUAGE "hu" + // "2017-03-07T11:08:02" - ISO8601:2004 #define D_YEAR_MONTH_SEPARATOR "." #define D_MONTH_DAY_SEPARATOR "." diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index 0e0f4594f..07499c821 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -32,6 +32,9 @@ #define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) +// HTML (ISO 639-1) Language Code +#define D_HTML_LANGUAGE "it" + // "2017-03-07T11:08:02" - ISO8601:2004 #define D_YEAR_MONTH_SEPARATOR "-" #define D_MONTH_DAY_SEPARATOR "-" diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h index 0932a7326..918f9bddd 100644 --- a/sonoff/language/nl-NL.h +++ b/sonoff/language/nl-NL.h @@ -32,6 +32,9 @@ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) +// HTML (ISO 639-1) Language Code +#define D_HTML_LANGUAGE "nl" + // "2017-03-07T11:08:02" - ISO8601:2004 #define D_YEAR_MONTH_SEPARATOR "-" #define D_MONTH_DAY_SEPARATOR "-" diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h index 1b2bbb099..4542d826d 100644 --- a/sonoff/language/pl-PL.h +++ b/sonoff/language/pl-PL.h @@ -32,6 +32,9 @@ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) +// HTML (ISO 639-1) Language Code +#define D_HTML_LANGUAGE "pl" + // "2017-03-07T11:08:02" - ISO8601:2004 #define D_YEAR_MONTH_SEPARATOR "-" #define D_MONTH_DAY_SEPARATOR "-" diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h index cc3b74a04..db42667f5 100644 --- a/sonoff/language/pt-PT.h +++ b/sonoff/language/pt-PT.h @@ -32,6 +32,9 @@ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) +// HTML (ISO 639-1) Language Code +#define D_HTML_LANGUAGE "pt" + // "2017-03-07T11:08:02" - ISO8601:2004 #define D_YEAR_MONTH_SEPARATOR "-" #define D_MONTH_DAY_SEPARATOR "-" diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h index d5483b504..1b60f0e4a 100644 --- a/sonoff/language/ru-RU.h +++ b/sonoff/language/ru-RU.h @@ -32,6 +32,9 @@ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) +// HTML (ISO 639-1) Language Code +#define D_HTML_LANGUAGE "ru" + // "2017-03-07T11:08:02" - ISO8601:2004 #define D_YEAR_MONTH_SEPARATOR "-" #define D_MONTH_DAY_SEPARATOR "-" diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h index feff61a23..d52e648f9 100644 --- a/sonoff/language/zh-CN.h +++ b/sonoff/language/zh-CN.h @@ -32,6 +32,9 @@ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) +// HTML (ISO 639-1) Language Code +#define D_HTML_LANGUAGE "zh" + // "2017-03-07T11:08:02" - ISO8601:2004 #define D_YEAR_MONTH_SEPARATOR "-" #define D_MONTH_DAY_SEPARATOR "-" diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h index 8ae1618c6..e011dfe3c 100644 --- a/sonoff/language/zh-TW.h +++ b/sonoff/language/zh-TW.h @@ -32,6 +32,9 @@ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) +// HTML (ISO 639-1) Language Code +#define D_HTML_LANGUAGE "zh" + // "2017-03-07T11:08:02" - ISO8601:2004 #define D_YEAR_MONTH_SEPARATOR "-" #define D_MONTH_DAY_SEPARATOR "-" diff --git a/sonoff/user_config.h b/sonoff/user_config.h index a59d451fd..92a8c160f 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -29,7 +29,7 @@ \*********************************************************************************************/ // -- Localization -------------------------------- -//#define MY_LANGUAGE cz-CZ // Czech without fonetick in Czech +//#define MY_LANGUAGE cs-CZ // Czech in Czech //#define MY_LANGUAGE de-DE // German in Germany //#define MY_LANGUAGE en-GB // English in Great Britain. Enabled by Default //#define MY_LANGUAGE es-AR // Spanish in Argentina diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index fb248a2a7..cc843748f 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -29,7 +29,7 @@ #define STR(x) STR_HELPER(x) const char HTTP_HEAD[] PROGMEM = - "" + "" "" "" "" From 4063275f7db2841d4c26d6c0b36539d9d5507ce8 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 10 Mar 2018 17:58:54 +0100 Subject: [PATCH 013/136] v5.12.0e - Add Clock features 5.12.0e * Add commands Color6 RRGGBB for Clock marker color and Rotation pixels for Clock rotation (#2092) --- sonoff/_releasenotes.ino | 1 + sonoff/i18n.h | 1 + sonoff/settings.h | 6 ++---- sonoff/settings.ino | 6 ++++-- sonoff/sonoff.h | 4 ++-- sonoff/xdrv_01_light.ino | 15 +++++++++++---- sonoff/xplg_ws2812.ino | 32 ++++++++++++++++---------------- 7 files changed, 37 insertions(+), 28 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 1ad9bb410..9b04c9236 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,6 +1,7 @@ /* 5.12.0e * Add a second TLS fingerprint to allow switching keys in TLS mode (#2033, #2102) * Add HTML language header in local language (#2123) + * Add commands Color6 RRGGBB for Clock marker color and Rotation pixels for Clock rotation (#2092) * * 5.12.0d * Add support for optional MQTT drivers to be selected in user_config.h (#1992) diff --git a/sonoff/i18n.h b/sonoff/i18n.h index e0e115b50..6b724fce9 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -250,6 +250,7 @@ #define D_CMND_LEDTABLE "LedTable" #define D_CMND_FADE "Fade" #define D_CMND_PIXELS "Pixels" +#define D_CMND_ROTATION "Rotation" #define D_CMND_SCHEME "Scheme" #define D_CMND_SPEED "Speed" #define D_CMND_WAKEUP "Wakeup" diff --git a/sonoff/settings.h b/sonoff/settings.h index a3049dbca..3cdedb488 100644 --- a/sonoff/settings.h +++ b/sonoff/settings.h @@ -116,11 +116,9 @@ struct SYSCFG { byte syslog_level; // 1AA uint8_t webserver; // 1AB byte weblog_level; // 1AC - -// char mqtt_fingerprint[60]; // 1AD uint8_t mqtt_fingerprint[2][20]; // 1AD - byte free_1D5[20]; // 1D5 + byte free_1D5[20]; // 1D5 Free since 5.12.0e char mqtt_host[33]; // 1E9 uint16_t mqtt_port; // 20A @@ -186,7 +184,7 @@ struct SYSCFG { uint16_t blinktime; // 39A uint16_t blinkcount; // 39C - uint16_t ws_pixels; // 39E Not used since 5.8.0 + uint16_t light_rotation; // 39E uint8_t ws_red; // 3A0 Not used since 5.8.0 uint8_t ws_green; // 3A1 Not used since 5.8.0 uint8_t ws_blue; // 3A2 Not used since 5.8.0 diff --git a/sonoff/settings.ino b/sonoff/settings.ino index b0d6c444e..72bbcf5fc 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -579,6 +579,7 @@ void SettingsDefaultSet2() // 5.8.0 Settings.light_pixels = WS2812_LEDS; +// Settings.light_rotation = 0; // 5.8.1 // Settings.altitude = 0; @@ -597,7 +598,6 @@ void SettingsDefaultSet2() void SettingsDefaultSet_3_2_4() { - Settings.ws_pixels = WS2812_LEDS; Settings.ws_red = 255; Settings.ws_green = 0; Settings.ws_blue = 0; @@ -625,6 +625,7 @@ void SettingsDefaultSet_3_9_3() } Settings.light_pixels = WS2812_LEDS; + Settings.light_rotation = 0; for (byte i = 0; i < MAX_PWMS; i++) { Settings.light_color[i] = 255; } @@ -835,7 +836,7 @@ void SettingsDelta() } } if (!Settings.light_pixels && cfg_wsflg) { - Settings.light_pixels = Settings.ws_pixels; + Settings.light_pixels = WS2812_LEDS; Settings.light_color[0] = Settings.ws_red; Settings.light_color[1] = Settings.ws_green; Settings.light_color[2] = Settings.ws_blue; @@ -887,6 +888,7 @@ void SettingsDelta() Settings.flag.not_power_linked = 0; } if (Settings.version < 0x050C0005) { + Settings.light_rotation = 0; char fingerprint[60]; memcpy(fingerprint, Settings.mqtt_fingerprint, sizeof(fingerprint)); char *p = fingerprint; diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index cfa72ffe6..df588119c 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -138,8 +138,8 @@ enum SettingsParmaIndex {P_HOLD_TIME, P_MAX_POWER_RETRY, P_MAX_PARAM8}; enum DomoticzSensors {DZ_TEMP, DZ_TEMP_HUM, DZ_TEMP_HUM_BARO, DZ_POWER_ENERGY, DZ_ILLUMINANCE, DZ_COUNT, DZ_VOLTAGE, DZ_CURRENT, DZ_AIRQUALITY, DZ_MAX_SENSORS}; -enum Ws2812ClockIndex {WS_SECOND, WS_MINUTE, WS_HOUR}; -enum Ws2812Color {WS_RED, WS_GREEN, WS_BLUE}; +enum Ws2812ClockIndex { WS_SECOND, WS_MINUTE, WS_HOUR, WS_MARKER }; +enum Ws2812Color { WS_RED, WS_GREEN, WS_BLUE }; enum LightTypes {LT_BASIC, LT_PWM1, LT_PWM2, LT_PWM3, LT_PWM4, LT_PWM5, LT_PWM6, LT_PWM7, LT_NU8, LT_NU9, LT_NU10, LT_WS2812, LT_RGBW, LT_RGBWC}; enum LichtSubtypes {LST_NONE, LST_SINGLE, LST_COLDWARM, LST_RGB, LST_RGBW, LST_RGBWC}; enum LichtSchemes {LS_POWER, LS_WAKEUP, LS_CYCLEUP, LS_CYCLEDN, LS_RANDOM, LS_MAX}; diff --git a/sonoff/xdrv_01_light.ino b/sonoff/xdrv_01_light.ino index 432788878..6bcf20bea 100644 --- a/sonoff/xdrv_01_light.ino +++ b/sonoff/xdrv_01_light.ino @@ -55,10 +55,10 @@ enum LightCommands { CMND_COLOR, CMND_COLORTEMPERATURE, CMND_DIMMER, CMND_LED, CMND_LEDTABLE, CMND_FADE, - CMND_PIXELS, CMND_SCHEME, CMND_SPEED, CMND_WAKEUP, CMND_WAKEUPDURATION, CMND_WIDTH, CMND_UNDOCA }; + CMND_PIXELS, CMND_ROTATION, CMND_SCHEME, CMND_SPEED, CMND_WAKEUP, CMND_WAKEUPDURATION, CMND_WIDTH, CMND_UNDOCA }; const char kLightCommands[] PROGMEM = D_CMND_COLOR "|" D_CMND_COLORTEMPERATURE "|" D_CMND_DIMMER "|" D_CMND_LED "|" D_CMND_LEDTABLE "|" D_CMND_FADE "|" - D_CMND_PIXELS "|" D_CMND_SCHEME "|" D_CMND_SPEED "|" D_CMND_WAKEUP "|" D_CMND_WAKEUPDURATION "|" D_CMND_WIDTH "|UNDOCA" ; + D_CMND_PIXELS "|" D_CMND_ROTATION "|" D_CMND_SCHEME "|" D_CMND_SPEED "|" D_CMND_WAKEUP "|" D_CMND_WAKEUPDURATION "|" D_CMND_WIDTH "|UNDOCA" ; struct LRgbColor { uint8_t R, G, B; @@ -1018,7 +1018,7 @@ boolean LightCommand() char option = (1 == XdrvMailbox.data_len) ? XdrvMailbox.data[0] : '\0'; int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic, kLightCommands); - if ((CMND_COLOR == command_code) && (light_subtype > LST_SINGLE) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= 5)) { + if ((CMND_COLOR == command_code) && (light_subtype > LST_SINGLE) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= 6)) { if (XdrvMailbox.data_len > 0) { valid_entry = LightColorEntry(XdrvMailbox.data, XdrvMailbox.data_len); if (valid_entry) { @@ -1031,7 +1031,7 @@ boolean LightCommand() } Settings.light_scheme = 0; coldim = true; - } else { // Color3, 4 and 5 + } else { // Color3, 4, 5 and 6 for (byte i = 0; i < LST_RGB; i++) { Settings.ws_color[XdrvMailbox.index -3][i] = light_entry_color[i]; } @@ -1065,11 +1065,18 @@ boolean LightCommand() else if ((CMND_PIXELS == command_code) && (LT_WS2812 == light_type)) { if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= WS2812_MAX_LEDS)) { Settings.light_pixels = XdrvMailbox.payload; + Settings.light_rotation = 0; Ws2812Clear(); light_update = 1; } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, Settings.light_pixels); } + else if ((CMND_ROTATION == command_code) && (LT_WS2812 == light_type)) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < Settings.light_pixels)) { + Settings.light_rotation = XdrvMailbox.payload; + } + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, Settings.light_rotation); + } else if ((CMND_WIDTH == command_code) && (LT_WS2812 == light_type) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= 4)) { if (1 == XdrvMailbox.index) { if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 4)) { diff --git a/sonoff/xplg_ws2812.ino b/sonoff/xplg_ws2812.ino index d8d085085..42aafb8f3 100644 --- a/sonoff/xplg_ws2812.ino +++ b/sonoff/xplg_ws2812.ino @@ -114,9 +114,7 @@ void Ws2812StripShow() int mod(int a, int b) { int ret = a % b; - if (ret < 0) { - ret += b; - } + if (ret < 0) ret += b; return ret; } @@ -142,13 +140,15 @@ void Ws2812UpdatePixelColor(int position, struct WsColor hand_color, float offse void Ws2812UpdateHand(int position, uint8_t index) { - if (Settings.flag.ws_clock_reverse) { - position = Settings.light_pixels -position; - } + position = (position + Settings.light_rotation) % Settings.light_pixels; + + if (Settings.flag.ws_clock_reverse) position = Settings.light_pixels -position; WsColor hand_color = { Settings.ws_color[index][WS_RED], Settings.ws_color[index][WS_GREEN], Settings.ws_color[index][WS_BLUE] }; Ws2812UpdatePixelColor(position, hand_color, 1); - uint8_t range = ((Settings.ws_width[index] -1) / 2) +1; + + uint8_t range = 1; + if (index < WS_MARKER) range = ((Settings.ws_width[index] -1) / 2) +1; for (uint8_t h = 1; h < range; h++) { float offset = (float)(range - h) / (float)range; Ws2812UpdatePixelColor(position -h, hand_color, offset); @@ -160,9 +160,15 @@ void Ws2812Clock() { strip->ClearTo(0); // Reset strip int clksize = 60000 / (int)Settings.light_pixels; + Ws2812UpdateHand((RtcTime.second * 1000) / clksize, WS_SECOND); Ws2812UpdateHand((RtcTime.minute * 1000) / clksize, WS_MINUTE); Ws2812UpdateHand(((RtcTime.hour % 12) * (5000 / clksize)) + ((RtcTime.minute * 1000) / (12 * clksize)), WS_HOUR); + if (Settings.ws_color[WS_MARKER][WS_RED] + Settings.ws_color[WS_MARKER][WS_GREEN] + Settings.ws_color[WS_MARKER][WS_BLUE]) { + for (byte i = 0; i < 12; i++) { + Ws2812UpdateHand((i * 5000) / clksize, WS_MARKER); + } + } Ws2812StripShow(); } @@ -207,9 +213,7 @@ void Ws2812Gradient(uint8_t schemenr) #endif ColorScheme scheme = kSchemes[schemenr]; - if (scheme.count < 2) { - return; - } + if (scheme.count < 2) return; uint8_t repeat = kRepeat[Settings.light_width]; // number of scheme.count per ledcount uint16_t range = (uint16_t)ceil((float)Settings.light_pixels / (float)repeat); @@ -260,9 +264,7 @@ void Ws2812Bars(uint8_t schemenr) ColorScheme scheme = kSchemes[schemenr]; uint16_t maxSize = Settings.light_pixels / scheme.count; - if (kWidth[Settings.light_width] > maxSize) { - maxSize = 0; - } + if (kWidth[Settings.light_width] > maxSize) maxSize = 0; uint16_t speed = ((Settings.light_speed * 2) -1) * (STATES / 10); uint8_t offset = speed > 0 ? strip_timer_counter / speed : 0; @@ -280,9 +282,7 @@ void Ws2812Bars(uint8_t schemenr) } uint8_t colorIndex = offset % scheme.count; for (i = 0; i < Settings.light_pixels; i++) { - if (maxSize) { - colorIndex = ((i + offset) % (scheme.count * kWidth[Settings.light_width])) / kWidth[Settings.light_width]; - } + if (maxSize) colorIndex = ((i + offset) % (scheme.count * kWidth[Settings.light_width])) / kWidth[Settings.light_width]; c.R = mcolor[colorIndex].red; c.G = mcolor[colorIndex].green; c.B = mcolor[colorIndex].blue; From ad40a851613e69ccfca7e39fd305c712c16a53bf Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sun, 11 Mar 2018 15:23:17 +0100 Subject: [PATCH 014/136] v5.12.0e - Add wifi Retry time offset 5.12.0e * Add additional time offset to Wifi Retry based on device mac address (#2089) --- sonoff/_releasenotes.ino | 1 + sonoff/support.ino | 34 ++++++++++++++++++---------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 9b04c9236..67f7d8da6 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,5 @@ /* 5.12.0e + * Add additional time offset to Wifi Retry based on device mac address (#2089) * Add a second TLS fingerprint to allow switching keys in TLS mode (#2033, #2102) * Add HTML language header in local language (#2123) * Add commands Color6 RRGGBB for Clock marker color and Rotation pixels for Clock rotation (#2092) diff --git a/sonoff/support.ino b/sonoff/support.ino index bca8532be..1033d7e1b 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -119,7 +119,7 @@ Decoding 14 results 0x4021ffb4: snprintf_P(char*, unsigned int, char const*, ...) at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/pgmspace.cpp line 146 0x40201118: atol at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/core_esp8266_noniso.c line 45 0x40201128: atoi at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/core_esp8266_noniso.c line 45 -0x4020fafb: MqttDataCallback(char*, unsigned char*, unsigned int) at R:\Arduino\Work-ESP8266\Theo\sonoff\sonoff-4\sonoff/sonoff.ino line 679 (discriminator 1) +0x4020fafb: MqttDataHandler(char*, unsigned char*, unsigned int) at R:\Arduino\Work-ESP8266\Theo\sonoff\sonoff-4\sonoff/sonoff.ino line 679 (discriminator 1) 0x4022321b: pp_attach at ?? line ? 00:00:08 MQTT: tele/sonoff/INFO3 = {"Started":"Fatal exception:28 flag:2 (EXCEPTION) epc1:0x4000bf64 epc2:0x00000000 epc3:0x00000000 excvaddr:0x00000007 depc:0x00000000"} @@ -427,11 +427,12 @@ uint32_t GetHash(const char *buffer, size_t size) * Wifi \*********************************************************************************************/ -#define WIFI_CONFIG_SEC 180 // seconds before restart -#define WIFI_CHECK_SEC 20 // seconds -#define WIFI_RETRY_SEC 30 // seconds +#define WIFI_CONFIG_SEC 180 // seconds before restart +#define WIFI_CHECK_SEC 20 // seconds +#define WIFI_RETRY_OFFSET_SEC 20 // seconds uint8_t wifi_counter; +uint8_t wifi_retry_init; uint8_t wifi_retry; uint8_t wifi_status; uint8_t wps_result; @@ -599,7 +600,7 @@ void WifiCheckIp() { if ((WL_CONNECTED == WiFi.status()) && (static_cast(WiFi.localIP()) != 0)) { wifi_counter = WIFI_CHECK_SEC; - wifi_retry = WIFI_RETRY_SEC; + wifi_retry = wifi_retry_init; AddLog_P((wifi_status != WL_CONNECTED) ? LOG_LEVEL_INFO : LOG_LEVEL_DEBUG_MORE, S_LOG_WIFI, PSTR(D_CONNECTED)); if (wifi_status != WL_CONNECTED) { // AddLog_P(LOG_LEVEL_INFO, PSTR("Wifi: Set IP addresses")); @@ -614,15 +615,15 @@ void WifiCheckIp() case WL_CONNECTED: AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_NO_IP_ADDRESS)); wifi_status = 0; - wifi_retry = WIFI_RETRY_SEC; + wifi_retry = wifi_retry_init; break; case WL_NO_SSID_AVAIL: AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_AP_NOT_REACHED)); if (WIFI_WAIT == Settings.sta_config) { - wifi_retry = WIFI_RETRY_SEC; + wifi_retry = wifi_retry_init; } else { - if (wifi_retry > (WIFI_RETRY_SEC / 2)) { - wifi_retry = WIFI_RETRY_SEC / 2; + if (wifi_retry > (wifi_retry_init / 2)) { + wifi_retry = wifi_retry_init / 2; } else if (wifi_retry) { wifi_retry = 0; @@ -631,25 +632,25 @@ void WifiCheckIp() break; case WL_CONNECT_FAILED: AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_WRONG_PASSWORD)); - if (wifi_retry > (WIFI_RETRY_SEC / 2)) { - wifi_retry = WIFI_RETRY_SEC / 2; + if (wifi_retry > (wifi_retry_init / 2)) { + wifi_retry = wifi_retry_init / 2; } else if (wifi_retry) { wifi_retry = 0; } break; default: // WL_IDLE_STATUS and WL_DISCONNECTED - if (!wifi_retry || ((WIFI_RETRY_SEC / 2) == wifi_retry)) { + if (!wifi_retry || ((wifi_retry_init / 2) == wifi_retry)) { AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_AP_TIMEOUT)); } else { AddLog_P(LOG_LEVEL_DEBUG, S_LOG_WIFI, PSTR(D_ATTEMPTING_CONNECTION)); } } if (wifi_retry) { - if (WIFI_RETRY_SEC == wifi_retry) { + if (wifi_retry_init == wifi_retry) { WifiBegin(3); // Select default SSID } - if ((Settings.sta_config != WIFI_WAIT) && ((WIFI_RETRY_SEC / 2) == wifi_retry)) { + if ((Settings.sta_config != WIFI_WAIT) && ((wifi_retry_init / 2) == wifi_retry)) { WifiBegin(2); // Select alternate SSID } wifi_counter = 1; @@ -657,7 +658,7 @@ void WifiCheckIp() } else { WifiConfig(Settings.sta_config); wifi_counter = 1; - wifi_retry = WIFI_RETRY_SEC; + wifi_retry = wifi_retry_init; } } } @@ -765,7 +766,8 @@ void WifiConnect() { WiFi.persistent(false); // Solve possible wifi init errors wifi_status = 0; - wifi_retry = WIFI_RETRY_SEC; + wifi_retry_init = WIFI_RETRY_OFFSET_SEC + ((ESP.getChipId() & 0xF) * 2); + wifi_retry = wifi_retry_init; wifi_counter = 1; } From fa25b8c04379e0c3108f705c6434df774608c873 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sun, 11 Mar 2018 15:46:58 +0100 Subject: [PATCH 015/136] v5.12.0e - Add display remaining time to PulseTime 5.12.0e * Add display of remaining pulse time to command PulseTime (#2085) --- sonoff/_releasenotes.ino | 5 +++-- sonoff/i18n.h | 1 + sonoff/sonoff.ino | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 67f7d8da6..af9289dba 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,8 +1,9 @@ /* 5.12.0e - * Add additional time offset to Wifi Retry based on device mac address (#2089) * Add a second TLS fingerprint to allow switching keys in TLS mode (#2033, #2102) + * Add display of remaining pulse time to command PulseTime (#2085) + * Add additional time offset to Wifi Retry based on device mac address (#2089) + * Add command Color6 RRGGBB for Clock hour marker color and command Rotation pixels for Clock rotation (#2092) * Add HTML language header in local language (#2123) - * Add commands Color6 RRGGBB for Clock marker color and Rotation pixels for Clock rotation (#2092) * * 5.12.0d * Add support for optional MQTT drivers to be selected in user_config.h (#1992) diff --git a/sonoff/i18n.h b/sonoff/i18n.h index 6b724fce9..7508e3bf8 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -401,6 +401,7 @@ const char S_JSON_COMMAND_INDEX_NVALUE[] PROGMEM = "{\"%s%d\":%d}"; const char S_JSON_COMMAND_INDEX_LVALUE[] PROGMEM = "{\"%s%d\":%lu}"; const char S_JSON_COMMAND_INDEX_SVALUE[] PROGMEM = "{\"%s%d\":\"%s\"}"; const char S_JSON_COMMAND_INDEX_SVALUE_SVALUE[] PROGMEM = "{\"%s%d\":\"%s%s\"}"; +const char S_JSON_COMMAND_INDEX_NVALUE_ACTIVE_NVALUE[] PROGMEM = "{\"%s%d\":\"%d (" D_JSON_ACTIVE " %d)\"}"; const char S_JSON_SENSOR_INDEX_NVALUE[] PROGMEM = "{\"" D_CMND_SENSOR "%d\":%d}"; const char S_JSON_SENSOR_INDEX_SVALUE[] PROGMEM = "{\"" D_CMND_SENSOR "%d\":\"%s\"}"; diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 5f3ce3ea4..9ceb02e83 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -513,7 +513,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) Settings.pulse_timer[index -1] = payload16; // 0 - 65535 pulse_timer[index -1] = 0; } - snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_NVALUE, command, index, Settings.pulse_timer[index -1]); + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_NVALUE_ACTIVE_NVALUE, command, index, Settings.pulse_timer[index -1], pulse_timer[index -1]); } else if (CMND_BLINKTIME == command_code) { if ((payload > 2) && (payload <= 3600)) { From 9a421ab6a28744b5d5f1d2104dfec1cb4d806e00 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sun, 11 Mar 2018 17:44:58 +0100 Subject: [PATCH 016/136] v5.12.0e - Fix MAX31850 higher temperatures 5.12.0e * Fix MAX31850 higher temperatures (#1269) --- sonoff/_releasenotes.ino | 1 + sonoff/xsns_05_ds18x20.ino | 34 ++++++++++++++++++++++--------- sonoff/xsns_05_ds18x20_legacy.ino | 19 ++++++++++++----- 3 files changed, 39 insertions(+), 15 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index af9289dba..63560c599 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -4,6 +4,7 @@ * Add additional time offset to Wifi Retry based on device mac address (#2089) * Add command Color6 RRGGBB for Clock hour marker color and command Rotation pixels for Clock rotation (#2092) * Add HTML language header in local language (#2123) + * Fix MAX31850 higher temperatures (#1269) * * 5.12.0d * Add support for optional MQTT drivers to be selected in user_config.h (#1992) diff --git a/sonoff/xsns_05_ds18x20.ino b/sonoff/xsns_05_ds18x20.ino index fa525da36..545b27e72 100644 --- a/sonoff/xsns_05_ds18x20.ino +++ b/sonoff/xsns_05_ds18x20.ino @@ -287,6 +287,8 @@ boolean Ds18x20Read(uint8_t sensor, float &t) { uint8_t data[9]; int8_t sign = 1; + uint16_t temp12 = 0; + int16_t temp14 = 0; float temp9 = 0.0; t = NAN; @@ -315,23 +317,30 @@ boolean Ds18x20Read(uint8_t sensor, float &t) case DS1822_CHIPID: case DS18B20_CHIPID: if (data[4] != 0x7F) { - data[4] = 0x7F; // Set resolution to 12-bit + data[4] = 0x7F; // Set resolution to 12-bit OneWireReset(); OneWireSelect(ds18x20_address[ds18x20_index[sensor]]); OneWireWrite(W1_WRITE_SCRATCHPAD); - OneWireWrite(data[2]); // Th Register - OneWireWrite(data[3]); // Tl Register - OneWireWrite(data[4]); // Configuration Register + OneWireWrite(data[2]); // Th Register + OneWireWrite(data[3]); // Tl Register + OneWireWrite(data[4]); // Configuration Register OneWireSelect(ds18x20_address[ds18x20_index[sensor]]); - OneWireWrite(W1_WRITE_EEPROM); // Save scratchpad to EEPROM + OneWireWrite(W1_WRITE_EEPROM); // Save scratchpad to EEPROM } - case MAX31850_CHIPID: - uint16_t temp12 = (data[1] << 8) + data[0]; + temp12 = (data[1] << 8) + data[0]; if (temp12 > 2047) { temp12 = (~temp12) +1; sign = -1; } - t = ConvertTemp(sign * temp12 * 0.0625); + t = ConvertTemp(sign * temp12 * 0.0625); // Divide by 16 + break; + case MAX31850_CHIPID: + temp14 = (data[1] << 8) + (data[0] & 0xFC); + if (temp14 < 0) { + temp14 = (~temp14) +1; + sign = -1; + } + t = ConvertTemp(sign * temp14 * 0.0625); // Divide by 16 break; } } @@ -404,8 +413,13 @@ boolean Xsns05(byte function) case FUNC_INIT: Ds18x20Init(); break; +// case FUNC_EVERY_SECOND: +// if ((Settings.tele_period - tele_period) &3 == 3) { +// Ds18x20Convert(); // Start conversion every four seconds, takes up to one second +// } +// break; case FUNC_PREP_BEFORE_TELEPERIOD: - Ds18x20Convert(); // Start conversion, takes up to one second + Ds18x20Convert(); // Start conversion, takes up to one second break; case FUNC_JSON_APPEND: Ds18x20Show(1); @@ -413,7 +427,7 @@ boolean Xsns05(byte function) #ifdef USE_WEBSERVER case FUNC_WEB_APPEND: Ds18x20Show(0); - Ds18x20Convert(); // Start conversion, takes up to one second + Ds18x20Convert(); // Start conversion, takes up to one second break; #endif // USE_WEBSERVER } diff --git a/sonoff/xsns_05_ds18x20_legacy.ino b/sonoff/xsns_05_ds18x20_legacy.ino index cf083d766..d352c064c 100644 --- a/sonoff/xsns_05_ds18x20_legacy.ino +++ b/sonoff/xsns_05_ds18x20_legacy.ino @@ -103,6 +103,8 @@ boolean Ds18x20Read(uint8_t sensor, float &t) { byte data[12]; int8_t sign = 1; + uint16_t temp12 = 0; + int16_t temp14 = 0; float temp9 = 0.0; uint8_t present = 0; @@ -117,7 +119,7 @@ boolean Ds18x20Read(uint8_t sensor, float &t) } if (OneWire::crc8(data, 8) == data[8]) { switch(ds18x20_address[ds18x20_index[sensor]][0]) { - case DS18S20_CHIPID: // DS18S20 + case DS18S20_CHIPID: if (data[1] > 0x80) { data[0] = (~data[0]) +1; sign = -1; // App-Note fix possible sign error @@ -129,14 +131,21 @@ boolean Ds18x20Read(uint8_t sensor, float &t) } t = ConvertTemp((temp9 - 0.25) + ((16.0 - data[6]) / 16.0)); break; - case DS18B20_CHIPID: // DS18B20 - case MAX31850_CHIPID: // MAX31850 - uint16_t temp12 = (data[1] << 8) + data[0]; + case DS18B20_CHIPID: + temp12 = (data[1] << 8) + data[0]; if (temp12 > 2047) { temp12 = (~temp12) +1; sign = -1; } - t = ConvertTemp(sign * temp12 * 0.0625); + t = ConvertTemp(sign * temp12 * 0.0625); // Divide by 16 + break; + case MAX31850_CHIPID: + temp14 = (data[1] << 8) + (data[0] & 0xFC); + if (temp14 < 0) { + temp14 = (~temp14) +1; + sign = -1; + } + t = ConvertTemp(sign * temp14 * 0.0625); // Divide by 16 break; } } From 846f4d01781e02a34ffa4c40b9ffbf96c8e754bb Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 12 Mar 2018 11:04:38 +0100 Subject: [PATCH 017/136] v5.12.0e - Better fix MAX31850 higher temperatures 5.12.0e * Fix MAX31850 higher temperatures (#1269) --- sonoff/xsns_05_ds18x20.ino | 6 +----- sonoff/xsns_05_ds18x20_legacy.ino | 8 ++------ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/sonoff/xsns_05_ds18x20.ino b/sonoff/xsns_05_ds18x20.ino index 545b27e72..23dc4482e 100644 --- a/sonoff/xsns_05_ds18x20.ino +++ b/sonoff/xsns_05_ds18x20.ino @@ -336,11 +336,7 @@ boolean Ds18x20Read(uint8_t sensor, float &t) break; case MAX31850_CHIPID: temp14 = (data[1] << 8) + (data[0] & 0xFC); - if (temp14 < 0) { - temp14 = (~temp14) +1; - sign = -1; - } - t = ConvertTemp(sign * temp14 * 0.0625); // Divide by 16 + t = ConvertTemp(temp14 * 0.0625); // Divide by 16 break; } } diff --git a/sonoff/xsns_05_ds18x20_legacy.ino b/sonoff/xsns_05_ds18x20_legacy.ino index d352c064c..085280ece 100644 --- a/sonoff/xsns_05_ds18x20_legacy.ino +++ b/sonoff/xsns_05_ds18x20_legacy.ino @@ -140,12 +140,8 @@ boolean Ds18x20Read(uint8_t sensor, float &t) t = ConvertTemp(sign * temp12 * 0.0625); // Divide by 16 break; case MAX31850_CHIPID: - temp14 = (data[1] << 8) + (data[0] & 0xFC); - if (temp14 < 0) { - temp14 = (~temp14) +1; - sign = -1; - } - t = ConvertTemp(sign * temp14 * 0.0625); // Divide by 16 + temp14 = (data[1] << 8) + (data[0] & 0xFC); + t = ConvertTemp(temp14 * 0.0625); // Divide by 16 break; } } From 058e911c94b9f79c30c12ee5c9ce6f8ac09d9f94 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 12 Mar 2018 14:56:48 +0100 Subject: [PATCH 018/136] v5.12.0e - Add Domoticz dust sensors 5.12.0e * Add Domoticz dust (custom) sensors to PMS5003 and NovaFitness SDS drivers as PM1, PM2.5 and PM10 --- sonoff/_releasenotes.ino | 1 + sonoff/language/cs-CZ.h | 23 ++++++++++++----------- sonoff/language/de-DE.h | 21 +++++++++++---------- sonoff/language/en-GB.h | 21 +++++++++++---------- sonoff/language/es-AR.h | 21 +++++++++++---------- sonoff/language/fr-FR.h | 21 +++++++++++---------- sonoff/language/hu-HU.h | 21 +++++++++++---------- sonoff/language/it-IT.h | 21 +++++++++++---------- sonoff/language/nl-NL.h | 21 +++++++++++---------- sonoff/language/pl-PL.h | 21 +++++++++++---------- sonoff/language/pt-PT.h | 21 +++++++++++---------- sonoff/language/ru-RU.h | 22 +++++++++++----------- sonoff/language/zh-CN.h | 21 +++++++++++---------- sonoff/language/zh-TW.h | 21 +++++++++++---------- sonoff/xsns_18_pms5003.ino | 5 +++++ sonoff/xsns_20_novasds.ino | 4 ++++ 16 files changed, 154 insertions(+), 132 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 63560c599..959c83d8d 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,5 @@ /* 5.12.0e + * Add Domoticz dust (custom) sensors to PMS5003 and NovaFitness SDS drivers as PM1, PM2.5 and PM10 * Add a second TLS fingerprint to allow switching keys in TLS mode (#2033, #2102) * Add display of remaining pulse time to command PulseTime (#2085) * Add additional time offset to Wifi Retry based on device mac address (#2089) diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h index c799d9a37..5f60ae8c1 100644 --- a/sonoff/language/cs-CZ.h +++ b/sonoff/language/cs-CZ.h @@ -1,5 +1,5 @@ /* - cz-CZ.h - localization for Czech with diacritics - Czech for Sonoff-Tasmota + cs-CZ.h - localization for Czech with diacritics - Czech for Sonoff-Tasmota Copyright (C) 2018 Theo Arends (translated by vs) @@ -165,13 +165,6 @@ #define D_DATA_SIZE "Velikost dat" #define D_ANALOG_INPUT "Analogový vstup" -#define D_FINGERPRINT "Verifikuj otisk TLS..." -#define D_TLS_CONNECT_FAILED_TO "Nepřipojeno TLS do" -#define D_RETRY_IN "Zopakuji za" -#define D_VERIFIED "Ověřeno otisk " -#define D_INSECURE "Nesprávné připojení z důvodu chybného otisku TLS" -#define D_CONNECT_FAILED_TO "Spojení se nepodařilo navázat" - // support.ino #define D_OSWATCH "osWatch" #define D_BLOCKED_LOOP "Zablokování smyčky" @@ -320,6 +313,14 @@ #define D_ENABLE_WEBLOG_FOR_RESPONSE "Zapni úroveň 2 zápisu Weblog, pokud je očekávána odpověď" #define D_NEED_USER_AND_PASSWORD "Vyžadován uživatel=&heslo=" +// xdrv_00_mqtt.ino +#define D_FINGERPRINT "Verifikuj otisk TLS..." +#define D_TLS_CONNECT_FAILED_TO "Nepřipojeno TLS do" +#define D_RETRY_IN "Zopakuji za" +#define D_VERIFIED "Ověřeno otisk " +#define D_INSECURE "Nesprávné připojení z důvodu chybného otisku TLS" +#define D_CONNECT_FAILED_TO "Spojení se nepodařilo navázat" + // xdrv_wemohue.ino #define D_MULTICAST_DISABLED "Multicast je vypnutý" #define D_MULTICAST_REJOINED "Multicast opět připojený" @@ -351,9 +352,9 @@ #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Vlhk,Tlak" #define D_DOMOTICZ_POWER_ENERGY "Příkon,Energie" #define D_DOMOTICZ_ILLUMINANCE "Osvětlení" - #define D_DOMOTICZ_COUNT "Počítadlo" - #define D_DOMOTICZ_VOLTAGE "Napětí" - #define D_DOMOTICZ_CURRENT "Proud" + #define D_DOMOTICZ_COUNT "Počítadlo/PM1" + #define D_DOMOTICZ_VOLTAGE "Napětí/PM2,5" + #define D_DOMOTICZ_CURRENT "Proud/PM10" #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Aktualizace stopek" diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index 14c525a75..4ba502af3 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -165,13 +165,6 @@ #define D_DATA_SIZE "Datengröße" #define D_ANALOG_INPUT "Analog" -#define D_FINGERPRINT "TLS-Fingerabdruck wird verifiziert..." -#define D_TLS_CONNECT_FAILED_TO "TLS-Verbindung fehlgeschlagen an" -#define D_RETRY_IN "Wiederversuch in" -#define D_VERIFIED "verifiziert mit Fingerabdruck" -#define D_INSECURE "unsichere Verbindung aufgrund ungültigen Fingerabdrucks" -#define D_CONNECT_FAILED_TO "Verbindung fehlgeschlagen aufgrund von" - // support.ino #define D_OSWATCH "osWatch" #define D_BLOCKED_LOOP "Blocked Loop" @@ -320,6 +313,14 @@ #define D_ENABLE_WEBLOG_FOR_RESPONSE "Aktivere Web Log Level 2 falls Reaktion erwartet" #define D_NEED_USER_AND_PASSWORD "Benutzer benötigt=&password=" +// xdrv_00_mqtt.ino +#define D_FINGERPRINT "TLS-Fingerabdruck wird verifiziert..." +#define D_TLS_CONNECT_FAILED_TO "TLS-Verbindung fehlgeschlagen an" +#define D_RETRY_IN "Wiederversuch in" +#define D_VERIFIED "verifiziert mit Fingerabdruck" +#define D_INSECURE "unsichere Verbindung aufgrund ungültigen Fingerabdrucks" +#define D_CONNECT_FAILED_TO "Verbindung fehlgeschlagen aufgrund von" + // xdrv_wemohue.ino #define D_MULTICAST_DISABLED "Multicast deaktiviert" #define D_MULTICAST_REJOINED "Multicast (wieder-)verbunden" @@ -351,9 +352,9 @@ #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro" #define D_DOMOTICZ_POWER_ENERGY "Power,Energy" #define D_DOMOTICZ_ILLUMINANCE "Illuminance" - #define D_DOMOTICZ_COUNT "Count" - #define D_DOMOTICZ_VOLTAGE "Voltage" - #define D_DOMOTICZ_CURRENT "Current" + #define D_DOMOTICZ_COUNT "Count/PM1" + #define D_DOMOTICZ_VOLTAGE "Voltage/PM2.5" + #define D_DOMOTICZ_CURRENT "Current/PM10" #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Update timer" diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h index 80c8518df..99faed325 100644 --- a/sonoff/language/en-GB.h +++ b/sonoff/language/en-GB.h @@ -165,13 +165,6 @@ #define D_DATA_SIZE "Data Size" #define D_ANALOG_INPUT "Analog" -#define D_FINGERPRINT "Verify TLS fingerprint..." -#define D_TLS_CONNECT_FAILED_TO "TLS Connect failed to" -#define D_RETRY_IN "Retry in" -#define D_VERIFIED "Verified using Fingerprint" -#define D_INSECURE "Insecure connection due to invalid Fingerprint" -#define D_CONNECT_FAILED_TO "Connect failed to" - // support.ino #define D_OSWATCH "osWatch" #define D_BLOCKED_LOOP "Blocked Loop" @@ -320,6 +313,14 @@ #define D_ENABLE_WEBLOG_FOR_RESPONSE "Enable weblog 2 if response expected" #define D_NEED_USER_AND_PASSWORD "Need user=&password=" +// xdrv_00_mqtt.ino +#define D_FINGERPRINT "Verify TLS fingerprint..." +#define D_TLS_CONNECT_FAILED_TO "TLS Connect failed to" +#define D_RETRY_IN "Retry in" +#define D_VERIFIED "Verified using Fingerprint" +#define D_INSECURE "Insecure connection due to invalid Fingerprint" +#define D_CONNECT_FAILED_TO "Connect failed to" + // xdrv_wemohue.ino #define D_MULTICAST_DISABLED "Multicast disabled" #define D_MULTICAST_REJOINED "Multicast (re)joined" @@ -351,9 +352,9 @@ #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro" #define D_DOMOTICZ_POWER_ENERGY "Power,Energy" #define D_DOMOTICZ_ILLUMINANCE "Illuminance" - #define D_DOMOTICZ_COUNT "Count" - #define D_DOMOTICZ_VOLTAGE "Voltage" - #define D_DOMOTICZ_CURRENT "Current" + #define D_DOMOTICZ_COUNT "Count/PM1" + #define D_DOMOTICZ_VOLTAGE "Voltage/PM2.5" + #define D_DOMOTICZ_CURRENT "Current/PM10" #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Update timer" diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index fee5c40ea..531f78d26 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -165,13 +165,6 @@ #define D_DATA_SIZE "Tamaño de Datos" #define D_ANALOG_INPUT "Entrada Analógica" -#define D_FINGERPRINT "Verificar TLS fingerprint..." -#define D_TLS_CONNECT_FAILED_TO "Falló Conección TLS a" -#define D_RETRY_IN "Reintentando" -#define D_VERIFIED "Verificado Fingerprint" -#define D_INSECURE "Conección insegura por Fingerprint no válido" -#define D_CONNECT_FAILED_TO "Falló Conección a" - // support.ino #define D_OSWATCH "osWatch" #define D_BLOCKED_LOOP "Ciclo Bloqueado" @@ -320,6 +313,14 @@ #define D_ENABLE_WEBLOG_FOR_RESPONSE "Habilitar weblog 2 si desea respuesta" #define D_NEED_USER_AND_PASSWORD "Se necesita user=&password=" +// xdrv_00_mqtt.ino +#define D_FINGERPRINT "Verificar TLS fingerprint..." +#define D_TLS_CONNECT_FAILED_TO "Falló Conección TLS a" +#define D_RETRY_IN "Reintentando" +#define D_VERIFIED "Verificado Fingerprint" +#define D_INSECURE "Conección insegura por Fingerprint no válido" +#define D_CONNECT_FAILED_TO "Falló Conección a" + // xdrv_wemohue.ino #define D_MULTICAST_DISABLED "Multicast deshabilitado" #define D_MULTICAST_REJOINED "Multicast (re)conectado" @@ -351,9 +352,9 @@ #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro" #define D_DOMOTICZ_POWER_ENERGY "Potencia,Energía" #define D_DOMOTICZ_ILLUMINANCE "Luminancia" - #define D_DOMOTICZ_COUNT "Contador" - #define D_DOMOTICZ_VOLTAGE "Voltaje" - #define D_DOMOTICZ_CURRENT "Corriente" + #define D_DOMOTICZ_COUNT "Contador/PM1" + #define D_DOMOTICZ_VOLTAGE "Voltaje/PM2,5" + #define D_DOMOTICZ_CURRENT "Corriente/PM10" #define D_DOMOTICZ_AIRQUALITY "Calidad del Aire" #define D_DOMOTICZ_UPDATE_TIMER "Intervalo de refresco" diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h index 8ec6cd1f7..4690bab6e 100644 --- a/sonoff/language/fr-FR.h +++ b/sonoff/language/fr-FR.h @@ -165,13 +165,6 @@ #define D_DATA_SIZE "Taille données" #define D_ANALOG_INPUT "Analogique" -#define D_FINGERPRINT "Verification empreinte TLS ..." -#define D_TLS_CONNECT_FAILED_TO "Echec de connexion TLS à" -#define D_RETRY_IN "Nouvelle tentative dans" -#define D_VERIFIED "Verifié empreinte " -#define D_INSECURE "Connexion non sécurisée car empreinte non vérifée" -#define D_CONNECT_FAILED_TO "Echec de connexion à" - // support.ino #define D_OSWATCH "osWatch" #define D_BLOCKED_LOOP "Boucle bloquée" @@ -320,6 +313,14 @@ #define D_ENABLE_WEBLOG_FOR_RESPONSE "Activer weblog 2 si response attendue" #define D_NEED_USER_AND_PASSWORD "Nécessite utilisateur=&password=" +// xdrv_00_mqtt.ino +#define D_FINGERPRINT "Verification empreinte TLS ..." +#define D_TLS_CONNECT_FAILED_TO "Echec de connexion TLS à" +#define D_RETRY_IN "Nouvelle tentative dans" +#define D_VERIFIED "Verifié empreinte " +#define D_INSECURE "Connexion non sécurisée car empreinte non vérifée" +#define D_CONNECT_FAILED_TO "Echec de connexion à" + // xdrv_wemohue.ino #define D_MULTICAST_DISABLED "Multicast désactivé" #define D_MULTICAST_REJOINED "Multicast (re)joint" @@ -351,9 +352,9 @@ #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro" #define D_DOMOTICZ_POWER_ENERGY "Power,Energy" #define D_DOMOTICZ_ILLUMINANCE "Illuminance" - #define D_DOMOTICZ_COUNT "Count" - #define D_DOMOTICZ_VOLTAGE "Voltage" - #define D_DOMOTICZ_CURRENT "Current" + #define D_DOMOTICZ_COUNT "Count/PM1" + #define D_DOMOTICZ_VOLTAGE "Voltage/PM2,5" + #define D_DOMOTICZ_CURRENT "Current/PM10" #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Update timer" diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h index c07024f11..3d1714c38 100644 --- a/sonoff/language/hu-HU.h +++ b/sonoff/language/hu-HU.h @@ -165,13 +165,6 @@ #define D_DATA_SIZE "Adat Méret" #define D_ANALOG_INPUT "Analóg" -#define D_FINGERPRINT "TLS fingerprint hitelesítése..." -#define D_TLS_CONNECT_FAILED_TO "TLS Csatlakozás sikertelen a" -#define D_RETRY_IN "Újrapróbálás" -#define D_VERIFIED "Hitelesítve Fingerprint" -#define D_INSECURE "Nem biztonságos kapcsolat érvénytelen Fingerprint miatt" -#define D_CONNECT_FAILED_TO "Sikertelen csatlakozás a" - // support.ino #define D_OSWATCH "osWatch" #define D_BLOCKED_LOOP "Blocked Loop" @@ -320,6 +313,14 @@ #define D_ENABLE_WEBLOG_FOR_RESPONSE "Engedélyezz 2-es weblogolást több információért" #define D_NEED_USER_AND_PASSWORD "Kell felhasználó=&jelszó=" +// xdrv_00_mqtt.ino +#define D_FINGERPRINT "TLS fingerprint hitelesítése..." +#define D_TLS_CONNECT_FAILED_TO "TLS Csatlakozás sikertelen a" +#define D_RETRY_IN "Újrapróbálás" +#define D_VERIFIED "Hitelesítve Fingerprint" +#define D_INSECURE "Nem biztonságos kapcsolat érvénytelen Fingerprint miatt" +#define D_CONNECT_FAILED_TO "Sikertelen csatlakozás a" + // xdrv_wemohue.ino #define D_MULTICAST_DISABLED "Multicast kikapcsolva" #define D_MULTICAST_REJOINED "Multicast (újra)csatlakozás" @@ -351,9 +352,9 @@ #define D_DOMOTICZ_TEMP_HUM_BARO "Hőm,Párat,Légny" #define D_DOMOTICZ_POWER_ENERGY "Teljesítmény,Energia" #define D_DOMOTICZ_ILLUMINANCE "Fényerő" - #define D_DOMOTICZ_COUNT "Szám" - #define D_DOMOTICZ_VOLTAGE "Feszültség" - #define D_DOMOTICZ_CURRENT "Áram" + #define D_DOMOTICZ_COUNT "Szám/PM1" + #define D_DOMOTICZ_VOLTAGE "Feszültség/PM2.5" + #define D_DOMOTICZ_CURRENT "Áram/PM10" #define D_DOMOTICZ_AIRQUALITY "Légminőség" #define D_DOMOTICZ_UPDATE_TIMER "Update időzítő" diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index 07499c821..67752fd81 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -165,13 +165,6 @@ #define D_DATA_SIZE "Dimensione Dati" #define D_ANALOG_INPUT "Ingresso Analogico" -#define D_FINGERPRINT "Verifica TLS fingerprint..." -#define D_TLS_CONNECT_FAILED_TO "Connessione TLS fallita a" -#define D_RETRY_IN "Nuovo tentativo in" -#define D_VERIFIED "Verificato Fingerprint" -#define D_INSECURE "Connessione insicura a causa di Fingerprint non valido" -#define D_CONNECT_FAILED_TO "Connessione Fallita a" - // support.ino #define D_OSWATCH "osWatch" #define D_BLOCKED_LOOP "Ciclo Bloccato" @@ -320,6 +313,14 @@ #define D_ENABLE_WEBLOG_FOR_RESPONSE "Abilitare weblog 2 se e' attesa una risposta" #define D_NEED_USER_AND_PASSWORD "Richiesto user=&password=" +// xdrv_00_mqtt.ino +#define D_FINGERPRINT "Verifica TLS fingerprint..." +#define D_TLS_CONNECT_FAILED_TO "Connessione TLS fallita a" +#define D_RETRY_IN "Nuovo tentativo in" +#define D_VERIFIED "Verificato Fingerprint" +#define D_INSECURE "Connessione insicura a causa di Fingerprint non valido" +#define D_CONNECT_FAILED_TO "Connessione Fallita a" + // xdrv_wemohue.ino #define D_MULTICAST_DISABLED "Multicast disabilitato" #define D_MULTICAST_REJOINED "Multicast (ri)associato" @@ -351,9 +352,9 @@ #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro" #define D_DOMOTICZ_POWER_ENERGY "Power,Energy" #define D_DOMOTICZ_ILLUMINANCE "Illuminance" - #define D_DOMOTICZ_COUNT "Count" - #define D_DOMOTICZ_VOLTAGE "Voltage" - #define D_DOMOTICZ_CURRENT "Current" + #define D_DOMOTICZ_COUNT "Count/PM1" + #define D_DOMOTICZ_VOLTAGE "Voltage/PM2.5" + #define D_DOMOTICZ_CURRENT "Current/PM10" #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Intervallo di aggiornamento" diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h index 918f9bddd..3a02ded56 100644 --- a/sonoff/language/nl-NL.h +++ b/sonoff/language/nl-NL.h @@ -165,13 +165,6 @@ #define D_DATA_SIZE "Data lengte" #define D_ANALOG_INPUT "Analoog" -#define D_FINGERPRINT "Controleer TLS vingerafdruk..." -#define D_TLS_CONNECT_FAILED_TO "TLS Verbinding mislukt naar" -#define D_RETRY_IN "Opnieuw proberen over" -#define D_VERIFIED "Gecontroleerd met vingerafdruk" -#define D_INSECURE "Door ongeldige vingerafdruk een onveilige verbinding" -#define D_CONNECT_FAILED_TO "Verbinding mislukt naar" - // support.ino #define D_OSWATCH "osWatch" #define D_BLOCKED_LOOP "Blocked Loop" @@ -320,6 +313,14 @@ #define D_ENABLE_WEBLOG_FOR_RESPONSE "Schakel weblog 2 in indien antwoord verwacht" #define D_NEED_USER_AND_PASSWORD "Benodig user=&password=" +// xdrv_00_mqtt.ino +#define D_FINGERPRINT "Controleer TLS vingerafdruk..." +#define D_TLS_CONNECT_FAILED_TO "TLS Verbinding mislukt naar" +#define D_RETRY_IN "Opnieuw proberen over" +#define D_VERIFIED "Gecontroleerd met vingerafdruk" +#define D_INSECURE "Door ongeldige vingerafdruk een onveilige verbinding" +#define D_CONNECT_FAILED_TO "Verbinding mislukt naar" + // xdrv_wemohue.ino #define D_MULTICAST_DISABLED "Multicast uitgeschakeld" #define D_MULTICAST_REJOINED "Multicast verbonden" @@ -351,9 +352,9 @@ #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro" #define D_DOMOTICZ_POWER_ENERGY "Power,Energy" #define D_DOMOTICZ_ILLUMINANCE "Illuminance" - #define D_DOMOTICZ_COUNT "Count" - #define D_DOMOTICZ_VOLTAGE "Spanning" - #define D_DOMOTICZ_CURRENT "Stroom" + #define D_DOMOTICZ_COUNT "Count/PM1" + #define D_DOMOTICZ_VOLTAGE "Spanning/PM2,5" + #define D_DOMOTICZ_CURRENT "Stroom/PM10" #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Bijwerk timer" diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h index 4542d826d..6acc8a7f6 100644 --- a/sonoff/language/pl-PL.h +++ b/sonoff/language/pl-PL.h @@ -165,13 +165,6 @@ #define D_DATA_SIZE "Wielkość danych" #define D_ANALOG_INPUT "Wej_analogowe" -#define D_FINGERPRINT "Weryfikuj odcisk TLS..." -#define D_TLS_CONNECT_FAILED_TO "Nieudane połączenie TLS do" -#define D_RETRY_IN "Spróbuj ponownie" -#define D_VERIFIED "Zweryfikowano odcisku" -#define D_INSECURE "Nieprawidłowe połączenie z powodu błędnego odcisku TLS" -#define D_CONNECT_FAILED_TO "Nie udało się nawiązać połączenia" - // support.ino #define D_OSWATCH "osWatch" #define D_BLOCKED_LOOP "Pętla zablokowana" @@ -320,6 +313,14 @@ #define D_ENABLE_WEBLOG_FOR_RESPONSE "Włącz poziom 2 zapisu Weblog, jeśli oczekiwana jest odpowiedź" #define D_NEED_USER_AND_PASSWORD "Wymagany użytkownik=&hasło=" +// xdrv_00_mqtt.ino +#define D_FINGERPRINT "Weryfikuj odcisk TLS..." +#define D_TLS_CONNECT_FAILED_TO "Nieudane połączenie TLS do" +#define D_RETRY_IN "Spróbuj ponownie" +#define D_VERIFIED "Zweryfikowano odcisku" +#define D_INSECURE "Nieprawidłowe połączenie z powodu błędnego odcisku TLS" +#define D_CONNECT_FAILED_TO "Nie udało się nawiązać połączenia" + // xdrv_wemohue.ino #define D_MULTICAST_DISABLED "Multicast jest wyłączony" #define D_MULTICAST_REJOINED "Multicast (re)dołączony" @@ -351,9 +352,9 @@ #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Wilg,Cis" #define D_DOMOTICZ_POWER_ENERGY "Moc,Energia" #define D_DOMOTICZ_ILLUMINANCE "Oświetl." - #define D_DOMOTICZ_COUNT "Licznik" - #define D_DOMOTICZ_VOLTAGE "Napięcie" - #define D_DOMOTICZ_CURRENT "Prąd" + #define D_DOMOTICZ_COUNT "Licznik/PM1" + #define D_DOMOTICZ_VOLTAGE "Napięcie/PM2,5" + #define D_DOMOTICZ_CURRENT "Prąd/PM10" #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Zaktualizuj czasomierz" diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h index db42667f5..180d316d7 100644 --- a/sonoff/language/pt-PT.h +++ b/sonoff/language/pt-PT.h @@ -165,13 +165,6 @@ #define D_DATA_SIZE "Tamanho de dados" #define D_ANALOG_INPUT "Entrada Analógica" -#define D_FINGERPRINT "Verifique a impressão digital TLS..." -#define D_TLS_CONNECT_FAILED_TO "TLS não conseguiu ligar" -#define D_RETRY_IN "Tentativa em" -#define D_VERIFIED "Verificado impressão digital " -#define D_INSECURE "Ligação insegura devido à impressão digital inválida" -#define D_CONNECT_FAILED_TO "A ligação falhou ao" - // support.ino #define D_OSWATCH "osWatch" #define D_BLOCKED_LOOP "Loop Bloqueado" @@ -320,6 +313,14 @@ #define D_ENABLE_WEBLOG_FOR_RESPONSE "Habilitar weblog 2 se resposta esperada" #define D_NEED_USER_AND_PASSWORD "Necessário user=&password=" +// xdrv_00_mqtt.ino +#define D_FINGERPRINT "Verifique a impressão digital TLS..." +#define D_TLS_CONNECT_FAILED_TO "TLS não conseguiu ligar" +#define D_RETRY_IN "Tentativa em" +#define D_VERIFIED "Verificado impressão digital " +#define D_INSECURE "Ligação insegura devido à impressão digital inválida" +#define D_CONNECT_FAILED_TO "A ligação falhou ao" + // xdrv_wemohue.ino #define D_MULTICAST_DISABLED "Multicast desabilitado" #define D_MULTICAST_REJOINED "Multicast (re)ingressou" @@ -351,9 +352,9 @@ #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro" #define D_DOMOTICZ_POWER_ENERGY "Potência,Energia" #define D_DOMOTICZ_ILLUMINANCE "Luminâcia" - #define D_DOMOTICZ_COUNT "Contagem" - #define D_DOMOTICZ_VOLTAGE "Voltagem" - #define D_DOMOTICZ_CURRENT "Corrente" + #define D_DOMOTICZ_COUNT "Contagem/PM1" + #define D_DOMOTICZ_VOLTAGE "Voltagem/PM2.5" + #define D_DOMOTICZ_CURRENT "Corrente/PM10" #define D_DOMOTICZ_AIRQUALITY "Qualidade do Ar" #define D_DOMOTICZ_UPDATE_TIMER "Tempo de atualização" diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h index 1b60f0e4a..d2626ae5f 100644 --- a/sonoff/language/ru-RU.h +++ b/sonoff/language/ru-RU.h @@ -165,13 +165,6 @@ #define D_DATA_SIZE "Размер данных" #define D_ANALOG_INPUT "Аналоговый вход" -#define D_FINGERPRINT "Проверка TLS Fingerprint..." -#define D_TLS_CONNECT_FAILED_TO "Сбой подключения TLS к" -#define D_RETRY_IN "Повторить" -#define D_VERIFIED "Проверено Fingerprint" -#define D_INSECURE "Небезопасное соединение, недействительный Fingerprint" -#define D_CONNECT_FAILED_TO "Ошибка подключения к" - // support.ino #define D_OSWATCH "osWatch" #define D_BLOCKED_LOOP "Блокирующий цикл" @@ -320,6 +313,14 @@ #define D_ENABLE_WEBLOG_FOR_RESPONSE "Включить Веб лог уровня 2 если ожидается ответ" #define D_NEED_USER_AND_PASSWORD "Ожидается user=&password=" +// xdrv_00_mqtt.ino +#define D_FINGERPRINT "Проверка TLS Fingerprint..." +#define D_TLS_CONNECT_FAILED_TO "Сбой подключения TLS к" +#define D_RETRY_IN "Повторить" +#define D_VERIFIED "Проверено Fingerprint" +#define D_INSECURE "Небезопасное соединение, недействительный Fingerprint" +#define D_CONNECT_FAILED_TO "Ошибка подключения к" + // xdrv_wemohue.ino #define D_MULTICAST_DISABLED "Multicast отключен" #define D_MULTICAST_REJOINED "Multicast (ре)соединился" @@ -351,9 +352,9 @@ #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro" #define D_DOMOTICZ_POWER_ENERGY "Power,Energy" #define D_DOMOTICZ_ILLUMINANCE "Illuminance" - #define D_DOMOTICZ_COUNT "Count" - #define D_DOMOTICZ_VOLTAGE "Voltage" - #define D_DOMOTICZ_CURRENT "Current" + #define D_DOMOTICZ_COUNT "Count/PM1" + #define D_DOMOTICZ_VOLTAGE "Voltage/PM2,5" + #define D_DOMOTICZ_CURRENT "Current/PM10" #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Update timer" @@ -384,7 +385,6 @@ #define D_PARTICALS_BEYOND "Particals" // sonoff_template.h -// Max string length is 8 characters including suffixes #define D_SENSOR_NONE "-нет-" #define D_SENSOR_DHT11 "DHT11" #define D_SENSOR_AM2301 "AM2301" diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h index d52e648f9..eb0351508 100644 --- a/sonoff/language/zh-CN.h +++ b/sonoff/language/zh-CN.h @@ -165,13 +165,6 @@ #define D_DATA_SIZE "数据大小:" #define D_ANALOG_INPUT "Analog" -#define D_FINGERPRINT "验证 TLS 指纹..." -#define D_TLS_CONNECT_FAILED_TO "TLS 连接失败" -#define D_RETRY_IN "重试倒计时:" -#define D_VERIFIED "验证成功" -#define D_INSECURE "指纹无效导致连接不安全" -#define D_CONNECT_FAILED_TO "连接失败:" - // support.ino #define D_OSWATCH "osWatch" #define D_BLOCKED_LOOP "Blocked Loop" @@ -320,6 +313,14 @@ #define D_ENABLE_WEBLOG_FOR_RESPONSE "如果预期响应，则启用Weblog 2" #define D_NEED_USER_AND_PASSWORD "需要 user=<用户名>&password=<密码>" +// xdrv_00_mqtt.ino +#define D_FINGERPRINT "验证 TLS 指纹..." +#define D_TLS_CONNECT_FAILED_TO "TLS 连接失败" +#define D_RETRY_IN "重试倒计时:" +#define D_VERIFIED "验证成功" +#define D_INSECURE "指纹无效导致连接不安全" +#define D_CONNECT_FAILED_TO "连接失败:" + // xdrv_wemohue.ino #define D_MULTICAST_DISABLED "组播已禁用" #define D_MULTICAST_REJOINED "组播已(重新)加入" @@ -351,9 +352,9 @@ #define D_DOMOTICZ_TEMP_HUM_BARO "温度,湿度,气压" #define D_DOMOTICZ_POWER_ENERGY "功率,电量" #define D_DOMOTICZ_ILLUMINANCE "照度" - #define D_DOMOTICZ_COUNT "数值" - #define D_DOMOTICZ_VOLTAGE "电压" - #define D_DOMOTICZ_CURRENT "电流" + #define D_DOMOTICZ_COUNT "数值/PM1" + #define D_DOMOTICZ_VOLTAGE "电压/PM2.5" + #define D_DOMOTICZ_CURRENT "电流/PM10" #define D_DOMOTICZ_AIRQUALITY "空气质量" #define D_DOMOTICZ_UPDATE_TIMER "更新计时器" diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h index e011dfe3c..cab33a14b 100644 --- a/sonoff/language/zh-TW.h +++ b/sonoff/language/zh-TW.h @@ -165,13 +165,6 @@ #define D_DATA_SIZE "數據大小:" #define D_ANALOG_INPUT "Analog" -#define D_FINGERPRINT "驗證 TLS 指紋..." -#define D_TLS_CONNECT_FAILED_TO "TLS 連接失敗" -#define D_RETRY_IN "重試倒計時:" -#define D_VERIFIED "驗證成功" -#define D_INSECURE "指紋無效導致連接不安全" -#define D_CONNECT_FAILED_TO "連接失敗:" - // support.ino #define D_OSWATCH "osWatch" #define D_BLOCKED_LOOP "Blocked Loop" @@ -320,6 +313,14 @@ #define D_ENABLE_WEBLOG_FOR_RESPONSE "如果預期響應，則啟用Weblog 2" #define D_NEED_USER_AND_PASSWORD "需要 user=<用戶名>&password=<密碼>" +// xdrv_00_mqtt.ino +#define D_FINGERPRINT "驗證 TLS 指紋..." +#define D_TLS_CONNECT_FAILED_TO "TLS 連接失敗" +#define D_RETRY_IN "重試倒計時:" +#define D_VERIFIED "驗證成功" +#define D_INSECURE "指紋無效導致連接不安全" +#define D_CONNECT_FAILED_TO "連接失敗:" + // xdrv_wemohue.ino #define D_MULTICAST_DISABLED "組播已禁用" #define D_MULTICAST_REJOINED "組播已(重新)加入" @@ -351,9 +352,9 @@ #define D_DOMOTICZ_TEMP_HUM_BARO "溫度,濕度,氣壓" #define D_DOMOTICZ_POWER_ENERGY "功率,電量" #define D_DOMOTICZ_ILLUMINANCE "照度" - #define D_DOMOTICZ_COUNT "數值" - #define D_DOMOTICZ_VOLTAGE "電壓" - #define D_DOMOTICZ_CURRENT "電流" + #define D_DOMOTICZ_COUNT "數值/PM1" + #define D_DOMOTICZ_VOLTAGE "電壓/PM2.5" + #define D_DOMOTICZ_CURRENT "電流/PM10" #define D_DOMOTICZ_AIRQUALITY "空氣品質" #define D_DOMOTICZ_UPDATE_TIMER "更新計時器" diff --git a/sonoff/xsns_18_pms5003.ino b/sonoff/xsns_18_pms5003.ino index 217b63674..18b26263e 100644 --- a/sonoff/xsns_18_pms5003.ino +++ b/sonoff/xsns_18_pms5003.ino @@ -130,6 +130,11 @@ void PmsShow(boolean json) pms_data.pm10_standard, pms_data.pm25_standard, pms_data.pm100_standard, pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env, pms_data.particles_03um, pms_data.particles_05um, pms_data.particles_10um, pms_data.particles_25um, pms_data.particles_50um, pms_data.particles_100um); +#ifdef USE_DOMOTICZ + DomoticzSensor(DZ_COUNT, pms_data.pm10_env); // PM1 + DomoticzSensor(DZ_VOLTAGE, pms_data.pm25_env); // PM2.5 + DomoticzSensor(DZ_CURRENT, pms_data.pm100_env); // PM10 +#endif // USE_DOMOTICZ #ifdef USE_WEBSERVER } else { snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_PMS5003_SNS, mqtt_data, diff --git a/sonoff/xsns_20_novasds.ino b/sonoff/xsns_20_novasds.ino index 56d896c5e..8f6b591da 100644 --- a/sonoff/xsns_20_novasds.ino +++ b/sonoff/xsns_20_novasds.ino @@ -107,6 +107,10 @@ void NovaSdsShow(boolean json) dtostrfd(pm2_5f, 1, pm2_5); if (json) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"SDS0X1\":{\"PM2.5\":%s,\"PM10\":%s}"), mqtt_data, pm2_5, pm10); +#ifdef USE_DOMOTICZ + DomoticzSensor(DZ_VOLTAGE, pm2_5); // PM2.5 + DomoticzSensor(DZ_CURRENT, pm10); // PM10 +#endif // USE_DOMOTICZ #ifdef USE_WEBSERVER } else { snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SDS0X1_SNS, mqtt_data, pm2_5, pm10); From 12fa89430393df1f410ec76c0cd998811f28a9e7 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Wed, 14 Mar 2018 14:32:51 +0100 Subject: [PATCH 019/136] v5.12.0e - Add command PowerDelta 5.12.0e * Add command PowerDelta 0..100 (percentage) to Energy monitoring devices to report on active power load change (#2157) --- sonoff/_releasenotes.ino | 1 + sonoff/i18n.h | 3 +++ sonoff/settings.h | 4 +--- sonoff/settings.ino | 2 ++ sonoff/sonoff.h | 11 ++++++----- sonoff/xdrv_03_energy.ino | 19 ++++++++++++++++++- 6 files changed, 31 insertions(+), 9 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 959c83d8d..c0d3a1434 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -5,6 +5,7 @@ * Add additional time offset to Wifi Retry based on device mac address (#2089) * Add command Color6 RRGGBB for Clock hour marker color and command Rotation pixels for Clock rotation (#2092) * Add HTML language header in local language (#2123) + * Add command PowerDelta 0..100 (percentage) to Energy monitoring devices to report on active power load change (#2157) * Fix MAX31850 higher temperatures (#1269) * * 5.12.0d diff --git a/sonoff/i18n.h b/sonoff/i18n.h index 7508e3bf8..4bfa45866 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -275,6 +275,7 @@ // Commands xdrv_03_energy.ino #define D_CMND_POWERLOW "PowerLow" #define D_CMND_POWERHIGH "PowerHigh" +#define D_CMND_POWERDELTA "PowerDelta" #define D_CMND_VOLTAGELOW "VoltageLow" #define D_CMND_VOLTAGEHIGH "VoltageHigh" #define D_CMND_CURRENTLOW "CurrentLow" @@ -359,6 +360,7 @@ enum UnitNames { UNIT_MILLISECOND, UNIT_MINUTE, UNIT_PPM, + UNIT_PERCENTAGE, UNIT_PRESSURE, UNIT_SECOND, UNIT_SECTORS, @@ -376,6 +378,7 @@ const char kUnitNames[] PROGMEM = D_UNIT_MILLISECOND "|" D_UNIT_MINUTE "|" D_UNIT_PARTS_PER_MILLION "|" + "%|" D_UNIT_PRESSURE "|" D_UNIT_SECOND "|" D_UNIT_SECTORS "|" diff --git a/sonoff/settings.h b/sonoff/settings.h index 3cdedb488..54c5116ab 100644 --- a/sonoff/settings.h +++ b/sonoff/settings.h @@ -149,9 +149,7 @@ struct SYSCFG { uint8_t ledstate; // 2FB uint8_t param[PARAM8_SIZE]; // 2FC was domoticz_in_topic until 5.1.6 char state_text[4][11]; // 313 - - byte free_33F[1]; // 33F - + uint8_t energy_power_delta; // 33F uint16_t domoticz_update_timer; // 340 uint16_t pwm_range; // 342 diff --git a/sonoff/settings.ino b/sonoff/settings.ino index 72bbcf5fc..503ebfb86 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -509,6 +509,7 @@ void SettingsDefaultSet2() // Settings.domoticz_switch_idx[i] = 0; } + Settings.energy_power_delta = 80; Settings.energy_power_calibration = HLW_PREF_PULSE; Settings.energy_voltage_calibration = HLW_UREF_PULSE; Settings.energy_current_calibration = HLW_IREF_PULSE; @@ -889,6 +890,7 @@ void SettingsDelta() } if (Settings.version < 0x050C0005) { Settings.light_rotation = 0; + Settings.energy_power_delta = 80; char fingerprint[60]; memcpy(fingerprint, Settings.mqtt_fingerprint, sizeof(fingerprint)); char *p = fingerprint; diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index df588119c..c90b31550 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -71,11 +71,12 @@ typedef unsigned long power_t; // Power (Relay) type //#define PWM_FREQ 910 // 100..1000 Hz led refresh (iTead value) #define PWM_FREQ 880 // 100..1000 Hz led refresh (BN-SZ01 value) -#define MAX_POWER_HOLD 10 // Time in SECONDS to allow max agreed power (Pow) -#define MAX_POWER_WINDOW 30 // Time in SECONDS to disable allow max agreed power (Pow) -#define SAFE_POWER_HOLD 10 // Time in SECONDS to allow max unit safe power (Pow) -#define SAFE_POWER_WINDOW 30 // Time in MINUTES to disable allow max unit safe power (Pow) -#define MAX_POWER_RETRY 5 // Retry count allowing agreed power limit overflow (Pow) +#define DEFAULT_POWER_DELTA 80 // Power change percentage +#define MAX_POWER_HOLD 10 // Time in SECONDS to allow max agreed power +#define MAX_POWER_WINDOW 30 // Time in SECONDS to disable allow max agreed power +#define SAFE_POWER_HOLD 10 // Time in SECONDS to allow max unit safe power +#define SAFE_POWER_WINDOW 30 // Time in MINUTES to disable allow max unit safe power +#define MAX_POWER_RETRY 5 // Retry count allowing agreed power limit overflow #define STATES 20 // State loops per second #define SYSLOG_TIMER 600 // Seconds to restore syslog_level diff --git a/sonoff/xdrv_03_energy.ino b/sonoff/xdrv_03_energy.ino index bf29ed6be..656c2ee8e 100644 --- a/sonoff/xdrv_03_energy.ino +++ b/sonoff/xdrv_03_energy.ino @@ -29,12 +29,14 @@ enum EnergyHardware { ENERGY_NONE, ENERGY_HLW8012, ENERGY_CSE7766, ENERGY_PZEM004T }; enum EnergyCommands { + CMND_POWERDELTA, CMND_POWERLOW, CMND_POWERHIGH, CMND_VOLTAGELOW, CMND_VOLTAGEHIGH, CMND_CURRENTLOW, CMND_CURRENTHIGH, CMND_POWERCAL, CMND_POWERSET, CMND_VOLTAGECAL, CMND_VOLTAGESET, CMND_CURRENTCAL, CMND_CURRENTSET, CMND_ENERGYRESET, CMND_MAXENERGY, CMND_MAXENERGYSTART, CMND_MAXPOWER, CMND_MAXPOWERHOLD, CMND_MAXPOWERWINDOW, CMND_SAFEPOWER, CMND_SAFEPOWERHOLD, CMND_SAFEPOWERWINDOW }; const char kEnergyCommands[] PROGMEM = + D_CMND_POWERDELTA "|" D_CMND_POWERLOW "|" D_CMND_POWERHIGH "|" D_CMND_VOLTAGELOW "|" D_CMND_VOLTAGEHIGH "|" D_CMND_CURRENTLOW "|" D_CMND_CURRENTHIGH "|" D_CMND_POWERCAL "|" D_CMND_POWERSET "|" D_CMND_VOLTAGECAL "|" D_CMND_VOLTAGESET "|" D_CMND_CURRENTCAL "|" D_CMND_CURRENTSET "|" D_CMND_ENERGYRESET "|" D_CMND_MAXENERGY "|" D_CMND_MAXENERGYSTART "|" @@ -44,6 +46,7 @@ const char kEnergyCommands[] PROGMEM = float energy_voltage = 0; // 123.1 V float energy_current = 0; // 123.123 A float energy_power = 0; // 123.1 W +float energy_power_last = 0; float energy_power_factor = 0; // 0.12 float energy_daily = 0; // 12.123 kWh float energy_total = 0; // 12345.12345 kWh @@ -679,6 +682,13 @@ void EnergyMarginCheck() } } + if (!jsonflg && Settings.energy_power_delta) { + float diff = abs(energy_power_last - energy_power); + float max_power = (energy_power_last > energy_power) ? energy_power_last : energy_power; + energy_power_last = energy_power; + if (((diff / max_power) * 100) > Settings.energy_power_delta) EnergyMqttShow(); + } + #if FEATURE_POWER_LIMIT // Max Power if (Settings.energy_max_power_limit) { @@ -768,7 +778,14 @@ boolean EnergyCommand() unsigned long nvalue = 0; int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic, kEnergyCommands); - if (CMND_POWERLOW == command_code) { + if (CMND_POWERDELTA == command_code) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 101)) { + Settings.energy_power_delta = (1 == XdrvMailbox.payload) ? DEFAULT_POWER_DELTA : XdrvMailbox.payload; + } + nvalue = Settings.energy_power_delta; + unit = UNIT_PERCENTAGE; + } + else if (CMND_POWERLOW == command_code) { if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) { Settings.energy_min_power = XdrvMailbox.payload; } From 3eccfb0b8778b9c9726664c3880dabd762ce8e22 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Wed, 14 Mar 2018 17:28:30 +0100 Subject: [PATCH 020/136] v5.12.0e - Add Restart Reason to Status 1 5.12.0e * Add Restart Reason to Status 1 report (#2161) --- sonoff/_releasenotes.ino | 1 + sonoff/sonoff.ino | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index c0d3a1434..d7ebcf426 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -6,6 +6,7 @@ * Add command Color6 RRGGBB for Clock hour marker color and command Rotation pixels for Clock rotation (#2092) * Add HTML language header in local language (#2123) * Add command PowerDelta 0..100 (percentage) to Energy monitoring devices to report on active power load change (#2157) + * Add Restart Reason to Status 1 report (#2161) * Fix MAX31850 higher temperatures (#1269) * * 5.12.0d diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 9ceb02e83..3edbeac23 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -1218,8 +1218,8 @@ void PublishStatus(uint8_t payload) } if ((0 == payload) || (1 == payload)) { - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_STATUS D_STATUS1_PARAMETER "\":{\"" D_JSON_BAUDRATE "\":%d,\"" D_CMND_GROUPTOPIC "\":\"%s\",\"" D_CMND_OTAURL "\":\"%s\",\"" D_JSON_UPTIME "\":\"%s\",\"" D_JSON_STARTUPUTC "\":\"%s\",\"" D_CMND_SLEEP "\":%d,\"" D_JSON_BOOTCOUNT "\":%d,\"" D_JSON_SAVECOUNT "\":%d,\"" D_JSON_SAVEADDRESS "\":\"%X\"}}"), - baudrate, Settings.mqtt_grptopic, Settings.ota_url, GetDateAndTime(DT_UPTIME).c_str(), GetDateAndTime(DT_RESTART).c_str(), Settings.sleep, Settings.bootcount, Settings.save_flag, GetSettingsAddress()); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_STATUS D_STATUS1_PARAMETER "\":{\"" D_JSON_BAUDRATE "\":%d,\"" D_CMND_GROUPTOPIC "\":\"%s\",\"" D_CMND_OTAURL "\":\"%s\",\"" D_JSON_RESTARTREASON "\":\"%s\",\"" D_JSON_UPTIME "\":\"%s\",\"" D_JSON_STARTUPUTC "\":\"%s\",\"" D_CMND_SLEEP "\":%d,\"" D_JSON_BOOTCOUNT "\":%d,\"" D_JSON_SAVECOUNT "\":%d,\"" D_JSON_SAVEADDRESS "\":\"%X\"}}"), + baudrate, Settings.mqtt_grptopic, Settings.ota_url, GetResetReason().c_str(), GetDateAndTime(DT_UPTIME).c_str(), GetDateAndTime(DT_RESTART).c_str(), Settings.sleep, Settings.bootcount, Settings.save_flag, GetSettingsAddress()); MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "1")); } @@ -1262,8 +1262,8 @@ void PublishStatus(uint8_t payload) if (energy_flg) { if ((0 == payload) || (9 == payload)) { - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_STATUS D_STATUS9_MARGIN "\":{\"" D_CMND_POWERLOW "\":%d,\"" D_CMND_POWERHIGH "\":%d,\"" D_CMND_VOLTAGELOW "\":%d,\"" D_CMND_VOLTAGEHIGH "\":%d,\"" D_CMND_CURRENTLOW "\":%d,\"" D_CMND_CURRENTHIGH "\":%d}}"), - Settings.energy_min_power, Settings.energy_max_power, Settings.energy_min_voltage, Settings.energy_max_voltage, Settings.energy_min_current, Settings.energy_max_current); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_STATUS D_STATUS9_MARGIN "\":{\"" D_CMND_POWERDELTA "\":%d,\"" D_CMND_POWERLOW "\":%d,\"" D_CMND_POWERHIGH "\":%d,\"" D_CMND_VOLTAGELOW "\":%d,\"" D_CMND_VOLTAGEHIGH "\":%d,\"" D_CMND_CURRENTLOW "\":%d,\"" D_CMND_CURRENTHIGH "\":%d}}"), + Settings.energy_power_delta, Settings.energy_min_power, Settings.energy_max_power, Settings.energy_min_voltage, Settings.energy_max_voltage, Settings.energy_min_current, Settings.energy_max_current); MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "9")); } } From ea8ca36ca70f8bf3c285a48275dee9fdea8d82c6 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 15 Mar 2018 17:33:35 +0100 Subject: [PATCH 021/136] v5.12.0e - Updated PowerDelta code (#2157) Updated PowerDelta code (#2157) --- sonoff/xdrv_03_energy.ino | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/sonoff/xdrv_03_energy.ino b/sonoff/xdrv_03_energy.ino index 656c2ee8e..eb9249d2b 100644 --- a/sonoff/xdrv_03_energy.ino +++ b/sonoff/xdrv_03_energy.ino @@ -46,7 +46,6 @@ const char kEnergyCommands[] PROGMEM = float energy_voltage = 0; // 123.1 V float energy_current = 0; // 123.123 A float energy_power = 0; // 123.1 W -float energy_power_last = 0; float energy_power_factor = 0; // 0.12 float energy_daily = 0; // 12.123 kWh float energy_total = 0; // 12345.12345 kWh @@ -54,6 +53,9 @@ float energy_start = 0; // 12345.12345 kWh total previous unsigned long energy_kWhtoday; // 1212312345 Wh * 10^-5 (deca micro Watt hours) - 5763924 = 0.05763924 kWh = 0.058 kWh = energy_daily unsigned long energy_period = 0; // 1212312345 Wh * 10^-5 (deca micro Watt hours) - 5763924 = 0.05763924 kWh = 0.058 kWh = energy_daily +float energy_power_last[3] = { 0 }; +uint8_t energy_power_delta = 0; + bool energy_power_on = true; byte energy_min_power_flag = 0; @@ -641,6 +643,20 @@ void EnergyMarginCheck() return; } + if (Settings.energy_power_delta) { + float delta = abs(energy_power_last[0] - energy_power); + // Any delta compared to minimal delta + float min_power = (energy_power_last[0] > energy_power) ? energy_power : energy_power_last[0]; + if (((delta / min_power) * 100) > Settings.energy_power_delta) { + energy_power_delta = 1; + energy_power_last[1] = energy_power; // We only want one report so reset history + energy_power_last[2] = energy_power; + } + } + energy_power_last[0] = energy_power_last[1]; // Shift in history every second allowing power changes to settle for up to three seconds + energy_power_last[1] = energy_power_last[2]; + energy_power_last[2] = energy_power; + if (energy_power_on && (Settings.energy_min_power || Settings.energy_max_power || Settings.energy_min_voltage || Settings.energy_max_voltage || Settings.energy_min_current || Settings.energy_max_current)) { energy_power_u = (uint16_t)(energy_power); energy_voltage_u = (uint16_t)(energy_voltage); @@ -682,13 +698,6 @@ void EnergyMarginCheck() } } - if (!jsonflg && Settings.energy_power_delta) { - float diff = abs(energy_power_last - energy_power); - float max_power = (energy_power_last > energy_power) ? energy_power_last : energy_power; - energy_power_last = energy_power; - if (((diff / max_power) * 100) > Settings.energy_power_delta) EnergyMqttShow(); - } - #if FEATURE_POWER_LIMIT // Max Power if (Settings.energy_max_power_limit) { @@ -753,6 +762,8 @@ void EnergyMarginCheck() } } #endif // FEATURE_POWER_LIMIT + + if (energy_power_delta) EnergyMqttShow(); } void EnergyMqttShow() @@ -762,6 +773,7 @@ void EnergyMqttShow() EnergyShow(1); snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}"), mqtt_data); MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_ENERGY), Settings.flag.mqtt_sensor_retain); + energy_power_delta = 0; } /*********************************************************************************************\ From de9c965d76b887ebbbc37a3fd6dd92d68b6489ae Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 16 Mar 2018 10:20:32 +0100 Subject: [PATCH 022/136] v5.12.0e - Hu language spelling correction (#2175) Hu language spelling correction (#2175) --- sonoff/language/hu-HU.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h index 3d1714c38..613008ae0 100644 --- a/sonoff/language/hu-HU.h +++ b/sonoff/language/hu-HU.h @@ -59,7 +59,7 @@ #define D_BOOT_COUNT "Bootolások száma" #define D_BRIGHTLIGHT "Max. fényerő" #define D_BUTTON "Gomb" -#define D_BY "által" // Written by me +#define D_BY "tőle:" // Written by me #define D_BYTES "Byte-ok" #define D_CELSIUS "Celsius" #define D_CO2 "Szén-dioxid" @@ -71,7 +71,7 @@ #define D_COUNTER "Számláló" #define D_CURRENT "Áram" // As in Voltage and Current #define D_DATA "Adat" -#define D_DARKLIGHT "Min. févnyerő" +#define D_DARKLIGHT "Min. fényerő" #define D_DEBUG "Debug" #define D_DISABLED "Letiltva" #define D_DNS_SERVER "DNS Szerver" @@ -210,7 +210,7 @@ #define D_INFORMATION "Információ" #define D_FIRMWARE_UPGRADE "Firmware Frissítés" #define D_CONSOLE "Konzol" -#define D_CONFIRM_RESTART "Újraindítés megerősítése" +#define D_CONFIRM_RESTART "Újraindítás megerősítése" #define D_CONFIGURE_MODULE "Eszköz konfiguráció" #define D_CONFIGURE_WIFI "WiFi konfiguráció" @@ -459,4 +459,4 @@ #define D_LOG_UPNP "UPP: " // UPnP #define D_LOG_WIFI "WIF: " // Wifi -#endif // _LANGUAGE_EN_GB_H_ +#endif // _LANGUAGE_HU_HU_H_ From 1c8e8b7be778b25a8b6d50435c9c95495bc17b1f Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 16 Mar 2018 11:13:10 +0100 Subject: [PATCH 023/136] v5.12.0e - Clear up HAss effect list syntax (#1930) Clear up HAss effect list syntax - still unusable due to mqtt message way too long (#1930) --- sonoff/xdrv_07_home_assistant.ino | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/sonoff/xdrv_07_home_assistant.ino b/sonoff/xdrv_07_home_assistant.ino index 84a218bd9..eaec8686e 100644 --- a/sonoff/xdrv_07_home_assistant.ino +++ b/sonoff/xdrv_07_home_assistant.ino @@ -53,24 +53,7 @@ const char HASS_DISCOVER_LIGHT_SCHEME[] PROGMEM = "%s,\"effect_command_topic\":\"%s\"," // cmnd/led2/Scheme "\"effect_state_topic\":\"%s\"," // stat/led2/RESULT "\"effect_value_template\":\"{{value_json." D_CMND_SCHEME "}}\"," - "\"effect_list\":\"[0, 1, 2, 3, 4]\""; // Needs to be a Python string list providing Scheme parameter values (Unable to get this functional) -*/ -/* -#1690 - investigate -effect_list: -- 0 -- 1 -- 2 -- 3 -- 4 -- 5 -- 6 -- 7 -- 8 -- 9 -- 10 -- 11 -- 12 + "\"effect_list\":[\"0\",\"1\",\"2\",\"3\",\"4\"]"; // string list with reference to scheme parameter. Currently only supports numbers 0 to 11 as it make the mqtt string too long */ void HAssDiscovery() { From 5677a9c85438e35bd4957cba5f1efb7e2cc7eb09 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 16 Mar 2018 16:46:58 +0100 Subject: [PATCH 024/136] v5.12.0e - Fix S31 power on wrong power report Fix S31 power on wrong power report --- sonoff/xdrv_03_energy.ino | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sonoff/xdrv_03_energy.ino b/sonoff/xdrv_03_energy.ino index eb9249d2b..74a52460f 100644 --- a/sonoff/xdrv_03_energy.ino +++ b/sonoff/xdrv_03_energy.ino @@ -265,6 +265,7 @@ void HlwInit() #define CSE_UREF 100 uint8_t cse_receive_flag = 0; +uint8_t cse_power_valid = 0; long voltage_cycle = 0; long current_cycle = 0; @@ -330,9 +331,15 @@ void CseReceived() if ((header & 0xF2) == 0xF2) { // Power cycle exceeds range energy_power = 0; } else { - energy_power = (float)(Settings.energy_power_calibration * CSE_PREF) / (float)power_cycle; + if (cse_power_valid < 16) { // Skip first incomplete power_cycle + cse_power_valid++; + energy_power = 0; + } else { + energy_power = (float)(Settings.energy_power_calibration * CSE_PREF) / (float)power_cycle; + } } } else { + cse_power_valid = 0; energy_power = 0; // Powered on but no load } if (adjustement & 0x20) { // Current valid From 3e7142f2a486279c8510da95155b38b163780f30 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 16 Mar 2018 17:33:14 +0100 Subject: [PATCH 025/136] v5.12.0e - Fix S31 power on wrong power report Fix S31 power on wrong power report --- sonoff/xdrv_03_energy.ino | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sonoff/xdrv_03_energy.ino b/sonoff/xdrv_03_energy.ino index 74a52460f..8867ed298 100644 --- a/sonoff/xdrv_03_energy.ino +++ b/sonoff/xdrv_03_energy.ino @@ -265,11 +265,11 @@ void HlwInit() #define CSE_UREF 100 uint8_t cse_receive_flag = 0; -uint8_t cse_power_valid = 0; long voltage_cycle = 0; long current_cycle = 0; long power_cycle = 0; +unsigned long power_cycle_first = 0; long cf_pulses = 0; long cf_pulses_last_time = CSE_PULSES_NOT_INITIALIZED; @@ -320,9 +320,6 @@ void CseReceived() power_cycle = serial_in_buffer[17] << 16 | serial_in_buffer[18] << 8 | serial_in_buffer[19]; cf_pulses = serial_in_buffer[21] << 8 | serial_in_buffer[22]; -// if (adjustement & 0x80) { // CF overflow -// cf_pulses += 0x10000; -// } if (energy_power_on) { // Powered on if (adjustement & 0x40) { // Voltage valid energy_voltage = (float)(Settings.energy_voltage_calibration * CSE_UREF) / (float)voltage_cycle; @@ -331,15 +328,16 @@ void CseReceived() if ((header & 0xF2) == 0xF2) { // Power cycle exceeds range energy_power = 0; } else { - if (cse_power_valid < 16) { // Skip first incomplete power_cycle - cse_power_valid++; - energy_power = 0; - } else { + if (0 == power_cycle_first) power_cycle_first = power_cycle; // Skip first incomplete power_cycle + if (power_cycle_first != power_cycle) { + power_cycle_first = -1; energy_power = (float)(Settings.energy_power_calibration * CSE_PREF) / (float)power_cycle; + } else { + energy_power = 0; } } } else { - cse_power_valid = 0; + power_cycle_first = 0; energy_power = 0; // Powered on but no load } if (adjustement & 0x20) { // Current valid @@ -350,6 +348,7 @@ void CseReceived() } } } else { // Powered off + power_cycle_first = 0; energy_voltage = 0; energy_power = 0; energy_current = 0; From 55c43ded0e8c1e5343dc56f68922dbaaf217bd70 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 17 Mar 2018 15:00:53 +0100 Subject: [PATCH 026/136] v5.12.0f - Add BRG support 5.12.0f * Add support for WS2812 BRG led configuration to be defined as NEO_BRG in user_config.h (#1690) --- README.md | 2 +- sonoff/_releasenotes.ino | 5 ++++- sonoff/settings.ino | 4 ++-- sonoff/sonoff.h | 12 +++++++++++ sonoff/sonoff.ino | 2 +- sonoff/sonoff_post.h | 2 +- sonoff/user_config.h | 8 +++---- sonoff/xdrv_00_mqtt.ino | 28 ++++++++++++------------ sonoff/xdrv_01_light.ino | 2 +- sonoff/xplg_ws2812.ino | 46 +++++++++++++++++++++++----------------- 10 files changed, 67 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index 1c1b625dc..6b30d05d0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## Sonoff-Tasmota Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE. -Current version is **5.12.0e** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.12.0f** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### ATTENTION All versions diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index d7ebcf426..82d94a3ca 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,7 @@ -/* 5.12.0e +/* 5.12.0f + * Add support for WS2812 BRG led configuration to be defined as NEO_BRG in user_config.h (#1690) + * + * 5.12.0e * Add Domoticz dust (custom) sensors to PMS5003 and NovaFitness SDS drivers as PM1, PM2.5 and PM10 * Add a second TLS fingerprint to allow switching keys in TLS mode (#2033, #2102) * Add display of remaining pulse time to command PulseTime (#2085) diff --git a/sonoff/settings.ino b/sonoff/settings.ino index 503ebfb86..cc2d1c955 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -509,7 +509,7 @@ void SettingsDefaultSet2() // Settings.domoticz_switch_idx[i] = 0; } - Settings.energy_power_delta = 80; + Settings.energy_power_delta = DEFAULT_POWER_DELTA; Settings.energy_power_calibration = HLW_PREF_PULSE; Settings.energy_voltage_calibration = HLW_UREF_PULSE; Settings.energy_current_calibration = HLW_IREF_PULSE; @@ -890,7 +890,7 @@ void SettingsDelta() } if (Settings.version < 0x050C0005) { Settings.light_rotation = 0; - Settings.energy_power_delta = 80; + Settings.energy_power_delta = DEFAULT_POWER_DELTA; char fingerprint[60]; memcpy(fingerprint, Settings.mqtt_fingerprint, sizeof(fingerprint)); char *p = fingerprint; diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index c90b31550..518408e0c 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -107,6 +107,18 @@ typedef unsigned long power_t; // Power (Relay) type #define max(a,b) ((a)>(b)?(a):(b)) */ +//enum ws2812NeopixelbusFeature { NEO_RGB, NEO_GRB, NEO_BRG, NEO_4LED, NEO_RGBW, NEO_GRBW }; // Doesn't work +#define NEO_RGB 0 // Neopixel RGB leds +#define NEO_GRB 1 // Neopixel GRB leds +#define NEO_BRG 2 // Neopixel BRG leds +#define NEO_4LED 3 // Placeholder to test for 4 led types +#define NEO_RGBW 4 // Neopixel RGBW leds +#define NEO_GRBW 5 // Neopixel GRBW leds + +#define MQTT_PUBSUBCLIENT 1 // Mqtt PubSubClient library +#define MQTT_TASMOTAMQTT 2 // Mqtt TasmotaMqtt library based on esp-mqtt-arduino +#define MQTT_ESPMQTTARDUINO 3 // Mqtt esp-mqtt-arduino library by Ingo Randolf + /*********************************************************************************************\ * Enumeration \*********************************************************************************************/ diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 3edbeac23..e4a8c0b2a 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050C0005 // 5.12.0e +#define VERSION 0x050C0006 // 5.12.0f // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h index b6ab9e999..078d880a0 100644 --- a/sonoff/sonoff_post.h +++ b/sonoff/sonoff_post.h @@ -68,7 +68,7 @@ void WifiWpsStatusCallback(wps_cb_status status); #define USE_IR_RECEIVE // Support for IR receiver (+5k5 code, 264 iram) #define USE_WS2812 // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by // #ifndef USE_WS2812_CTYPE - #define USE_WS2812_CTYPE 1 // WS2812 Color type (0 - RGB, 1 - GRB, 2 - RGBW, 3 - GRBW) + #define USE_WS2812_CTYPE NEO_GRB // WS2812 Color type (NEO_RGB, NEO_GRB, NEO_BRG, NEO_RGBW, NEO_GRBW) #endif // #define USE_WS2812_DMA // DMA supports only GPIO03 (= Serial RXD) (+1k mem). When USE_WS2812_DMA is enabled expect Exceptions on Pow #define USE_ARILUX_RF // Add support for Arilux RF remote controller (+0k8 code, 252 iram (non 2.3.0)) diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 92a8c160f..fcc39b63c 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -78,11 +78,11 @@ * Select ONE of possible MQTT library types below \*********************************************************************************************/ // Default MQTT driver for both non-TLS and TLS connections. Blocks network if MQTT server is unavailable. -#define MQTT_LIBRARY_TYPE 1 // Use PubSubClient library +#define MQTT_LIBRARY_TYPE MQTT_PUBSUBCLIENT // Use PubSubClient library // Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support -//#define MQTT_LIBRARY_TYPE 2 // Use TasmotaMqtt library (+4k4 code, +4k mem) - non-TLS only +//#define MQTT_LIBRARY_TYPE MQTT_TASMOTAMQTT // Use TasmotaMqtt library (+4k4 code, +4k mem) - non-TLS only // Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support -//#define MQTT_LIBRARY_TYPE 3 // Use (patched) esp-mqtt-arduino library (+4k8 code, +4k mem) - non-TLS only +//#define MQTT_LIBRARY_TYPE MQTT_ESPMQTTARDUINO // Use (patched) esp-mqtt-arduino library (+4k8 code, +4k mem) - non-TLS only // -- MQTT ---------------------------------------- #define MQTT_USE 1 // [SetOption3] Select default MQTT use (0 = Off, 1 = On) @@ -227,7 +227,7 @@ #define USE_IR_RECEIVE // Support for IR receiver (+5k5 code, 264 iram) #define USE_WS2812 // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by // - #define USE_WS2812_CTYPE 1 // WS2812 Color type (0 - RGB, 1 - GRB, 2 - RGBW, 3 - GRBW) + #define USE_WS2812_CTYPE NEO_GRB // WS2812 Color type (NEO_RGB, NEO_GRB, NEO_BRG, NEO_RGBW, NEO_GRBW) // #define USE_WS2812_DMA // DMA supports only GPIO03 (= Serial RXD) (+1k mem). When USE_WS2812_DMA is enabled expect Exceptions on Pow #define USE_ARILUX_RF // Add support for Arilux RF remote controller (+0k8 code, 252 iram (non 2.3.0)) diff --git a/sonoff/xdrv_00_mqtt.ino b/sonoff/xdrv_00_mqtt.ino index 9f89eb259..6a87f1f25 100644 --- a/sonoff/xdrv_00_mqtt.ino +++ b/sonoff/xdrv_00_mqtt.ino @@ -18,23 +18,23 @@ */ /*********************************************************************************************\ - * Select ONE of possible MQTT libraries below + * Select ONE of possible MQTT library types below \*********************************************************************************************/ // Default MQTT driver for both non-TLS and TLS connections. Blocks network if MQTT server is unavailable. -//#define MQTT_LIBRARY_TYPE 1 // Use PubSubClient library +//#define MQTT_LIBRARY_TYPE MQTT_PUBSUBCLIENT // Use PubSubClient library // Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support -//#define MQTT_LIBRARY_TYPE 2 // Use TasmotaMqtt library (+4k4 code, +4k mem) - non-TLS only +//#define MQTT_LIBRARY_TYPE MQTT_TASMOTAMQTT // Use TasmotaMqtt library (+4k4 code, +4k mem) - non-TLS only // Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support -//#define MQTT_LIBRARY_TYPE 3 // Use (patched) esp-mqtt-arduino library (+4k8 code, +4k mem) - non-TLS only +//#define MQTT_LIBRARY_TYPE MQTT_ESPMQTTARDUINO // Use (patched) esp-mqtt-arduino library (+4k8 code, +4k mem) - non-TLS only #ifdef USE_MQTT_TLS #ifdef MQTT_LIBRARY_TYPE #undef MQTT_LIBRARY_TYPE #endif -#define MQTT_LIBRARY_TYPE 1 // Use PubSubClient library as it only supports TLS +#define MQTT_LIBRARY_TYPE MQTT_PUBSUBCLIENT // Use PubSubClient library as it only supports TLS #else #ifndef MQTT_LIBRARY_TYPE -#define MQTT_LIBRARY_TYPE 1 // Use PubSubClient library as default +#define MQTT_LIBRARY_TYPE MQTT_PUBSUBCLIENT // Use PubSubClient library as default #endif #endif @@ -63,7 +63,7 @@ bool mqtt_connected = false; // MQTT virtual connection status * void MqttLoop() \*********************************************************************************************/ -#if (1 == MQTT_LIBRARY_TYPE) /*****************************************************************/ +#if (MQTT_LIBRARY_TYPE == MQTT_PUBSUBCLIENT) /***********************************************/ #include @@ -100,7 +100,7 @@ void MqttLoop() MqttClient.loop(); } -#elif (2 == MQTT_LIBRARY_TYPE) /*****************************************************************/ +#elif (MQTT_LIBRARY_TYPE == MQTT_TASMOTAMQTT) /**********************************************/ #include TasmotaMqtt MqttClient; @@ -134,7 +134,7 @@ void MqttLoop() { } -#elif (3 == MQTT_LIBRARY_TYPE) /***************************************************************/ +#elif (MQTT_LIBRARY_TYPE == MQTT_ESPMQTTARDUINO) /*******************************************/ #include MQTT *MqttClient = NULL; @@ -450,14 +450,14 @@ void MqttReconnect() if (!MqttCheckTls()) return; #endif // USE_MQTT_TLS -#if (2 == MQTT_LIBRARY_TYPE) +#if (MQTT_LIBRARY_TYPE == MQTT_TASMOTAMQTT) MqttClient.InitConnection(Settings.mqtt_host, Settings.mqtt_port); MqttClient.InitClient(mqtt_client, mqtt_user, mqtt_pwd, MQTT_KEEPALIVE); MqttClient.InitLWT(stopic, mqtt_data, 1, true); MqttClient.OnConnected(MqttConnected); MqttClient.OnDisconnected(MqttDisconnectedCb); MqttClient.OnData(MqttDataHandler); -#elif (3 == MQTT_LIBRARY_TYPE) +#elif (MQTT_LIBRARY_TYPE == MQTT_ESPMQTTARDUINO) MqttClient = new MQTT(mqtt_client, Settings.mqtt_host, Settings.mqtt_port, stopic, 1, true, mqtt_data); MqttClient->setUserPwd(mqtt_user, mqtt_pwd); MqttClient->onConnected(MqttConnected); @@ -468,7 +468,7 @@ void MqttReconnect() mqtt_initial_connection_state = 1; } -#if (1 == MQTT_LIBRARY_TYPE) +#if (MQTT_LIBRARY_TYPE == MQTT_PUBSUBCLIENT) MqttClient.setCallback(MqttDataHandler); MqttClient.setServer(Settings.mqtt_host, Settings.mqtt_port); if (MqttClient.connect(mqtt_client, mqtt_user, mqtt_pwd, stopic, 1, true, mqtt_data)) { @@ -476,9 +476,9 @@ void MqttReconnect() } else { MqttDisconnected(MqttClient.state()); // status codes are documented here http://pubsubclient.knolleary.net/api.html#state } -#elif (2 == MQTT_LIBRARY_TYPE) +#elif (MQTT_LIBRARY_TYPE == MQTT_TASMOTAMQTT) MqttClient.Connect(); -#elif (3 == MQTT_LIBRARY_TYPE) +#elif (MQTT_LIBRARY_TYPE == MQTT_ESPMQTTARDUINO) MqttClient->connect(); #endif // MQTT_LIBRARY_TYPE } diff --git a/sonoff/xdrv_01_light.ino b/sonoff/xdrv_01_light.ino index 6bcf20bea..8182a032b 100644 --- a/sonoff/xdrv_01_light.ino +++ b/sonoff/xdrv_01_light.ino @@ -376,7 +376,7 @@ void LightInit() } #ifdef USE_WS2812 // ************************************************************************ else if (LT_WS2812 == light_type) { -#if (USE_WS2812_CTYPE > 1) +#if (USE_WS2812_CTYPE > NEO_4LED) light_subtype++; // from RGB to RGBW #endif Ws2812Init(); diff --git a/sonoff/xplg_ws2812.ino b/sonoff/xplg_ws2812.ino index 42aafb8f3..3f1652c40 100644 --- a/sonoff/xplg_ws2812.ino +++ b/sonoff/xplg_ws2812.ino @@ -25,21 +25,25 @@ #include #ifdef USE_WS2812_DMA -#if (USE_WS2812_CTYPE == 1) +#if (USE_WS2812_CTYPE == NEO_GRB) NeoPixelBus *strip = NULL; -#elif (USE_WS2812_CTYPE == 2) +#elif (USE_WS2812_CTYPE == NEO_BRG) + NeoPixelBus *strip = NULL; +#elif (USE_WS2812_CTYPE == NEO_RGBW) NeoPixelBus *strip = NULL; -#elif (USE_WS2812_CTYPE == 3) +#elif (USE_WS2812_CTYPE == NEO_GRBW) NeoPixelBus *strip = NULL; #else // USE_WS2812_CTYPE NeoPixelBus *strip = NULL; #endif // USE_WS2812_CTYPE #else // USE_WS2812_DMA -#if (USE_WS2812_CTYPE == 1) +#if (USE_WS2812_CTYPE == NEO_GRB) NeoPixelBus *strip = NULL; -#elif (USE_WS2812_CTYPE == 2) +#elif (USE_WS2812_CTYPE == NEO_BRG) + NeoPixelBus *strip = NULL; +#elif (USE_WS2812_CTYPE == NEO_RGBW) NeoPixelBus *strip = NULL; -#elif (USE_WS2812_CTYPE == 3) +#elif (USE_WS2812_CTYPE == NEO_GRBW) NeoPixelBus *strip = NULL; #else // USE_WS2812_CTYPE NeoPixelBus *strip = NULL; @@ -90,7 +94,7 @@ uint8_t ws_show_next = 1; void Ws2812StripShow() { -#if (USE_WS2812_CTYPE > 1) +#if (USE_WS2812_CTYPE > NEO_4LED) RgbwColor c; #else RgbColor c; @@ -102,7 +106,7 @@ void Ws2812StripShow() c.R = ledTable[c.R]; c.G = ledTable[c.G]; c.B = ledTable[c.B]; -#if (USE_WS2812_CTYPE > 1) +#if (USE_WS2812_CTYPE > NEO_4LED) c.W = ledTable[c.W]; #endif strip->SetPixelColor(i, c); @@ -122,7 +126,7 @@ int mod(int a, int b) void Ws2812UpdatePixelColor(int position, struct WsColor hand_color, float offset) { -#if (USE_WS2812_CTYPE > 1) +#if (USE_WS2812_CTYPE > NEO_4LED) RgbwColor color; #else RgbColor color; @@ -205,7 +209,7 @@ void Ws2812Gradient(uint8_t schemenr) * Display a gradient of colors for the current color scheme. * Repeat is the number of repetitions of the gradient (pick a multiple of 2 for smooth looping of the gradient). */ -#if (USE_WS2812_CTYPE > 1) +#if (USE_WS2812_CTYPE > NEO_4LED) RgbwColor c; c.W = 0; #else @@ -253,7 +257,7 @@ void Ws2812Bars(uint8_t schemenr) * Display solid bars of color for the current color scheme. * Width is the width of each bar in pixels/lights. */ -#if (USE_WS2812_CTYPE > 1) +#if (USE_WS2812_CTYPE > NEO_4LED) RgbwColor c; c.W = 0; #else @@ -298,21 +302,25 @@ void Ws2812Bars(uint8_t schemenr) void Ws2812Init() { #ifdef USE_WS2812_DMA -#if (USE_WS2812_CTYPE == 1) +#if (USE_WS2812_CTYPE == NEO_GRB) strip = new NeoPixelBus(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use. -#elif (USE_WS2812_CTYPE == 2) +#elif (USE_WS2812_CTYPE == NEO_BRG) + strip = new NeoPixelBus(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use. +#elif (USE_WS2812_CTYPE == NEO_RGBW) strip = new NeoPixelBus(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use. -#elif (USE_WS2812_CTYPE == 3) +#elif (USE_WS2812_CTYPE == NEO_GRBW) strip = new NeoPixelBus(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use. #else // USE_WS2812_CTYPE strip = new NeoPixelBus(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use. #endif // USE_WS2812_CTYPE #else // USE_WS2812_DMA -#if (USE_WS2812_CTYPE == 1) +#if (USE_WS2812_CTYPE == NEO_GRB) strip = new NeoPixelBus(WS2812_MAX_LEDS, pin[GPIO_WS2812]); -#elif (USE_WS2812_CTYPE == 2) +#elif (USE_WS2812_CTYPE == NEO_BRG) + strip = new NeoPixelBus(WS2812_MAX_LEDS, pin[GPIO_WS2812]); +#elif (USE_WS2812_CTYPE == NEO_RGBW) strip = new NeoPixelBus(WS2812_MAX_LEDS, pin[GPIO_WS2812]); -#elif (USE_WS2812_CTYPE == 3) +#elif (USE_WS2812_CTYPE == NEO_GRBW) strip = new NeoPixelBus(WS2812_MAX_LEDS, pin[GPIO_WS2812]); #else // USE_WS2812_CTYPE strip = new NeoPixelBus(WS2812_MAX_LEDS, pin[GPIO_WS2812]); @@ -331,7 +339,7 @@ void Ws2812Clear() void Ws2812SetColor(uint16_t led, uint8_t red, uint8_t green, uint8_t blue, uint8_t white) { -#if (USE_WS2812_CTYPE > 1) +#if (USE_WS2812_CTYPE > NEO_4LED) RgbwColor lcolor; lcolor.W = white; #else @@ -357,7 +365,7 @@ char* Ws2812GetColor(uint16_t led, char* scolor) { uint8_t sl_ledcolor[4]; - #if (USE_WS2812_CTYPE > 1) + #if (USE_WS2812_CTYPE > NEO_4LED) RgbwColor lcolor = strip->GetPixelColor(led -1); sl_ledcolor[3] = lcolor.W; #else From 42ad9e1a66d41f3948fc47affcee0573e864e5aa Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 17 Mar 2018 15:10:08 +0100 Subject: [PATCH 027/136] Revert "v5.12.0f - Add BRG support" This reverts commit 55c43ded0e8c1e5343dc56f68922dbaaf217bd70. --- README.md | 2 +- sonoff/_releasenotes.ino | 5 +---- sonoff/settings.ino | 4 ++-- sonoff/sonoff.h | 12 ----------- sonoff/sonoff.ino | 2 +- sonoff/sonoff_post.h | 2 +- sonoff/user_config.h | 8 +++---- sonoff/xdrv_00_mqtt.ino | 28 ++++++++++++------------ sonoff/xdrv_01_light.ino | 2 +- sonoff/xplg_ws2812.ino | 46 +++++++++++++++++----------------------- 10 files changed, 44 insertions(+), 67 deletions(-) diff --git a/README.md b/README.md index 6b30d05d0..1c1b625dc 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## Sonoff-Tasmota Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE. -Current version is **5.12.0f** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.12.0e** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### ATTENTION All versions diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 82d94a3ca..d7ebcf426 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,7 +1,4 @@ -/* 5.12.0f - * Add support for WS2812 BRG led configuration to be defined as NEO_BRG in user_config.h (#1690) - * - * 5.12.0e +/* 5.12.0e * Add Domoticz dust (custom) sensors to PMS5003 and NovaFitness SDS drivers as PM1, PM2.5 and PM10 * Add a second TLS fingerprint to allow switching keys in TLS mode (#2033, #2102) * Add display of remaining pulse time to command PulseTime (#2085) diff --git a/sonoff/settings.ino b/sonoff/settings.ino index cc2d1c955..503ebfb86 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -509,7 +509,7 @@ void SettingsDefaultSet2() // Settings.domoticz_switch_idx[i] = 0; } - Settings.energy_power_delta = DEFAULT_POWER_DELTA; + Settings.energy_power_delta = 80; Settings.energy_power_calibration = HLW_PREF_PULSE; Settings.energy_voltage_calibration = HLW_UREF_PULSE; Settings.energy_current_calibration = HLW_IREF_PULSE; @@ -890,7 +890,7 @@ void SettingsDelta() } if (Settings.version < 0x050C0005) { Settings.light_rotation = 0; - Settings.energy_power_delta = DEFAULT_POWER_DELTA; + Settings.energy_power_delta = 80; char fingerprint[60]; memcpy(fingerprint, Settings.mqtt_fingerprint, sizeof(fingerprint)); char *p = fingerprint; diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index 518408e0c..c90b31550 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -107,18 +107,6 @@ typedef unsigned long power_t; // Power (Relay) type #define max(a,b) ((a)>(b)?(a):(b)) */ -//enum ws2812NeopixelbusFeature { NEO_RGB, NEO_GRB, NEO_BRG, NEO_4LED, NEO_RGBW, NEO_GRBW }; // Doesn't work -#define NEO_RGB 0 // Neopixel RGB leds -#define NEO_GRB 1 // Neopixel GRB leds -#define NEO_BRG 2 // Neopixel BRG leds -#define NEO_4LED 3 // Placeholder to test for 4 led types -#define NEO_RGBW 4 // Neopixel RGBW leds -#define NEO_GRBW 5 // Neopixel GRBW leds - -#define MQTT_PUBSUBCLIENT 1 // Mqtt PubSubClient library -#define MQTT_TASMOTAMQTT 2 // Mqtt TasmotaMqtt library based on esp-mqtt-arduino -#define MQTT_ESPMQTTARDUINO 3 // Mqtt esp-mqtt-arduino library by Ingo Randolf - /*********************************************************************************************\ * Enumeration \*********************************************************************************************/ diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index e4a8c0b2a..3edbeac23 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050C0006 // 5.12.0f +#define VERSION 0x050C0005 // 5.12.0e // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h index 078d880a0..b6ab9e999 100644 --- a/sonoff/sonoff_post.h +++ b/sonoff/sonoff_post.h @@ -68,7 +68,7 @@ void WifiWpsStatusCallback(wps_cb_status status); #define USE_IR_RECEIVE // Support for IR receiver (+5k5 code, 264 iram) #define USE_WS2812 // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by // #ifndef USE_WS2812_CTYPE - #define USE_WS2812_CTYPE NEO_GRB // WS2812 Color type (NEO_RGB, NEO_GRB, NEO_BRG, NEO_RGBW, NEO_GRBW) + #define USE_WS2812_CTYPE 1 // WS2812 Color type (0 - RGB, 1 - GRB, 2 - RGBW, 3 - GRBW) #endif // #define USE_WS2812_DMA // DMA supports only GPIO03 (= Serial RXD) (+1k mem). When USE_WS2812_DMA is enabled expect Exceptions on Pow #define USE_ARILUX_RF // Add support for Arilux RF remote controller (+0k8 code, 252 iram (non 2.3.0)) diff --git a/sonoff/user_config.h b/sonoff/user_config.h index fcc39b63c..92a8c160f 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -78,11 +78,11 @@ * Select ONE of possible MQTT library types below \*********************************************************************************************/ // Default MQTT driver for both non-TLS and TLS connections. Blocks network if MQTT server is unavailable. -#define MQTT_LIBRARY_TYPE MQTT_PUBSUBCLIENT // Use PubSubClient library +#define MQTT_LIBRARY_TYPE 1 // Use PubSubClient library // Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support -//#define MQTT_LIBRARY_TYPE MQTT_TASMOTAMQTT // Use TasmotaMqtt library (+4k4 code, +4k mem) - non-TLS only +//#define MQTT_LIBRARY_TYPE 2 // Use TasmotaMqtt library (+4k4 code, +4k mem) - non-TLS only // Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support -//#define MQTT_LIBRARY_TYPE MQTT_ESPMQTTARDUINO // Use (patched) esp-mqtt-arduino library (+4k8 code, +4k mem) - non-TLS only +//#define MQTT_LIBRARY_TYPE 3 // Use (patched) esp-mqtt-arduino library (+4k8 code, +4k mem) - non-TLS only // -- MQTT ---------------------------------------- #define MQTT_USE 1 // [SetOption3] Select default MQTT use (0 = Off, 1 = On) @@ -227,7 +227,7 @@ #define USE_IR_RECEIVE // Support for IR receiver (+5k5 code, 264 iram) #define USE_WS2812 // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by // - #define USE_WS2812_CTYPE NEO_GRB // WS2812 Color type (NEO_RGB, NEO_GRB, NEO_BRG, NEO_RGBW, NEO_GRBW) + #define USE_WS2812_CTYPE 1 // WS2812 Color type (0 - RGB, 1 - GRB, 2 - RGBW, 3 - GRBW) // #define USE_WS2812_DMA // DMA supports only GPIO03 (= Serial RXD) (+1k mem). When USE_WS2812_DMA is enabled expect Exceptions on Pow #define USE_ARILUX_RF // Add support for Arilux RF remote controller (+0k8 code, 252 iram (non 2.3.0)) diff --git a/sonoff/xdrv_00_mqtt.ino b/sonoff/xdrv_00_mqtt.ino index 6a87f1f25..9f89eb259 100644 --- a/sonoff/xdrv_00_mqtt.ino +++ b/sonoff/xdrv_00_mqtt.ino @@ -18,23 +18,23 @@ */ /*********************************************************************************************\ - * Select ONE of possible MQTT library types below + * Select ONE of possible MQTT libraries below \*********************************************************************************************/ // Default MQTT driver for both non-TLS and TLS connections. Blocks network if MQTT server is unavailable. -//#define MQTT_LIBRARY_TYPE MQTT_PUBSUBCLIENT // Use PubSubClient library +//#define MQTT_LIBRARY_TYPE 1 // Use PubSubClient library // Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support -//#define MQTT_LIBRARY_TYPE MQTT_TASMOTAMQTT // Use TasmotaMqtt library (+4k4 code, +4k mem) - non-TLS only +//#define MQTT_LIBRARY_TYPE 2 // Use TasmotaMqtt library (+4k4 code, +4k mem) - non-TLS only // Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support -//#define MQTT_LIBRARY_TYPE MQTT_ESPMQTTARDUINO // Use (patched) esp-mqtt-arduino library (+4k8 code, +4k mem) - non-TLS only +//#define MQTT_LIBRARY_TYPE 3 // Use (patched) esp-mqtt-arduino library (+4k8 code, +4k mem) - non-TLS only #ifdef USE_MQTT_TLS #ifdef MQTT_LIBRARY_TYPE #undef MQTT_LIBRARY_TYPE #endif -#define MQTT_LIBRARY_TYPE MQTT_PUBSUBCLIENT // Use PubSubClient library as it only supports TLS +#define MQTT_LIBRARY_TYPE 1 // Use PubSubClient library as it only supports TLS #else #ifndef MQTT_LIBRARY_TYPE -#define MQTT_LIBRARY_TYPE MQTT_PUBSUBCLIENT // Use PubSubClient library as default +#define MQTT_LIBRARY_TYPE 1 // Use PubSubClient library as default #endif #endif @@ -63,7 +63,7 @@ bool mqtt_connected = false; // MQTT virtual connection status * void MqttLoop() \*********************************************************************************************/ -#if (MQTT_LIBRARY_TYPE == MQTT_PUBSUBCLIENT) /***********************************************/ +#if (1 == MQTT_LIBRARY_TYPE) /*****************************************************************/ #include @@ -100,7 +100,7 @@ void MqttLoop() MqttClient.loop(); } -#elif (MQTT_LIBRARY_TYPE == MQTT_TASMOTAMQTT) /**********************************************/ +#elif (2 == MQTT_LIBRARY_TYPE) /*****************************************************************/ #include TasmotaMqtt MqttClient; @@ -134,7 +134,7 @@ void MqttLoop() { } -#elif (MQTT_LIBRARY_TYPE == MQTT_ESPMQTTARDUINO) /*******************************************/ +#elif (3 == MQTT_LIBRARY_TYPE) /***************************************************************/ #include MQTT *MqttClient = NULL; @@ -450,14 +450,14 @@ void MqttReconnect() if (!MqttCheckTls()) return; #endif // USE_MQTT_TLS -#if (MQTT_LIBRARY_TYPE == MQTT_TASMOTAMQTT) +#if (2 == MQTT_LIBRARY_TYPE) MqttClient.InitConnection(Settings.mqtt_host, Settings.mqtt_port); MqttClient.InitClient(mqtt_client, mqtt_user, mqtt_pwd, MQTT_KEEPALIVE); MqttClient.InitLWT(stopic, mqtt_data, 1, true); MqttClient.OnConnected(MqttConnected); MqttClient.OnDisconnected(MqttDisconnectedCb); MqttClient.OnData(MqttDataHandler); -#elif (MQTT_LIBRARY_TYPE == MQTT_ESPMQTTARDUINO) +#elif (3 == MQTT_LIBRARY_TYPE) MqttClient = new MQTT(mqtt_client, Settings.mqtt_host, Settings.mqtt_port, stopic, 1, true, mqtt_data); MqttClient->setUserPwd(mqtt_user, mqtt_pwd); MqttClient->onConnected(MqttConnected); @@ -468,7 +468,7 @@ void MqttReconnect() mqtt_initial_connection_state = 1; } -#if (MQTT_LIBRARY_TYPE == MQTT_PUBSUBCLIENT) +#if (1 == MQTT_LIBRARY_TYPE) MqttClient.setCallback(MqttDataHandler); MqttClient.setServer(Settings.mqtt_host, Settings.mqtt_port); if (MqttClient.connect(mqtt_client, mqtt_user, mqtt_pwd, stopic, 1, true, mqtt_data)) { @@ -476,9 +476,9 @@ void MqttReconnect() } else { MqttDisconnected(MqttClient.state()); // status codes are documented here http://pubsubclient.knolleary.net/api.html#state } -#elif (MQTT_LIBRARY_TYPE == MQTT_TASMOTAMQTT) +#elif (2 == MQTT_LIBRARY_TYPE) MqttClient.Connect(); -#elif (MQTT_LIBRARY_TYPE == MQTT_ESPMQTTARDUINO) +#elif (3 == MQTT_LIBRARY_TYPE) MqttClient->connect(); #endif // MQTT_LIBRARY_TYPE } diff --git a/sonoff/xdrv_01_light.ino b/sonoff/xdrv_01_light.ino index 8182a032b..6bcf20bea 100644 --- a/sonoff/xdrv_01_light.ino +++ b/sonoff/xdrv_01_light.ino @@ -376,7 +376,7 @@ void LightInit() } #ifdef USE_WS2812 // ************************************************************************ else if (LT_WS2812 == light_type) { -#if (USE_WS2812_CTYPE > NEO_4LED) +#if (USE_WS2812_CTYPE > 1) light_subtype++; // from RGB to RGBW #endif Ws2812Init(); diff --git a/sonoff/xplg_ws2812.ino b/sonoff/xplg_ws2812.ino index 3f1652c40..42aafb8f3 100644 --- a/sonoff/xplg_ws2812.ino +++ b/sonoff/xplg_ws2812.ino @@ -25,25 +25,21 @@ #include #ifdef USE_WS2812_DMA -#if (USE_WS2812_CTYPE == NEO_GRB) +#if (USE_WS2812_CTYPE == 1) NeoPixelBus *strip = NULL; -#elif (USE_WS2812_CTYPE == NEO_BRG) - NeoPixelBus *strip = NULL; -#elif (USE_WS2812_CTYPE == NEO_RGBW) +#elif (USE_WS2812_CTYPE == 2) NeoPixelBus *strip = NULL; -#elif (USE_WS2812_CTYPE == NEO_GRBW) +#elif (USE_WS2812_CTYPE == 3) NeoPixelBus *strip = NULL; #else // USE_WS2812_CTYPE NeoPixelBus *strip = NULL; #endif // USE_WS2812_CTYPE #else // USE_WS2812_DMA -#if (USE_WS2812_CTYPE == NEO_GRB) +#if (USE_WS2812_CTYPE == 1) NeoPixelBus *strip = NULL; -#elif (USE_WS2812_CTYPE == NEO_BRG) - NeoPixelBus *strip = NULL; -#elif (USE_WS2812_CTYPE == NEO_RGBW) +#elif (USE_WS2812_CTYPE == 2) NeoPixelBus *strip = NULL; -#elif (USE_WS2812_CTYPE == NEO_GRBW) +#elif (USE_WS2812_CTYPE == 3) NeoPixelBus *strip = NULL; #else // USE_WS2812_CTYPE NeoPixelBus *strip = NULL; @@ -94,7 +90,7 @@ uint8_t ws_show_next = 1; void Ws2812StripShow() { -#if (USE_WS2812_CTYPE > NEO_4LED) +#if (USE_WS2812_CTYPE > 1) RgbwColor c; #else RgbColor c; @@ -106,7 +102,7 @@ void Ws2812StripShow() c.R = ledTable[c.R]; c.G = ledTable[c.G]; c.B = ledTable[c.B]; -#if (USE_WS2812_CTYPE > NEO_4LED) +#if (USE_WS2812_CTYPE > 1) c.W = ledTable[c.W]; #endif strip->SetPixelColor(i, c); @@ -126,7 +122,7 @@ int mod(int a, int b) void Ws2812UpdatePixelColor(int position, struct WsColor hand_color, float offset) { -#if (USE_WS2812_CTYPE > NEO_4LED) +#if (USE_WS2812_CTYPE > 1) RgbwColor color; #else RgbColor color; @@ -209,7 +205,7 @@ void Ws2812Gradient(uint8_t schemenr) * Display a gradient of colors for the current color scheme. * Repeat is the number of repetitions of the gradient (pick a multiple of 2 for smooth looping of the gradient). */ -#if (USE_WS2812_CTYPE > NEO_4LED) +#if (USE_WS2812_CTYPE > 1) RgbwColor c; c.W = 0; #else @@ -257,7 +253,7 @@ void Ws2812Bars(uint8_t schemenr) * Display solid bars of color for the current color scheme. * Width is the width of each bar in pixels/lights. */ -#if (USE_WS2812_CTYPE > NEO_4LED) +#if (USE_WS2812_CTYPE > 1) RgbwColor c; c.W = 0; #else @@ -302,25 +298,21 @@ void Ws2812Bars(uint8_t schemenr) void Ws2812Init() { #ifdef USE_WS2812_DMA -#if (USE_WS2812_CTYPE == NEO_GRB) +#if (USE_WS2812_CTYPE == 1) strip = new NeoPixelBus(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use. -#elif (USE_WS2812_CTYPE == NEO_BRG) - strip = new NeoPixelBus(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use. -#elif (USE_WS2812_CTYPE == NEO_RGBW) +#elif (USE_WS2812_CTYPE == 2) strip = new NeoPixelBus(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use. -#elif (USE_WS2812_CTYPE == NEO_GRBW) +#elif (USE_WS2812_CTYPE == 3) strip = new NeoPixelBus(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use. #else // USE_WS2812_CTYPE strip = new NeoPixelBus(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use. #endif // USE_WS2812_CTYPE #else // USE_WS2812_DMA -#if (USE_WS2812_CTYPE == NEO_GRB) +#if (USE_WS2812_CTYPE == 1) strip = new NeoPixelBus(WS2812_MAX_LEDS, pin[GPIO_WS2812]); -#elif (USE_WS2812_CTYPE == NEO_BRG) - strip = new NeoPixelBus(WS2812_MAX_LEDS, pin[GPIO_WS2812]); -#elif (USE_WS2812_CTYPE == NEO_RGBW) +#elif (USE_WS2812_CTYPE == 2) strip = new NeoPixelBus(WS2812_MAX_LEDS, pin[GPIO_WS2812]); -#elif (USE_WS2812_CTYPE == NEO_GRBW) +#elif (USE_WS2812_CTYPE == 3) strip = new NeoPixelBus(WS2812_MAX_LEDS, pin[GPIO_WS2812]); #else // USE_WS2812_CTYPE strip = new NeoPixelBus(WS2812_MAX_LEDS, pin[GPIO_WS2812]); @@ -339,7 +331,7 @@ void Ws2812Clear() void Ws2812SetColor(uint16_t led, uint8_t red, uint8_t green, uint8_t blue, uint8_t white) { -#if (USE_WS2812_CTYPE > NEO_4LED) +#if (USE_WS2812_CTYPE > 1) RgbwColor lcolor; lcolor.W = white; #else @@ -365,7 +357,7 @@ char* Ws2812GetColor(uint16_t led, char* scolor) { uint8_t sl_ledcolor[4]; - #if (USE_WS2812_CTYPE > NEO_4LED) + #if (USE_WS2812_CTYPE > 1) RgbwColor lcolor = strip->GetPixelColor(led -1); sl_ledcolor[3] = lcolor.W; #else From bdb652547e159f451af289203fd8bf19127b213c Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 17 Mar 2018 15:22:29 +0100 Subject: [PATCH 028/136] v5.12.0f - Add BRG and RBG support 5.12.0f * Add compile time support for WS2812 BRG and RBG led configurations to be defined in user_config.h (#1690) --- README.md | 2 +- sonoff/_releasenotes.ino | 5 +++- sonoff/settings.ino | 4 +-- sonoff/sonoff.h | 13 ++++++++++ sonoff/sonoff.ino | 2 +- sonoff/sonoff_post.h | 2 +- sonoff/user_config.h | 8 +++--- sonoff/xdrv_00_mqtt.ino | 28 ++++++++++----------- sonoff/xdrv_01_light.ino | 2 +- sonoff/xplg_ws2812.ino | 54 ++++++++++++++++++++++++++-------------- 10 files changed, 76 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index 1c1b625dc..6b30d05d0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## Sonoff-Tasmota Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE. -Current version is **5.12.0e** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.12.0f** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### ATTENTION All versions diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index d7ebcf426..97fb87e7f 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,7 @@ -/* 5.12.0e +/* 5.12.0f + * Add compile time support for WS2812 BRG and RBG led configurations to be defined in user_config.h (#1690) + * + * 5.12.0e * Add Domoticz dust (custom) sensors to PMS5003 and NovaFitness SDS drivers as PM1, PM2.5 and PM10 * Add a second TLS fingerprint to allow switching keys in TLS mode (#2033, #2102) * Add display of remaining pulse time to command PulseTime (#2085) diff --git a/sonoff/settings.ino b/sonoff/settings.ino index 503ebfb86..cc2d1c955 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -509,7 +509,7 @@ void SettingsDefaultSet2() // Settings.domoticz_switch_idx[i] = 0; } - Settings.energy_power_delta = 80; + Settings.energy_power_delta = DEFAULT_POWER_DELTA; Settings.energy_power_calibration = HLW_PREF_PULSE; Settings.energy_voltage_calibration = HLW_UREF_PULSE; Settings.energy_current_calibration = HLW_IREF_PULSE; @@ -890,7 +890,7 @@ void SettingsDelta() } if (Settings.version < 0x050C0005) { Settings.light_rotation = 0; - Settings.energy_power_delta = 80; + Settings.energy_power_delta = DEFAULT_POWER_DELTA; char fingerprint[60]; memcpy(fingerprint, Settings.mqtt_fingerprint, sizeof(fingerprint)); char *p = fingerprint; diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index c90b31550..fa3649ad1 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -107,6 +107,19 @@ typedef unsigned long power_t; // Power (Relay) type #define max(a,b) ((a)>(b)?(a):(b)) */ +//enum ws2812NeopixelbusFeature { NEO_RGB, NEO_GRB, NEO_BRG, NEO_RBG, NEO_3LED, NEO_RGBW, NEO_GRBW }; // Doesn't work +#define NEO_RGB 0 // Neopixel RGB leds +#define NEO_GRB 1 // Neopixel GRB leds +#define NEO_BRG 2 // Neopixel BRG leds +#define NEO_RBG 3 // Neopixel RBG leds +#define NEO_3LED 4 // Placeholder to test for 4 led types +#define NEO_RGBW 5 // Neopixel RGBW leds +#define NEO_GRBW 6 // Neopixel GRBW leds + +#define MQTT_PUBSUBCLIENT 1 // Mqtt PubSubClient library +#define MQTT_TASMOTAMQTT 2 // Mqtt TasmotaMqtt library based on esp-mqtt-arduino +#define MQTT_ESPMQTTARDUINO 3 // Mqtt esp-mqtt-arduino library by Ingo Randolf + /*********************************************************************************************\ * Enumeration \*********************************************************************************************/ diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 3edbeac23..e4a8c0b2a 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050C0005 // 5.12.0e +#define VERSION 0x050C0006 // 5.12.0f // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h index b6ab9e999..026cc9465 100644 --- a/sonoff/sonoff_post.h +++ b/sonoff/sonoff_post.h @@ -68,7 +68,7 @@ void WifiWpsStatusCallback(wps_cb_status status); #define USE_IR_RECEIVE // Support for IR receiver (+5k5 code, 264 iram) #define USE_WS2812 // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by // #ifndef USE_WS2812_CTYPE - #define USE_WS2812_CTYPE 1 // WS2812 Color type (0 - RGB, 1 - GRB, 2 - RGBW, 3 - GRBW) + #define USE_WS2812_CTYPE NEO_GRB // WS2812 Color type (NEO_RGB, NEO_GRB, NEO_BRG, NEO_RBG, NEO_RGBW, NEO_GRBW) #endif // #define USE_WS2812_DMA // DMA supports only GPIO03 (= Serial RXD) (+1k mem). When USE_WS2812_DMA is enabled expect Exceptions on Pow #define USE_ARILUX_RF // Add support for Arilux RF remote controller (+0k8 code, 252 iram (non 2.3.0)) diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 92a8c160f..caf686d6b 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -78,11 +78,11 @@ * Select ONE of possible MQTT library types below \*********************************************************************************************/ // Default MQTT driver for both non-TLS and TLS connections. Blocks network if MQTT server is unavailable. -#define MQTT_LIBRARY_TYPE 1 // Use PubSubClient library +#define MQTT_LIBRARY_TYPE MQTT_PUBSUBCLIENT // Use PubSubClient library // Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support -//#define MQTT_LIBRARY_TYPE 2 // Use TasmotaMqtt library (+4k4 code, +4k mem) - non-TLS only +//#define MQTT_LIBRARY_TYPE MQTT_TASMOTAMQTT // Use TasmotaMqtt library (+4k4 code, +4k mem) - non-TLS only // Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support -//#define MQTT_LIBRARY_TYPE 3 // Use (patched) esp-mqtt-arduino library (+4k8 code, +4k mem) - non-TLS only +//#define MQTT_LIBRARY_TYPE MQTT_ESPMQTTARDUINO // Use (patched) esp-mqtt-arduino library (+4k8 code, +4k mem) - non-TLS only // -- MQTT ---------------------------------------- #define MQTT_USE 1 // [SetOption3] Select default MQTT use (0 = Off, 1 = On) @@ -227,7 +227,7 @@ #define USE_IR_RECEIVE // Support for IR receiver (+5k5 code, 264 iram) #define USE_WS2812 // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by // - #define USE_WS2812_CTYPE 1 // WS2812 Color type (0 - RGB, 1 - GRB, 2 - RGBW, 3 - GRBW) + #define USE_WS2812_CTYPE NEO_GRB // WS2812 Color type (NEO_RGB, NEO_GRB, NEO_BRG, NEO_RBG, NEO_RGBW, NEO_GRBW) // #define USE_WS2812_DMA // DMA supports only GPIO03 (= Serial RXD) (+1k mem). When USE_WS2812_DMA is enabled expect Exceptions on Pow #define USE_ARILUX_RF // Add support for Arilux RF remote controller (+0k8 code, 252 iram (non 2.3.0)) diff --git a/sonoff/xdrv_00_mqtt.ino b/sonoff/xdrv_00_mqtt.ino index 9f89eb259..6a87f1f25 100644 --- a/sonoff/xdrv_00_mqtt.ino +++ b/sonoff/xdrv_00_mqtt.ino @@ -18,23 +18,23 @@ */ /*********************************************************************************************\ - * Select ONE of possible MQTT libraries below + * Select ONE of possible MQTT library types below \*********************************************************************************************/ // Default MQTT driver for both non-TLS and TLS connections. Blocks network if MQTT server is unavailable. -//#define MQTT_LIBRARY_TYPE 1 // Use PubSubClient library +//#define MQTT_LIBRARY_TYPE MQTT_PUBSUBCLIENT // Use PubSubClient library // Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support -//#define MQTT_LIBRARY_TYPE 2 // Use TasmotaMqtt library (+4k4 code, +4k mem) - non-TLS only +//#define MQTT_LIBRARY_TYPE MQTT_TASMOTAMQTT // Use TasmotaMqtt library (+4k4 code, +4k mem) - non-TLS only // Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support -//#define MQTT_LIBRARY_TYPE 3 // Use (patched) esp-mqtt-arduino library (+4k8 code, +4k mem) - non-TLS only +//#define MQTT_LIBRARY_TYPE MQTT_ESPMQTTARDUINO // Use (patched) esp-mqtt-arduino library (+4k8 code, +4k mem) - non-TLS only #ifdef USE_MQTT_TLS #ifdef MQTT_LIBRARY_TYPE #undef MQTT_LIBRARY_TYPE #endif -#define MQTT_LIBRARY_TYPE 1 // Use PubSubClient library as it only supports TLS +#define MQTT_LIBRARY_TYPE MQTT_PUBSUBCLIENT // Use PubSubClient library as it only supports TLS #else #ifndef MQTT_LIBRARY_TYPE -#define MQTT_LIBRARY_TYPE 1 // Use PubSubClient library as default +#define MQTT_LIBRARY_TYPE MQTT_PUBSUBCLIENT // Use PubSubClient library as default #endif #endif @@ -63,7 +63,7 @@ bool mqtt_connected = false; // MQTT virtual connection status * void MqttLoop() \*********************************************************************************************/ -#if (1 == MQTT_LIBRARY_TYPE) /*****************************************************************/ +#if (MQTT_LIBRARY_TYPE == MQTT_PUBSUBCLIENT) /***********************************************/ #include @@ -100,7 +100,7 @@ void MqttLoop() MqttClient.loop(); } -#elif (2 == MQTT_LIBRARY_TYPE) /*****************************************************************/ +#elif (MQTT_LIBRARY_TYPE == MQTT_TASMOTAMQTT) /**********************************************/ #include TasmotaMqtt MqttClient; @@ -134,7 +134,7 @@ void MqttLoop() { } -#elif (3 == MQTT_LIBRARY_TYPE) /***************************************************************/ +#elif (MQTT_LIBRARY_TYPE == MQTT_ESPMQTTARDUINO) /*******************************************/ #include MQTT *MqttClient = NULL; @@ -450,14 +450,14 @@ void MqttReconnect() if (!MqttCheckTls()) return; #endif // USE_MQTT_TLS -#if (2 == MQTT_LIBRARY_TYPE) +#if (MQTT_LIBRARY_TYPE == MQTT_TASMOTAMQTT) MqttClient.InitConnection(Settings.mqtt_host, Settings.mqtt_port); MqttClient.InitClient(mqtt_client, mqtt_user, mqtt_pwd, MQTT_KEEPALIVE); MqttClient.InitLWT(stopic, mqtt_data, 1, true); MqttClient.OnConnected(MqttConnected); MqttClient.OnDisconnected(MqttDisconnectedCb); MqttClient.OnData(MqttDataHandler); -#elif (3 == MQTT_LIBRARY_TYPE) +#elif (MQTT_LIBRARY_TYPE == MQTT_ESPMQTTARDUINO) MqttClient = new MQTT(mqtt_client, Settings.mqtt_host, Settings.mqtt_port, stopic, 1, true, mqtt_data); MqttClient->setUserPwd(mqtt_user, mqtt_pwd); MqttClient->onConnected(MqttConnected); @@ -468,7 +468,7 @@ void MqttReconnect() mqtt_initial_connection_state = 1; } -#if (1 == MQTT_LIBRARY_TYPE) +#if (MQTT_LIBRARY_TYPE == MQTT_PUBSUBCLIENT) MqttClient.setCallback(MqttDataHandler); MqttClient.setServer(Settings.mqtt_host, Settings.mqtt_port); if (MqttClient.connect(mqtt_client, mqtt_user, mqtt_pwd, stopic, 1, true, mqtt_data)) { @@ -476,9 +476,9 @@ void MqttReconnect() } else { MqttDisconnected(MqttClient.state()); // status codes are documented here http://pubsubclient.knolleary.net/api.html#state } -#elif (2 == MQTT_LIBRARY_TYPE) +#elif (MQTT_LIBRARY_TYPE == MQTT_TASMOTAMQTT) MqttClient.Connect(); -#elif (3 == MQTT_LIBRARY_TYPE) +#elif (MQTT_LIBRARY_TYPE == MQTT_ESPMQTTARDUINO) MqttClient->connect(); #endif // MQTT_LIBRARY_TYPE } diff --git a/sonoff/xdrv_01_light.ino b/sonoff/xdrv_01_light.ino index 6bcf20bea..f5f6184c7 100644 --- a/sonoff/xdrv_01_light.ino +++ b/sonoff/xdrv_01_light.ino @@ -376,7 +376,7 @@ void LightInit() } #ifdef USE_WS2812 // ************************************************************************ else if (LT_WS2812 == light_type) { -#if (USE_WS2812_CTYPE > 1) +#if (USE_WS2812_CTYPE > NEO_3LED) light_subtype++; // from RGB to RGBW #endif Ws2812Init(); diff --git a/sonoff/xplg_ws2812.ino b/sonoff/xplg_ws2812.ino index 42aafb8f3..4d6410f90 100644 --- a/sonoff/xplg_ws2812.ino +++ b/sonoff/xplg_ws2812.ino @@ -25,21 +25,29 @@ #include #ifdef USE_WS2812_DMA -#if (USE_WS2812_CTYPE == 1) +#if (USE_WS2812_CTYPE == NEO_GRB) NeoPixelBus *strip = NULL; -#elif (USE_WS2812_CTYPE == 2) +#elif (USE_WS2812_CTYPE == NEO_BRG) + NeoPixelBus *strip = NULL; +#elif (USE_WS2812_CTYPE == NEO_RBG) + NeoPixelBus *strip = NULL; +#elif (USE_WS2812_CTYPE == NEO_RGBW) NeoPixelBus *strip = NULL; -#elif (USE_WS2812_CTYPE == 3) +#elif (USE_WS2812_CTYPE == NEO_GRBW) NeoPixelBus *strip = NULL; #else // USE_WS2812_CTYPE NeoPixelBus *strip = NULL; #endif // USE_WS2812_CTYPE #else // USE_WS2812_DMA -#if (USE_WS2812_CTYPE == 1) +#if (USE_WS2812_CTYPE == NEO_GRB) NeoPixelBus *strip = NULL; -#elif (USE_WS2812_CTYPE == 2) +#elif (USE_WS2812_CTYPE == NEO_BRG) + NeoPixelBus *strip = NULL; +#elif (USE_WS2812_CTYPE == NEO_RBG) + NeoPixelBus *strip = NULL; +#elif (USE_WS2812_CTYPE == NEO_RGBW) NeoPixelBus *strip = NULL; -#elif (USE_WS2812_CTYPE == 3) +#elif (USE_WS2812_CTYPE == NEO_GRBW) NeoPixelBus *strip = NULL; #else // USE_WS2812_CTYPE NeoPixelBus *strip = NULL; @@ -90,7 +98,7 @@ uint8_t ws_show_next = 1; void Ws2812StripShow() { -#if (USE_WS2812_CTYPE > 1) +#if (USE_WS2812_CTYPE > NEO_3LED) RgbwColor c; #else RgbColor c; @@ -102,7 +110,7 @@ void Ws2812StripShow() c.R = ledTable[c.R]; c.G = ledTable[c.G]; c.B = ledTable[c.B]; -#if (USE_WS2812_CTYPE > 1) +#if (USE_WS2812_CTYPE > NEO_3LED) c.W = ledTable[c.W]; #endif strip->SetPixelColor(i, c); @@ -122,7 +130,7 @@ int mod(int a, int b) void Ws2812UpdatePixelColor(int position, struct WsColor hand_color, float offset) { -#if (USE_WS2812_CTYPE > 1) +#if (USE_WS2812_CTYPE > NEO_3LED) RgbwColor color; #else RgbColor color; @@ -205,7 +213,7 @@ void Ws2812Gradient(uint8_t schemenr) * Display a gradient of colors for the current color scheme. * Repeat is the number of repetitions of the gradient (pick a multiple of 2 for smooth looping of the gradient). */ -#if (USE_WS2812_CTYPE > 1) +#if (USE_WS2812_CTYPE > NEO_3LED) RgbwColor c; c.W = 0; #else @@ -253,7 +261,7 @@ void Ws2812Bars(uint8_t schemenr) * Display solid bars of color for the current color scheme. * Width is the width of each bar in pixels/lights. */ -#if (USE_WS2812_CTYPE > 1) +#if (USE_WS2812_CTYPE > NEO_3LED) RgbwColor c; c.W = 0; #else @@ -298,21 +306,29 @@ void Ws2812Bars(uint8_t schemenr) void Ws2812Init() { #ifdef USE_WS2812_DMA -#if (USE_WS2812_CTYPE == 1) +#if (USE_WS2812_CTYPE == NEO_GRB) strip = new NeoPixelBus(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use. -#elif (USE_WS2812_CTYPE == 2) +#elif (USE_WS2812_CTYPE == NEO_BRG) + strip = new NeoPixelBus(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use. +#elif (USE_WS2812_CTYPE == NEO_RBG) + strip = new NeoPixelBus(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use. +#elif (USE_WS2812_CTYPE == NEO_RGBW) strip = new NeoPixelBus(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use. -#elif (USE_WS2812_CTYPE == 3) +#elif (USE_WS2812_CTYPE == NEO_GRBW) strip = new NeoPixelBus(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use. #else // USE_WS2812_CTYPE strip = new NeoPixelBus(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use. #endif // USE_WS2812_CTYPE #else // USE_WS2812_DMA -#if (USE_WS2812_CTYPE == 1) +#if (USE_WS2812_CTYPE == NEO_GRB) strip = new NeoPixelBus(WS2812_MAX_LEDS, pin[GPIO_WS2812]); -#elif (USE_WS2812_CTYPE == 2) +#elif (USE_WS2812_CTYPE == NEO_BRG) + strip = new NeoPixelBus(WS2812_MAX_LEDS, pin[GPIO_WS2812]); +#elif (USE_WS2812_CTYPE == NEO_RBG) + strip = new NeoPixelBus(WS2812_MAX_LEDS, pin[GPIO_WS2812]); +#elif (USE_WS2812_CTYPE == NEO_RGBW) strip = new NeoPixelBus(WS2812_MAX_LEDS, pin[GPIO_WS2812]); -#elif (USE_WS2812_CTYPE == 3) +#elif (USE_WS2812_CTYPE == NEO_GRBW) strip = new NeoPixelBus(WS2812_MAX_LEDS, pin[GPIO_WS2812]); #else // USE_WS2812_CTYPE strip = new NeoPixelBus(WS2812_MAX_LEDS, pin[GPIO_WS2812]); @@ -331,7 +347,7 @@ void Ws2812Clear() void Ws2812SetColor(uint16_t led, uint8_t red, uint8_t green, uint8_t blue, uint8_t white) { -#if (USE_WS2812_CTYPE > 1) +#if (USE_WS2812_CTYPE > NEO_3LED) RgbwColor lcolor; lcolor.W = white; #else @@ -357,7 +373,7 @@ char* Ws2812GetColor(uint16_t led, char* scolor) { uint8_t sl_ledcolor[4]; - #if (USE_WS2812_CTYPE > 1) + #if (USE_WS2812_CTYPE > NEO_3LED) RgbwColor lcolor = strip->GetPixelColor(led -1); sl_ledcolor[3] = lcolor.W; #else From d3ef9caa347c7894daee3aadcd5cb5a9359c5fd6 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sun, 18 Mar 2018 13:47:30 +0100 Subject: [PATCH 029/136] v5.12.0g - Add hardware serial mqtt bridge 5.12.0g * Add support for MQTT to hardware serial bridge using commands Baudrate and SerialSend. Currently supports 8N1 and text only (#2182) --- README.md | 2 +- sonoff/_releasenotes.ino | 5 ++- sonoff/i18n.h | 3 ++ sonoff/settings.h | 18 ++------ sonoff/settings.ino | 4 ++ sonoff/sonoff.h | 1 + sonoff/sonoff.ino | 94 ++++++++++++++++++++++++++++++++-------- sonoff/support.ino | 8 ++++ 8 files changed, 99 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 6b30d05d0..91c14f661 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## Sonoff-Tasmota Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE. -Current version is **5.12.0f** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.12.0g** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### ATTENTION All versions diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 97fb87e7f..ca3d6c7a7 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,7 @@ -/* 5.12.0f +/* 5.12.0g + * Add support for MQTT to hardware serial bridge using commands Baudrate and SerialSend. Currently supports 8N1 and text only (#2182) + * + * 5.12.0f * Add compile time support for WS2812 BRG and RBG led configurations to be defined in user_config.h (#1690) * * 5.12.0e diff --git a/sonoff/i18n.h b/sonoff/i18n.h index 4bfa45866..d59143209 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -96,6 +96,7 @@ #define D_JSON_SAVESTATE "SaveState" #define D_JSON_SDKVERSION "SDK" #define D_JSON_SELECTED "selected" +#define D_JSON_SERIALRECEIVED "SerialReceived" #define D_JSON_SSID "SSId" #define D_JSON_STARTDST "StartDST" // Start Daylight Savings Time #define D_JSON_STARTED "Started" @@ -240,6 +241,8 @@ #define D_CMND_LEDSTATE "LedState" #define D_CMND_CFGDUMP "CfgDump" #define D_CMND_I2CSCAN "I2CScan" +#define D_CMND_SERIALSEND "SerialSend" +#define D_CMND_BAUDRATE "Baudrate" #define D_CMND_EXCEPTION "Exception" // Commands xdrv_01_light.ino diff --git a/sonoff/settings.h b/sonoff/settings.h index 54c5116ab..3c3caf9da 100644 --- a/sonoff/settings.h +++ b/sonoff/settings.h @@ -47,7 +47,7 @@ typedef union { // Restricted by MISRA-C Rule 18.4 bu uint32_t hass_discovery : 1; // bit 19 (v5.11.1a) uint32_t not_power_linked : 1; // bit 20 (v5.11.1f) uint32_t no_power_on_check : 1; // bit 21 (v5.11.1i) - uint32_t spare22 : 1; + uint32_t mqtt_serial : 1; // bit 22 (v5.12.0f) uint32_t spare23 : 1; uint32_t spare24 : 1; uint32_t spare25 : 1; @@ -99,9 +99,7 @@ struct SYSCFG { int8_t timezone; // 016 char ota_url[101]; // 017 char mqtt_prefix[3][11]; // 07C - - byte free_09D[1]; // 09D - + uint8_t baudrate; // 09D byte seriallog_level; // 09E uint8_t sta_config; // 09F byte sta_active; // 0A0 @@ -128,7 +126,6 @@ struct SYSCFG { char mqtt_topic[33]; // 26F char button_topic[33]; // 290 char mqtt_grptopic[33]; // 2B1 - uint8_t display_model; // 2D2 uint8_t display_mode; // 2D3 uint8_t display_refresh; // 2D4 @@ -137,12 +134,12 @@ struct SYSCFG { uint8_t display_address[8]; // 2D8 uint8_t display_dimmer; // 2E0 uint8_t display_size; // 2E1 + uint8_t free_2E2[4]; // 2E2 uint16_t pwm_frequency; // 2E6 power_t power; // 2E8 uint16_t pwm_value[MAX_PWMS]; // 2EC - int16_t altitude; // 2F6 Add since 5.8.0i uint16_t tele_period; // 2F8 uint8_t ex_power; // 2FA Not used since 5.8.0j @@ -152,10 +149,8 @@ struct SYSCFG { uint8_t energy_power_delta; // 33F uint16_t domoticz_update_timer; // 340 uint16_t pwm_range; // 342 - unsigned long domoticz_relay_idx[MAX_DOMOTICZ_IDX]; // 344 unsigned long domoticz_key_idx[MAX_DOMOTICZ_IDX]; // 354 - unsigned long energy_power_calibration; // 364 unsigned long energy_voltage_calibration; // 368 unsigned long energy_current_calibration; // 36C @@ -179,7 +174,6 @@ struct SYSCFG { uint16_t mqtt_retry; // 396 uint8_t poweronstate; // 398 uint8_t last_module; // 399 - uint16_t blinktime; // 39A uint16_t blinkcount; // 39C uint16_t light_rotation; // 39E @@ -205,10 +199,8 @@ struct SYSCFG { uint16_t domoticz_switch_idx[MAX_DOMOTICZ_IDX]; // 454 uint16_t domoticz_sensor_idx[MAX_DOMOTICZ_SNS_IDX]; // 45C uint8_t module; // 474 - uint8_t ws_color[4][3]; // 475 uint8_t ws_width[3]; // 481 - myio my_gp; // 484 uint16_t light_pixels; // 496 uint8_t light_color[5]; // 498 @@ -231,9 +223,7 @@ struct SYSCFG { char web_password[33]; // 4A9 uint8_t switchmode[MAX_SWITCHES]; // 4CA char ntp_server[3][33]; // 4CE - byte ina219_mode; // 531 - uint16_t pulse_timer[MAX_PULSETIMERS]; // 532 byte free_542[2]; // 542 @@ -241,9 +231,7 @@ struct SYSCFG { uint32_t ip_address[4]; // 544 unsigned long energy_kWhtotal; // 554 char mqtt_fulltopic[100]; // 558 - SysBitfield2 flag2; // 5BC Add flag2 since 5.9.2 - unsigned long pulse_counter[MAX_COUNTERS]; // 5C0 uint16_t pulse_counter_type; // 5D0 uint16_t pulse_counter_debounce; // 5D2 diff --git a/sonoff/settings.ino b/sonoff/settings.ino index cc2d1c955..84f68ba08 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -457,6 +457,7 @@ void SettingsDefaultSet2() Settings.save_data = SAVE_DATA; Settings.timezone = APP_TIMEZONE; strlcpy(Settings.ota_url, OTA_URL, sizeof(Settings.ota_url)); + Settings.baudrate = APP_BAUDRATE / 1200; Settings.seriallog_level = SERIAL_LOG_LEVEL; // Settings.sta_active = 0; @@ -899,6 +900,9 @@ void SettingsDelta() Settings.mqtt_fingerprint[1][i] = Settings.mqtt_fingerprint[0][i]; } } + if (Settings.version < 0x050C0007) { + Settings.baudrate = APP_BAUDRATE / 1200; + } Settings.version = VERSION; SettingsSave(1); diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index fa3649ad1..0b90213bd 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -99,6 +99,7 @@ typedef unsigned long power_t; // Power (Relay) type #define MIN_BACKLOG_DELAY 2 // Minimal backlog delay in 0.1 seconds #define APP_BAUDRATE 115200 // Default serial baudrate +#define SERIAL_POLLING 100 // Serial receive polling in ms #define MAX_STATUS 11 // Max number of status lines /* diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index e4a8c0b2a..dfd322bae 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050C0006 // 5.12.0f +#define VERSION 0x050C0007 // 5.12.0g // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) @@ -76,7 +76,7 @@ enum TasmotaCommands { CMND_LOGHOST, CMND_LOGPORT, CMND_IPADDRESS, CMND_NTPSERVER, CMND_AP, CMND_SSID, CMND_PASSWORD, CMND_HOSTNAME, CMND_WIFICONFIG, CMND_FRIENDLYNAME, CMND_SWITCHMODE, CMND_WEBSERVER, CMND_WEBPASSWORD, CMND_WEBLOG, CMND_EMULATION, CMND_TELEPERIOD, CMND_RESTART, CMND_RESET, CMND_TIMEZONE, CMND_ALTITUDE, CMND_LEDPOWER, CMND_LEDSTATE, - CMND_CFGDUMP, CMND_I2CSCAN, CMND_EXCEPTION }; + CMND_CFGDUMP, CMND_I2CSCAN, CMND_SERIALSEND, CMND_BAUDRATE, CMND_EXCEPTION }; const char kTasmotaCommands[] PROGMEM = D_CMND_BACKLOG "|" D_CMND_DELAY "|" D_CMND_POWER "|" D_CMND_STATUS "|" D_CMND_STATE "|" D_CMND_POWERONSTATE "|" D_CMND_PULSETIME "|" D_CMND_BLINKTIME "|" D_CMND_BLINKCOUNT "|" D_CMND_SENSOR "|" D_CMND_SAVEDATA "|" D_CMND_SETOPTION "|" D_CMND_TEMPERATURE_RESOLUTION "|" D_CMND_HUMIDITY_RESOLUTION "|" @@ -86,7 +86,7 @@ const char kTasmotaCommands[] PROGMEM = D_CMND_LOGHOST "|" D_CMND_LOGPORT "|" D_CMND_IPADDRESS "|" D_CMND_NTPSERVER "|" D_CMND_AP "|" D_CMND_SSID "|" D_CMND_PASSWORD "|" D_CMND_HOSTNAME "|" D_CMND_WIFICONFIG "|" D_CMND_FRIENDLYNAME "|" D_CMND_SWITCHMODE "|" D_CMND_WEBSERVER "|" D_CMND_WEBPASSWORD "|" D_CMND_WEBLOG "|" D_CMND_EMULATION "|" D_CMND_TELEPERIOD "|" D_CMND_RESTART "|" D_CMND_RESET "|" D_CMND_TIMEZONE "|" D_CMND_ALTITUDE "|" D_CMND_LEDPOWER "|" D_CMND_LEDSTATE "|" - D_CMND_CFGDUMP "|" D_CMND_I2CSCAN + D_CMND_CFGDUMP "|" D_CMND_I2CSCAN "|" D_CMND_SERIALSEND "|" D_CMND_BAUDRATE #ifdef DEBUG_THEO "|" D_CMND_EXCEPTION #endif @@ -102,6 +102,7 @@ const char kOptionBlinkOff[] PROGMEM = "BLINKOFF|" D_BLINKOFF ; int baudrate = APP_BAUDRATE; // Serial interface baud rate SerialConfig serial_config = SERIAL_8N1; // Serial interface configuration 8 data bits, No parity, 1 stop bit byte serial_in_byte; // Received byte +unsigned long serial_polling_window = 0; // Serial polling window int serial_in_byte_counter = 0; // Index in receive buffer byte dual_hex_code = 0; // Sonoff dual input flag uint16_t dual_button_code = 0; // Sonoff dual received code @@ -422,10 +423,12 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) if (!strcmp(dataBuf,"?")) data_len = 0; int16_t payload = -99; // No payload uint16_t payload16 = 0; - long lnum = strtol(dataBuf, &p, 10); + long payload32 = strtol(dataBuf, &p, 10); if (p != dataBuf) { - payload = (int16_t) lnum; // -32766 - 32767 - payload16 = (uint16_t) lnum; // 0 - 65535 + payload = (int16_t) payload32; // -32766 - 32767 + payload16 = (uint16_t) payload32; // 0 - 65535 + } else { + payload32 = 0; } backlog_delay = MIN_BACKLOG_DELAY; // Reset backlog delay @@ -810,11 +813,27 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) strlcpy(Settings.ota_url, (1 == payload) ? OTA_URL : dataBuf, sizeof(Settings.ota_url)); snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, Settings.ota_url); } + else if (CMND_BAUDRATE == command_code) { + if (payload32 > 0) { + payload32 /= 1200; // Make it a valid baudrate + baudrate = (1 == payload) ? APP_BAUDRATE : payload32 * 1200; + SetSerialBaudrate(baudrate); + } + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, Settings.baudrate * 1200); + } + else if ((CMND_SERIALSEND == command_code) && (index > 0) && (index <= 2)) { + SetSeriallog(LOG_LEVEL_NONE); + Settings.flag.mqtt_serial = 1; + if (data_len > 0) { + if (1 == index) Serial.printf("%s\n", dataBuf); + if (2 == index) Serial.printf("%s", dataBuf); + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, D_JSON_DONE); + } + } else if (CMND_SERIALLOG == command_code) { if ((payload >= LOG_LEVEL_NONE) && (payload <= LOG_LEVEL_ALL)) { - Settings.seriallog_level = payload; - seriallog_level = payload; - seriallog_timer = 0; + Settings.flag.mqtt_serial = 0; + SetSeriallog(payload); } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE, command, Settings.seriallog_level, seriallog_level); } @@ -1016,7 +1035,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, GetStateText(bitRead(Settings.ledstate, 3))); } - else if (CMND_LEDSTATE ==command_code) { + else if (CMND_LEDSTATE == command_code) { if ((payload >= 0) && (payload < MAX_LED_OPTION)) { Settings.ledstate = payload; if (!Settings.ledstate) SetLedPower(0); @@ -1902,41 +1921,73 @@ void SerialInput() if (serial_in_byte > 127) { // binary data... serial_in_byte_counter = 0; + serial_polling_window = 0; Serial.flush(); return; } if (isprint(serial_in_byte)) { - if (serial_in_byte_counter < INPUT_BUFFER_SIZE) { // add char to string if it still fits + if (serial_in_byte_counter < INPUT_BUFFER_SIZE -1) { // add char to string if it still fits serial_in_buffer[serial_in_byte_counter++] = serial_in_byte; + serial_polling_window = millis(); } else { serial_in_byte_counter = 0; + serial_polling_window = 0; } } /*-------------------------------------------------------------------------------------------*\ * Sonoff SC 19200 baud serial interface \*-------------------------------------------------------------------------------------------*/ - if (serial_in_byte == '\x1B') { // Sonoff SC status from ATMEGA328P - serial_in_buffer[serial_in_byte_counter] = 0; // serial data completed - SonoffScSerialInput(serial_in_buffer); - serial_in_byte_counter = 0; - Serial.flush(); - return; + if (SONOFF_SC == Settings.module) { + if (serial_in_byte == '\x1B') { // Sonoff SC status from ATMEGA328P + serial_in_buffer[serial_in_byte_counter] = 0; // serial data completed + SonoffScSerialInput(serial_in_buffer); + serial_in_byte_counter = 0; + Serial.flush(); + return; + } } /*-------------------------------------------------------------------------------------------*/ - +/* else if (serial_in_byte == '\n') { + serial_in_buffer[serial_in_byte_counter] = 0; // serial data completed + if (!Settings.flag.mqtt_serial) { + seriallog_level = (Settings.seriallog_level < LOG_LEVEL_INFO) ? (byte)LOG_LEVEL_INFO : Settings.seriallog_level; + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_COMMAND "%s"), serial_in_buffer); + AddLog(LOG_LEVEL_INFO); + ExecuteCommand(serial_in_buffer); + } else { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_JSON_SERIALRECEIVED "\":\"%s\"}"), serial_in_buffer); + MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_SERIALRECEIVED)); + } + serial_in_byte_counter = 0; + serial_polling_window = 0; + Serial.flush(); + return; + } +*/ + else if (!Settings.flag.mqtt_serial && (serial_in_byte == '\n')) { serial_in_buffer[serial_in_byte_counter] = 0; // serial data completed seriallog_level = (Settings.seriallog_level < LOG_LEVEL_INFO) ? (byte)LOG_LEVEL_INFO : Settings.seriallog_level; snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_COMMAND "%s"), serial_in_buffer); AddLog(LOG_LEVEL_INFO); ExecuteCommand(serial_in_buffer); serial_in_byte_counter = 0; + serial_polling_window = 0; Serial.flush(); return; } } + + if (Settings.flag.mqtt_serial && serial_in_byte_counter && (millis() > (serial_polling_window + SERIAL_POLLING))) { + serial_in_buffer[serial_in_byte_counter] = 0; // serial data completed + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_JSON_SERIALRECEIVED "\":\"%s\"}"), serial_in_buffer); + MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_SERIALRECEIVED)); + serial_in_byte_counter = 0; + serial_polling_window = 0; + Serial.flush(); + } } /********************************************************************************************/ @@ -2033,18 +2084,22 @@ void GpioInit() } if (SONOFF_BRIDGE == Settings.module) { + Settings.flag.mqtt_serial = 0; baudrate = 19200; } if (SONOFF_DUAL == Settings.module) { + Settings.flag.mqtt_serial = 0; devices_present = 2; baudrate = 19200; } else if (CH4 == Settings.module) { + Settings.flag.mqtt_serial = 0; devices_present = 4; baudrate = 19200; } else if (SONOFF_SC == Settings.module) { + Settings.flag.mqtt_serial = 0; devices_present = 0; baudrate = 19200; } @@ -2141,6 +2196,7 @@ void setup() OsWatchInit(); + baudrate = Settings.baudrate * 1200; seriallog_level = Settings.seriallog_level; seriallog_timer = SERIALLOG_TIMER; #ifndef USE_EMULATION @@ -2246,7 +2302,7 @@ void loop() if (millis() >= state_loop_timer) StateLoop(); - if (Serial.available()) SerialInput(); + SerialInput(); // yield(); // yield == delay(0), delay contains yield, auto yield in loop delay(sleep); // https://github.com/esp8266/Arduino/issues/2021 diff --git a/sonoff/support.ino b/sonoff/support.ino index 1033d7e1b..62312bd7b 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -401,6 +401,7 @@ int GetCommandCode(char* destination, size_t destination_size, const char* needl void SetSerialBaudrate(int baudrate) { + Settings.baudrate = baudrate / 1200; if (Serial.baudRate() != baudrate) { if (seriallog_level) { snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_APPLICATION D_SET_BAUDRATE_TO " %d"), baudrate); @@ -1378,6 +1379,13 @@ boolean Xsns02(byte function) * \*********************************************************************************************/ +void SetSeriallog(byte loglevel) +{ + Settings.seriallog_level = loglevel; + seriallog_level = loglevel; + seriallog_timer = 0; +} + #ifdef USE_WEBSERVER void GetLog(byte idx, char** entry_pp, size_t* len_p) { From 2ba4d6fb47faddfb39aa49791331ca71a2e7f861 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Tue, 20 Mar 2018 14:31:11 +0100 Subject: [PATCH 030/136] v5.12.0h - Add Serial Bridges 5.12.0h * Add support for Software Serial bridge using commands SerialDelimiter, SBaudrate and SSerialSend. Supports 8N1 and text only (#2190) * Add support for Hardware Serial bridge using commands SerialDelimiter, Baudrate and SerialSend. Supports 8N1 and text only (#2182) --- README.md | 2 +- .../README.md | 2 +- .../examples/swsertest/swsertest.ino | 0 .../keywords.txt | 0 .../library.json | 4 +- .../library.properties | 4 +- .../src/TasmotaSerial.cpp | 31 ++-- .../src/TasmotaSerial.h | 5 +- sonoff/_releasenotes.ino | 5 +- sonoff/i18n.h | 6 + sonoff/language/cs-CZ.h | 2 + sonoff/language/de-DE.h | 2 + sonoff/language/en-GB.h | 2 + sonoff/language/es-AR.h | 2 + sonoff/language/fr-FR.h | 2 + sonoff/language/hu-HU.h | 2 + sonoff/language/it-IT.h | 2 + sonoff/language/nl-NL.h | 2 + sonoff/language/pl-PL.h | 2 + sonoff/language/pt-PT.h | 2 + sonoff/language/ru-RU.h | 2 + sonoff/language/zh-CN.h | 2 + sonoff/language/zh-TW.h | 2 + sonoff/settings.h | 5 +- sonoff/settings.ino | 6 + sonoff/sonoff.h | 1 + sonoff/sonoff.ino | 78 +++++---- sonoff/sonoff_post.h | 1 + sonoff/sonoff_template.h | 5 +- sonoff/support.ino | 44 ++++++ sonoff/user_config.h | 1 + sonoff/xdrv_08_serial_bridge.ino | 149 ++++++++++++++++++ 32 files changed, 307 insertions(+), 68 deletions(-) rename lib/{TasmotaSerial-1.1.0 => TasmotaSerial-1.2.0}/README.md (79%) rename lib/{TasmotaSerial-1.1.0 => TasmotaSerial-1.2.0}/examples/swsertest/swsertest.ino (100%) rename lib/{TasmotaSerial-1.1.0 => TasmotaSerial-1.2.0}/keywords.txt (100%) rename lib/{TasmotaSerial-1.1.0 => TasmotaSerial-1.2.0}/library.json (89%) rename lib/{TasmotaSerial-1.1.0 => TasmotaSerial-1.2.0}/library.properties (64%) rename lib/{TasmotaSerial-1.1.0 => TasmotaSerial-1.2.0}/src/TasmotaSerial.cpp (91%) rename lib/{TasmotaSerial-1.1.0 => TasmotaSerial-1.2.0}/src/TasmotaSerial.h (91%) create mode 100644 sonoff/xdrv_08_serial_bridge.ino diff --git a/README.md b/README.md index 91c14f661..2f4d7ed1c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## Sonoff-Tasmota Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE. -Current version is **5.12.0g** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.12.0h** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### ATTENTION All versions diff --git a/lib/TasmotaSerial-1.1.0/README.md b/lib/TasmotaSerial-1.2.0/README.md similarity index 79% rename from lib/TasmotaSerial-1.1.0/README.md rename to lib/TasmotaSerial-1.2.0/README.md index 5c7a24721..205a9597c 100644 --- a/lib/TasmotaSerial-1.1.0/README.md +++ b/lib/TasmotaSerial-1.2.0/README.md @@ -1,6 +1,6 @@ # TasmotaSerial -Implementation of software serial library for the ESP8266 at 9600 baud +Implementation of software serial library for the ESP8266 Allows for several instances to be active at the same time. diff --git a/lib/TasmotaSerial-1.1.0/examples/swsertest/swsertest.ino b/lib/TasmotaSerial-1.2.0/examples/swsertest/swsertest.ino similarity index 100% rename from lib/TasmotaSerial-1.1.0/examples/swsertest/swsertest.ino rename to lib/TasmotaSerial-1.2.0/examples/swsertest/swsertest.ino diff --git a/lib/TasmotaSerial-1.1.0/keywords.txt b/lib/TasmotaSerial-1.2.0/keywords.txt similarity index 100% rename from lib/TasmotaSerial-1.1.0/keywords.txt rename to lib/TasmotaSerial-1.2.0/keywords.txt diff --git a/lib/TasmotaSerial-1.1.0/library.json b/lib/TasmotaSerial-1.2.0/library.json similarity index 89% rename from lib/TasmotaSerial-1.1.0/library.json rename to lib/TasmotaSerial-1.2.0/library.json index 986c6d7ac..e4b2ba8a3 100644 --- a/lib/TasmotaSerial-1.1.0/library.json +++ b/lib/TasmotaSerial-1.2.0/library.json @@ -1,10 +1,10 @@ { "name": "TasmotaSerial", - "version": "1.0.0", + "version": "1.2.0", "keywords": [ "serial", "io", "TasmotaSerial" ], - "description": "Implementation of software serial for ESP8266 at 9600 baud.", + "description": "Implementation of software serial for ESP8266.", "repository": { "type": "git", diff --git a/lib/TasmotaSerial-1.1.0/library.properties b/lib/TasmotaSerial-1.2.0/library.properties similarity index 64% rename from lib/TasmotaSerial-1.1.0/library.properties rename to lib/TasmotaSerial-1.2.0/library.properties index 703b613ee..d427d0fb3 100644 --- a/lib/TasmotaSerial-1.1.0/library.properties +++ b/lib/TasmotaSerial-1.2.0/library.properties @@ -1,8 +1,8 @@ name=TasmotaSerial -version=1.0 +version=1.2.0 author=Theo Arends maintainer=Theo Arends -sentence=Implementation of software serial for ESP8266 at 9600 baud. +sentence=Implementation of software serial for ESP8266. paragraph= category=Signal Input/Output url= diff --git a/lib/TasmotaSerial-1.1.0/src/TasmotaSerial.cpp b/lib/TasmotaSerial-1.2.0/src/TasmotaSerial.cpp similarity index 91% rename from lib/TasmotaSerial-1.1.0/src/TasmotaSerial.cpp rename to lib/TasmotaSerial-1.2.0/src/TasmotaSerial.cpp index 35881dfb3..c189442e6 100644 --- a/lib/TasmotaSerial-1.1.0/src/TasmotaSerial.cpp +++ b/lib/TasmotaSerial-1.2.0/src/TasmotaSerial.cpp @@ -87,9 +87,7 @@ TasmotaSerial::TasmotaSerial(int receive_pin, int transmit_pin) m_in_pos = m_out_pos = 0; if (m_rx_pin > -1) { m_buffer = (uint8_t*)malloc(TM_SERIAL_BUFFER_SIZE); - if (m_buffer == NULL) { - return; - } + if (m_buffer == NULL) return; // Use getCycleCount() loop to get as exact timing as possible m_bit_time = ESP.getCpuFreqMHz() *1000000 /TM_SERIAL_BAUDRATE; pinMode(m_rx_pin, INPUT); @@ -111,7 +109,8 @@ bool TasmotaSerial::isValidGPIOpin(int pin) bool TasmotaSerial::begin(long speed) { // Use getCycleCount() loop to get as exact timing as possible m_bit_time = ESP.getCpuFreqMHz() *1000000 /speed; - return m_valid && (speed <= TM_SERIAL_BAUDRATE); + m_high_speed = (speed > 9600); + return m_valid; } bool TasmotaSerial::begin() { @@ -123,17 +122,13 @@ void TasmotaSerial::flush() { } int TasmotaSerial::peek() { - if ((-1 == m_rx_pin) || (m_in_pos == m_out_pos)) { - return -1; - } + if ((-1 == m_rx_pin) || (m_in_pos == m_out_pos)) return -1; return m_buffer[m_out_pos]; } int TasmotaSerial::read() { - if ((-1 == m_rx_pin) || (m_in_pos == m_out_pos)) { - return -1; - } + if ((-1 == m_rx_pin) || (m_in_pos == m_out_pos)) return -1; uint8_t ch = m_buffer[m_out_pos]; m_out_pos = (m_out_pos +1) % TM_SERIAL_BUFFER_SIZE; return ch; @@ -142,23 +137,20 @@ int TasmotaSerial::read() int TasmotaSerial::available() { int avail = m_in_pos - m_out_pos; - if (avail < 0) { - avail += TM_SERIAL_BUFFER_SIZE; - } + if (avail < 0) avail += TM_SERIAL_BUFFER_SIZE; return avail; } #ifdef TM_SERIAL_USE_IRAM -#define TM_SERIAL_WAIT { while (ESP.getCycleCount()-start < wait) optimistic_yield(1); wait += m_bit_time; } // Watchdog timeouts +#define TM_SERIAL_WAIT { while (ESP.getCycleCount()-start < wait) if (!m_high_speed) optimistic_yield(1); wait += m_bit_time; } // Watchdog timeouts #else #define TM_SERIAL_WAIT { while (ESP.getCycleCount()-start < wait); wait += m_bit_time; } #endif size_t TasmotaSerial::write(uint8_t b) { - if (-1 == m_tx_pin) { - return 0; - } + if (-1 == m_tx_pin) return 0; + if (m_high_speed) cli(); // Disable interrupts in order to get a clean transmit unsigned long wait = m_bit_time; digitalWrite(m_tx_pin, HIGH); unsigned long start = ESP.getCycleCount(); @@ -173,6 +165,7 @@ size_t TasmotaSerial::write(uint8_t b) // Stop bit digitalWrite(m_tx_pin, HIGH); TM_SERIAL_WAIT; + if (m_high_speed) sei(); return 1; } @@ -191,9 +184,7 @@ void TasmotaSerial::rxRead() for (int i = 0; i < 8; i++) { TM_SERIAL_WAIT; rec >>= 1; - if (digitalRead(m_rx_pin)) { - rec |= 0x80; - } + if (digitalRead(m_rx_pin)) rec |= 0x80; } // Stop bit TM_SERIAL_WAIT; diff --git a/lib/TasmotaSerial-1.1.0/src/TasmotaSerial.h b/lib/TasmotaSerial-1.2.0/src/TasmotaSerial.h similarity index 91% rename from lib/TasmotaSerial-1.1.0/src/TasmotaSerial.h rename to lib/TasmotaSerial-1.2.0/src/TasmotaSerial.h index d18dd335f..0876590fe 100644 --- a/lib/TasmotaSerial-1.1.0/src/TasmotaSerial.h +++ b/lib/TasmotaSerial-1.2.0/src/TasmotaSerial.h @@ -20,12 +20,12 @@ #ifndef TasmotaSerial_h #define TasmotaSerial_h /*********************************************************************************************\ - * TasmotaSerial supports up to 9600 baud with fixed buffer size of 64 bytes using optional no iram + * TasmotaSerial supports up to 115200 baud with fixed buffer size of 64 bytes using optional no iram * * Based on EspSoftwareSerial v3.3.1 by Peter Lerup (https://github.com/plerup/espsoftwareserial) \*********************************************************************************************/ -#define TM_SERIAL_BAUDRATE 9600 // Max supported baudrate +#define TM_SERIAL_BAUDRATE 9600 // Default baudrate #define TM_SERIAL_BUFFER_SIZE 64 // Receive buffer size #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) @@ -57,6 +57,7 @@ class TasmotaSerial : public Stream { // Member variables bool m_valid; + bool m_high_speed; int m_rx_pin; int m_tx_pin; unsigned long m_bit_time; diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index ca3d6c7a7..7dd12439a 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,5 +1,6 @@ -/* 5.12.0g - * Add support for MQTT to hardware serial bridge using commands Baudrate and SerialSend. Currently supports 8N1 and text only (#2182) +/* 5.12.0h + * Add support for Software Serial bridge using commands SerialDelimiter, SBaudrate and SSerialSend. Supports 8N1 and text only (#2190) + * Add support for Hardware Serial bridge using commands SerialDelimiter, Baudrate and SerialSend. Supports 8N1 and text only (#2182) * * 5.12.0f * Add compile time support for WS2812 BRG and RBG led configurations to be defined in user_config.h (#1690) diff --git a/sonoff/i18n.h b/sonoff/i18n.h index d59143209..ce785243d 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -242,6 +242,7 @@ #define D_CMND_CFGDUMP "CfgDump" #define D_CMND_I2CSCAN "I2CScan" #define D_CMND_SERIALSEND "SerialSend" +#define D_CMND_SERIALDELIMITER "SerialDelimiter" #define D_CMND_BAUDRATE "Baudrate" #define D_CMND_EXCEPTION "Exception" @@ -340,6 +341,11 @@ #define D_CMND_DISP_SIZE "Size" #define D_CMND_DISP_TEXT "Text" +// Commands xdrv_08_serial_bridge.ino +#define D_CMND_SSERIALSEND "SSerialSend" +#define D_CMND_SBAUDRATE "SBaudrate" + #define D_JSON_SSERIALRECEIVED "SSerialReceived" + /********************************************************************************************/ #ifndef MY_LANGUAGE diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h index 5f60ae8c1..e78d0a8e0 100644 --- a/sonoff/language/cs-CZ.h +++ b/sonoff/language/cs-CZ.h @@ -412,6 +412,8 @@ #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" #define D_SENSOR_SDS0X1 "SDS0X1" +#define D_SENSOR_SBR_RX "SerBr Rx" +#define D_SENSOR_SBR_TX "SerBr Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index 4ba502af3..b0ea8033a 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -412,6 +412,8 @@ #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" #define D_SENSOR_SDS0X1 "SDS0X1" +#define D_SENSOR_SBR_RX "SerBr Rx" +#define D_SENSOR_SBR_TX "SerBr Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h index 99faed325..5fb862b5e 100644 --- a/sonoff/language/en-GB.h +++ b/sonoff/language/en-GB.h @@ -412,6 +412,8 @@ #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" #define D_SENSOR_SDS0X1 "SDS0X1" +#define D_SENSOR_SBR_RX "SerBr Rx" +#define D_SENSOR_SBR_TX "SerBr Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index 531f78d26..dbe241731 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -412,6 +412,8 @@ #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" #define D_SENSOR_SDS0X1 "SDS0X1" +#define D_SENSOR_SBR_RX "SerBr Rx" +#define D_SENSOR_SBR_TX "SerBr Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h index 4690bab6e..7b9c0137f 100644 --- a/sonoff/language/fr-FR.h +++ b/sonoff/language/fr-FR.h @@ -412,6 +412,8 @@ #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" #define D_SENSOR_SDS0X1 "SDS0X1" +#define D_SENSOR_SBR_RX "SerBr Rx" +#define D_SENSOR_SBR_TX "SerBr Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h index 613008ae0..82dde4c38 100644 --- a/sonoff/language/hu-HU.h +++ b/sonoff/language/hu-HU.h @@ -412,6 +412,8 @@ #define D_SENSOR_BACKLIGHT "Háttérvil" #define D_SENSOR_PMS5003 "PMS5003" #define D_SENSOR_SDS0X1 "SDS0X1" +#define D_SENSOR_SBR_RX "SerBr Rx" +#define D_SENSOR_SBR_TX "SerBr Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index 67752fd81..4e16869a4 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -412,6 +412,8 @@ #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" #define D_SENSOR_SDS0X1 "SDS0X1" +#define D_SENSOR_SBR_RX "SerBr Rx" +#define D_SENSOR_SBR_TX "SerBr Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h index 3a02ded56..53bdb7f67 100644 --- a/sonoff/language/nl-NL.h +++ b/sonoff/language/nl-NL.h @@ -412,6 +412,8 @@ #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" #define D_SENSOR_SDS0X1 "SDS0X1" +#define D_SENSOR_SBR_RX "SerBr Rx" +#define D_SENSOR_SBR_TX "SerBr Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h index 6acc8a7f6..90a69afb5 100644 --- a/sonoff/language/pl-PL.h +++ b/sonoff/language/pl-PL.h @@ -412,6 +412,8 @@ #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" #define D_SENSOR_SDS0X1 "SDS0X1" +#define D_SENSOR_SBR_RX "SerBr Rx" +#define D_SENSOR_SBR_TX "SerBr Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h index 180d316d7..7d8f0512c 100644 --- a/sonoff/language/pt-PT.h +++ b/sonoff/language/pt-PT.h @@ -412,6 +412,8 @@ #define D_SENSOR_BACKLIGHT "Luz negra" #define D_SENSOR_PMS5003 "PMS5003" #define D_SENSOR_SDS0X1 "SDS0X1" +#define D_SENSOR_SBR_RX "SerBr Rx" +#define D_SENSOR_SBR_TX "SerBr Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h index d2626ae5f..640b8bef7 100644 --- a/sonoff/language/ru-RU.h +++ b/sonoff/language/ru-RU.h @@ -412,6 +412,8 @@ #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" #define D_SENSOR_SDS0X1 "SDS0X1" +#define D_SENSOR_SBR_RX "SerBr Rx" +#define D_SENSOR_SBR_TX "SerBr Tx" // Units #define D_UNIT_AMPERE "А" diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h index eb0351508..0cd86bcc8 100644 --- a/sonoff/language/zh-CN.h +++ b/sonoff/language/zh-CN.h @@ -412,6 +412,8 @@ #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" #define D_SENSOR_SDS0X1 "SDS0X1" +#define D_SENSOR_SBR_RX "SerBr Rx" +#define D_SENSOR_SBR_TX "SerBr Tx" // Units #define D_UNIT_AMPERE "安" diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h index cab33a14b..c3efc118b 100644 --- a/sonoff/language/zh-TW.h +++ b/sonoff/language/zh-TW.h @@ -412,6 +412,8 @@ #define D_SENSOR_BACKLIGHT "BkLight" #define D_SENSOR_PMS5003 "PMS5003" #define D_SENSOR_SDS0X1 "SDS0X1" +#define D_SENSOR_SBR_RX "SerBr Rx" +#define D_SENSOR_SBR_TX "SerBr Tx" // Units #define D_UNIT_AMPERE "安" diff --git a/sonoff/settings.h b/sonoff/settings.h index 3c3caf9da..936e54963 100644 --- a/sonoff/settings.h +++ b/sonoff/settings.h @@ -192,9 +192,8 @@ struct SYSCFG { uint16_t ws_wakeup; // 3AA Not used since 5.8.0 char friendlyname[MAX_FRIENDLYNAMES][33]; // 3AC char switch_topic[33]; // 430 - - byte free_451[2]; // 451 - + char serial_delimiter; // 451 + uint8_t sbaudrate; // 452 uint8_t sleep; // 453 uint16_t domoticz_switch_idx[MAX_DOMOTICZ_IDX]; // 454 uint16_t domoticz_sensor_idx[MAX_DOMOTICZ_SNS_IDX]; // 45C diff --git a/sonoff/settings.ino b/sonoff/settings.ino index 84f68ba08..8b8123741 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -458,6 +458,8 @@ void SettingsDefaultSet2() Settings.timezone = APP_TIMEZONE; strlcpy(Settings.ota_url, OTA_URL, sizeof(Settings.ota_url)); Settings.baudrate = APP_BAUDRATE / 1200; + Settings.sbaudrate = SOFT_BAUDRATE / 1200; + Settings.serial_delimiter = 0xff; Settings.seriallog_level = SERIAL_LOG_LEVEL; // Settings.sta_active = 0; @@ -903,6 +905,10 @@ void SettingsDelta() if (Settings.version < 0x050C0007) { Settings.baudrate = APP_BAUDRATE / 1200; } + if (Settings.version < 0x050C0008) { + Settings.sbaudrate = SOFT_BAUDRATE / 1200; + Settings.serial_delimiter = 0xff; + } Settings.version = VERSION; SettingsSave(1); diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index 0b90213bd..58079e2df 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -98,6 +98,7 @@ typedef unsigned long power_t; // Power (Relay) type #define MAX_BACKLOG 16 // Max number of commands in backlog (chk backlog_index and backlog_pointer code) #define MIN_BACKLOG_DELAY 2 // Minimal backlog delay in 0.1 seconds +#define SOFT_BAUDRATE 9600 // Default software serial baudrate #define APP_BAUDRATE 115200 // Default serial baudrate #define SERIAL_POLLING 100 // Serial receive polling in ms #define MAX_STATUS 11 // Max number of status lines diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index dfd322bae..941ec36c6 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050C0007 // 5.12.0g +#define VERSION 0x050C0008 // 5.12.0h // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) @@ -76,7 +76,7 @@ enum TasmotaCommands { CMND_LOGHOST, CMND_LOGPORT, CMND_IPADDRESS, CMND_NTPSERVER, CMND_AP, CMND_SSID, CMND_PASSWORD, CMND_HOSTNAME, CMND_WIFICONFIG, CMND_FRIENDLYNAME, CMND_SWITCHMODE, CMND_WEBSERVER, CMND_WEBPASSWORD, CMND_WEBLOG, CMND_EMULATION, CMND_TELEPERIOD, CMND_RESTART, CMND_RESET, CMND_TIMEZONE, CMND_ALTITUDE, CMND_LEDPOWER, CMND_LEDSTATE, - CMND_CFGDUMP, CMND_I2CSCAN, CMND_SERIALSEND, CMND_BAUDRATE, CMND_EXCEPTION }; + CMND_CFGDUMP, CMND_I2CSCAN, CMND_SERIALSEND, CMND_BAUDRATE, CMND_SERIALDELIMITER, CMND_EXCEPTION }; const char kTasmotaCommands[] PROGMEM = D_CMND_BACKLOG "|" D_CMND_DELAY "|" D_CMND_POWER "|" D_CMND_STATUS "|" D_CMND_STATE "|" D_CMND_POWERONSTATE "|" D_CMND_PULSETIME "|" D_CMND_BLINKTIME "|" D_CMND_BLINKCOUNT "|" D_CMND_SENSOR "|" D_CMND_SAVEDATA "|" D_CMND_SETOPTION "|" D_CMND_TEMPERATURE_RESOLUTION "|" D_CMND_HUMIDITY_RESOLUTION "|" @@ -86,7 +86,7 @@ const char kTasmotaCommands[] PROGMEM = D_CMND_LOGHOST "|" D_CMND_LOGPORT "|" D_CMND_IPADDRESS "|" D_CMND_NTPSERVER "|" D_CMND_AP "|" D_CMND_SSID "|" D_CMND_PASSWORD "|" D_CMND_HOSTNAME "|" D_CMND_WIFICONFIG "|" D_CMND_FRIENDLYNAME "|" D_CMND_SWITCHMODE "|" D_CMND_WEBSERVER "|" D_CMND_WEBPASSWORD "|" D_CMND_WEBLOG "|" D_CMND_EMULATION "|" D_CMND_TELEPERIOD "|" D_CMND_RESTART "|" D_CMND_RESET "|" D_CMND_TIMEZONE "|" D_CMND_ALTITUDE "|" D_CMND_LEDPOWER "|" D_CMND_LEDSTATE "|" - D_CMND_CFGDUMP "|" D_CMND_I2CSCAN "|" D_CMND_SERIALSEND "|" D_CMND_BAUDRATE + D_CMND_CFGDUMP "|" D_CMND_I2CSCAN "|" D_CMND_SERIALSEND "|" D_CMND_BAUDRATE "|" D_CMND_SERIALDELIMITER #ifdef DEBUG_THEO "|" D_CMND_EXCEPTION #endif @@ -821,15 +821,35 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, Settings.baudrate * 1200); } - else if ((CMND_SERIALSEND == command_code) && (index > 0) && (index <= 2)) { + else if ((CMND_SERIALSEND == command_code) && (index > 0) && (index <= 3)) { SetSeriallog(LOG_LEVEL_NONE); Settings.flag.mqtt_serial = 1; if (data_len > 0) { - if (1 == index) Serial.printf("%s\n", dataBuf); - if (2 == index) Serial.printf("%s", dataBuf); + if (1 == index) { + Serial.printf("%s\n", dataBuf); + } + else if (2 == index) { + Serial.printf("%s", dataBuf); + } + else if (3 == index) { + uint16_t dat_len = data_len; + Serial.printf("%s", Unescape(dataBuf, &dat_len)); + } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, D_JSON_DONE); } } + else if (CMND_SERIALDELIMITER == command_code) { + if ((data_len > 0) && (payload < 256)) { + if (payload > 0) { + Settings.serial_delimiter = payload; + } else { + uint16_t dat_len = data_len; + Unescape(dataBuf, &dat_len); + Settings.serial_delimiter = dataBuf[0]; + } + } + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, Settings.serial_delimiter); + } else if (CMND_SERIALLOG == command_code) { if ((payload >= LOG_LEVEL_NONE) && (payload <= LOG_LEVEL_ALL)) { Settings.flag.mqtt_serial = 0; @@ -1921,17 +1941,26 @@ void SerialInput() if (serial_in_byte > 127) { // binary data... serial_in_byte_counter = 0; - serial_polling_window = 0; Serial.flush(); return; } - if (isprint(serial_in_byte)) { - if (serial_in_byte_counter < INPUT_BUFFER_SIZE -1) { // add char to string if it still fits - serial_in_buffer[serial_in_byte_counter++] = serial_in_byte; - serial_polling_window = millis(); - } else { - serial_in_byte_counter = 0; - serial_polling_window = 0; + if (!Settings.flag.mqtt_serial) { + if (isprint(serial_in_byte)) { + if (serial_in_byte_counter < INPUT_BUFFER_SIZE -1) { // add char to string if it still fits + serial_in_buffer[serial_in_byte_counter++] = serial_in_byte; + } else { + serial_in_byte_counter = 0; + } + } + } else { + if (serial_in_byte) { + if ((serial_in_byte_counter < INPUT_BUFFER_SIZE -1) && (serial_in_byte != Settings.serial_delimiter)) { // add char to string if it still fits + serial_in_buffer[serial_in_byte_counter++] = serial_in_byte; + serial_polling_window = millis(); + } else { + serial_polling_window = 0; + break; + } } } @@ -1949,24 +1978,7 @@ void SerialInput() } /*-------------------------------------------------------------------------------------------*/ -/* - else if (serial_in_byte == '\n') { - serial_in_buffer[serial_in_byte_counter] = 0; // serial data completed - if (!Settings.flag.mqtt_serial) { - seriallog_level = (Settings.seriallog_level < LOG_LEVEL_INFO) ? (byte)LOG_LEVEL_INFO : Settings.seriallog_level; - snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_COMMAND "%s"), serial_in_buffer); - AddLog(LOG_LEVEL_INFO); - ExecuteCommand(serial_in_buffer); - } else { - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_JSON_SERIALRECEIVED "\":\"%s\"}"), serial_in_buffer); - MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_SERIALRECEIVED)); - } - serial_in_byte_counter = 0; - serial_polling_window = 0; - Serial.flush(); - return; - } -*/ + else if (!Settings.flag.mqtt_serial && (serial_in_byte == '\n')) { serial_in_buffer[serial_in_byte_counter] = 0; // serial data completed seriallog_level = (Settings.seriallog_level < LOG_LEVEL_INFO) ? (byte)LOG_LEVEL_INFO : Settings.seriallog_level; @@ -1985,8 +1997,6 @@ void SerialInput() snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_JSON_SERIALRECEIVED "\":\"%s\"}"), serial_in_buffer); MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_SERIALRECEIVED)); serial_in_byte_counter = 0; - serial_polling_window = 0; - Serial.flush(); } } diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h index 026cc9465..09b4836ba 100644 --- a/sonoff/sonoff_post.h +++ b/sonoff/sonoff_post.h @@ -63,6 +63,7 @@ void WifiWpsStatusCallback(wps_cb_status status); #define USE_PMS5003 // Add support for PMS5003 and PMS7003 particle concentration sensor (+1k3 code) #define USE_NOVA_SDS // Add support for SDS011 and SDS021 particle concentration sensor (+0k7 code) #define USE_PZEM004T // Add support for PZEM004T Energy monitor (+2k code) +#define USE_SERIAL_BRIDGE // Add support for software Serial Bridge (+0k8 code) #define USE_IR_REMOTE // Send IR remote commands using library IRremoteESP8266 and ArduinoJson (+4k code, 0k3 mem, 48 iram) #define USE_IR_HVAC // Support for HVAC system using IR (+2k code) #define USE_IR_RECEIVE // Support for IR receiver (+5k5 code, 264 iram) diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h index 6a0e2cd97..f5a68bbfa 100644 --- a/sonoff/sonoff_template.h +++ b/sonoff/sonoff_template.h @@ -89,6 +89,8 @@ enum UserSelectablePins { GPIO_BACKLIGHT, // Display backlight control GPIO_PMS5003, // Plantower PMS5003 Serial interface GPIO_SDS0X1, // Nova Fitness SDS011 Serial interface + GPIO_SBR_TX, // Serial Bridge Serial interface + GPIO_SBR_RX, // Serial Bridge Serial interface GPIO_SENSOR_END }; // Programmer selectable GPIO functionality offset by user selectable GPIOs @@ -130,7 +132,8 @@ const char kSensorNames[] PROGMEM = D_SENSOR_PZEM_TX "|" D_SENSOR_PZEM_RX "|" D_SENSOR_SAIR_TX "|" D_SENSOR_SAIR_RX "|" D_SENSOR_SPI_CS "|" D_SENSOR_SPI_DC "|" D_SENSOR_BACKLIGHT "|" - D_SENSOR_PMS5003 "|" D_SENSOR_SDS0X1; + D_SENSOR_PMS5003 "|" D_SENSOR_SDS0X1 "|" + D_SENSOR_SBR_TX "|" D_SENSOR_SBR_RX; /********************************************************************************************/ diff --git a/sonoff/support.ino b/sonoff/support.ino index 62312bd7b..4689ae707 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -197,6 +197,50 @@ char* dtostrfd(double number, unsigned char prec, char *s) return dtostrf(number, 1, prec, s); } +char* Unescape(char* buffer, uint16_t* size) +{ + uint8_t* read = (uint8_t*)buffer; + uint8_t* write = (uint8_t*)buffer; + uint16_t start_size = *size; + uint16_t end_size = *size; + uint8_t che = 0; + + while (start_size > 0) { + uint8_t ch = *read++; + start_size--; + if (ch != '\\') { + *write++ = ch; + } else { + if (start_size > 0) { + uint8_t chi = *read++; + start_size--; + end_size--; + switch (chi) { + case '\\': che = '\\'; break; // 5C Backslash + case 'a': che = '\a'; break; // 07 Bell (Alert) + case 'b': che = '\b'; break; // 08 Backspace + case 'e': che = '\e'; break; // 1B Escape + case 'f': che = '\f'; break; // 0C Formfeed + case 'n': che = '\n'; break; // 0A Linefeed (Newline) + case 'r': che = '\r'; break; // 0D Carriage return +// case 's': che = ' '; break; // 20 Space + case 't': che = '\t'; break; // 09 Horizontal tab + case 'v': che = '\v'; break; // 0B Vertical tab +// case '?': che = '\?'; break; // 3F Question mark + default : { + che = chi; + *write++ = ch; + end_size++; + } + } + *write++ = che; + } + } + } + *size = end_size; + return buffer; +} + boolean ParseIp(uint32_t* addr, const char* str) { uint8_t *part = (uint8_t*)addr; diff --git a/sonoff/user_config.h b/sonoff/user_config.h index caf686d6b..a93e386ae 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -220,6 +220,7 @@ #define USE_PMS5003 // Add support for PMS5003 and PMS7003 particle concentration sensor (+1k3 code) #define USE_NOVA_SDS // Add support for SDS011 and SDS021 particle concentration sensor (+0k7 code) #define USE_PZEM004T // Add support for PZEM004T Energy monitor (+2k code) +#define USE_SERIAL_BRIDGE // Add support for software Serial Bridge (+0k8 code) // -- Low level interface devices ----------------- #define USE_IR_REMOTE // Send IR remote commands using library IRremoteESP8266 and ArduinoJson (+4k code, 0k3 mem, 48 iram) diff --git a/sonoff/xdrv_08_serial_bridge.ino b/sonoff/xdrv_08_serial_bridge.ino new file mode 100644 index 000000000..428dc5e35 --- /dev/null +++ b/sonoff/xdrv_08_serial_bridge.ino @@ -0,0 +1,149 @@ +/* + xdrv_08_serial_bridge.ino - serial bridge support for Sonoff-Tasmota + + Copyright (C) 2018 Theo Arends and Dániel Zoltán Tolnai + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifdef USE_SERIAL_BRIDGE +/*********************************************************************************************\ + * Serial Bridge using Software Serial library (TasmotaSerial) +\*********************************************************************************************/ +#define SERIAL_BRIDGE_BUFFER_SIZE 130 + +#include + +enum SerialBridgeCommands { CMND_SSERIALSEND, CMND_SBAUDRATE }; +const char kSerialBridgeCommands[] PROGMEM = D_CMND_SSERIALSEND "|" D_CMND_SBAUDRATE; + +TasmotaSerial *SerialBridgeSerial; + +uint8_t serial_bridge_active = 1; +uint8_t serial_bridge_in_byte_counter = 0; +unsigned long serial_bridge_polling_window = 0; +char serial_bridge_buffer[SERIAL_BRIDGE_BUFFER_SIZE]; + +void SerialBridgeInput() +{ + while (SerialBridgeSerial->available()) { + yield(); + uint8_t serial_in_byte = SerialBridgeSerial->read(); + + if (serial_in_byte > 127) { // binary data... + serial_bridge_in_byte_counter = 0; + SerialBridgeSerial->flush(); + return; + } + if (serial_in_byte) { + if ((serial_in_byte_counter < sizeof(serial_bridge_buffer) -1) && (serial_in_byte != Settings.serial_delimiter)) { // add char to string if it still fits + serial_bridge_buffer[serial_bridge_in_byte_counter++] = serial_in_byte; + serial_bridge_polling_window = millis(); // Wait for more data + } else { + serial_bridge_polling_window = 0; // Publish now + break; + } + } + } + + if (serial_bridge_in_byte_counter && (millis() > (serial_bridge_polling_window + SERIAL_POLLING))) { + serial_bridge_buffer[serial_bridge_in_byte_counter] = 0; // serial data completed + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_JSON_SSERIALRECEIVED "\":\"%s\"}"), serial_bridge_buffer); + MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_SSERIALRECEIVED)); + serial_bridge_in_byte_counter = 0; + } +} + +/********************************************************************************************/ + +void SerialBridgeInit(void) +{ + serial_bridge_active = 0; + if ((pin[GPIO_SBR_RX] < 99) && (pin[GPIO_SBR_TX] < 99)) { + SerialBridgeSerial = new TasmotaSerial(pin[GPIO_SBR_RX], pin[GPIO_SBR_TX]); + if (SerialBridgeSerial->begin(Settings.sbaudrate * 1200)) { // Baud rate is stored div 1200 so it fits into one byte + serial_bridge_active = 1; + SerialBridgeSerial->flush(); + } + } +} + +/*********************************************************************************************\ + * Commands +\*********************************************************************************************/ + +boolean SerialBridgeCommand() +{ + char command [CMDSZ]; + boolean serviced = true; + + int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic, kSerialBridgeCommands); + if ((CMND_SSERIALSEND == command_code) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= 3)) { + if (XdrvMailbox.data_len > 0) { + if (1 == XdrvMailbox.index) { + SerialBridgeSerial->write(XdrvMailbox.data, XdrvMailbox.data_len); + SerialBridgeSerial->write("\n"); + } + else if (2 == XdrvMailbox.index) { + SerialBridgeSerial->write(XdrvMailbox.data, XdrvMailbox.data_len); + } + else if (3 == XdrvMailbox.index) { + SerialBridgeSerial->write(Unescape(XdrvMailbox.data, &XdrvMailbox.data_len), XdrvMailbox.data_len); + } + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, D_JSON_DONE); + } + } + else if (CMND_SBAUDRATE == command_code) { + char *p; + int baud = strtol(XdrvMailbox.data, &p, 10); + if (baud > 0) { + baud /= 1200; // Make it a valid baudrate + Settings.sbaudrate = (1 == XdrvMailbox.payload) ? SOFT_BAUDRATE / 1200 : baud; + SerialBridgeSerial->begin(Settings.sbaudrate * 1200); // Reinitialize serial port with new baud rate + } + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_LVALUE, command, Settings.sbaudrate * 1200); + } + else { + serviced = false; // Unknown command + } + return serviced; +} + +/*********************************************************************************************\ + * Interface +\*********************************************************************************************/ + +#define XDRV_08 + +boolean Xdrv08(byte function) +{ + boolean result = false; + + if (serial_bridge_active) { + switch (function) { + case FUNC_INIT: + SerialBridgeInit(); + break; + case FUNC_LOOP: + SerialBridgeInput(); + break; + case FUNC_COMMAND: + result = SerialBridgeCommand(); + break; + } + } + return result; +} + +#endif // USE_SERIAL_BRIDGE From 2c4b8a4a3b5acd42834584b8043e1d24cf79993d Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Tue, 20 Mar 2018 16:28:18 +0100 Subject: [PATCH 031/136] v5.12.0h - Add HSBColor and Channel commands 5.12.0h * Add PWM status to command State if PWM enabled (#2203) * Add command HSBColor Hue,Sat,Bri (#1642, #2203) * Add command Channel 0..100 to control dimmer value for individual color channels (#2111, #2203) --- sonoff/_releasenotes.ino | 3 ++ sonoff/i18n.h | 5 +++- sonoff/sonoff.ino | 30 ++++++++++++++------ sonoff/support.ino | 2 +- sonoff/xdrv_01_light.ino | 59 ++++++++++++++++++++++++++++++++++++++-- 5 files changed, 86 insertions(+), 13 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 7dd12439a..41334f0a6 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,6 +1,9 @@ /* 5.12.0h * Add support for Software Serial bridge using commands SerialDelimiter, SBaudrate and SSerialSend. Supports 8N1 and text only (#2190) * Add support for Hardware Serial bridge using commands SerialDelimiter, Baudrate and SerialSend. Supports 8N1 and text only (#2182) + * Add PWM status to command State if PWM enabled (#2203) + * Add command HSBColor Hue,Sat,Bri (#1642, #2203) + * Add command Channel 0..100 to control dimmer value for individual color channels (#2111, #2203) * * 5.12.0f * Add compile time support for WS2812 BRG and RBG led configurations to be defined in user_config.h (#1690) diff --git a/sonoff/i18n.h b/sonoff/i18n.h index ce785243d..71a795297 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -63,6 +63,7 @@ #define D_JSON_GATEWAY "Gateway" #define D_JSON_HEAPSIZE "Heap" #define D_JSON_HIGH "High" +#define D_JSON_HSBCOLOR "HSBColor" #define D_JSON_HUMIDITY "Humidity" #define D_JSON_I2CSCAN_DEVICES_FOUND_AT "Device(s) found at" #define D_JSON_I2CSCAN_UNKNOWN_ERROR_AT "Unknown error at" @@ -247,9 +248,11 @@ #define D_CMND_EXCEPTION "Exception" // Commands xdrv_01_light.ino +#define D_CMND_CHANNEL "Channel" #define D_CMND_COLOR "Color" #define D_CMND_COLORTEMPERATURE "CT" #define D_CMND_DIMMER "Dimmer" +#define D_CMND_HSBCOLOR "HSBColor" #define D_CMND_LED "Led" #define D_CMND_LEDTABLE "LedTable" #define D_CMND_FADE "Fade" @@ -483,4 +486,4 @@ const char S_INFORMATION[] PROGMEM = D_INFORMATION; const char S_RESTART[] PROGMEM = D_RESTART; #endif // USE_WEBSERVER -#endif // _I18N_H_ \ No newline at end of file +#endif // _I18N_H_ diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 941ec36c6..695cf1c0b 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -737,15 +737,9 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) Settings.pwm_value[index -1] = payload; analogWrite(pin[GPIO_PWM1 + index -1], bitRead(pwm_inverted, index -1) ? Settings.pwm_range - payload : payload); } - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_PWM "\":{")); - bool first = true; - for (byte i = 0; i < MAX_PWMS; i++) { - if (pin[GPIO_PWM1 + i] < 99) { - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s%s\"" D_CMND_PWM "%d\":%d"), mqtt_data, first ? "" : ",", i+1, Settings.pwm_value[i]); - first = false; - } - } - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}}"),mqtt_data); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{")); + MqttShowPWMState(); // Render the PWM status to MQTT + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}"), mqtt_data); } else if (CMND_PWMFREQUENCY == command_code) { if ((1 == payload) || ((payload >= 100) && (payload <= 4000))) { @@ -1327,6 +1321,19 @@ void PublishStatus(uint8_t payload) } +void MqttShowPWMState() +{ + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_PWM "\":{"), mqtt_data); + bool first = true; + for (byte i = 0; i < MAX_PWMS; i++) { + if (pin[GPIO_PWM1 + i] < 99) { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s%s\"" D_CMND_PWM "%d\":%d"), mqtt_data, first ? "" : ",", i+1, Settings.pwm_value[i]); + first = false; + } + } + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}"), mqtt_data); +} + void MqttShowState() { char stemp1[33]; @@ -1345,6 +1352,11 @@ void MqttShowState() } } + if (pwm_present) { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,"), mqtt_data); + MqttShowPWMState(); + } + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"" D_JSON_WIFI "\":{\"" D_JSON_AP "\":%d,\"" D_JSON_SSID "\":\"%s\",\"" D_JSON_RSSI "\":%d,\"" D_JSON_APMAC_ADDRESS "\":\"%s\"}}"), mqtt_data, Settings.sta_active +1, Settings.sta_ssid[Settings.sta_active], WifiGetRssiAsQuality(WiFi.RSSI()), WiFi.BSSIDstr().c_str()); } diff --git a/sonoff/support.ino b/sonoff/support.ino index 4689ae707..6a1293ccf 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -223,7 +223,7 @@ char* Unescape(char* buffer, uint16_t* size) case 'f': che = '\f'; break; // 0C Formfeed case 'n': che = '\n'; break; // 0A Linefeed (Newline) case 'r': che = '\r'; break; // 0D Carriage return -// case 's': che = ' '; break; // 20 Space + case 's': che = ' '; break; // 20 Space case 't': che = '\t'; break; // 09 Horizontal tab case 'v': che = '\v'; break; // 0B Vertical tab // case '?': che = '\?'; break; // 3F Question mark diff --git a/sonoff/xdrv_01_light.ino b/sonoff/xdrv_01_light.ino index f5f6184c7..61a599c86 100644 --- a/sonoff/xdrv_01_light.ino +++ b/sonoff/xdrv_01_light.ino @@ -55,10 +55,12 @@ enum LightCommands { CMND_COLOR, CMND_COLORTEMPERATURE, CMND_DIMMER, CMND_LED, CMND_LEDTABLE, CMND_FADE, - CMND_PIXELS, CMND_ROTATION, CMND_SCHEME, CMND_SPEED, CMND_WAKEUP, CMND_WAKEUPDURATION, CMND_WIDTH, CMND_UNDOCA }; + CMND_PIXELS, CMND_ROTATION, CMND_SCHEME, CMND_SPEED, CMND_WAKEUP, CMND_WAKEUPDURATION, + CMND_WIDTH, CMND_CHANNEL, CMND_HSBCOLOR, CMND_UNDOCA }; const char kLightCommands[] PROGMEM = D_CMND_COLOR "|" D_CMND_COLORTEMPERATURE "|" D_CMND_DIMMER "|" D_CMND_LED "|" D_CMND_LEDTABLE "|" D_CMND_FADE "|" - D_CMND_PIXELS "|" D_CMND_ROTATION "|" D_CMND_SCHEME "|" D_CMND_SPEED "|" D_CMND_WAKEUP "|" D_CMND_WAKEUPDURATION "|" D_CMND_WIDTH "|UNDOCA" ; + D_CMND_PIXELS "|" D_CMND_ROTATION "|" D_CMND_SCHEME "|" D_CMND_SPEED "|" D_CMND_WAKEUP "|" D_CMND_WAKEUPDURATION "|" + D_CMND_WIDTH "|" D_CMND_CHANNEL "|" D_CMND_HSBCOLOR "|UNDOCA" ; struct LRgbColor { uint8_t R, G, B; @@ -535,6 +537,8 @@ void LightState(uint8_t append) { char scolor[25]; char scommand[33]; + float hsb[3]; + int16_t h,s,b; if (append) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,"), mqtt_data); @@ -546,6 +550,15 @@ void LightState(uint8_t append) mqtt_data, scommand, GetStateText(light_power), Settings.light_dimmer); if (light_subtype > LST_SINGLE) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"" D_CMND_COLOR "\":\"%s\""), mqtt_data, LightGetColor(0, scolor)); + + // Add status for HSB + LightGetHsb(&hsb[0],&hsb[1],&hsb[2]); + // Scale these percentages up to the numbers expected byt he client + h = round(hsb[0] * 360); + s = round(hsb[1] * 100); + b = round(hsb[2] * 100); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"" D_CMND_HSBCOLOR "\":\"%d,%d,%d\""), mqtt_data, h,s,b); + } if ((LST_COLDWARM == light_subtype) || (LST_RGBWC == light_subtype)) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"" D_CMND_COLORTEMPERATURE "\":%d"), mqtt_data, LightGetColorTemp()); @@ -1053,6 +1066,48 @@ boolean LightCommand() snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_SVALUE, command, XdrvMailbox.index, scolor); } } + else if ((CMND_CHANNEL == command_code) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= light_subtype ) ) { + // Set "Channel" directly - this allows Color and Direct PWM control to coexist + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) { + uint8_t level = XdrvMailbox.payload; + light_current_color[XdrvMailbox.index-1] = round(level * 2.55); + LightSetColor(); + coldim = true; + } + snprintf_P(scolor, 25, PSTR("%d"), round(light_current_color[XdrvMailbox.index -1] / 2.55)); + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_SVALUE, command, XdrvMailbox.index, scolor); + } + else if ((CMND_HSBCOLOR == command_code) && ( light_subtype >= LST_RGB)) { + // Implement method to "direct set" color by HSB (HSB is passed comma separated, 0360) ? (HSB[0] % 360) : HSB[0] ) /360.0, + ( (HSB[1]>100) ? (HSB[1] % 100) : HSB[1] ) /100.0, + ( (HSB[2]>100) ? (HSB[2] % 100) : HSB[2] ) /100.0, + 0); + } else { + LightState(0); + } + } #ifdef USE_WS2812 // *********************************************************************** else if ((CMND_LED == command_code) && (LT_WS2812 == light_type) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= Settings.light_pixels)) { if (XdrvMailbox.data_len > 0) { From 687f96f843b16a31212f4b84fa54a0607321aec6 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Wed, 21 Mar 2018 09:27:05 +0100 Subject: [PATCH 032/136] v5.12.0h - Change to default PWM Color/Dimmer 5.12.0h * Add support for Zengge WF017 PWM Led strip controller (#2202) * Change default option SetOption15 from 0 to 1 providing better initial PWM experience --- sonoff/_releasenotes.ino | 2 ++ sonoff/settings.ino | 9 +++++---- sonoff/sonoff_template.h | 29 +++++++++++++++-------------- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 41334f0a6..2beb71f2f 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,9 +1,11 @@ /* 5.12.0h * Add support for Software Serial bridge using commands SerialDelimiter, SBaudrate and SSerialSend. Supports 8N1 and text only (#2190) * Add support for Hardware Serial bridge using commands SerialDelimiter, Baudrate and SerialSend. Supports 8N1 and text only (#2182) + * Add support for Zengge WF017 PWM Led strip controller (#2202) * Add PWM status to command State if PWM enabled (#2203) * Add command HSBColor Hue,Sat,Bri (#1642, #2203) * Add command Channel 0..100 to control dimmer value for individual color channels (#2111, #2203) + * Change default option SetOption15 from 0 to 1 providing better initial PWM experience * * 5.12.0f * Add compile time support for WS2812 BRG and RBG led configurations to be defined in user_config.h (#1690) diff --git a/sonoff/settings.ino b/sonoff/settings.ino index 8b8123741..ac706f4aa 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -450,6 +450,7 @@ void SettingsDefaultSet2() Settings.flag.mqtt_power_retain = MQTT_POWER_RETAIN; Settings.flag.mqtt_button_retain = MQTT_BUTTON_RETAIN; Settings.flag.mqtt_switch_retain = MQTT_SWITCH_RETAIN; + Settings.flag.pwm_control = 1; Settings.flag.hass_discovery = HOME_ASSISTANT_DISCOVERY_ENABLE; Settings.flag2.emulation = EMULATION; @@ -525,14 +526,14 @@ void SettingsDefaultSet2() // Settings.energy_max_voltage = 0; // Settings.energy_min_current = 0; // Settings.energy_max_current = 0; -// Settings.energy_max_power_limit = 0; // MaxPowerLimit +// Settings.energy_max_power_limit = 0; // MaxPowerLimit Settings.energy_max_power_limit_hold = MAX_POWER_HOLD; Settings.energy_max_power_limit_window = MAX_POWER_WINDOW; -// Settings.energy_max_power_safe_limit = 0; // MaxSafePowerLimit +// Settings.energy_max_power_safe_limit = 0; // MaxSafePowerLimit Settings.energy_max_power_safe_limit_hold = SAFE_POWER_HOLD; Settings.energy_max_power_safe_limit_window = SAFE_POWER_WINDOW; -// Settings.energy_max_energy = 0; // MaxEnergy -// Settings.energy_max_energy_start = 0; // MaxEnergyStart +// Settings.energy_max_energy = 0; // MaxEnergy +// Settings.energy_max_energy_start = 0; // MaxEnergyStart SettingsDefaultSet_3_2_4(); diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h index f5a68bbfa..2fba23102 100644 --- a/sonoff/sonoff_template.h +++ b/sonoff/sonoff_template.h @@ -180,6 +180,7 @@ enum SupportedModules { SONOFF_DUAL_R2, ARILUX_LC06, SONOFF_S31, + ZENGGE_ZF_WF017, MAXMODULE }; /********************************************************************************************/ @@ -234,6 +235,7 @@ const uint8_t kNiceList[MAXMODULE] PROGMEM = { ARILUX_LC01, ARILUX_LC06, ARILUX_LC11, + ZENGGE_ZF_WF017, HUAFAN_SS, KMC_70011, AILIGHT, @@ -789,6 +791,19 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_REL1, // GPIO12 Red Led and Relay (0 = Off, 1 = On) GPIO_LED1_INV, // GPIO13 Green Led (0 = On, 1 = Off) 0, 0, 0, 0 + }, + { "Zengge WF017", // Zenggee ZJ-WF017-A (ESP12S)) - https://www.ebay.com/p/Smartphone-Android-IOS-WiFi-Music-Controller-for-RGB-5050-3528-LED-Strip-Light/534446632?_trksid=p2047675.l2644 + GPIO_KEY1, // GPIO00 Optional Button + 0, + GPIO_USER, // GPIO02 Empty pad + 0, + GPIO_USER, // GPIO04 W2 - PWM5 + 0, + 0, 0, 0, 0, 0, 0, // Flash connection + GPIO_PWM2, // GPIO12 RGB LED Green + GPIO_PWM1, // GPIO13 RGB LED Red + GPIO_PWM3, // GPIO14 RGB LED Blue + 0, 0, 0 } }; @@ -819,20 +834,6 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { 0, 0 } - { "Zengge WF017", // Zenggee ZJ-WF017-A (ESP12S)) - https://www.ebay.com/p/Smartphone-Android-IOS-WiFi-Music-Controller-for-RGB-5050-3528-LED-Strip-Light/534446632?_trksid=p2047675.l2644 - GPIO_KEY1, // GPIO00 Optional Button - 0, - GPIO_USER, // GPIO02 Empty pad - 0, - GPIO_USER, // GPIO04 W2 - PWM5 - 0, - 0, 0, 0, 0, 0, 0, // Flash connection - GPIO_PWM2, // GPIO12 RGB LED Green - GPIO_PWM1, // GPIO13 RGB LED Red - GPIO_PWM3, // GPIO14 RGB LED Blue - 0, 0, 0 - } - { "SMPW701E", // SM-PW701E WLAN Socket (#1190) 0, 0, 0, 0, GPIO_LED1_INV, // GPIO04 Blue Led (0 = On, 1 = Off) From f80fb8966872cc591cfa04abaaab82d6e08ed0f6 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Wed, 21 Mar 2018 09:56:39 +0100 Subject: [PATCH 033/136] v5.12.0h - Add Channel status information 5.12.0h * Add Channel status information (#2211) --- sonoff/_releasenotes.ino | 1 + sonoff/xdrv_01_light.ino | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 2beb71f2f..63b563072 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -5,6 +5,7 @@ * Add PWM status to command State if PWM enabled (#2203) * Add command HSBColor Hue,Sat,Bri (#1642, #2203) * Add command Channel 0..100 to control dimmer value for individual color channels (#2111, #2203) + * Add Channel status information (#2211) * Change default option SetOption15 from 0 to 1 providing better initial PWM experience * * 5.12.0f diff --git a/sonoff/xdrv_01_light.ino b/sonoff/xdrv_01_light.ino index 61a599c86..54c7cebc9 100644 --- a/sonoff/xdrv_01_light.ino +++ b/sonoff/xdrv_01_light.ino @@ -550,15 +550,19 @@ void LightState(uint8_t append) mqtt_data, scommand, GetStateText(light_power), Settings.light_dimmer); if (light_subtype > LST_SINGLE) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"" D_CMND_COLOR "\":\"%s\""), mqtt_data, LightGetColor(0, scolor)); - - // Add status for HSB + // Add status for HSB LightGetHsb(&hsb[0],&hsb[1],&hsb[2]); // Scale these percentages up to the numbers expected byt he client h = round(hsb[0] * 360); s = round(hsb[1] * 100); b = round(hsb[2] * 100); snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"" D_CMND_HSBCOLOR "\":\"%d,%d,%d\""), mqtt_data, h,s,b); - + // Add status for each channel + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"" D_CMND_CHANNEL "\":[" ), mqtt_data); + for (byte i = 0; i < light_subtype; i++) { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s%s%d" ), mqtt_data, (i > 0 ? "," : ""), round(light_current_color[i]/2.55)); + } + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s]" ), mqtt_data); } if ((LST_COLDWARM == light_subtype) || (LST_RGBWC == light_subtype)) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"" D_CMND_COLORTEMPERATURE "\":%d"), mqtt_data, LightGetColorTemp()); @@ -1074,8 +1078,7 @@ boolean LightCommand() LightSetColor(); coldim = true; } - snprintf_P(scolor, 25, PSTR("%d"), round(light_current_color[XdrvMailbox.index -1] / 2.55)); - snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_SVALUE, command, XdrvMailbox.index, scolor); + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_NVALUE, command, XdrvMailbox.index, round(light_current_color[XdrvMailbox.index -1] / 2.55)); } else if ((CMND_HSBCOLOR == command_code) && ( light_subtype >= LST_RGB)) { // Implement method to "direct set" color by HSB (HSB is passed comma separated, 0 Date: Wed, 21 Mar 2018 10:42:56 +0100 Subject: [PATCH 034/136] 5.12.0h - Add all FriendlyNames to Status 5.12.0h * Add all FriendlyNames to Status information (#2208) * Change status display of Ssid and SetOption --- sonoff/_releasenotes.ino | 2 ++ sonoff/sonoff.ino | 14 ++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 63b563072..14a120f8a 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -6,6 +6,8 @@ * Add command HSBColor Hue,Sat,Bri (#1642, #2203) * Add command Channel 0..100 to control dimmer value for individual color channels (#2111, #2203) * Add Channel status information (#2211) + * Add all FriendlyNames to Status information (#2208) + * Change status display of Ssid and SetOption * Change default option SetOption15 from 0 to 1 providing better initial PWM experience * * 5.12.0f diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 695cf1c0b..4ec4a4a1b 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -1237,6 +1237,7 @@ void ExecuteCommand(char *cmnd) void PublishStatus(uint8_t payload) { uint8_t option = 1; + char stemp[MAX_FRIENDLYNAMES * (sizeof(Settings.friendlyname[0]) +4)]; // Workaround MQTT - TCP/IP stack queueing when SUB_PREFIX = PUB_PREFIX if (!strcmp(Settings.mqtt_prefix[0],Settings.mqtt_prefix[1]) && (!payload)) option++; @@ -1245,8 +1246,13 @@ void PublishStatus(uint8_t payload) if (!energy_flg && (9 == payload)) payload = 99; if ((0 == payload) || (99 == payload)) { - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_STATUS "\":{\"" D_CMND_MODULE "\":%d,\"" D_CMND_FRIENDLYNAME "\":\"%s\",\"" D_CMND_TOPIC "\":\"%s\",\"" D_CMND_BUTTONTOPIC "\":\"%s\",\"" D_CMND_POWER "\":%d,\"" D_CMND_POWERONSTATE "\":%d,\"" D_CMND_LEDSTATE "\":%d,\"" D_CMND_SAVEDATA "\":%d,\"" D_JSON_SAVESTATE "\":%d,\"" D_CMND_BUTTONRETAIN "\":%d,\"" D_CMND_POWERRETAIN "\":%d}}"), - Settings.module +1, Settings.friendlyname[0], mqtt_topic, Settings.button_topic, power, Settings.poweronstate, Settings.ledstate, Settings.save_data, Settings.flag.save_state, Settings.flag.mqtt_button_retain, Settings.flag.mqtt_power_retain); + uint8_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : devices_present; + stemp[0] = '\0'; + for (byte i = 0; i < maxfn; i++) { + snprintf_P(stemp, sizeof(stemp), PSTR("%s%s\"%s\"" ), stemp, (i > 0 ? "," : ""), Settings.friendlyname[i]); + } + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_STATUS "\":{\"" D_CMND_MODULE "\":%d,\"" D_CMND_FRIENDLYNAME "\":[%s],\"" D_CMND_TOPIC "\":\"%s\",\"" D_CMND_BUTTONTOPIC "\":\"%s\",\"" D_CMND_POWER "\":%d,\"" D_CMND_POWERONSTATE "\":%d,\"" D_CMND_LEDSTATE "\":%d,\"" D_CMND_SAVEDATA "\":%d,\"" D_JSON_SAVESTATE "\":%d,\"" D_CMND_BUTTONRETAIN "\":%d,\"" D_CMND_POWERRETAIN "\":%d}}"), + Settings.module +1, stemp, mqtt_topic, Settings.button_topic, power, Settings.poweronstate, Settings.ledstate, Settings.save_data, Settings.flag.save_state, Settings.flag.mqtt_button_retain, Settings.flag.mqtt_power_retain); MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS)); } @@ -1263,8 +1269,8 @@ void PublishStatus(uint8_t payload) } if ((0 == payload) || (3 == payload)) { - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_STATUS D_STATUS3_LOGGING "\":{\"" D_CMND_SERIALLOG "\":%d,\"" D_CMND_WEBLOG "\":%d,\"" D_CMND_SYSLOG "\":%d,\"" D_CMND_LOGHOST "\":\"%s\",\"" D_CMND_LOGPORT "\":%d,\"" D_CMND_SSID "1\":\"%s\",\"" D_CMND_SSID "2\":\"%s\",\"" D_CMND_TELEPERIOD "\":%d,\"" D_CMND_SETOPTION "\":\"%08X\"}}"), - Settings.seriallog_level, Settings.weblog_level, Settings.syslog_level, Settings.syslog_host, Settings.syslog_port, Settings.sta_ssid[0], Settings.sta_ssid[1], Settings.tele_period, Settings.flag.data); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_STATUS D_STATUS3_LOGGING "\":{\"" D_CMND_SERIALLOG "\":%d,\"" D_CMND_WEBLOG "\":%d,\"" D_CMND_SYSLOG "\":%d,\"" D_CMND_LOGHOST "\":\"%s\",\"" D_CMND_LOGPORT "\":%d,\"" D_CMND_SSID "\":[\"%s\",\"%s\"],\"" D_CMND_TELEPERIOD "\":%d,\"" D_CMND_SETOPTION "\":[\"%08X\",\"%08X\"]}}"), + Settings.seriallog_level, Settings.weblog_level, Settings.syslog_level, Settings.syslog_host, Settings.syslog_port, Settings.sta_ssid[0], Settings.sta_ssid[1], Settings.tele_period, Settings.flag.data, Settings.flag2.data); MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "3")); } From d89534164a7da98e54b19c864e38cb90191fe234 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Wed, 21 Mar 2018 17:58:39 +0100 Subject: [PATCH 035/136] v5.12.0h - Add optional Arduino OTA 5.12.0h * Add optional Arduino OTA support to be enabled in user_config.h (#1998) --- sonoff/_releasenotes.ino | 1 + sonoff/sonoff.ino | 100 ++++++++++++++++++++++++++++++++++++++- sonoff/user_config.h | 1 + 3 files changed, 100 insertions(+), 2 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 14a120f8a..dc40e3a5b 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,5 @@ /* 5.12.0h + * Add optional Arduino OTA support to be enabled in user_config.h (#1998) * Add support for Software Serial bridge using commands SerialDelimiter, SBaudrate and SSerialSend. Supports 8N1 and text only (#2190) * Add support for Hardware Serial bridge using commands SerialDelimiter, Baudrate and SerialSend. Supports 8N1 and text only (#2182) * Add support for Zengge WF017 PWM Led strip controller (#2202) diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 4ec4a4a1b..c69a5784a 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -54,8 +54,14 @@ #include // WifiManager, Webserver #include // WifiManager #endif // USE_WEBSERVER +#ifdef USE_ARDUINO_OTA + #include // Arduino OTA + #ifndef USE_DISCOVERY + #define USE_DISCOVERY + #endif +#endif // USE_ARDUINO_OTA #ifdef USE_DISCOVERY - #include // MQTT, Webserver + #include // MQTT, Webserver, Arduino OTA #endif // USE_DISCOVERY #ifdef USE_I2C #include // I2C support library @@ -176,7 +182,6 @@ uint8_t i2c_flg = 0; // I2C configured uint8_t spi_flg = 0; // SPI configured uint8_t light_type = 0; // Light types bool pwm_present = false; // Any PWM channel configured with SetOption15 0 - boolean mdns_begun = false; char my_version[33]; // Composed version string @@ -1903,6 +1908,86 @@ void StateLoop() } } +#ifdef USE_ARDUINO_OTA +/*********************************************************************************************\ + * Allow updating via the Arduino OTA-protocol. + * + * - Once started disables current wifi clients and udp + * - Perform restart when done to re-init wifi clients +\*********************************************************************************************/ + +bool arduino_ota_triggered = false; +uint16_t arduino_ota_progress_dot_count = 0; + +void ArduinoOTAInit() +{ + ArduinoOTA.setPort(8266); + ArduinoOTA.setHostname(Settings.hostname); + if (Settings.web_password[0] !=0) ArduinoOTA.setPassword(Settings.web_password); + + ArduinoOTA.onStart([]() + { + SettingsSave(1); // Free flash for OTA update +#ifdef USE_WEBSERVER + if (Settings.webserver) StopWebserver(); +#endif // USE_WEBSERVER +#ifdef USE_ARILUX_RF + AriluxRfDisable(); // Prevent restart exception on Arilux Interrupt routine +#endif // USE_ARILUX_RF + if (Settings.flag.mqtt_enabled) MqttDisconnect(); + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_UPLOAD "Arduino OTA " D_UPLOAD_STARTED)); + AddLog(LOG_LEVEL_INFO); + arduino_ota_triggered = true; + arduino_ota_progress_dot_count = 0; + delay(100); // Allow time for message xfer + }); + + ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) + { + if ((LOG_LEVEL_DEBUG <= seriallog_level)) { + arduino_ota_progress_dot_count++; + Serial.printf("."); + if (!(arduino_ota_progress_dot_count % 80)) Serial.println(); + } + }); + + ArduinoOTA.onError([](ota_error_t error) + { + /* + From ArduinoOTA.h: + typedef enum { OTA_AUTH_ERROR, OTA_BEGIN_ERROR, OTA_CONNECT_ERROR, OTA_RECEIVE_ERROR, OTA_END_ERROR } ota_error_t; + */ + char error_str[100]; + + if ((LOG_LEVEL_DEBUG <= seriallog_level) && arduino_ota_progress_dot_count) Serial.println(); + switch (error) { + case OTA_BEGIN_ERROR: strncpy_P(error_str, PSTR(D_UPLOAD_ERR_2), sizeof(error_str)); break; + case OTA_RECEIVE_ERROR: strncpy_P(error_str, PSTR(D_UPLOAD_ERR_5), sizeof(error_str)); break; + case OTA_END_ERROR: strncpy_P(error_str, PSTR(D_UPLOAD_ERR_7), sizeof(error_str)); break; + default: + snprintf_P(error_str, sizeof(error_str), PSTR(D_UPLOAD_ERROR_CODE " %d"), error); + } + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_UPLOAD "Arduino OTA %s. " D_RESTARTING), error_str); + AddLog(LOG_LEVEL_INFO); + delay(100); // Allow time for message xfer + ESP.restart(); + }); + + ArduinoOTA.onEnd([]() + { + if ((LOG_LEVEL_DEBUG <= seriallog_level)) Serial.println(); + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_UPLOAD "Arduino OTA " D_SUCCESSFUL ". " D_RESTARTING)); + AddLog(LOG_LEVEL_INFO); + delay(100); // Allow time for message xfer + ESP.restart(); + }); + + ArduinoOTA.begin(); + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_UPLOAD "Arduino OTA " D_ENABLED " " D_PORT " 8266")); + AddLog(LOG_LEVEL_INFO); +} +#endif // USE_ARDUINO_OTA + /********************************************************************************************/ void SerialInput() @@ -2311,6 +2396,11 @@ void setup() #endif // BE_MINIMAL RtcInit(); + +#ifdef USE_ARDUINO_OTA + ArduinoOTAInit(); +#endif // USE_ARDUINO_OTA + XsnsCall(FUNC_INIT); } @@ -2332,6 +2422,12 @@ void loop() SerialInput(); +#ifdef USE_ARDUINO_OTA + ArduinoOTA.handle(); + // Once OTA is triggered, only handle that and dont do other stuff. (otherwise it fails) + while (arduino_ota_triggered) ArduinoOTA.handle(); +#endif // USE_ARDUINO_OTA + // yield(); // yield == delay(0), delay contains yield, auto yield in loop delay(sleep); // https://github.com/esp8266/Arduino/issues/2021 } diff --git a/sonoff/user_config.h b/sonoff/user_config.h index a93e386ae..b919f6773 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -73,6 +73,7 @@ // -- Ota ----------------------------------------- #define OTA_URL "http://sonoff.maddox.co.uk/tasmota/sonoff.ino.bin" // [OtaUrl] +//#define USE_ARDUINO_OTA // Add optional support for Arduino OTA (+4k5 code) /*********************************************************************************************\ * Select ONE of possible MQTT library types below From d564615b7d70b493925f2045699ed94b36e7ccdd Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 23 Mar 2018 17:20:20 +0100 Subject: [PATCH 036/136] v5.12.0i - Add timers 5.12.0i * Add 16 timers using commands Timer and Timers (#1091) --- README.md | 2 +- sonoff/_releasenotes.ino | 5 +- sonoff/i18n.h | 10 ++ sonoff/settings.h | 19 ++++ sonoff/settings.ino | 3 + sonoff/sonoff.h | 1 + sonoff/sonoff.ino | 2 +- sonoff/support.ino | 26 +++++ sonoff/user_config.h | 2 + sonoff/xdrv_09_timers.ino | 205 ++++++++++++++++++++++++++++++++++++++ 10 files changed, 272 insertions(+), 3 deletions(-) create mode 100644 sonoff/xdrv_09_timers.ino diff --git a/README.md b/README.md index 2f4d7ed1c..e4a1e3fb6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## Sonoff-Tasmota Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE. -Current version is **5.12.0h** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.12.0i** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### ATTENTION All versions diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index dc40e3a5b..d92495343 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,7 @@ -/* 5.12.0h +/* 5.12.0i + * Add 16 timers using commands Timer and Timers (#1091) + * + * 5.12.0h * Add optional Arduino OTA support to be enabled in user_config.h (#1998) * Add support for Software Serial bridge using commands SerialDelimiter, SBaudrate and SSerialSend. Supports 8N1 and text only (#2190) * Add support for Hardware Serial bridge using commands SerialDelimiter, Baudrate and SerialSend. Supports 8N1 and text only (#2182) diff --git a/sonoff/i18n.h b/sonoff/i18n.h index 71a795297..2b9ac09ed 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -349,6 +349,16 @@ #define D_CMND_SBAUDRATE "SBaudrate" #define D_JSON_SSERIALRECEIVED "SSerialReceived" +// Commands xdrv_09_timers.ino +#define D_CMND_TIMER "Timer" + #define D_JSON_TIMER_ARM "Arm" + #define D_JSON_TIMER_TIME "Time" + #define D_JSON_TIMER_DAYS "Days" + #define D_JSON_TIMER_REPEAT "Repeat" + #define D_JSON_TIMER_DEVICE "Device" + #define D_JSON_TIMER_POWER "Power" +#define D_CMND_TIMERS "Timers" + /********************************************************************************************/ #ifndef MY_LANGUAGE diff --git a/sonoff/settings.h b/sonoff/settings.h index 936e54963..173958b86 100644 --- a/sonoff/settings.h +++ b/sonoff/settings.h @@ -89,6 +89,20 @@ typedef union { }; } SysBitfield2; +typedef union { + uint32_t data; + struct { + uint32_t time : 11; // bits 0 - 10 = minutes in a day + uint32_t mday : 5; // bits 11 - 15 = optional day in a month + uint32_t days : 7; // bits 16 - 22 = week day mask + uint32_t device : 4; // bits 23 - 26 = 16 devices + uint32_t power : 2; // bits 27 - 28 = 4 power states - Off, On, Toggle + uint32_t repeat : 1; // bit 29 + uint32_t arm : 1; // bit 30 + uint32_t spare : 1; // bit 31 + }; +} Timer; + struct SYSCFG { unsigned long cfg_holder; // 000 unsigned long save_flag; // 004 @@ -236,6 +250,11 @@ struct SYSCFG { uint16_t pulse_counter_debounce; // 5D2 uint8_t rf_code[17][9]; // 5D4 + byte free_66d[3]; // 66D + + Timer timer[MAX_TIMERS]; // 670 + + // 6B0 - FFF free locations } Settings; struct RTCMEM { diff --git a/sonoff/settings.ino b/sonoff/settings.ino index ac706f4aa..d17f33d35 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -910,6 +910,9 @@ void SettingsDelta() Settings.sbaudrate = SOFT_BAUDRATE / 1200; Settings.serial_delimiter = 0xff; } + if (Settings.version < 0x050C0009) { + memset(&Settings.timer, 0x00, sizeof(Timer) * MAX_TIMERS); + } Settings.version = VERSION; SettingsSave(1); diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index 58079e2df..5511856c4 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -43,6 +43,7 @@ typedef unsigned long power_t; // Power (Relay) type #define MAX_SWITCHES 4 // Max number of switches #define MAX_PWMS 5 // Max number of PWM channels #define MAX_COUNTERS 4 // Max number of counter sensors +#define MAX_TIMERS 16 // Max number of Timers #define MAX_PULSETIMERS 8 // Max number of supported pulse timers #define MAX_FRIENDLYNAMES 4 // Max number of Friendly names #define MAX_DOMOTICZ_IDX 4 // Max number of Domoticz device, key and switch indices diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index c69a5784a..96ade5005 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050C0008 // 5.12.0h +#define VERSION 0x050C0009 // 5.12.0i // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) diff --git a/sonoff/support.ino b/sonoff/support.ino index 6a1293ccf..d0250690a 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -241,6 +241,32 @@ char* Unescape(char* buffer, uint16_t* size) return buffer; } +char* UpperCase(char* dest, const char* source) +{ + char* write = dest; + const char* read = source; + char ch = '.'; + + while (ch != '\0') { + ch = *read++; + *write++ = toupper(ch); + } + return dest; +} + +char* UpperCase_P(char* dest, const char* source) +{ + char* write = dest; + const char* read = source; + char ch = '.'; + + while (ch != '\0') { + ch = pgm_read_byte(read++); + *write++ = toupper(ch); + } + return dest; +} + boolean ParseIp(uint32_t* addr, const char* str) { uint8_t *part = (uint8_t*)addr; diff --git a/sonoff/user_config.h b/sonoff/user_config.h index b919f6773..5de54309a 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -162,6 +162,8 @@ #define NTP_SERVER2 "nl.pool.ntp.org" // [NtpServer2] Select second NTP server by name or IP address (5.39.184.5) #define NTP_SERVER3 "0.nl.pool.ntp.org" // [NtpServer3] Select third NTP server by name or IP address (93.94.224.67) +#define USE_TIMERS // Add support for up to 16 timers (+2k2 code) + // -- Time - Start Daylight Saving Time and timezone offset from UTC in minutes #define TIME_DST North, Last, Sun, Mar, 2, +120 // Northern Hemisphere, Last sunday in march at 02:00 +120 minutes diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino new file mode 100644 index 000000000..350f49dfd --- /dev/null +++ b/sonoff/xdrv_09_timers.ino @@ -0,0 +1,205 @@ +/* + xdrv_09_timers.ino - timer support for Sonoff-Tasmota + + Copyright (C) 2018 Theo Arends + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifdef USE_TIMERS +/*********************************************************************************************\ + * Timers + * + * Arm a timer using one or all of the following JSON values: + * {"Arm":1,"Time":"09:23","Days":"--TW--S","Repeat":1,"Device":1,"Power":1} + * + * Arm 0 = Off, 1 = On + * Time hours:minutes + * Days 7 day character mask starting with Sunday (SMTWTFS). 0 or - = Off, any other value = On + * Repeat 0 = Execute once, 1 = Execute again + * Device 1..16 + * Power 0 = Off, 1 = On, 2 = Toggle, 3 = Blink + * +\*********************************************************************************************/ + +enum TimerCommands { CMND_TIMER, CMND_TIMERS }; +const char kTimerCommands[] PROGMEM = D_CMND_TIMER "|" D_CMND_TIMERS ; + +power_t fired = 0; + +void TimerEverySecond() +{ + if (RtcTime.valid) { + uint16_t time = (RtcTime.hour * 60) + RtcTime.minute; + uint8_t days = 1 << (RtcTime.day_of_week -1); + + for (byte i = 0; i < MAX_TIMERS; i++) { + if (Settings.timer[i].arm) { + if (time == Settings.timer[i].time) { + if (!bitRead(fired, i) && (Settings.timer[i].days & days)) { + bitSet(fired, i); + Settings.timer[i].arm = Settings.timer[i].repeat; + ExecuteCommandPower(Settings.timer[i].device +1, Settings.timer[i].power); + } + } else { + bitClear(fired, i); + } + } + } + } +} + +void PrepShowTimer(uint8_t index) +{ + char days[8] = { 0 }; + + index--; + for (byte i = 0; i < 7; i++) { + uint8_t mask = 1 << i; + snprintf(days, sizeof(days), "%s%d", days, ((Settings.timer[index].days & mask) > 0)); + } + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_DEVICE "\":%d,\"" D_JSON_TIMER_POWER "\":%d}"), + mqtt_data, index +1, Settings.timer[index].arm, Settings.timer[index].time / 60, Settings.timer[index].time % 60, days, Settings.timer[index].repeat, Settings.timer[index].device +1, Settings.timer[index].power); +} + +/*********************************************************************************************\ + * Commands +\*********************************************************************************************/ + +boolean TimerCommand() +{ + char command [CMDSZ]; + char dataBufUc[XdrvMailbox.data_len]; + boolean serviced = true; + uint8_t index = XdrvMailbox.index; + + UpperCase(dataBufUc, XdrvMailbox.data); + int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic, kTimerCommands); + if ((CMND_TIMER == command_code) && (index > 0) && (index <= MAX_TIMERS)) { + uint8_t error = 0; + + if (XdrvMailbox.data_len) { + StaticJsonBuffer<128> jsonBuffer; + JsonObject& root = jsonBuffer.parseObject(dataBufUc); + if (!root.success()) { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_TIMER "%d\":\"" D_JSON_INVALID_JSON "\"}"), index); // JSON decode failed + error = 1; + } + else { + char parm_uc[10]; + + index--; + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_ARM))].success()) { + Settings.timer[index].arm = (root[parm_uc] != 0); + } + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_TIME))].success()) { + uint16_t itime = 0; + uint8_t value = 0; + char time_str[10]; + + snprintf(time_str, sizeof(time_str), root[parm_uc]); + const char *substr = strtok(time_str, ":"); + if (substr != NULL) { + value = atoi(substr); + if (value > 23) value = 23; + itime = value * 60; + substr = strtok(NULL, ":"); + if (substr != NULL) { + value = atoi(substr); + if (value > 59) value = 59; + itime += value; + } + } + Settings.timer[index].time = itime; + } + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_DAYS))].success()) { + // SMTWTFS = 1234567 = 0011001 = 00TW00S = --TW--S + Settings.timer[index].days = 0; + const char *tday = root[parm_uc]; + char ch = '.'; + + uint8_t i = 0; + while ((ch != '\0') && (i < 7)) { + ch = *tday++; + if (ch == '-') ch = '0'; + uint8_t mask = 1 << i++; + Settings.timer[index].days |= (ch == '0') ? 0 : mask; + } + } + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_REPEAT))].success()) { + Settings.timer[index].repeat = (root[parm_uc] != 0); + } + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_DEVICE))].success()) { + Settings.timer[index].device = ((uint8_t)root[parm_uc] -1) & 0x0F; + } + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_POWER))].success()) { + Settings.timer[index].power = (uint8_t)root[parm_uc] & 0x03; + } + if (Settings.timer[index].arm) bitClear(fired, index); + + index++; + } + } + if (!error) { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{")); + PrepShowTimer(index); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}"), mqtt_data); + } + } + else if (CMND_TIMERS == command_code) { + byte jsflg = 0; + byte lines = 1; + for (byte i = 0; i < MAX_TIMERS; i++) { + if (!jsflg) { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_TIMERS "%d\":{"), lines++); + } else { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,"), mqtt_data); + } + jsflg = 1; + PrepShowTimer(i +1); + if ((strlen(mqtt_data) > (LOGSZ - TOPSZ)) || (i == MAX_TIMERS -1)) { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}}"), mqtt_data); + MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_TIMERS)); + jsflg = 0; + } + } + mqtt_data[0] = '\0'; + } + else serviced = false; + + return serviced; +} + +/*********************************************************************************************\ + * Interface +\*********************************************************************************************/ + +#define XDRV_09 + +boolean Xdrv09(byte function) +{ + boolean result = false; + + switch (function) { + case FUNC_EVERY_SECOND: + TimerEverySecond(); + break; + case FUNC_COMMAND: + result = TimerCommand(); + break; + } + return result; +} + +#endif // USE_TIMERS \ No newline at end of file From c4b3d4269371cfc9a203b8ee4787dd8970c91b0c Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Wed, 28 Mar 2018 18:01:38 +0200 Subject: [PATCH 037/136] v5.12.0i - Add Timers webpage 5.12.0i * Add commands Timer 0 to clear timer and Timer 1..16 to copy timer * Add optional Timer configuration webpage to be enabled in user_config.h with define USE_TIMERS_WEB * Change webpage parameter communication --- sonoff/_releasenotes.ino | 3 + sonoff/language/cs-CZ.h | 10 ++ sonoff/language/de-DE.h | 10 ++ sonoff/language/en-GB.h | 10 ++ sonoff/language/es-AR.h | 10 ++ sonoff/language/fr-FR.h | 10 ++ sonoff/language/hu-HU.h | 10 ++ sonoff/language/it-IT.h | 10 ++ sonoff/language/nl-NL.h | 12 +- sonoff/language/pl-PL.h | 10 ++ sonoff/language/pt-PT.h | 10 ++ sonoff/language/ru-RU.h | 10 ++ sonoff/language/zh-CN.h | 10 ++ sonoff/language/zh-TW.h | 10 ++ sonoff/settings.h | 4 +- sonoff/user_config.h | 1 + sonoff/webserver.ino | 61 ++++++--- sonoff/xdrv_05_domoticz.ino | 2 +- sonoff/xdrv_09_timers.ino | 258 ++++++++++++++++++++++++++++-------- 19 files changed, 382 insertions(+), 79 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index d92495343..5583d95fc 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,5 +1,8 @@ /* 5.12.0i * Add 16 timers using commands Timer and Timers (#1091) + * Add commands Timer 0 to clear timer and Timer 1..16 to copy timer + * Add optional Timer configuration webpage to be enabled in user_config.h with define USE_TIMERS_WEB + * Change webpage parameter communication * * 5.12.0h * Add optional Arduino OTA support to be enabled in user_config.h (#1998) diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h index e78d0a8e0..617524e20 100644 --- a/sonoff/language/cs-CZ.h +++ b/sonoff/language/cs-CZ.h @@ -358,6 +358,16 @@ #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Aktualizace stopek" +// xdrv_09_timers.ino +#define D_CONFIGURE_TIMER "Configure Timer" +#define D_TIMER_PARAMETERS "Timer parameters" +#define D_TIMER_ARM "Arm" +#define D_TIMER_TIME "Time" +#define D_TIMER_DAYS "Days" +#define D_TIMER_REPEAT "Repeat" +#define D_TIMER_DEVICE "Device" +#define D_TIMER_POWER "Power" + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energie Dnes" #define D_ENERGY_YESTERDAY "Energie Včera" diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index b0ea8033a..f6f5c78a0 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -358,6 +358,16 @@ #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Update timer" +// xdrv_09_timers.ino +#define D_CONFIGURE_TIMER "Configure Timer" +#define D_TIMER_PARAMETERS "Timer parameters" +#define D_TIMER_ARM "Arm" +#define D_TIMER_TIME "Time" +#define D_TIMER_DAYS "Days" +#define D_TIMER_REPEAT "Repeat" +#define D_TIMER_DEVICE "Device" +#define D_TIMER_POWER "Power" + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energie heute" #define D_ENERGY_YESTERDAY "Energie gestern" diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h index 5fb862b5e..c7db040db 100644 --- a/sonoff/language/en-GB.h +++ b/sonoff/language/en-GB.h @@ -358,6 +358,16 @@ #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Update timer" +// xdrv_09_timers.ino +#define D_CONFIGURE_TIMER "Configure Timer" +#define D_TIMER_PARAMETERS "Timer parameters" +#define D_TIMER_ARM "Arm" +#define D_TIMER_TIME "Time" +#define D_TIMER_DAYS "Days" +#define D_TIMER_REPEAT "Repeat" +#define D_TIMER_DEVICE "Device" +#define D_TIMER_POWER "Power" + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energy Today" #define D_ENERGY_YESTERDAY "Energy Yesterday" diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index dbe241731..5ad7d344c 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -358,6 +358,16 @@ #define D_DOMOTICZ_AIRQUALITY "Calidad del Aire" #define D_DOMOTICZ_UPDATE_TIMER "Intervalo de refresco" +// xdrv_09_timers.ino +#define D_CONFIGURE_TIMER "Configure Timer" +#define D_TIMER_PARAMETERS "Timer parameters" +#define D_TIMER_ARM "Arm" +#define D_TIMER_TIME "Time" +#define D_TIMER_DAYS "Days" +#define D_TIMER_REPEAT "Repeat" +#define D_TIMER_DEVICE "Device" +#define D_TIMER_POWER "Power" + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energía Hoy" #define D_ENERGY_YESTERDAY "Energía Ayer" diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h index 7b9c0137f..64953f3b3 100644 --- a/sonoff/language/fr-FR.h +++ b/sonoff/language/fr-FR.h @@ -358,6 +358,16 @@ #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Update timer" +// xdrv_09_timers.ino +#define D_CONFIGURE_TIMER "Configure Timer" +#define D_TIMER_PARAMETERS "Timer parameters" +#define D_TIMER_ARM "Arm" +#define D_TIMER_TIME "Time" +#define D_TIMER_DAYS "Days" +#define D_TIMER_REPEAT "Repeat" +#define D_TIMER_DEVICE "Device" +#define D_TIMER_POWER "Power" + // xsns_03_energy.ino #define D_ENERGY_TODAY "Energie aujourd'hui" #define D_ENERGY_YESTERDAY "Energie hier" diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h index 82dde4c38..dd6ec3292 100644 --- a/sonoff/language/hu-HU.h +++ b/sonoff/language/hu-HU.h @@ -358,6 +358,16 @@ #define D_DOMOTICZ_AIRQUALITY "Légminőség" #define D_DOMOTICZ_UPDATE_TIMER "Update időzítő" +// xdrv_09_timers.ino +#define D_CONFIGURE_TIMER "Configure Timer" +#define D_TIMER_PARAMETERS "Timer parameters" +#define D_TIMER_ARM "Arm" +#define D_TIMER_TIME "Time" +#define D_TIMER_DAYS "Days" +#define D_TIMER_REPEAT "Repeat" +#define D_TIMER_DEVICE "Device" +#define D_TIMER_POWER "Power" + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Mai Energia" #define D_ENERGY_YESTERDAY "Tegnapi Energia" diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index 4e16869a4..c9134c7dd 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -358,6 +358,16 @@ #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Intervallo di aggiornamento" +// xdrv_09_timers.ino +#define D_CONFIGURE_TIMER "Configure Timer" +#define D_TIMER_PARAMETERS "Timer parameters" +#define D_TIMER_ARM "Arm" +#define D_TIMER_TIME "Time" +#define D_TIMER_DAYS "Days" +#define D_TIMER_REPEAT "Repeat" +#define D_TIMER_DEVICE "Device" +#define D_TIMER_POWER "Power" + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energia Oggi" #define D_ENERGY_YESTERDAY "Energia Ieri" diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h index 53bdb7f67..3b91d3d84 100644 --- a/sonoff/language/nl-NL.h +++ b/sonoff/language/nl-NL.h @@ -110,7 +110,7 @@ #define D_OFF "Uit" #define D_OFFLINE "Offline" #define D_OK "Ok" -#define D_ON "Ann" +#define D_ON "Aan" #define D_ONLINE "Online" #define D_PASSWORD "Wachtwoord" #define D_PORT "Poort" @@ -358,6 +358,16 @@ #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Bijwerk timer" +// xdrv_09_timers.ino +#define D_CONFIGURE_TIMER "Configureer Tijdschakelaar" +#define D_TIMER_PARAMETERS "Tijdschakelaar parameters" +#define D_TIMER_ARM "Actief" +#define D_TIMER_TIME "Tijd" +#define D_TIMER_DAYS "Dagen" +#define D_TIMER_REPEAT "Herhaal" +#define D_TIMER_DEVICE "Uitgang" +#define D_TIMER_POWER "Actie" + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Verbruik vandaag" #define D_ENERGY_YESTERDAY "Verbruik gisteren" diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h index 90a69afb5..f1023e5e4 100644 --- a/sonoff/language/pl-PL.h +++ b/sonoff/language/pl-PL.h @@ -358,6 +358,16 @@ #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Zaktualizuj czasomierz" +// xdrv_09_timers.ino +#define D_CONFIGURE_TIMER "Configure Timer" +#define D_TIMER_PARAMETERS "Timer parameters" +#define D_TIMER_ARM "Arm" +#define D_TIMER_TIME "Time" +#define D_TIMER_DAYS "Days" +#define D_TIMER_REPEAT "Repeat" +#define D_TIMER_DEVICE "Device" +#define D_TIMER_POWER "Power" + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energia Dzisiaj" #define D_ENERGY_YESTERDAY "Energia Wczoraj" diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h index 7d8f0512c..73a8b53ea 100644 --- a/sonoff/language/pt-PT.h +++ b/sonoff/language/pt-PT.h @@ -358,6 +358,16 @@ #define D_DOMOTICZ_AIRQUALITY "Qualidade do Ar" #define D_DOMOTICZ_UPDATE_TIMER "Tempo de atualização" +// xdrv_09_timers.ino +#define D_CONFIGURE_TIMER "Configure Timer" +#define D_TIMER_PARAMETERS "Timer parameters" +#define D_TIMER_ARM "Arm" +#define D_TIMER_TIME "Time" +#define D_TIMER_DAYS "Days" +#define D_TIMER_REPEAT "Repeat" +#define D_TIMER_DEVICE "Device" +#define D_TIMER_POWER "Power" + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Consumo energético de hoje" #define D_ENERGY_YESTERDAY "Consumo energético de ontem" diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h index 640b8bef7..5c5b964e6 100644 --- a/sonoff/language/ru-RU.h +++ b/sonoff/language/ru-RU.h @@ -358,6 +358,16 @@ #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Update timer" +// xdrv_09_timers.ino +#define D_CONFIGURE_TIMER "Configure Timer" +#define D_TIMER_PARAMETERS "Timer parameters" +#define D_TIMER_ARM "Arm" +#define D_TIMER_TIME "Time" +#define D_TIMER_DAYS "Days" +#define D_TIMER_REPEAT "Repeat" +#define D_TIMER_DEVICE "Device" +#define D_TIMER_POWER "Power" + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Энергия Сегодня" #define D_ENERGY_YESTERDAY "Энергия Вчера" diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h index 0cd86bcc8..86c352dbf 100644 --- a/sonoff/language/zh-CN.h +++ b/sonoff/language/zh-CN.h @@ -358,6 +358,16 @@ #define D_DOMOTICZ_AIRQUALITY "空气质量" #define D_DOMOTICZ_UPDATE_TIMER "更新计时器" +// xdrv_09_timers.ino +#define D_CONFIGURE_TIMER "Configure Timer" +#define D_TIMER_PARAMETERS "Timer parameters" +#define D_TIMER_ARM "Arm" +#define D_TIMER_TIME "Time" +#define D_TIMER_DAYS "Days" +#define D_TIMER_REPEAT "Repeat" +#define D_TIMER_DEVICE "Device" +#define D_TIMER_POWER "Power" + // xdrv_03_energy.ino #define D_ENERGY_TODAY "今日用电量" #define D_ENERGY_YESTERDAY "昨日用电量" diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h index c3efc118b..f015232e3 100644 --- a/sonoff/language/zh-TW.h +++ b/sonoff/language/zh-TW.h @@ -358,6 +358,16 @@ #define D_DOMOTICZ_AIRQUALITY "空氣品質" #define D_DOMOTICZ_UPDATE_TIMER "更新計時器" +// xdrv_09_timers.ino +#define D_CONFIGURE_TIMER "Configure Timer" +#define D_TIMER_PARAMETERS "Timer parameters" +#define D_TIMER_ARM "Arm" +#define D_TIMER_TIME "Time" +#define D_TIMER_DAYS "Days" +#define D_TIMER_REPEAT "Repeat" +#define D_TIMER_DEVICE "Device" +#define D_TIMER_POWER "Power" + // xdrv_03_energy.ino #define D_ENERGY_TODAY "今日用電量" #define D_ENERGY_YESTERDAY "昨日用電量" diff --git a/sonoff/settings.h b/sonoff/settings.h index 173958b86..5c18c9ca2 100644 --- a/sonoff/settings.h +++ b/sonoff/settings.h @@ -93,10 +93,10 @@ typedef union { uint32_t data; struct { uint32_t time : 11; // bits 0 - 10 = minutes in a day - uint32_t mday : 5; // bits 11 - 15 = optional day in a month + uint32_t mday : 5; // bits 11 - 15 = 32 days in a month uint32_t days : 7; // bits 16 - 22 = week day mask uint32_t device : 4; // bits 23 - 26 = 16 devices - uint32_t power : 2; // bits 27 - 28 = 4 power states - Off, On, Toggle + uint32_t power : 2; // bits 27 - 28 = 4 power states - Off, On, Toggle, Blink uint32_t repeat : 1; // bit 29 uint32_t arm : 1; // bit 30 uint32_t spare : 1; // bit 31 diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 5de54309a..d49373f67 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -163,6 +163,7 @@ #define NTP_SERVER3 "0.nl.pool.ntp.org" // [NtpServer3] Select third NTP server by name or IP address (93.94.224.67) #define USE_TIMERS // Add support for up to 16 timers (+2k2 code) + #define USE_TIMERS_WEB // Add timer webpage support (+4k5 code) // -- Time - Start Daylight Saving Time and timezone offset from UTC in minutes #define TIME_DST North, Last, Sun, Mar, 2, +120 // Northern Hemisphere, Last sunday in march at 02:00 +120 minutes diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index cc843748f..d314d09e4 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -39,16 +39,19 @@ const char HTTP_HEAD[] PROGMEM = "var cn,x,lt;" "cn=180;" "x=null;" // Allow for abortion + "function eb(s){" + "return document.getElementById(s);" // Save code space + "}" "function u(){" "if(cn>=0){" - "document.getElementById('t').innerHTML='" D_RESTART_IN " '+cn+' " D_SECONDS "';" + "eb('t').innerHTML='" D_RESTART_IN " '+cn+' " D_SECONDS "';" "cn--;" "setTimeout(u,1000);" "}" "}" "function c(l){" - "document.getElementById('s1').value=l.innerText||l.textContent;" - "document.getElementById('p1').focus();" + "eb('s1').value=l.innerText||l.textContent;" + "eb('p1').focus();" "}" "function la(p){" "var a='';" @@ -61,7 +64,7 @@ const char HTTP_HEAD[] PROGMEM = "x.onreadystatechange=function(){" "if(x.readyState==4&&x.status==200){" "var s=x.responseText.replace(/{t}/g,\"\").replace(/{s}/g,\"\").replace(/{c}/g,\"%'>
" + ""; + + +void HandleKNXConfiguration() +{ + char tmp[100]; + String stmp; + + if (HTTP_USER == webserver_state) { + HandleRoot(); + return; + } + AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_KNX); + + if ( WebServer->hasArg("save") ) { + KNX_Save_Settings(); + HandleConfiguration(); + } + else + { + if ( WebServer->hasArg("btn_add") ) { + if ( WebServer->arg("btn_add") == "1" ) { + + stmp = WebServer->arg("GAop"); //option selected + byte GAop = stmp.toInt(); + stmp = WebServer->arg("GA_FNUM"); + byte GA_FNUM = stmp.toInt(); + stmp = WebServer->arg("GA_AREA"); + byte GA_AREA = stmp.toInt(); + stmp = WebServer->arg("GA_FDEF"); + byte GA_FDEF = stmp.toInt(); + + KNX_ADD_GA( GAop, GA_FNUM, GA_AREA, GA_FDEF ); + + } + else + { + + stmp = WebServer->arg("CBop"); //option selected + byte CBop = stmp.toInt(); + stmp = WebServer->arg("CB_FNUM"); + byte CB_FNUM = stmp.toInt(); + stmp = WebServer->arg("CB_AREA"); + byte CB_AREA = stmp.toInt(); + stmp = WebServer->arg("CB_FDEF"); + byte CB_FDEF = stmp.toInt(); + + KNX_ADD_CB( CBop, CB_FNUM, CB_AREA, CB_FDEF ); + + } + } + else if ( WebServer->hasArg("btn_del_ga") ) + { + + stmp = WebServer->arg("btn_del_ga"); + byte GA_NUM = stmp.toInt(); + + KNX_DEL_GA(GA_NUM); + + } + else if ( WebServer->hasArg("btn_del_cb") ) + { + + stmp = WebServer->arg("btn_del_cb"); + byte CB_NUM = stmp.toInt(); + + KNX_DEL_CB(CB_NUM); + + } + + String page = FPSTR(HTTP_HEAD); + page.replace(F("{v}"), FPSTR(S_CONFIGURE_KNX)); + page += FPSTR(HTTP_HEAD_STYLE); + page.replace(F("340px"), F("530px")); + page += FPSTR(HTTP_FORM_KNX); + KNX_physs_addr.value = Settings.knx_physsical_addr; + page.replace(F("{kna"), String(KNX_physs_addr.pa.area)); + page.replace(F("{knl"), String(KNX_physs_addr.pa.line)); + page.replace(F("{knm"), String(KNX_physs_addr.pa.member)); + if ( Settings.flag.knx_enabled ) { page += F(" checked"); } + + page += FPSTR(HTTP_FORM_KNX2); + for (byte i = 0; i < KNX_MAX_device_param ; i++) + { + if ( device_param[i].show ) + { + page += FPSTR(HTTP_FORM_KNX_OPT); + page.replace(F("{vop}"), String(device_param[i].type)); + page.replace(F("{nop}"), String(device_param_ga[i])); + } + } + page += F(" -> "); + page += FPSTR(HTTP_FORM_KNX_GA); + page.replace(F("GAfnum"), F("GA_FNUM")); + page.replace(F("GAarea"), F("GA_AREA")); + page.replace(F("GAfdef"), F("GA_FDEF")); + page.replace(F("GAfnum"), F("GA_FNUM")); + page.replace(F("GAarea"), F("GA_AREA")); + page.replace(F("GAfdef"), F("GA_FDEF")); + page += FPSTR(HTTP_FORM_KNX_ADD_BTN); + page.replace(F("{btnval}"), String(1)); + if (Settings.knx_GA_registered < MAX_KNX_GA) { + page.replace(F("btndis"), F(" ")); + } + else + { + page.replace(F("btndis"), F("disabled")); + } + page.replace(F("fncbtnadd"), F("GAwarning")); + for (byte i = 0; i < Settings.knx_GA_registered ; ++i) + { + if ( Settings.knx_GA_param[i] ) + { + page += FPSTR(HTTP_FORM_KNX_ADD_TABLE_ROW); + page.replace(F("{opval}"), String(i+1)); + page.replace(F("{optex}"), String(device_param_ga[Settings.knx_GA_param[i]-1])); + KNX_addr.value = Settings.knx_GA_addr[i]; + page.replace(F("GAfnum"), String(KNX_addr.ga.area)); + page.replace(F("GAarea"), String(KNX_addr.ga.line)); + page.replace(F("GAfdef"), String(KNX_addr.ga.member)); + } + } + page += FPSTR(HTTP_FORM_KNX3); + page += FPSTR(HTTP_FORM_KNX_GA); + page.replace(F("GAfnum"), F("CB_FNUM")); + page.replace(F("GAarea"), F("CB_AREA")); + page.replace(F("GAfdef"), F("CB_FDEF")); + page.replace(F("GAfnum"), F("CB_FNUM")); + page.replace(F("GAarea"), F("CB_AREA")); + page.replace(F("GAfdef"), F("CB_FDEF")); + page += FPSTR(HTTP_FORM_KNX4); + for (byte i = 0; i < KNX_MAX_device_param ; i++) + { + if ( device_param[i].show ) + { + page += FPSTR(HTTP_FORM_KNX_OPT); + page.replace(F("{vop}"), String(device_param[i].type)); + page.replace(F("{nop}"), String(device_param_cb[i])); + } + } + page += F(" "); + page += FPSTR(HTTP_FORM_KNX_ADD_BTN); + page.replace(F("{btnval}"), String(2)); + if (Settings.knx_CB_registered < MAX_KNX_CB) { + page.replace(F("btndis"), F(" ")); + } + else + { + page.replace(F("btndis"), F("disabled")); + } + page.replace(F("fncbtnadd"), F("CBwarning")); + for (byte i = 0; i < Settings.knx_CB_registered ; ++i) + { + if ( Settings.knx_CB_param[i] ) + { + page += FPSTR(HTTP_FORM_KNX_ADD_TABLE_ROW2); + page.replace(F("{opval}"), String(i+1)); + page.replace(F("{optex}"), String(device_param_cb[Settings.knx_CB_param[i]-1])); + KNX_addr.value = Settings.knx_CB_addr[i]; + page.replace(F("GAfnum"), String(KNX_addr.ga.area)); + page.replace(F("GAarea"), String(KNX_addr.ga.line)); + page.replace(F("GAfdef"), String(KNX_addr.ga.member)); + } + } + page += F("
\").replace(/{m}/g,\"\").replace(/{e}/g,\"
\").replace(/}2/g,\"\");" - "document.getElementById('i').innerHTML=s;" + "eb('i').innerHTML=s;" "}" ""; const char HTTP_MSG_SLIDER1[] PROGMEM = @@ -180,6 +183,11 @@ const char HTTP_BTN_RSTRT[] PROGMEM = "
"; const char HTTP_BTN_MENU2[] PROGMEM = "
" +#ifdef USE_TIMERS +#ifdef USE_TIMERS_WEB + "
" +#endif // USE_TIMERS_WEB +#endif // USE_TIMERS "
"; const char HTTP_BTN_MENU3[] PROGMEM = "
" @@ -206,7 +214,7 @@ const char HTTP_BTN_CONF[] PROGMEM = "

"; const char HTTP_FORM_MODULE[] PROGMEM = "
 " D_MODULE_PARAMETERS " 
" - "" + "" "
" D_MODULE_TYPE " ({mt)

"; const char HTTP_LNK_ITEM[] PROGMEM = "
{v} {i} {r}%
"; @@ -214,7 +222,7 @@ const char HTTP_LNK_SCAN[] PROGMEM = "
"; const char HTTP_FORM_WIFI[] PROGMEM = "
 " D_WIFI_PARAMETERS " " - "" + "" "
" D_AP1_SSID " (" STA_SSID1 ")

" "
" D_AP1_PASSWORD "

" "
" D_AP2_SSID " (" STA_SSID2 ")

" @@ -222,7 +230,7 @@ const char HTTP_FORM_WIFI[] PROGMEM = "
" D_HOSTNAME " (" WIFI_HOSTNAME ")

"; const char HTTP_FORM_MQTT[] PROGMEM = "
 " D_MQTT_PARAMETERS " " - "" + "" "
" D_HOST " (" MQTT_HOST ")

" "
" D_PORT " (" STR(MQTT_PORT) ")

" "
" D_CLIENT " ({m0)

" @@ -232,7 +240,7 @@ const char HTTP_FORM_MQTT[] PROGMEM = "
" D_FULL_TOPIC " (" MQTT_FULLTOPIC ")

"; const char HTTP_FORM_LOG1[] PROGMEM = "
 " D_LOGGING_PARAMETERS " " - ""; + ""; const char HTTP_FORM_LOG2[] PROGMEM = "
{b0 ({b1)

"; const char HTTP_FORM_OTHER[] PROGMEM = "
 " D_OTHER_PARAMETERS " " - "" + "" "
" D_WEB_ADMIN_PASSWORD "

" "
" D_MQTT_ENABLE "
"; const char HTTP_FORM_OTHER2[] PROGMEM = @@ -274,7 +282,7 @@ const char HTTP_FORM_UPG[] PROGMEM = const char HTTP_FORM_RST_UPG[] PROGMEM = "" "

" - "
" + "
" "
" "" ""; @@ -330,6 +338,11 @@ void StartWebserver(int type, IPAddress ipweb) WebServer->on("/", HandleRoot); WebServer->on("/cn", HandleConfiguration); WebServer->on("/md", HandleModuleConfiguration); +#ifdef USE_TIMERS +#ifdef USE_TIMERS_WEB + WebServer->on("/tm", HandleTimerConfiguration); +#endif // USE_TIMERS_WEB +#endif // USE_TIMERS WebServer->on("/w1", HandleWifiConfigurationWithScan); WebServer->on("/w0", HandleWifiConfiguration); if (Settings.flag.mqtt_enabled) { @@ -1001,17 +1014,16 @@ void HandleSaveSettings() char stemp[TOPSZ]; char stemp2[TOPSZ]; - byte what = 0; - byte restart; String result = ""; AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_SAVE_CONFIGURATION); char tmp[100]; - WebGetArg("w", tmp, sizeof(tmp)); - if (strlen(tmp)) { - what = atoi(tmp); - } + WebGetArg("w", tmp, sizeof(tmp)); // Returns "5,1" where 5 is config type and 1 is restart flag + char *p = tmp; + uint8_t what = strtol(p, &p, 10); + p++; // Skip comma + uint8_t restart = strtol(p, &p, 10); switch (what) { case 1: WebGetArg("h", tmp, sizeof(tmp)); @@ -1085,6 +1097,13 @@ void HandleSaveSettings() Settings.seriallog_level, Settings.weblog_level, Settings.syslog_level, Settings.syslog_host, Settings.syslog_port, Settings.tele_period); AddLog(LOG_LEVEL_INFO); break; +#ifdef USE_TIMERS +#ifdef USE_TIMERS_WEB + case 7: + TimerSaveSettings(); + break; +#endif // USE_TIMERS_WEB +#endif // USE_TIMERS #ifdef USE_DOMOTICZ case 4: DomoticzSaveSettings(); @@ -1136,8 +1155,6 @@ void HandleSaveSettings() break; } - WebGetArg("r", tmp, sizeof(tmp)); - restart = (!strlen(tmp)) ? 1 : atoi(tmp); if (restart) { String page = FPSTR(HTTP_HEAD); page.replace(F("{v}"), FPSTR(S_SAVE_CONFIGURATION)); diff --git a/sonoff/xdrv_05_domoticz.ino b/sonoff/xdrv_05_domoticz.ino index 3e1dfdc49..5aa6a7c43 100644 --- a/sonoff/xdrv_05_domoticz.ino +++ b/sonoff/xdrv_05_domoticz.ino @@ -22,7 +22,7 @@ #ifdef USE_WEBSERVER const char HTTP_FORM_DOMOTICZ[] PROGMEM = "
 " D_DOMOTICZ_PARAMETERS " 
" - "" + "" "
"; const char HTTP_FORM_DOMOTICZ_RELAY[] PROGMEM = "" diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino index 350f49dfd..d84b14358 100644 --- a/sonoff/xdrv_09_timers.ino +++ b/sonoff/xdrv_09_timers.ino @@ -36,7 +36,7 @@ enum TimerCommands { CMND_TIMER, CMND_TIMERS }; const char kTimerCommands[] PROGMEM = D_CMND_TIMER "|" D_CMND_TIMERS ; -power_t fired = 0; +uint16_t fired = 0; void TimerEverySecond() { @@ -45,6 +45,7 @@ void TimerEverySecond() uint8_t days = 1 << (RtcTime.day_of_week -1); for (byte i = 0; i < MAX_TIMERS; i++) { + if (Settings.timer[i].device >= devices_present) Settings.timer[i].data = 0; // Reset timer due to change in devices present if (Settings.timer[i].arm) { if (time == Settings.timer[i].time) { if (!bitRead(fired, i) && (Settings.timer[i].days & days)) { @@ -88,67 +89,74 @@ boolean TimerCommand() int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic, kTimerCommands); if ((CMND_TIMER == command_code) && (index > 0) && (index <= MAX_TIMERS)) { uint8_t error = 0; - if (XdrvMailbox.data_len) { - StaticJsonBuffer<128> jsonBuffer; - JsonObject& root = jsonBuffer.parseObject(dataBufUc); - if (!root.success()) { - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_TIMER "%d\":\"" D_JSON_INVALID_JSON "\"}"), index); // JSON decode failed - error = 1; - } - else { - char parm_uc[10]; - - index--; - if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_ARM))].success()) { - Settings.timer[index].arm = (root[parm_uc] != 0); + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= MAX_TIMERS)) { + if (XdrvMailbox.payload == 0) { + Settings.timer[index -1].data = 0; // Clear timer + } else { + Settings.timer[index -1].data = Settings.timer[XdrvMailbox.payload -1].data; // Copy timer } - if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_TIME))].success()) { - uint16_t itime = 0; - uint8_t value = 0; - char time_str[10]; + } else { + StaticJsonBuffer<128> jsonBuffer; + JsonObject& root = jsonBuffer.parseObject(dataBufUc); + if (!root.success()) { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_TIMER "%d\":\"" D_JSON_INVALID_JSON "\"}"), index); // JSON decode failed + error = 1; + } + else { + char parm_uc[10]; + index--; + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_ARM))].success()) { + Settings.timer[index].arm = (root[parm_uc] != 0); + } + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_TIME))].success()) { + uint16_t itime = 0; + uint8_t value = 0; + char time_str[10]; - snprintf(time_str, sizeof(time_str), root[parm_uc]); - const char *substr = strtok(time_str, ":"); - if (substr != NULL) { - value = atoi(substr); - if (value > 23) value = 23; - itime = value * 60; - substr = strtok(NULL, ":"); + snprintf(time_str, sizeof(time_str), root[parm_uc]); + const char *substr = strtok(time_str, ":"); if (substr != NULL) { value = atoi(substr); - if (value > 59) value = 59; - itime += value; + if (value > 23) value = 23; + itime = value * 60; + substr = strtok(NULL, ":"); + if (substr != NULL) { + value = atoi(substr); + if (value > 59) value = 59; + itime += value; + } + } + Settings.timer[index].time = itime; + } + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_DAYS))].success()) { + // SMTWTFS = 1234567 = 0011001 = 00TW00S = --TW--S + Settings.timer[index].days = 0; + const char *tday = root[parm_uc]; + char ch = '.'; + + uint8_t i = 0; + while ((ch != '\0') && (i < 7)) { + ch = *tday++; + if (ch == '-') ch = '0'; + uint8_t mask = 1 << i++; + Settings.timer[index].days |= (ch == '0') ? 0 : mask; } } - Settings.timer[index].time = itime; - } - if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_DAYS))].success()) { - // SMTWTFS = 1234567 = 0011001 = 00TW00S = --TW--S - Settings.timer[index].days = 0; - const char *tday = root[parm_uc]; - char ch = '.'; - - uint8_t i = 0; - while ((ch != '\0') && (i < 7)) { - ch = *tday++; - if (ch == '-') ch = '0'; - uint8_t mask = 1 << i++; - Settings.timer[index].days |= (ch == '0') ? 0 : mask; + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_REPEAT))].success()) { + Settings.timer[index].repeat = (root[parm_uc] != 0); } - } - if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_REPEAT))].success()) { - Settings.timer[index].repeat = (root[parm_uc] != 0); - } - if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_DEVICE))].success()) { - Settings.timer[index].device = ((uint8_t)root[parm_uc] -1) & 0x0F; - } - if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_POWER))].success()) { - Settings.timer[index].power = (uint8_t)root[parm_uc] & 0x03; - } - if (Settings.timer[index].arm) bitClear(fired, index); + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_DEVICE))].success()) { + uint8_t device = ((uint8_t)root[parm_uc] -1) & 0x0F; + Settings.timer[index].device = (device < devices_present) ? device : devices_present -1; + } + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_POWER))].success()) { + Settings.timer[index].power = (uint8_t)root[parm_uc] & 0x03; + } + if (Settings.timer[index].arm) bitClear(fired, index); - index++; + index++; + } } } if (!error) { @@ -181,6 +189,150 @@ boolean TimerCommand() return serviced; } +/*********************************************************************************************\ + * Presentation +\*********************************************************************************************/ + +#ifdef USE_WEBSERVER +#ifdef USE_TIMERS_WEB +const char HTTP_TIMER_SCRIPT[] PROGMEM = + "var pt=[],ct=99;" + "function qs(s){" // Save code space + "return document.querySelector(s);" + "}" + "function ce(i,q){" // Create select option + "var o=document.createElement('option');" + "o.textContent=i;" + "q.appendChild(o);" + "}" + "function st(){" // Save parameters to hidden area + "var d,h,i,m,n,s,p;" + "h=qs('#ho');" + "m=qs('#mi');" + "d=qs('#d1');" + "s=0;" + "n=1<<30;if(eb('a0').checked){s|=n;}" // Get arm + "n=1<<29;if(eb('r0').checked){s|=n;}" // Get repeat + "for(i=0;i<7;i++){n=1<<(16+i);if(eb('w'+i).checked){s|=n;}}" // Get weekdays + "s|=(eb('p1').value<<27);" // Get power + "s|=(d.selectedIndex<<23);" // Get device + "s|=((h.selectedIndex*60)+m.selectedIndex)&0x7FF;" // Get time + "pt[ct]=s;" + "eb('t0').value=pt.join();" // Save parameters from array to hidden area + "}" + "function ot(t,e){" + "var d,h,i,m,n,s,tl,p,q;" + "h=qs('#ho');" + "m=qs('#mi');" + "d=qs('#d1');" + "if(ct==99){" // Do this once + "pt=eb('t0').value.split(',').map(Number);" // Get parameters from hidden area to array + "for(i=0;i<=23;i++){ce((i<10)?('0'+i):i,h);}" // Create hours select options + "for(i=0;i<=59;i++){ce((i<10)?('0'+i):i,m);}" // Create minutes select options + "for(i=0;i<}1;i++){ce(i+1,d);}" // Create devices + "}else{" + "st();" // Save changes + "}" + "tl=document.getElementsByClassName('tl');" // Remove the background color of all tablinks/buttons + "for(i=0;i>(16+i))&1;eb('w'+i).checked=p;}" // Set weekdays + "p=(s>>23)&0xF;d.value=p+1;" // Set device + "p=(s>>27)&3;eb('p1').value=p;" // Set power + "p=(s>>29)&1;eb('r0').checked=p;" // Set repeat + "p=(s>>30)&1;eb('a0').checked=p;" // Set arm + "ct=t;" + "}"; +const char HTTP_TIMER_STYLE[] PROGMEM = + ".tl{float:left;border-radius:0;border:1px solid #fff;padding:1px;width:6.25%;}" + ""; +const char HTTP_FORM_TIMER[] PROGMEM = + "
 " D_TIMER_PARAMETERS " " + " " + "" D_TIMER_POWER " " + "
" + "
" +// "Time  " + "" D_TIMER_TIME "  :  " + "" D_TIMER_ARM " " + "" D_TIMER_REPEAT "" + "

" + "
"; +const char HTTP_FORM_TIMER2[] PROGMEM = + "type='submit' onclick='st();this.form.submit();'"; + +const char S_CONFIGURE_TIMER[] PROGMEM = D_CONFIGURE_TIMER; + +void HandleTimerConfiguration() +{ + if (HTTP_USER == webserver_state) { + HandleRoot(); + return; + } + AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_TIMER); + + String page = FPSTR(HTTP_HEAD); + page.replace(F("{v}"), FPSTR(S_CONFIGURE_TIMER)); + page += FPSTR(HTTP_TIMER_SCRIPT); + page += FPSTR(HTTP_HEAD_STYLE); + page.replace(F(""), FPSTR(HTTP_TIMER_STYLE)); + page += FPSTR(HTTP_FORM_TIMER); + for (byte i = 0; i < MAX_TIMERS; i++) { + if (i > 0) page += F(","); + page += String(Settings.timer[i].data); + } + page += F("' hidden>
"); + for (byte i = 0; i < MAX_TIMERS; i++) { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR(""), + i, (0 == i) ? " id='dP'" : "", i +1); + page += mqtt_data; + } + page += FPSTR(HTTP_FORM_TIMER1); + page.replace(F("}1"), String(devices_present)); + char day[4] = { 0 }; + for (byte i = 0; i < 7; i++) { + strncpy_P(day, PSTR(D_DAY3LIST) + (i *3), 3); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s"), i, i, day); + page += mqtt_data; + } + page += F("
"); + + page += FPSTR(HTTP_FORM_END); + page.replace(F("type='submit'"), FPSTR(HTTP_FORM_TIMER2)); + page += F(""); // Get the element with id='defaultOpen' and click on it + page += FPSTR(HTTP_BTN_CONF); + ShowPage(page); +} + +void TimerSaveSettings() +{ + char tmp[MAX_TIMERS *12]; // Need space for MAX_TIMERS x 10 digit numbers separated by a comma + + WebGetArg("t0", tmp, sizeof(tmp)); + char *p = tmp; + for (byte i = 0; i < MAX_TIMERS; i++) { + uint32_t data = strtol(p, &p, 10); + p++; // Skip comma + if ((data & 0x7FF) < 1440) Settings.timer[i].data = data; + } +} +#endif // USE_TIMERS_WEB +#endif // USE_WEBSERVER + /*********************************************************************************************\ * Interface \*********************************************************************************************/ From ae07f77ab9d1d794c88ad708f621e0b5a3501fda Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 29 Mar 2018 10:13:44 +0200 Subject: [PATCH 038/136] Update Spanish language file Update Spanish language file (#2283) --- sonoff/language/es-AR.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index 5ad7d344c..bf35cc807 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -359,14 +359,14 @@ #define D_DOMOTICZ_UPDATE_TIMER "Intervalo de refresco" // xdrv_09_timers.ino -#define D_CONFIGURE_TIMER "Configure Timer" -#define D_TIMER_PARAMETERS "Timer parameters" -#define D_TIMER_ARM "Arm" -#define D_TIMER_TIME "Time" -#define D_TIMER_DAYS "Days" -#define D_TIMER_REPEAT "Repeat" -#define D_TIMER_DEVICE "Device" -#define D_TIMER_POWER "Power" +#define D_CONFIGURE_TIMER "Configuración Temporizadores" +#define D_TIMER_PARAMETERS "Parámetros de Temporizadores" +#define D_TIMER_ARM "Activo" +#define D_TIMER_TIME "Hora" +#define D_TIMER_DAYS "Días" +#define D_TIMER_REPEAT "Repetir" +#define D_TIMER_DEVICE "Salida" +#define D_TIMER_POWER "Estado" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energía Hoy" From a935f92998b0510fb8f7d310aa541447862f59f7 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 29 Mar 2018 13:03:13 +0200 Subject: [PATCH 039/136] v5.12.0i - Add HAss Button discovery 5.12.0i * Add Home Assistant MQTT Discovery for Buttons (#2277) --- sonoff/_releasenotes.ino | 1 + sonoff/settings.ino | 6 +- sonoff/sonoff.ino | 10 ++-- sonoff/user_config.h | 2 + sonoff/webserver.ino | 2 +- sonoff/xdrv_00_mqtt.ino | 4 +- sonoff/xdrv_07_home_assistant.ino | 99 +++++++++++++++++++++++++++---- 7 files changed, 102 insertions(+), 22 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 5583d95fc..5a9ad3773 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -2,6 +2,7 @@ * Add 16 timers using commands Timer and Timers (#1091) * Add commands Timer 0 to clear timer and Timer 1..16 to copy timer * Add optional Timer configuration webpage to be enabled in user_config.h with define USE_TIMERS_WEB + * Add Home Assistant MQTT Discovery for Buttons (#2277) * Change webpage parameter communication * * 5.12.0h diff --git a/sonoff/settings.ino b/sonoff/settings.ino index d17f33d35..e1b0a7dcd 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -494,7 +494,7 @@ void SettingsDefaultSet2() strlcpy(Settings.mqtt_user, MQTT_USER, sizeof(Settings.mqtt_user)); strlcpy(Settings.mqtt_pwd, MQTT_PASS, sizeof(Settings.mqtt_pwd)); strlcpy(Settings.mqtt_topic, MQTT_TOPIC, sizeof(Settings.mqtt_topic)); - strlcpy(Settings.button_topic, "0", sizeof(Settings.button_topic)); + strlcpy(Settings.button_topic, MQTT_BUTTON_TOPIC, sizeof(Settings.button_topic)); strlcpy(Settings.mqtt_grptopic, MQTT_GRPTOPIC, sizeof(Settings.mqtt_grptopic)); Settings.tele_period = TELE_PERIOD; @@ -544,7 +544,7 @@ void SettingsDefaultSet2() SettingsDefaultSet_3_9_3(); - strlcpy(Settings.switch_topic, "0", sizeof(Settings.switch_topic)); + strlcpy(Settings.switch_topic, MQTT_SWITCH_TOPIC, sizeof(Settings.switch_topic)); strlcpy(Settings.web_password, WEB_PASSWORD, sizeof(Settings.web_password)); @@ -744,7 +744,7 @@ void SettingsDelta() SettingsDefaultSet_3_2_4(); } if (Settings.version < 0x03020500) { // 3.2.5 - Add parameter - GetMqttClient(Settings.friendlyname[0], Settings.mqtt_client, sizeof(Settings.friendlyname[0])); + Format(Settings.friendlyname[0], Settings.mqtt_client, sizeof(Settings.friendlyname[0])); strlcpy(Settings.friendlyname[1], FRIENDLY_NAME"2", sizeof(Settings.friendlyname[1])); strlcpy(Settings.friendlyname[2], FRIENDLY_NAME"3", sizeof(Settings.friendlyname[2])); strlcpy(Settings.friendlyname[3], FRIENDLY_NAME"4", sizeof(Settings.friendlyname[3])); diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 96ade5005..47ee15b9d 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -196,7 +196,7 @@ String backlog[MAX_BACKLOG]; // Command backlog /********************************************************************************************/ -char* GetMqttClient(char* output, const char* input, int size) +char* Format(char* output, const char* input, int size) { char *token; uint8_t digits = 0; @@ -1107,9 +1107,11 @@ boolean send_button_power(byte key, byte device, byte state) char stopic[TOPSZ]; char scommand[CMDSZ]; + char key_topic[sizeof(Settings.button_topic)]; boolean result = false; - char *key_topic = (key) ? Settings.switch_topic : Settings.button_topic; + char *tmp = (key) ? Settings.switch_topic : Settings.button_topic; + Format(key_topic, tmp, sizeof(key_topic)); if (Settings.flag.mqtt_enabled && MqttIsConnected() && (strlen(key_topic) != 0) && strcmp(key_topic, "0")) { if (!key && (device > devices_present)) device = 1; GetTopic_P(stopic, CMND, key_topic, GetPowerDevice(scommand, device, sizeof(scommand), key)); @@ -2328,8 +2330,8 @@ void setup() SetSerialBaudrate(baudrate); - GetMqttClient(mqtt_client, Settings.mqtt_client, sizeof(mqtt_client)); - GetMqttClient(mqtt_topic, Settings.mqtt_topic, sizeof(mqtt_topic)); + Format(mqtt_client, Settings.mqtt_client, sizeof(mqtt_client)); + Format(mqtt_topic, Settings.mqtt_topic, sizeof(mqtt_topic)); if (strstr(Settings.hostname, "%")) { strlcpy(Settings.hostname, WIFI_HOSTNAME, sizeof(Settings.hostname)); diff --git a/sonoff/user_config.h b/sonoff/user_config.h index d49373f67..178f414f6 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -126,6 +126,8 @@ // %topic% token options (also ButtonTopic and SwitchTopic) #define MQTT_TOPIC PROJECT // [Topic] (unique) MQTT device topic #define MQTT_GRPTOPIC "sonoffs" // [GroupTopic] MQTT Group topic +#define MQTT_BUTTON_TOPIC "0" // [ButtonTopic] MQTT button topic +#define MQTT_SWITCH_TOPIC "0" // [SwitchTopic] MQTT switch topic #define MQTT_CLIENT_ID "DVES_%06X" // [MqttClient] Also fall back topic using Chip Id = last 6 characters of MAC address // -- MQTT - Telemetry ---------------------------- diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index d314d09e4..45bde262f 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -879,7 +879,7 @@ void HandleMqttConfiguration() page += FPSTR(HTTP_HEAD_STYLE); page += FPSTR(HTTP_FORM_MQTT); char str[sizeof(Settings.mqtt_client)]; - page.replace(F("{m0"), GetMqttClient(str, MQTT_CLIENT_ID, sizeof(Settings.mqtt_client))); + page.replace(F("{m0"), Format(str, MQTT_CLIENT_ID, sizeof(Settings.mqtt_client))); page.replace(F("{m1"), Settings.mqtt_host); page.replace(F("{m2"), String(Settings.mqtt_port)); page.replace(F("{m3"), Settings.mqtt_client); diff --git a/sonoff/xdrv_00_mqtt.ino b/sonoff/xdrv_00_mqtt.ino index 6a87f1f25..c1f2867da 100644 --- a/sonoff/xdrv_00_mqtt.ino +++ b/sonoff/xdrv_00_mqtt.ino @@ -637,7 +637,7 @@ bool MqttCommand() if ((data_len > 0) && (data_len < sizeof(Settings.button_topic))) { MakeValidMqtt(0, dataBuf); if (!strcmp(dataBuf, mqtt_client)) payload = 1; - strlcpy(Settings.button_topic, (!strcmp(dataBuf,"0")) ? "" : (1 == payload) ? mqtt_topic : dataBuf, sizeof(Settings.button_topic)); + strlcpy(Settings.button_topic, (!strcmp(dataBuf,"0")) ? "" : (1 == payload) ? MQTT_BUTTON_TOPIC : dataBuf, sizeof(Settings.button_topic)); } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, Settings.button_topic); } @@ -645,7 +645,7 @@ bool MqttCommand() if ((data_len > 0) && (data_len < sizeof(Settings.switch_topic))) { MakeValidMqtt(0, dataBuf); if (!strcmp(dataBuf, mqtt_client)) payload = 1; - strlcpy(Settings.switch_topic, (!strcmp(dataBuf,"0")) ? "" : (1 == payload) ? mqtt_topic : dataBuf, sizeof(Settings.switch_topic)); + strlcpy(Settings.switch_topic, (!strcmp(dataBuf,"0")) ? "" : (1 == payload) ? MQTT_SWITCH_TOPIC : dataBuf, sizeof(Settings.switch_topic)); } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, Settings.switch_topic); } diff --git a/sonoff/xdrv_07_home_assistant.ino b/sonoff/xdrv_07_home_assistant.ino index eaec8686e..87a07a6f6 100644 --- a/sonoff/xdrv_07_home_assistant.ino +++ b/sonoff/xdrv_07_home_assistant.ino @@ -31,6 +31,16 @@ const char HASS_DISCOVER_SWITCH[] PROGMEM = "\"payload_available\":\"" D_ONLINE "\"," // Online "\"payload_not_available\":\"" D_OFFLINE "\""; // Offline +const char HASS_DISCOVER_BUTTON[] PROGMEM = + "{\"name\":\"%s\"," // dualr2 1 BTN + "\"state_topic\":\"%s\"," // cmnd/dualr2/POWER (implies "\"optimistic\":\"false\",") +// "\"value_template\":\"{{value_json.%s}}\"," // POWER2 + "\"payload_on\":\"%s\"," // TOGGLE +// "\"optimistic\":\"false\"," // false is Hass default when state_topic is set + "\"availability_topic\":\"%s\"," // tele/dualr2/LWT + "\"payload_available\":\"" D_ONLINE "\"," // Online + "\"payload_not_available\":\"" D_OFFLINE "\""; // Offline + const char HASS_DISCOVER_LIGHT_DIMMER[] PROGMEM = "%s,\"brightness_command_topic\":\"%s\"," // cmnd/led2/Dimmer "\"brightness_state_topic\":\"%s\"," // stat/led2/RESULT @@ -55,32 +65,26 @@ const char HASS_DISCOVER_LIGHT_SCHEME[] PROGMEM = "\"effect_value_template\":\"{{value_json." D_CMND_SCHEME "}}\"," "\"effect_list\":[\"0\",\"1\",\"2\",\"3\",\"4\"]"; // string list with reference to scheme parameter. Currently only supports numbers 0 to 11 as it make the mqtt string too long */ -void HAssDiscovery() + +void HAssDiscoverRelay() { char sidx[8]; char stopic[TOPSZ]; bool is_light = false; - // Configure Tasmota for default Home Assistant parameters to keep discovery message as short as possible - if (Settings.flag.hass_discovery) { - Settings.flag.mqtt_response = 0; // Response always as RESULT and not as uppercase command - Settings.flag.decimal_text = 1; // Respond with decimal color values -// Settings.light_scheme = 0; // To just control color it needs to be Scheme 0 -// strncpy_P(Settings.mqtt_fulltopic, PSTR("%prefix%/%topic%/"), sizeof(Settings.mqtt_fulltopic)); // Make MQTT topic as short as possible to make this process posible within MQTT_MAX_PACKET_SIZE - } - - for (int i = 1; i <= devices_present; i++) { + for (int i = 1; i <= MAX_RELAYS; i++) { is_light = ((i == devices_present) && (light_type)); - mqtt_data[0] = '\0'; + mqtt_data[0] = '\0'; // Clear retained message snprintf_P(sidx, sizeof(sidx), PSTR("_%d"), i); // Clear "other" topic first in case the device has been reconfigured snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/%s/%s%s/config"), (is_light) ? "switch" : "light", mqtt_topic, sidx); MqttPublish(stopic, true); + // Clear or Set topic snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/%s/%s%s/config"), (is_light) ? "light" : "switch", mqtt_topic, sidx); - if (Settings.flag.hass_discovery) { + if (Settings.flag.hass_discovery && (i <= devices_present)) { char name[33]; char value_template[33]; char command_topic[TOPSZ]; @@ -129,6 +133,77 @@ void HAssDiscovery() } } +void HAssDiscoverButton() +{ + char sidx[8]; + char stopic[TOPSZ]; + char key_topic[sizeof(Settings.button_topic)]; + + // Send info about buttons + char *tmp = Settings.button_topic; + Format(key_topic, tmp, sizeof(key_topic)); + if ((strlen(key_topic) != 0) && strcmp(key_topic, "0")) { + for (byte button_index = 0; button_index < MAX_KEYS; button_index++) { + uint8_t button_present = 0; + + if (!button_index && ((SONOFF_DUAL == Settings.module) || (CH4 == Settings.module))) { + button_present = 1; + } else { + if (pin[GPIO_KEY1 + button_index] < 99) { + button_present = 1; + } + } + + mqtt_data[0] = '\0'; // Clear retained message + + // Clear or Set topic + snprintf_P(sidx, sizeof(sidx), PSTR("_%d"), button_index+1); + snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/%s/%s%s/config"), "binary_sensor", key_topic, sidx); + + if (Settings.flag.hass_discovery && button_present) { + char name[33]; + char value_template[33]; + char state_topic[TOPSZ]; + char availability_topic[TOPSZ]; + + if (button_index+1 > MAX_FRIENDLYNAMES) { + snprintf_P(name, sizeof(name), PSTR("%s %d BTN"), Settings.friendlyname[0], button_index+1); + } else { + snprintf_P(name, sizeof(name), PSTR("%s BTN"), Settings.friendlyname[button_index]); + } + GetPowerDevice(value_template, button_index+1, sizeof(value_template)); + GetTopic_P(state_topic, CMND, key_topic, value_template); // State of button is sent as CMND TOGGLE + GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT); + snprintf_P(mqtt_data, sizeof(mqtt_data), HASS_DISCOVER_BUTTON, name, state_topic, Settings.state_text[2], availability_topic); + + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}"), mqtt_data); + } + MqttPublish(stopic, true); + } + } +} + +void HAssDiscovery() +{ + // Configure Tasmota for default Home Assistant parameters to keep discovery message as short as possible + if (Settings.flag.hass_discovery) { + Settings.flag.mqtt_response = 0; // Response always as RESULT and not as uppercase command + Settings.flag.decimal_text = 1; // Respond with decimal color values +// Settings.light_scheme = 0; // To just control color it needs to be Scheme 0 +// strncpy_P(Settings.mqtt_fulltopic, PSTR("%prefix%/%topic%/"), sizeof(Settings.mqtt_fulltopic)); // Make MQTT topic as short as possible to make this process posible within MQTT_MAX_PACKET_SIZE + } + + // Send info about relays and lights + HAssDiscoverRelay(); + + // Send info about buttons + HAssDiscoverButton(); + + // TODO: Send info about switches + + // TODO: Send info about sensors +} + /*********************************************************************************************\ * Interface \*********************************************************************************************/ From dabb4deefc1bed9748b165744dc3e3bac412d973 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 29 Mar 2018 14:01:38 +0200 Subject: [PATCH 040/136] Cleanup restart for non-HAss users Cleanup restart for non-HAss users --- sonoff/sonoff.ino | 8 +++++++- sonoff/xdrv_07_home_assistant.ino | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 47ee15b9d..9703b62e8 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -572,7 +572,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) switch (index) { case 3: // mqtt case 15: // pwm_control - case 19: // hass_discovery +// case 19: // hass_discovery restart_flag = 2; case 0: // save_state case 1: // button_restrict @@ -587,6 +587,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) case 16: // ws_clock_reverse case 17: // decimal_text case 18: // light_signal + case 19: // hass_discovery case 20: // not_power_linked case 21: // no_power_on_check bitWrite(Settings.flag.data, index, payload); @@ -595,6 +596,11 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) stop_flash_rotate = payload; SettingsSave(2); } +#ifdef USE_HOME_ASSISTANT + if (19 == index) { // hass_discovery + HAssDiscovery(1); + } +#endif // USE_HOME_ASSISTANT } } else { // SetOption32 .. diff --git a/sonoff/xdrv_07_home_assistant.ino b/sonoff/xdrv_07_home_assistant.ino index 87a07a6f6..3f8e001be 100644 --- a/sonoff/xdrv_07_home_assistant.ino +++ b/sonoff/xdrv_07_home_assistant.ino @@ -183,7 +183,7 @@ void HAssDiscoverButton() } } -void HAssDiscovery() +void HAssDiscovery(uint8_t mode) { // Configure Tasmota for default Home Assistant parameters to keep discovery message as short as possible if (Settings.flag.hass_discovery) { @@ -193,15 +193,15 @@ void HAssDiscovery() // strncpy_P(Settings.mqtt_fulltopic, PSTR("%prefix%/%topic%/"), sizeof(Settings.mqtt_fulltopic)); // Make MQTT topic as short as possible to make this process posible within MQTT_MAX_PACKET_SIZE } - // Send info about relays and lights - HAssDiscoverRelay(); + if (Settings.flag.hass_discovery || (1 == mode)) { + // Send info about relays and lights + HAssDiscoverRelay(); + // Send info about buttons + HAssDiscoverButton(); + // TODO: Send info about switches - // Send info about buttons - HAssDiscoverButton(); - - // TODO: Send info about switches - - // TODO: Send info about sensors + // TODO: Send info about sensors + } } /*********************************************************************************************\ @@ -217,7 +217,7 @@ boolean Xdrv07(byte function) if (Settings.flag.mqtt_enabled) { switch (function) { case FUNC_MQTT_INIT: - HAssDiscovery(); + HAssDiscovery(0); break; } } From c85edf15aca858e5395b74a66e084d4975c3ae9d Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 29 Mar 2018 14:51:34 +0200 Subject: [PATCH 041/136] Change MQTT Energy response topic to SENSOR 5.12.0i * Change MQTT response topic for Energy changes from ENERGY to SENSOR (#2229, #2251) --- sonoff/_releasenotes.ino | 3 ++- sonoff/xdrv_03_energy.ino | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 5a9ad3773..4b0a6d335 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -2,7 +2,8 @@ * Add 16 timers using commands Timer and Timers (#1091) * Add commands Timer 0 to clear timer and Timer 1..16 to copy timer * Add optional Timer configuration webpage to be enabled in user_config.h with define USE_TIMERS_WEB - * Add Home Assistant MQTT Discovery for Buttons (#2277) + * Change MQTT response topic for Energy changes from ENERGY to SENSOR (#2229, #2251) + * Add Home Assistant MQTT Discovery for Buttons and change SetOption19 response (#2277) * Change webpage parameter communication * * 5.12.0h diff --git a/sonoff/xdrv_03_energy.ino b/sonoff/xdrv_03_energy.ino index 8867ed298..a1052a077 100644 --- a/sonoff/xdrv_03_energy.ino +++ b/sonoff/xdrv_03_energy.ino @@ -778,7 +778,7 @@ void EnergyMqttShow() snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_JSON_TIME "\":\"%s\""), GetDateAndTime(DT_LOCAL).c_str()); EnergyShow(1); snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}"), mqtt_data); - MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_ENERGY), Settings.flag.mqtt_sensor_retain); + MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); energy_power_delta = 0; } From 9f0fdd597c5a59f5fd371973a5615f1b3a7e88d0 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 29 Mar 2018 17:21:03 +0200 Subject: [PATCH 042/136] Change Reset on Button Hold time to 40 seconds 5.12.0i * Change default Reset configuration time from 4 seconds to 40 seconds on Button hold (#2268) --- sonoff/_releasenotes.ino | 1 + sonoff/sonoff.h | 1 + sonoff/sonoff.ino | 26 +++++++++++++++++--------- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 4b0a6d335..07d30af84 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -5,6 +5,7 @@ * Change MQTT response topic for Energy changes from ENERGY to SENSOR (#2229, #2251) * Add Home Assistant MQTT Discovery for Buttons and change SetOption19 response (#2277) * Change webpage parameter communication + * Change default Reset configuration time from 4 seconds to 40 seconds on Button hold (#2268) * * 5.12.0h * Add optional Arduino OTA support to be enabled in user_config.h (#1998) diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index 5511856c4..61ef81adb 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -80,6 +80,7 @@ typedef unsigned long power_t; // Power (Relay) type #define MAX_POWER_RETRY 5 // Retry count allowing agreed power limit overflow #define STATES 20 // State loops per second +#define IMMINENT_RESET_FACTOR 10 // Factor to extent button hold time for imminent Reset to default 40 seconds using KEY_HOLD_TIME of 40 #define SYSLOG_TIMER 600 // Seconds to restore syslog_level #define SERIALLOG_TIMER 600 // Seconds to disable SerialLog #define OTA_ATTEMPTS 5 // Number of times to try fetching the new firmware diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 9703b62e8..90abae7b5 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -31,7 +31,11 @@ #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) #include "sonoff.h" // Enumeration used in user_config.h #include "user_config.h" // Fixed user configurable options -#include "user_config_override.h" // Configuration overrides for user_config.h + +//#ifdef USE_CONFIG_OVERRIDE + #include "user_config_override.h" // Configuration overrides for user_config.h +//#endif + #include "i18n.h" // Language support configured by user_config.h #include "sonoff_template.h" // Hardware configuration #include "sonoff_post.h" // Configuration overrides for all previous includes @@ -572,7 +576,6 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) switch (index) { case 3: // mqtt case 15: // pwm_control -// case 19: // hass_discovery restart_flag = 2; case 0: // save_state case 1: // button_restrict @@ -1478,6 +1481,7 @@ void ButtonHandler() { uint8_t button = NOT_PRESSED; uint8_t button_present = 0; + uint8_t hold_time_extent = IMMINENT_RESET_FACTOR; // Extent hold time factor in case of iminnent Reset command char scmnd[20]; uint8_t maxdev = (devices_present > MAX_KEYS) ? MAX_KEYS : devices_present; @@ -1493,6 +1497,7 @@ void ButtonHandler() button = PRESSED; if (0xF500 == dual_button_code) { // Button hold holdbutton[button_index] = (Settings.param[P_HOLD_TIME] * (STATES / 10)) -1; + hold_time_extent = 0; } dual_button_code = 0; } @@ -1545,20 +1550,23 @@ void ButtonHandler() holdbutton[button_index] = 0; } else { holdbutton[button_index]++; - if (Settings.flag.button_single) { // Allow only single button press for immediate action - if (holdbutton[button_index] == Settings.param[P_HOLD_TIME] * (STATES / 10) * 4) { // Button hold for four times longer + if (Settings.flag.button_single) { // Allow only single button press for immediate action + if (holdbutton[button_index] == Settings.param[P_HOLD_TIME] * (STATES / 10) * hold_time_extent) { // Button held for factor times longer // Settings.flag.button_single = 0; snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_SETOPTION "13 0")); // Disable single press only ExecuteCommand(scmnd); } } else { - if (holdbutton[button_index] == Settings.param[P_HOLD_TIME] * (STATES / 10)) { // Button hold - multipress[button_index] = 0; - if (!Settings.flag.button_restrict) { // No button restriction + if (Settings.flag.button_restrict) { // Button restriction + if (holdbutton[button_index] == Settings.param[P_HOLD_TIME] * (STATES / 10)) { // Button hold + multipress[button_index] = 0; + send_button_power(0, button_index +1, 3); // Execute Hold command via MQTT if ButtonTopic is set + } + } else { + if (holdbutton[button_index] == (Settings.param[P_HOLD_TIME] * (STATES / 10)) * hold_time_extent) { // Button held for factor times longer + multipress[button_index] = 0; snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_RESET " 1")); ExecuteCommand(scmnd); - } else { - send_button_power(0, button_index +1, 3); // Execute Hold command via MQTT if ButtonTopic is set } } } From 71f0ab7b2c2203f24b1eabf86452a105df1cebb0 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 29 Mar 2018 17:23:47 +0200 Subject: [PATCH 043/136] Change Reset on Button Hold time to 40 seconds 5.12.0i * Change default Reset configuration time from 4 seconds to 40 seconds on Button hold (#2268) --- sonoff/sonoff.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 90abae7b5..6ef37513e 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -1497,7 +1497,7 @@ void ButtonHandler() button = PRESSED; if (0xF500 == dual_button_code) { // Button hold holdbutton[button_index] = (Settings.param[P_HOLD_TIME] * (STATES / 10)) -1; - hold_time_extent = 0; + hold_time_extent = 1; } dual_button_code = 0; } From 914c2929f8afc70e28ba25be7d78337b29cc3652 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 30 Mar 2018 10:28:55 +0200 Subject: [PATCH 044/136] Revert Button Topic change --- sonoff/settings.ino | 4 ++-- sonoff/user_config.h | 4 +--- sonoff/xdrv_00_mqtt.ino | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sonoff/settings.ino b/sonoff/settings.ino index e1b0a7dcd..db75406b4 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -494,7 +494,7 @@ void SettingsDefaultSet2() strlcpy(Settings.mqtt_user, MQTT_USER, sizeof(Settings.mqtt_user)); strlcpy(Settings.mqtt_pwd, MQTT_PASS, sizeof(Settings.mqtt_pwd)); strlcpy(Settings.mqtt_topic, MQTT_TOPIC, sizeof(Settings.mqtt_topic)); - strlcpy(Settings.button_topic, MQTT_BUTTON_TOPIC, sizeof(Settings.button_topic)); + strlcpy(Settings.button_topic, "0", sizeof(Settings.button_topic)); strlcpy(Settings.mqtt_grptopic, MQTT_GRPTOPIC, sizeof(Settings.mqtt_grptopic)); Settings.tele_period = TELE_PERIOD; @@ -544,7 +544,7 @@ void SettingsDefaultSet2() SettingsDefaultSet_3_9_3(); - strlcpy(Settings.switch_topic, MQTT_SWITCH_TOPIC, sizeof(Settings.switch_topic)); + strlcpy(Settings.switch_topic, "0", sizeof(Settings.switch_topic)); strlcpy(Settings.web_password, WEB_PASSWORD, sizeof(Settings.web_password)); diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 178f414f6..68cafc6be 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -126,8 +126,6 @@ // %topic% token options (also ButtonTopic and SwitchTopic) #define MQTT_TOPIC PROJECT // [Topic] (unique) MQTT device topic #define MQTT_GRPTOPIC "sonoffs" // [GroupTopic] MQTT Group topic -#define MQTT_BUTTON_TOPIC "0" // [ButtonTopic] MQTT button topic -#define MQTT_SWITCH_TOPIC "0" // [SwitchTopic] MQTT switch topic #define MQTT_CLIENT_ID "DVES_%06X" // [MqttClient] Also fall back topic using Chip Id = last 6 characters of MAC address // -- MQTT - Telemetry ---------------------------- @@ -140,7 +138,7 @@ #define DOMOTICZ_UPDATE_TIMER 0 // [DomoticzUpdateTimer] Send relay status (0 = disable, 1 - 3600 seconds) (Optional) // -- MQTT - Home Assistant Discovery ------------- -#define USE_HOME_ASSISTANT // Enable Home Assistant Discovery Support (+1k4 code) +#define USE_HOME_ASSISTANT // Enable Home Assistant Discovery Support (+2k code) #define HOME_ASSISTANT_DISCOVERY_PREFIX "homeassistant" // Home Assistant discovery prefix #define HOME_ASSISTANT_DISCOVERY_ENABLE 0 // [SetOption19] Home Assistant Discovery (0 = Disable, 1 = Enable) diff --git a/sonoff/xdrv_00_mqtt.ino b/sonoff/xdrv_00_mqtt.ino index c1f2867da..6a87f1f25 100644 --- a/sonoff/xdrv_00_mqtt.ino +++ b/sonoff/xdrv_00_mqtt.ino @@ -637,7 +637,7 @@ bool MqttCommand() if ((data_len > 0) && (data_len < sizeof(Settings.button_topic))) { MakeValidMqtt(0, dataBuf); if (!strcmp(dataBuf, mqtt_client)) payload = 1; - strlcpy(Settings.button_topic, (!strcmp(dataBuf,"0")) ? "" : (1 == payload) ? MQTT_BUTTON_TOPIC : dataBuf, sizeof(Settings.button_topic)); + strlcpy(Settings.button_topic, (!strcmp(dataBuf,"0")) ? "" : (1 == payload) ? mqtt_topic : dataBuf, sizeof(Settings.button_topic)); } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, Settings.button_topic); } @@ -645,7 +645,7 @@ bool MqttCommand() if ((data_len > 0) && (data_len < sizeof(Settings.switch_topic))) { MakeValidMqtt(0, dataBuf); if (!strcmp(dataBuf, mqtt_client)) payload = 1; - strlcpy(Settings.switch_topic, (!strcmp(dataBuf,"0")) ? "" : (1 == payload) ? MQTT_SWITCH_TOPIC : dataBuf, sizeof(Settings.switch_topic)); + strlcpy(Settings.switch_topic, (!strcmp(dataBuf,"0")) ? "" : (1 == payload) ? mqtt_topic : dataBuf, sizeof(Settings.switch_topic)); } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, Settings.switch_topic); } From 5ee463ddfb35c01fd45f1f86d9500dc2e1257d64 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 30 Mar 2018 11:15:04 +0200 Subject: [PATCH 045/136] Change Timer parameter Device to Output Change Timer parameter Device to Output and add German translation (#2294) --- sonoff/_releasenotes.ino | 1 + sonoff/i18n.h | 2 +- sonoff/language/cs-CZ.h | 2 +- sonoff/language/de-DE.h | 18 +++++++++--------- sonoff/language/en-GB.h | 2 +- sonoff/language/es-AR.h | 2 +- sonoff/language/fr-FR.h | 2 +- sonoff/language/hu-HU.h | 2 +- sonoff/language/it-IT.h | 2 +- sonoff/language/nl-NL.h | 2 +- sonoff/language/pl-PL.h | 2 +- sonoff/language/pt-PT.h | 2 +- sonoff/language/ru-RU.h | 2 +- sonoff/language/zh-CN.h | 2 +- sonoff/language/zh-TW.h | 2 +- sonoff/xdrv_09_timers.ino | 6 +++--- 16 files changed, 26 insertions(+), 25 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 07d30af84..e65516123 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -6,6 +6,7 @@ * Add Home Assistant MQTT Discovery for Buttons and change SetOption19 response (#2277) * Change webpage parameter communication * Change default Reset configuration time from 4 seconds to 40 seconds on Button hold (#2268) + * Change Timer parameter Device to more obvious Output * * 5.12.0h * Add optional Arduino OTA support to be enabled in user_config.h (#1998) diff --git a/sonoff/i18n.h b/sonoff/i18n.h index 2b9ac09ed..dcc7024a0 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -355,7 +355,7 @@ #define D_JSON_TIMER_TIME "Time" #define D_JSON_TIMER_DAYS "Days" #define D_JSON_TIMER_REPEAT "Repeat" - #define D_JSON_TIMER_DEVICE "Device" + #define D_JSON_TIMER_OUTPUT "Output" #define D_JSON_TIMER_POWER "Power" #define D_CMND_TIMERS "Timers" diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h index 617524e20..c83da57de 100644 --- a/sonoff/language/cs-CZ.h +++ b/sonoff/language/cs-CZ.h @@ -365,7 +365,7 @@ #define D_TIMER_TIME "Time" #define D_TIMER_DAYS "Days" #define D_TIMER_REPEAT "Repeat" -#define D_TIMER_DEVICE "Device" +#define D_TIMER_OUTPUT "Device" #define D_TIMER_POWER "Power" // xdrv_03_energy.ino diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index f6f5c78a0..7e50360d0 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -356,17 +356,17 @@ #define D_DOMOTICZ_VOLTAGE "Voltage/PM2.5" #define D_DOMOTICZ_CURRENT "Current/PM10" #define D_DOMOTICZ_AIRQUALITY "AirQuality" -#define D_DOMOTICZ_UPDATE_TIMER "Update timer" + #define D_DOMOTICZ_UPDATE_TIMER "Update Zeitplan" // xdrv_09_timers.ino -#define D_CONFIGURE_TIMER "Configure Timer" -#define D_TIMER_PARAMETERS "Timer parameters" -#define D_TIMER_ARM "Arm" -#define D_TIMER_TIME "Time" -#define D_TIMER_DAYS "Days" -#define D_TIMER_REPEAT "Repeat" -#define D_TIMER_DEVICE "Device" -#define D_TIMER_POWER "Power" +#define D_CONFIGURE_TIMER "Zeitplan konfigurieren" +#define D_TIMER_PARAMETERS "Zeitplan Einstellungen" +#define D_TIMER_ARM "Aktiv" +#define D_TIMER_TIME "Uhrzeit" +#define D_TIMER_DAYS "Wochentage" +#define D_TIMER_REPEAT "Wiederholen" +#define D_TIMER_OUTPUT "Ausgang" +#define D_TIMER_POWER "Aktion" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energie heute" diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h index c7db040db..c0ead99f8 100644 --- a/sonoff/language/en-GB.h +++ b/sonoff/language/en-GB.h @@ -365,7 +365,7 @@ #define D_TIMER_TIME "Time" #define D_TIMER_DAYS "Days" #define D_TIMER_REPEAT "Repeat" -#define D_TIMER_DEVICE "Device" +#define D_TIMER_OUTPUT "Output" #define D_TIMER_POWER "Power" // xdrv_03_energy.ino diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index bf35cc807..891a313ab 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -365,7 +365,7 @@ #define D_TIMER_TIME "Hora" #define D_TIMER_DAYS "Días" #define D_TIMER_REPEAT "Repetir" -#define D_TIMER_DEVICE "Salida" +#define D_TIMER_OUTPUT "Salida" #define D_TIMER_POWER "Estado" // xdrv_03_energy.ino diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h index 64953f3b3..3fa12b4cd 100644 --- a/sonoff/language/fr-FR.h +++ b/sonoff/language/fr-FR.h @@ -365,7 +365,7 @@ #define D_TIMER_TIME "Time" #define D_TIMER_DAYS "Days" #define D_TIMER_REPEAT "Repeat" -#define D_TIMER_DEVICE "Device" +#define D_TIMER_OUTPUT "Device" #define D_TIMER_POWER "Power" // xsns_03_energy.ino diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h index dd6ec3292..9edb25609 100644 --- a/sonoff/language/hu-HU.h +++ b/sonoff/language/hu-HU.h @@ -365,7 +365,7 @@ #define D_TIMER_TIME "Time" #define D_TIMER_DAYS "Days" #define D_TIMER_REPEAT "Repeat" -#define D_TIMER_DEVICE "Device" +#define D_TIMER_OUTPUT "Device" #define D_TIMER_POWER "Power" // xdrv_03_energy.ino diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index c9134c7dd..084327cc7 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -365,7 +365,7 @@ #define D_TIMER_TIME "Time" #define D_TIMER_DAYS "Days" #define D_TIMER_REPEAT "Repeat" -#define D_TIMER_DEVICE "Device" +#define D_TIMER_OUTPUT "Device" #define D_TIMER_POWER "Power" // xdrv_03_energy.ino diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h index 3b91d3d84..2d1fbaf31 100644 --- a/sonoff/language/nl-NL.h +++ b/sonoff/language/nl-NL.h @@ -365,7 +365,7 @@ #define D_TIMER_TIME "Tijd" #define D_TIMER_DAYS "Dagen" #define D_TIMER_REPEAT "Herhaal" -#define D_TIMER_DEVICE "Uitgang" +#define D_TIMER_OUTPUT "Uitgang" #define D_TIMER_POWER "Actie" // xdrv_03_energy.ino diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h index f1023e5e4..6c011fed5 100644 --- a/sonoff/language/pl-PL.h +++ b/sonoff/language/pl-PL.h @@ -365,7 +365,7 @@ #define D_TIMER_TIME "Time" #define D_TIMER_DAYS "Days" #define D_TIMER_REPEAT "Repeat" -#define D_TIMER_DEVICE "Device" +#define D_TIMER_OUTPUT "Device" #define D_TIMER_POWER "Power" // xdrv_03_energy.ino diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h index 73a8b53ea..00acd9872 100644 --- a/sonoff/language/pt-PT.h +++ b/sonoff/language/pt-PT.h @@ -365,7 +365,7 @@ #define D_TIMER_TIME "Time" #define D_TIMER_DAYS "Days" #define D_TIMER_REPEAT "Repeat" -#define D_TIMER_DEVICE "Device" +#define D_TIMER_OUTPUT "Device" #define D_TIMER_POWER "Power" // xdrv_03_energy.ino diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h index 5c5b964e6..496daf8b2 100644 --- a/sonoff/language/ru-RU.h +++ b/sonoff/language/ru-RU.h @@ -365,7 +365,7 @@ #define D_TIMER_TIME "Time" #define D_TIMER_DAYS "Days" #define D_TIMER_REPEAT "Repeat" -#define D_TIMER_DEVICE "Device" +#define D_TIMER_OUTPUT "Device" #define D_TIMER_POWER "Power" // xdrv_03_energy.ino diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h index 86c352dbf..82f0ae4ce 100644 --- a/sonoff/language/zh-CN.h +++ b/sonoff/language/zh-CN.h @@ -365,7 +365,7 @@ #define D_TIMER_TIME "Time" #define D_TIMER_DAYS "Days" #define D_TIMER_REPEAT "Repeat" -#define D_TIMER_DEVICE "Device" +#define D_TIMER_OUTPUT "Device" #define D_TIMER_POWER "Power" // xdrv_03_energy.ino diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h index f015232e3..b37639f6f 100644 --- a/sonoff/language/zh-TW.h +++ b/sonoff/language/zh-TW.h @@ -365,7 +365,7 @@ #define D_TIMER_TIME "Time" #define D_TIMER_DAYS "Days" #define D_TIMER_REPEAT "Repeat" -#define D_TIMER_DEVICE "Device" +#define D_TIMER_OUTPUT "Device" #define D_TIMER_POWER "Power" // xdrv_03_energy.ino diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino index d84b14358..efa57b708 100644 --- a/sonoff/xdrv_09_timers.ino +++ b/sonoff/xdrv_09_timers.ino @@ -70,7 +70,7 @@ void PrepShowTimer(uint8_t index) uint8_t mask = 1 << i; snprintf(days, sizeof(days), "%s%d", days, ((Settings.timer[index].days & mask) > 0)); } - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_DEVICE "\":%d,\"" D_JSON_TIMER_POWER "\":%d}"), + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_OUTPUT "\":%d,\"" D_JSON_TIMER_POWER "\":%d}"), mqtt_data, index +1, Settings.timer[index].arm, Settings.timer[index].time / 60, Settings.timer[index].time % 60, days, Settings.timer[index].repeat, Settings.timer[index].device +1, Settings.timer[index].power); } @@ -146,7 +146,7 @@ boolean TimerCommand() if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_REPEAT))].success()) { Settings.timer[index].repeat = (root[parm_uc] != 0); } - if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_DEVICE))].success()) { + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_OUTPUT))].success()) { uint8_t device = ((uint8_t)root[parm_uc] -1) & 0x0F; Settings.timer[index].device = (device < devices_present) ? device : devices_present -1; } @@ -257,7 +257,7 @@ const char HTTP_FORM_TIMER[] PROGMEM = const char HTTP_FORM_TIMER1[] PROGMEM = "



" "
" - "" D_TIMER_DEVICE "  " + "" D_TIMER_OUTPUT "  " "" D_TIMER_POWER " \"+a.substring(i*3,(i*3)+3)+\"\"}" + "eb('ds').innerHTML=s;" // Create weekdays + "eb('dP').click();" // Get the element with id='dP' and click on it "}"; const char HTTP_TIMER_STYLE[] PROGMEM = ".tl{float:left;border-radius:0;border:1px solid #fff;padding:1px;width:6.25%;}" @@ -255,7 +256,7 @@ const char HTTP_FORM_TIMER[] PROGMEM = "
 " D_TIMER_PARAMETERS " " "



" "
" "" D_TIMER_OUTPUT "  " "" D_TIMER_POWER "  " - "" D_TIMER_TIME "  :  " + "" D_TIMER_TIME "  " D_HOUR_MINUTE_SEPARATOR "  " "" D_TIMER_ARM " " "" D_TIMER_REPEAT "" "

" - "
"; + "
"; const char HTTP_FORM_TIMER2[] PROGMEM = "type='submit' onclick='st();this.form.submit();'"; @@ -295,25 +296,11 @@ void HandleTimerConfiguration() if (i > 0) page += F(","); page += String(Settings.timer[i].data); } - page += F("' hidden>
"); - for (byte i = 0; i < MAX_TIMERS; i++) { - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR(""), - i, (0 == i) ? " id='dP'" : "", i +1); - page += mqtt_data; - } page += FPSTR(HTTP_FORM_TIMER1); page.replace(F("}1"), String(devices_present)); - char day[4] = { 0 }; - for (byte i = 0; i < 7; i++) { - strncpy_P(day, PSTR(D_DAY3LIST) + (i *3), 3); - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s"), i, i, day); - page += mqtt_data; - } - page += F("
"); - page += FPSTR(HTTP_FORM_END); page.replace(F("type='submit'"), FPSTR(HTTP_FORM_TIMER2)); - page += F(""); // Get the element with id='defaultOpen' and click on it + page += F(""); // Init elements and select first tab/button page += FPSTR(HTTP_BTN_CONF); ShowPage(page); } @@ -324,11 +311,14 @@ void TimerSaveSettings() WebGetArg("t0", tmp, sizeof(tmp)); char *p = tmp; + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MQTT D_CMND_TIMERS " ")); for (byte i = 0; i < MAX_TIMERS; i++) { uint32_t data = strtol(p, &p, 10); p++; // Skip comma if ((data & 0x7FF) < 1440) Settings.timer[i].data = data; + snprintf_P(log_data, sizeof(log_data), PSTR("%s%s0x%08X"), log_data, (i > 0)?",":"", Settings.timer[i].data); } + AddLog(LOG_LEVEL_DEBUG); } #endif // USE_TIMERS_WEB #endif // USE_WEBSERVER From 67477b1f4ebe8d95f0601eb6f0b98a10eb51c5d8 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 31 Mar 2018 16:26:00 +0200 Subject: [PATCH 048/136] Add support for SGP30 sensor 5.12.0i * Add support for SGP30 gas and air quality sensor (#2307) --- .../.github/ISSUE_TEMPLATE.md | 46 ++++ .../.github/PULL_REQUEST_TEMPLATE.md | 26 ++ lib/Adafruit_SGP30-1.0.0.13/.gitignore | 4 + lib/Adafruit_SGP30-1.0.0.13/.travis.yml | 27 ++ .../Adafruit_SGP30.cpp | 243 ++++++++++++++++++ lib/Adafruit_SGP30-1.0.0.13/Adafruit_SGP30.h | 68 +++++ lib/Adafruit_SGP30-1.0.0.13/README.md | 18 ++ .../examples/sgp30test/sgp30test.ino | 45 ++++ .../library.properties | 9 + lib/Adafruit_SGP30-1.0.0.13/license.txt | 26 ++ sonoff/_releasenotes.ino | 5 +- sonoff/i18n.h | 7 +- sonoff/language/cs-CZ.h | 2 + sonoff/language/de-DE.h | 2 + sonoff/language/en-GB.h | 2 + sonoff/language/es-AR.h | 2 + sonoff/language/fr-FR.h | 2 + sonoff/language/hu-HU.h | 2 + sonoff/language/it-IT.h | 2 + sonoff/language/nl-NL.h | 2 + sonoff/language/pl-PL.h | 2 + sonoff/language/pt-PT.h | 2 + sonoff/language/ru-RU.h | 2 + sonoff/language/zh-CN.h | 2 + sonoff/language/zh-TW.h | 2 + sonoff/sonoff_post.h | 4 + sonoff/user_config.h | 1 + sonoff/xsns_21_sgp30.ino | 115 +++++++++ 28 files changed, 667 insertions(+), 3 deletions(-) create mode 100644 lib/Adafruit_SGP30-1.0.0.13/.github/ISSUE_TEMPLATE.md create mode 100644 lib/Adafruit_SGP30-1.0.0.13/.github/PULL_REQUEST_TEMPLATE.md create mode 100644 lib/Adafruit_SGP30-1.0.0.13/.gitignore create mode 100644 lib/Adafruit_SGP30-1.0.0.13/.travis.yml create mode 100644 lib/Adafruit_SGP30-1.0.0.13/Adafruit_SGP30.cpp create mode 100644 lib/Adafruit_SGP30-1.0.0.13/Adafruit_SGP30.h create mode 100644 lib/Adafruit_SGP30-1.0.0.13/README.md create mode 100644 lib/Adafruit_SGP30-1.0.0.13/examples/sgp30test/sgp30test.ino create mode 100644 lib/Adafruit_SGP30-1.0.0.13/library.properties create mode 100644 lib/Adafruit_SGP30-1.0.0.13/license.txt create mode 100644 sonoff/xsns_21_sgp30.ino diff --git a/lib/Adafruit_SGP30-1.0.0.13/.github/ISSUE_TEMPLATE.md b/lib/Adafruit_SGP30-1.0.0.13/.github/ISSUE_TEMPLATE.md new file mode 100644 index 000000000..f0e26146f --- /dev/null +++ b/lib/Adafruit_SGP30-1.0.0.13/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,46 @@ +Thank you for opening an issue on an Adafruit Arduino library repository. To +improve the speed of resolution please review the following guidelines and +common troubleshooting steps below before creating the issue: + +- **Do not use GitHub issues for troubleshooting projects and issues.** Instead use + the forums at http://forums.adafruit.com to ask questions and troubleshoot why + something isn't working as expected. In many cases the problem is a common issue + that you will more quickly receive help from the forum community. GitHub issues + are meant for known defects in the code. If you don't know if there is a defect + in the code then start with troubleshooting on the forum first. + +- **If following a tutorial or guide be sure you didn't miss a step.** Carefully + check all of the steps and commands to run have been followed. Consult the + forum if you're unsure or have questions about steps in a guide/tutorial. + +- **For Arduino projects check these very common issues to ensure they don't apply**: + + - For uploading sketches or communicating with the board make sure you're using + a **USB data cable** and **not** a **USB charge-only cable**. It is sometimes + very hard to tell the difference between a data and charge cable! Try using the + cable with other devices or swapping to another cable to confirm it is not + the problem. + + - **Be sure you are supplying adequate power to the board.** Check the specs of + your board and plug in an external power supply. In many cases just + plugging a board into your computer is not enough to power it and other + peripherals. + + - **Double check all soldering joints and connections.** Flakey connections + cause many mysterious problems. See the [guide to excellent soldering](https://learn.adafruit.com/adafruit-guide-excellent-soldering/tools) for examples of good solder joints. + + - **Ensure you are using an official Arduino or Adafruit board.** We can't + guarantee a clone board will have the same functionality and work as expected + with this code and don't support them. + +If you're sure this issue is a defect in the code and checked the steps above +please fill in the following fields to provide enough troubleshooting information. +You may delete the guideline and text above to just leave the following details: + +- Arduino board: **INSERT ARDUINO BOARD NAME/TYPE HERE** + +- Arduino IDE version (found in Arduino -> About Arduino menu): **INSERT ARDUINO + VERSION HERE** + +- List the steps to reproduce the problem below (if possible attach a sketch or + copy the sketch code in too): **LIST REPRO STEPS BELOW** diff --git a/lib/Adafruit_SGP30-1.0.0.13/.github/PULL_REQUEST_TEMPLATE.md b/lib/Adafruit_SGP30-1.0.0.13/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..7b641eb86 --- /dev/null +++ b/lib/Adafruit_SGP30-1.0.0.13/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,26 @@ +Thank you for creating a pull request to contribute to Adafruit's GitHub code! +Before you open the request please review the following guidelines and tips to +help it be more easily integrated: + +- **Describe the scope of your change--i.e. what the change does and what parts + of the code were modified.** This will help us understand any risks of integrating + the code. + +- **Describe any known limitations with your change.** For example if the change + doesn't apply to a supported platform of the library please mention it. + +- **Please run any tests or examples that can exercise your modified code.** We + strive to not break users of the code and running tests/examples helps with this + process. + +Thank you again for contributing! We will try to test and integrate the change +as soon as we can, but be aware we have many GitHub repositories to manage and +can't immediately respond to every request. There is no need to bump or check in +on a pull request (it will clutter the discussion of the request). + +Also don't be worried if the request is closed or not integrated--sometimes the +priorities of Adafruit's GitHub code (education, ease of use) might not match the +priorities of the pull request. Don't fret, the open source community thrives on +forks and GitHub makes it easy to keep your changes in a forked repo. + +After reviewing the guidelines above you can delete this text from the pull request. diff --git a/lib/Adafruit_SGP30-1.0.0.13/.gitignore b/lib/Adafruit_SGP30-1.0.0.13/.gitignore new file mode 100644 index 000000000..7f189125f --- /dev/null +++ b/lib/Adafruit_SGP30-1.0.0.13/.gitignore @@ -0,0 +1,4 @@ +*~ +Doxyfile* +doxygen_sqlite3.db +html \ No newline at end of file diff --git a/lib/Adafruit_SGP30-1.0.0.13/.travis.yml b/lib/Adafruit_SGP30-1.0.0.13/.travis.yml new file mode 100644 index 000000000..428f3434e --- /dev/null +++ b/lib/Adafruit_SGP30-1.0.0.13/.travis.yml @@ -0,0 +1,27 @@ +language: c +sudo: false + +# Blacklist +branches: + except: + - gh-pages + +env: + global: + - PRETTYNAME="Adafruit SGP30 Arduino Library" +# Optional, will default to "$TRAVIS_BUILD_DIR/Doxyfile" +# - DOXYFILE: $TRAVIS_BUILD_DIR/Doxyfile + +before_install: + - source <(curl -SLs https://raw.githubusercontent.com/adafruit/travis-ci-arduino/master/install.sh) + +#install: +# - arduino --install-library "Adafruit ILI9341","Adafruit GFX Library" + +script: + - build_main_platforms + +# Generate and deploy documentation +after_success: + - source <(curl -SLs https://raw.githubusercontent.com/adafruit/travis-ci-arduino/master/library_check.sh) + - source <(curl -SLs https://raw.githubusercontent.com/adafruit/travis-ci-arduino/master/doxy_gen_and_deploy.sh) \ No newline at end of file diff --git a/lib/Adafruit_SGP30-1.0.0.13/Adafruit_SGP30.cpp b/lib/Adafruit_SGP30-1.0.0.13/Adafruit_SGP30.cpp new file mode 100644 index 000000000..b2ccbe8da --- /dev/null +++ b/lib/Adafruit_SGP30-1.0.0.13/Adafruit_SGP30.cpp @@ -0,0 +1,243 @@ +/*! + * @file Adafruit_SGP30.cpp + * + * @mainpage Adafruit SGP30 gas sensor driver + * + * @section intro_sec Introduction + * + * This is the documentation for Adafruit's SGP30 driver for the + * Arduino platform. It is designed specifically to work with the + * Adafruit SGP30 breakout: http://www.adafruit.com/products/3709 + * + * These sensors use I2C to communicate, 2 pins (SCL+SDA) are required + * to interface with the breakout. + * + * Adafruit invests time and resources providing this open source code, + * please support Adafruit and open-source hardware by purchasing + * products from Adafruit! + * + * + * @section author Author + * Written by Ladyada for Adafruit Industries. + * + * @section license License + * BSD license, all text here must be included in any redistribution. + * + */ + + +#if ARDUINO >= 100 + #include "Arduino.h" +#else + #include "WProgram.h" +#endif + +#include "Adafruit_SGP30.h" + +//#define I2C_DEBUG + +/**************************************************************************/ +/*! + @brief Instantiates a new SGP30 class +*/ +/**************************************************************************/ +Adafruit_SGP30::Adafruit_SGP30() { +} + +/**************************************************************************/ +/*! + @brief Setups the hardware and detects a valid SGP30. Initializes I2C + then reads the serialnumber and checks that we are talking to an SGP30 + @param theWire Optional pointer to I2C interface, otherwise use Wire + @returns True if SGP30 found on I2C, False if something went wrong! +*/ +/**************************************************************************/ +boolean Adafruit_SGP30::begin(TwoWire *theWire) { + _i2caddr = SGP30_I2CADDR_DEFAULT; + if (theWire == NULL) { + _i2c = &Wire; + } else { + _i2c = theWire; + } + + _i2c->begin(); + + + uint8_t command[2]; + command[0] = 0x36; + command[1] = 0x82; + if (! readWordFromCommand(command, 2, 10, serialnumber, 3)) + return false; + + uint16_t featureset; + command[0] = 0x20; + command[1] = 0x2F; + if (! readWordFromCommand(command, 2, 10, &featureset, 1)) + return false; + //Serial.print("Featureset 0x"); Serial.println(featureset, HEX); + if (featureset != SGP30_FEATURESET) + return false; + if (! IAQinit()) + return false; + + return true; +} + +/**************************************************************************/ +/*! + @brief Commands the sensor to begin the IAQ algorithm. Must be called after startup. + @returns True if command completed successfully, false if something went wrong! +*/ +/**************************************************************************/ +boolean Adafruit_SGP30::IAQinit(void) { + uint8_t command[2]; + command[0] = 0x20; + command[1] = 0x03; + return readWordFromCommand(command, 2, 10); +} + +/**************************************************************************/ +/*! + @brief Commands the sensor to take a single eCO2/VOC measurement. Places results in {@link TVOC} and {@link eCO2} + @returns True if command completed successfully, false if something went wrong! +*/ +/**************************************************************************/ +boolean Adafruit_SGP30::IAQmeasure(void) { + uint8_t command[2]; + command[0] = 0x20; + command[1] = 0x08; + uint16_t reply[2]; + if (! readWordFromCommand(command, 2, 12, reply, 2)) + return false; + TVOC = reply[1]; + eCO2 = reply[0]; + return true; +} + +/**************************************************************************/ +/*! + @brief Request baseline calibration values for both CO2 and TVOC IAQ calculations. Places results in parameter memory locaitons. + @param eco2_base A pointer to a uint16_t which we will save the calibration value to + @param tvoc_base A pointer to a uint16_t which we will save the calibration value to + @returns True if command completed successfully, false if something went wrong! +*/ +/**************************************************************************/ +boolean Adafruit_SGP30::getIAQBaseline(uint16_t *eco2_base, uint16_t *tvoc_base) { + uint8_t command[2]; + command[0] = 0x20; + command[1] = 0x15; + uint16_t reply[2]; + if (! readWordFromCommand(command, 2, 10, reply, 2)) + return false; + *eco2_base = reply[0]; + *tvoc_base = reply[1]; + return true; +} + +/**************************************************************************/ +/*! + @brief Assign baseline calibration values for both CO2 and TVOC IAQ calculations. + @param eco2_base A uint16_t which we will save the calibration value from + @param tvoc_base A uint16_t which we will save the calibration value from + @returns True if command completed successfully, false if something went wrong! +*/ +/**************************************************************************/ +boolean Adafruit_SGP30::setIAQBaseline(uint16_t eco2_base, uint16_t tvoc_base) { + uint8_t command[8]; + command[0] = 0x20; + command[1] = 0x1e; + command[2] = tvoc_base >> 8; + command[3] = tvoc_base & 0xFF; + command[4] = generateCRC(command+2, 2); + command[5] = eco2_base >> 8; + command[6] = eco2_base & 0xFF; + command[7] = generateCRC(command+5, 2); + + return readWordFromCommand(command, 8, 10); +} + +/**************************************************************************/ +/*! + @brief I2C low level interfacing +*/ +/**************************************************************************/ + + +boolean Adafruit_SGP30::readWordFromCommand(uint8_t command[], uint8_t commandLength, uint16_t delayms, uint16_t *readdata, uint8_t readlen) +{ + uint8_t data; + + _i2c->beginTransmission(_i2caddr); + +#ifdef I2C_DEBUG + Serial.print("\t\t-> "); +#endif + + for (uint8_t i=0; iwrite(command[i]); +#ifdef I2C_DEBUG + Serial.print("0x"); Serial.print(command[i], HEX); Serial.print(", "); +#endif + } +#ifdef I2C_DEBUG + Serial.println(); +#endif + _i2c->endTransmission(); + + delay(delayms); + + if (readlen == 0) + return true; + + uint8_t replylen = readlen * (SGP30_WORD_LEN +1); + if (_i2c->requestFrom(_i2caddr, replylen) != replylen) + return false; + uint8_t replybuffer[replylen]; +#ifdef I2C_DEBUG + Serial.print("\t\t<- "); +#endif + for (uint8_t i=0; iread(); +#ifdef I2C_DEBUG + Serial.print("0x"); Serial.print(replybuffer[i], HEX); Serial.print(", "); +#endif + } + +#ifdef I2C_DEBUG + Serial.println(); +#endif + + for (uint8_t i=0; i + +// the i2c address +#define SGP30_I2CADDR_DEFAULT 0x58 ///< SGP30 has only one I2C address + +// commands and constants +#define SGP30_FEATURESET 0x0020 ///< The required set for this library +#define SGP30_CRC8_POLYNOMIAL 0x31 ///< Seed for SGP30's CRC polynomial +#define SGP30_CRC8_INIT 0xFF ///< Init value for CRC +#define SGP30_WORD_LEN 2 ///< 2 bytes per word + +/**************************************************************************/ +/*! Class that stores state and functions for interacting with SGP30 Gas Sensor */ +/**************************************************************************/ +class Adafruit_SGP30 { + public: + Adafruit_SGP30(); + boolean begin(TwoWire *theWire = NULL); + boolean IAQinit(void); + boolean IAQmeasure(void); + + boolean getIAQBaseline(uint16_t *eco2_base, uint16_t *tvoc_base); + boolean setIAQBaseline(uint16_t eco2_base, uint16_t tvoc_base); + + /** + * The last measurement of the IAQ-calculated Total Volatile Organic Compounds in ppb. This value is set when you call {@link IAQmeasure()} + */ + uint16_t TVOC; + + /** + * The last measurement of the IAQ-calculated equivalent CO2 in ppm. This value is set when you call {@link IAQmeasure()} + */ + uint16_t eCO2; + + /** + * The 48-bit serial number, this value is set when you call {@link begin()} + */ + uint16_t serialnumber[3]; + private: + TwoWire *_i2c; + uint8_t _i2caddr; + + void write(uint8_t address, uint8_t *data, uint8_t n); + void read(uint8_t address, uint8_t *data, uint8_t n); + boolean readWordFromCommand(uint8_t command[], uint8_t commandLength, uint16_t delay, uint16_t *readdata = NULL, uint8_t readlen = 0); + uint8_t generateCRC(uint8_t data[], uint8_t datalen); +}; diff --git a/lib/Adafruit_SGP30-1.0.0.13/README.md b/lib/Adafruit_SGP30-1.0.0.13/README.md new file mode 100644 index 000000000..44056b5c8 --- /dev/null +++ b/lib/Adafruit_SGP30-1.0.0.13/README.md @@ -0,0 +1,18 @@ +Adafruit_SGP30 +================ + +This is the Adafruit SGP30 Gas / Air Quality I2C sensor library + +Tested and works great with the Aadafruit SGP30 Breakout Board + * http://www.adafruit.com/products/3709 + +This chip uses I2C to communicate, 2 pins are required to interface + +Adafruit invests time and resources providing this open source code, +please support Adafruit and open-source hardware by purchasing +products from Adafruit! + +Written by Limor Fried for Adafruit Industries. +BSD license, check license.txt for more information +All text above must be included in any redistribution + diff --git a/lib/Adafruit_SGP30-1.0.0.13/examples/sgp30test/sgp30test.ino b/lib/Adafruit_SGP30-1.0.0.13/examples/sgp30test/sgp30test.ino new file mode 100644 index 000000000..6b9b3ea05 --- /dev/null +++ b/lib/Adafruit_SGP30-1.0.0.13/examples/sgp30test/sgp30test.ino @@ -0,0 +1,45 @@ +#include +#include "Adafruit_SGP30.h" + +Adafruit_SGP30 sgp; + +void setup() { + Serial.begin(9600); + Serial.println("SGP30 test"); + + if (! sgp.begin()){ + Serial.println("Sensor not found :("); + while (1); + } + Serial.print("Found SGP30 serial #"); + Serial.print(sgp.serialnumber[0], HEX); + Serial.print(sgp.serialnumber[1], HEX); + Serial.println(sgp.serialnumber[2], HEX); + + // If you have a baseline measurement from before you can assign it to start, to 'self-calibrate' + //sgp.setIAQBaseline(0x8E68, 0x8F41); // Will vary for each sensor! +} + +int counter = 0; +void loop() { + if (! sgp.IAQmeasure()) { + Serial.println("Measurement failed"); + return; + } + Serial.print("TVOC "); Serial.print(sgp.TVOC); Serial.print(" ppb\t"); + Serial.print("eCO2 "); Serial.print(sgp.eCO2); Serial.println(" ppm"); + delay(1000); + + counter++; + if (counter == 30) { + counter = 0; + + uint16_t TVOC_base, eCO2_base; + if (! sgp.getIAQBaseline(&eCO2_base, &TVOC_base)) { + Serial.println("Failed to get baseline readings"); + return; + } + Serial.print("****Baseline values: eCO2: 0x"); Serial.print(eCO2_base, HEX); + Serial.print(" & TVOC: 0x"); Serial.println(TVOC_base, HEX); + } +} \ No newline at end of file diff --git a/lib/Adafruit_SGP30-1.0.0.13/library.properties b/lib/Adafruit_SGP30-1.0.0.13/library.properties new file mode 100644 index 000000000..3520b4d38 --- /dev/null +++ b/lib/Adafruit_SGP30-1.0.0.13/library.properties @@ -0,0 +1,9 @@ +name=Adafruit SGP30 Sensor +version=1.0.2 +author=Adafruit +maintainer=Adafruit +sentence=This is an Arduino library for the Adafruit SGP30 Gas / Air Quality Sensor +paragraph=This is an Arduino library for the Adafruit SGP30 Gas / Air Quality Sensor +category=Sensors +url=https://github.com/adafruit/Adafruit_SGP30 +architectures=* diff --git a/lib/Adafruit_SGP30-1.0.0.13/license.txt b/lib/Adafruit_SGP30-1.0.0.13/license.txt new file mode 100644 index 000000000..f6a0f22b8 --- /dev/null +++ b/lib/Adafruit_SGP30-1.0.0.13/license.txt @@ -0,0 +1,26 @@ +Software License Agreement (BSD License) + +Copyright (c) 2012, Adafruit Industries +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: +1. Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. +3. Neither the name of the copyright holders nor the +names of its contributors may be used to endorse or promote products +derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index e65516123..35ae88f27 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -2,11 +2,12 @@ * Add 16 timers using commands Timer and Timers (#1091) * Add commands Timer 0 to clear timer and Timer 1..16 to copy timer * Add optional Timer configuration webpage to be enabled in user_config.h with define USE_TIMERS_WEB - * Change MQTT response topic for Energy changes from ENERGY to SENSOR (#2229, #2251) * Add Home Assistant MQTT Discovery for Buttons and change SetOption19 response (#2277) + * Add support for SGP30 gas and air quality sensor (#2307) * Change webpage parameter communication - * Change default Reset configuration time from 4 seconds to 40 seconds on Button hold (#2268) * Change Timer parameter Device to more obvious Output + * Change MQTT response topic for Energy changes from ENERGY to SENSOR (#2229, #2251) + * Change default Reset configuration time from 4 seconds to 40 seconds on Button hold (#2268) * * 5.12.0h * Add optional Arduino OTA support to be enabled in user_config.h (#1998) diff --git a/sonoff/i18n.h b/sonoff/i18n.h index dcc7024a0..12db1d541 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -111,6 +111,7 @@ #define D_JSON_TIME "Time" #define D_JSON_TODAY "Today" #define D_JSON_TOTAL "Total" +#define D_JSON_TVOC "TVOC" #define D_JSON_TYPE "Type" #define D_JSON_UPTIME "Uptime" #define D_JSON_UTC_TIME "UTC" @@ -381,6 +382,8 @@ enum UnitNames { UNIT_MILLIAMPERE, UNIT_MILLISECOND, UNIT_MINUTE, + UNIT_PPB, + UNIT_PPD, UNIT_PPM, UNIT_PERCENTAGE, UNIT_PRESSURE, @@ -399,6 +402,8 @@ const char kUnitNames[] PROGMEM = D_UNIT_MILLIAMPERE "|" D_UNIT_MILLISECOND "|" D_UNIT_MINUTE "|" + D_UNIT_PARTS_PER_BILLION "|" + D_UNIT_PARTS_PER_DECILITER "|" D_UNIT_PARTS_PER_MILLION "|" "%|" D_UNIT_PRESSURE "|" @@ -475,7 +480,7 @@ const char HTTP_SNS_PRESSURE[] PROGMEM = "%s{s}%s " D_PRESSURE "{m}%s " D_UNIT_P const char HTTP_SNS_SEAPRESSURE[] PROGMEM = "%s{s}%s " D_PRESSUREATSEALEVEL "{m}%s " D_UNIT_PRESSURE "{e}"; // {s} =
const char HTTP_SNS_ANALOG[] PROGMEM = "%s{s}%s " D_ANALOG_INPUT "%d{m}%d{e}"; // {s} = -#if defined(USE_MHZ19) || defined(USE_SENSEAIR) +#if defined(USE_MHZ19) || defined(USE_SENSEAIR) || defined(USE_SGP30) const char HTTP_SNS_CO2[] PROGMEM = "%s{s}%s " D_CO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}"; // {s} = #endif // USE_WEBSERVER diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h index 8e953810e..9f2740ecb 100644 --- a/sonoff/language/cs-CZ.h +++ b/sonoff/language/cs-CZ.h @@ -142,6 +142,7 @@ #define D_TOPIC "Topic" #define D_TRANSMIT "Odešli" #define D_TRUE "Pravda" +#define D_TVOC "TVOC" #define D_UPGRADE "aktualizace" #define D_UPLOAD "Nahrání..." #define D_UPTIME "Uptime" @@ -437,6 +438,7 @@ #define D_UNIT_MILLIAMPERE "mA" #define D_UNIT_MILLISECOND "ms" #define D_UNIT_MINUTE "Min" +#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PRESSURE "hPa" diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index 7e50360d0..45040412e 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -142,6 +142,7 @@ #define D_TOPIC "topic" #define D_TRANSMIT "Übertragen" #define D_TRUE "wahr" +#define D_TVOC "TVOC" #define D_UPGRADE "update" #define D_UPLOAD "Upload" #define D_UPTIME "Laufzeit" @@ -437,6 +438,7 @@ #define D_UNIT_MILLIAMPERE "mA" #define D_UNIT_MILLISECOND "ms" #define D_UNIT_MINUTE "min" +#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PRESSURE "hPa" diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h index c0ead99f8..dadd68f85 100644 --- a/sonoff/language/en-GB.h +++ b/sonoff/language/en-GB.h @@ -142,6 +142,7 @@ #define D_TOPIC "Topic" #define D_TRANSMIT "Transmit" #define D_TRUE "True" +#define D_TVOC "TVOC" #define D_UPGRADE "upgrade" #define D_UPLOAD "Upload" #define D_UPTIME "Uptime" @@ -437,6 +438,7 @@ #define D_UNIT_MILLIAMPERE "mA" #define D_UNIT_MILLISECOND "ms" #define D_UNIT_MINUTE "Min" +#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PRESSURE "hPa" diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index 891a313ab..ae9acf887 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -142,6 +142,7 @@ #define D_TOPIC "Topic" #define D_TRANSMIT "Transmitir" #define D_TRUE "Verdadero" +#define D_TVOC "TVOC" #define D_UPGRADE "Actualización" #define D_UPLOAD "Carga" #define D_UPTIME "Tiempo Encendido" @@ -437,6 +438,7 @@ #define D_UNIT_MILLIAMPERE "mA" #define D_UNIT_MILLISECOND "ms" #define D_UNIT_MINUTE "Min" +#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PRESSURE "hPa" diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h index e021604de..d5a62db80 100644 --- a/sonoff/language/fr-FR.h +++ b/sonoff/language/fr-FR.h @@ -142,6 +142,7 @@ #define D_TOPIC "Topic" #define D_TRANSMIT "Transmettre" #define D_TRUE "Vrai" +#define D_TVOC "TVOC" #define D_UPGRADE "upgrade" #define D_UPLOAD "Upload" #define D_UPTIME "Uptime" @@ -437,6 +438,7 @@ #define D_UNIT_MILLIAMPERE "mA" #define D_UNIT_MILLISECOND "ms" #define D_UNIT_MINUTE "Min" +#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PRESSURE "hPa" diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h index 6288b743a..f4dc7a0c9 100644 --- a/sonoff/language/hu-HU.h +++ b/sonoff/language/hu-HU.h @@ -142,6 +142,7 @@ #define D_TOPIC "Téma" #define D_TRANSMIT "Továbbít" #define D_TRUE "Igaz" +#define D_TVOC "TVOC" #define D_UPGRADE "frissítés" #define D_UPLOAD "Feltöltés" #define D_UPTIME "Üzemidő" @@ -437,6 +438,7 @@ #define D_UNIT_MILLIAMPERE "mA" #define D_UNIT_MILLISECOND "ms" #define D_UNIT_MINUTE "p" +#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PRESSURE "hPa" diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index 64383eec4..8a3a80702 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -142,6 +142,7 @@ #define D_TOPIC "Topic" #define D_TRANSMIT "Trasmesso" #define D_TRUE "True" +#define D_TVOC "TVOC" #define D_UPGRADE "aggiornamento" #define D_UPLOAD "Invio" #define D_UPTIME "Uptime" @@ -437,6 +438,7 @@ #define D_UNIT_MILLIAMPERE "mA" #define D_UNIT_MILLISECOND "ms" #define D_UNIT_MINUTE "Min" +#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PRESSURE "hPa" diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h index 2d1fbaf31..507213f07 100644 --- a/sonoff/language/nl-NL.h +++ b/sonoff/language/nl-NL.h @@ -142,6 +142,7 @@ #define D_TOPIC "Topic" // Onderwerp #define D_TRANSMIT "Verzend" #define D_TRUE "Waar" +#define D_TVOC "TVOC" #define D_UPGRADE "opwaarderen" #define D_UPLOAD "Verzenden" #define D_UPTIME "Bedrijfstijd" @@ -437,6 +438,7 @@ #define D_UNIT_MILLIAMPERE "mA" #define D_UNIT_MILLISECOND "ms" #define D_UNIT_MINUTE "Min" +#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PRESSURE "hPa" diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h index 9cd364d43..856e682bf 100644 --- a/sonoff/language/pl-PL.h +++ b/sonoff/language/pl-PL.h @@ -142,6 +142,7 @@ #define D_TOPIC "Temat" #define D_TRANSMIT "Wyślij" #define D_TRUE "Prawda" +#define D_TVOC "TVOC" #define D_UPGRADE "aktualizacji" #define D_UPLOAD "Wgraj" #define D_UPTIME "Uptime" @@ -437,6 +438,7 @@ #define D_UNIT_MILLIAMPERE "mA" #define D_UNIT_MILLISECOND "ms" #define D_UNIT_MINUTE "Min" +#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PRESSURE "hPa" diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h index 2f4d40a1d..482e40474 100644 --- a/sonoff/language/pt-PT.h +++ b/sonoff/language/pt-PT.h @@ -142,6 +142,7 @@ #define D_TOPIC "Tópico" #define D_TRANSMIT "Transmitir" #define D_TRUE "Verdadeiro" +#define D_TVOC "TVOC" #define D_UPGRADE "Atualizar" #define D_UPLOAD "Enviar" #define D_UPTIME "Tempo de Atividade" @@ -437,6 +438,7 @@ #define D_UNIT_MILLIAMPERE "mA" #define D_UNIT_MILLISECOND "ms" #define D_UNIT_MINUTE "Min" +#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PRESSURE "hPa" diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h index aad061b0c..ee84a50b0 100644 --- a/sonoff/language/ru-RU.h +++ b/sonoff/language/ru-RU.h @@ -142,6 +142,7 @@ #define D_TOPIC "Топик" #define D_TRANSMIT "Передать" #define D_TRUE "Истина" +#define D_TVOC "TVOC" #define D_UPGRADE "обновление" #define D_UPLOAD "Загрузить" #define D_UPTIME "Uptime" @@ -437,6 +438,7 @@ #define D_UNIT_MILLIAMPERE "мА" #define D_UNIT_MILLISECOND "мс" #define D_UNIT_MINUTE "мин" +#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PRESSURE "гПа" diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h index 4fadd8592..a105a9c3a 100644 --- a/sonoff/language/zh-CN.h +++ b/sonoff/language/zh-CN.h @@ -142,6 +142,7 @@ #define D_TOPIC "主题" #define D_TRANSMIT "发送" #define D_TRUE "True" +#define D_TVOC "TVOC" #define D_UPGRADE "升级" #define D_UPLOAD "上传" #define D_UPTIME "运行时间" @@ -437,6 +438,7 @@ #define D_UNIT_MILLIAMPERE "毫安" #define D_UNIT_MILLISECOND "毫秒" #define D_UNIT_MINUTE "分" +#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_DECILITER "每分升" #define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PRESSURE "百帕" diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h index f6b8e8ecd..118e0d719 100644 --- a/sonoff/language/zh-TW.h +++ b/sonoff/language/zh-TW.h @@ -142,6 +142,7 @@ #define D_TOPIC "主題" #define D_TRANSMIT "發送" #define D_TRUE "True" +#define D_TVOC "TVOC" #define D_UPGRADE "升級" #define D_UPLOAD "上傳" #define D_UPTIME "運行時間" @@ -437,6 +438,7 @@ #define D_UNIT_MILLIAMPERE "毫安" #define D_UNIT_MILLISECOND "毫秒" #define D_UNIT_MINUTE "分" +#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_DECILITER "每分升" #define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PRESSURE "百帕" diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h index 09b4836ba..67678c6e2 100644 --- a/sonoff/sonoff_post.h +++ b/sonoff/sonoff_post.h @@ -45,6 +45,7 @@ void WifiWpsStatusCallback(wps_cb_status status); #define USE_HTU // Add I2C code for HTU21/SI7013/SI7020/SI7021 sensor (+1k5 code) #define USE_BMP // Add I2C code for BMP085/BMP180/BMP280/BME280 sensor (+4k code) #define USE_BME680 // Add additional support for BME680 sensor using Adafruit Sensor and BME680 libraries (+6k code) +#define USE_SGP30 // Add I2C code for SGP30 sensor (+4k code) #define USE_BH1750 // Add I2C code for BH1750 sensor (+0k5 code) #define USE_VEML6070 // Add I2C code for VEML6070 sensor (+0k5 code) #define USE_TSL2561 // Add I2C code for TSL2561 sensor using library Adafruit TSL2561 Arduino (+1k2 code) @@ -101,6 +102,9 @@ void WifiWpsStatusCallback(wps_cb_status status); #ifdef USE_EMULATION #undef USE_EMULATION // Disable Wemo or Hue emulation #endif +#ifdef USE_TIMERS +#undef USE_TIMERS // Disable support for up to 16 timers +#endif #ifdef USE_PZEM004T #undef USE_PZEM004T // Disable PZEM004T energy sensor #endif diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 68cafc6be..5b274624a 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -206,6 +206,7 @@ #define USE_HTU // Add I2C code for HTU21/SI7013/SI7020/SI7021 sensor (+1k5 code) #define USE_BMP // Add I2C code for BMP085/BMP180/BMP280/BME280 sensor (+4k code) // #define USE_BME680 // Add additional support for BME680 sensor using Adafruit Sensor and BME680 libraries (+6k code) + #define USE_SGP30 // Add I2C code for SGP30 sensor (+1k1 code) #define USE_BH1750 // Add I2C code for BH1750 sensor (+0k5 code) // #define USE_VEML6070 // Add I2C code for VEML6070 sensor (+0k5 code) // #define USE_TSL2561 // Add I2C code for TSL2561 sensor using library Joba_Tsl2561 (+2k3 code) diff --git a/sonoff/xsns_21_sgp30.ino b/sonoff/xsns_21_sgp30.ino new file mode 100644 index 000000000..205c34437 --- /dev/null +++ b/sonoff/xsns_21_sgp30.ino @@ -0,0 +1,115 @@ +/* + xsns_21_sgp30.ino - SGP30 gas and air quality sensor support for Sonoff-Tasmota + + Copyright (C) 2018 Theo Arends + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifdef USE_I2C +#ifdef USE_SGP30 +/*********************************************************************************************\ + * SGP30 - Gas (TVOC - Total Volatile Organic Compounds) and Air Quality (CO2) + * + * Source: Gerhard Mutz and Adafruit Industries + * + * I2C Address: 0x58 +\*********************************************************************************************/ + +#include "Adafruit_SGP30.h" +Adafruit_SGP30 sgp; + +uint8_t sgp30_type = 0; +uint8_t sgp30_ready = 0; +uint8_t sgp30_counter = 0; + +/********************************************************************************************/ + +void Sgp30Update() // Perform every second to ensure proper operation of the baseline compensation algorithm +{ + sgp30_ready = 0; + if (!sgp30_type) { + if (sgp.begin()) { + sgp30_type = 1; +// snprintf_P(log_data, sizeof(log_data), PSTR("SGP: Serialnumber 0x%04X-0x%04X-0x%04X"), sgp.serialnumber[0], sgp.serialnumber[1], sgp.serialnumber[2]); +// AddLog(LOG_LEVEL_DEBUG); + snprintf_P(log_data, sizeof(log_data), S_LOG_I2C_FOUND_AT, "SGP30", 0x58); + AddLog(LOG_LEVEL_DEBUG); + } + } else { + if (!sgp.IAQmeasure()) return; // Measurement failed + sgp30_counter++; + if (30 == sgp30_counter) { + sgp30_counter = 0; + + uint16_t TVOC_base; + uint16_t eCO2_base; + + if (!sgp.getIAQBaseline(&eCO2_base, &TVOC_base)) return; // Failed to get baseline readings +// snprintf_P(log_data, sizeof(log_data), PSTR("SGP: Baseline values eCO2 0x%04X, TVOC 0x%04X"), eCO2_base, TVOC_base); +// AddLog(LOG_LEVEL_DEBUG); + } + sgp30_ready = 1; + } +} + +const char HTTP_SNS_TVOC[] PROGMEM = "%s{s}SGP30 " D_TVOC "{m}%d " D_UNIT_PARTS_PER_BILLION "{e}"; + +void Sgp30Show(boolean json) +{ + if (sgp30_ready) { + if (json) { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"SGP30\":{\"" D_JSON_CO2 "\":%d,\"" D_JSON_TVOC "\":%d}"), mqtt_data, sgp.eCO2, sgp.TVOC); +#ifdef USE_DOMOTICZ + DomoticzSensor(DZ_AIRQUALITY, sgp.eCO2); +#endif // USE_DOMOTICZ + } else { +#ifdef USE_WEBSERVER + snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_CO2, mqtt_data, "SGP30", sgp.eCO2); + snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_TVOC, mqtt_data, sgp.TVOC); +#endif + } + } +} + +/*********************************************************************************************\ + * Interface +\*********************************************************************************************/ + +#define XSNS_21 + +boolean Xsns21(byte function) +{ + boolean result = false; + + if (i2c_flg) { + switch (function) { + case FUNC_EVERY_SECOND: + Sgp30Update(); + break; + case FUNC_JSON_APPEND: + Sgp30Show(1); + break; +#ifdef USE_WEBSERVER + case FUNC_WEB_APPEND: + Sgp30Show(0); + break; +#endif // USE_WEBSERVER + } + } + return result; +} + +#endif // USE_SGP30 +#endif // USE_I2C \ No newline at end of file From 823c9a040484935bab6b70318ff7e03105edce82 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 31 Mar 2018 17:29:00 +0200 Subject: [PATCH 049/136] Add more validation to timer handling Add more validation to timer handling --- sonoff/i18n.h | 1 + sonoff/sonoff_post.h | 2 +- sonoff/webserver.ino | 22 +++++--- sonoff/xdrv_09_timers.ino | 107 ++++++++++++++++++++------------------ 4 files changed, 72 insertions(+), 60 deletions(-) diff --git a/sonoff/i18n.h b/sonoff/i18n.h index 12db1d541..b026d0af5 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -358,6 +358,7 @@ #define D_JSON_TIMER_REPEAT "Repeat" #define D_JSON_TIMER_OUTPUT "Output" #define D_JSON_TIMER_POWER "Power" + #define D_JSON_TIMER_NO_DEVICE "No GPIO as output configured" #define D_CMND_TIMERS "Timers" /********************************************************************************************/ diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h index 67678c6e2..f1f980edf 100644 --- a/sonoff/sonoff_post.h +++ b/sonoff/sonoff_post.h @@ -45,7 +45,7 @@ void WifiWpsStatusCallback(wps_cb_status status); #define USE_HTU // Add I2C code for HTU21/SI7013/SI7020/SI7021 sensor (+1k5 code) #define USE_BMP // Add I2C code for BMP085/BMP180/BMP280/BME280 sensor (+4k code) #define USE_BME680 // Add additional support for BME680 sensor using Adafruit Sensor and BME680 libraries (+6k code) -#define USE_SGP30 // Add I2C code for SGP30 sensor (+4k code) +#define USE_SGP30 // Add I2C code for SGP30 sensor (+1k1 code) #define USE_BH1750 // Add I2C code for BH1750 sensor (+0k5 code) #define USE_VEML6070 // Add I2C code for VEML6070 sensor (+0k5 code) #define USE_TSL2561 // Add I2C code for TSL2561 sensor using library Adafruit TSL2561 Arduino (+1k2 code) diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index 45bde262f..b697e2bab 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -181,15 +181,17 @@ const char HTTP_BTN_MENU1[] PROGMEM = "
"; const char HTTP_BTN_RSTRT[] PROGMEM = "
"; -const char HTTP_BTN_MENU2[] PROGMEM = - "
" +const char HTTP_BTN_MENU_MODULE[] PROGMEM = + "
"; #ifdef USE_TIMERS #ifdef USE_TIMERS_WEB - "
" +const char HTTP_BTN_MENU_TIMER[] PROGMEM = + "
"; #endif // USE_TIMERS_WEB #endif // USE_TIMERS +const char HTTP_BTN_MENU_WIFI[] PROGMEM = "
"; -const char HTTP_BTN_MENU3[] PROGMEM = +const char HTTP_BTN_MENU_MQTT[] PROGMEM = "
" #ifdef USE_DOMOTICZ "
" @@ -629,10 +631,14 @@ void HandleConfiguration() String page = FPSTR(HTTP_HEAD); page.replace(F("{v}"), FPSTR(S_CONFIGURATION)); page += FPSTR(HTTP_HEAD_STYLE); - page += FPSTR(HTTP_BTN_MENU2); - if (Settings.flag.mqtt_enabled) { - page += FPSTR(HTTP_BTN_MENU3); - } + page += FPSTR(HTTP_BTN_MENU_MODULE); +#ifdef USE_TIMERS +#ifdef USE_TIMERS_WEB + if (devices_present) page += FPSTR(HTTP_BTN_MENU_TIMER); +#endif // USE_TIMERS_WEB +#endif // USE_TIMERS + page += FPSTR(HTTP_BTN_MENU_WIFI); + if (Settings.flag.mqtt_enabled) page += FPSTR(HTTP_BTN_MENU_MQTT); page += FPSTR(HTTP_BTN_MENU4); page += FPSTR(HTTP_BTN_MAIN); ShowPage(page); diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino index f1ddeb68c..b82eb7e2c 100644 --- a/sonoff/xdrv_09_timers.ino +++ b/sonoff/xdrv_09_timers.ino @@ -97,65 +97,70 @@ boolean TimerCommand() Settings.timer[index -1].data = Settings.timer[XdrvMailbox.payload -1].data; // Copy timer } } else { - StaticJsonBuffer<128> jsonBuffer; - JsonObject& root = jsonBuffer.parseObject(dataBufUc); - if (!root.success()) { - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_TIMER "%d\":\"" D_JSON_INVALID_JSON "\"}"), index); // JSON decode failed - error = 1; - } - else { - char parm_uc[10]; - index--; - if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_ARM))].success()) { - Settings.timer[index].arm = (root[parm_uc] != 0); + if (devices_present) { + StaticJsonBuffer<128> jsonBuffer; + JsonObject& root = jsonBuffer.parseObject(dataBufUc); + if (!root.success()) { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_TIMER "%d\":\"" D_JSON_INVALID_JSON "\"}"), index); // JSON decode failed + error = 1; } - if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_TIME))].success()) { - uint16_t itime = 0; - uint8_t value = 0; - char time_str[10]; + else { + char parm_uc[10]; + index--; + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_ARM))].success()) { + Settings.timer[index].arm = (root[parm_uc] != 0); + } + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_TIME))].success()) { + uint16_t itime = 0; + uint8_t value = 0; + char time_str[10]; - snprintf(time_str, sizeof(time_str), root[parm_uc]); - const char *substr = strtok(time_str, ":"); - if (substr != NULL) { - value = atoi(substr); - if (value > 23) value = 23; - itime = value * 60; - substr = strtok(NULL, ":"); + snprintf(time_str, sizeof(time_str), root[parm_uc]); + const char *substr = strtok(time_str, ":"); if (substr != NULL) { value = atoi(substr); - if (value > 59) value = 59; - itime += value; + if (value > 23) value = 23; + itime = value * 60; + substr = strtok(NULL, ":"); + if (substr != NULL) { + value = atoi(substr); + if (value > 59) value = 59; + itime += value; + } + } + Settings.timer[index].time = itime; + } + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_DAYS))].success()) { + // SMTWTFS = 1234567 = 0011001 = 00TW00S = --TW--S + Settings.timer[index].days = 0; + const char *tday = root[parm_uc]; + char ch = '.'; + + uint8_t i = 0; + while ((ch != '\0') && (i < 7)) { + ch = *tday++; + if (ch == '-') ch = '0'; + uint8_t mask = 1 << i++; + Settings.timer[index].days |= (ch == '0') ? 0 : mask; } } - Settings.timer[index].time = itime; - } - if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_DAYS))].success()) { - // SMTWTFS = 1234567 = 0011001 = 00TW00S = --TW--S - Settings.timer[index].days = 0; - const char *tday = root[parm_uc]; - char ch = '.'; - - uint8_t i = 0; - while ((ch != '\0') && (i < 7)) { - ch = *tday++; - if (ch == '-') ch = '0'; - uint8_t mask = 1 << i++; - Settings.timer[index].days |= (ch == '0') ? 0 : mask; + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_REPEAT))].success()) { + Settings.timer[index].repeat = (root[parm_uc] != 0); } - } - if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_REPEAT))].success()) { - Settings.timer[index].repeat = (root[parm_uc] != 0); - } - if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_OUTPUT))].success()) { - uint8_t device = ((uint8_t)root[parm_uc] -1) & 0x0F; - Settings.timer[index].device = (device < devices_present) ? device : devices_present -1; - } - if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_POWER))].success()) { - Settings.timer[index].power = (uint8_t)root[parm_uc] & 0x03; - } - if (Settings.timer[index].arm) bitClear(fired, index); + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_OUTPUT))].success()) { + uint8_t device = ((uint8_t)root[parm_uc] -1) & 0x0F; + Settings.timer[index].device = (device < devices_present) ? device : devices_present -1; + } + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_POWER))].success()) { + Settings.timer[index].power = (uint8_t)root[parm_uc] & 0x03; + } + if (Settings.timer[index].arm) bitClear(fired, index); - index++; + index++; + } + } else { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_TIMER "%d\":\"" D_JSON_TIMER_NO_DEVICE "\"}"), index); // No outputs defined so nothing to control + error = 1; } } } From 96212834cf3bbc31f8baf98fe7fb21a128e489ee Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 31 Mar 2018 18:59:37 +0200 Subject: [PATCH 050/136] Change Backlog max commands to 30 5.12.0i * Change max number of commands in Backlog from 15 to 30 --- sonoff/_releasenotes.ino | 1 + sonoff/sonoff.h | 2 +- sonoff/sonoff.ino | 18 +++++------------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 35ae88f27..f87587c10 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -6,6 +6,7 @@ * Add support for SGP30 gas and air quality sensor (#2307) * Change webpage parameter communication * Change Timer parameter Device to more obvious Output + * Change max number of commands in Backlog from 15 to 30 * Change MQTT response topic for Energy changes from ENERGY to SENSOR (#2229, #2251) * Change default Reset configuration time from 4 seconds to 40 seconds on Button hold (#2268) * diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index 61ef81adb..0869c6929 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -97,7 +97,7 @@ typedef unsigned long power_t; // Power (Relay) type #define WEB_LOG_SIZE 4000 // Max number of characters in weblog #endif -#define MAX_BACKLOG 16 // Max number of commands in backlog (chk backlog_index and backlog_pointer code) +#define MAX_BACKLOG 30 // Max number of commands in backlog #define MIN_BACKLOG_DELAY 2 // Minimal backlog delay in 0.1 seconds #define SOFT_BAUDRATE 9600 // Default software serial baudrate diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 6ef37513e..aff1fd224 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -463,16 +463,13 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) int command_code = GetCommandCode(command, sizeof(command), type, kTasmotaCommands); if (CMND_BACKLOG == command_code) { if (data_len) { + uint8_t bl_pointer = (!backlog_pointer) ? MAX_BACKLOG -1 : backlog_pointer; + bl_pointer--; char *blcommand = strtok(dataBuf, ";"); - while (blcommand != NULL) { + while ((blcommand != NULL) && (backlog_index != bl_pointer)) { backlog[backlog_index] = String(blcommand); backlog_index++; -/* - if (backlog_index >= MAX_BACKLOG) { - backlog_index = 0; - } -*/ - backlog_index &= 0xF; + if (backlog_index >= MAX_BACKLOG) backlog_index = 0; blcommand = strtok(NULL, ";"); } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, D_JSON_APPENDED); @@ -1756,12 +1753,7 @@ void StateLoop() ExecuteCommand((char*)backlog[backlog_pointer].c_str()); backlog_mutex = 0; backlog_pointer++; -/* - if (backlog_pointer >= MAX_BACKLOG) { - backlog_pointer = 0; - } -*/ - backlog_pointer &= 0xF; + if (backlog_pointer >= MAX_BACKLOG) backlog_pointer = 0; } } From ce98c6cacc448830b4eac4ab4f2f9e3eb738f2a3 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 31 Mar 2018 19:56:16 +0200 Subject: [PATCH 051/136] Add multiple colors to Led command 5.12.0i * Add multiple color entry support for command Led like Led2 120000.001200.000012 setting led2 as Red, Led3 as Green and Led4 as Blue (#2303) --- sonoff/_releasenotes.ino | 3 ++- sonoff/xdrv_01_light.ino | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index f87587c10..50b7a7ca0 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -4,9 +4,10 @@ * Add optional Timer configuration webpage to be enabled in user_config.h with define USE_TIMERS_WEB * Add Home Assistant MQTT Discovery for Buttons and change SetOption19 response (#2277) * Add support for SGP30 gas and air quality sensor (#2307) + * Add multiple color entry support for command Led like Led2 120000.001200.000012 setting led2 as Red, Led3 as Green and Led4 as Blue (#2303) * Change webpage parameter communication * Change Timer parameter Device to more obvious Output - * Change max number of commands in Backlog from 15 to 30 + * Change max number of commands in Backlog from 15 to 30 and ignore commands overflowing * Change MQTT response topic for Energy changes from ENERGY to SENSOR (#2229, #2251) * Change default Reset configuration time from 4 seconds to 40 seconds on Button hold (#2268) * diff --git a/sonoff/xdrv_01_light.ino b/sonoff/xdrv_01_light.ino index 54c7cebc9..9158442a9 100644 --- a/sonoff/xdrv_01_light.ino +++ b/sonoff/xdrv_01_light.ino @@ -1114,8 +1114,16 @@ boolean LightCommand() #ifdef USE_WS2812 // *********************************************************************** else if ((CMND_LED == command_code) && (LT_WS2812 == light_type) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= Settings.light_pixels)) { if (XdrvMailbox.data_len > 0) { - if (LightColorEntry(XdrvMailbox.data, XdrvMailbox.data_len)) { - Ws2812SetColor(XdrvMailbox.index, light_entry_color[0], light_entry_color[1], light_entry_color[2], light_entry_color[3]); + char *p; + uint16_t idx = XdrvMailbox.index; + for (char *color = strtok_r(XdrvMailbox.data, ".", &p); color; color = strtok_r(NULL, ".", &p)) { + if (LightColorEntry(color, strlen(color))) { + Ws2812SetColor(idx, light_entry_color[0], light_entry_color[1], light_entry_color[2], light_entry_color[3]); + idx++; + if (idx >= Settings.light_pixels) break; + } else { + break; + } } } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_SVALUE, command, XdrvMailbox.index, Ws2812GetColor(XdrvMailbox.index, scolor)); From 8af94521162e5a2fd0de80d4e944738610746228 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sun, 1 Apr 2018 11:04:00 +0200 Subject: [PATCH 052/136] Change led multiple color sep from dot to space 5.12.0i * Add multiple color entry support for command Led like Led2 120000 001200 000012 setting led2 as Red, Led3 as Green and Led4 as Blue (#2303) --- sonoff/_releasenotes.ino | 2 +- sonoff/xdrv_01_light.ino | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 50b7a7ca0..1de743336 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -4,7 +4,7 @@ * Add optional Timer configuration webpage to be enabled in user_config.h with define USE_TIMERS_WEB * Add Home Assistant MQTT Discovery for Buttons and change SetOption19 response (#2277) * Add support for SGP30 gas and air quality sensor (#2307) - * Add multiple color entry support for command Led like Led2 120000.001200.000012 setting led2 as Red, Led3 as Green and Led4 as Blue (#2303) + * Add multiple color entry support for command Led like Led2 120000 001200 000012 setting led2 as Red, Led3 as Green and Led4 as Blue (#2303) * Change webpage parameter communication * Change Timer parameter Device to more obvious Output * Change max number of commands in Backlog from 15 to 30 and ignore commands overflowing diff --git a/sonoff/xdrv_01_light.ino b/sonoff/xdrv_01_light.ino index 9158442a9..2c9b04890 100644 --- a/sonoff/xdrv_01_light.ino +++ b/sonoff/xdrv_01_light.ino @@ -1116,7 +1116,7 @@ boolean LightCommand() if (XdrvMailbox.data_len > 0) { char *p; uint16_t idx = XdrvMailbox.index; - for (char *color = strtok_r(XdrvMailbox.data, ".", &p); color; color = strtok_r(NULL, ".", &p)) { + for (char *color = strtok_r(XdrvMailbox.data, " ", &p); color; color = strtok_r(NULL, " ", &p)) { if (LightColorEntry(color, strlen(color))) { Ws2812SetColor(idx, light_entry_color[0], light_entry_color[1], light_entry_color[2], light_entry_color[3]); idx++; From 1ccac05b43f71d72901b892218e7a3f5460d9825 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sun, 1 Apr 2018 21:37:00 +0200 Subject: [PATCH 053/136] Add Domoticz Battery and RSSI Quality 5.12.0i * Add Domoticz Battery and RSSI Quality (#1604) --- sonoff/_releasenotes.ino | 1 + sonoff/xdrv_05_domoticz.ino | 40 ++++++++++++++++++++++++++++++++----- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 1de743336..2c5c80c70 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -2,6 +2,7 @@ * Add 16 timers using commands Timer and Timers (#1091) * Add commands Timer 0 to clear timer and Timer 1..16 to copy timer * Add optional Timer configuration webpage to be enabled in user_config.h with define USE_TIMERS_WEB + * Add Domoticz Battery and RSSI Quality (#1604) * Add Home Assistant MQTT Discovery for Buttons and change SetOption19 response (#2277) * Add support for SGP30 gas and air quality sensor (#2307) * Add multiple color entry support for command Led like Led2 120000 001200 000012 setting led2 as Red, Led3 as Green and Led4 as Blue (#2303) diff --git a/sonoff/xdrv_05_domoticz.ino b/sonoff/xdrv_05_domoticz.ino index 5aa6a7c43..ea2b39319 100644 --- a/sonoff/xdrv_05_domoticz.ino +++ b/sonoff/xdrv_05_domoticz.ino @@ -35,6 +35,8 @@ const char HTTP_FORM_DOMOTICZ_TIMER[] PROGMEM = ""; #endif // USE_WEBSERVER +const char DOMOTICZ_MESSAGE[] PROGMEM = "{\"idx\":%d,\"nvalue\":%d,\"svalue\":\"%s\",\"Battery\":%d,\"RSSI\":%d}"; + enum DomoticzCommands { CMND_IDX, CMND_KEYIDX, CMND_SWITCHIDX, CMND_SENSORIDX, CMND_UPDATETIMER }; const char kDomoticzCommands[] PROGMEM = D_CMND_IDX "|" D_CMND_KEYIDX "|" D_CMND_SWITCHIDX "|" D_CMND_SENSORIDX "|" D_CMND_UPDATETIMER ; @@ -57,6 +59,32 @@ boolean domoticz_subscribe = false; int domoticz_update_timer = 0; byte domoticz_update_flag = 1; +int DomoticzBatteryQuality() +{ + // Battery 0%: ESP 2.6V (minimum operating voltage is 2.5) + // Battery 100%: ESP 3.6V (maximum operating voltage is 3.6) + // Battery 101% to 200%: ESP over 3.6V (means over maximum operating voltage) + + int quality = 0; // Voltage range from 2,6V > 0% to 3,6V > 100% + + uint16_t voltage = ESP.getVcc(); + if (voltage <= 2600) { + quality = 0; + } else if (voltage >= 4600) { + quality = 200; + } else { + quality = (voltage - 2600) / 10; + } + return quality; +} + +int DomoticzRssiQuality() +{ + // RSSI range: 0% to 10% (12 means disable RSSI in Domoticz) + + return WifiGetRssiAsQuality(WiFi.RSSI()) / 10; +} + void MqttPublishDomoticzPowerState(byte device) { char sdimmer[8]; @@ -66,8 +94,8 @@ void MqttPublishDomoticzPowerState(byte device) } if (Settings.flag.mqtt_enabled && Settings.domoticz_relay_idx[device -1]) { snprintf_P(sdimmer, sizeof(sdimmer), PSTR("%d"), Settings.light_dimmer); - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"idx\":%d,\"nvalue\":%d,\"svalue\":\"%s\"}"), - Settings.domoticz_relay_idx[device -1], (power & (1 << (device -1))) ? 1 : 0, (light_type) ? sdimmer : ""); + snprintf_P(mqtt_data, sizeof(mqtt_data), DOMOTICZ_MESSAGE, + Settings.domoticz_relay_idx[device -1], (power & (1 << (device -1))) ? 1 : 0, (light_type) ? sdimmer : "", DomoticzBatteryQuality(), DomoticzRssiQuality()); MqttPublish(domoticz_in_topic); } } @@ -275,13 +303,15 @@ uint8_t DomoticzHumidityState(char *hum) void DomoticzSensor(byte idx, char *data) { if (Settings.domoticz_sensor_idx[idx]) { - char dmess[64]; + char dmess[90]; memcpy(dmess, mqtt_data, sizeof(dmess)); if (DZ_AIRQUALITY == idx) { - snprintf_P(mqtt_data, sizeof(dmess), PSTR("{\"idx\":%d,\"nvalue\":%s}"), Settings.domoticz_sensor_idx[idx], data); + snprintf_P(mqtt_data, sizeof(dmess), PSTR("{\"idx\":%d,\"nvalue\":%s,\"Battery\":%d,\"RSSI\":%d}"), + Settings.domoticz_sensor_idx[idx], data, DomoticzBatteryQuality(), DomoticzRssiQuality()); } else { - snprintf_P(mqtt_data, sizeof(dmess), PSTR("{\"idx\":%d,\"nvalue\":0,\"svalue\":\"%s\"}"), Settings.domoticz_sensor_idx[idx], data); + snprintf_P(mqtt_data, sizeof(dmess), DOMOTICZ_MESSAGE, + Settings.domoticz_sensor_idx[idx], 0, data, DomoticzBatteryQuality(), DomoticzRssiQuality()); } MqttPublish(domoticz_in_topic); memcpy(mqtt_data, dmess, sizeof(dmess)); From fa556897fe1711fb1d2dae6eea91a9a4a25dd571 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sun, 1 Apr 2018 21:54:15 +0200 Subject: [PATCH 054/136] Change SGP30 CO2 into eCO2 Change SGP30 CO2 into eCO2 (#2307) --- sonoff/i18n.h | 3 ++- sonoff/language/cs-CZ.h | 1 + sonoff/language/de-DE.h | 1 + sonoff/language/en-GB.h | 1 + sonoff/language/es-AR.h | 1 + sonoff/language/fr-FR.h | 1 + sonoff/language/hu-HU.h | 1 + sonoff/language/it-IT.h | 1 + sonoff/language/nl-NL.h | 1 + sonoff/language/pl-PL.h | 1 + sonoff/language/pt-PT.h | 1 + sonoff/language/ru-RU.h | 1 + sonoff/language/zh-CN.h | 1 + sonoff/language/zh-TW.h | 1 + sonoff/xsns_21_sgp30.ino | 11 ++++++----- 15 files changed, 21 insertions(+), 6 deletions(-) diff --git a/sonoff/i18n.h b/sonoff/i18n.h index b026d0af5..95b17fea6 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -48,6 +48,7 @@ #define D_JSON_DATA "Data" #define D_JSON_DNSSERVER "DNSServer" #define D_JSON_DONE "Done" +#define D_JSON_ECO2 "eCO2" #define D_JSON_EMPTY "Empty" #define D_JSON_ENDDST "EndDST" // End Daylight Savings Time #define D_JSON_ERASE "Erase" @@ -481,7 +482,7 @@ const char HTTP_SNS_PRESSURE[] PROGMEM = "%s{s}%s " D_PRESSURE "{m}%s " D_UNIT_P const char HTTP_SNS_SEAPRESSURE[] PROGMEM = "%s{s}%s " D_PRESSUREATSEALEVEL "{m}%s " D_UNIT_PRESSURE "{e}"; // {s} = const char HTTP_SNS_ANALOG[] PROGMEM = "%s{s}%s " D_ANALOG_INPUT "%d{m}%d{e}"; // {s} = -#if defined(USE_MHZ19) || defined(USE_SENSEAIR) || defined(USE_SGP30) +#if defined(USE_MHZ19) || defined(USE_SENSEAIR) const char HTTP_SNS_CO2[] PROGMEM = "%s{s}%s " D_CO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}"; // {s} = #endif // USE_WEBSERVER diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h index 9f2740ecb..21336443c 100644 --- a/sonoff/language/cs-CZ.h +++ b/sonoff/language/cs-CZ.h @@ -77,6 +77,7 @@ #define D_DNS_SERVER "Server DNS" #define D_DONE "Provedeno" #define D_DST_TIME "DST" +#define D_ECO2 "eCO2" #define D_EMULATION "Emulace" #define D_ENABLED "Otevřený" #define D_ERASE "Smaž" diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index 45040412e..caa74fd41 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -77,6 +77,7 @@ #define D_DNS_SERVER "DNS Server" #define D_DONE "erledigt" #define D_DST_TIME "DST" +#define D_ECO2 "eCO2" #define D_EMULATION "Emulation" #define D_ENABLED "aktiviert" #define D_ERASE "löschen" diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h index dadd68f85..484946200 100644 --- a/sonoff/language/en-GB.h +++ b/sonoff/language/en-GB.h @@ -77,6 +77,7 @@ #define D_DNS_SERVER "DNS Server" #define D_DONE "Done" #define D_DST_TIME "DST" +#define D_ECO2 "eCO2" #define D_EMULATION "Emulation" #define D_ENABLED "Enabled" #define D_ERASE "Erase" diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index ae9acf887..143ee4d3c 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -77,6 +77,7 @@ #define D_DNS_SERVER "DNS Server" #define D_DONE "Listo" #define D_DST_TIME "DST" +#define D_ECO2 "eCO2" #define D_EMULATION "Emulación" #define D_ENABLED "Habilitado" #define D_ERASE "Borrar" diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h index d5a62db80..5d09cfcb6 100644 --- a/sonoff/language/fr-FR.h +++ b/sonoff/language/fr-FR.h @@ -77,6 +77,7 @@ #define D_DNS_SERVER "Serveur DNS" #define D_DONE "Fait" #define D_DST_TIME "DST" +#define D_ECO2 "eCO2" #define D_EMULATION "Emulation" #define D_ENABLED "Activé" #define D_ERASE "Effacer" diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h index f4dc7a0c9..e043b1b96 100644 --- a/sonoff/language/hu-HU.h +++ b/sonoff/language/hu-HU.h @@ -77,6 +77,7 @@ #define D_DNS_SERVER "DNS Szerver" #define D_DONE "Kész" #define D_DST_TIME "DST" +#define D_ECO2 "eCO2" #define D_EMULATION "Emuláció" #define D_ENABLED "Engedélyezve" #define D_ERASE "Törlés" diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index 8a3a80702..59851e677 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -77,6 +77,7 @@ #define D_DNS_SERVER "DNS Server" #define D_DONE "Fatto" #define D_DST_TIME "DST" +#define D_ECO2 "eCO2" #define D_EMULATION "Emulazione" #define D_ENABLED "Abilitato" #define D_ERASE "Cancellare" diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h index 507213f07..b21bea2aa 100644 --- a/sonoff/language/nl-NL.h +++ b/sonoff/language/nl-NL.h @@ -77,6 +77,7 @@ #define D_DNS_SERVER "DNS Server" #define D_DONE "Klaar" #define D_DST_TIME "ZT" +#define D_ECO2 "eCO2" #define D_EMULATION "Emulatie" #define D_ENABLED "Geactiveerd" #define D_ERASE "Wissen" diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h index 856e682bf..9d0352315 100644 --- a/sonoff/language/pl-PL.h +++ b/sonoff/language/pl-PL.h @@ -77,6 +77,7 @@ #define D_DNS_SERVER "Server DNS" #define D_DONE "Wykonane" #define D_DST_TIME "DST" +#define D_ECO2 "eCO2" #define D_EMULATION "Emulacja" #define D_ENABLED "Otwarty" #define D_ERASE "Nadpisz" diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h index 482e40474..5c52cd528 100644 --- a/sonoff/language/pt-PT.h +++ b/sonoff/language/pt-PT.h @@ -77,6 +77,7 @@ #define D_DNS_SERVER "Servidor DNS" #define D_DONE "Concluído" #define D_DST_TIME "DST" +#define D_ECO2 "eCO2" #define D_EMULATION "Emulação" #define D_ENABLED "Habilitado" #define D_ERASE "Apagar" diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h index ee84a50b0..d11bfcda2 100644 --- a/sonoff/language/ru-RU.h +++ b/sonoff/language/ru-RU.h @@ -77,6 +77,7 @@ #define D_DNS_SERVER "DNS Сервер" #define D_DONE "Выполнено" #define D_DST_TIME "DST" +#define D_ECO2 "eCO2" #define D_EMULATION "Эмуляция" #define D_ENABLED "Активно" #define D_ERASE "Стирать" diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h index a105a9c3a..f9d0d5cc2 100644 --- a/sonoff/language/zh-CN.h +++ b/sonoff/language/zh-CN.h @@ -77,6 +77,7 @@ #define D_DNS_SERVER "DNS服务器" #define D_DONE "完成" #define D_DST_TIME "DST" +#define D_ECO2 "eCO2" #define D_EMULATION "设备模拟" #define D_ENABLED "启用" #define D_ERASE "擦除" diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h index 118e0d719..a95b772ca 100644 --- a/sonoff/language/zh-TW.h +++ b/sonoff/language/zh-TW.h @@ -77,6 +77,7 @@ #define D_DNS_SERVER "DNS伺服器" #define D_DONE "完成" #define D_DST_TIME "DST" +#define D_ECO2 "eCO2" #define D_EMULATION "設備模擬" #define D_ENABLED "啟用" #define D_ERASE "刪除" diff --git a/sonoff/xsns_21_sgp30.ino b/sonoff/xsns_21_sgp30.ino index 205c34437..eed03ce7f 100644 --- a/sonoff/xsns_21_sgp30.ino +++ b/sonoff/xsns_21_sgp30.ino @@ -64,20 +64,21 @@ void Sgp30Update() // Perform every second to ensure proper operation of the ba } } -const char HTTP_SNS_TVOC[] PROGMEM = "%s{s}SGP30 " D_TVOC "{m}%d " D_UNIT_PARTS_PER_BILLION "{e}"; +const char HTTP_SNS_SGP30[] PROGMEM = "%s" + "{s}SGP30 " D_ECO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}" // {s} = + "{s}SGP30 " D_TVOC "{m}%d " D_UNIT_PARTS_PER_BILLION "{e}"; void Sgp30Show(boolean json) { if (sgp30_ready) { if (json) { - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"SGP30\":{\"" D_JSON_CO2 "\":%d,\"" D_JSON_TVOC "\":%d}"), mqtt_data, sgp.eCO2, sgp.TVOC); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"SGP30\":{\"" D_JSON_ECO2 "\":%d,\"" D_JSON_TVOC "\":%d}"), mqtt_data, sgp.eCO2, sgp.TVOC); #ifdef USE_DOMOTICZ - DomoticzSensor(DZ_AIRQUALITY, sgp.eCO2); + DomoticzSensor(DZ_AIRQUALITY, sgp.eCO2); #endif // USE_DOMOTICZ } else { #ifdef USE_WEBSERVER - snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_CO2, mqtt_data, "SGP30", sgp.eCO2); - snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_TVOC, mqtt_data, sgp.TVOC); + snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_SGP30, mqtt_data, sgp.eCO2, sgp.TVOC); #endif } } From 8ddd121953a2c4bdcab5f5473ffad6b05da35ec3 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 2 Apr 2018 11:24:36 +0200 Subject: [PATCH 055/136] Change user_config_override usage 5.12.0i * Change user_config_override usage by providing user_config_override_sample.h (#2228) --- README.md | 20 +++--- platformio.ini | 57 +++++++++++++---- sonoff/sonoff.ino | 4 +- sonoff/user_config.h | 3 + sonoff/user_config_override.h | 44 ------------- sonoff/user_config_override_sample.h | 93 ++++++++++++++++++++++++++++ 6 files changed, 149 insertions(+), 72 deletions(-) delete mode 100644 sonoff/user_config_override.h create mode 100644 sonoff/user_config_override_sample.h diff --git a/README.md b/README.md index e4a1e3fb6..3300c8b0d 100644 --- a/README.md +++ b/README.md @@ -3,23 +3,17 @@ Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and Electr Current version is **5.12.0i** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. -### ATTENTION All versions +### Quick install -Only Flash Mode DOUT is supported. Do not use Flash Mode DIO / QIO / QOUT as it might seem to brick your device. +Download one of the release binaries from https://github.com/arendst/Sonoff-Tasmota/releases and flash it to your hardware as documented in the wiki. -See [Wiki](https://github.com/arendst/Sonoff-Tasmota/wiki/Theo's-Tasmota-Tips) for background information. +### User compilation parameters -### ATTENTION Version 5 and up +If you want to compile Tasmota yourself keep in mind the following: -These versions use a new linker script to free flash memory for future code additions. It moves the settings from Spiffs to Eeprom. If you compile your own firmware download the new linker to your IDE or Platformio base folder. See [Wiki > Prerequisite](https://github.com/arendst/Sonoff-Tasmota/wiki/Prerequisite). - -Best practice to implement is: -- Open the webpage to your device -- Perform option ``Backup Configuration`` -- Upgrade new firmware using ``Firmware upgrade`` -- If configuration conversion fails keep the webpage open and perform ``Restore Configuration`` - -You should now have a device with 32k more code memory to play with. +- Only Flash Mode **DOUT** is supported. Do not use Flash Mode DIO / QIO / QOUT as it might seem to brick your device. See [Wiki](https://github.com/arendst/Sonoff-Tasmota/wiki/Theo's-Tasmota-Tips) for background information. +- Tasmota uses a linker script WITHOUT spiffs for optimal code space. If you compile your own firmware on Arduino IDE and ESP/Arduino library 2.3.0 then download the new linker to your IDE or Platformio base folder. Later version of ESP/Arduino library already contain the correct linker script. See [Wiki > Prerequisite](https://github.com/arendst/Sonoff-Tasmota/wiki/Prerequisite). +- To make compile time changes to Tasmota can use the user_config_override.h file. It assures keeping your settings when you compile a new version. To use user_config.override.h copy the provided user_config.override_sample.h file to user_config.override.h and add your setting overrides. To enable the override file you will need to add a compile define as documented in the user_config_override_sample.h file ### Version Information diff --git a/platformio.ini b/platformio.ini index 675d7c891..87991ad88 100644 --- a/platformio.ini +++ b/platformio.ini @@ -14,6 +14,7 @@ src_dir = sonoff ;env_default = sonoff ;env_default = sonoff-minimal ;env_default = sonoff-xxl +;env_default = sonoff-CZ ;env_default = sonoff-DE ;env_default = sonoff-ES ;env_default = sonoff-FR @@ -24,6 +25,7 @@ src_dir = sonoff ;env_default = sonoff-PT ;env_default = sonoff-RU ;env_default = sonoff-CN +;env_default = sonoff-TW [env:sonoff] ;platform = espressif8266@1.5.0 ; v2.3.0 @@ -33,7 +35,7 @@ framework = arduino board = esp01_1m board_flash_mode = dout build_flags = -Wl,-Tesp8266.flash.1m0.ld -lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DUSE_CONFIG_OVERRIDE extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -60,7 +62,8 @@ framework = arduino board = esp01_1m board_flash_mode = dout build_flags = -Wl,-Tesp8266.flash.1m0.ld -DBE_MINIMAL -lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DBE_MINIMAL -DUSE_CONFIG_OVERRIDE + extra_scripts = pio/strip-floats.py ; Serial Monitor options @@ -74,12 +77,26 @@ framework = arduino board = esp01_1m board_flash_mode = dout build_flags = -Wl,-Tesp8266.flash.1m0.ld -DUSE_ALL_SENSORS -lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DUSE_ALL_SENSORS -DUSE_CONFIG_OVERRIDE extra_scripts = pio/strip-floats.py ; Serial Monitor options monitor_baud = 115200 +[env:sonoff-CZ] +;platform = espressif8266@1.5.0 ; v2.3.0 +;platform = espressif8266@1.6.0 ; v2.4.0 +platform = espressif8266 +framework = arduino +board = esp01_1m +board_flash_mode = dout +build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=cs-CZ +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=cs-CZ -DUSE_CONFIG_OVERRIDE +extra_scripts = pio/strip-floats.py + +; *** Serial Monitor options +monitor_baud = 115200 + [env:sonoff-DE] ;platform = espressif8266@1.5.0 ; v2.3.0 ;platform = espressif8266@1.6.0 ; v2.4.0 @@ -88,7 +105,7 @@ framework = arduino board = esp01_1m board_flash_mode = dout build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=de-DE -lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=de-DE -DUSE_CONFIG_OVERRIDE extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -102,7 +119,7 @@ framework = arduino board = esp01_1m board_flash_mode = dout build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=es-AR -lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=es-AR -DUSE_CONFIG_OVERRIDE extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -116,7 +133,7 @@ framework = arduino board = esp01_1m board_flash_mode = dout build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=fr-FR -lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=fr-FR -DUSE_CONFIG_OVERRIDE extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -130,7 +147,7 @@ framework = arduino board = esp01_1m board_flash_mode = dout build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=hu-HU -lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=hu-HU -DUSE_CONFIG_OVERRIDE extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -144,7 +161,7 @@ framework = arduino board = esp01_1m board_flash_mode = dout build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=it-IT -lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=it-IT -DUSE_CONFIG_OVERRIDE extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -158,7 +175,7 @@ framework = arduino board = esp01_1m board_flash_mode = dout build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=nl-NL -lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=nl-NL -DUSE_CONFIG_OVERRIDE extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -172,7 +189,7 @@ framework = arduino board = esp01_1m board_flash_mode = dout build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=pl-PL -lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=pl-PL -DUSE_CONFIG_OVERRIDE extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -186,7 +203,7 @@ framework = arduino board = esp01_1m board_flash_mode = dout build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=pt-PT -lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=pt-PT -DUSE_CONFIG_OVERRIDE extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -200,7 +217,7 @@ framework = arduino board = esp01_1m board_flash_mode = dout build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=ru-RU -lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=ru-RU -DUSE_CONFIG_OVERRIDE extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -214,7 +231,21 @@ framework = arduino board = esp01_1m board_flash_mode = dout build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=zh-CN -lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=zh-CN -DUSE_CONFIG_OVERRIDE +extra_scripts = pio/strip-floats.py + +; *** Serial Monitor options +monitor_baud = 115200 + +[env:sonoff-TW] +;platform = espressif8266@1.5.0 ; v2.3.0 +;platform = espressif8266@1.6.0 ; v2.4.0 +platform = espressif8266 +framework = arduino +board = esp01_1m +board_flash_mode = dout +build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=zh-TW +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=zh-TW -DUSE_CONFIG_OVERRIDE extra_scripts = pio/strip-floats.py ; *** Serial Monitor options diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index aff1fd224..ba91347ed 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -32,9 +32,9 @@ #include "sonoff.h" // Enumeration used in user_config.h #include "user_config.h" // Fixed user configurable options -//#ifdef USE_CONFIG_OVERRIDE +#ifdef USE_CONFIG_OVERRIDE #include "user_config_override.h" // Configuration overrides for user_config.h -//#endif +#endif #include "i18n.h" // Language support configured by user_config.h #include "sonoff_template.h" // Hardware configuration diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 5b274624a..db5e9a50d 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -48,6 +48,9 @@ // As an IDE restriction it needs to be the same as the main .ino file #define CFG_HOLDER 0x20161209 // [Reset 1] Change this value to load following default configuration parameters + +//#define USE_CONFIG_OVERRIDE // Uncomment to use your own user_config_override.h file. See README.md + #define SAVE_DATA 1 // [SaveData] Save changed parameters to Flash (0 = disable, 1 - 3600 seconds) #define SAVE_STATE 1 // [SetOption0] Save changed power state to Flash (0 = disable, 1 = enable) diff --git a/sonoff/user_config_override.h b/sonoff/user_config_override.h deleted file mode 100644 index 1008faf72..000000000 --- a/sonoff/user_config_override.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - user_config_override.h - user configuration overrides user_config.h for Sonoff-Tasmota - - Copyright (C) 2018 Theo Arends - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#ifndef _USER_CONFIG_OVERRIDE_H_ -#define _USER_CONFIG_OVERRIDE_H_ - -/*****************************************************************************************************\ - * ATTENTION: - Changes to most PARAMETER defines will only override flash settings if you change - * define CFG_HOLDER. - * - Expect compiler warnings when no ifdef/undef/endif sequence is used. - * - You still need to update user_config.h for major defines MODULE and USE_MQTT_TLS. - * - Changing MODULE defines are not being tested for validity as they are in user_config.h. - * - Most parameters can be changed online using commands via MQTT, WebConsole or serial. - * - So I see no use in this but anyway, your on your own. -\*****************************************************************************************************/ - -// Examples -//#ifdef CFG_HOLDER -//#undef CFG_HOLDER -//#endif -//#define CFG_HOLDER 0x20161210 - -//#ifdef STA_SSID1 -//#undef STA_SSID1 -//#endif -//#define STA_SSID1 "yourssid1" - -#endif // _USER_CONFIG_OVERRIDE_H_ \ No newline at end of file diff --git a/sonoff/user_config_override_sample.h b/sonoff/user_config_override_sample.h new file mode 100644 index 000000000..81e209c5d --- /dev/null +++ b/sonoff/user_config_override_sample.h @@ -0,0 +1,93 @@ +/* + user_config_override.h - user configuration overrides user_config.h for Sonoff-Tasmota + + Copyright (C) 2018 Theo Arends + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef _USER_CONFIG_OVERRIDE_H_ +#define _USER_CONFIG_OVERRIDE_H_ + +// force the compiler to show a warning to confirm that this file is inlcuded +#warning **** Using Settings from user_config_override.h File *** + +/*****************************************************************************************************\ + * USAGE: + * To modify the stock configuration without changing the user_config.h file: + * (1) copy this file to "user_config_override.h" (It will be ignored by Git) + * (2) define your own settings below + * (3) for platformio: + * define USE_CONFIG_OVERRIDE as a build flags. + * ie1 : export PLATFORMIO_BUILD_FLAGS='-DUSE_CONFIG_OVERRIDE' + * ie2 : enable in file platformio.ini ;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DUSE_CONFIG_OVERRIDE + * for Arduino IDE: + * enable define USE_CONFIG_OVERRIDE in user_config.h + ****************************************************************************************************** + * ATTENTION: + * - Changes to most PARAMETER defines will only override flash settings if you change define CFG_HOLDER. + * - Expect compiler warnings when no ifdef/undef/endif sequence is used. + * - You still need to update user_config.h for major defines MODULE and USE_MQTT_TLS. + * - Changing MODULE defines are not being tested for validity as they are in user_config.h. + * - Most parameters can be changed online using commands via MQTT, WebConsole or serial. +\*****************************************************************************************************/ + +/* +Examples : + +// Setup your own Wifi settings ------------------------------------------------------- +#undef STA_SSID1 +#define STA_SSID1 "YourSSID" // [Ssid1] Wifi SSID + +#undef STA_PASS1 +#define STA_PASS1 "YourWifiPassword" // [Password1] Wifi password + +// Setup your own MQTT settings ------------------------------------------------------- +#undef MQTT_HOST +#define MQTT_HOST "your-mqtt-server.com" // [MqttHost] + +#undef MQTT_PORT +#define MQTT_PORT 1883 // [MqttPort] MQTT port (10123 on CloudMQTT) + +#undef MQTT_USER +#define MQTT_USER "YourMqttUser" // [MqttUser] Optional user + +#undef MQTT_PASS +#define MQTT_PASS "YourMqttPass" // [MqttPassword] Optional password + +// You might even pass some parameters from the command line ---------------------------- +// Ie: export PLATFORMIO_BUILD_FLAGS='-DUSE_CONFIG_OVER -DMY_IP="192.168.1.99" -DMY_GW="192.168.1.1" -DMY_DNS="192.168.1.1"' + +#ifdef MY_IP +#undef WIFI_IP_ADDRESS +#define WIFI_IP_ADDRESS MY_IP // Set to 0.0.0.0 for using DHCP or IP address +#endif + +#ifdef MY_GW +#undef WIFI_GATEWAY +#define WIFI_GATEWAY MY_GW // if not using DHCP set Gateway IP address +#endif + +#ifdef MY_DNS +#undef WIFI_DNS +#define WIFI_DNS MY_DNS // If not using DHCP set DNS IP address (might be equal to WIFI_GATEWAY) +#endif + +*/ + + + + + +#endif // _USER_CONFIG_OVERRIDE_H_ \ No newline at end of file From 83294be8fec305744c223a822d6463be112cd524 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 2 Apr 2018 11:31:05 +0200 Subject: [PATCH 056/136] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3300c8b0d..84a7814f0 100644 --- a/README.md +++ b/README.md @@ -5,15 +5,15 @@ Current version is **5.12.0i** - See [sonoff/_releasenotes.ino](https://github.c ### Quick install -Download one of the release binaries from https://github.com/arendst/Sonoff-Tasmota/releases and flash it to your hardware as documented in the wiki. +Download one of the released binaries from https://github.com/arendst/Sonoff-Tasmota/releases and flash it to your hardware as documented in the wiki. -### User compilation parameters +### Important User Compilation Information -If you want to compile Tasmota yourself keep in mind the following: +If you want to compile Sonoff-Tasmota yourself keep in mind the following: - Only Flash Mode **DOUT** is supported. Do not use Flash Mode DIO / QIO / QOUT as it might seem to brick your device. See [Wiki](https://github.com/arendst/Sonoff-Tasmota/wiki/Theo's-Tasmota-Tips) for background information. -- Tasmota uses a linker script WITHOUT spiffs for optimal code space. If you compile your own firmware on Arduino IDE and ESP/Arduino library 2.3.0 then download the new linker to your IDE or Platformio base folder. Later version of ESP/Arduino library already contain the correct linker script. See [Wiki > Prerequisite](https://github.com/arendst/Sonoff-Tasmota/wiki/Prerequisite). -- To make compile time changes to Tasmota can use the user_config_override.h file. It assures keeping your settings when you compile a new version. To use user_config.override.h copy the provided user_config.override_sample.h file to user_config.override.h and add your setting overrides. To enable the override file you will need to add a compile define as documented in the user_config_override_sample.h file +- Sonoff-Tasmota uses a linker script WITHOUT spiffs for optimal code space. If you compile using ESP/Arduino library 2.3.0 then download the new linker to your Arduino IDE or Platformio base folder. Later version of ESP/Arduino library already contain the correct linker script. See [Wiki > Prerequisite](https://github.com/arendst/Sonoff-Tasmota/wiki/Prerequisite). +- To make compile time changes to Sonoff-Tasmota it can use the ``user_config_override.h`` file. It assures keeping your settings when you compile a new version. To use ``user_config.override.h`` copy the provided ``user_config.override_sample.h`` file and add your setting overrides. To enable the override file you will need to add a compile define as documented in the ``user_config_override_sample.h`` file. ### Version Information From f3c553f3da41cd481187665db88352bc85a7c085 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 2 Apr 2018 11:34:49 +0200 Subject: [PATCH 057/136] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 84a7814f0..7734cacfd 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ Download one of the released binaries from https://github.com/arendst/Sonoff-Tas If you want to compile Sonoff-Tasmota yourself keep in mind the following: - Only Flash Mode **DOUT** is supported. Do not use Flash Mode DIO / QIO / QOUT as it might seem to brick your device. See [Wiki](https://github.com/arendst/Sonoff-Tasmota/wiki/Theo's-Tasmota-Tips) for background information. -- Sonoff-Tasmota uses a linker script WITHOUT spiffs for optimal code space. If you compile using ESP/Arduino library 2.3.0 then download the new linker to your Arduino IDE or Platformio base folder. Later version of ESP/Arduino library already contain the correct linker script. See [Wiki > Prerequisite](https://github.com/arendst/Sonoff-Tasmota/wiki/Prerequisite). -- To make compile time changes to Sonoff-Tasmota it can use the ``user_config_override.h`` file. It assures keeping your settings when you compile a new version. To use ``user_config.override.h`` copy the provided ``user_config.override_sample.h`` file and add your setting overrides. To enable the override file you will need to add a compile define as documented in the ``user_config_override_sample.h`` file. +- Sonoff-Tasmota uses a 1M linker script WITHOUT spiffs for optimal code space. If you compile using ESP/Arduino library 2.3.0 then download the provided new linker script to your Arduino IDE or Platformio base folder. Later version of ESP/Arduino library already contain the correct linker script. See [Wiki > Prerequisite](https://github.com/arendst/Sonoff-Tasmota/wiki/Prerequisite). +- To make compile time changes to Sonoff-Tasmota it can use the ``user_config_override.h`` file. It assures keeping your settings when you download and compile a new version. To use ``user_config.override.h`` you will have to make a copy of the provided ``user_config.override_sample.h`` file and add your setting overrides. To enable the override file you will need to use a compile define as documented in the ``user_config_override_sample.h`` file. ### Version Information From 883fa4ce8d18c0bafead084bc93a5f898ea401be Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 2 Apr 2018 14:19:57 +0200 Subject: [PATCH 058/136] Add hexadecimal Data entry to command IrSend 5.12.0i * Add hexadecimal Data entry to command IrSend using 0x notation (#1290, #2314) --- sonoff/_releasenotes.ino | 2 ++ sonoff/xdrv_02_irremote.ino | 19 +++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 2c5c80c70..d5fed07f2 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -2,6 +2,7 @@ * Add 16 timers using commands Timer and Timers (#1091) * Add commands Timer 0 to clear timer and Timer 1..16 to copy timer * Add optional Timer configuration webpage to be enabled in user_config.h with define USE_TIMERS_WEB + * Add hexadecimal Data entry to command IrSend using 0x notation (#1290, #2314) * Add Domoticz Battery and RSSI Quality (#1604) * Add Home Assistant MQTT Discovery for Buttons and change SetOption19 response (#2277) * Add support for SGP30 gas and air quality sensor (#2307) @@ -9,6 +10,7 @@ * Change webpage parameter communication * Change Timer parameter Device to more obvious Output * Change max number of commands in Backlog from 15 to 30 and ignore commands overflowing + * Change user_config_override usage by providing user_config_override_sample.h (#2228) * Change MQTT response topic for Energy changes from ENERGY to SENSOR (#2229, #2251) * Change default Reset configuration time from 4 seconds to 40 seconds on Button hold (#2268) * diff --git a/sonoff/xdrv_02_irremote.ino b/sonoff/xdrv_02_irremote.ino index 94f57baae..896faa37a 100644 --- a/sonoff/xdrv_02_irremote.ino +++ b/sonoff/xdrv_02_irremote.ino @@ -284,26 +284,25 @@ boolean IrSendCommand() uint32_t bits = 0; uint32_t data = 0; - for (uint16_t i = 0; i <= sizeof(dataBufUc); i++) { - dataBufUc[i] = toupper(XdrvMailbox.data[i]); - } + UpperCase(dataBufUc, XdrvMailbox.data); if (!strcasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_IRSEND))) { if (XdrvMailbox.data_len) { StaticJsonBuffer<128> jsonBuf; - JsonObject &ir_json = jsonBuf.parseObject(dataBufUc); - if (!ir_json.success()) { + JsonObject &root = jsonBuf.parseObject(dataBufUc); + if (!root.success()) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_IRSEND "\":\"" D_JSON_INVALID_JSON "\"}")); // JSON decode failed } else { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_IRSEND "\":\"" D_JSON_DONE "\"}")); - protocol = ir_json[D_JSON_IR_PROTOCOL]; - bits = ir_json[D_JSON_IR_BITS]; - data = ir_json[D_JSON_IR_DATA]; + char parm_uc[10]; + protocol = root[UpperCase_P(parm_uc, PSTR(D_JSON_IR_PROTOCOL))]; + bits = root[UpperCase_P(parm_uc, PSTR(D_JSON_IR_BITS))]; + data = strtoul(root[UpperCase_P(parm_uc, PSTR(D_JSON_IR_DATA))], NULL, 0); if (protocol && bits && data) { int protocol_code = GetCommandCode(protocol_text, sizeof(protocol_text), protocol, kIrRemoteProtocols); - snprintf_P(log_data, sizeof(log_data), PSTR("IRS: protocol_text %s, protocol %s, bits %d, data %d, protocol_code %d"), - protocol_text, protocol, bits, data, protocol_code); + snprintf_P(log_data, sizeof(log_data), PSTR("IRS: protocol_text %s, protocol %s, bits %d, data %u (0x%lX), protocol_code %d"), + protocol_text, protocol, bits, data, data, protocol_code); AddLog(LOG_LEVEL_DEBUG); switch (protocol_code) { From dd5956020021aac5d7285043c8a40adf5967c924 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 2 Apr 2018 15:00:26 +0200 Subject: [PATCH 059/136] Add hexadecimal RGB color entry on RGBCW leds 5.12.0i * Add hexadecimal RGB color entry on RGBCW leds (#2304) --- sonoff/_releasenotes.ino | 1 + sonoff/xdrv_01_light.ino | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index d5fed07f2..6f2e91046 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -7,6 +7,7 @@ * Add Home Assistant MQTT Discovery for Buttons and change SetOption19 response (#2277) * Add support for SGP30 gas and air quality sensor (#2307) * Add multiple color entry support for command Led like Led2 120000 001200 000012 setting led2 as Red, Led3 as Green and Led4 as Blue (#2303) + * Add hexadecimal RGB color entry on RGBCW leds (#2304) * Change webpage parameter communication * Change Timer parameter Device to more obvious Output * Change max number of commands in Backlog from 15 to 30 and ignore commands overflowing diff --git a/sonoff/xdrv_01_light.ino b/sonoff/xdrv_01_light.ino index 2c9b04890..9230c1529 100644 --- a/sonoff/xdrv_01_light.ino +++ b/sonoff/xdrv_01_light.ino @@ -991,11 +991,10 @@ boolean LightColorEntry(char *buffer, uint8_t buffer_length) light_entry_color[i++] = atoi(str); } } -// entry_type = (light_subtype == i) ? 2 : 0; // Decimal entry_type = 2; // Decimal } - else if ((2 * light_subtype) == buffer_length) { // Hexadecimal entry - for (byte i = 0; i < light_subtype; i++) { + else if (((2 * light_subtype) == buffer_length) || (buffer_length > 3)) { // Hexadecimal entry + for (byte i = 0; i < buffer_length / 2; i++) { strlcpy(scolor, buffer + (i *2), 3); light_entry_color[i] = (uint8_t)strtol(scolor, &p, 16); } From f205a68d43f2b8c134c93ed09cd0f8d22305782f Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Tue, 3 Apr 2018 16:45:33 +0200 Subject: [PATCH 060/136] Add GPIO13 to Sonoff Dev (#2341) --- sonoff/sonoff_template.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h index 2fba23102..d8498d687 100644 --- a/sonoff/sonoff_template.h +++ b/sonoff/sonoff_template.h @@ -487,7 +487,7 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_USER, // GPIO05 Optional sensor 0, 0, 0, 0, 0, 0, // Flash connection GPIO_USER, // GPIO12 - GPIO_LED1_INV, // GPIO13 BLUE LED + GPIO_USER, // GPIO13 BLUE LED GPIO_USER, // GPIO14 Optional sensor 0, // GPIO15 0, // GPIO16 From 524979aa5f6786217357be1d28d3898865960bee Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 5 Apr 2018 12:49:43 +0200 Subject: [PATCH 061/136] v5.12.0j - Add Sunrise/set timer option 5.12.0j * Add optional Sunrise and Sunset timers with commands Latitide and Longitude to be enabled with define USE_SUNRISE in user_config.h (#2317) --- README.md | 2 +- sonoff/_releasenotes.ino | 5 +- sonoff/i18n.h | 11 +- sonoff/language/cs-CZ.h | 2 + sonoff/language/de-DE.h | 2 + sonoff/language/en-GB.h | 2 + sonoff/language/es-AR.h | 2 + sonoff/language/fr-FR.h | 2 + sonoff/language/hu-HU.h | 2 + sonoff/language/it-IT.h | 2 + sonoff/language/nl-NL.h | 2 + sonoff/language/pl-PL.h | 2 + sonoff/language/pt-PT.h | 2 + sonoff/language/ru-RU.h | 2 + sonoff/language/zh-CN.h | 2 + sonoff/language/zh-TW.h | 2 + sonoff/settings.h | 7 +- sonoff/settings.ino | 14 ++ sonoff/sonoff.ino | 13 +- sonoff/sonoff_post.h | 3 + sonoff/support.ino | 43 +++++- sonoff/user_config.h | 3 + sonoff/xdrv_09_timers.ino | 309 ++++++++++++++++++++++++++++++++++---- 23 files changed, 388 insertions(+), 48 deletions(-) diff --git a/README.md b/README.md index 7734cacfd..60700342d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## Sonoff-Tasmota Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE. -Current version is **5.12.0i** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.12.0j** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### Quick install diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 6f2e91046..a61c583fb 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,7 @@ -/* 5.12.0i +/* 5.12.0j + * Add optional Sunrise and Sunset timers with commands Latitide and Longitude to be enabled with define USE_SUNRISE in user_config.h (#2317) + * + * 5.12.0i * Add 16 timers using commands Timer and Timers (#1091) * Add commands Timer 0 to clear timer and Timer 1..16 to copy timer * Add optional Timer configuration webpage to be enabled in user_config.h with define USE_TIMERS_WEB diff --git a/sonoff/i18n.h b/sonoff/i18n.h index 95b17fea6..5dea3bbe9 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -105,6 +105,8 @@ #define D_JSON_STARTUPUTC "StartupUTC" #define D_JSON_SUBNETMASK "Subnetmask" #define D_JSON_SUCCESSFUL "Successful" +#define D_JSON_SUNRISE "Sunrise" +#define D_JSON_SUNSET "Sunset" #define D_JSON_SWITCH "Switch" #define D_JSON_SYNC "Sync" #define D_JSON_TEMPERATURE "Temperature" @@ -270,9 +272,9 @@ #define D_CMND_IRSEND "IRSend" #define D_JSON_INVALID_JSON "Invalid JSON" #define D_JSON_PROTOCOL_NOT_SUPPORTED "Protocol not supported" - #define D_JSON_IR_PROTOCOL "PROTOCOL" - #define D_JSON_IR_BITS "BITS" - #define D_JSON_IR_DATA "DATA" + #define D_JSON_IR_PROTOCOL "Protocol" + #define D_JSON_IR_BITS "Bits" + #define D_JSON_IR_DATA "Data" #define D_CMND_IRHVAC "IRHVAC" #define D_JSON_IRHVAC_VENDOR "VENDOR" #define D_JSON_IRHVAC_POWER "POWER" @@ -354,6 +356,7 @@ // Commands xdrv_09_timers.ino #define D_CMND_TIMER "Timer" #define D_JSON_TIMER_ARM "Arm" + #define D_JSON_TIMER_MODE "Mode" #define D_JSON_TIMER_TIME "Time" #define D_JSON_TIMER_DAYS "Days" #define D_JSON_TIMER_REPEAT "Repeat" @@ -361,6 +364,8 @@ #define D_JSON_TIMER_POWER "Power" #define D_JSON_TIMER_NO_DEVICE "No GPIO as output configured" #define D_CMND_TIMERS "Timers" +#define D_CMND_LATITUDE "Latitude" +#define D_CMND_LONGITUDE "Longitude" /********************************************************************************************/ diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h index 21336443c..0920fc2e6 100644 --- a/sonoff/language/cs-CZ.h +++ b/sonoff/language/cs-CZ.h @@ -137,6 +137,8 @@ #define D_SUBNET_MASK "Maska podsítě" #define D_SUBSCRIBE_TO "Přihlaš se do" #define D_SUCCESSFUL "úspěšné." +#define D_SUNRISE "Sunrise" +#define D_SUNSET "Sunset" #define D_TEMPERATURE "Teplota" #define D_TO "do" #define D_TOGGLE "Přepni" diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index caa74fd41..2b9295e34 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -137,6 +137,8 @@ #define D_SUBNET_MASK "Subnetzmaske" #define D_SUBSCRIBE_TO "subscribe to" #define D_SUCCESSFUL "erfolgreich" +#define D_SUNRISE "Sunrise" +#define D_SUNSET "Sunset" #define D_TEMPERATURE "Temperatur" #define D_TO "zu" #define D_TOGGLE "An/Aus" diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h index 484946200..26a2e9fe0 100644 --- a/sonoff/language/en-GB.h +++ b/sonoff/language/en-GB.h @@ -137,6 +137,8 @@ #define D_SUBNET_MASK "Subnet Mask" #define D_SUBSCRIBE_TO "Subscribe to" #define D_SUCCESSFUL "Successful" +#define D_SUNRISE "Sunrise" +#define D_SUNSET "Sunset" #define D_TEMPERATURE "Temperature" #define D_TO "to" #define D_TOGGLE "Toggle" diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index 143ee4d3c..5dfc111da 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -137,6 +137,8 @@ #define D_SUBNET_MASK "Máscara Subred" #define D_SUBSCRIBE_TO "Suscribir a" #define D_SUCCESSFUL "Exitosa" +#define D_SUNRISE "Sunrise" +#define D_SUNSET "Sunset" #define D_TEMPERATURE "Temperatura" #define D_TO "a" #define D_TOGGLE "Conmutar" diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h index 5d09cfcb6..d0aff6c77 100644 --- a/sonoff/language/fr-FR.h +++ b/sonoff/language/fr-FR.h @@ -137,6 +137,8 @@ #define D_SUBNET_MASK "Masque sous réseau" #define D_SUBSCRIBE_TO "Souscrire à" #define D_SUCCESSFUL "Réussi" +#define D_SUNRISE "Sunrise" +#define D_SUNSET "Sunset" #define D_TEMPERATURE "Temperature" #define D_TO "à" #define D_TOGGLE "Bascule" diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h index e043b1b96..455e0ba1f 100644 --- a/sonoff/language/hu-HU.h +++ b/sonoff/language/hu-HU.h @@ -137,6 +137,8 @@ #define D_SUBNET_MASK "Subnet Mask" #define D_SUBSCRIBE_TO "Feliratkozás a" #define D_SUCCESSFUL "Sikeres" +#define D_SUNRISE "Sunrise" +#define D_SUNSET "Sunset" #define D_TEMPERATURE "Hőmérséklet" #define D_TO "-nak" #define D_TOGGLE "Toggle" diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index 59851e677..cab2e7892 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -137,6 +137,8 @@ #define D_SUBNET_MASK "Maschera sottorete" #define D_SUBSCRIBE_TO "Sottoscrivi a" #define D_SUCCESSFUL "Riuscito" +#define D_SUNRISE "Sunrise" +#define D_SUNSET "Sunset" #define D_TEMPERATURE "Temperatura" #define D_TO "a" #define D_TOGGLE "Toggle" diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h index b21bea2aa..802255b3a 100644 --- a/sonoff/language/nl-NL.h +++ b/sonoff/language/nl-NL.h @@ -137,6 +137,8 @@ #define D_SUBNET_MASK "Subnet Masker" #define D_SUBSCRIBE_TO "Abonneer op" #define D_SUCCESSFUL "Gelukt" +#define D_SUNRISE "Zonsopgang" +#define D_SUNSET "Zonsondergang" #define D_TEMPERATURE "Temperatuur" #define D_TO "naar" #define D_TOGGLE "Toggle" // Wissel, Tuimel diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h index 9d0352315..3ce638de6 100644 --- a/sonoff/language/pl-PL.h +++ b/sonoff/language/pl-PL.h @@ -137,6 +137,8 @@ #define D_SUBNET_MASK "Maska podsieci" #define D_SUBSCRIBE_TO "Subskrybuj do" #define D_SUCCESSFUL "Powodzenie" +#define D_SUNRISE "Sunrise" +#define D_SUNSET "Sunset" #define D_TEMPERATURE "Temperatura" #define D_TO "do" #define D_TOGGLE "Przełącz" diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h index 5c52cd528..cae2832db 100644 --- a/sonoff/language/pt-PT.h +++ b/sonoff/language/pt-PT.h @@ -137,6 +137,8 @@ #define D_SUBNET_MASK "Mascara sub rede" #define D_SUBSCRIBE_TO "Subescrever para" #define D_SUCCESSFUL "Successo" +#define D_SUNRISE "Sunrise" +#define D_SUNSET "Sunset" #define D_TEMPERATURE "Temperatura" #define D_TO "para" #define D_TOGGLE "Pressionar" diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h index d11bfcda2..0fa85d5a9 100644 --- a/sonoff/language/ru-RU.h +++ b/sonoff/language/ru-RU.h @@ -137,6 +137,8 @@ #define D_SUBNET_MASK "Маска Подсети" #define D_SUBSCRIBE_TO "Подписаться на" #define D_SUCCESSFUL "Успешно" +#define D_SUNRISE "Sunrise" +#define D_SUNSET "Sunset" #define D_TEMPERATURE "Температура" #define D_TO "до" #define D_TOGGLE "Переключить" diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h index f9d0d5cc2..0f1a97347 100644 --- a/sonoff/language/zh-CN.h +++ b/sonoff/language/zh-CN.h @@ -137,6 +137,8 @@ #define D_SUBNET_MASK "子网掩码" #define D_SUBSCRIBE_TO "订阅" #define D_SUCCESSFUL "成功" +#define D_SUNRISE "Sunrise" +#define D_SUNSET "Sunset" #define D_TEMPERATURE "温度" #define D_TO "to" #define D_TOGGLE "切换" diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h index a95b772ca..f0ae1d59e 100644 --- a/sonoff/language/zh-TW.h +++ b/sonoff/language/zh-TW.h @@ -137,6 +137,8 @@ #define D_SUBNET_MASK "子網遮罩" #define D_SUBSCRIBE_TO "訂閱" #define D_SUCCESSFUL "成功" +#define D_SUNRISE "Sunrise" +#define D_SUNSET "Sunset" #define D_TEMPERATURE "溫度" #define D_TO "to" #define D_TOGGLE "切換" diff --git a/sonoff/settings.h b/sonoff/settings.h index 5c18c9ca2..a83b24e1e 100644 --- a/sonoff/settings.h +++ b/sonoff/settings.h @@ -93,7 +93,7 @@ typedef union { uint32_t data; struct { uint32_t time : 11; // bits 0 - 10 = minutes in a day - uint32_t mday : 5; // bits 11 - 15 = 32 days in a month + uint32_t mode : 5; // bits 11 - 15 = timer modes - Scheduler, Sunrise, Sunset uint32_t days : 7; // bits 16 - 22 = week day mask uint32_t device : 4; // bits 23 - 26 = 16 devices uint32_t power : 2; // bits 27 - 28 = 4 power states - Off, On, Toggle, Blink @@ -253,8 +253,9 @@ struct SYSCFG { byte free_66d[3]; // 66D Timer timer[MAX_TIMERS]; // 670 - - // 6B0 - FFF free locations + int latitude; // 6B0 + int longitude; // 6B4 + // 6B8 - FFF free locations } Settings; struct RTCMEM { diff --git a/sonoff/settings.ino b/sonoff/settings.ino index db75406b4..7a8105c3e 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -54,6 +54,13 @@ #define HOME_ASSISTANT_DISCOVERY_ENABLE 0 #endif +#ifndef LATITUDE +#define LATITUDE 48.858360 // [Latitude] Your location to be used with sunrise and sunset +#endif +#ifndef LONGITUDE +#define LONGITUDE 2.294442 // [Longitude] Your location to be used with sunrise and sunset +#endif + /*********************************************************************************************\ * RTC memory \*********************************************************************************************/ @@ -597,6 +604,9 @@ void SettingsDefaultSet2() // 5.10.1 SettingsDefaultSet_5_10_1(); + + Settings.latitude = (int)((double)LATITUDE * 1000000); + Settings.longitude = (int)((double)LONGITUDE * 1000000); } /********************************************************************************************/ @@ -913,6 +923,10 @@ void SettingsDelta() if (Settings.version < 0x050C0009) { memset(&Settings.timer, 0x00, sizeof(Timer) * MAX_TIMERS); } + if (Settings.version < 0x050C000A) { + Settings.latitude = (int)((double)LATITUDE * 1000000); + Settings.longitude = (int)((double)LONGITUDE * 1000000); + } Settings.version = VERSION; SettingsSave(1); diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index ba91347ed..c354aabc8 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,20 +25,18 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050C0009 // 5.12.0i +#define VERSION 0x050C000A // 5.12.0j // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) #include "sonoff.h" // Enumeration used in user_config.h #include "user_config.h" // Fixed user configurable options - #ifdef USE_CONFIG_OVERRIDE #include "user_config_override.h" // Configuration overrides for user_config.h #endif - +#include "sonoff_post.h" // Configuration overrides for all previous includes #include "i18n.h" // Language support configured by user_config.h #include "sonoff_template.h" // Hardware configuration -#include "sonoff_post.h" // Configuration overrides for all previous includes #ifdef ARDUINO_ESP8266_RELEASE_2_4_0 #include "lwip/init.h" @@ -1036,7 +1034,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) } } else if (CMND_TIMEZONE == command_code) { - if ((data_len > 0) && (((payload >= -13) && (payload <= 13)) || (99 == payload))) Settings.timezone = payload; + if ((data_len > 0) && (((payload >= -13) && (payload <= 14)) || (99 == payload))) Settings.timezone = payload; snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, Settings.timezone); } else if (CMND_ALTITUDE == command_code) { @@ -1307,8 +1305,13 @@ void PublishStatus(uint8_t payload) } if ((0 == payload) || (7 == payload)) { +#ifdef USE_SUNRISE + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_STATUS D_STATUS7_TIME "\":{\"" D_JSON_UTC_TIME "\":\"%s\",\"" D_JSON_LOCAL_TIME "\":\"%s\",\"" D_JSON_STARTDST "\":\"%s\",\"" D_JSON_ENDDST "\":\"%s\",\"" D_CMND_TIMEZONE "\":%d,\"" D_JSON_SUNRISE "\":\"%s\",\"" D_JSON_SUNSET "\":\"%s\"}}"), + GetTime(0).c_str(), GetTime(1).c_str(), GetTime(2).c_str(), GetTime(3).c_str(), Settings.timezone, GetSun(0).c_str(), GetSun(1).c_str()); +#else snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_STATUS D_STATUS7_TIME "\":{\"" D_JSON_UTC_TIME "\":\"%s\",\"" D_JSON_LOCAL_TIME "\":\"%s\",\"" D_JSON_STARTDST "\":\"%s\",\"" D_JSON_ENDDST "\":\"%s\",\"" D_CMND_TIMEZONE "\":%d}}"), GetTime(0).c_str(), GetTime(1).c_str(), GetTime(2).c_str(), GetTime(3).c_str(), Settings.timezone); +#endif // USE_SUNRISE MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "7")); } diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h index f1f980edf..4455519d0 100644 --- a/sonoff/sonoff_post.h +++ b/sonoff/sonoff_post.h @@ -105,6 +105,9 @@ void WifiWpsStatusCallback(wps_cb_status status); #ifdef USE_TIMERS #undef USE_TIMERS // Disable support for up to 16 timers #endif +#ifdef USE_SUNRISE +#undef USE_SUNRISE // Disable support for Sunrise and sunset tools +#endif #ifdef USE_PZEM004T #undef USE_PZEM004T // Disable PZEM004T energy sensor #endif diff --git a/sonoff/support.ino b/sonoff/support.ino index d0250690a..b845af708 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -192,6 +192,35 @@ size_t strchrspn(const char *str1, int character) return ret; } +double AtoD(char *str) +{ + // simple ascii to double, because atof or strtod are too large + char strbuf[24]; + + strcpy(strbuf, str); + char *pt; + double left = atoi(strbuf); + double right = 0; + short len = 0; + pt = strtok (strbuf, "."); + if (pt) { + pt = strtok (NULL, "."); + if (pt) { + right = atoi(pt); + len = strlen(pt); + double fac = 1; + while (len) { + fac /= 10.0; + len--; + } + // pow is also very large + //double fac=pow(10,-len); + right *= fac; + } + } + return left + right; +} + char* dtostrfd(double number, unsigned char prec, char *s) { return dtostrf(number, 1, prec, s); @@ -1077,6 +1106,7 @@ uint32_t standard_time = 0; uint32_t ntp_time = 0; uint32_t midnight = 1451602800; uint32_t restart_time = 0; +int16_t time_timezone = 0; // Timezone * 10 uint8_t midnight_now = 0; uint8_t ntp_sync_minute = 0; @@ -1325,8 +1355,8 @@ boolean MidnightNow() void RtcSecond() { - uint32_t stdoffset; - uint32_t dstoffset; + int32_t stdoffset; + int32_t dstoffset; TIME_T tmpTime; if ((ntp_sync_minute > 59) && (RtcTime.minute > 2)) ntp_sync_minute = 1; // If sync prepare for a new cycle @@ -1353,6 +1383,7 @@ void RtcSecond() utc_time++; local_time = utc_time; if (local_time > 1451602800) { // 2016-01-01 + int32_t time_offset = Settings.timezone * SECS_PER_HOUR; if (99 == Settings.timezone) { if (DaylightSavingTime.hemis) { dstoffset = StandardTime.offset * SECS_PER_MIN; // Southern hemisphere @@ -1362,13 +1393,13 @@ void RtcSecond() stdoffset = StandardTime.offset * SECS_PER_MIN; } if ((utc_time >= (daylight_saving_time - stdoffset)) && (utc_time < (standard_time - dstoffset))) { - local_time += dstoffset; // Daylight Saving Time + time_offset = dstoffset; // Daylight Saving Time } else { - local_time += stdoffset; // Standard Time + time_offset = stdoffset; // Standard Time } - } else { - local_time += Settings.timezone * SECS_PER_HOUR; } + local_time += time_offset; + time_timezone = time_offset / (SECS_PER_HOUR / 10); } BreakTime(local_time, RtcTime); if (!RtcTime.hour && !RtcTime.minute && !RtcTime.second && RtcTime.valid) { diff --git a/sonoff/user_config.h b/sonoff/user_config.h index db5e9a50d..6c5a134e0 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -167,6 +167,9 @@ #define USE_TIMERS // Add support for up to 16 timers (+2k2 code) #define USE_TIMERS_WEB // Add timer webpage support (+4k5 code) + #define USE_SUNRISE // Add support for Sunrise and sunset tools (+16k) + #define LATITUDE 48.858360 // [Latitude] Your location to be used with sunrise and sunset + #define LONGITUDE 2.294442 // [Longitude] Your location to be used with sunrise and sunset // -- Time - Start Daylight Saving Time and timezone offset from UTC in minutes #define TIME_DST North, Last, Sun, Mar, 2, +120 // Northern Hemisphere, Last sunday in march at 02:00 +120 minutes diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino index b82eb7e2c..0975c8c64 100644 --- a/sonoff/xdrv_09_timers.ino +++ b/sonoff/xdrv_09_timers.ino @@ -22,9 +22,10 @@ * Timers * * Arm a timer using one or all of the following JSON values: - * {"Arm":1,"Time":"09:23","Days":"--TW--S","Repeat":1,"Device":1,"Power":1} + * {"Arm":1,"Mode":0,"Time":"09:23","Days":"--TW--S","Repeat":1,"Device":1,"Power":1} * * Arm 0 = Off, 1 = On + * Mode 0 = Schedule, 1 = Sunrise, 2 = Sunset * Time hours:minutes * Days 7 day character mask starting with Sunday (SMTWTFS). 0 or - = Off, any other value = On * Repeat 0 = Execute once, 1 = Execute again @@ -33,28 +34,201 @@ * \*********************************************************************************************/ -enum TimerCommands { CMND_TIMER, CMND_TIMERS }; -const char kTimerCommands[] PROGMEM = D_CMND_TIMER "|" D_CMND_TIMERS ; +enum TimerCommands { CMND_TIMER, CMND_TIMERS +#ifdef USE_SUNRISE +, CMND_LATITUDE, CMND_LONGITUDE +#endif + }; +const char kTimerCommands[] PROGMEM = D_CMND_TIMER "|" D_CMND_TIMERS +#ifdef USE_SUNRISE +"|" D_CMND_LATITUDE "|" D_CMND_LONGITUDE +#endif +; -uint16_t fired = 0; +uint16_t timer_fired = 0; +uint16_t timer_last_minute = 60; + +#ifdef USE_SUNRISE +/*********************************************************************************************\ + * Sunrise and sunset (+13k code) + * + * https://forum.arduino.cc/index.php?topic=218280.0 + * Source: C-Programm von http://lexikon.astronomie.info/zeitgleichung/neu.html + * Rewrite for Arduino by 'jurs' for German Arduino forum +\*********************************************************************************************/ + +const double pi2 = TWO_PI; +const double pi = PI; +const double RAD = DEG_TO_RAD; + +double JulianischesDatum() +{ + // Gregorianischer Kalender + int Gregor; + int Jahr = RtcTime.year; + int Monat = RtcTime.month; + int Tag = RtcTime.day_of_month; + + if (Monat <= 2) { + Monat += 12; + Jahr -= 1; + } + Gregor = (Jahr / 400) - (Jahr / 100) + (Jahr / 4); // Gregorianischer Kalender + return 2400000.5 + 365.0*Jahr - 679004.0 + Gregor + (int)(30.6001 * (Monat +1)) + Tag + 0.5; +} + +double InPi(double x) +{ + int n = (int)(x / pi2); + x = x - n*pi2; + if (x < 0) x += pi2; + return x; +} + +double eps(double T) +{ + // Neigung der Erdachse + return RAD * (23.43929111 + (-46.8150*T - 0.00059*T*T + 0.001813*T*T*T)/3600.0); +} + +double BerechneZeitgleichung(double *DK,double T) +{ + double RA_Mittel = 18.71506921 + 2400.0513369*T +(2.5862e-5 - 1.72e-9*T)*T*T; + double M = InPi(pi2 * (0.993133 + 99.997361*T)); + double L = InPi(pi2 * (0.7859453 + M/pi2 + (6893.0*sin(M)+72.0*sin(2.0*M)+6191.2*T) / 1296.0e3)); + double e = eps(T); + double RA = atan(tan(L)*cos(e)); + if (RA < 0.0) RA += pi; + if (L > pi) RA += pi; + RA = 24.0*RA/pi2; + *DK = asin(sin(e)*sin(L)); + // Damit 0<=RA_Mittel<24 + RA_Mittel = 24.0 * InPi(pi2*RA_Mittel/24.0)/pi2; + double dRA = RA_Mittel - RA; + if (dRA < -12.0) dRA += 24.0; + if (dRA > 12.0) dRA -= 24.0; + dRA = dRA * 1.0027379; + return dRA; +} + +void DuskTillDawn(uint8_t *hour_up,uint8_t *minute_up, uint8_t *hour_down, uint8_t *minute_down) +{ + double JD2000 = 2451545.0; + double JD = JulianischesDatum(); + double T = (JD - JD2000) / 36525.0; + double DK; + /* + h (D) = -0.8333 normaler SA & SU-Gang + h (D) = -6.0 civile Dämmerung + h (D) = -12.0 nautische Dämmerung + h (D) = -18.0 astronomische Dämmerung + */ + double h = -50/60.0*RAD; + double B = ((double)Settings.latitude/1000000) * RAD; // geographische Breite + double GeographischeLaenge = (double)Settings.longitude/1000000; + double Zeitzone = (double)time_timezone / 10; + double Zeitgleichung = BerechneZeitgleichung(&DK, T); + double Minuten = Zeitgleichung * 60.0; + double Zeitdifferenz = 12.0*acos((sin(h) - sin(B)*sin(DK)) / (cos(B)*cos(DK)))/pi; + double AufgangOrtszeit = 12.0 - Zeitdifferenz - Zeitgleichung; + double UntergangOrtszeit = 12.0 + Zeitdifferenz - Zeitgleichung; + double AufgangWeltzeit = AufgangOrtszeit - GeographischeLaenge / 15.0; + double UntergangWeltzeit = UntergangOrtszeit - GeographischeLaenge / 15.0; + double Aufgang = AufgangWeltzeit + Zeitzone; // In Stunden + if (Aufgang < 0.0) { + Aufgang += 24.0; + } else { + if (Aufgang >= 24.0) Aufgang -= 24.0; + } + double Untergang = UntergangWeltzeit + Zeitzone; + if (Untergang < 0.0) { + Untergang += 24.0; + } else { + if (Untergang >= 24.0) Untergang -= 24.0; + } + int AufgangMinuten = (int)(60.0*(Aufgang - (int)Aufgang)+0.5); + int AufgangStunden = (int)Aufgang; + if (AufgangMinuten >= 60.0) { + AufgangMinuten -= 60.0; + AufgangStunden++; + } else { + if (AufgangMinuten < 0.0) { + AufgangMinuten += 60.0; + AufgangStunden--; + if (AufgangStunden < 0.0) AufgangStunden += 24.0; + } + } + int UntergangMinuten = (int)(60.0*(Untergang - (int)Untergang)+0.5); + int UntergangStunden = (int)Untergang; + if (UntergangMinuten >= 60.0) { + UntergangMinuten -= 60.0; + UntergangStunden++; + } else { + if (UntergangMinuten<0) { + UntergangMinuten += 60.0; + UntergangStunden--; + if (UntergangStunden < 0.0) UntergangStunden += 24.0; + } + } + *hour_up = AufgangStunden; + *minute_up = AufgangMinuten; + *hour_down = UntergangStunden; + *minute_down = UntergangMinuten; +} + +String GetSun(byte dawn) +{ + char stime[6]; + + uint8_t hour[2]; + uint8_t minute[2]; + + DuskTillDawn(&hour[0], &minute[0], &hour[1], &minute[1]); + dawn &= 1; + snprintf_P(stime, sizeof(stime), PSTR("%02d:%02d"), hour[dawn], minute[dawn]); + return String(stime); +} + +uint16_t GetSunMinutes(byte dawn) +{ + uint8_t hour[2]; + uint8_t minute[2]; + + DuskTillDawn(&hour[0], &minute[0], &hour[1], &minute[1]); + dawn &= 1; + return (hour[dawn] *60) + minute[dawn]; +} + +#endif // USE_SUNRISE + +/*******************************************************************************************/ void TimerEverySecond() { if (RtcTime.valid) { - uint16_t time = (RtcTime.hour * 60) + RtcTime.minute; - uint8_t days = 1 << (RtcTime.day_of_week -1); + if (RtcTime.minute != timer_last_minute) { // Execute every minute + timer_last_minute = RtcTime.minute; + uint16_t time = (RtcTime.hour *60) + RtcTime.minute; + uint8_t days = 1 << (RtcTime.day_of_week -1); - for (byte i = 0; i < MAX_TIMERS; i++) { - if (Settings.timer[i].device >= devices_present) Settings.timer[i].data = 0; // Reset timer due to change in devices present - if (Settings.timer[i].arm) { - if (time == Settings.timer[i].time) { - if (!bitRead(fired, i) && (Settings.timer[i].days & days)) { - bitSet(fired, i); - Settings.timer[i].arm = Settings.timer[i].repeat; - ExecuteCommandPower(Settings.timer[i].device +1, Settings.timer[i].power); + for (byte i = 0; i < MAX_TIMERS; i++) { + if (Settings.timer[i].device >= devices_present) Settings.timer[i].data = 0; // Reset timer due to change in devices present + uint16_t set_time = Settings.timer[i].time; +#ifdef USE_SUNRISE + if ((1 == Settings.timer[i].mode) || (2 == Settings.timer[i].mode)) { // Sunrise or Sunset + set_time = GetSunMinutes(Settings.timer[i].mode -1); + } +#endif + if (Settings.timer[i].arm) { + if (time == set_time) { + if (!bitRead(timer_fired, i) && (Settings.timer[i].days & days)) { + bitSet(timer_fired, i); + Settings.timer[i].arm = Settings.timer[i].repeat; + ExecuteCommandPower(Settings.timer[i].device +1, Settings.timer[i].power); + } + } else { + bitClear(timer_fired, i); } - } else { - bitClear(fired, i); } } } @@ -70,8 +244,13 @@ void PrepShowTimer(uint8_t index) uint8_t mask = 1 << i; snprintf(days, sizeof(days), "%s%d", days, ((Settings.timer[index].days & mask) > 0)); } +#ifdef USE_SUNRISE + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_MODE "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_OUTPUT "\":%d,\"" D_JSON_TIMER_POWER "\":%d}"), + mqtt_data, index +1, Settings.timer[index].arm, Settings.timer[index].mode, Settings.timer[index].time / 60, Settings.timer[index].time % 60, days, Settings.timer[index].repeat, Settings.timer[index].device +1, Settings.timer[index].power); +#else snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_OUTPUT "\":%d,\"" D_JSON_TIMER_POWER "\":%d}"), mqtt_data, index +1, Settings.timer[index].arm, Settings.timer[index].time / 60, Settings.timer[index].time % 60, days, Settings.timer[index].repeat, Settings.timer[index].device +1, Settings.timer[index].power); +#endif // USE_SUNRISE } /*********************************************************************************************\ @@ -110,6 +289,11 @@ boolean TimerCommand() if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_ARM))].success()) { Settings.timer[index].arm = (root[parm_uc] != 0); } +#ifdef USE_SUNRISE + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_MODE))].success()) { + Settings.timer[index].mode = (uint8_t)root[parm_uc] & 0x03; + } +#endif if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_TIME))].success()) { uint16_t itime = 0; uint8_t value = 0; @@ -154,7 +338,7 @@ boolean TimerCommand() if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_POWER))].success()) { Settings.timer[index].power = (uint8_t)root[parm_uc] & 0x03; } - if (Settings.timer[index].arm) bitClear(fired, index); + if (Settings.timer[index].arm) bitClear(timer_fired, index); index++; } @@ -181,7 +365,7 @@ boolean TimerCommand() } jsflg = 1; PrepShowTimer(i +1); - if ((strlen(mqtt_data) > (LOGSZ - TOPSZ)) || (i == MAX_TIMERS -1)) { + if ((strlen(mqtt_data) > (LOGSZ - TOPSZ - 20)) || (i == MAX_TIMERS -1)) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}}"), mqtt_data); MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_TIMERS)); jsflg = 0; @@ -189,6 +373,24 @@ boolean TimerCommand() } mqtt_data[0] = '\0'; } +#ifdef USE_SUNRISE + else if (CMND_LONGITUDE == command_code) { + if (XdrvMailbox.data_len) { + Settings.longitude = (int)(AtoD(XdrvMailbox.data) *1000000); + } + char lbuff[32]; + dtostrfd(((double)Settings.longitude) /1000000, 6, lbuff); + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, lbuff); + } + else if (CMND_LATITUDE == command_code) { + if (XdrvMailbox.data_len) { + Settings.latitude = (int)(AtoD(XdrvMailbox.data) *1000000); + } + char lbuff[32]; + dtostrfd(((double)Settings.latitude) /1000000, 6, lbuff); + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, lbuff); + } +#endif else serviced = false; return serviced; @@ -210,12 +412,26 @@ const char HTTP_TIMER_SCRIPT[] PROGMEM = "o.textContent=i;" "q.appendChild(o);" "}" +#ifdef USE_SUNRISE + "function gt(){" // Set hours and minutas according to mode + "var m,p,q;" + "m=qs('input[name=\"rd\"]:checked').value;" // Get mode + "if(m==0){p=pt[ct]&0x7FF;}" // Schedule time + "if(m==1){p=pt[" STR(MAX_TIMERS) "];}" // Sunrise + "if(m==2){p=pt[" STR(MAX_TIMERS +1) "];}" // Sunset + "q=Math.floor(p/60);if(q<10){q='0'+q;}qs('#ho').value=q;" // Set hours + "q=p%60;if(q<10){q='0'+q;}qs('#mi').value=q;" // Set minutes + "}" +#endif "function st(){" // Save parameters to hidden area "var i,n,p,s;" "s=0;" "n=1<<30;if(eb('a0').checked){s|=n;}" // Get arm "n=1<<29;if(eb('r0').checked){s|=n;}" // Get repeat "for(i=0;i<7;i++){n=1<<(16+i);if(eb('w'+i).checked){s|=n;}}" // Get weekdays +#ifdef USE_SUNRISE + "s|=(qs('input[name=\"rd\"]:checked').value<<11);" // Get mode +#endif "s|=(eb('p1').value<<27);" // Get power "s|=(qs('#d1').selectedIndex<<23);" // Get device "s|=((qs('#ho').selectedIndex*60)+qs('#mi').selectedIndex)&0x7FF;" // Get time @@ -224,22 +440,25 @@ const char HTTP_TIMER_SCRIPT[] PROGMEM = "}" "function ot(t,e){" // Select tab and update elements "var i,n,o,p,q,s;" - "if(ct<99){" - "st();" // Save changes - "}" + "if(ct<99){st();}" // Save changes + "ct=t;" "o=document.getElementsByClassName('tl');" // Restore style to all tabs/buttons "for(i=0;i>11)&3;eb('b'+p).checked=1;" // Set mode + "gt();" // Set hours and minutes according to mode +#else "p=s&0x7FF;" // Get time "q=Math.floor(p/60);if(q<10){q='0'+q;}qs('#ho').value=q;" // Set hours "q=p%60;if(q<10){q='0'+q;}qs('#mi').value=q;" // Set minutes +#endif "for(i=0;i<7;i++){p=(s>>(16+i))&1;eb('w'+i).checked=p;}" // Set weekdays "p=(s>>23)&0xF;qs('#d1').value=p+1;" // Set device "p=(s>>27)&3;eb('p1').value=p;" // Set power "p=(s>>29)&1;eb('r0').checked=p;" // Set repeat "p=(s>>30)&1;eb('a0').checked=p;" // Set arm - "ct=t;" "}" "function it(){" // Initialize elements and select first tab "var b,i,o,s;" @@ -256,6 +475,9 @@ const char HTTP_TIMER_SCRIPT[] PROGMEM = "}"; const char HTTP_TIMER_STYLE[] PROGMEM = ".tl{float:left;border-radius:0;border:1px solid #fff;padding:1px;width:6.25%;}" +#ifdef USE_SUNRISE + "input[type='radio']{width:13px;height:34px;margin-top:-1px;margin-right:8px;vertical-align:middle;}" +#endif ""; const char HTTP_FORM_TIMER[] PROGMEM = "
 " D_TIMER_PARAMETERS " 
" @@ -263,8 +485,8 @@ const char HTTP_FORM_TIMER[] PROGMEM = const char HTTP_FORM_TIMER1[] PROGMEM = "' hidden>



" "
" - "" D_TIMER_OUTPUT "  " - "" D_TIMER_POWER "  " + "" D_TIMER_POWER " " "

" "
" -// "Time  " - "" D_TIMER_TIME "  " D_HOUR_MINUTE_SEPARATOR "  " "" D_TIMER_ARM " " "" D_TIMER_REPEAT "" + "

" + "
" +// "Time " +#ifdef USE_SUNRISE + "
" + "" D_TIMER_TIME " " + "" + " " D_HOUR_MINUTE_SEPARATOR " " + "
" + "" D_SUNRISE "
" + "" D_SUNSET "
" + "
" +#else + "" D_TIMER_TIME " " + "" + " " D_HOUR_MINUTE_SEPARATOR " " + "" +#endif // USE_SUNRISE "

" "
"; const char HTTP_FORM_TIMER2[] PROGMEM = @@ -301,8 +539,15 @@ void HandleTimerConfiguration() if (i > 0) page += F(","); page += String(Settings.timer[i].data); } +#ifdef USE_SUNRISE + page += F(","); page += String(GetSunMinutes(0)); // Add Sunrise + page += F(","); page += String(GetSunMinutes(1)); // Add Sunset +#endif // USE_SUNRISE page += FPSTR(HTTP_FORM_TIMER1); page.replace(F("}1"), String(devices_present)); +#ifdef USE_SUNRISE + page.replace(F("299"), String(180 + (strlen(D_TIMER_TIME) *10))); // Fix string length to keep radios centered +#endif // USE_SUNRISE page += FPSTR(HTTP_FORM_END); page.replace(F("type='submit'"), FPSTR(HTTP_FORM_TIMER2)); page += F(""); // Init elements and select first tab/button @@ -313,14 +558,20 @@ void HandleTimerConfiguration() void TimerSaveSettings() { char tmp[MAX_TIMERS *12]; // Need space for MAX_TIMERS x 10 digit numbers separated by a comma + Timer timer; WebGetArg("t0", tmp, sizeof(tmp)); char *p = tmp; snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MQTT D_CMND_TIMERS " ")); for (byte i = 0; i < MAX_TIMERS; i++) { - uint32_t data = strtol(p, &p, 10); + timer.data = strtol(p, &p, 10); p++; // Skip comma - if ((data & 0x7FF) < 1440) Settings.timer[i].data = data; + if (timer.time < 1440) { +#ifdef USE_SUNRISE + if ((1 == timer.mode) || (2 == timer.mode)) timer.time = Settings.timer[i].time; // Do not save time on Sunrise or Sunset +#endif + Settings.timer[i].data = timer.data; + } snprintf_P(log_data, sizeof(log_data), PSTR("%s%s0x%08X"), log_data, (i > 0)?",":"", Settings.timer[i].data); } AddLog(LOG_LEVEL_DEBUG); From a42a30c51a5ed76881889a207884f8b8af0695db Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 5 Apr 2018 15:26:16 +0200 Subject: [PATCH 062/136] Refresh layout user_config.h --- sonoff/user_config.h | 210 +++++++++++++++++++++++++------------------ 1 file changed, 121 insertions(+), 89 deletions(-) diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 6c5a134e0..dd981c2b3 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -21,35 +21,32 @@ #define _USER_CONFIG_H_ /*********************************************************************************************\ - * ATTENTION: Changes to most PARAMETER defines will only override flash settings if you change - * define CFG_HOLDER. - * Most parameters can be changed online using commands via MQTT, WebConsole or serial + * This file consists of TWO sections. * - * Corresponding MQTT/Serial/Console commands in [brackets] + * SECTION 1: + * The first section contains PARAMETERS overriding flash settings if define CFG_HOLDER is CHANGED. + * All parameters can be persistent changed online using commands via MQTT, WebConsole or Serial. + * Corresponding MQTT/Serial/Console commands are shown in [brackets] + * + * SECTION 2: + * The second section contains Enabled and Disabled FEATURES allowing different program size. + * Changes in this section do NOT need a change of define CFG_HOLDER. + * + * ATTENTION: + * Users are advised to use the user_config_override.h file for any local changes. \*********************************************************************************************/ -// -- Localization -------------------------------- -//#define MY_LANGUAGE cs-CZ // Czech in Czech -//#define MY_LANGUAGE de-DE // German in Germany -//#define MY_LANGUAGE en-GB // English in Great Britain. Enabled by Default -//#define MY_LANGUAGE es-AR // Spanish in Argentina -//#define MY_LANGUAGE fr-FR // French in France -//#define MY_LANGUAGE hu-HU // Hungarian in Hungary -//#define MY_LANGUAGE it-IT // Italian in Italy -//#define MY_LANGUAGE nl-NL // Dutch in the Netherlands -//#define MY_LANGUAGE pl-PL // Polish in Poland -//#define MY_LANGUAGE pt-PT // Portuguese in Portugal -//#define MY_LANGUAGE ru-RU // Russian in Russia -//#define MY_LANGUAGE zh-CN // Chinese (Simplified) in China -//#define MY_LANGUAGE zh-TW // Chinese (Traditional) in Taiwan +//#define USE_CONFIG_OVERRIDE // Uncomment to use user_config_override.h file. See README.md + +/*********************************************************************************************\ + * SECTION 1 +\*********************************************************************************************/ + +// -- Master parameter control -------------------- +#define CFG_HOLDER 0x20161209 // [Reset 1] Change this value to load SECTION1 configuration parameters to flash // -- Project ------------------------------------- -#define PROJECT "sonoff" // PROJECT is used as the default topic delimiter and OTA file name - // As an IDE restriction it needs to be the same as the main .ino file - -#define CFG_HOLDER 0x20161209 // [Reset 1] Change this value to load following default configuration parameters - -//#define USE_CONFIG_OVERRIDE // Uncomment to use your own user_config_override.h file. See README.md +#define PROJECT "sonoff" // PROJECT is used as the default topic delimiter #define SAVE_DATA 1 // [SaveData] Save changed parameters to Flash (0 = disable, 1 - 3600 seconds) #define SAVE_STATE 1 // [SetOption0] Save changed power state to Flash (0 = disable, 1 = enable) @@ -76,37 +73,16 @@ // -- Ota ----------------------------------------- #define OTA_URL "http://sonoff.maddox.co.uk/tasmota/sonoff.ino.bin" // [OtaUrl] -//#define USE_ARDUINO_OTA // Add optional support for Arduino OTA (+4k5 code) - -/*********************************************************************************************\ - * Select ONE of possible MQTT library types below -\*********************************************************************************************/ -// Default MQTT driver for both non-TLS and TLS connections. Blocks network if MQTT server is unavailable. -#define MQTT_LIBRARY_TYPE MQTT_PUBSUBCLIENT // Use PubSubClient library -// Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support -//#define MQTT_LIBRARY_TYPE MQTT_TASMOTAMQTT // Use TasmotaMqtt library (+4k4 code, +4k mem) - non-TLS only -// Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support -//#define MQTT_LIBRARY_TYPE MQTT_ESPMQTTARDUINO // Use (patched) esp-mqtt-arduino library (+4k8 code, +4k mem) - non-TLS only // -- MQTT ---------------------------------------- #define MQTT_USE 1 // [SetOption3] Select default MQTT use (0 = Off, 1 = On) -// !!! TLS uses a LOT OF MEMORY (20k) so be careful to enable other options at the same time !!! -//#define USE_MQTT_TLS // Use TLS for MQTT connection (+53k code, +15k mem) - Disable by // - // Needs Fingerprint, TLS Port, UserId and Password -#ifdef USE_MQTT_TLS - #define MQTT_HOST "" // [MqttHost] - #define MQTT_FINGERPRINT1 "A5 02 FF 13 99 9F 8B 39 8E F1 83 4F 11 23 65 0B 32 36 FC 07" // [MqttFingerprint1] - #define MQTT_FINGERPRINT2 "A5 02 FF 13 99 9F 8B 39 8E F1 83 4F 11 23 65 0B 32 36 FC 07" // [MqttFingerprint2] - #define MQTT_PORT 20123 // [MqttPort] MQTT TLS port - #define MQTT_USER "cloudmqttuser" // [MqttUser] Mandatory user - #define MQTT_PASS "cloudmqttpassword" // [MqttPassword] Mandatory password -#else - #define MQTT_HOST "" // [MqttHost] - #define MQTT_PORT 1883 // [MqttPort] MQTT port (10123 on CloudMQTT) - #define MQTT_USER "DVES_USER" // [MqttUser] Optional user - #define MQTT_PASS "DVES_PASS" // [MqttPassword] Optional password -#endif +#define MQTT_HOST "" // [MqttHost] +#define MQTT_FINGERPRINT1 "A5 02 FF 13 99 9F 8B 39 8E F1 83 4F 11 23 65 0B 32 36 FC 07" // [MqttFingerprint1] +#define MQTT_FINGERPRINT2 "A5 02 FF 13 99 9F 8B 39 8E F1 83 4F 11 23 65 0B 32 36 FC 07" // [MqttFingerprint2] +#define MQTT_PORT 1883 // [MqttPort] MQTT port (10123 on CloudMQTT) +#define MQTT_USER "DVES_USER" // [MqttUser] MQTT user +#define MQTT_PASS "DVES_PASS" // [MqttPassword] MQTT password #define MQTT_BUTTON_RETAIN 0 // [ButtonRetain] Button may send retain flag (0 = off, 1 = on) #define MQTT_POWER_RETAIN 0 // [PowerRetain] Power status message may send retain flag (0 = off, 1 = on) @@ -118,7 +94,7 @@ #define MQTT_CMND_HOLD "HOLD" // [StateText4] Command to send when button is kept down for over KEY_HOLD_TIME * 0.1 seconds (needs to be a string like "HOLD") // -- MQTT topics --------------------------------- -//#define MQTT_FULLTOPIC "tasmota/bedroom/%topic%/%prefix%/" // Up to max 80 characers + // Example "tasmota/bedroom/%topic%/%prefix%/" up to 80 characers #define MQTT_FULLTOPIC "%prefix%/%topic%/" // [FullTopic] Subscribe and Publish full topic name - Legacy topic // %prefix% token options @@ -135,60 +111,40 @@ #define TELE_PERIOD 300 // [TelePeriod] Telemetry (0 = disable, 10 - 3600 seconds) // -- MQTT - Domoticz ----------------------------- -#define USE_DOMOTICZ // Enable Domoticz (+6k code, +0.3k mem) - Disable by // - #define DOMOTICZ_IN_TOPIC "domoticz/in" // Domoticz Input Topic - #define DOMOTICZ_OUT_TOPIC "domoticz/out" // Domoticz Output Topic - #define DOMOTICZ_UPDATE_TIMER 0 // [DomoticzUpdateTimer] Send relay status (0 = disable, 1 - 3600 seconds) (Optional) +#define DOMOTICZ_UPDATE_TIMER 0 // [DomoticzUpdateTimer] Send relay status (0 = disable, 1 - 3600 seconds) // -- MQTT - Home Assistant Discovery ------------- -#define USE_HOME_ASSISTANT // Enable Home Assistant Discovery Support (+2k code) - #define HOME_ASSISTANT_DISCOVERY_PREFIX "homeassistant" // Home Assistant discovery prefix - #define HOME_ASSISTANT_DISCOVERY_ENABLE 0 // [SetOption19] Home Assistant Discovery (0 = Disable, 1 = Enable) +#define HOME_ASSISTANT_DISCOVERY_ENABLE 0 // [SetOption19] Home Assistant Discovery (0 = Disable, 1 = Enable) // -- HTTP ---------------------------------------- -#define USE_WEBSERVER // Enable web server and wifi manager (+66k code, +8k mem) - Disable by // - #define WEB_SERVER 2 // [WebServer] Web server (0 = Off, 1 = Start as User, 2 = Start as Admin) - #define WEB_PORT 80 // Web server Port for User and Admin mode - #define WEB_USERNAME "admin" // Web server Admin mode user name - #define WEB_PASSWORD "" // [WebPassword] Web server Admin mode Password for WEB_USERNAME (empty string = Disable) - #define FRIENDLY_NAME "Sonoff" // [FriendlyName] Friendlyname up to 32 characters used by webpages and Alexa - #define USE_EMULATION // Enable Belkin WeMo and Hue Bridge emulation for Alexa (+16k code, +2k mem) - #define EMULATION EMUL_NONE // [Emulation] Select Belkin WeMo (single relay/light) or Hue Bridge emulation (multi relay/light) (EMUL_NONE, EMUL_WEMO or EMUL_HUE) - -// -- mDNS ---------------------------------------- -#define USE_DISCOVERY // Enable mDNS for the following services (+8k code, +0.3k mem) - Disable by // - #define WEBSERVER_ADVERTISE // Provide access to webserver by name .local/ - #define MQTT_HOST_DISCOVERY // Find MQTT host server (overrides MQTT_HOST if found) +#define WEB_SERVER 2 // [WebServer] Web server (0 = Off, 1 = Start as User, 2 = Start as Admin) +#define WEB_PASSWORD "" // [WebPassword] Web server Admin mode Password for WEB_USERNAME (empty string = Disable) +#define FRIENDLY_NAME "Sonoff" // [FriendlyName] Friendlyname up to 32 characters used by webpages and Alexa +#define EMULATION EMUL_NONE // [Emulation] Select Belkin WeMo (single relay/light) or Hue Bridge emulation (multi relay/light) (EMUL_NONE, EMUL_WEMO or EMUL_HUE) // -- Time - Up to three NTP servers in your region #define NTP_SERVER1 "pool.ntp.org" // [NtpServer1] Select first NTP server by name or IP address (129.250.35.250) #define NTP_SERVER2 "nl.pool.ntp.org" // [NtpServer2] Select second NTP server by name or IP address (5.39.184.5) #define NTP_SERVER3 "0.nl.pool.ntp.org" // [NtpServer3] Select third NTP server by name or IP address (93.94.224.67) -#define USE_TIMERS // Add support for up to 16 timers (+2k2 code) - #define USE_TIMERS_WEB // Add timer webpage support (+4k5 code) - #define USE_SUNRISE // Add support for Sunrise and sunset tools (+16k) - #define LATITUDE 48.858360 // [Latitude] Your location to be used with sunrise and sunset - #define LONGITUDE 2.294442 // [Longitude] Your location to be used with sunrise and sunset - -// -- Time - Start Daylight Saving Time and timezone offset from UTC in minutes -#define TIME_DST North, Last, Sun, Mar, 2, +120 // Northern Hemisphere, Last sunday in march at 02:00 +120 minutes - -// -- Time - Start Standard Time and timezone offset from UTC in minutes -#define TIME_STD North, Last, Sun, Oct, 3, +60 // Northern Hemisphere, Last sunday in october 02:00 +60 minutes +// -- Location ------------------------------------ +#define LATITUDE 48.858360 // [Latitude] Your location to be used with sunrise and sunset +#define LONGITUDE 2.294442 // [Longitude] Your location to be used with sunrise and sunset // -- Application --------------------------------- -#define APP_TIMEZONE 1 // [Timezone] +1 hour (Amsterdam) (-12 .. 12 = hours from UTC, 99 = use TIME_DST/TIME_STD) -#define APP_LEDSTATE LED_POWER // [LedState] Function of led (LED_OFF, LED_POWER, LED_MQTTSUB, LED_POWER_MQTTSUB, LED_MQTTPUB, LED_POWER_MQTTPUB, LED_MQTT, LED_POWER_MQTT) +#define APP_TIMEZONE 1 // [Timezone] +1 hour (Amsterdam) (-13 .. 14 = hours from UTC, 99 = use TIME_DST/TIME_STD) +#define APP_LEDSTATE LED_POWER // [LedState] Function of led + // (LED_OFF, LED_POWER, LED_MQTTSUB, LED_POWER_MQTTSUB, LED_MQTTPUB, LED_POWER_MQTTPUB, LED_MQTT, LED_POWER_MQTT) #define APP_PULSETIME 0 // [PulseTime] Time in 0.1 Sec to turn off power for relay 1 (0 = disabled) -#define APP_POWERON_STATE 3 // [PowerOnState] Power On Relay state (0 = Off, 1 = On, 2 = Toggle Saved state, 3 = Saved state) +#define APP_POWERON_STATE POWER_ALL_SAVED // [PowerOnState] Power On Relay state + // (POWER_ALL_OFF, POWER_ALL_ON, POWER_ALL_SAVED_TOGGLE, POWER_ALL_SAVED, POWER_ALL_ALWAYS_ON, POWER_ALL_OFF_PULSETIME_ON) #define APP_BLINKTIME 10 // [BlinkTime] Time in 0.1 Sec to blink/toggle power for relay 1 #define APP_BLINKCOUNT 10 // [BlinkCount] Number of blinks (0 = 32000) #define APP_SLEEP 0 // [Sleep] Sleep time to lower energy consumption (0 = Off, 1 - 250 mSec) #define KEY_HOLD_TIME 40 // [SetOption32] Number of 0.1 seconds to hold Button or external Pushbutton before sending HOLD message -#define SWITCH_MODE TOGGLE // [SwitchMode] TOGGLE, FOLLOW, FOLLOW_INV, PUSHBUTTON, PUSHBUTTON_INV, PUSHBUTTONHOLD, PUSHBUTTONHOLD_INV or PUSHBUTTON_TOGGLE (the wall switch state) -#define WS2812_LEDS 30 // [Pixels] Number of WS2812 LEDs to start with +#define SWITCH_MODE TOGGLE // [SwitchMode] TOGGLE, FOLLOW, FOLLOW_INV, PUSHBUTTON, PUSHBUTTON_INV, PUSHBUTTONHOLD, PUSHBUTTONHOLD_INV, PUSHBUTTON_TOGGLE (the wall switch state) +#define WS2812_LEDS 30 // [Pixels] Number of WS2812 LEDs to start with (max is 512) #define TEMP_CONVERSION 0 // [SetOption8] Return temperature in (0 = Celsius or 1 = Fahrenheit) #define TEMP_RESOLUTION 1 // [TempRes] Maximum number of decimals (0 - 3) showing sensor Temperature @@ -196,6 +152,77 @@ #define PRESSURE_RESOLUTION 1 // [PressRes] Maximum number of decimals (0 - 3) showing sensor Pressure #define ENERGY_RESOLUTION 3 // [EnergyRes] Maximum number of decimals (0 - 5) showing energy usage in kWh +/*********************************************************************************************\ + * END OF SECTION 1 + * + * SECTION 2 + * - Enable a feature by removing both // in front of it + * - Disable a feature by preceding it with // +\*********************************************************************************************/ + +//#define USE_ARDUINO_OTA // Add optional support for Arduino OTA (+4k5 code) + +// -- Localization -------------------------------- + // If non selected the default en-GB will be used +//#define MY_LANGUAGE cs-CZ // Czech in Czech +//#define MY_LANGUAGE de-DE // German in Germany +//#define MY_LANGUAGE en-GB // English in Great Britain. Enabled by Default +//#define MY_LANGUAGE es-AR // Spanish in Argentina +//#define MY_LANGUAGE fr-FR // French in France +//#define MY_LANGUAGE hu-HU // Hungarian in Hungary +//#define MY_LANGUAGE it-IT // Italian in Italy +//#define MY_LANGUAGE nl-NL // Dutch in the Netherlands +//#define MY_LANGUAGE pl-PL // Polish in Poland +//#define MY_LANGUAGE pt-PT // Portuguese in Portugal +//#define MY_LANGUAGE ru-RU // Russian in Russia +//#define MY_LANGUAGE zh-CN // Chinese (Simplified) in China +//#define MY_LANGUAGE zh-TW // Chinese (Traditional) in Taiwan + +/*-------------------------------------------------------------------------------------------*\ + * Select ONE of possible three MQTT library types below +\*-------------------------------------------------------------------------------------------*/ + // Default MQTT driver for both non-TLS and TLS connections. Blocks network if MQTT server is unavailable. +#define MQTT_LIBRARY_TYPE MQTT_PUBSUBCLIENT // Use PubSubClient library + // Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support +//#define MQTT_LIBRARY_TYPE MQTT_TASMOTAMQTT // Use TasmotaMqtt library (+4k4 code, +4k mem) - non-TLS only + // Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support +//#define MQTT_LIBRARY_TYPE MQTT_ESPMQTTARDUINO // Use (patched) esp-mqtt-arduino library (+4k8 code, +4k mem) - non-TLS only + +// -- MQTT - Domoticz ----------------------------- +#define USE_DOMOTICZ // Enable Domoticz (+6k code, +0.3k mem) + #define DOMOTICZ_IN_TOPIC "domoticz/in" // Domoticz Input Topic + #define DOMOTICZ_OUT_TOPIC "domoticz/out" // Domoticz Output Topic + +// -- MQTT - Home Assistant Discovery ------------- +#define USE_HOME_ASSISTANT // Enable Home Assistant Discovery Support (+2k code) + #define HOME_ASSISTANT_DISCOVERY_PREFIX "homeassistant" // Home Assistant discovery prefix + +// -- MQTT - TLS ---------------------------------- + // !!! TLS uses a LOT OF MEMORY so be careful to enable other options at the same time !!! +//#define USE_MQTT_TLS // Use TLS for MQTT connection (+53k code, +15k mem) + +// -- HTTP ---------------------------------------- +#define USE_WEBSERVER // Enable web server and wifi manager (+66k code, +8k mem) + #define WEB_PORT 80 // Web server Port for User and Admin mode + #define WEB_USERNAME "admin" // Web server Admin mode user name + #define USE_EMULATION // Enable Belkin WeMo and Hue Bridge emulation for Alexa (+16k code, +2k mem) + +// -- mDNS ---------------------------------------- +#define USE_DISCOVERY // Enable mDNS for the following services (+8k code, +0.3k mem) + #define WEBSERVER_ADVERTISE // Provide access to webserver by name .local/ + #define MQTT_HOST_DISCOVERY // Find MQTT host server (overrides MQTT_HOST if found) + +// -- Time - Start Daylight Saving Time and timezone offset from UTC in minutes +#define TIME_DST North, Last, Sun, Mar, 2, +120 // Northern Hemisphere, Last sunday in march at 02:00 +120 minutes + +// -- Time - Start Standard Time and timezone offset from UTC in minutes +#define TIME_STD North, Last, Sun, Oct, 3, +60 // Northern Hemisphere, Last sunday in october 02:00 +60 minutes + +// -- Time ---------------------------------------- +#define USE_TIMERS // Add support for up to 16 timers (+2k2 code) + #define USE_TIMERS_WEB // Add timer webpage support (+4k5 code) + #define USE_SUNRISE // Add support for Sunrise and sunset tools (+16k) + // -- Internal Analog input ----------------------- #define USE_ADC_VCC // Display Vcc in Power status. Disable for use as Analog input on selected devices @@ -223,6 +250,12 @@ #define MGS_SENSOR_ADDR 0x04 // Default Mutichannel Gas sensor i2c address #endif // USE_I2C +// -- SPI sensors --------------------------------- +//#define USE_SPI // SPI using default library +#ifdef USE_SPI + +#endif // USE_SPI + // -- Serial sensors ------------------------------ #define USE_MHZ19 // Add support for MH-Z19 CO2 sensor (+2k code) #define USE_SENSEAIR // Add support for SenseAir K30, K70 and S8 CO2 sensor (+2k3 code) @@ -254,7 +287,6 @@ * Compile a minimal version if upgrade memory gets tight ONLY TO BE USED FOR UPGRADE STEP 1! * To be used as step 1 during upgrade. * Step 2 is re-compile with option BE_MINIMAL commented out. - * !!! Needed for next release of Arduino/ESP8266 (+22k code, +2k mem) !!! \*********************************************************************************************/ //#define BE_MINIMAL // Minimal version if upgrade memory gets tight (-45k code, -2k mem) From 88046b37305405fcce4e804df1224b94297b4952 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 5 Apr 2018 16:13:17 +0200 Subject: [PATCH 063/136] Align user_config_override_sample --- sonoff/user_config.h | 3 ++- sonoff/user_config_override_sample.h | 39 +++++++++++++++------------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/sonoff/user_config.h b/sonoff/user_config.h index dd981c2b3..6b4386058 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -33,13 +33,14 @@ * Changes in this section do NOT need a change of define CFG_HOLDER. * * ATTENTION: - * Users are advised to use the user_config_override.h file for any local changes. + * Users are advised to use the user_config_override.h file for most changes. \*********************************************************************************************/ //#define USE_CONFIG_OVERRIDE // Uncomment to use user_config_override.h file. See README.md /*********************************************************************************************\ * SECTION 1 + * - After initial load any change here only take effect if CFG_HOLDER is changed too \*********************************************************************************************/ // -- Master parameter control -------------------- diff --git a/sonoff/user_config_override_sample.h b/sonoff/user_config_override_sample.h index 81e209c5d..acd66cebe 100644 --- a/sonoff/user_config_override_sample.h +++ b/sonoff/user_config_override_sample.h @@ -21,7 +21,7 @@ #define _USER_CONFIG_OVERRIDE_H_ // force the compiler to show a warning to confirm that this file is inlcuded -#warning **** Using Settings from user_config_override.h File *** +#warning **** user_config_override.h: Using Settings from this File **** /*****************************************************************************************************\ * USAGE: @@ -31,57 +31,60 @@ * (3) for platformio: * define USE_CONFIG_OVERRIDE as a build flags. * ie1 : export PLATFORMIO_BUILD_FLAGS='-DUSE_CONFIG_OVERRIDE' - * ie2 : enable in file platformio.ini ;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DUSE_CONFIG_OVERRIDE + * ie2 : enable in file platformio.ini "build_flags = -Wl,-Tesp8266.flash.1m0.ld -DUSE_CONFIG_OVERRIDE" * for Arduino IDE: * enable define USE_CONFIG_OVERRIDE in user_config.h ****************************************************************************************************** * ATTENTION: - * - Changes to most PARAMETER defines will only override flash settings if you change define CFG_HOLDER. + * - Changes to SECTION1 PARAMETER defines will only override flash settings if you change define CFG_HOLDER. * - Expect compiler warnings when no ifdef/undef/endif sequence is used. - * - You still need to update user_config.h for major defines MODULE and USE_MQTT_TLS. - * - Changing MODULE defines are not being tested for validity as they are in user_config.h. - * - Most parameters can be changed online using commands via MQTT, WebConsole or serial. + * - You still need to update user_config.h for major define USE_MQTT_TLS. + * - All parameters can be persistent changed online using commands via MQTT, WebConsole or Serial. \*****************************************************************************************************/ /* Examples : -// Setup your own Wifi settings ------------------------------------------------------- +// -- Master parameter control -------------------- +#undef CFG_HOLDER +#define CFG_HOLDER 0x20161209 // [Reset 1] Change this value to load SECTION1 configuration parameters to flash + +// -- Setup your own Wifi settings --------------- #undef STA_SSID1 -#define STA_SSID1 "YourSSID" // [Ssid1] Wifi SSID +#define STA_SSID1 "YourSSID" // [Ssid1] Wifi SSID #undef STA_PASS1 -#define STA_PASS1 "YourWifiPassword" // [Password1] Wifi password +#define STA_PASS1 "YourWifiPassword" // [Password1] Wifi password -// Setup your own MQTT settings ------------------------------------------------------- +// -- Setup your own MQTT settings --------------- #undef MQTT_HOST -#define MQTT_HOST "your-mqtt-server.com" // [MqttHost] +#define MQTT_HOST "your-mqtt-server.com" // [MqttHost] #undef MQTT_PORT -#define MQTT_PORT 1883 // [MqttPort] MQTT port (10123 on CloudMQTT) +#define MQTT_PORT 1883 // [MqttPort] MQTT port (10123 on CloudMQTT) #undef MQTT_USER -#define MQTT_USER "YourMqttUser" // [MqttUser] Optional user +#define MQTT_USER "YourMqttUser" // [MqttUser] Optional user #undef MQTT_PASS -#define MQTT_PASS "YourMqttPass" // [MqttPassword] Optional password +#define MQTT_PASS "YourMqttPass" // [MqttPassword] Optional password // You might even pass some parameters from the command line ---------------------------- -// Ie: export PLATFORMIO_BUILD_FLAGS='-DUSE_CONFIG_OVER -DMY_IP="192.168.1.99" -DMY_GW="192.168.1.1" -DMY_DNS="192.168.1.1"' +// Ie: export PLATFORMIO_BUILD_FLAGS='-DUSE_CONFIG_OVERRIDE -DMY_IP="192.168.1.99" -DMY_GW="192.168.1.1" -DMY_DNS="192.168.1.1"' #ifdef MY_IP #undef WIFI_IP_ADDRESS -#define WIFI_IP_ADDRESS MY_IP // Set to 0.0.0.0 for using DHCP or IP address +#define WIFI_IP_ADDRESS MY_IP // Set to 0.0.0.0 for using DHCP or IP address #endif #ifdef MY_GW #undef WIFI_GATEWAY -#define WIFI_GATEWAY MY_GW // if not using DHCP set Gateway IP address +#define WIFI_GATEWAY MY_GW // if not using DHCP set Gateway IP address #endif #ifdef MY_DNS #undef WIFI_DNS -#define WIFI_DNS MY_DNS // If not using DHCP set DNS IP address (might be equal to WIFI_GATEWAY) +#define WIFI_DNS MY_DNS // If not using DHCP set DNS IP address (might be equal to WIFI_GATEWAY) #endif */ From 8157c66d1e472718c2c1b8ab8652c5093f986fff Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 6 Apr 2018 10:27:05 +0200 Subject: [PATCH 064/136] Log info (#2371) and German Translation (#2372) --- sonoff/language/de-DE.h | 8 ++++---- sonoff/user_config.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index 2b9295e34..0e6bfc26f 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -134,11 +134,11 @@ #define D_START "Start" #define D_STD_TIME "STD" #define D_STOP "Stop" -#define D_SUBNET_MASK "Subnetzmaske" -#define D_SUBSCRIBE_TO "subscribe to" +#define D_SUBNET_MASK "Subnetmask" +#define D_SUBSCRIBE_TO "subscribe zu" #define D_SUCCESSFUL "erfolgreich" -#define D_SUNRISE "Sunrise" -#define D_SUNSET "Sunset" +#define D_SUNRISE "Sonnenaufgang" +#define D_SUNSET "Sonnenuntergang" #define D_TEMPERATURE "Temperatur" #define D_TO "zu" #define D_TOGGLE "An/Aus" diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 6b4386058..6fe6fe616 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -68,9 +68,9 @@ // -- Syslog -------------------------------------- #define SYS_LOG_HOST "" // [LogHost] (Linux) syslog host #define SYS_LOG_PORT 514 // [LogPort] default syslog UDP port -#define SYS_LOG_LEVEL LOG_LEVEL_NONE // [SysLog] -#define SERIAL_LOG_LEVEL LOG_LEVEL_INFO // [SerialLog] -#define WEB_LOG_LEVEL LOG_LEVEL_INFO // [WebLog] +#define SYS_LOG_LEVEL LOG_LEVEL_NONE // [SysLog] LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE +#define SERIAL_LOG_LEVEL LOG_LEVEL_INFO // [SerialLog] LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE +#define WEB_LOG_LEVEL LOG_LEVEL_INFO // [WebLog] LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE // -- Ota ----------------------------------------- #define OTA_URL "http://sonoff.maddox.co.uk/tasmota/sonoff.ino.bin" // [OtaUrl] From 4beaf5a2fcbba67243eae74f7d8fad1c36208ad1 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 7 Apr 2018 10:35:11 +0200 Subject: [PATCH 065/136] Update language files (#2375, #2384) --- sonoff/language/de-DE.h | 84 ++++++++++++++++++++--------------------- sonoff/language/es-AR.h | 4 +- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index 0e6bfc26f..fde844b8b 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -43,7 +43,7 @@ #define D_MINUTE_SECOND_SEPARATOR ":" #define D_DAY3LIST "SonMonDieMitDonFriSam" -#define D_MONTH3LIST "JanFebMaeAprMaiJunJulAugSepOktNovDez" +#define D_MONTH3LIST "JanFebMärAprMaiJunJulAugSepOktNovDez" // Non JSON decimal separator #define D_DECIMAL_SEPARATOR "." @@ -74,7 +74,7 @@ #define D_DARKLIGHT "dunkel" #define D_DEBUG "debug" #define D_DISABLED "deaktiviert" -#define D_DNS_SERVER "DNS Server" +#define D_DNS_SERVER "DNS-Server" #define D_DONE "erledigt" #define D_DST_TIME "DST" #define D_ECO2 "eCO2" @@ -85,7 +85,7 @@ #define D_FAHRENHEIT "Fahrenheit" #define D_FAILED "fehlgeschlagen" #define D_FALLBACK "Fallback" -#define D_FALLBACK_TOPIC "Fallback topic" +#define D_FALLBACK_TOPIC "Fallback-Topic" #define D_FALSE "falsch" #define D_FILE "Datei" #define D_FREE_MEMORY "Freier Arbeitsspeicher" @@ -100,7 +100,7 @@ #define D_INDEX "Index" #define D_INFO "Info" #define D_INITIALIZED "initialisiert" -#define D_IP_ADDRESS "IP-Addresse" +#define D_IP_ADDRESS "IP-Adresse" #define D_LIGHT "Licht" #define D_LWT "LWT" #define D_MODULE "Modul" @@ -117,8 +117,8 @@ #define D_PORT "Port" #define D_POWER_FACTOR "Leistungsfaktor" #define D_POWERUSAGE "Leistung" -#define D_PRESSURE "Druck" -#define D_PRESSUREATSEALEVEL "MeeresDruck" +#define D_PRESSURE "Luftdruck" +#define D_PRESSUREATSEALEVEL "Luftdruck auf Meereshöhe" #define D_PROGRAM_FLASH_SIZE "Ges. Flash Speicher" #define D_PROGRAM_SIZE "Ben. Flash Speicher" #define D_PROJECT "Projekt" @@ -134,8 +134,8 @@ #define D_START "Start" #define D_STD_TIME "STD" #define D_STOP "Stop" -#define D_SUBNET_MASK "Subnetmask" -#define D_SUBSCRIBE_TO "subscribe zu" +#define D_SUBNET_MASK "Subnetzmaske" +#define D_SUBSCRIBE_TO "abonniere" #define D_SUCCESSFUL "erfolgreich" #define D_SUNRISE "Sonnenaufgang" #define D_SUNSET "Sonnenuntergang" @@ -151,43 +151,43 @@ #define D_UPTIME "Laufzeit" #define D_USER "Benutzer" #define D_UTC_TIME "UTC" -#define D_UV_LEVEL "UV Level" +#define D_UV_LEVEL "UV-Level" #define D_VERSION "Version" #define D_VOLTAGE "Spannung" #define D_WARMLIGHT "warm" #define D_WEB_SERVER "Web-Server" // sonoff.ino -#define D_WARNING_MINIMAL_VERSION "WARNING This version does not support persistent settings" +#define D_WARNING_MINIMAL_VERSION "ACHTUNG: Diese Version unterstützt keine persistenten Einstellungen" #define D_LEVEL_10 "level 1-0" #define D_LEVEL_01 "level 0-1" -#define D_SERIAL_LOGGING_DISABLED "Serielles logging deaktiviert" -#define D_SYSLOG_LOGGING_REENABLED "Syslog logging reaktiviert" +#define D_SERIAL_LOGGING_DISABLED "Serielles Logging deaktiviert" +#define D_SYSLOG_LOGGING_REENABLED "Syslog-Logging aktiviert" -#define D_SET_BAUDRATE_TO "Baudrate eingestellt auf" +#define D_SET_BAUDRATE_TO "Setze Baudrate auf" #define D_RECEIVED_TOPIC "empfangenes topic" #define D_DATA_SIZE "Datengröße" #define D_ANALOG_INPUT "Analog" // support.ino #define D_OSWATCH "osWatch" -#define D_BLOCKED_LOOP "Blocked Loop" +#define D_BLOCKED_LOOP "Schleife blockiert." #define D_WPS_FAILED_WITH_STATUS "WPS fehlgeschlagen mit Status" #define D_ACTIVE_FOR_3_MINUTES "aktiv für 3 Minuten" #define D_FAILED_TO_START "Starten fehlgeschlagen" -#define D_PATCH_ISSUE_2186 "Patch-Problem 2186" +#define D_PATCH_ISSUE_2186 "Repariere Problem #2186" #define D_CONNECTING_TO_AP "verbinden mit AP" #define D_IN_MODE "in Modus" -#define D_CONNECT_FAILED_NO_IP_ADDRESS "Verbindung fehlgeschlagen da keine IP-Adresse zugeteilt wurde" -#define D_CONNECT_FAILED_AP_NOT_REACHED "Verbindung fehlgeschlagen da AP nicht erreicht werden konnte" -#define D_CONNECT_FAILED_WRONG_PASSWORD "Verbindung fehlgeschlagen mit AP weil das Passwort falsch ist" -#define D_CONNECT_FAILED_AP_TIMEOUT "Verbindung fehlgeschlagen da der AP nicht antwortet (timeout)" +#define D_CONNECT_FAILED_NO_IP_ADDRESS "Verbindung fehlgeschlagen, da keine IP-Adresse zugeteilt wurde" +#define D_CONNECT_FAILED_AP_NOT_REACHED "Verbindung fehlgeschlagen, da AP nicht erreicht werden konnte" +#define D_CONNECT_FAILED_WRONG_PASSWORD "Verbindung fehlgeschlagen, da das Passwort falsch ist" +#define D_CONNECT_FAILED_AP_TIMEOUT "Verbindung fehlgeschlagen, da der AP nicht antwortet (timeout)" #define D_ATTEMPTING_CONNECTION "Verbindungsversuch..." #define D_CHECKING_CONNECTION "Prüfe Verbindung..." #define D_QUERY_DONE "Suchanfrage abgeschlossen. MQTT-Services gefunden" #define D_MQTT_SERVICE_FOUND "MQTT-Service gefunden bei" #define D_FOUND_AT "gefunden bei" -#define D_SYSLOG_HOST_NOT_FOUND "Syslog Host nicht gefunden" +#define D_SYSLOG_HOST_NOT_FOUND "Syslog-Host nicht gefunden" // settings.ino #define D_SAVED_TO_FLASH_AT "in Flash gespeichert am" @@ -228,40 +228,40 @@ #define D_RESTORE_CONFIGURATION "Konfiguration wiederherstellen" #define D_MAIN_MENU "Hauptmenü" -#define D_MODULE_PARAMETERS "Geräte Einstellungen" -#define D_MODULE_TYPE "Geräte Typ" +#define D_MODULE_PARAMETERS "Geräte-Einstellungen" +#define D_MODULE_TYPE "Gerätetyp" #define D_GPIO "GPIO" #define D_SERIAL_IN "serieller Eingang [serial in]" #define D_SERIAL_OUT "serieller Ausgang [serial out]" -#define D_WIFI_PARAMETERS "WLAN Einstellungen" +#define D_WIFI_PARAMETERS "WLAN-Einstellungen" #define D_SCAN_FOR_WIFI_NETWORKS "WLAN-Netzwerk suchen und auswählen" #define D_SCAN_DONE "Suche abgeschlossen" #define D_NO_NETWORKS_FOUND "Keine Netzwerke gefunden" -#define D_REFRESH_TO_SCAN_AGAIN "Aktualisieren um erneut zu suchen" +#define D_REFRESH_TO_SCAN_AGAIN "Aktualisieren, um erneut zu suchen" #define D_DUPLICATE_ACCESSPOINT "AccessPoint duplizieren" #define D_SKIPPING_LOW_QUALITY "überspringe wegen niedriger Qualität" #define D_RSSI "RSSI" #define D_WEP "WEP" -#define D_WPA_PSK "WPA PSK" -#define D_WPA2_PSK "WPA2 PSK" +#define D_WPA_PSK "WPA-PSK" +#define D_WPA2_PSK "WPA2-PSK" #define D_AP1_SSID "WLAN 1 - SSID" #define D_AP1_PASSWORD "WLAN 1 - Passwort" #define D_AP2_SSID "WLAN 2 - SSID" #define D_AP2_PASSWORD "WLAN 2 - Passwort" -#define D_MQTT_PARAMETERS "MQTT Einstellungen" +#define D_MQTT_PARAMETERS "MQTT-Einstellungen" #define D_CLIENT "client" #define D_FULL_TOPIC "full topic" -#define D_LOGGING_PARAMETERS "Logging Einstellungen" -#define D_SERIAL_LOG_LEVEL "Seriell Log level" -#define D_WEB_LOG_LEVEL "Web Log level" -#define D_SYS_LOG_LEVEL "Sys Log level" +#define D_LOGGING_PARAMETERS "Logging-Einstellungen" +#define D_SERIAL_LOG_LEVEL "Seriell-Log Level" +#define D_WEB_LOG_LEVEL "Web-Log Level" +#define D_SYS_LOG_LEVEL "Sys-Log Level" #define D_MORE_DEBUG "More debug" -#define D_SYSLOG_HOST "Sys Log Host" -#define D_SYSLOG_PORT "Sys Log Port" -#define D_TELEMETRY_PERIOD "Telemetry period" +#define D_SYSLOG_HOST "Sys-Log Host" +#define D_SYSLOG_PORT "Sys-Log Port" +#define D_TELEMETRY_PERIOD "Telemetrieperiode" #define D_OTHER_PARAMETERS "Sonstige Einstellungen" #define D_WEB_ADMIN_PASSWORD "Passwort für Web Oberfläche" @@ -298,7 +298,7 @@ #define D_UPGRADE_BY_WEBSERVER "Update über Web-Server" #define D_OTA_URL "OTA-URL" #define D_START_UPGRADE "Update starten" -#define D_UPGRADE_BY_FILE_UPLOAD "Update Datei hochladen" +#define D_UPGRADE_BY_FILE_UPLOAD "Update-Datei hochladen" #define D_UPLOAD_STARTED "Upload gestartet" #define D_UPGRADE_STARTED "Update gestartet" #define D_UPLOAD_DONE "Upload abgeschlossen" @@ -315,7 +315,7 @@ #define D_ENTER_COMMAND "Befehl eingeben" #define D_ENABLE_WEBLOG_FOR_RESPONSE "Aktivere Web Log Level 2 falls Reaktion erwartet" -#define D_NEED_USER_AND_PASSWORD "Benutzer benötigt=&password=" +#define D_NEED_USER_AND_PASSWORD "Benötige user=&password=" // xdrv_00_mqtt.ino #define D_FINGERPRINT "TLS-Fingerabdruck wird verifiziert..." @@ -340,13 +340,13 @@ #define D_HUE "Hue" #define D_HUE_BRIDGE_SETUP "Hue-Setup" -#define D_HUE_API_NOT_IMPLEMENTED "Hue API nicht implementiert" -#define D_HUE_API "Hue API" -#define D_HUE_POST_ARGS "Hue POST args" +#define D_HUE_API_NOT_IMPLEMENTED "Hue-API nicht implementiert" +#define D_HUE_API "Hue-API" +#define D_HUE_POST_ARGS "Hue POST-Argumente" #define D_3_RESPONSE_PACKETS_SENT "3 Antwortpakete gesendet" // xdrv_05_domoticz.ino -#define D_DOMOTICZ_PARAMETERS "Domoticz parameters" +#define D_DOMOTICZ_PARAMETERS "Domoticz-Parameter" #define D_DOMOTICZ_IDX "Idx" #define D_DOMOTICZ_KEY_IDX "Key idx" #define D_DOMOTICZ_SWITCH_IDX "Switch idx" @@ -364,7 +364,7 @@ // xdrv_09_timers.ino #define D_CONFIGURE_TIMER "Zeitplan konfigurieren" -#define D_TIMER_PARAMETERS "Zeitplan Einstellungen" +#define D_TIMER_PARAMETERS "Zeitplan-Einstellungen" #define D_TIMER_ARM "Aktiv" #define D_TIMER_TIME "Uhrzeit" #define D_TIMER_DAYS "Wochentage" @@ -383,7 +383,7 @@ #define D_SENSORS_FOUND "Sensor gefunden" // xsns_06_dht.ino -#define D_TIMEOUT_WAITING_FOR "Timeout wartet auf" +#define D_TIMEOUT_WAITING_FOR "Timeout während Warten auf" #define D_START_SIGNAL_LOW "Startausschlag niedrig" #define D_START_SIGNAL_HIGH "Startausschlag hoch" #define D_PULSE "pulse" diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index 5dfc111da..14793c0d6 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -137,8 +137,8 @@ #define D_SUBNET_MASK "Máscara Subred" #define D_SUBSCRIBE_TO "Suscribir a" #define D_SUCCESSFUL "Exitosa" -#define D_SUNRISE "Sunrise" -#define D_SUNSET "Sunset" +#define D_SUNRISE "Salida del Sol" +#define D_SUNSET "Puesta del Sol" #define D_TEMPERATURE "Temperatura" #define D_TO "a" #define D_TOGGLE "Conmutar" From 7a9ee6b6696238bf2e6c5b925dc68d7305556aab Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Tue, 10 Apr 2018 11:45:53 +0200 Subject: [PATCH 066/136] v5.12.0k - Fix two define changes 5.12.0k * Prepare for simple rules by enlarging Settings area to now 2048 bytes * Fix freeing more code space when emulation is disabled (#1592) * Fix compile error when not defined USE_TIMERS (#2400) --- README.md | 2 +- sonoff/_releasenotes.ino | 7 ++++++- sonoff/settings.h | 9 +++++++-- sonoff/settings.ino | 4 ++++ sonoff/sonoff.ino | 12 ++++++------ sonoff/support.ino | 6 +++--- sonoff/xdrv_00_mqtt.ino | 2 +- sonoff/xplg_wemohue.ino | 7 ++----- 8 files changed, 30 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 60700342d..695d7895c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## Sonoff-Tasmota Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE. -Current version is **5.12.0j** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.12.0k** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### Quick install diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index a61c583fb..4404e6fa5 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,9 @@ -/* 5.12.0j +/* 5.12.0k + * Prepare for simple rules by enlarging Settings area to now 2048 bytes + * Fix freeing more code space when emulation is disabled (#1592) + * Fix compile error when not defined USE_TIMERS (#2400) + * + * 5.12.0j * Add optional Sunrise and Sunset timers with commands Latitide and Longitude to be enabled with define USE_SUNRISE in user_config.h (#2317) * * 5.12.0i diff --git a/sonoff/settings.h b/sonoff/settings.h index a83b24e1e..d9c53a4bc 100644 --- a/sonoff/settings.h +++ b/sonoff/settings.h @@ -48,7 +48,7 @@ typedef union { // Restricted by MISRA-C Rule 18.4 bu uint32_t not_power_linked : 1; // bit 20 (v5.11.1f) uint32_t no_power_on_check : 1; // bit 21 (v5.11.1i) uint32_t mqtt_serial : 1; // bit 22 (v5.12.0f) - uint32_t spare23 : 1; + uint32_t rules_enabled : 1; // bit 23 (v5.12.0j) uint32_t spare24 : 1; uint32_t spare25 : 1; uint32_t spare26 : 1; @@ -255,7 +255,12 @@ struct SYSCFG { Timer timer[MAX_TIMERS]; // 670 int latitude; // 6B0 int longitude; // 6B4 - // 6B8 - FFF free locations + + byte free_6b8[72]; // 6B8 + + char rules[256]; // 700 + + // 800 - FFF free locations } Settings; struct RTCMEM { diff --git a/sonoff/settings.ino b/sonoff/settings.ino index 7a8105c3e..c9b41d946 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -927,6 +927,10 @@ void SettingsDelta() Settings.latitude = (int)((double)LATITUDE * 1000000); Settings.longitude = (int)((double)LONGITUDE * 1000000); } + if (Settings.version < 0x050C000B) { + memset(&Settings.free_6b8, 0x00, sizeof(Settings.free_6b8)); + memset(&Settings.rules, 0x00, sizeof(Settings.rules)); + } Settings.version = VERSION; SettingsSave(1); diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index c354aabc8..d689b66fc 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050C000A // 5.12.0j +#define VERSION 0x050C000B // 5.12.0k // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) @@ -558,7 +558,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) XsnsCall(FUNC_COMMAND); // if (!XsnsCall(FUNC_COMMAND)) type = NULL; } - else if ((CMND_SETOPTION == command_code) && ((index <= 21) || ((index > 31) && (index <= P_MAX_PARAM8 + 31)))) { + else if ((CMND_SETOPTION == command_code) && ((index <= 23) || ((index > 31) && (index <= P_MAX_PARAM8 + 31)))) { if (index <= 31) { ptype = 0; // SetOption0 .. 31 } else { @@ -588,6 +588,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) case 19: // hass_discovery case 20: // not_power_linked case 21: // no_power_on_check + case 23: // rules_enabled bitWrite(Settings.flag.data, index, payload); } if (12 == index) { // stop_flash_rotate @@ -1305,13 +1306,13 @@ void PublishStatus(uint8_t payload) } if ((0 == payload) || (7 == payload)) { -#ifdef USE_SUNRISE +#if defined(USE_TIMERS) && defined(USE_SUNRISE) snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_STATUS D_STATUS7_TIME "\":{\"" D_JSON_UTC_TIME "\":\"%s\",\"" D_JSON_LOCAL_TIME "\":\"%s\",\"" D_JSON_STARTDST "\":\"%s\",\"" D_JSON_ENDDST "\":\"%s\",\"" D_CMND_TIMEZONE "\":%d,\"" D_JSON_SUNRISE "\":\"%s\",\"" D_JSON_SUNSET "\":\"%s\"}}"), GetTime(0).c_str(), GetTime(1).c_str(), GetTime(2).c_str(), GetTime(3).c_str(), Settings.timezone, GetSun(0).c_str(), GetSun(1).c_str()); #else snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_STATUS D_STATUS7_TIME "\":{\"" D_JSON_UTC_TIME "\":\"%s\",\"" D_JSON_LOCAL_TIME "\":\"%s\",\"" D_JSON_STARTDST "\":\"%s\",\"" D_JSON_ENDDST "\":\"%s\",\"" D_CMND_TIMEZONE "\":%d}}"), GetTime(0).c_str(), GetTime(1).c_str(), GetTime(2).c_str(), GetTime(3).c_str(), Settings.timezone); -#endif // USE_SUNRISE +#endif // USE_TIMERS and USE_SUNRISE MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "7")); } @@ -2423,11 +2424,10 @@ void loop() #ifdef USE_WEBSERVER PollDnsWebserver(); -#endif // USE_WEBSERVER - #ifdef USE_EMULATION if (Settings.flag2.emulation) PollUdp(); #endif // USE_EMULATION +#endif // USE_WEBSERVER if (millis() >= state_loop_timer) StateLoop(); diff --git a/sonoff/support.ino b/sonoff/support.ino index b845af708..58ecce027 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -617,7 +617,7 @@ void WifiConfig(uint8_t type) if (type >= WIFI_RETRY) { // WIFI_RETRY and WIFI_WAIT return; } -#ifdef USE_EMULATION +#if defined(USE_WEBSERVER) && defined(USE_EMULATION) UdpDisconnect(); #endif // USE_EMULATION WiFi.disconnect(); // Solve possible Wifi hangs @@ -653,7 +653,7 @@ void WifiBegin(uint8_t flag) { const char kWifiPhyMode[] = " BGN"; -#ifdef USE_EMULATION +#if defined(USE_WEBSERVER) && defined(USE_EMULATION) UdpDisconnect(); #endif // USE_EMULATION @@ -840,7 +840,7 @@ void WifiCheck(uint8_t param) #endif // USE_EMULATION #endif // USE_WEBSERVER } else { -#ifdef USE_EMULATION +#if defined(USE_WEBSERVER) && defined(USE_EMULATION) UdpDisconnect(); #endif // USE_EMULATION mdns_begun = false; diff --git a/sonoff/xdrv_00_mqtt.ino b/sonoff/xdrv_00_mqtt.ino index 6a87f1f25..f9be1003c 100644 --- a/sonoff/xdrv_00_mqtt.ino +++ b/sonoff/xdrv_00_mqtt.ino @@ -418,7 +418,7 @@ void MqttReconnect() return; } -#ifdef USE_EMULATION +#if defined(USE_WEBSERVER) && defined(USE_EMULATION) UdpDisconnect(); #endif // USE_EMULATION diff --git a/sonoff/xplg_wemohue.ino b/sonoff/xplg_wemohue.ino index a1f3d8ce8..965fd7483 100644 --- a/sonoff/xplg_wemohue.ino +++ b/sonoff/xplg_wemohue.ino @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#ifdef USE_EMULATION +#if defined(USE_WEBSERVER) && defined(USE_EMULATION) /*********************************************************************************************\ * Belkin WeMo and Philips Hue bridge emulation \*********************************************************************************************/ @@ -266,7 +266,6 @@ void PollUdp() } } -#ifdef USE_WEBSERVER /*********************************************************************************************\ * Wemo web server additions \*********************************************************************************************/ @@ -814,6 +813,4 @@ void HandleHueApi(String *path) else if (path->endsWith("/rules")) HueNotImplemented(path); else HueGlobalConfig(path); } -#endif // USE_WEBSERVER -#endif // USE_EMULATION - +#endif // USE_WEBSERVER && USE_EMULATION From ee7227254feed210cb47fb0bcbe3924ad0848687 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Wed, 11 Apr 2018 10:11:20 +0200 Subject: [PATCH 067/136] Minor changes to prep for rules Change German day display to two character (#2403) --- sonoff/language/de-DE.h | 2 +- sonoff/settings.h | 2 +- sonoff/sonoff.h | 5 ++++- sonoff/support.ino | 6 ++++++ sonoff/webserver.ino | 24 ++++++++---------------- sonoff/xdrv_00_mqtt.ino | 4 ++++ sonoff/xsns_01_counter.ino | 2 +- sonoff/xsns_04_snfsc.ino | 10 ++++++---- sonoff/xsns_05_ds18b20.ino | 2 +- sonoff/xsns_05_ds18x20.ino | 2 +- sonoff/xsns_05_ds18x20_legacy.ino | 2 +- sonoff/xsns_06_dht.ino | 2 +- sonoff/xsns_07_sht1x.ino | 2 +- sonoff/xsns_08_htu21.ino | 2 +- sonoff/xsns_09_bmp.ino | 2 +- sonoff/xsns_10_bh1750.ino | 2 +- sonoff/xsns_11_veml6070.ino | 2 +- sonoff/xsns_13_ina219.ino | 6 ++++-- sonoff/xsns_14_sht3x.ino | 2 +- sonoff/xsns_15_mhz19.ino | 2 +- sonoff/xsns_16_tsl2561.ino | 2 +- sonoff/xsns_17_senseair.ino | 2 +- sonoff/xsns_18_pms5003.ino | 8 +++++--- sonoff/xsns_20_novasds.ino | 6 ++++-- sonoff/xsns_21_sgp30.ino | 2 +- 25 files changed, 58 insertions(+), 45 deletions(-) diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index fde844b8b..7a2a169b2 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -42,7 +42,7 @@ #define D_HOUR_MINUTE_SEPARATOR ":" #define D_MINUTE_SECOND_SEPARATOR ":" -#define D_DAY3LIST "SonMonDieMitDonFriSam" +#define D_DAY3LIST "So Mo Di Mi Do Fr Sa " #define D_MONTH3LIST "JanFebMärAprMaiJunJulAugSepOktNovDez" // Non JSON decimal separator diff --git a/sonoff/settings.h b/sonoff/settings.h index d9c53a4bc..e9fe0f296 100644 --- a/sonoff/settings.h +++ b/sonoff/settings.h @@ -258,7 +258,7 @@ struct SYSCFG { byte free_6b8[72]; // 6B8 - char rules[256]; // 700 + char rules[MAX_RULE_SIZE]; // 700 // 800 - FFF free locations } Settings; diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index 0869c6929..279c1652d 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -48,6 +48,7 @@ typedef unsigned long power_t; // Power (Relay) type #define MAX_FRIENDLYNAMES 4 // Max number of Friendly names #define MAX_DOMOTICZ_IDX 4 // Max number of Domoticz device, key and switch indices #define MAX_DOMOTICZ_SNS_IDX 12 // Max number of Domoticz sensors indices +#define MAX_RULE_SIZE 256 // Max number of characters in rules #define MODULE SONOFF_BASIC // [Module] Select default model @@ -163,7 +164,9 @@ enum LichtSubtypes {LST_NONE, LST_SINGLE, LST_COLDWARM, LST_RGB, LST_RGBW, LST_R enum LichtSchemes {LS_POWER, LS_WAKEUP, LS_CYCLEUP, LS_CYCLEDN, LS_RANDOM, LS_MAX}; enum XsnsFunctions {FUNC_INIT, FUNC_LOOP, FUNC_EVERY_50_MSECOND, FUNC_EVERY_SECOND, FUNC_PREP_BEFORE_TELEPERIOD, FUNC_JSON_APPEND, FUNC_WEB_APPEND, FUNC_SAVE_BEFORE_RESTART, - FUNC_COMMAND, FUNC_MQTT_SUBSCRIBE, FUNC_MQTT_INIT, FUNC_MQTT_DATA, FUNC_SET_POWER, FUNC_SHOW_SENSOR}; + FUNC_COMMAND, FUNC_NTP_INIT, FUNC_NTP_SET, + FUNC_MQTT_SUBSCRIBE, FUNC_MQTT_INIT, FUNC_MQTT_DATA, FUNC_MQTT_DISCONNECTED, FUNC_MQTT_CONNECTED, + FUNC_SET_POWER, FUNC_SHOW_SENSOR}; const uint8_t kDefaultRfCode[9] PROGMEM = { 0x21, 0x16, 0x01, 0x0E, 0x03, 0x48, 0x2E, 0x1A, 0x00 }; diff --git a/sonoff/support.ino b/sonoff/support.ino index 58ecce027..591a4c571 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -1376,6 +1376,12 @@ void RtcSecond() snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_APPLICATION "(" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"), GetTime(0).c_str(), GetTime(2).c_str(), GetTime(3).c_str()); AddLog(LOG_LEVEL_DEBUG); + + if (local_time < 1451602800) { + XdrvCall(FUNC_NTP_SET); + } else { + XdrvCall(FUNC_NTP_SET); + } } else { ntp_sync_minute++; // Try again in next minute } diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index b697e2bab..20ddb0b0c 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -183,12 +183,10 @@ const char HTTP_BTN_RSTRT[] PROGMEM = "
"; const char HTTP_BTN_MENU_MODULE[] PROGMEM = "
"; -#ifdef USE_TIMERS -#ifdef USE_TIMERS_WEB +#if defined(USE_TIMERS) && defined(USE_TIMERS_WEB) const char HTTP_BTN_MENU_TIMER[] PROGMEM = "
"; -#endif // USE_TIMERS_WEB -#endif // USE_TIMERS +#endif // USE_TIMERS and USE_TIMERS_WEB const char HTTP_BTN_MENU_WIFI[] PROGMEM = "
"; const char HTTP_BTN_MENU_MQTT[] PROGMEM = @@ -340,11 +338,9 @@ void StartWebserver(int type, IPAddress ipweb) WebServer->on("/", HandleRoot); WebServer->on("/cn", HandleConfiguration); WebServer->on("/md", HandleModuleConfiguration); -#ifdef USE_TIMERS -#ifdef USE_TIMERS_WEB +#if defined(USE_TIMERS) && defined(USE_TIMERS_WEB) WebServer->on("/tm", HandleTimerConfiguration); -#endif // USE_TIMERS_WEB -#endif // USE_TIMERS +#endif // USE_TIMERS and USE_TIMERS_WEB WebServer->on("/w1", HandleWifiConfigurationWithScan); WebServer->on("/w0", HandleWifiConfiguration); if (Settings.flag.mqtt_enabled) { @@ -632,11 +628,9 @@ void HandleConfiguration() page.replace(F("{v}"), FPSTR(S_CONFIGURATION)); page += FPSTR(HTTP_HEAD_STYLE); page += FPSTR(HTTP_BTN_MENU_MODULE); -#ifdef USE_TIMERS -#ifdef USE_TIMERS_WEB +#if defined(USE_TIMERS) && defined(USE_TIMERS_WEB) if (devices_present) page += FPSTR(HTTP_BTN_MENU_TIMER); -#endif // USE_TIMERS_WEB -#endif // USE_TIMERS +#endif // USE_TIMERS and USE_TIMERS_WEB page += FPSTR(HTTP_BTN_MENU_WIFI); if (Settings.flag.mqtt_enabled) page += FPSTR(HTTP_BTN_MENU_MQTT); page += FPSTR(HTTP_BTN_MENU4); @@ -1103,13 +1097,11 @@ void HandleSaveSettings() Settings.seriallog_level, Settings.weblog_level, Settings.syslog_level, Settings.syslog_host, Settings.syslog_port, Settings.tele_period); AddLog(LOG_LEVEL_INFO); break; -#ifdef USE_TIMERS -#ifdef USE_TIMERS_WEB +#if defined(USE_TIMERS) && defined(USE_TIMERS_WEB) case 7: TimerSaveSettings(); break; -#endif // USE_TIMERS_WEB -#endif // USE_TIMERS +#endif // USE_TIMERS and USE_TIMERS_WEB #ifdef USE_DOMOTICZ case 4: DomoticzSaveSettings(); diff --git a/sonoff/xdrv_00_mqtt.ino b/sonoff/xdrv_00_mqtt.ino index f9be1003c..ca74724c3 100644 --- a/sonoff/xdrv_00_mqtt.ino +++ b/sonoff/xdrv_00_mqtt.ino @@ -316,6 +316,8 @@ void MqttDisconnected(int state) snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MQTT D_CONNECT_FAILED_TO " %s:%d, rc %d. " D_RETRY_IN " %d " D_UNIT_SECOND), Settings.mqtt_host, Settings.mqtt_port, state, mqtt_retry_counter); AddLog(LOG_LEVEL_INFO); + + XdrvCall(FUNC_MQTT_DISCONNECTED); } void MqttConnected() @@ -371,6 +373,8 @@ void MqttConnected() XdrvCall(FUNC_MQTT_INIT); } mqtt_initial_connection_state = 0; + + XdrvCall(FUNC_MQTT_CONNECTED); } #ifdef USE_MQTT_TLS diff --git a/sonoff/xsns_01_counter.ino b/sonoff/xsns_01_counter.ino index 68cc418d0..397f3d853 100644 --- a/sonoff/xsns_01_counter.ino +++ b/sonoff/xsns_01_counter.ino @@ -105,7 +105,7 @@ void CounterShow(boolean json) if (json) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"" D_JSON_COUNTER "%d\":%s"), mqtt_data, i +1, counter); #ifdef USE_DOMOTICZ - if (1 == dsxflg) { + if ((0 == tele_period) && (1 == dsxflg)) { DomoticzSensor(DZ_COUNT, RtcSettings.pulse_counter[i]); dsxflg++; } diff --git a/sonoff/xsns_04_snfsc.ino b/sonoff/xsns_04_snfsc.ino index 944dff985..63bdcc5d8 100644 --- a/sonoff/xsns_04_snfsc.ino +++ b/sonoff/xsns_04_snfsc.ino @@ -123,10 +123,12 @@ void SonoffScShow(boolean json) snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"SonoffSC\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s,\"" D_JSON_LIGHT "\":%d,\"" D_JSON_NOISE "\":%d,\"" D_JSON_AIRQUALITY "\":%d}"), mqtt_data, temperature, humidity, sc_value[2], sc_value[3], sc_value[4]); #ifdef USE_DOMOTICZ - DomoticzTempHumSensor(temperature, humidity); - DomoticzSensor(DZ_ILLUMINANCE, sc_value[2]); - DomoticzSensor(DZ_COUNT, sc_value[3]); - DomoticzSensor(DZ_AIRQUALITY, 500 + ((100 - sc_value[4]) * 20)); + if (0 == tele_period) { + DomoticzTempHumSensor(temperature, humidity); + DomoticzSensor(DZ_ILLUMINANCE, sc_value[2]); + DomoticzSensor(DZ_COUNT, sc_value[3]); + DomoticzSensor(DZ_AIRQUALITY, 500 + ((100 - sc_value[4]) * 20)); + } #endif // USE_DOMOTICZ #ifdef USE_WEBSERVER } else { diff --git a/sonoff/xsns_05_ds18b20.ino b/sonoff/xsns_05_ds18b20.ino index bec747c45..6faeeed18 100644 --- a/sonoff/xsns_05_ds18b20.ino +++ b/sonoff/xsns_05_ds18b20.ino @@ -197,7 +197,7 @@ void Ds18b20Show(boolean json) if(json) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"DS18B20\":{\"" D_JSON_TEMPERATURE "\":%s}"), mqtt_data, temperature); #ifdef USE_DOMOTICZ - DomoticzSensor(DZ_TEMP, temperature); + if (0 == tele_period) DomoticzSensor(DZ_TEMP, temperature); #endif // USE_DOMOTICZ #ifdef USE_WEBSERVER } else { diff --git a/sonoff/xsns_05_ds18x20.ino b/sonoff/xsns_05_ds18x20.ino index 23dc4482e..4f17e94cd 100644 --- a/sonoff/xsns_05_ds18x20.ino +++ b/sonoff/xsns_05_ds18x20.ino @@ -380,7 +380,7 @@ void Ds18x20Show(boolean json) snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"%s\":{\"" D_JSON_ID "\":\"%s\",\"" D_JSON_TEMPERATURE "\":%s}"), mqtt_data, stemp, address, temperature); } #ifdef USE_DOMOTICZ - if (domoticz_flag) { + if ((0 == tele_period) && domoticz_flag) { DomoticzSensor(DZ_TEMP, temperature); domoticz_flag = false; } diff --git a/sonoff/xsns_05_ds18x20_legacy.ino b/sonoff/xsns_05_ds18x20_legacy.ino index 085280ece..bd78ff424 100644 --- a/sonoff/xsns_05_ds18x20_legacy.ino +++ b/sonoff/xsns_05_ds18x20_legacy.ino @@ -188,7 +188,7 @@ void Ds18x20Show(boolean json) mqtt_data, stemp, i +1, ds18x20_types, Ds18x20Addresses(i).c_str(), temperature); strcpy(stemp, ","); #ifdef USE_DOMOTICZ - if (1 == dsxflg) { + if ((0 == tele_period) && (1 == dsxflg)) { DomoticzSensor(DZ_TEMP, temperature); } #endif // USE_DOMOTICZ diff --git a/sonoff/xsns_06_dht.ino b/sonoff/xsns_06_dht.ino index e23d1989f..2bca2d87f 100644 --- a/sonoff/xsns_06_dht.ino +++ b/sonoff/xsns_06_dht.ino @@ -226,7 +226,7 @@ void DhtShow(boolean json) if (json) { snprintf_P(mqtt_data, sizeof(mqtt_data), JSON_SNS_TEMPHUM, mqtt_data, Dht[i].stype, temperature, humidity); #ifdef USE_DOMOTICZ - if (!dsxflg) { + if ((0 == tele_period) && !dsxflg) { DomoticzTempHumSensor(temperature, humidity); dsxflg++; } diff --git a/sonoff/xsns_07_sht1x.ino b/sonoff/xsns_07_sht1x.ino index 6ff557aff..08afed555 100644 --- a/sonoff/xsns_07_sht1x.ino +++ b/sonoff/xsns_07_sht1x.ino @@ -199,7 +199,7 @@ void ShtShow(boolean json) if (json) { snprintf_P(mqtt_data, sizeof(mqtt_data), JSON_SNS_TEMPHUM, mqtt_data, "SHT1X", temperature, humidity); #ifdef USE_DOMOTICZ - DomoticzTempHumSensor(temperature, humidity); + if (0 == tele_period) DomoticzTempHumSensor(temperature, humidity); #endif // USE_DOMOTICZ #ifdef USE_WEBSERVER } else { diff --git a/sonoff/xsns_08_htu21.ino b/sonoff/xsns_08_htu21.ino index d4d52a6e3..a36ad0db7 100644 --- a/sonoff/xsns_08_htu21.ino +++ b/sonoff/xsns_08_htu21.ino @@ -262,7 +262,7 @@ void HtuShow(boolean json) if (json) { snprintf_P(mqtt_data, sizeof(mqtt_data), JSON_SNS_TEMPHUM, mqtt_data, htu_types, temperature, humidity); #ifdef USE_DOMOTICZ - DomoticzTempHumSensor(temperature, humidity); + if (0 == tele_period) DomoticzTempHumSensor(temperature, humidity); #endif // USE_DOMOTICZ #ifdef USE_WEBSERVER } else { diff --git a/sonoff/xsns_09_bmp.ino b/sonoff/xsns_09_bmp.ino index abfe2e582..9ca0fa491 100644 --- a/sonoff/xsns_09_bmp.ino +++ b/sonoff/xsns_09_bmp.ino @@ -465,7 +465,7 @@ void BmpShow(boolean json) mqtt_data, bmp_name, temperature, (bmp_model >= 2) ? json_humidity : "", pressure, (Settings.altitude != 0) ? json_sealevel : ""); #endif // USE_BME680 #ifdef USE_DOMOTICZ - DomoticzTempHumPressureSensor(temperature, humidity, pressure); + if (0 == tele_period) DomoticzTempHumPressureSensor(temperature, humidity, pressure); #endif // USE_DOMOTICZ #ifdef USE_WEBSERVER } else { diff --git a/sonoff/xsns_10_bh1750.ino b/sonoff/xsns_10_bh1750.ino index f39833fc4..9c02f02e0 100644 --- a/sonoff/xsns_10_bh1750.ino +++ b/sonoff/xsns_10_bh1750.ino @@ -77,7 +77,7 @@ void Bh1750Show(boolean json) if (json) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"BH1750\":{\"" D_JSON_ILLUMINANCE "\":%d}"), mqtt_data, illuminance); #ifdef USE_DOMOTICZ - DomoticzSensor(DZ_ILLUMINANCE, illuminance); + if (0 == tele_period) DomoticzSensor(DZ_ILLUMINANCE, illuminance); #endif // USE_DOMOTICZ #ifdef USE_WEBSERVER } else { diff --git a/sonoff/xsns_11_veml6070.ino b/sonoff/xsns_11_veml6070.ino index aa5dba112..557f615f3 100644 --- a/sonoff/xsns_11_veml6070.ino +++ b/sonoff/xsns_11_veml6070.ino @@ -82,7 +82,7 @@ void Veml6070Show(boolean json) if (json) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"VEML6070\":{\"" D_JSON_UV_LEVEL "\":%d}"), mqtt_data, uvlevel); #ifdef USE_DOMOTICZ - DomoticzSensor(DZ_ILLUMINANCE, uvlevel); + if (0 == tele_period) DomoticzSensor(DZ_ILLUMINANCE, uvlevel); #endif // USE_DOMOTICZ #ifdef USE_WEBSERVER } else { diff --git a/sonoff/xsns_13_ina219.ino b/sonoff/xsns_13_ina219.ino index 8fb4e2f1b..50bcb1642 100644 --- a/sonoff/xsns_13_ina219.ino +++ b/sonoff/xsns_13_ina219.ino @@ -216,8 +216,10 @@ void Ina219Show(boolean json) snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"INA219\":{\"" D_JSON_VOLTAGE "\":%s,\"" D_JSON_CURRENT "\":%s,\"" D_JSON_POWERUSAGE "\":%s}"), mqtt_data, voltage, current, power); #ifdef USE_DOMOTICZ - DomoticzSensor(DZ_VOLTAGE, voltage); - DomoticzSensor(DZ_CURRENT, current); + if (0 == tele_period) { + DomoticzSensor(DZ_VOLTAGE, voltage); + DomoticzSensor(DZ_CURRENT, current); + } #endif // USE_DOMOTICZ #ifdef USE_WEBSERVER } else { diff --git a/sonoff/xsns_14_sht3x.ino b/sonoff/xsns_14_sht3x.ino index afedf31fc..76a808474 100644 --- a/sonoff/xsns_14_sht3x.ino +++ b/sonoff/xsns_14_sht3x.ino @@ -107,7 +107,7 @@ void Sht3xShow(boolean json) if (json) { snprintf_P(mqtt_data, sizeof(mqtt_data), JSON_SNS_TEMPHUM, mqtt_data, types, temperature, humidity); #ifdef USE_DOMOTICZ - if (0 == i) { // We want the same first sensor to report to Domoticz in case a read is missed + if ((0 == tele_period) && (0 == i)) { // We want the same first sensor to report to Domoticz in case a read is missed DomoticzTempHumSensor(temperature, humidity); } #endif // USE_DOMOTICZ diff --git a/sonoff/xsns_15_mhz19.ino b/sonoff/xsns_15_mhz19.ino index a5e09725c..4cbf88c9e 100644 --- a/sonoff/xsns_15_mhz19.ino +++ b/sonoff/xsns_15_mhz19.ino @@ -265,7 +265,7 @@ void MhzShow(boolean json) if (json) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"%s\":{\"" D_JSON_CO2 "\":%d,\"" D_JSON_TEMPERATURE "\":%s}"), mqtt_data, mhz_types, mhz_last_ppm, temperature); #ifdef USE_DOMOTICZ - DomoticzSensor(DZ_AIRQUALITY, mhz_last_ppm); + if (0 == tele_period) DomoticzSensor(DZ_AIRQUALITY, mhz_last_ppm); #endif // USE_DOMOTICZ #ifdef USE_WEBSERVER } else { diff --git a/sonoff/xsns_16_tsl2561.ino b/sonoff/xsns_16_tsl2561.ino index 24ae0dee6..6fe09a88f 100644 --- a/sonoff/xsns_16_tsl2561.ino +++ b/sonoff/xsns_16_tsl2561.ino @@ -71,7 +71,7 @@ void Tsl2561Show(boolean json) snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"TSL2561\":{\"" D_JSON_ILLUMINANCE "\":%u.%03u}"), mqtt_data, milliLux/1000, milliLux%1000); #ifdef USE_DOMOTICZ - DomoticzSensor(DZ_ILLUMINANCE, (milliLux+500)/1000); + if (0 == tele_period) DomoticzSensor(DZ_ILLUMINANCE, (milliLux+500)/1000); #endif // USE_DOMOTICZ #ifdef USE_WEBSERVER } else { diff --git a/sonoff/xsns_17_senseair.ino b/sonoff/xsns_17_senseair.ino index eb647b11c..3e938bdea 100644 --- a/sonoff/xsns_17_senseair.ino +++ b/sonoff/xsns_17_senseair.ino @@ -213,7 +213,7 @@ void SenseairShow(boolean json) } snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}"), mqtt_data); #ifdef USE_DOMOTICZ - DomoticzSensor(DZ_AIRQUALITY, senseair_co2); + if (0 == tele_period) DomoticzSensor(DZ_AIRQUALITY, senseair_co2); #endif // USE_DOMOTICZ #ifdef USE_WEBSERVER } else { diff --git a/sonoff/xsns_18_pms5003.ino b/sonoff/xsns_18_pms5003.ino index 18b26263e..55a3b134e 100644 --- a/sonoff/xsns_18_pms5003.ino +++ b/sonoff/xsns_18_pms5003.ino @@ -131,9 +131,11 @@ void PmsShow(boolean json) pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env, pms_data.particles_03um, pms_data.particles_05um, pms_data.particles_10um, pms_data.particles_25um, pms_data.particles_50um, pms_data.particles_100um); #ifdef USE_DOMOTICZ - DomoticzSensor(DZ_COUNT, pms_data.pm10_env); // PM1 - DomoticzSensor(DZ_VOLTAGE, pms_data.pm25_env); // PM2.5 - DomoticzSensor(DZ_CURRENT, pms_data.pm100_env); // PM10 + if (0 == tele_period) { + DomoticzSensor(DZ_COUNT, pms_data.pm10_env); // PM1 + DomoticzSensor(DZ_VOLTAGE, pms_data.pm25_env); // PM2.5 + DomoticzSensor(DZ_CURRENT, pms_data.pm100_env); // PM10 + } #endif // USE_DOMOTICZ #ifdef USE_WEBSERVER } else { diff --git a/sonoff/xsns_20_novasds.ino b/sonoff/xsns_20_novasds.ino index 8f6b591da..5c38ff0f5 100644 --- a/sonoff/xsns_20_novasds.ino +++ b/sonoff/xsns_20_novasds.ino @@ -108,8 +108,10 @@ void NovaSdsShow(boolean json) if (json) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"SDS0X1\":{\"PM2.5\":%s,\"PM10\":%s}"), mqtt_data, pm2_5, pm10); #ifdef USE_DOMOTICZ - DomoticzSensor(DZ_VOLTAGE, pm2_5); // PM2.5 - DomoticzSensor(DZ_CURRENT, pm10); // PM10 + if (0 == tele_period) { + DomoticzSensor(DZ_VOLTAGE, pm2_5); // PM2.5 + DomoticzSensor(DZ_CURRENT, pm10); // PM10 + } #endif // USE_DOMOTICZ #ifdef USE_WEBSERVER } else { diff --git a/sonoff/xsns_21_sgp30.ino b/sonoff/xsns_21_sgp30.ino index eed03ce7f..d30281155 100644 --- a/sonoff/xsns_21_sgp30.ino +++ b/sonoff/xsns_21_sgp30.ino @@ -74,7 +74,7 @@ void Sgp30Show(boolean json) if (json) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"SGP30\":{\"" D_JSON_ECO2 "\":%d,\"" D_JSON_TVOC "\":%d}"), mqtt_data, sgp.eCO2, sgp.TVOC); #ifdef USE_DOMOTICZ - DomoticzSensor(DZ_AIRQUALITY, sgp.eCO2); + if (0 == tele_period) DomoticzSensor(DZ_AIRQUALITY, sgp.eCO2); #endif // USE_DOMOTICZ } else { #ifdef USE_WEBSERVER From 18074dbce3b91cefb5ca49ba9c14a6d35c7a33be Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Wed, 11 Apr 2018 10:49:37 +0200 Subject: [PATCH 068/136] Update Czech language file (#2418, #2410) --- sonoff/language/cs-CZ.h | 96 ++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h index 0920fc2e6..0b2fed9f1 100644 --- a/sonoff/language/cs-CZ.h +++ b/sonoff/language/cs-CZ.h @@ -42,8 +42,8 @@ #define D_HOUR_MINUTE_SEPARATOR ":" #define D_MINUTE_SECOND_SEPARATOR ":" -#define D_DAY3LIST "PonÚteStřČtvPátSobNed" -#define D_MONTH3LIST "LedÚnoBřeDubKvěČerČevSrpZářŘíjLisPro" +#define D_DAY3LIST "Po Út St Čt Pá So Ne " +#define D_MONTH3LIST "LedÚnoBřeDubKvěČvnČvcSrpZářŘíjLisPro" // Non JSON decimal separator #define D_DECIMAL_SEPARATOR "," @@ -56,19 +56,19 @@ #define D_AUTO "AUTO" #define D_BLINK "Blikání" #define D_BLINKOFF "BlikáníVyp" -#define D_BOOT_COUNT "Počítadlo spuštění" +#define D_BOOT_COUNT "Počitadlo spuštění" #define D_BRIGHTLIGHT "Světlý" #define D_BUTTON "Tlačítko" #define D_BY "by" // Written by me -#define D_BYTES "Bytu" -#define D_CELSIUS "Celsia" -#define D_CO2 "Kysličníku uhličitého" +#define D_BYTES "Bytů" +#define D_CELSIUS "°C" +#define D_CO2 "CO2" #define D_CODE "kód" // Button code -#define D_COLDLIGHT "Studený" +#define D_COLDLIGHT "Studené světlo" #define D_COMMAND "Příkaz" #define D_CONNECTED "...připojeno" #define D_COUNT "Počítej" -#define D_COUNTER "Počítadlo" +#define D_COUNTER "Počitadlo" #define D_CURRENT "Proud" // As in Voltage and Current #define D_DATA "Data" #define D_DARKLIGHT "Tmavý" @@ -89,14 +89,14 @@ #define D_FALSE "Nepravda" #define D_FILE "Soubor" #define D_FREE_MEMORY "Volná paměť" -#define D_GAS "Gas" +#define D_GAS "Plyn" #define D_GATEWAY "Výchozí brána" #define D_GROUP "Skupina" #define D_HOST "Server" #define D_HOSTNAME "Název serveru" #define D_HUMIDITY "Vlhkost" #define D_ILLUMINANCE "Osvětlení" -#define D_IMMEDIATE "Mžikové" // Button immediate +#define D_IMMEDIATE "Okamžité" // Button immediate #define D_INDEX "Index" #define D_INFO "Informace" #define D_INITIALIZED "Inicializovaný" @@ -107,11 +107,11 @@ #define D_MQTT "MQTT" #define D_MULTI_PRESS "několikeré-stisknutí" #define D_NOISE "Hluk" -#define D_NONE "Není" -#define D_OFF "Vypnutý" +#define D_NONE "Žádný" +#define D_OFF "Vyp." #define D_OFFLINE "Neaktivní" #define D_OK "OK" -#define D_ON "Sepnutý" +#define D_ON "Zap." #define D_ONLINE "Aktivní" #define D_PASSWORD "Heslo" #define D_PORT "Port" @@ -119,15 +119,15 @@ #define D_POWERUSAGE "Příkon" #define D_PRESSURE "Tlak" #define D_PRESSUREATSEALEVEL "Tlak na úrovni hladiny moře" -#define D_PROGRAM_FLASH_SIZE "Velikost flash programu" +#define D_PROGRAM_FLASH_SIZE "Velikost paměti flash" #define D_PROGRAM_SIZE "Velikost programu" #define D_PROJECT "Projekt" -#define D_RECEIVED "Obdržený" +#define D_RECEIVED "Přijatý" #define D_RESTART "Restart" #define D_RESTARTING "Restartování" #define D_RESTART_REASON "Příčina restartu" -#define D_RESTORE "Načtený" -#define D_RETAINED "Uloženo" +#define D_RESTORE "Obnovit" +#define D_RETAINED "Zachováno" #define D_SAVE "Ulož" #define D_SENSOR "Sensor" #define D_SSID "SSID" @@ -137,8 +137,8 @@ #define D_SUBNET_MASK "Maska podsítě" #define D_SUBSCRIBE_TO "Přihlaš se do" #define D_SUCCESSFUL "úspěšné." -#define D_SUNRISE "Sunrise" -#define D_SUNSET "Sunset" +#define D_SUNRISE "Svítání" +#define D_SUNSET "Soumrak" #define D_TEMPERATURE "Teplota" #define D_TO "do" #define D_TOGGLE "Přepni" @@ -154,18 +154,18 @@ #define D_UV_LEVEL "úroveň UV" #define D_VERSION "Verze" #define D_VOLTAGE "Napětí" -#define D_WARMLIGHT "Ohřev" +#define D_WARMLIGHT "Teplé světlo" #define D_WEB_SERVER "Web Server" // sonoff.ino -#define D_WARNING_MINIMAL_VERSION "WARNING Tato verze nepodporuje trvalé nastavení" +#define D_WARNING_MINIMAL_VERSION "UPOZORNĚNÍ Tato verze nepodporuje trvalé nastavení" #define D_LEVEL_10 "úroveň 1-0" #define D_LEVEL_01 "úroveň 0-1" #define D_SERIAL_LOGGING_DISABLED "Logování na sériovém portu ukončeno" #define D_SYSLOG_LOGGING_REENABLED "Obnoven zápis do Syslog" #define D_SET_BAUDRATE_TO "Nastavení rychlosti přenosu na" -#define D_RECEIVED_TOPIC "Obdržený topic" +#define D_RECEIVED_TOPIC "Přijatý topic" #define D_DATA_SIZE "Velikost dat" #define D_ANALOG_INPUT "Analogový vstup" @@ -228,13 +228,13 @@ #define D_RESTORE_CONFIGURATION "Obnovení nastavení" #define D_MAIN_MENU "Hlavní menu" -#define D_MODULE_PARAMETERS "Parametry modulu" +#define D_MODULE_PARAMETERS "Nastavení modulu" #define D_MODULE_TYPE "Typ modulu" #define D_GPIO "GPIO" #define D_SERIAL_IN "Serial In" #define D_SERIAL_OUT "Serial Out" -#define D_WIFI_PARAMETERS "Parametry WiFi" +#define D_WIFI_PARAMETERS "Nastavení WiFi" #define D_SCAN_FOR_WIFI_NETWORKS "Scan sítí WiFi" #define D_SCAN_DONE "Scan dokončen" #define D_NO_NETWORKS_FOUND "Síť nebyla nalezena" @@ -250,11 +250,11 @@ #define D_AP2_SSID "AP2 SSID" #define D_AP2_PASSWORD "Heslo AP2" -#define D_MQTT_PARAMETERS "Parametry MQTT" +#define D_MQTT_PARAMETERS "Nastavení MQTT" #define D_CLIENT "Klient" #define D_FULL_TOPIC "Celý topic" -#define D_LOGGING_PARAMETERS "Volby logování" +#define D_LOGGING_PARAMETERS "Volba logování" #define D_SERIAL_LOG_LEVEL "Seriová úroveň logu" #define D_WEB_LOG_LEVEL "Webová úroveň logu" #define D_SYS_LOG_LEVEL "Systemová úroveň logu" @@ -263,7 +263,7 @@ #define D_SYSLOG_PORT "Syslog port" #define D_TELEMETRY_PERIOD "Interval telemetrie" -#define D_OTHER_PARAMETERS "Jiné parametry" +#define D_OTHER_PARAMETERS "Další nastavení" #define D_WEB_ADMIN_PASSWORD "Heslo Web administrátora" #define D_MQTT_ENABLE "MQTT aktivní" #define D_FRIENDLY_NAME "Friendly Name" @@ -346,7 +346,7 @@ #define D_3_RESPONSE_PACKETS_SENT "3 pakety odpovědi odeslány" // xdrv_05_domoticz.ino -#define D_DOMOTICZ_PARAMETERS "Parametry Domoticz" +#define D_DOMOTICZ_PARAMETERS "Nastavení Domoticz" #define D_DOMOTICZ_IDX "Idx" #define D_DOMOTICZ_KEY_IDX "Key idx" #define D_DOMOTICZ_SWITCH_IDX "Spinac idx" @@ -363,19 +363,19 @@ #define D_DOMOTICZ_UPDATE_TIMER "Aktualizace stopek" // xdrv_09_timers.ino -#define D_CONFIGURE_TIMER "Configure Timer" -#define D_TIMER_PARAMETERS "Timer parameters" -#define D_TIMER_ARM "Arm" -#define D_TIMER_TIME "Time" -#define D_TIMER_DAYS "Days" -#define D_TIMER_REPEAT "Repeat" -#define D_TIMER_OUTPUT "Output" -#define D_TIMER_POWER "Power" +#define D_CONFIGURE_TIMER "Nastavení Časovače" +#define D_TIMER_PARAMETERS "Časovač" +#define D_TIMER_ARM "Zajistit" +#define D_TIMER_TIME "Čas" +#define D_TIMER_DAYS "Dny" +#define D_TIMER_REPEAT "Opakovat" +#define D_TIMER_OUTPUT "Výstup" +#define D_TIMER_POWER "Napájení" // xdrv_03_energy.ino -#define D_ENERGY_TODAY "Energie Dnes" -#define D_ENERGY_YESTERDAY "Energie Včera" -#define D_ENERGY_TOTAL "Energie Součet" +#define D_ENERGY_TODAY "Spotřeba Dnes" +#define D_ENERGY_YESTERDAY "Spotřeba Včera" +#define D_ENERGY_TOTAL "Celková spotřeba" // xsns_05_ds18b20.ino #define D_SENSOR_BUSY "Sensor DS18x20 obsazen" @@ -384,19 +384,19 @@ // xsns_06_dht.ino #define D_TIMEOUT_WAITING_FOR "Čekání na" -#define D_START_SIGNAL_LOW "signál, startovní nízký" -#define D_START_SIGNAL_HIGH "signál, startovní vysoký" -#define D_PULSE "puls" +#define D_START_SIGNAL_LOW "nízký startovní signál" +#define D_START_SIGNAL_HIGH "vysoký startovní signál" +#define D_PULSE "impuls" #define D_CHECKSUM_FAILURE "Chybný kontrolní součet" // xsns_07_sht1x.ino -#define D_SENSOR_DID_NOT_ACK_COMMAND "Sensor neobdržel pžíkaz ACK" +#define D_SENSOR_DID_NOT_ACK_COMMAND "Sensor neobdržel příkaz ACK" #define D_SHT1X_FOUND "SHT1X nalezen" // xsns_18_pms5003.ino #define D_STANDARD_CONCENTRATION "CF-1 PM" // Standard Particle CF-1 Particle Matter #define D_ENVIRONMENTAL_CONCENTRATION "PM" // Environmetal Particle Matter -#define D_PARTICALS_BEYOND "Particals" +#define D_PARTICALS_BEYOND "částic" // sonoff_template.h #define D_SENSOR_NONE "Není" @@ -409,11 +409,11 @@ #define D_SENSOR_WS2812 "WS2812" #define D_SENSOR_IRSEND "IRsend" #define D_SENSOR_SWITCH "Spínač" // Suffix "1" -#define D_SENSOR_BUTTON "Tlačít" // Suffix "1" +#define D_SENSOR_BUTTON "Tlačítko" // Suffix "1" #define D_SENSOR_RELAY "Relé" // Suffix "1i" #define D_SENSOR_LED "Led" // Suffix "1i" #define D_SENSOR_PWM "PWM" // Suffix "1", -#define D_SENSOR_COUNTER "Počíta" // Suffix "1" +#define D_SENSOR_COUNTER "Počitadlo" // Suffix "1" #define D_SENSOR_IRRECV "IRrecv" #define D_SENSOR_MHZ_RX "MHZ Rx" #define D_SENSOR_MHZ_TX "MHZ Tx" @@ -431,7 +431,7 @@ // Units #define D_UNIT_AMPERE "A" -#define D_UNIT_HOUR "Hod" +#define D_UNIT_HOUR "hod" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" #define D_UNIT_LUX "lx" @@ -440,7 +440,7 @@ #define D_UNIT_MICROSECOND "us" #define D_UNIT_MILLIAMPERE "mA" #define D_UNIT_MILLISECOND "ms" -#define D_UNIT_MINUTE "Min" +#define D_UNIT_MINUTE "min" #define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_MILLION "ppm" From 208f64fd8f7595b41211ab089c3b789978815e74 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Wed, 11 Apr 2018 17:56:18 +0200 Subject: [PATCH 069/136] Fix empty friendlyname (#2420) --- sonoff/sonoff.ino | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index d689b66fc..4142b602f 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -558,7 +558,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) XsnsCall(FUNC_COMMAND); // if (!XsnsCall(FUNC_COMMAND)) type = NULL; } - else if ((CMND_SETOPTION == command_code) && ((index <= 23) || ((index > 31) && (index <= P_MAX_PARAM8 + 31)))) { + else if ((CMND_SETOPTION == command_code) && ((index <= 21) || ((index > 31) && (index <= P_MAX_PARAM8 + 31)))) { if (index <= 31) { ptype = 0; // SetOption0 .. 31 } else { @@ -588,7 +588,8 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) case 19: // hass_discovery case 20: // not_power_linked case 21: // no_power_on_check - case 23: // rules_enabled +// case 22: // mqtt_serial - use commands SerialSend and SerialLog +// case 23: // rules_enabled - use command Rule bitWrite(Settings.flag.data, index, payload); } if (12 == index) { // stop_flash_rotate @@ -1258,7 +1259,7 @@ void PublishStatus(uint8_t payload) if (!energy_flg && (9 == payload)) payload = 99; if ((0 == payload) || (99 == payload)) { - uint8_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : devices_present; + uint8_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : (!devices_present) ? 1 : devices_present; stemp[0] = '\0'; for (byte i = 0; i < maxfn; i++) { snprintf_P(stemp, sizeof(stemp), PSTR("%s%s\"%s\"" ), stemp, (i > 0 ? "," : ""), Settings.friendlyname[i]); From 2049730877e8c75b6ae2986d47d5fe62bdaeb1ac Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 12 Apr 2018 14:01:43 +0200 Subject: [PATCH 070/136] Fix DS18x20 temperature updates (# 5.12.0k * Change Timer parameter name from Power to Action * Fix update temperature on DS18x20 drivers (#2328) --- sonoff/_releasenotes.ino | 2 ++ sonoff/i18n.h | 2 +- sonoff/language/cs-CZ.h | 3 +- sonoff/language/de-DE.h | 3 +- sonoff/language/en-GB.h | 3 +- sonoff/language/es-AR.h | 3 +- sonoff/language/fr-FR.h | 3 +- sonoff/language/hu-HU.h | 3 +- sonoff/language/it-IT.h | 3 +- sonoff/language/nl-NL.h | 3 +- sonoff/language/pl-PL.h | 3 +- sonoff/language/pt-PT.h | 3 +- sonoff/language/ru-RU.h | 3 +- sonoff/language/zh-CN.h | 3 +- sonoff/language/zh-TW.h | 3 +- sonoff/sonoff.h | 2 +- sonoff/support.ino | 6 ++-- sonoff/user_config.h | 6 ++-- sonoff/xdrv_09_timers.ino | 51 +++++++++++++++++-------------- sonoff/xdrv_interface.ino | 5 +++ sonoff/xsns_05_ds18b20.ino | 2 +- sonoff/xsns_05_ds18x20.ino | 7 +---- sonoff/xsns_05_ds18x20_legacy.ino | 7 ++--- sonoff/xsns_interface.ino | 13 ++++++++ 24 files changed, 86 insertions(+), 56 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 4404e6fa5..72db773c9 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,6 +1,8 @@ /* 5.12.0k * Prepare for simple rules by enlarging Settings area to now 2048 bytes + * Change Timer parameter name from Power to Action * Fix freeing more code space when emulation is disabled (#1592) + * Fix update temperature on DS18x20 drivers (#2328) * Fix compile error when not defined USE_TIMERS (#2400) * * 5.12.0j diff --git a/sonoff/i18n.h b/sonoff/i18n.h index 5dea3bbe9..be258ae7e 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -361,7 +361,7 @@ #define D_JSON_TIMER_DAYS "Days" #define D_JSON_TIMER_REPEAT "Repeat" #define D_JSON_TIMER_OUTPUT "Output" - #define D_JSON_TIMER_POWER "Power" + #define D_JSON_TIMER_ACTION "Action" #define D_JSON_TIMER_NO_DEVICE "No GPIO as output configured" #define D_CMND_TIMERS "Timers" #define D_CMND_LATITUDE "Latitude" diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h index 0b2fed9f1..d8916d700 100644 --- a/sonoff/language/cs-CZ.h +++ b/sonoff/language/cs-CZ.h @@ -128,6 +128,7 @@ #define D_RESTART_REASON "Příčina restartu" #define D_RESTORE "Obnovit" #define D_RETAINED "Zachováno" +#define D_RULE "Rule" #define D_SAVE "Ulož" #define D_SENSOR "Sensor" #define D_SSID "SSID" @@ -370,7 +371,7 @@ #define D_TIMER_DAYS "Dny" #define D_TIMER_REPEAT "Opakovat" #define D_TIMER_OUTPUT "Výstup" -#define D_TIMER_POWER "Napájení" +#define D_TIMER_ACTION "Napájení" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Spotřeba Dnes" diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index 7a2a169b2..0d804c0c1 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -128,6 +128,7 @@ #define D_RESTART_REASON "Grund für Neustart" #define D_RESTORE "Wiederherstellung" #define D_RETAINED "beibehalten" +#define D_RULE "Regel" #define D_SAVE "Speichern" #define D_SENSOR "Sensor" #define D_SSID "SSID" @@ -370,7 +371,7 @@ #define D_TIMER_DAYS "Wochentage" #define D_TIMER_REPEAT "Wiederholen" #define D_TIMER_OUTPUT "Ausgang" -#define D_TIMER_POWER "Aktion" +#define D_TIMER_ACTION "Aktion" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energie heute" diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h index 26a2e9fe0..d5555b094 100644 --- a/sonoff/language/en-GB.h +++ b/sonoff/language/en-GB.h @@ -128,6 +128,7 @@ #define D_RESTART_REASON "Restart Reason" #define D_RESTORE "restore" #define D_RETAINED "retained" +#define D_RULE "Rule" #define D_SAVE "Save" #define D_SENSOR "Sensor" #define D_SSID "SSId" @@ -370,7 +371,7 @@ #define D_TIMER_DAYS "Days" #define D_TIMER_REPEAT "Repeat" #define D_TIMER_OUTPUT "Output" -#define D_TIMER_POWER "Power" +#define D_TIMER_ACTION "Action" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energy Today" diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index 14793c0d6..fb3a1164b 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -128,6 +128,7 @@ #define D_RESTART_REASON "Causa Reinicio" #define D_RESTORE "Restauración" #define D_RETAINED "Grabado" +#define D_RULE "Rule" #define D_SAVE "Grabar" #define D_SENSOR "Sensor" #define D_SSID "SSId" @@ -370,7 +371,7 @@ #define D_TIMER_DAYS "Días" #define D_TIMER_REPEAT "Repetir" #define D_TIMER_OUTPUT "Salida" -#define D_TIMER_POWER "Estado" +#define D_TIMER_ACTION "Estado" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energía Hoy" diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h index d0aff6c77..2d08fe03c 100644 --- a/sonoff/language/fr-FR.h +++ b/sonoff/language/fr-FR.h @@ -128,6 +128,7 @@ #define D_RESTART_REASON "Raison redémarrage" #define D_RESTORE "restorer" #define D_RETAINED "retenu" +#define D_RULE "Rule" #define D_SAVE "Enregister" #define D_SENSOR "Capteur" #define D_SSID "SSID" @@ -370,7 +371,7 @@ #define D_TIMER_DAYS "Days" #define D_TIMER_REPEAT "Repeat" #define D_TIMER_OUTPUT "Output" -#define D_TIMER_POWER "Power" +#define D_TIMER_ACTION "Action" // xsns_03_energy.ino #define D_ENERGY_TODAY "Energie aujourd'hui" diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h index 455e0ba1f..2e2080a84 100644 --- a/sonoff/language/hu-HU.h +++ b/sonoff/language/hu-HU.h @@ -128,6 +128,7 @@ #define D_RESTART_REASON "Újraindítás oka:" #define D_RESTORE "Visszaállítás" #define D_RETAINED "mentve" +#define D_RULE "Rule" #define D_SAVE "Mentés" #define D_SENSOR "Szenzor" #define D_SSID "SSId" @@ -370,7 +371,7 @@ #define D_TIMER_DAYS "Days" #define D_TIMER_REPEAT "Repeat" #define D_TIMER_OUTPUT "Output" -#define D_TIMER_POWER "Power" +#define D_TIMER_ACTION "Action" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Mai Energia" diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index cab2e7892..ad3185c49 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -128,6 +128,7 @@ #define D_RESTART_REASON "Causa Riavvio" #define D_RESTORE "ripristino" #define D_RETAINED "salvato" +#define D_RULE "Rule" #define D_SAVE "Salva" #define D_SENSOR "Sensore" #define D_SSID "SSId" @@ -370,7 +371,7 @@ #define D_TIMER_DAYS "Days" #define D_TIMER_REPEAT "Repeat" #define D_TIMER_OUTPUT "Output" -#define D_TIMER_POWER "Power" +#define D_TIMER_ACTION "Action" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energia Oggi" diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h index 802255b3a..bf030e88c 100644 --- a/sonoff/language/nl-NL.h +++ b/sonoff/language/nl-NL.h @@ -128,6 +128,7 @@ #define D_RESTART_REASON "Reden herstart" #define D_RESTORE "herstellen" #define D_RETAINED "retained" +#define D_RULE "Regel" #define D_SAVE "Opslaan" #define D_SENSOR "Sensor" #define D_SSID "SSId" @@ -370,7 +371,7 @@ #define D_TIMER_DAYS "Dagen" #define D_TIMER_REPEAT "Herhaal" #define D_TIMER_OUTPUT "Uitgang" -#define D_TIMER_POWER "Actie" +#define D_TIMER_ACTION "Actie" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Verbruik vandaag" diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h index 3ce638de6..e143424c7 100644 --- a/sonoff/language/pl-PL.h +++ b/sonoff/language/pl-PL.h @@ -128,6 +128,7 @@ #define D_RESTART_REASON "Przyczyna restartu" #define D_RESTORE "Przywracanie" #define D_RETAINED "Zachowane" +#define D_RULE "Rule" #define D_SAVE "Zapisz" #define D_SENSOR "Czujnik" #define D_SSID "SSID" @@ -370,7 +371,7 @@ #define D_TIMER_DAYS "Days" #define D_TIMER_REPEAT "Repeat" #define D_TIMER_OUTPUT "Output" -#define D_TIMER_POWER "Power" +#define D_TIMER_ACTION "Action" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energia Dzisiaj" diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h index cae2832db..765bb1e19 100644 --- a/sonoff/language/pt-PT.h +++ b/sonoff/language/pt-PT.h @@ -128,6 +128,7 @@ #define D_RESTART_REASON "Razão do reinicio" #define D_RESTORE "Restauro" #define D_RETAINED "Manter" +#define D_RULE "Rule" #define D_SAVE "Salvar" #define D_SENSOR "Sensor" #define D_SSID "SSId" @@ -370,7 +371,7 @@ #define D_TIMER_DAYS "Days" #define D_TIMER_REPEAT "Repeat" #define D_TIMER_OUTPUT "Output" -#define D_TIMER_POWER "Power" +#define D_TIMER_ACTION "Action" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Consumo energético de hoje" diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h index 0fa85d5a9..152d081c3 100644 --- a/sonoff/language/ru-RU.h +++ b/sonoff/language/ru-RU.h @@ -128,6 +128,7 @@ #define D_RESTART_REASON "Причина перезагрузки" #define D_RESTORE "восстановление" #define D_RETAINED "нераспред." +#define D_RULE "Rule" #define D_SAVE "Сохранить" #define D_SENSOR "Датчик" #define D_SSID "SSId" @@ -370,7 +371,7 @@ #define D_TIMER_DAYS "Days" #define D_TIMER_REPEAT "Repeat" #define D_TIMER_OUTPUT "Output" -#define D_TIMER_POWER "Power" +#define D_TIMER_ACTION "Action" // xdrv_03_energy.ino #define D_ENERGY_TODAY "Энергия Сегодня" diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h index 0f1a97347..dd965887c 100644 --- a/sonoff/language/zh-CN.h +++ b/sonoff/language/zh-CN.h @@ -128,6 +128,7 @@ #define D_RESTART_REASON "重启原因" #define D_RESTORE "恢复" #define D_RETAINED "已保留" +#define D_RULE "Rule" #define D_SAVE "保存" #define D_SENSOR "传感器" #define D_SSID "名称" @@ -370,7 +371,7 @@ #define D_TIMER_DAYS "Days" #define D_TIMER_REPEAT "Repeat" #define D_TIMER_OUTPUT "Output" -#define D_TIMER_POWER "Power" +#define D_TIMER_ACTION "Action" // xdrv_03_energy.ino #define D_ENERGY_TODAY "今日用电量" diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h index f0ae1d59e..a954d4669 100644 --- a/sonoff/language/zh-TW.h +++ b/sonoff/language/zh-TW.h @@ -128,6 +128,7 @@ #define D_RESTART_REASON "重啟原因" #define D_RESTORE "恢覆" #define D_RETAINED "已保留" +#define D_RULE "Rule" #define D_SAVE "存檔" #define D_SENSOR "感測器" #define D_SSID "名稱" @@ -370,7 +371,7 @@ #define D_TIMER_DAYS "Days" #define D_TIMER_REPEAT "Repeat" #define D_TIMER_OUTPUT "Output" -#define D_TIMER_POWER "Power" +#define D_TIMER_ACTION "Action" // xdrv_03_energy.ino #define D_ENERGY_TODAY "今日用電量" diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index 279c1652d..0cdc38cc8 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -164,7 +164,7 @@ enum LichtSubtypes {LST_NONE, LST_SINGLE, LST_COLDWARM, LST_RGB, LST_RGBW, LST_R enum LichtSchemes {LS_POWER, LS_WAKEUP, LS_CYCLEUP, LS_CYCLEDN, LS_RANDOM, LS_MAX}; enum XsnsFunctions {FUNC_INIT, FUNC_LOOP, FUNC_EVERY_50_MSECOND, FUNC_EVERY_SECOND, FUNC_PREP_BEFORE_TELEPERIOD, FUNC_JSON_APPEND, FUNC_WEB_APPEND, FUNC_SAVE_BEFORE_RESTART, - FUNC_COMMAND, FUNC_NTP_INIT, FUNC_NTP_SET, + FUNC_COMMAND, FUNC_NTP_INIT, FUNC_NTP_SET, FUNC_CLOCK_TIMER, FUNC_MQTT_SUBSCRIBE, FUNC_MQTT_INIT, FUNC_MQTT_DATA, FUNC_MQTT_DISCONNECTED, FUNC_MQTT_CONNECTED, FUNC_SET_POWER, FUNC_SHOW_SENSOR}; diff --git a/sonoff/support.ino b/sonoff/support.ino index 591a4c571..2a2ea7625 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -192,7 +192,7 @@ size_t strchrspn(const char *str1, int character) return ret; } -double AtoD(char *str) +double CharToDouble(char *str) { // simple ascii to double, because atof or strtod are too large char strbuf[24]; @@ -1377,8 +1377,8 @@ void RtcSecond() GetTime(0).c_str(), GetTime(2).c_str(), GetTime(3).c_str()); AddLog(LOG_LEVEL_DEBUG); - if (local_time < 1451602800) { - XdrvCall(FUNC_NTP_SET); + if (local_time < 1451602800) { // 2016-01-01 + XdrvCall(FUNC_NTP_INIT); } else { XdrvCall(FUNC_NTP_SET); } diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 6fe6fe616..ffb41aff5 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -68,9 +68,9 @@ // -- Syslog -------------------------------------- #define SYS_LOG_HOST "" // [LogHost] (Linux) syslog host #define SYS_LOG_PORT 514 // [LogPort] default syslog UDP port -#define SYS_LOG_LEVEL LOG_LEVEL_NONE // [SysLog] LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE -#define SERIAL_LOG_LEVEL LOG_LEVEL_INFO // [SerialLog] LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE -#define WEB_LOG_LEVEL LOG_LEVEL_INFO // [WebLog] LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE +#define SYS_LOG_LEVEL LOG_LEVEL_NONE // [SysLog] (LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE) +#define SERIAL_LOG_LEVEL LOG_LEVEL_INFO // [SerialLog] (LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE) +#define WEB_LOG_LEVEL LOG_LEVEL_INFO // [WebLog] (LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE) // -- Ota ----------------------------------------- #define OTA_URL "http://sonoff.maddox.co.uk/tasmota/sonoff.ino.bin" // [OtaUrl] diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino index 0975c8c64..080c33ec9 100644 --- a/sonoff/xdrv_09_timers.ino +++ b/sonoff/xdrv_09_timers.ino @@ -22,15 +22,15 @@ * Timers * * Arm a timer using one or all of the following JSON values: - * {"Arm":1,"Mode":0,"Time":"09:23","Days":"--TW--S","Repeat":1,"Device":1,"Power":1} + * {"Arm":1,"Mode":0,"Time":"09:23","Days":"--TW--S","Repeat":1,"Output":1,"Action":1} * - * Arm 0 = Off, 1 = On - * Mode 0 = Schedule, 1 = Sunrise, 2 = Sunset - * Time hours:minutes - * Days 7 day character mask starting with Sunday (SMTWTFS). 0 or - = Off, any other value = On - * Repeat 0 = Execute once, 1 = Execute again - * Device 1..16 - * Power 0 = Off, 1 = On, 2 = Toggle, 3 = Blink + * Arm 0 = Off, 1 = On + * Mode 0 = Schedule, 1 = Sunrise, 2 = Sunset + * Time hours:minutes + * Days 7 day character mask starting with Sunday (SMTWTFS). 0 or - = Off, any other value = On + * Repeat 0 = Execute once, 1 = Execute again + * Output 1..16 + * Action 0 = Off, 1 = On, 2 = Toggle, 3 = Blink or Rule if USE_RULES enabled * \*********************************************************************************************/ @@ -45,7 +45,6 @@ const char kTimerCommands[] PROGMEM = D_CMND_TIMER "|" D_CMND_TIMERS #endif ; -uint16_t timer_fired = 0; uint16_t timer_last_minute = 60; #ifdef USE_SUNRISE @@ -206,7 +205,7 @@ uint16_t GetSunMinutes(byte dawn) void TimerEverySecond() { if (RtcTime.valid) { - if (RtcTime.minute != timer_last_minute) { // Execute every minute + if (RtcTime.minute != timer_last_minute) { // Execute every minute only once timer_last_minute = RtcTime.minute; uint16_t time = (RtcTime.hour *60) + RtcTime.minute; uint8_t days = 1 << (RtcTime.day_of_week -1); @@ -221,13 +220,16 @@ void TimerEverySecond() #endif if (Settings.timer[i].arm) { if (time == set_time) { - if (!bitRead(timer_fired, i) && (Settings.timer[i].days & days)) { - bitSet(timer_fired, i); + if (Settings.timer[i].days & days) { Settings.timer[i].arm = Settings.timer[i].repeat; - ExecuteCommandPower(Settings.timer[i].device +1, Settings.timer[i].power); +#ifdef USE_RULES + if (3 == Settings.timer[i].power) { // Blink becomes Rule disregarding device and allowing use of Backlog commands + XdrvMailbox.index = i; + XdrvCall(FUNC_CLOCK_TIMER); + } else +#endif + ExecuteCommandPower(Settings.timer[i].device +1, Settings.timer[i].power); } - } else { - bitClear(timer_fired, i); } } } @@ -245,10 +247,10 @@ void PrepShowTimer(uint8_t index) snprintf(days, sizeof(days), "%s%d", days, ((Settings.timer[index].days & mask) > 0)); } #ifdef USE_SUNRISE - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_MODE "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_OUTPUT "\":%d,\"" D_JSON_TIMER_POWER "\":%d}"), + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_MODE "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_OUTPUT "\":%d,\"" D_JSON_TIMER_ACTION "\":%d}"), mqtt_data, index +1, Settings.timer[index].arm, Settings.timer[index].mode, Settings.timer[index].time / 60, Settings.timer[index].time % 60, days, Settings.timer[index].repeat, Settings.timer[index].device +1, Settings.timer[index].power); #else - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_OUTPUT "\":%d,\"" D_JSON_TIMER_POWER "\":%d}"), + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_OUTPUT "\":%d,\"" D_JSON_TIMER_ACTION "\":%d}"), mqtt_data, index +1, Settings.timer[index].arm, Settings.timer[index].time / 60, Settings.timer[index].time % 60, days, Settings.timer[index].repeat, Settings.timer[index].device +1, Settings.timer[index].power); #endif // USE_SUNRISE } @@ -259,7 +261,7 @@ void PrepShowTimer(uint8_t index) boolean TimerCommand() { - char command [CMDSZ]; + char command[CMDSZ]; char dataBufUc[XdrvMailbox.data_len]; boolean serviced = true; uint8_t index = XdrvMailbox.index; @@ -335,10 +337,9 @@ boolean TimerCommand() uint8_t device = ((uint8_t)root[parm_uc] -1) & 0x0F; Settings.timer[index].device = (device < devices_present) ? device : devices_present -1; } - if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_POWER))].success()) { + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_ACTION))].success()) { Settings.timer[index].power = (uint8_t)root[parm_uc] & 0x03; } - if (Settings.timer[index].arm) bitClear(timer_fired, index); index++; } @@ -376,7 +377,7 @@ boolean TimerCommand() #ifdef USE_SUNRISE else if (CMND_LONGITUDE == command_code) { if (XdrvMailbox.data_len) { - Settings.longitude = (int)(AtoD(XdrvMailbox.data) *1000000); + Settings.longitude = (int)(CharToDouble(XdrvMailbox.data) *1000000); } char lbuff[32]; dtostrfd(((double)Settings.longitude) /1000000, 6, lbuff); @@ -384,7 +385,7 @@ boolean TimerCommand() } else if (CMND_LATITUDE == command_code) { if (XdrvMailbox.data_len) { - Settings.latitude = (int)(AtoD(XdrvMailbox.data) *1000000); + Settings.latitude = (int)(CharToDouble(XdrvMailbox.data) *1000000); } char lbuff[32]; dtostrfd(((double)Settings.latitude) /1000000, 6, lbuff); @@ -486,11 +487,15 @@ const char HTTP_FORM_TIMER1[] PROGMEM = "' hidden>



" "
" "" D_TIMER_OUTPUT "  " - "" D_TIMER_POWER " " "" "" "" +#ifdef USE_RULES + "" +#else "" +#endif "" "

" "
" diff --git a/sonoff/xdrv_interface.ino b/sonoff/xdrv_interface.ino index 09f056ece..99a1600e8 100644 --- a/sonoff/xdrv_interface.ino +++ b/sonoff/xdrv_interface.ino @@ -182,12 +182,17 @@ boolean XdrvMqttData(char *topicBuf, uint16_t stopicBuf, char *dataBuf, uint16_t * FUNC_LOOP * FUNC_MQTT_SUBSCRIBE * FUNC_MQTT_INIT + * FUNC_MQTT_DISCONNECTED + * FUNC_MQTT_CONNECTED * return FUNC_MQTT_DATA * return FUNC_COMMAND * FUNC_SET_POWER * FUNC_SHOW_SENSOR * FUNC_EVERY_SECOND * FUNC_EVERY_50_MSECOND + * FUNC_NTP_INIT + * FUNC_NTP_SET + * FUNC_CLOCK_TIMER \*********************************************************************************************/ boolean XdrvCall(byte Function) diff --git a/sonoff/xsns_05_ds18b20.ino b/sonoff/xsns_05_ds18b20.ino index 6faeeed18..753fafeca 100644 --- a/sonoff/xsns_05_ds18b20.ino +++ b/sonoff/xsns_05_ds18b20.ino @@ -205,6 +205,7 @@ void Ds18b20Show(boolean json) #endif // USE_WEBSERVER } } + Ds18x20Convert(); // Start conversion, takes up to one second } /*********************************************************************************************\ @@ -231,7 +232,6 @@ boolean Xsns05(byte function) #ifdef USE_WEBSERVER case FUNC_WEB_APPEND: Ds18b20Show(0); - Ds18x20Convert(); // Start conversion, takes up to one second break; #endif // USE_WEBSERVER } diff --git a/sonoff/xsns_05_ds18x20.ino b/sonoff/xsns_05_ds18x20.ino index 4f17e94cd..b99c71298 100644 --- a/sonoff/xsns_05_ds18x20.ino +++ b/sonoff/xsns_05_ds18x20.ino @@ -392,6 +392,7 @@ void Ds18x20Show(boolean json) } } } + Ds18x20Convert(); // Start conversion, takes up to one second } /*********************************************************************************************\ @@ -409,11 +410,6 @@ boolean Xsns05(byte function) case FUNC_INIT: Ds18x20Init(); break; -// case FUNC_EVERY_SECOND: -// if ((Settings.tele_period - tele_period) &3 == 3) { -// Ds18x20Convert(); // Start conversion every four seconds, takes up to one second -// } -// break; case FUNC_PREP_BEFORE_TELEPERIOD: Ds18x20Convert(); // Start conversion, takes up to one second break; @@ -423,7 +419,6 @@ boolean Xsns05(byte function) #ifdef USE_WEBSERVER case FUNC_WEB_APPEND: Ds18x20Show(0); - Ds18x20Convert(); // Start conversion, takes up to one second break; #endif // USE_WEBSERVER } diff --git a/sonoff/xsns_05_ds18x20_legacy.ino b/sonoff/xsns_05_ds18x20_legacy.ino index bd78ff424..885ce7540 100644 --- a/sonoff/xsns_05_ds18x20_legacy.ino +++ b/sonoff/xsns_05_ds18x20_legacy.ino @@ -204,12 +204,9 @@ void Ds18x20Show(boolean json) if (dsxflg) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}"), mqtt_data); } -#ifdef USE_WEBSERVER - } else { - Ds18x20Search(); // Check for changes in sensors number - Ds18x20Convert(); // Start Conversion, takes up to one second -#endif // USE_WEBSERVER } + Ds18x20Search(); // Check for changes in sensors number + Ds18x20Convert(); // Start Conversion, takes up to one second } /*********************************************************************************************\ diff --git a/sonoff/xsns_interface.ino b/sonoff/xsns_interface.ino index 20488dc92..19cd86bb3 100644 --- a/sonoff/xsns_interface.ino +++ b/sonoff/xsns_interface.ino @@ -186,6 +186,7 @@ boolean (* const xsns_func_ptr[])(byte) PROGMEM = { // Sensor Function Pointers }; const uint8_t xsns_present = sizeof(xsns_func_ptr) / sizeof(xsns_func_ptr[0]); // Number of External Sensors found +uint8_t xsns_index = 0; /*********************************************************************************************\ * Function call to all xsns @@ -200,6 +201,18 @@ const uint8_t xsns_present = sizeof(xsns_func_ptr) / sizeof(xsns_func_ptr[0]); * FUNC_EVERY_50_MSECOND \*********************************************************************************************/ +uint8_t XsnsPresent() +{ + return xsns_present; +} + +boolean XsnsNextCall(byte Function) +{ + xsns_index++; + if (xsns_index == xsns_present) xsns_index = 0; + return xsns_func_ptr[xsns_index](Function); +} + boolean XsnsCall(byte Function) { boolean result = false; From ed2e8d893476142f8bfbc382b48066741ff092a5 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 13 Apr 2018 10:33:17 +0200 Subject: [PATCH 071/136] Add PWM4/5 to H801 template (#1503) --- sonoff/sonoff_template.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h index d8498d687..cbb197abb 100644 --- a/sonoff/sonoff_template.h +++ b/sonoff/sonoff_template.h @@ -498,12 +498,12 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_LED1, // GPIO01 Green LED GPIO_TXD, // GPIO02 RX - Pin next to TX on the PCB GPIO_RXD, // GPIO03 TX - Pin next to GND on the PCB - GPIO_USER, // GPIO04 W2 - PWM5 + GPIO_PWM5, // GPIO04 W2 - PWM5 GPIO_LED2_INV, // GPIO05 Red LED 0, 0, 0, 0, 0, 0, // Flash connection GPIO_PWM3, // GPIO12 Blue GPIO_PWM2, // GPIO13 Green - GPIO_USER, // GPIO14 W1 - PWM4 + GPIO_PWM4, // GPIO14 W1 - PWM4 GPIO_PWM1, // GPIO15 Red 0, 0 }, From 08456e55e6eeb34578c153c84acb90036899e8d7 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 13 Apr 2018 17:42:11 +0200 Subject: [PATCH 072/136] v5.12.0k - Add rules 5.12.0k * Add commands Publish, Rule, RuleTimer and Event. See Wiki about Rule restriction, usage and examples --- sonoff/_releasenotes.ino | 3 +- sonoff/i18n.h | 47 ++-- sonoff/sonoff.h | 4 +- sonoff/sonoff.ino | 21 +- sonoff/support.ino | 8 +- sonoff/user_config.h | 3 + sonoff/xdrv_00_mqtt.ino | 41 +++- sonoff/xdrv_05_domoticz.ino | 2 +- sonoff/xdrv_09_timers.ino | 6 +- sonoff/xdrv_10_rules.ino | 443 ++++++++++++++++++++++++++++++++++++ sonoff/xdrv_interface.ino | 5 - 11 files changed, 528 insertions(+), 55 deletions(-) create mode 100644 sonoff/xdrv_10_rules.ino diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 72db773c9..c441078ef 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,6 +1,7 @@ /* 5.12.0k - * Prepare for simple rules by enlarging Settings area to now 2048 bytes + * Prepare for simple rules of up to 255 characters by enlarging Settings area to now 2048 bytes * Change Timer parameter name from Power to Action + * Add commands Publish, Rule, RuleTimer and Event. See Wiki about Rule restriction, usage and examples * Fix freeing more code space when emulation is disabled (#1592) * Fix update temperature on DS18x20 drivers (#2328) * Fix compile error when not defined USE_TIMERS (#2400) diff --git a/sonoff/i18n.h b/sonoff/i18n.h index be258ae7e..ce984f1e4 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -138,28 +138,6 @@ #define D_RSLT_WARNING "WARNING" // Commands sonoff.ino -#define D_CMND_MQTTHOST "MqttHost" -#define D_CMND_MQTTPORT "MqttPort" -#define D_CMND_MQTTRETRY "MqttRetry" -#define D_CMND_STATETEXT "StateText" -#define D_CMND_MQTTFINGERPRINT "MqttFingerprint" -#define D_CMND_MQTTCLIENT "MqttClient" -#define D_CMND_MQTTUSER "MqttUser" -#define D_CMND_MQTTPASSWORD "MqttPassword" -#define D_CMND_FULLTOPIC "FullTopic" -#define D_CMND_PREFIX "Prefix" - #define PRFX_MAX_STRING_LENGTH 5 - #define D_CMND "cmnd" - #define D_STAT "stat" - #define D_TELE "tele" -#define D_CMND_GROUPTOPIC "GroupTopic" -#define D_CMND_TOPIC "Topic" -#define D_CMND_BUTTONTOPIC "ButtonTopic" -#define D_CMND_SWITCHTOPIC "SwitchTopic" -#define D_CMND_BUTTONRETAIN "ButtonRetain" -#define D_CMND_SWITCHRETAIN "SwitchRetain" -#define D_CMND_POWERRETAIN "PowerRetain" -#define D_CMND_SENSORRETAIN "SensorRetain" #define D_CMND_BACKLOG "Backlog" #define D_CMND_DELAY "Delay" #define D_CMND_STATUS "Status" @@ -251,6 +229,31 @@ #define D_CMND_BAUDRATE "Baudrate" #define D_CMND_EXCEPTION "Exception" +// Commands xdrv_00_mqtt.ino +#define D_CMND_MQTTHOST "MqttHost" +#define D_CMND_MQTTPORT "MqttPort" +#define D_CMND_MQTTRETRY "MqttRetry" +#define D_CMND_STATETEXT "StateText" +#define D_CMND_MQTTFINGERPRINT "MqttFingerprint" +#define D_CMND_MQTTCLIENT "MqttClient" +#define D_CMND_MQTTUSER "MqttUser" +#define D_CMND_MQTTPASSWORD "MqttPassword" +#define D_CMND_FULLTOPIC "FullTopic" +#define D_CMND_PREFIX "Prefix" + #define PRFX_MAX_STRING_LENGTH 5 + #define D_CMND "cmnd" + #define D_STAT "stat" + #define D_TELE "tele" +#define D_CMND_GROUPTOPIC "GroupTopic" +#define D_CMND_TOPIC "Topic" +#define D_CMND_BUTTONTOPIC "ButtonTopic" +#define D_CMND_SWITCHTOPIC "SwitchTopic" +#define D_CMND_BUTTONRETAIN "ButtonRetain" +#define D_CMND_SWITCHRETAIN "SwitchRetain" +#define D_CMND_POWERRETAIN "PowerRetain" +#define D_CMND_SENSORRETAIN "SensorRetain" +#define D_CMND_PUBLISH "Publish" + // Commands xdrv_01_light.ino #define D_CMND_CHANNEL "Channel" #define D_CMND_COLOR "Color" diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index 0cdc38cc8..c0a4e9a00 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -164,9 +164,7 @@ enum LichtSubtypes {LST_NONE, LST_SINGLE, LST_COLDWARM, LST_RGB, LST_RGBW, LST_R enum LichtSchemes {LS_POWER, LS_WAKEUP, LS_CYCLEUP, LS_CYCLEDN, LS_RANDOM, LS_MAX}; enum XsnsFunctions {FUNC_INIT, FUNC_LOOP, FUNC_EVERY_50_MSECOND, FUNC_EVERY_SECOND, FUNC_PREP_BEFORE_TELEPERIOD, FUNC_JSON_APPEND, FUNC_WEB_APPEND, FUNC_SAVE_BEFORE_RESTART, - FUNC_COMMAND, FUNC_NTP_INIT, FUNC_NTP_SET, FUNC_CLOCK_TIMER, - FUNC_MQTT_SUBSCRIBE, FUNC_MQTT_INIT, FUNC_MQTT_DATA, FUNC_MQTT_DISCONNECTED, FUNC_MQTT_CONNECTED, - FUNC_SET_POWER, FUNC_SHOW_SENSOR}; + FUNC_COMMAND, FUNC_MQTT_SUBSCRIBE, FUNC_MQTT_INIT, FUNC_MQTT_DATA, FUNC_SET_POWER, FUNC_SHOW_SENSOR}; const uint8_t kDefaultRfCode[9] PROGMEM = { 0x21, 0x16, 0x01, 0x0E, 0x03, 0x48, 0x2E, 0x1A, 0x00 }; diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 4142b602f..27dd3b9e0 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -1101,7 +1101,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) /********************************************************************************************/ -boolean send_button_power(byte key, byte device, byte state) +boolean SendKey(byte key, byte device, byte state) { // key 0 = button_topic // key 1 = switch_topic @@ -1130,13 +1130,18 @@ boolean send_button_power(byte key, byte device, byte state) snprintf_P(mqtt_data, sizeof(mqtt_data), GetStateText(state)); } #ifdef USE_DOMOTICZ - if (!(DomoticzButton(key, device, state, strlen(mqtt_data)))) { + if (!(DomoticzSendKey(key, device, state, strlen(mqtt_data)))) { MqttPublishDirect(stopic, (key) ? Settings.flag.mqtt_switch_retain : Settings.flag.mqtt_button_retain); } #else MqttPublishDirect(stopic, (key) ? Settings.flag.mqtt_switch_retain : Settings.flag.mqtt_button_retain); #endif // USE_DOMOTICZ result = true; +#ifdef USE_RULES + } else { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"%s%d\":{\"State\":%d}}"), (key) ? "Switch" : "Button", device, state); + result = RulesProcess(); +#endif // USE_RULES } return result; } @@ -1527,7 +1532,7 @@ void ButtonHandler() if (!holdbutton[button_index]) button_pressed = true; // Do not allow within 1 second } if (button_pressed) { - if (!send_button_power(0, button_index +1, POWER_TOGGLE)) { // Execute Toggle command via MQTT if ButtonTopic is set + if (!SendKey(0, button_index +1, POWER_TOGGLE)) { // Execute Toggle command via MQTT if ButtonTopic is set ExecuteCommandPower(button_index +1, POWER_TOGGLE); // Execute Toggle command internally } } @@ -1536,7 +1541,7 @@ void ButtonHandler() if (Settings.flag.button_single) { // Allow only single button press for immediate action snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_APPLICATION D_BUTTON "%d " D_IMMEDIATE), button_index +1); AddLog(LOG_LEVEL_DEBUG); - if (!send_button_power(0, button_index +1, POWER_TOGGLE)) { // Execute Toggle command via MQTT if ButtonTopic is set + if (!SendKey(0, button_index +1, POWER_TOGGLE)) { // Execute Toggle command via MQTT if ButtonTopic is set ExecuteCommandPower(button_index +1, POWER_TOGGLE); // Execute Toggle command internally } } else { @@ -1562,7 +1567,7 @@ void ButtonHandler() if (Settings.flag.button_restrict) { // Button restriction if (holdbutton[button_index] == Settings.param[P_HOLD_TIME] * (STATES / 10)) { // Button hold multipress[button_index] = 0; - send_button_power(0, button_index +1, 3); // Execute Hold command via MQTT if ButtonTopic is set + SendKey(0, button_index +1, 3); // Execute Hold command via MQTT if ButtonTopic is set } } else { if (holdbutton[button_index] == (Settings.param[P_HOLD_TIME] * (STATES / 10)) * hold_time_extent) { // Button held for factor times longer @@ -1588,7 +1593,7 @@ void ButtonHandler() multipress[button_index] = 1; } } - if (single_press && send_button_power(0, button_index + multipress[button_index], POWER_TOGGLE)) { // Execute Toggle command via MQTT if ButtonTopic is set + if (single_press && SendKey(0, button_index + multipress[button_index], POWER_TOGGLE)) { // Execute Toggle command via MQTT if ButtonTopic is set // Success } else { if (multipress[button_index] < 3) { // Single or Double press @@ -1629,7 +1634,7 @@ void SwitchHandler() if (holdwallswitch[i]) { holdwallswitch[i]--; if (0 == holdwallswitch[i]) { - send_button_power(1, i +1, 3); // Execute command via MQTT + SendKey(1, i +1, 3); // Execute command via MQTT } } @@ -1682,7 +1687,7 @@ void SwitchHandler() } if (switchflag < 3) { - if (!send_button_power(1, i +1, switchflag)) { // Execute command via MQTT + if (!SendKey(1, i +1, switchflag)) { // Execute command via MQTT ExecuteCommandPower(i +1, switchflag); // Execute command internally (if i < devices_present) } } diff --git a/sonoff/support.ino b/sonoff/support.ino index 2a2ea7625..6b17f0b75 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -1376,12 +1376,14 @@ void RtcSecond() snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_APPLICATION "(" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"), GetTime(0).c_str(), GetTime(2).c_str(), GetTime(3).c_str()); AddLog(LOG_LEVEL_DEBUG); - +#ifdef USE_RULES if (local_time < 1451602800) { // 2016-01-01 - XdrvCall(FUNC_NTP_INIT); + strncpy_P(mqtt_data, PSTR("{\"Time\":{\"Initialized\":1}}"), sizeof(mqtt_data)); } else { - XdrvCall(FUNC_NTP_SET); + strncpy_P(mqtt_data, PSTR("{\"Time\":{\"Set\":1}}"), sizeof(mqtt_data)); } + RulesProcess(); +#endif // USE_RULES } else { ntp_sync_minute++; // Try again in next minute } diff --git a/sonoff/user_config.h b/sonoff/user_config.h index ffb41aff5..cf1d29985 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -224,6 +224,9 @@ #define USE_TIMERS_WEB // Add timer webpage support (+4k5 code) #define USE_SUNRISE // Add support for Sunrise and sunset tools (+16k) +// -- Rules --------------------------------------- +#define USE_RULES // Add support for rules (+4k4 code) + // -- Internal Analog input ----------------------- #define USE_ADC_VCC // Display Vcc in Power status. Disable for use as Analog input on selected devices diff --git a/sonoff/xdrv_00_mqtt.ino b/sonoff/xdrv_00_mqtt.ino index ca74724c3..fa478b7a7 100644 --- a/sonoff/xdrv_00_mqtt.ino +++ b/sonoff/xdrv_00_mqtt.ino @@ -42,11 +42,11 @@ enum MqttCommands { CMND_MQTTHOST, CMND_MQTTPORT, CMND_MQTTRETRY, CMND_STATETEXT, CMND_MQTTFINGERPRINT, CMND_MQTTCLIENT, - CMND_MQTTUSER, CMND_MQTTPASSWORD, CMND_FULLTOPIC, CMND_PREFIX, CMND_GROUPTOPIC, CMND_TOPIC, + CMND_MQTTUSER, CMND_MQTTPASSWORD, CMND_FULLTOPIC, CMND_PREFIX, CMND_GROUPTOPIC, CMND_TOPIC, CMND_PUBLISH, CMND_BUTTONTOPIC, CMND_SWITCHTOPIC, CMND_BUTTONRETAIN, CMND_SWITCHRETAIN, CMND_POWERRETAIN, CMND_SENSORRETAIN }; const char kMqttCommands[] PROGMEM = D_CMND_MQTTHOST "|" D_CMND_MQTTPORT "|" D_CMND_MQTTRETRY "|" D_CMND_STATETEXT "|" D_CMND_MQTTFINGERPRINT "|" D_CMND_MQTTCLIENT "|" - D_CMND_MQTTUSER "|" D_CMND_MQTTPASSWORD "|" D_CMND_FULLTOPIC "|" D_CMND_PREFIX "|" D_CMND_GROUPTOPIC "|" D_CMND_TOPIC "|" + D_CMND_MQTTUSER "|" D_CMND_MQTTPASSWORD "|" D_CMND_FULLTOPIC "|" D_CMND_PREFIX "|" D_CMND_GROUPTOPIC "|" D_CMND_TOPIC "|" D_CMND_PUBLISH "|" D_CMND_BUTTONTOPIC "|" D_CMND_SWITCHTOPIC "|" D_CMND_BUTTONRETAIN "|" D_CMND_SWITCHRETAIN "|" D_CMND_POWERRETAIN "|" D_CMND_SENSORRETAIN ; uint8_t mqtt_retry_counter = 1; // MQTT connection retry counter @@ -316,8 +316,10 @@ void MqttDisconnected(int state) snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MQTT D_CONNECT_FAILED_TO " %s:%d, rc %d. " D_RETRY_IN " %d " D_UNIT_SECOND), Settings.mqtt_host, Settings.mqtt_port, state, mqtt_retry_counter); AddLog(LOG_LEVEL_INFO); - - XdrvCall(FUNC_MQTT_DISCONNECTED); +#ifdef USE_RULES + strncpy_P(mqtt_data, PSTR("{\"MQTT\":{\"Disconnected\":1}}"), sizeof(mqtt_data)); + RulesProcess(); +#endif // USE_RULES } void MqttConnected() @@ -369,12 +371,17 @@ void MqttConnected() tele_period = Settings.tele_period -9; } status_update_timer = 2; - +#ifdef USE_RULES + strncpy_P(mqtt_data, PSTR("{\"System\":{\"Boot\":1}}"), sizeof(mqtt_data)); + RulesProcess(); +#endif // USE_RULES XdrvCall(FUNC_MQTT_INIT); } mqtt_initial_connection_state = 0; - - XdrvCall(FUNC_MQTT_CONNECTED); +#ifdef USE_RULES + strncpy_P(mqtt_data, PSTR("{\"MQTT\":{\"Connected\":1}}"), sizeof(mqtt_data)); + RulesProcess(); +#endif // USE_RULES } #ifdef USE_MQTT_TLS @@ -614,6 +621,22 @@ bool MqttCommand() } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_SVALUE, command, index, Settings.mqtt_prefix[index -1]); } + else if (CMND_PUBLISH == command_code) { + if (data_len > 0) { + char *mqtt_part = strtok(dataBuf, " "); + if (mqtt_part) { + snprintf(stemp1, sizeof(stemp1), mqtt_part); + mqtt_part = strtok(NULL, " "); + if (mqtt_part) { + snprintf(mqtt_data, sizeof(mqtt_data), mqtt_part); + } else { + mqtt_data[0] = '\0'; + } + MqttPublishDirect(stemp1, false); + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, D_JSON_DONE); + } + } + } else if (CMND_GROUPTOPIC == command_code) { if ((data_len > 0) && (data_len < sizeof(Settings.mqtt_grptopic))) { MakeValidMqtt(0, dataBuf); @@ -658,7 +681,7 @@ bool MqttCommand() strlcpy(Settings.button_topic, mqtt_topic, sizeof(Settings.button_topic)); if (!payload) { for(i = 1; i <= MAX_KEYS; i++) { - send_button_power(0, i, 9); // Clear MQTT retain in broker + SendKey(0, i, 9); // Clear MQTT retain in broker } } Settings.flag.mqtt_button_retain = payload; @@ -670,7 +693,7 @@ bool MqttCommand() strlcpy(Settings.button_topic, mqtt_topic, sizeof(Settings.button_topic)); if (!payload) { for(i = 1; i <= MAX_SWITCHES; i++) { - send_button_power(1, i, 9); // Clear MQTT retain in broker + SendKey(1, i, 9); // Clear MQTT retain in broker } } Settings.flag.mqtt_switch_retain = payload; diff --git a/sonoff/xdrv_05_domoticz.ino b/sonoff/xdrv_05_domoticz.ino index ea2b39319..38a979916 100644 --- a/sonoff/xdrv_05_domoticz.ino +++ b/sonoff/xdrv_05_domoticz.ino @@ -265,7 +265,7 @@ boolean DomoticzCommand() return serviced; } -boolean DomoticzButton(byte key, byte device, byte state, byte svalflg) +boolean DomoticzSendKey(byte key, byte device, byte state, byte svalflg) { if ((Settings.domoticz_key_idx[device -1] || Settings.domoticz_switch_idx[device -1]) && (svalflg)) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"command\":\"switchlight\",\"idx\":%d,\"switchcmd\":\"%s\"}"), diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino index 080c33ec9..e864e0062 100644 --- a/sonoff/xdrv_09_timers.ino +++ b/sonoff/xdrv_09_timers.ino @@ -224,10 +224,10 @@ void TimerEverySecond() Settings.timer[i].arm = Settings.timer[i].repeat; #ifdef USE_RULES if (3 == Settings.timer[i].power) { // Blink becomes Rule disregarding device and allowing use of Backlog commands - XdrvMailbox.index = i; - XdrvCall(FUNC_CLOCK_TIMER); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"Clock\":{\"Timer\":%d}}"), i +1); + RulesProcess(); } else -#endif +#endif // USE_RULES ExecuteCommandPower(Settings.timer[i].device +1, Settings.timer[i].power); } } diff --git a/sonoff/xdrv_10_rules.ino b/sonoff/xdrv_10_rules.ino new file mode 100644 index 000000000..61742f0b6 --- /dev/null +++ b/sonoff/xdrv_10_rules.ino @@ -0,0 +1,443 @@ +/* + xdrv_10_rules.ino - rule support for Sonoff-Tasmota + + Copyright (C) 2018 ESP Easy Group and Theo Arends + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifdef USE_RULES +/*********************************************************************************************\ + * Rules based heavily on ESP Easy implementation + * + * Inspiration: https://github.com/letscontrolit/ESPEasy + * + * Add rules using the following, case insensitive, format: + * on do endon on do endon .. + * + * Examples: + * on System#Boot do Color 001000 endon + * on INA219#Current>0.100 do Dimmer 10 endon + * on INA219#Current>0.100 do Backlog Dimmer 10;Color 10,0,0 endon + * on INA219#Current>0.100 do Backlog Dimmer 10;Color 100000 endon on System#Boot do color 001000 endon + * on ds18b20#temperature>23 do power off endon on ds18b20#temperature<22 do power on endon + * on mqtt#connected do color 000010 endon + * on mqtt#disconnected do color 00100C endon + * on time#initialized do color 001000 endon + * on time#set do color 001008 endon + * on clock#timer=3 do color 080800 endon + * on rules#timer=1 do color 080800 endon + * on mqtt#connected do color 000010 endon on mqtt#disconnected do color 001010 endon on time#initialized do color 001000 endon on time#set do backlog color 000810;ruletimer1 10 endon on rules#timer=1 do color 080800 endon + * on event#anyname do color 100000 endon + * on event#anyname do color %eventvalue% endon + * on power1#state=1 do color 001000 endon + * on button1#state do publish cmnd/ring2/power %eventvalue% endon on button2#state do publish cmnd/strip1/power %eventvalue% endon + * on switch1#state do power2 %eventvalue% endon + * + * Notes: + * Spaces after , around and before are mandatory + * System#Boot is initiated after MQTT is connected due to command handling preparation + * Control rule triggering with command: + * Rule 0 = Rules disabled (Off) + * Rule 1 = Rules enabled (On) + * Rule 2 = Toggle rules state + * Rule 4 = Perform commands as long as trigger is met (Once OFF) + * Rule 5 = Perform commands once until trigger is not met (Once ON) + * Rule 6 = Toggle Once state + * Execute an event like: + * Event anyname=001000 + * Set a RuleTimer to 100 seconds like: + * RuleTimer2 100 +\*********************************************************************************************/ + +#define MAX_RULE_TIMERS 8 + +#define ULONG_MAX 0xffffffffUL + +#define D_CMND_RULE "Rule" +#define D_CMND_RULETIMER "RuleTimer" +#define D_CMND_EVENT "Event" + +#define D_JSON_INITIATED "Initiated" + +enum RulesCommands { CMND_RULE, CMND_RULETIMER, CMND_EVENT }; +const char kRulesCommands[] PROGMEM = D_CMND_RULE "|" D_CMND_RULETIMER "|" D_CMND_EVENT ; + +String rules_event_value; +unsigned long rules_timer[MAX_RULE_TIMERS] = { 0 }; +uint8_t rules_quota = 0; +long rules_power = -1; + +uint32_t rules_triggers = 0; +uint8_t rules_trigger_count = 0; + +/*******************************************************************************************/ + +long TimeDifference(unsigned long prev, unsigned long next) +{ + // Return the time difference as a signed value, taking into account the timers may overflow. + // Returned timediff is between -24.9 days and +24.9 days. + // Returned value is positive when "next" is after "prev" + long signed_diff = 0; + // To cast a value to a signed long, the difference may not exceed half the ULONG_MAX + const unsigned long half_max_unsigned_long = 2147483647u; // = 2^31 -1 + if (next >= prev) { + const unsigned long diff = next - prev; + if (diff <= half_max_unsigned_long) { // Normal situation, just return the difference. + signed_diff = static_cast(diff); // Difference is a positive value. + } else { + // prev has overflow, return a negative difference value + signed_diff = static_cast((ULONG_MAX - next) + prev + 1u); + signed_diff = -1 * signed_diff; + } + } else { + // next < prev + const unsigned long diff = prev - next; + if (diff <= half_max_unsigned_long) { // Normal situation, return a negative difference value + signed_diff = static_cast(diff); + signed_diff = -1 * signed_diff; + } else { + // next has overflow, return a positive difference value + signed_diff = static_cast((ULONG_MAX - prev) + next + 1u); + } + } + return signed_diff; +} + +long TimePassedSince(unsigned long timestamp) +{ + // Compute the number of milliSeconds passed since timestamp given. + // Note: value can be negative if the timestamp has not yet been reached. + return TimeDifference(timestamp, millis()); +} + +bool TimeReached(unsigned long timer) +{ + // Check if a certain timeout has been reached. + const long passed = TimePassedSince(timer); + return (passed >= 0); +} + +/*******************************************************************************************/ + +bool RulesRuleMatch(String &event, String &rule) +{ + // event = {"INA219":{"Voltage":4.494,"Current":0.020,"Power":0.089}} + // event = {"System":{"Boot":1}} + // rule = "INA219#CURRENT>0.100" + + bool match = false; + + // Step1: Analyse rule + int pos = rule.indexOf('#'); + if (pos == -1) return false; // No # sign in rule + + String rule_task = rule.substring(0, pos); // "INA219" or "SYSTEM" + String rule_name = rule.substring(pos +1); // "CURRENT>0.100" or "BOOT" + + char compare = ' '; + pos = rule_name.indexOf(">"); + if (pos > 0) { + compare = '>'; + } else { + pos = rule_name.indexOf("<"); + if (pos > 0) { + compare = '<'; + } else { + pos = rule_name.indexOf("="); + if (pos > 0) { + compare = '='; + } + } + } + + String tmp_value = "none"; + double rule_value = 0; + if (pos > 0) { + tmp_value = rule_name.substring(pos + 1); // "0.100" + rule_value = CharToDouble((char*)tmp_value.c_str()); // 0.1 - This saves 9k code over toFLoat()! + rule_name = rule_name.substring(0, pos); // "CURRENT" + } + + // Step2: Search rule_task and rule_name + StaticJsonBuffer<400> jsonBuf; + JsonObject &root = jsonBuf.parseObject(event); + if (!root.success()) return false; // No valid JSON data + + double value = 0; + const char* str_value = root[rule_task][rule_name]; + +// snprintf_P(log_data, sizeof(log_data), PSTR("RUL: Task %s, Name %s, Value %s, TrigCnt %d, TrigSt %d, Source %s, Json %s"), +// rule_task.c_str(), rule_name.c_str(), tmp_value.c_str(), rules_trigger_count, bitRead(rules_triggers, rules_trigger_count), event.c_str(), (str_value) ? str_value : "none"); +// AddLog(LOG_LEVEL_DEBUG); + + if (!root[rule_task][rule_name].success()) return false; + // No value but rule_name is ok + + rules_event_value = str_value; // Prepare %eventvalue% + + // Step 3: Compare rule (value) + if (str_value) { + value = CharToDouble((char*)str_value); + switch (compare) { + case '>': + if (value > rule_value) match = true; + break; + case '<': + if (value < rule_value) match = true; + break; + case '=': + if (value == rule_value) match = true; + break; + case ' ': + match = true; // Json value but not needed + break; + } + } else match = true; + + if (Settings.flag.rules_once) { + if (match) { // Only allow match state changes + if (!bitRead(rules_triggers, rules_trigger_count)) { + bitSet(rules_triggers, rules_trigger_count); + } else { + match = false; + } + } else { + bitClear(rules_triggers, rules_trigger_count); + } + } + + return match; +} + +/*******************************************************************************************/ + +bool RulesProcess() +{ + bool serviced = false; + + if (!Settings.flag.rules_enabled) return serviced; // Not enabled + if (!strlen(Settings.rules)) return serviced; // No rules + + String event_saved = mqtt_data; + event_saved.toUpperCase(); + String rules = Settings.rules; + + rules_trigger_count = 0; + int plen = 0; + while (true) { + rules = rules.substring(plen); // Select relative to last rule + rules.trim(); + if (!rules.length()) return serviced; // No more rules + + String rule = rules; + rule.toUpperCase(); // "ON INA219#CURRENT>0.100 DO BACKLOG DIMMER 10;COLOR 100000 ENDON" + if (!rule.startsWith("ON ")) return serviced; // Bad syntax - Nothing to start on + + int pevt = rule.indexOf(" DO "); + if (pevt == -1) return serviced; // Bad syntax - Nothing to do + String event_trigger = rule.substring(3, pevt); // "INA219#CURRENT>0.100" + + plen = rule.indexOf(" ENDON"); + if (plen == -1) return serviced; // Bad syntax - No endon + String commands = rules.substring(pevt +4, plen); // "Backlog Dimmer 10;Color 100000" + plen += 6; + +// snprintf_P(log_data, sizeof(log_data), PSTR("RUL: Trigger |%s|, Commands |%s|"), event_trigger.c_str(), commands.c_str()); +// AddLog(LOG_LEVEL_DEBUG); + + rules_event_value = ""; + String event = event_saved; + if (RulesRuleMatch(event, event_trigger)) { + commands.replace(F("%eventvalue%"), rules_event_value); + char command[commands.length() +1]; + snprintf(command, sizeof(command), commands.c_str()); + + snprintf_P(log_data, sizeof(log_data), PSTR("RUL: %s performs \"%s\""), event_trigger.c_str(), command); + AddLog(LOG_LEVEL_INFO); + +// snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, D_CMND_RULE, D_JSON_INITIATED); +// MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_RULE)); + + ExecuteCommand(command); + serviced = true; + } + rules_trigger_count++; + } + return serviced; +} + +/*******************************************************************************************/ + +void RulesInit() +{ + if (Settings.rules[0] == '\0') { + Settings.flag.rules_enabled = 0; + Settings.flag.rules_once = 0; + } +} + +void RulesSetPower() +{ + if (Settings.flag.rules_enabled) { + uint16_t new_power = XdrvMailbox.index; + if (rules_power == -1) rules_power = new_power; + uint16_t old_power = rules_power; + rules_power = new_power; + for (byte i = 0; i < devices_present; i++) { + uint8_t new_state = new_power &1; + uint8_t old_state = old_power &1; + if (new_state != old_state) { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"Power%d\":{\"State\":%d}}"), i +1, new_state); + RulesProcess(); + } + new_power >>= 1; + old_power >>= 1; + } + } +} + +void RulesEvery50ms() +{ + if (Settings.flag.rules_enabled) { + rules_quota++; + if (rules_quota &1) { // Every 100 ms + mqtt_data[0] = '\0'; + uint16_t tele_period_save = tele_period; + tele_period = 2; // Do not allow HA updates during next function call + XsnsNextCall(FUNC_JSON_APPEND); // ,"INA219":{"Voltage":4.494,"Current":0.020,"Power":0.089} + tele_period = tele_period_save; + if (strlen(mqtt_data)) { + mqtt_data[0] = '{'; // {"INA219":{"Voltage":4.494,"Current":0.020,"Power":0.089} + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}"), mqtt_data); + RulesProcess(); + } + } + } +} + +void RulesEverySecond() +{ + if (Settings.flag.rules_enabled) { + for (byte i = 0; i < MAX_RULE_TIMERS; i++) { + if (rules_timer[i] != 0L) { // Timer active? + if (TimeReached(rules_timer[i])) { // Timer finished? + rules_timer[i] = 0L; // Turn off this timer + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"Rules\":{\"Timer\":%d}}"), i +1); + RulesProcess(); + } + } + } + } +} + +boolean RulesCommand() +{ + char command[CMDSZ]; + boolean serviced = true; + uint8_t index = XdrvMailbox.index; + + int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic, kRulesCommands); + if (CMND_RULE == command_code) { + if ((XdrvMailbox.data_len > 0) && (XdrvMailbox.data_len < sizeof(Settings.rules))) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 6)) { + switch (XdrvMailbox.payload) { + case 0: // Off + case 1: // On + Settings.flag.rules_enabled = XdrvMailbox.payload; + break; + case 2: // Toggle + Settings.flag.rules_enabled ^= 1; + break; + case 4: // Off + case 5: // On + Settings.flag.rules_once = XdrvMailbox.payload &1; + break; + case 6: // Toggle + Settings.flag.rules_once ^= 1; + break; + } + } else { +/* + String uc_data = XdrvMailbox.data; // Do not allow Rule to be used within a rule + uc_data.toUpperCase(); + String uc_command = command; + uc_command += " "; // Distuingish from RuleTimer + uc_command.toUpperCase(); + if (!uc_data.indexOf(uc_command)) strlcpy(Settings.rules, XdrvMailbox.data, sizeof(Settings.rules)); +*/ + strlcpy(Settings.rules, XdrvMailbox.data, sizeof(Settings.rules)); + } + rules_triggers = 0; // Reset once flag + } + snprintf_P (mqtt_data, sizeof(mqtt_data), PSTR("{\"%s\":\"%s\",\"Once\":\"%s\",\"Rules\":\"%s\"}"), command, GetStateText(Settings.flag.rules_enabled), GetStateText(Settings.flag.rules_once), Settings.rules); + } + else if ((CMND_RULETIMER == command_code) && (index > 0) && (index <= MAX_RULE_TIMERS)) { + if (XdrvMailbox.data_len > 0) { + rules_timer[index -1] = (XdrvMailbox.payload > 0) ? millis() + (1000 * XdrvMailbox.payload) : 0; + } + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_LVALUE, command, index, (rules_timer[index -1]) ? (rules_timer[index -1] - millis()) / 1000 : 0); + } + else if (CMND_EVENT == command_code) { + if (XdrvMailbox.data_len > 0) { + String event = XdrvMailbox.data; + String parameter = ""; + int pos = event.indexOf('='); + if (pos > 0) { + parameter = event.substring(pos +1); + parameter.trim(); + event = event.substring(0, pos); + } + event.trim(); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"Event\":{\"%s\":\"%s\"}}"), event.c_str(), parameter.c_str()); + RulesProcess(); + } + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, D_JSON_DONE); + } + else serviced = false; + + return serviced; +} + +/*********************************************************************************************\ + * Interface +\*********************************************************************************************/ + +#define XDRV_10 + +boolean Xdrv10(byte function) +{ + boolean result = false; + + switch (function) { + case FUNC_INIT: + RulesInit(); + break; + case FUNC_SET_POWER: + RulesSetPower(); + break; + case FUNC_EVERY_50_MSECOND: + RulesEvery50ms(); + break; + case FUNC_EVERY_SECOND: + RulesEverySecond(); + break; + case FUNC_COMMAND: + result = RulesCommand(); + break; + } + return result; +} + +#endif // USE_RULES \ No newline at end of file diff --git a/sonoff/xdrv_interface.ino b/sonoff/xdrv_interface.ino index 99a1600e8..09f056ece 100644 --- a/sonoff/xdrv_interface.ino +++ b/sonoff/xdrv_interface.ino @@ -182,17 +182,12 @@ boolean XdrvMqttData(char *topicBuf, uint16_t stopicBuf, char *dataBuf, uint16_t * FUNC_LOOP * FUNC_MQTT_SUBSCRIBE * FUNC_MQTT_INIT - * FUNC_MQTT_DISCONNECTED - * FUNC_MQTT_CONNECTED * return FUNC_MQTT_DATA * return FUNC_COMMAND * FUNC_SET_POWER * FUNC_SHOW_SENSOR * FUNC_EVERY_SECOND * FUNC_EVERY_50_MSECOND - * FUNC_NTP_INIT - * FUNC_NTP_SET - * FUNC_CLOCK_TIMER \*********************************************************************************************/ boolean XdrvCall(byte Function) From 2b196bb524cee4c901eb1f3e5200d7a22205a7be Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 13 Apr 2018 17:53:24 +0200 Subject: [PATCH 073/136] Fix missed update --- sonoff/settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonoff/settings.h b/sonoff/settings.h index e9fe0f296..c0f8c90b2 100644 --- a/sonoff/settings.h +++ b/sonoff/settings.h @@ -49,7 +49,7 @@ typedef union { // Restricted by MISRA-C Rule 18.4 bu uint32_t no_power_on_check : 1; // bit 21 (v5.11.1i) uint32_t mqtt_serial : 1; // bit 22 (v5.12.0f) uint32_t rules_enabled : 1; // bit 23 (v5.12.0j) - uint32_t spare24 : 1; + uint32_t rules_once : 1; // bit 23 (v5.12.0k) uint32_t spare25 : 1; uint32_t spare26 : 1; uint32_t spare27 : 1; From 946fcd2fe49806495d73138b1138e0812a1e4087 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 14 Apr 2018 14:39:16 +0200 Subject: [PATCH 074/136] v5.12.0l - Increase rules save area to 511 chars 5.12.0l * Release rules up to 511 characters * Prepare for feature release - call on translators to update their language files --- README.md | 16 ++++++++++++++-- sonoff/_releasenotes.ino | 6 +++++- sonoff/settings.h | 6 +++--- sonoff/sonoff.h | 6 +++--- sonoff/sonoff.ino | 2 +- sonoff/support.ino | 4 ++-- sonoff/xdrv_10_rules.ino | 10 +++++----- 7 files changed, 33 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 695d7895c..604183bad 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,19 @@ ## Sonoff-Tasmota -Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE. -Current version is **5.12.0k** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Alternative firmware for _ESP8266 based devices_ like [iTead](https://www.itead.cc/) _**Sonoff**_ with **web**, **timers**, 'Over The Air' (**OTA**) firmware updates and **sensors support**, allowing control under **Serial**, **HTTP** and **MQTT**, so as to be used on **Smart Home Systems**. Written for Arduino IDE and PlatformIO. + +[![GitHub version](https://img.shields.io/github/release/arendst/Sonoff-Tasmota.svg)](https://github.com/arendst/Sonoff-Tasmota/releases/latest) +[![GitHub download](https://img.shields.io/github/downloads/arendst/Sonoff-Tasmota/total.svg)](https://github.com/arendst/Sonoff-Tasmota/releases/latest) +[![License](https://img.shields.io/github/license/arendst/Sonoff-Tasmota.svg)](https://github.com/arendst/Sonoff-Tasmota/blob/development/LICENSE.txt) + +If you like **Sonoff Tasmota**, give it a star, or fork it and contribute! +[![GitHub stars](https://img.shields.io/github/stars/arendst/Sonoff-Tasmota.svg?style=social&label=Star)](https://github.com/arendst/Sonoff-Tasmota/stargazers) +[![GitHub forks](https://img.shields.io/github/forks/arendst/Sonoff-Tasmota.svg?style=social&label=Fork)](https://github.com/arendst/Sonoff-Tasmota/network) + +### Development: +[![Build Status](https://img.shields.io/travis/arendst/Sonoff-Tasmota.svg)](https://travis-ci.org/arendst/Sonoff-Tasmota) + +Current version is **5.12.0l** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### Quick install diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index c441078ef..0860a476d 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,8 @@ -/* 5.12.0k +/* 5.12.0l + * Release rules up to 511 characters + * Prepare for feature release - call on translators to update their language files + * + * 5.12.0k * Prepare for simple rules of up to 255 characters by enlarging Settings area to now 2048 bytes * Change Timer parameter name from Power to Action * Add commands Publish, Rule, RuleTimer and Event. See Wiki about Rule restriction, usage and examples diff --git a/sonoff/settings.h b/sonoff/settings.h index c0f8c90b2..3e0d85c7d 100644 --- a/sonoff/settings.h +++ b/sonoff/settings.h @@ -49,7 +49,7 @@ typedef union { // Restricted by MISRA-C Rule 18.4 bu uint32_t no_power_on_check : 1; // bit 21 (v5.11.1i) uint32_t mqtt_serial : 1; // bit 22 (v5.12.0f) uint32_t rules_enabled : 1; // bit 23 (v5.12.0j) - uint32_t rules_once : 1; // bit 23 (v5.12.0k) + uint32_t rules_once : 1; // bit 24 (v5.12.0k) uint32_t spare25 : 1; uint32_t spare26 : 1; uint32_t spare27 : 1; @@ -258,9 +258,9 @@ struct SYSCFG { byte free_6b8[72]; // 6B8 - char rules[MAX_RULE_SIZE]; // 700 + char rules[MAX_RULE_SIZE]; // 700 uses 512 bytes in v5.12.0l - // 800 - FFF free locations + // 900 - FFF free locations } Settings; struct RTCMEM { diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index c0a4e9a00..bf9407312 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -48,7 +48,7 @@ typedef unsigned long power_t; // Power (Relay) type #define MAX_FRIENDLYNAMES 4 // Max number of Friendly names #define MAX_DOMOTICZ_IDX 4 // Max number of Domoticz device, key and switch indices #define MAX_DOMOTICZ_SNS_IDX 12 // Max number of Domoticz sensors indices -#define MAX_RULE_SIZE 256 // Max number of characters in rules +#define MAX_RULE_SIZE 512 // Max number of characters in rules #define MODULE SONOFF_BASIC // [Module] Select default model @@ -86,10 +86,10 @@ typedef unsigned long power_t; // Power (Relay) type #define SERIALLOG_TIMER 600 // Seconds to disable SerialLog #define OTA_ATTEMPTS 5 // Number of times to try fetching the new firmware -#define INPUT_BUFFER_SIZE 255 // Max number of characters in (serial) command buffer +#define INPUT_BUFFER_SIZE 512 // Max number of characters in (serial and http) command buffer #define CMDSZ 24 // Max number of characters in command #define TOPSZ 100 // Max number of characters in topic string -#define LOGSZ 400 // Max number of characters in log +#define LOGSZ 512 // Max number of characters in log #define MIN_MESSZ 893 // Min number of characters in MQTT message #ifdef USE_MQTT_TLS diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 27dd3b9e0..e1e6e2200 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050C000B // 5.12.0k +#define VERSION 0x050C000C // 5.12.0l // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) diff --git a/sonoff/support.ino b/sonoff/support.ino index 6b17f0b75..e200d0240 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -1593,10 +1593,10 @@ void AddLog_P(byte loglevel, const char *formatP, const char *formatP2) AddLog(loglevel); } -void AddLogSerial(byte loglevel, uint8_t *buffer, byte count) +void AddLogSerial(byte loglevel, uint8_t *buffer, int count) { snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_SERIAL D_RECEIVED)); - for (byte i = 0; i < count; i++) { + for (int i = 0; i < count; i++) { snprintf_P(log_data, sizeof(log_data), PSTR("%s %02X"), log_data, *(buffer++)); } AddLog(loglevel); diff --git a/sonoff/xdrv_10_rules.ino b/sonoff/xdrv_10_rules.ino index 61742f0b6..690b5a934 100644 --- a/sonoff/xdrv_10_rules.ino +++ b/sonoff/xdrv_10_rules.ino @@ -40,10 +40,10 @@ * on rules#timer=1 do color 080800 endon * on mqtt#connected do color 000010 endon on mqtt#disconnected do color 001010 endon on time#initialized do color 001000 endon on time#set do backlog color 000810;ruletimer1 10 endon on rules#timer=1 do color 080800 endon * on event#anyname do color 100000 endon - * on event#anyname do color %eventvalue% endon + * on event#anyname do color %value% endon * on power1#state=1 do color 001000 endon - * on button1#state do publish cmnd/ring2/power %eventvalue% endon on button2#state do publish cmnd/strip1/power %eventvalue% endon - * on switch1#state do power2 %eventvalue% endon + * on button1#state do publish cmnd/ring2/power %value% endon on button2#state do publish cmnd/strip1/power %value% endon + * on switch1#state do power2 %value% endon * * Notes: * Spaces after , around and before are mandatory @@ -185,7 +185,7 @@ bool RulesRuleMatch(String &event, String &rule) if (!root[rule_task][rule_name].success()) return false; // No value but rule_name is ok - rules_event_value = str_value; // Prepare %eventvalue% + rules_event_value = str_value; // Prepare %value% // Step 3: Compare rule (value) if (str_value) { @@ -260,7 +260,7 @@ bool RulesProcess() rules_event_value = ""; String event = event_saved; if (RulesRuleMatch(event, event_trigger)) { - commands.replace(F("%eventvalue%"), rules_event_value); + commands.replace(F("%value%"), rules_event_value); char command[commands.length() +1]; snprintf(command, sizeof(command), commands.c_str()); From a612be5bcd78f0a3e5160810129e0423c60cf8cd Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 14 Apr 2018 18:00:18 +0200 Subject: [PATCH 075/136] Add timer sunrise and sunset offset 5.12.0l * Add timer sunrise and sunset offset (#2378) --- sonoff/_releasenotes.ino | 1 + sonoff/xdrv_09_timers.ino | 129 +++++++++++++++++++++++++++++++------- 2 files changed, 108 insertions(+), 22 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 0860a476d..44ca02078 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,6 +1,7 @@ /* 5.12.0l * Release rules up to 511 characters * Prepare for feature release - call on translators to update their language files + * Add timer sunrise and sunset offset (#2378) * * 5.12.0k * Prepare for simple rules of up to 255 characters by enlarging Settings area to now 2048 bytes diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino index e864e0062..c30cd153d 100644 --- a/sonoff/xdrv_09_timers.ino +++ b/sonoff/xdrv_09_timers.ino @@ -175,6 +175,43 @@ void DuskTillDawn(uint8_t *hour_up,uint8_t *minute_up, uint8_t *hour_down, uint8 *minute_down = UntergangMinuten; } +void ApplyTimerOffsets(Timer *duskdawn) +{ + uint8_t hour[2]; + uint8_t minute[2]; + Timer stored = (Timer)*duskdawn; + + // replace hours, minutes by sunrise + DuskTillDawn(&hour[0], &minute[0], &hour[1], &minute[1]); + uint8_t mode = (duskdawn->mode -1) &1; + duskdawn->time = (hour[mode] *60) + minute[mode]; + + // apply offsets, check for over- and underflows + uint16_t timeBuffer; + if ((uint16_t)stored.time > 720) { + // negative offset, time after 12:00 + timeBuffer = (uint16_t)stored.time - 720; + // check for underflow + if (timeBuffer > (uint16_t)duskdawn->time) { + timeBuffer = 1440 - (timeBuffer - (uint16_t)duskdawn->time); + duskdawn->days = duskdawn->days >> 1; + duskdawn->days = duskdawn->days |= (stored.days << 6); + } else { + timeBuffer = (uint16_t)duskdawn->time - timeBuffer; + } + } else { + // positive offset + timeBuffer = (uint16_t)duskdawn->time + (uint16_t)stored.time; + // check for overflow + if (timeBuffer > 1440) { + timeBuffer -= 1440; + duskdawn->days = duskdawn->days << 1; + duskdawn->days = duskdawn->days |= (stored.days >> 6); + } + } + duskdawn->time = timeBuffer; +} + String GetSun(byte dawn) { char stime[6]; @@ -212,23 +249,25 @@ void TimerEverySecond() for (byte i = 0; i < MAX_TIMERS; i++) { if (Settings.timer[i].device >= devices_present) Settings.timer[i].data = 0; // Reset timer due to change in devices present - uint16_t set_time = Settings.timer[i].time; + Timer xtimer = Settings.timer[i]; + uint16_t set_time = xtimer.time; #ifdef USE_SUNRISE - if ((1 == Settings.timer[i].mode) || (2 == Settings.timer[i].mode)) { // Sunrise or Sunset - set_time = GetSunMinutes(Settings.timer[i].mode -1); + if ((1 == xtimer.mode) || (2 == xtimer.mode)) { // Sunrise or Sunset + ApplyTimerOffsets(&xtimer); + set_time = xtimer.time; } #endif - if (Settings.timer[i].arm) { + if (xtimer.arm) { if (time == set_time) { - if (Settings.timer[i].days & days) { - Settings.timer[i].arm = Settings.timer[i].repeat; + if (xtimer.days & days) { + Settings.timer[i].arm = xtimer.repeat; #ifdef USE_RULES - if (3 == Settings.timer[i].power) { // Blink becomes Rule disregarding device and allowing use of Backlog commands + if (3 == xtimer.power) { // Blink becomes Rule disregarding device and allowing use of Backlog commands snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"Clock\":{\"Timer\":%d}}"), i +1); RulesProcess(); } else #endif // USE_RULES - ExecuteCommandPower(Settings.timer[i].device +1, Settings.timer[i].power); + ExecuteCommandPower(xtimer.device +1, xtimer.power); } } } @@ -241,17 +280,22 @@ void PrepShowTimer(uint8_t index) { char days[8] = { 0 }; - index--; + Timer xtimer = Settings.timer[index -1]; + for (byte i = 0; i < 7; i++) { uint8_t mask = 1 << i; - snprintf(days, sizeof(days), "%s%d", days, ((Settings.timer[index].days & mask) > 0)); + snprintf(days, sizeof(days), "%s%d", days, ((xtimer.days & mask) > 0)); } #ifdef USE_SUNRISE + int16_t hour = xtimer.time / 60; + if ((1 == xtimer.mode) || (2 == xtimer.mode)) { // Sunrise or Sunset + if (hour > 11) hour = (hour -12) * -1; + } snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_MODE "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_OUTPUT "\":%d,\"" D_JSON_TIMER_ACTION "\":%d}"), - mqtt_data, index +1, Settings.timer[index].arm, Settings.timer[index].mode, Settings.timer[index].time / 60, Settings.timer[index].time % 60, days, Settings.timer[index].repeat, Settings.timer[index].device +1, Settings.timer[index].power); + mqtt_data, index, xtimer.arm, xtimer.mode, hour, xtimer.time % 60, days, xtimer.repeat, xtimer.device +1, xtimer.power); #else snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_OUTPUT "\":%d,\"" D_JSON_TIMER_ACTION "\":%d}"), - mqtt_data, index +1, Settings.timer[index].arm, Settings.timer[index].time / 60, Settings.timer[index].time % 60, days, Settings.timer[index].repeat, Settings.timer[index].device +1, Settings.timer[index].power); + mqtt_data, index, xtimer.arm, xtimer.time / 60, xtimer.time % 60, days, xtimer.repeat, xtimer.device +1, xtimer.power); #endif // USE_SUNRISE } @@ -298,18 +342,20 @@ boolean TimerCommand() #endif if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_TIME))].success()) { uint16_t itime = 0; - uint8_t value = 0; + int8_t value = 0; char time_str[10]; snprintf(time_str, sizeof(time_str), root[parm_uc]); const char *substr = strtok(time_str, ":"); if (substr != NULL) { value = atoi(substr); + if (value < 0) value = abs(value) +12; // Allow entering timer offset from -11:59 to -00:01 converted to 12:01 to 23:59 if (value > 23) value = 23; itime = value * 60; substr = strtok(NULL, ":"); if (substr != NULL) { value = atoi(substr); + if (value < 0) value = 0; if (value > 59) value = 59; itime += value; } @@ -417,25 +463,50 @@ const char HTTP_TIMER_SCRIPT[] PROGMEM = "function gt(){" // Set hours and minutas according to mode "var m,p,q;" "m=qs('input[name=\"rd\"]:checked').value;" // Get mode - "if(m==0){p=pt[ct]&0x7FF;}" // Schedule time + "if(m==0){p=pt[ct]&0x7FF;so(0);}" // Schedule time, hide offset span "if(m==1){p=pt[" STR(MAX_TIMERS) "];}" // Sunrise "if(m==2){p=pt[" STR(MAX_TIMERS +1) "];}" // Sunset "q=Math.floor(p/60);if(q<10){q='0'+q;}qs('#ho').value=q;" // Set hours "q=p%60;if(q<10){q='0'+q;}qs('#mi').value=q;" // Set minutes + "if((m==1)||(m==2)){" // Sunrise or sunset is set + "p=pt[ct]&0x7FF;" // Load stored time for offset calculation + "q=Math.floor(p/60);" // Parse hours + "if(q>=12){q-=12;qs('#odr').selectedIndex=1;}" // Negative offset + "else{qs('#odr').selectedIndex=0;}" + "if(q<10){q='0'+q;}qs('#oho').value=q;" // Set offset hours + "q=p%60;if(q<10){q='0'+q;}qs('#omi').value=q;" // Set offset minutes + "so(1);" // Show offset span + "}" + "}" + "function so(b){" // Hide or show offset items + "if(b==1){qs('#ofs').style='';}" + "else{qs('#ofs').style='display:none;';}" "}" #endif "function st(){" // Save parameters to hidden area - "var i,n,p,s;" - "s=0;" + "var i,l,m,n,p,s;" + "m=0;s=0;" "n=1<<30;if(eb('a0').checked){s|=n;}" // Get arm "n=1<<29;if(eb('r0').checked){s|=n;}" // Get repeat "for(i=0;i<7;i++){n=1<<(16+i);if(eb('w'+i).checked){s|=n;}}" // Get weekdays #ifdef USE_SUNRISE + "m=qs('input[name=\"rd\"]:checked').value;" // Check mode "s|=(qs('input[name=\"rd\"]:checked').value<<11);" // Get mode #endif "s|=(eb('p1').value<<27);" // Get power "s|=(qs('#d1').selectedIndex<<23);" // Get device - "s|=((qs('#ho').selectedIndex*60)+qs('#mi').selectedIndex)&0x7FF;" // Get time + +// "s|=((qs('#ho').selectedIndex*60)+qs('#mi').selectedIndex)&0x7FF;" // Get time + + "if(m==0){s|=((qs('#ho').selectedIndex*60)+qs('#mi').selectedIndex)&0x7FF;}" // Get time +#ifdef USE_SUNRISE + "if((m==1)||(m==2)){" + "l=((qs('#oho').selectedIndex*60)+qs('#omi').selectedIndex);" // Buffer offset time + "if(qs('#odr').selectedIndex>0){l+=720;}" // If negative offset, add 12h to given offset time + "s|=l&0x7FF;" // Save offset instead of time + "}" +#endif + "pt[ct]=s;" "eb('t0').value=pt.join();" // Save parameters from array to hidden area "}" @@ -468,6 +539,13 @@ const char HTTP_TIMER_SCRIPT[] PROGMEM = "eb('bt').innerHTML=s;" // Create tabs "o=qs('#ho');for(i=0;i<=23;i++){ce((i<10)?('0'+i):i,o);}" // Create hours select options "o=qs('#mi');for(i=0;i<=59;i++){ce((i<10)?('0'+i):i,o);}" // Create minutes select options + +#ifdef USE_SUNRISE // NEW: Create offset options (+/- up to 11h, 59m) + "o=qs('#odr');ce('+',o);ce('-',o);" // Create offset direction select options + "o=qs('#oho');for(i=0;i<=11;i++){ce((i<10)?('0'+i):i,o);}" // Create offset hours select options + "o=qs('#omi');for(i=0;i<=59;i++){ce((i<10)?('0'+i):i,o);}" // Create offset minutes select options +#endif + "o=qs('#d1');for(i=0;i<}1;i++){ce(i+1,o);}" // Create devices "var a='" D_DAY3LIST "';" "s='';for(i=0;i<7;i++){s+=\"\"+a.substring(i*3,(i*3)+3)+\"\"}" @@ -503,15 +581,22 @@ const char HTTP_FORM_TIMER1[] PROGMEM = "" D_TIMER_REPEAT "" "

" "
" -// "Time " #ifdef USE_SUNRISE "
" "" D_TIMER_TIME " " - "" - " " D_HOUR_MINUTE_SEPARATOR " " - "
" + "" + " " D_HOUR_MINUTE_SEPARATOR " " + "
" "" D_SUNRISE "
" "" D_SUNSET "
" + "
" "
" #else "" D_TIMER_TIME " " @@ -573,7 +658,7 @@ void TimerSaveSettings() p++; // Skip comma if (timer.time < 1440) { #ifdef USE_SUNRISE - if ((1 == timer.mode) || (2 == timer.mode)) timer.time = Settings.timer[i].time; // Do not save time on Sunrise or Sunset +// if ((1 == timer.mode) || (2 == timer.mode)) timer.time = Settings.timer[i].time; // Do not save time on Sunrise or Sunset #endif Settings.timer[i].data = timer.data; } From 96d13d05a7e10cf1c525cf164089f7a72e1957ae Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sun, 15 Apr 2018 10:18:48 +0200 Subject: [PATCH 076/136] Add contribution --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 604183bad..51c26c777 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Alternative firmware for _ESP8266 based devices_ like [iTead](https://www.itead. [![GitHub download](https://img.shields.io/github/downloads/arendst/Sonoff-Tasmota/total.svg)](https://github.com/arendst/Sonoff-Tasmota/releases/latest) [![License](https://img.shields.io/github/license/arendst/Sonoff-Tasmota.svg)](https://github.com/arendst/Sonoff-Tasmota/blob/development/LICENSE.txt) -If you like **Sonoff Tasmota**, give it a star, or fork it and contribute! +If you like **Sonoff-Tasmota**, give it a star, or fork it and contribute! [![GitHub stars](https://img.shields.io/github/stars/arendst/Sonoff-Tasmota.svg?style=social&label=Star)](https://github.com/arendst/Sonoff-Tasmota/stargazers) [![GitHub forks](https://img.shields.io/github/forks/arendst/Sonoff-Tasmota.svg?style=social&label=Fork)](https://github.com/arendst/Sonoff-Tasmota/network) @@ -70,6 +70,15 @@ The following devices are supported: - [Luani HVIO board](https://luani.de/projekte/esp8266-hvio/) - Wemos D1 mini, NodeMcu and Ledunia +### Contribute + +You can contribute to Sonoff-Tasmota by +- providing Pull Requests (Features, Proof of Concepts, Language files or Fixes) +- testing new released features and report issues +- donating to acquire hardware for testing and implementating or out of gratitude + +[![donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://paypal.me/tasmota) + ### License This program is licensed under GPL-3.0 \ No newline at end of file From 8e0a25f68144639bd6107b5186f020c9e534bc42 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Tue, 17 Apr 2018 12:07:11 +0200 Subject: [PATCH 077/136] Update french language and add versioning --- sonoff/language/cs-CZ.h | 1 + sonoff/language/de-DE.h | 1 + sonoff/language/es-AR.h | 1 + sonoff/language/fr-FR.h | 183 ++++++++++++++++++++-------------------- sonoff/language/hu-HU.h | 1 + sonoff/language/it-IT.h | 1 + sonoff/language/nl-NL.h | 1 + sonoff/language/pl-PL.h | 1 + sonoff/language/pt-PT.h | 1 + sonoff/language/ru-RU.h | 1 + sonoff/language/zh-CN.h | 1 + sonoff/language/zh-TW.h | 1 + 12 files changed, 103 insertions(+), 91 deletions(-) diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h index d8916d700..07be6d2cf 100644 --- a/sonoff/language/cs-CZ.h +++ b/sonoff/language/cs-CZ.h @@ -28,6 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * + * Updated until v5.12.0k \*********************************************************************/ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index 0d804c0c1..b69f1ede9 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -28,6 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * + * Updated until v5.12.0l \*********************************************************************/ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index fb3a1164b..7999057c8 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -28,6 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * + * Updated until v5.12.0k \*********************************************************************/ #define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h index 2d08fe03c..19ae7f1cf 100644 --- a/sonoff/language/fr-FR.h +++ b/sonoff/language/fr-FR.h @@ -28,6 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * + * Updated until v5.12.0l \*********************************************************************/ #define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) @@ -58,7 +59,7 @@ #define D_BLINKOFF "BlinkOff" #define D_BOOT_COUNT "Nombre de boot" #define D_BRIGHTLIGHT "Luminosité" -#define D_BUTTON "Boutton" +#define D_BUTTON "Bouton" #define D_BY "par" // Written by me #define D_BYTES "Bytes" #define D_CELSIUS "Celsius" @@ -69,8 +70,8 @@ #define D_CONNECTED "Connecté" #define D_COUNT "Compte" #define D_COUNTER "Compteur" -#define D_CURRENT "Courrant" // As in Voltage and Current -#define D_DATA "Data" +#define D_CURRENT "Courant" // As in Voltage and Current +#define D_DATA "Donnée" #define D_DARKLIGHT "Sombre" #define D_DEBUG "Debug" #define D_DISABLED "Désactivé" @@ -78,17 +79,17 @@ #define D_DONE "Fait" #define D_DST_TIME "DST" #define D_ECO2 "eCO2" -#define D_EMULATION "Emulation" +#define D_EMULATION "Émulation" #define D_ENABLED "Activé" #define D_ERASE "Effacer" #define D_ERROR "Erreur" #define D_FAHRENHEIT "Fahrenheit" -#define D_FAILED "Echoué" -#define D_FALLBACK "Fallback" -#define D_FALLBACK_TOPIC "Fallback Topic" +#define D_FAILED "Échoué" +#define D_FALLBACK "Secours" +#define D_FALLBACK_TOPIC "Topic de secours" #define D_FALSE "Faux" #define D_FILE "Fichier" -#define D_FREE_MEMORY "Memoire libre" +#define D_FREE_MEMORY "Mémoire libre" #define D_GAS "Gaz" #define D_GATEWAY "Passerelle" #define D_GROUP "Groupe" @@ -96,7 +97,7 @@ #define D_HOSTNAME "Hostname" #define D_HUMIDITY "Humidité" #define D_ILLUMINANCE "Éclairement" -#define D_IMMEDIATE "immediat" // Button immediate +#define D_IMMEDIATE "immédiat" // Button immediate #define D_INDEX "Index" #define D_INFO "Info" #define D_INITIALIZED "Initialisé" @@ -107,11 +108,11 @@ #define D_MQTT "MQTT" #define D_MULTI_PRESS "multi-pression" #define D_NOISE "Bruit" -#define D_NONE "None" -#define D_OFF "Off" +#define D_NONE "Aucun" +#define D_OFF "Arrêt" #define D_OFFLINE "Déconnecté" #define D_OK "Ok" -#define D_ON "On" +#define D_ON "Marche" #define D_ONLINE "Connecté" #define D_PASSWORD "Mot de passe" #define D_PORT "Port" @@ -124,37 +125,37 @@ #define D_PROJECT "Projet" #define D_RECEIVED "Reçu" #define D_RESTART "Redémarrage" -#define D_RESTARTING "Redémarrage" -#define D_RESTART_REASON "Raison redémarrage" -#define D_RESTORE "restorer" +#define D_RESTARTING "Redémarre" +#define D_RESTART_REASON "Raison du redémarrage" +#define D_RESTORE "restaurer" #define D_RETAINED "retenu" -#define D_RULE "Rule" -#define D_SAVE "Enregister" +#define D_RULE "Règle" +#define D_SAVE "Enregistrer" #define D_SENSOR "Capteur" #define D_SSID "SSID" -#define D_START "Start" +#define D_START "Départ" #define D_STD_TIME "STD" #define D_STOP "Stop" -#define D_SUBNET_MASK "Masque sous réseau" +#define D_SUBNET_MASK "Masque sous-réseau" #define D_SUBSCRIBE_TO "Souscrire à" #define D_SUCCESSFUL "Réussi" -#define D_SUNRISE "Sunrise" -#define D_SUNSET "Sunset" -#define D_TEMPERATURE "Temperature" +#define D_SUNRISE "Jour" // "Lever du soleil" <- maybe too long? +#define D_SUNSET "Nuit" // "Coucher du soleil" <- maybe too long? +#define D_TEMPERATURE "Température" #define D_TO "à" -#define D_TOGGLE "Bascule" -#define D_TOPIC "Topic" +#define D_TOGGLE "Inverser" +#define D_TOPIC "Topic" // Keep MQTT keyword #define D_TRANSMIT "Transmettre" #define D_TRUE "Vrai" #define D_TVOC "TVOC" -#define D_UPGRADE "upgrade" -#define D_UPLOAD "Upload" -#define D_UPTIME "Uptime" +#define D_UPGRADE "mise à jour" +#define D_UPLOAD "Upload" // Not better in french +#define D_UPTIME "Durée d'activité" #define D_USER "Utilisateur" #define D_UTC_TIME "UTC" #define D_UV_LEVEL "Niveau UV" #define D_VERSION "Version" -#define D_VOLTAGE "Voltage" +#define D_VOLTAGE "Tension" #define D_WARMLIGHT "Chaud" #define D_WEB_SERVER "Serveur web" @@ -162,36 +163,36 @@ #define D_WARNING_MINIMAL_VERSION "ATTENTION Cette version ne supporte pas les réglages persistants" #define D_LEVEL_10 "level 1-0" #define D_LEVEL_01 "level 0-1" -#define D_SERIAL_LOGGING_DISABLED "Journalisation série désactivé" -#define D_SYSLOG_LOGGING_REENABLED "Jounalisation syslog réactivé" +#define D_SERIAL_LOGGING_DISABLED "Journalisation série désactivée" +#define D_SYSLOG_LOGGING_REENABLED "Jounalisation syslog réactivée" -#define D_SET_BAUDRATE_TO "Definir baudrate à" -#define D_RECEIVED_TOPIC "Topic reçu" +#define D_SET_BAUDRATE_TO "Définir baudrate à" +#define D_RECEIVED_TOPIC "Topic reçu" // Terme MQTT #define D_DATA_SIZE "Taille données" #define D_ANALOG_INPUT "Analogique" // support.ino #define D_OSWATCH "osWatch" #define D_BLOCKED_LOOP "Boucle bloquée" -#define D_WPS_FAILED_WITH_STATUS "WPSconfig ECHOUÉ avec status" +#define D_WPS_FAILED_WITH_STATUS "WPSconfig ÉCHOUÉ avec status" #define D_ACTIVE_FOR_3_MINUTES "actif pour 3 minutes" -#define D_FAILED_TO_START "Echec de démarrage" -#define D_PATCH_ISSUE_2186 "Patch issue 2186" +#define D_FAILED_TO_START "Échec de démarrage" +#define D_PATCH_ISSUE_2186 "Correction 2186" #define D_CONNECTING_TO_AP "Connexion à l'AP" #define D_IN_MODE "en mode" -#define D_CONNECT_FAILED_NO_IP_ADDRESS "Echec de connexion car aucune adresse IP n'a été reçue" -#define D_CONNECT_FAILED_AP_NOT_REACHED "Echec de connexion car l'AP ne peut-être contacté" -#define D_CONNECT_FAILED_WRONG_PASSWORD "Echec de connexion car le mot de passe de l'AP est incorrect" -#define D_CONNECT_FAILED_AP_TIMEOUT "Echec de connexion avec l'AP, expiré" +#define D_CONNECT_FAILED_NO_IP_ADDRESS "Échec de connexion car aucune adresse IP n'a été reçue" +#define D_CONNECT_FAILED_AP_NOT_REACHED "Échec de connexion car l'AP ne peut-être contacté" +#define D_CONNECT_FAILED_WRONG_PASSWORD "Échec de connexion car le mot de passe de l'AP est incorrect" +#define D_CONNECT_FAILED_AP_TIMEOUT "Échec de connexion avec l'AP, expiré" #define D_ATTEMPTING_CONNECTION "Tentative de connexion..." -#define D_CHECKING_CONNECTION "Verification connexion..." -#define D_QUERY_DONE "Requête terminé. Services MQTT trouvés" +#define D_CHECKING_CONNECTION "Vérification connexion..." +#define D_QUERY_DONE "Requête terminée. Services MQTT trouvés" #define D_MQTT_SERVICE_FOUND "Service MQTT trouvé sur" #define D_FOUND_AT "trouvé à" #define D_SYSLOG_HOST_NOT_FOUND "Host syslog introuvable" // settings.ino -#define D_SAVED_TO_FLASH_AT "Enregistré dans la flash à" +#define D_SAVED_TO_FLASH_AT "Enregistré en flash à" #define D_LOADED_FROM_FLASH_AT "Chargé de la flash à" #define D_USE_DEFAULTS "Utiliser par défaut" #define D_ERASED_SECTOR "Secteur effacé" @@ -203,8 +204,8 @@ #define D_WEBSERVER_STOPPED "Serveur web éteint" #define D_FILE_NOT_FOUND "Fichier introuvable" #define D_REDIRECTED "Redirection sur le portail captif" -#define D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION "Wifimanager defini AccessPoint et garde station" -#define D_WIFIMANAGER_SET_ACCESSPOINT "Wifimanager defini AccessPoint" +#define D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION "Wifimanager définit AccessPoint et garde station" +#define D_WIFIMANAGER_SET_ACCESSPOINT "Wifimanager définit AccessPoint" #define D_TRYING_TO_CONNECT "Tentative de connexion du module au réseau" #define D_RESTART_IN "Redémarrage dans" @@ -239,7 +240,7 @@ #define D_SCAN_FOR_WIFI_NETWORKS "Scan des réseaux wifi" #define D_SCAN_DONE "Scan terminé" #define D_NO_NETWORKS_FOUND "Aucun réseau trouvé" -#define D_REFRESH_TO_SCAN_AGAIN "Rafraichir pour scanner à nouveau" +#define D_REFRESH_TO_SCAN_AGAIN "Rafraîchir pour scanner à nouveau" #define D_DUPLICATE_ACCESSPOINT "AccessPoint dupliqué" #define D_SKIPPING_LOW_QUALITY "Passe car mauvaise qualité" #define D_RSSI "RSSI" @@ -260,9 +261,9 @@ #define D_WEB_LOG_LEVEL "Niveau de journalisation web" #define D_SYS_LOG_LEVEL "Niveau syslog" #define D_MORE_DEBUG "Plus de debug" -#define D_SYSLOG_HOST "Host syslog" -#define D_SYSLOG_PORT "Host syslog" -#define D_TELEMETRY_PERIOD "Période télémetrie" +#define D_SYSLOG_HOST "Hôte syslog" +#define D_SYSLOG_PORT "Port syslog" +#define D_TELEMETRY_PERIOD "Période télémétrie" #define D_OTHER_PARAMETERS "Autres paramètres" #define D_WEB_ADMIN_PASSWORD "Mot de passe Web Admin" @@ -274,8 +275,8 @@ #define D_MULTI_DEVICE "multi module" #define D_SAVE_CONFIGURATION "Enregistrer configuration" -#define D_CONFIGURATION_SAVED "Configuration enregistré" -#define D_CONFIGURATION_RESET "Configuration réinitialisé" +#define D_CONFIGURATION_SAVED "Configuration enregistrée" +#define D_CONFIGURATION_RESET "Configuration réinitialisée" #define D_PROGRAM_VERSION "Version Programme" #define D_BUILD_DATE_AND_TIME "Date & Heure de build" @@ -301,12 +302,12 @@ #define D_START_UPGRADE "Lancer la mise à jour" #define D_UPGRADE_BY_FILE_UPLOAD "Mise à jour par téléchargement fichier" #define D_UPLOAD_STARTED "Téléchargement lancé" -#define D_UPGRADE_STARTED "Mise à jour lancé" +#define D_UPGRADE_STARTED "Mise à jour lancée" #define D_UPLOAD_DONE "Téléchargement terminé" #define D_UPLOAD_ERR_1 "Aucun fichier sélectionné" #define D_UPLOAD_ERR_2 "Espace insuffisant" #define D_UPLOAD_ERR_3 "Magic byte n'est pas 0xE9" -#define D_UPLOAD_ERR_4 "La taille de la flash programme est plus grande que la taille réelle de la flash" +#define D_UPLOAD_ERR_4 "La taille du programme à flasher est plus grande que la taille réelle de la mémoire flash" #define D_UPLOAD_ERR_5 "Erreur comparaison buffer de téléchargement" #define D_UPLOAD_ERR_6 "Téléchargement échoué. Activation logging 3" #define D_UPLOAD_ERR_7 "Téléchargement annulé" @@ -319,25 +320,25 @@ #define D_NEED_USER_AND_PASSWORD "Nécessite utilisateur=&password=" // xdrv_00_mqtt.ino -#define D_FINGERPRINT "Verification empreinte TLS ..." -#define D_TLS_CONNECT_FAILED_TO "Echec de connexion TLS à" +#define D_FINGERPRINT "Vérification empreinte TLS ..." +#define D_TLS_CONNECT_FAILED_TO "Échec de connexion TLS à" #define D_RETRY_IN "Nouvelle tentative dans" -#define D_VERIFIED "Verifié empreinte " -#define D_INSECURE "Connexion non sécurisée car empreinte non vérifée" -#define D_CONNECT_FAILED_TO "Echec de connexion à" +#define D_VERIFIED "Vérifié par empreinte " +#define D_INSECURE "Connexion non sécurisée car empreinte non vérifiée" +#define D_CONNECT_FAILED_TO "Échec de connexion à" // xdrv_wemohue.ino #define D_MULTICAST_DISABLED "Multicast désactivé" #define D_MULTICAST_REJOINED "Multicast (re)joint" -#define D_MULTICAST_JOIN_FAILED "Multicast echec abonnement" -#define D_FAILED_TO_SEND_RESPONSE "Echec d'envoi réponse" +#define D_MULTICAST_JOIN_FAILED "Multicast échec abonnement" +#define D_FAILED_TO_SEND_RESPONSE "Échec d'envoi réponse" #define D_WEMO "WeMo" #define D_WEMO_BASIC_EVENT "WeMo basic event" #define D_WEMO_EVENT_SERVICE "WeMo event service" #define D_WEMO_META_SERVICE "WeMo meta service" #define D_WEMO_SETUP "Réglage WeMo" -#define D_RESPONSE_SENT "Response envoyé" +#define D_RESPONSE_SENT "Réponse envoyée" #define D_HUE "Hue" #define D_HUE_BRIDGE_SETUP "Réglage Hue" @@ -355,28 +356,28 @@ #define D_DOMOTICZ_TEMP "Temp" #define D_DOMOTICZ_TEMP_HUM "Temp,Hum" #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro" - #define D_DOMOTICZ_POWER_ENERGY "Power,Energy" + #define D_DOMOTICZ_POWER_ENERGY "Puissance,Énergie" #define D_DOMOTICZ_ILLUMINANCE "Illuminance" - #define D_DOMOTICZ_COUNT "Count/PM1" - #define D_DOMOTICZ_VOLTAGE "Voltage/PM2,5" - #define D_DOMOTICZ_CURRENT "Current/PM10" - #define D_DOMOTICZ_AIRQUALITY "AirQuality" -#define D_DOMOTICZ_UPDATE_TIMER "Update timer" + #define D_DOMOTICZ_COUNT "Compteur/PM1" + #define D_DOMOTICZ_VOLTAGE "Tension/PM2,5" + #define D_DOMOTICZ_CURRENT "Courant/PM10" + #define D_DOMOTICZ_AIRQUALITY "Qualité de l'air" +#define D_DOMOTICZ_UPDATE_TIMER "Durée de rafraichissement" // xdrv_09_timers.ino -#define D_CONFIGURE_TIMER "Configure Timer" -#define D_TIMER_PARAMETERS "Timer parameters" -#define D_TIMER_ARM "Arm" -#define D_TIMER_TIME "Time" -#define D_TIMER_DAYS "Days" -#define D_TIMER_REPEAT "Repeat" -#define D_TIMER_OUTPUT "Output" +#define D_CONFIGURE_TIMER "Configuration Timer" +#define D_TIMER_PARAMETERS "Paramètres Timer" +#define D_TIMER_ARM "Armer" +#define D_TIMER_TIME "Temps" +#define D_TIMER_DAYS "Jours" +#define D_TIMER_REPEAT "Répéter" +#define D_TIMER_OUTPUT "Sortie" #define D_TIMER_ACTION "Action" // xsns_03_energy.ino -#define D_ENERGY_TODAY "Energie aujourd'hui" -#define D_ENERGY_YESTERDAY "Energie hier" -#define D_ENERGY_TOTAL "Energie totale" +#define D_ENERGY_TODAY "Énergie aujourd'hui" +#define D_ENERGY_YESTERDAY "Énergie hier" +#define D_ENERGY_TOTAL "Énergie totale" // xsns_05_ds18b20.ino #define D_SENSOR_BUSY "Capteur occupé" @@ -384,11 +385,11 @@ #define D_SENSORS_FOUND "Capteur trouvé" // xsns_06_dht.ino -#define D_TIMEOUT_WAITING_FOR "Expiré attend pour" -#define D_START_SIGNAL_LOW "Signal démarrage bas" -#define D_START_SIGNAL_HIGH "Signal démarrage haut" -#define D_PULSE "pulse" -#define D_CHECKSUM_FAILURE "Echec checksum" +#define D_TIMEOUT_WAITING_FOR "Expiration du délai" +#define D_START_SIGNAL_LOW "Signal Start bas" +#define D_START_SIGNAL_HIGH "Signal Start haut" +#define D_PULSE "Impulsion" +#define D_CHECKSUM_FAILURE "Erreur checksum" // xsns_07_sht1x.ino #define D_SENSOR_DID_NOT_ACK_COMMAND "Le capteur n'a pas ACK la commande" @@ -400,7 +401,7 @@ #define D_PARTICALS_BEYOND "Particules" // sonoff_template.h -#define D_SENSOR_NONE "None" +#define D_SENSOR_NONE "Aucun" #define D_SENSOR_DHT11 "DHT11" #define D_SENSOR_AM2301 "AM2301" #define D_SENSOR_SI7021 "SI7021" @@ -408,14 +409,14 @@ #define D_SENSOR_I2C_SCL "I2C SCL" #define D_SENSOR_I2C_SDA "I2C SDA" #define D_SENSOR_WS2812 "WS2812" -#define D_SENSOR_IRSEND "IRsend" -#define D_SENSOR_SWITCH "Switch" // Suffix "1" -#define D_SENSOR_BUTTON "Button" // Suffix "1" -#define D_SENSOR_RELAY "Relay" // Suffix "1i" -#define D_SENSOR_LED "LED" // Suffix "1i" -#define D_SENSOR_PWM "PWM" // Suffix "1" -#define D_SENSOR_COUNTER "Counter" // Suffix "1" -#define D_SENSOR_IRRECV "IRrecv" +#define D_SENSOR_IRSEND "ÉmetIR" +#define D_SENSOR_SWITCH "Inter." // Suffix "1" +#define D_SENSOR_BUTTON "Bouton" // Suffix "1" +#define D_SENSOR_RELAY "Relais" // Suffix "1i" +#define D_SENSOR_LED "LED" // Suffix "1i" +#define D_SENSOR_PWM "PWM" // Suffix "1" +#define D_SENSOR_COUNTER "Compteur" // Suffix "1" +#define D_SENSOR_IRRECV "RécptIR" #define D_SENSOR_MHZ_RX "MHZ Rx" #define D_SENSOR_MHZ_TX "MHZ Tx" #define D_SENSOR_PZEM_RX "PZEM Rx" @@ -424,7 +425,7 @@ #define D_SENSOR_SAIR_TX "SAir Tx" #define D_SENSOR_SPI_CS "SPI CS" #define D_SENSOR_SPI_DC "SPI DC" -#define D_SENSOR_BACKLIGHT "BkLight" +#define D_SENSOR_BACKLIGHT "RétroÉcl" #define D_SENSOR_PMS5003 "PMS5003" #define D_SENSOR_SDS0X1 "SDS0X1" #define D_SENSOR_SBR_RX "SerBr Rx" diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h index 2e2080a84..17531c7db 100644 --- a/sonoff/language/hu-HU.h +++ b/sonoff/language/hu-HU.h @@ -28,6 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * + * Updated until v5.12.0e \*********************************************************************/ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index ad3185c49..5266713ac 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -28,6 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * + * Updated until v5.12.0 \*********************************************************************/ #define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h index bf030e88c..59dd2cf85 100644 --- a/sonoff/language/nl-NL.h +++ b/sonoff/language/nl-NL.h @@ -28,6 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * + * Updated until v5.12.0l \*********************************************************************/ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h index e143424c7..4249be1e3 100644 --- a/sonoff/language/pl-PL.h +++ b/sonoff/language/pl-PL.h @@ -28,6 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * + * Updated until v5.12.0d \*********************************************************************/ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h index 765bb1e19..3b7ca2b8c 100644 --- a/sonoff/language/pt-PT.h +++ b/sonoff/language/pt-PT.h @@ -28,6 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * + * Updated until v5.12.0 \*********************************************************************/ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h index 152d081c3..fa2a9dbf3 100644 --- a/sonoff/language/ru-RU.h +++ b/sonoff/language/ru-RU.h @@ -28,6 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * + * Updated until v5.12.0b \*********************************************************************/ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h index dd965887c..10e8d649d 100644 --- a/sonoff/language/zh-CN.h +++ b/sonoff/language/zh-CN.h @@ -28,6 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * + * Updated until v5.12.0d \*********************************************************************/ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h index a954d4669..2790fa19b 100644 --- a/sonoff/language/zh-TW.h +++ b/sonoff/language/zh-TW.h @@ -28,6 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * + * Updated until v5.12.0d \*********************************************************************/ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) From 5858ecdb79cfefd829a196bccbe0bd78905dfbd1 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Tue, 17 Apr 2018 15:34:18 +0200 Subject: [PATCH 078/136] Fix negative Lat an Long value entry 5.12.0l * Fix negative Latitude and Longitude value entry (#2461) --- lib/ESPAsyncUDP-0.21/README.md | 12 + .../AsyncUDPClient/AsyncUDPClient.ino | 51 ++ .../AsyncUDPMulticastServer.ino | 52 ++ .../AsyncUDPServer/AsyncUDPServer.ino | 50 ++ lib/ESPAsyncUDP-0.21/keywords.txt | 33 + lib/ESPAsyncUDP-0.21/library.json | 17 + lib/ESPAsyncUDP-0.21/library.properties | 9 + lib/ESPAsyncUDP-0.21/src/AsyncUDP.cpp | 425 +++++++++++ lib/ESPAsyncUDP-0.21/src/ESPAsyncUDP.h | 130 ++++ lib/ESPAsyncUDP-0.21/travis/common.sh | 23 + lib/esp-knx-ip-async-udp-0.4.0.15/DPT.h | 72 ++ lib/esp-knx-ip-async-udp-0.4.0.15/LICENSE | 21 + lib/esp-knx-ip-async-udp-0.4.0.15/README.md | 107 +++ .../esp-knx-ip-config.cpp | 358 ++++++++++ .../esp-knx-ip-conversion.cpp | 87 +++ .../esp-knx-ip-send.cpp | 180 +++++ .../esp-knx-ip-webserver.cpp | 540 ++++++++++++++ .../esp-knx-ip.cpp | 658 ++++++++++++++++++ .../esp-knx-ip.h | 571 +++++++++++++++ .../environment-sensor/environment-sensor.ino | 159 +++++ .../examples/sonoff/sonoff.ino | 183 +++++ .../examples/static-config/static-config.ino | 142 ++++ .../keywords.txt | 104 +++ .../library.properties | 10 + sonoff/_releasenotes.ino | 1 + sonoff/settings.h | 18 +- sonoff/sonoff.h | 2 + sonoff/sonoff.ino | 7 + sonoff/sonoff_post.h | 6 + sonoff/support.ino | 4 +- sonoff/webserver.ino | 9 + sonoff/xdrv_09_timers.ino | 21 +- sonoff/xdrv_10_rules.ino | 28 +- 33 files changed, 4054 insertions(+), 36 deletions(-) create mode 100644 lib/ESPAsyncUDP-0.21/README.md create mode 100644 lib/ESPAsyncUDP-0.21/examples/AsyncUDPClient/AsyncUDPClient.ino create mode 100644 lib/ESPAsyncUDP-0.21/examples/AsyncUDPMulticastServer/AsyncUDPMulticastServer.ino create mode 100644 lib/ESPAsyncUDP-0.21/examples/AsyncUDPServer/AsyncUDPServer.ino create mode 100644 lib/ESPAsyncUDP-0.21/keywords.txt create mode 100644 lib/ESPAsyncUDP-0.21/library.json create mode 100644 lib/ESPAsyncUDP-0.21/library.properties create mode 100644 lib/ESPAsyncUDP-0.21/src/AsyncUDP.cpp create mode 100644 lib/ESPAsyncUDP-0.21/src/ESPAsyncUDP.h create mode 100644 lib/ESPAsyncUDP-0.21/travis/common.sh create mode 100644 lib/esp-knx-ip-async-udp-0.4.0.15/DPT.h create mode 100644 lib/esp-knx-ip-async-udp-0.4.0.15/LICENSE create mode 100644 lib/esp-knx-ip-async-udp-0.4.0.15/README.md create mode 100644 lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-config.cpp create mode 100644 lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-conversion.cpp create mode 100644 lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-send.cpp create mode 100644 lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-webserver.cpp create mode 100644 lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip.cpp create mode 100644 lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip.h create mode 100644 lib/esp-knx-ip-async-udp-0.4.0.15/examples/environment-sensor/environment-sensor.ino create mode 100644 lib/esp-knx-ip-async-udp-0.4.0.15/examples/sonoff/sonoff.ino create mode 100644 lib/esp-knx-ip-async-udp-0.4.0.15/examples/static-config/static-config.ino create mode 100644 lib/esp-knx-ip-async-udp-0.4.0.15/keywords.txt create mode 100644 lib/esp-knx-ip-async-udp-0.4.0.15/library.properties diff --git a/lib/ESPAsyncUDP-0.21/README.md b/lib/ESPAsyncUDP-0.21/README.md new file mode 100644 index 000000000..6568fa372 --- /dev/null +++ b/lib/ESPAsyncUDP-0.21/README.md @@ -0,0 +1,12 @@ +# ESPAsyncUDP +_Library patched with the [PR #21](https://github.com/me-no-dev/ESPAsyncUDP/pull/21)_ + +Async UDP Library for ESP8266 Arduino [![Build Status](https://travis-ci.org/me-no-dev/ESPAsyncUDP.svg?branch=master)](https://travis-ci.org/me-no-dev/ESPAsyncUDP) + +[![Join the chat at https://gitter.im/me-no-dev/ESPAsyncWebServer](https://badges.gitter.im/me-no-dev/ESPAsyncWebServer.svg)](https://gitter.im/me-no-dev/ESPAsyncWebServer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +This is a fully asynchronous UDP library, aimed at enabling trouble-free, multi-connection network environment for Espressif's ESP8266 MCUs. + +The library is easy to use and includes support for Unicast, Broadcast and Multicast environments + +Latest GIT version of ESP8266 Arduino might be required for this library to work diff --git a/lib/ESPAsyncUDP-0.21/examples/AsyncUDPClient/AsyncUDPClient.ino b/lib/ESPAsyncUDP-0.21/examples/AsyncUDPClient/AsyncUDPClient.ino new file mode 100644 index 000000000..cf528fe12 --- /dev/null +++ b/lib/ESPAsyncUDP-0.21/examples/AsyncUDPClient/AsyncUDPClient.ino @@ -0,0 +1,51 @@ +#include +#include "ESPAsyncUDP.h" + +const char * ssid = "***********"; +const char * password = "***********"; + +AsyncUDP udp; + +void setup() +{ + Serial.begin(115200); + WiFi.mode(WIFI_STA); + WiFi.begin(ssid, password); + if (WiFi.waitForConnectResult() != WL_CONNECTED) { + Serial.println("WiFi Failed"); + while(1) { + delay(1000); + } + } + if(udp.connect(IPAddress(192,168,1,100), 1234)) { + Serial.println("UDP connected"); + udp.onPacket([](AsyncUDPPacket packet) { + Serial.print("UDP Packet Type: "); + Serial.print(packet.isBroadcast()?"Broadcast":packet.isMulticast()?"Multicast":"Unicast"); + Serial.print(", From: "); + Serial.print(packet.remoteIP()); + Serial.print(":"); + Serial.print(packet.remotePort()); + Serial.print(", To: "); + Serial.print(packet.localIP()); + Serial.print(":"); + Serial.print(packet.localPort()); + Serial.print(", Length: "); + Serial.print(packet.length()); + Serial.print(", Data: "); + Serial.write(packet.data(), packet.length()); + Serial.println(); + //reply to the client + packet.printf("Got %u bytes of data", packet.length()); + }); + //Send unicast + udp.print("Hello Server!"); + } +} + +void loop() +{ + delay(1000); + //Send broadcast on port 1234 + udp.broadcastTo("Anyone here?", 1234); +} diff --git a/lib/ESPAsyncUDP-0.21/examples/AsyncUDPMulticastServer/AsyncUDPMulticastServer.ino b/lib/ESPAsyncUDP-0.21/examples/AsyncUDPMulticastServer/AsyncUDPMulticastServer.ino new file mode 100644 index 000000000..bb3e69c9b --- /dev/null +++ b/lib/ESPAsyncUDP-0.21/examples/AsyncUDPMulticastServer/AsyncUDPMulticastServer.ino @@ -0,0 +1,52 @@ +#include +#include "ESPAsyncUDP.h" + +const char * ssid = "***********"; +const char * password = "***********"; + +AsyncUDP udp; + +void setup() +{ + Serial.begin(115200); + WiFi.mode(WIFI_STA); + WiFi.begin(ssid, password); + if (WiFi.waitForConnectResult() != WL_CONNECTED) { + Serial.println("WiFi Failed"); + while(1) { + delay(1000); + } + } + if(udp.listenMulticast(IPAddress(239,1,2,3), 1234)) { + Serial.print("UDP Listening on IP: "); + Serial.println(WiFi.localIP()); + udp.onPacket([](AsyncUDPPacket packet) { + Serial.print("UDP Packet Type: "); + Serial.print(packet.isBroadcast()?"Broadcast":packet.isMulticast()?"Multicast":"Unicast"); + Serial.print(", From: "); + Serial.print(packet.remoteIP()); + Serial.print(":"); + Serial.print(packet.remotePort()); + Serial.print(", To: "); + Serial.print(packet.localIP()); + Serial.print(":"); + Serial.print(packet.localPort()); + Serial.print(", Length: "); + Serial.print(packet.length()); + Serial.print(", Data: "); + Serial.write(packet.data(), packet.length()); + Serial.println(); + //reply to the client + packet.printf("Got %u bytes of data", packet.length()); + }); + //Send multicast + udp.print("Hello!"); + } +} + +void loop() +{ + delay(1000); + //Send multicast + udp.print("Anyone here?"); +} diff --git a/lib/ESPAsyncUDP-0.21/examples/AsyncUDPServer/AsyncUDPServer.ino b/lib/ESPAsyncUDP-0.21/examples/AsyncUDPServer/AsyncUDPServer.ino new file mode 100644 index 000000000..fc12a7fc3 --- /dev/null +++ b/lib/ESPAsyncUDP-0.21/examples/AsyncUDPServer/AsyncUDPServer.ino @@ -0,0 +1,50 @@ +#include +#include "ESPAsyncUDP.h" + +const char * ssid = "***********"; +const char * password = "***********"; + +AsyncUDP udp; + +void setup() +{ + Serial.begin(115200); + WiFi.mode(WIFI_STA); + WiFi.begin(ssid, password); + if (WiFi.waitForConnectResult() != WL_CONNECTED) { + Serial.println("WiFi Failed"); + while(1) { + delay(1000); + } + } + if(udp.listen(1234)) { + Serial.print("UDP Listening on IP: "); + Serial.println(WiFi.localIP()); + udp.onPacket([](AsyncUDPPacket packet) { + Serial.print("UDP Packet Type: "); + Serial.print(packet.isBroadcast()?"Broadcast":packet.isMulticast()?"Multicast":"Unicast"); + Serial.print(", From: "); + Serial.print(packet.remoteIP()); + Serial.print(":"); + Serial.print(packet.remotePort()); + Serial.print(", To: "); + Serial.print(packet.localIP()); + Serial.print(":"); + Serial.print(packet.localPort()); + Serial.print(", Length: "); + Serial.print(packet.length()); + Serial.print(", Data: "); + Serial.write(packet.data(), packet.length()); + Serial.println(); + //reply to the client + packet.printf("Got %u bytes of data", packet.length()); + }); + } +} + +void loop() +{ + delay(1000); + //Send broadcast + udp.broadcast("Anyone here?"); +} diff --git a/lib/ESPAsyncUDP-0.21/keywords.txt b/lib/ESPAsyncUDP-0.21/keywords.txt new file mode 100644 index 000000000..67c0b97a7 --- /dev/null +++ b/lib/ESPAsyncUDP-0.21/keywords.txt @@ -0,0 +1,33 @@ +####################################### +# Syntax Coloring Map For Ultrasound +####################################### + +####################################### +# Datatypes (KEYWORD1) +####################################### + +AsyncUDP KEYWORD1 +AsyncUDPPacket KEYWORD1 + +####################################### +# Methods and Functions (KEYWORD2) +####################################### + +connect KEYWORD2 +connected KEYWORD2 +listen KEYWORD2 +listenMulticast KEYWORD2 +close KEYWORD2 +write KEYWORD2 +broadcast KEYWORD2 +onPacket KEYWORD2 +data KEYWORD2 +length KEYWORD2 +localIP KEYWORD2 +localPort KEYWORD2 +remoteIP KEYWORD2 +remotePort KEYWORD2 + +####################################### +# Constants (LITERAL1) +####################################### diff --git a/lib/ESPAsyncUDP-0.21/library.json b/lib/ESPAsyncUDP-0.21/library.json new file mode 100644 index 000000000..fe300b6e6 --- /dev/null +++ b/lib/ESPAsyncUDP-0.21/library.json @@ -0,0 +1,17 @@ +{ + "name":"ESPAsyncUDP", + "description":"Asynchronous UDP Library for ESP8266", + "keywords":"async,udp,server,client,multicast,broadcast", + "authors": + { + "name": "Hristo Gochkov", + "maintainer": true + }, + "repository": + { + "type": "git", + "url": "https://github.com/me-no-dev/ESPAsyncUDP.git" + }, + "frameworks": "arduino", + "platforms":"espressif" +} diff --git a/lib/ESPAsyncUDP-0.21/library.properties b/lib/ESPAsyncUDP-0.21/library.properties new file mode 100644 index 000000000..1aa6ef1ad --- /dev/null +++ b/lib/ESPAsyncUDP-0.21/library.properties @@ -0,0 +1,9 @@ +name=ESP Async UDP +version=1.0.0 +author=Me-No-Dev +maintainer=Me-No-Dev +sentence=Async UDP Library for ESP8266 +paragraph=Async UDP Library for ESP8266 +category=Other +url=https://github.com/me-no-dev/ESPAsyncUDP +architectures=* diff --git a/lib/ESPAsyncUDP-0.21/src/AsyncUDP.cpp b/lib/ESPAsyncUDP-0.21/src/AsyncUDP.cpp new file mode 100644 index 000000000..6d2423819 --- /dev/null +++ b/lib/ESPAsyncUDP-0.21/src/AsyncUDP.cpp @@ -0,0 +1,425 @@ +#include "Arduino.h" +#include "ESPAsyncUDP.h" + +extern "C" { +#include "user_interface.h" +#include "lwip/opt.h" +#include "lwip/inet.h" +#include "lwip/udp.h" +#include "lwip/igmp.h" +} + +AsyncUDPMessage::AsyncUDPMessage(size_t size) +{ + _index = 0; + if(size > 1460) { + size = 1460; + } + _size = size; + _buffer = (uint8_t *)malloc(size); +} + +AsyncUDPMessage::~AsyncUDPMessage() +{ + if(_buffer) { + free(_buffer); + } +} + +size_t AsyncUDPMessage::write(const uint8_t *data, size_t len) +{ + if(_buffer == NULL) { + return 0; + } + size_t s = space(); + if(len > s) { + len = s; + } + memcpy(_buffer + _index, data, len); + _index += len; + return len; +} + +size_t AsyncUDPMessage::write(uint8_t data) +{ + return write(&data, 1); +} + +size_t AsyncUDPMessage::space() +{ + if(_buffer == NULL) { + return 0; + } + return _size - _index; +} + +uint8_t * AsyncUDPMessage::data() +{ + return _buffer; +} + +size_t AsyncUDPMessage::length() +{ + return _index; +} + +void AsyncUDPMessage::flush() +{ + _index = 0; +} + + +AsyncUDPPacket::AsyncUDPPacket(AsyncUDP *udp, ip_addr_t *localIp, uint16_t localPort, ip_addr_t *remoteIp, uint16_t remotePort, uint8_t *data, size_t len) +{ + _udp = udp; + _localIp = localIp; + _localPort = localPort; + _remoteIp = remoteIp; + _remotePort = remotePort; + _data = data; + _len = len; +} + +AsyncUDPPacket::~AsyncUDPPacket() +{ + +} + +uint8_t * AsyncUDPPacket::data() +{ + return _data; +} + +size_t AsyncUDPPacket::length() +{ + return _len; +} + +IPAddress AsyncUDPPacket::localIP() +{ + return IPAddress(_localIp->addr); +} + +uint16_t AsyncUDPPacket::localPort() +{ + return _localPort; +} + +IPAddress AsyncUDPPacket::remoteIP() +{ + return IPAddress(_remoteIp->addr); +} + +uint16_t AsyncUDPPacket::remotePort() +{ + return _remotePort; +} + +bool AsyncUDPPacket::isBroadcast() +{ + return _localIp->addr == 0xFFFFFFFF || _localIp->addr == (uint32_t)(0); +} + +bool AsyncUDPPacket::isMulticast() +{ + return ip_addr_ismulticast(_localIp); +} + +size_t AsyncUDPPacket::write(const uint8_t *data, size_t len) +{ + return _udp->writeTo(data, len, _remoteIp, _remotePort); +} + +size_t AsyncUDPPacket::write(uint8_t data) +{ + return write(&data, 1); +} + +size_t AsyncUDPPacket::send(AsyncUDPMessage &message) +{ + return write(message.data(), message.length()); +} + + + +AsyncUDP::AsyncUDP() +{ + _pcb = NULL; + _connected = false; + _handler = NULL; +} + +AsyncUDP::~AsyncUDP() +{ + close(); +} + +AsyncUDP::operator bool() +{ + return _connected; +} + +bool AsyncUDP::connected() +{ + return _connected; +} + +void AsyncUDP::onPacket(AuPacketHandlerFunctionWithArg cb, void * arg) +{ + onPacket(std::bind(cb, arg, std::placeholders::_1)); +} + +void AsyncUDP::onPacket(AuPacketHandlerFunction cb) +{ + _handler = cb; +} + +void AsyncUDP::_recv(udp_pcb *upcb, pbuf *pb, ip_addr_t *addr, uint16_t port) +{ + (void)upcb; // its unused, avoid warning + while(pb != NULL) { + if(_handler) { + uint8_t * data = (uint8_t*)((pb)->payload); + size_t len = pb->len; + + ip_hdr* iphdr = reinterpret_cast(data - UDP_HLEN - IP_HLEN); + ip_addr_t daddr; + daddr.addr = iphdr->dest.addr; + + udp_hdr* udphdr = reinterpret_cast(((uint8_t*)((pb)->payload)) - UDP_HLEN); + uint16_t dport = ntohs(udphdr->dest); + + AsyncUDPPacket packet(this, &daddr, dport, addr, port, data, len); + _handler(packet); + } + + pbuf * this_pb = pb; + pb = pb->next; + this_pb->next = NULL; + pbuf_free(this_pb); + } +} + +#if LWIP_VERSION_MAJOR == 1 +void AsyncUDP::_s_recv(void *arg, udp_pcb *upcb, pbuf *p, ip_addr_t *addr, uint16_t port) +#else +void AsyncUDP::_s_recv(void *arg, udp_pcb *upcb, pbuf *p, const ip_addr_t *addr, uint16_t port) +#endif +{ + reinterpret_cast(arg)->_recv(upcb, p, (ip_addr_t *)addr, port); +} + +bool AsyncUDP::listen(ip_addr_t *addr, uint16_t port) +{ + close(); + _pcb = udp_new(); + if(_pcb == NULL) { + return false; + } + err_t err = udp_bind(_pcb, addr, port); + if(err != ERR_OK) { + close(); + return false; + } + udp_recv(_pcb, &_s_recv, (void *) this); + _connected = true; + return true; +} + +bool AsyncUDP::listenMulticast(ip_addr_t *addr, uint16_t port, uint8_t ttl) +{ + close(); + if(!ip_addr_ismulticast(addr)) { + return false; + } + ip_addr_t multicast_if_addr; + struct ip_info ifIpInfo; + int mode = wifi_get_opmode(); + if(mode & STATION_MODE) { + wifi_get_ip_info(STATION_IF, &ifIpInfo); + multicast_if_addr.addr = ifIpInfo.ip.addr; + } else if (mode & SOFTAP_MODE) { + wifi_get_ip_info(SOFTAP_IF, &ifIpInfo); + multicast_if_addr.addr = ifIpInfo.ip.addr; + } else { + return false; + } + if (igmp_joingroup(&multicast_if_addr, addr)!= ERR_OK) { + return false; + } + if(!listen(IPADDR_ANY, port)) { + return false; + } +#if LWIP_VERSION_MAJOR == 1 + udp_set_multicast_netif_addr(_pcb, multicast_if_addr); +#else + udp_set_multicast_netif_addr(_pcb, &multicast_if_addr); +#endif + udp_set_multicast_ttl(_pcb, ttl); + ip_addr_copy(_pcb->remote_ip, *addr); + _pcb->remote_port = port; + return true; +} + +bool AsyncUDP::connect(ip_addr_t *addr, uint16_t port) +{ + close(); + _pcb = udp_new(); + if(_pcb == NULL) { + return false; + } + err_t err = udp_connect(_pcb, addr, port); + if(err != ERR_OK) { + close(); + return false; + } + udp_recv(_pcb, &_s_recv, (void *) this); + _connected = true; + return true; +} + +void AsyncUDP::close() +{ + if(_pcb != NULL) { + if(_connected) { + udp_disconnect(_pcb); + } + udp_remove(_pcb); + _connected = false; + _pcb = NULL; + } +} + +size_t AsyncUDP::writeTo(const uint8_t *data, size_t len, ip_addr_t *addr, uint16_t port) +{ + if(!_pcb && !connect(addr, port)) { + return 0; + } + if(len > 1460) { + len = 1460; + } + pbuf* pbt = pbuf_alloc(PBUF_TRANSPORT, len, PBUF_RAM); + if(pbt != NULL) { + uint8_t* dst = reinterpret_cast(pbt->payload); + memcpy(dst, data, len); + err_t err = udp_sendto(_pcb, pbt, addr, port); + pbuf_free(pbt); + if(err < ERR_OK) { + return 0; + } + return len; + } + return 0; +} + +bool AsyncUDP::listen(const IPAddress addr, uint16_t port) +{ + ip_addr_t laddr; + laddr.addr = addr; + return listen(&laddr, port); +} + +bool AsyncUDP::listen(uint16_t port) +{ + return listen(IPAddress((uint32_t)INADDR_ANY), port); +} + +bool AsyncUDP::listenMulticast(const IPAddress addr, uint16_t port, uint8_t ttl) +{ + ip_addr_t laddr; + laddr.addr = addr; + return listenMulticast(&laddr, port, ttl); +} + +bool AsyncUDP::connect(const IPAddress addr, uint16_t port) +{ + ip_addr_t daddr; + daddr.addr = addr; + return connect(&daddr, port); +} + +size_t AsyncUDP::writeTo(const uint8_t *data, size_t len, const IPAddress addr, uint16_t port) +{ + ip_addr_t daddr; + daddr.addr = addr; + return writeTo(data, len, &daddr, port); +} + +size_t AsyncUDP::write(const uint8_t *data, size_t len) +{ + if(_pcb) + { + return writeTo(data, len, &(_pcb->remote_ip), _pcb->remote_port); + } +} + +size_t AsyncUDP::write(uint8_t data) +{ + return write(&data, 1); +} + +size_t AsyncUDP::broadcastTo(uint8_t *data, size_t len, uint16_t port) +{ + ip_addr_t daddr; + daddr.addr = 0xFFFFFFFF; + return writeTo(data, len, &daddr, port); +} + +size_t AsyncUDP::broadcastTo(const char * data, uint16_t port) +{ + return broadcastTo((uint8_t *)data, strlen(data), port); +} + +size_t AsyncUDP::broadcast(uint8_t *data, size_t len) +{ + if(_pcb->local_port != 0) { + return broadcastTo(data, len, _pcb->local_port); + } + return 0; +} + +size_t AsyncUDP::broadcast(const char * data) +{ + return broadcast((uint8_t *)data, strlen(data)); +} + + +size_t AsyncUDP::sendTo(AsyncUDPMessage &message, ip_addr_t *addr, uint16_t port) +{ + if(!message) { + return 0; + } + return writeTo(message.data(), message.length(), addr, port); +} + +size_t AsyncUDP::sendTo(AsyncUDPMessage &message, const IPAddress addr, uint16_t port) +{ + if(!message) { + return 0; + } + return writeTo(message.data(), message.length(), addr, port); +} + +size_t AsyncUDP::send(AsyncUDPMessage &message) +{ + if((!message) || (!_pcb)) { + return 0; + } + return writeTo(message.data(), message.length(), &(_pcb->remote_ip), _pcb->remote_port); +} + +size_t AsyncUDP::broadcastTo(AsyncUDPMessage &message, uint16_t port) +{ + if(!message) { + return 0; + } + return broadcastTo(message.data(), message.length(), port); +} + +size_t AsyncUDP::broadcast(AsyncUDPMessage &message) +{ + if(!message) { + return 0; + } + return broadcast(message.data(), message.length()); +} diff --git a/lib/ESPAsyncUDP-0.21/src/ESPAsyncUDP.h b/lib/ESPAsyncUDP-0.21/src/ESPAsyncUDP.h new file mode 100644 index 000000000..8e5a70b21 --- /dev/null +++ b/lib/ESPAsyncUDP-0.21/src/ESPAsyncUDP.h @@ -0,0 +1,130 @@ +#ifndef ESPASYNCUDP_H +#define ESPASYNCUDP_H + +#include "IPAddress.h" +#include "Print.h" +#include +#include "lwip/init.h" + +class AsyncUDP; +class AsyncUDPPacket; +class AsyncUDPMessage; +struct udp_pcb; +struct pbuf; +#if LWIP_VERSION_MAJOR == 1 +struct ip_addr; +typedef struct ip_addr ip_addr_t; +#else +struct ip4_addr; +typedef struct ip4_addr ip_addr_t; +#endif + +class AsyncUDPMessage : public Print +{ +protected: + uint8_t *_buffer; + size_t _index; + size_t _size; +public: + AsyncUDPMessage(size_t size=1460); + virtual ~AsyncUDPMessage(); + size_t write(const uint8_t *data, size_t len); + size_t write(uint8_t data); + size_t space(); + uint8_t * data(); + size_t length(); + void flush(); + operator bool() + { + return _buffer != NULL; + } +}; + +class AsyncUDPPacket : public Print +{ +protected: + AsyncUDP *_udp; + ip_addr_t *_localIp; + uint16_t _localPort; + ip_addr_t *_remoteIp; + uint16_t _remotePort; + uint8_t *_data; + size_t _len; +public: + AsyncUDPPacket(AsyncUDP *udp, ip_addr_t *localIp, uint16_t localPort, ip_addr_t *remoteIp, uint16_t remotePort, uint8_t *data, size_t len); + virtual ~AsyncUDPPacket(); + + uint8_t * data(); + size_t length(); + bool isBroadcast(); + bool isMulticast(); + + IPAddress localIP(); + uint16_t localPort(); + IPAddress remoteIP(); + uint16_t remotePort(); + + size_t send(AsyncUDPMessage &message); + + size_t write(const uint8_t *data, size_t len); + size_t write(uint8_t data); +}; + +typedef std::function AuPacketHandlerFunction; +typedef std::function AuPacketHandlerFunctionWithArg; + +class AsyncUDP : public Print +{ +protected: + udp_pcb *_pcb; + bool _connected; + AuPacketHandlerFunction _handler; + + void _recv(udp_pcb *upcb, pbuf *pb, ip_addr_t *addr, uint16_t port); +#if LWIP_VERSION_MAJOR == 1 + static void _s_recv(void *arg, udp_pcb *upcb, pbuf *p, ip_addr_t *addr, uint16_t port); +#else + static void _s_recv(void *arg, udp_pcb *upcb, pbuf *p, const ip_addr_t *addr, uint16_t port); +#endif + +public: + AsyncUDP(); + virtual ~AsyncUDP(); + + void onPacket(AuPacketHandlerFunctionWithArg cb, void * arg=NULL); + void onPacket(AuPacketHandlerFunction cb); + + bool listen(ip_addr_t *addr, uint16_t port); + bool listen(const IPAddress addr, uint16_t port); + bool listen(uint16_t port); + + bool listenMulticast(ip_addr_t *addr, uint16_t port, uint8_t ttl=1); + bool listenMulticast(const IPAddress addr, uint16_t port, uint8_t ttl=1); + + bool connect(ip_addr_t *addr, uint16_t port); + bool connect(const IPAddress addr, uint16_t port); + + void close(); + + size_t writeTo(const uint8_t *data, size_t len, ip_addr_t *addr, uint16_t port); + size_t writeTo(const uint8_t *data, size_t len, const IPAddress addr, uint16_t port); + size_t write(const uint8_t *data, size_t len); + size_t write(uint8_t data); + + size_t broadcastTo(uint8_t *data, size_t len, uint16_t port); + size_t broadcastTo(const char * data, uint16_t port); + size_t broadcast(uint8_t *data, size_t len); + size_t broadcast(const char * data); + + size_t sendTo(AsyncUDPMessage &message, ip_addr_t *addr, uint16_t port); + size_t sendTo(AsyncUDPMessage &message, const IPAddress addr, uint16_t port); + size_t send(AsyncUDPMessage &message); + + size_t broadcastTo(AsyncUDPMessage &message, uint16_t port); + size_t broadcast(AsyncUDPMessage &message); + + bool connected(); + operator bool(); +}; + +#endif diff --git a/lib/ESPAsyncUDP-0.21/travis/common.sh b/lib/ESPAsyncUDP-0.21/travis/common.sh new file mode 100644 index 000000000..57bede343 --- /dev/null +++ b/lib/ESPAsyncUDP-0.21/travis/common.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +function build_sketches() +{ + local arduino=$1 + local srcpath=$2 + local platform=$3 + local sketches=$(find $srcpath -name *.ino) + for sketch in $sketches; do + local sketchdir=$(dirname $sketch) + if [[ -f "$sketchdir/.$platform.skip" ]]; then + echo -e "\n\n ------------ Skipping $sketch ------------ \n\n"; + continue + fi + echo -e "\n\n ------------ Building $sketch ------------ \n\n"; + $arduino --verify $sketch; + local result=$? + if [ $result -ne 0 ]; then + echo "Build failed ($1)" + return $result + fi + done +} diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/DPT.h b/lib/esp-knx-ip-async-udp-0.4.0.15/DPT.h new file mode 100644 index 000000000..72e0c7f54 --- /dev/null +++ b/lib/esp-knx-ip-async-udp-0.4.0.15/DPT.h @@ -0,0 +1,72 @@ +/** + * esp-knx-ip library for KNX/IP communication on an ESP8266 + * Author: Nico Weichbrodt + * License: MIT + */ + +typedef enum __dpt_1_001 +{ + DPT_1_001_OFF = 0x00, + DPT_1_001_ON = 0x01, +} dpt_1_001_t; + +typedef enum __dpt_2_001 +{ + DPT_2_001_NO_OFF = 0b00, + DPT_2_001_NO_ON = 0b01, + DPT_2_001_YES_OFF = 0b10, + DPT_2_001_YES_ON = 0b11, +} dpt_2_001_t; + +typedef enum __dpt_3_007 +{ + DPT_3_007_DECREASE_STOP = 0x00, + DPT_3_007_DECREASE_100 = 0x01, + DPT_3_007_DECREASE_50 = 0x02, + DPT_3_007_DECREASE_25 = 0x03, + DPT_3_007_DECREASE_12 = 0x04, + DPT_3_007_DECREASE_6 = 0x05, + DPT_3_007_DECREASE_3 = 0x06, + DPT_3_007_DECREASE_1 = 0x07, + DPT_3_007_INCREASE_STOP = 0x08, + DPT_3_007_INCREASE_100 = 0x09, + DPT_3_007_INCREASE_50 = 0x0A, + DPT_3_007_INCREASE_25 = 0x0B, + DPT_3_007_INCREASE_12 = 0x0C, + DPT_3_007_INCREASE_6 = 0x0D, + DPT_3_007_INCREASE_3 = 0x0E, + DPT_3_007_INCREASE_1 = 0x0F, +} dpt_3_007_t; + +typedef enum __weekday +{ + DPT_10_001_WEEKDAY_MONDAY = 1, + DPT_10_001_WEEKDAY_TUESDAY = 2, + DPT_10_001_WEEKDAY_WEDNESDAY = 3, + DPT_10_001_WEEKDAY_THURSDAY = 4, + DPT_10_001_WEEKDAY_FRIDAY = 5, + DPT_10_001_WEEKDAY_SATURDAY = 6, + DPT_10_001_WEEKDAY_SUNDAY = 8, +} weekday_t; + +typedef struct __time_of_day +{ + weekday_t weekday; + uint8_t hours; + uint8_t minutes; + uint8_t seconds; +} time_of_day_t; + +typedef struct __date +{ + uint8_t day; + uint8_t month; + uint8_t year; +} date_t; + +typedef struct __color +{ + uint8_t red; + uint8_t green; + uint8_t blue; +} color_t; \ No newline at end of file diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/LICENSE b/lib/esp-knx-ip-async-udp-0.4.0.15/LICENSE new file mode 100644 index 000000000..80f432a97 --- /dev/null +++ b/lib/esp-knx-ip-async-udp-0.4.0.15/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018 Nico Weichbrodt + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/README.md b/lib/esp-knx-ip-async-udp-0.4.0.15/README.md new file mode 100644 index 000000000..b18b50d6b --- /dev/null +++ b/lib/esp-knx-ip-async-udp-0.4.0.15/README.md @@ -0,0 +1,107 @@ +# ESP-KNX-IP # + +This is a library for the ESP8266 to enable KNXnet/IP communication. It uses UDP multicast on 224.0.23.12:3671. +It is intended to be used with the Arduino platform for the ESP8266. + +## Prerequisities / Dependencies ## + +* You need version 2.4.0 of the esp8266 board libraries. + * I only tested with lwip v1.4. v2 might work, you need to test yourself. +* You need the [ESPAsyncUDP](https://github.com/me-no-dev/ESPAsyncUDP) library. +* You need a KNXnet/IP **router**. A gateway will **not** work. Alternatively use [knxd](https://github.com/knxd/knxd). + +## Caveats ## + +Receiving packets should work immediately. + +Sending sometimes only works after a substantial amount of time (max 5 minutes in my experiments). In my case, this was fixed by disabling IGMP snooping on the switch(es). + +## How to use ## + +The library is under development. API may change multiple times in the future. + +API documentation is available [here](https://github.com/envy/esp-knx-ip/wiki/API) + +A simple example: + +```c++ +#include + +const char* ssid = "my-ssid"; // your network SSID (name) +const char* pass = "my-pw"; // your network password + +config_id_t my_GA; +config_id_t param_id; + +int8_t some_var = 0; + +void setup() +{ + // Register a callback that is called when a configurable group address is receiving a telegram + knx.register_callback("Set/Get callback", my_callback); + knx.register_callback("Write callback", my_other_callback); + + int default_val = 21; + param_id = knx.config_register_int("My Parameter", default_val); + + // Register a configurable group address for sending out answers + my_GA = knx.config_register_ga("Answer GA"); + + knx.load(); // Try to load a config from EEPROM + + WiFi.begin(ssid, pass); + while (WiFi.status() != WL_CONNECTED) { + delay(500); + } + + knx.start(); // Start everything. Must be called after WiFi connection has been established +} + +void loop() +{ + knx.loop(); +} + + +void my_callback(message_t const &msg, void *arg) +{ + switch (msg.ct) + { + case KNX_CT_WRITE: + // Save received data + some_var = knx.data_to_1byte_int(msg.data); + break; + case KNX_CT_READ: + // Answer with saved data + knx.answer1ByteInt(msg.received_on, some_var); + break; + } +} + +void my_other_callback(message_t const &msg, void *arg) +{ + switch (msg.ct) + { + case KNX_CT_WRITE: + // Write an answer somewhere else + int value = knx.config_get_int(param_id); + address_t ga = knx.config_get_ga(my_GA); + knx.answer1ByteInt(ga, (int8_t)value); + break; + } +} + +``` + +## How to configure (buildtime) ## + +Open the `esp-knx-ip.h` and take a look at the config options at the top inside the block marked `CONFIG` + +## How to configure (runtime) ## + +Simply visit the IP of your ESP with a webbrowser. You can configure the following: +* KNX physical address +* Which group address should trigger which callback +* Which group address are to be used by the program (e.g. for status replies) + +The configuration is dynamically generated from the code. \ No newline at end of file diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-config.cpp b/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-config.cpp new file mode 100644 index 000000000..8d2b7b39d --- /dev/null +++ b/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-config.cpp @@ -0,0 +1,358 @@ +/** + * esp-knx-ip library for KNX/IP communication on an ESP8266 + * Author: Nico Weichbrodt + * License: MIT + */ + +#include "esp-knx-ip.h" + +/** + * Physical address functions + */ + +void ESPKNXIP::physical_address_set(address_t const &addr) +{ + physaddr = addr; +} + +address_t ESPKNXIP::physical_address_get() +{ + return physaddr; +} + +/** + * Configuration functions start here + */ +config_id_t ESPKNXIP::config_register_string(String name, uint8_t len, String _default, enable_condition_t cond) +{ + if (registered_configs >= MAX_CONFIGS) + return -1; + + if (_default.length() >= len) + return -1; + + config_id_t id = registered_configs; + + custom_configs[id].name = name; + custom_configs[id].type = CONFIG_TYPE_STRING; + custom_configs[id].len = sizeof(uint8_t) + len; + custom_configs[id].cond = cond; + if (id == 0) + custom_configs[id].offset = 0; + else + custom_configs[id].offset = custom_configs[id - 1].offset + custom_configs[id - 1].len; + + __config_set_string(id, _default); + + registered_configs++; + + DEBUG_PRINT("Registered config >"); + DEBUG_PRINT(name); + DEBUG_PRINT("< @ "); + DEBUG_PRINT(id); + DEBUG_PRINT("/string["); + DEBUG_PRINT(custom_configs[id].offset); + DEBUG_PRINT("+"); + DEBUG_PRINT(custom_configs[id].len); + DEBUG_PRINTLN("]"); + + return id; +} + +config_id_t ESPKNXIP::config_register_int(String name, int32_t _default, enable_condition_t cond) +{ + if (registered_configs >= MAX_CONFIGS) + return -1; + + config_id_t id = registered_configs; + + custom_configs[id].name = name; + custom_configs[id].type = CONFIG_TYPE_INT; + custom_configs[id].len = sizeof(uint8_t) + sizeof(int32_t); + custom_configs[id].cond = cond; + if (id == 0) + custom_configs[id].offset = 0; + else + custom_configs[id].offset = custom_configs[id - 1].offset + custom_configs[id - 1].len; + + __config_set_int(id, _default); + + registered_configs++; + + DEBUG_PRINT("Registered config >"); + DEBUG_PRINT(name); + DEBUG_PRINT("< @ "); + DEBUG_PRINT(id); + DEBUG_PRINT("/int["); + DEBUG_PRINT(custom_configs[id].offset); + DEBUG_PRINT("+"); + DEBUG_PRINT(custom_configs[id].len); + DEBUG_PRINTLN("]"); + + return id; +} + +config_id_t ESPKNXIP::config_register_bool(String name, bool _default, enable_condition_t cond) +{ + if (registered_configs >= MAX_CONFIGS) + return -1; + + config_id_t id = registered_configs; + + custom_configs[id].name = name; + custom_configs[id].type = CONFIG_TYPE_BOOL; + custom_configs[id].len = sizeof(uint8_t) + sizeof(uint8_t); + custom_configs[id].cond = cond; + if (id == 0) + custom_configs[id].offset = 0; + else + custom_configs[id].offset = custom_configs[id - 1].offset + custom_configs[id - 1].len; + + __config_set_bool(id, _default); + + registered_configs++; + + DEBUG_PRINT("Registered config >"); + DEBUG_PRINT(name); + DEBUG_PRINT("< @ "); + DEBUG_PRINT(id); + DEBUG_PRINT("/bool["); + DEBUG_PRINT(custom_configs[id].offset); + DEBUG_PRINT("+"); + DEBUG_PRINT(custom_configs[id].len); + DEBUG_PRINTLN("]"); + + return id; +} + +config_id_t ESPKNXIP::config_register_options(String name, option_entry_t *options, uint8_t _default, enable_condition_t cond) +{ + if (registered_configs >= MAX_CONFIGS) + return -1; + + if (options == nullptr || options->name == nullptr) + return -1; + + config_id_t id = registered_configs; + + custom_configs[id].name = name; + custom_configs[id].type = CONFIG_TYPE_OPTIONS; + custom_configs[id].len = sizeof(uint8_t) + sizeof(uint8_t); + custom_configs[id].cond = cond; + if (id == 0) + custom_configs[id].offset = 0; + else + custom_configs[id].offset = custom_configs[id - 1].offset + custom_configs[id - 1].len; + + custom_configs[id].data.options = options; + + __config_set_options(id, _default); + + registered_configs++; + + DEBUG_PRINT("Registered config >"); + DEBUG_PRINT(name); + DEBUG_PRINT("< @ "); + DEBUG_PRINT(id); + DEBUG_PRINT("/opt["); + DEBUG_PRINT(custom_configs[id].offset); + DEBUG_PRINT("+"); + DEBUG_PRINT(custom_configs[id].len); + DEBUG_PRINTLN("]"); + + return id; +} + +config_id_t ESPKNXIP::config_register_ga(String name, enable_condition_t cond) +{ + if (registered_configs >= MAX_CONFIGS) + return -1; + + config_id_t id = registered_configs; + + custom_configs[id].name = name; + custom_configs[id].type = CONFIG_TYPE_GA; + custom_configs[id].len = sizeof(uint8_t) + sizeof(address_t); + custom_configs[id].cond = cond; + if (id == 0) + custom_configs[id].offset = 0; + else + custom_configs[id].offset = custom_configs[id - 1].offset + custom_configs[id - 1].len; + + address_t t; + t.value = 0; + __config_set_ga(id, t); + + registered_configs++; + + DEBUG_PRINT("Registered config >"); + DEBUG_PRINT(name); + DEBUG_PRINT("< @ "); + DEBUG_PRINT(id); + DEBUG_PRINT("/ga["); + DEBUG_PRINT(custom_configs[id].offset); + DEBUG_PRINT("+"); + DEBUG_PRINT(custom_configs[id].len); + DEBUG_PRINTLN("]"); + + return id; +} + +void ESPKNXIP::__config_set_flags(config_id_t id, config_flags_t flags) +{ + DEBUG_PRINT("Setting flag @ "); + DEBUG_PRINT(custom_configs[id].offset); + DEBUG_PRINT(" to "); + DEBUG_PRINT(custom_config_data[custom_configs[id].offset], BIN); + DEBUG_PRINT(" | "); + DEBUG_PRINT(flags, BIN); + custom_config_data[custom_configs[id].offset] |= (uint8_t)flags; + DEBUG_PRINT(" = "); + DEBUG_PRINTLN(custom_config_data[custom_configs[id].offset], BIN); +} + +void ESPKNXIP::config_set_string(config_id_t id, String val) +{ + if (id >= registered_configs) + return; + if (custom_configs[id].type != CONFIG_TYPE_STRING) + return; + if (val.length() >= custom_configs[id].len) + return; + __config_set_flags(id, CONFIG_FLAGS_VALUE_SET); + __config_set_string(id, val); +} + +void ESPKNXIP::__config_set_string(config_id_t id, String &val) +{ + memcpy(&custom_config_data[custom_configs[id].offset + sizeof(uint8_t)], val.c_str(), val.length()+1); +} + +void ESPKNXIP::config_set_int(config_id_t id, int32_t val) +{ + if (id >= registered_configs) + return; + if (custom_configs[id].type != CONFIG_TYPE_INT) + return; + __config_set_flags(id, CONFIG_FLAGS_VALUE_SET); + __config_set_int(id, val); +} + +void ESPKNXIP::__config_set_int(config_id_t id, int32_t val) +{ + // This does not work for some reason: + // Could be due to pointer alignment + //int32_t *v = (int32_t *)(custom_config_data + custom_configs[id].offset); + //*v = val; + custom_config_data[custom_configs[id].offset + sizeof(uint8_t) + 0] = (uint8_t)((val & 0xFF000000) >> 24); + custom_config_data[custom_configs[id].offset + sizeof(uint8_t) + 1] = (uint8_t)((val & 0x00FF0000) >> 16); + custom_config_data[custom_configs[id].offset + sizeof(uint8_t) + 2] = (uint8_t)((val & 0x0000FF00) >> 8); + custom_config_data[custom_configs[id].offset + sizeof(uint8_t) + 3] = (uint8_t)((val & 0x000000FF) >> 0); +} + +void ESPKNXIP::config_set_bool(config_id_t id, bool val) +{ + if (id >= registered_configs) + return; + if (custom_configs[id].type != CONFIG_TYPE_BOOL) + return; + __config_set_flags(id, CONFIG_FLAGS_VALUE_SET); + __config_set_bool(id, val); +} + +void ESPKNXIP::__config_set_bool(config_id_t id, bool val) +{ + custom_config_data[custom_configs[id].offset + sizeof(uint8_t)] = val ? 1 : 0; +} + +void ESPKNXIP::config_set_options(config_id_t id, uint8_t val) +{ + if (id >= registered_configs) + return; + if (custom_configs[id].type != CONFIG_TYPE_OPTIONS) + return; + + option_entry_t *cur = custom_configs[id].data.options; + while (cur->name != nullptr) + { + if (cur->value == val) + { + __config_set_flags(id, CONFIG_FLAGS_VALUE_SET); + __config_set_options(id, val); + break; + } + cur++; + } +} + +void ESPKNXIP::__config_set_options(config_id_t id, uint8_t val) +{ + custom_config_data[custom_configs[id].offset + sizeof(uint8_t)] = val; +} + +void ESPKNXIP::config_set_ga(config_id_t id, address_t const &val) +{ + if (id >= registered_configs) + return; + if (custom_configs[id].type != CONFIG_TYPE_GA) + return; + __config_set_flags(id, CONFIG_FLAGS_VALUE_SET); + __config_set_ga(id, val); +} + +void ESPKNXIP::__config_set_ga(config_id_t id, address_t const &val) +{ + custom_config_data[custom_configs[id].offset + sizeof(uint8_t) + 0] = val.bytes.high; + custom_config_data[custom_configs[id].offset + sizeof(uint8_t) + 1] = val.bytes.low; +} + +String ESPKNXIP::config_get_string(config_id_t id) +{ + if (id >= registered_configs) + return String(""); + + return String((char *)&custom_config_data[custom_configs[id].offset + sizeof(uint8_t)]); +} + +int32_t ESPKNXIP::config_get_int(config_id_t id) +{ + if (id >= registered_configs) + return 0; + + int32_t v = (custom_config_data[custom_configs[id].offset + sizeof(uint8_t) + 0] << 24) + + (custom_config_data[custom_configs[id].offset + sizeof(uint8_t) + 1] << 16) + + (custom_config_data[custom_configs[id].offset + sizeof(uint8_t) + 2] << 8) + + (custom_config_data[custom_configs[id].offset + sizeof(uint8_t) + 3] << 0); + return v; +} + +bool ESPKNXIP::config_get_bool(config_id_t id) +{ + if (id >= registered_configs) + return false; + + return custom_config_data[custom_configs[id].offset + sizeof(uint8_t)] != 0; +} + +uint8_t ESPKNXIP::config_get_options(config_id_t id) +{ + if (id >= registered_configs) + return false; + + return custom_config_data[custom_configs[id].offset + sizeof(uint8_t)]; +} + +address_t ESPKNXIP::config_get_ga(config_id_t id) +{ + address_t t; + if (id >= registered_configs) + { + t.value = 0; + return t; + } + + t.bytes.high = custom_config_data[custom_configs[id].offset + sizeof(uint8_t) + 0]; + t.bytes.low = custom_config_data[custom_configs[id].offset + sizeof(uint8_t) + 1]; + + return t; +} diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-conversion.cpp b/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-conversion.cpp new file mode 100644 index 000000000..9dc2fd563 --- /dev/null +++ b/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-conversion.cpp @@ -0,0 +1,87 @@ +/** + * esp-knx-ip library for KNX/IP communication on an ESP8266 + * Author: Nico Weichbrodt + * License: MIT + */ + +#include "esp-knx-ip.h" + +/** + * Conversion functions + */ + +bool ESPKNXIP::data_to_bool(uint8_t *data) +{ + return (data[0] & 0x01) == 1 ? true : false; +} + +int8_t ESPKNXIP::data_to_1byte_int(uint8_t *data) +{ + return (int8_t)data[1]; +} + +uint8_t ESPKNXIP::data_to_1byte_uint(uint8_t *data) +{ + return data[1]; +} + +int16_t ESPKNXIP::data_to_2byte_int(uint8_t *data) +{ + return (int16_t)((data[1] << 8) | data[2]); +} + +uint16_t ESPKNXIP::data_to_2byte_uint(uint8_t *data) +{ + return (uint16_t)((data[1] << 8) | data[2]); +} + +float ESPKNXIP::data_to_2byte_float(uint8_t *data) +{ + //uint8_t sign = (data[1] & 0b10000000) >> 7; + uint8_t expo = (data[1] & 0b01111000) >> 3; + int16_t mant = ((data[1] & 0b10000111) << 8) | data[2]; + return 0.01f * mant * pow(2, expo); +} + +time_of_day_t ESPKNXIP::data_to_3byte_time(uint8_t *data) +{ + time_of_day_t time; + time.weekday = (weekday_t)((data[1] & 0b11100000) >> 5); + time.hours = (data[1] & 0b00011111); + time.minutes = (data[2] & 0b00111111); + time.seconds = (data[3] & 0b00111111); + return time; +} + +date_t ESPKNXIP::data_to_3byte_data(uint8_t *data) +{ + date_t date; + date.day = (data[1] & 0b00011111); + date.month = (data[2] & 0b00001111); + date.year = (data[3] & 0b01111111); + return date; +} + +color_t ESPKNXIP::data_to_3byte_color(uint8_t *data) +{ + color_t color; + color.red = data[1]; + color.green = data[2]; + color.blue = data[3]; + return color; +} + +int32_t ESPKNXIP::data_to_4byte_int(uint8_t *data) +{ + return (int32_t)((data[1] << 24) | (data[2] << 16) | (data[3] << 8) | (data[4] << 0)); +} + +uint32_t ESPKNXIP::data_to_4byte_uint(uint8_t *data) +{ + return (uint32_t)((data[1] << 24) | (data[2] << 16) | (data[3] << 8) | (data[4] << 0)); +} + +float ESPKNXIP::data_to_4byte_float(uint8_t *data) +{ + return (float)((data[1] << 24) | (data[2] << 16) | (data[3] << 8) |data[4]); +} \ No newline at end of file diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-send.cpp b/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-send.cpp new file mode 100644 index 000000000..1244fc50a --- /dev/null +++ b/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-send.cpp @@ -0,0 +1,180 @@ +/** + * esp-knx-ip library for KNX/IP communication on an ESP8266 + * Author: Nico Weichbrodt + * License: MIT + */ + +#include "esp-knx-ip.h" + +/** + * Send functions + */ + +void ESPKNXIP::send(address_t const &receiver, knx_command_type_t ct, uint8_t data_len, uint8_t *data) +{ + if (receiver.value == 0) + return; + +#if SEND_CHECKSUM + uint32_t len = 6 + 2 + 8 + data_len + 1; // knx_pkt + cemi_msg + cemi_service + data + checksum +#else + uint32_t len = 6 + 2 + 8 + data_len; // knx_pkt + cemi_msg + cemi_service + data +#endif + DEBUG_PRINT(F("Creating packet with len ")); + DEBUG_PRINTLN(len) + uint8_t buf[len]; + knx_ip_pkt_t *knx_pkt = (knx_ip_pkt_t *)buf; + knx_pkt->header_len = 0x06; + knx_pkt->protocol_version = 0x10; + knx_pkt->service_type = __ntohs(KNX_ST_ROUTING_INDICATION); + knx_pkt->total_len.len = __ntohs(len); + cemi_msg_t *cemi_msg = (cemi_msg_t *)knx_pkt->pkt_data; + cemi_msg->message_code = KNX_MT_L_DATA_IND; + cemi_msg->additional_info_len = 0; + cemi_service_t *cemi_data = &cemi_msg->data.service_information; + cemi_data->control_1.bits.confirm = 0; + cemi_data->control_1.bits.ack = 0; + cemi_data->control_1.bits.priority = B11; + cemi_data->control_1.bits.system_broadcast = 0x01; + cemi_data->control_1.bits.repeat = 0x01; + cemi_data->control_1.bits.reserved = 0; + cemi_data->control_1.bits.frame_type = 0x01; + cemi_data->control_2.bits.extended_frame_format = 0x00; + cemi_data->control_2.bits.hop_count = 0x06; + cemi_data->control_2.bits.dest_addr_type = 0x01; + cemi_data->source = physaddr; + cemi_data->destination = receiver; + //cemi_data->destination.bytes.high = (area << 3) | line; + //cemi_data->destination.bytes.low = member; + cemi_data->data_len = data_len; + cemi_data->pci.apci = (ct & 0x0C) >> 2; + cemi_data->pci.tpci_seq_number = 0x00; // ??? + cemi_data->pci.tpci_comm_type = KNX_COT_UDP; // ??? + memcpy(cemi_data->data, data, data_len); + cemi_data->data[0] = (cemi_data->data[0] & 0x3F) | ((ct & 0x03) << 6); + +#if SEND_CHECKSUM + // Calculate checksum, which is just XOR of all bytes + uint8_t cs = buf[0] ^ buf[1]; + for (uint32_t i = 2; i < len - 1; ++i) + { + cs ^= buf[i]; + } + buf[len - 1] = cs; +#endif + +#ifdef ESP_KNX_DEBUG + DEBUG_PRINT(F("Sending packet:")); + for (int i = 0; i < len; ++i) + { + DEBUG_PRINT(F(" 0x")); + DEBUG_PRINT(buf[i], 16); + } + DEBUG_PRINTLN(F("")); +#endif + + udp.writeTo(buf, len, MULTICAST_IP, MULTICAST_PORT); +} + +void ESPKNXIP::send_1bit(address_t const &receiver, knx_command_type_t ct, uint8_t bit) +{ + uint8_t buf[] = {(uint8_t)(bit & 0b00000001)}; + send(receiver, ct, 1, buf); +} + +void ESPKNXIP::send_2bit(address_t const &receiver, knx_command_type_t ct, uint8_t twobit) +{ + uint8_t buf[] = {(uint8_t)(twobit & 0b00000011)}; + send(receiver, ct, 1, buf); +} + +void ESPKNXIP::send_4bit(address_t const &receiver, knx_command_type_t ct, uint8_t fourbit) +{ + uint8_t buf[] = {(uint8_t)(fourbit & 0b00001111)}; + send(receiver, ct, 1, buf); +} + +void ESPKNXIP::send_1byte_int(address_t const &receiver, knx_command_type_t ct, int8_t val) +{ + uint8_t buf[] = {0x00, (uint8_t)val}; + send(receiver, ct, 2, buf); +} + +void ESPKNXIP::send_1byte_uint(address_t const &receiver, knx_command_type_t ct, uint8_t val) +{ + uint8_t buf[] = {0x00, val}; + send(receiver, ct, 2, buf); +} + +void ESPKNXIP::send_2byte_int(address_t const &receiver, knx_command_type_t ct, int16_t val) +{ + uint8_t buf[] = {0x00, (uint8_t)(val >> 8), (uint8_t)(val & 0x00FF)}; + send(receiver, ct, 3, buf); +} + +void ESPKNXIP::send_2byte_uint(address_t const &receiver, knx_command_type_t ct, uint16_t val) +{ + uint8_t buf[] = {0x00, (uint8_t)(val >> 8), (uint8_t)(val & 0x00FF)}; + send(receiver, ct, 3, buf); +} + +void ESPKNXIP::send_2byte_float(address_t const &receiver, knx_command_type_t ct, float val) +{ + float v = val * 100.0f; + int e = 0; + for (; v < -2048.0f; v /= 2) + ++e; + for (; v > 2047.0f; v /= 2) + ++e; + long m = round(v) & 0x7FF; + short msb = (short) (e << 3 | m >> 8); + if (val < 0.0f) + msb |= 0x80; + uint8_t buf[] = {0x00, (uint8_t)msb, (uint8_t)m}; + send(receiver, ct, 3, buf); +} + +void ESPKNXIP::send_3byte_time(address_t const &receiver, knx_command_type_t ct, uint8_t weekday, uint8_t hours, uint8_t minutes, uint8_t seconds) +{ + weekday <<= 5; + uint8_t buf[] = {0x00, (uint8_t)(((weekday << 5) & 0xE0) | (hours & 0x1F)), (uint8_t)(minutes & 0x3F), (uint8_t)(seconds & 0x3F)}; + send(receiver, ct, 4, buf); +} + +void ESPKNXIP::send_3byte_date(address_t const &receiver, knx_command_type_t ct, uint8_t day, uint8_t month, uint8_t year) +{ + uint8_t buf[] = {0x00, (uint8_t)(day & 0x1F), (uint8_t)(month & 0x0F), year}; + send(receiver, ct, 4, buf); +} + +void ESPKNXIP::send_3byte_color(address_t const &receiver, knx_command_type_t ct, uint8_t red, uint8_t green, uint8_t blue) +{ + uint8_t buf[] = {0x00, red, green, blue}; + send(receiver, ct, 4, buf); +} + +void ESPKNXIP::send_4byte_int(address_t const &receiver, knx_command_type_t ct, int32_t val) +{ + uint8_t buf[] = {0x00, + (uint8_t)((val & 0xFF000000) >> 24), + (uint8_t)((val & 0x00FF0000) >> 16), + (uint8_t)((val & 0x0000FF00) >> 8), + (uint8_t)((val & 0x000000FF) >> 0)}; + send(receiver, ct, 5, buf); +} + +void ESPKNXIP::send_4byte_uint(address_t const &receiver, knx_command_type_t ct, uint32_t val) +{ + uint8_t buf[] = {0x00, + (uint8_t)((val & 0xFF000000) >> 24), + (uint8_t)((val & 0x00FF0000) >> 16), + (uint8_t)((val & 0x0000FF00) >> 8), + (uint8_t)((val & 0x000000FF) >> 0)}; + send(receiver, ct, 5, buf); +} + +void ESPKNXIP::send_4byte_float(address_t const &receiver, knx_command_type_t ct, float val) +{ + uint8_t buf[] = {0x00, ((uint8_t *)&val)[3], ((uint8_t *)&val)[2], ((uint8_t *)&val)[1], ((uint8_t *)&val)[0]}; + send(receiver, ct, 5, buf); +} diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-webserver.cpp b/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-webserver.cpp new file mode 100644 index 000000000..bdbc013fd --- /dev/null +++ b/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-webserver.cpp @@ -0,0 +1,540 @@ +/** + * esp-knx-ip library for KNX/IP communication on an ESP8266 + * Author: Nico Weichbrodt + * License: MIT + */ + +#include "esp-knx-ip.h" + +void ESPKNXIP::__handle_root() +{ + String m = F(""); +#if USE_BOOTSTRAP + m += F(""); + m += F(""); +#endif + m += F("
"); + m += F("

ESP KNX

"); + + // Feedback + + if (registered_feedbacks > 0) + { + m += F("

Feedback

"); + for (feedback_id_t i = 0; i < registered_feedbacks; ++i) + { + if (feedbacks[i].cond && !feedbacks[i].cond()) + { + continue; + } + m += F("
"); + m += F("
"); + m += F("
"); + m += feedbacks[i].name; + m += F("
"); + switch (feedbacks[i].type) + { + case FEEDBACK_TYPE_INT: + m += F(""); + m += String(*(int32_t *)feedbacks[i].data); + m += F(""); + break; + case FEEDBACK_TYPE_FLOAT: + m += F(""); + m += feedbacks[i].options.float_options.prefix; + m += String(*(float *)feedbacks[i].data, feedbacks[i].options.float_options.precision); + m += feedbacks[i].options.float_options.suffix; + m += F(""); + break; + case FEEDBACK_TYPE_BOOL: + m += F(""); + m += (*(bool *)feedbacks[i].data) ? F("True") : F("False"); + m += F(""); + break; + case FEEDBACK_TYPE_ACTION: + m += F("
"); + break; + } + m += F("
"); + m += F(""); + } + } + + if (registered_callbacks > 0) + m += F("

Callbacks

"); + + if (registered_callback_assignments > 0) + { + for (uint8_t i = 0; i < registered_callback_assignments; ++i) + { + // Skip empty slots + if ((callback_assignments[i].slot_flags & SLOT_FLAGS_USED) == 0) + { + continue; + } + // Skip disabled callbacks + if (callbacks[callback_assignments[i].callback_id].cond && !callbacks[callback_assignments[i].callback_id].cond()) + { + continue; + } + address_t &addr = callback_assignments[i].address; + m += F("
"); + m += F("
"); + m += F("
"); + m += addr.ga.area; + m += F("/"); + m += addr.ga.line; + m += F("/"); + m += addr.ga.member; + m += F(""); + m += F(""); + m += callbacks[callback_assignments[i].callback_id].name; + m += F("
"); + m += F("
"); + m += F("
"); + m += F(""); + } + } + + if (registered_callbacks > 0) + { + m += F("
"); + m += F("
"); + m += F(""); + m += F("
/
"); + m += F(""); + m += F("
/
"); + m += F(""); + m += F("
->
"); + m += F(""); + m += F("
"); + m += F("
"); + m += F(""); + } + + m += F("

Configuration

"); + + // Physical address + m += F("
"); + m += F("
"); + m += F("
Physical address
"); + m += F(""); + m += F("
.
"); + m += F(""); + m += F("
.
"); + m += F(""); + m += F("
"); + m += F("
"); + m += F(""); + + if (registered_configs > 0) + { + for (config_id_t i = 0; i < registered_configs; ++i) + { + // Check if this config option has a enable condition and if so check that condition + if (custom_configs[i].cond && !custom_configs[i].cond()) + continue; + + m += F("
"); + m += F("
"); + m += F("
"); + m += custom_configs[i].name; + m += F("
"); + + switch (custom_configs[i].type) + { + case CONFIG_TYPE_STRING: + m += F(""); + break; + case CONFIG_TYPE_INT: + m += F(""); + break; + case CONFIG_TYPE_BOOL: + m += F("
"); + m += F(""); + m += F("
"); + break; + case CONFIG_TYPE_OPTIONS: + { + m += F(""); + break; + } + case CONFIG_TYPE_GA: + address_t a = config_get_ga(i); + m += F(""); + m += F("
/
"); + m += F(""); + m += F("
/
"); + m += F(""); + break; + } + m += F(""); + m += F("
"); + m += F("
"); + m += F(""); + } + } + +#if !(DISABLE_EEPROM_BUTTONS && DISABLE_RESTORE_BUTTON && DISABLE_REBOOT_BUTTON) + // EEPROM save and restore + m += F("
"); + // Save to EEPROM +#if !DISABLE_EEPROM_BUTTONS + m += F("
"); + m += F("
"); + m += F(""); + m += F(""); + m += F(""); + m += F("
"); + // Restore from EEPROM + m += F("
"); + m += F("
"); + m += F(""); + m += F(""); + m += F(""); + m += F("
"); +#endif +#if !DISABLE_RESTORE_BUTTON + // Load Defaults + m += F("
"); + m += F("
"); + m += F(""); + m += F(""); + m += F("
"); +#endif +#if !DISABLE_REBOOT_BUTTON + // Reboot + m += F("
"); + m += F("
"); + m += F(""); + m += F(""); + m += F("
"); +#endif + m += F("
"); // row +#endif + + // End of page + m += F("
"); + server->send(200, F("text/html"), m); +} + +void ESPKNXIP::__handle_register() +{ + DEBUG_PRINTLN(F("Register called")); + if (server->hasArg(F("area")) && server->hasArg(F("line")) && server->hasArg(F("member")) && server->hasArg(F("cb"))) + { + uint8_t area = server->arg(F("area")).toInt(); + uint8_t line = server->arg(F("line")).toInt(); + uint8_t member = server->arg(F("member")).toInt(); + callback_id_t cb = (callback_id_t)server->arg(F("cb")).toInt(); + + DEBUG_PRINT(F("Got args: ")); + DEBUG_PRINT(area); + DEBUG_PRINT(F("/")); + DEBUG_PRINT(line); + DEBUG_PRINT(F("/")); + DEBUG_PRINT(member); + DEBUG_PRINT(F("/")); + DEBUG_PRINT(cb); + DEBUG_PRINTLN(F("")); + + if (area > 31 || line > 7) + { + DEBUG_PRINTLN(F("Area or Line wrong")); + goto end; + } + + if (!__callback_is_id_valid(cb)) + { + DEBUG_PRINTLN(F("Invalid callback id")); + goto end; + } + address_t ga = {.ga={line, area, member}}; + __callback_register_assignment(ga, cb); + } +end: + server->sendHeader(F("Location"),F(__ROOT_PATH)); + server->send(302); +} + +void ESPKNXIP::__handle_delete() +{ + DEBUG_PRINTLN(F("Delete called")); + if (server->hasArg(F("id"))) + { + callback_assignment_id_t id = (callback_assignment_id_t)server->arg(F("id")).toInt(); + + DEBUG_PRINT(F("Got args: ")); + DEBUG_PRINT(id); + DEBUG_PRINTLN(F("")); + + if (id >= registered_callback_assignments || (callback_assignments[id].slot_flags & SLOT_FLAGS_USED) == 0) + { + DEBUG_PRINTLN(F("ID wrong")); + goto end; + } + + __callback_delete_assignment(id); + } +end: + server->sendHeader(F("Location"),F(__ROOT_PATH)); + server->send(302); +} + +void ESPKNXIP::__handle_set() +{ + DEBUG_PRINTLN(F("Set called")); + if (server->hasArg(F("area")) && server->hasArg(F("line")) && server->hasArg(F("member"))) + { + uint8_t area = server->arg(F("area")).toInt(); + uint8_t line = server->arg(F("line")).toInt(); + uint8_t member = server->arg(F("member")).toInt(); + + DEBUG_PRINT(F("Got args: ")); + DEBUG_PRINT(area); + DEBUG_PRINT(F(".")); + DEBUG_PRINT(line); + DEBUG_PRINT(F(".")); + DEBUG_PRINT(member); + DEBUG_PRINTLN(F("")); + + if (area > 31 || line > 7) + { + DEBUG_PRINTLN(F("Area or Line wrong")); + goto end; + } + + physaddr.bytes.high = (area << 4) | line; + physaddr.bytes.low = member; + } +end: + server->sendHeader(F("Location"),F(__ROOT_PATH)); + server->send(302); +} + +void ESPKNXIP::__handle_config() +{ + DEBUG_PRINTLN(F("Config called")); + if (server->hasArg(F("id"))) + { + config_id_t id = server->arg(F("id")).toInt(); + + DEBUG_PRINT(F("Got args: ")); + DEBUG_PRINT(id); + DEBUG_PRINTLN(F("")); + + if (id < 0 || id >= registered_configs) + { + DEBUG_PRINTLN(F("ID wrong")); + goto end; + } + + switch (custom_configs[id].type) + { + case CONFIG_TYPE_STRING: + { + String v = server->arg(F("value")); + if (v.length() >= custom_configs[id].len) + goto end; + __config_set_flags(id, CONFIG_FLAGS_VALUE_SET); + __config_set_string(id, v); + break; + } + case CONFIG_TYPE_INT: + { + __config_set_flags(id, CONFIG_FLAGS_VALUE_SET); + __config_set_int(id, server->arg(F("value")).toInt()); + break; + } + case CONFIG_TYPE_BOOL: + { + __config_set_flags(id, CONFIG_FLAGS_VALUE_SET); + __config_set_bool(id, server->arg(F("value")).compareTo(F("on")) == 0); + break; + } + case CONFIG_TYPE_OPTIONS: + { + uint8_t val = (uint8_t)server->arg(F("value")).toInt(); + DEBUG_PRINT(F("Value: ")); + DEBUG_PRINTLN(val); + config_set_options(id, val); + break; + } + case CONFIG_TYPE_GA: + { + uint8_t area = server->arg(F("area")).toInt(); + uint8_t line = server->arg(F("line")).toInt(); + uint8_t member = server->arg(F("member")).toInt(); + if (area > 31 || line > 7) + { + DEBUG_PRINTLN(F("Area or Line wrong")); + goto end; + } + address_t tmp; + tmp.bytes.high = (area << 3) | line; + tmp.bytes.low = member; + __config_set_flags(id, CONFIG_FLAGS_VALUE_SET); + __config_set_ga(id, tmp); + break; + } + } + } +end: + server->sendHeader(F("Location"),F(__ROOT_PATH)); + server->send(302); +} + +void ESPKNXIP::__handle_feedback() +{ +DEBUG_PRINTLN(F("Feedback called")); + if (server->hasArg(F("id"))) + { + config_id_t id = server->arg(F("id")).toInt(); + + DEBUG_PRINT(F("Got args: ")); + DEBUG_PRINT(id); + DEBUG_PRINTLN(F("")); + + if (id < 0 || id >= registered_feedbacks) + { + DEBUG_PRINTLN(F("ID wrong")); + goto end; + } + + switch (feedbacks[id].type) + { + case FEEDBACK_TYPE_ACTION: + { + feedback_action_fptr_t func = (feedback_action_fptr_t)feedbacks[id].data; + void *arg = feedbacks[id].options.action_options.arg; + func(arg); + break; + } + default: + DEBUG_PRINTLN(F("Feedback has no action")); + break; + } + } +end: + server->sendHeader(F("Location"),F(__ROOT_PATH)); + server->send(302); +} + +#if !DISABLE_RESTORE_BUTTONS +void ESPKNXIP::__handle_restore() +{ + DEBUG_PRINTLN(F("Restore called")); + memcpy(custom_config_data, custom_config_default_data, MAX_CONFIG_SPACE); +end: + server->sendHeader(F("Location"),F(__ROOT_PATH)); + server->send(302); +} +#endif + +#if !DISABLE_REBOOT_BUTTONS +void ESPKNXIP::__handle_reboot() +{ + DEBUG_PRINTLN(F("Rebooting!")); + server->sendHeader(F("Location"),F(__ROOT_PATH)); + server->send(302); + delay(1000); + ESP.restart(); + //while(1); +} +#endif + +#if !DISABLE_EEPROM_BUTTONS +void ESPKNXIP::__handle_eeprom() +{ + DEBUG_PRINTLN(F("EEPROM called")); + if (server->hasArg(F("mode"))) + { + uint8_t mode = server->arg(F("mode")).toInt(); + + DEBUG_PRINT(F("Got args: ")); + DEBUG_PRINT(mode); + DEBUG_PRINTLN(F("")); + + if (mode == 1) + { + // save + save_to_eeprom(); + } + else if (mode == 2) + { + // restore + restore_from_eeprom(); + } + } +end: + server->sendHeader(F("Location"),F(__ROOT_PATH)); + server->send(302); +} +#endif diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip.cpp b/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip.cpp new file mode 100644 index 000000000..35b9c5014 --- /dev/null +++ b/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip.cpp @@ -0,0 +1,658 @@ +/** + * esp-knx-ip library for KNX/IP communication on an ESP8266 + * Author: Nico Weichbrodt + * License: MIT + */ + +#include "esp-knx-ip.h" + +char const *string_defaults[] = +{ + "Do this", + "True", + "False", + "" +}; + +ESPKNXIP::ESPKNXIP() : server(nullptr), + registered_callback_assignments(0), + free_callback_assignment_slots(0), + registered_callbacks(0), + free_callback_slots(0), + registered_configs(0), + registered_feedbacks(0) +{ + DEBUG_PRINTLN(); + DEBUG_PRINTLN("ESPKNXIP starting up"); + // Default physical address is 1.1.0 + physaddr.bytes.high = (/*area*/1 << 4) | /*line*/1; + physaddr.bytes.low = /*member*/0; + memset(callback_assignments, 0, MAX_CALLBACK_ASSIGNMENTS * sizeof(callback_assignment_t)); + memset(callbacks, 0, MAX_CALLBACKS * sizeof(callback_fptr_t)); + memset(custom_config_data, 0, MAX_CONFIG_SPACE * sizeof(uint8_t)); + memset(custom_config_default_data, 0, MAX_CONFIG_SPACE * sizeof(uint8_t)); + memset(custom_configs, 0, MAX_CONFIGS * sizeof(config_t)); +} + +void ESPKNXIP::load() +{ + memcpy(custom_config_default_data, custom_config_data, MAX_CONFIG_SPACE); + EEPROM.begin(EEPROM_SIZE); + restore_from_eeprom(); +} + +void ESPKNXIP::start(ESP8266WebServer *srv) +{ + server = srv; + __start(); +} + +void ESPKNXIP::start() +{ + server = new ESP8266WebServer(80); + __start(); +} + +void ESPKNXIP::__start() +{ + if (server != nullptr) + { + server->on(ROOT_PREFIX, [this](){ + __handle_root(); + }); + server->on(__ROOT_PATH, [this](){ + __handle_root(); + }); + server->on(__REGISTER_PATH, [this](){ + __handle_register(); + }); + server->on(__DELETE_PATH, [this](){ + __handle_delete(); + }); + server->on(__PHYS_PATH, [this](){ + __handle_set(); + }); +#if !DISABLE_EEPROM_BUTTONS + server->on(__EEPROM_PATH, [this](){ + __handle_eeprom(); + }); +#endif + server->on(__CONFIG_PATH, [this](){ + __handle_config(); + }); + server->on(__FEEDBACK_PATH, [this](){ + __handle_feedback(); + }); +#if !DISABLE_RESTORE_BUTTON + server->on(__RESTORE_PATH, [this](){ + __handle_restore(); + }); +#endif +#if !DISABLE_REBOOT_BUTTON + server->on(__REBOOT_PATH, [this](){ + __handle_reboot(); + }); +#endif + server->begin(); + } + + udp.listenMulticast(MULTICAST_IP, MULTICAST_PORT); + udp.onPacket([this](AsyncUDPPacket &packet) { + DEBUG_PRINTLN("got packet"); + __loop_knx(packet); }); +} + +void ESPKNXIP::save_to_eeprom() +{ + uint32_t address = 0; + uint64_t magic = EEPROM_MAGIC; + EEPROM.put(address, magic); + address += sizeof(uint64_t); + EEPROM.put(address++, registered_callback_assignments); + for (uint8_t i = 0; i < MAX_CALLBACK_ASSIGNMENTS; ++i) + { + EEPROM.put(address, callback_assignments[i].address); + address += sizeof(address_t); + } + for (uint8_t i = 0; i < MAX_CALLBACK_ASSIGNMENTS; ++i) + { + EEPROM.put(address, callback_assignments[i].callback_id); + address += sizeof(callback_id_t); + } + EEPROM.put(address, physaddr); + address += sizeof(address_t); + + EEPROM.put(address, custom_config_data); + address += sizeof(custom_config_data); + + EEPROM.commit(); + DEBUG_PRINT("Wrote to EEPROM: 0x"); + DEBUG_PRINTLN(address, HEX); +} + +void ESPKNXIP::restore_from_eeprom() +{ + uint32_t address = 0; + uint64_t magic = 0; + EEPROM.get(address, magic); + if (magic != EEPROM_MAGIC) + { + DEBUG_PRINTLN("No valid magic in EEPROM, aborting restore."); + DEBUG_PRINT("Expected 0x"); + DEBUG_PRINT((unsigned long)(EEPROM_MAGIC >> 32), HEX); + DEBUG_PRINT(" 0x"); + DEBUG_PRINT((unsigned long)(EEPROM_MAGIC), HEX); + DEBUG_PRINT(" got 0x"); + DEBUG_PRINT((unsigned long)(magic >> 32), HEX); + DEBUG_PRINT(" 0x"); + DEBUG_PRINTLN((unsigned long)magic, HEX); + return; + } + address += sizeof(uint64_t); + EEPROM.get(address++, registered_callback_assignments); + for (uint8_t i = 0; i < MAX_CALLBACK_ASSIGNMENTS; ++i) + { + EEPROM.get(address, callback_assignments[i].address); + if (callback_assignments[i].address.value != 0) + { + // if address is not 0/0/0 then mark slot as used + callback_assignments[i].slot_flags |= SLOT_FLAGS_USED; + DEBUG_PRINTLN("used slot"); + } + else + { + // if address is 0/0/0, then we found a free slot, yay! + // however, only count those slots, if we have not reached registered_callback_assignments yet + if (i < registered_callback_assignments) + { + DEBUG_PRINTLN("free slot before reaching registered_callback_assignments"); + free_callback_assignment_slots++; + } + else + { + DEBUG_PRINTLN("free slot"); + } + } + address += sizeof(address_t); + } + for (uint8_t i = 0; i < MAX_CALLBACK_ASSIGNMENTS; ++i) + { + EEPROM.get(address, callback_assignments[i].callback_id); + address += sizeof(callback_id_t); + } + EEPROM.get(address, physaddr); + address += sizeof(address_t); + + //EEPROM.get(address, custom_config_data); + //address += sizeof(custom_config_data); + uint32_t conf_offset = address; + for (uint8_t i = 0; i < registered_configs; ++i) + { + // First byte is flags. + config_flags_t flags = CONFIG_FLAGS_NO_FLAGS; + flags = (config_flags_t)EEPROM.read(address); + DEBUG_PRINT("Flag in EEPROM @ "); + DEBUG_PRINT(address - conf_offset); + DEBUG_PRINT(": "); + DEBUG_PRINTLN(flags, BIN); + custom_config_data[custom_configs[i].offset] = flags; + if (flags & CONFIG_FLAGS_VALUE_SET) + { + DEBUG_PRINTLN("Non-default value"); + for (int j = 0; j < custom_configs[i].len - sizeof(uint8_t); ++j) + { + custom_config_data[custom_configs[i].offset + sizeof(uint8_t) + j] = EEPROM.read(address + sizeof(uint8_t) + j); + } + } + + address += custom_configs[i].len; + } + + DEBUG_PRINT("Restored from EEPROM: 0x"); + DEBUG_PRINTLN(address, HEX); +} + +uint16_t ESPKNXIP::__ntohs(uint16_t n) +{ + return (uint16_t)((((uint8_t*)&n)[0] << 8) | (((uint8_t*)&n)[1])); +} + +callback_assignment_id_t ESPKNXIP::__callback_register_assignment(address_t address, callback_id_t id) +{ + if (registered_callback_assignments >= MAX_CALLBACK_ASSIGNMENTS) + return -1; + + if (free_callback_assignment_slots == 0) + { + callback_assignment_id_t aid = registered_callback_assignments; + + callback_assignments[aid].slot_flags |= SLOT_FLAGS_USED; + callback_assignments[aid].address = address; + callback_assignments[aid].callback_id = id; + registered_callback_assignments++; + return aid; + } + else + { + // find the free slot + for (callback_assignment_id_t aid = 0; aid < registered_callback_assignments; ++aid) + { + if (callback_assignments[aid].slot_flags & SLOT_FLAGS_USED) + { + // found a used slot + continue; + } + // and now an empty one + callback_assignments[aid].slot_flags |= SLOT_FLAGS_USED; + callback_assignments[aid].address = address; + callback_assignments[aid].callback_id = id; + + free_callback_assignment_slots--; + return id; + } + } +} + +void ESPKNXIP::__callback_delete_assignment(callback_assignment_id_t id) +{ + // TODO this can be optimized if we are deleting the last element + // as then we can decrement registered_callback_assignments + + // clear slot and mark it as empty + callback_assignments[id].slot_flags = SLOT_FLAGS_EMPTY; + callback_assignments[id].address.value = 0; + callback_assignments[id].callback_id = 0; + + if (id == registered_callback_assignments - 1) + { + DEBUG_PRINTLN("last cba deleted"); + // If this is the last callback, we can delete it by decrementing registered_callbacks. + registered_callback_assignments--; + + // However, if the assignment before this slot are also empty, we can decrement even further + // First check if this was also the first element + if (id == 0) + { + DEBUG_PRINTLN("really last cba"); + // If this was the last, then we are done. + return; + } + + id--; + while(true) + { + DEBUG_PRINT("checking "); + DEBUG_PRINTLN((int32_t)id); + if ((callback_assignments[id].slot_flags & SLOT_FLAGS_USED) == 0) + { + DEBUG_PRINTLN("merged free slot"); + // Slot before is empty + free_callback_assignment_slots--; + registered_callback_assignments--; + } + else + { + DEBUG_PRINTLN("aborted on used slot"); + // Slot is used, abort + return; + } + id--; + if (id == CALLBACK_ASSIGNMENT_ID_MAX) + { + DEBUG_PRINTLN("abort on wrap"); + // Wrap around, abort + return; + } + } + } + else + { + DEBUG_PRINTLN("free slot created"); + // there is now one more free slot + free_callback_assignment_slots++; + } +} + +bool ESPKNXIP::__callback_is_id_valid(callback_id_t id) +{ + if (id < registered_callbacks) + return true; + + if (callbacks[id].slot_flags & SLOT_FLAGS_USED) + return true; + + return false; +} + +callback_id_t ESPKNXIP::callback_register(String name, callback_fptr_t cb, void *arg, enable_condition_t cond) +{ + if (registered_callbacks >= MAX_CALLBACKS) + return -1; + + if (free_callback_slots == 0) + { + callback_id_t id = registered_callbacks; + + callbacks[id].slot_flags |= SLOT_FLAGS_USED; + callbacks[id].name = name; + callbacks[id].fkt = cb; + callbacks[id].cond = cond; + callbacks[id].arg = arg; + registered_callbacks++; + return id; + } + else + { + // find the free slot + for (callback_id_t id = 0; id < registered_callbacks; ++id) + { + if (callbacks[id].slot_flags & SLOT_FLAGS_USED) + { + // found a used slot + continue; + } + // and now an empty one + callbacks[id].slot_flags |= SLOT_FLAGS_USED; + callbacks[id].name = name; + callbacks[id].fkt = cb; + callbacks[id].cond = cond; + callbacks[id].arg = arg; + + free_callback_slots--; + return id; + } + } +} + +void ESPKNXIP::callback_deregister(callback_id_t id) +{ + if (!__callback_is_id_valid(id)) + return; + + // clear slot and mark it as empty + callbacks[id].slot_flags = SLOT_FLAGS_EMPTY; + callbacks[id].fkt = nullptr; + callbacks[id].cond = nullptr; + callbacks[id].arg = nullptr; + + if (id == registered_callbacks - 1) + { + // If this is the last callback, we can delete it by decrementing registered_callbacks. + registered_callbacks--; + + // However, if the callbacks before this slot are also empty, we can decrement even further + // First check if this was also the first element + if (id == 0) + { + // If this was the last, then we are done. + return; + } + + id--; + while(true) + { + if ((callbacks[id].slot_flags & SLOT_FLAGS_USED) == 0) + { + // Slot is empty + free_callback_slots--; + registered_callbacks--; + } + else + { + // Slot is used, abort + return; + } + id--; + if (id == CALLBACK_ASSIGNMENT_ID_MAX) + { + // Wrap around, abort + return; + } + } + } + else + { + // there is now one more free slot + free_callback_slots++; + } +} + +callback_assignment_id_t ESPKNXIP::callback_assign(callback_id_t id, address_t val) +{ + if (!__callback_is_id_valid(id)) + return -1; + + return __callback_register_assignment(val, id); +} + +void ESPKNXIP::callback_unassign(callback_assignment_id_t id) +{ + if (!__callback_is_id_valid(id)) + return; + + __callback_delete_assignment(id); +} + +/** + * Feedback functions start here + */ + +feedback_id_t ESPKNXIP::feedback_register_int(String name, int32_t *value, enable_condition_t cond) +{ + if (registered_feedbacks >= MAX_FEEDBACKS) + return -1; + + feedback_id_t id = registered_feedbacks; + + feedbacks[id].type = FEEDBACK_TYPE_INT; + feedbacks[id].name = name; + feedbacks[id].cond = cond; + feedbacks[id].data = (void *)value; + + registered_feedbacks++; + + return id; +} + +feedback_id_t ESPKNXIP::feedback_register_float(String name, float *value, uint8_t precision, char const *prefix, char const *suffix, enable_condition_t cond) +{ + if (registered_feedbacks >= MAX_FEEDBACKS) + return -1; + + feedback_id_t id = registered_feedbacks; + + feedbacks[id].type = FEEDBACK_TYPE_FLOAT; + feedbacks[id].name = name; + feedbacks[id].cond = cond; + feedbacks[id].data = (void *)value; + feedbacks[id].options.float_options.precision = precision; + feedbacks[id].options.float_options.prefix = prefix ? strdup(prefix) : STRING_DEFAULT_EMPTY; + feedbacks[id].options.float_options.suffix = suffix ? strdup(suffix) : STRING_DEFAULT_EMPTY; + + registered_feedbacks++; + + return id; +} + +feedback_id_t ESPKNXIP::feedback_register_bool(String name, bool *value, char const *true_text, char const *false_text, enable_condition_t cond) +{ + if (registered_feedbacks >= MAX_FEEDBACKS) + return -1; + + feedback_id_t id = registered_feedbacks; + + feedbacks[id].type = FEEDBACK_TYPE_BOOL; + feedbacks[id].name = name; + feedbacks[id].cond = cond; + feedbacks[id].data = (void *)value; + feedbacks[id].options.bool_options.true_text = true_text ? strdup(true_text) : STRING_DEFAULT_TRUE; + feedbacks[id].options.bool_options.false_text = false_text ? strdup(false_text) : STRING_DEFAULT_FALSE; + + registered_feedbacks++; + + return id; +} + +feedback_id_t ESPKNXIP::feedback_register_action(String name, feedback_action_fptr_t value, const char *btn_text, void *arg, enable_condition_t cond) +{ + if (registered_feedbacks >= MAX_FEEDBACKS) + return -1; + + feedback_id_t id = registered_feedbacks; + + feedbacks[id].type = FEEDBACK_TYPE_ACTION; + feedbacks[id].name = name; + feedbacks[id].cond = cond; + feedbacks[id].data = (void *)value; + feedbacks[id].options.action_options.arg = arg; + feedbacks[id].options.action_options.btn_text = btn_text ? strdup(btn_text) : STRING_DEFAULT_DO_THIS; + + registered_feedbacks++; + + return id; +} + +void ESPKNXIP::loop() +{ + if (server != nullptr) + { + __loop_webserver(); + } +} + +void ESPKNXIP::__loop_webserver() +{ + server->handleClient(); +} + +void ESPKNXIP::__loop_knx(AsyncUDPPacket &packet) +{ + size_t read = packet.length(); + if (!read) + { + return; + } + DEBUG_PRINTLN(F("")); + DEBUG_PRINT(F("LEN: ")); + DEBUG_PRINTLN(read); + + uint8_t *buf = packet.data(); + + DEBUG_PRINT(F("Got packet:")); +#ifdef ESP_KNX_DEBUG + for (size_t i = 0; i < read; ++i) + { + DEBUG_PRINT(F(" 0x")); + DEBUG_PRINT(buf[i], 16); + } +#endif + DEBUG_PRINTLN(F("")); + + knx_ip_pkt_t *knx_pkt = (knx_ip_pkt_t *)buf; + + DEBUG_PRINT(F("ST: 0x")); + DEBUG_PRINTLN(__ntohs(knx_pkt->service_type), 16); + + if (knx_pkt->header_len != 0x06 && knx_pkt->protocol_version != 0x10 && knx_pkt->service_type != KNX_ST_ROUTING_INDICATION) + return; + + cemi_msg_t *cemi_msg = (cemi_msg_t *)knx_pkt->pkt_data; + + DEBUG_PRINT(F("MT: 0x")); + DEBUG_PRINTLN(cemi_msg->message_code, 16); + + if (cemi_msg->message_code != KNX_MT_L_DATA_IND) + return; + + DEBUG_PRINT(F("ADDI: 0x")); + DEBUG_PRINTLN(cemi_msg->additional_info_len, 16); + + cemi_service_t *cemi_data = &cemi_msg->data.service_information; + + if (cemi_msg->additional_info_len > 0) + cemi_data = (cemi_service_t *)(((uint8_t *)cemi_data) + cemi_msg->additional_info_len); + + DEBUG_PRINT(F("C1: 0x")); + DEBUG_PRINTLN(cemi_data->control_1.byte, 16); + + DEBUG_PRINT(F("C2: 0x")); + DEBUG_PRINTLN(cemi_data->control_2.byte, 16); + + DEBUG_PRINT(F("DT: 0x")); + DEBUG_PRINTLN(cemi_data->control_2.bits.dest_addr_type, 16); + + if (cemi_data->control_2.bits.dest_addr_type != 0x01) + return; + + DEBUG_PRINT(F("HC: 0x")); + DEBUG_PRINTLN(cemi_data->control_2.bits.hop_count, 16); + + DEBUG_PRINT(F("EFF: 0x")); + DEBUG_PRINTLN(cemi_data->control_2.bits.extended_frame_format, 16); + + DEBUG_PRINT(F("Source: 0x")); + DEBUG_PRINT(cemi_data->source.bytes.high, 16); + DEBUG_PRINT(F(" 0x")); + DEBUG_PRINTLN(cemi_data->source.bytes.low, 16); + + DEBUG_PRINT(F("Dest: 0x")); + DEBUG_PRINT(cemi_data->destination.bytes.high, 16); + DEBUG_PRINT(F(" 0x")); + DEBUG_PRINTLN(cemi_data->destination.bytes.low, 16); + + knx_command_type_t ct = (knx_command_type_t)(((cemi_data->data[0] & 0xC0) >> 6) | ((cemi_data->pci.apci & 0x03) << 2)); + + DEBUG_PRINT(F("CT: 0x")); + DEBUG_PRINTLN(ct, 16); + +#ifdef ESP_KNX_DEBUG + for (int i = 0; i < cemi_data->data_len; ++i) + { + DEBUG_PRINT(F(" 0x")); + DEBUG_PRINT(cemi_data->data[i], 16); + } +#endif + + DEBUG_PRINTLN(F("==")); + + // Call callbacks + for (int i = 0; i < registered_callback_assignments; ++i) + { + DEBUG_PRINT(F("Testing: 0x")); + DEBUG_PRINT(callback_assignments[i].address.bytes.high, 16); + DEBUG_PRINT(F(" 0x")); + DEBUG_PRINTLN(callback_assignments[i].address.bytes.low, 16); + if (cemi_data->destination.value == callback_assignments[i].address.value) + { + DEBUG_PRINTLN(F("Found match")); + if (callbacks[callback_assignments[i].callback_id].cond && !callbacks[callback_assignments[i].callback_id].cond()) + { + DEBUG_PRINTLN(F("But it's disabled")); +#if ALLOW_MULTIPLE_CALLBACKS_PER_ADDRESS + continue; +#else + return; +#endif + } + uint8_t data[cemi_data->data_len]; + memcpy(data, cemi_data->data, cemi_data->data_len); + data[0] = data[0] & 0x3F; + message_t msg = {}; + msg.ct = ct; + msg.received_on = cemi_data->destination; + msg.data_len = cemi_data->data_len; + msg.data = data; + callbacks[callback_assignments[i].callback_id].fkt(msg, callbacks[callback_assignments[i].callback_id].arg); +#if ALLOW_MULTIPLE_CALLBACKS_PER_ADDRESS + continue; +#else + return; +#endif + } + } + + return; +} + +// Global "singleton" object +ESPKNXIP knx; diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip.h b/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip.h new file mode 100644 index 000000000..86e02c5e8 --- /dev/null +++ b/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip.h @@ -0,0 +1,571 @@ +/** + * esp-knx-ip library for KNX/IP communication on an ESP8266 + * Author: Nico Weichbrodt + * License: MIT + */ + +#ifndef ESP_KNX_IP_H +#define ESP_KNX_IP_H + +/** + * CONFIG + * All MAX_ values must not exceed 255 (1 byte, except MAC_CONFIG_SPACE which can go up to 2 bytes, so 0xffff in theory) and must not be negative! + * Config space is restriced by EEPROM_SIZE (default 1024). + * Required EEPROM size is 8 + MAX_GA_CALLBACKS * 3 + 2 + MAX_CONFIG_SPACE which is 552 by default + */ +#define EEPROM_SIZE 1024 // [Default 1024] +#define MAX_CALLBACK_ASSIGNMENTS 10 // [Default 10] Maximum number of group address callbacks that can be stored +#define MAX_CALLBACKS 10 // [Default 10] Maximum number of callbacks that can be stored +#define MAX_CONFIGS 20 // [Default 20] Maximum number of config items that can be stored +#define MAX_CONFIG_SPACE 0x0200 // [Default 0x0200] Maximum number of bytes that can be stored for custom config + +#define MAX_FEEDBACKS 20 // [Default 20] Maximum number of feedbacks that can be shown + +// Callbacks +#define ALLOW_MULTIPLE_CALLBACKS_PER_ADDRESS 1 // [Default 0] Set to 1 to always test all assigned callbacks. This allows for multiple callbacks being assigned to the same address. If disabled, only the first assigned will be called. + +// Webserver related +#define USE_BOOTSTRAP 1 // [Default 1] Set to 1 to enable use of bootstrap CSS for nicer webconfig. CSS is loaded from bootstrapcdn.com. Set to 0 to disable +#define ROOT_PREFIX "" // [Default ""] This gets prepended to all webserver paths, default is empty string "". Set this to "/knx" if you want the config to be available on http:///knx +#define DISABLE_EEPROM_BUTTONS 1 // [Default 0] Set to 1 to disable the EEPROM buttons in the web ui. +#define DISABLE_REBOOT_BUTTON 1 // [Default 0] Set to 1 to disable the reboot button in the web ui. +#define DISABLE_RESTORE_BUTTON 1 // [Default 0] Set to 1 to disable the "restore defaults" button in the web ui. + +// These values normally don't need adjustment +#define MULTICAST_PORT 3671 // [Default 3671] +#define MULTICAST_IP IPAddress(224, 0, 23, 12) // [Default IPAddress(224, 0, 23, 12)] +#define SEND_CHECKSUM 0 + +// Uncomment to enable printing out debug messages. +//#define ESP_KNX_DEBUG +/** + * END CONFIG + */ + +#include "Arduino.h" +#include +#include +#include +#include + +#include "DPT.h" + +#define EEPROM_MAGIC (0xDEADBEEF00000000 + (MAX_CONFIG_SPACE) + (MAX_CALLBACK_ASSIGNMENTS << 16) + (MAX_CALLBACKS << 8)) + +// Define where debug output will be printed. +#ifndef DEBUG_PRINTER +#define DEBUG_PRINTER Serial +#endif + +// Setup debug printing macros. +#ifdef ESP_KNX_DEBUG + #define DEBUG_PRINT(...) { DEBUG_PRINTER.print(__VA_ARGS__); } + #define DEBUG_PRINTLN(...) { DEBUG_PRINTER.println(__VA_ARGS__); } +#else + #define DEBUG_PRINT(...) {} + #define DEBUG_PRINTLN(...) {} +#endif + +#define __ROOT_PATH ROOT_PREFIX"/" +#define __REGISTER_PATH ROOT_PREFIX"/register" +#define __DELETE_PATH ROOT_PREFIX"/delete" +#define __PHYS_PATH ROOT_PREFIX"/phys" +#define __EEPROM_PATH ROOT_PREFIX"/eeprom" +#define __CONFIG_PATH ROOT_PREFIX"/config" +#define __FEEDBACK_PATH ROOT_PREFIX"/feedback" +#define __RESTORE_PATH ROOT_PREFIX"/restore" +#define __REBOOT_PATH ROOT_PREFIX"/reboot" + +/** + * Different service types, we are mainly interested in KNX_ST_ROUTING_INDICATION + */ +typedef enum __knx_service_type +{ + KNX_ST_SEARCH_REQUEST = 0x0201, + KNX_ST_SEARCH_RESPONSE = 0x0202, + KNX_ST_DESCRIPTION_REQUEST = 0x0203, + KNX_ST_DESCRIPTION_RESPONSE = 0x0204, + KNX_ST_CONNECT_REQUEST = 0x0205, + KNX_ST_CONNECT_RESPONSE = 0x0206, + KNX_ST_CONNECTIONSTATE_REQUEST = 0x0207, + KNX_ST_CONNECTIONSTATE_RESPONSE = 0x0208, + KNX_ST_DISCONNECT_REQUEST = 0x0209, + KNX_ST_DISCONNECT_RESPONSE = 0x020A, + + KNX_ST_DEVICE_CONFIGURATION_REQUEST = 0x0310, + KNX_ST_DEVICE_CONFIGURATION_ACK = 0x0311, + + KNX_ST_TUNNELING_REQUEST = 0x0420, + KNX_ST_TUNNELING_ACK = 0x0421, + + KNX_ST_ROUTING_INDICATION = 0x0530, + KNX_ST_ROUTING_LOST_MESSAGE = 0x0531, + KNX_ST_ROUTING_BUSY = 0x0532, + +// KNX_ST_RLOG_START = 0x0600, +// KNX_ST_RLOG_END = 0x06FF, + + KNX_ST_REMOTE_DIAGNOSTIC_REQUEST = 0x0740, + KNX_ST_REMOTE_DIAGNOSTIC_RESPONSE = 0x0741, + KNX_ST_REMOTE_BASIC_CONFIGURATION_REQUEST = 0x0742, + KNX_ST_REMOTE_RESET_REQUEST = 0x0743, + +// KNX_ST_OBJSRV_START = 0x0800, +// KNX_ST_OBJSRV_END = 0x08FF, +} knx_service_type_t; + +/** + * Differnt command types, first three are of main interest + */ +typedef enum __knx_command_type +{ + KNX_CT_READ = 0x00, + KNX_CT_ANSWER = 0x01, + KNX_CT_WRITE = 0x02, + KNX_CT_INDIVIDUAL_ADDR_WRITE = 0x03, + KNX_CT_INDIVIDUAL_ADDR_REQUEST = 0x04, + KNX_CT_INDIVIDUAL_ADDR_RESPONSE = 0x05, + KNX_CT_ADC_READ = 0x06, + KNX_CT_ADC_ANSWER = 0x07, + KNX_CT_MEM_READ = 0x08, + KNX_CT_MEM_ANSWER = 0x09, + KNX_CT_MEM_WRITE = 0x0A, +//KNX_CT_UNKNOWN = 0x0B, + KNX_CT_MASK_VERSION_READ = 0x0C, + KNX_CT_MASK_VERSION_RESPONSE = 0x0D, + KNX_CT_RESTART = 0x0E, + KNX_CT_ESCAPE = 0x0F, +} knx_command_type_t; + +/** + * cEMI message types, mainly KNX_MT_L_DATA_IND is interesting + */ +typedef enum __knx_cemi_msg_type +{ + KNX_MT_L_DATA_REQ = 0x11, + KNX_MT_L_DATA_IND = 0x29, + KNX_MT_L_DATA_CON = 0x2E, +} knx_cemi_msg_type_t; + +/** + * TCPI communication type + */ +typedef enum __knx_communication_type { + KNX_COT_UDP = 0x00, // Unnumbered Data Packet + KNX_COT_NDP = 0x01, // Numbered Data Packet + KNX_COT_UCD = 0x02, // Unnumbered Control Data + KNX_COT_NCD = 0x03, // Numbered Control Data +} knx_communication_type_t; + +/** + * KNX/IP header + */ +typedef struct __knx_ip_pkt +{ + uint8_t header_len; // Should always be 0x06 + uint8_t protocol_version; // Should be version 1.0, transmitted as 0x10 + uint16_t service_type; // See knx_service_type_t + union + { + struct { + uint8_t first_byte; + uint8_t second_byte; + } bytes; + uint16_t len; + } total_len; // header_len + rest of pkt. This is a bit weird as the spec says this: If the total number of bytes transmitted is greater than 252 bytes, the first “Total Length” byte is set to FF (255). Only in this case the second byte includes additional length information + uint8_t pkt_data[]; // This is of type cemi_msg_t +} knx_ip_pkt_t; + +typedef struct __cemi_addi +{ + uint8_t type_id; + uint8_t len; + uint8_t data[]; +} cemi_addi_t; + +typedef union __address +{ + uint16_t value; + struct + { + uint8_t high; + uint8_t low; + } bytes; + struct __attribute__((packed)) + { + uint8_t line:3; + uint8_t area:5; + uint8_t member; + } ga; + struct __attribute__((packed)) + { + uint8_t line:4; + uint8_t area:4; + uint8_t member; + } pa; + uint8_t array[2]; +} address_t; + +typedef struct __cemi_service +{ + union + { + struct + { + // Struct is reversed due to bit order + uint8_t confirm:1; // 0 = no error, 1 = error + uint8_t ack:1; // 0 = no ack, 1 = ack + uint8_t priority:2; // 0 = system, 1 = high, 2 = urgent/alarm, 3 = normal + uint8_t system_broadcast:1; // 0 = system broadcast, 1 = broadcast + uint8_t repeat:1; // 0 = repeat on error, 1 = do not repeat + uint8_t reserved:1; // always zero + uint8_t frame_type:1; // 0 = extended, 1 = standard + } bits; + uint8_t byte; + } control_1; + union + { + struct + { + // Struct is reversed due to bit order + uint8_t extended_frame_format:4; + uint8_t hop_count:3; + uint8_t dest_addr_type:1; // 0 = individual, 1 = group + } bits; + uint8_t byte; + } control_2; + address_t source; + address_t destination; + uint8_t data_len; // length of data, excluding the tpci byte + struct + { + uint8_t apci:2; // If tpci.comm_type == KNX_COT_UCD or KNX_COT_NCD, then this is apparently control data? + uint8_t tpci_seq_number:4; + uint8_t tpci_comm_type:2; // See knx_communication_type_t + } pci; + uint8_t data[]; +} cemi_service_t; + +typedef struct __cemi_msg +{ + uint8_t message_code; + uint8_t additional_info_len; + union + { + cemi_addi_t additional_info[]; + cemi_service_t service_information; + } data; +} cemi_msg_t; + +typedef enum __config_type +{ + CONFIG_TYPE_UNKNOWN, + CONFIG_TYPE_INT, + CONFIG_TYPE_BOOL, + CONFIG_TYPE_STRING, + CONFIG_TYPE_OPTIONS, + CONFIG_TYPE_GA, +} config_type_t; + +typedef enum __feedback_type +{ + FEEDBACK_TYPE_UNKNOWN, + FEEDBACK_TYPE_INT, + FEEDBACK_TYPE_FLOAT, + FEEDBACK_TYPE_BOOL, + FEEDBACK_TYPE_ACTION, +} feedback_type_t; + +typedef enum __config_flags +{ + CONFIG_FLAGS_NO_FLAGS = 0, + CONFIG_FLAGS_VALUE_SET = 1, +} config_flags_t; + +typedef enum __slot_flags +{ + SLOT_FLAGS_EMPTY = 0, // Empty slots have no flags + SLOT_FLAGS_USED = 1, +} slot_flags_t; + +typedef struct __message +{ + knx_command_type_t ct; + address_t received_on; + uint8_t data_len; + uint8_t *data; +} message_t; + +typedef bool (*enable_condition_t)(void); +typedef void (*callback_fptr_t)(message_t const &msg, void *arg); +typedef void (*feedback_action_fptr_t)(void *arg); + +typedef uint8_t callback_id_t; +#define CALLBACK_ID_MAX UINT8_MAX +typedef uint8_t callback_assignment_id_t; +#define CALLBACK_ASSIGNMENT_ID_MAX UINT8_MAX +typedef uint8_t config_id_t; +typedef uint8_t feedback_id_t; + +typedef struct __option_entry +{ + char const *name; + uint8_t value; +} option_entry_t; + +typedef struct __config +{ + config_type_t type; + String name; + uint8_t offset; + uint8_t len; + enable_condition_t cond; + union { + option_entry_t *options; + } data; +} config_t; + +extern char const *string_defaults[]; +#define STRING_DEFAULT_DO_THIS (string_defaults[0]) +#define STRING_DEFAULT_TRUE (string_defaults[1]) +#define STRING_DEFAULT_FALSE (string_defaults[2]) +#define STRING_DEFAULT_EMPTY (string_defaults[3]) + +typedef struct __feedback_float_options +{ + uint8_t precision; + char const *prefix; + char const *suffix; +} feedback_float_options_t; + +typedef struct __feedback_bool_options +{ + char const *true_text; + char const *false_text; +} feedback_bool_options_t; + +typedef struct __feedback_action_options +{ + void *arg; + char const *btn_text; +} feedback_action_options_t; + +typedef struct __feedback +{ + feedback_type_t type; + String name; + enable_condition_t cond; + void *data; + union { + feedback_bool_options_t bool_options; + feedback_float_options_t float_options; + feedback_action_options_t action_options; + } options; +} feedback_t; + +typedef struct __callback +{ + uint8_t slot_flags; + callback_fptr_t fkt; + enable_condition_t cond; + void *arg; + String name; +} callback_t; + +typedef struct __callback_assignment +{ + uint8_t slot_flags; + address_t address; + callback_id_t callback_id; +} callback_assignment_t; + +class ESPKNXIP { + public: + ESPKNXIP(); + void load(); + void start(); + void start(ESP8266WebServer *srv); + void loop(); + + void save_to_eeprom(); + void restore_from_eeprom(); + + callback_id_t callback_register(String name, callback_fptr_t cb, void *arg = nullptr, enable_condition_t cond = nullptr); + callback_assignment_id_t callback_assign(callback_id_t id, address_t val); + void callback_deregister(callback_id_t id); + void callback_unassign(callback_assignment_id_t id); + + void physical_address_set(address_t const &addr); + address_t physical_address_get(); + + // Configuration functions + config_id_t config_register_string(String name, uint8_t len, String _default, enable_condition_t cond = nullptr); + config_id_t config_register_int(String name, int32_t _default, enable_condition_t cond = nullptr); + config_id_t config_register_bool(String name, bool _default, enable_condition_t cond = nullptr); + config_id_t config_register_options(String name, option_entry_t *options, uint8_t _default, enable_condition_t cond = nullptr); + config_id_t config_register_ga(String name, enable_condition_t cond = nullptr); + + String config_get_string(config_id_t id); + int32_t config_get_int(config_id_t id); + bool config_get_bool(config_id_t id); + uint8_t config_get_options(config_id_t id); + address_t config_get_ga(config_id_t id); + + void config_set_string(config_id_t id, String val); + void config_set_int(config_id_t id, int32_t val); + void config_set_bool(config_id_t, bool val); + void config_set_options(config_id_t id, uint8_t val); + void config_set_ga(config_id_t id, address_t const &val); + + // Feedback functions + feedback_id_t feedback_register_int(String name, int32_t *value, enable_condition_t cond = nullptr); + feedback_id_t feedback_register_float(String name, float *value, uint8_t precision = 2, char const *prefix = nullptr, char const *suffix = nullptr, enable_condition_t cond = nullptr); + feedback_id_t feedback_register_bool(String name, bool *value, char const *true_text = nullptr, char const *false_text = nullptr, enable_condition_t cond = nullptr); + feedback_id_t feedback_register_action(String name, feedback_action_fptr_t value, char const *btn_text = nullptr, void *arg = nullptr, enable_condition_t = nullptr); + + // Send functions + void send(address_t const &receiver, knx_command_type_t ct, uint8_t data_len, uint8_t *data); + + void send_1bit(address_t const &receiver, knx_command_type_t ct, uint8_t bit); + void send_2bit(address_t const &receiver, knx_command_type_t ct, uint8_t twobit); + void send_4bit(address_t const &receiver, knx_command_type_t ct, uint8_t fourbit); + void send_1byte_int(address_t const &receiver, knx_command_type_t ct, int8_t val); + void send_1byte_uint(address_t const &receiver, knx_command_type_t ct, uint8_t val); + void send_2byte_int(address_t const &receiver, knx_command_type_t ct, int16_t val); + void send_2byte_uint(address_t const &receiver, knx_command_type_t ct, uint16_t val); + void send_2byte_float(address_t const &receiver, knx_command_type_t ct, float val); + void send_3byte_time(address_t const &receiver, knx_command_type_t ct, uint8_t weekday, uint8_t hours, uint8_t minutes, uint8_t seconds); + void send_3byte_time(address_t const &receiver, knx_command_type_t ct, time_of_day_t const &time) { send_3byte_time(receiver, ct, time.weekday, time.hours, time.minutes, time.seconds); } + void send_3byte_date(address_t const &receiver, knx_command_type_t ct, uint8_t day, uint8_t month, uint8_t year); + void send_3byte_date(address_t const &receiver, knx_command_type_t ct, date_t const &date) { send_3byte_date(receiver, ct, date.day, date.month, date.year); } + void send_3byte_color(address_t const &receiver, knx_command_type_t ct, uint8_t red, uint8_t green, uint8_t blue); + void send_3byte_color(address_t const &receiver, knx_command_type_t ct, color_t const &color) { send_3byte_color(receiver, ct, color.red, color.green, color.blue); } + void send_4byte_int(address_t const &receiver, knx_command_type_t ct, int32_t val); + void send_4byte_uint(address_t const &receiver, knx_command_type_t ct, uint32_t val); + void send_4byte_float(address_t const &receiver, knx_command_type_t ct, float val); + + void write_1bit(address_t const &receiver, uint8_t bit) { send_1bit(receiver, KNX_CT_WRITE, bit); } + void write_2bit(address_t const &receiver, uint8_t twobit) { send_2bit(receiver, KNX_CT_WRITE, twobit); } + void write_4bit(address_t const &receiver, uint8_t fourbit) { send_4bit(receiver, KNX_CT_WRITE, fourbit); } + void write_1byte_int(address_t const &receiver, int8_t val) { send_1byte_int(receiver, KNX_CT_WRITE, val); } + void write_1byte_uint(address_t const &receiver, uint8_t val) { send_1byte_uint(receiver, KNX_CT_WRITE, val); } + void write_2byte_int(address_t const &receiver, int16_t val) { send_2byte_int(receiver, KNX_CT_WRITE, val); } + void write_2byte_uint(address_t const &receiver, uint16_t val) { send_2byte_uint(receiver, KNX_CT_WRITE, val); } + void write_2byte_float(address_t const &receiver, float val) { send_2byte_float(receiver, KNX_CT_WRITE, val); } + void write_3byte_time(address_t const &receiver, uint8_t weekday, uint8_t hours, uint8_t minutes, uint8_t seconds) { send_3byte_time(receiver, KNX_CT_WRITE, weekday, hours, minutes, seconds); } + void write_3byte_time(address_t const &receiver, time_of_day_t const &time) { send_3byte_time(receiver, KNX_CT_WRITE, time.weekday, time.hours, time.minutes, time.seconds); } + void write_3byte_date(address_t const &receiver, uint8_t day, uint8_t month, uint8_t year) { send_3byte_date(receiver, KNX_CT_WRITE, day, month, year); } + void write_3byte_date(address_t const &receiver, date_t const &date) { send_3byte_date(receiver, KNX_CT_WRITE, date.day, date.month, date.year); } + void write_3byte_color(address_t const &receiver, uint8_t red, uint8_t green, uint8_t blue) { send_3byte_color(receiver, KNX_CT_WRITE, red, green, blue); } + void write_3byte_color(address_t const &receiver, color_t const &color) { send_3byte_color(receiver, KNX_CT_WRITE, color); } + void write_4byte_int(address_t const &receiver, int32_t val) { send_4byte_int(receiver, KNX_CT_WRITE, val); } + void write_4byte_uint(address_t const &receiver, uint32_t val) { send_4byte_uint(receiver, KNX_CT_WRITE, val); } + void write_4byte_float(address_t const &receiver, float val) { send_4byte_float(receiver, KNX_CT_WRITE, val);} + + void answer_1bit(address_t const &receiver, uint8_t bit) { send_1bit(receiver, KNX_CT_ANSWER, bit); } + void answer_2bit(address_t const &receiver, uint8_t twobit) { send_2bit(receiver, KNX_CT_ANSWER, twobit); } + void answer_4bit(address_t const &receiver, uint8_t fourbit) { send_4bit(receiver, KNX_CT_ANSWER, fourbit); } + void answer_1byte_int(address_t const &receiver, int8_t val) { send_1byte_int(receiver, KNX_CT_ANSWER, val); } + void answer_1byte_uint(address_t const &receiver, uint8_t val) { send_1byte_uint(receiver, KNX_CT_ANSWER, val); } + void answer_2byte_int(address_t const &receiver, int16_t val) { send_2byte_int(receiver, KNX_CT_ANSWER, val); } + void answer_2byte_uint(address_t const &receiver, uint16_t val) { send_2byte_uint(receiver, KNX_CT_ANSWER, val); } + void answer_2byte_float(address_t const &receiver, float val) { send_2byte_float(receiver, KNX_CT_ANSWER, val); } + void answer_3byte_time(address_t const &receiver, uint8_t weekday, uint8_t hours, uint8_t minutes, uint8_t seconds) { send_3byte_time(receiver, KNX_CT_ANSWER, weekday, hours, minutes, seconds); } + void answer_3byte_time(address_t const &receiver, time_of_day_t const &time) { send_3byte_time(receiver, KNX_CT_ANSWER, time.weekday, time.hours, time.minutes, time.seconds); } + void answer_3byte_date(address_t const &receiver, uint8_t day, uint8_t month, uint8_t year) { send_3byte_date(receiver, KNX_CT_ANSWER, day, month, year); } + void answer_3byte_date(address_t const &receiver, date_t const &date) { send_3byte_date(receiver, KNX_CT_ANSWER, date.day, date.month, date.year); } + void answer_3byte_color(address_t const &receiver, uint8_t red, uint8_t green, uint8_t blue) { send_3byte_color(receiver, KNX_CT_ANSWER, red, green, blue); } + void answer_3byte_color(address_t const &receiver, color_t const &color) { send_3byte_color(receiver, KNX_CT_ANSWER, color); } + void answer_4byte_int(address_t const &receiver, int32_t val) { send_4byte_int(receiver, KNX_CT_ANSWER, val); } + void answer_4byte_uint(address_t const &receiver, uint32_t val) { send_4byte_uint(receiver, KNX_CT_ANSWER, val); } + void answer_4byte_float(address_t const &receiver, float val) { send_4byte_float(receiver, KNX_CT_ANSWER, val);} + + bool data_to_bool(uint8_t *data); + int8_t data_to_1byte_int(uint8_t *data); + uint8_t data_to_1byte_uint(uint8_t *data); + int16_t data_to_2byte_int(uint8_t *data); + uint16_t data_to_2byte_uint(uint8_t *data); + float data_to_2byte_float(uint8_t *data); + color_t data_to_3byte_color(uint8_t *data); + time_of_day_t data_to_3byte_time(uint8_t *data); + date_t data_to_3byte_data(uint8_t *data); + int32_t data_to_4byte_int(uint8_t *data); + uint32_t data_to_4byte_uint(uint8_t *data); + float data_to_4byte_float(uint8_t *data); + + static address_t GA_to_address(uint8_t area, uint8_t line, uint8_t member) + { + // Yes, the order is correct, see the struct definition above + address_t tmp = {.ga={line, area, member}}; + return tmp; + } + + static address_t PA_to_address(uint8_t area, uint8_t line, uint8_t member) + { + // Yes, the order is correct, see the struct definition above + address_t tmp = {.pa={line, area, member}}; + return tmp; + } + + private: + void __start(); + void __loop_knx(AsyncUDPPacket &packet); + + // Webserver functions + void __loop_webserver(); + void __handle_root(); + void __handle_register(); + void __handle_delete(); + void __handle_set(); +#if !DISABLE_EEPROM_BUTTONS + void __handle_eeprom(); +#endif + void __handle_config(); + void __handle_feedback(); +#if !DISABLE_RESTORE_BUTTONS + void __handle_restore(); +#endif +#if !DISABLE_REBOOT_BUTTONS + void __handle_reboot(); +#endif + + void __config_set_flags(config_id_t id, config_flags_t flags); + + void __config_set_string(config_id_t id, String &val); + void __config_set_int(config_id_t id, int32_t val); + void __config_set_bool(config_id_t id, bool val); + void __config_set_options(config_id_t id, uint8_t val); + void __config_set_ga(config_id_t id, address_t const &val); + + bool __callback_is_id_valid(callback_id_t id); + + callback_assignment_id_t __callback_register_assignment(address_t address, callback_id_t id); + void __callback_delete_assignment(callback_assignment_id_t id); + + ESP8266WebServer *server; + address_t physaddr; + AsyncUDP udp; + + callback_assignment_id_t registered_callback_assignments; + callback_assignment_id_t free_callback_assignment_slots; + callback_assignment_t callback_assignments[MAX_CALLBACK_ASSIGNMENTS]; + + callback_id_t registered_callbacks; + callback_id_t free_callback_slots; + callback_t callbacks[MAX_CALLBACKS]; + + config_id_t registered_configs; + uint8_t custom_config_data[MAX_CONFIG_SPACE]; + uint8_t custom_config_default_data[MAX_CONFIG_SPACE]; + config_t custom_configs[MAX_CONFIGS]; + + feedback_id_t registered_feedbacks; + feedback_t feedbacks[MAX_FEEDBACKS]; + + uint16_t __ntohs(uint16_t); +}; + +// Global "singleton" object +extern ESPKNXIP knx; + +#endif diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/examples/environment-sensor/environment-sensor.ino b/lib/esp-knx-ip-async-udp-0.4.0.15/examples/environment-sensor/environment-sensor.ino new file mode 100644 index 000000000..02621bbc6 --- /dev/null +++ b/lib/esp-knx-ip-async-udp-0.4.0.15/examples/environment-sensor/environment-sensor.ino @@ -0,0 +1,159 @@ +/* + * This is an example showing a simple environment sensor based on a BME280 attached via I2C. + * This sketch was tested on a WeMos D1 mini + */ + +#include +#include + +// WiFi config here +const char* ssid = "myssid"; +const char* pass = "mypassword"; + +#define LED_PIN D4 +#define UPDATE_INTERVAL 10000 + +unsigned long next_change = 0; + +float last_temp = 0.0; +float last_hum = 0.0; +float last_pres = 0.0; + +config_id_t temp_ga, hum_ga, pres_ga; +config_id_t hostname_id; +config_id_t update_rate_id, send_rate_id; +config_id_t enable_sending_id; +config_id_t enable_reading_id; + +Adafruit_BME280 bme; + +void setup() { + pinMode(LED_PIN, OUTPUT); + Serial.begin(115200); + + hostname_id = knx.config_register_string("Hostname", 20, String("env")); + enable_sending_id = knx.config_register_bool("Send on update", true); + update_rate_id = knx.config_register_int("Update rate (ms)", UPDATE_INTERVAL); + temp_ga = knx.config_register_ga("Temperature", show_periodic_options); + hum_ga = knx.config_register_ga("Humidity", show_periodic_options); + pres_ga = knx.config_register_ga("Pressure", show_periodic_options); + + knx.callback_register("Read Temperature", temp_cb); + knx.callback_register("Read Humidity", hum_cb); + knx.callback_register("Read Pressure", pres_cb); + + knx.feedback_register_float("Temperature (°C)", &last_temp); + knx.feedback_register_float("Humidity (%)", &last_hum); + knx.feedback_register_float("Pressure (hPa)", &last_pres, 0); + + // Load previous config from EEPROM + knx.load(); + + // Init sensor + if (!bme.begin(0x76)) { + Serial.println("Could not find a valid BME280 sensor, check wiring!"); + } + + // Init WiFi + WiFi.hostname(knx.config_get_string(hostname_id)); + WiFi.begin(ssid, pass); + + Serial.println(""); + Serial.print("[Connecting]"); + Serial.print(ssid); + + digitalWrite(LED_PIN, LOW); + while (WiFi.status() != WL_CONNECTED) { + digitalWrite(LED_PIN, HIGH); + delay(250); + Serial.print("."); + digitalWrite(LED_PIN, LOW); + delay(250); + } + digitalWrite(LED_PIN, HIGH); + + // Start knx + knx.start(); + + Serial.println(); + Serial.println("Connected to wifi"); + Serial.println(WiFi.localIP()); +} + +void loop() { + knx.loop(); + + unsigned long now = millis(); + + if (next_change < now) + { + next_change = now + knx.config_get_int(update_rate_id); + + last_temp = bme.readTemperature(); + last_hum = bme.readHumidity(); + last_pres = bme.readPressure()/100.0f; + + Serial.print("T: "); + Serial.print(last_temp); + Serial.print("°C H: "); + Serial.print(last_hum); + Serial.print("% P: "); + Serial.print(last_pres); + Serial.println("hPa"); + + if (knx.config_get_bool(enable_sending_id)) + { + knx.write_2byte_float(knx.config_get_ga(temp_ga), last_temp); + knx.write_2byte_float(knx.config_get_ga(hum_ga), last_hum); + knx.write_2byte_float(knx.config_get_ga(pres_ga), last_pres); + } + } + + delay(50); +} + +bool show_periodic_options() +{ + return knx.config_get_bool(enable_sending_id); +} + +bool enable_reading_callback() +{ + return knx.config_get_bool(enable_reading_id); +} + +void temp_cb(message_t const &msg, void *arg) +{ + switch (msg.ct) + { + case KNX_CT_READ: + { + knx.answer_2byte_float(msg.received_on, last_temp); + break; + } + } +} + +void hum_cb(message_t const &msg, void *arg) +{ + switch (msg.ct) + { + case KNX_CT_READ: + { + knx.answer_2byte_float(msg.received_on, last_hum); + break; + } + } +} + +void pres_cb(message_t const &msg, void *arg) +{ + switch (msg.ct) + { + case KNX_CT_READ: + { + knx.answer_2byte_float(msg.received_on, last_pres); + break; + } + } +} diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/examples/sonoff/sonoff.ino b/lib/esp-knx-ip-async-udp-0.4.0.15/examples/sonoff/sonoff.ino new file mode 100644 index 000000000..fc2400b7b --- /dev/null +++ b/lib/esp-knx-ip-async-udp-0.4.0.15/examples/sonoff/sonoff.ino @@ -0,0 +1,183 @@ +#include + +// WiFi config here +const char* ssid = "ssid"; +const char* pass = "pass"; + +// Common +#define LED_PIN 13 + +// For Basic and S20 +#define BTN1_PIN 0 +#define CH1_PIN 12 + +// For 4CH +#define BTN2_PIN 9 +#define CH2_PIN 5 +#define BTN3_PIN 10 +#define CH3_PIN 4 +#define BTN4_PIN 14 +#define CH4_PIN 15 + +typedef enum __type_option +{ + SONOFF_TYPE_NONE = 0, + SONOFF_TYPE_BASIC = 1, + SONOFF_TYPE_S20 = 2, + SONOFF_TYPE_4CH = 3, + SONOFF_TYPE_4CH_PRO = 4, +} type_option_t; + +option_entry_t type_options[] = { + {"Sonoff Basic", SONOFF_TYPE_BASIC}, + {"Sonoff S20", SONOFF_TYPE_S20}, + {"Sonoff 4CH", SONOFF_TYPE_4CH}, + {"Sonoff 4CH Pro", SONOFF_TYPE_4CH_PRO}, + {nullptr, 0} +}; + +config_id_t hostname_id; +config_id_t type_id; + +typedef struct __sonoff_channel +{ + int pin; + int btn_pin; + config_id_t status_ga_id; + bool state; + bool last_btn_state; +} sonoff_channel_t; + +sonoff_channel_t channels[] = { + {CH1_PIN, BTN1_PIN, 0, false, false}, + {CH2_PIN, BTN2_PIN, 0, false, false}, + {CH3_PIN, BTN3_PIN, 0, false, false}, + {CH4_PIN, BTN4_PIN, 0, false, false}, +}; + +void setup() +{ + pinMode(LED_PIN, OUTPUT); + pinMode(BTN1_PIN, INPUT_PULLUP); + pinMode(BTN2_PIN, INPUT_PULLUP); + pinMode(BTN3_PIN, INPUT_PULLUP); + pinMode(BTN4_PIN, INPUT_PULLUP); + pinMode(CH1_PIN, OUTPUT); + pinMode(CH2_PIN, OUTPUT); + pinMode(CH3_PIN, OUTPUT); + pinMode(CH4_PIN, OUTPUT); + Serial.begin(115200); + + // Register the config options + hostname_id = knx.config_register_string("Hostname", 20, String("sonoff")); + type_id = knx.config_register_options("Type", type_options, SONOFF_TYPE_BASIC); + + channels[0].status_ga_id = knx.config_register_ga("Channel 1 Status GA"); + channels[1].status_ga_id = knx.config_register_ga("Channel 2 Status GA", is_4ch_or_4ch_pro); + channels[2].status_ga_id = knx.config_register_ga("Channel 3 Status GA", is_4ch_or_4ch_pro); + channels[3].status_ga_id = knx.config_register_ga("Channel 4 Status GA", is_4ch_or_4ch_pro); + + knx.callback_register("Channel 1", channel_cb, &channels[0]); + knx.callback_register("Channel 2", channel_cb, &channels[1], is_4ch_or_4ch_pro); + knx.callback_register("Channel 3", channel_cb, &channels[2], is_4ch_or_4ch_pro); + knx.callback_register("Channel 4", channel_cb, &channels[3], is_4ch_or_4ch_pro); + + knx.feedback_register_bool("Channel 1 is on", &(channels[0].state)); + knx.feedback_register_action("Toogle channel 1", toggle_chan, &channels[0]); + knx.feedback_register_bool("Channel 2 is on", &(channels[1].state), is_4ch_or_4ch_pro); + knx.feedback_register_action("Toogle channel 2", toggle_chan, &channels[1], is_4ch_or_4ch_pro); + knx.feedback_register_bool("Channel 3 is on", &(channels[2].state), is_4ch_or_4ch_pro); + knx.feedback_register_action("Toogle channel 3", toggle_chan, &channels[2], is_4ch_or_4ch_pro); + knx.feedback_register_bool("Channel 4 is on", &(channels[3].state), is_4ch_or_4ch_pro); + knx.feedback_register_action("Toogle channel 4", toggle_chan, &channels[3], is_4ch_or_4ch_pro); + + knx.load(); + + // Init WiFi + WiFi.hostname(knx.config_get_string(hostname_id)); + WiFi.begin(ssid, pass); + + Serial.println(""); + Serial.print("[Connecting]"); + Serial.print(ssid); + + digitalWrite(LED_PIN, LOW); + while (WiFi.status() != WL_CONNECTED) { + digitalWrite(LED_PIN, HIGH); + delay(500); + Serial.print("."); + digitalWrite(LED_PIN, LOW); + } + digitalWrite(LED_PIN, HIGH); + + // Start knx + knx.start(); + + Serial.println(); + Serial.println("Connected to wifi"); + Serial.println(WiFi.localIP()); +} + +void loop() +{ + knx.loop(); + + // Check local buttons + check_button(&channels[0]); + if (is_4ch_or_4ch_pro()) + { + check_button(&channels[1]); + check_button(&channels[2]); + check_button(&channels[3]); + } + + delay(50); +} + +bool is_basic_or_s20() +{ + uint8_t type = knx.config_get_options(type_id); + return type == SONOFF_TYPE_BASIC || type == SONOFF_TYPE_S20; +} + +bool is_4ch_or_4ch_pro() +{ + uint8_t type = knx.config_get_options(type_id); + return type == SONOFF_TYPE_4CH ||type == SONOFF_TYPE_4CH_PRO; +} + +void check_button(sonoff_channel_t *chan) +{ + bool state_now = digitalRead(chan->btn_pin) == HIGH ? true : false; + if (state_now != chan->last_btn_state && state_now == LOW) + { + chan->state = !chan->state; + digitalWrite(chan->pin, chan->state ? HIGH : LOW); + knx.write_1bit(knx.config_get_ga(chan->status_ga_id), chan->state); + } + chan->last_btn_state = state_now; +} + +void toggle_chan(void *arg) +{ + sonoff_channel_t *chan = (sonoff_channel_t *)arg; + chan->state = !chan->state; + digitalWrite(chan->pin, chan->state ? HIGH : LOW); + knx.write_1bit(knx.config_get_ga(chan->status_ga_id), chan->state); +} + +void channel_cb(message_t const &msg, void *arg) +{ + sonoff_channel_t *chan = (sonoff_channel_t *)arg; + switch (msg.ct) + { + case KNX_CT_WRITE: + chan->state = msg.data[0]; + Serial.println(chan->state ? "Toggle on" : "Toggle off"); + digitalWrite(chan->pin, chan->state ? HIGH : LOW); + knx.write_1bit(knx.config_get_ga(chan->status_ga_id), chan->state); + break; + case KNX_CT_READ: + knx.answer_1bit(msg.received_on, chan->state); + } +} diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/examples/static-config/static-config.ino b/lib/esp-knx-ip-async-udp-0.4.0.15/examples/static-config/static-config.ino new file mode 100644 index 000000000..bea5093f3 --- /dev/null +++ b/lib/esp-knx-ip-async-udp-0.4.0.15/examples/static-config/static-config.ino @@ -0,0 +1,142 @@ +/* + * This is an example showing a simple environment sensor based on a BME280 attached via I2C. + * It shows, how the library can used to statically configure a device without a webserver for config. + * This sketch was tested on a WeMos D1 mini + */ + +#include +#include + +// WiFi config here +const char* ssid = "myssid"; +const char* pass = "mypassword"; + +#define LED_PIN D4 +#define UPDATE_INTERVAL 10000 + +unsigned long next_change = 0; + +float last_temp = 0.0; +float last_hum = 0.0; +float last_pres = 0.0; + +Adafruit_BME280 bme; + +// Group addresses to send to (1/1/1, 1/1/2 and 1/1/3) +address_t temp_ga = knx.GA_to_address(1, 1, 1); +address_t hum_ga = knx.GA_to_address(1, 1, 2); +address_t pres_ga = knx.GA_to_address(1, 1, 3); + +void setup() { + pinMode(LED_PIN, OUTPUT); + Serial.begin(115200); + + callback_id_t temp_cb = knx.callback_register("Read Temperature", temp_cb); + callback_id_t hum_cb =knx.callback_register("Read Humidity", hum_cb); + callback_id_t pres_cb =knx.callback_register("Read Pressure", pres_cb); + + // Assign callbacks to group addresses (2/1/1, 2/1/2, 2/1/3) + knx.callback_assign(temp_cb, knx.GA_to_address(2, 1, 1)); + knx.callback_assign(hum_cb, knx.GA_to_address(2, 1, 2)); + knx.callback_assign(pres_cb, knx.GA_to_address(2, 1, 3)); + + // Set physical address (1.1.1) + knx.physical_address_set(knx.PA_to_address(1, 1, 1)); + + // Do not call knx.load() for static config, it will try to load config from EEPROM which we don't have here + + // Init sensor + if (!bme.begin(0x76)) { + Serial.println("Could not find a valid BME280 sensor, check wiring!"); + } + + // Init WiFi + WiFi.hostname("env"); + WiFi.begin(ssid, pass); + + Serial.println(""); + Serial.print("[Connecting]"); + Serial.print(ssid); + + digitalWrite(LED_PIN, LOW); + while (WiFi.status() != WL_CONNECTED) { + digitalWrite(LED_PIN, HIGH); + delay(250); + Serial.print("."); + digitalWrite(LED_PIN, LOW); + delay(250); + } + digitalWrite(LED_PIN, HIGH); + + // Start knx, disable webserver by passing nullptr + knx.start(nullptr); + + Serial.println(); + Serial.println("Connected to wifi"); + Serial.println(WiFi.localIP()); +} + +void loop() { + knx.loop(); + + unsigned long now = millis(); + + if (next_change < now) + { + next_change = now + UPDATE_INTERVAL; + + last_temp = bme.readTemperature(); + last_hum = bme.readHumidity(); + last_pres = bme.readPressure()/100.0f; + + Serial.print("T: "); + Serial.print(last_temp); + Serial.print("°C H: "); + Serial.print(last_hum); + Serial.print("% P: "); + Serial.print(last_pres); + Serial.println("hPa"); + + knx.write_2byte_float(temp_ga, last_temp); + knx.write_2byte_float(hum_ga, last_hum); + knx.write_2byte_float(pres_ga, last_pres); + } + + delay(50); +} + +void temp_cb(message_t const &msg, void *arg) +{ + switch (msg.ct) + { + case KNX_CT_READ: + { + knx.answer_2byte_float(msg.received_on, last_temp); + break; + } + } +} + +void hum_cb(message_t const &msg, void *arg) +{ + switch (msg.ct) + { + case KNX_CT_READ: + { + knx.answer_2byte_float(msg.received_on, last_hum); + break; + } + } +} + +void pres_cb(message_t const &msg, void *arg) +{ + switch (msg.ct) + { + case KNX_CT_READ: + { + knx.answer_2byte_float(msg.received_on, last_pres); + break; + } + } +} diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/keywords.txt b/lib/esp-knx-ip-async-udp-0.4.0.15/keywords.txt new file mode 100644 index 000000000..bc4989bd4 --- /dev/null +++ b/lib/esp-knx-ip-async-udp-0.4.0.15/keywords.txt @@ -0,0 +1,104 @@ +# datatypes +address_t DATA_TYPE +message_t DATA_TYPE +callback_id_t DATA_TYPE +callback_assignment_id_t DATA_TYPE +option_entry_t DATA_TYPE +config_id_t DATA_TYPE +enable_condition_t DATA_TYPE +callback_fptr_t DATA_TYPE +feedback_action_fptr_t DATA_TYPE +knx_command_type_t DATA_TYPE + +# methods +setup KEYWORD2 +loop KEYWORD2 +GA_to_address KEYWORD2 +PA_to_address KEYWORD2 +callback_register KEYWORD2 +callback_assign KEYWORD2 +callback_deregister KEYWORD2 +callback_unassign KEYWORD2 +physical_address_set KEYWORD2 +physical_address_get KEYWORD2 +config_register_string KEYWORD2 +config_register_int KEYWORD2 +config_register_bool KEYWORD2 +config_register_options KEYWORD2 +config_register_ga KEYWORD2 +config_get_string KEYWORD2 +config_get_int KEYWORD2 +config_get_bool KEYWORD2 +config_get_options KEYWORD2 +config_get_ga KEYWORD2 +config_set_string KEYWORD2 +config_set_int KEYWORD2 +config_set_bool KEYWORD2 +config_set_options KEYWORD2 +config_set_ga KEYWORD2 +feedback_register_int KEYWORD2 +feedback_register_float KEYWORD2 +feedback_register_bool KEYWORD2 +feedback_register_action KEYWORD2 +send_1bit KEYWORD2 +send_2bit KEYWORD2 +send_4bit KEYWORD2 +send_1byte_int KEYWORD2 +send_1byte_uint KEYWORD2 +send_2byte_int KEYWORD2 +send_2byte_uint KEYWORD2 +send_2byte_float KEYWORD2 +send_3byte_time KEYWORD2 +send_3byte_time KEYWORD2 +send_3byte_date KEYWORD2 +send_3byte_date KEYWORD2 +send_3byte_color KEYWORD2 +send_3byte_color KEYWORD2 +send_4byte_int KEYWORD2 +send_4byte_uint KEYWORD2 +send_4byte_float KEYWORD2 +write_1bit KEYWORD2 +write_2bit KEYWORD2 +write_4bit KEYWORD2 +write_1byte_int KEYWORD2 +write_1byte_uint KEYWORD2 +write_2byte_int KEYWORD2 +write_2byte_uint KEYWORD2 +write_2byte_float KEYWORD2 +write_3byte_time KEYWORD2 +write_3byte_time KEYWORD2 +write_3byte_date KEYWORD2 +write_3byte_date KEYWORD2 +write_3byte_color KEYWORD2 +write_3byte_color KEYWORD2 +write_4byte_int KEYWORD2 +write_4byte_uint KEYWORD2 +write_4byte_float KEYWORD2 +answer_1bit KEYWORD2 +answer_2bit KEYWORD2 +answer_4bit KEYWORD2 +answer_1byte_int KEYWORD2 +answer_1byte_uint KEYWORD2 +answer_2byte_int KEYWORD2 +answer_2byte_uint KEYWORD2 +answer_2byte_float KEYWORD2 +answer_3byte_time KEYWORD2 +answer_3byte_time KEYWORD2 +answer_3byte_date KEYWORD2 +answer_3byte_date KEYWORD2 +answer_3byte_color KEYWORD2 +answer_3byte_color KEYWORD2 +answer_4byte_int KEYWORD2 +answer_4byte_uint KEYWORD2 +answer_4byte_float KEYWORD2 + +data_to_1byte_int KEYWORD 2 +data_to_2byte_int KEYWORD 2 +data_to_2byte_float KEYWORD 2 +data_to_4byte_float KEYWORD 2 +data_to_3byte_color KEYWORD 2 +data_to_3byte_time KEYWORD 2 +data_to_3byte_data KEYWORD 2 + +# constants +knx LITERAL1 \ No newline at end of file diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/library.properties b/lib/esp-knx-ip-async-udp-0.4.0.15/library.properties new file mode 100644 index 000000000..ff2607bdc --- /dev/null +++ b/lib/esp-knx-ip-async-udp-0.4.0.15/library.properties @@ -0,0 +1,10 @@ +name=ESP KNX IP Library +version=0.4 +author=Nico Weichbrodt +maintainer=Nico Weichbrodt +sentence=ESP8266 library for KNX/IP communication. +paragraph=Build your own IoT devices with KNX/IP connectivity! This library depends on the ESPAsyncUDP library. +category=Communication +url=https://github.com/envy/esp-knx-ip +architectures=esp8266 +includes=esp-knx-ip.h \ No newline at end of file diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 44ca02078..bc760ec2f 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -2,6 +2,7 @@ * Release rules up to 511 characters * Prepare for feature release - call on translators to update their language files * Add timer sunrise and sunset offset (#2378) + * Fix negative Latitude and Longitude value entry (#2461) * * 5.12.0k * Prepare for simple rules of up to 255 characters by enlarging Settings area to now 2048 bytes diff --git a/sonoff/settings.h b/sonoff/settings.h index 3e0d85c7d..7346eed76 100644 --- a/sonoff/settings.h +++ b/sonoff/settings.h @@ -50,7 +50,7 @@ typedef union { // Restricted by MISRA-C Rule 18.4 bu uint32_t mqtt_serial : 1; // bit 22 (v5.12.0f) uint32_t rules_enabled : 1; // bit 23 (v5.12.0j) uint32_t rules_once : 1; // bit 24 (v5.12.0k) - uint32_t spare25 : 1; + uint32_t knx_enabled : 1; // bit 25 (v5.12.0l) KNX uint32_t spare26 : 1; uint32_t spare27 : 1; uint32_t spare28 : 1; @@ -226,13 +226,9 @@ struct SYSCFG { uint8_t light_speed; // 4A2 uint8_t light_scheme; // 4A3 uint8_t light_width; // 4A4 - - byte free_4A5[1]; // 4A5 - + byte knx_GA_registered; // 4A5 Number of Group Address to read uint16_t light_wakeup; // 4A6 - - byte free_4A8[1]; // 4A8 - + byte knx_CB_registered; // 4A8 Number of Group Address to write char web_password[33]; // 4A9 uint8_t switchmode[MAX_SWITCHES]; // 4CA char ntp_server[3][33]; // 4CE @@ -256,7 +252,13 @@ struct SYSCFG { int latitude; // 6B0 int longitude; // 6B4 - byte free_6b8[72]; // 6B8 + uint16_t knx_physsical_addr; // 6B8 (address_t is a uint16_t) + uint16_t knx_GA_addr[MAX_KNX_GA]; // 6BA (address_t is a uint16_t) x KNX_max_GA + uint16_t knx_CB_addr[MAX_KNX_CB]; // 6CE (address_t is a uint16_t) x KNX_max_CB + byte knx_GA_param[MAX_KNX_GA]; // 6E2 Type of Input (relay changed, button pressed, sensor read <-teleperiod) + byte knx_CB_param[MAX_KNX_CB]; // 6EC Type of Output (set relay, toggle relay, reply sensor value) + + byte free_6b8[10]; // 6F6 char rules[MAX_RULE_SIZE]; // 700 uses 512 bytes in v5.12.0l diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index bf9407312..2a2bb58ce 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -48,6 +48,8 @@ typedef unsigned long power_t; // Power (Relay) type #define MAX_FRIENDLYNAMES 4 // Max number of Friendly names #define MAX_DOMOTICZ_IDX 4 // Max number of Domoticz device, key and switch indices #define MAX_DOMOTICZ_SNS_IDX 12 // Max number of Domoticz sensors indices +#define MAX_KNX_GA 10 // Max number of KNX Group Addresses to read that can be set +#define MAX_KNX_CB 10 // Max number of KNX Group Addresses to write that can be set #define MAX_RULE_SIZE 512 // Max number of characters in rules #define MODULE SONOFF_BASIC // [Module] Select default model diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index e1e6e2200..2e20c6ae7 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -185,6 +185,7 @@ uint8_t spi_flg = 0; // SPI configured uint8_t light_type = 0; // Light types bool pwm_present = false; // Any PWM channel configured with SetOption15 0 boolean mdns_begun = false; +unsigned long features = 0UL; char my_version[33]; // Composed version string char my_hostname[33]; // Composed Wifi hostname @@ -1143,6 +1144,9 @@ boolean SendKey(byte key, byte device, byte state) result = RulesProcess(); #endif // USE_RULES } +#ifdef USE_KNX + KnxSendButtonPower(key, device, state); +#endif // USE_KNX return result; } @@ -1193,6 +1197,9 @@ void ExecuteCommandPower(byte device, byte state) #ifdef USE_DOMOTICZ DomoticzUpdatePowerState(device); #endif // USE_DOMOTICZ +#ifdef USE_KNX + KnxUpdatePowerState(device, power); +#endif // USE_KNX if (device <= MAX_PULSETIMERS) { // pulse_timer[(device -1)] = (power & mask) ? Settings.pulse_timer[(device -1)] : 0; pulse_timer[(device -1)] = (((POWER_ALL_OFF_PULSETIME_ON == Settings.poweronstate) ? ~power : power) & mask) ? Settings.pulse_timer[(device -1)] : 0; diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h index 4455519d0..4301971dd 100644 --- a/sonoff/sonoff_post.h +++ b/sonoff/sonoff_post.h @@ -33,6 +33,12 @@ void WifiWpsStatusCallback(wps_cb_status status); } #endif +#ifdef USE_KNX +#include + +void KNX_CB_Action(message_t const &msg, void *arg); +#endif // USE_KNX + #define USE_DHT // Default DHT11 sensor needs no external library #ifdef USE_ALL_SENSORS // ===================== Configure sonoff-xxl.bin ========================= diff --git a/sonoff/support.ino b/sonoff/support.ino index e200d0240..3d46ea004 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -218,7 +218,9 @@ double CharToDouble(char *str) right *= fac; } } - return left + right; + double result = left + right; + if (left < 0) { result = left - right; } + return result; } char* dtostrfd(double number, unsigned char prec, char *s) diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index 20ddb0b0c..38198826e 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -196,6 +196,9 @@ const char HTTP_BTN_MENU_MQTT[] PROGMEM = #endif // USE_DOMOTICZ ""; const char HTTP_BTN_MENU4[] PROGMEM = +#ifdef USE_KNX + "
" +#endif // USE_KNX "
" "
" "
" @@ -349,6 +352,9 @@ void StartWebserver(int type, IPAddress ipweb) WebServer->on("/dm", HandleDomoticzConfiguration); #endif // USE_DOMOTICZ } +#ifdef USE_KNX + WebServer->on("/kn", HandleKNXConfiguration); +#endif // USE_KNX WebServer->on("/lg", HandleLoggingConfiguration); WebServer->on("/co", HandleOtherConfiguration); WebServer->on("/dl", HandleBackupConfiguration); @@ -378,6 +384,9 @@ void StartWebserver(int type, IPAddress ipweb) } #endif // USE_EMULATION WebServer->onNotFound(HandleNotFound); +#ifdef USE_KNX + KNXStart(); +#endif // USE_KNX } reset_web_log_flag = 0; WebServer->begin(); // Web server start diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino index c30cd153d..4f7b5d2af 100644 --- a/sonoff/xdrv_09_timers.ino +++ b/sonoff/xdrv_09_timers.ino @@ -289,7 +289,7 @@ void PrepShowTimer(uint8_t index) #ifdef USE_SUNRISE int16_t hour = xtimer.time / 60; if ((1 == xtimer.mode) || (2 == xtimer.mode)) { // Sunrise or Sunset - if (hour > 11) hour = (hour -12) * -1; + if (hour > 11) { hour = (hour -12) * -1; } } snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_MODE "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_OUTPUT "\":%d,\"" D_JSON_TIMER_ACTION "\":%d}"), mqtt_data, index, xtimer.arm, xtimer.mode, hour, xtimer.time % 60, days, xtimer.repeat, xtimer.device +1, xtimer.power); @@ -349,14 +349,14 @@ boolean TimerCommand() const char *substr = strtok(time_str, ":"); if (substr != NULL) { value = atoi(substr); - if (value < 0) value = abs(value) +12; // Allow entering timer offset from -11:59 to -00:01 converted to 12:01 to 23:59 - if (value > 23) value = 23; + if (value < 0) { value = abs(value) +12; } // Allow entering timer offset from -11:59 to -00:01 converted to 12:01 to 23:59 + if (value > 23) { value = 23; } itime = value * 60; substr = strtok(NULL, ":"); if (substr != NULL) { value = atoi(substr); - if (value < 0) value = 0; - if (value > 59) value = 59; + if (value < 0) { value = 0; } + if (value > 59) { value = 59; } itime += value; } } @@ -371,7 +371,7 @@ boolean TimerCommand() uint8_t i = 0; while ((ch != '\0') && (i < 7)) { ch = *tday++; - if (ch == '-') ch = '0'; + if (ch == '-') { ch = '0'; } uint8_t mask = 1 << i++; Settings.timer[index].days |= (ch == '0') ? 0 : mask; } @@ -626,7 +626,7 @@ void HandleTimerConfiguration() page.replace(F(""), FPSTR(HTTP_TIMER_STYLE)); page += FPSTR(HTTP_FORM_TIMER); for (byte i = 0; i < MAX_TIMERS; i++) { - if (i > 0) page += F(","); + if (i > 0) { page += F(","); } page += String(Settings.timer[i].data); } #ifdef USE_SUNRISE @@ -656,12 +656,7 @@ void TimerSaveSettings() for (byte i = 0; i < MAX_TIMERS; i++) { timer.data = strtol(p, &p, 10); p++; // Skip comma - if (timer.time < 1440) { -#ifdef USE_SUNRISE -// if ((1 == timer.mode) || (2 == timer.mode)) timer.time = Settings.timer[i].time; // Do not save time on Sunrise or Sunset -#endif - Settings.timer[i].data = timer.data; - } + if (timer.time < 1440) { Settings.timer[i].data = timer.data; } snprintf_P(log_data, sizeof(log_data), PSTR("%s%s0x%08X"), log_data, (i > 0)?",":"", Settings.timer[i].data); } AddLog(LOG_LEVEL_DEBUG); diff --git a/sonoff/xdrv_10_rules.ino b/sonoff/xdrv_10_rules.ino index 690b5a934..2697f3d32 100644 --- a/sonoff/xdrv_10_rules.ino +++ b/sonoff/xdrv_10_rules.ino @@ -141,7 +141,7 @@ bool RulesRuleMatch(String &event, String &rule) // Step1: Analyse rule int pos = rule.indexOf('#'); - if (pos == -1) return false; // No # sign in rule + if (pos == -1) { return false; } // No # sign in rule String rule_task = rule.substring(0, pos); // "INA219" or "SYSTEM" String rule_name = rule.substring(pos +1); // "CURRENT>0.100" or "BOOT" @@ -173,7 +173,7 @@ bool RulesRuleMatch(String &event, String &rule) // Step2: Search rule_task and rule_name StaticJsonBuffer<400> jsonBuf; JsonObject &root = jsonBuf.parseObject(event); - if (!root.success()) return false; // No valid JSON data + if (!root.success()) { return false; } // No valid JSON data double value = 0; const char* str_value = root[rule_task][rule_name]; @@ -182,7 +182,7 @@ bool RulesRuleMatch(String &event, String &rule) // rule_task.c_str(), rule_name.c_str(), tmp_value.c_str(), rules_trigger_count, bitRead(rules_triggers, rules_trigger_count), event.c_str(), (str_value) ? str_value : "none"); // AddLog(LOG_LEVEL_DEBUG); - if (!root[rule_task][rule_name].success()) return false; + if (!root[rule_task][rule_name].success()) { return false; } // No value but rule_name is ok rules_event_value = str_value; // Prepare %value% @@ -227,8 +227,8 @@ bool RulesProcess() { bool serviced = false; - if (!Settings.flag.rules_enabled) return serviced; // Not enabled - if (!strlen(Settings.rules)) return serviced; // No rules + if (!Settings.flag.rules_enabled) { return serviced; } // Not enabled + if (!strlen(Settings.rules)) { return serviced; } // No rules String event_saved = mqtt_data; event_saved.toUpperCase(); @@ -237,21 +237,21 @@ bool RulesProcess() rules_trigger_count = 0; int plen = 0; while (true) { - rules = rules.substring(plen); // Select relative to last rule + rules = rules.substring(plen); // Select relative to last rule rules.trim(); - if (!rules.length()) return serviced; // No more rules + if (!rules.length()) { return serviced; } // No more rules String rule = rules; - rule.toUpperCase(); // "ON INA219#CURRENT>0.100 DO BACKLOG DIMMER 10;COLOR 100000 ENDON" - if (!rule.startsWith("ON ")) return serviced; // Bad syntax - Nothing to start on + rule.toUpperCase(); // "ON INA219#CURRENT>0.100 DO BACKLOG DIMMER 10;COLOR 100000 ENDON" + if (!rule.startsWith("ON ")) { return serviced; } // Bad syntax - Nothing to start on int pevt = rule.indexOf(" DO "); - if (pevt == -1) return serviced; // Bad syntax - Nothing to do - String event_trigger = rule.substring(3, pevt); // "INA219#CURRENT>0.100" + if (pevt == -1) { return serviced; } // Bad syntax - Nothing to do + String event_trigger = rule.substring(3, pevt); // "INA219#CURRENT>0.100" plen = rule.indexOf(" ENDON"); - if (plen == -1) return serviced; // Bad syntax - No endon - String commands = rules.substring(pevt +4, plen); // "Backlog Dimmer 10;Color 100000" + if (plen == -1) { return serviced; } // Bad syntax - No endon + String commands = rules.substring(pevt +4, plen); // "Backlog Dimmer 10;Color 100000" plen += 6; // snprintf_P(log_data, sizeof(log_data), PSTR("RUL: Trigger |%s|, Commands |%s|"), event_trigger.c_str(), commands.c_str()); @@ -375,7 +375,7 @@ boolean RulesCommand() String uc_command = command; uc_command += " "; // Distuingish from RuleTimer uc_command.toUpperCase(); - if (!uc_data.indexOf(uc_command)) strlcpy(Settings.rules, XdrvMailbox.data, sizeof(Settings.rules)); + if (!uc_data.indexOf(uc_command)) { strlcpy(Settings.rules, XdrvMailbox.data, sizeof(Settings.rules)); } */ strlcpy(Settings.rules, XdrvMailbox.data, sizeof(Settings.rules)); } From 107379276be99fae7a72d9e2a347b345997d042a Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Tue, 17 Apr 2018 17:05:24 +0200 Subject: [PATCH 079/136] Fix sunrise and sunset calculation (#2461) 5.12.0l * Fix sunrise and sunset calculation (#2461) --- sonoff/_releasenotes.ino | 1 + sonoff/support.ino | 2 +- sonoff/xdrv_09_timers.ino | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index bc760ec2f..229aae0b4 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -3,6 +3,7 @@ * Prepare for feature release - call on translators to update their language files * Add timer sunrise and sunset offset (#2378) * Fix negative Latitude and Longitude value entry (#2461) + * Fix sunrise and sunset calculation (#2461) * * 5.12.0k * Prepare for simple rules of up to 255 characters by enlarging Settings area to now 2048 bytes diff --git a/sonoff/support.ino b/sonoff/support.ino index 3d46ea004..4d1e51516 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -1409,7 +1409,7 @@ void RtcSecond() } } local_time += time_offset; - time_timezone = time_offset / (SECS_PER_HOUR / 10); + time_timezone = time_offset / 360; // (SECS_PER_HOUR / 10) fails as it is defined as UL } BreakTime(local_time, RtcTime); if (!RtcTime.hour && !RtcTime.minute && !RtcTime.second && RtcTime.valid) { diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino index 4f7b5d2af..dfdcd647d 100644 --- a/sonoff/xdrv_09_timers.ino +++ b/sonoff/xdrv_09_timers.ino @@ -123,9 +123,12 @@ void DuskTillDawn(uint8_t *hour_up,uint8_t *minute_up, uint8_t *hour_down, uint8 h (D) = -18.0 astronomische Dämmerung */ double h = -50/60.0*RAD; - double B = ((double)Settings.latitude/1000000) * RAD; // geographische Breite - double GeographischeLaenge = (double)Settings.longitude/1000000; - double Zeitzone = (double)time_timezone / 10; + double B = (((double)Settings.latitude)/1000000) * RAD; // geographische Breite + double GeographischeLaenge = ((double)Settings.longitude)/1000000; +// double Zeitzone = 0; //Weltzeit +// double Zeitzone = 1; //Winterzeit +// double Zeitzone = 2.0; //Sommerzeit + double Zeitzone = ((double)time_timezone) / 10; double Zeitgleichung = BerechneZeitgleichung(&DK, T); double Minuten = Zeitgleichung * 60.0; double Zeitdifferenz = 12.0*acos((sin(h) - sin(B)*sin(DK)) / (cos(B)*cos(DK)))/pi; From 0e671eb75d87e8b8bf38241fa53a610231206f7c Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Wed, 18 Apr 2018 17:24:23 +0200 Subject: [PATCH 080/136] v5.12.0m - Add KNX support and Random timer 5.12.0m * Reinit timers to accomodate random window (#2447) * Add random window to timers (#2447) * Add optional KNX IP Protocol Support (#2402) --- README.md | 2 +- sonoff/language/cs-CZ.h | 20 ++++++++++++++++++++ sonoff/language/de-DE.h | 20 ++++++++++++++++++++ sonoff/language/en-GB.h | 21 +++++++++++++++++++++ sonoff/language/es-AR.h | 20 ++++++++++++++++++++ sonoff/language/fr-FR.h | 20 ++++++++++++++++++++ sonoff/language/hu-HU.h | 20 ++++++++++++++++++++ sonoff/language/it-IT.h | 20 ++++++++++++++++++++ sonoff/language/nl-NL.h | 20 ++++++++++++++++++++ sonoff/language/pl-PL.h | 20 ++++++++++++++++++++ sonoff/language/pt-PT.h | 20 ++++++++++++++++++++ sonoff/language/ru-RU.h | 20 ++++++++++++++++++++ sonoff/language/zh-CN.h | 20 ++++++++++++++++++++ sonoff/language/zh-TW.h | 20 ++++++++++++++++++++ 14 files changed, 262 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 51c26c777..7d95d9370 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ If you like **Sonoff-Tasmota**, give it a star, or fork it and contribute! ### Development: [![Build Status](https://img.shields.io/travis/arendst/Sonoff-Tasmota.svg)](https://travis-ci.org/arendst/Sonoff-Tasmota) -Current version is **5.12.0l** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.12.0m** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### Quick install diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h index 07be6d2cf..e5ad4bee3 100644 --- a/sonoff/language/cs-CZ.h +++ b/sonoff/language/cs-CZ.h @@ -374,6 +374,26 @@ #define D_TIMER_OUTPUT "Výstup" #define D_TIMER_ACTION "Napájení" +// xdrv_10_knx.ino +#define D_CONFIGURE_KNX "Configure KNX" +#define D_KNX_PARAMETERS "KNX Parameters" +#define D_KNX_GENERAL_CONFIG "General" +#define D_KNX_PHYSICAL_ADDRESS "Physical Address" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" +#define D_KNX_ENABLE "Enable KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" +#define D_ADD "Add" +#define D_DELETE "Delete" +#define D_REPLY "Reply" +#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_LOG_KNX "KNX: " +#define D_RECEIVED_FROM "Received from" +#define D_KNX_COMMAND_WRITE "Write" +#define D_KNX_COMMAND_READ "Read" +#define D_KNX_COMMAND_OTHER "Other" +#define D_SENT_TO "sent to" +#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Spotřeba Dnes" #define D_ENERGY_YESTERDAY "Spotřeba Včera" diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index b69f1ede9..2617e8e1b 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -374,6 +374,26 @@ #define D_TIMER_OUTPUT "Ausgang" #define D_TIMER_ACTION "Aktion" +// xdrv_10_knx.ino +#define D_CONFIGURE_KNX "Configure KNX" +#define D_KNX_PARAMETERS "KNX Parameters" +#define D_KNX_GENERAL_CONFIG "General" +#define D_KNX_PHYSICAL_ADDRESS "Physical Address" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" +#define D_KNX_ENABLE "Enable KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" +#define D_ADD "Add" +#define D_DELETE "Delete" +#define D_REPLY "Reply" +#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_LOG_KNX "KNX: " +#define D_RECEIVED_FROM "Received from" +#define D_KNX_COMMAND_WRITE "Write" +#define D_KNX_COMMAND_READ "Read" +#define D_KNX_COMMAND_OTHER "Other" +#define D_SENT_TO "sent to" +#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energie heute" #define D_ENERGY_YESTERDAY "Energie gestern" diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h index d5555b094..7c7c9568f 100644 --- a/sonoff/language/en-GB.h +++ b/sonoff/language/en-GB.h @@ -28,6 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * + * Updated until v5.12.0l \*********************************************************************/ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) @@ -373,6 +374,26 @@ #define D_TIMER_OUTPUT "Output" #define D_TIMER_ACTION "Action" +// xdrv_10_knx.ino +#define D_CONFIGURE_KNX "Configure KNX" +#define D_KNX_PARAMETERS "KNX Parameters" +#define D_KNX_GENERAL_CONFIG "General" +#define D_KNX_PHYSICAL_ADDRESS "Physical Address" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" +#define D_KNX_ENABLE "Enable KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" +#define D_ADD "Add" +#define D_DELETE "Delete" +#define D_REPLY "Reply" +#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_LOG_KNX "KNX: " +#define D_RECEIVED_FROM "Received from" +#define D_KNX_COMMAND_WRITE "Write" +#define D_KNX_COMMAND_READ "Read" +#define D_KNX_COMMAND_OTHER "Other" +#define D_SENT_TO "sent to" +#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energy Today" #define D_ENERGY_YESTERDAY "Energy Yesterday" diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index 7999057c8..4a4e6c9ec 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -374,6 +374,26 @@ #define D_TIMER_OUTPUT "Salida" #define D_TIMER_ACTION "Estado" +// xdrv_10_knx.ino +#define D_CONFIGURE_KNX "Configure KNX" +#define D_KNX_PARAMETERS "KNX Parameters" +#define D_KNX_GENERAL_CONFIG "General" +#define D_KNX_PHYSICAL_ADDRESS "Physical Address" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" +#define D_KNX_ENABLE "Enable KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" +#define D_ADD "Add" +#define D_DELETE "Delete" +#define D_REPLY "Reply" +#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_LOG_KNX "KNX: " +#define D_RECEIVED_FROM "Received from" +#define D_KNX_COMMAND_WRITE "Write" +#define D_KNX_COMMAND_READ "Read" +#define D_KNX_COMMAND_OTHER "Other" +#define D_SENT_TO "sent to" +#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energía Hoy" #define D_ENERGY_YESTERDAY "Energía Ayer" diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h index 19ae7f1cf..26c0fe784 100644 --- a/sonoff/language/fr-FR.h +++ b/sonoff/language/fr-FR.h @@ -374,6 +374,26 @@ #define D_TIMER_OUTPUT "Sortie" #define D_TIMER_ACTION "Action" +// xdrv_10_knx.ino +#define D_CONFIGURE_KNX "Configure KNX" +#define D_KNX_PARAMETERS "KNX Parameters" +#define D_KNX_GENERAL_CONFIG "General" +#define D_KNX_PHYSICAL_ADDRESS "Physical Address" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" +#define D_KNX_ENABLE "Enable KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" +#define D_ADD "Add" +#define D_DELETE "Delete" +#define D_REPLY "Reply" +#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_LOG_KNX "KNX: " +#define D_RECEIVED_FROM "Received from" +#define D_KNX_COMMAND_WRITE "Write" +#define D_KNX_COMMAND_READ "Read" +#define D_KNX_COMMAND_OTHER "Other" +#define D_SENT_TO "sent to" +#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." + // xsns_03_energy.ino #define D_ENERGY_TODAY "Énergie aujourd'hui" #define D_ENERGY_YESTERDAY "Énergie hier" diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h index 17531c7db..80c568688 100644 --- a/sonoff/language/hu-HU.h +++ b/sonoff/language/hu-HU.h @@ -374,6 +374,26 @@ #define D_TIMER_OUTPUT "Output" #define D_TIMER_ACTION "Action" +// xdrv_10_knx.ino +#define D_CONFIGURE_KNX "Configure KNX" +#define D_KNX_PARAMETERS "KNX Parameters" +#define D_KNX_GENERAL_CONFIG "General" +#define D_KNX_PHYSICAL_ADDRESS "Physical Address" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" +#define D_KNX_ENABLE "Enable KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" +#define D_ADD "Add" +#define D_DELETE "Delete" +#define D_REPLY "Reply" +#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_LOG_KNX "KNX: " +#define D_RECEIVED_FROM "Received from" +#define D_KNX_COMMAND_WRITE "Write" +#define D_KNX_COMMAND_READ "Read" +#define D_KNX_COMMAND_OTHER "Other" +#define D_SENT_TO "sent to" +#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Mai Energia" #define D_ENERGY_YESTERDAY "Tegnapi Energia" diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index 5266713ac..b273222e6 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -374,6 +374,26 @@ #define D_TIMER_OUTPUT "Output" #define D_TIMER_ACTION "Action" +// xdrv_10_knx.ino +#define D_CONFIGURE_KNX "Configure KNX" +#define D_KNX_PARAMETERS "KNX Parameters" +#define D_KNX_GENERAL_CONFIG "General" +#define D_KNX_PHYSICAL_ADDRESS "Physical Address" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" +#define D_KNX_ENABLE "Enable KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" +#define D_ADD "Add" +#define D_DELETE "Delete" +#define D_REPLY "Reply" +#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_LOG_KNX "KNX: " +#define D_RECEIVED_FROM "Received from" +#define D_KNX_COMMAND_WRITE "Write" +#define D_KNX_COMMAND_READ "Read" +#define D_KNX_COMMAND_OTHER "Other" +#define D_SENT_TO "sent to" +#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energia Oggi" #define D_ENERGY_YESTERDAY "Energia Ieri" diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h index 59dd2cf85..776bca8e9 100644 --- a/sonoff/language/nl-NL.h +++ b/sonoff/language/nl-NL.h @@ -374,6 +374,26 @@ #define D_TIMER_OUTPUT "Uitgang" #define D_TIMER_ACTION "Actie" +// xdrv_10_knx.ino +#define D_CONFIGURE_KNX "Configure KNX" +#define D_KNX_PARAMETERS "KNX Parameters" +#define D_KNX_GENERAL_CONFIG "General" +#define D_KNX_PHYSICAL_ADDRESS "Physical Address" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" +#define D_KNX_ENABLE "Enable KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" +#define D_ADD "Add" +#define D_DELETE "Delete" +#define D_REPLY "Reply" +#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_LOG_KNX "KNX: " +#define D_RECEIVED_FROM "Received from" +#define D_KNX_COMMAND_WRITE "Write" +#define D_KNX_COMMAND_READ "Read" +#define D_KNX_COMMAND_OTHER "Other" +#define D_SENT_TO "sent to" +#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Verbruik vandaag" #define D_ENERGY_YESTERDAY "Verbruik gisteren" diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h index 4249be1e3..09715f1e0 100644 --- a/sonoff/language/pl-PL.h +++ b/sonoff/language/pl-PL.h @@ -374,6 +374,26 @@ #define D_TIMER_OUTPUT "Output" #define D_TIMER_ACTION "Action" +// xdrv_10_knx.ino +#define D_CONFIGURE_KNX "Configure KNX" +#define D_KNX_PARAMETERS "KNX Parameters" +#define D_KNX_GENERAL_CONFIG "General" +#define D_KNX_PHYSICAL_ADDRESS "Physical Address" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" +#define D_KNX_ENABLE "Enable KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" +#define D_ADD "Add" +#define D_DELETE "Delete" +#define D_REPLY "Reply" +#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_LOG_KNX "KNX: " +#define D_RECEIVED_FROM "Received from" +#define D_KNX_COMMAND_WRITE "Write" +#define D_KNX_COMMAND_READ "Read" +#define D_KNX_COMMAND_OTHER "Other" +#define D_SENT_TO "sent to" +#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energia Dzisiaj" #define D_ENERGY_YESTERDAY "Energia Wczoraj" diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h index 3b7ca2b8c..01293ed18 100644 --- a/sonoff/language/pt-PT.h +++ b/sonoff/language/pt-PT.h @@ -374,6 +374,26 @@ #define D_TIMER_OUTPUT "Output" #define D_TIMER_ACTION "Action" +// xdrv_10_knx.ino +#define D_CONFIGURE_KNX "Configure KNX" +#define D_KNX_PARAMETERS "KNX Parameters" +#define D_KNX_GENERAL_CONFIG "General" +#define D_KNX_PHYSICAL_ADDRESS "Physical Address" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" +#define D_KNX_ENABLE "Enable KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" +#define D_ADD "Add" +#define D_DELETE "Delete" +#define D_REPLY "Reply" +#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_LOG_KNX "KNX: " +#define D_RECEIVED_FROM "Received from" +#define D_KNX_COMMAND_WRITE "Write" +#define D_KNX_COMMAND_READ "Read" +#define D_KNX_COMMAND_OTHER "Other" +#define D_SENT_TO "sent to" +#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Consumo energético de hoje" #define D_ENERGY_YESTERDAY "Consumo energético de ontem" diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h index fa2a9dbf3..c5ecf5e69 100644 --- a/sonoff/language/ru-RU.h +++ b/sonoff/language/ru-RU.h @@ -374,6 +374,26 @@ #define D_TIMER_OUTPUT "Output" #define D_TIMER_ACTION "Action" +// xdrv_10_knx.ino +#define D_CONFIGURE_KNX "Configure KNX" +#define D_KNX_PARAMETERS "KNX Parameters" +#define D_KNX_GENERAL_CONFIG "General" +#define D_KNX_PHYSICAL_ADDRESS "Physical Address" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" +#define D_KNX_ENABLE "Enable KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" +#define D_ADD "Add" +#define D_DELETE "Delete" +#define D_REPLY "Reply" +#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_LOG_KNX "KNX: " +#define D_RECEIVED_FROM "Received from" +#define D_KNX_COMMAND_WRITE "Write" +#define D_KNX_COMMAND_READ "Read" +#define D_KNX_COMMAND_OTHER "Other" +#define D_SENT_TO "sent to" +#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." + // xdrv_03_energy.ino #define D_ENERGY_TODAY "Энергия Сегодня" #define D_ENERGY_YESTERDAY "Энергия Вчера" diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h index 10e8d649d..ad52fef54 100644 --- a/sonoff/language/zh-CN.h +++ b/sonoff/language/zh-CN.h @@ -374,6 +374,26 @@ #define D_TIMER_OUTPUT "Output" #define D_TIMER_ACTION "Action" +// xdrv_10_knx.ino +#define D_CONFIGURE_KNX "Configure KNX" +#define D_KNX_PARAMETERS "KNX Parameters" +#define D_KNX_GENERAL_CONFIG "General" +#define D_KNX_PHYSICAL_ADDRESS "Physical Address" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" +#define D_KNX_ENABLE "Enable KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" +#define D_ADD "Add" +#define D_DELETE "Delete" +#define D_REPLY "Reply" +#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_LOG_KNX "KNX: " +#define D_RECEIVED_FROM "Received from" +#define D_KNX_COMMAND_WRITE "Write" +#define D_KNX_COMMAND_READ "Read" +#define D_KNX_COMMAND_OTHER "Other" +#define D_SENT_TO "sent to" +#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." + // xdrv_03_energy.ino #define D_ENERGY_TODAY "今日用电量" #define D_ENERGY_YESTERDAY "昨日用电量" diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h index 2790fa19b..927032310 100644 --- a/sonoff/language/zh-TW.h +++ b/sonoff/language/zh-TW.h @@ -374,6 +374,26 @@ #define D_TIMER_OUTPUT "Output" #define D_TIMER_ACTION "Action" +// xdrv_10_knx.ino +#define D_CONFIGURE_KNX "Configure KNX" +#define D_KNX_PARAMETERS "KNX Parameters" +#define D_KNX_GENERAL_CONFIG "General" +#define D_KNX_PHYSICAL_ADDRESS "Physical Address" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" +#define D_KNX_ENABLE "Enable KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" +#define D_ADD "Add" +#define D_DELETE "Delete" +#define D_REPLY "Reply" +#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_LOG_KNX "KNX: " +#define D_RECEIVED_FROM "Received from" +#define D_KNX_COMMAND_WRITE "Write" +#define D_KNX_COMMAND_READ "Read" +#define D_KNX_COMMAND_OTHER "Other" +#define D_SENT_TO "sent to" +#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." + // xdrv_03_energy.ino #define D_ENERGY_TODAY "今日用電量" #define D_ENERGY_YESTERDAY "昨日用電量" From 8bc64758504d37486485a014fe69d19bd171e597 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Wed, 18 Apr 2018 17:28:45 +0200 Subject: [PATCH 081/136] v5.12.0m - Add KNX support and Random Timer 5.12.0m * Reinit timers to accomodate random window (#2447) * Add random window to timers (#2447) * Add optional KNX IP Protocol Support (#2402) --- sonoff/_releasenotes.ino | 7 +- sonoff/i18n.h | 1 + sonoff/settings.h | 22 +- sonoff/settings.ino | 16 +- sonoff/sonoff.ino | 2 +- sonoff/sonoff_post.h | 5 +- sonoff/user_config.h | 3 + sonoff/xdrv_09_timers.ino | 149 ++++--- sonoff/xdrv_11_knx.ino | 885 ++++++++++++++++++++++++++++++++++++++ sonoff/xsns_04_snfsc.ino | 8 + sonoff/xsns_06_dht.ino | 8 + sonoff/xsns_07_sht1x.ino | 8 + sonoff/xsns_08_htu21.ino | 8 + sonoff/xsns_09_bmp.ino | 8 + sonoff/xsns_14_sht3x.ino | 8 + 15 files changed, 1053 insertions(+), 85 deletions(-) create mode 100644 sonoff/xdrv_11_knx.ino diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 229aae0b4..ea8d97155 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,9 @@ -/* 5.12.0l +/* 5.12.0m + * Reinit timers to accomodate random window (#2447) + * Add random window to timers (#2447) + * Add optional KNX IP Protocol Support (#2402) + * + * 5.12.0l * Release rules up to 511 characters * Prepare for feature release - call on translators to update their language files * Add timer sunrise and sunset offset (#2378) diff --git a/sonoff/i18n.h b/sonoff/i18n.h index ce984f1e4..bee43f02d 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -361,6 +361,7 @@ #define D_JSON_TIMER_ARM "Arm" #define D_JSON_TIMER_MODE "Mode" #define D_JSON_TIMER_TIME "Time" + #define D_JSON_TIMER_WINDOW "Window" #define D_JSON_TIMER_DAYS "Days" #define D_JSON_TIMER_REPEAT "Repeat" #define D_JSON_TIMER_OUTPUT "Output" diff --git a/sonoff/settings.h b/sonoff/settings.h index 7346eed76..dec5ef2fe 100644 --- a/sonoff/settings.h +++ b/sonoff/settings.h @@ -92,14 +92,14 @@ typedef union { typedef union { uint32_t data; struct { - uint32_t time : 11; // bits 0 - 10 = minutes in a day - uint32_t mode : 5; // bits 11 - 15 = timer modes - Scheduler, Sunrise, Sunset - uint32_t days : 7; // bits 16 - 22 = week day mask - uint32_t device : 4; // bits 23 - 26 = 16 devices - uint32_t power : 2; // bits 27 - 28 = 4 power states - Off, On, Toggle, Blink - uint32_t repeat : 1; // bit 29 - uint32_t arm : 1; // bit 30 - uint32_t spare : 1; // bit 31 + uint32_t time : 11; // bits 0 - 10 = minutes in a day + uint32_t window : 4; // bits 11 - 14 = minutes random window + uint32_t repeat : 1; // bit 15 + uint32_t days : 7; // bits 16 - 22 = week day mask + uint32_t device : 4; // bits 23 - 26 = 16 devices + uint32_t power : 2; // bits 27 - 28 = 4 power states - Off, On, Toggle, Blink or Rule + uint32_t mode : 2; // bits 29 - 30 = timer modes - Scheduler, Sunrise, Sunset + uint32_t arm : 1; // bit 31 }; } Timer; @@ -258,11 +258,11 @@ struct SYSCFG { byte knx_GA_param[MAX_KNX_GA]; // 6E2 Type of Input (relay changed, button pressed, sensor read <-teleperiod) byte knx_CB_param[MAX_KNX_CB]; // 6EC Type of Output (set relay, toggle relay, reply sensor value) - byte free_6b8[10]; // 6F6 + byte free_6f6[266]; // 6F6 - char rules[MAX_RULE_SIZE]; // 700 uses 512 bytes in v5.12.0l + char rules[MAX_RULE_SIZE]; // 800 uses 512 bytes in v5.12.0m - // 900 - FFF free locations + // A00 - FFF free locations } Settings; struct RTCMEM { diff --git a/sonoff/settings.ino b/sonoff/settings.ino index c9b41d946..9419548c8 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -920,21 +920,25 @@ void SettingsDelta() Settings.sbaudrate = SOFT_BAUDRATE / 1200; Settings.serial_delimiter = 0xff; } - if (Settings.version < 0x050C0009) { - memset(&Settings.timer, 0x00, sizeof(Timer) * MAX_TIMERS); - } +// if (Settings.version < 0x050C0009) { +// memset(&Settings.timer, 0x00, sizeof(Timer) * MAX_TIMERS); +// } if (Settings.version < 0x050C000A) { Settings.latitude = (int)((double)LATITUDE * 1000000); Settings.longitude = (int)((double)LONGITUDE * 1000000); } if (Settings.version < 0x050C000B) { - memset(&Settings.free_6b8, 0x00, sizeof(Settings.free_6b8)); memset(&Settings.rules, 0x00, sizeof(Settings.rules)); } + if (Settings.version < 0x050C000D) { + memmove(Settings.rules, Settings.rules -256, sizeof(Settings.rules)); // move rules up by 256 bytes + memset(&Settings.timer, 0x00, sizeof(Timer) * MAX_TIMERS); // Reset timers as layout has changed from v5.12.0i + Settings.knx_GA_registered = 0; + Settings.knx_CB_registered = 0; + memset(&Settings.knx_physsical_addr, 0x00, 0x800 - 0x6b8); // Reset until 0x800 for future use + } Settings.version = VERSION; SettingsSave(1); } } - - diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 2e20c6ae7..f937cc517 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050C000C // 5.12.0l +#define VERSION 0x050C000D // 5.12.0m // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h index 4301971dd..d488f4ea4 100644 --- a/sonoff/sonoff_post.h +++ b/sonoff/sonoff_post.h @@ -33,11 +33,10 @@ void WifiWpsStatusCallback(wps_cb_status status); } #endif -#ifdef USE_KNX +//#ifdef USE_KNX // Enabling this will fail compilation. It has no impact if not used. (20180417) #include - void KNX_CB_Action(message_t const &msg, void *arg); -#endif // USE_KNX +//#endif // USE_KNX #define USE_DHT // Default DHT11 sensor needs no external library diff --git a/sonoff/user_config.h b/sonoff/user_config.h index cf1d29985..884ba8376 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -202,6 +202,9 @@ // !!! TLS uses a LOT OF MEMORY so be careful to enable other options at the same time !!! //#define USE_MQTT_TLS // Use TLS for MQTT connection (+53k code, +15k mem) +// -- KNX IP Protocol ----------------------------- +//#define USE_KNX // Enable KNX IP Protocol Support (+23k code, +3k3 mem) + // -- HTTP ---------------------------------------- #define USE_WEBSERVER // Enable web server and wifi manager (+66k code, +8k mem) #define WEB_PORT 80 // Web server Port for User and Admin mode diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino index dfdcd647d..65dfd0136 100644 --- a/sonoff/xdrv_09_timers.ino +++ b/sonoff/xdrv_09_timers.ino @@ -27,6 +27,7 @@ * Arm 0 = Off, 1 = On * Mode 0 = Schedule, 1 = Sunrise, 2 = Sunset * Time hours:minutes + * Window minutes (0..15) * Days 7 day character mask starting with Sunday (SMTWTFS). 0 or - = Off, any other value = On * Repeat 0 = Execute once, 1 = Execute again * Output 1..16 @@ -46,6 +47,7 @@ const char kTimerCommands[] PROGMEM = D_CMND_TIMER "|" D_CMND_TIMERS ; uint16_t timer_last_minute = 60; +int8_t timer_window[MAX_TIMERS] = { 0 }; #ifdef USE_SUNRISE /*********************************************************************************************\ @@ -242,12 +244,26 @@ uint16_t GetSunMinutes(byte dawn) /*******************************************************************************************/ +void TimerSetRandomWindow(byte index) +{ + timer_window[index] = 0; + if (Settings.timer[index].window) { + timer_window[index] = (random(0, (Settings.timer[index].window << 1) +1)) - Settings.timer[index].window; // -15 .. 15 + } +} + +void TimerSetRandomWindows() +{ + for (byte i = 0; i < MAX_TIMERS; i++) { TimerSetRandomWindow(i); } +} + void TimerEverySecond() { if (RtcTime.valid) { + if (!RtcTime.hour && !RtcTime.minute && !RtcTime.second) { TimerSetRandomWindows(); } // Midnight if (RtcTime.minute != timer_last_minute) { // Execute every minute only once timer_last_minute = RtcTime.minute; - uint16_t time = (RtcTime.hour *60) + RtcTime.minute; + int16_t time = (RtcTime.hour *60) + RtcTime.minute; uint8_t days = 1 << (RtcTime.day_of_week -1); for (byte i = 0; i < MAX_TIMERS; i++) { @@ -261,6 +277,9 @@ void TimerEverySecond() } #endif if (xtimer.arm) { + set_time += timer_window[i]; // Add random time offset + if (set_time < 0) { set_time == 0; } // Stay today; + if (set_time > 1439) { set_time == 1439; } if (time == set_time) { if (xtimer.days & days) { Settings.timer[i].arm = xtimer.repeat; @@ -294,11 +313,11 @@ void PrepShowTimer(uint8_t index) if ((1 == xtimer.mode) || (2 == xtimer.mode)) { // Sunrise or Sunset if (hour > 11) { hour = (hour -12) * -1; } } - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_MODE "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_OUTPUT "\":%d,\"" D_JSON_TIMER_ACTION "\":%d}"), - mqtt_data, index, xtimer.arm, xtimer.mode, hour, xtimer.time % 60, days, xtimer.repeat, xtimer.device +1, xtimer.power); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_MODE "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_WINDOW "\":%d,\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_OUTPUT "\":%d,\"" D_JSON_TIMER_ACTION "\":%d}"), + mqtt_data, index, xtimer.arm, xtimer.mode, hour, xtimer.time % 60, xtimer.window, days, xtimer.repeat, xtimer.device +1, xtimer.power); #else - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_OUTPUT "\":%d,\"" D_JSON_TIMER_ACTION "\":%d}"), - mqtt_data, index, xtimer.arm, xtimer.time / 60, xtimer.time % 60, days, xtimer.repeat, xtimer.device +1, xtimer.power); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_WINDOW "\":%d,\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_OUTPUT "\":%d,\"" D_JSON_TIMER_ACTION "\":%d}"), + mqtt_data, index, xtimer.arm, xtimer.time / 60, xtimer.time % 60, xtimer.window, days, xtimer.repeat, xtimer.device +1, xtimer.power); #endif // USE_SUNRISE } @@ -365,6 +384,10 @@ boolean TimerCommand() } Settings.timer[index].time = itime; } + if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_WINDOW))].success()) { + Settings.timer[index].window = (uint8_t)root[parm_uc] & 0x0F; + TimerSetRandomWindow(index); + } if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_DAYS))].success()) { // SMTWTFS = 1234567 = 0011001 = 00TW00S = --TW--S Settings.timer[index].days = 0; @@ -413,9 +436,9 @@ boolean TimerCommand() } else { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,"), mqtt_data); } - jsflg = 1; + jsflg++; PrepShowTimer(i +1); - if ((strlen(mqtt_data) > (LOGSZ - TOPSZ - 20)) || (i == MAX_TIMERS -1)) { + if (jsflg > 3) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}}"), mqtt_data); MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_TIMERS)); jsflg = 0; @@ -463,53 +486,57 @@ const char HTTP_TIMER_SCRIPT[] PROGMEM = "q.appendChild(o);" "}" #ifdef USE_SUNRISE - "function gt(){" // Set hours and minutas according to mode + "function gt(){" // Set hours and minutes according to mode "var m,p,q;" "m=qs('input[name=\"rd\"]:checked').value;" // Get mode - "if(m==0){p=pt[ct]&0x7FF;so(0);}" // Schedule time, hide offset span - "if(m==1){p=pt[" STR(MAX_TIMERS) "];}" // Sunrise - "if(m==2){p=pt[" STR(MAX_TIMERS +1) "];}" // Sunset - "q=Math.floor(p/60);if(q<10){q='0'+q;}qs('#ho').value=q;" // Set hours - "q=p%60;if(q<10){q='0'+q;}qs('#mi').value=q;" // Set minutes + "p=pt[ct]&0x7FF;" // Get time + "if(m==0){" // Time is set + "q=Math.floor(p/60);if(q<10){q='0'+q;}qs('#ho').value=q;" // Set hours + "q=p%60;if(q<10){q='0'+q;}qs('#mi').value=q;" // Set minutes + "so(0);" // Schedule time, hide offset span + "}" "if((m==1)||(m==2)){" // Sunrise or sunset is set - "p=pt[ct]&0x7FF;" // Load stored time for offset calculation "q=Math.floor(p/60);" // Parse hours - "if(q>=12){q-=12;qs('#odr').selectedIndex=1;}" // Negative offset - "else{qs('#odr').selectedIndex=0;}" - "if(q<10){q='0'+q;}qs('#oho').value=q;" // Set offset hours - "q=p%60;if(q<10){q='0'+q;}qs('#omi').value=q;" // Set offset minutes + "if(q>=12){q-=12;qs('#dr').selectedIndex=1;}" // Negative offset + "else{qs('#dr').selectedIndex=0;}" + "if(q<10){q='0'+q;}qs('#ho').value=q;" // Set offset hours + "q=p%60;if(q<10){q='0'+q;}qs('#mi').value=q;" // Set offset minutes "so(1);" // Show offset span "}" "}" "function so(b){" // Hide or show offset items - "if(b==1){qs('#ofs').style='';}" - "else{qs('#ofs').style='display:none;';}" + "o=qs('#ho');" + "e=o.childElementCount;" + "if(b==1){" + "qs('#dr').disabled='';" + "if(e>12){for(i=12;i<=23;i++){o.removeChild(o.lastElementChild);}}" // Create offset hours select options + "}else{" + "qs('#dr').disabled='disabled';" + "if(e<23){for(i=12;i<=23;i++){ce(i,o);}}" // Create hours select options + "}" "}" #endif "function st(){" // Save parameters to hidden area "var i,l,m,n,p,s;" "m=0;s=0;" - "n=1<<30;if(eb('a0').checked){s|=n;}" // Get arm - "n=1<<29;if(eb('r0').checked){s|=n;}" // Get repeat + "n=1<<31;if(eb('a0').checked){s|=n;}" // Get arm + "n=1<<15;if(eb('r0').checked){s|=n;}" // Get repeat "for(i=0;i<7;i++){n=1<<(16+i);if(eb('w'+i).checked){s|=n;}}" // Get weekdays #ifdef USE_SUNRISE "m=qs('input[name=\"rd\"]:checked').value;" // Check mode - "s|=(qs('input[name=\"rd\"]:checked').value<<11);" // Get mode + "s|=(qs('input[name=\"rd\"]:checked').value<<29);" // Get mode #endif "s|=(eb('p1').value<<27);" // Get power "s|=(qs('#d1').selectedIndex<<23);" // Get device - -// "s|=((qs('#ho').selectedIndex*60)+qs('#mi').selectedIndex)&0x7FF;" // Get time - - "if(m==0){s|=((qs('#ho').selectedIndex*60)+qs('#mi').selectedIndex)&0x7FF;}" // Get time + "l=((qs('#ho').selectedIndex*60)+qs('#mi').selectedIndex)&0x7FF;" + "if(m==0){s|=l;}" // Get time #ifdef USE_SUNRISE "if((m==1)||(m==2)){" - "l=((qs('#oho').selectedIndex*60)+qs('#omi').selectedIndex);" // Buffer offset time - "if(qs('#odr').selectedIndex>0){l+=720;}" // If negative offset, add 12h to given offset time - "s|=l&0x7FF;" // Save offset instead of time + "if(qs('#dr').selectedIndex>0){l+=720;}" // If negative offset, add 12h to given offset time + "s|=l&0x7FF;" // Save offset instead of time "}" #endif - + "s|=((qs('#mw').selectedIndex)&0x0F)<<11;" // Get window minutes "pt[ct]=s;" "eb('t0').value=pt.join();" // Save parameters from array to hidden area "}" @@ -522,33 +549,31 @@ const char HTTP_TIMER_SCRIPT[] PROGMEM = "e.style.cssText=\"background-color:#fff;color:#000;font-weight:bold;\";" // Change style to tab/button used to open content "s=pt[ct];" // Get parameters from array #ifdef USE_SUNRISE - "p=(s>>11)&3;eb('b'+p).checked=1;" // Set mode + "p=(s>>29)&3;eb('b'+p).checked=1;" // Set mode "gt();" // Set hours and minutes according to mode #else "p=s&0x7FF;" // Get time "q=Math.floor(p/60);if(q<10){q='0'+q;}qs('#ho').value=q;" // Set hours "q=p%60;if(q<10){q='0'+q;}qs('#mi').value=q;" // Set minutes #endif + "q=(s>>11)&0xF;if(q<10){q='0'+q;}qs('#mw').value=q;" // Set window minutes "for(i=0;i<7;i++){p=(s>>(16+i))&1;eb('w'+i).checked=p;}" // Set weekdays "p=(s>>23)&0xF;qs('#d1').value=p+1;" // Set device "p=(s>>27)&3;eb('p1').value=p;" // Set power - "p=(s>>29)&1;eb('r0').checked=p;" // Set repeat - "p=(s>>30)&1;eb('a0').checked=p;" // Set arm + "p=(s>>15)&1;eb('r0').checked=p;" // Set repeat + "p=(s>>31)&1;eb('a0').checked=p;" // Set arm "}" "function it(){" // Initialize elements and select first tab "var b,i,o,s;" "pt=eb('t0').value.split(',').map(Number);" // Get parameters from hidden area to array "s='';for(i=0;i<" STR(MAX_TIMERS) ";i++){b='';if(0==i){b=\" id='dP'\";}s+=\"\"}" "eb('bt').innerHTML=s;" // Create tabs +#ifdef USE_SUNRISE // NEW: Create offset options (+/- up to 11h, 59m) + "o=qs('#dr');ce('+',o);ce('-',o);" // Create offset direction select options +#endif "o=qs('#ho');for(i=0;i<=23;i++){ce((i<10)?('0'+i):i,o);}" // Create hours select options "o=qs('#mi');for(i=0;i<=59;i++){ce((i<10)?('0'+i):i,o);}" // Create minutes select options - -#ifdef USE_SUNRISE // NEW: Create offset options (+/- up to 11h, 59m) - "o=qs('#odr');ce('+',o);ce('-',o);" // Create offset direction select options - "o=qs('#oho');for(i=0;i<=11;i++){ce((i<10)?('0'+i):i,o);}" // Create offset hours select options - "o=qs('#omi');for(i=0;i<=59;i++){ce((i<10)?('0'+i):i,o);}" // Create offset minutes select options -#endif - + "o=qs('#mw');for(i=0;i<=15;i++){ce((i<10)?('0'+i):i,o);}" // Create window minutes select options "o=qs('#d1');for(i=0;i<}1;i++){ce(i+1,o);}" // Create devices "var a='" D_DAY3LIST "';" "s='';for(i=0;i<7;i++){s+=\"\"+a.substring(i*3,(i*3)+3)+\"\"}" @@ -558,7 +583,7 @@ const char HTTP_TIMER_SCRIPT[] PROGMEM = const char HTTP_TIMER_STYLE[] PROGMEM = ".tl{float:left;border-radius:0;border:1px solid #fff;padding:1px;width:6.25%;}" #ifdef USE_SUNRISE - "input[type='radio']{width:13px;height:34px;margin-top:-1px;margin-right:8px;vertical-align:middle;}" + "input[type='radio']{width:13px;height:24px;margin-top:-1px;margin-right:8px;vertical-align:middle;}" #endif ""; const char HTTP_FORM_TIMER[] PROGMEM = @@ -586,27 +611,20 @@ const char HTTP_FORM_TIMER1[] PROGMEM = "
" #ifdef USE_SUNRISE "
" - "" D_TIMER_TIME " " - "" - " " D_HOUR_MINUTE_SEPARATOR " " - "
" - "" D_SUNRISE "
" - "" D_SUNSET "
" - "
" + "" D_TIMER_TIME "
" + "" D_SUNRISE " (}8)
" + "" D_SUNSET " (}9)
" "
" + "" + " " #else "" D_TIMER_TIME " " +#endif // USE_SUNRISE "" " " D_HOUR_MINUTE_SEPARATOR " " "" -#endif // USE_SUNRISE + " +/- " + "" "

" "
"; const char HTTP_FORM_TIMER2[] PROGMEM = @@ -632,14 +650,12 @@ void HandleTimerConfiguration() if (i > 0) { page += F(","); } page += String(Settings.timer[i].data); } -#ifdef USE_SUNRISE - page += F(","); page += String(GetSunMinutes(0)); // Add Sunrise - page += F(","); page += String(GetSunMinutes(1)); // Add Sunset -#endif // USE_SUNRISE page += FPSTR(HTTP_FORM_TIMER1); page.replace(F("}1"), String(devices_present)); #ifdef USE_SUNRISE - page.replace(F("299"), String(180 + (strlen(D_TIMER_TIME) *10))); // Fix string length to keep radios centered + page.replace(F("}8"), GetSun(0)); // Add Sunrise + page.replace(F("}9"), GetSun(1)); // Add Sunset + page.replace(F("299"), String(100 + (strlen(D_SUNSET) *12))); // Fix string length to keep radios centered #endif // USE_SUNRISE page += FPSTR(HTTP_FORM_END); page.replace(F("type='submit'"), FPSTR(HTTP_FORM_TIMER2)); @@ -659,7 +675,11 @@ void TimerSaveSettings() for (byte i = 0; i < MAX_TIMERS; i++) { timer.data = strtol(p, &p, 10); p++; // Skip comma - if (timer.time < 1440) { Settings.timer[i].data = timer.data; } + if (timer.time < 1440) { + bool flag = (timer.window != Settings.timer[i].window); + Settings.timer[i].data = timer.data; + if (flag) TimerSetRandomWindow(i); + } snprintf_P(log_data, sizeof(log_data), PSTR("%s%s0x%08X"), log_data, (i > 0)?",":"", Settings.timer[i].data); } AddLog(LOG_LEVEL_DEBUG); @@ -678,6 +698,9 @@ boolean Xdrv09(byte function) boolean result = false; switch (function) { + case FUNC_INIT: + TimerSetRandomWindows(); + break; case FUNC_EVERY_SECOND: TimerEverySecond(); break; diff --git a/sonoff/xdrv_11_knx.ino b/sonoff/xdrv_11_knx.ino new file mode 100644 index 000000000..734c22c54 --- /dev/null +++ b/sonoff/xdrv_11_knx.ino @@ -0,0 +1,885 @@ +/* + xdrv_11_knx.ino - KNX IP Protocol support for Sonoff-Tasmota + + Copyright (C) 2018 Adrian Scillato (https://github.com/ascillato) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifdef USE_KNX +/*********************************************************************************************\ + * KNX support + * + * Using libraries: + * ESP KNX IP library (async-udp branch) (https://github.com/envy/esp-knx-ip/tree/async-udp) + * ESPAsyncUDP library (https://github.com/me-no-dev/ESPAsyncUDP) + +Constants in sonoff.h +----------------------- + +#define MAX_KNX_GA 10 Max number of KNX Group Addresses to read that can be set +#define MAX_KNX_CB 10 Max number of KNX Group Addresses to write that can be set + If you change MAX_KNX_CB you also have to change on the esp-knx-ip.h file the following: + #define MAX_CALLBACK_ASSIGNMENTS 10 + #define MAX_CALLBACKS 10 + Both to MAX_KNX_CB + +Variables in settings.h +----------------------- + +bool Settings.flag.knx_enabled Enable/Disable KNX Protocol +uint16_t Settings.knx_physsical_addr Physical KNX address of this device +byte Settings.knx_GA_registered Number of group address to read +byte Settings.knx_CB_registered Number of group address to write +uint16_t Settings.knx_GA_addr[MAX_KNX_GA] Group address to read +uint16_t Settings.knx_CB_addr[MAX_KNX_CB] Group address to write +byte Settings.knx_GA_param[MAX_KNX_GA] Type of Input (relay changed, button pressed, sensor read) +byte Settings.knx_CB_param[MAX_KNX_CB] Type of Output (set relay, toggle relay, reply sensor value) + +\*********************************************************************************************/ + +#include + +//void KNX_CB_Action(message_t const &msg, void *arg); // Define function (action callback) to be called by the KNX_IP Library + // when an action is requested by another KNX Device + +address_t KNX_physs_addr; // Physical KNX address of this device +address_t KNX_addr; // KNX Address converter variable + +#define KNX_Empty 255 +#define KNX_TEMPERATURE 17 +#define KNX_HUMIDITY 18 +#define KNX_MAX_device_param 18 + +float last_temp; +float last_hum; + +typedef struct __device_parameters +{ + byte type; // PARAMETER_ID. Used as type of GA = relay, button, sensor, etc, (INPUTS) + // used when an action on device triggers a MSG to send on KNX + // Needed because this is the value that the ESP_KNX_IP library will pass as parameter + // to identify the action to perform when a MSG is received + + bool show; // HARDWARE related. to identify if the parameter exists on the device. + + bool last_state; // LAST_STATE of relays + + callback_id_t CB_id; // ACTION_ID. To store the ID value of Registered_CB to the library. + // The ESP_KNX_IP requires to register the callbacks, and then, to assign an address to the registered callback + // So CB_id is needed to store the ID of the callback to then, assign multiple addresses to the same ID (callback) + // It is used as type of CB = set relay, toggle relay, reply sensor, etc, (OUTPUTS) + // used when a MSG receive KNX triggers an action on the device + // - Multiples address to the same callback (i.e. Set Relay 1 Status) are used on scenes for example +} device_parameters_t; + +// device parameters (information that can be sent) +device_parameters_t device_param[] = { + { 1, false, false, KNX_Empty }, // device_param[ 0] = Relay 1 + { 2, false, false, KNX_Empty }, // device_param[ 1] = Relay 2 + { 3, false, false, KNX_Empty }, // device_param[ 2] = Relay 3 + { 4, false, false, KNX_Empty }, // device_param[ 3] = Relay 4 + { 5, false, false, KNX_Empty }, // device_param[ 4] = Relay 5 + { 6, false, false, KNX_Empty }, // device_param[ 5] = Relay 6 + { 7, false, false, KNX_Empty }, // device_param[ 6] = Relay 7 + { 8, false, false, KNX_Empty }, // device_param[ 7] = Relay 8 + { 9, false, false, KNX_Empty }, // device_param[ 8] = Button 1 + { 10, false, false, KNX_Empty }, // device_param[ 9] = Button 2 + { 11, false, false, KNX_Empty }, // device_param[10] = Button 3 + { 12, false, false, KNX_Empty }, // device_param[11] = Button 4 + { 13, false, false, KNX_Empty }, // device_param[12] = Button 5 + { 14, false, false, KNX_Empty }, // device_param[13] = Button 6 + { 15, false, false, KNX_Empty }, // device_param[14] = Button 7 + { 16, false, false, KNX_Empty }, // device_param[15] = Button 8 + { KNX_TEMPERATURE, false, false, KNX_Empty }, // device_param[16] = Temperature + { KNX_HUMIDITY , false, false, KNX_Empty }, // device_param[17] = humidity + { KNX_Empty, false, false, KNX_Empty} +}; + +// device parameters (information that can be sent) +const char * device_param_ga[] = { + D_SENSOR_RELAY " 1", // Relay 1 + D_SENSOR_RELAY " 2", // Relay 2 + D_SENSOR_RELAY " 3", // Relay 3 + D_SENSOR_RELAY " 4", // Relay 4 + D_SENSOR_RELAY " 5", // Relay 5 + D_SENSOR_RELAY " 6", // Relay 6 + D_SENSOR_RELAY " 7", // Relay 7 + D_SENSOR_RELAY " 8", // Relay 8 + D_SENSOR_BUTTON " 1", // Button 1 + D_SENSOR_BUTTON " 2", // Button 2 + D_SENSOR_BUTTON " 3", // Button 3 + D_SENSOR_BUTTON " 4", // Button 4 + D_SENSOR_BUTTON " 5", // Button 5 + D_SENSOR_BUTTON " 6", // Button 6 + D_SENSOR_BUTTON " 7", // Button 7 + D_SENSOR_BUTTON " 8", // Button 8 + D_TEMPERATURE , // Temperature + D_HUMIDITY , // Humidity + nullptr +}; + +// device actions (posible actions to be performed on the device) +const char *device_param_cb[] = { + D_SENSOR_RELAY " 1", // Set Relay 1 (1-On or 0-OFF) + D_SENSOR_RELAY " 2", + D_SENSOR_RELAY " 3", + D_SENSOR_RELAY " 4", + D_SENSOR_RELAY " 5", + D_SENSOR_RELAY " 6", + D_SENSOR_RELAY " 7", + D_SENSOR_RELAY " 8", + D_SENSOR_RELAY " 1 " D_BUTTON_TOGGLE, // Relay 1 Toggle (1 or 0 will toggle) + D_SENSOR_RELAY " 2 " D_BUTTON_TOGGLE, + D_SENSOR_RELAY " 3 " D_BUTTON_TOGGLE, + D_SENSOR_RELAY " 4 " D_BUTTON_TOGGLE, + D_SENSOR_RELAY " 5 " D_BUTTON_TOGGLE, + D_SENSOR_RELAY " 6 " D_BUTTON_TOGGLE, + D_SENSOR_RELAY " 7 " D_BUTTON_TOGGLE, + D_SENSOR_RELAY " 8 " D_BUTTON_TOGGLE, + D_REPLY " " D_TEMPERATURE, // Reply Temperature + D_REPLY " " D_HUMIDITY, // Reply Humidity + nullptr +}; + + +byte KNX_GA_Search( byte param, byte start = 0 ) +{ + for (byte i = start; i < Settings.knx_GA_registered; ++i) + { + if ( Settings.knx_GA_param[i] == param ) + { + if ( Settings.knx_GA_addr[i] != 0 ) // Relay has group address set? GA=0/0/0 can not be used as KNX address, so it is used here as a: not set value + { + if ( i >= start ) { return i; } + } + } + } + return KNX_Empty; +} + + +byte KNX_CB_Search( byte param, byte start = 0 ) +{ + for (byte i = start; i < Settings.knx_CB_registered; ++i) + { + if ( Settings.knx_CB_param[i] == param ) + { + if ( Settings.knx_CB_addr[i] != 0 ) + { + if ( i >= start ) { return i; } + } + } + } + return KNX_Empty; +} + + +void KNX_ADD_GA( byte GAop, byte GA_FNUM, byte GA_AREA, byte GA_FDEF ) +{ + // Check if all GA were assigned. If yes-> return + if ( Settings.knx_GA_registered >= MAX_KNX_GA ) { return; } + if ( GA_FNUM == 0 && GA_AREA == 0 && GA_FDEF == 0 ) { return; } + + // Assign a GA to that address + Settings.knx_GA_param[Settings.knx_GA_registered] = GAop; + KNX_addr.ga.area = GA_FNUM; + KNX_addr.ga.line = GA_AREA; + KNX_addr.ga.member = GA_FDEF; + Settings.knx_GA_addr[Settings.knx_GA_registered] = KNX_addr.value; + + Settings.knx_GA_registered++; + + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX D_ADD " GA #%d: %s " D_TO " %d/%d/%d"), + Settings.knx_GA_registered, + device_param_ga[GAop-1], + GA_FNUM, GA_AREA, GA_FDEF ); + AddLog(LOG_LEVEL_DEBUG); +} + + +void KNX_DEL_GA( byte GAnum ) +{ + + byte dest_offset = 0; + byte src_offset = 0; + byte len = 0; + + // Delete GA + Settings.knx_GA_param[GAnum-1] = 0; + + if (GAnum == 1) + { + // start of array, so delete first entry + src_offset = 1; + // Settings.knx_GA_registered will be 1 in case of only one entry + // Settings.knx_GA_registered will be 2 in case of two entries, etc.. + // so only copy anything, if there is it at least more then one element + len = (Settings.knx_GA_registered - 1); + } + else if (GAnum == Settings.knx_GA_registered) + { + // last element, don't do anything, simply decrement counter + } + else + { + // somewhere in the middle + // need to calc offsets + + // skip all prev elements + dest_offset = GAnum -1 ; // GAnum -1 is equal to how many element are in front of it + src_offset = dest_offset + 1; // start after the current element + len = (Settings.knx_GA_registered - GAnum); + } + + if (len > 0) + { + memmove(Settings.knx_GA_param + dest_offset, Settings.knx_GA_param + src_offset, len * sizeof(byte)); + memmove(Settings.knx_GA_addr + dest_offset, Settings.knx_GA_addr + src_offset, len * sizeof(uint16_t)); + } + + Settings.knx_GA_registered--; + + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX D_DELETE " GA #%d"), + GAnum ); + AddLog(LOG_LEVEL_DEBUG); +} + + +void KNX_ADD_CB( byte CBop, byte CB_FNUM, byte CB_AREA, byte CB_FDEF ) +{ + // Check if all callbacks were assigned. If yes-> return + if ( Settings.knx_CB_registered >= MAX_KNX_CB ) { return; } + if ( CB_FNUM == 0 && CB_AREA == 0 && CB_FDEF == 0 ) { return; } + + // Check if a CB for CBop was registered on the ESP-KNX-IP Library + if ( device_param[CBop-1].CB_id == KNX_Empty ) + { + // if no, register the CB for CBop + device_param[CBop-1].CB_id = knx.callback_register("", KNX_CB_Action, &device_param[CBop-1]); + // KNX IP Library requires a parameter + // to identify which action was requested on the KNX network + // to be performed on this device (set relay, etc.) + // Is going to be used device_param[j].type that stores the type number (1: relay 1, etc) + } + // Assign a callback to CB address + Settings.knx_CB_param[Settings.knx_CB_registered] = CBop; + KNX_addr.ga.area = CB_FNUM; + KNX_addr.ga.line = CB_AREA; + KNX_addr.ga.member = CB_FDEF; + Settings.knx_CB_addr[Settings.knx_CB_registered] = KNX_addr.value; + + knx.callback_assign( device_param[CBop-1].CB_id, KNX_addr ); + + Settings.knx_CB_registered++; + + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX D_ADD " CB #%d: %d/%d/%d " D_TO " %s"), + Settings.knx_CB_registered, + CB_FNUM, CB_AREA, CB_FDEF, + device_param_cb[CBop-1] ); + AddLog(LOG_LEVEL_DEBUG); +} + + +void KNX_DEL_CB( byte CBnum ) +{ + byte oldparam = Settings.knx_CB_param[CBnum-1]; + byte dest_offset = 0; + byte src_offset = 0; + byte len = 0; + + // Delete assigment + knx.callback_unassign(CBnum-1); + Settings.knx_CB_param[CBnum-1] = 0; + + if (CBnum == 1) + { + // start of array, so delete first entry + src_offset = 1; + // Settings.knx_CB_registered will be 1 in case of only one entry + // Settings.knx_CB_registered will be 2 in case of two entries, etc.. + // so only copy anything, if there is it at least more then one element + len = (Settings.knx_CB_registered - 1); + } + else if (CBnum == Settings.knx_CB_registered) + { + // last element, don't do anything, simply decrement counter + } + else + { + // somewhere in the middle + // need to calc offsets + + // skip all prev elements + dest_offset = CBnum -1 ; // GAnum -1 is equal to how many element are in front of it + src_offset = dest_offset + 1; // start after the current element + len = (Settings.knx_CB_registered - CBnum); + } + + if (len > 0) + { + memmove(Settings.knx_CB_param + dest_offset, Settings.knx_CB_param + src_offset, len * sizeof(byte)); + memmove(Settings.knx_CB_addr + dest_offset, Settings.knx_CB_addr + src_offset, len * sizeof(uint16_t)); + } + + Settings.knx_CB_registered--; + + // Check if there is no other assigment to that callback. If there is not. delete that callback register + if ( KNX_CB_Search( oldparam ) == KNX_Empty ) { + knx.callback_deregister( device_param[oldparam-1].CB_id ); + device_param[oldparam-1].CB_id = KNX_Empty; + } + + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX D_DELETE " CB #%d"), CBnum ); + AddLog(LOG_LEVEL_DEBUG); +} + + +bool KNX_CONFIG_NOT_MATCH() +{ + for (int i = 0; i < KNX_MAX_device_param; ++i) + { + if ( !device_param[i].show ) { // device has this parameter ? + // if not, search for all registered group address to this parameter for deletion + if ( KNX_GA_Search(i+1) != KNX_Empty ) { return true; } + if ( (i < 8) || (i > 15) ) // check relays and sensors (i from 8 to 16 are toggle relays parameters) + { + if ( KNX_CB_Search(i+1) != KNX_Empty ) { return true; } + if ( KNX_CB_Search(i+8) != KNX_Empty ) { return true; } + } + } + } + return false; +} + + +void KNXStart() +{ + knx.start(nullptr); + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX D_START)); + AddLog(LOG_LEVEL_DEBUG); +} + + +void KNX_INIT() +{ + // Check for incompatible config + if (Settings.knx_GA_registered > MAX_KNX_GA) { Settings.knx_GA_registered = MAX_KNX_GA; } + if (Settings.knx_CB_registered > MAX_KNX_CB) { Settings.knx_CB_registered = MAX_KNX_CB; } + + // Set Physical KNX Address of the device + KNX_physs_addr.value = Settings.knx_physsical_addr; + knx.physical_address_set( KNX_physs_addr ); + + // Read Configuration + // Check which relays, buttons and sensors where configured for this device + // and activate options according to the hardware + for (int i = GPIO_REL1; i < GPIO_REL8 + 1; ++i) + { + if (GetUsedInModule(i, my_module.gp.io)) { device_param[i - GPIO_REL1].show = true; } + } + for (int i = GPIO_REL1_INV; i < GPIO_REL8_INV + 1; ++i) + { + if (GetUsedInModule(i, my_module.gp.io)) { device_param[i - GPIO_REL1_INV].show = true; } + } + for (int i = GPIO_SWT1; i < GPIO_SWT4 + 1; ++i) + { + if (GetUsedInModule(i, my_module.gp.io)) { device_param[i - GPIO_SWT1 + 8].show = true; } + } + for (int i = GPIO_KEY1; i < GPIO_KEY4 + 1; ++i) + { + if (GetUsedInModule(i, my_module.gp.io)) { device_param[i - GPIO_KEY1 + 8].show = true; } + } + if (GetUsedInModule(GPIO_DHT11, my_module.gp.io)) { device_param[KNX_TEMPERATURE-1].show = true; } + if (GetUsedInModule(GPIO_DHT22, my_module.gp.io)) { device_param[KNX_TEMPERATURE-1].show = true; } + if (GetUsedInModule(GPIO_SI7021, my_module.gp.io)) { device_param[KNX_TEMPERATURE-1].show = true; } + if (GetUsedInModule(GPIO_DHT11, my_module.gp.io)) { device_param[KNX_HUMIDITY-1].show = true; } + if (GetUsedInModule(GPIO_DHT22, my_module.gp.io)) { device_param[KNX_HUMIDITY-1].show = true; } + if (GetUsedInModule(GPIO_SI7021, my_module.gp.io)) { device_param[KNX_HUMIDITY-1].show = true; } + + // Delete from KNX settings all configuration is not anymore related to this device + if (KNX_CONFIG_NOT_MATCH()) { + Settings.knx_GA_registered = 0; + Settings.knx_CB_registered = 0; + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX D_DELETE " " D_KNX_PARAMETERS )); + AddLog(LOG_LEVEL_DEBUG); + } + + // Register Group Addresses to listen to + // Search on the settings if there is a group address set for receive KNX messages for the type: device_param[j].type + // If there is, register the group address on the KNX_IP Library to Receive data for Executing Callbacks + byte j; + for (byte i = 0; i < Settings.knx_CB_registered; ++i) + { + j = Settings.knx_CB_param[i]; + if ( j > 0 ) + { + device_param[j-1].CB_id = knx.callback_register("", KNX_CB_Action, &device_param[j-1]); // KNX IP Library requires a parameter + // to identify which action was requested on the KNX network + // to be performed on this device (set relay, etc.) + // Is going to be used device_param[j].type that stores the type number (1: relay 1, etc) + KNX_addr.value = Settings.knx_CB_addr[i]; + knx.callback_assign( device_param[j-1].CB_id, KNX_addr ); + } + } +} + + +void KNX_CB_Action(message_t const &msg, void *arg) +{ + device_parameters_t *chan = (device_parameters_t *)arg; + + if (!(Settings.flag.knx_enabled)) { return; } + + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX D_RECEIVED_FROM " %d.%d.%d " D_COMMAND " %s: %d " D_TO " %s"), + msg.received_on.ga.area, msg.received_on.ga.line, msg.received_on.ga.member, + (msg.ct == KNX_CT_WRITE) ? D_KNX_COMMAND_WRITE : (msg.ct == KNX_CT_READ) ? D_KNX_COMMAND_READ : D_KNX_COMMAND_OTHER, + msg.data[0], + device_param_cb[(chan->type)-1]); + AddLog(LOG_LEVEL_INFO); + + switch (msg.ct) + { + case KNX_CT_WRITE: + if (chan->type < 9) // Set Relays + { + ExecuteCommandPower(chan->type, msg.data[0]); + } + else if (chan->type < 17) // Toggle Relays + { + ExecuteCommandPower((chan->type) -8, 2); + } + break; + case KNX_CT_READ: + if (chan->type < 9) // reply Relays status + { + knx.answer_1bit(msg.received_on, chan->last_state); + } + else if (chan->type = KNX_TEMPERATURE) // Reply Temperature + { + knx.answer_2byte_float(msg.received_on, last_temp); + } + else if (chan->type = KNX_HUMIDITY) // Reply Humidity + { + knx.answer_2byte_float(msg.received_on, last_hum); + } + break; + } +} + + +void KnxUpdatePowerState(byte device, power_t state) +{ + if (!(Settings.flag.knx_enabled)) { return; } + + device_param[device -1].last_state = bitRead(state, device -1); // power state (on/off) + + // Search all the registered GA that has that output (variable: device) as parameter + byte i = KNX_GA_Search(device); + while ( i != KNX_Empty ) { + KNX_addr.value = Settings.knx_GA_addr[i]; + knx.write_1bit(KNX_addr, device_param[device -1].last_state); + + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX "%s = %d " D_SENT_TO " %d.%d.%d"), + device_param_ga[device -1], device_param[device -1].last_state, + KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member); + AddLog(LOG_LEVEL_INFO); + + i = KNX_GA_Search(device, i + 1); + } +} + + +void KnxSendButtonPower(byte key, byte device, byte state) +{ +// key 0 = button_topic +// key 1 = switch_topic +// state 0 = off +// state 1 = on +// state 2 = toggle +// state 3 = hold +// state 9 = clear retain flag + if (!(Settings.flag.knx_enabled)) { return; } +// if (key) +// { + +// Search all the registered GA that has that output (variable: device) as parameter + byte i = KNX_GA_Search(device + 8); + while ( i != KNX_Empty ) { + KNX_addr.value = Settings.knx_GA_addr[i]; + knx.write_1bit(KNX_addr, !(state == 0)); + + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX "%s = %d " D_SENT_TO " %d.%d.%d"), + device_param_ga[device + 8], !(state == 0), + KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member); + AddLog(LOG_LEVEL_INFO); + + i = KNX_GA_Search(device + 8, i + 1); + } +// } +} + + +void KnxSensor(byte sensor_type, float value) +{ + if (sensor_type == KNX_TEMPERATURE) + { + last_temp = value; + } else if (sensor_type == KNX_HUMIDITY) + { + last_hum = value; + } + + if (!(Settings.flag.knx_enabled)) { return; } + + byte i = KNX_GA_Search(sensor_type); + while ( i != KNX_Empty ) { + KNX_addr.value = Settings.knx_GA_addr[i]; + knx.write_2byte_float(KNX_addr, value); + + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX "%s " D_SENT_TO " %d.%d.%d "), + device_param_ga[sensor_type], + KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member); + AddLog(LOG_LEVEL_INFO); + + i = KNX_GA_Search(sensor_type, i+1); + } +} + + +/*********************************************************************************************\ + * Presentation +\*********************************************************************************************/ + +#ifdef USE_WEBSERVER +const char S_CONFIGURE_KNX[] PROGMEM = D_CONFIGURE_KNX; + +const char HTTP_FORM_KNX[] PROGMEM = + "
 " D_KNX_PARAMETERS " 
" + "
" + "" D_KNX_PHYSICAL_ADDRESS " " + " . " + " . " + "" + "

" D_KNX_PHYSICAL_ADDRESS_NOTE "

" + "" D_KNX_ENABLE "

" + + "
" + "" D_KNX_GROUP_ADDRESS_TO_WRITE "
" + + " / " + " / " + " "; + +const char HTTP_FORM_KNX_ADD_BTN[] PROGMEM = + "

" + "
" D_DOMOTICZ_IDX " {1
, {m} = , {e} =
, {m} = , {e} =
, {m} = , {e} =
" D_DOMOTICZ_UPDATE_TIMER " (" STR(DOMOTICZ_UPDATE_TIMER) ")
, {m} = , {e} =
, {m} = , {e} =
, {m} = , {e} =
, {m} = , {e} =
"; + +const char HTTP_FORM_KNX_ADD_TABLE_ROW[] PROGMEM = + "" + ""; + +const char HTTP_FORM_KNX3[] PROGMEM = + "
{optex} -> GAfnum / GAarea / GAfdef

" + "
" + "" D_KNX_GROUP_ADDRESS_TO_READ "
"; + +const char HTTP_FORM_KNX4[] PROGMEM = + "->
GAfnum / GAarea / GAfdef -> {optex}
"); + page += F("
"); + page += FPSTR(HTTP_BTN_CONF); + + page.replace( F(""), + F("function GAwarning()" + "{" + "var GA_FNUM = document.getElementById('GA_FNUM');" + "var GA_AREA = document.getElementById('GA_AREA');" + "var GA_FDEF = document.getElementById('GA_FDEF');" + "if ( GA_FNUM != null && GA_FNUM.value == '0' && GA_AREA.value == '0' && GA_FDEF.value == '0' ) {" + "alert('" D_KNX_WARNING "');" + "}" + "}" + "function CBwarning()" + "{" + "var CB_FNUM = document.getElementById('CB_FNUM');" + "var CB_AREA = document.getElementById('CB_AREA');" + "var CB_FDEF = document.getElementById('CB_FDEF');" + "if ( CB_FNUM != null && CB_FNUM.value == '0' && CB_AREA.value == '0' && CB_FDEF.value == '0' ) {" + "alert('" D_KNX_WARNING "');" + "}" + "}" + "") ); + ShowPage(page); + } + +} + + +void KNX_Save_Settings() +{ + String stmp; + address_t KNX_addr; + byte i; + + Settings.flag.knx_enabled = WebServer->hasArg("b1"); + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX D_ENABLED ": %d "), + Settings.flag.knx_enabled); + AddLog(LOG_LEVEL_DEBUG); + + stmp = WebServer->arg("area"); + KNX_addr.pa.area = stmp.toInt(); + stmp = WebServer->arg("line"); + KNX_addr.pa.line = stmp.toInt(); + stmp = WebServer->arg("member"); + KNX_addr.pa.member = stmp.toInt(); + Settings.knx_physsical_addr = KNX_addr.value; + knx.physical_address_set( KNX_addr ); // Set Physical KNX Address of the device + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX D_KNX_PHYSICAL_ADDRESS ": %d.%d.%d "), + KNX_addr.pa.area, KNX_addr.pa.line, KNX_addr.pa.member ); + AddLog(LOG_LEVEL_DEBUG); + + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX "GA: %d"), + Settings.knx_GA_registered ); + AddLog(LOG_LEVEL_DEBUG); + for (i = 0; i < Settings.knx_GA_registered ; ++i) + { + KNX_addr.value = Settings.knx_GA_addr[i]; + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX "GA #%d: %s " D_TO " %d/%d/%d"), + i+1, device_param_ga[Settings.knx_GA_param[i]-1], + KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member ); + AddLog(LOG_LEVEL_DEBUG); + } + + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX "CB: %d"), + Settings.knx_CB_registered ); + AddLog(LOG_LEVEL_DEBUG); + for (i = 0; i < Settings.knx_CB_registered ; ++i) + { + KNX_addr.value = Settings.knx_CB_addr[i]; + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX "CB #%d: %d/%d/%d " D_TO " %s"), + i+1, + KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member, + device_param_cb[Settings.knx_CB_param[i]-1] ); + AddLog(LOG_LEVEL_DEBUG); + } +} + +#endif // USE_WEBSERVER + + +/*********************************************************************************************\ + * Interface +\*********************************************************************************************/ + +#define XDRV_11 + +boolean Xdrv11(byte function) +{ + boolean result = false; + switch (function) { + case FUNC_INIT: + KNX_INIT(); + break; + case FUNC_LOOP: + knx.loop(); // Process knx events + // It is not used by the actual config of asyncUDP branch of ESP-KNX-IP Library, + // but is left here for compatibility with upcoming features of ESP-KNX-IP Library + break; +// case FUNC_COMMAND: +// result = KNXCommand(); +// break; +// case FUNC_SET_POWER: +// break; + } + return result; +} + +#endif // USE_KNX diff --git a/sonoff/xsns_04_snfsc.ino b/sonoff/xsns_04_snfsc.ino index 63bdcc5d8..1628e9abf 100644 --- a/sonoff/xsns_04_snfsc.ino +++ b/sonoff/xsns_04_snfsc.ino @@ -130,6 +130,14 @@ void SonoffScShow(boolean json) DomoticzSensor(DZ_AIRQUALITY, 500 + ((100 - sc_value[4]) * 20)); } #endif // USE_DOMOTICZ + +#ifdef USE_KNX + if (0 == tele_period) { + KnxSensor(KNX_TEMPERATURE, t); + KnxSensor(KNX_HUMIDITY, h); + } +#endif // USE_KNX + #ifdef USE_WEBSERVER } else { snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_TEMP, mqtt_data, "", temperature, TempUnit()); diff --git a/sonoff/xsns_06_dht.ino b/sonoff/xsns_06_dht.ino index 2bca2d87f..91a154169 100644 --- a/sonoff/xsns_06_dht.ino +++ b/sonoff/xsns_06_dht.ino @@ -231,6 +231,14 @@ void DhtShow(boolean json) dsxflg++; } #endif // USE_DOMOTICZ + +#ifdef USE_KNX + if (0 == tele_period) { + KnxSensor(KNX_TEMPERATURE, t); + KnxSensor(KNX_HUMIDITY, h); + } +#endif // USE_KNX + #ifdef USE_WEBSERVER } else { snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_TEMP, mqtt_data, Dht[i].stype, temperature, TempUnit()); diff --git a/sonoff/xsns_07_sht1x.ino b/sonoff/xsns_07_sht1x.ino index 08afed555..98837471b 100644 --- a/sonoff/xsns_07_sht1x.ino +++ b/sonoff/xsns_07_sht1x.ino @@ -201,6 +201,14 @@ void ShtShow(boolean json) #ifdef USE_DOMOTICZ if (0 == tele_period) DomoticzTempHumSensor(temperature, humidity); #endif // USE_DOMOTICZ + +#ifdef USE_KNX + if (0 == tele_period) { + KnxSensor(KNX_TEMPERATURE, t); + KnxSensor(KNX_HUMIDITY, h); + } +#endif // USE_KNX + #ifdef USE_WEBSERVER } else { snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_TEMP, mqtt_data, "SHT1X", temperature, TempUnit()); diff --git a/sonoff/xsns_08_htu21.ino b/sonoff/xsns_08_htu21.ino index a36ad0db7..3d9e21d3b 100644 --- a/sonoff/xsns_08_htu21.ino +++ b/sonoff/xsns_08_htu21.ino @@ -264,6 +264,14 @@ void HtuShow(boolean json) #ifdef USE_DOMOTICZ if (0 == tele_period) DomoticzTempHumSensor(temperature, humidity); #endif // USE_DOMOTICZ + +#ifdef USE_KNX + if (0 == tele_period) { + KnxSensor(KNX_TEMPERATURE, t); + KnxSensor(KNX_HUMIDITY, h); + } +#endif // USE_KNX + #ifdef USE_WEBSERVER } else { snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_TEMP, mqtt_data, htu_types, temperature, TempUnit()); diff --git a/sonoff/xsns_09_bmp.ino b/sonoff/xsns_09_bmp.ino index 9ca0fa491..01eb29799 100644 --- a/sonoff/xsns_09_bmp.ino +++ b/sonoff/xsns_09_bmp.ino @@ -467,6 +467,14 @@ void BmpShow(boolean json) #ifdef USE_DOMOTICZ if (0 == tele_period) DomoticzTempHumPressureSensor(temperature, humidity, pressure); #endif // USE_DOMOTICZ + +#ifdef USE_KNX + if (0 == tele_period) { + KnxSensor(KNX_TEMPERATURE, t); + KnxSensor(KNX_HUMIDITY, h); + } +#endif // USE_KNX + #ifdef USE_WEBSERVER } else { snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_TEMP, mqtt_data, bmp_name, temperature, TempUnit()); diff --git a/sonoff/xsns_14_sht3x.ino b/sonoff/xsns_14_sht3x.ino index 76a808474..bef289aa3 100644 --- a/sonoff/xsns_14_sht3x.ino +++ b/sonoff/xsns_14_sht3x.ino @@ -111,6 +111,14 @@ void Sht3xShow(boolean json) DomoticzTempHumSensor(temperature, humidity); } #endif // USE_DOMOTICZ + +#ifdef USE_KNX + if (0 == tele_period) { + KnxSensor(KNX_TEMPERATURE, t); + KnxSensor(KNX_HUMIDITY, h); + } +#endif // USE_KNX + #ifdef USE_WEBSERVER } else { snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_TEMP, mqtt_data, types, temperature, TempUnit()); From 8a77c48759bc871a8a16469553ebd5244556777f Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 19 Apr 2018 20:27:57 +0200 Subject: [PATCH 082/136] Fix Esp/lib 2.3.0 compile error 5.12.0m * Fix compile error when using ESP/Arduino library v2.3.0 by reverting KNX async UDP library to default UDP library (#2488, #2492, #2493) --- README.md | 4 +- lib/ESPAsyncUDP-0.21/README.md | 12 - .../AsyncUDPClient/AsyncUDPClient.ino | 51 --- .../AsyncUDPMulticastServer.ino | 52 --- .../AsyncUDPServer/AsyncUDPServer.ino | 50 --- lib/ESPAsyncUDP-0.21/keywords.txt | 33 -- lib/ESPAsyncUDP-0.21/library.json | 17 - lib/ESPAsyncUDP-0.21/library.properties | 9 - lib/ESPAsyncUDP-0.21/src/AsyncUDP.cpp | 425 ------------------ lib/ESPAsyncUDP-0.21/src/ESPAsyncUDP.h | 130 ------ lib/ESPAsyncUDP-0.21/travis/common.sh | 23 - .../DPT.h | 0 .../LICENSE | 0 .../README.md | 15 +- .../esp-knx-ip-config.cpp | 0 .../esp-knx-ip-conversion.cpp | 0 .../esp-knx-ip-send.cpp | 4 +- .../esp-knx-ip-webserver.cpp | 0 .../esp-knx-ip.cpp | 17 +- .../esp-knx-ip.h | 6 +- .../environment-sensor/environment-sensor.ino | 0 .../examples/sonoff/sonoff.ino | 0 .../examples/static-config/static-config.ino | 0 .../keywords.txt | 0 .../library.properties | 6 +- sonoff/_releasenotes.ino | 1 + sonoff/language/es-AR.h | 34 +- sonoff/xdrv_11_knx.ino | 5 +- 28 files changed, 40 insertions(+), 854 deletions(-) delete mode 100644 lib/ESPAsyncUDP-0.21/README.md delete mode 100644 lib/ESPAsyncUDP-0.21/examples/AsyncUDPClient/AsyncUDPClient.ino delete mode 100644 lib/ESPAsyncUDP-0.21/examples/AsyncUDPMulticastServer/AsyncUDPMulticastServer.ino delete mode 100644 lib/ESPAsyncUDP-0.21/examples/AsyncUDPServer/AsyncUDPServer.ino delete mode 100644 lib/ESPAsyncUDP-0.21/keywords.txt delete mode 100644 lib/ESPAsyncUDP-0.21/library.json delete mode 100644 lib/ESPAsyncUDP-0.21/library.properties delete mode 100644 lib/ESPAsyncUDP-0.21/src/AsyncUDP.cpp delete mode 100644 lib/ESPAsyncUDP-0.21/src/ESPAsyncUDP.h delete mode 100644 lib/ESPAsyncUDP-0.21/travis/common.sh rename lib/{esp-knx-ip-async-udp-0.4.0.15 => esp-knx-ip-0.5.0}/DPT.h (100%) rename lib/{esp-knx-ip-async-udp-0.4.0.15 => esp-knx-ip-0.5.0}/LICENSE (100%) rename lib/{esp-knx-ip-async-udp-0.4.0.15 => esp-knx-ip-0.5.0}/README.md (77%) rename lib/{esp-knx-ip-async-udp-0.4.0.15 => esp-knx-ip-0.5.0}/esp-knx-ip-config.cpp (100%) rename lib/{esp-knx-ip-async-udp-0.4.0.15 => esp-knx-ip-0.5.0}/esp-knx-ip-conversion.cpp (100%) rename lib/{esp-knx-ip-async-udp-0.4.0.15 => esp-knx-ip-0.5.0}/esp-knx-ip-send.cpp (98%) rename lib/{esp-knx-ip-async-udp-0.4.0.15 => esp-knx-ip-0.5.0}/esp-knx-ip-webserver.cpp (100%) rename lib/{esp-knx-ip-async-udp-0.4.0.15 => esp-knx-ip-0.5.0}/esp-knx-ip.cpp (98%) rename lib/{esp-knx-ip-async-udp-0.4.0.15 => esp-knx-ip-0.5.0}/esp-knx-ip.h (99%) rename lib/{esp-knx-ip-async-udp-0.4.0.15 => esp-knx-ip-0.5.0}/examples/environment-sensor/environment-sensor.ino (100%) rename lib/{esp-knx-ip-async-udp-0.4.0.15 => esp-knx-ip-0.5.0}/examples/sonoff/sonoff.ino (100%) rename lib/{esp-knx-ip-async-udp-0.4.0.15 => esp-knx-ip-0.5.0}/examples/static-config/static-config.ino (100%) rename lib/{esp-knx-ip-async-udp-0.4.0.15 => esp-knx-ip-0.5.0}/keywords.txt (100%) rename lib/{esp-knx-ip-async-udp-0.4.0.15 => esp-knx-ip-0.5.0}/library.properties (60%) diff --git a/README.md b/README.md index 7d95d9370..8d0d6b3d5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## Sonoff-Tasmota -Alternative firmware for _ESP8266 based devices_ like [iTead](https://www.itead.cc/) _**Sonoff**_ with **web**, **timers**, 'Over The Air' (**OTA**) firmware updates and **sensors support**, allowing control under **Serial**, **HTTP** and **MQTT**, so as to be used on **Smart Home Systems**. Written for Arduino IDE and PlatformIO. +Alternative firmware for _ESP8266 based devices_ like [iTead](https://www.itead.cc/) _**Sonoff**_ with **web**, **timers**, 'Over The Air' (**OTA**) firmware updates and **sensors support**, allowing control under **Serial**, **HTTP**, **MQTT** and **KNX**, so as to be used on **Smart Home Systems**. Written for Arduino IDE and PlatformIO. [![GitHub version](https://img.shields.io/github/release/arendst/Sonoff-Tasmota.svg)](https://github.com/arendst/Sonoff-Tasmota/releases/latest) [![GitHub download](https://img.shields.io/github/downloads/arendst/Sonoff-Tasmota/total.svg)](https://github.com/arendst/Sonoff-Tasmota/releases/latest) @@ -81,4 +81,4 @@ You can contribute to Sonoff-Tasmota by ### License -This program is licensed under GPL-3.0 \ No newline at end of file +This program is licensed under GPL-3.0 diff --git a/lib/ESPAsyncUDP-0.21/README.md b/lib/ESPAsyncUDP-0.21/README.md deleted file mode 100644 index 6568fa372..000000000 --- a/lib/ESPAsyncUDP-0.21/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# ESPAsyncUDP -_Library patched with the [PR #21](https://github.com/me-no-dev/ESPAsyncUDP/pull/21)_ - -Async UDP Library for ESP8266 Arduino [![Build Status](https://travis-ci.org/me-no-dev/ESPAsyncUDP.svg?branch=master)](https://travis-ci.org/me-no-dev/ESPAsyncUDP) - -[![Join the chat at https://gitter.im/me-no-dev/ESPAsyncWebServer](https://badges.gitter.im/me-no-dev/ESPAsyncWebServer.svg)](https://gitter.im/me-no-dev/ESPAsyncWebServer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - -This is a fully asynchronous UDP library, aimed at enabling trouble-free, multi-connection network environment for Espressif's ESP8266 MCUs. - -The library is easy to use and includes support for Unicast, Broadcast and Multicast environments - -Latest GIT version of ESP8266 Arduino might be required for this library to work diff --git a/lib/ESPAsyncUDP-0.21/examples/AsyncUDPClient/AsyncUDPClient.ino b/lib/ESPAsyncUDP-0.21/examples/AsyncUDPClient/AsyncUDPClient.ino deleted file mode 100644 index cf528fe12..000000000 --- a/lib/ESPAsyncUDP-0.21/examples/AsyncUDPClient/AsyncUDPClient.ino +++ /dev/null @@ -1,51 +0,0 @@ -#include -#include "ESPAsyncUDP.h" - -const char * ssid = "***********"; -const char * password = "***********"; - -AsyncUDP udp; - -void setup() -{ - Serial.begin(115200); - WiFi.mode(WIFI_STA); - WiFi.begin(ssid, password); - if (WiFi.waitForConnectResult() != WL_CONNECTED) { - Serial.println("WiFi Failed"); - while(1) { - delay(1000); - } - } - if(udp.connect(IPAddress(192,168,1,100), 1234)) { - Serial.println("UDP connected"); - udp.onPacket([](AsyncUDPPacket packet) { - Serial.print("UDP Packet Type: "); - Serial.print(packet.isBroadcast()?"Broadcast":packet.isMulticast()?"Multicast":"Unicast"); - Serial.print(", From: "); - Serial.print(packet.remoteIP()); - Serial.print(":"); - Serial.print(packet.remotePort()); - Serial.print(", To: "); - Serial.print(packet.localIP()); - Serial.print(":"); - Serial.print(packet.localPort()); - Serial.print(", Length: "); - Serial.print(packet.length()); - Serial.print(", Data: "); - Serial.write(packet.data(), packet.length()); - Serial.println(); - //reply to the client - packet.printf("Got %u bytes of data", packet.length()); - }); - //Send unicast - udp.print("Hello Server!"); - } -} - -void loop() -{ - delay(1000); - //Send broadcast on port 1234 - udp.broadcastTo("Anyone here?", 1234); -} diff --git a/lib/ESPAsyncUDP-0.21/examples/AsyncUDPMulticastServer/AsyncUDPMulticastServer.ino b/lib/ESPAsyncUDP-0.21/examples/AsyncUDPMulticastServer/AsyncUDPMulticastServer.ino deleted file mode 100644 index bb3e69c9b..000000000 --- a/lib/ESPAsyncUDP-0.21/examples/AsyncUDPMulticastServer/AsyncUDPMulticastServer.ino +++ /dev/null @@ -1,52 +0,0 @@ -#include -#include "ESPAsyncUDP.h" - -const char * ssid = "***********"; -const char * password = "***********"; - -AsyncUDP udp; - -void setup() -{ - Serial.begin(115200); - WiFi.mode(WIFI_STA); - WiFi.begin(ssid, password); - if (WiFi.waitForConnectResult() != WL_CONNECTED) { - Serial.println("WiFi Failed"); - while(1) { - delay(1000); - } - } - if(udp.listenMulticast(IPAddress(239,1,2,3), 1234)) { - Serial.print("UDP Listening on IP: "); - Serial.println(WiFi.localIP()); - udp.onPacket([](AsyncUDPPacket packet) { - Serial.print("UDP Packet Type: "); - Serial.print(packet.isBroadcast()?"Broadcast":packet.isMulticast()?"Multicast":"Unicast"); - Serial.print(", From: "); - Serial.print(packet.remoteIP()); - Serial.print(":"); - Serial.print(packet.remotePort()); - Serial.print(", To: "); - Serial.print(packet.localIP()); - Serial.print(":"); - Serial.print(packet.localPort()); - Serial.print(", Length: "); - Serial.print(packet.length()); - Serial.print(", Data: "); - Serial.write(packet.data(), packet.length()); - Serial.println(); - //reply to the client - packet.printf("Got %u bytes of data", packet.length()); - }); - //Send multicast - udp.print("Hello!"); - } -} - -void loop() -{ - delay(1000); - //Send multicast - udp.print("Anyone here?"); -} diff --git a/lib/ESPAsyncUDP-0.21/examples/AsyncUDPServer/AsyncUDPServer.ino b/lib/ESPAsyncUDP-0.21/examples/AsyncUDPServer/AsyncUDPServer.ino deleted file mode 100644 index fc12a7fc3..000000000 --- a/lib/ESPAsyncUDP-0.21/examples/AsyncUDPServer/AsyncUDPServer.ino +++ /dev/null @@ -1,50 +0,0 @@ -#include -#include "ESPAsyncUDP.h" - -const char * ssid = "***********"; -const char * password = "***********"; - -AsyncUDP udp; - -void setup() -{ - Serial.begin(115200); - WiFi.mode(WIFI_STA); - WiFi.begin(ssid, password); - if (WiFi.waitForConnectResult() != WL_CONNECTED) { - Serial.println("WiFi Failed"); - while(1) { - delay(1000); - } - } - if(udp.listen(1234)) { - Serial.print("UDP Listening on IP: "); - Serial.println(WiFi.localIP()); - udp.onPacket([](AsyncUDPPacket packet) { - Serial.print("UDP Packet Type: "); - Serial.print(packet.isBroadcast()?"Broadcast":packet.isMulticast()?"Multicast":"Unicast"); - Serial.print(", From: "); - Serial.print(packet.remoteIP()); - Serial.print(":"); - Serial.print(packet.remotePort()); - Serial.print(", To: "); - Serial.print(packet.localIP()); - Serial.print(":"); - Serial.print(packet.localPort()); - Serial.print(", Length: "); - Serial.print(packet.length()); - Serial.print(", Data: "); - Serial.write(packet.data(), packet.length()); - Serial.println(); - //reply to the client - packet.printf("Got %u bytes of data", packet.length()); - }); - } -} - -void loop() -{ - delay(1000); - //Send broadcast - udp.broadcast("Anyone here?"); -} diff --git a/lib/ESPAsyncUDP-0.21/keywords.txt b/lib/ESPAsyncUDP-0.21/keywords.txt deleted file mode 100644 index 67c0b97a7..000000000 --- a/lib/ESPAsyncUDP-0.21/keywords.txt +++ /dev/null @@ -1,33 +0,0 @@ -####################################### -# Syntax Coloring Map For Ultrasound -####################################### - -####################################### -# Datatypes (KEYWORD1) -####################################### - -AsyncUDP KEYWORD1 -AsyncUDPPacket KEYWORD1 - -####################################### -# Methods and Functions (KEYWORD2) -####################################### - -connect KEYWORD2 -connected KEYWORD2 -listen KEYWORD2 -listenMulticast KEYWORD2 -close KEYWORD2 -write KEYWORD2 -broadcast KEYWORD2 -onPacket KEYWORD2 -data KEYWORD2 -length KEYWORD2 -localIP KEYWORD2 -localPort KEYWORD2 -remoteIP KEYWORD2 -remotePort KEYWORD2 - -####################################### -# Constants (LITERAL1) -####################################### diff --git a/lib/ESPAsyncUDP-0.21/library.json b/lib/ESPAsyncUDP-0.21/library.json deleted file mode 100644 index fe300b6e6..000000000 --- a/lib/ESPAsyncUDP-0.21/library.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name":"ESPAsyncUDP", - "description":"Asynchronous UDP Library for ESP8266", - "keywords":"async,udp,server,client,multicast,broadcast", - "authors": - { - "name": "Hristo Gochkov", - "maintainer": true - }, - "repository": - { - "type": "git", - "url": "https://github.com/me-no-dev/ESPAsyncUDP.git" - }, - "frameworks": "arduino", - "platforms":"espressif" -} diff --git a/lib/ESPAsyncUDP-0.21/library.properties b/lib/ESPAsyncUDP-0.21/library.properties deleted file mode 100644 index 1aa6ef1ad..000000000 --- a/lib/ESPAsyncUDP-0.21/library.properties +++ /dev/null @@ -1,9 +0,0 @@ -name=ESP Async UDP -version=1.0.0 -author=Me-No-Dev -maintainer=Me-No-Dev -sentence=Async UDP Library for ESP8266 -paragraph=Async UDP Library for ESP8266 -category=Other -url=https://github.com/me-no-dev/ESPAsyncUDP -architectures=* diff --git a/lib/ESPAsyncUDP-0.21/src/AsyncUDP.cpp b/lib/ESPAsyncUDP-0.21/src/AsyncUDP.cpp deleted file mode 100644 index 6d2423819..000000000 --- a/lib/ESPAsyncUDP-0.21/src/AsyncUDP.cpp +++ /dev/null @@ -1,425 +0,0 @@ -#include "Arduino.h" -#include "ESPAsyncUDP.h" - -extern "C" { -#include "user_interface.h" -#include "lwip/opt.h" -#include "lwip/inet.h" -#include "lwip/udp.h" -#include "lwip/igmp.h" -} - -AsyncUDPMessage::AsyncUDPMessage(size_t size) -{ - _index = 0; - if(size > 1460) { - size = 1460; - } - _size = size; - _buffer = (uint8_t *)malloc(size); -} - -AsyncUDPMessage::~AsyncUDPMessage() -{ - if(_buffer) { - free(_buffer); - } -} - -size_t AsyncUDPMessage::write(const uint8_t *data, size_t len) -{ - if(_buffer == NULL) { - return 0; - } - size_t s = space(); - if(len > s) { - len = s; - } - memcpy(_buffer + _index, data, len); - _index += len; - return len; -} - -size_t AsyncUDPMessage::write(uint8_t data) -{ - return write(&data, 1); -} - -size_t AsyncUDPMessage::space() -{ - if(_buffer == NULL) { - return 0; - } - return _size - _index; -} - -uint8_t * AsyncUDPMessage::data() -{ - return _buffer; -} - -size_t AsyncUDPMessage::length() -{ - return _index; -} - -void AsyncUDPMessage::flush() -{ - _index = 0; -} - - -AsyncUDPPacket::AsyncUDPPacket(AsyncUDP *udp, ip_addr_t *localIp, uint16_t localPort, ip_addr_t *remoteIp, uint16_t remotePort, uint8_t *data, size_t len) -{ - _udp = udp; - _localIp = localIp; - _localPort = localPort; - _remoteIp = remoteIp; - _remotePort = remotePort; - _data = data; - _len = len; -} - -AsyncUDPPacket::~AsyncUDPPacket() -{ - -} - -uint8_t * AsyncUDPPacket::data() -{ - return _data; -} - -size_t AsyncUDPPacket::length() -{ - return _len; -} - -IPAddress AsyncUDPPacket::localIP() -{ - return IPAddress(_localIp->addr); -} - -uint16_t AsyncUDPPacket::localPort() -{ - return _localPort; -} - -IPAddress AsyncUDPPacket::remoteIP() -{ - return IPAddress(_remoteIp->addr); -} - -uint16_t AsyncUDPPacket::remotePort() -{ - return _remotePort; -} - -bool AsyncUDPPacket::isBroadcast() -{ - return _localIp->addr == 0xFFFFFFFF || _localIp->addr == (uint32_t)(0); -} - -bool AsyncUDPPacket::isMulticast() -{ - return ip_addr_ismulticast(_localIp); -} - -size_t AsyncUDPPacket::write(const uint8_t *data, size_t len) -{ - return _udp->writeTo(data, len, _remoteIp, _remotePort); -} - -size_t AsyncUDPPacket::write(uint8_t data) -{ - return write(&data, 1); -} - -size_t AsyncUDPPacket::send(AsyncUDPMessage &message) -{ - return write(message.data(), message.length()); -} - - - -AsyncUDP::AsyncUDP() -{ - _pcb = NULL; - _connected = false; - _handler = NULL; -} - -AsyncUDP::~AsyncUDP() -{ - close(); -} - -AsyncUDP::operator bool() -{ - return _connected; -} - -bool AsyncUDP::connected() -{ - return _connected; -} - -void AsyncUDP::onPacket(AuPacketHandlerFunctionWithArg cb, void * arg) -{ - onPacket(std::bind(cb, arg, std::placeholders::_1)); -} - -void AsyncUDP::onPacket(AuPacketHandlerFunction cb) -{ - _handler = cb; -} - -void AsyncUDP::_recv(udp_pcb *upcb, pbuf *pb, ip_addr_t *addr, uint16_t port) -{ - (void)upcb; // its unused, avoid warning - while(pb != NULL) { - if(_handler) { - uint8_t * data = (uint8_t*)((pb)->payload); - size_t len = pb->len; - - ip_hdr* iphdr = reinterpret_cast(data - UDP_HLEN - IP_HLEN); - ip_addr_t daddr; - daddr.addr = iphdr->dest.addr; - - udp_hdr* udphdr = reinterpret_cast(((uint8_t*)((pb)->payload)) - UDP_HLEN); - uint16_t dport = ntohs(udphdr->dest); - - AsyncUDPPacket packet(this, &daddr, dport, addr, port, data, len); - _handler(packet); - } - - pbuf * this_pb = pb; - pb = pb->next; - this_pb->next = NULL; - pbuf_free(this_pb); - } -} - -#if LWIP_VERSION_MAJOR == 1 -void AsyncUDP::_s_recv(void *arg, udp_pcb *upcb, pbuf *p, ip_addr_t *addr, uint16_t port) -#else -void AsyncUDP::_s_recv(void *arg, udp_pcb *upcb, pbuf *p, const ip_addr_t *addr, uint16_t port) -#endif -{ - reinterpret_cast(arg)->_recv(upcb, p, (ip_addr_t *)addr, port); -} - -bool AsyncUDP::listen(ip_addr_t *addr, uint16_t port) -{ - close(); - _pcb = udp_new(); - if(_pcb == NULL) { - return false; - } - err_t err = udp_bind(_pcb, addr, port); - if(err != ERR_OK) { - close(); - return false; - } - udp_recv(_pcb, &_s_recv, (void *) this); - _connected = true; - return true; -} - -bool AsyncUDP::listenMulticast(ip_addr_t *addr, uint16_t port, uint8_t ttl) -{ - close(); - if(!ip_addr_ismulticast(addr)) { - return false; - } - ip_addr_t multicast_if_addr; - struct ip_info ifIpInfo; - int mode = wifi_get_opmode(); - if(mode & STATION_MODE) { - wifi_get_ip_info(STATION_IF, &ifIpInfo); - multicast_if_addr.addr = ifIpInfo.ip.addr; - } else if (mode & SOFTAP_MODE) { - wifi_get_ip_info(SOFTAP_IF, &ifIpInfo); - multicast_if_addr.addr = ifIpInfo.ip.addr; - } else { - return false; - } - if (igmp_joingroup(&multicast_if_addr, addr)!= ERR_OK) { - return false; - } - if(!listen(IPADDR_ANY, port)) { - return false; - } -#if LWIP_VERSION_MAJOR == 1 - udp_set_multicast_netif_addr(_pcb, multicast_if_addr); -#else - udp_set_multicast_netif_addr(_pcb, &multicast_if_addr); -#endif - udp_set_multicast_ttl(_pcb, ttl); - ip_addr_copy(_pcb->remote_ip, *addr); - _pcb->remote_port = port; - return true; -} - -bool AsyncUDP::connect(ip_addr_t *addr, uint16_t port) -{ - close(); - _pcb = udp_new(); - if(_pcb == NULL) { - return false; - } - err_t err = udp_connect(_pcb, addr, port); - if(err != ERR_OK) { - close(); - return false; - } - udp_recv(_pcb, &_s_recv, (void *) this); - _connected = true; - return true; -} - -void AsyncUDP::close() -{ - if(_pcb != NULL) { - if(_connected) { - udp_disconnect(_pcb); - } - udp_remove(_pcb); - _connected = false; - _pcb = NULL; - } -} - -size_t AsyncUDP::writeTo(const uint8_t *data, size_t len, ip_addr_t *addr, uint16_t port) -{ - if(!_pcb && !connect(addr, port)) { - return 0; - } - if(len > 1460) { - len = 1460; - } - pbuf* pbt = pbuf_alloc(PBUF_TRANSPORT, len, PBUF_RAM); - if(pbt != NULL) { - uint8_t* dst = reinterpret_cast(pbt->payload); - memcpy(dst, data, len); - err_t err = udp_sendto(_pcb, pbt, addr, port); - pbuf_free(pbt); - if(err < ERR_OK) { - return 0; - } - return len; - } - return 0; -} - -bool AsyncUDP::listen(const IPAddress addr, uint16_t port) -{ - ip_addr_t laddr; - laddr.addr = addr; - return listen(&laddr, port); -} - -bool AsyncUDP::listen(uint16_t port) -{ - return listen(IPAddress((uint32_t)INADDR_ANY), port); -} - -bool AsyncUDP::listenMulticast(const IPAddress addr, uint16_t port, uint8_t ttl) -{ - ip_addr_t laddr; - laddr.addr = addr; - return listenMulticast(&laddr, port, ttl); -} - -bool AsyncUDP::connect(const IPAddress addr, uint16_t port) -{ - ip_addr_t daddr; - daddr.addr = addr; - return connect(&daddr, port); -} - -size_t AsyncUDP::writeTo(const uint8_t *data, size_t len, const IPAddress addr, uint16_t port) -{ - ip_addr_t daddr; - daddr.addr = addr; - return writeTo(data, len, &daddr, port); -} - -size_t AsyncUDP::write(const uint8_t *data, size_t len) -{ - if(_pcb) - { - return writeTo(data, len, &(_pcb->remote_ip), _pcb->remote_port); - } -} - -size_t AsyncUDP::write(uint8_t data) -{ - return write(&data, 1); -} - -size_t AsyncUDP::broadcastTo(uint8_t *data, size_t len, uint16_t port) -{ - ip_addr_t daddr; - daddr.addr = 0xFFFFFFFF; - return writeTo(data, len, &daddr, port); -} - -size_t AsyncUDP::broadcastTo(const char * data, uint16_t port) -{ - return broadcastTo((uint8_t *)data, strlen(data), port); -} - -size_t AsyncUDP::broadcast(uint8_t *data, size_t len) -{ - if(_pcb->local_port != 0) { - return broadcastTo(data, len, _pcb->local_port); - } - return 0; -} - -size_t AsyncUDP::broadcast(const char * data) -{ - return broadcast((uint8_t *)data, strlen(data)); -} - - -size_t AsyncUDP::sendTo(AsyncUDPMessage &message, ip_addr_t *addr, uint16_t port) -{ - if(!message) { - return 0; - } - return writeTo(message.data(), message.length(), addr, port); -} - -size_t AsyncUDP::sendTo(AsyncUDPMessage &message, const IPAddress addr, uint16_t port) -{ - if(!message) { - return 0; - } - return writeTo(message.data(), message.length(), addr, port); -} - -size_t AsyncUDP::send(AsyncUDPMessage &message) -{ - if((!message) || (!_pcb)) { - return 0; - } - return writeTo(message.data(), message.length(), &(_pcb->remote_ip), _pcb->remote_port); -} - -size_t AsyncUDP::broadcastTo(AsyncUDPMessage &message, uint16_t port) -{ - if(!message) { - return 0; - } - return broadcastTo(message.data(), message.length(), port); -} - -size_t AsyncUDP::broadcast(AsyncUDPMessage &message) -{ - if(!message) { - return 0; - } - return broadcast(message.data(), message.length()); -} diff --git a/lib/ESPAsyncUDP-0.21/src/ESPAsyncUDP.h b/lib/ESPAsyncUDP-0.21/src/ESPAsyncUDP.h deleted file mode 100644 index 8e5a70b21..000000000 --- a/lib/ESPAsyncUDP-0.21/src/ESPAsyncUDP.h +++ /dev/null @@ -1,130 +0,0 @@ -#ifndef ESPASYNCUDP_H -#define ESPASYNCUDP_H - -#include "IPAddress.h" -#include "Print.h" -#include -#include "lwip/init.h" - -class AsyncUDP; -class AsyncUDPPacket; -class AsyncUDPMessage; -struct udp_pcb; -struct pbuf; -#if LWIP_VERSION_MAJOR == 1 -struct ip_addr; -typedef struct ip_addr ip_addr_t; -#else -struct ip4_addr; -typedef struct ip4_addr ip_addr_t; -#endif - -class AsyncUDPMessage : public Print -{ -protected: - uint8_t *_buffer; - size_t _index; - size_t _size; -public: - AsyncUDPMessage(size_t size=1460); - virtual ~AsyncUDPMessage(); - size_t write(const uint8_t *data, size_t len); - size_t write(uint8_t data); - size_t space(); - uint8_t * data(); - size_t length(); - void flush(); - operator bool() - { - return _buffer != NULL; - } -}; - -class AsyncUDPPacket : public Print -{ -protected: - AsyncUDP *_udp; - ip_addr_t *_localIp; - uint16_t _localPort; - ip_addr_t *_remoteIp; - uint16_t _remotePort; - uint8_t *_data; - size_t _len; -public: - AsyncUDPPacket(AsyncUDP *udp, ip_addr_t *localIp, uint16_t localPort, ip_addr_t *remoteIp, uint16_t remotePort, uint8_t *data, size_t len); - virtual ~AsyncUDPPacket(); - - uint8_t * data(); - size_t length(); - bool isBroadcast(); - bool isMulticast(); - - IPAddress localIP(); - uint16_t localPort(); - IPAddress remoteIP(); - uint16_t remotePort(); - - size_t send(AsyncUDPMessage &message); - - size_t write(const uint8_t *data, size_t len); - size_t write(uint8_t data); -}; - -typedef std::function AuPacketHandlerFunction; -typedef std::function AuPacketHandlerFunctionWithArg; - -class AsyncUDP : public Print -{ -protected: - udp_pcb *_pcb; - bool _connected; - AuPacketHandlerFunction _handler; - - void _recv(udp_pcb *upcb, pbuf *pb, ip_addr_t *addr, uint16_t port); -#if LWIP_VERSION_MAJOR == 1 - static void _s_recv(void *arg, udp_pcb *upcb, pbuf *p, ip_addr_t *addr, uint16_t port); -#else - static void _s_recv(void *arg, udp_pcb *upcb, pbuf *p, const ip_addr_t *addr, uint16_t port); -#endif - -public: - AsyncUDP(); - virtual ~AsyncUDP(); - - void onPacket(AuPacketHandlerFunctionWithArg cb, void * arg=NULL); - void onPacket(AuPacketHandlerFunction cb); - - bool listen(ip_addr_t *addr, uint16_t port); - bool listen(const IPAddress addr, uint16_t port); - bool listen(uint16_t port); - - bool listenMulticast(ip_addr_t *addr, uint16_t port, uint8_t ttl=1); - bool listenMulticast(const IPAddress addr, uint16_t port, uint8_t ttl=1); - - bool connect(ip_addr_t *addr, uint16_t port); - bool connect(const IPAddress addr, uint16_t port); - - void close(); - - size_t writeTo(const uint8_t *data, size_t len, ip_addr_t *addr, uint16_t port); - size_t writeTo(const uint8_t *data, size_t len, const IPAddress addr, uint16_t port); - size_t write(const uint8_t *data, size_t len); - size_t write(uint8_t data); - - size_t broadcastTo(uint8_t *data, size_t len, uint16_t port); - size_t broadcastTo(const char * data, uint16_t port); - size_t broadcast(uint8_t *data, size_t len); - size_t broadcast(const char * data); - - size_t sendTo(AsyncUDPMessage &message, ip_addr_t *addr, uint16_t port); - size_t sendTo(AsyncUDPMessage &message, const IPAddress addr, uint16_t port); - size_t send(AsyncUDPMessage &message); - - size_t broadcastTo(AsyncUDPMessage &message, uint16_t port); - size_t broadcast(AsyncUDPMessage &message); - - bool connected(); - operator bool(); -}; - -#endif diff --git a/lib/ESPAsyncUDP-0.21/travis/common.sh b/lib/ESPAsyncUDP-0.21/travis/common.sh deleted file mode 100644 index 57bede343..000000000 --- a/lib/ESPAsyncUDP-0.21/travis/common.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -function build_sketches() -{ - local arduino=$1 - local srcpath=$2 - local platform=$3 - local sketches=$(find $srcpath -name *.ino) - for sketch in $sketches; do - local sketchdir=$(dirname $sketch) - if [[ -f "$sketchdir/.$platform.skip" ]]; then - echo -e "\n\n ------------ Skipping $sketch ------------ \n\n"; - continue - fi - echo -e "\n\n ------------ Building $sketch ------------ \n\n"; - $arduino --verify $sketch; - local result=$? - if [ $result -ne 0 ]; then - echo "Build failed ($1)" - return $result - fi - done -} diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/DPT.h b/lib/esp-knx-ip-0.5.0/DPT.h similarity index 100% rename from lib/esp-knx-ip-async-udp-0.4.0.15/DPT.h rename to lib/esp-knx-ip-0.5.0/DPT.h diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/LICENSE b/lib/esp-knx-ip-0.5.0/LICENSE similarity index 100% rename from lib/esp-knx-ip-async-udp-0.4.0.15/LICENSE rename to lib/esp-knx-ip-0.5.0/LICENSE diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/README.md b/lib/esp-knx-ip-0.5.0/README.md similarity index 77% rename from lib/esp-knx-ip-async-udp-0.4.0.15/README.md rename to lib/esp-knx-ip-0.5.0/README.md index b18b50d6b..a93c09192 100644 --- a/lib/esp-knx-ip-async-udp-0.4.0.15/README.md +++ b/lib/esp-knx-ip-0.5.0/README.md @@ -3,19 +3,6 @@ This is a library for the ESP8266 to enable KNXnet/IP communication. It uses UDP multicast on 224.0.23.12:3671. It is intended to be used with the Arduino platform for the ESP8266. -## Prerequisities / Dependencies ## - -* You need version 2.4.0 of the esp8266 board libraries. - * I only tested with lwip v1.4. v2 might work, you need to test yourself. -* You need the [ESPAsyncUDP](https://github.com/me-no-dev/ESPAsyncUDP) library. -* You need a KNXnet/IP **router**. A gateway will **not** work. Alternatively use [knxd](https://github.com/knxd/knxd). - -## Caveats ## - -Receiving packets should work immediately. - -Sending sometimes only works after a substantial amount of time (max 5 minutes in my experiments). In my case, this was fixed by disabling IGMP snooping on the switch(es). - ## How to use ## The library is under development. API may change multiple times in the future. @@ -104,4 +91,4 @@ Simply visit the IP of your ESP with a webbrowser. You can configure the followi * Which group address should trigger which callback * Which group address are to be used by the program (e.g. for status replies) -The configuration is dynamically generated from the code. \ No newline at end of file +The configuration is dynamically generated from the code. diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-config.cpp b/lib/esp-knx-ip-0.5.0/esp-knx-ip-config.cpp similarity index 100% rename from lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-config.cpp rename to lib/esp-knx-ip-0.5.0/esp-knx-ip-config.cpp diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-conversion.cpp b/lib/esp-knx-ip-0.5.0/esp-knx-ip-conversion.cpp similarity index 100% rename from lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-conversion.cpp rename to lib/esp-knx-ip-0.5.0/esp-knx-ip-conversion.cpp diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-send.cpp b/lib/esp-knx-ip-0.5.0/esp-knx-ip-send.cpp similarity index 98% rename from lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-send.cpp rename to lib/esp-knx-ip-0.5.0/esp-knx-ip-send.cpp index 1244fc50a..72459f922 100644 --- a/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-send.cpp +++ b/lib/esp-knx-ip-0.5.0/esp-knx-ip-send.cpp @@ -73,7 +73,9 @@ void ESPKNXIP::send(address_t const &receiver, knx_command_type_t ct, uint8_t da DEBUG_PRINTLN(F("")); #endif - udp.writeTo(buf, len, MULTICAST_IP, MULTICAST_PORT); + udp.beginPacketMulticast(MULTICAST_IP, MULTICAST_PORT, WiFi.localIP()); + udp.write(buf, len); + udp.endPacket(); } void ESPKNXIP::send_1bit(address_t const &receiver, knx_command_type_t ct, uint8_t bit) diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-webserver.cpp b/lib/esp-knx-ip-0.5.0/esp-knx-ip-webserver.cpp similarity index 100% rename from lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip-webserver.cpp rename to lib/esp-knx-ip-0.5.0/esp-knx-ip-webserver.cpp diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip.cpp b/lib/esp-knx-ip-0.5.0/esp-knx-ip.cpp similarity index 98% rename from lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip.cpp rename to lib/esp-knx-ip-0.5.0/esp-knx-ip.cpp index 35b9c5014..b572333b9 100644 --- a/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip.cpp +++ b/lib/esp-knx-ip-0.5.0/esp-knx-ip.cpp @@ -96,10 +96,7 @@ void ESPKNXIP::__start() server->begin(); } - udp.listenMulticast(MULTICAST_IP, MULTICAST_PORT); - udp.onPacket([this](AsyncUDPPacket &packet) { - DEBUG_PRINTLN("got packet"); - __loop_knx(packet); }); + udp.beginMulticast(WiFi.localIP(), MULTICAST_IP, MULTICAST_PORT); } void ESPKNXIP::save_to_eeprom() @@ -514,6 +511,7 @@ feedback_id_t ESPKNXIP::feedback_register_action(String name, feedback_action_fp void ESPKNXIP::loop() { + __loop_knx(); if (server != nullptr) { __loop_webserver(); @@ -525,9 +523,9 @@ void ESPKNXIP::__loop_webserver() server->handleClient(); } -void ESPKNXIP::__loop_knx(AsyncUDPPacket &packet) +void ESPKNXIP::__loop_knx() { - size_t read = packet.length(); + int read = udp.parsePacket(); if (!read) { return; @@ -536,11 +534,14 @@ void ESPKNXIP::__loop_knx(AsyncUDPPacket &packet) DEBUG_PRINT(F("LEN: ")); DEBUG_PRINTLN(read); - uint8_t *buf = packet.data(); + uint8_t buf[read]; + + udp.read(buf, read); + udp.flush(); DEBUG_PRINT(F("Got packet:")); #ifdef ESP_KNX_DEBUG - for (size_t i = 0; i < read; ++i) + for (int i = 0; i < read; ++i) { DEBUG_PRINT(F(" 0x")); DEBUG_PRINT(buf[i], 16); diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip.h b/lib/esp-knx-ip-0.5.0/esp-knx-ip.h similarity index 99% rename from lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip.h rename to lib/esp-knx-ip-0.5.0/esp-knx-ip.h index 86e02c5e8..538264b3e 100644 --- a/lib/esp-knx-ip-async-udp-0.4.0.15/esp-knx-ip.h +++ b/lib/esp-knx-ip-0.5.0/esp-knx-ip.h @@ -45,7 +45,7 @@ #include "Arduino.h" #include #include -#include +#include #include #include "DPT.h" @@ -509,7 +509,7 @@ class ESPKNXIP { private: void __start(); - void __loop_knx(AsyncUDPPacket &packet); + void __loop_knx(); // Webserver functions void __loop_webserver(); @@ -544,7 +544,7 @@ class ESPKNXIP { ESP8266WebServer *server; address_t physaddr; - AsyncUDP udp; + WiFiUDP udp; callback_assignment_id_t registered_callback_assignments; callback_assignment_id_t free_callback_assignment_slots; diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/examples/environment-sensor/environment-sensor.ino b/lib/esp-knx-ip-0.5.0/examples/environment-sensor/environment-sensor.ino similarity index 100% rename from lib/esp-knx-ip-async-udp-0.4.0.15/examples/environment-sensor/environment-sensor.ino rename to lib/esp-knx-ip-0.5.0/examples/environment-sensor/environment-sensor.ino diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/examples/sonoff/sonoff.ino b/lib/esp-knx-ip-0.5.0/examples/sonoff/sonoff.ino similarity index 100% rename from lib/esp-knx-ip-async-udp-0.4.0.15/examples/sonoff/sonoff.ino rename to lib/esp-knx-ip-0.5.0/examples/sonoff/sonoff.ino diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/examples/static-config/static-config.ino b/lib/esp-knx-ip-0.5.0/examples/static-config/static-config.ino similarity index 100% rename from lib/esp-knx-ip-async-udp-0.4.0.15/examples/static-config/static-config.ino rename to lib/esp-knx-ip-0.5.0/examples/static-config/static-config.ino diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/keywords.txt b/lib/esp-knx-ip-0.5.0/keywords.txt similarity index 100% rename from lib/esp-knx-ip-async-udp-0.4.0.15/keywords.txt rename to lib/esp-knx-ip-0.5.0/keywords.txt diff --git a/lib/esp-knx-ip-async-udp-0.4.0.15/library.properties b/lib/esp-knx-ip-0.5.0/library.properties similarity index 60% rename from lib/esp-knx-ip-async-udp-0.4.0.15/library.properties rename to lib/esp-knx-ip-0.5.0/library.properties index ff2607bdc..57cad993c 100644 --- a/lib/esp-knx-ip-async-udp-0.4.0.15/library.properties +++ b/lib/esp-knx-ip-0.5.0/library.properties @@ -1,10 +1,10 @@ name=ESP KNX IP Library -version=0.4 +version=0.5 author=Nico Weichbrodt maintainer=Nico Weichbrodt sentence=ESP8266 library for KNX/IP communication. -paragraph=Build your own IoT devices with KNX/IP connectivity! This library depends on the ESPAsyncUDP library. +paragraph=Build your own IoT devices with KNX/IP connectivity! category=Communication url=https://github.com/envy/esp-knx-ip architectures=esp8266 -includes=esp-knx-ip.h \ No newline at end of file +includes=esp-knx-ip.h diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index ea8d97155..034877a45 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -2,6 +2,7 @@ * Reinit timers to accomodate random window (#2447) * Add random window to timers (#2447) * Add optional KNX IP Protocol Support (#2402) + * Fix compile error when using ESP/Arduino library v2.3.0 by reverting KNX async UDP library to default UDP library (#2488,#2492,#2493) * * 5.12.0l * Release rules up to 511 characters diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index 4a4e6c9ec..736e7849d 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -28,7 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * - * Updated until v5.12.0k + * Updated until v5.12.0m \*********************************************************************/ #define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) @@ -375,24 +375,24 @@ #define D_TIMER_ACTION "Estado" // xdrv_10_knx.ino -#define D_CONFIGURE_KNX "Configure KNX" -#define D_KNX_PARAMETERS "KNX Parameters" +#define D_CONFIGURE_KNX "Configuración de KNX" +#define D_KNX_PARAMETERS "Parámetros de KNX" #define D_KNX_GENERAL_CONFIG "General" -#define D_KNX_PHYSICAL_ADDRESS "Physical Address" -#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" -#define D_KNX_ENABLE "Enable KNX" -#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" -#define D_ADD "Add" -#define D_DELETE "Delete" -#define D_REPLY "Reply" -#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_KNX_PHYSICAL_ADDRESS "Dirección Física" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Debe ser única en la red KNX )" +#define D_KNX_ENABLE "Habilitar KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Datos a Enviar a las Direcciones de Grupo" +#define D_ADD "Agregar" +#define D_DELETE "Eliminar" +#define D_REPLY "Responder" +#define D_KNX_GROUP_ADDRESS_TO_READ "Direcciones de Grupo para Recibir Datos" #define D_LOG_KNX "KNX: " -#define D_RECEIVED_FROM "Received from" -#define D_KNX_COMMAND_WRITE "Write" -#define D_KNX_COMMAND_READ "Read" -#define D_KNX_COMMAND_OTHER "Other" -#define D_SENT_TO "sent to" -#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." +#define D_RECEIVED_FROM "Recibido desde" +#define D_KNX_COMMAND_WRITE "Escribir" +#define D_KNX_COMMAND_READ "Leer" +#define D_KNX_COMMAND_OTHER "Otro" +#define D_SENT_TO "enviada a" +#define D_KNX_WARNING "La dirección de grupo ( 0 / 0 / 0 ) está reservada y no puede ser utilizada." // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energía Hoy" diff --git a/sonoff/xdrv_11_knx.ino b/sonoff/xdrv_11_knx.ino index 734c22c54..76fc1cf0c 100644 --- a/sonoff/xdrv_11_knx.ino +++ b/sonoff/xdrv_11_knx.ino @@ -22,8 +22,7 @@ * KNX support * * Using libraries: - * ESP KNX IP library (async-udp branch) (https://github.com/envy/esp-knx-ip/tree/async-udp) - * ESPAsyncUDP library (https://github.com/me-no-dev/ESPAsyncUDP) + * ESP KNX IP library (https://github.com/envy/esp-knx-ip) Constants in sonoff.h ----------------------- @@ -870,8 +869,6 @@ boolean Xdrv11(byte function) break; case FUNC_LOOP: knx.loop(); // Process knx events - // It is not used by the actual config of asyncUDP branch of ESP-KNX-IP Library, - // but is left here for compatibility with upcoming features of ESP-KNX-IP Library break; // case FUNC_COMMAND: // result = KNXCommand(); From b7ed866803fb0f9c86a221d662099bf9850b1cc3 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 19 Apr 2018 20:55:12 +0200 Subject: [PATCH 083/136] Update French with KNX (#2452) --- sonoff/language/fr-FR.h | 96 ++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h index 26c0fe784..4cd410a9e 100644 --- a/sonoff/language/fr-FR.h +++ b/sonoff/language/fr-FR.h @@ -28,7 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * - * Updated until v5.12.0l + * Updated until v5.12.0m \*********************************************************************/ #define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) @@ -133,14 +133,14 @@ #define D_SAVE "Enregistrer" #define D_SENSOR "Capteur" #define D_SSID "SSID" -#define D_START "Départ" +#define D_START "Lancer" // "Lancer la mise à jour" #define D_STD_TIME "STD" #define D_STOP "Stop" #define D_SUBNET_MASK "Masque sous-réseau" #define D_SUBSCRIBE_TO "Souscrire à" #define D_SUCCESSFUL "Réussi" -#define D_SUNRISE "Jour" // "Lever du soleil" <- maybe too long? -#define D_SUNSET "Nuit" // "Coucher du soleil" <- maybe too long? +#define D_SUNRISE "Lever du jour" +#define D_SUNSET "Tombée de la nuit" #define D_TEMPERATURE "Température" #define D_TO "à" #define D_TOGGLE "Inverser" @@ -148,7 +148,7 @@ #define D_TRANSMIT "Transmettre" #define D_TRUE "Vrai" #define D_TVOC "TVOC" -#define D_UPGRADE "mise à jour" +#define D_UPGRADE "la mise à jour" // "Lancer la mise à jour" #define D_UPLOAD "Upload" // Not better in french #define D_UPTIME "Durée d'activité" #define D_USER "Utilisateur" @@ -214,24 +214,24 @@ #define D_BUTTON_TOGGLE "on/off" #define D_CONFIGURATION "Configuration" #define D_INFORMATION "Information" -#define D_FIRMWARE_UPGRADE "Mise à jour Firmware" +#define D_FIRMWARE_UPGRADE "Mise à jour du Firmware" #define D_CONSOLE "Console" #define D_CONFIRM_RESTART "Confirmer redémarrage" -#define D_CONFIGURE_MODULE "Configuration Module" +#define D_CONFIGURE_MODULE "Configuration du Module" #define D_CONFIGURE_WIFI "Configuration WiFi" #define D_CONFIGURE_MQTT "Configuration MQTT" #define D_CONFIGURE_DOMOTICZ "Configuration Domoticz" -#define D_CONFIGURE_LOGGING "Configuration Logging" +#define D_CONFIGURE_LOGGING "Configuration du journal" #define D_CONFIGURE_OTHER "Autre configuration" #define D_CONFIRM_RESET_CONFIGURATION "Confirmer réinitialisation configuration" -#define D_RESET_CONFIGURATION "Réinitialisation Configuration" -#define D_BACKUP_CONFIGURATION "Sauvegarde Configuration" -#define D_RESTORE_CONFIGURATION "Restauration Configuration" +#define D_RESET_CONFIGURATION "Configuration par défaut" +#define D_BACKUP_CONFIGURATION "Sauvegarde de la config." +#define D_RESTORE_CONFIGURATION "Restauration de la config." #define D_MAIN_MENU "Menu principal" #define D_MODULE_PARAMETERS "Paramètres module" -#define D_MODULE_TYPE "Type module" +#define D_MODULE_TYPE "Type de module" #define D_GPIO "GPIO" #define D_SERIAL_IN "Serial In" #define D_SERIAL_OUT "Serial Out" @@ -241,8 +241,8 @@ #define D_SCAN_DONE "Scan terminé" #define D_NO_NETWORKS_FOUND "Aucun réseau trouvé" #define D_REFRESH_TO_SCAN_AGAIN "Rafraîchir pour scanner à nouveau" -#define D_DUPLICATE_ACCESSPOINT "AccessPoint dupliqué" -#define D_SKIPPING_LOW_QUALITY "Passe car mauvaise qualité" +#define D_DUPLICATE_ACCESSPOINT "Point d'Accès dupliqué" +#define D_SKIPPING_LOW_QUALITY "Évité car de mauvaise qualité" #define D_RSSI "RSSI" #define D_WEP "WEP" #define D_WPA_PSK "WPA PSK" @@ -256,13 +256,13 @@ #define D_CLIENT "Client" #define D_FULL_TOPIC "topic complet" -#define D_LOGGING_PARAMETERS "Paramètres journalisation" +#define D_LOGGING_PARAMETERS "Paramètres du journal" #define D_SERIAL_LOG_LEVEL "Niveau de journalisation série" #define D_WEB_LOG_LEVEL "Niveau de journalisation web" -#define D_SYS_LOG_LEVEL "Niveau syslog" +#define D_SYS_LOG_LEVEL "Niveau Syslog" #define D_MORE_DEBUG "Plus de debug" -#define D_SYSLOG_HOST "Hôte syslog" -#define D_SYSLOG_PORT "Port syslog" +#define D_SYSLOG_HOST "Hôte Syslog" +#define D_SYSLOG_PORT "Port Syslog" #define D_TELEMETRY_PERIOD "Période télémétrie" #define D_OTHER_PARAMETERS "Autres paramètres" @@ -274,11 +274,11 @@ #define D_SINGLE_DEVICE "module unique" #define D_MULTI_DEVICE "multi module" -#define D_SAVE_CONFIGURATION "Enregistrer configuration" +#define D_SAVE_CONFIGURATION "Enregistrer la configuration" #define D_CONFIGURATION_SAVED "Configuration enregistrée" #define D_CONFIGURATION_RESET "Configuration réinitialisée" -#define D_PROGRAM_VERSION "Version Programme" +#define D_PROGRAM_VERSION "Version du programme" #define D_BUILD_DATE_AND_TIME "Date & Heure de build" #define D_CORE_AND_SDK_VERSION "Version Core/SDK" #define D_FLASH_WRITE_COUNT "Compteur écriture flash" @@ -306,21 +306,21 @@ #define D_UPLOAD_DONE "Téléchargement terminé" #define D_UPLOAD_ERR_1 "Aucun fichier sélectionné" #define D_UPLOAD_ERR_2 "Espace insuffisant" -#define D_UPLOAD_ERR_3 "Magic byte n'est pas 0xE9" +#define D_UPLOAD_ERR_3 "L'octet magique n'est pas 0xE9" #define D_UPLOAD_ERR_4 "La taille du programme à flasher est plus grande que la taille réelle de la mémoire flash" -#define D_UPLOAD_ERR_5 "Erreur comparaison buffer de téléchargement" +#define D_UPLOAD_ERR_5 "Erreur de comparaison du buffer de téléchargement" #define D_UPLOAD_ERR_6 "Téléchargement échoué. Activation logging 3" #define D_UPLOAD_ERR_7 "Téléchargement annulé" #define D_UPLOAD_ERR_8 "Fichier invalide" #define D_UPLOAD_ERR_9 "Fichier trop grand" #define D_UPLOAD_ERROR_CODE "Code d'erreur téléchargement" -#define D_ENTER_COMMAND "Saisir commande" +#define D_ENTER_COMMAND "Saisir une commande" #define D_ENABLE_WEBLOG_FOR_RESPONSE "Activer weblog 2 si response attendue" #define D_NEED_USER_AND_PASSWORD "Nécessite utilisateur=&password=" // xdrv_00_mqtt.ino -#define D_FINGERPRINT "Vérification empreinte TLS ..." +#define D_FINGERPRINT "Vérification d'empreinte TLS ..." #define D_TLS_CONNECT_FAILED_TO "Échec de connexion TLS à" #define D_RETRY_IN "Nouvelle tentative dans" #define D_VERIFIED "Vérifié par empreinte " @@ -345,7 +345,7 @@ #define D_HUE_API_NOT_IMPLEMENTED "API Hue non implémentée" #define D_HUE_API "Hue API" #define D_HUE_POST_ARGS "Hue POST args" -#define D_3_RESPONSE_PACKETS_SENT "3 paquets response envoyés" +#define D_3_RESPONSE_PACKETS_SENT "3 paquets Response envoyés" // xdrv_05_domoticz.ino #define D_DOMOTICZ_PARAMETERS "Paramètres Domoticz" @@ -365,7 +365,7 @@ #define D_DOMOTICZ_UPDATE_TIMER "Durée de rafraichissement" // xdrv_09_timers.ino -#define D_CONFIGURE_TIMER "Configuration Timer" +#define D_CONFIGURE_TIMER "Configuration des Timers" #define D_TIMER_PARAMETERS "Paramètres Timer" #define D_TIMER_ARM "Armer" #define D_TIMER_TIME "Temps" @@ -375,24 +375,24 @@ #define D_TIMER_ACTION "Action" // xdrv_10_knx.ino -#define D_CONFIGURE_KNX "Configure KNX" -#define D_KNX_PARAMETERS "KNX Parameters" -#define D_KNX_GENERAL_CONFIG "General" -#define D_KNX_PHYSICAL_ADDRESS "Physical Address" -#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" -#define D_KNX_ENABLE "Enable KNX" -#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" -#define D_ADD "Add" -#define D_DELETE "Delete" -#define D_REPLY "Reply" -#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_CONFIGURE_KNX "Configuration de KNX" +#define D_KNX_PARAMETERS "Paramètres KNX" +#define D_KNX_GENERAL_CONFIG "Général" +#define D_KNX_PHYSICAL_ADDRESS "Adresse individuelle" // Backbone/Line/Device -> Zone/Ligne/Participant +#define D_KNX_PHYSICAL_ADDRESS_NOTE "(Doit être unique sur le réseau KNX)" +#define D_KNX_ENABLE "Activer KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Données à envoyer à les Adresses de Groupe" +#define D_ADD "Ajoûter" +#define D_DELETE "Supprimer" +#define D_REPLY "Répondre" +#define D_KNX_GROUP_ADDRESS_TO_READ "Données à recevoir des Adresses de Groupe" #define D_LOG_KNX "KNX: " -#define D_RECEIVED_FROM "Received from" -#define D_KNX_COMMAND_WRITE "Write" -#define D_KNX_COMMAND_READ "Read" -#define D_KNX_COMMAND_OTHER "Other" -#define D_SENT_TO "sent to" -#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." +#define D_RECEIVED_FROM "Reçu de" +#define D_KNX_COMMAND_WRITE "Écrire" +#define D_KNX_COMMAND_READ "Lire" +#define D_KNX_COMMAND_OTHER "Autre" +#define D_SENT_TO "envoyé à" +#define D_KNX_WARNING "L'Adresse de Groupe ( 0 / 0 / 0 ) est réservée et ne peut être utilisée." // xsns_03_energy.ino #define D_ENERGY_TODAY "Énergie aujourd'hui" @@ -412,7 +412,7 @@ #define D_CHECKSUM_FAILURE "Erreur checksum" // xsns_07_sht1x.ino -#define D_SENSOR_DID_NOT_ACK_COMMAND "Le capteur n'a pas ACK la commande" +#define D_SENSOR_DID_NOT_ACK_COMMAND "Le capteur n'a pas acquitté la commande" #define D_SHT1X_FOUND "SHT1X found" // xsns_18_pms5003.ino @@ -454,12 +454,12 @@ // Units #define D_UNIT_AMPERE "A" #define D_UNIT_HOUR "h" -#define D_UNIT_KILOOHM "kOhm" +#define D_UNIT_KILOOHM "kΩ" #define D_UNIT_KILOWATTHOUR "kWh" #define D_UNIT_LUX "lx" -#define D_UNIT_MICROGRAM_PER_CUBIC_METER "ug/m3" -#define D_UNIT_MICROMETER "um" -#define D_UNIT_MICROSECOND "us" +#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m3" +#define D_UNIT_MICROMETER "µm" +#define D_UNIT_MICROSECOND "µs" #define D_UNIT_MILLIAMPERE "mA" #define D_UNIT_MILLISECOND "ms" #define D_UNIT_MINUTE "Min" From cb0305d2a3e60e6f2377d0e3ee8ea18a32ce8edd Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 19 Apr 2018 21:28:26 +0200 Subject: [PATCH 084/136] Fix config filename truncation 5.12.0m * Fix configuration filename truncation when it contains spaces (#2484, #2490) --- sonoff/_releasenotes.ino | 1 + sonoff/webserver.ino | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 034877a45..72b5f1901 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -3,6 +3,7 @@ * Add random window to timers (#2447) * Add optional KNX IP Protocol Support (#2402) * Fix compile error when using ESP/Arduino library v2.3.0 by reverting KNX async UDP library to default UDP library (#2488,#2492,#2493) + * Fix configuration filename truncation when it contains spaces (#2484, #2490) * * 5.12.0l * Release rules up to 511 characters diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index 38198826e..b1e322648 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -1001,7 +1001,7 @@ void HandleBackupConfiguration() WebServer->setContentLength(sizeof(buffer)); char attachment[100]; - snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=Config_%s_%s.dmp"), Settings.friendlyname[0], my_version); + snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=Config_%s_%s.dmp"), SpaceToUnderscore(Settings.friendlyname[0]), my_version); WebServer->sendHeader(F("Content-Disposition"), attachment); WebServer->send(200, FPSTR(HDR_CTYPE_STREAM), ""); memcpy(buffer, &Settings, sizeof(buffer)); From b479f9b015cf1b488a6daa7f488c7c28eb502f0a Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 19 Apr 2018 21:30:07 +0200 Subject: [PATCH 085/136] Revert "Fix config filename truncation" This reverts commit cb0305d2a3e60e6f2377d0e3ee8ea18a32ce8edd. --- sonoff/_releasenotes.ino | 1 - sonoff/webserver.ino | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 72b5f1901..034877a45 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -3,7 +3,6 @@ * Add random window to timers (#2447) * Add optional KNX IP Protocol Support (#2402) * Fix compile error when using ESP/Arduino library v2.3.0 by reverting KNX async UDP library to default UDP library (#2488,#2492,#2493) - * Fix configuration filename truncation when it contains spaces (#2484, #2490) * * 5.12.0l * Release rules up to 511 characters diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index b1e322648..38198826e 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -1001,7 +1001,7 @@ void HandleBackupConfiguration() WebServer->setContentLength(sizeof(buffer)); char attachment[100]; - snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=Config_%s_%s.dmp"), SpaceToUnderscore(Settings.friendlyname[0]), my_version); + snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=Config_%s_%s.dmp"), Settings.friendlyname[0], my_version); WebServer->sendHeader(F("Content-Disposition"), attachment); WebServer->send(200, FPSTR(HDR_CTYPE_STREAM), ""); memcpy(buffer, &Settings, sizeof(buffer)); From 729d0340f119d7a97f12781efe4cf7f3eac710c1 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 19 Apr 2018 21:31:31 +0200 Subject: [PATCH 086/136] Fix config filename truncation 5.12.0m * Fix configuration filename truncation when it contains spaces (#2484, #2490) --- sonoff/_releasenotes.ino | 1 + sonoff/support.ino | 76 ++++++---------------------------------- sonoff/webserver.ino | 2 +- 3 files changed, 12 insertions(+), 67 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 034877a45..72b5f1901 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -3,6 +3,7 @@ * Add random window to timers (#2447) * Add optional KNX IP Protocol Support (#2402) * Fix compile error when using ESP/Arduino library v2.3.0 by reverting KNX async UDP library to default UDP library (#2488,#2492,#2493) + * Fix configuration filename truncation when it contains spaces (#2484, #2490) * * 5.12.0l * Release rules up to 511 characters diff --git a/sonoff/support.ino b/sonoff/support.ino index 4d1e51516..acff35224 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -78,72 +78,6 @@ String GetResetReason() } } -#ifdef DEBUG_THEO -void ExceptionTest(byte type) -{ -/* -Exception (28): -epc1=0x4000bf64 epc2=0x00000000 epc3=0x00000000 excvaddr=0x00000007 depc=0x00000000 - -ctx: cont -sp: 3fff1f30 end: 3fff2840 offset: 01a0 - ->>>stack>>> -3fff20d0: 202c3573 756f7247 2c302070 646e4920 -3fff20e0: 40236a6e 7954202c 45206570 00454358 -3fff20f0: 00000010 00000007 00000000 3fff2180 -3fff2100: 3fff2190 40107bfc 3fff3e4c 3fff22c0 -3fff2110: 40261934 000000f0 3fff22c0 401004d8 -3fff2120: 40238fcf 00000050 3fff2100 4021fc10 -3fff2130: 3fff32bc 4021680c 3ffeade1 4021ff7d -3fff2140: 3fff2190 3fff2180 0000000c 7fffffff -3fff2150: 00000019 00000000 00000000 3fff21c0 -3fff2160: 3fff23f3 3ffe8e08 00000000 4021ffb4 -3fff2170: 3fff2190 3fff2180 0000000c 40201118 -3fff2180: 3fff21c0 0000003c 3ffef840 00000007 -3fff2190: 00000000 00000000 00000000 40201128 -3fff21a0: 3fff23f3 000000f1 3fff23ec 4020fafb -3fff21b0: 3fff23f3 3fff21c0 3fff21d0 3fff23f6 -3fff21c0: 00000000 3fff23fb 4022321b 00000000 - -Exception 28: LoadProhibited: A load referenced a page mapped with an attribute that does not permit loads -Decoding 14 results -0x40236a6e: ets_vsnprintf at ?? line ? -0x40107bfc: vsnprintf at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/libc_replacements.c line 387 -0x40261934: bignum_exptmod at ?? line ? -0x401004d8: malloc at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266\umm_malloc/umm_malloc.c line 1664 -0x40238fcf: wifi_station_get_connect_status at ?? line ? -0x4021fc10: operator new[](unsigned int) at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/abi.cpp line 57 -0x4021680c: ESP8266WiFiSTAClass::status() at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\libraries\ESP8266WiFi\src/ESP8266WiFiSTA.cpp line 569 -0x4021ff7d: vsnprintf_P(char*, unsigned int, char const*, __va_list_tag) at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/pgmspace.cpp line 146 -0x4021ffb4: snprintf_P(char*, unsigned int, char const*, ...) at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/pgmspace.cpp line 146 -0x40201118: atol at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/core_esp8266_noniso.c line 45 -0x40201128: atoi at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/core_esp8266_noniso.c line 45 -0x4020fafb: MqttDataHandler(char*, unsigned char*, unsigned int) at R:\Arduino\Work-ESP8266\Theo\sonoff\sonoff-4\sonoff/sonoff.ino line 679 (discriminator 1) -0x4022321b: pp_attach at ?? line ? - -00:00:08 MQTT: tele/sonoff/INFO3 = {"Started":"Fatal exception:28 flag:2 (EXCEPTION) epc1:0x4000bf64 epc2:0x00000000 epc3:0x00000000 excvaddr:0x00000007 depc:0x00000000"} -*/ - if (1 == type) { - char svalue[10]; - snprintf_P(svalue, sizeof(svalue), PSTR("%s"), 7); // Exception 28 as number in string (7 in excvaddr) - } -/* -14:50:52 osWatch: FreeRam 25896, rssi 68, last_run 0 -14:51:02 osWatch: FreeRam 25896, rssi 58, last_run 0 -14:51:03 CMND: exception 2 -14:51:12 osWatch: FreeRam 25360, rssi 60, last_run 8771 -14:51:22 osWatch: FreeRam 25360, rssi 62, last_run 18771 -14:51:32 osWatch: FreeRam 25360, rssi 62, last_run 28771 -14:51:42 osWatch: FreeRam 25360, rssi 62, last_run 38771 -14:51:42 osWatch: Warning, loop blocked. Restart now -*/ - if (2 == type) { - while(1) delay(1000); // this will trigger the os watch - } -} -#endif // DEBUG_THEO - /*********************************************************************************************\ * Miscellaneous \*********************************************************************************************/ @@ -298,6 +232,16 @@ char* UpperCase_P(char* dest, const char* source) return dest; } +char* SpaceToUnderscore(char* source) +{ + char* ptr = source; + while (*ptr) { + if (*ptr == ' ') { *ptr = '_'; } + ptr++; + } + return source; +} + boolean ParseIp(uint32_t* addr, const char* str) { uint8_t *part = (uint8_t*)addr; diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index 38198826e..b1e322648 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -1001,7 +1001,7 @@ void HandleBackupConfiguration() WebServer->setContentLength(sizeof(buffer)); char attachment[100]; - snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=Config_%s_%s.dmp"), Settings.friendlyname[0], my_version); + snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=Config_%s_%s.dmp"), SpaceToUnderscore(Settings.friendlyname[0]), my_version); WebServer->sendHeader(F("Content-Disposition"), attachment); WebServer->send(200, FPSTR(HDR_CTYPE_STREAM), ""); memcpy(buffer, &Settings, sizeof(buffer)); From c1bdc07cdfed869f9c160a9cd27755ac70e82e6d Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 19 Apr 2018 21:33:20 +0200 Subject: [PATCH 087/136] Revert "Fix config filename truncation" This reverts commit 729d0340f119d7a97f12781efe4cf7f3eac710c1. --- sonoff/_releasenotes.ino | 1 - sonoff/support.ino | 76 ++++++++++++++++++++++++++++++++++------ sonoff/webserver.ino | 2 +- 3 files changed, 67 insertions(+), 12 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 72b5f1901..034877a45 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -3,7 +3,6 @@ * Add random window to timers (#2447) * Add optional KNX IP Protocol Support (#2402) * Fix compile error when using ESP/Arduino library v2.3.0 by reverting KNX async UDP library to default UDP library (#2488,#2492,#2493) - * Fix configuration filename truncation when it contains spaces (#2484, #2490) * * 5.12.0l * Release rules up to 511 characters diff --git a/sonoff/support.ino b/sonoff/support.ino index acff35224..4d1e51516 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -78,6 +78,72 @@ String GetResetReason() } } +#ifdef DEBUG_THEO +void ExceptionTest(byte type) +{ +/* +Exception (28): +epc1=0x4000bf64 epc2=0x00000000 epc3=0x00000000 excvaddr=0x00000007 depc=0x00000000 + +ctx: cont +sp: 3fff1f30 end: 3fff2840 offset: 01a0 + +>>>stack>>> +3fff20d0: 202c3573 756f7247 2c302070 646e4920 +3fff20e0: 40236a6e 7954202c 45206570 00454358 +3fff20f0: 00000010 00000007 00000000 3fff2180 +3fff2100: 3fff2190 40107bfc 3fff3e4c 3fff22c0 +3fff2110: 40261934 000000f0 3fff22c0 401004d8 +3fff2120: 40238fcf 00000050 3fff2100 4021fc10 +3fff2130: 3fff32bc 4021680c 3ffeade1 4021ff7d +3fff2140: 3fff2190 3fff2180 0000000c 7fffffff +3fff2150: 00000019 00000000 00000000 3fff21c0 +3fff2160: 3fff23f3 3ffe8e08 00000000 4021ffb4 +3fff2170: 3fff2190 3fff2180 0000000c 40201118 +3fff2180: 3fff21c0 0000003c 3ffef840 00000007 +3fff2190: 00000000 00000000 00000000 40201128 +3fff21a0: 3fff23f3 000000f1 3fff23ec 4020fafb +3fff21b0: 3fff23f3 3fff21c0 3fff21d0 3fff23f6 +3fff21c0: 00000000 3fff23fb 4022321b 00000000 + +Exception 28: LoadProhibited: A load referenced a page mapped with an attribute that does not permit loads +Decoding 14 results +0x40236a6e: ets_vsnprintf at ?? line ? +0x40107bfc: vsnprintf at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/libc_replacements.c line 387 +0x40261934: bignum_exptmod at ?? line ? +0x401004d8: malloc at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266\umm_malloc/umm_malloc.c line 1664 +0x40238fcf: wifi_station_get_connect_status at ?? line ? +0x4021fc10: operator new[](unsigned int) at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/abi.cpp line 57 +0x4021680c: ESP8266WiFiSTAClass::status() at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\libraries\ESP8266WiFi\src/ESP8266WiFiSTA.cpp line 569 +0x4021ff7d: vsnprintf_P(char*, unsigned int, char const*, __va_list_tag) at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/pgmspace.cpp line 146 +0x4021ffb4: snprintf_P(char*, unsigned int, char const*, ...) at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/pgmspace.cpp line 146 +0x40201118: atol at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/core_esp8266_noniso.c line 45 +0x40201128: atoi at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/core_esp8266_noniso.c line 45 +0x4020fafb: MqttDataHandler(char*, unsigned char*, unsigned int) at R:\Arduino\Work-ESP8266\Theo\sonoff\sonoff-4\sonoff/sonoff.ino line 679 (discriminator 1) +0x4022321b: pp_attach at ?? line ? + +00:00:08 MQTT: tele/sonoff/INFO3 = {"Started":"Fatal exception:28 flag:2 (EXCEPTION) epc1:0x4000bf64 epc2:0x00000000 epc3:0x00000000 excvaddr:0x00000007 depc:0x00000000"} +*/ + if (1 == type) { + char svalue[10]; + snprintf_P(svalue, sizeof(svalue), PSTR("%s"), 7); // Exception 28 as number in string (7 in excvaddr) + } +/* +14:50:52 osWatch: FreeRam 25896, rssi 68, last_run 0 +14:51:02 osWatch: FreeRam 25896, rssi 58, last_run 0 +14:51:03 CMND: exception 2 +14:51:12 osWatch: FreeRam 25360, rssi 60, last_run 8771 +14:51:22 osWatch: FreeRam 25360, rssi 62, last_run 18771 +14:51:32 osWatch: FreeRam 25360, rssi 62, last_run 28771 +14:51:42 osWatch: FreeRam 25360, rssi 62, last_run 38771 +14:51:42 osWatch: Warning, loop blocked. Restart now +*/ + if (2 == type) { + while(1) delay(1000); // this will trigger the os watch + } +} +#endif // DEBUG_THEO + /*********************************************************************************************\ * Miscellaneous \*********************************************************************************************/ @@ -232,16 +298,6 @@ char* UpperCase_P(char* dest, const char* source) return dest; } -char* SpaceToUnderscore(char* source) -{ - char* ptr = source; - while (*ptr) { - if (*ptr == ' ') { *ptr = '_'; } - ptr++; - } - return source; -} - boolean ParseIp(uint32_t* addr, const char* str) { uint8_t *part = (uint8_t*)addr; diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index b1e322648..38198826e 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -1001,7 +1001,7 @@ void HandleBackupConfiguration() WebServer->setContentLength(sizeof(buffer)); char attachment[100]; - snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=Config_%s_%s.dmp"), SpaceToUnderscore(Settings.friendlyname[0]), my_version); + snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=Config_%s_%s.dmp"), Settings.friendlyname[0], my_version); WebServer->sendHeader(F("Content-Disposition"), attachment); WebServer->send(200, FPSTR(HDR_CTYPE_STREAM), ""); memcpy(buffer, &Settings, sizeof(buffer)); From 8f985abc1f115f7adff0d01b8dec4d290b51e058 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 19 Apr 2018 21:41:59 +0200 Subject: [PATCH 088/136] Fix config filename truncation 5.12.0m * Fix configuration filename truncation when it contains spaces (#2484, #2490) --- sonoff/_releasenotes.ino | 1 + sonoff/support.ino | 79 +++++++--------------------------------- sonoff/webserver.ino | 3 +- 3 files changed, 16 insertions(+), 67 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 034877a45..72b5f1901 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -3,6 +3,7 @@ * Add random window to timers (#2447) * Add optional KNX IP Protocol Support (#2402) * Fix compile error when using ESP/Arduino library v2.3.0 by reverting KNX async UDP library to default UDP library (#2488,#2492,#2493) + * Fix configuration filename truncation when it contains spaces (#2484, #2490) * * 5.12.0l * Release rules up to 511 characters diff --git a/sonoff/support.ino b/sonoff/support.ino index 4d1e51516..401b74e17 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -78,72 +78,6 @@ String GetResetReason() } } -#ifdef DEBUG_THEO -void ExceptionTest(byte type) -{ -/* -Exception (28): -epc1=0x4000bf64 epc2=0x00000000 epc3=0x00000000 excvaddr=0x00000007 depc=0x00000000 - -ctx: cont -sp: 3fff1f30 end: 3fff2840 offset: 01a0 - ->>>stack>>> -3fff20d0: 202c3573 756f7247 2c302070 646e4920 -3fff20e0: 40236a6e 7954202c 45206570 00454358 -3fff20f0: 00000010 00000007 00000000 3fff2180 -3fff2100: 3fff2190 40107bfc 3fff3e4c 3fff22c0 -3fff2110: 40261934 000000f0 3fff22c0 401004d8 -3fff2120: 40238fcf 00000050 3fff2100 4021fc10 -3fff2130: 3fff32bc 4021680c 3ffeade1 4021ff7d -3fff2140: 3fff2190 3fff2180 0000000c 7fffffff -3fff2150: 00000019 00000000 00000000 3fff21c0 -3fff2160: 3fff23f3 3ffe8e08 00000000 4021ffb4 -3fff2170: 3fff2190 3fff2180 0000000c 40201118 -3fff2180: 3fff21c0 0000003c 3ffef840 00000007 -3fff2190: 00000000 00000000 00000000 40201128 -3fff21a0: 3fff23f3 000000f1 3fff23ec 4020fafb -3fff21b0: 3fff23f3 3fff21c0 3fff21d0 3fff23f6 -3fff21c0: 00000000 3fff23fb 4022321b 00000000 - -Exception 28: LoadProhibited: A load referenced a page mapped with an attribute that does not permit loads -Decoding 14 results -0x40236a6e: ets_vsnprintf at ?? line ? -0x40107bfc: vsnprintf at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/libc_replacements.c line 387 -0x40261934: bignum_exptmod at ?? line ? -0x401004d8: malloc at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266\umm_malloc/umm_malloc.c line 1664 -0x40238fcf: wifi_station_get_connect_status at ?? line ? -0x4021fc10: operator new[](unsigned int) at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/abi.cpp line 57 -0x4021680c: ESP8266WiFiSTAClass::status() at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\libraries\ESP8266WiFi\src/ESP8266WiFiSTA.cpp line 569 -0x4021ff7d: vsnprintf_P(char*, unsigned int, char const*, __va_list_tag) at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/pgmspace.cpp line 146 -0x4021ffb4: snprintf_P(char*, unsigned int, char const*, ...) at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/pgmspace.cpp line 146 -0x40201118: atol at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/core_esp8266_noniso.c line 45 -0x40201128: atoi at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/core_esp8266_noniso.c line 45 -0x4020fafb: MqttDataHandler(char*, unsigned char*, unsigned int) at R:\Arduino\Work-ESP8266\Theo\sonoff\sonoff-4\sonoff/sonoff.ino line 679 (discriminator 1) -0x4022321b: pp_attach at ?? line ? - -00:00:08 MQTT: tele/sonoff/INFO3 = {"Started":"Fatal exception:28 flag:2 (EXCEPTION) epc1:0x4000bf64 epc2:0x00000000 epc3:0x00000000 excvaddr:0x00000007 depc:0x00000000"} -*/ - if (1 == type) { - char svalue[10]; - snprintf_P(svalue, sizeof(svalue), PSTR("%s"), 7); // Exception 28 as number in string (7 in excvaddr) - } -/* -14:50:52 osWatch: FreeRam 25896, rssi 68, last_run 0 -14:51:02 osWatch: FreeRam 25896, rssi 58, last_run 0 -14:51:03 CMND: exception 2 -14:51:12 osWatch: FreeRam 25360, rssi 60, last_run 8771 -14:51:22 osWatch: FreeRam 25360, rssi 62, last_run 18771 -14:51:32 osWatch: FreeRam 25360, rssi 62, last_run 28771 -14:51:42 osWatch: FreeRam 25360, rssi 62, last_run 38771 -14:51:42 osWatch: Warning, loop blocked. Restart now -*/ - if (2 == type) { - while(1) delay(1000); // this will trigger the os watch - } -} -#endif // DEBUG_THEO - /*********************************************************************************************\ * Miscellaneous \*********************************************************************************************/ @@ -298,6 +232,19 @@ char* UpperCase_P(char* dest, const char* source) return dest; } +char* SpaceToUnderscore(char* dest, const char* source) +{ + char* write = dest; + const char* read = source; + char ch = '.'; + + while (ch != '\0') { + ch = *read++; + *write++ = (ch == ' ') ? '_' : ch; + } + return dest; +} + boolean ParseIp(uint32_t* addr, const char* str) { uint8_t *part = (uint8_t*)addr; diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index 38198826e..29067e14b 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -1001,7 +1001,8 @@ void HandleBackupConfiguration() WebServer->setContentLength(sizeof(buffer)); char attachment[100]; - snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=Config_%s_%s.dmp"), Settings.friendlyname[0], my_version); + char friendlyname[sizeof(Settings.friendlyname[0])]; + snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=Config_%s_%s.dmp"), SpaceToUnderscore(friendlyname, Settings.friendlyname[0]), my_version); WebServer->sendHeader(F("Content-Disposition"), attachment); WebServer->send(200, FPSTR(HDR_CTYPE_STREAM), ""); memcpy(buffer, &Settings, sizeof(buffer)); From e0aeb8e0a2f1abdbb49f65426420596b46190767 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 19 Apr 2018 21:57:14 +0200 Subject: [PATCH 089/136] Add Greek translation 5.12.0m * Add Greek language file (#2491) --- platformio.ini | 15 ++ sonoff/_releasenotes.ino | 1 + sonoff/i18n.h | 1 - sonoff/language/el-GR.h | 501 +++++++++++++++++++++++++++++++++++++++ sonoff/user_config.h | 1 + 5 files changed, 518 insertions(+), 1 deletion(-) create mode 100644 sonoff/language/el-GR.h diff --git a/platformio.ini b/platformio.ini index 87991ad88..6f8b86e2c 100644 --- a/platformio.ini +++ b/platformio.ini @@ -18,6 +18,7 @@ src_dir = sonoff ;env_default = sonoff-DE ;env_default = sonoff-ES ;env_default = sonoff-FR +;env_default = sonoff-GR ;env_default = sonoff-HU ;env_default = sonoff-IT ;env_default = sonoff-NL @@ -139,6 +140,20 @@ extra_scripts = pio/strip-floats.py ; *** Serial Monitor options monitor_baud = 115200 +[env:sonoff-GR] +;platform = espressif8266@1.5.0 ; v2.3.0 +;platform = espressif8266@1.6.0 ; v2.4.0 +platform = espressif8266 +framework = arduino +board = esp01_1m +board_flash_mode = dout +build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=el-GR +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=el-GR -DUSE_CONFIG_OVERRIDE +extra_scripts = pio/strip-floats.py + +; *** Serial Monitor options +monitor_baud = 115200 + [env:sonoff-HU] ;platform = espressif8266@1.5.0 ; v2.3.0 ;platform = espressif8266@1.6.0 ; v2.4.0 diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 72b5f1901..c9cd7fef3 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -2,6 +2,7 @@ * Reinit timers to accomodate random window (#2447) * Add random window to timers (#2447) * Add optional KNX IP Protocol Support (#2402) + * Add Greek language file (#2491) * Fix compile error when using ESP/Arduino library v2.3.0 by reverting KNX async UDP library to default UDP library (#2488,#2492,#2493) * Fix configuration filename truncation when it contains spaces (#2484, #2490) * diff --git a/sonoff/i18n.h b/sonoff/i18n.h index bee43f02d..595f8c30f 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -227,7 +227,6 @@ #define D_CMND_SERIALSEND "SerialSend" #define D_CMND_SERIALDELIMITER "SerialDelimiter" #define D_CMND_BAUDRATE "Baudrate" -#define D_CMND_EXCEPTION "Exception" // Commands xdrv_00_mqtt.ino #define D_CMND_MQTTHOST "MqttHost" diff --git a/sonoff/language/el-GR.h b/sonoff/language/el-GR.h new file mode 100644 index 000000000..12e5542ce --- /dev/null +++ b/sonoff/language/el-GR.h @@ -0,0 +1,501 @@ +/* + el-GR.h - localization for Greek - Greece for Sonoff-Tasmota + + Copyright (C) 2018 Harry Kandiloros + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef _LANGUAGE_EL_GR_H_ +#define _LANGUAGE_EL_GR_H_ + +/*************************** ATTENTION *******************************\ + * + * Due to memory constraints only UTF-8 is supported. + * To save code space keep text as short as possible. + * Time and Date provided by SDK can not be localized (yet). + * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. + * Use online command Prefix to translate cmnd, stat and tele. + * + * Updated until v5.12.0m +\*********************************************************************/ + +//#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) + +// HTML (ISO 639-1) Language Code +#define D_HTML_LANGUAGE "el" + +// "2017-03-07T11:08:02" - ISO8601:2004 +#define D_YEAR_MONTH_SEPARATOR "-" +#define D_MONTH_DAY_SEPARATOR "-" +#define D_DATE_TIME_SEPARATOR "T" +#define D_HOUR_MINUTE_SEPARATOR ":" +#define D_MINUTE_SECOND_SEPARATOR ":" + +#define D_DAY3LIST "ΚυρΔευΤριΤετΠεμΠαρΣαβ" +#define D_MONTH3LIST "ΙανΦεβΜαρΑπρΜαϊΙονΙολΑυγΣεπΟκτΝοεΔεκ" + +// Non JSON decimal separator +#define D_DECIMAL_SEPARATOR "," + +// Common +#define D_ADMIN "Admin" +#define D_AIR_QUALITY "Ποιότητα Αέρα" +#define D_AP "AP" // Access Point +#define D_AS "as" +#define D_AUTO "ΑΥΤΟΜΑΤΟ" +#define D_BLINK "Αναβοσβήνει" +#define D_BLINKOFF "Δεν αναβοσβήνει" +#define D_BOOT_COUNT "Αριθμός εκκινήσεων" +#define D_BRIGHTLIGHT "Λαμπερό" +#define D_BUTTON "Κουμπί" +#define D_BY "από" // Written by me +#define D_BYTES "Bytes" +#define D_CELSIUS "Κελσίου" +#define D_CO2 "Διοξείδιο του άνθρακα" +#define D_CODE "κώδικας" // Button code +#define D_COLDLIGHT "Ψυχρός" +#define D_COMMAND "Εντολή" +#define D_CONNECTED "Συνδεδεμένο" +#define D_COUNT "Μέτρημα" +#define D_COUNTER "Μετρητής" +#define D_CURRENT "Τάση ρεύματος" // As in Voltage and Current +#define D_DATA "Δεδομένα" +#define D_DARKLIGHT "Σκούρο" +#define D_DEBUG "Debug" +#define D_DISABLED "Απενεργοποιημένο" +#define D_DNS_SERVER "Διακομιστής DNS" +#define D_DONE "Εγινε" +#define D_DST_TIME "DST" +#define D_ECO2 "eCO2" +#define D_EMULATION "Emulation" +#define D_ENABLED "Ενεργό" +#define D_ERASE "Σβήσιμο" +#define D_ERROR "Σφάλμα" +#define D_FAHRENHEIT "Φαρενάιτ" +#define D_FAILED "Αποτυχία" +#define D_FALLBACK "Εφεδρικό" +#define D_FALLBACK_TOPIC "Εφεδρικό θέμα" +#define D_FALSE "Λάθος" +#define D_FILE "Αρχείο" +#define D_FREE_MEMORY "Ελεύθερη Μνήμη" +#define D_GAS "Γκάζι" +#define D_GATEWAY "Πύλη" +#define D_GROUP "Ομάδα" +#define D_HOST "Host" +#define D_HOSTNAME "Hostname" +#define D_HUMIDITY "Υγρασία" +#define D_ILLUMINANCE "Illuminance" +#define D_IMMEDIATE "Φωτεινότητα" // Button immediate +#define D_INDEX "Κατάλογος" +#define D_INFO "Πληροφορίες" +#define D_INITIALIZED "Αρχικό" +#define D_IP_ADDRESS "IP Address" +#define D_LIGHT "Light" +#define D_LWT "LWT" +#define D_MODULE "Module" +#define D_MQTT "MQTT" +#define D_MULTI_PRESS "πολλαπλή πίεση" +#define D_NOISE "θόρυβος" +#define D_NONE "Κανένα" +#define D_OFF "Κλειστό" +#define D_OFFLINE "Offline" +#define D_OK "Ok" +#define D_ON "Ανοιχτό" +#define D_ONLINE "Online" +#define D_PASSWORD "ΚωδικόςPassword" +#define D_PORT "Πόρτα" +#define D_POWER_FACTOR "Παράγοντας ισχύος" +#define D_POWERUSAGE "Ισχύης" +#define D_PRESSURE "Πίεση" +#define D_PRESSUREATSEALEVEL "Πίεση στην επιφάνεια της Θάλασσας" +#define D_PROGRAM_FLASH_SIZE "Μέγεθος Προγράμματος Flash" +#define D_PROGRAM_SIZE "Μέγεθος Προγράμματος" +#define D_PROJECT "Έργο" +#define D_RECEIVED "Λήψη" +#define D_RESTART "Επανεκκίνηση" +#define D_RESTARTING "Επανεκκίνηση" +#define D_RESTART_REASON "Λόγος Επανεκκίνησης" +#define D_RESTORE "επαναφορά" +#define D_RETAINED "διατηρούνται" +#define D_RULE "Κανόνας" +#define D_SAVE "Αποθήκευση" +#define D_SENSOR "Σένσορας" +#define D_SSID "SSId" +#define D_START "Έναρξη" +#define D_STD_TIME "STD" +#define D_STOP "Στοπ" +#define D_SUBNET_MASK "Μάσκα υποδικτύου" +#define D_SUBSCRIBE_TO "Εγγραφή στο" +#define D_SUCCESSFUL "Επιτυχής" +#define D_SUNRISE "Σούρουπο" +#define D_SUNSET "Ηλιοβασίλεμα" +#define D_TEMPERATURE "Θερμοκρασία" +#define D_TO "στο" +#define D_TOGGLE "Εναλλαγή" +#define D_TOPIC "Θέμα" +#define D_TRANSMIT "Μετάδοση" +#define D_TRUE "Σωστό" +#define D_TVOC "TVOC" +#define D_UPGRADE "αναβάθμιση" +#define D_UPLOAD "Ανέβασμα" +#define D_UPTIME "Uptime" +#define D_USER "Χρήστης" +#define D_UTC_TIME "UTC" +#define D_UV_LEVEL "Επίπεδο UV" +#define D_VERSION "Έκδοση" +#define D_VOLTAGE "Τάση" +#define D_WARMLIGHT "Ζεστό" +#define D_WEB_SERVER "Web διακομιστής" + +// sonoff.ino +#define D_WARNING_MINIMAL_VERSION "ΠΡΟΕΙΔΟΠΟΙΗΣΗ Αυτή η έκδοση δεν αποθηκεύει τις ρυθμίσεις" +#define D_LEVEL_10 "επίπεδο 1-0" +#define D_LEVEL_01 "επίπεδο 0-1" +#define D_SERIAL_LOGGING_DISABLED "Η σειριακής καταγραφή απενεργοποιήθηκε" +#define D_SYSLOG_LOGGING_REENABLED "Η καταγραφή Syslog είναι ενεργοποιημένη" + +#define D_SET_BAUDRATE_TO "Ρύθμιση Baudrate σε" +#define D_RECEIVED_TOPIC "Λήψη θεμάτων" +#define D_DATA_SIZE "Μέγεθος δεδομένων" +#define D_ANALOG_INPUT "Αναλογικό" + +// support.ino +#define D_OSWATCH "osWatch" +#define D_BLOCKED_LOOP "Blocked Loop" +#define D_WPS_FAILED_WITH_STATUS "WPSconfig FAILED with status" +#define D_ACTIVE_FOR_3_MINUTES "active for 3 minutes" +#define D_FAILED_TO_START "failed to start" +#define D_PATCH_ISSUE_2186 "Patch issue 2186" +#define D_CONNECTING_TO_AP "Connecting to AP" +#define D_IN_MODE "in mode" +#define D_CONNECT_FAILED_NO_IP_ADDRESS "Connect failed as no IP address received" +#define D_CONNECT_FAILED_AP_NOT_REACHED "Connect failed as AP cannot be reached" +#define D_CONNECT_FAILED_WRONG_PASSWORD "Connect failed with AP incorrect password" +#define D_CONNECT_FAILED_AP_TIMEOUT "Connect failed with AP timeout" +#define D_ATTEMPTING_CONNECTION "Attempting connection..." +#define D_CHECKING_CONNECTION "Checking connection..." +#define D_QUERY_DONE "Query done. MQTT services found" +#define D_MQTT_SERVICE_FOUND "MQTT service found on" +#define D_FOUND_AT "found at" +#define D_SYSLOG_HOST_NOT_FOUND "Syslog Host not found" + +// settings.ino +#define D_SAVED_TO_FLASH_AT "Εγινε flash στην θέση" +#define D_LOADED_FROM_FLASH_AT "Φορτώθηκε από την flash στην θέση" +#define D_USE_DEFAULTS "Χρήση προεπιλογών" +#define D_ERASED_SECTOR "Διαγραμμένος τομέας" + +// webserver.ino +#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware - παρακαλώ αναβαθμήστε" +#define D_WEBSERVER_ACTIVE_ON "Web διακομιστής ενεργός" +#define D_WITH_IP_ADDRESS "με διεύθυνση IP" +#define D_WEBSERVER_STOPPED "Web διακομιστής σταμάτησε" +#define D_FILE_NOT_FOUND "Το αρχείο δεν βρέθηκε" +#define D_REDIRECTED "Ανακατεύθυνση σε captive portal" +#define D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION "Wifimanager set AccessPoint and keep Station" +#define D_WIFIMANAGER_SET_ACCESSPOINT "Wifimanager set AccessPoint" +#define D_TRYING_TO_CONNECT "Προσπάθεια σύνδεσης της συσκευής στο δίκτυο" + +#define D_RESTART_IN "Επανεκκίνηση σε" +#define D_SECONDS "δευτερόλεπτα" +#define D_DEVICE_WILL_RESTART "Η συσκευή θα ξεκινήσει ξανά σε λίγα δευτερόλεπτα" +#define D_BUTTON_TOGGLE "Εναλλαγή" +#define D_CONFIGURATION "Ρύθμιση" +#define D_INFORMATION "Πληροφορίες" +#define D_FIRMWARE_UPGRADE "Αναβάθμιση Firmware" +#define D_CONSOLE "Κονσόλα" +#define D_CONFIRM_RESTART "Επιβεβαίωση Επανεκκίνησης" + +#define D_CONFIGURE_MODULE "Ρύθμιση Module" +#define D_CONFIGURE_WIFI "Ρύθμιση WiFi" +#define D_CONFIGURE_MQTT "Ρύθμιση MQTT" +#define D_CONFIGURE_DOMOTICZ "Ρύθμιση Domoticz" +#define D_CONFIGURE_LOGGING "Ρύθμιση καταγραφής" +#define D_CONFIGURE_OTHER "Άλλες Ρυθμίσεις" +#define D_CONFIRM_RESET_CONFIGURATION "Confirm Reset Configuration" +#define D_RESET_CONFIGURATION "Επαναφορά Ρυθμίσεων" +#define D_BACKUP_CONFIGURATION "Αντίγραφα Ασφαλείας Ρυθμίσεων" +#define D_RESTORE_CONFIGURATION "Επαναφορά Ρυθμίσεων" +#define D_MAIN_MENU "Κεντρικό Μενού" + +#define D_MODULE_PARAMETERS "Παράμετροι Module" +#define D_MODULE_TYPE "Είδος Module" +#define D_GPIO "GPIO" +#define D_SERIAL_IN "Serial In" +#define D_SERIAL_OUT "Serial Out" + +#define D_WIFI_PARAMETERS "Παράμετροι Wifi" +#define D_SCAN_FOR_WIFI_NETWORKS "Σάρωση για δίκτυα wifi" +#define D_SCAN_DONE "Ολοκλήρωση σάρωσης" +#define D_NO_NETWORKS_FOUND "Δεν βρέθηκαν δίκτυα" +#define D_REFRESH_TO_SCAN_AGAIN "Ανανέωση για επανάληψη σάρωσης" +#define D_DUPLICATE_ACCESSPOINT "Duplicate AccessPoint" +#define D_SKIPPING_LOW_QUALITY "Παράλειψη λόγω χαμηλού σήματος" +#define D_RSSI "RSSI" +#define D_WEP "WEP" +#define D_WPA_PSK "WPA PSK" +#define D_WPA2_PSK "WPA2 PSK" +#define D_AP1_SSID "AP1 SSId" +#define D_AP1_PASSWORD "AP1 Κωδικός" +#define D_AP2_SSID "AP2 SSId" +#define D_AP2_PASSWORD "AP2 Κωδικός" + +#define D_MQTT_PARAMETERS "MQTT Παράμετροι" +#define D_CLIENT "Πελάτης" +#define D_FULL_TOPIC "Full Topic" + +#define D_LOGGING_PARAMETERS "Παράμετροι καταγραφής" +#define D_SERIAL_LOG_LEVEL "Επίπεδο καταγραφής Serial" +#define D_WEB_LOG_LEVEL "Επίπεδο καταγραφής Web" +#define D_SYS_LOG_LEVEL "Επίπεδο καταγραφής Syslog" +#define D_MORE_DEBUG "Επιπλέον debug" +#define D_SYSLOG_HOST "Υπολογιστής Syslog" +#define D_SYSLOG_PORT "Πόρτα Syslog" +#define D_TELEMETRY_PERIOD "Χρόνος τηλεμετρίας" + +#define D_OTHER_PARAMETERS "Άλλες Παράμετροι" +#define D_WEB_ADMIN_PASSWORD "Web Admin Κωδικός" +#define D_MQTT_ENABLE "MQTT Ενεργό" +#define D_FRIENDLY_NAME "Φιλικό Όνομα" +#define D_BELKIN_WEMO "Belkin WeMo" +#define D_HUE_BRIDGE "Hue Bridge" +#define D_SINGLE_DEVICE "μονή συσκευή" +#define D_MULTI_DEVICE "πολλαπλή συσκευή" + +#define D_SAVE_CONFIGURATION "Αποθήκευση Ρυθμίσεων" +#define D_CONFIGURATION_SAVED "Οι ρυθμίσεις αποθηκεύτηκαν" +#define D_CONFIGURATION_RESET "Επαναφορά ρυθμίσεων" + +#define D_PROGRAM_VERSION "Εκδοση προγράμματος" +#define D_BUILD_DATE_AND_TIME "Ημερομηνία και Ώρα Build" +#define D_CORE_AND_SDK_VERSION "Core/SDK Version" +#define D_FLASH_WRITE_COUNT "Μετρητής εγγραφών Flash" +#define D_MAC_ADDRESS "MAC Address" +#define D_MQTT_HOST "MQTT Host" +#define D_MQTT_PORT "MQTT Port" +#define D_MQTT_CLIENT "MQTT Client" +#define D_MQTT_USER "MQTT User" +#define D_MQTT_TOPIC "MQTT Topic" +#define D_MQTT_GROUP_TOPIC "MQTT Group Topic" +#define D_MQTT_FULL_TOPIC "MQTT Full Topic" +#define D_MDNS_DISCOVERY "mDNS Discovery" +#define D_MDNS_ADVERTISE "mDNS Advertise" +#define D_ESP_CHIP_ID "ESP Chip Id" +#define D_FLASH_CHIP_ID "Flash Chip Id" +#define D_FLASH_CHIP_SIZE "Μέγεθος Flash" +#define D_FREE_PROGRAM_SPACE "Ελεύθερος Χώρος Προγράμματος" + +#define D_UPGRADE_BY_WEBSERVER "αναβάθμιση από τον διακομιστή web" +#define D_OTA_URL "OTA Url" +#define D_START_UPGRADE "Εκκίνηση αναβάθμισης" +#define D_UPGRADE_BY_FILE_UPLOAD "Αναβάθμιση με ανέβασμα αρχείου" +#define D_UPLOAD_STARTED "Το ανέβασμα ξεκίνησε" +#define D_UPGRADE_STARTED "Η αναβάθμιση ξεκίνησε" +#define D_UPLOAD_DONE "Το ανέβασμα ολοκληρώθηκε" +#define D_UPLOAD_ERR_1 "Δεν έχει επιλεγεί αρχείο" +#define D_UPLOAD_ERR_2 "Δεν υπάρχει αρκετός χώρος" +#define D_UPLOAD_ERR_3 "Magic byte δεν είναι 0xE9" +#define D_UPLOAD_ERR_4 "Το μέγεθος του προγράμματος flash είναι μεγαλύτερο από το πραγματικό μέγεθος του flash" +#define D_UPLOAD_ERR_5 "Upload buffer miscompare" +#define D_UPLOAD_ERR_6 "Το ανέβασμα απέτυχε. Επιλέξτε επίπεδο καταγραφής 3" +#define D_UPLOAD_ERR_7 "Το ανεβάσμα διακόπηκε" +#define D_UPLOAD_ERR_8 "Μη έγκυρο αρχείο" +#define D_UPLOAD_ERR_9 "Το αρχείο είναι πολύ μεγάλο" +#define D_UPLOAD_ERROR_CODE "Κωδικός λάθους ανεβάσματος" + +#define D_ENTER_COMMAND "Εισαγωγή εντολής" +#define D_ENABLE_WEBLOG_FOR_RESPONSE "Ενεργοποιήστε το weblog 2 αν περιμένετε απάντηση" +#define D_NEED_USER_AND_PASSWORD "Χρειάζεστε user=<όνομα χρήστη>&password=<κωδικό χρήστη>" + +// xdrv_00_mqtt.ino +#define D_FINGERPRINT "Επαλήθευση TLS fingerprint..." +#define D_TLS_CONNECT_FAILED_TO "Αποτυχία TLS σύνδεσης" +#define D_RETRY_IN "Επανάληψη σε" +#define D_VERIFIED "Επαλήθευση με Fingerprint" +#define D_INSECURE "Μη ασφαλής σύνδεση λόγο ακατάλληλου Fingerprint" +#define D_CONNECT_FAILED_TO "Αποτυχία σύνδεσης στο" + +// xdrv_wemohue.ino +#define D_MULTICAST_DISABLED "Multicast απενεργοποιημένο" +#define D_MULTICAST_REJOINED "Multicast επανασύνδεση" +#define D_MULTICAST_JOIN_FAILED "Αποτυχία σύνδεσης Multicast" +#define D_FAILED_TO_SEND_RESPONSE "Αποτυχία αποστολής απάντησης" + +#define D_WEMO "WeMo" +#define D_WEMO_BASIC_EVENT "WeMo βασικό event" +#define D_WEMO_EVENT_SERVICE "WeMo υπηρεσία event" +#define D_WEMO_META_SERVICE "WeMo υπηρεσία meta" +#define D_WEMO_SETUP "WeMo ρυθμίσεις" +#define D_RESPONSE_SENT "Αποστολή απάντησης" + +#define D_HUE "Hue" +#define D_HUE_BRIDGE_SETUP "Hue ρυθμίσεις" +#define D_HUE_API_NOT_IMPLEMENTED "Hue API δεν έχει υλοποιηθεί" +#define D_HUE_API "Hue API" +#define D_HUE_POST_ARGS "Hue POST args" +#define D_3_RESPONSE_PACKETS_SENT "3πλο πακέτο απάντησεης στάλθηκε" + +// xdrv_05_domoticz.ino +#define D_DOMOTICZ_PARAMETERS "Domoticz παράμετροι" +#define D_DOMOTICZ_IDX "Idx" +#define D_DOMOTICZ_KEY_IDX "Key idx" +#define D_DOMOTICZ_SWITCH_IDX "Switch idx" +#define D_DOMOTICZ_SENSOR_IDX "Sensor idx" + #define D_DOMOTICZ_TEMP "Temp" + #define D_DOMOTICZ_TEMP_HUM "Temp,Hum" + #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro" + #define D_DOMOTICZ_POWER_ENERGY "Power,Energy" + #define D_DOMOTICZ_ILLUMINANCE "Illuminance" + #define D_DOMOTICZ_COUNT "Count/PM1" + #define D_DOMOTICZ_VOLTAGE "Voltage/PM2.5" + #define D_DOMOTICZ_CURRENT "Current/PM10" + #define D_DOMOTICZ_AIRQUALITY "Ποιότητα Αέρα" +#define D_DOMOTICZ_UPDATE_TIMER "Ενημέρωση" + +// xdrv_09_timers.ino +#define D_CONFIGURE_TIMER "Ρυθμίσεις Χρόνου" +#define D_TIMER_PARAMETERS "Χρονικοί παράμετροι" +#define D_TIMER_ARM "Arm" +#define D_TIMER_TIME "Ωρα" +#define D_TIMER_DAYS "Μέρες" +#define D_TIMER_REPEAT "Επανάληψη" +#define D_TIMER_OUTPUT "Αποτέλεσμα" +#define D_TIMER_ACTION "Εντολή" + +// xdrv_10_knx.ino +#define D_CONFIGURE_KNX "Ρυθμίσεις KNX" +#define D_KNX_PARAMETERS "KNX Παράμετροι" +#define D_KNX_GENERAL_CONFIG "Γενικά" +#define D_KNX_PHYSICAL_ADDRESS "Διεύθυνση Μνήμης" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Πρέπει να είναι μοναδική στο KNX δίκτυο )" +#define D_KNX_ENABLE "Ενεργοποιημένο KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Αποστολή δεδομένων σε Ομάδα Διευθύνσεων" +#define D_ADD "Προσθήκη" +#define D_DELETE "Διαγραφή" +#define D_REPLY "Επανάληψη" +#define D_KNX_GROUP_ADDRESS_TO_READ "Ομάδα Διευθύνσεων που θα λάβει τα Δεδομένα" +#define D_LOG_KNX "KNX: " +#define D_RECEIVED_FROM "Στάλθηκε από" +#define D_KNX_COMMAND_WRITE "Εγγραφή" +#define D_KNX_COMMAND_READ "Ανάγνωση" +#define D_KNX_COMMAND_OTHER "Αλλο" +#define D_SENT_TO "αποστολή σε" +#define D_KNX_WARNING "Η Ομάδα Διευθύνσεων ( 0 / 0 / 0 ) είναι δεσμευμένη και δεν μπορεί να χρησιμοποιηθεί." + +// xdrv_03_energy.ino +#define D_ENERGY_TODAY "Energy Σήμερα" +#define D_ENERGY_YESTERDAY "Energy Χτες" +#define D_ENERGY_TOTAL "Energy Συνολικά" + +// xsns_05_ds18b20.ino +#define D_SENSOR_BUSY "Απασχολημένος Σένσορας" +#define D_SENSOR_CRC_ERROR "CRC λάθος σένσορα" +#define D_SENSORS_FOUND "Βρέθηκε σένσορας" + +// xsns_06_dht.ino +#define D_TIMEOUT_WAITING_FOR "Timeout περιμένετε για" +#define D_START_SIGNAL_LOW "εκκίνηση με χαμηλό σήμα" +#define D_START_SIGNAL_HIGH "εκκίνηση με υψηλό σήμα" +#define D_PULSE "παλμός" +#define D_CHECKSUM_FAILURE "Αποτυχία Checksum" + +// xsns_07_sht1x.ino +#define D_SENSOR_DID_NOT_ACK_COMMAND "Ο σένσορας δεν έλαβε την εντολή ACK" +#define D_SHT1X_FOUND "Βρέθηκε SHT1X" + +// xsns_18_pms5003.ino +#define D_STANDARD_CONCENTRATION "CF-1 PM" // Standard Particle CF-1 Particle Matter +#define D_ENVIRONMENTAL_CONCENTRATION "PM" // Environmetal Particle Matter +#define D_PARTICALS_BEYOND "Particals" + +// sonoff_template.h +#define D_SENSOR_NONE "Κανένας" +#define D_SENSOR_DHT11 "DHT11" +#define D_SENSOR_AM2301 "AM2301" +#define D_SENSOR_SI7021 "SI7021" +#define D_SENSOR_DS18X20 "DS18x20" +#define D_SENSOR_I2C_SCL "I2C SCL" +#define D_SENSOR_I2C_SDA "I2C SDA" +#define D_SENSOR_WS2812 "WS2812" +#define D_SENSOR_IRSEND "IRsend" +#define D_SENSOR_SWITCH "Διακόπτης" // Suffix "1" +#define D_SENSOR_BUTTON "Κουμπί" // Suffix "1" +#define D_SENSOR_RELAY "Ρελέ" // Suffix "1i" +#define D_SENSOR_LED "Led" // Suffix "1i" +#define D_SENSOR_PWM "PWM" // Suffix "1" +#define D_SENSOR_COUNTER "Μετρητής" // Suffix "1" +#define D_SENSOR_IRRECV "IRrecv" +#define D_SENSOR_MHZ_RX "MHZ Rx" +#define D_SENSOR_MHZ_TX "MHZ Tx" +#define D_SENSOR_PZEM_RX "PZEM Rx" +#define D_SENSOR_PZEM_TX "PZEM Tx" +#define D_SENSOR_SAIR_RX "SAir Rx" +#define D_SENSOR_SAIR_TX "SAir Tx" +#define D_SENSOR_SPI_CS "SPI CS" +#define D_SENSOR_SPI_DC "SPI DC" +#define D_SENSOR_BACKLIGHT "BkLight" +#define D_SENSOR_PMS5003 "PMS5003" +#define D_SENSOR_SDS0X1 "SDS0X1" +#define D_SENSOR_SBR_RX "SerBr Rx" +#define D_SENSOR_SBR_TX "SerBr Tx" + +// Units +#define D_UNIT_AMPERE "A" +#define D_UNIT_HOUR "Hr" +#define D_UNIT_KILOOHM "kOhm" +#define D_UNIT_KILOWATTHOUR "kWh" +#define D_UNIT_LUX "lx" +#define D_UNIT_MICROGRAM_PER_CUBIC_METER "ug/m3" +#define D_UNIT_MICROMETER "um" +#define D_UNIT_MICROSECOND "us" +#define D_UNIT_MILLIAMPERE "mA" +#define D_UNIT_MILLISECOND "ms" +#define D_UNIT_MINUTE "Min" +#define D_UNIT_PARTS_PER_BILLION "ppb" +#define D_UNIT_PARTS_PER_DECILITER "ppd" +#define D_UNIT_PARTS_PER_MILLION "ppm" +#define D_UNIT_PRESSURE "hPa" +#define D_UNIT_SECOND "sec" +#define D_UNIT_SECTORS "sectors" +#define D_UNIT_VOLT "V" +#define D_UNIT_WATT "W" +#define D_UNIT_WATTHOUR "Wh" + +// Log message prefix +#define D_LOG_APPLICATION "APP: " // Application +#define D_LOG_BRIDGE "BRG: " // Bridge +#define D_LOG_CONFIG "CFG: " // Settings +#define D_LOG_COMMAND "CMD: " // Command +#define D_LOG_DEBUG "DBG: " // Debug +#define D_LOG_DHT "DHT: " // DHT sensor +#define D_LOG_DOMOTICZ "DOM: " // Domoticz +#define D_LOG_DSB "DSB: " // DS18xB20 sensor +#define D_LOG_HTTP "HTP: " // HTTP webserver +#define D_LOG_I2C "I2C: " // I2C +#define D_LOG_IRR "IRR: " // Infra Red Received +#define D_LOG_LOG "LOG: " // Logging +#define D_LOG_MODULE "MOD: " // Module +#define D_LOG_MDNS "DNS: " // mDNS +#define D_LOG_MQTT "MQT: " // MQTT +#define D_LOG_OTHER "OTH: " // Other +#define D_LOG_RESULT "RSL: " // Result +#define D_LOG_RFR "RFR: " // RF Received +#define D_LOG_SERIAL "SER: " // Serial +#define D_LOG_SHT1 "SHT: " // SHT1x sensor +#define D_LOG_UPLOAD "UPL: " // Upload +#define D_LOG_UPNP "UPP: " // UPnP +#define D_LOG_WIFI "WIF: " // Wifi + +#endif // _LANGUAGE_EN_GB_H_ diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 884ba8376..402454462 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -167,6 +167,7 @@ // If non selected the default en-GB will be used //#define MY_LANGUAGE cs-CZ // Czech in Czech //#define MY_LANGUAGE de-DE // German in Germany +//#define MY_LANGUAGE el-GR // Greek in Greece //#define MY_LANGUAGE en-GB // English in Great Britain. Enabled by Default //#define MY_LANGUAGE es-AR // Spanish in Argentina //#define MY_LANGUAGE fr-FR // French in France From 76f699bf0255f4c0d8dc797a89e84a9dd0ecc95f Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 19 Apr 2018 22:29:09 +0200 Subject: [PATCH 090/136] Remove debug code and do some clean-up Remove debug code and set H801 GPIO0 to GPIO_USER (#1503) --- sonoff/i18n.h | 1 - sonoff/settings.ino | 86 ---------------------------------------- sonoff/sonoff.ino | 18 +-------- sonoff/sonoff_post.h | 5 ++- sonoff/sonoff_template.h | 2 +- 5 files changed, 6 insertions(+), 106 deletions(-) diff --git a/sonoff/i18n.h b/sonoff/i18n.h index 595f8c30f..2820ae0de 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -222,7 +222,6 @@ #define D_CMND_ALTITUDE "Altitude" #define D_CMND_LEDPOWER "LedPower" #define D_CMND_LEDSTATE "LedState" -#define D_CMND_CFGDUMP "CfgDump" #define D_CMND_I2CSCAN "I2CScan" #define D_CMND_SERIALSEND "SerialSend" #define D_CMND_SERIALDELIMITER "SerialDelimiter" diff --git a/sonoff/settings.ino b/sonoff/settings.ino index 9419548c8..579862457 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -119,41 +119,6 @@ boolean RtcSettingsValid() return (RTC_MEM_VALID == RtcSettings.valid); } -#ifdef DEBUG_THEO -void RtcSettingsDump() -{ - #define CFG_COLS 16 - - uint16_t idx; - uint16_t maxrow; - uint16_t row; - uint16_t col; - - uint8_t *buffer = (uint8_t *) &RtcSettings; - maxrow = ((sizeof(RTCMEM)+CFG_COLS)/CFG_COLS); - - for (row = 0; row < maxrow; row++) { - idx = row * CFG_COLS; - snprintf_P(log_data, sizeof(log_data), PSTR("%03X:"), idx); - for (col = 0; col < CFG_COLS; col++) { - if (!(col%4)) { - snprintf_P(log_data, sizeof(log_data), PSTR("%s "), log_data); - } - snprintf_P(log_data, sizeof(log_data), PSTR("%s %02X"), log_data, buffer[idx + col]); - } - snprintf_P(log_data, sizeof(log_data), PSTR("%s |"), log_data); - for (col = 0; col < CFG_COLS; col++) { -// if (!(col%4)) { -// snprintf_P(log_data, sizeof(log_data), PSTR("%s "), log_data); -// } - snprintf_P(log_data, sizeof(log_data), PSTR("%s%c"), log_data, ((buffer[idx + col] > 0x20) && (buffer[idx + col] < 0x7F)) ? (char)buffer[idx + col] : ' '); - } - snprintf_P(log_data, sizeof(log_data), PSTR("%s|"), log_data); - AddLog(LOG_LEVEL_INFO); - } -} -#endif // DEBUG_THEO - /*********************************************************************************************\ * Config - Flash \*********************************************************************************************/ @@ -374,57 +339,6 @@ void SettingsSdkErase() delay(1000); } -void SettingsDump(char* parms) -{ - #define CFG_COLS 16 - - uint16_t idx; - uint16_t maxrow; - uint16_t row; - uint16_t col; - char *p; - - uint8_t *buffer = (uint8_t *) &Settings; - maxrow = ((sizeof(SYSCFG)+CFG_COLS)/CFG_COLS); - - uint16_t srow = strtol(parms, &p, 16) / CFG_COLS; - uint16_t mrow = strtol(p, &p, 10); - -// snprintf_P(log_data, sizeof(log_data), PSTR("Cnfg: Parms %s, Start row %d, rows %d"), parms, srow, mrow); -// AddLog(LOG_LEVEL_DEBUG); - - if (0 == mrow) { // Default only 8 lines - mrow = 8; - } - if (srow > maxrow) { - srow = maxrow - mrow; - } - if (mrow < (maxrow - srow)) { - maxrow = srow + mrow; - } - - for (row = srow; row < maxrow; row++) { - idx = row * CFG_COLS; - snprintf_P(log_data, sizeof(log_data), PSTR("%03X:"), idx); - for (col = 0; col < CFG_COLS; col++) { - if (!(col%4)) { - snprintf_P(log_data, sizeof(log_data), PSTR("%s "), log_data); - } - snprintf_P(log_data, sizeof(log_data), PSTR("%s %02X"), log_data, buffer[idx + col]); - } - snprintf_P(log_data, sizeof(log_data), PSTR("%s |"), log_data); - for (col = 0; col < CFG_COLS; col++) { -// if (!(col%4)) { -// snprintf_P(log_data, sizeof(log_data), PSTR("%s "), log_data); -// } - snprintf_P(log_data, sizeof(log_data), PSTR("%s%c"), log_data, ((buffer[idx + col] > 0x20) && (buffer[idx + col] < 0x7F)) ? (char)buffer[idx + col] : ' '); - } - snprintf_P(log_data, sizeof(log_data), PSTR("%s|"), log_data); - AddLog(LOG_LEVEL_INFO); - delay(1); - } -} - /********************************************************************************************/ void SettingsDefault() diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index f937cc517..df9997cfd 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -84,7 +84,7 @@ enum TasmotaCommands { CMND_LOGHOST, CMND_LOGPORT, CMND_IPADDRESS, CMND_NTPSERVER, CMND_AP, CMND_SSID, CMND_PASSWORD, CMND_HOSTNAME, CMND_WIFICONFIG, CMND_FRIENDLYNAME, CMND_SWITCHMODE, CMND_WEBSERVER, CMND_WEBPASSWORD, CMND_WEBLOG, CMND_EMULATION, CMND_TELEPERIOD, CMND_RESTART, CMND_RESET, CMND_TIMEZONE, CMND_ALTITUDE, CMND_LEDPOWER, CMND_LEDSTATE, - CMND_CFGDUMP, CMND_I2CSCAN, CMND_SERIALSEND, CMND_BAUDRATE, CMND_SERIALDELIMITER, CMND_EXCEPTION }; + CMND_I2CSCAN, CMND_SERIALSEND, CMND_BAUDRATE, CMND_SERIALDELIMITER }; const char kTasmotaCommands[] PROGMEM = D_CMND_BACKLOG "|" D_CMND_DELAY "|" D_CMND_POWER "|" D_CMND_STATUS "|" D_CMND_STATE "|" D_CMND_POWERONSTATE "|" D_CMND_PULSETIME "|" D_CMND_BLINKTIME "|" D_CMND_BLINKCOUNT "|" D_CMND_SENSOR "|" D_CMND_SAVEDATA "|" D_CMND_SETOPTION "|" D_CMND_TEMPERATURE_RESOLUTION "|" D_CMND_HUMIDITY_RESOLUTION "|" @@ -94,11 +94,7 @@ const char kTasmotaCommands[] PROGMEM = D_CMND_LOGHOST "|" D_CMND_LOGPORT "|" D_CMND_IPADDRESS "|" D_CMND_NTPSERVER "|" D_CMND_AP "|" D_CMND_SSID "|" D_CMND_PASSWORD "|" D_CMND_HOSTNAME "|" D_CMND_WIFICONFIG "|" D_CMND_FRIENDLYNAME "|" D_CMND_SWITCHMODE "|" D_CMND_WEBSERVER "|" D_CMND_WEBPASSWORD "|" D_CMND_WEBLOG "|" D_CMND_EMULATION "|" D_CMND_TELEPERIOD "|" D_CMND_RESTART "|" D_CMND_RESET "|" D_CMND_TIMEZONE "|" D_CMND_ALTITUDE "|" D_CMND_LEDPOWER "|" D_CMND_LEDSTATE "|" - D_CMND_CFGDUMP "|" D_CMND_I2CSCAN "|" D_CMND_SERIALSEND "|" D_CMND_BAUDRATE "|" D_CMND_SERIALDELIMITER -#ifdef DEBUG_THEO - "|" D_CMND_EXCEPTION -#endif - ; + D_CMND_I2CSCAN "|" D_CMND_SERIALSEND "|" D_CMND_BAUDRATE "|" D_CMND_SERIALDELIMITER; const char kOptionOff[] PROGMEM = "OFF|" D_OFF "|" D_FALSE "|" D_STOP "|" D_CELSIUS ; const char kOptionOn[] PROGMEM = "ON|" D_ON "|" D_TRUE "|" D_START "|" D_FAHRENHEIT "|" D_USER ; @@ -1068,10 +1064,6 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, Settings.ledstate); } - else if (CMND_CFGDUMP == command_code) { - SettingsDump(dataBuf); - snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, D_JSON_DONE); - } #ifdef USE_I2C else if ((CMND_I2CSCAN == command_code) && i2c_flg) { I2cScan(mqtt_data, sizeof(mqtt_data)); @@ -1080,12 +1072,6 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) else if (XdrvCommand(grpflg, type, index, dataBuf, data_len, payload, payload16)) { // Serviced } -#ifdef DEBUG_THEO - else if (CMND_EXCEPTION == command_code) { - if (data_len > 0) ExceptionTest(payload); - snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, D_JSON_DONE); - } -#endif // DEBUG_THEO else { type = NULL; } diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h index d488f4ea4..47a752c72 100644 --- a/sonoff/sonoff_post.h +++ b/sonoff/sonoff_post.h @@ -86,8 +86,6 @@ void KNX_CB_Action(message_t const &msg, void *arg); #define USE_DS18B20 // Default DS18B20 sensor needs no external library #endif -//#define DEBUG_THEO // Add debug code - #ifdef BE_MINIMAL // ========================== Configure sonoff-minimal.bin ===================== #ifdef USE_MQTT_TLS #undef USE_MQTT_TLS // Disable TLS support won't work as the MQTTHost is not set @@ -113,6 +111,9 @@ void KNX_CB_Action(message_t const &msg, void *arg); #ifdef USE_SUNRISE #undef USE_SUNRISE // Disable support for Sunrise and sunset tools #endif +#ifdef USE_KNX +#undef USE_KNX // Disable KNX IP Protocol Support +#endif #ifdef USE_PZEM004T #undef USE_PZEM004T // Disable PZEM004T energy sensor #endif diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h index cbb197abb..b7ceb6c24 100644 --- a/sonoff/sonoff_template.h +++ b/sonoff/sonoff_template.h @@ -494,7 +494,7 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_ADC0 // ADC0 A0 Analog input }, { "H801", // Lixada H801 Wifi (ESP8266) - GPIO_KEY1, // GPIO00 E-FW Button + GPIO_USER, // GPIO00 E-FW Button GPIO_LED1, // GPIO01 Green LED GPIO_TXD, // GPIO02 RX - Pin next to TX on the PCB GPIO_RXD, // GPIO03 TX - Pin next to GND on the PCB From 67a8f0fc60555f52fa0b8647eae51f5548ae460c Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 20 Apr 2018 10:40:58 +0200 Subject: [PATCH 091/136] Update Cz and Fr language files --- sonoff/language/cs-CZ.h | 46 ++++++++++++++++++++--------------------- sonoff/language/fr-FR.h | 10 ++++----- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h index e5ad4bee3..c7c975297 100644 --- a/sonoff/language/cs-CZ.h +++ b/sonoff/language/cs-CZ.h @@ -1,7 +1,7 @@ /* cs-CZ.h - localization for Czech with diacritics - Czech for Sonoff-Tasmota - Copyright (C) 2018 Theo Arends (translated by vs) + Copyright (C) 2018 Vladimír Synekl This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * - * Updated until v5.12.0k + * Updated until v5.12.0m \*********************************************************************/ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) @@ -57,7 +57,7 @@ #define D_AUTO "AUTO" #define D_BLINK "Blikání" #define D_BLINKOFF "BlikáníVyp" -#define D_BOOT_COUNT "Počitadlo spuštění" +#define D_BOOT_COUNT "Počítadlo spuštění" #define D_BRIGHTLIGHT "Světlý" #define D_BUTTON "Tlačítko" #define D_BY "by" // Written by me @@ -69,7 +69,7 @@ #define D_COMMAND "Příkaz" #define D_CONNECTED "...připojeno" #define D_COUNT "Počítej" -#define D_COUNTER "Počitadlo" +#define D_COUNTER "Počítadlo" #define D_CURRENT "Proud" // As in Voltage and Current #define D_DATA "Data" #define D_DARKLIGHT "Tmavý" @@ -116,7 +116,7 @@ #define D_ONLINE "Aktivní" #define D_PASSWORD "Heslo" #define D_PORT "Port" -#define D_POWER_FACTOR "Součinitel příkonu" +#define D_POWER_FACTOR "Účiník" #define D_POWERUSAGE "Příkon" #define D_PRESSURE "Tlak" #define D_PRESSUREATSEALEVEL "Tlak na úrovni hladiny moře" @@ -375,24 +375,24 @@ #define D_TIMER_ACTION "Napájení" // xdrv_10_knx.ino -#define D_CONFIGURE_KNX "Configure KNX" -#define D_KNX_PARAMETERS "KNX Parameters" -#define D_KNX_GENERAL_CONFIG "General" -#define D_KNX_PHYSICAL_ADDRESS "Physical Address" -#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" -#define D_KNX_ENABLE "Enable KNX" -#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" -#define D_ADD "Add" -#define D_DELETE "Delete" -#define D_REPLY "Reply" -#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_CONFIGURE_KNX "Nastavení KNX" +#define D_KNX_PARAMETERS "KNX parametry" +#define D_KNX_GENERAL_CONFIG "Obecné" +#define D_KNX_PHYSICAL_ADDRESS "Fyzická adresa" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Musí být jedinečná v síti KNX )" +#define D_KNX_ENABLE "Povol KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data k odeslání na skupinové adresy" +#define D_ADD "Přidej" +#define D_DELETE "Smaž" +#define D_REPLY "Odpověď" +#define D_KNX_GROUP_ADDRESS_TO_READ "Skupinové adresy pro příjem dat z" #define D_LOG_KNX "KNX: " -#define D_RECEIVED_FROM "Received from" -#define D_KNX_COMMAND_WRITE "Write" -#define D_KNX_COMMAND_READ "Read" -#define D_KNX_COMMAND_OTHER "Other" -#define D_SENT_TO "sent to" -#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." +#define D_RECEIVED_FROM "Přijato z" +#define D_KNX_COMMAND_WRITE "Zapiš" +#define D_KNX_COMMAND_READ "Čti" +#define D_KNX_COMMAND_OTHER "Jiné" +#define D_SENT_TO "pošli" +#define D_KNX_WARNING "Skupinová adresa ( 0 / 0 / 0 ) je rezervována a nemůže být použita." // xdrv_03_energy.ino #define D_ENERGY_TODAY "Spotřeba Dnes" @@ -435,7 +435,7 @@ #define D_SENSOR_RELAY "Relé" // Suffix "1i" #define D_SENSOR_LED "Led" // Suffix "1i" #define D_SENSOR_PWM "PWM" // Suffix "1", -#define D_SENSOR_COUNTER "Počitadlo" // Suffix "1" +#define D_SENSOR_COUNTER "Počítadlo" // Suffix "1" #define D_SENSOR_IRRECV "IRrecv" #define D_SENSOR_MHZ_RX "MHZ Rx" #define D_SENSOR_MHZ_TX "MHZ Tx" diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h index 4cd410a9e..db3506ef1 100644 --- a/sonoff/language/fr-FR.h +++ b/sonoff/language/fr-FR.h @@ -149,7 +149,7 @@ #define D_TRUE "Vrai" #define D_TVOC "TVOC" #define D_UPGRADE "la mise à jour" // "Lancer la mise à jour" -#define D_UPLOAD "Upload" // Not better in french +#define D_UPLOAD "Upload" // Not better in french #define D_UPTIME "Durée d'activité" #define D_USER "Utilisateur" #define D_UTC_TIME "UTC" @@ -309,14 +309,14 @@ #define D_UPLOAD_ERR_3 "L'octet magique n'est pas 0xE9" #define D_UPLOAD_ERR_4 "La taille du programme à flasher est plus grande que la taille réelle de la mémoire flash" #define D_UPLOAD_ERR_5 "Erreur de comparaison du buffer de téléchargement" -#define D_UPLOAD_ERR_6 "Téléchargement échoué. Activation logging 3" +#define D_UPLOAD_ERR_6 "Téléchargement échoué. Activer Weblog 3" #define D_UPLOAD_ERR_7 "Téléchargement annulé" #define D_UPLOAD_ERR_8 "Fichier invalide" #define D_UPLOAD_ERR_9 "Fichier trop grand" #define D_UPLOAD_ERROR_CODE "Code d'erreur téléchargement" #define D_ENTER_COMMAND "Saisir une commande" -#define D_ENABLE_WEBLOG_FOR_RESPONSE "Activer weblog 2 si response attendue" +#define D_ENABLE_WEBLOG_FOR_RESPONSE "Activer Weblog 2 si une réponse est attendue" #define D_NEED_USER_AND_PASSWORD "Nécessite utilisateur=&password=" // xdrv_00_mqtt.ino @@ -345,7 +345,7 @@ #define D_HUE_API_NOT_IMPLEMENTED "API Hue non implémentée" #define D_HUE_API "Hue API" #define D_HUE_POST_ARGS "Hue POST args" -#define D_3_RESPONSE_PACKETS_SENT "3 paquets Response envoyés" +#define D_3_RESPONSE_PACKETS_SENT "3 paquets de réponse envoyés" // xdrv_05_domoticz.ino #define D_DOMOTICZ_PARAMETERS "Paramètres Domoticz" @@ -381,7 +381,7 @@ #define D_KNX_PHYSICAL_ADDRESS "Adresse individuelle" // Backbone/Line/Device -> Zone/Ligne/Participant #define D_KNX_PHYSICAL_ADDRESS_NOTE "(Doit être unique sur le réseau KNX)" #define D_KNX_ENABLE "Activer KNX" -#define D_KNX_GROUP_ADDRESS_TO_WRITE "Données à envoyer à les Adresses de Groupe" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Données à envoyer aux Adresses de Groupe" #define D_ADD "Ajoûter" #define D_DELETE "Supprimer" #define D_REPLY "Répondre" From 24b82c78e8637afedc15ac95824dc53865081a9d Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 20 Apr 2018 11:28:26 +0200 Subject: [PATCH 092/136] Fix Web timer Hour reset (#2461) Fix Web timer Hour reset (#2461) --- sonoff/xdrv_09_timers.ino | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino index 65dfd0136..82884ab4e 100644 --- a/sonoff/xdrv_09_timers.ino +++ b/sonoff/xdrv_09_timers.ino @@ -491,17 +491,17 @@ const char HTTP_TIMER_SCRIPT[] PROGMEM = "m=qs('input[name=\"rd\"]:checked').value;" // Get mode "p=pt[ct]&0x7FF;" // Get time "if(m==0){" // Time is set + "so(0);" // Hide offset span and allow Hour 00..23 "q=Math.floor(p/60);if(q<10){q='0'+q;}qs('#ho').value=q;" // Set hours "q=p%60;if(q<10){q='0'+q;}qs('#mi').value=q;" // Set minutes - "so(0);" // Schedule time, hide offset span "}" "if((m==1)||(m==2)){" // Sunrise or sunset is set + "so(1);" // Show offset span and allow Hour 00..11 "q=Math.floor(p/60);" // Parse hours "if(q>=12){q-=12;qs('#dr').selectedIndex=1;}" // Negative offset "else{qs('#dr').selectedIndex=0;}" "if(q<10){q='0'+q;}qs('#ho').value=q;" // Set offset hours "q=p%60;if(q<10){q='0'+q;}qs('#mi').value=q;" // Set offset minutes - "so(1);" // Show offset span "}" "}" "function so(b){" // Hide or show offset items @@ -536,7 +536,7 @@ const char HTTP_TIMER_SCRIPT[] PROGMEM = "s|=l&0x7FF;" // Save offset instead of time "}" #endif - "s|=((qs('#mw').selectedIndex)&0x0F)<<11;" // Get window minutes + "s|=((qs('#mw').selectedIndex)&0x0F)<<11;" // Get window minutes "pt[ct]=s;" "eb('t0').value=pt.join();" // Save parameters from array to hidden area "}" @@ -568,7 +568,7 @@ const char HTTP_TIMER_SCRIPT[] PROGMEM = "pt=eb('t0').value.split(',').map(Number);" // Get parameters from hidden area to array "s='';for(i=0;i<" STR(MAX_TIMERS) ";i++){b='';if(0==i){b=\" id='dP'\";}s+=\"\"}" "eb('bt').innerHTML=s;" // Create tabs -#ifdef USE_SUNRISE // NEW: Create offset options (+/- up to 11h, 59m) +#ifdef USE_SUNRISE "o=qs('#dr');ce('+',o);ce('-',o);" // Create offset direction select options #endif "o=qs('#ho');for(i=0;i<=23;i++){ce((i<10)?('0'+i):i,o);}" // Create hours select options From 2743c35462f87501985fde8608ec830de2cf9821 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 20 Apr 2018 14:31:09 +0200 Subject: [PATCH 093/136] Add support for HC-SR04 5.12.0m * Add support for sensor HC-SR04 ultrasonic (#113, #1964, #2444) --- sonoff/_releasenotes.ino | 3 +- sonoff/i18n.h | 1 + sonoff/language/cs-CZ.h | 4 + sonoff/language/de-DE.h | 4 + sonoff/language/el-GR.h | 4 + sonoff/language/en-GB.h | 4 + sonoff/language/es-AR.h | 4 + sonoff/language/fr-FR.h | 4 + sonoff/language/hu-HU.h | 4 + sonoff/language/it-IT.h | 4 + sonoff/language/nl-NL.h | 4 + sonoff/language/pl-PL.h | 4 + sonoff/language/pt-PT.h | 4 + sonoff/language/ru-RU.h | 4 + sonoff/language/zh-CN.h | 4 + sonoff/language/zh-TW.h | 4 + sonoff/sonoff_template.h | 5 +- sonoff/user_config.h | 2 + sonoff/webserver.ino | 191 +++++++++++---------------------------- sonoff/xsns_22_sr04.ino | 173 +++++++++++++++++++++++++++++++++++ 20 files changed, 289 insertions(+), 142 deletions(-) create mode 100644 sonoff/xsns_22_sr04.ino diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index c9cd7fef3..b2145b6bf 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -3,7 +3,8 @@ * Add random window to timers (#2447) * Add optional KNX IP Protocol Support (#2402) * Add Greek language file (#2491) - * Fix compile error when using ESP/Arduino library v2.3.0 by reverting KNX async UDP library to default UDP library (#2488,#2492,#2493) + * Add support for sensor HC-SR04 ultrasonic (#113, #1964, #2444) + * Fix compile error when using ESP/Arduino library v2.3.0 by reverting KNX async UDP library to default UDP library (#2488, #2492, #2493) * Fix configuration filename truncation when it contains spaces (#2484, #2490) * * 5.12.0l diff --git a/sonoff/i18n.h b/sonoff/i18n.h index 2820ae0de..fc6a43db4 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -46,6 +46,7 @@ #define D_JSON_COUNTER "Counter" #define D_JSON_CURRENT "Current" // As in Voltage and Current #define D_JSON_DATA "Data" +#define D_JSON_DISTANCE "Distance" #define D_JSON_DNSSERVER "DNSServer" #define D_JSON_DONE "Done" #define D_JSON_ECO2 "eCO2" diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h index c7c975297..fa641216d 100644 --- a/sonoff/language/cs-CZ.h +++ b/sonoff/language/cs-CZ.h @@ -75,6 +75,7 @@ #define D_DARKLIGHT "Tmavý" #define D_DEBUG "Debug" #define D_DISABLED "Zablokováno" +#define D_DISTANCE "Distance" #define D_DNS_SERVER "Server DNS" #define D_DONE "Provedeno" #define D_DST_TIME "DST" @@ -450,9 +451,12 @@ #define D_SENSOR_SDS0X1 "SDS0X1" #define D_SENSOR_SBR_RX "SerBr Rx" #define D_SENSOR_SBR_TX "SerBr Tx" +#define D_SENSOR_SR04_TRIG "SR04 Tri" +#define D_SENSOR_SR04_ECHO "SR04 Ech" // Units #define D_UNIT_AMPERE "A" +#define D_UNIT_CENTIMETER "cm" #define D_UNIT_HOUR "hod" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index 2617e8e1b..b2ade5e2b 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -75,6 +75,7 @@ #define D_DARKLIGHT "dunkel" #define D_DEBUG "debug" #define D_DISABLED "deaktiviert" +#define D_DISTANCE "Abstand" #define D_DNS_SERVER "DNS-Server" #define D_DONE "erledigt" #define D_DST_TIME "DST" @@ -450,9 +451,12 @@ #define D_SENSOR_SDS0X1 "SDS0X1" #define D_SENSOR_SBR_RX "SerBr Rx" #define D_SENSOR_SBR_TX "SerBr Tx" +#define D_SENSOR_SR04_TRIG "SR04 Tri" +#define D_SENSOR_SR04_ECHO "SR04 Ech" // Units #define D_UNIT_AMPERE "A" +#define D_UNIT_CENTIMETER "cm" #define D_UNIT_HOUR "h" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/el-GR.h b/sonoff/language/el-GR.h index 12e5542ce..7eff7094a 100644 --- a/sonoff/language/el-GR.h +++ b/sonoff/language/el-GR.h @@ -75,6 +75,7 @@ #define D_DARKLIGHT "Σκούρο" #define D_DEBUG "Debug" #define D_DISABLED "Απενεργοποιημένο" +#define D_DISTANCE "Distance" #define D_DNS_SERVER "Διακομιστής DNS" #define D_DONE "Εγινε" #define D_DST_TIME "DST" @@ -450,9 +451,12 @@ #define D_SENSOR_SDS0X1 "SDS0X1" #define D_SENSOR_SBR_RX "SerBr Rx" #define D_SENSOR_SBR_TX "SerBr Tx" +#define D_SENSOR_SR04_TRIG "SR04 Tri" +#define D_SENSOR_SR04_ECHO "SR04 Ech" // Units #define D_UNIT_AMPERE "A" +#define D_UNIT_CENTIMETER "cm" #define D_UNIT_HOUR "Hr" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h index 7c7c9568f..a57d18fd9 100644 --- a/sonoff/language/en-GB.h +++ b/sonoff/language/en-GB.h @@ -75,6 +75,7 @@ #define D_DARKLIGHT "Dark" #define D_DEBUG "Debug" #define D_DISABLED "Disabled" +#define D_DISTANCE "Distance" #define D_DNS_SERVER "DNS Server" #define D_DONE "Done" #define D_DST_TIME "DST" @@ -450,9 +451,12 @@ #define D_SENSOR_SDS0X1 "SDS0X1" #define D_SENSOR_SBR_RX "SerBr Rx" #define D_SENSOR_SBR_TX "SerBr Tx" +#define D_SENSOR_SR04_TRIG "SR04 Tri" +#define D_SENSOR_SR04_ECHO "SR04 Ech" // Units #define D_UNIT_AMPERE "A" +#define D_UNIT_CENTIMETER "cm" #define D_UNIT_HOUR "Hr" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index 736e7849d..899a6057a 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -75,6 +75,7 @@ #define D_DARKLIGHT "Oscura" #define D_DEBUG "Debug" #define D_DISABLED "Deshabilitado" +#define D_DISTANCE "Distance" #define D_DNS_SERVER "DNS Server" #define D_DONE "Listo" #define D_DST_TIME "DST" @@ -450,9 +451,12 @@ #define D_SENSOR_SDS0X1 "SDS0X1" #define D_SENSOR_SBR_RX "SerBr Rx" #define D_SENSOR_SBR_TX "SerBr Tx" +#define D_SENSOR_SR04_TRIG "SR04 Tri" +#define D_SENSOR_SR04_ECHO "SR04 Ech" // Units #define D_UNIT_AMPERE "A" +#define D_UNIT_CENTIMETER "cm" #define D_UNIT_HOUR "Hr" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h index db3506ef1..a9211dab1 100644 --- a/sonoff/language/fr-FR.h +++ b/sonoff/language/fr-FR.h @@ -75,6 +75,7 @@ #define D_DARKLIGHT "Sombre" #define D_DEBUG "Debug" #define D_DISABLED "Désactivé" +#define D_DISTANCE "Distance" #define D_DNS_SERVER "Serveur DNS" #define D_DONE "Fait" #define D_DST_TIME "DST" @@ -450,9 +451,12 @@ #define D_SENSOR_SDS0X1 "SDS0X1" #define D_SENSOR_SBR_RX "SerBr Rx" #define D_SENSOR_SBR_TX "SerBr Tx" +#define D_SENSOR_SR04_TRIG "SR04 Tri" +#define D_SENSOR_SR04_ECHO "SR04 Ech" // Units #define D_UNIT_AMPERE "A" +#define D_UNIT_CENTIMETER "cm" #define D_UNIT_HOUR "h" #define D_UNIT_KILOOHM "kΩ" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h index 80c568688..51d9e146f 100644 --- a/sonoff/language/hu-HU.h +++ b/sonoff/language/hu-HU.h @@ -75,6 +75,7 @@ #define D_DARKLIGHT "Min. fényerő" #define D_DEBUG "Debug" #define D_DISABLED "Letiltva" +#define D_DISTANCE "Distance" #define D_DNS_SERVER "DNS Szerver" #define D_DONE "Kész" #define D_DST_TIME "DST" @@ -450,9 +451,12 @@ #define D_SENSOR_SDS0X1 "SDS0X1" #define D_SENSOR_SBR_RX "SerBr Rx" #define D_SENSOR_SBR_TX "SerBr Tx" +#define D_SENSOR_SR04_TRIG "SR04 Tri" +#define D_SENSOR_SR04_ECHO "SR04 Ech" // Units #define D_UNIT_AMPERE "A" +#define D_UNIT_CENTIMETER "cm" #define D_UNIT_HOUR "ó" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index b273222e6..7bd6b65b5 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -75,6 +75,7 @@ #define D_DARKLIGHT "Scuro" #define D_DEBUG "Debug" #define D_DISABLED "Disabilitato" +#define D_DISTANCE "Distance" #define D_DNS_SERVER "DNS Server" #define D_DONE "Fatto" #define D_DST_TIME "DST" @@ -450,9 +451,12 @@ #define D_SENSOR_SDS0X1 "SDS0X1" #define D_SENSOR_SBR_RX "SerBr Rx" #define D_SENSOR_SBR_TX "SerBr Tx" +#define D_SENSOR_SR04_TRIG "SR04 Tri" +#define D_SENSOR_SR04_ECHO "SR04 Ech" // Units #define D_UNIT_AMPERE "A" +#define D_UNIT_CENTIMETER "cm" #define D_UNIT_HOUR "Hr" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h index 776bca8e9..5d3bcb959 100644 --- a/sonoff/language/nl-NL.h +++ b/sonoff/language/nl-NL.h @@ -75,6 +75,7 @@ #define D_DARKLIGHT "Donker" #define D_DEBUG "Debug" #define D_DISABLED "Uitgeschakeld" +#define D_DISTANCE "Afstand" #define D_DNS_SERVER "DNS Server" #define D_DONE "Klaar" #define D_DST_TIME "ZT" @@ -450,9 +451,12 @@ #define D_SENSOR_SDS0X1 "SDS0X1" #define D_SENSOR_SBR_RX "SerBr Rx" #define D_SENSOR_SBR_TX "SerBr Tx" +#define D_SENSOR_SR04_TRIG "SR04 Tri" +#define D_SENSOR_SR04_ECHO "SR04 Ech" // Units #define D_UNIT_AMPERE "A" +#define D_UNIT_CENTIMETER "cm" #define D_UNIT_HOUR "h" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h index 09715f1e0..19a27ebeb 100644 --- a/sonoff/language/pl-PL.h +++ b/sonoff/language/pl-PL.h @@ -75,6 +75,7 @@ #define D_DARKLIGHT "Ciemny" #define D_DEBUG "Debug" #define D_DISABLED "Zablokowany" +#define D_DISTANCE "Distance" #define D_DNS_SERVER "Server DNS" #define D_DONE "Wykonane" #define D_DST_TIME "DST" @@ -450,9 +451,12 @@ #define D_SENSOR_SDS0X1 "SDS0X1" #define D_SENSOR_SBR_RX "SerBr Rx" #define D_SENSOR_SBR_TX "SerBr Tx" +#define D_SENSOR_SR04_TRIG "SR04 Tri" +#define D_SENSOR_SR04_ECHO "SR04 Ech" // Units #define D_UNIT_AMPERE "A" +#define D_UNIT_CENTIMETER "cm" #define D_UNIT_HOUR "Godz" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h index 01293ed18..55ccf37a6 100644 --- a/sonoff/language/pt-PT.h +++ b/sonoff/language/pt-PT.h @@ -75,6 +75,7 @@ #define D_DARKLIGHT "Luz Escura" #define D_DEBUG "Depurar" #define D_DISABLED "Disabilitado" +#define D_DISTANCE "Distance" #define D_DNS_SERVER "Servidor DNS" #define D_DONE "Concluído" #define D_DST_TIME "DST" @@ -450,9 +451,12 @@ #define D_SENSOR_SDS0X1 "SDS0X1" #define D_SENSOR_SBR_RX "SerBr Rx" #define D_SENSOR_SBR_TX "SerBr Tx" +#define D_SENSOR_SR04_TRIG "SR04 Tri" +#define D_SENSOR_SR04_ECHO "SR04 Ech" // Units #define D_UNIT_AMPERE "A" +#define D_UNIT_CENTIMETER "cm" #define D_UNIT_HOUR "Hr" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h index c5ecf5e69..96ad631ab 100644 --- a/sonoff/language/ru-RU.h +++ b/sonoff/language/ru-RU.h @@ -75,6 +75,7 @@ #define D_DARKLIGHT "Темный" #define D_DEBUG "Отладка" #define D_DISABLED "Блокирован" +#define D_DISTANCE "Distance" #define D_DNS_SERVER "DNS Сервер" #define D_DONE "Выполнено" #define D_DST_TIME "DST" @@ -450,9 +451,12 @@ #define D_SENSOR_SDS0X1 "SDS0X1" #define D_SENSOR_SBR_RX "SerBr Rx" #define D_SENSOR_SBR_TX "SerBr Tx" +#define D_SENSOR_SR04_TRIG "SR04 Tri" +#define D_SENSOR_SR04_ECHO "SR04 Ech" // Units #define D_UNIT_AMPERE "А" +#define D_UNIT_CENTIMETER "cm" #define D_UNIT_HOUR "Ч" #define D_UNIT_KILOOHM "кОм" #define D_UNIT_KILOWATTHOUR "кВт" diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h index ad52fef54..b90ab7b1d 100644 --- a/sonoff/language/zh-CN.h +++ b/sonoff/language/zh-CN.h @@ -75,6 +75,7 @@ #define D_DARKLIGHT "Dark" #define D_DEBUG "调试" #define D_DISABLED "禁用" +#define D_DISTANCE "Distance" #define D_DNS_SERVER "DNS服务器" #define D_DONE "完成" #define D_DST_TIME "DST" @@ -450,9 +451,12 @@ #define D_SENSOR_SDS0X1 "SDS0X1" #define D_SENSOR_SBR_RX "SerBr Rx" #define D_SENSOR_SBR_TX "SerBr Tx" +#define D_SENSOR_SR04_TRIG "SR04 Tri" +#define D_SENSOR_SR04_ECHO "SR04 Ech" // Units #define D_UNIT_AMPERE "安" +#define D_UNIT_CENTIMETER "cm" #define D_UNIT_HOUR "时" #define D_UNIT_KILOOHM "千欧" #define D_UNIT_KILOWATTHOUR "千瓦时" diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h index 927032310..b13f0ba04 100644 --- a/sonoff/language/zh-TW.h +++ b/sonoff/language/zh-TW.h @@ -75,6 +75,7 @@ #define D_DARKLIGHT "Dark" #define D_DEBUG "除錯" #define D_DISABLED "停用" +#define D_DISTANCE "Distance" #define D_DNS_SERVER "DNS伺服器" #define D_DONE "完成" #define D_DST_TIME "DST" @@ -450,9 +451,12 @@ #define D_SENSOR_SDS0X1 "SDS0X1" #define D_SENSOR_SBR_RX "SerBr Rx" #define D_SENSOR_SBR_TX "SerBr Tx" +#define D_SENSOR_SR04_TRIG "SR04 Tri" +#define D_SENSOR_SR04_ECHO "SR04 Ech" // Units #define D_UNIT_AMPERE "安" +#define D_UNIT_CENTIMETER "cm" #define D_UNIT_HOUR "時" #define D_UNIT_KILOOHM "千歐" #define D_UNIT_KILOWATTHOUR "千瓦時" diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h index b7ceb6c24..1efb95e7f 100644 --- a/sonoff/sonoff_template.h +++ b/sonoff/sonoff_template.h @@ -91,6 +91,8 @@ enum UserSelectablePins { GPIO_SDS0X1, // Nova Fitness SDS011 Serial interface GPIO_SBR_TX, // Serial Bridge Serial interface GPIO_SBR_RX, // Serial Bridge Serial interface + GPIO_SR04_TRIG, // SR04 Trigger pin + GPIO_SR04_ECHO, // SR04 Echo pin GPIO_SENSOR_END }; // Programmer selectable GPIO functionality offset by user selectable GPIOs @@ -133,7 +135,8 @@ const char kSensorNames[] PROGMEM = D_SENSOR_SAIR_TX "|" D_SENSOR_SAIR_RX "|" D_SENSOR_SPI_CS "|" D_SENSOR_SPI_DC "|" D_SENSOR_BACKLIGHT "|" D_SENSOR_PMS5003 "|" D_SENSOR_SDS0X1 "|" - D_SENSOR_SBR_TX "|" D_SENSOR_SBR_RX; + D_SENSOR_SBR_TX "|" D_SENSOR_SBR_RX "|" + D_SENSOR_SR04_TRIG "|" D_SENSOR_SR04_ECHO; /********************************************************************************************/ diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 402454462..eefdd2ffe 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -285,6 +285,8 @@ #define USE_ARILUX_RF // Add support for Arilux RF remote controller (+0k8 code, 252 iram (non 2.3.0)) +#define USE_SR04 // Add support for HC-SR04 ultrasonic devices (+1k code) + /*********************************************************************************************\ * Select all sensors - overrides above undefines!! \*********************************************************************************************/ diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index 29067e14b..33cadbd16 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -396,9 +396,7 @@ void StartWebserver(int type, IPAddress ipweb) my_hostname, (mdns_begun) ? ".local" : "", ipweb.toString().c_str()); AddLog(LOG_LEVEL_INFO); } - if (type) { - webserver_state = type; - } + if (type) { webserver_state = type; } } void StopWebserver() @@ -435,12 +433,8 @@ void WifiManagerBegin() void PollDnsWebserver() { - if (DnsServer) { - DnsServer->processNextRequest(); - } - if (WebServer) { - WebServer->handleClient(); - } + if (DnsServer) { DnsServer->processNextRequest(); } + if (WebServer) { WebServer->handleClient(); } } /*********************************************************************************************/ @@ -495,9 +489,7 @@ void HandleRoot() { AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_MAIN_MENU); - if (CaptivePortal()) { // If captive portal redirect instead of displaying the page. - return; - } + if (CaptivePortal()) { return; } // If captive portal redirect instead of displaying the page. if (HTTP_MANAGER == webserver_state) { if ((Settings.web_password[0] != 0) && !(WebServer->hasArg("USER1")) && !(WebServer->hasArg("PASS1"))) { @@ -549,9 +541,7 @@ void HandleRoot() page += F(""); byte idx = 0; for (byte i = 0; i < 4; i++) { - if (idx > 0) { - page += F(""); - } + if (idx > 0) { page += F(""); } for (byte j = 0; j < 4; j++) { idx++; snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR(""), idx, idx); @@ -620,17 +610,13 @@ void HandleAjaxStatusRefresh() boolean HttpUser() { boolean status = (HTTP_USER == webserver_state); - if (status) { - HandleRoot(); - } + if (status) { HandleRoot(); } return status; } void HandleConfiguration() { - if (HttpUser()) { - return; - } + if (HttpUser()) { return; } AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURATION); String page = FPSTR(HTTP_HEAD); @@ -638,10 +624,10 @@ void HandleConfiguration() page += FPSTR(HTTP_HEAD_STYLE); page += FPSTR(HTTP_BTN_MENU_MODULE); #if defined(USE_TIMERS) && defined(USE_TIMERS_WEB) - if (devices_present) page += FPSTR(HTTP_BTN_MENU_TIMER); + if (devices_present) { page += FPSTR(HTTP_BTN_MENU_TIMER); } #endif // USE_TIMERS and USE_TIMERS_WEB page += FPSTR(HTTP_BTN_MENU_WIFI); - if (Settings.flag.mqtt_enabled) page += FPSTR(HTTP_BTN_MENU_MQTT); + if (Settings.flag.mqtt_enabled) { page += FPSTR(HTTP_BTN_MENU_MQTT); } page += FPSTR(HTTP_BTN_MENU4); page += FPSTR(HTTP_BTN_MAIN); ShowPage(page); @@ -651,26 +637,20 @@ boolean GetUsedInModule(byte val, uint8_t *arr) { int offset = 0; - if (!val) { - return false; // None - } + if (!val) { return false; } // None #ifndef USE_I2C - if (GPIO_I2C_SCL == val) { - return true; - } - if (GPIO_I2C_SDA == val) { - return true; - } + if (GPIO_I2C_SCL == val) { return true; } + if (GPIO_I2C_SDA == val) { return true; } +#endif +#ifndef USE_SR04 + if (GPIO_SR04_TRIG == val) { return true; } + if (GPIO_SR04_ECHO == val) { return true; } #endif #ifndef USE_WS2812 - if (GPIO_WS2812 == val) { - return true; - } + if (GPIO_WS2812 == val) { return true; } #endif #ifndef USE_IR_REMOTE - if (GPIO_IRSEND == val) { - return true; - } + if (GPIO_IRSEND == val) { return true; } #endif if ((val >= GPIO_REL1) && (val < GPIO_REL1 + MAX_RELAYS)) { offset = (GPIO_REL1_INV - GPIO_REL1); @@ -693,21 +673,15 @@ boolean GetUsedInModule(byte val, uint8_t *arr) offset = -(GPIO_PWM1_INV - GPIO_PWM1); } for (byte i = 0; i < MAX_GPIO_PIN; i++) { - if (arr[i] == val) { - return true; - } - if (arr[i] == val + offset) { - return true; - } + if (arr[i] == val) { return true; } + if (arr[i] == val + offset) { return true; } } return false; } void HandleModuleConfiguration() { - if (HttpUser()) { - return; - } + if (HttpUser()) { return; } char stemp[20]; uint8_t midx; @@ -777,9 +751,7 @@ void HandleWifiConfiguration() void HandleWifi(boolean scan) { - if (HttpUser()) { - return; - } + if (HttpUser()) { return; } AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_WIFI); @@ -818,15 +790,13 @@ void HandleWifi(boolean scan) if (remove_duplicate_access_points) { String cssid; for (int i = 0; i < n; i++) { - if (-1 == indices[i]) { - continue; - } + if (-1 == indices[i]) { continue; } cssid = WiFi.SSID(indices[i]); for (int j = i + 1; j < n; j++) { if (cssid == WiFi.SSID(indices[j])) { snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_WIFI D_DUPLICATE_ACCESSPOINT " %s"), WiFi.SSID(indices[j]).c_str()); AddLog(LOG_LEVEL_DEBUG); - indices[j] = -1; // set dup aps to index -1 + indices[j] = -1; // set dup aps to index -1 } } } @@ -834,9 +804,7 @@ void HandleWifi(boolean scan) //display networks in page for (int i = 0; i < n; i++) { - if (-1 == indices[i]) { - continue; // skip dups - } + if (-1 == indices[i]) { continue; } // skip dups snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_WIFI D_SSID " %s, " D_RSSI " %d"), WiFi.SSID(indices[i]).c_str(), WiFi.RSSI(indices[i])); AddLog(LOG_LEVEL_DEBUG); int quality = WifiGetRssiAsQuality(WiFi.RSSI(indices[i])); @@ -878,9 +846,7 @@ void HandleWifi(boolean scan) void HandleMqttConfiguration() { - if (HttpUser()) { - return; - } + if (HttpUser()) { return; } AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_MQTT); String page = FPSTR(HTTP_HEAD); @@ -903,9 +869,7 @@ void HandleMqttConfiguration() void HandleLoggingConfiguration() { - if (HttpUser()) { - return; - } + if (HttpUser()) { return; } AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_LOGGING); String page = FPSTR(HTTP_HEAD); @@ -952,9 +916,7 @@ void HandleLoggingConfiguration() void HandleOtherConfiguration() { - if (HttpUser()) { - return; - } + if (HttpUser()) { return; } AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_OTHER); char stemp[40]; @@ -990,9 +952,7 @@ void HandleOtherConfiguration() void HandleBackupConfiguration() { - if (HttpUser()) { - return; - } + if (HttpUser()) { return; } AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_BACKUP_CONFIGURATION)); uint8_t buffer[sizeof(Settings)]; @@ -1018,9 +978,7 @@ void HandleBackupConfiguration() void HandleSaveSettings() { - if (HttpUser()) { - return; - } + if (HttpUser()) { return; } char stemp[TOPSZ]; char stemp2[TOPSZ]; @@ -1186,9 +1144,7 @@ void HandleSaveSettings() void HandleResetConfiguration() { - if (HttpUser()) { - return; - } + if (HttpUser()) { return; } char svalue[33]; @@ -1208,9 +1164,7 @@ void HandleResetConfiguration() void HandleRestoreConfiguration() { - if (HttpUser()) { - return; - } + if (HttpUser()) { return; } AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_RESTORE_CONFIGURATION); String page = FPSTR(HTTP_HEAD); @@ -1228,9 +1182,7 @@ void HandleRestoreConfiguration() void HandleUpgradeFirmware() { - if (HttpUser()) { - return; - } + if (HttpUser()) { return; } AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_FIRMWARE_UPGRADE); String page = FPSTR(HTTP_HEAD); @@ -1249,9 +1201,7 @@ void HandleUpgradeFirmware() void HandleUpgradeFirmwareStart() { - if (HttpUser()) { - return; - } + if (HttpUser()) { return; } char svalue[100]; AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_UPGRADE_STARTED)); @@ -1278,9 +1228,7 @@ void HandleUpgradeFirmwareStart() void HandleUploadDone() { - if (HttpUser()) { - return; - } + if (HttpUser()) { return; } AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_UPLOAD_DONE)); char error[100]; @@ -1327,13 +1275,9 @@ void HandleUploadLoop() // Based on ESP8266HTTPUpdateServer.cpp uses ESP8266WebServer Parsing.cpp and Cores Updater.cpp (Update) boolean _serialoutput = (LOG_LEVEL_DEBUG <= seriallog_level); - if (HTTP_USER == webserver_state) { - return; - } + if (HTTP_USER == webserver_state) { return; } if (upload_error) { - if (!upload_file_type) { - Update.end(); - } + if (!upload_file_type) { Update.end(); } return; } @@ -1408,9 +1352,7 @@ void HandleUploadLoop() if (_serialoutput) { Serial.printf("."); upload_progress_dot_count++; - if (!(upload_progress_dot_count % 80)) { - Serial.println(); - } + if (!(upload_progress_dot_count % 80)) { Serial.println(); } } } } else if(!upload_error && (UPLOAD_FILE_END == upload.status)) { @@ -1419,9 +1361,7 @@ void HandleUploadLoop() } if (!upload_file_type) { if (!Update.end(true)) { // true to set the size to the current progress - if (_serialoutput) { - Update.printError(Serial); - } + if (_serialoutput) { Update.printError(Serial); } upload_error = 6; return; } @@ -1434,9 +1374,7 @@ void HandleUploadLoop() restart_flag = 0; MqttRetryCounter(0); upload_error = 7; - if (!upload_file_type) { - Update.end(); - } + if (!upload_file_type) { Update.end(); } } delay(0); } @@ -1451,9 +1389,7 @@ void HandlePreflightRequest() void HandleHttpCommand() { - if (HttpUser()) { - return; - } + if (HttpUser()) { return; } char svalue[INPUT_BUFFER_SIZE]; // big to serve Backlog AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_COMMAND)); @@ -1473,12 +1409,7 @@ void HandleHttpCommand() if (valid) { byte curridx = web_log_index; WebGetArg("cmnd", svalue, sizeof(svalue)); - if (strlen(svalue)) { -// byte syslog_now = syslog_level; -// syslog_level = 0; // Disable UDP syslog to not trigger hardware WDT - Seems to work fine since 5.7.1d (global logging) - ExecuteCommand(svalue); -// syslog_level = syslog_now; - } + if (strlen(svalue)) { ExecuteCommand(svalue); } if (web_log_index != curridx) { byte counter = curridx; @@ -1491,9 +1422,7 @@ void HandleHttpCommand() // [14:49:36 MQTT: stat/wemos5/RESULT = {"POWER":"OFF"}] > [{"POWER":"OFF"}] char* JSON = (char*)memchr(tmp, '{', len); if (JSON) { // Is it a JSON message (and not only [15:26:08 MQT: stat/wemos5/POWER = O]) - if (message.length() > 1) { - message += F(","); - } + if (message.length() > 1) { message += F(","); } size_t JSONlen = len - (JSON - tmp); strlcpy(mqtt_data, JSON +1, JSONlen -2); message += mqtt_data; @@ -1515,10 +1444,7 @@ void HandleHttpCommand() void HandleConsole() { - if (HttpUser()) { - return; - } - + if (HttpUser()) { return; } AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONSOLE); String page = FPSTR(HTTP_HEAD); @@ -1533,9 +1459,7 @@ void HandleConsole() void HandleAjaxConsoleRefresh() { - if (HttpUser()) { - return; - } + if (HttpUser()) { return; } char svalue[INPUT_BUFFER_SIZE]; // big to serve Backlog byte cflg = 1; byte counter = 0; // Initial start, should never be 0 again @@ -1544,16 +1468,11 @@ void HandleAjaxConsoleRefresh() if (strlen(svalue)) { snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_COMMAND "%s"), svalue); AddLog(LOG_LEVEL_INFO); -// byte syslog_now = syslog_level; -// syslog_level = 0; // Disable UDP syslog to not trigger hardware WDT - Seems to work fine since 5.7.1d (global logging) ExecuteCommand(svalue); -// syslog_level = syslog_now; } WebGetArg("c2", svalue, sizeof(svalue)); - if (strlen(svalue)) { - counter = atoi(svalue); - } + if (strlen(svalue)) { counter = atoi(svalue); } byte last_reset_web_log_flag = reset_web_log_flag; String message = F("}9"); // Cannot load mqtt_data here as <> will be encoded by replacements below @@ -1580,7 +1499,7 @@ void HandleAjaxConsoleRefresh() message += mqtt_data; } counter++; - if (!counter) counter++; // Skip 0 as it is not allowed + if (!counter) { counter++; } // Skip 0 as it is not allowed } while (counter != web_log_index); // XML encoding to fix blank console log in concert with javascript decodeURIComponent message.replace(F("%"), F("%25")); // Needs to be done first as otherwise the % in %26 will also be converted @@ -1596,9 +1515,7 @@ void HandleAjaxConsoleRefresh() void HandleInformation() { - if (HttpUser()) { - return; - } + if (HttpUser()) { return; } AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_INFORMATION); char stopic[TOPSZ]; @@ -1712,9 +1629,7 @@ void HandleInformation() void HandleRestart() { - if (HttpUser()) { - return; - } + if (HttpUser()) { return; } AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_RESTART); String page = FPSTR(HTTP_HEAD); @@ -1738,9 +1653,7 @@ void HandleNotFound() // snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_HTTP "Not fount (%s)"), WebServer->uri().c_str()); // AddLog(LOG_LEVEL_DEBUG); - if (CaptivePortal()) { // If captive portal redirect instead of displaying the error page. - return; - } + if (CaptivePortal()) { return; } // If captive portal redirect instead of displaying the error page. #ifdef USE_EMULATION String path = WebServer->uri(); @@ -1778,9 +1691,7 @@ boolean ValidIpAddress(String str) { for (uint16_t i = 0; i < str.length(); i++) { int c = str.charAt(i); - if (c != '.' && (c < '0' || c > '9')) { - return false; - } + if (c != '.' && (c < '0' || c > '9')) { return false; } } return true; } diff --git a/sonoff/xsns_22_sr04.ino b/sonoff/xsns_22_sr04.ino new file mode 100644 index 000000000..5a3a7dc87 --- /dev/null +++ b/sonoff/xsns_22_sr04.ino @@ -0,0 +1,173 @@ +/* + xsns_22_sr04.ino - SR04 ultrasonic sensor support for Sonoff-Tasmota + + Copyright (C) 2018 Nuno Ferreira and Theo Arends + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifdef USE_SR04 +/*********************************************************************************************\ + * HC-SR04, HC-SR04+, JSN-SR04T - Ultrasonic distance sensor + * + * Code for SR04 family of ultrasonic distance sensors + * References: + * - https://www.dfrobot.com/wiki/index.php/Weather-proof_Ultrasonic_Sensor_SKU_:_SEN0207 +\*********************************************************************************************/ +#define max(a,b) ((a)>(b)?(a):(b)) + +uint8_t sr04_echo_pin = 0; +uint8_t sr04_trig_pin = 0; + +/*********************************************************************************************\ + * Embedded stripped and tuned NewPing library from Tim Eckel - teckel@leethost.com + * https://bitbucket.org/teckel12/arduino-new-ping +\*********************************************************************************************/ +#define US_ROUNDTRIP_CM 58 // Microseconds (uS) it takes sound to travel round-trip 1cm (2cm total), uses integer to save compiled code space. Default: 58 +#define US_ROUNDTRIP_IN 148 // Microseconds (uS) it takes sound to travel round-trip 1 inch (2 inches total), uses integer to save compiled code space. Default: 148 +#define PING_MEDIAN_DELAY 29000 +#define MAX_SENSOR_DISTANCE 500 +#define PING_OVERHEAD 5 + +// Conversion from uS to distance (round result to nearest cm or inch). +#define EchoConvert(echoTime, conversionFactor) (max(((unsigned int)echoTime + conversionFactor / 2) / conversionFactor, (echoTime ? 1 : 0))) + +/********************************************************************************************/ + +void Sr04Init() +{ + sr04_echo_pin = pin[GPIO_SR04_ECHO]; + sr04_trig_pin = pin[GPIO_SR04_TRIG]; + pinMode(sr04_trig_pin, OUTPUT); + pinMode(sr04_echo_pin, INPUT_PULLUP); +} + +boolean Sr04Read(uint16_t *distance) +{ + uint16_t duration = 0; + + *distance = 0; + + /* Send ping and get delay */ + duration = Sr04GetSamples(9, 250); + + /* Calculate the distance (in cm) based on the speed of sound. */ + *distance = EchoConvert(duration, US_ROUNDTRIP_CM); + + return 1; +} + +uint16_t Sr04Ping(uint16_t max_cm_distance) +{ + uint16_t duration = 0; + uint16_t maxEchoTime, maxTime; + + maxEchoTime = min(max_cm_distance + 1, (uint16_t) MAX_SENSOR_DISTANCE + 1) * US_ROUNDTRIP_CM; + + /* The following trigPin/echoPin cycle is used to determine the + distance of the nearest object by bouncing soundwaves off of it. */ + digitalWrite(sr04_trig_pin, LOW); + delayMicroseconds(2); + digitalWrite(sr04_trig_pin, HIGH); + delayMicroseconds(10); + digitalWrite(sr04_trig_pin, LOW); + + /* Wait for the echo */ + duration = pulseIn(sr04_echo_pin, HIGH, 26000) - PING_OVERHEAD; + + return (duration > maxEchoTime) ? 0 : duration; +} + +uint16_t Sr04GetSamples(uint8_t it, uint16_t max_cm_distance) { + uint16_t uS[it]; + uint16_t last; + uint8_t j; + uint8_t i = 0; + uint16_t t; + uS[0] = 0; + + while (i < it) { + t = micros(); + last = Sr04Ping(max_cm_distance); + + if (last != 0) { + if (i > 0) { + for (j = i; j > 0 && uS[j - 1] < last; j--) { + uS[j] = uS[j - 1]; + } + } else { + j = 0; + } + uS[j] = last; + i++; + } else { + it--; + } + if (i < it && micros() - t < PING_MEDIAN_DELAY) { + delay((PING_MEDIAN_DELAY + t - micros()) / 1000); + } + } + + return (uS[1]); // Return the ping distance from the 2nd highest reading +} + +#ifdef USE_WEBSERVER +const char HTTP_SNS_DISTANCE[] PROGMEM = + "%s{s}SR04 " D_DISTANCE "{m}%d" D_UNIT_CENTIMETER "{e}"; // {s} = , {m} = , {e} = +#endif // USE_WEBSERVER + +void Sr04Show(boolean json) +{ + uint16_t distance; + + if (Sr04Read(&distance)) { // Check if read failed + if(json) { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"SR04\":{\"" D_JSON_DISTANCE "\":%d}"), mqtt_data, distance); +#ifdef USE_WEBSERVER + } else { + snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_DISTANCE, mqtt_data, distance); +#endif // USE_WEBSERVER + } + } +} + +/*********************************************************************************************\ + * Interface +\*********************************************************************************************/ + +#define XSNS_22 + +boolean Xsns22(byte function) +{ + boolean result = false; + + if ((pin[GPIO_SR04_ECHO] < 99) && (pin[GPIO_SR04_TRIG] < 99)) { + switch (function) { + case FUNC_INIT: + Sr04Init(); + break; + case FUNC_JSON_APPEND: + Sr04Show(1); + break; +#ifdef USE_WEBSERVER + case FUNC_WEB_APPEND: + Sr04Show(0); + break; +#endif // USE_WEBSERVER + } + } + return result; +} + +#endif // USE_SR04 From 7dbd94b978a075f7ee1536bd8c66ea72bb2125ae Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 20 Apr 2018 16:07:06 +0200 Subject: [PATCH 094/136] Add Bulgarian language file --- platformio.ini | 15 ++ sonoff/language/bg-BG.h | 505 ++++++++++++++++++++++++++++++++++++++++ sonoff/user_config.h | 1 + 3 files changed, 521 insertions(+) create mode 100644 sonoff/language/bg-BG.h diff --git a/platformio.ini b/platformio.ini index 6f8b86e2c..c3d38b9a2 100644 --- a/platformio.ini +++ b/platformio.ini @@ -14,6 +14,7 @@ src_dir = sonoff ;env_default = sonoff ;env_default = sonoff-minimal ;env_default = sonoff-xxl +;env_default = sonoff-BG ;env_default = sonoff-CZ ;env_default = sonoff-DE ;env_default = sonoff-ES @@ -98,6 +99,20 @@ extra_scripts = pio/strip-floats.py ; *** Serial Monitor options monitor_baud = 115200 +[env:sonoff-BG] +;platform = espressif8266@1.5.0 ; v2.3.0 +;platform = espressif8266@1.6.0 ; v2.4.0 +platform = espressif8266 +framework = arduino +board = esp01_1m +board_flash_mode = dout +build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=bg-BG +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=bg-BG -DUSE_CONFIG_OVERRIDE +extra_scripts = pio/strip-floats.py + +; *** Serial Monitor options +monitor_baud = 115200 + [env:sonoff-DE] ;platform = espressif8266@1.5.0 ; v2.3.0 ;platform = espressif8266@1.6.0 ; v2.4.0 diff --git a/sonoff/language/bg-BG.h b/sonoff/language/bg-BG.h new file mode 100644 index 000000000..29391e192 --- /dev/null +++ b/sonoff/language/bg-BG.h @@ -0,0 +1,505 @@ +/* + bg-BG.h - localization for Bulgaria - Bulgarian for Sonoff-Tasmota + + Copyright (C) 2018 Theo Arends + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef _LANGUAGE_BG_BG_H_ +#define _LANGUAGE_BG_BG_H_ + +/*************************** ATTENTION *******************************\ + * + * Due to memory constraints only UTF-8 is supported. + * To save code space keep text as short as possible. + * Time and Date provided by SDK can not be localized (yet). + * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. + * Use online command Prefix to translate cmnd, stat and tele. + * + * Updated until v5.12.0l +\*********************************************************************/ + +//#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) + +// HTML (ISO 639-1) Language Code +#define D_HTML_LANGUAGE "bg" + +// "2017-03-07T11:08:02" - ISO8601:2004 +#define D_YEAR_MONTH_SEPARATOR "-" +#define D_MONTH_DAY_SEPARATOR "-" +#define D_DATE_TIME_SEPARATOR "T" +#define D_HOUR_MINUTE_SEPARATOR ":" +#define D_MINUTE_SECOND_SEPARATOR ":" + +#define D_DAY3LIST "НедПонВтрСрдЧетПетСъб" +#define D_MONTH3LIST "ЯнуФевМарАпрМайЮниЮлиАвгСепОктНоеДек" + +// Non JSON decimal separator +#define D_DECIMAL_SEPARATOR "," + +// Common +#define D_ADMIN "Admin" +#define D_AIR_QUALITY "Качество на въздуха" +#define D_AP "Точка за достъп" // Access Point +#define D_AS "като" +#define D_AUTO "АВТОМАТИЧНО" +#define D_BLINK "Мигане вкл." +#define D_BLINKOFF "Мигане изкл." +#define D_BOOT_COUNT "Брой на стартиранията" +#define D_BRIGHTLIGHT "Яркост" +#define D_BUTTON "Бутон" +#define D_BY "от" // Written by me +#define D_BYTES "Байт" +#define D_CELSIUS "Целзий" +#define D_CO2 "Въглероден диоксид" +#define D_CODE "код" // Button code +#define D_COLDLIGHT "Хладна" +#define D_COMMAND "Команда" +#define D_CONNECTED "Свързан" +#define D_COUNT "Брой" +#define D_COUNTER "Брояч" +#define D_CURRENT "Ток" // As in Voltage and Current +#define D_DATA "Данни" +#define D_DARKLIGHT "Тъмна" +#define D_DEBUG "Дебъгване" +#define D_DISABLED "Деактивиран" +#define D_DISTANCE "Distance" +#define D_DNS_SERVER "DNS Сървър" +#define D_DONE "Изпълнено" +#define D_DST_TIME "DST" +#define D_ECO2 "eCO2" +#define D_EMULATION "Емулация" +#define D_ENABLED "Активиран" +#define D_ERASE "Изтриване" +#define D_ERROR "Грешка" +#define D_FAHRENHEIT "Фаренхайт" +#define D_FAILED "Неуспешно" +#define D_FALLBACK "Обратна връзка" +#define D_FALLBACK_TOPIC "Топик на обратната връзка" +#define D_FALSE "Невярно" +#define D_FILE "Файл" +#define D_FREE_MEMORY "Свободна памет" +#define D_GAS "Газ" +#define D_GATEWAY "Шлюз" +#define D_GROUP "Група" +#define D_HOST "Хост" +#define D_HOSTNAME "Име на хоста" +#define D_HUMIDITY "Влажност" +#define D_ILLUMINANCE "Осветеност" +#define D_IMMEDIATE "моментален" // Button immediate +#define D_INDEX "Индекс" +#define D_INFO "Информация" +#define D_INITIALIZED "Инициализирано" +#define D_IP_ADDRESS "IP адрес" +#define D_LIGHT "Светлина" +#define D_LWT "LWT" +#define D_MODULE "Модул" +#define D_MQTT "MQTT" +#define D_MULTI_PRESS "многократно натискане" +#define D_NOISE "Шум" +#define D_NONE "Няма" +#define D_OFF "Изкл." +#define D_OFFLINE "Офлайн" +#define D_OK "Ок" +#define D_ON "Вкл." +#define D_ONLINE "Онлайн" +#define D_PASSWORD "Парола" +#define D_PORT "Порт" +#define D_POWER_FACTOR "Фактор на мощността" +#define D_POWERUSAGE "Мощност" +#define D_PRESSURE "Налягане" +#define D_PRESSUREATSEALEVEL "Налягане на морското ниво" +#define D_PROGRAM_FLASH_SIZE "Размер на флаш паметта за програми" +#define D_PROGRAM_SIZE "Размер на програмата" +#define D_PROJECT "Проект" +#define D_RECEIVED "Получено" +#define D_RESTART "Рестарт" +#define D_RESTARTING "Рестартиране" +#define D_RESTART_REASON "Причина за рестарта" +#define D_RESTORE "възстановяване" +#define D_RETAINED "запазено" +#define D_RULE "Правило" +#define D_SAVE "Запис" +#define D_SENSOR "Датчик" +#define D_SSID "SSId" +#define D_START "Старт" +#define D_STD_TIME "STD" +#define D_STOP "Стоп" +#define D_SUBNET_MASK "Маска на подмрежата" +#define D_SUBSCRIBE_TO "Записване за" +#define D_SUCCESSFUL "Успешно" +#define D_SUNRISE "Изгрев" +#define D_SUNSET "Залез" +#define D_TEMPERATURE "Температура" +#define D_TO "към" +#define D_TOGGLE "Превключване" +#define D_TOPIC "Топик" +#define D_TRANSMIT "Предаване" +#define D_TRUE "Вярно" +#define D_TVOC "TVOC" +#define D_UPGRADE "Обновяване" +#define D_UPLOAD "Зареждане" +#define D_UPTIME "Време от стартирането" +#define D_USER "Потребител" +#define D_UTC_TIME "UTC" +#define D_UV_LEVEL "Ниво на ултравиолетово излъчване" +#define D_VERSION "Версия" +#define D_VOLTAGE "Напрежение" +#define D_WARMLIGHT "Топла" +#define D_WEB_SERVER "Уеб сървър" + +// sonoff.ino +#define D_WARNING_MINIMAL_VERSION "ПРЕДУПРЕЖДЕНИЕ Тази версия не поддържа постоянни настройки" +#define D_LEVEL_10 "ниво 1-0" +#define D_LEVEL_01 "ниво 0-1" +#define D_SERIAL_LOGGING_DISABLED "Серийния логинг изключен" +#define D_SYSLOG_LOGGING_REENABLED "Системния логинг активиран" + +#define D_SET_BAUDRATE_TO "Задаване скорост на предаване (Baudrate)" +#define D_RECEIVED_TOPIC "Получен топик" +#define D_DATA_SIZE "Размер на данните" +#define D_ANALOG_INPUT "Аналогов вход" + +// support.ino +#define D_OSWATCH "osWatch" +#define D_BLOCKED_LOOP "Блокиран цикъл" +#define D_WPS_FAILED_WITH_STATUS "WPS конфигурацията е НЕУСПЕШНА със статус" +#define D_ACTIVE_FOR_3_MINUTES "активно в течение на 3 минути" +#define D_FAILED_TO_START "неуспешно стартиране" +#define D_PATCH_ISSUE_2186 "Проблем с патч 2186" +#define D_CONNECTING_TO_AP "Свързване към точка за достъп" +#define D_IN_MODE "в режим" +#define D_CONNECT_FAILED_NO_IP_ADDRESS "Грешка при свързването, не е получен IP адрес" +#define D_CONNECT_FAILED_AP_NOT_REACHED "Грешка при свързването, точката за достъп е недостижима" +#define D_CONNECT_FAILED_WRONG_PASSWORD "Грешка при свързването, грешна парола към точката за достъп" +#define D_CONNECT_FAILED_AP_TIMEOUT "Грешка при свързването, превишено време за изчакване" +#define D_ATTEMPTING_CONNECTION "Опитва свързване..." +#define D_CHECKING_CONNECTION "Проверка на свързването..." +#define D_QUERY_DONE "Запитването е изпълнено. Намерена е услуга MQTT" +#define D_MQTT_SERVICE_FOUND "MQTT услуга е намерена на" +#define D_FOUND_AT "намерена в" +#define D_SYSLOG_HOST_NOT_FOUND "Хостът на системния лог не е намерен" + +// settings.ino +#define D_SAVED_TO_FLASH_AT "Запазено в флаш паметта на" +#define D_LOADED_FROM_FLASH_AT "Заредено от флаш паметта от" +#define D_USE_DEFAULTS "Използване на параметри по подразбиране" +#define D_ERASED_SECTOR "Изтрит сектор" + +// webserver.ino +#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Фърмуеър MINIMAL - моля надградете го" +#define D_WEBSERVER_ACTIVE_ON "Уеб сървърът е активен на" +#define D_WITH_IP_ADDRESS "с IP адрес" +#define D_WEBSERVER_STOPPED "Уеб сървърът е спрян" +#define D_FILE_NOT_FOUND "Файлът не е намерен" +#define D_REDIRECTED "Пренасочено към адаптивния портал" +#define D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION "Wifi мениджърът настройва точка за достъп и запомня станцията" +#define D_WIFIMANAGER_SET_ACCESSPOINT "Wifi мениджърът настрои точката за достъп" +#define D_TRYING_TO_CONNECT "Опит за свързване на устройството към мрежата" + +#define D_RESTART_IN "Рестарт след" +#define D_SECONDS "секунди" +#define D_DEVICE_WILL_RESTART "Устройството ще се рестартира след няколко секунди" +#define D_BUTTON_TOGGLE "Превключване" +#define D_CONFIGURATION "Конфигурация" +#define D_INFORMATION "Информация" +#define D_FIRMWARE_UPGRADE "Обновяване на фърмуеъра" +#define D_CONSOLE "Конзола" +#define D_CONFIRM_RESTART "Подтвърдете рестартирането" + +#define D_CONFIGURE_MODULE "Конфигурация на модула" +#define D_CONFIGURE_WIFI "Конфигурация на WiFi" +#define D_CONFIGURE_MQTT "Конфигурация на MQTT" +#define D_CONFIGURE_DOMOTICZ "Конфигурация на Domoticz" +#define D_CONFIGURE_LOGGING "Конфигурация на логинга" +#define D_CONFIGURE_OTHER "Конфигурация на други" +#define D_CONFIRM_RESET_CONFIGURATION "Потвърдете ресетирането" +#define D_RESET_CONFIGURATION "Ресетиране на конфигурацията" +#define D_BACKUP_CONFIGURATION "Запазване на конфигурацията" +#define D_RESTORE_CONFIGURATION "Възстановяване на конфигурацията" +#define D_MAIN_MENU "Основно Меню" + +#define D_MODULE_PARAMETERS "Параметри на модула" +#define D_MODULE_TYPE "Тип на модула" +#define D_GPIO "GPIO" +#define D_SERIAL_IN "Сериен вход" +#define D_SERIAL_OUT "Сериен изход" + +#define D_WIFI_PARAMETERS "Параметры на Wifi" +#define D_SCAN_FOR_WIFI_NETWORKS "Сканиране за безжични мрежи Wifi" +#define D_SCAN_DONE "Сканированието е завършено" +#define D_NO_NETWORKS_FOUND "Не са намерени мрежи" +#define D_REFRESH_TO_SCAN_AGAIN "Обновяване за повторно сканиране" +#define D_DUPLICATE_ACCESSPOINT "Дублиране на точката за достъп (AP)" +#define D_SKIPPING_LOW_QUALITY "Пропускане поради лошо качество" +#define D_RSSI "RSSI" +#define D_WEP "WEP" +#define D_WPA_PSK "WPA PSK" +#define D_WPA2_PSK "WPA2 PSK" +#define D_AP1_SSID "AP1 SSId" +#define D_AP1_PASSWORD "AP1 Парола" +#define D_AP2_SSID "AP2 SSId" +#define D_AP2_PASSWORD "AP2 Парола" + +#define D_MQTT_PARAMETERS "Параметри на MQTT" +#define D_CLIENT "Клиент" +#define D_FULL_TOPIC "Пълен топик" + +#define D_LOGGING_PARAMETERS "Параметри на логинга" +#define D_SERIAL_LOG_LEVEL "Степен на серийния лог" +#define D_WEB_LOG_LEVEL "Степен на Уеб лога" +#define D_SYS_LOG_LEVEL "Степен на системния лог" +#define D_MORE_DEBUG "Още дебъгване" +#define D_SYSLOG_HOST "Хост на системния лог" +#define D_SYSLOG_PORT "Порт на системния лог" +#define D_TELEMETRY_PERIOD "Период на телеметрия" + +#define D_OTHER_PARAMETERS "Други параметри" +#define D_WEB_ADMIN_PASSWORD "Парола на уеб администратора" +#define D_MQTT_ENABLE "активиране на MQTT" +#define D_FRIENDLY_NAME "приятелско име" +#define D_BELKIN_WEMO "Belkin WeMo" +#define D_HUE_BRIDGE "Hue Bridge" +#define D_SINGLE_DEVICE "единично" +#define D_MULTI_DEVICE "мулти" + +#define D_SAVE_CONFIGURATION "Запазване на конфигурацията" +#define D_CONFIGURATION_SAVED "Конфигурацията е запазена" +#define D_CONFIGURATION_RESET "Конфигурацията е изчистена" + +#define D_PROGRAM_VERSION "Версия на програмата" +#define D_BUILD_DATE_AND_TIME "Дата & Час на компилацията" +#define D_CORE_AND_SDK_VERSION "Версия на Core/SDK" +#define D_FLASH_WRITE_COUNT "Брой на записите във Flash" +#define D_MAC_ADDRESS "MAC адрес" +#define D_MQTT_HOST "MQTT хост" +#define D_MQTT_PORT "MQTT порт" +#define D_MQTT_CLIENT "MQTT ID на клиент" +#define D_MQTT_USER "MQTT потребител" +#define D_MQTT_TOPIC "MQTT топик" +#define D_MQTT_GROUP_TOPIC "MQTT групов топик" +#define D_MQTT_FULL_TOPIC "MQTT пълен топик" +#define D_MDNS_DISCOVERY "mDNS откриване" +#define D_MDNS_ADVERTISE "mDNS транслация" +#define D_ESP_CHIP_ID "ID на чипа ESP" +#define D_FLASH_CHIP_ID "ID на чипа на флаш паметта" +#define D_FLASH_CHIP_SIZE "Размер на флаш паметта" +#define D_FREE_PROGRAM_SPACE "Свободно пространство за програми" + +#define D_UPGRADE_BY_WEBSERVER "Обновяване чрез уеб сървър" +#define D_OTA_URL "OTA Url" +#define D_START_UPGRADE "Започване на обновяване" +#define D_UPGRADE_BY_FILE_UPLOAD "Обновяване чрез зареждане на файл" +#define D_UPLOAD_STARTED "Зареждането започна" +#define D_UPGRADE_STARTED "Обновяването започна" +#define D_UPLOAD_DONE "Зареждането завърши" +#define D_UPLOAD_ERR_1 "Не е избран файл" +#define D_UPLOAD_ERR_2 "Недостатъчно свободно място" +#define D_UPLOAD_ERR_3 "Magic байтът не е 0xE9" +#define D_UPLOAD_ERR_4 "Размерът на програмата е по-голям от реалния размер на флаш паметта" +#define D_UPLOAD_ERR_5 "Грешка при зареждането в буфера" +#define D_UPLOAD_ERR_6 "Грешка пр зареждането. Включено е ниво 3 на лога" +#define D_UPLOAD_ERR_7 "Зареждането е прекъснато" +#define D_UPLOAD_ERR_8 "Файлът е невалиден" +#define D_UPLOAD_ERR_9 "Файлът е прекалено голям" +#define D_UPLOAD_ERROR_CODE "Код на грешка при зареждането" + +#define D_ENTER_COMMAND "Въвеждане на команда" +#define D_ENABLE_WEBLOG_FOR_RESPONSE "Включете ниво 2 на лога, ако очаквате отговор" +#define D_NEED_USER_AND_PASSWORD "Очаква user=&password=" + +// xdrv_00_mqtt.ino +#define D_FINGERPRINT "Проверка на TLS отпечатък..." +#define D_TLS_CONNECT_FAILED_TO "Неуспешно TLS свързване към" +#define D_RETRY_IN "Повторно след" +#define D_VERIFIED "Проверен отпечтък" +#define D_INSECURE "Нешифрована връзка, недействителен отпечатък" +#define D_CONNECT_FAILED_TO "Грешка при свързването към" + +// xdrv_wemohue.ino +#define D_MULTICAST_DISABLED "Multicast е изключен" +#define D_MULTICAST_REJOINED "Multicast е повторно съединен" +#define D_MULTICAST_JOIN_FAILED "Multicast грешка при присъединяването" +#define D_FAILED_TO_SEND_RESPONSE "Не се получи изпращането на отговор" + +#define D_WEMO "WeMo" +#define D_WEMO_BASIC_EVENT "WeMo главно събитие" +#define D_WEMO_EVENT_SERVICE "WeMo услуга за събитията" +#define D_WEMO_META_SERVICE "WeMo мета-услуга" +#define D_WEMO_SETUP "WeMo настройка" +#define D_RESPONSE_SENT "Отговорът е изпратен" + +#define D_HUE "Hue" +#define D_HUE_BRIDGE_SETUP "Hue мост настройка" +#define D_HUE_API_NOT_IMPLEMENTED "Hue API не е внедрено" +#define D_HUE_API "Hue API" +#define D_HUE_POST_ARGS "Hue POST аргументи" +#define D_3_RESPONSE_PACKETS_SENT "Изпратени са 3 пакета за отговор" + +// xdrv_05_domoticz.ino +#define D_DOMOTICZ_PARAMETERS "Domoticz параметри" +#define D_DOMOTICZ_IDX "Idx" +#define D_DOMOTICZ_KEY_IDX "Key idx" +#define D_DOMOTICZ_SWITCH_IDX "Switch idx" +#define D_DOMOTICZ_SENSOR_IDX "Sensor idx" + #define D_DOMOTICZ_TEMP "Temp" + #define D_DOMOTICZ_TEMP_HUM "Temp,Hum" + #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro" + #define D_DOMOTICZ_POWER_ENERGY "Power,Energy" + #define D_DOMOTICZ_ILLUMINANCE "Illuminance" + #define D_DOMOTICZ_COUNT "Count/PM1" + #define D_DOMOTICZ_VOLTAGE "Voltage/PM2,5" + #define D_DOMOTICZ_CURRENT "Current/PM10" + #define D_DOMOTICZ_AIRQUALITY "AirQuality" +#define D_DOMOTICZ_UPDATE_TIMER "Update timer" + +// xdrv_09_timers.ino +#define D_CONFIGURE_TIMER "Конфигуриране на таймер" +#define D_TIMER_PARAMETERS "Параметри на таймера" +#define D_TIMER_ARM "Arm" +#define D_TIMER_TIME "Time" +#define D_TIMER_DAYS "Days" +#define D_TIMER_REPEAT "Repeat" +#define D_TIMER_OUTPUT "Output" +#define D_TIMER_ACTION "Action" + +// xdrv_10_knx.ino +#define D_CONFIGURE_KNX "Configure KNX" +#define D_KNX_PARAMETERS "KNX Parameters" +#define D_KNX_GENERAL_CONFIG "General" +#define D_KNX_PHYSICAL_ADDRESS "Physical Address" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" +#define D_KNX_ENABLE "Enable KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" +#define D_ADD "Add" +#define D_DELETE "Delete" +#define D_REPLY "Reply" +#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_LOG_KNX "KNX: " +#define D_RECEIVED_FROM "Received from" +#define D_KNX_COMMAND_WRITE "Write" +#define D_KNX_COMMAND_READ "Read" +#define D_KNX_COMMAND_OTHER "Other" +#define D_SENT_TO "sent to" +#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." + +// xdrv_03_energy.ino +#define D_ENERGY_TODAY "Използвана енергия днес" +#define D_ENERGY_YESTERDAY "Използвана енергия вчера" +#define D_ENERGY_TOTAL "Използвана енергия общо" + +// xsns_05_ds18b20.ino +#define D_SENSOR_BUSY "Датчикът DS18x20 е зает" +#define D_SENSOR_CRC_ERROR "Датчик DS18x20 - грешка CRC" +#define D_SENSORS_FOUND "Намерен е датчик DS18x20" + +// xsns_06_dht.ino +#define D_TIMEOUT_WAITING_FOR "Изтекло време за очакване на" +#define D_START_SIGNAL_LOW "стартов сигнал нисък" +#define D_START_SIGNAL_HIGH "стартов сигнал висок" +#define D_PULSE "импулс" +#define D_CHECKSUM_FAILURE "Грешка в контролната сума" + +// xsns_07_sht1x.ino +#define D_SENSOR_DID_NOT_ACK_COMMAND "Датчикът не прие команда ACK" +#define D_SHT1X_FOUND "Намерен е SHT1X" + +// xsns_18_pms5003.ino +#define D_STANDARD_CONCENTRATION "CF-1 PM" // Standard Particle CF-1 Particle Matter +#define D_ENVIRONMENTAL_CONCENTRATION "PM" // Environmetal Particle Matter +#define D_PARTICALS_BEYOND "Particals" + +// sonoff_template.h +#define D_SENSOR_NONE "няма" +#define D_SENSOR_DHT11 "DHT11" +#define D_SENSOR_AM2301 "AM2301" +#define D_SENSOR_SI7021 "SI7021" +#define D_SENSOR_DS18X20 "DS18x20" +#define D_SENSOR_I2C_SCL "I2C SCL" +#define D_SENSOR_I2C_SDA "I2C SDA" +#define D_SENSOR_WS2812 "WS2812" +#define D_SENSOR_IRSEND "IRsend" +#define D_SENSOR_SWITCH "Ключ" // Suffix "1" +#define D_SENSOR_BUTTON "Бутон" // Suffix "1" +#define D_SENSOR_RELAY "Реле" // Suffix "1i" +#define D_SENSOR_LED "Led" // Suffix "1i" +#define D_SENSOR_PWM "PWM" // Suffix "1" +#define D_SENSOR_COUNTER "Брояч" // Suffix "1" +#define D_SENSOR_IRRECV "IRrecv" +#define D_SENSOR_MHZ_RX "MHZ Rx" +#define D_SENSOR_MHZ_TX "MHZ Tx" +#define D_SENSOR_PZEM_RX "PZEM Rx" +#define D_SENSOR_PZEM_TX "PZEM Tx" +#define D_SENSOR_SAIR_RX "SAir Rx" +#define D_SENSOR_SAIR_TX "SAir Tx" +#define D_SENSOR_SPI_CS "SPI CS" +#define D_SENSOR_SPI_DC "SPI DC" +#define D_SENSOR_BACKLIGHT "BkLight" +#define D_SENSOR_PMS5003 "PMS5003" +#define D_SENSOR_SDS0X1 "SDS0X1" +#define D_SENSOR_SBR_RX "SerBr Rx" +#define D_SENSOR_SBR_TX "SerBr Tx" +#define D_SENSOR_SR04_TRIG "SR04 Tri" +#define D_SENSOR_SR04_ECHO "SR04 Ech" + +// Units +#define D_UNIT_AMPERE "А" +#define D_UNIT_CENTIMETER "cm" +#define D_UNIT_HOUR "Ч" +#define D_UNIT_KILOOHM "кОм" +#define D_UNIT_KILOWATTHOUR "кВт" +#define D_UNIT_LUX "лукс" +#define D_UNIT_MICROGRAM_PER_CUBIC_METER "микрограм/м3" +#define D_UNIT_MICROMETER "микрметър" +#define D_UNIT_MICROSECOND "микросек." +#define D_UNIT_MILLIAMPERE "мА" +#define D_UNIT_MILLISECOND "милисек." +#define D_UNIT_MINUTE "мин." +#define D_UNIT_PARTS_PER_BILLION "ppb" +#define D_UNIT_PARTS_PER_DECILITER "ppd" +#define D_UNIT_PARTS_PER_MILLION "ppm" +#define D_UNIT_PRESSURE "Хектопаскал" +#define D_UNIT_SECOND "сек." +#define D_UNIT_SECTORS "сектори" +#define D_UNIT_VOLT "В" +#define D_UNIT_WATT "Вт" +#define D_UNIT_WATTHOUR "Вт/Час" + +// Log message prefix +#define D_LOG_APPLICATION "APP: " // Application +#define D_LOG_BRIDGE "BRG: " // Bridge +#define D_LOG_CONFIG "CFG: " // Settings +#define D_LOG_COMMAND "CMD: " // Command +#define D_LOG_DEBUG "DBG: " // Debug +#define D_LOG_DHT "DHT: " // DHT sensor +#define D_LOG_DOMOTICZ "DOM: " // Domoticz +#define D_LOG_DSB "DSB: " // DS18xB20 sensor +#define D_LOG_HTTP "HTP: " // HTTP webserver +#define D_LOG_I2C "I2C: " // I2C +#define D_LOG_IRR "IRR: " // Infra Red Received +#define D_LOG_LOG "LOG: " // Logging +#define D_LOG_MODULE "MOD: " // Module +#define D_LOG_MDNS "DNS: " // mDNS +#define D_LOG_MQTT "MQT: " // MQTT +#define D_LOG_OTHER "OTH: " // Other +#define D_LOG_RESULT "RSL: " // Result +#define D_LOG_RFR "RFR: " // RF Received +#define D_LOG_SERIAL "SER: " // Serial +#define D_LOG_SHT1 "SHT: " // SHT1x sensor +#define D_LOG_UPLOAD "UPL: " // Upload +#define D_LOG_UPNP "UPP: " // UPnP +#define D_LOG_WIFI "WIF: " // Wifi + +#endif // _LANGUAGE_BG_BG_H_ diff --git a/sonoff/user_config.h b/sonoff/user_config.h index eefdd2ffe..05950abd0 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -165,6 +165,7 @@ // -- Localization -------------------------------- // If non selected the default en-GB will be used +//#define MY_LANGUAGE bg-BG // Bulgarian in Bulgaria //#define MY_LANGUAGE cs-CZ // Czech in Czech //#define MY_LANGUAGE de-DE // German in Germany //#define MY_LANGUAGE el-GR // Greek in Greece From a8b83aa0369623d7e017501227a9e096eab4d5b7 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 20 Apr 2018 16:55:27 +0200 Subject: [PATCH 095/136] Add support for Sonoff Pow R2 (#2340) 5.12.0m * Add support for Sonoff Pow R2 (#2340) --- README.md | 1 + sonoff/_releasenotes.ino | 2 ++ sonoff/sonoff.ino | 4 ++-- sonoff/sonoff_template.h | 19 ++++++++++++++++--- sonoff/xdrv_03_energy.ino | 6 +++--- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 8d0d6b3d5..fd0d98f73 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ The following devices are supported: - [iTead Sonoff TH10/TH16 with temperature sensor](https://www.itead.cc/smart-home/sonoff-th.html) - [iTead Sonoff Dual (R2)](https://www.itead.cc/smart-home/sonoff-dual.html) - [iTead Sonoff Pow](https://www.itead.cc/smart-home/sonoff-pow.html) +- [iTead Sonoff Pow R2](https://www.itead.cc/sonoff-pow-r2.html) - [iTead Sonoff 4CH](https://www.itead.cc/smart-home/sonoff-4ch.html) - [iTead Sonoff 4CH Pro](https://www.itead.cc/smart-home/sonoff-4ch-pro.html) - [iTead S20 Smart Socket](https://www.itead.cc/smart-socket.html) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index b2145b6bf..1c2269538 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -3,7 +3,9 @@ * Add random window to timers (#2447) * Add optional KNX IP Protocol Support (#2402) * Add Greek language file (#2491) + * Add Bulgarian language file * Add support for sensor HC-SR04 ultrasonic (#113, #1964, #2444) + * Add support for Sonoff Pow R2 (#2340) * Fix compile error when using ESP/Arduino library v2.3.0 by reverting KNX async UDP library to default UDP library (#2488, #2492, #2493) * Fix configuration filename truncation when it contains spaces (#2484, #2490) * diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index df9997cfd..00850b891 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -2041,9 +2041,9 @@ void SerialInput() } /*-------------------------------------------------------------------------------------------*\ - * Sonoff S31 4800 baud serial interface + * Sonoff S31 and Sonoff Pow R2 4800 baud serial interface \*-------------------------------------------------------------------------------------------*/ - if (SONOFF_S31 == Settings.module) { + if ((SONOFF_S31 == Settings.module) || (SONOFF_POW_R2 == Settings.module)) { if (CseSerialInput()) { serial_in_byte_counter = 0; Serial.flush(); diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h index 1efb95e7f..b3f95152f 100644 --- a/sonoff/sonoff_template.h +++ b/sonoff/sonoff_template.h @@ -184,6 +184,7 @@ enum SupportedModules { ARILUX_LC06, SONOFF_S31, ZENGGE_ZF_WF017, + SONOFF_POW_R2, MAXMODULE }; /********************************************************************************************/ @@ -208,6 +209,7 @@ const uint8_t kNiceList[MAXMODULE] PROGMEM = { SONOFF_DUAL, SONOFF_DUAL_R2, SONOFF_POW, + SONOFF_POW_R2, SONOFF_S31, SONOFF_4CH, SONOFF_4CHPRO, @@ -321,7 +323,7 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_USER, // GPIO14 Optional sensor 0, 0, 0 }, - { "Sonoff Pow", // Sonoff Pow (ESP8266) + { "Sonoff Pow", // Sonoff Pow (ESP8266 - HLW8012) GPIO_KEY1, // GPIO00 Button 0, 0, 0, 0, GPIO_HLW_SEL, // GPIO05 HLW8012 Sel output @@ -329,7 +331,7 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_REL1, // GPIO12 Red Led and Relay (0 = Off, 1 = On) GPIO_HLW_CF1, // GPIO13 HLW8012 CF1 voltage / current GPIO_HLW_CF, // GPIO14 HLW8012 CF power - GPIO_LED1, // GPIO15 Green Led (0 = On, 1 = Off) + GPIO_LED1, // GPIO15 Blue Led (0 = On, 1 = Off) 0, 0 }, { "Sonoff 4CH", // Sonoff 4CH (ESP8285) @@ -784,7 +786,7 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_USER, // GPIO15 RGBW LED White 0, 0 }, - { "Sonoff S31", // Sonoff S31 (ESP8266) + { "Sonoff S31", // Sonoff S31 (ESP8266 - CSE7766) GPIO_KEY1, // GPIO00 Button 0, // GPIO01 Serial RXD 4800 baud 8E1 CSE7766 energy sensor 0, @@ -807,6 +809,17 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_PWM1, // GPIO13 RGB LED Red GPIO_PWM3, // GPIO14 RGB LED Blue 0, 0, 0 + }, + { "Sonoff Pow R2", // Sonoff Pow R2 (ESP8285 - CSE7766) + GPIO_KEY1, // GPIO00 Button + 0, // GPIO01 Serial RXD 4800 baud 8E1 CSE7766 energy sensor + 0, + 0, // GPIO03 Serial TXD + 0, 0, + 0, 0, 0, 0, 0, 0, // Flash connection + GPIO_REL1, // GPIO12 Red Led and Relay (0 = Off, 1 = On) + GPIO_LED1_INV, // GPIO13 Blue Led (0 = On, 1 = Off) + 0, 0, 0, 0 } }; diff --git a/sonoff/xdrv_03_energy.ino b/sonoff/xdrv_03_energy.ino index a1052a077..fc70751bf 100644 --- a/sonoff/xdrv_03_energy.ino +++ b/sonoff/xdrv_03_energy.ino @@ -252,7 +252,7 @@ void HlwInit() } /*********************************************************************************************\ - * CSE7766 - Energy (Sonoff S31) + * CSE7766 - Energy (Sonoff S31 and Sonoff Pow R2) * * Based on datasheet from http://www.chipsea.com/UploadFiles/2017/08/11144342F01B5662.pdf \*********************************************************************************************/ @@ -1015,9 +1015,9 @@ boolean EnergyCommand() void EnergyDrvInit() { energy_flg = ENERGY_NONE; - if ((pin[GPIO_HLW_SEL] < 99) && (pin[GPIO_HLW_CF1] < 99) && (pin[GPIO_HLW_CF] < 99)) { // Sonoff Pow + if ((pin[GPIO_HLW_SEL] < 99) && (pin[GPIO_HLW_CF1] < 99) && (pin[GPIO_HLW_CF] < 99)) { // Sonoff Pow or any HLW8012 based device energy_flg = ENERGY_HLW8012; - } else if (SONOFF_S31 == Settings.module) { // Sonoff S31 + } else if ((SONOFF_S31 == Settings.module) || (SONOFF_POW_R2 == Settings.module)) { // Sonoff S31 or Sonoff Pow R2 baudrate = 4800; serial_config = SERIAL_8E1; energy_flg = ENERGY_CSE7766; From c8277472b9596e7c491fb4c6e1ef526e80d68193 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 20 Apr 2018 17:43:20 +0200 Subject: [PATCH 096/136] Better Fix config filename truncation Better Fix config filename truncation (#2484) --- README.md | 4 ++-- sonoff/support.ino | 4 ++-- sonoff/webserver.ino | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fd0d98f73..f7c00a1dd 100644 --- a/README.md +++ b/README.md @@ -44,8 +44,8 @@ The following devices are supported: - [iTead Sonoff SV](https://www.itead.cc/smart-home/sonoff-sv.html) - [iTead Sonoff TH10/TH16 with temperature sensor](https://www.itead.cc/smart-home/sonoff-th.html) - [iTead Sonoff Dual (R2)](https://www.itead.cc/smart-home/sonoff-dual.html) -- [iTead Sonoff Pow](https://www.itead.cc/smart-home/sonoff-pow.html) -- [iTead Sonoff Pow R2](https://www.itead.cc/sonoff-pow-r2.html) +- [iTead Sonoff Pow with Energy Monitoring](https://www.itead.cc/smart-home/sonoff-pow.html) +- [iTead Sonoff Pow R2 with Energy Monitoring](https://www.itead.cc/sonoff-pow-r2.html) - [iTead Sonoff 4CH](https://www.itead.cc/smart-home/sonoff-4ch.html) - [iTead Sonoff 4CH Pro](https://www.itead.cc/smart-home/sonoff-4ch-pro.html) - [iTead S20 Smart Socket](https://www.itead.cc/smart-socket.html) diff --git a/sonoff/support.ino b/sonoff/support.ino index 401b74e17..34d271644 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -232,7 +232,7 @@ char* UpperCase_P(char* dest, const char* source) return dest; } -char* SpaceToUnderscore(char* dest, const char* source) +char* NoAlNumToUnderscore(char* dest, const char* source) { char* write = dest; const char* read = source; @@ -240,7 +240,7 @@ char* SpaceToUnderscore(char* dest, const char* source) while (ch != '\0') { ch = *read++; - *write++ = (ch == ' ') ? '_' : ch; + *write++ = (isalnum(ch) || ('\0' == ch)) ? ch : '_'; } return dest; } diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index 33cadbd16..1dc3eda52 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -962,7 +962,7 @@ void HandleBackupConfiguration() char attachment[100]; char friendlyname[sizeof(Settings.friendlyname[0])]; - snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=Config_%s_%s.dmp"), SpaceToUnderscore(friendlyname, Settings.friendlyname[0]), my_version); + snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=Config_%s_%s.dmp"), NoAlNumToUnderscore(friendlyname, Settings.friendlyname[0]), my_version); WebServer->sendHeader(F("Content-Disposition"), attachment); WebServer->send(200, FPSTR(HDR_CTYPE_STREAM), ""); memcpy(buffer, &Settings, sizeof(buffer)); From 51b333348c878f868612f3c7cdac389f50ddc26e Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 20 Apr 2018 18:12:25 +0200 Subject: [PATCH 097/136] Updated Spanish language file --- sonoff/language/es-AR.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index 899a6057a..ded21e8e7 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -75,7 +75,7 @@ #define D_DARKLIGHT "Oscura" #define D_DEBUG "Debug" #define D_DISABLED "Deshabilitado" -#define D_DISTANCE "Distance" +#define D_DISTANCE "Distancia" #define D_DNS_SERVER "DNS Server" #define D_DONE "Listo" #define D_DST_TIME "DST" From 6bb0f034c34a6e6a3769053e84e61356d2038243 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 21 Apr 2018 13:10:44 +0200 Subject: [PATCH 098/136] Fix Timer invalid JSON message when too long Fix Timer invalid JSON message when too long (#2447) --- sonoff/xdrv_09_timers.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino index 82884ab4e..0ffe94f55 100644 --- a/sonoff/xdrv_09_timers.ino +++ b/sonoff/xdrv_09_timers.ino @@ -345,7 +345,7 @@ boolean TimerCommand() } } else { if (devices_present) { - StaticJsonBuffer<128> jsonBuffer; + StaticJsonBuffer<200> jsonBuffer; JsonObject& root = jsonBuffer.parseObject(dataBufUc); if (!root.success()) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_TIMER "%d\":\"" D_JSON_INVALID_JSON "\"}"), index); // JSON decode failed From 84fce04a68e196b811a923719b4ce019f7bbb2ee Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 21 Apr 2018 17:10:35 +0200 Subject: [PATCH 099/136] Updated Bulgarian language file (#2503) Updated Bulgarian language file (#2503) --- sonoff/language/bg-BG.h | 90 ++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/sonoff/language/bg-BG.h b/sonoff/language/bg-BG.h index 29391e192..7f30252ec 100644 --- a/sonoff/language/bg-BG.h +++ b/sonoff/language/bg-BG.h @@ -28,7 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * - * Updated until v5.12.0l + * Updated until v5.12.0m \*********************************************************************/ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) @@ -193,7 +193,7 @@ #define D_SYSLOG_HOST_NOT_FOUND "Хостът на системния лог не е намерен" // settings.ino -#define D_SAVED_TO_FLASH_AT "Запазено в флаш паметта на" +#define D_SAVED_TO_FLASH_AT "Запазено във флаш паметта на" #define D_LOADED_FROM_FLASH_AT "Заредено от флаш паметта от" #define D_USE_DEFAULTS "Използване на параметри по подразбиране" #define D_ERASED_SECTOR "Изтрит сектор" @@ -224,12 +224,12 @@ #define D_CONFIGURE_MQTT "Конфигурация на MQTT" #define D_CONFIGURE_DOMOTICZ "Конфигурация на Domoticz" #define D_CONFIGURE_LOGGING "Конфигурация на логинга" -#define D_CONFIGURE_OTHER "Конфигурация на други" -#define D_CONFIRM_RESET_CONFIGURATION "Потвърдете ресетирането" -#define D_RESET_CONFIGURATION "Ресетиране на конфигурацията" +#define D_CONFIGURE_OTHER "Драги конфигурации" +#define D_CONFIRM_RESET_CONFIGURATION "Потвърдете изчистването" +#define D_RESET_CONFIGURATION "Изчистване на конфигурацията" #define D_BACKUP_CONFIGURATION "Запазване на конфигурацията" #define D_RESTORE_CONFIGURATION "Възстановяване на конфигурацията" -#define D_MAIN_MENU "Основно Меню" +#define D_MAIN_MENU "Основно меню" #define D_MODULE_PARAMETERS "Параметри на модула" #define D_MODULE_TYPE "Тип на модула" @@ -237,10 +237,10 @@ #define D_SERIAL_IN "Сериен вход" #define D_SERIAL_OUT "Сериен изход" -#define D_WIFI_PARAMETERS "Параметры на Wifi" -#define D_SCAN_FOR_WIFI_NETWORKS "Сканиране за безжични мрежи Wifi" -#define D_SCAN_DONE "Сканированието е завършено" -#define D_NO_NETWORKS_FOUND "Не са намерени мрежи" +#define D_WIFI_PARAMETERS "Wifi параметри" +#define D_SCAN_FOR_WIFI_NETWORKS "Сканиране за безжични мрежи" +#define D_SCAN_DONE "Сканирането приключи" +#define D_NO_NETWORKS_FOUND "Не бяха открити мрежи" #define D_REFRESH_TO_SCAN_AGAIN "Обновяване за повторно сканиране" #define D_DUPLICATE_ACCESSPOINT "Дублиране на точката за достъп (AP)" #define D_SKIPPING_LOW_QUALITY "Пропускане поради лошо качество" @@ -280,9 +280,9 @@ #define D_CONFIGURATION_RESET "Конфигурацията е изчистена" #define D_PROGRAM_VERSION "Версия на програмата" -#define D_BUILD_DATE_AND_TIME "Дата & Час на компилацията" +#define D_BUILD_DATE_AND_TIME "Дата и час на компилацията" #define D_CORE_AND_SDK_VERSION "Версия на Core/SDK" -#define D_FLASH_WRITE_COUNT "Брой на записите във Flash" +#define D_FLASH_WRITE_COUNT "Брой на записите във флаш паметта" #define D_MAC_ADDRESS "MAC адрес" #define D_MQTT_HOST "MQTT хост" #define D_MQTT_PORT "MQTT порт" @@ -369,31 +369,31 @@ #define D_CONFIGURE_TIMER "Конфигуриране на таймер" #define D_TIMER_PARAMETERS "Параметри на таймера" #define D_TIMER_ARM "Arm" -#define D_TIMER_TIME "Time" -#define D_TIMER_DAYS "Days" -#define D_TIMER_REPEAT "Repeat" -#define D_TIMER_OUTPUT "Output" -#define D_TIMER_ACTION "Action" +#define D_TIMER_TIME "Време" +#define D_TIMER_DAYS "Дни" +#define D_TIMER_REPEAT "Повтори" +#define D_TIMER_OUTPUT "Изход" +#define D_TIMER_ACTION "Действие" // xdrv_10_knx.ino -#define D_CONFIGURE_KNX "Configure KNX" -#define D_KNX_PARAMETERS "KNX Parameters" -#define D_KNX_GENERAL_CONFIG "General" -#define D_KNX_PHYSICAL_ADDRESS "Physical Address" -#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" -#define D_KNX_ENABLE "Enable KNX" -#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" -#define D_ADD "Add" -#define D_DELETE "Delete" -#define D_REPLY "Reply" -#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_CONFIGURE_KNX "Конфигуриране на KNX" +#define D_KNX_PARAMETERS "KNX параметри" +#define D_KNX_GENERAL_CONFIG "Основни" +#define D_KNX_PHYSICAL_ADDRESS "Физически адрес" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Трябва да е уникален в KNX мрежата )" +#define D_KNX_ENABLE "Активиране на KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Групови адреси за изпращане на данни" +#define D_ADD "Добаване" +#define D_DELETE "Изтриване" +#define D_REPLY "Отговор" +#define D_KNX_GROUP_ADDRESS_TO_READ "Групови адреси за получаване на данни" #define D_LOG_KNX "KNX: " -#define D_RECEIVED_FROM "Received from" -#define D_KNX_COMMAND_WRITE "Write" -#define D_KNX_COMMAND_READ "Read" -#define D_KNX_COMMAND_OTHER "Other" -#define D_SENT_TO "sent to" -#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." +#define D_RECEIVED_FROM "Получен от" +#define D_KNX_COMMAND_WRITE "Писане" +#define D_KNX_COMMAND_READ "Четене" +#define D_KNX_COMMAND_OTHER "Друго" +#define D_SENT_TO "изпратен до" +#define D_KNX_WARNING "Груповият адрес ( 0 / 0 / 0 ) е резервиран и не може да бъде използван." // xdrv_03_energy.ino #define D_ENERGY_TODAY "Използвана енергия днес" @@ -446,7 +446,7 @@ #define D_SENSOR_SAIR_TX "SAir Tx" #define D_SENSOR_SPI_CS "SPI CS" #define D_SENSOR_SPI_DC "SPI DC" -#define D_SENSOR_BACKLIGHT "BkLight" +#define D_SENSOR_BACKLIGHT "Подсветка" #define D_SENSOR_PMS5003 "PMS5003" #define D_SENSOR_SDS0X1 "SDS0X1" #define D_SENSOR_SBR_RX "SerBr Rx" @@ -456,26 +456,26 @@ // Units #define D_UNIT_AMPERE "А" -#define D_UNIT_CENTIMETER "cm" -#define D_UNIT_HOUR "Ч" +#define D_UNIT_CENTIMETER "см" +#define D_UNIT_HOUR "ч" #define D_UNIT_KILOOHM "кОм" -#define D_UNIT_KILOWATTHOUR "кВт" +#define D_UNIT_KILOWATTHOUR "кВт/ч" #define D_UNIT_LUX "лукс" #define D_UNIT_MICROGRAM_PER_CUBIC_METER "микрограм/м3" -#define D_UNIT_MICROMETER "микрметър" -#define D_UNIT_MICROSECOND "микросек." +#define D_UNIT_MICROMETER "микрометър" +#define D_UNIT_MICROSECOND "микросек" #define D_UNIT_MILLIAMPERE "мА" -#define D_UNIT_MILLISECOND "милисек." -#define D_UNIT_MINUTE "мин." +#define D_UNIT_MILLISECOND "мсек" +#define D_UNIT_MINUTE "мин" #define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_MILLION "ppm" -#define D_UNIT_PRESSURE "Хектопаскал" -#define D_UNIT_SECOND "сек." +#define D_UNIT_PRESSURE "хПа" +#define D_UNIT_SECOND "сек" #define D_UNIT_SECTORS "сектори" #define D_UNIT_VOLT "В" #define D_UNIT_WATT "Вт" -#define D_UNIT_WATTHOUR "Вт/Час" +#define D_UNIT_WATTHOUR "Вт/ч" // Log message prefix #define D_LOG_APPLICATION "APP: " // Application From 9549ab3ad36d0e30076702a67ab213070e12ddb6 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 21 Apr 2018 18:17:24 +0200 Subject: [PATCH 100/136] Remove display of passwords (#2505) Remove display of passwords (#2505) --- sonoff/i18n.h | 4 ++++ sonoff/sonoff.ino | 8 ++++++-- sonoff/sonoff_post.h | 42 ++++++++++++++++++++++++++++------------- sonoff/support.ino | 2 +- sonoff/webserver.ino | 10 +++++----- sonoff/xdrv_00_mqtt.ino | 4 +++- 6 files changed, 48 insertions(+), 22 deletions(-) diff --git a/sonoff/i18n.h b/sonoff/i18n.h index fc6a43db4..f50242d86 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -372,6 +372,8 @@ /********************************************************************************************/ +#define D_ASTERIX "********" + #ifndef MY_LANGUAGE #include "language/en-GB.h" #else @@ -435,11 +437,13 @@ const char S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE[] PROGMEM = "{\"%s\":\"%d (" D const char S_JSON_COMMAND_NVALUE[] PROGMEM = "{\"%s\":%d}"; const char S_JSON_COMMAND_LVALUE[] PROGMEM = "{\"%s\":%lu}"; const char S_JSON_COMMAND_SVALUE[] PROGMEM = "{\"%s\":\"%s\"}"; +const char S_JSON_COMMAND_ASTERIX[] PROGMEM = "{\"%s\":\"" D_ASTERIX "\"}"; const char S_JSON_COMMAND_XVALUE[] PROGMEM = "{\"%s\":%s}"; // %s must provide quotes on non-number const char S_JSON_COMMAND_INDEX_NVALUE[] PROGMEM = "{\"%s%d\":%d}"; const char S_JSON_COMMAND_INDEX_LVALUE[] PROGMEM = "{\"%s%d\":%lu}"; const char S_JSON_COMMAND_INDEX_SVALUE[] PROGMEM = "{\"%s%d\":\"%s\"}"; +const char S_JSON_COMMAND_INDEX_ASTERIX[] PROGMEM = "{\"%s%d\":\"" D_ASTERIX "\"}"; const char S_JSON_COMMAND_INDEX_SVALUE_SVALUE[] PROGMEM = "{\"%s%d\":\"%s%s\"}"; const char S_JSON_COMMAND_INDEX_NVALUE_ACTIVE_NVALUE[] PROGMEM = "{\"%s%d\":\"%d (" D_JSON_ACTIVE " %d)\"}"; diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 00850b891..4bb89b6e6 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -922,8 +922,10 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) strlcpy(Settings.sta_pwd[index -1], (1 == payload) ? (1 == index) ? STA_PASS1 : STA_PASS2 : dataBuf, sizeof(Settings.sta_pwd[0])); Settings.sta_active = index -1; restart_flag = 2; + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_SVALUE, command, index, Settings.sta_pwd[index -1]); + } else { + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_ASTERIX, command, index); } - snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_SVALUE, command, index, Settings.sta_pwd[index -1]); } else if ((CMND_HOSTNAME == command_code) && !grpflg) { if ((data_len > 0) && (data_len < sizeof(Settings.hostname))) { @@ -978,8 +980,10 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) else if (CMND_WEBPASSWORD == command_code) { if ((data_len > 0) && (data_len < sizeof(Settings.web_password))) { strlcpy(Settings.web_password, (!strcmp(dataBuf,"0")) ? "" : (1 == payload) ? WEB_PASSWORD : dataBuf, sizeof(Settings.web_password)); + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, Settings.web_password); + } else { + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_ASTERIX, command); } - snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, Settings.web_password); } else if (CMND_WEBLOG == command_code) { if ((payload >= LOG_LEVEL_NONE) && (payload <= LOG_LEVEL_ALL)) Settings.weblog_level = payload; diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h index 47a752c72..09d68f89a 100644 --- a/sonoff/sonoff_post.h +++ b/sonoff/sonoff_post.h @@ -79,6 +79,7 @@ void KNX_CB_Action(message_t const &msg, void *arg); #endif // #define USE_WS2812_DMA // DMA supports only GPIO03 (= Serial RXD) (+1k mem). When USE_WS2812_DMA is enabled expect Exceptions on Pow #define USE_ARILUX_RF // Add support for Arilux RF remote controller (+0k8 code, 252 iram (non 2.3.0)) +#define USE_SR04 // Add support for HC-SR04 ultrasonic devices (+1k code) #endif // USE_ALL_SENSORS ===================== #if defined(USE_DS18x20) || defined(USE_DS18x20_LEGACY) @@ -99,6 +100,9 @@ void KNX_CB_Action(message_t const &msg, void *arg); #ifdef USE_HOME_ASSISTANT #undef USE_HOME_ASSISTANT // Disable Home Assistant #endif +#ifdef USE_KNX +#undef USE_KNX // Disable KNX IP Protocol Support +#endif //#ifdef USE_WEBSERVER //#undef USE_WEBSERVER // Disable Webserver //#endif @@ -111,30 +115,24 @@ void KNX_CB_Action(message_t const &msg, void *arg); #ifdef USE_SUNRISE #undef USE_SUNRISE // Disable support for Sunrise and sunset tools #endif -#ifdef USE_KNX -#undef USE_KNX // Disable KNX IP Protocol Support +#ifdef USE_RULES +#undef USE_RULES // Disable support for rules #endif -#ifdef USE_PZEM004T -#undef USE_PZEM004T // Disable PZEM004T energy sensor +#ifdef USE_DHT +#undef USE_DHT // Disable internal DHT sensor #endif #ifdef USE_DS18x20 #undef USE_DS18x20 // Disable DS18x20 sensor #endif +#ifdef USE_DS18B20 +#undef USE_DS18B20 // Disable internal DS18B20 sensor +#endif #ifdef USE_I2C #undef USE_I2C // Disable all I2C sensors and devices #endif #ifdef USE_SPI #undef USE_SPI // Disable all SPI devices #endif -#ifdef USE_WS2812 -#undef USE_WS2812 // Disable WS2812 Led string -#endif -#ifdef USE_DS18B20 -#undef USE_DS18B20 // Disable internal DS18B20 sensor -#endif -#ifdef USE_DHT -#undef USE_DHT // Disable internal DHT sensor -#endif #ifdef USE_DISPLAY #undef USE_DISPLAY // Disable Display support #endif @@ -144,12 +142,30 @@ void KNX_CB_Action(message_t const &msg, void *arg); #ifdef USE_SENSEAIR #undef USE_SENSEAIR // Disable support for SenseAir K30, K70 and S8 CO2 sensor #endif +#ifdef USE_PMS5003 +#undef USE_PMS5003 // Disable support for PMS5003 and PMS7003 particle concentration sensor +#endif +#ifdef USE_NOVA_SDS +#undef USE_NOVA_SDS // Disable support for SDS011 and SDS021 particle concentration sensor +#endif +#ifdef USE_PZEM004T +#undef USE_PZEM004T // Disable PZEM004T energy sensor +#endif +#ifdef USE_SERIAL_BRIDGE +#undef USE_SERIAL_BRIDGE // Disable support for software Serial Bridge +#endif #ifdef USE_IR_REMOTE #undef USE_IR_REMOTE // Disable IR driver #endif +#ifdef USE_WS2812 +#undef USE_WS2812 // Disable WS2812 Led string +#endif #ifdef USE_ARILUX_RF #undef USE_ARILUX_RF // Disable support for Arilux RF remote controller #endif +#ifdef USE_SR04 +#undef USE_SR04 // Disable support for for HC-SR04 ultrasonic devices +#endif #ifdef DEBUG_THEO #undef DEBUG_THEO // Disable debug code #endif diff --git a/sonoff/support.ino b/sonoff/support.ino index 34d271644..8bc76d6a8 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -740,7 +740,7 @@ void WifiCheck(uint8_t param) strlcpy(Settings.sta_pwd[0], WiFi.psk().c_str(), sizeof(Settings.sta_pwd[0])); } Settings.sta_active = 0; - snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_WIFI D_WCFG_1_SMARTCONFIG D_CMND_SSID "1 %s, " D_CMND_PASSWORD "1 %s"), Settings.sta_ssid[0], Settings.sta_pwd[0]); + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_WIFI D_WCFG_1_SMARTCONFIG D_CMND_SSID "1 %s"), Settings.sta_ssid[0]); AddLog(LOG_LEVEL_INFO); } } diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index 1dc3eda52..c6dcab568 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -227,9 +227,9 @@ const char HTTP_FORM_WIFI[] PROGMEM = "
 " D_WIFI_PARAMETERS " 
" "" "
" D_AP1_SSID " (" STA_SSID1 ")

" - "
" D_AP1_PASSWORD "

" + "
" D_AP1_PASSWORD "

" "
" D_AP2_SSID " (" STA_SSID2 ")

" - "
" D_AP2_PASSWORD "

" + "
" D_AP2_PASSWORD "

" "
" D_HOSTNAME " (" WIFI_HOSTNAME ")

"; const char HTTP_FORM_MQTT[] PROGMEM = "
 " D_MQTT_PARAMETERS " " @@ -259,7 +259,7 @@ const char HTTP_FORM_LOG3[] PROGMEM = const char HTTP_FORM_OTHER[] PROGMEM = "
 " D_OTHER_PARAMETERS " " "" - "
" D_WEB_ADMIN_PASSWORD "

" + "
" D_WEB_ADMIN_PASSWORD "

" "
" D_MQTT_ENABLE "
"; const char HTTP_FORM_OTHER2[] PROGMEM = "
" D_FRIENDLY_NAME " {1 ({2)

"; @@ -1011,8 +1011,8 @@ void HandleSaveSettings() strlcpy(Settings.sta_pwd[0], (!strlen(tmp)) ? "" : (strchr(tmp,'*')) ? Settings.sta_pwd[0] : tmp, sizeof(Settings.sta_pwd[0])); WebGetArg("p2", tmp, sizeof(tmp)); strlcpy(Settings.sta_pwd[1], (!strlen(tmp)) ? "" : (strchr(tmp,'*')) ? Settings.sta_pwd[1] : tmp, sizeof(Settings.sta_pwd[1])); - snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_WIFI D_CMND_HOSTNAME " %s, " D_CMND_SSID "1 %s, " D_CMND_PASSWORD "1 %s, " D_CMND_SSID "2 %s, " D_CMND_PASSWORD "2 %s"), - Settings.hostname, Settings.sta_ssid[0], Settings.sta_pwd[0], Settings.sta_ssid[1], Settings.sta_pwd[1]); + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_WIFI D_CMND_HOSTNAME " %s, " D_CMND_SSID "1 %s, " D_CMND_SSID "2 %s"), + Settings.hostname, Settings.sta_ssid[0], Settings.sta_ssid[1]); AddLog(LOG_LEVEL_INFO); result += F("
" D_TRYING_TO_CONNECT "
"); break; diff --git a/sonoff/xdrv_00_mqtt.ino b/sonoff/xdrv_00_mqtt.ino index fa478b7a7..68b3c6a70 100644 --- a/sonoff/xdrv_00_mqtt.ino +++ b/sonoff/xdrv_00_mqtt.ino @@ -594,9 +594,11 @@ bool MqttCommand() else if (CMND_MQTTPASSWORD == command_code) { if ((data_len > 0) && (data_len < sizeof(Settings.mqtt_pwd))) { strlcpy(Settings.mqtt_pwd, (!strcmp(dataBuf,"0")) ? "" : (1 == payload) ? MQTT_PASS : dataBuf, sizeof(Settings.mqtt_pwd)); + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, Settings.mqtt_pwd); restart_flag = 2; + } else { + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_ASTERIX, command); } - snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, Settings.mqtt_pwd); } else if (CMND_FULLTOPIC == command_code) { if ((data_len > 0) && (data_len < sizeof(Settings.mqtt_fulltopic))) { From 2daba99e33a1647f1f9c01829ad6e8083526b8b2 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sun, 22 Apr 2018 14:01:32 +0200 Subject: [PATCH 101/136] Minor fixes --- README.md | 2 +- sonoff/language/cs-CZ.h | 4 ++-- sonoff/xsns_22_sr04.ino | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f7c00a1dd..16b220ff7 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ The following devices are supported: You can contribute to Sonoff-Tasmota by - providing Pull Requests (Features, Proof of Concepts, Language files or Fixes) - testing new released features and report issues -- donating to acquire hardware for testing and implementating or out of gratitude +- donating to acquire hardware for testing and implementing or out of gratitude [![donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://paypal.me/tasmota) diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h index fa641216d..51296a577 100644 --- a/sonoff/language/cs-CZ.h +++ b/sonoff/language/cs-CZ.h @@ -1,7 +1,7 @@ /* cs-CZ.h - localization for Czech with diacritics - Czech for Sonoff-Tasmota - Copyright (C) 2018 Vladimír Synekl + Copyright (C) 2018 Vladimír Synek This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -368,7 +368,7 @@ // xdrv_09_timers.ino #define D_CONFIGURE_TIMER "Nastavení Časovače" #define D_TIMER_PARAMETERS "Časovač" -#define D_TIMER_ARM "Zajistit" +#define D_TIMER_ARM "Aktivní" #define D_TIMER_TIME "Čas" #define D_TIMER_DAYS "Dny" #define D_TIMER_REPEAT "Opakovat" diff --git a/sonoff/xsns_22_sr04.ino b/sonoff/xsns_22_sr04.ino index 5a3a7dc87..59781cb0e 100644 --- a/sonoff/xsns_22_sr04.ino +++ b/sonoff/xsns_22_sr04.ino @@ -26,6 +26,7 @@ * - https://www.dfrobot.com/wiki/index.php/Weather-proof_Ultrasonic_Sensor_SKU_:_SEN0207 \*********************************************************************************************/ #define max(a,b) ((a)>(b)?(a):(b)) +#define min(a,b) ((a)<(b)?(a):(b)) uint8_t sr04_echo_pin = 0; uint8_t sr04_trig_pin = 0; @@ -71,7 +72,7 @@ boolean Sr04Read(uint16_t *distance) uint16_t Sr04Ping(uint16_t max_cm_distance) { uint16_t duration = 0; - uint16_t maxEchoTime, maxTime; + uint16_t maxEchoTime; maxEchoTime = min(max_cm_distance + 1, (uint16_t) MAX_SENSOR_DISTANCE + 1) * US_ROUNDTRIP_CM; @@ -89,7 +90,8 @@ uint16_t Sr04Ping(uint16_t max_cm_distance) return (duration > maxEchoTime) ? 0 : duration; } -uint16_t Sr04GetSamples(uint8_t it, uint16_t max_cm_distance) { +uint16_t Sr04GetSamples(uint8_t it, uint16_t max_cm_distance) +{ uint16_t uS[it]; uint16_t last; uint8_t j; From e6dbde4e43d687de77527310a11e37e336ee7bff Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sun, 22 Apr 2018 14:04:58 +0200 Subject: [PATCH 102/136] Only compile one environment to ease Travis --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index c3d38b9a2..1d6d4cc94 100644 --- a/platformio.ini +++ b/platformio.ini @@ -11,7 +11,7 @@ src_dir = sonoff ; *** Uncomment one of the lines below to build/upload only one environment -;env_default = sonoff +env_default = sonoff ;env_default = sonoff-minimal ;env_default = sonoff-xxl ;env_default = sonoff-BG From d42ecbcb8fde730f3fde320338c04b72d133ad76 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sun, 22 Apr 2018 14:47:03 +0200 Subject: [PATCH 103/136] Compile all of them. --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 1d6d4cc94..c3d38b9a2 100644 --- a/platformio.ini +++ b/platformio.ini @@ -11,7 +11,7 @@ src_dir = sonoff ; *** Uncomment one of the lines below to build/upload only one environment -env_default = sonoff +;env_default = sonoff ;env_default = sonoff-minimal ;env_default = sonoff-xxl ;env_default = sonoff-BG From 1669e6263982b5a8a2d46cd524a02fd4cbec0f55 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sun, 22 Apr 2018 16:56:51 +0200 Subject: [PATCH 104/136] update picture --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 16b220ff7..f7b285e56 100644 --- a/README.md +++ b/README.md @@ -46,8 +46,8 @@ The following devices are supported: - [iTead Sonoff Dual (R2)](https://www.itead.cc/smart-home/sonoff-dual.html) - [iTead Sonoff Pow with Energy Monitoring](https://www.itead.cc/smart-home/sonoff-pow.html) - [iTead Sonoff Pow R2 with Energy Monitoring](https://www.itead.cc/sonoff-pow-r2.html) -- [iTead Sonoff 4CH](https://www.itead.cc/smart-home/sonoff-4ch.html) -- [iTead Sonoff 4CH Pro](https://www.itead.cc/smart-home/sonoff-4ch-pro.html) +- [iTead Sonoff 4CH (R2)](https://www.itead.cc/smart-home/sonoff-4ch.html) +- [iTead Sonoff 4CH Pro (R2)](https://www.itead.cc/smart-home/sonoff-4ch-pro.html) - [iTead S20 Smart Socket](https://www.itead.cc/smart-socket.html) - [Sonoff S22 Smart Socket](https://github.com/arendst/Sonoff-Tasmota/issues/627) - [iTead Sonoff S31 Smart Socket with Energy Monitoring](https://www.itead.cc/sonoff-s31.html) @@ -55,7 +55,7 @@ The following devices are supported: - [iTead Sonoff Touch](https://www.itead.cc/sonoff-touch.html) - [iTead Sonoff T1](https://www.itead.cc/sonoff-t1.html) - [iTead Sonoff SC](https://www.itead.cc/sonoff-sc.html) -- [iTead Sonoff Led](https://www.itead.cc/sonoff-led.html) +- [iTead Sonoff Led](https://www.itead.cc/sonoff-led.html) - [iTead Sonoff BN-SZ01 Ceiling Led](https://www.itead.cc/bn-sz01.html) - [iTead Sonoff B1](https://www.itead.cc/sonoff-b1.html) - [iTead Sonoff RF Bridge 433](https://www.itead.cc/sonoff-rf-bridge-433.html) From 8fea3e49a8611da9af39b693d6f9a16d15c37492 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 23 Apr 2018 11:37:46 +0200 Subject: [PATCH 105/136] 5.12.0m - Changes and Fixes 5.12.0m * Remove sonoff-xxl * Add sonoff-classic, sonoff-allsensors and sonoff-knx * Add some coloring to important web buttons * Add user selectable defines for Sunrise/set Dawn option (#2378) * Add GPIO_User to GPIO02 for all Sonoff T1 (#2524) --- platformio.ini | 92 ++++++++++++++++++++++++++------------- sonoff/_releasenotes.ino | 7 ++- sonoff/sonoff.h | 6 +++ sonoff/sonoff_post.h | 86 ++++++++++++++++++++++++++++++++++-- sonoff/sonoff_template.h | 6 +-- sonoff/user_config.h | 15 ++++++- sonoff/webserver.ino | 12 +++-- sonoff/xdrv_09_timers.ino | 3 +- sonoff/xdrv_11_knx.ino | 6 ++- 9 files changed, 186 insertions(+), 47 deletions(-) diff --git a/platformio.ini b/platformio.ini index c3d38b9a2..c74fe3c8d 100644 --- a/platformio.ini +++ b/platformio.ini @@ -13,8 +13,11 @@ src_dir = sonoff ; *** Uncomment one of the lines below to build/upload only one environment ;env_default = sonoff ;env_default = sonoff-minimal -;env_default = sonoff-xxl +;env_default = sonoff-classic +;env_default = sonoff-knx +;env_default = sonoff-allsensors ;env_default = sonoff-BG +;env_default = sonoff-CN ;env_default = sonoff-CZ ;env_default = sonoff-DE ;env_default = sonoff-ES @@ -26,7 +29,6 @@ src_dir = sonoff ;env_default = sonoff-PL ;env_default = sonoff-PT ;env_default = sonoff-RU -;env_default = sonoff-CN ;env_default = sonoff-TW [env:sonoff] @@ -71,7 +73,35 @@ extra_scripts = pio/strip-floats.py ; Serial Monitor options monitor_baud = 115200 -[env:sonoff-xxl] +[env:sonoff-classic] +;platform = espressif8266@1.5.0 ; v2.3.0 +;platform = espressif8266@1.6.0 ; v2.4.0 +platform = espressif8266 +framework = arduino +board = esp01_1m +board_flash_mode = dout +build_flags = -Wl,-Tesp8266.flash.1m0.ld -DUSE_CLASSIC +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DUSE_CLASSIC -DUSE_CONFIG_OVERRIDE +extra_scripts = pio/strip-floats.py + +; Serial Monitor options +monitor_baud = 115200 + +[env:sonoff-knx] +;platform = espressif8266@1.5.0 ; v2.3.0 +;platform = espressif8266@1.6.0 ; v2.4.0 +platform = espressif8266 +framework = arduino +board = esp01_1m +board_flash_mode = dout +build_flags = -Wl,-Tesp8266.flash.1m0.ld -DUSE_KNX_NO_EMULATION +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DUSE_KNX_NO_EMULATION -DUSE_CONFIG_OVERRIDE +extra_scripts = pio/strip-floats.py + +; Serial Monitor options +monitor_baud = 115200 + +[env:sonoff-allsensors] ;platform = espressif8266@1.5.0 ; v2.3.0 ;platform = espressif8266@1.6.0 ; v2.4.0 platform = espressif8266 @@ -85,20 +115,6 @@ extra_scripts = pio/strip-floats.py ; Serial Monitor options monitor_baud = 115200 -[env:sonoff-CZ] -;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=cs-CZ -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=cs-CZ -DUSE_CONFIG_OVERRIDE -extra_scripts = pio/strip-floats.py - -; *** Serial Monitor options -monitor_baud = 115200 - [env:sonoff-BG] ;platform = espressif8266@1.5.0 ; v2.3.0 ;platform = espressif8266@1.6.0 ; v2.4.0 @@ -113,6 +129,34 @@ extra_scripts = pio/strip-floats.py ; *** Serial Monitor options monitor_baud = 115200 +[env:sonoff-CN] +;platform = espressif8266@1.5.0 ; v2.3.0 +;platform = espressif8266@1.6.0 ; v2.4.0 +platform = espressif8266 +framework = arduino +board = esp01_1m +board_flash_mode = dout +build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=zh-CN +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=zh-CN -DUSE_CONFIG_OVERRIDE +extra_scripts = pio/strip-floats.py + +; *** Serial Monitor options +monitor_baud = 115200 + +[env:sonoff-CZ] +;platform = espressif8266@1.5.0 ; v2.3.0 +;platform = espressif8266@1.6.0 ; v2.4.0 +platform = espressif8266 +framework = arduino +board = esp01_1m +board_flash_mode = dout +build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=cs-CZ +;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=cs-CZ -DUSE_CONFIG_OVERRIDE +extra_scripts = pio/strip-floats.py + +; *** Serial Monitor options +monitor_baud = 115200 + [env:sonoff-DE] ;platform = espressif8266@1.5.0 ; v2.3.0 ;platform = espressif8266@1.6.0 ; v2.4.0 @@ -253,20 +297,6 @@ extra_scripts = pio/strip-floats.py ; *** Serial Monitor options monitor_baud = 115200 -[env:sonoff-CN] -;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=zh-CN -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=zh-CN -DUSE_CONFIG_OVERRIDE -extra_scripts = pio/strip-floats.py - -; *** Serial Monitor options -monitor_baud = 115200 - [env:sonoff-TW] ;platform = espressif8266@1.5.0 ; v2.3.0 ;platform = espressif8266@1.6.0 ; v2.4.0 diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 1c2269538..454f24137 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,11 +1,16 @@ /* 5.12.0m * Reinit timers to accomodate random window (#2447) + * Remove sonoff-xxl + * Add sonoff-classic, sonoff-allsensors and sonoff-knx + * Add some coloring to important web buttons + * Add user selectable defines for Sunrise/set Dawn option (#2378) * Add random window to timers (#2447) * Add optional KNX IP Protocol Support (#2402) * Add Greek language file (#2491) * Add Bulgarian language file * Add support for sensor HC-SR04 ultrasonic (#113, #1964, #2444) * Add support for Sonoff Pow R2 (#2340) + * Add GPIO_User to GPIO02 for all Sonoff T1 (#2524) * Fix compile error when using ESP/Arduino library v2.3.0 by reverting KNX async UDP library to default UDP library (#2488, #2492, #2493) * Fix configuration filename truncation when it contains spaces (#2484, #2490) * @@ -111,7 +116,7 @@ * Add support for sensor SHTC3 (#1967) * * 5.12.0a - * Change platformio option sonoff-ds18x20 to sonoff-xxl enabling ds18x20 and all other sensors in one image + * Change platformio option sonoff-ds18x20 to sonoff-allsensors enabling ds18x20 and all other sensors in one image * Fix providing web page configuratin option for Friendly Name when no device (relay or light) is configured (#1850) * Change default parameters in user_config.h to undefined for easy installation (#1851) * Change max user configurable hold time from 10 to 25 seconds (#1851) diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index 2a2bb58ce..296046c85 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -127,6 +127,12 @@ typedef unsigned long power_t; // Power (Relay) type #define MQTT_TASMOTAMQTT 2 // Mqtt TasmotaMqtt library based on esp-mqtt-arduino #define MQTT_ESPMQTTARDUINO 3 // Mqtt esp-mqtt-arduino library by Ingo Randolf +// Sunrise and Sunset DawnType +#define DAWN_NORMAL -0.8333 +#define DAWN_CIVIL -6.0 +#define DAWN_NAUTIC -12.0 +#define DAWN_ASTRONOMIC -18.0 + /*********************************************************************************************\ * Enumeration \*********************************************************************************************/ diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h index 09d68f89a..1d6ba7878 100644 --- a/sonoff/sonoff_post.h +++ b/sonoff/sonoff_post.h @@ -20,6 +20,10 @@ #ifndef _SONOFF_POST_H_ #define _SONOFF_POST_H_ +/*********************************************************************************************\ + * Function declarations +\*********************************************************************************************/ + #ifdef __cplusplus extern "C" { #endif @@ -38,9 +42,18 @@ void WifiWpsStatusCallback(wps_cb_status status); void KNX_CB_Action(message_t const &msg, void *arg); //#endif // USE_KNX +/*********************************************************************************************\ + * Default global defines +\*********************************************************************************************/ + #define USE_DHT // Default DHT11 sensor needs no external library -#ifdef USE_ALL_SENSORS // ===================== Configure sonoff-xxl.bin ========================= +/*********************************************************************************************\ + * [sonoff-allsensors.bin] + * Provide an image with all supported sensors enabled +\*********************************************************************************************/ + +#ifdef USE_ALL_SENSORS #define USE_ADC_VCC // Display Vcc in Power status. Disable for use as Analog input on selected devices #define USE_DS18x20 // For more than one DS18x20 sensors with id sort, single scan and read retry (+1k3 code) //#define USE_DS18x20_LEGACY // For more than one DS18x20 sensors with dynamic scan using library OneWire (+1k5 code) @@ -80,14 +93,75 @@ void KNX_CB_Action(message_t const &msg, void *arg); // #define USE_WS2812_DMA // DMA supports only GPIO03 (= Serial RXD) (+1k mem). When USE_WS2812_DMA is enabled expect Exceptions on Pow #define USE_ARILUX_RF // Add support for Arilux RF remote controller (+0k8 code, 252 iram (non 2.3.0)) #define USE_SR04 // Add support for HC-SR04 ultrasonic devices (+1k code) -#endif // USE_ALL_SENSORS ===================== +#endif // USE_ALL_SENSORS + +/*********************************************************************************************\ + * [sonoff-classic.bin] + * Provide an image close to version 5.12.0 but still within 499k program space to allow one time OTA +\*********************************************************************************************/ + +#ifdef USE_CLASSIC +#ifdef USE_KNX +#undef USE_KNX +#endif +#ifdef USE_TIMERS +#undef USE_TIMERS +#endif +#ifdef USE_TIMERS_WEB +#undef USE_TIMERS_WEB +#endif +#ifdef USE_SUNRISE +#undef USE_SUNRISE +#endif +#ifdef USE_RULES +#undef USE_RULES +#endif +#ifdef USE_SGP30 +#undef USE_SGP30 +#endif +#ifdef USE_NOVA_SDS +#undef USE_NOVA_SDS +#endif +#ifdef USE_IR_RECEIVE +#undef USE_IR_RECEIVE +#endif +#ifdef USE_SERIAL_BRIDGE +#undef USE_SERIAL_BRIDGE +#endif +#ifdef USE_SR04 +#undef USE_SR04 +#endif +#endif // USE_CLASSIC + +/*********************************************************************************************\ + * [sonoff-knx.bin] + * Provide a dedicated KNX image allowing enough code and memory space +\*********************************************************************************************/ + +#ifdef USE_KNX_NO_EMULATION +#ifndef USE_KNX +#define USE_KNX // Enable KNX IP Protocol Support (+23k code, +3k3 mem) +#endif +#ifdef USE_EMULATION +#undef USE_EMULATION // Disable Belkin WeMo and Hue Bridge emulation for Alexa (-16k code, -2k mem) +#endif +#endif // USE_KNX_NO_EMULATION + +/*********************************************************************************************\ + * Mandatory define for DS18x20 if changed by above image selections +\*********************************************************************************************/ #if defined(USE_DS18x20) || defined(USE_DS18x20_LEGACY) #else #define USE_DS18B20 // Default DS18B20 sensor needs no external library #endif -#ifdef BE_MINIMAL // ========================== Configure sonoff-minimal.bin ===================== +/*********************************************************************************************\ + * [sonoff-minimal.bin] + * Provide the smallest image possible while still enabling a webserver for intermediate image load +\*********************************************************************************************/ + +#ifdef BE_MINIMAL #ifdef USE_MQTT_TLS #undef USE_MQTT_TLS // Disable TLS support won't work as the MQTTHost is not set #endif @@ -169,7 +243,11 @@ void KNX_CB_Action(message_t const &msg, void *arg); #ifdef DEBUG_THEO #undef DEBUG_THEO // Disable debug code #endif -#endif // BE_MINIMAL ========================== +#endif // BE_MINIMAL + +/*********************************************************************************************\ + * Mandatory defines satisfying possible disabled defines +\*********************************************************************************************/ #ifndef SWITCH_MODE #define SWITCH_MODE TOGGLE // TOGGLE, FOLLOW or FOLLOW_INV (the wall switch state) diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h index b3f95152f..dc0746ec7 100644 --- a/sonoff/sonoff_template.h +++ b/sonoff/sonoff_template.h @@ -608,7 +608,7 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { { "Sonoff T1 1CH", // Sonoff T1 1CH (ESP8285) GPIO_KEY1, // GPIO00 Button 1 GPIO_USER, // GPIO01 Serial RXD and Optional sensor - 0, + GPIO_USER, // GPIO02 Optional Sensor (J3 Pin 5) GPIO_USER, // GPIO03 Serial TXD and Optional sensor 0, 0, 0, 0, 0, // Flash connection @@ -621,7 +621,7 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { { "Sonoff T1 2CH", // Sonoff T1 2CH (ESP8285) GPIO_KEY1, // GPIO00 Button 1 GPIO_USER, // GPIO01 Serial RXD and Optional sensor - 0, + GPIO_USER, // GPIO02 Optional Sensor (J3 Pin 5) GPIO_USER, // GPIO03 Serial TXD and Optional sensor 0, GPIO_REL2, // GPIO05 Blue Led and Relay 2 (0 = Off, 1 = On) @@ -636,7 +636,7 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { { "Sonoff T1 3CH", // Sonoff T1 3CH (ESP8285) GPIO_KEY1, // GPIO00 Button 1 GPIO_USER, // GPIO01 Serial RXD and Optional sensor - 0, + GPIO_USER, // GPIO02 Optional Sensor (J3 Pin 5) GPIO_USER, // GPIO03 Serial TXD and Optional sensor GPIO_REL3, // GPIO04 Blue Led and Relay 3 (0 = Off, 1 = On) GPIO_REL2, // GPIO05 Blue Led and Relay 2 (0 = Off, 1 = On) diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 05950abd0..92dd23dda 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -228,6 +228,7 @@ #define USE_TIMERS // Add support for up to 16 timers (+2k2 code) #define USE_TIMERS_WEB // Add timer webpage support (+4k5 code) #define USE_SUNRISE // Add support for Sunrise and sunset tools (+16k) + #define SUNRISE_DAWN_ANGLE DAWN_NORMAL // Select desired Dawn Angle from (DAWN_NORMAL, DAWN_CIVIL, DAWN_NAUTIC, DAWN_ASTRONOMIC) // -- Rules --------------------------------------- #define USE_RULES // Add support for rules (+4k4 code) @@ -288,11 +289,23 @@ #define USE_SR04 // Add support for HC-SR04 ultrasonic devices (+1k code) +/*********************************************************************************************\ + * Select features and sensors enabled in previous version saving space +\*********************************************************************************************/ + +//#define USE_CLASSIC // Create sonoff-classic (See sonoff_post.h for selected features) + /*********************************************************************************************\ * Select all sensors - overrides above undefines!! \*********************************************************************************************/ -//#define USE_ALL_SENSORS // Create sonoff-xxl with all sensors enabled (See sonoff_post.h for selected sensors) +//#define USE_ALL_SENSORS // Create sonoff-allsensors with all sensors enabled (See sonoff_post.h for selected sensors) + +/*********************************************************************************************\ + * Select KNX without Emulation to save space +\*********************************************************************************************/ + +//#define USE_KNX_NO_EMULATION // Create sonoff-knx with KNX but without Emulation (See sonoff_post.h) /*********************************************************************************************\ * Compile a minimal version if upgrade memory gets tight ONLY TO BE USED FOR UPGRADE STEP 1! diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index c6dcab568..e7d9262be 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -89,7 +89,11 @@ const char HTTP_HEAD_STYLE[] PROGMEM = "body{text-align:center;font-family:verdana;}" "td{padding:0px;}" "button{border:0;border-radius:0.3rem;background-color:#1fa3ec;color:#fff;line-height:2.4rem;font-size:1.2rem;width:100%;-webkit-transition-duration:0.4s;transition-duration:0.4s;cursor:pointer;}" - "button:hover{background-color:#006cba;}" + "button:hover{background-color:#0e70a4;}" + ".bred{background-color:#d43535;}" + ".bred:hover{background-color:#931f1f;}" + ".bgrn{background-color:#47c266;}" + ".bgrn:hover{background-color:#5aaf6f;}" "a{text-decoration:none;}" ".p{float:left;text-align:left;}" ".q{float:right;text-align:right;}" @@ -180,7 +184,7 @@ const char HTTP_BTN_MENU1[] PROGMEM = "
" "
"; const char HTTP_BTN_RSTRT[] PROGMEM = - "
"; + "
"; const char HTTP_BTN_MENU_MODULE[] PROGMEM = "
"; #if defined(USE_TIMERS) && defined(USE_TIMERS_WEB) @@ -202,7 +206,7 @@ const char HTTP_BTN_MENU4[] PROGMEM = "
" "
" "
" - "
" + "
" "
" "
"; const char HTTP_BTN_MAIN[] PROGMEM = @@ -270,7 +274,7 @@ const char HTTP_FORM_OTHER3b[] PROGMEM = "
{3{4"; // Different id only used for labels #endif // USE_EMULATION const char HTTP_FORM_END[] PROGMEM = - "
"; + "
"; const char HTTP_FORM_RST[] PROGMEM = "
" "
 " D_RESTORE_CONFIGURATION " "; diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino index 0ffe94f55..26b23b258 100644 --- a/sonoff/xdrv_09_timers.ino +++ b/sonoff/xdrv_09_timers.ino @@ -124,7 +124,8 @@ void DuskTillDawn(uint8_t *hour_up,uint8_t *minute_up, uint8_t *hour_down, uint8 h (D) = -12.0 nautische Dämmerung h (D) = -18.0 astronomische Dämmerung */ - double h = -50/60.0*RAD; +// double h = -50/60.0*RAD; + double h = SUNRISE_DAWN_ANGLE *RAD; double B = (((double)Settings.latitude)/1000000) * RAD; // geographische Breite double GeographischeLaenge = ((double)Settings.longitude)/1000000; // double Zeitzone = 0; //Weltzeit diff --git a/sonoff/xdrv_11_knx.ino b/sonoff/xdrv_11_knx.ino index 76fc1cf0c..7084973b9 100644 --- a/sonoff/xdrv_11_knx.ino +++ b/sonoff/xdrv_11_knx.ino @@ -596,7 +596,8 @@ const char HTTP_FORM_KNX_ADD_BTN[] PROGMEM = const char HTTP_FORM_KNX_ADD_TABLE_ROW[] PROGMEM = "{optex} -> GAfnum / GAarea / GAfdef " - ""; +// ""; + ""; const char HTTP_FORM_KNX3[] PROGMEM = "

" @@ -608,7 +609,8 @@ const char HTTP_FORM_KNX4[] PROGMEM = const char HTTP_FORM_KNX_ADD_TABLE_ROW2[] PROGMEM = "GAfnum / GAarea / GAfdef -> {optex}" - ""; +// ""; + ""; void HandleKNXConfiguration() From c3c4e48b74f38e1a07379809a47e0dc64bf971eb Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 23 Apr 2018 12:38:15 +0200 Subject: [PATCH 106/136] Add stale and see what happens... --- .github/stale.yml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/stale.yml diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 000000000..43d5e77f3 --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,40 @@ +# Number of days of inactivity before an Issue or Pull Request becomes stale +daysUntilStale: 120 + +# Number of days of inactivity before a stale Issue or Pull Request is closed. +# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale. +daysUntilClose: 14 + +# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable +exemptLabels: + - pinned + - security + - enhancement + - bug + +# Set to true to ignore issues in a project (defaults to false) +exemptProjects: false + +# Set to true to ignore issues in a milestone (defaults to false) +exemptMilestones: false + +# Label to use when marking as stale +staleLabel: stale + +# Comment to post when marking as stale. Set to `false` to disable +markComment: > + This issue has been automatically marked as stale because it has not had + recent activity. It will be closed if no further activity occurs. Thank you + for your contributions. +# Comment to post when removing the stale label. +# unmarkComment: > +# Your comment here. + +# Comment to post when closing a stale Issue or Pull Request. +closeComment: > + This issue will be auto-closed because there hasn't been any activity for a few months. Feel free to open a new one if you still experience this problem. +# Limit the number of actions per hour, from 1-30. Default is 30 +limitPerRun: 30 + +# Limit to only `issues` or `pulls` +only: issues From 883fb041d7a83cee39357b437d5d1d8c26b6baba Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 23 Apr 2018 16:59:04 +0200 Subject: [PATCH 107/136] Add firmware info and Credits --- README.md | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 105 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f7b285e56..b5e83f708 100644 --- a/README.md +++ b/README.md @@ -16,11 +16,9 @@ If you like **Sonoff-Tasmota**, give it a star, or fork it and contribute! Current version is **5.12.0m** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### Quick install - Download one of the released binaries from https://github.com/arendst/Sonoff-Tasmota/releases and flash it to your hardware as documented in the wiki. ### Important User Compilation Information - If you want to compile Sonoff-Tasmota yourself keep in mind the following: - Only Flash Mode **DOUT** is supported. Do not use Flash Mode DIO / QIO / QOUT as it might seem to brick your device. See [Wiki](https://github.com/arendst/Sonoff-Tasmota/wiki/Theo's-Tasmota-Tips) for background information. @@ -28,7 +26,6 @@ If you want to compile Sonoff-Tasmota yourself keep in mind the following: - To make compile time changes to Sonoff-Tasmota it can use the ``user_config_override.h`` file. It assures keeping your settings when you download and compile a new version. To use ``user_config.override.h`` you will have to make a copy of the provided ``user_config.override_sample.h`` file and add your setting overrides. To enable the override file you will need to use a compile define as documented in the ``user_config_override_sample.h`` file. ### Version Information - - Sonoff-Tasmota provides all (Sonoff) modules in one file and starts with module Sonoff Basic. - Once uploaded select module using the configuration webpage or the commands ```Modules``` and ```Module```. - After reboot select config menu again or use commands ```GPIOs``` and ```GPIO``` to change GPIO with desired sensor. @@ -71,8 +68,72 @@ The following devices are supported: - [Luani HVIO board](https://luani.de/projekte/esp8266-hvio/) - Wemos D1 mini, NodeMcu and Ledunia -### Contribute +### Firmware release information +Different firmware images are released based on Features and Sensors selection guided by code and memory usage. +- The Minimal version allows intermediate OTA uploads to support larger versions and does NOT change any persistent parameter. +- The Classic version allows single OTA uploads as did the previous Sonoff-Tasmota versions. + +| Typical file size | sonoff | classic | minimal | knx | allsensors | +|--------------------------------|--------|---------|---------|------|------------| +| ESP/Arduino lib v2.3.0 | 526k | 488k | 427k | 535k | 549k | +| ESP/Arduino lib v2.4.0 | 531k | 496k | 435k | 540k | 552k | +| ESP/Arduino lib v2.4.1 | 533k | 498k | 436k | 542k | 554k | + +| Feature | sonoff | classic | minimal | knx | allsensors | +|--------------------------------|--------|---------|---------|-----|------------| +| MY_LANGUAGE en-GB | x | x | x | x | x | +| MQTT_LIBRARY_TYPE PUBSUBCLIENT | x | x | x | x | x | +| USE_DOMOTICZ | x | x | - | x | x | +| USE_HOME_ASSISTANT | x | x | - | x | x | +| USE_MQTT_TLS | - | - | - | - | - | +| USE_KNX | - | - | - | x | - | +| USE_WEBSERVER | x | x | x | x | x | +| USE_EMULATION | x | x | - | - | x | +| USE_DISCOVERY | x | x | - | x | x | +| WEBSERVER_ADVERTISE | x | x | - | x | x | +| MQTT_HOST_DISCOVERY | x | x | - | x | x | +| USE_TIMERS | x | - | - | x | x | +| USE_TIMERS_WEB | x | - | - | x | x | +| USE_SUNRISE | x | - | - | x | x | +| USE_RULES | x | - | - | x | x | + +| Sensor | sonoff | classic | minimal | knx | allsensors | +|--------------------------------|--------|---------|---------|-----|------------| +| USE_ADC_VCC | x | x | x | x | x | +| USE_DS18B20 | x | x | - | x | - | +| USE_DS18x20 | - | - | - | - | x | +| USE_DS18x20_LEGACY | - | - | - | - | - | +| USE_I2C | x | x | - | x | x | +| USE_SHT | x | x | - | x | x | +| USE_SHT3X | x | x | - | x | x | +| USE_HTU | x | x | - | x | x | +| USE_BMP | x | x | - | x | x | +| USE_BME680 | - | - | - | - | x | +| USE_SGP30 | x | - | - | x | x | +| USE_BH1750 | x | x | - | x | x | +| USE_VEML6070 | - | - | - | - | x | +| USE_TSL2561 | - | - | - | - | x | +| USE_ADS1115 | - | - | - | - | x | +| USE_ADS1115_I2CDEV | - | - | - | - | - | +| USE_INA219 | - | - | - | - | x | +| USE_MGS | - | - | - | - | x | +| USE_SPI | - | - | - | - | - | +| USE_MHZ19 | x | x | - | x | x | +| USE_SENSEAIR | x | x | - | x | x | +| USE_PMS5003 | x | x | - | x | x | +| USE_NOVA_SDS | x | - | - | x | x | +| USE_PZEM004T | x | x | - | x | x | +| USE_SERIAL_BRIDGE | x | - | - | x | x | +| USE_IR_REMOTE | x | x | - | x | x | +| USE_IR_HVAC | - | - | - | - | x | +| USE_IR_RECEIVE | x | - | - | x | x | +| USE_WS2812 | x | x | - | x | x | +| USE_WS2812_DMA | - | - | - | - | - | +| USE_ARILUX_RF | x | x | - | x | x | +| USE_SR04 | x | - | - | x | x | + +### Contribute You can contribute to Sonoff-Tasmota by - providing Pull Requests (Features, Proof of Concepts, Language files or Fixes) - testing new released features and report issues @@ -80,6 +141,46 @@ You can contribute to Sonoff-Tasmota by [![donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://paypal.me/tasmota) +### Credits +Libraries used with Sonoff-Tasmota are: +- [ESP8266 core for Arduino](https://github.com/esp8266/Arduino) +- [Adafruit BME680](https://github.com/adafruit/Adafruit_BME680) +- [Adafruit Sensor](https://github.com/adafruit/Adafruit_Sensor) +- [Adafruit SGP30](https://github.com/adafruit/Adafruit_SGP30) +- [ArduinoJson](https://arduinojson.org/) +- [Esp8266MqttClient](https://github.com/tuanpmt/ESP8266MQTTClient) +- [esp-knx-ip](https://github.com/envy/esp-knx-ip) +- [esp-mqtt-arduino](https://github.com/i-n-g-o/esp-mqtt-arduino) +- [I2Cdevlib](https://github.com/jrowberg/i2cdevlib) +- [IRremoteEsp8266](https://github.com/markszabo/IRremoteESP8266) +- [JobaTsl2561](https://github.com/joba-1/Joba_Tsl2561) +- [MultiChannelGasSensor](http://wiki.seeedstudio.com/Grove-Multichannel_Gas_Sensor/) +- [NeoPixelBus](https://github.com/Makuna/NeoPixelBus) +- [OneWire](https://github.com/PaulStoffregen/OneWire) +- [PubSubClient](https://github.com/knolleary/pubsubclient) + +People helping to keep the show on the road: +- David Lang for providing initial issue resolution and code optimizations +- Heiko Krupp for his IRSend, HTU21, SI70xx and Wemo/Hue emulation drivers +- Wiktor Schmidt for Travis CI implementation +- Thom Dietrich for PlatformIO optimizations +- Marinus van den Broek for his EspEasy based inspiration +- Pete Ba for more user friendly energy monitor calibration +- Lobradov providing compile optimization tips +- Flexiti for his initial timer implementation +- reloxx13 for his [SonWeb](https://github.com/reloxx13/SonWEB) management tool +- Joachim Banzhaf for his TSL2561 library and driver +- Gijs Noorlander for his MHZ19 and SenseAir drivers +- Emontnemery for his HomeAssistant Discovery concept and many code tuning tips +- Aidan Mountford for his HSB support +- Daniel Ztolnai for his inspiring Serial Bridge implementation +- Gerhard Mutz for his SGP30 and Sunrise/Sunset driver +- Nuno Ferreira for his HC-SR04 driver +- Adrian Scillato for his (security)fixes and implementing and maintaining KNX +- Raymond Mouthaan for managing Wemos Wiki information +- Norbert Richter, Frogmore42 and Jason2866 for providing many issue answers +- Many more providing Tips, Pocs or PRs + ### License This program is licensed under GPL-3.0 From 40ea11af73990561adcfa9dc12b7be4d85ff4fb8 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 23 Apr 2018 17:08:41 +0200 Subject: [PATCH 108/136] Lay-out update --- README.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b5e83f708..5ed1a06e1 100644 --- a/README.md +++ b/README.md @@ -74,13 +74,17 @@ Different firmware images are released based on Features and Sensors selection g - The Minimal version allows intermediate OTA uploads to support larger versions and does NOT change any persistent parameter. - The Classic version allows single OTA uploads as did the previous Sonoff-Tasmota versions. -| Typical file size | sonoff | classic | minimal | knx | allsensors | +#### Typical file size. + +| ESP/Arduino library version | sonoff | classic | minimal | knx | allsensors | |--------------------------------|--------|---------|---------|------|------------| | ESP/Arduino lib v2.3.0 | 526k | 488k | 427k | 535k | 549k | | ESP/Arduino lib v2.4.0 | 531k | 496k | 435k | 540k | 552k | | ESP/Arduino lib v2.4.1 | 533k | 498k | 436k | 542k | 554k | -| Feature | sonoff | classic | minimal | knx | allsensors | +#### Available Features and Sensors. + +| Feature or Sensor | sonoff | classic | minimal | knx | allsensors | |--------------------------------|--------|---------|---------|-----|------------| | MY_LANGUAGE en-GB | x | x | x | x | x | | MQTT_LIBRARY_TYPE PUBSUBCLIENT | x | x | x | x | x | @@ -97,9 +101,7 @@ Different firmware images are released based on Features and Sensors selection g | USE_TIMERS_WEB | x | - | - | x | x | | USE_SUNRISE | x | - | - | x | x | | USE_RULES | x | - | - | x | x | - -| Sensor | sonoff | classic | minimal | knx | allsensors | -|--------------------------------|--------|---------|---------|-----|------------| +| | | | | | | | USE_ADC_VCC | x | x | x | x | x | | USE_DS18B20 | x | x | - | x | - | | USE_DS18x20 | - | - | - | - | x | @@ -132,6 +134,7 @@ Different firmware images are released based on Features and Sensors selection g | USE_WS2812_DMA | - | - | - | - | - | | USE_ARILUX_RF | x | x | - | x | x | | USE_SR04 | x | - | - | x | x | +| | sonoff | classic | minimal | knx | allsensors | ### Contribute You can contribute to Sonoff-Tasmota by @@ -164,7 +167,7 @@ People helping to keep the show on the road: - Heiko Krupp for his IRSend, HTU21, SI70xx and Wemo/Hue emulation drivers - Wiktor Schmidt for Travis CI implementation - Thom Dietrich for PlatformIO optimizations -- Marinus van den Broek for his EspEasy based inspiration +- Marinus van den Broek for his EspEasy inspiration - Pete Ba for more user friendly energy monitor calibration - Lobradov providing compile optimization tips - Flexiti for his initial timer implementation From ee0ca1631fc4769be114abed71efe0074fec45ac Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 23 Apr 2018 17:10:50 +0200 Subject: [PATCH 109/136] Lay-out update2 --- README.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 5ed1a06e1..c2d00f6a1 100644 --- a/README.md +++ b/README.md @@ -74,14 +74,6 @@ Different firmware images are released based on Features and Sensors selection g - The Minimal version allows intermediate OTA uploads to support larger versions and does NOT change any persistent parameter. - The Classic version allows single OTA uploads as did the previous Sonoff-Tasmota versions. -#### Typical file size. - -| ESP/Arduino library version | sonoff | classic | minimal | knx | allsensors | -|--------------------------------|--------|---------|---------|------|------------| -| ESP/Arduino lib v2.3.0 | 526k | 488k | 427k | 535k | 549k | -| ESP/Arduino lib v2.4.0 | 531k | 496k | 435k | 540k | 552k | -| ESP/Arduino lib v2.4.1 | 533k | 498k | 436k | 542k | 554k | - #### Available Features and Sensors. | Feature or Sensor | sonoff | classic | minimal | knx | allsensors | @@ -134,7 +126,14 @@ Different firmware images are released based on Features and Sensors selection g | USE_WS2812_DMA | - | - | - | - | - | | USE_ARILUX_RF | x | x | - | x | x | | USE_SR04 | x | - | - | x | x | -| | sonoff | classic | minimal | knx | allsensors | + +#### Typical file size. + +| ESP/Arduino library version | sonoff | classic | minimal | knx | allsensors | +|--------------------------------|--------|---------|---------|------|------------| +| ESP/Arduino lib v2.3.0 | 526k | 488k | 427k | 535k | 549k | +| ESP/Arduino lib v2.4.0 | 531k | 496k | 435k | 540k | 552k | +| ESP/Arduino lib v2.4.1 | 533k | 498k | 436k | 542k | 554k | ### Contribute You can contribute to Sonoff-Tasmota by From c432d41eb5e272292872d86cc6af6fcbe6f16698 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 23 Apr 2018 17:14:19 +0200 Subject: [PATCH 110/136] Updated lay-out --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index c2d00f6a1..608843f54 100644 --- a/README.md +++ b/README.md @@ -144,6 +144,8 @@ You can contribute to Sonoff-Tasmota by [![donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://paypal.me/tasmota) ### Credits + +#### Libraries used Libraries used with Sonoff-Tasmota are: - [ESP8266 core for Arduino](https://github.com/esp8266/Arduino) - [Adafruit BME680](https://github.com/adafruit/Adafruit_BME680) @@ -161,6 +163,7 @@ Libraries used with Sonoff-Tasmota are: - [OneWire](https://github.com/PaulStoffregen/OneWire) - [PubSubClient](https://github.com/knolleary/pubsubclient) +#### People inspiring me People helping to keep the show on the road: - David Lang for providing initial issue resolution and code optimizations - Heiko Krupp for his IRSend, HTU21, SI70xx and Wemo/Hue emulation drivers From e32e9ee6c28e77b514ff06e01143fa5696d60cd9 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 23 Apr 2018 17:18:24 +0200 Subject: [PATCH 111/136] updates --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 608843f54..a15c9ab91 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ Different firmware images are released based on Features and Sensors selection g - The Minimal version allows intermediate OTA uploads to support larger versions and does NOT change any persistent parameter. - The Classic version allows single OTA uploads as did the previous Sonoff-Tasmota versions. -#### Available Features and Sensors. +#### Available Features and Sensors | Feature or Sensor | sonoff | classic | minimal | knx | allsensors | |--------------------------------|--------|---------|---------|-----|------------| @@ -127,7 +127,7 @@ Different firmware images are released based on Features and Sensors selection g | USE_ARILUX_RF | x | x | - | x | x | | USE_SR04 | x | - | - | x | x | -#### Typical file size. +#### Typical file size | ESP/Arduino library version | sonoff | classic | minimal | knx | allsensors | |--------------------------------|--------|---------|---------|------|------------| @@ -165,11 +165,11 @@ Libraries used with Sonoff-Tasmota are: #### People inspiring me People helping to keep the show on the road: -- David Lang for providing initial issue resolution and code optimizations +- David Lang providing initial issue resolution and code optimizations - Heiko Krupp for his IRSend, HTU21, SI70xx and Wemo/Hue emulation drivers - Wiktor Schmidt for Travis CI implementation - Thom Dietrich for PlatformIO optimizations -- Marinus van den Broek for his EspEasy inspiration +- Marinus van den Broek for his EspEasy groundwork - Pete Ba for more user friendly energy monitor calibration - Lobradov providing compile optimization tips - Flexiti for his initial timer implementation @@ -178,7 +178,7 @@ People helping to keep the show on the road: - Gijs Noorlander for his MHZ19 and SenseAir drivers - Emontnemery for his HomeAssistant Discovery concept and many code tuning tips - Aidan Mountford for his HSB support -- Daniel Ztolnai for his inspiring Serial Bridge implementation +- Daniel Ztolnai for his Serial Bridge implementation - Gerhard Mutz for his SGP30 and Sunrise/Sunset driver - Nuno Ferreira for his HC-SR04 driver - Adrian Scillato for his (security)fixes and implementing and maintaining KNX From f9c702f8ebe388a5aef890a8647efea1c6c94d41 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Wed, 25 Apr 2018 12:06:53 +0200 Subject: [PATCH 112/136] v5.12.0m - Add MQTT_TELE_RETAIN 5.12.0m * Add define MQTT_TELE_RETAIN compile option default set to 0 (#1071) --- platformio.ini | 361 ++++++++++++++++++++++++++++++--------- sonoff/_releasenotes.ino | 1 + sonoff/sonoff.ino | 4 +- sonoff/user_config.h | 3 + sonoff/xdrv_10_rules.ino | 2 + 5 files changed, 292 insertions(+), 79 deletions(-) diff --git a/platformio.ini b/platformio.ini index c74fe3c8d..39a9e974d 100644 --- a/platformio.ini +++ b/platformio.ini @@ -33,13 +33,23 @@ src_dir = sonoff [env:sonoff] ;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 +platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.7.0 ; v2.4.1 +;platform = espressif8266 framework = arduino board = esp01_1m board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DUSE_CONFIG_OVERRIDE + +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +build_flags = + -Wl,-Tesp8266.flash.1m0.ld + -DVTABLES_IN_FLASH + -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY +; -DUSE_CONFIG_OVERRIDE + +; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -52,7 +62,7 @@ monitor_baud = 115200 ; *** Upload file to OTA server using SCP ;upload_port = user@host:/path -;extra_scripts = pio/sftp-uploader.py +;extra_scripts = pio/strip-floats.py, pio/sftp-uploader.py ; *** Upload file to OTA server using HTTP ;upload_port = domus1:80/api/upload-arduino.php @@ -60,14 +70,24 @@ monitor_baud = 115200 [env:sonoff-minimal] ;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 +platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.7.0 ; v2.4.1 +;platform = espressif8266 framework = arduino board = esp01_1m board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DBE_MINIMAL -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DBE_MINIMAL -DUSE_CONFIG_OVERRIDE +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +build_flags = + -Wl,-Tesp8266.flash.1m0.ld + -DVTABLES_IN_FLASH + -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY + -DBE_MINIMAL +; -DUSE_CONFIG_OVERRIDE + +; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes extra_scripts = pio/strip-floats.py ; Serial Monitor options @@ -75,13 +95,24 @@ monitor_baud = 115200 [env:sonoff-classic] ;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 +platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.7.0 ; v2.4.1 +;platform = espressif8266 framework = arduino board = esp01_1m board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DUSE_CLASSIC -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DUSE_CLASSIC -DUSE_CONFIG_OVERRIDE + +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +build_flags = + -Wl,-Tesp8266.flash.1m0.ld + -DVTABLES_IN_FLASH + -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY + -DUSE_CLASSIC +; -DUSE_CONFIG_OVERRIDE + +; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes extra_scripts = pio/strip-floats.py ; Serial Monitor options @@ -89,13 +120,24 @@ monitor_baud = 115200 [env:sonoff-knx] ;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 +platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.7.0 ; v2.4.1 +;platform = espressif8266 framework = arduino board = esp01_1m board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DUSE_KNX_NO_EMULATION -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DUSE_KNX_NO_EMULATION -DUSE_CONFIG_OVERRIDE + +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +build_flags = + -Wl,-Tesp8266.flash.1m0.ld + -DVTABLES_IN_FLASH + -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY + -DUSE_KNX_NO_EMULATION +; -DUSE_CONFIG_OVERRIDE + +; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes extra_scripts = pio/strip-floats.py ; Serial Monitor options @@ -103,13 +145,24 @@ monitor_baud = 115200 [env:sonoff-allsensors] ;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 +platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.7.0 ; v2.4.1 +;platform = espressif8266 framework = arduino board = esp01_1m board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DUSE_ALL_SENSORS -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DUSE_ALL_SENSORS -DUSE_CONFIG_OVERRIDE + +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +build_flags = + -Wl,-Tesp8266.flash.1m0.ld + -DVTABLES_IN_FLASH + -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY + -DUSE_ALL_SENSORS +; -DUSE_CONFIG_OVERRIDE + +; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes extra_scripts = pio/strip-floats.py ; Serial Monitor options @@ -117,13 +170,24 @@ monitor_baud = 115200 [env:sonoff-BG] ;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 +platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.7.0 ; v2.4.1 +;platform = espressif8266 framework = arduino board = esp01_1m board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=bg-BG -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=bg-BG -DUSE_CONFIG_OVERRIDE + +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +build_flags = + -Wl,-Tesp8266.flash.1m0.ld + -DVTABLES_IN_FLASH + -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY + -DMY_LANGUAGE=bg-BG +; -DUSE_CONFIG_OVERRIDE + +; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -131,13 +195,24 @@ monitor_baud = 115200 [env:sonoff-CN] ;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 +platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.7.0 ; v2.4.1 +;platform = espressif8266 framework = arduino board = esp01_1m board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=zh-CN -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=zh-CN -DUSE_CONFIG_OVERRIDE + +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +build_flags = + -Wl,-Tesp8266.flash.1m0.ld + -DVTABLES_IN_FLASH + -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY + -DMY_LANGUAGE=zh-CN +; -DUSE_CONFIG_OVERRIDE + +; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -145,13 +220,24 @@ monitor_baud = 115200 [env:sonoff-CZ] ;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 +platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.7.0 ; v2.4.1 +;platform = espressif8266 framework = arduino board = esp01_1m board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=cs-CZ -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=cs-CZ -DUSE_CONFIG_OVERRIDE + +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +build_flags = + -Wl,-Tesp8266.flash.1m0.ld + -DVTABLES_IN_FLASH + -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY + -DMY_LANGUAGE=cs-CZ +; -DUSE_CONFIG_OVERRIDE + +; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -159,13 +245,24 @@ monitor_baud = 115200 [env:sonoff-DE] ;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 +platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.7.0 ; v2.4.1 +;platform = espressif8266 framework = arduino board = esp01_1m board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=de-DE -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=de-DE -DUSE_CONFIG_OVERRIDE + +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +build_flags = + -Wl,-Tesp8266.flash.1m0.ld + -DVTABLES_IN_FLASH + -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY + -DMY_LANGUAGE=de-DE +; -DUSE_CONFIG_OVERRIDE + +; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -173,13 +270,24 @@ monitor_baud = 115200 [env:sonoff-ES] ;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 +platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.7.0 ; v2.4.1 +;platform = espressif8266 framework = arduino board = esp01_1m board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=es-AR -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=es-AR -DUSE_CONFIG_OVERRIDE + +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +build_flags = + -Wl,-Tesp8266.flash.1m0.ld + -DVTABLES_IN_FLASH + -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY + -DMY_LANGUAGE=es-AR +; -DUSE_CONFIG_OVERRIDE + +; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -187,13 +295,24 @@ monitor_baud = 115200 [env:sonoff-FR] ;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 +platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.7.0 ; v2.4.1 +;platform = espressif8266 framework = arduino board = esp01_1m board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=fr-FR -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=fr-FR -DUSE_CONFIG_OVERRIDE + +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +build_flags = + -Wl,-Tesp8266.flash.1m0.ld + -DVTABLES_IN_FLASH + -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY + -DMY_LANGUAGE=fr-FR +; -DUSE_CONFIG_OVERRIDE + +; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -201,13 +320,24 @@ monitor_baud = 115200 [env:sonoff-GR] ;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 +platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.7.0 ; v2.4.1 +;platform = espressif8266 framework = arduino board = esp01_1m board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=el-GR -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=el-GR -DUSE_CONFIG_OVERRIDE + +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +build_flags = + -Wl,-Tesp8266.flash.1m0.ld + -DVTABLES_IN_FLASH + -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY + -DMY_LANGUAGE=el-GR +; -DUSE_CONFIG_OVERRIDE + +; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -215,13 +345,24 @@ monitor_baud = 115200 [env:sonoff-HU] ;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 +platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.7.0 ; v2.4.1 +;platform = espressif8266 framework = arduino board = esp01_1m board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=hu-HU -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=hu-HU -DUSE_CONFIG_OVERRIDE + +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +build_flags = + -Wl,-Tesp8266.flash.1m0.ld + -DVTABLES_IN_FLASH + -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY + -DMY_LANGUAGE=hu-HU +; -DUSE_CONFIG_OVERRIDE + +; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -229,13 +370,24 @@ monitor_baud = 115200 [env:sonoff-IT] ;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 +platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.7.0 ; v2.4.1 +;platform = espressif8266 framework = arduino board = esp01_1m board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=it-IT -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=it-IT -DUSE_CONFIG_OVERRIDE + +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +build_flags = + -Wl,-Tesp8266.flash.1m0.ld + -DVTABLES_IN_FLASH + -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY + -DMY_LANGUAGE=it-IT +; -DUSE_CONFIG_OVERRIDE + +; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -243,13 +395,24 @@ monitor_baud = 115200 [env:sonoff-NL] ;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 +platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.7.0 ; v2.4.1 +;platform = espressif8266 framework = arduino board = esp01_1m board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=nl-NL -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=nl-NL -DUSE_CONFIG_OVERRIDE + +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +build_flags = + -Wl,-Tesp8266.flash.1m0.ld + -DVTABLES_IN_FLASH + -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY + -DMY_LANGUAGE=nl-NL +; -DUSE_CONFIG_OVERRIDE + +; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -257,13 +420,24 @@ monitor_baud = 115200 [env:sonoff-PL] ;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 +platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.7.0 ; v2.4.1 +;platform = espressif8266 framework = arduino board = esp01_1m board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=pl-PL -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=pl-PL -DUSE_CONFIG_OVERRIDE + +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +build_flags = + -Wl,-Tesp8266.flash.1m0.ld + -DVTABLES_IN_FLASH + -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY + -DMY_LANGUAGE=pl-PL +; -DUSE_CONFIG_OVERRIDE + +; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -271,13 +445,24 @@ monitor_baud = 115200 [env:sonoff-PT] ;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 +platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.7.0 ; v2.4.1 +;platform = espressif8266 framework = arduino board = esp01_1m board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=pt-PT -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=pt-PT -DUSE_CONFIG_OVERRIDE + +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +build_flags = + -Wl,-Tesp8266.flash.1m0.ld + -DVTABLES_IN_FLASH + -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY + -DMY_LANGUAGE=pt-PT +; -DUSE_CONFIG_OVERRIDE + +; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -285,13 +470,24 @@ monitor_baud = 115200 [env:sonoff-RU] ;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 +platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.7.0 ; v2.4.1 +;platform = espressif8266 framework = arduino board = esp01_1m board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=ru-RU -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=ru-RU -DUSE_CONFIG_OVERRIDE + +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +build_flags = + -Wl,-Tesp8266.flash.1m0.ld + -DVTABLES_IN_FLASH + -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY + -DMY_LANGUAGE=ru-RU +; -DUSE_CONFIG_OVERRIDE + +; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes extra_scripts = pio/strip-floats.py ; *** Serial Monitor options @@ -299,13 +495,24 @@ monitor_baud = 115200 [env:sonoff-TW] ;platform = espressif8266@1.5.0 ; v2.3.0 -;platform = espressif8266@1.6.0 ; v2.4.0 -platform = espressif8266 +platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.7.0 ; v2.4.1 +;platform = espressif8266 framework = arduino board = esp01_1m board_flash_mode = dout -build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=zh-TW -;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=zh-TW -DUSE_CONFIG_OVERRIDE + +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +build_flags = + -Wl,-Tesp8266.flash.1m0.ld + -DVTABLES_IN_FLASH + -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY + -DMY_LANGUAGE=zh-TW +; -DUSE_CONFIG_OVERRIDE + +; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes extra_scripts = pio/strip-floats.py ; *** Serial Monitor options diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 454f24137..c56d6fda0 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -3,6 +3,7 @@ * Remove sonoff-xxl * Add sonoff-classic, sonoff-allsensors and sonoff-knx * Add some coloring to important web buttons + * Add define MQTT_TELE_RETAIN compile option default set to 0 (#1071) * Add user selectable defines for Sunrise/set Dawn option (#2378) * Add random window to timers (#2447) * Add optional KNX IP Protocol Support (#2402) diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 4bb89b6e6..71a2a33d4 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -1459,10 +1459,10 @@ void PerformEverySecond() mqtt_data[0] = '\0'; MqttShowState(); - MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_STATE)); + MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_STATE), MQTT_TELE_RETAIN); mqtt_data[0] = '\0'; - if (MqttShowSensor()) MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); + if (MqttShowSensor()) { MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); } } } diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 92dd23dda..6bfa6e1cd 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -191,6 +191,9 @@ // Alternative MQTT driver does not block network when MQTT server is unavailable. No TLS support //#define MQTT_LIBRARY_TYPE MQTT_ESPMQTTARDUINO // Use (patched) esp-mqtt-arduino library (+4k8 code, +4k mem) - non-TLS only +// -- MQTT ---------------------------------------- +#define MQTT_TELE_RETAIN 0 // Tele messages may send retain flag (0 = off, 1 = on) + // -- MQTT - Domoticz ----------------------------- #define USE_DOMOTICZ // Enable Domoticz (+6k code, +0.3k mem) #define DOMOTICZ_IN_TOPIC "domoticz/in" // Domoticz Input Topic diff --git a/sonoff/xdrv_10_rules.ino b/sonoff/xdrv_10_rules.ino index 2697f3d32..afe6baa18 100644 --- a/sonoff/xdrv_10_rules.ino +++ b/sonoff/xdrv_10_rules.ino @@ -63,7 +63,9 @@ #define MAX_RULE_TIMERS 8 +#ifndef ULONG_MAX #define ULONG_MAX 0xffffffffUL +#endif #define D_CMND_RULE "Rule" #define D_CMND_RULETIMER "RuleTimer" From 07a14fe8962e56e84d3da18fe68628c2bd78bffe Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Wed, 25 Apr 2018 14:42:54 +0200 Subject: [PATCH 113/136] Updated using common section --- platformio.ini | 627 ++++++++++++++++--------------------------------- 1 file changed, 206 insertions(+), 421 deletions(-) diff --git a/platformio.ini b/platformio.ini index 39a9e974d..e37162bf1 100644 --- a/platformio.ini +++ b/platformio.ini @@ -31,11 +31,14 @@ src_dir = sonoff ;env_default = sonoff-RU ;env_default = sonoff-TW -[env:sonoff] +[common] ; ************************************************************ +; *** Esp8266 core for Arduino version ;platform = espressif8266@1.5.0 ; v2.3.0 -platform = espressif8266@1.6.0 ; v2.4.0 +;platform = espressif8266@1.6.0 ; v2.4.0 ;platform = espressif8266@1.7.0 ; v2.4.1 -;platform = espressif8266 +;platform = https://github.com/platformio/platform-espressif8266.git#feature/stage +platform = espressif8266 + framework = arduino board = esp01_1m board_flash_mode = dout @@ -56,464 +59,246 @@ extra_scripts = pio/strip-floats.py monitor_baud = 115200 ; *** Upload Serial reset method for Wemos and NodeMCU -;upload_port = COM5 ;upload_speed = 115200 -;upload_resetmethod = nodemcu +upload_speed = 512000 +upload_resetmethod = nodemcu +;upload_port = COM5 ; *** Upload file to OTA server using SCP ;upload_port = user@host:/path ;extra_scripts = pio/strip-floats.py, pio/sftp-uploader.py ; *** Upload file to OTA server using HTTP -;upload_port = domus1:80/api/upload-arduino.php -;extra_scripts = pio/strip-floats.py, pio/http-uploader.py +upload_port = domus1:80/api/upload-arduino.php +extra_scripts = pio/strip-floats.py, pio/http-uploader.py + +; ********************************************************************* + +[env:sonoff] +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_flash_mode = ${common.board_flash_mode} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} +monitor_baud = ${common.monitor_baud} +upload_speed = ${common.upload_speed} +upload_resetmethod = ${common.upload_resetmethod} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} [env:sonoff-minimal] -;platform = espressif8266@1.5.0 ; v2.3.0 -platform = espressif8266@1.6.0 ; v2.4.0 -;platform = espressif8266@1.7.0 ; v2.4.1 -;platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall - -build_flags = - -Wl,-Tesp8266.flash.1m0.ld - -DVTABLES_IN_FLASH - -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY - -DBE_MINIMAL -; -DUSE_CONFIG_OVERRIDE - -; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes -extra_scripts = pio/strip-floats.py - -; Serial Monitor options -monitor_baud = 115200 +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_flash_mode = ${common.board_flash_mode} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} -DBE_MINIMAL +monitor_baud = ${common.monitor_baud} +upload_speed = ${common.upload_speed} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} [env:sonoff-classic] -;platform = espressif8266@1.5.0 ; v2.3.0 -platform = espressif8266@1.6.0 ; v2.4.0 -;platform = espressif8266@1.7.0 ; v2.4.1 -;platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall - -build_flags = - -Wl,-Tesp8266.flash.1m0.ld - -DVTABLES_IN_FLASH - -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY - -DUSE_CLASSIC -; -DUSE_CONFIG_OVERRIDE - -; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes -extra_scripts = pio/strip-floats.py - -; Serial Monitor options -monitor_baud = 115200 +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_flash_mode = ${common.board_flash_mode} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} -DUSE_CLASSIC +monitor_baud = ${common.monitor_baud} +upload_speed = ${common.upload_speed} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} [env:sonoff-knx] -;platform = espressif8266@1.5.0 ; v2.3.0 -platform = espressif8266@1.6.0 ; v2.4.0 -;platform = espressif8266@1.7.0 ; v2.4.1 -;platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall - -build_flags = - -Wl,-Tesp8266.flash.1m0.ld - -DVTABLES_IN_FLASH - -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY - -DUSE_KNX_NO_EMULATION -; -DUSE_CONFIG_OVERRIDE - -; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes -extra_scripts = pio/strip-floats.py - -; Serial Monitor options -monitor_baud = 115200 +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_flash_mode = ${common.board_flash_mode} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} -DUSE_KNX_NO_EMULATION +monitor_baud = ${common.monitor_baud} +upload_speed = ${common.upload_speed} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} [env:sonoff-allsensors] -;platform = espressif8266@1.5.0 ; v2.3.0 -platform = espressif8266@1.6.0 ; v2.4.0 -;platform = espressif8266@1.7.0 ; v2.4.1 -;platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall - -build_flags = - -Wl,-Tesp8266.flash.1m0.ld - -DVTABLES_IN_FLASH - -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY - -DUSE_ALL_SENSORS -; -DUSE_CONFIG_OVERRIDE - -; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes -extra_scripts = pio/strip-floats.py - -; Serial Monitor options -monitor_baud = 115200 +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_flash_mode = ${common.board_flash_mode} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} -DUSE_ALL_SENSORS +monitor_baud = ${common.monitor_baud} +upload_speed = ${common.upload_speed} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} [env:sonoff-BG] -;platform = espressif8266@1.5.0 ; v2.3.0 -platform = espressif8266@1.6.0 ; v2.4.0 -;platform = espressif8266@1.7.0 ; v2.4.1 -;platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall - -build_flags = - -Wl,-Tesp8266.flash.1m0.ld - -DVTABLES_IN_FLASH - -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY - -DMY_LANGUAGE=bg-BG -; -DUSE_CONFIG_OVERRIDE - -; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes -extra_scripts = pio/strip-floats.py - -; *** Serial Monitor options -monitor_baud = 115200 +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_flash_mode = ${common.board_flash_mode} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} -DMY_LANGUAGE=bg-BG +monitor_baud = ${common.monitor_baud} +upload_speed = ${common.upload_speed} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} [env:sonoff-CN] -;platform = espressif8266@1.5.0 ; v2.3.0 -platform = espressif8266@1.6.0 ; v2.4.0 -;platform = espressif8266@1.7.0 ; v2.4.1 -;platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall - -build_flags = - -Wl,-Tesp8266.flash.1m0.ld - -DVTABLES_IN_FLASH - -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY - -DMY_LANGUAGE=zh-CN -; -DUSE_CONFIG_OVERRIDE - -; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes -extra_scripts = pio/strip-floats.py - -; *** Serial Monitor options -monitor_baud = 115200 +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_flash_mode = ${common.board_flash_mode} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-CN +monitor_baud = ${common.monitor_baud} +upload_speed = ${common.upload_speed} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} [env:sonoff-CZ] -;platform = espressif8266@1.5.0 ; v2.3.0 -platform = espressif8266@1.6.0 ; v2.4.0 -;platform = espressif8266@1.7.0 ; v2.4.1 -;platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall - -build_flags = - -Wl,-Tesp8266.flash.1m0.ld - -DVTABLES_IN_FLASH - -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY - -DMY_LANGUAGE=cs-CZ -; -DUSE_CONFIG_OVERRIDE - -; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes -extra_scripts = pio/strip-floats.py - -; *** Serial Monitor options -monitor_baud = 115200 +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_flash_mode = ${common.board_flash_mode} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} -DMY_LANGUAGE=cs-CZ +monitor_baud = ${common.monitor_baud} +upload_speed = ${common.upload_speed} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} [env:sonoff-DE] -;platform = espressif8266@1.5.0 ; v2.3.0 -platform = espressif8266@1.6.0 ; v2.4.0 -;platform = espressif8266@1.7.0 ; v2.4.1 -;platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall - -build_flags = - -Wl,-Tesp8266.flash.1m0.ld - -DVTABLES_IN_FLASH - -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY - -DMY_LANGUAGE=de-DE -; -DUSE_CONFIG_OVERRIDE - -; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes -extra_scripts = pio/strip-floats.py - -; *** Serial Monitor options -monitor_baud = 115200 +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_flash_mode = ${common.board_flash_mode} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} -DMY_LANGUAGE=de-DE +monitor_baud = ${common.monitor_baud} +upload_speed = ${common.upload_speed} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} [env:sonoff-ES] -;platform = espressif8266@1.5.0 ; v2.3.0 -platform = espressif8266@1.6.0 ; v2.4.0 -;platform = espressif8266@1.7.0 ; v2.4.1 -;platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall - -build_flags = - -Wl,-Tesp8266.flash.1m0.ld - -DVTABLES_IN_FLASH - -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY - -DMY_LANGUAGE=es-AR -; -DUSE_CONFIG_OVERRIDE - -; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes -extra_scripts = pio/strip-floats.py - -; *** Serial Monitor options -monitor_baud = 115200 +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_flash_mode = ${common.board_flash_mode} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} -DMY_LANGUAGE=es-AR +monitor_baud = ${common.monitor_baud} +upload_speed = ${common.upload_speed} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} [env:sonoff-FR] -;platform = espressif8266@1.5.0 ; v2.3.0 -platform = espressif8266@1.6.0 ; v2.4.0 -;platform = espressif8266@1.7.0 ; v2.4.1 -;platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall - -build_flags = - -Wl,-Tesp8266.flash.1m0.ld - -DVTABLES_IN_FLASH - -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY - -DMY_LANGUAGE=fr-FR -; -DUSE_CONFIG_OVERRIDE - -; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes -extra_scripts = pio/strip-floats.py - -; *** Serial Monitor options -monitor_baud = 115200 +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_flash_mode = ${common.board_flash_mode} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} -DMY_LANGUAGE=fr-FR +monitor_baud = ${common.monitor_baud} +upload_speed = ${common.upload_speed} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} [env:sonoff-GR] -;platform = espressif8266@1.5.0 ; v2.3.0 -platform = espressif8266@1.6.0 ; v2.4.0 -;platform = espressif8266@1.7.0 ; v2.4.1 -;platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall - -build_flags = - -Wl,-Tesp8266.flash.1m0.ld - -DVTABLES_IN_FLASH - -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY - -DMY_LANGUAGE=el-GR -; -DUSE_CONFIG_OVERRIDE - -; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes -extra_scripts = pio/strip-floats.py - -; *** Serial Monitor options -monitor_baud = 115200 +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_flash_mode = ${common.board_flash_mode} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} -DMY_LANGUAGE=el-GR +monitor_baud = ${common.monitor_baud} +upload_speed = ${common.upload_speed} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} [env:sonoff-HU] -;platform = espressif8266@1.5.0 ; v2.3.0 -platform = espressif8266@1.6.0 ; v2.4.0 -;platform = espressif8266@1.7.0 ; v2.4.1 -;platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall - -build_flags = - -Wl,-Tesp8266.flash.1m0.ld - -DVTABLES_IN_FLASH - -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY - -DMY_LANGUAGE=hu-HU -; -DUSE_CONFIG_OVERRIDE - -; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes -extra_scripts = pio/strip-floats.py - -; *** Serial Monitor options -monitor_baud = 115200 +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_flash_mode = ${common.board_flash_mode} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} -DMY_LANGUAGE=hu-HU +monitor_baud = ${common.monitor_baud} +upload_speed = ${common.upload_speed} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} [env:sonoff-IT] -;platform = espressif8266@1.5.0 ; v2.3.0 -platform = espressif8266@1.6.0 ; v2.4.0 -;platform = espressif8266@1.7.0 ; v2.4.1 -;platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall - -build_flags = - -Wl,-Tesp8266.flash.1m0.ld - -DVTABLES_IN_FLASH - -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY - -DMY_LANGUAGE=it-IT -; -DUSE_CONFIG_OVERRIDE - -; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes -extra_scripts = pio/strip-floats.py - -; *** Serial Monitor options -monitor_baud = 115200 +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_flash_mode = ${common.board_flash_mode} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} -DMY_LANGUAGE=it-IT +monitor_baud = ${common.monitor_baud} +upload_speed = ${common.upload_speed} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} [env:sonoff-NL] -;platform = espressif8266@1.5.0 ; v2.3.0 -platform = espressif8266@1.6.0 ; v2.4.0 -;platform = espressif8266@1.7.0 ; v2.4.1 -;platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall - -build_flags = - -Wl,-Tesp8266.flash.1m0.ld - -DVTABLES_IN_FLASH - -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY - -DMY_LANGUAGE=nl-NL -; -DUSE_CONFIG_OVERRIDE - -; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes -extra_scripts = pio/strip-floats.py - -; *** Serial Monitor options -monitor_baud = 115200 +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_flash_mode = ${common.board_flash_mode} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} -DMY_LANGUAGE=nl-NL +monitor_baud = ${common.monitor_baud} +upload_speed = ${common.upload_speed} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} [env:sonoff-PL] -;platform = espressif8266@1.5.0 ; v2.3.0 -platform = espressif8266@1.6.0 ; v2.4.0 -;platform = espressif8266@1.7.0 ; v2.4.1 -;platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall - -build_flags = - -Wl,-Tesp8266.flash.1m0.ld - -DVTABLES_IN_FLASH - -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY - -DMY_LANGUAGE=pl-PL -; -DUSE_CONFIG_OVERRIDE - -; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes -extra_scripts = pio/strip-floats.py - -; *** Serial Monitor options -monitor_baud = 115200 +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_flash_mode = ${common.board_flash_mode} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} -DMY_LANGUAGE=pl-PL +monitor_baud = ${common.monitor_baud} +upload_speed = ${common.upload_speed} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} [env:sonoff-PT] -;platform = espressif8266@1.5.0 ; v2.3.0 -platform = espressif8266@1.6.0 ; v2.4.0 -;platform = espressif8266@1.7.0 ; v2.4.1 -;platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall - -build_flags = - -Wl,-Tesp8266.flash.1m0.ld - -DVTABLES_IN_FLASH - -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY - -DMY_LANGUAGE=pt-PT -; -DUSE_CONFIG_OVERRIDE - -; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes -extra_scripts = pio/strip-floats.py - -; *** Serial Monitor options -monitor_baud = 115200 +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_flash_mode = ${common.board_flash_mode} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-PT +monitor_baud = ${common.monitor_baud} +upload_speed = ${common.upload_speed} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} [env:sonoff-RU] -;platform = espressif8266@1.5.0 ; v2.3.0 -platform = espressif8266@1.6.0 ; v2.4.0 -;platform = espressif8266@1.7.0 ; v2.4.1 -;platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall - -build_flags = - -Wl,-Tesp8266.flash.1m0.ld - -DVTABLES_IN_FLASH - -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY - -DMY_LANGUAGE=ru-RU -; -DUSE_CONFIG_OVERRIDE - -; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes -extra_scripts = pio/strip-floats.py - -; *** Serial Monitor options -monitor_baud = 115200 +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_flash_mode = ${common.board_flash_mode} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} -DMY_LANGUAGE=ru-RU +monitor_baud = ${common.monitor_baud} +upload_speed = ${common.upload_speed} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} [env:sonoff-TW] -;platform = espressif8266@1.5.0 ; v2.3.0 -platform = espressif8266@1.6.0 ; v2.4.0 -;platform = espressif8266@1.7.0 ; v2.4.1 -;platform = espressif8266 -framework = arduino -board = esp01_1m -board_flash_mode = dout - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall - -build_flags = - -Wl,-Tesp8266.flash.1m0.ld - -DVTABLES_IN_FLASH - -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY - -DMY_LANGUAGE=zh-TW -; -DUSE_CONFIG_OVERRIDE - -; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes -extra_scripts = pio/strip-floats.py - -; *** Serial Monitor options -monitor_baud = 115200 +platform = ${common.platform} +framework = ${common.framework} +board = ${common.board} +board_flash_mode = ${common.board_flash_mode} +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-TW +monitor_baud = ${common.monitor_baud} +upload_speed = ${common.upload_speed} +upload_port = ${common.upload_port} +extra_scripts = ${common.extra_scripts} From 00b08bc50912709f274bf2cea068b63ffa721019 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Wed, 25 Apr 2018 17:27:40 +0200 Subject: [PATCH 114/136] Add more timer user input checks --- sonoff/settings.h | 2 +- sonoff/webserver.ino | 4 +++ sonoff/xdrv_09_timers.ino | 70 ++++++++++++++++++++++++--------------- 3 files changed, 48 insertions(+), 28 deletions(-) diff --git a/sonoff/settings.h b/sonoff/settings.h index dec5ef2fe..313ca3c6f 100644 --- a/sonoff/settings.h +++ b/sonoff/settings.h @@ -98,7 +98,7 @@ typedef union { uint32_t days : 7; // bits 16 - 22 = week day mask uint32_t device : 4; // bits 23 - 26 = 16 devices uint32_t power : 2; // bits 27 - 28 = 4 power states - Off, On, Toggle, Blink or Rule - uint32_t mode : 2; // bits 29 - 30 = timer modes - Scheduler, Sunrise, Sunset + uint32_t mode : 2; // bits 29 - 30 = timer modes - 0 = Scheduler, 1 = Sunrise, 2 = Sunset uint32_t arm : 1; // bit 31 }; } Timer; diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index e7d9262be..f82fa2e6d 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -628,7 +628,11 @@ void HandleConfiguration() page += FPSTR(HTTP_HEAD_STYLE); page += FPSTR(HTTP_BTN_MENU_MODULE); #if defined(USE_TIMERS) && defined(USE_TIMERS_WEB) +#ifdef USE_RULES + page += FPSTR(HTTP_BTN_MENU_TIMER); +#else if (devices_present) { page += FPSTR(HTTP_BTN_MENU_TIMER); } +#endif // USE_RULES #endif // USE_TIMERS and USE_TIMERS_WEB page += FPSTR(HTTP_BTN_MENU_WIFI); if (Settings.flag.mqtt_enabled) { page += FPSTR(HTTP_BTN_MENU_MQTT); } diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino index 26b23b258..981609b41 100644 --- a/sonoff/xdrv_09_timers.ino +++ b/sonoff/xdrv_09_timers.ino @@ -22,7 +22,7 @@ * Timers * * Arm a timer using one or all of the following JSON values: - * {"Arm":1,"Mode":0,"Time":"09:23","Days":"--TW--S","Repeat":1,"Output":1,"Action":1} + * {"Arm":1,"Mode":0,"Time":"09:23","Window":0,"Days":"--TW--S","Repeat":1,"Output":1,"Action":1} * * Arm 0 = Off, 1 = On * Mode 0 = Schedule, 1 = Sunrise, 2 = Sunset @@ -268,7 +268,7 @@ void TimerEverySecond() uint8_t days = 1 << (RtcTime.day_of_week -1); for (byte i = 0; i < MAX_TIMERS; i++) { - if (Settings.timer[i].device >= devices_present) Settings.timer[i].data = 0; // Reset timer due to change in devices present +// if (Settings.timer[i].device >= devices_present) Settings.timer[i].data = 0; // Reset timer due to change in devices present Timer xtimer = Settings.timer[i]; uint16_t set_time = xtimer.time; #ifdef USE_SUNRISE @@ -290,7 +290,7 @@ void TimerEverySecond() RulesProcess(); } else #endif // USE_RULES - ExecuteCommandPower(xtimer.device +1, xtimer.power); + if (devices_present) { ExecuteCommandPower(xtimer.device +1, xtimer.power); } } } } @@ -302,6 +302,7 @@ void TimerEverySecond() void PrepShowTimer(uint8_t index) { char days[8] = { 0 }; + char soutput[80]; Timer xtimer = Settings.timer[index -1]; @@ -309,16 +310,21 @@ void PrepShowTimer(uint8_t index) uint8_t mask = 1 << i; snprintf(days, sizeof(days), "%s%d", days, ((xtimer.days & mask) > 0)); } + + soutput[0] = '\0'; + if (devices_present) { + snprintf_P(soutput, sizeof(soutput), PSTR(",\"" D_JSON_TIMER_OUTPUT "\":%d"), xtimer.device +1); + } #ifdef USE_SUNRISE int16_t hour = xtimer.time / 60; if ((1 == xtimer.mode) || (2 == xtimer.mode)) { // Sunrise or Sunset if (hour > 11) { hour = (hour -12) * -1; } } - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_MODE "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_WINDOW "\":%d,\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_OUTPUT "\":%d,\"" D_JSON_TIMER_ACTION "\":%d}"), - mqtt_data, index, xtimer.arm, xtimer.mode, hour, xtimer.time % 60, xtimer.window, days, xtimer.repeat, xtimer.device +1, xtimer.power); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_MODE "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_WINDOW "\":%d,\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d%s,\"" D_JSON_TIMER_ACTION "\":%d}"), + mqtt_data, index, xtimer.arm, xtimer.mode, hour, xtimer.time % 60, xtimer.window, days, xtimer.repeat, soutput, xtimer.power); #else - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_WINDOW "\":%d,\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_OUTPUT "\":%d,\"" D_JSON_TIMER_ACTION "\":%d}"), - mqtt_data, index, xtimer.arm, xtimer.time / 60, xtimer.time % 60, xtimer.window, days, xtimer.repeat, xtimer.device +1, xtimer.power); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_WINDOW "\":%d,\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d%s,\"" D_JSON_TIMER_ACTION "\":%d}"), + mqtt_data, index, xtimer.arm, xtimer.time / 60, xtimer.time % 60, xtimer.window, days, xtimer.repeat, soutput, xtimer.power); #endif // USE_SUNRISE } @@ -345,7 +351,9 @@ boolean TimerCommand() Settings.timer[index -1].data = Settings.timer[XdrvMailbox.payload -1].data; // Copy timer } } else { +#ifndef USE_RULES if (devices_present) { +#endif StaticJsonBuffer<200> jsonBuffer; JsonObject& root = jsonBuffer.parseObject(dataBufUc); if (!root.success()) { @@ -408,18 +416,21 @@ boolean TimerCommand() } if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_OUTPUT))].success()) { uint8_t device = ((uint8_t)root[parm_uc] -1) & 0x0F; - Settings.timer[index].device = (device < devices_present) ? device : devices_present -1; + Settings.timer[index].device = (device < devices_present) ? device : 0; } if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_ACTION))].success()) { - Settings.timer[index].power = (uint8_t)root[parm_uc] & 0x03; + uint8_t action = ((uint8_t)root[parm_uc] -1) & 0x03; + Settings.timer[index].power = (devices_present) ? action : 3; // If no devices than only allow rules } index++; } +#ifndef USE_RULES } else { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_TIMER "%d\":\"" D_JSON_TIMER_NO_DEVICE "\"}"), index); // No outputs defined so nothing to control error = 1; } +#endif } } if (!error) { @@ -527,8 +538,12 @@ const char HTTP_TIMER_SCRIPT[] PROGMEM = "m=qs('input[name=\"rd\"]:checked').value;" // Check mode "s|=(qs('input[name=\"rd\"]:checked').value<<29);" // Get mode #endif - "s|=(eb('p1').value<<27);" // Get power - "s|=(qs('#d1').selectedIndex<<23);" // Get device + "if(}1>0){" + "i=qs('#d1').selectedIndex;if(i>=0){s|=(i<<23);}" // Get output + "s|=(qs('#p1').selectedIndex<<27);" // Get action + "}else{" + "s|=3<<27;" // Get action (rule) + "}" "l=((qs('#ho').selectedIndex*60)+qs('#mi').selectedIndex)&0x7FF;" "if(m==0){s|=l;}" // Get time #ifdef USE_SUNRISE @@ -559,8 +574,10 @@ const char HTTP_TIMER_SCRIPT[] PROGMEM = #endif "q=(s>>11)&0xF;if(q<10){q='0'+q;}qs('#mw').value=q;" // Set window minutes "for(i=0;i<7;i++){p=(s>>(16+i))&1;eb('w'+i).checked=p;}" // Set weekdays - "p=(s>>23)&0xF;qs('#d1').value=p+1;" // Set device - "p=(s>>27)&3;eb('p1').value=p;" // Set power + "if(}1>0){" + "p=(s>>23)&0xF;qs('#d1').value=p+1;" // Set output + "p=(s>>27)&3;qs('#p1').selectedIndex=p;" // Set action + "}" "p=(s>>15)&1;eb('r0').checked=p;" // Set repeat "p=(s>>31)&1;eb('a0').checked=p;" // Set arm "}" @@ -569,13 +586,24 @@ const char HTTP_TIMER_SCRIPT[] PROGMEM = "pt=eb('t0').value.split(',').map(Number);" // Get parameters from hidden area to array "s='';for(i=0;i<" STR(MAX_TIMERS) ";i++){b='';if(0==i){b=\" id='dP'\";}s+=\"\"}" "eb('bt').innerHTML=s;" // Create tabs + "if(}1>0){" // Create Output and Action drop down boxes + "eb('oa').innerHTML=\"" D_TIMER_OUTPUT "  " D_TIMER_ACTION " \";" + "o=qs('#p1');ce('" D_OFF "',o);ce('" D_ON "',o);ce('" D_TOGGLE "',o);" // Create offset direction select options +#ifdef USE_RULES + "ce('" D_RULE "',o);" +#else + "ce('" D_BLINK "',o);" +#endif + "}else{" + "eb('oa').innerHTML=\"" D_TIMER_ACTION " " D_RULE "\";" // No outputs but rule is allowed + "}" #ifdef USE_SUNRISE "o=qs('#dr');ce('+',o);ce('-',o);" // Create offset direction select options #endif "o=qs('#ho');for(i=0;i<=23;i++){ce((i<10)?('0'+i):i,o);}" // Create hours select options "o=qs('#mi');for(i=0;i<=59;i++){ce((i<10)?('0'+i):i,o);}" // Create minutes select options "o=qs('#mw');for(i=0;i<=15;i++){ce((i<10)?('0'+i):i,o);}" // Create window minutes select options - "o=qs('#d1');for(i=0;i<}1;i++){ce(i+1,o);}" // Create devices + "o=qs('#d1');for(i=0;i<}1;i++){ce(i+1,o);}" // Create outputs "var a='" D_DAY3LIST "';" "s='';for(i=0;i<7;i++){s+=\"\"+a.substring(i*3,(i*3)+3)+\"\"}" "eb('ds').innerHTML=s;" // Create weekdays @@ -592,19 +620,7 @@ const char HTTP_FORM_TIMER[] PROGMEM = "



" - "
" - "" D_TIMER_OUTPUT "  " - "" D_TIMER_ACTION " " - "

" + "

" "
" "" D_TIMER_ARM " " "" D_TIMER_REPEAT "" From be36218b846099fee336d03df30c5f3684fc3c42 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Wed, 25 Apr 2018 18:25:25 +0200 Subject: [PATCH 115/136] Possible 2.4.1 memory leak fix (#2544) --- sonoff/xdrv_00_mqtt.ino | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sonoff/xdrv_00_mqtt.ino b/sonoff/xdrv_00_mqtt.ino index 68b3c6a70..7d47f37b5 100644 --- a/sonoff/xdrv_00_mqtt.ino +++ b/sonoff/xdrv_00_mqtt.ino @@ -399,6 +399,11 @@ boolean MqttCheckTls() } AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_FINGERPRINT)); + +//#ifdef ARDUINO_ESP8266_RELEASE_2_4_1 + EspClient = WiFiClientSecure(); // Wifi Secure Client reconnect issue 4497 (https://github.com/esp8266/Arduino/issues/4497) +//#endif + if (!EspClient.connect(Settings.mqtt_host, Settings.mqtt_port)) { snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MQTT D_TLS_CONNECT_FAILED_TO " %s:%d. " D_RETRY_IN " %d " D_UNIT_SECOND), Settings.mqtt_host, Settings.mqtt_port, mqtt_retry_counter); @@ -479,6 +484,14 @@ void MqttReconnect() mqtt_initial_connection_state = 1; } +//#ifdef ARDUINO_ESP8266_RELEASE_2_4_1 +#ifdef USE_MQTT_TLS + EspClient = WiFiClientSecure(); // Wifi Secure Client reconnect issue 4497 (https://github.com/esp8266/Arduino/issues/4497) +#else + EspClient = WiFiClient(); // Wifi Client reconnect issue 4497 (https://github.com/esp8266/Arduino/issues/4497) +#endif +//#endif + #if (MQTT_LIBRARY_TYPE == MQTT_PUBSUBCLIENT) MqttClient.setCallback(MqttDataHandler); MqttClient.setServer(Settings.mqtt_host, Settings.mqtt_port); From 9356c02b4dbacf4b6f56e47cb4eff60a220f2803 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 26 Apr 2018 10:12:44 +0200 Subject: [PATCH 116/136] Set default upload port to serial --- platformio.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platformio.ini b/platformio.ini index e37162bf1..5ac5a1941 100644 --- a/platformio.ini +++ b/platformio.ini @@ -62,15 +62,15 @@ monitor_baud = 115200 ;upload_speed = 115200 upload_speed = 512000 upload_resetmethod = nodemcu -;upload_port = COM5 +upload_port = COM5 ; *** Upload file to OTA server using SCP ;upload_port = user@host:/path ;extra_scripts = pio/strip-floats.py, pio/sftp-uploader.py ; *** Upload file to OTA server using HTTP -upload_port = domus1:80/api/upload-arduino.php -extra_scripts = pio/strip-floats.py, pio/http-uploader.py +;upload_port = domus1:80/api/upload-arduino.php +;extra_scripts = pio/strip-floats.py, pio/http-uploader.py ; ********************************************************************* From 4675dbea1c52208c540128e416c3b597400fccb3 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 27 Apr 2018 18:06:19 +0200 Subject: [PATCH 117/136] Add rules variables and teleperiod trigger 5.12.0m * Add rule variables and teleperiod trigger to accomodate user HA messages --- sonoff/_releasenotes.ino | 1 + sonoff/sonoff.ino | 7 +++++- sonoff/xdrv_00_mqtt.ino | 3 ++- sonoff/xdrv_09_timers.ino | 8 +++---- sonoff/xdrv_10_rules.ino | 49 ++++++++++++++++++++++++++++++++------- sonoff/xsns_09_bmp.ino | 7 +++++- 6 files changed, 60 insertions(+), 15 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index c56d6fda0..4be23c8d7 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -3,6 +3,7 @@ * Remove sonoff-xxl * Add sonoff-classic, sonoff-allsensors and sonoff-knx * Add some coloring to important web buttons + * Add rule variables and teleperiod trigger to accomodate user HA messages * Add define MQTT_TELE_RETAIN compile option default set to 0 (#1071) * Add user selectable defines for Sunrise/set Dawn option (#2378) * Add random window to timers (#2447) diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 71a2a33d4..ab223790a 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -1462,7 +1462,12 @@ void PerformEverySecond() MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_STATE), MQTT_TELE_RETAIN); mqtt_data[0] = '\0'; - if (MqttShowSensor()) { MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); } + if (MqttShowSensor()) { + MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); +#ifdef USE_RULES + RulesTeleperiod(); // Allow rule based HA messages +#endif // USE_RULES + } } } diff --git a/sonoff/xdrv_00_mqtt.ino b/sonoff/xdrv_00_mqtt.ino index 7d47f37b5..8328cef82 100644 --- a/sonoff/xdrv_00_mqtt.ino +++ b/sonoff/xdrv_00_mqtt.ino @@ -648,7 +648,8 @@ bool MqttCommand() mqtt_data[0] = '\0'; } MqttPublishDirect(stemp1, false); - snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, D_JSON_DONE); +// snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, D_JSON_DONE); + mqtt_data[0] = '\0'; } } } diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino index 981609b41..aa1287f20 100644 --- a/sonoff/xdrv_09_timers.ino +++ b/sonoff/xdrv_09_timers.ino @@ -201,7 +201,7 @@ void ApplyTimerOffsets(Timer *duskdawn) if (timeBuffer > (uint16_t)duskdawn->time) { timeBuffer = 1440 - (timeBuffer - (uint16_t)duskdawn->time); duskdawn->days = duskdawn->days >> 1; - duskdawn->days = duskdawn->days |= (stored.days << 6); + duskdawn->days |= (stored.days << 6); } else { timeBuffer = (uint16_t)duskdawn->time - timeBuffer; } @@ -212,7 +212,7 @@ void ApplyTimerOffsets(Timer *duskdawn) if (timeBuffer > 1440) { timeBuffer -= 1440; duskdawn->days = duskdawn->days << 1; - duskdawn->days = duskdawn->days |= (stored.days >> 6); + duskdawn->days |= (stored.days >> 6); } } duskdawn->time = timeBuffer; @@ -279,8 +279,8 @@ void TimerEverySecond() #endif if (xtimer.arm) { set_time += timer_window[i]; // Add random time offset - if (set_time < 0) { set_time == 0; } // Stay today; - if (set_time > 1439) { set_time == 1439; } + if (set_time < 0) { set_time = 0; } // Stay today; + if (set_time > 1439) { set_time = 1439; } if (time == set_time) { if (xtimer.days & days) { Settings.timer[i].arm = xtimer.repeat; diff --git a/sonoff/xdrv_10_rules.ino b/sonoff/xdrv_10_rules.ino index afe6baa18..f92edcf55 100644 --- a/sonoff/xdrv_10_rules.ino +++ b/sonoff/xdrv_10_rules.ino @@ -62,6 +62,7 @@ \*********************************************************************************************/ #define MAX_RULE_TIMERS 8 +#define RULES_MAX_VARS 5 #ifndef ULONG_MAX #define ULONG_MAX 0xffffffffUL @@ -83,6 +84,7 @@ long rules_power = -1; uint32_t rules_triggers = 0; uint8_t rules_trigger_count = 0; +uint8_t rules_teleperiod = 0; /*******************************************************************************************/ @@ -146,6 +148,12 @@ bool RulesRuleMatch(String &event, String &rule) if (pos == -1) { return false; } // No # sign in rule String rule_task = rule.substring(0, pos); // "INA219" or "SYSTEM" + if (rules_teleperiod) { + int ppos = rule_task.indexOf("TELE-"); // "TELE-INA219" or "INA219" + if (ppos == -1) { return false; } // No pre-amble in rule + rule_task = rule.substring(5, pos); // "INA219" or "SYSTEM" + } + String rule_name = rule.substring(pos +1); // "CURRENT>0.100" or "BOOT" char compare = ' '; @@ -228,6 +236,8 @@ bool RulesRuleMatch(String &event, String &rule) bool RulesProcess() { bool serviced = false; + char vars[RULES_MAX_VARS][10] = { 0 }; + char stemp[10]; if (!Settings.flag.rules_enabled) { return serviced; } // Not enabled if (!strlen(Settings.rules)) { return serviced; } // No rules @@ -262,17 +272,32 @@ bool RulesProcess() rules_event_value = ""; String event = event_saved; if (RulesRuleMatch(event, event_trigger)) { - commands.replace(F("%value%"), rules_event_value); - char command[commands.length() +1]; - snprintf(command, sizeof(command), commands.c_str()); + commands.trim(); + String ucommand = commands; + ucommand.toUpperCase(); + if (ucommand.startsWith("VAR")) { + uint8_t idx = ucommand.charAt(3) - '1'; +// idx -= '1'; + if ((idx >= 0) && (idx < RULES_MAX_VARS)) { snprintf(vars[idx], sizeof(vars[idx]), rules_event_value.c_str()); } + } else { + commands.replace(F("%value%"), rules_event_value); + for (byte i = 0; i < RULES_MAX_VARS; i++) { + if (strlen(vars[i])) { + snprintf_P(stemp, sizeof(stemp), PSTR("%%var%d%%"), i +1); + commands.replace(stemp, vars[i]); + } + } + char command[commands.length() +1]; + snprintf(command, sizeof(command), commands.c_str()); - snprintf_P(log_data, sizeof(log_data), PSTR("RUL: %s performs \"%s\""), event_trigger.c_str(), command); - AddLog(LOG_LEVEL_INFO); + snprintf_P(log_data, sizeof(log_data), PSTR("RUL: %s performs \"%s\""), event_trigger.c_str(), command); + AddLog(LOG_LEVEL_INFO); -// snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, D_CMND_RULE, D_JSON_INITIATED); -// MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_RULE)); +// snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, D_CMND_RULE, D_JSON_INITIATED); +// MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_RULE)); - ExecuteCommand(command); + ExecuteCommand(command); + } serviced = true; } rules_trigger_count++; @@ -288,6 +313,7 @@ void RulesInit() Settings.flag.rules_enabled = 0; Settings.flag.rules_once = 0; } + rules_teleperiod = 0; } void RulesSetPower() @@ -344,6 +370,13 @@ void RulesEverySecond() } } +void RulesTeleperiod() +{ + rules_teleperiod = 1; + RulesProcess(); + rules_teleperiod = 0; +} + boolean RulesCommand() { char command[CMDSZ]; diff --git a/sonoff/xsns_09_bmp.ino b/sonoff/xsns_09_bmp.ino index 01eb29799..e6b4e03fd 100644 --- a/sonoff/xsns_09_bmp.ino +++ b/sonoff/xsns_09_bmp.ino @@ -465,7 +465,12 @@ void BmpShow(boolean json) mqtt_data, bmp_name, temperature, (bmp_model >= 2) ? json_humidity : "", pressure, (Settings.altitude != 0) ? json_sealevel : ""); #endif // USE_BME680 #ifdef USE_DOMOTICZ - if (0 == tele_period) DomoticzTempHumPressureSensor(temperature, humidity, pressure); + if (0 == tele_period) { + DomoticzTempHumPressureSensor(temperature, humidity, pressure); +#ifdef USE_BME680 + if (bmp_model >= 3) { DomoticzSensor(DZ_AIRQUALITY, (uint32_t)g); } +#endif // USE_BME680 + } #endif // USE_DOMOTICZ #ifdef USE_KNX From e1011d3cdd8ac55e556169482dd2c82c24b00e12 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 28 Apr 2018 11:17:16 +0200 Subject: [PATCH 118/136] Disable sleep on core 2.4.1 5.12.0m * Disable sleep when using Esp/Arduino core 2.4.1 (#2559) --- sonoff/_releasenotes.ino | 1 + sonoff/support.ino | 2 ++ 2 files changed, 3 insertions(+) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 4be23c8d7..725ce14e3 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,6 +1,7 @@ /* 5.12.0m * Reinit timers to accomodate random window (#2447) * Remove sonoff-xxl + * Disable sleep when using Esp/Arduino core 2.4.1 (#2559) * Add sonoff-classic, sonoff-allsensors and sonoff-knx * Add some coloring to important web buttons * Add rule variables and teleperiod trigger to accomodate user HA messages diff --git a/sonoff/support.ino b/sonoff/support.ino index 8bc76d6a8..37e2139bb 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -615,7 +615,9 @@ void WifiBegin(uint8_t flag) delay(200); WiFi.mode(WIFI_STA); // Disable AP mode if (Settings.sleep) { +#ifndef ARDUINO_ESP8266_RELEASE_2_4_1 // See https://github.com/arendst/Sonoff-Tasmota/issues/2559 WiFi.setSleepMode(WIFI_LIGHT_SLEEP); // Allow light sleep during idle times +#endif } // if (WiFi.getPhyMode() != WIFI_PHY_MODE_11N) { // WiFi.setPhyMode(WIFI_PHY_MODE_11N); From c8352351413315e034b708f5e4a3f92f4c6a8c6b Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 28 Apr 2018 15:55:38 +0200 Subject: [PATCH 119/136] v5.12.0n - Change ADS1115 and Counter JSON 5.12.0n * Change ESP8266 Analog JSON message from {"Analog0:123"} to {"ANALOG":{"A0:123"}} to accomodate rules (#2560) * Change Counter JSON message from {"Counter1":0,"Counter3":0} to {"COUNTER":{"C1":0,"C3":0}} to accomodate rules * Change ADS1115 JSON message from {"ADS1115":{"Analog0":123,"Analog1":123}} to {"ADS1115":{"A0":123,"A1":123}} --- README.md | 4 ++-- sonoff/_releasenotes.ino | 7 ++++++- sonoff/sonoff.ino | 2 +- sonoff/support.ino | 2 +- sonoff/xsns_01_counter.ino | 15 ++++++++++++++- sonoff/xsns_12_ads1115.ino | 2 +- sonoff/xsns_12_ads1115_i2cdev.ino | 2 +- 7 files changed, 26 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index a15c9ab91..8d55383d2 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ If you like **Sonoff-Tasmota**, give it a star, or fork it and contribute! ### Development: [![Build Status](https://img.shields.io/travis/arendst/Sonoff-Tasmota.svg)](https://travis-ci.org/arendst/Sonoff-Tasmota) -Current version is **5.12.0m** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.12.0n** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### Quick install Download one of the released binaries from https://github.com/arendst/Sonoff-Tasmota/releases and flash it to your hardware as documented in the wiki. @@ -133,7 +133,7 @@ Different firmware images are released based on Features and Sensors selection g |--------------------------------|--------|---------|---------|------|------------| | ESP/Arduino lib v2.3.0 | 526k | 488k | 427k | 535k | 549k | | ESP/Arduino lib v2.4.0 | 531k | 496k | 435k | 540k | 552k | -| ESP/Arduino lib v2.4.1 | 533k | 498k | 436k | 542k | 554k | +| ESP/Arduino lib v2.4.1 | 534k | 499k | 437k | 543k | 555k | ### Contribute You can contribute to Sonoff-Tasmota by diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 725ce14e3..ec42dee40 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,9 @@ -/* 5.12.0m +/* 5.12.0n + * Change ESP8266 Analog JSON message from {"Analog0:123"} to {"ANALOG":{"A0:123"}} to accomodate rules (#2560) + * Change Counter JSON message from {"Counter1":0,"Counter3":0} to {"COUNTER":{"C1":0,"C3":0}} to accomodate rules + * Change ADS1115 JSON message from {"ADS1115":{"Analog0":123,"Analog1":123}} to {"ADS1115":{"A0":123,"A1":123}} + * + * 5.12.0m * Reinit timers to accomodate random window (#2447) * Remove sonoff-xxl * Disable sleep when using Esp/Arduino core 2.4.1 (#2559) diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index ab223790a..2da537983 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050C000D // 5.12.0m +#define VERSION 0x050C000E // 5.12.0n // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) diff --git a/sonoff/support.ino b/sonoff/support.ino index 37e2139bb..7ff973b2d 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -1396,7 +1396,7 @@ void AdcShow(boolean json) analog >>= 5; if (json) { - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"" D_JSON_ANALOG_INPUT "0\":%d"), mqtt_data, analog); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"ANALOG\":{\"A0\":%d}"), mqtt_data, analog); #ifdef USE_WEBSERVER } else { snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_ANALOG, mqtt_data, "", 0, analog); diff --git a/sonoff/xsns_01_counter.ino b/sonoff/xsns_01_counter.ino index 397f3d853..d1cb5da5b 100644 --- a/sonoff/xsns_01_counter.ino +++ b/sonoff/xsns_01_counter.ino @@ -90,9 +90,11 @@ const char HTTP_SNS_COUNTER[] PROGMEM = void CounterShow(boolean json) { + char stemp[10]; char counter[16]; byte dsxflg = 0; + byte header = 0; for (byte i = 0; i < MAX_COUNTERS; i++) { if (pin[GPIO_CNTR1 +i] < 99) { if (bitRead(Settings.pulse_counter_type, i)) { @@ -103,7 +105,13 @@ void CounterShow(boolean json) } if (json) { - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"" D_JSON_COUNTER "%d\":%s"), mqtt_data, i +1, counter); + if (!header) { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"COUNTER\":{"), mqtt_data); + stemp[0] = '\0'; + } + header++; + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s%s\"C%d\":%s"), mqtt_data, stemp, i +1, counter); + strcpy(stemp, ","); #ifdef USE_DOMOTICZ if ((0 == tele_period) && (1 == dsxflg)) { DomoticzSensor(DZ_COUNT, RtcSettings.pulse_counter[i]); @@ -117,6 +125,11 @@ void CounterShow(boolean json) } } } + if (json) { + if (header) { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}"), mqtt_data); + } + } } /*********************************************************************************************\ diff --git a/sonoff/xsns_12_ads1115.ino b/sonoff/xsns_12_ads1115.ino index 19c3ccf8a..f1279a732 100644 --- a/sonoff/xsns_12_ads1115.ino +++ b/sonoff/xsns_12_ads1115.ino @@ -190,7 +190,7 @@ void Ads1115Show(boolean json) stemp[0] = '\0'; } dsxflg++; - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s%s\"" D_JSON_ANALOG_INPUT "%d\":%d"), mqtt_data, stemp, i, adc_value); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s%s\"A%d\":%d"), mqtt_data, stemp, i, adc_value); strcpy(stemp, ","); #ifdef USE_WEBSERVER } else { diff --git a/sonoff/xsns_12_ads1115_i2cdev.ino b/sonoff/xsns_12_ads1115_i2cdev.ino index 692040743..d3748ec7a 100644 --- a/sonoff/xsns_12_ads1115_i2cdev.ino +++ b/sonoff/xsns_12_ads1115_i2cdev.ino @@ -110,7 +110,7 @@ void Ads1115Show(boolean json) stemp[0] = '\0'; } dsxflg++; - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s%s\"" D_JSON_ANALOG_INPUT "%d\":%d"), mqtt_data, stemp, i, adc_value); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s%s\"A%d\":%d"), mqtt_data, stemp, i, adc_value); strcpy(stemp, ","); #ifdef USE_WEBSERVER } else { From 44598e5fc4a2d1a12dc86d721272587c8394c66f Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 28 Apr 2018 18:18:37 +0200 Subject: [PATCH 120/136] Add ANALOG#A0div10 trigger to rules 5.12.0n * Add ANALOG#A0div10 trigger to rules to be used in rule like on analog#a0div10 do publish cmnd/ailight/dimmer %value% endon --- sonoff/_releasenotes.ino | 1 + sonoff/support.ino | 28 +++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index ec42dee40..d7bed584e 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -2,6 +2,7 @@ * Change ESP8266 Analog JSON message from {"Analog0:123"} to {"ANALOG":{"A0:123"}} to accomodate rules (#2560) * Change Counter JSON message from {"Counter1":0,"Counter3":0} to {"COUNTER":{"C1":0,"C3":0}} to accomodate rules * Change ADS1115 JSON message from {"ADS1115":{"Analog0":123,"Analog1":123}} to {"ADS1115":{"A0":123,"A1":123}} + * Add ANALOG#A0div10 trigger to rules to be used in rule like on analog#a0div10 do publish cmnd/ailight/dimmer %value% endon * * 5.12.0m * Reinit timers to accomodate random window (#2447) diff --git a/sonoff/support.ino b/sonoff/support.ino index 7ff973b2d..da95e4f25 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -1386,7 +1386,10 @@ void RtcInit() * ADC support \*********************************************************************************************/ -void AdcShow(boolean json) +uint8_t adc_counter = 0; +uint16_t adc_last_value = 0; + +uint16_t AdcRead() { uint16_t analog = 0; for (byte i = 0; i < 32; i++) { @@ -1394,6 +1397,26 @@ void AdcShow(boolean json) delay(1); } analog >>= 5; + return analog; +} + +void AdcEvery50ms() +{ + adc_counter++; + if (!(adc_counter % 4)) { + uint16_t new_value = AdcRead(); + if ((new_value < adc_last_value -10) || (new_value > adc_last_value +10)) { + adc_last_value = new_value; + uint16_t value = adc_last_value / 10; + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"ANALOG\":{\"A0div10\":%d}}"), (0 == value) ? 1 : (value > 99) ? 100 : value); + RulesProcess(); + } + } +} + +void AdcShow(boolean json) +{ + uint16_t analog = AdcRead(); if (json) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"ANALOG\":{\"A0\":%d}"), mqtt_data, analog); @@ -1416,6 +1439,9 @@ boolean Xsns02(byte function) if (pin[GPIO_ADC0] < 99) { switch (function) { + case FUNC_EVERY_50_MSECOND: + AdcEvery50ms(); + break; case FUNC_JSON_APPEND: AdcShow(1); break; From 39f56cff3af0a470367a0477a138f06ef8214adf Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sun, 29 Apr 2018 10:35:14 +0200 Subject: [PATCH 121/136] Fix Bug on KNX Driver Fix Bug on KNX Driver #2568 --- sonoff/xdrv_11_knx.ino | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sonoff/xdrv_11_knx.ino b/sonoff/xdrv_11_knx.ino index 7084973b9..3853284a2 100644 --- a/sonoff/xdrv_11_knx.ino +++ b/sonoff/xdrv_11_knx.ino @@ -548,7 +548,7 @@ void KnxSensor(byte sensor_type, float value) knx.write_2byte_float(KNX_addr, value); snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX "%s " D_SENT_TO " %d.%d.%d "), - device_param_ga[sensor_type], + device_param_ga[sensor_type -1], KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member); AddLog(LOG_LEVEL_INFO); @@ -741,9 +741,13 @@ void HandleKNXConfiguration() page.replace(F("GAarea"), F("CB_AREA")); page.replace(F("GAfdef"), F("CB_FDEF")); page += FPSTR(HTTP_FORM_KNX4); + byte j; for (byte i = 0; i < KNX_MAX_device_param ; i++) { - if ( device_param[i].show ) + // Check How many Relays are available and add: RelayX and TogleRelayX + if ( (i > 8) && (i < 16) ) { j=i-8; } else { j=i; } + if ( i == 8 ) { j = 0; } + if ( device_param[j].show ) { page += FPSTR(HTTP_FORM_KNX_OPT); page.replace(F("{vop}"), String(device_param[i].type)); From 36da4794d296aebe6f5e584fe164784a6ce7308c Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sun, 29 Apr 2018 13:45:23 +0200 Subject: [PATCH 122/136] Fix some language files Fix language files and allow Analog#A0div10 from 0 to 100 --- sonoff/language/cs-CZ.h | 4 ++-- sonoff/language/el-GR.h | 4 ++-- sonoff/language/en-GB.h | 2 +- sonoff/support.ino | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h index 51296a577..a52f31901 100644 --- a/sonoff/language/cs-CZ.h +++ b/sonoff/language/cs-CZ.h @@ -28,7 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * - * Updated until v5.12.0m + * Updated until v5.12.0n \*********************************************************************/ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) @@ -43,7 +43,7 @@ #define D_HOUR_MINUTE_SEPARATOR ":" #define D_MINUTE_SECOND_SEPARATOR ":" -#define D_DAY3LIST "Po Út St Čt Pá So Ne " +#define D_DAY3LIST "Ne Po Út St Čt Pá So " #define D_MONTH3LIST "LedÚnoBřeDubKvěČvnČvcSrpZářŘíjLisPro" // Non JSON decimal separator diff --git a/sonoff/language/el-GR.h b/sonoff/language/el-GR.h index 7eff7094a..e4280b092 100644 --- a/sonoff/language/el-GR.h +++ b/sonoff/language/el-GR.h @@ -1,7 +1,7 @@ /* el-GR.h - localization for Greek - Greece for Sonoff-Tasmota - Copyright (C) 2018 Harry Kandiloros + Copyright (C) 2018 Kan3Nas This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * - * Updated until v5.12.0m + * Updated until v5.12.0n \*********************************************************************/ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h index a57d18fd9..ade787b9e 100644 --- a/sonoff/language/en-GB.h +++ b/sonoff/language/en-GB.h @@ -28,7 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * - * Updated until v5.12.0l + * Updated until v5.12.0n \*********************************************************************/ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) diff --git a/sonoff/support.ino b/sonoff/support.ino index da95e4f25..78ac10c0c 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -1408,7 +1408,7 @@ void AdcEvery50ms() if ((new_value < adc_last_value -10) || (new_value > adc_last_value +10)) { adc_last_value = new_value; uint16_t value = adc_last_value / 10; - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"ANALOG\":{\"A0div10\":%d}}"), (0 == value) ? 1 : (value > 99) ? 100 : value); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"ANALOG\":{\"A0div10\":%d}}"), (value > 99) ? 100 : value); RulesProcess(); } } From c86a9f8e5321f86dc60a2370f6ecc59c431afb30 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sun, 29 Apr 2018 15:29:43 +0200 Subject: [PATCH 123/136] Fix Energy Today and Yesterday overflow 5.12.0o * Fix Energy Today and Yesterday overflow (#2543) --- README.md | 2 +- sonoff/_releasenotes.ino | 5 ++++- sonoff/settings.ino | 6 +++++- sonoff/sonoff.ino | 2 +- sonoff/xdrv_03_energy.ino | 35 ++++++++++++++++++----------------- 5 files changed, 29 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 8d55383d2..f4b869751 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ If you like **Sonoff-Tasmota**, give it a star, or fork it and contribute! ### Development: [![Build Status](https://img.shields.io/travis/arendst/Sonoff-Tasmota.svg)](https://travis-ci.org/arendst/Sonoff-Tasmota) -Current version is **5.12.0n** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.12.0o** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### Quick install Download one of the released binaries from https://github.com/arendst/Sonoff-Tasmota/releases and flash it to your hardware as documented in the wiki. diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index d7bed584e..804fc4068 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,7 @@ -/* 5.12.0n +/* 5.12.0o + * Fix Energy Today and Yesterday overflow (#2543) + * + * 5.12.0n * Change ESP8266 Analog JSON message from {"Analog0:123"} to {"ANALOG":{"A0:123"}} to accomodate rules (#2560) * Change Counter JSON message from {"Counter1":0,"Counter3":0} to {"COUNTER":{"C1":0,"C3":0}} to accomodate rules * Change ADS1115 JSON message from {"ADS1115":{"Analog0":123,"Analog1":123}} to {"ADS1115":{"A0":123,"A1":123}} diff --git a/sonoff/settings.ino b/sonoff/settings.ino index 579862457..059383d72 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -851,7 +851,11 @@ void SettingsDelta() Settings.knx_CB_registered = 0; memset(&Settings.knx_physsical_addr, 0x00, 0x800 - 0x6b8); // Reset until 0x800 for future use } - + if (Settings.version < 0x050C000F) { + Settings.energy_kWhtoday /= 1000; + Settings.energy_kWhyesterday /= 1000; + RtcSettings.energy_kWhtoday /= 1000; + } Settings.version = VERSION; SettingsSave(1); } diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 2da537983..ef8708617 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050C000E // 5.12.0n +#define VERSION 0x050C000F // 5.12.0o // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) diff --git a/sonoff/xdrv_03_energy.ino b/sonoff/xdrv_03_energy.ino index fc70751bf..db43cc670 100644 --- a/sonoff/xdrv_03_energy.ino +++ b/sonoff/xdrv_03_energy.ino @@ -47,11 +47,12 @@ float energy_voltage = 0; // 123.1 V float energy_current = 0; // 123.123 A float energy_power = 0; // 123.1 W float energy_power_factor = 0; // 0.12 -float energy_daily = 0; // 12.123 kWh +float energy_daily = 0; // 123.123 kWh float energy_total = 0; // 12345.12345 kWh float energy_start = 0; // 12345.12345 kWh total previous -unsigned long energy_kWhtoday; // 1212312345 Wh * 10^-5 (deca micro Watt hours) - 5763924 = 0.05763924 kWh = 0.058 kWh = energy_daily -unsigned long energy_period = 0; // 1212312345 Wh * 10^-5 (deca micro Watt hours) - 5763924 = 0.05763924 kWh = 0.058 kWh = energy_daily +unsigned long energy_kWhtoday; // 12312312 Wh * 10^-2 (deca milli Watt hours) - 5764 = 0.05764 kWh = 0.058 kWh = energy_daily +unsigned long energy_period = 0; // 12312312 Wh * 10^-2 (deca milli Watt hours) - 5764 = 0.05764 kWh = 0.058 kWh = energy_daily + float energy_power_last[3] = { 0 }; uint8_t energy_power_delta = 0; @@ -82,8 +83,8 @@ Ticker ticker_energy; void EnergyUpdateToday() { RtcSettings.energy_kWhtoday = energy_kWhtoday; - energy_daily = (float)energy_kWhtoday / 100000000; - energy_total = (float)(RtcSettings.energy_kWhtotal + (energy_kWhtoday / 1000)) / 100000; + energy_daily = (float)energy_kWhtoday / 100000; + energy_total = (float)(RtcSettings.energy_kWhtotal + energy_kWhtoday) / 100000; } /*********************************************************************************************\ @@ -156,7 +157,7 @@ void HlwEverySecond() hlw_len = 10000 / hlw_energy_period_counter; hlw_energy_period_counter = 0; if (hlw_len) { - energy_kWhtoday += ((HLW_PREF * Settings.energy_power_calibration) / hlw_len) / 36; + energy_kWhtoday += ((HLW_PREF * Settings.energy_power_calibration) / hlw_len) / 36000; EnergyUpdateToday(); } } @@ -390,7 +391,7 @@ void CseEverySecond() } if (cf_frequency && energy_power) { cf_pulses_last_time = cf_pulses; - energy_kWhtoday += (cf_frequency * Settings.energy_power_calibration) / 36; + energy_kWhtoday += (cf_frequency * Settings.energy_power_calibration) / 36000; EnergyUpdateToday(); } } @@ -539,7 +540,7 @@ void PzemEvery200ms() break; case 4: // Total energy as 99999Wh if (!energy_start || (value < energy_start)) energy_start = value; // Init after restart and hanlde roll-over if any - energy_kWhtoday += (value - energy_start) * 100000; + energy_kWhtoday += (value - energy_start) * 100; energy_start = value; EnergyUpdateToday(); break; @@ -579,7 +580,7 @@ void Energy200ms() if (RtcTime.valid) { if (LocalTime() == Midnight()) { Settings.energy_kWhyesterday = energy_kWhtoday; - Settings.energy_kWhtotal += (energy_kWhtoday / 1000); + Settings.energy_kWhtotal += energy_kWhtoday; RtcSettings.energy_kWhtotal = Settings.energy_kWhtotal; energy_kWhtoday = 0; energy_period = energy_kWhtoday; @@ -851,14 +852,14 @@ boolean EnergyCommand() if (p != XdrvMailbox.data) { switch (XdrvMailbox.index) { case 1: - energy_kWhtoday = lnum *100000; + energy_kWhtoday = lnum *100; energy_period = energy_kWhtoday; Settings.energy_kWhtoday = energy_kWhtoday; RtcSettings.energy_kWhtoday = energy_kWhtoday; - energy_daily = (float)energy_kWhtoday / 100000000; + energy_daily = (float)energy_kWhtoday / 100000; break; case 2: - Settings.energy_kWhyesterday = lnum *100000; + Settings.energy_kWhyesterday = lnum *100; break; case 3: RtcSettings.energy_kWhtotal = lnum *100; @@ -869,9 +870,9 @@ boolean EnergyCommand() char energy_yesterday_chr[10]; char stoday_energy[10]; char energy_total_chr[10]; - dtostrfd((float)Settings.energy_kWhyesterday / 100000000, Settings.flag2.energy_resolution, energy_yesterday_chr); - dtostrfd((float)RtcSettings.energy_kWhtoday / 100000000, Settings.flag2.energy_resolution, stoday_energy); - dtostrfd((float)(RtcSettings.energy_kWhtotal + (energy_kWhtoday / 1000)) / 100000, Settings.flag2.energy_resolution, energy_total_chr); + dtostrfd((float)Settings.energy_kWhyesterday / 100000, Settings.flag2.energy_resolution, energy_yesterday_chr); + dtostrfd((float)RtcSettings.energy_kWhtoday / 100000, Settings.flag2.energy_resolution, stoday_energy); + dtostrfd((float)(RtcSettings.energy_kWhtotal + energy_kWhtoday) / 100000, Settings.flag2.energy_resolution, energy_total_chr); snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"%s\":{\"" D_JSON_TOTAL "\":%s,\"" D_JSON_YESTERDAY "\":%s,\"" D_JSON_TODAY "\":%s}}"), command, energy_total_chr, energy_yesterday_chr, stoday_energy); status_flag = 1; @@ -1073,7 +1074,7 @@ void EnergyShow(boolean json) float energy = 0; if (show_energy_period) { - if (energy_period) energy = (float)(energy_kWhtoday - energy_period) / 100000; + if (energy_period) energy = (float)(energy_kWhtoday - energy_period) / 100; energy_period = energy_kWhtoday; } @@ -1084,7 +1085,7 @@ void EnergyShow(boolean json) dtostrfd(energy_voltage, Settings.flag2.voltage_resolution, energy_voltage_chr); dtostrfd(energy_current, Settings.flag2.current_resolution, energy_current_chr); dtostrfd(energy_power_factor, 2, energy_power_factor_chr); - dtostrfd((float)Settings.energy_kWhyesterday / 100000000, Settings.flag2.energy_resolution, energy_yesterday_chr); + dtostrfd((float)Settings.energy_kWhyesterday / 100000, Settings.flag2.energy_resolution, energy_yesterday_chr); if (json) { snprintf_P(speriod, sizeof(speriod), PSTR(",\"" D_JSON_PERIOD "\":%s"), energy_period_chr); From 67aaa2777c89d04c789d4b762385b997c5710a36 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 30 Apr 2018 11:10:38 +0200 Subject: [PATCH 124/136] Revert "Fix Energy Today and Yesterday overflow" This reverts commit c86a9f8e5321f86dc60a2370f6ecc59c431afb30. --- README.md | 2 +- sonoff/_releasenotes.ino | 5 +---- sonoff/settings.ino | 6 +----- sonoff/sonoff.ino | 2 +- sonoff/xdrv_03_energy.ino | 35 +++++++++++++++++------------------ 5 files changed, 21 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index f4b869751..8d55383d2 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ If you like **Sonoff-Tasmota**, give it a star, or fork it and contribute! ### Development: [![Build Status](https://img.shields.io/travis/arendst/Sonoff-Tasmota.svg)](https://travis-ci.org/arendst/Sonoff-Tasmota) -Current version is **5.12.0o** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.12.0n** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### Quick install Download one of the released binaries from https://github.com/arendst/Sonoff-Tasmota/releases and flash it to your hardware as documented in the wiki. diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 804fc4068..d7bed584e 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,7 +1,4 @@ -/* 5.12.0o - * Fix Energy Today and Yesterday overflow (#2543) - * - * 5.12.0n +/* 5.12.0n * Change ESP8266 Analog JSON message from {"Analog0:123"} to {"ANALOG":{"A0:123"}} to accomodate rules (#2560) * Change Counter JSON message from {"Counter1":0,"Counter3":0} to {"COUNTER":{"C1":0,"C3":0}} to accomodate rules * Change ADS1115 JSON message from {"ADS1115":{"Analog0":123,"Analog1":123}} to {"ADS1115":{"A0":123,"A1":123}} diff --git a/sonoff/settings.ino b/sonoff/settings.ino index 059383d72..579862457 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -851,11 +851,7 @@ void SettingsDelta() Settings.knx_CB_registered = 0; memset(&Settings.knx_physsical_addr, 0x00, 0x800 - 0x6b8); // Reset until 0x800 for future use } - if (Settings.version < 0x050C000F) { - Settings.energy_kWhtoday /= 1000; - Settings.energy_kWhyesterday /= 1000; - RtcSettings.energy_kWhtoday /= 1000; - } + Settings.version = VERSION; SettingsSave(1); } diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index ef8708617..2da537983 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050C000F // 5.12.0o +#define VERSION 0x050C000E // 5.12.0n // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) diff --git a/sonoff/xdrv_03_energy.ino b/sonoff/xdrv_03_energy.ino index db43cc670..fc70751bf 100644 --- a/sonoff/xdrv_03_energy.ino +++ b/sonoff/xdrv_03_energy.ino @@ -47,12 +47,11 @@ float energy_voltage = 0; // 123.1 V float energy_current = 0; // 123.123 A float energy_power = 0; // 123.1 W float energy_power_factor = 0; // 0.12 -float energy_daily = 0; // 123.123 kWh +float energy_daily = 0; // 12.123 kWh float energy_total = 0; // 12345.12345 kWh float energy_start = 0; // 12345.12345 kWh total previous -unsigned long energy_kWhtoday; // 12312312 Wh * 10^-2 (deca milli Watt hours) - 5764 = 0.05764 kWh = 0.058 kWh = energy_daily -unsigned long energy_period = 0; // 12312312 Wh * 10^-2 (deca milli Watt hours) - 5764 = 0.05764 kWh = 0.058 kWh = energy_daily - +unsigned long energy_kWhtoday; // 1212312345 Wh * 10^-5 (deca micro Watt hours) - 5763924 = 0.05763924 kWh = 0.058 kWh = energy_daily +unsigned long energy_period = 0; // 1212312345 Wh * 10^-5 (deca micro Watt hours) - 5763924 = 0.05763924 kWh = 0.058 kWh = energy_daily float energy_power_last[3] = { 0 }; uint8_t energy_power_delta = 0; @@ -83,8 +82,8 @@ Ticker ticker_energy; void EnergyUpdateToday() { RtcSettings.energy_kWhtoday = energy_kWhtoday; - energy_daily = (float)energy_kWhtoday / 100000; - energy_total = (float)(RtcSettings.energy_kWhtotal + energy_kWhtoday) / 100000; + energy_daily = (float)energy_kWhtoday / 100000000; + energy_total = (float)(RtcSettings.energy_kWhtotal + (energy_kWhtoday / 1000)) / 100000; } /*********************************************************************************************\ @@ -157,7 +156,7 @@ void HlwEverySecond() hlw_len = 10000 / hlw_energy_period_counter; hlw_energy_period_counter = 0; if (hlw_len) { - energy_kWhtoday += ((HLW_PREF * Settings.energy_power_calibration) / hlw_len) / 36000; + energy_kWhtoday += ((HLW_PREF * Settings.energy_power_calibration) / hlw_len) / 36; EnergyUpdateToday(); } } @@ -391,7 +390,7 @@ void CseEverySecond() } if (cf_frequency && energy_power) { cf_pulses_last_time = cf_pulses; - energy_kWhtoday += (cf_frequency * Settings.energy_power_calibration) / 36000; + energy_kWhtoday += (cf_frequency * Settings.energy_power_calibration) / 36; EnergyUpdateToday(); } } @@ -540,7 +539,7 @@ void PzemEvery200ms() break; case 4: // Total energy as 99999Wh if (!energy_start || (value < energy_start)) energy_start = value; // Init after restart and hanlde roll-over if any - energy_kWhtoday += (value - energy_start) * 100; + energy_kWhtoday += (value - energy_start) * 100000; energy_start = value; EnergyUpdateToday(); break; @@ -580,7 +579,7 @@ void Energy200ms() if (RtcTime.valid) { if (LocalTime() == Midnight()) { Settings.energy_kWhyesterday = energy_kWhtoday; - Settings.energy_kWhtotal += energy_kWhtoday; + Settings.energy_kWhtotal += (energy_kWhtoday / 1000); RtcSettings.energy_kWhtotal = Settings.energy_kWhtotal; energy_kWhtoday = 0; energy_period = energy_kWhtoday; @@ -852,14 +851,14 @@ boolean EnergyCommand() if (p != XdrvMailbox.data) { switch (XdrvMailbox.index) { case 1: - energy_kWhtoday = lnum *100; + energy_kWhtoday = lnum *100000; energy_period = energy_kWhtoday; Settings.energy_kWhtoday = energy_kWhtoday; RtcSettings.energy_kWhtoday = energy_kWhtoday; - energy_daily = (float)energy_kWhtoday / 100000; + energy_daily = (float)energy_kWhtoday / 100000000; break; case 2: - Settings.energy_kWhyesterday = lnum *100; + Settings.energy_kWhyesterday = lnum *100000; break; case 3: RtcSettings.energy_kWhtotal = lnum *100; @@ -870,9 +869,9 @@ boolean EnergyCommand() char energy_yesterday_chr[10]; char stoday_energy[10]; char energy_total_chr[10]; - dtostrfd((float)Settings.energy_kWhyesterday / 100000, Settings.flag2.energy_resolution, energy_yesterday_chr); - dtostrfd((float)RtcSettings.energy_kWhtoday / 100000, Settings.flag2.energy_resolution, stoday_energy); - dtostrfd((float)(RtcSettings.energy_kWhtotal + energy_kWhtoday) / 100000, Settings.flag2.energy_resolution, energy_total_chr); + dtostrfd((float)Settings.energy_kWhyesterday / 100000000, Settings.flag2.energy_resolution, energy_yesterday_chr); + dtostrfd((float)RtcSettings.energy_kWhtoday / 100000000, Settings.flag2.energy_resolution, stoday_energy); + dtostrfd((float)(RtcSettings.energy_kWhtotal + (energy_kWhtoday / 1000)) / 100000, Settings.flag2.energy_resolution, energy_total_chr); snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"%s\":{\"" D_JSON_TOTAL "\":%s,\"" D_JSON_YESTERDAY "\":%s,\"" D_JSON_TODAY "\":%s}}"), command, energy_total_chr, energy_yesterday_chr, stoday_energy); status_flag = 1; @@ -1074,7 +1073,7 @@ void EnergyShow(boolean json) float energy = 0; if (show_energy_period) { - if (energy_period) energy = (float)(energy_kWhtoday - energy_period) / 100; + if (energy_period) energy = (float)(energy_kWhtoday - energy_period) / 100000; energy_period = energy_kWhtoday; } @@ -1085,7 +1084,7 @@ void EnergyShow(boolean json) dtostrfd(energy_voltage, Settings.flag2.voltage_resolution, energy_voltage_chr); dtostrfd(energy_current, Settings.flag2.current_resolution, energy_current_chr); dtostrfd(energy_power_factor, 2, energy_power_factor_chr); - dtostrfd((float)Settings.energy_kWhyesterday / 100000, Settings.flag2.energy_resolution, energy_yesterday_chr); + dtostrfd((float)Settings.energy_kWhyesterday / 100000000, Settings.flag2.energy_resolution, energy_yesterday_chr); if (json) { snprintf_P(speriod, sizeof(speriod), PSTR(",\"" D_JSON_PERIOD "\":%s"), energy_period_chr); From 040a7adaf18ac30241a09895b899bf922ed61cdc Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 30 Apr 2018 12:07:48 +0200 Subject: [PATCH 125/136] v5.12.0o - Fix Energy Today overflow 5.12.0o * Fix Energy Today and Yesterday overflow (#2543) --- README.md | 2 +- sonoff/_releasenotes.ino | 5 ++++- sonoff/settings.ino | 6 +++++- sonoff/sonoff.ino | 2 +- sonoff/xdrv_03_energy.ino | 43 +++++++++++++++++++++++---------------- 5 files changed, 37 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 8d55383d2..f4b869751 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ If you like **Sonoff-Tasmota**, give it a star, or fork it and contribute! ### Development: [![Build Status](https://img.shields.io/travis/arendst/Sonoff-Tasmota.svg)](https://travis-ci.org/arendst/Sonoff-Tasmota) -Current version is **5.12.0n** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.12.0o** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### Quick install Download one of the released binaries from https://github.com/arendst/Sonoff-Tasmota/releases and flash it to your hardware as documented in the wiki. diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index d7bed584e..804fc4068 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,7 @@ -/* 5.12.0n +/* 5.12.0o + * Fix Energy Today and Yesterday overflow (#2543) + * + * 5.12.0n * Change ESP8266 Analog JSON message from {"Analog0:123"} to {"ANALOG":{"A0:123"}} to accomodate rules (#2560) * Change Counter JSON message from {"Counter1":0,"Counter3":0} to {"COUNTER":{"C1":0,"C3":0}} to accomodate rules * Change ADS1115 JSON message from {"ADS1115":{"Analog0":123,"Analog1":123}} to {"ADS1115":{"A0":123,"A1":123}} diff --git a/sonoff/settings.ino b/sonoff/settings.ino index 579862457..059383d72 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -851,7 +851,11 @@ void SettingsDelta() Settings.knx_CB_registered = 0; memset(&Settings.knx_physsical_addr, 0x00, 0x800 - 0x6b8); // Reset until 0x800 for future use } - + if (Settings.version < 0x050C000F) { + Settings.energy_kWhtoday /= 1000; + Settings.energy_kWhyesterday /= 1000; + RtcSettings.energy_kWhtoday /= 1000; + } Settings.version = VERSION; SettingsSave(1); } diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 2da537983..ef8708617 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050C000E // 5.12.0n +#define VERSION 0x050C000F // 5.12.0o // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) diff --git a/sonoff/xdrv_03_energy.ino b/sonoff/xdrv_03_energy.ino index fc70751bf..264613429 100644 --- a/sonoff/xdrv_03_energy.ino +++ b/sonoff/xdrv_03_energy.ino @@ -47,11 +47,12 @@ float energy_voltage = 0; // 123.1 V float energy_current = 0; // 123.123 A float energy_power = 0; // 123.1 W float energy_power_factor = 0; // 0.12 -float energy_daily = 0; // 12.123 kWh +float energy_daily = 0; // 123.123 kWh float energy_total = 0; // 12345.12345 kWh float energy_start = 0; // 12345.12345 kWh total previous -unsigned long energy_kWhtoday; // 1212312345 Wh * 10^-5 (deca micro Watt hours) - 5763924 = 0.05763924 kWh = 0.058 kWh = energy_daily -unsigned long energy_period = 0; // 1212312345 Wh * 10^-5 (deca micro Watt hours) - 5763924 = 0.05763924 kWh = 0.058 kWh = energy_daily +unsigned long energy_kWhtoday_delta = 0; // 1212312345 Wh 10^-5 (deca micro Watt hours) - Overflows to energy_kWhtoday (HLW and CSE only) +unsigned long energy_kWhtoday; // 12312312 Wh * 10^-2 (deca milli Watt hours) - 5764 = 0.05764 kWh = 0.058 kWh = energy_daily +unsigned long energy_period = 0; // 12312312 Wh * 10^-2 (deca milli Watt hours) - 5764 = 0.05764 kWh = 0.058 kWh = energy_daily float energy_power_last[3] = { 0 }; uint8_t energy_power_delta = 0; @@ -81,9 +82,14 @@ Ticker ticker_energy; void EnergyUpdateToday() { + if (energy_kWhtoday_delta > 1000) { + unsigned long delta = energy_kWhtoday_delta / 1000; + energy_kWhtoday_delta -= (delta * 1000); + energy_kWhtoday += delta; + } RtcSettings.energy_kWhtoday = energy_kWhtoday; - energy_daily = (float)energy_kWhtoday / 100000000; - energy_total = (float)(RtcSettings.energy_kWhtotal + (energy_kWhtoday / 1000)) / 100000; + energy_daily = (float)energy_kWhtoday / 100000; + energy_total = (float)(RtcSettings.energy_kWhtotal + energy_kWhtoday) / 100000; } /*********************************************************************************************\ @@ -156,7 +162,7 @@ void HlwEverySecond() hlw_len = 10000 / hlw_energy_period_counter; hlw_energy_period_counter = 0; if (hlw_len) { - energy_kWhtoday += ((HLW_PREF * Settings.energy_power_calibration) / hlw_len) / 36; + energy_kWhtoday_delta += ((HLW_PREF * Settings.energy_power_calibration) / hlw_len) / 36; EnergyUpdateToday(); } } @@ -390,7 +396,7 @@ void CseEverySecond() } if (cf_frequency && energy_power) { cf_pulses_last_time = cf_pulses; - energy_kWhtoday += (cf_frequency * Settings.energy_power_calibration) / 36; + energy_kWhtoday_delta += (cf_frequency * Settings.energy_power_calibration) / 36; EnergyUpdateToday(); } } @@ -539,7 +545,7 @@ void PzemEvery200ms() break; case 4: // Total energy as 99999Wh if (!energy_start || (value < energy_start)) energy_start = value; // Init after restart and hanlde roll-over if any - energy_kWhtoday += (value - energy_start) * 100000; + energy_kWhtoday += (value - energy_start) * 100; energy_start = value; EnergyUpdateToday(); break; @@ -579,9 +585,10 @@ void Energy200ms() if (RtcTime.valid) { if (LocalTime() == Midnight()) { Settings.energy_kWhyesterday = energy_kWhtoday; - Settings.energy_kWhtotal += (energy_kWhtoday / 1000); + Settings.energy_kWhtotal += energy_kWhtoday; RtcSettings.energy_kWhtotal = Settings.energy_kWhtotal; energy_kWhtoday = 0; + energy_kWhtoday_delta = 0; energy_period = energy_kWhtoday; EnergyUpdateToday(); energy_max_energy_state = 3; @@ -851,14 +858,15 @@ boolean EnergyCommand() if (p != XdrvMailbox.data) { switch (XdrvMailbox.index) { case 1: - energy_kWhtoday = lnum *100000; + energy_kWhtoday = lnum *100; + energy_kWhtoday_delta = 0; energy_period = energy_kWhtoday; Settings.energy_kWhtoday = energy_kWhtoday; RtcSettings.energy_kWhtoday = energy_kWhtoday; - energy_daily = (float)energy_kWhtoday / 100000000; + energy_daily = (float)energy_kWhtoday / 100000; break; case 2: - Settings.energy_kWhyesterday = lnum *100000; + Settings.energy_kWhyesterday = lnum *100; break; case 3: RtcSettings.energy_kWhtotal = lnum *100; @@ -869,9 +877,9 @@ boolean EnergyCommand() char energy_yesterday_chr[10]; char stoday_energy[10]; char energy_total_chr[10]; - dtostrfd((float)Settings.energy_kWhyesterday / 100000000, Settings.flag2.energy_resolution, energy_yesterday_chr); - dtostrfd((float)RtcSettings.energy_kWhtoday / 100000000, Settings.flag2.energy_resolution, stoday_energy); - dtostrfd((float)(RtcSettings.energy_kWhtotal + (energy_kWhtoday / 1000)) / 100000, Settings.flag2.energy_resolution, energy_total_chr); + dtostrfd((float)Settings.energy_kWhyesterday / 100000, Settings.flag2.energy_resolution, energy_yesterday_chr); + dtostrfd((float)RtcSettings.energy_kWhtoday / 100000, Settings.flag2.energy_resolution, stoday_energy); + dtostrfd((float)(RtcSettings.energy_kWhtotal + energy_kWhtoday) / 100000, Settings.flag2.energy_resolution, energy_total_chr); snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"%s\":{\"" D_JSON_TOTAL "\":%s,\"" D_JSON_YESTERDAY "\":%s,\"" D_JSON_TODAY "\":%s}}"), command, energy_total_chr, energy_yesterday_chr, stoday_energy); status_flag = 1; @@ -1040,6 +1048,7 @@ void EnergySnsInit() if (energy_flg) { energy_kWhtoday = (RtcSettingsValid()) ? RtcSettings.energy_kWhtoday : (RtcTime.day_of_year == Settings.energy_kWhdoy) ? Settings.energy_kWhtoday : 0; + energy_kWhtoday_delta = 0; energy_period = energy_kWhtoday; EnergyUpdateToday(); ticker_energy.attach_ms(200, Energy200ms); @@ -1073,7 +1082,7 @@ void EnergyShow(boolean json) float energy = 0; if (show_energy_period) { - if (energy_period) energy = (float)(energy_kWhtoday - energy_period) / 100000; + if (energy_period) energy = (float)(energy_kWhtoday - energy_period) / 100; energy_period = energy_kWhtoday; } @@ -1084,7 +1093,7 @@ void EnergyShow(boolean json) dtostrfd(energy_voltage, Settings.flag2.voltage_resolution, energy_voltage_chr); dtostrfd(energy_current, Settings.flag2.current_resolution, energy_current_chr); dtostrfd(energy_power_factor, 2, energy_power_factor_chr); - dtostrfd((float)Settings.energy_kWhyesterday / 100000000, Settings.flag2.energy_resolution, energy_yesterday_chr); + dtostrfd((float)Settings.energy_kWhyesterday / 100000, Settings.flag2.energy_resolution, energy_yesterday_chr); if (json) { snprintf_P(speriod, sizeof(speriod), PSTR(",\"" D_JSON_PERIOD "\":%s"), energy_period_chr); From 2c94ecfb6d1d1531d42cd655fafce83845fd2fbc Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 30 Apr 2018 14:18:46 +0200 Subject: [PATCH 126/136] Fix uptime 17651+ days 5.12.0o * Fix NTP sync to Thu Jan 01 08:00:10 1970 results in uptime 17651+ days (core2.4.1/sdk2.2.1) --- sonoff/_releasenotes.ino | 1 + sonoff/support.ino | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 804fc4068..0cb14f97b 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,5 +1,6 @@ /* 5.12.0o * Fix Energy Today and Yesterday overflow (#2543) + * Fix NTP sync to Thu Jan 01 08:00:10 1970 results in uptime 17651+ days (core2.4.1/sdk2.2.1) * * 5.12.0n * Change ESP8266 Analog JSON message from {"Analog0:123"} to {"ANALOG":{"A0:123"}} to accomodate rules (#2560) diff --git a/sonoff/support.ino b/sonoff/support.ino index 78ac10c0c..a33c81a1a 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -1314,7 +1314,7 @@ void RtcSecond() uint8_t offset = (uptime < 30) ? RtcTime.second : (((ESP.getChipId() & 0xF) * 3) + 3) ; // First try ASAP to sync. If fails try once every 60 seconds based on chip id if ((WL_CONNECTED == WiFi.status()) && (offset == RtcTime.second) && ((RtcTime.year < 2016) || (ntp_sync_minute == RtcTime.minute))) { ntp_time = sntp_get_current_timestamp(); - if (ntp_time) { + if (ntp_time > 1451602800) { // Fix NTP bug in core 2.4.1/SDK 2.2.1 (returns Thu Jan 01 08:00:10 1970 after power on) utc_time = ntp_time; ntp_sync_minute = 60; // Sync so block further requests if (restart_time == 0) { From 962a50452c55f3ae3a06d808c53af82960597426 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 30 Apr 2018 17:35:42 +0200 Subject: [PATCH 127/136] v5.13.0 Sync with master --- README.md | 2 +- sonoff/_releasenotes.ino | 188 +++++++++++++++------------------------ sonoff/sonoff.ino | 2 +- 3 files changed, 76 insertions(+), 116 deletions(-) diff --git a/README.md b/README.md index f4b869751..7b38ad191 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ If you like **Sonoff-Tasmota**, give it a star, or fork it and contribute! ### Development: [![Build Status](https://img.shields.io/travis/arendst/Sonoff-Tasmota.svg)](https://travis-ci.org/arendst/Sonoff-Tasmota) -Current version is **5.12.0o** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.13.0** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### Quick install Download one of the released binaries from https://github.com/arendst/Sonoff-Tasmota/releases and flash it to your hardware as documented in the wiki. diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 0cb14f97b..d08e1bb39 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,118 +1,49 @@ -/* 5.12.0o - * Fix Energy Today and Yesterday overflow (#2543) - * Fix NTP sync to Thu Jan 01 08:00:10 1970 results in uptime 17651+ days (core2.4.1/sdk2.2.1) - * - * 5.12.0n - * Change ESP8266 Analog JSON message from {"Analog0:123"} to {"ANALOG":{"A0:123"}} to accomodate rules (#2560) - * Change Counter JSON message from {"Counter1":0,"Counter3":0} to {"COUNTER":{"C1":0,"C3":0}} to accomodate rules - * Change ADS1115 JSON message from {"ADS1115":{"Analog0":123,"Analog1":123}} to {"ADS1115":{"A0":123,"A1":123}} - * Add ANALOG#A0div10 trigger to rules to be used in rule like on analog#a0div10 do publish cmnd/ailight/dimmer %value% endon - * - * 5.12.0m - * Reinit timers to accomodate random window (#2447) - * Remove sonoff-xxl - * Disable sleep when using Esp/Arduino core 2.4.1 (#2559) - * Add sonoff-classic, sonoff-allsensors and sonoff-knx - * Add some coloring to important web buttons - * Add rule variables and teleperiod trigger to accomodate user HA messages - * Add define MQTT_TELE_RETAIN compile option default set to 0 (#1071) - * Add user selectable defines for Sunrise/set Dawn option (#2378) - * Add random window to timers (#2447) - * Add optional KNX IP Protocol Support (#2402) - * Add Greek language file (#2491) - * Add Bulgarian language file - * Add support for sensor HC-SR04 ultrasonic (#113, #1964, #2444) - * Add support for Sonoff Pow R2 (#2340) - * Add GPIO_User to GPIO02 for all Sonoff T1 (#2524) - * Fix compile error when using ESP/Arduino library v2.3.0 by reverting KNX async UDP library to default UDP library (#2488, #2492, #2493) - * Fix configuration filename truncation when it contains spaces (#2484, #2490) - * - * 5.12.0l - * Release rules up to 511 characters - * Prepare for feature release - call on translators to update their language files - * Add timer sunrise and sunset offset (#2378) - * Fix negative Latitude and Longitude value entry (#2461) - * Fix sunrise and sunset calculation (#2461) - * - * 5.12.0k - * Prepare for simple rules of up to 255 characters by enlarging Settings area to now 2048 bytes - * Change Timer parameter name from Power to Action - * Add commands Publish, Rule, RuleTimer and Event. See Wiki about Rule restriction, usage and examples - * Fix freeing more code space when emulation is disabled (#1592) - * Fix update temperature on DS18x20 drivers (#2328) - * Fix compile error when not defined USE_TIMERS (#2400) - * - * 5.12.0j - * Add optional Sunrise and Sunset timers with commands Latitide and Longitude to be enabled with define USE_SUNRISE in user_config.h (#2317) - * - * 5.12.0i - * Add 16 timers using commands Timer and Timers (#1091) - * Add commands Timer 0 to clear timer and Timer 1..16 to copy timer - * Add optional Timer configuration webpage to be enabled in user_config.h with define USE_TIMERS_WEB - * Add hexadecimal Data entry to command IrSend using 0x notation (#1290, #2314) - * Add Domoticz Battery and RSSI Quality (#1604) - * Add Home Assistant MQTT Discovery for Buttons and change SetOption19 response (#2277) - * Add support for SGP30 gas and air quality sensor (#2307) - * Add multiple color entry support for command Led like Led2 120000 001200 000012 setting led2 as Red, Led3 as Green and Led4 as Blue (#2303) - * Add hexadecimal RGB color entry on RGBCW leds (#2304) +/* 5.13.0 20180430 + * Change platformio option sonoff-ds18x20 to sonoff-allsensors enabling ds18x20 and all other sensors in one image + * Change status display of Ssid and SetOption + * Change default option SetOption15 from 0 to 1 providing better initial PWM experience * Change webpage parameter communication - * Change Timer parameter Device to more obvious Output * Change max number of commands in Backlog from 15 to 30 and ignore commands overflowing + * Change TSL2561 driver to joba library and delete Adafruit library (#1644) + * Change default parameters in user_config.h to undefined for easy installation (#1851) + * Change max user configurable hold time from 10 to 25 seconds (#1851) + * Change Sonoff SC JSON format (#1939) + * Change Polish language to using Diacritics (#2005) * Change user_config_override usage by providing user_config_override_sample.h (#2228) * Change MQTT response topic for Energy changes from ENERGY to SENSOR (#2229, #2251) * Change default Reset configuration time from 4 seconds to 40 seconds on Button hold (#2268) - * - * 5.12.0h - * Add optional Arduino OTA support to be enabled in user_config.h (#1998) - * Add support for Software Serial bridge using commands SerialDelimiter, SBaudrate and SSerialSend. Supports 8N1 and text only (#2190) - * Add support for Hardware Serial bridge using commands SerialDelimiter, Baudrate and SerialSend. Supports 8N1 and text only (#2182) - * Add support for Zengge WF017 PWM Led strip controller (#2202) - * Add PWM status to command State if PWM enabled (#2203) - * Add command HSBColor Hue,Sat,Bri (#1642, #2203) - * Add command Channel 0..100 to control dimmer value for individual color channels (#2111, #2203) - * Add Channel status information (#2211) - * Add all FriendlyNames to Status information (#2208) - * Change status display of Ssid and SetOption - * Change default option SetOption15 from 0 to 1 providing better initial PWM experience - * - * 5.12.0f - * Add compile time support for WS2812 BRG and RBG led configurations to be defined in user_config.h (#1690) - * - * 5.12.0e - * Add Domoticz dust (custom) sensors to PMS5003 and NovaFitness SDS drivers as PM1, PM2.5 and PM10 - * Add a second TLS fingerprint to allow switching keys in TLS mode (#2033, #2102) - * Add display of remaining pulse time to command PulseTime (#2085) - * Add additional time offset to Wifi Retry based on device mac address (#2089) - * Add command Color6 RRGGBB for Clock hour marker color and command Rotation pixels for Clock rotation (#2092) - * Add HTML language header in local language (#2123) - * Add command PowerDelta 0..100 (percentage) to Energy monitoring devices to report on active power load change (#2157) - * Add Restart Reason to Status 1 report (#2161) - * Fix MAX31850 higher temperatures (#1269) - * - * 5.12.0d - * Add support for optional MQTT drivers to be selected in user_config.h (#1992) - * Add Portuguese language file - * Add compiler check for stable lwIP version v1.4 (#1940) - * Add always suffix with device number in Mqtt discovery topic (#1962) - * Add diacritics to Polish language file (#2005) - * Add Hungarian language file (#2024) - * Add Czech language file - * Add Chinese (Traditional) in Taiwan language file (#2108) - * Add support for Nova Fitness SDS011 and possibly SDS021 particle concentration sensor (#2070) - * Add single decimal precision to Nova Fitness SDS0x1 sensor values (#2093) - * Add support for multiple SHT3X sensors (#1949, #2110) - * Add Sonoff SC domoticz support for Sound level as Counter and Air quality (#2118) - * Fix MQTT TLS fingerprint validation (#2033) - * - * 5.12.0c + * Change ESP8266 Analog JSON message from {"Analog0:123"} to {"ANALOG":{"A0:123"}} to accomodate rules (#2560) + * Change Counter JSON message from {"Counter1":0,"Counter3":0} to {"COUNTER":{"C1":0,"C3":0}} to accomodate rules + * Change ADS1115 JSON message from {"ADS1115":{"Analog0":123,"Analog1":123}} to {"ADS1115":{"A0":123,"A1":123}} * Fix intermittent exception when dns lookup is used while sleep is enabled * Fix 5.4.0 regression turning off single press after button hold during 4x hold time * Fix possible wifi connection problem by erasing sdk configuration parameters - * Change Polish language to using Diacritics (#2005) - * - * 5.12.0b + * Fix NTP sync to Thu Jan 01 08:00:10 1970 results in uptime 17651+ days (core2.4.1/sdk2.2.1) + * Fix MAX31850 higher temperatures (#1269) + * Fix freeing more code space when emulation is disabled (#1592) + * Fix providing web page configuratin option for Friendly Name when no device (relay or light) is configured (#1850) + * Fix compile error when define HOME_ASSISTANT_DISCOVERY_ENABLE is not set (#1937) + * Fix MQTT TLS fingerprint validation (#2033) + * Fix update temperature on DS18x20 drivers (#2328) + * Fix compile error when not defined USE_TIMERS (#2400) + * Fix configuration filename truncation when it contains spaces (#2484, #2490) + * Fix Energy Today and Yesterday overflow (#2543) * Add serial debug info + * Add Portuguese language file + * Add Czech language file + * Add Bulgarian language file + * Add Domoticz dust (custom) sensors to PMS5003 and NovaFitness SDS drivers as PM1, PM2.5 and PM10 + * Add commands Publish, Rule, RuleTimer and Event. See Wiki about Rule restriction, usage and examples + * Add sonoff-classic, sonoff-allsensors and sonoff-knx + * Add some coloring to important web buttons + * Add support for sensor HC-SR04 ultrasonic (#113, #1964, #2444) + * Add define MQTT_TELE_RETAIN compile option default set to 0 (#1071) + * Add 16 timers using commands Timer and Timers (#1091) + * Add optional Timer configuration webpage to be enabled in user_config.h with define USE_TIMERS_WEB * Add Multichannel Gas sensor using MultiChannel_Gas_Sensor library (#1245) + * Add Domoticz Battery and RSSI Quality (#1604) + * Add command HSBColor Hue,Sat,Bri (#1642, #2203) + * Add compile time support for WS2812 BRG and RBG led configurations to be defined in user_config.h (#1690) * Add optional usage of %d or %X suffices in MQTT client to append chipid (#1871) * Add optional usage of %d or %X suffices in MQTT topic to append chipid (#1871) * Add optional usage of %d or %04d in ota url to be replaced with chipid (#1871) @@ -122,17 +53,46 @@ * Add Webserver upload preflight request support (#1927) * Add Home Assistant clear other device (#1931) * Add Restart time to Status 1 (#1938) - * Change TSL2561 driver to joba library and delete Adafruit library (#1644) - * Change Sonoff SC JSON format (#1939) - * Fix compile error when define HOME_ASSISTANT_DISCOVERY_ENABLE is not set (#1937) * Add optional TSL2561 driver using library Joba_Tsl2561 to be enabled in user_config.h with define USE_TSL2561_JOBA (#1951) * Add support for sensor SHTC3 (#1967) - * - * 5.12.0a - * Change platformio option sonoff-ds18x20 to sonoff-allsensors enabling ds18x20 and all other sensors in one image - * Fix providing web page configuratin option for Friendly Name when no device (relay or light) is configured (#1850) - * Change default parameters in user_config.h to undefined for easy installation (#1851) - * Change max user configurable hold time from 10 to 25 seconds (#1851) + * Add compiler check for stable lwIP version v1.4 (#1940) + * Add support for multiple SHT3X sensors (#1949, #2110) + * Add always suffix with device number in Mqtt discovery topic (#1962) + * Add support for optional MQTT drivers to be selected in user_config.h (#1992) + * Add optional Arduino OTA support to be enabled in user_config.h (#1998) + * Add diacritics to Polish language file (#2005) + * Add Hungarian language file (#2024) + * Add support for Nova Fitness SDS011 and possibly SDS021 particle concentration sensor (#2070) + * Add single decimal precision to Nova Fitness SDS0x1 sensor values (#2093) + * Add Chinese (Traditional) in Taiwan language file (#2108) + * Add Sonoff SC domoticz support for Sound level as Counter and Air quality (#2118) + * Add a second TLS fingerprint to allow switching keys in TLS mode (#2033, #2102) + * Add display of remaining pulse time to command PulseTime (#2085) + * Add additional time offset to Wifi Retry based on device mac address (#2089) + * Add command Color6 RRGGBB for Clock hour marker color and command Rotation pixels for Clock rotation (#2092) + * Add HTML language header in local language (#2123) + * Add command PowerDelta 0..100 (percentage) to Energy monitoring devices to report on active power load change (#2157) + * Add Restart Reason to Status 1 report (#2161) + * Add command Channel 0..100 to control dimmer value for individual color channels (#2111, #2203) + * Add support for Hardware Serial bridge using commands SerialDelimiter, Baudrate and SerialSend. Supports 8N1 and text only (#2182) + * Add support for Software Serial bridge using commands SerialDelimiter, SBaudrate and SSerialSend. Supports 8N1 and text only (#2190) + * Add support for Zengge WF017 PWM Led strip controller (#2202) + * Add PWM status to command State if PWM enabled (#2203) + * Add all FriendlyNames to Status information (#2208) + * Add Channel status information (#2211) + * Add hexadecimal Data entry to command IrSend using 0x notation (#1290, #2314) + * Add Home Assistant MQTT Discovery for Buttons and change SetOption19 response (#2277) + * Add multiple color entry support for command Led like Led2 120000 001200 000012 setting led2 as Red, Led3 as Green and Led4 as Blue (#2303) + * Add hexadecimal RGB color entry on RGBCW leds (#2304) + * Add support for SGP30 gas and air quality sensor (#2307) + * Add optional Sunrise and Sunset timers with commands Latitide and Longitude to be enabled with define USE_SUNRISE in user_config.h (#2317) + * Add timer sunrise and sunset offset (#2378) + * Add user selectable defines for Sunrise/set Dawn option (#2378) + * Add optional KNX IP Protocol Support (#2402) + * Add random window to timers (#2447) + * Add Greek language file (#2491) + * Add support for Sonoff Pow R2 (#2340) + * Add GPIO_User to GPIO02 for all Sonoff T1 (#2524) * * 5.12.0 20180209 * Change library PubSubClient.h define MQTT_MAX_PACKET_SIZE from 512 to 1000 for Home Assistant support diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index ef8708617..a3f7b2866 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050C000F // 5.12.0o +#define VERSION 0x050D0000 // 5.13.0 // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) From d629b8ce2a4ba1288793b97474fe63fb429adc8e Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Tue, 1 May 2018 11:28:36 +0200 Subject: [PATCH 128/136] v5.13.0a - Fix JSON buffer size 5.13.0a * Fix JSON buffers size too small for execution in some situations (#2580) --- README.md | 2 +- sonoff/_releasenotes.ino | 5 ++++- sonoff/sonoff.ino | 2 +- sonoff/xdrv_09_timers.ino | 2 +- sonoff/xdrv_10_rules.ino | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7b38ad191..19bf193a6 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ If you like **Sonoff-Tasmota**, give it a star, or fork it and contribute! ### Development: [![Build Status](https://img.shields.io/travis/arendst/Sonoff-Tasmota.svg)](https://travis-ci.org/arendst/Sonoff-Tasmota) -Current version is **5.13.0** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.13.0a** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### Quick install Download one of the released binaries from https://github.com/arendst/Sonoff-Tasmota/releases and flash it to your hardware as documented in the wiki. diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index d08e1bb39..3bb2238c9 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,7 @@ -/* 5.13.0 20180430 +/* 5.13.0a + * Fix JSON buffers size too small for execution in some situations (#2580) + * + * 5.13.0 20180430 * Change platformio option sonoff-ds18x20 to sonoff-allsensors enabling ds18x20 and all other sensors in one image * Change status display of Ssid and SetOption * Change default option SetOption15 from 0 to 1 providing better initial PWM experience diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index a3f7b2866..554a4858e 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050D0000 // 5.13.0 +#define VERSION 0x050D0001 // 5.13.0a // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino index aa1287f20..e85349da7 100644 --- a/sonoff/xdrv_09_timers.ino +++ b/sonoff/xdrv_09_timers.ino @@ -354,7 +354,7 @@ boolean TimerCommand() #ifndef USE_RULES if (devices_present) { #endif - StaticJsonBuffer<200> jsonBuffer; + StaticJsonBuffer<256> jsonBuffer; JsonObject& root = jsonBuffer.parseObject(dataBufUc); if (!root.success()) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_TIMER "%d\":\"" D_JSON_INVALID_JSON "\"}"), index); // JSON decode failed diff --git a/sonoff/xdrv_10_rules.ino b/sonoff/xdrv_10_rules.ino index f92edcf55..b07bea5b7 100644 --- a/sonoff/xdrv_10_rules.ino +++ b/sonoff/xdrv_10_rules.ino @@ -181,7 +181,7 @@ bool RulesRuleMatch(String &event, String &rule) } // Step2: Search rule_task and rule_name - StaticJsonBuffer<400> jsonBuf; + StaticJsonBuffer<1024> jsonBuf; JsonObject &root = jsonBuf.parseObject(event); if (!root.success()) { return false; } // No valid JSON data From 1fb9c0e531b87d83d8d7f279dab705f85d677bef Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Tue, 1 May 2018 12:42:17 +0200 Subject: [PATCH 129/136] v5.13.0a - Add optional module select not to be used 5.13.0a * Add define MODULE for user selecting default model although it preferably should not be changed (#569, #2589) --- README.md | 2 +- sonoff/_releasenotes.ino | 1 + sonoff/sonoff.h | 2 -- sonoff/sonoff_post.h | 4 ++++ sonoff/user_config.h | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 19bf193a6..5c369b928 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you like **Sonoff-Tasmota**, give it a star, or fork it and contribute! [![GitHub stars](https://img.shields.io/github/stars/arendst/Sonoff-Tasmota.svg?style=social&label=Star)](https://github.com/arendst/Sonoff-Tasmota/stargazers) [![GitHub forks](https://img.shields.io/github/forks/arendst/Sonoff-Tasmota.svg?style=social&label=Fork)](https://github.com/arendst/Sonoff-Tasmota/network) -### Development: +### Development [![Build Status](https://img.shields.io/travis/arendst/Sonoff-Tasmota.svg)](https://travis-ci.org/arendst/Sonoff-Tasmota) Current version is **5.13.0a** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 3bb2238c9..0bbf1e7bf 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,5 +1,6 @@ /* 5.13.0a * Fix JSON buffers size too small for execution in some situations (#2580) + * Add define MODULE for user selecting default model (#569, #2589) * * 5.13.0 20180430 * Change platformio option sonoff-ds18x20 to sonoff-allsensors enabling ds18x20 and all other sensors in one image diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index 296046c85..a2eecea4f 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -52,8 +52,6 @@ typedef unsigned long power_t; // Power (Relay) type #define MAX_KNX_CB 10 // Max number of KNX Group Addresses to write that can be set #define MAX_RULE_SIZE 512 // Max number of characters in rules -#define MODULE SONOFF_BASIC // [Module] Select default model - #define MQTT_TOKEN_PREFIX "%prefix%" // To be substituted by mqtt_prefix[x] #define MQTT_TOKEN_TOPIC "%topic%" // To be substituted by mqtt_topic, mqtt_grptopic, mqtt_buttontopic, mqtt_switchtopic diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h index 1d6ba7878..ef1dfbfd9 100644 --- a/sonoff/sonoff_post.h +++ b/sonoff/sonoff_post.h @@ -46,6 +46,10 @@ void KNX_CB_Action(message_t const &msg, void *arg); * Default global defines \*********************************************************************************************/ +#ifndef MODULE +#define MODULE SONOFF_BASIC // [Module] Select default model +#endif + #define USE_DHT // Default DHT11 sensor needs no external library /*********************************************************************************************\ diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 6bfa6e1cd..83b9a346f 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -48,6 +48,7 @@ // -- Project ------------------------------------- #define PROJECT "sonoff" // PROJECT is used as the default topic delimiter +#define MODULE SONOFF_BASIC // [Module] Select default model from sonoff_template.h (Should not be changed) #define SAVE_DATA 1 // [SaveData] Save changed parameters to Flash (0 = disable, 1 - 3600 seconds) #define SAVE_STATE 1 // [SetOption0] Save changed power state to Flash (0 = disable, 1 = enable) From 69ef562b36bf0e56472af8f3feba976cfed8a716 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Tue, 1 May 2018 18:02:45 +0200 Subject: [PATCH 130/136] Fix configuration restore 5.13.0a * Fix configuration restore (#2591) --- sonoff/_releasenotes.ino | 3 ++- sonoff/webserver.ino | 29 +++++++++++++++++++---------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 0bbf1e7bf..2efcefcd7 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,6 +1,7 @@ /* 5.13.0a * Fix JSON buffers size too small for execution in some situations (#2580) - * Add define MODULE for user selecting default model (#569, #2589) + * Add define MODULE for user selecting default model although it preferably should not be changed (#569, #2589) + * Fix configuration restore (#2591) * * 5.13.0 20180430 * Change platformio option sonoff-ds18x20 to sonoff-allsensors enabling ds18x20 and all other sensors in one image diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index f82fa2e6d..9c9be2a42 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -328,6 +328,8 @@ uint8_t webserver_state = HTTP_OFF; uint8_t upload_error = 0; uint8_t upload_file_type; uint8_t upload_progress_dot_count; +uint8_t config_block_count = 0; +uint8_t config_xor_on = 0; // Helper function to avoid code duplication (saves 4k Flash) static void WebGetArg(const char* arg, char* out, size_t max) @@ -1317,17 +1319,14 @@ void HandleUploadLoop() } upload_progress_dot_count = 0; } else if (!upload_error && (UPLOAD_FILE_WRITE == upload.status)) { - if (0 == upload.totalSize) - { + if (0 == upload.totalSize) { if (upload_file_type) { if (upload.buf[0] != CONFIG_FILE_SIGN) { upload_error = 8; return; } - if (upload.currentSize > sizeof(Settings)) { - upload_error = 9; - return; - } + config_xor_on = upload.buf[1]; + config_block_count = 0; } else { if (upload.buf[0] != 0xE9) { upload_error = 3; @@ -1343,14 +1342,24 @@ void HandleUploadLoop() } if (upload_file_type) { // config if (!upload_error) { - if (upload.buf[1]) { + if (upload.currentSize > (sizeof(Settings) - (config_block_count * HTTP_UPLOAD_BUFLEN))) { + if (config_block_count) { SettingsDefault(); } + upload_error = 9; + return; + } + if (config_xor_on) { for (uint16_t i = 2; i < upload.currentSize; i++) { upload.buf[i] ^= (CONFIG_FILE_XOR +i); } } - SettingsDefaultSet2(); - memcpy((char*)&Settings +16, upload.buf +16, upload.currentSize -16); - memcpy((char*)&Settings +8, upload.buf +8, 4); // Restore version and auto upgrade + if (0 == config_block_count) { + SettingsDefaultSet2(); + memcpy((char*)&Settings +16, upload.buf +16, upload.currentSize -16); + memcpy((char*)&Settings +8, upload.buf +8, 4); // Restore version and auto upgrade + } else { + memcpy((char*)&Settings +(config_block_count * HTTP_UPLOAD_BUFLEN), upload.buf, upload.currentSize); + } + config_block_count++; } } else { // firmware if (!upload_error && (Update.write(upload.buf, upload.currentSize) != upload.currentSize)) { From 036b958f76c63f66dd14900bf994bbfe20651024 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Wed, 2 May 2018 10:15:50 +0200 Subject: [PATCH 131/136] v5.13.1a - Update otaurl 5.13.1a * Change user_config.h otaurl to http://sonoff.maddox.co.uk/tasmota/sonoff.bin (#2588, #2602) --- README.md | 2 +- sonoff/_releasenotes.ino | 5 ++++- sonoff/sonoff.ino | 2 +- sonoff/user_config.h | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5c369b928..4845199a5 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ If you like **Sonoff-Tasmota**, give it a star, or fork it and contribute! ### Development [![Build Status](https://img.shields.io/travis/arendst/Sonoff-Tasmota.svg)](https://travis-ci.org/arendst/Sonoff-Tasmota) -Current version is **5.13.0a** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.13.1a** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### Quick install Download one of the released binaries from https://github.com/arendst/Sonoff-Tasmota/releases and flash it to your hardware as documented in the wiki. diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 2efcefcd7..8236aae15 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,7 @@ -/* 5.13.0a +/* 5.13.1a + * Change user_config.h otaurl to http://sonoff.maddox.co.uk/tasmota/sonoff.bin (#2588, #2602) + * + * 5.13.1 20180501 * Fix JSON buffers size too small for execution in some situations (#2580) * Add define MODULE for user selecting default model although it preferably should not be changed (#569, #2589) * Fix configuration restore (#2591) diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 554a4858e..e6565c286 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050D0001 // 5.13.0a +#define VERSION 0x050D0101 // 5.13.1a // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 83b9a346f..1e880ec22 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -74,7 +74,7 @@ #define WEB_LOG_LEVEL LOG_LEVEL_INFO // [WebLog] (LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE) // -- Ota ----------------------------------------- -#define OTA_URL "http://sonoff.maddox.co.uk/tasmota/sonoff.ino.bin" // [OtaUrl] +#define OTA_URL "http://sonoff.maddox.co.uk/tasmota/sonoff.bin" // [OtaUrl] // -- MQTT ---------------------------------------- #define MQTT_USE 1 // [SetOption3] Select default MQTT use (0 = Off, 1 = On) From e6e126391dfd91d0d6cdfb8a8261e505ac052377 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Thu, 3 May 2018 15:21:45 +0200 Subject: [PATCH 132/136] Fix compile error when ADC enabled and No rules 5.13.1a * Fix compile error when ADC is enabled and Rules are disabled (#2608) --- sonoff/_releasenotes.ino | 1 + sonoff/support.ino | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 8236aae15..0ab8d3efc 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,5 +1,6 @@ /* 5.13.1a * Change user_config.h otaurl to http://sonoff.maddox.co.uk/tasmota/sonoff.bin (#2588, #2602) + * Fix compile error when ADC is enabled and Rules are disabled (#2608) * * 5.13.1 20180501 * Fix JSON buffers size too small for execution in some situations (#2580) diff --git a/sonoff/support.ino b/sonoff/support.ino index a33c81a1a..d86f9ccce 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -1400,6 +1400,7 @@ uint16_t AdcRead() return analog; } +#ifdef USE_RULES void AdcEvery50ms() { adc_counter++; @@ -1413,6 +1414,7 @@ void AdcEvery50ms() } } } +#endif // USE_RULES void AdcShow(boolean json) { @@ -1439,9 +1441,11 @@ boolean Xsns02(byte function) if (pin[GPIO_ADC0] < 99) { switch (function) { +#ifdef USE_RULES case FUNC_EVERY_50_MSECOND: AdcEvery50ms(); break; +#endif // USE_RULES case FUNC_JSON_APPEND: AdcShow(1); break; From 5462057cadebf4e2d368042867c5ff8cf6b90dbb Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 4 May 2018 09:54:56 +0200 Subject: [PATCH 133/136] Fix timer data I/O errors 5.13.1a * Fix several timer data input and output errors (#2597, #2620) --- sonoff/_releasenotes.ino | 1 + sonoff/xdrv_09_timers.ino | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 0ab8d3efc..e02b9d3f6 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,6 +1,7 @@ /* 5.13.1a * Change user_config.h otaurl to http://sonoff.maddox.co.uk/tasmota/sonoff.bin (#2588, #2602) * Fix compile error when ADC is enabled and Rules are disabled (#2608) + * Fix several timer data input and output errors (#2597, #2620) * * 5.13.1 20180501 * Fix JSON buffers size too small for execution in some situations (#2580) diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino index e85349da7..533ee818e 100644 --- a/sonoff/xdrv_09_timers.ino +++ b/sonoff/xdrv_09_timers.ino @@ -302,6 +302,7 @@ void TimerEverySecond() void PrepShowTimer(uint8_t index) { char days[8] = { 0 }; + char sign[2] = { 0 }; char soutput[80]; Timer xtimer = Settings.timer[index -1]; @@ -318,10 +319,13 @@ void PrepShowTimer(uint8_t index) #ifdef USE_SUNRISE int16_t hour = xtimer.time / 60; if ((1 == xtimer.mode) || (2 == xtimer.mode)) { // Sunrise or Sunset - if (hour > 11) { hour = (hour -12) * -1; } + if (hour > 11) { + hour -= 12; + sign[0] = '-'; + } } - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_MODE "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_WINDOW "\":%d,\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d%s,\"" D_JSON_TIMER_ACTION "\":%d}"), - mqtt_data, index, xtimer.arm, xtimer.mode, hour, xtimer.time % 60, xtimer.window, days, xtimer.repeat, soutput, xtimer.power); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_MODE "\":%d,\"" D_JSON_TIMER_TIME "\":\"%s%02d:%02d\",\"" D_JSON_TIMER_WINDOW "\":%d,\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d%s,\"" D_JSON_TIMER_ACTION "\":%d}"), + mqtt_data, index, xtimer.arm, xtimer.mode, sign, hour, xtimer.time % 60, xtimer.window, days, xtimer.repeat, soutput, xtimer.power); #else snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_WINDOW "\":%d,\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d%s,\"" D_JSON_TIMER_ACTION "\":%d}"), mqtt_data, index, xtimer.arm, xtimer.time / 60, xtimer.time % 60, xtimer.window, days, xtimer.repeat, soutput, xtimer.power); @@ -374,13 +378,18 @@ boolean TimerCommand() if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_TIME))].success()) { uint16_t itime = 0; int8_t value = 0; + uint8_t sign = 0; char time_str[10]; snprintf(time_str, sizeof(time_str), root[parm_uc]); const char *substr = strtok(time_str, ":"); if (substr != NULL) { + if (strchr(substr, '-')) { + sign = 1; + substr++; + } value = atoi(substr); - if (value < 0) { value = abs(value) +12; } // Allow entering timer offset from -11:59 to -00:01 converted to 12:01 to 23:59 + if (sign) { value += 12; } // Allow entering timer offset from -11:59 to -00:01 converted to 12:01 to 23:59 if (value > 23) { value = 23; } itime = value * 60; substr = strtok(NULL, ":"); @@ -401,14 +410,13 @@ boolean TimerCommand() // SMTWTFS = 1234567 = 0011001 = 00TW00S = --TW--S Settings.timer[index].days = 0; const char *tday = root[parm_uc]; - char ch = '.'; - uint8_t i = 0; + char ch = *tday++; while ((ch != '\0') && (i < 7)) { - ch = *tday++; if (ch == '-') { ch = '0'; } uint8_t mask = 1 << i++; Settings.timer[index].days |= (ch == '0') ? 0 : mask; + ch = *tday++; } } if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_REPEAT))].success()) { @@ -419,7 +427,7 @@ boolean TimerCommand() Settings.timer[index].device = (device < devices_present) ? device : 0; } if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_ACTION))].success()) { - uint8_t action = ((uint8_t)root[parm_uc] -1) & 0x03; + uint8_t action = (uint8_t)root[parm_uc] & 0x03; Settings.timer[index].power = (devices_present) ? action : 3; // If no devices than only allow rules } From 7aa40cf5686c22a2e56398d9d8ce942df124f18a Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 4 May 2018 15:39:18 +0200 Subject: [PATCH 134/136] Add Portuguese in Brazil language 5.13.1a * Add Portuguese in Brazil language file --- sonoff/_releasenotes.ino | 1 + sonoff/language/it-IT.h | 14 +- sonoff/language/pt-BR.h | 505 +++++++++++++++++++++++++++++++++++++++ sonoff/language/pt-PT.h | 2 +- sonoff/user_config.h | 1 + 5 files changed, 515 insertions(+), 8 deletions(-) create mode 100644 sonoff/language/pt-BR.h diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index e02b9d3f6..193dc1f07 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -2,6 +2,7 @@ * Change user_config.h otaurl to http://sonoff.maddox.co.uk/tasmota/sonoff.bin (#2588, #2602) * Fix compile error when ADC is enabled and Rules are disabled (#2608) * Fix several timer data input and output errors (#2597, #2620) + * Add Portuguese in Brazil language file * * 5.13.1 20180501 * Fix JSON buffers size too small for execution in some situations (#2580) diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index 7bd6b65b5..4be29d809 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -51,7 +51,7 @@ // Common #define D_ADMIN "Admin" -#define D_AIR_QUALITY "Qualita' dell'aria" +#define D_AIR_QUALITY "Qualità dell'aria" #define D_AP "AP" // Access Point #define D_AS "come" #define D_AUTO "AUTO" @@ -96,7 +96,7 @@ #define D_GROUP "Gruppo" #define D_HOST "Host" #define D_HOSTNAME "Nome Host" -#define D_HUMIDITY "Umidita'" +#define D_HUMIDITY "Umidità" #define D_ILLUMINANCE "Illuminazione" #define D_IMMEDIATE "immediato" // Button immediate #define D_INDEX "Indice" @@ -180,7 +180,7 @@ #define D_FAILED_TO_START "partenza fallita" #define D_PATCH_ISSUE_2186 "Patch issue 2186" #define D_CONNECTING_TO_AP "Connessione ad AP" -#define D_IN_MODE "in modalita'" +#define D_IN_MODE "in modalità" #define D_CONNECT_FAILED_NO_IP_ADDRESS "Connessione fallita, indirizzo IP non ricevuto" #define D_CONNECT_FAILED_AP_NOT_REACHED "Connessione fallita, AP non raggiungibile" #define D_CONNECT_FAILED_WRONG_PASSWORD "Connessione fallita, password AP non corretta" @@ -211,7 +211,7 @@ #define D_RESTART_IN "Riavvio in" #define D_SECONDS "secondi" -#define D_DEVICE_WILL_RESTART "Il dispositivo verra' riavviato tra pochi secondi" +#define D_DEVICE_WILL_RESTART "Il dispositivo verrà riavviato tra pochi secondi" #define D_BUTTON_TOGGLE "On/Off" #define D_CONFIGURATION "Configurazione" #define D_INFORMATION "Informazioni" @@ -229,7 +229,7 @@ #define D_RESET_CONFIGURATION "Reset Configurazione" #define D_BACKUP_CONFIGURATION "Backup Configurazione" #define D_RESTORE_CONFIGURATION "Ripristino Configurazione" -#define D_MAIN_MENU "Menu' Principale" +#define D_MAIN_MENU "Menu Principale" #define D_MODULE_PARAMETERS "Parametri del modulo" #define D_MODULE_TYPE "Tipo modulo" @@ -243,7 +243,7 @@ #define D_NO_NETWORKS_FOUND "Nessuna rete trovata" #define D_REFRESH_TO_SCAN_AGAIN "Ricarica per nuova scansione" #define D_DUPLICATE_ACCESSPOINT "AccessPoint duplicato" -#define D_SKIPPING_LOW_QUALITY "Ignorato a causa di bassa qualita'" +#define D_SKIPPING_LOW_QUALITY "Ignorato a causa di bassa qualità" #define D_RSSI "RSSI" #define D_WEP "WEP" #define D_WPA_PSK "WPA PSK" @@ -317,7 +317,7 @@ #define D_UPLOAD_ERROR_CODE "Codice errore invio" #define D_ENTER_COMMAND "Inserire comando" -#define D_ENABLE_WEBLOG_FOR_RESPONSE "Abilitare weblog 2 se e' attesa una risposta" +#define D_ENABLE_WEBLOG_FOR_RESPONSE "Abilitare weblog 2 se è attesa una risposta" #define D_NEED_USER_AND_PASSWORD "Richiesto user=&password=" // xdrv_00_mqtt.ino diff --git a/sonoff/language/pt-BR.h b/sonoff/language/pt-BR.h new file mode 100644 index 000000000..a279782eb --- /dev/null +++ b/sonoff/language/pt-BR.h @@ -0,0 +1,505 @@ +/* + pt-BR.h - localization for Portuguese - Brazil for Sonoff-Tasmota + + Copyright (C) 2018 Fabiano Bovo + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef _LANGUAGE_PT_BR_H_ +#define _LANGUAGE_PT_BR_H_ + +/*************************** ATTENTION *******************************\ + * + * Due to memory constraints only UTF-8 is supported. + * To save code space keep text as short as possible. + * Time and Date provided by SDK can not be localized (yet). + * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. + * Use online command Prefix to translate cmnd, stat and tele. + * + * Updated until v5.13.0 +\*********************************************************************/ + +//#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) + +// HTML (ISO 639-1) Language Code +#define D_HTML_LANGUAGE "pt" + +// "2017-03-07T11:08:02" - ISO8601:2004 +#define D_YEAR_MONTH_SEPARATOR "-" +#define D_MONTH_DAY_SEPARATOR "-" +#define D_DATE_TIME_SEPARATOR "T" +#define D_HOUR_MINUTE_SEPARATOR ":" +#define D_MINUTE_SECOND_SEPARATOR ":" + +#define D_DAY3LIST "DomSegTerQuaQuiSexSab" +#define D_MONTH3LIST "JanFevMarAbrMaiJunJulAgoSepOutNovDez" + +// Non JSON decimal separator +#define D_DECIMAL_SEPARATOR "," + +// Common +#define D_ADMIN "Admin" +#define D_AIR_QUALITY "Qualidade do Ar" +#define D_AP "Pondo de acesso" // Ponto de Acesso +#define D_AS "como" +#define D_AUTO "Auto" +#define D_BLINK "Pulsar" +#define D_BLINKOFF "Pulsar desligado" +#define D_BOOT_COUNT "Contagem de inicialização" +#define D_BRIGHTLIGHT "Brilho" +#define D_BUTTON "Botão" +#define D_BY "por" // Write by me +#define D_BYTES "Bytes" +#define D_CELSIUS "Celsius" +#define D_CO2 "Dióxido de Carbono" +#define D_CODE "Código" // Button code +#define D_COLDLIGHT "Luz Fria" +#define D_COMMAND "Comando" +#define D_CONNECTED "Ligado" +#define D_COUNT "Contagem" +#define D_COUNTER "Contador" +#define D_CURRENT "Corrente" // As in Voltage and Current +#define D_DATA "Dados" +#define D_DARKLIGHT "Luz Escura" +#define D_DEBUG "Depurar" +#define D_DISABLED "Desabilitado" +#define D_DISTANCE "Distância" +#define D_DNS_SERVER "Servidor DNS" +#define D_DONE "Concluído" +#define D_DST_TIME "DST" +#define D_ECO2 "eCO2" +#define D_EMULATION "Emulação" +#define D_ENABLED "Habilitado" +#define D_ERASE "Apagar" +#define D_ERROR "Erro" +#define D_FAHRENHEIT "Fahrenheit" +#define D_FAILED "Falha" +#define D_FALLBACK "Retornar" +#define D_FALLBACK_TOPIC "Tópico para retornar" +#define D_FALSE "Falso" +#define D_FILE "Arquivo" +#define D_FREE_MEMORY "Memória Livre" +#define D_GAS "Gás" +#define D_GATEWAY "Gateway" +#define D_GROUP "Grupo" +#define D_HOST "Anfitrião" +#define D_HOSTNAME "Nome do anfitrião" +#define D_HUMIDITY "Umidade" +#define D_ILLUMINANCE "Luminância" +#define D_IMMEDIATE "Imediato" // Button immediate +#define D_INDEX "Índice" +#define D_INFO "Informação" +#define D_INITIALIZED "Inicializado" +#define D_IP_ADDRESS "Endereço IP" +#define D_LIGHT "Luz" +#define D_LWT "LWT" +#define D_MODULE "Módulo" +#define D_MQTT "MQTT" +#define D_MULTI_PRESS "multi-pressão" +#define D_NOISE "Ruído" +#define D_NONE "Nenhum" +#define D_OFF "Desligado" +#define D_OFFLINE "Desconectado" +#define D_OK "Ok" +#define D_ON "Ligado" +#define D_ONLINE "Conectado" +#define D_PASSWORD "Senha" +#define D_PORT "Porta" +#define D_POWER_FACTOR "Fator de potência" +#define D_POWERUSAGE "Potência" +#define D_PRESSURE "Pressão" +#define D_PRESSUREATSEALEVEL "Pressão ao nível do mar" +#define D_PROGRAM_FLASH_SIZE "Tamanho do programa na memória" +#define D_PROGRAM_SIZE "Tamanho do programa" +#define D_PROJECT "Projeto" +#define D_RECEIVED "Recebido" +#define D_RESTART "Reiniciar" +#define D_RESTARTING "Reiniciando" +#define D_RESTART_REASON "Motivo do reinício" +#define D_RESTORE "Restauração" +#define D_RETAINED "Manter" +#define D_RULE "Regra" +#define D_SAVE "Salvar" +#define D_SENSOR "Sensor" +#define D_SSID "SSId" +#define D_START "Iniciar" +#define D_STD_TIME "STD" +#define D_STOP "Parar" +#define D_SUBNET_MASK "Máscara sub rede" +#define D_SUBSCRIBE_TO "Subescrever para" +#define D_SUCCESSFUL "Successo" +#define D_SUNRISE "Nascer do sol" +#define D_SUNSET "Por do sol" +#define D_TEMPERATURE "Temperatura" +#define D_TO "Para" +#define D_TOGGLE "Inverter" +#define D_TOPIC "Tópico" +#define D_TRANSMIT "Transmitir" +#define D_TRUE "Verdadeiro" +#define D_TVOC "TVOC" +#define D_UPGRADE "atualização" +#define D_UPLOAD "Enviar" +#define D_UPTIME "Tempo de atividade" +#define D_USER "Usuário" +#define D_UTC_TIME "UTC" +#define D_UV_LEVEL "Nível UV" +#define D_VERSION "Versão" +#define D_VOLTAGE "Voltagem" +#define D_WARMLIGHT "Luz quente" +#define D_WEB_SERVER "Servidor WEB" + +// sonoff.ino +#define D_WARNING_MINIMAL_VERSION "AVISO esta versão não supporta configurações persistentes" +#define D_LEVEL_10 "nível 1-0" +#define D_LEVEL_01 "nível 0-1" +#define D_SERIAL_LOGGING_DISABLED "Registro em serie desabilitado" +#define D_SYSLOG_LOGGING_REENABLED "Registro do Syslog reativado" + +#define D_SET_BAUDRATE_TO "Ajuste da velocidade para" +#define D_RECEIVED_TOPIC "Tópico recebido" +#define D_DATA_SIZE "Tamanho de dados" +#define D_ANALOG_INPUT "Entrada analógica" + +// support.ino +#define D_OSWATCH "osWatch" +#define D_BLOCKED_LOOP "Loop bloqueado" +#define D_WPS_FAILED_WITH_STATUS "WPSconfig falha de estado" +#define D_ACTIVE_FOR_3_MINUTES "Ativo por 3 minutos" +#define D_FAILED_TO_START "Falha ao iníciar" +#define D_PATCH_ISSUE_2186 "Questão 2186" +#define D_CONNECTING_TO_AP "Ligando ao PA" +#define D_IN_MODE "em modo" +#define D_CONNECT_FAILED_NO_IP_ADDRESS "A ligação falhou porque nenhum endereço IP foi recebido" +#define D_CONNECT_FAILED_AP_NOT_REACHED "A ligação falhou porque o PA não pôde ser alcançado" +#define D_CONNECT_FAILED_WRONG_PASSWORD "A ligação falhou porque a senha está incorreta" +#define D_CONNECT_FAILED_AP_TIMEOUT "A ligação falhou porque o tempo foi excedido" +#define D_ATTEMPTING_CONNECTION "Ligando..." +#define D_CHECKING_CONNECTION "Verificando ligação..." +#define D_QUERY_DONE "Consulta finalizada. Serviço MQTT não encontrado" +#define D_MQTT_SERVICE_FOUND "Serviço MQTT encontrado em" +#define D_FOUND_AT "encontrado em" +#define D_SYSLOG_HOST_NOT_FOUND "Syslog anfitrião não encontrado" + +// settings.ino +#define D_SAVED_TO_FLASH_AT "Guardado na flash em" +#define D_LOADED_FROM_FLASH_AT "Lido da flash em" +#define D_USE_DEFAULTS "Usar predefinições" +#define D_ERASED_SECTOR "Apagar setores" + +// webserver.ino +#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware mínimo - Atualizar por favor" +#define D_WEBSERVER_ACTIVE_ON "Servidor WEB ativo em" +#define D_WITH_IP_ADDRESS "com o endereço IP" +#define D_WEBSERVER_STOPPED "Servidor WEB parou" +#define D_FILE_NOT_FOUND "Arquivo não encontrado" +#define D_REDIRECTED "Redirecionado para o portal ativo" +#define D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION "Wifimanager configura o Ponto de Acesso e mantém a estação" +#define D_WIFIMANAGER_SET_ACCESSPOINT "Wifimanager configura o Ponto de Acesso" +#define D_TRYING_TO_CONNECT "Conectar o dispositivo à rede" + +#define D_RESTART_IN "Reinicia em" +#define D_SECONDS "segundos" +#define D_DEVICE_WILL_RESTART "O dispositivo irá reiniciar dentro de alguns segundos" +#define D_BUTTON_TOGGLE "Comandar" +#define D_CONFIGURATION "Configuração" +#define D_INFORMATION "Informação" +#define D_FIRMWARE_UPGRADE "Atualização de Firmware" +#define D_CONSOLE "Console" +#define D_CONFIRM_RESTART "Confirmar o reinicio" + +#define D_CONFIGURE_MODULE "Configurar Módulo" +#define D_CONFIGURE_WIFI "Configurar WiFi" +#define D_CONFIGURE_MQTT "Configurar MQTT" +#define D_CONFIGURE_DOMOTICZ "Configurar Domoticz" +#define D_CONFIGURE_LOGGING "Configurar Logging" +#define D_CONFIGURE_OTHER "Configurar outras opções" +#define D_CONFIRM_RESET_CONFIGURATION "Confirmar limpeza de configuração" +#define D_RESET_CONFIGURATION "Apagar configuração" +#define D_BACKUP_CONFIGURATION "Salvar configuração" +#define D_RESTORE_CONFIGURATION "Repor configuração" +#define D_MAIN_MENU "Menu principal" + +#define D_MODULE_PARAMETERS "Parametros do módulo" +#define D_MODULE_TYPE "Tipo de módulo" +#define D_GPIO "GPIO" +#define D_SERIAL_IN "Entrada serial" +#define D_SERIAL_OUT "Saída serial" + +#define D_WIFI_PARAMETERS "Parâmetros do wifi" +#define D_SCAN_FOR_WIFI_NETWORKS "Encontrar redes wifi" +#define D_SCAN_DONE "Busca finalizada" +#define D_NO_NETWORKS_FOUND "Sem redes" +#define D_REFRESH_TO_SCAN_AGAIN "Nova busca" +#define D_DUPLICATE_ACCESSPOINT "Ponto de Acesso duplicado" +#define D_SKIPPING_LOW_QUALITY "Ignorado devido à baixa qualidade do sinal" +#define D_RSSI "RSSI" +#define D_WEP "WEP" +#define D_WPA_PSK "WPA PSK" +#define D_WPA2_PSK "WPA2 PSK" +#define D_AP1_SSID "AP1 SSId" +#define D_AP1_PASSWORD "Senha AP1" +#define D_AP2_SSID "AP2 SSId" +#define D_AP2_PASSWORD "Senha AP2" + +#define D_MQTT_PARAMETERS "Parâmetros MQTT" +#define D_CLIENT "Cliente" +#define D_FULL_TOPIC "Tópico completo" + +#define D_LOGGING_PARAMETERS "Parâmetros Logging" +#define D_SERIAL_LOG_LEVEL "Nível de registro serial" +#define D_WEB_LOG_LEVEL "Nível de registro WEB" +#define D_SYS_LOG_LEVEL "Nível de registro Syslog" +#define D_MORE_DEBUG "Depurar mais" +#define D_SYSLOG_HOST "Syslog anfitrião" +#define D_SYSLOG_PORT "Porta Syslog" +#define D_TELEMETRY_PERIOD "Período de telemetria" + +#define D_OTHER_PARAMETERS "Outros parâmetros" +#define D_WEB_ADMIN_PASSWORD "Senha de WEB Admin" +#define D_MQTT_ENABLE "MQTT habilitado" +#define D_FRIENDLY_NAME "Nome amigável" +#define D_BELKIN_WEMO "Belkin WeMo" +#define D_HUE_BRIDGE "Hue Bridge" +#define D_SINGLE_DEVICE "Dispositivo único" +#define D_MULTI_DEVICE "Múltiplos dispositivos" + +#define D_SAVE_CONFIGURATION "Salvar configuração" +#define D_CONFIGURATION_SAVED "Configuração salva" +#define D_CONFIGURATION_RESET "Reinicialização da configuração" + +#define D_PROGRAM_VERSION "Versão do programa" +#define D_BUILD_DATE_AND_TIME "Data e Hora da construção" +#define D_CORE_AND_SDK_VERSION "Versão Core/SDK" +#define D_FLASH_WRITE_COUNT "Contagem de gravação flash" +#define D_MAC_ADDRESS "Endereço MAC" +#define D_MQTT_HOST "MQTT Servidor" +#define D_MQTT_PORT "MQTT Porta" +#define D_MQTT_CLIENT "MQTT Cliente" +#define D_MQTT_USER "MQTT Usuário" +#define D_MQTT_TOPIC "MQTT Tópico" +#define D_MQTT_GROUP_TOPIC "MQTT Tópico Grupo" +#define D_MQTT_FULL_TOPIC "MQTT Tópico Completo" +#define D_MDNS_DISCOVERY "Descobrir mDNS" +#define D_MDNS_ADVERTISE "Anunciar mDNS" +#define D_ESP_CHIP_ID "ESP Chip Id" +#define D_FLASH_CHIP_ID "Flash Chip Id" +#define D_FLASH_CHIP_SIZE "Flash Size" +#define D_FREE_PROGRAM_SPACE "Espaço Livre Programa" + +#define D_UPGRADE_BY_WEBSERVER "Atualizar pelo servidor WEB" +#define D_OTA_URL "OTA Url" +#define D_START_UPGRADE "Iniciar atualização" +#define D_UPGRADE_BY_FILE_UPLOAD "Atualização por arquivo local" +#define D_UPLOAD_STARTED "Início do envio" +#define D_UPGRADE_STARTED "Atualização iniciada" +#define D_UPLOAD_DONE "Atualização finalizada" +#define D_UPLOAD_ERR_1 "Nenhum arquivo selecionado" +#define D_UPLOAD_ERR_2 "Não existe memória disponível" +#define D_UPLOAD_ERR_3 "Byte mágico não é 0xE9" +#define D_UPLOAD_ERR_4 "O tamanho do programa é maior do que o tamanho da memória" +#define D_UPLOAD_ERR_5 "Envio buffer miscompare" +#define D_UPLOAD_ERR_6 "Falha no envio. Habilitar logging 3" +#define D_UPLOAD_ERR_7 "Envio cancelado" +#define D_UPLOAD_ERR_8 "Arquivo inválido" +#define D_UPLOAD_ERR_9 "Arquivo muito grande" +#define D_UPLOAD_ERROR_CODE "Código de erro do envio" + +#define D_ENTER_COMMAND "Inserir comando" +#define D_ENABLE_WEBLOG_FOR_RESPONSE "Habilitar weblog 2 se resposta esperada" +#define D_NEED_USER_AND_PASSWORD "Necessário user=&password=" + +// xdrv_00_mqtt.ino +#define D_FINGERPRINT "Verifique a impressão digital TLS..." +#define D_TLS_CONNECT_FAILED_TO "TLS não conseguiu ligar" +#define D_RETRY_IN "Tentativa em" +#define D_VERIFIED "Verificado impressão digital " +#define D_INSECURE "Ligação insegura devido à impressão digital inválida" +#define D_CONNECT_FAILED_TO "A ligação falhou ao" + +// xdrv_wemohue.ino +#define D_MULTICAST_DISABLED "Multicast desabilitado" +#define D_MULTICAST_REJOINED "Multicast (re)ingressou" +#define D_MULTICAST_JOIN_FAILED "Multicast falha no reingresso" +#define D_FAILED_TO_SEND_RESPONSE "Falha no envio de reposta" + +#define D_WEMO "WeMo" +#define D_WEMO_BASIC_EVENT "WeMo evento básico" +#define D_WEMO_EVENT_SERVICE "WeMo evento de serviço" +#define D_WEMO_META_SERVICE "WeMo serviço meta" +#define D_WEMO_SETUP "WeMo configuração" +#define D_RESPONSE_SENT "Resposta enviada" + +#define D_HUE "Hue" +#define D_HUE_BRIDGE_SETUP "Hue setup" +#define D_HUE_API_NOT_IMPLEMENTED "Hue API nao implementada" +#define D_HUE_API "Hue API" +#define D_HUE_POST_ARGS "Hue POST args" +#define D_3_RESPONSE_PACKETS_SENT "3 pacotes de resposta enviados" + +// xdrv_05_domoticz.ino +#define D_DOMOTICZ_PARAMETERS "Parâmetros Domoticz" +#define D_DOMOTICZ_IDX "Idx" +#define D_DOMOTICZ_KEY_IDX "Chave idx" +#define D_DOMOTICZ_SWITCH_IDX "Interruptor idx" +#define D_DOMOTICZ_SENSOR_IDX "Sensor idx" + #define D_DOMOTICZ_TEMP "Temp" + #define D_DOMOTICZ_TEMP_HUM "Temp,Hum" + #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro" + #define D_DOMOTICZ_POWER_ENERGY "Potência,Energia" + #define D_DOMOTICZ_ILLUMINANCE "Luminância" + #define D_DOMOTICZ_COUNT "Contagem/PM1" + #define D_DOMOTICZ_VOLTAGE "Voltagem/PM2.5" + #define D_DOMOTICZ_CURRENT "Corrente/PM10" + #define D_DOMOTICZ_AIRQUALITY "Qualidade do ar" +#define D_DOMOTICZ_UPDATE_TIMER "Tempo de atualização" + +// xdrv_09_timers.ino +#define D_CONFIGURE_TIMER "Configurar temporizador" +#define D_TIMER_PARAMETERS "Parâmetros" +#define D_TIMER_ARM "Habilitar" +#define D_TIMER_TIME "Horário" +#define D_TIMER_DAYS "Dias" +#define D_TIMER_REPEAT "Repetir" +#define D_TIMER_OUTPUT "Saída" +#define D_TIMER_ACTION "Ação" + +// xdrv_10_knx.ino +#define D_CONFIGURE_KNX "Configurar KNX" +#define D_KNX_PARAMETERS "Parâmetros KNX" +#define D_KNX_GENERAL_CONFIG "Geral" +#define D_KNX_PHYSICAL_ADDRESS "Endereço físico" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "(Deve ser único na rede KNX)" +#define D_KNX_ENABLE "Habilitar KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Endereço do grupo para enviar" +#define D_ADD "Adicionar" +#define D_DELETE "Remover" +#define D_REPLY "Responder" +#define D_KNX_GROUP_ADDRESS_TO_READ "Endereço do grupo para receber" +#define D_LOG_KNX "KNX: " +#define D_RECEIVED_FROM "Recebido de" +#define D_KNX_COMMAND_WRITE "Escrever" +#define D_KNX_COMMAND_READ "Ler" +#define D_KNX_COMMAND_OTHER "Outros" +#define D_SENT_TO "Enviar para" +#define D_KNX_WARNING "O endereço ( 0 / 0 / 0 ) é reservado e não pode ser usado." + +// xdrv_03_energy.ino +#define D_ENERGY_TODAY "Consumo energético de hoje" +#define D_ENERGY_YESTERDAY "Consumo energético de ontem" +#define D_ENERGY_TOTAL "Consumo total de energia" + +// xsns_05_ds18b20.ino +#define D_SENSOR_BUSY "Sensor ocupado" +#define D_SENSOR_CRC_ERROR "Erro sensor CRC" +#define D_SENSORS_FOUND "Sensores encontrados" + +// xsns_06_dht.ino +#define D_TIMEOUT_WAITING_FOR "Fim do tempo de espera" +#define D_START_SIGNAL_LOW "Sinal de início baixo" +#define D_START_SIGNAL_HIGH "Sinal de início elevado" +#define D_PULSE "pulso" +#define D_CHECKSUM_FAILURE "Falha checksum" + +// xsns_07_sht1x.ino +#define D_SENSOR_DID_NOT_ACK_COMMAND "Sensor não aceitou o comando ACK" +#define D_SHT1X_FOUND "SHT1X encontrado" + +// xsns_18_pms5003.ino +#define D_STANDARD_CONCENTRATION "CF-1 PM" // Standard Particle CF-1 Particle Matter +#define D_ENVIRONMENTAL_CONCENTRATION "PM" // Environmetal Particle Matter +#define D_PARTICALS_BEYOND "Partículas" + +// sonoff_template.h +#define D_SENSOR_NONE "Nenhum" +#define D_SENSOR_DHT11 "DHT11" +#define D_SENSOR_AM2301 "AM2301" +#define D_SENSOR_SI7021 "SI7021" +#define D_SENSOR_DS18X20 "DS18x20" +#define D_SENSOR_I2C_SCL "I2C SCL" +#define D_SENSOR_I2C_SDA "I2C SDA" +#define D_SENSOR_WS2812 "WS2812" +#define D_SENSOR_IRSEND "IRsend" +#define D_SENSOR_SWITCH "Interruptor" // Suffix "1" +#define D_SENSOR_BUTTON "Botão" // Suffix "1" +#define D_SENSOR_RELAY "Relé" // Suffix "1i" +#define D_SENSOR_LED "Led" // Suffix "1i" +#define D_SENSOR_PWM "PWM" // Suffix "1" +#define D_SENSOR_COUNTER "Contador" // Suffix "1" +#define D_SENSOR_IRRECV "IRrecv" +#define D_SENSOR_MHZ_RX "MHZ Rx" +#define D_SENSOR_MHZ_TX "MHZ Tx" +#define D_SENSOR_PZEM_RX "PZEM Rx" +#define D_SENSOR_PZEM_TX "PZEM Tx" +#define D_SENSOR_SAIR_RX "SAir Rx" +#define D_SENSOR_SAIR_TX "SAir Tx" +#define D_SENSOR_SPI_CS "SPI CS" +#define D_SENSOR_SPI_DC "SPI DC" +#define D_SENSOR_BACKLIGHT "Luz de fundo" +#define D_SENSOR_PMS5003 "PMS5003" +#define D_SENSOR_SDS0X1 "SDS0X1" +#define D_SENSOR_SBR_RX "SerBr Rx" +#define D_SENSOR_SBR_TX "SerBr Tx" +#define D_SENSOR_SR04_TRIG "SR04 Tri" +#define D_SENSOR_SR04_ECHO "SR04 Ech" + +// Units +#define D_UNIT_AMPERE "A" +#define D_UNIT_CENTIMETER "cm" +#define D_UNIT_HOUR "H" +#define D_UNIT_KILOOHM "kOhm" +#define D_UNIT_KILOWATTHOUR "kWh" +#define D_UNIT_LUX "lx" +#define D_UNIT_MICROGRAM_PER_CUBIC_METER "ug/m3" +#define D_UNIT_MICROMETER "um" +#define D_UNIT_MICROSECOND "us" +#define D_UNIT_MILLIAMPERE "mA" +#define D_UNIT_MILLISECOND "ms" +#define D_UNIT_MINUTE "M" +#define D_UNIT_PARTS_PER_BILLION "ppb" +#define D_UNIT_PARTS_PER_DECILITER "ppd" +#define D_UNIT_PARTS_PER_MILLION "ppm" +#define D_UNIT_PRESSURE "hPa" +#define D_UNIT_SECOND "s" +#define D_UNIT_SECTORS "setores" +#define D_UNIT_VOLT "V" +#define D_UNIT_WATT "W" +#define D_UNIT_WATTHOUR "W/h" + +// Log message prefix +#define D_LOG_APPLICATION "APP: " // Application +#define D_LOG_BRIDGE "BRG: " // Bridge +#define D_LOG_CONFIG "CFG: " // Settings +#define D_LOG_COMMAND "CMD: " // Command +#define D_LOG_DEBUG "DBG: " // Debug +#define D_LOG_DHT "DHT: " // DHT sensor +#define D_LOG_DOMOTICZ "DOM: " // Domoticz +#define D_LOG_DSB "DSB: " // DS18xB20 sensor +#define D_LOG_HTTP "HTP: " // HTTP webserver +#define D_LOG_I2C "I2C: " // I2C +#define D_LOG_IRR "IRR: " // Infra Red Received +#define D_LOG_LOG "LOG: " // Logging +#define D_LOG_MODULE "MOD: " // Module +#define D_LOG_MDNS "DNS: " // mDNS +#define D_LOG_MQTT "MQT: " // MQTT +#define D_LOG_OTHER "OTH: " // Other +#define D_LOG_RESULT "RSL: " // Result +#define D_LOG_RFR "RFR: " // RF Received +#define D_LOG_SERIAL "SER: " // Serial +#define D_LOG_SHT1 "SHT: " // SHT1x sensor +#define D_LOG_UPLOAD "UPL: " // Upload +#define D_LOG_UPNP "UPP: " // UPnP +#define D_LOG_WIFI "WIF: " // Wifi + +#endif // _LANGUAGE_PT_BR_H_ diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h index 55ccf37a6..149aeec31 100644 --- a/sonoff/language/pt-PT.h +++ b/sonoff/language/pt-PT.h @@ -1,7 +1,7 @@ /* pt-PT.h - localization for Portuguese - Portugal for Sonoff-Tasmota - Copyright (C) 2018 Theo Arends and Paulo Paiva + Copyright (C) 2018 Paulo Paiva This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 1e880ec22..c8f4f4dbb 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -177,6 +177,7 @@ //#define MY_LANGUAGE it-IT // Italian in Italy //#define MY_LANGUAGE nl-NL // Dutch in the Netherlands //#define MY_LANGUAGE pl-PL // Polish in Poland +//#define MY_LANGUAGE pt-BR // Portuguese in Brazil //#define MY_LANGUAGE pt-PT // Portuguese in Portugal //#define MY_LANGUAGE ru-RU // Russian in Russia //#define MY_LANGUAGE zh-CN // Chinese (Simplified) in China From d875dae47ad4c9da7d186459bca2fc7f3b18e9a9 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 4 May 2018 16:31:05 +0200 Subject: [PATCH 135/136] Updated Italian language file 5.13.1a * Updated Italian language file (#2618) --- sonoff/_releasenotes.ino | 1 + sonoff/language/it-IT.h | 54 ++++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 193dc1f07..f534c9bbf 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -3,6 +3,7 @@ * Fix compile error when ADC is enabled and Rules are disabled (#2608) * Fix several timer data input and output errors (#2597, #2620) * Add Portuguese in Brazil language file + * Updated Italian language file (#2618) * * 5.13.1 20180501 * Fix JSON buffers size too small for execution in some situations (#2580) diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index 4be29d809..e114c8176 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -1,7 +1,7 @@ /* it-IT.h - localization for Italian - Italy for Sonoff-Tasmota - Copyright (C) 2018 Gennaro Tortone + Copyright (C) 2018 Gennaro Tortone - some mods by Antonio Fragola This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command Prefix to translate cmnd, stat and tele. * - * Updated until v5.12.0 + * Updated until v5.13.0 \*********************************************************************/ #define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) @@ -366,34 +366,34 @@ #define D_DOMOTICZ_UPDATE_TIMER "Intervallo di aggiornamento" // xdrv_09_timers.ino -#define D_CONFIGURE_TIMER "Configure Timer" -#define D_TIMER_PARAMETERS "Timer parameters" -#define D_TIMER_ARM "Arm" -#define D_TIMER_TIME "Time" -#define D_TIMER_DAYS "Days" -#define D_TIMER_REPEAT "Repeat" +#define D_CONFIGURE_TIMER "Configura Timer" +#define D_TIMER_PARAMETERS "Parametri Timer" +#define D_TIMER_ARM "Attiva" +#define D_TIMER_TIME "Ora" +#define D_TIMER_DAYS "Giorni" +#define D_TIMER_REPEAT "Ripeti" #define D_TIMER_OUTPUT "Output" -#define D_TIMER_ACTION "Action" +#define D_TIMER_ACTION "Azione" // xdrv_10_knx.ino -#define D_CONFIGURE_KNX "Configure KNX" -#define D_KNX_PARAMETERS "KNX Parameters" -#define D_KNX_GENERAL_CONFIG "General" -#define D_KNX_PHYSICAL_ADDRESS "Physical Address" -#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" -#define D_KNX_ENABLE "Enable KNX" -#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" -#define D_ADD "Add" -#define D_DELETE "Delete" -#define D_REPLY "Reply" -#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_CONFIGURE_KNX "Configura KNX" +#define D_KNX_PARAMETERS "Parametri KNX" +#define D_KNX_GENERAL_CONFIG "Generale" +#define D_KNX_PHYSICAL_ADDRESS "Indirizzo Fisico" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Deve essere univoco nella rete KNX )" +#define D_KNX_ENABLE "Abilita KNX" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Dati da Inviare al Gruppo di Indirizzi" +#define D_ADD "Aggiungi" +#define D_DELETE "Elimina" +#define D_REPLY "Rispondi" +#define D_KNX_GROUP_ADDRESS_TO_READ "Gruppo di Indirizzi da cui Ricevere Dati" #define D_LOG_KNX "KNX: " -#define D_RECEIVED_FROM "Received from" -#define D_KNX_COMMAND_WRITE "Write" -#define D_KNX_COMMAND_READ "Read" -#define D_KNX_COMMAND_OTHER "Other" -#define D_SENT_TO "sent to" -#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." +#define D_RECEIVED_FROM "Ricevuto Da" +#define D_KNX_COMMAND_WRITE "Scrivi" +#define D_KNX_COMMAND_READ "Leggi" +#define D_KNX_COMMAND_OTHER "Altro" +#define D_SENT_TO "invia a" +#define D_KNX_WARNING "L'indirizzo del gruppo ( 0 / 0 / 0 ) è riservato e non può essere usato." // xdrv_03_energy.ino #define D_ENERGY_TODAY "Energia Oggi" @@ -422,7 +422,7 @@ #define D_PARTICALS_BEYOND "Particelle" // sonoff_template.h -#define D_SENSOR_NONE "None" +#define D_SENSOR_NONE "Nessuno" #define D_SENSOR_DHT11 "DHT11" #define D_SENSOR_AM2301 "AM2301" #define D_SENSOR_SI7021 "SI7021" From 200c952138d338b84c55c61e60e26cdb0f872485 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sat, 5 May 2018 09:51:46 +0200 Subject: [PATCH 136/136] Fix KNX config error 5.13.1a * Fix KNX config error (#2628) --- sonoff/_releasenotes.ino | 1 + sonoff/xdrv_11_knx.ino | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index f534c9bbf..86387a041 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -2,6 +2,7 @@ * Change user_config.h otaurl to http://sonoff.maddox.co.uk/tasmota/sonoff.bin (#2588, #2602) * Fix compile error when ADC is enabled and Rules are disabled (#2608) * Fix several timer data input and output errors (#2597, #2620) + * Fix KNX config error (#2628) * Add Portuguese in Brazil language file * Updated Italian language file (#2618) * diff --git a/sonoff/xdrv_11_knx.ino b/sonoff/xdrv_11_knx.ino index 3853284a2..4c3c8b19f 100644 --- a/sonoff/xdrv_11_knx.ino +++ b/sonoff/xdrv_11_knx.ino @@ -347,7 +347,7 @@ void KNX_DEL_CB( byte CBnum ) bool KNX_CONFIG_NOT_MATCH() { - for (int i = 0; i < KNX_MAX_device_param; ++i) + for (byte i = 0; i < KNX_MAX_device_param; ++i) { if ( !device_param[i].show ) { // device has this parameter ? // if not, search for all registered group address to this parameter for deletion @@ -355,7 +355,7 @@ bool KNX_CONFIG_NOT_MATCH() if ( (i < 8) || (i > 15) ) // check relays and sensors (i from 8 to 16 are toggle relays parameters) { if ( KNX_CB_Search(i+1) != KNX_Empty ) { return true; } - if ( KNX_CB_Search(i+8) != KNX_Empty ) { return true; } + if ( KNX_CB_Search(i+9) != KNX_Empty ) { return true; } } } } @@ -520,7 +520,7 @@ void KnxSendButtonPower(byte key, byte device, byte state) knx.write_1bit(KNX_addr, !(state == 0)); snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX "%s = %d " D_SENT_TO " %d.%d.%d"), - device_param_ga[device + 8], !(state == 0), + device_param_ga[device + 7], !(state == 0), KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member); AddLog(LOG_LEVEL_INFO); @@ -732,6 +732,7 @@ void HandleKNXConfiguration() page.replace(F("GAfdef"), String(KNX_addr.ga.member)); } } + page += FPSTR(HTTP_FORM_KNX3); page += FPSTR(HTTP_FORM_KNX_GA); page.replace(F("GAfnum"), F("CB_FNUM")); @@ -765,6 +766,7 @@ void HandleKNXConfiguration() page.replace(F("btndis"), F("disabled")); } page.replace(F("fncbtnadd"), F("CBwarning")); + for (byte i = 0; i < Settings.knx_CB_registered ; ++i) { if ( Settings.knx_CB_param[i] ) @@ -812,7 +814,6 @@ void KNX_Save_Settings() { String stmp; address_t KNX_addr; - byte i; Settings.flag.knx_enabled = WebServer->hasArg("b1"); snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX D_ENABLED ": %d "), @@ -834,7 +835,7 @@ void KNX_Save_Settings() snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX "GA: %d"), Settings.knx_GA_registered ); AddLog(LOG_LEVEL_DEBUG); - for (i = 0; i < Settings.knx_GA_registered ; ++i) + for (byte i = 0; i < Settings.knx_GA_registered ; ++i) { KNX_addr.value = Settings.knx_GA_addr[i]; snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX "GA #%d: %s " D_TO " %d/%d/%d"), @@ -846,7 +847,7 @@ void KNX_Save_Settings() snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX "CB: %d"), Settings.knx_CB_registered ); AddLog(LOG_LEVEL_DEBUG); - for (i = 0; i < Settings.knx_CB_registered ; ++i) + for (byte i = 0; i < Settings.knx_CB_registered ; ++i) { KNX_addr.value = Settings.knx_CB_addr[i]; snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_KNX "CB #%d: %d/%d/%d " D_TO " %s"),