diff --git a/.gitignore b/.gitignore index 5dac9f52f..49359a587 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ .piolibdeps .clang_complete .gcc-flags.json +.vscode +sonoff/user_config_override.h diff --git a/README.md b/README.md index edff41892..a48256766 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.10.0j** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.11.1b** - 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.0.0/README.md b/lib/TasmotaSerial-1.0.1/README.md similarity index 100% rename from lib/TasmotaSerial-1.0.0/README.md rename to lib/TasmotaSerial-1.0.1/README.md diff --git a/lib/TasmotaSerial-1.0.0/examples/swsertest/swsertest.ino b/lib/TasmotaSerial-1.0.1/examples/swsertest/swsertest.ino similarity index 100% rename from lib/TasmotaSerial-1.0.0/examples/swsertest/swsertest.ino rename to lib/TasmotaSerial-1.0.1/examples/swsertest/swsertest.ino diff --git a/lib/TasmotaSerial-1.0.0/keywords.txt b/lib/TasmotaSerial-1.0.1/keywords.txt similarity index 100% rename from lib/TasmotaSerial-1.0.0/keywords.txt rename to lib/TasmotaSerial-1.0.1/keywords.txt diff --git a/lib/TasmotaSerial-1.0.0/library.json b/lib/TasmotaSerial-1.0.1/library.json similarity index 100% rename from lib/TasmotaSerial-1.0.0/library.json rename to lib/TasmotaSerial-1.0.1/library.json diff --git a/lib/TasmotaSerial-1.0.0/library.properties b/lib/TasmotaSerial-1.0.1/library.properties similarity index 100% rename from lib/TasmotaSerial-1.0.0/library.properties rename to lib/TasmotaSerial-1.0.1/library.properties diff --git a/lib/TasmotaSerial-1.0.0/src/TasmotaSerial.cpp b/lib/TasmotaSerial-1.0.1/src/TasmotaSerial.cpp similarity index 84% rename from lib/TasmotaSerial-1.0.0/src/TasmotaSerial.cpp rename to lib/TasmotaSerial-1.0.1/src/TasmotaSerial.cpp index 1b55818e0..5508a478a 100644 --- a/lib/TasmotaSerial-1.0.0/src/TasmotaSerial.cpp +++ b/lib/TasmotaSerial-1.0.1/src/TasmotaSerial.cpp @@ -82,35 +82,50 @@ TasmotaSerial::TasmotaSerial(int receive_pin, int transmit_pin) if (!((isValidGPIOpin(receive_pin)) && (isValidGPIOpin(transmit_pin) || transmit_pin == 16))) { return; } - m_buffer = (uint8_t*)malloc(TM_SERIAL_BUFFER_SIZE); - if (m_buffer == NULL) { - return; - } - m_valid = true; m_rx_pin = receive_pin; m_tx_pin = transmit_pin; m_in_pos = m_out_pos = 0; - // Use getCycleCount() loop to get as exact timing as possible - m_bit_time = ESP.getCpuFreqMHz() *1000000 /TM_SERIAL_BAUDRATE; - pinMode(m_rx_pin, INPUT); - ObjList[m_rx_pin] = this; - attachInterrupt(m_rx_pin, ISRList[m_rx_pin], FALLING); - pinMode(m_tx_pin, OUTPUT); - digitalWrite(m_tx_pin, HIGH); + if (m_rx_pin > -1) { + m_buffer = (uint8_t*)malloc(TM_SERIAL_BUFFER_SIZE); + 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); + ObjList[m_rx_pin] = this; + attachInterrupt(m_rx_pin, ISRList[m_rx_pin], FALLING); + } + if (m_tx_pin > -1) { + pinMode(m_tx_pin, OUTPUT); + digitalWrite(m_tx_pin, HIGH); + } + m_valid = true; } bool TasmotaSerial::isValidGPIOpin(int pin) { - return (pin >= 0 && pin <= 5) || (pin >= 12 && pin <= 15); + return (pin >= -1 && pin <= 5) || (pin >= 12 && pin <= 15); } bool TasmotaSerial::begin() { return m_valid; } +void TasmotaSerial::flush() { + m_in_pos = m_out_pos = 0; +} + +int TasmotaSerial::peek() { + if ((-1 == m_rx_pin) || (m_in_pos == m_out_pos)) { + return -1; + } + return m_buffer[m_out_pos]; +} + int TasmotaSerial::read() { - if (m_in_pos == m_out_pos) { + if ((-1 == m_rx_pin) || (m_in_pos == m_out_pos)) { return -1; } uint8_t ch = m_buffer[m_out_pos]; @@ -130,8 +145,11 @@ int TasmotaSerial::available() //#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); wait += m_bit_time; } -size_t TasmotaSerial::txWrite(uint8_t b) +size_t TasmotaSerial::write(uint8_t b) { + if (-1 == m_tx_pin) { + return 0; + } unsigned long wait = m_bit_time; digitalWrite(m_tx_pin, HIGH); unsigned long start = ESP.getCycleCount(); @@ -149,8 +167,12 @@ size_t TasmotaSerial::txWrite(uint8_t b) return 1; } +/* size_t TasmotaSerial::write(const uint8_t *buffer, size_t size) { + if (-1 == m_tx_pin) { + return 0; + } size_t n = 0; // Flush input buffer on every write m_in_pos = m_out_pos = 0; @@ -159,6 +181,7 @@ size_t TasmotaSerial::write(const uint8_t *buffer, size_t size) } return n; } +*/ #ifdef TM_SERIAL_USE_IRAM void ICACHE_RAM_ATTR TasmotaSerial::rxRead() diff --git a/lib/TasmotaSerial-1.0.0/src/TasmotaSerial.h b/lib/TasmotaSerial-1.0.1/src/TasmotaSerial.h similarity index 82% rename from lib/TasmotaSerial-1.0.0/src/TasmotaSerial.h rename to lib/TasmotaSerial-1.0.1/src/TasmotaSerial.h index beada7792..a56dcbe2e 100644 --- a/lib/TasmotaSerial-1.0.0/src/TasmotaSerial.h +++ b/lib/TasmotaSerial-1.0.1/src/TasmotaSerial.h @@ -26,19 +26,30 @@ \*********************************************************************************************/ #define TM_SERIAL_BAUDRATE 9600 -#define TM_SERIAL_BUFFER_SIZE 20 +#define TM_SERIAL_BUFFER_SIZE 64 //#define TM_SERIAL_USE_IRAM // Enable to use iram (+368 bytes) -class TasmotaSerial { +#include + +class TasmotaSerial : public Stream { public: TasmotaSerial(int receive_pin, int transmit_pin); bool begin(); - size_t write(const uint8_t *buffer, size_t size = 1); - int read(); - int available(); + int peek(); + + virtual size_t write(uint8_t byte); + virtual int read(); + virtual int available(); + virtual void flush(); + +// size_t write(const uint8_t *buffer, size_t size = 1); +// int read(); +// int available(); void rxRead(); + using Print::write; + private: bool isValidGPIOpin(int pin); size_t txWrite(uint8_t byte); diff --git a/pio/espupload.py b/pio/espupload.py index df3be81c3..d7f7e9512 100644 --- a/pio/espupload.py +++ b/pio/espupload.py @@ -18,13 +18,19 @@ import pycurl HOST_URL = "domus1:80/api/upload-arduino.php" def upload(hostUrl, filename): + tname = os.path.normpath(os.path.dirname(filename)) + new_filename = tname + os.sep + os.path.basename(tname) + '.bin' + if os.path.exists(new_filename): + os.remove(new_filename) + os.rename(filename, new_filename) + url = 'http://%s' % (hostUrl) c = pycurl.Curl() c.setopt(c.URL, url) # The "Expect:" is there to suppress "Expect: 100-continue" behaviour that is # the default in libcurl when posting large bodies (and fails on lighttpd). c.setopt(c.HTTPHEADER, ["Expect:"]) - c.setopt(c.HTTPPOST, [('file', (c.FORM_FILE, filename, )), ]) + c.setopt(c.HTTPPOST, [('file', (c.FORM_FILE, new_filename, )), ]) c.perform() c.close() diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 6bdada0bb..86ec89408 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,66 +1,51 @@ -/* 5.10.0j - * Allow conditional code based on core version - * Removed all MQTT, JSON and Command language defines from locale files (#1473) +/* 5.11.1b + * Add command PowerOnState option 5 which inverts PulseTime and allows for delayed always on after power on + * Changed OSWATCH_RESET_TIME (Blocked loop) from 30 to 120 seconds to allow slow networks (#1556) + * Add French language file (#1561) + * Fix truncated command names and wrong response for DomoticzSwitchIdx (#1571) + * Add HTTP Allow Cross Origin removed from ESP8266/Arduino 2.4.0 (#1572) + * Fix %-sign issue as printf escape character in Humidity and Sonoff SC (#1579) * - * 5.10.0i - * Add device function pointers - * Moved Command and JSON English language defines to one file (i18n.h) - * Update it-IT.h language file (#1449) - * Fix Wemo and Hue emulation by adding M-Search response delay (#1486) + * 5.11.1a + * Add OtaMagic two step Web server OTA upgrade using filename-minimal image if OTA free space is too small + * Add chinese language file (#1551) * - * 5.10.0h - * Fix Wemo Emulation for Gen 2 devices (#1486) + * 5.11.1 20180107 + * Fix Sonoff Pow command handling (#1542) * - * 5.10.0g - * Add 2nd Gen Alexa support to Wemo emulation discovery (#1357, #1450) - * - * 5.10.0f - * Differentiate between JSON text defines and other text defines to allow for English JSON while using different locale (#1449) - * Fix display of build date and time in non-english locale (#1465) - * Add define for additional number of WS2812 schemes (#1463) - * - * 5.10.0e - * Add Italian language file (#1449) - * Fix Wemo Emulation once again closest to issue (#1357) - * Add support for sensor SHT3x (#1314) - * - * 5.10.0d - * Renamed commands Color2,3,4 to Color3,4,5 - * Add command Color2 to set color while keeping same dimmer value - * Add led signal to Carbon Dioxide (CO2) sensors (see user_config.h) - * Fix Wemo Emulation again (#1357) + * 5.11.0 20180107 + * Minor webpage HTML optimizations (#1358) * Updated German translation (#1438) - * - * 5.10.0c - * Consolidate device serial (MH-Z19, SenseAir and Pzem004T) into TasmotaSerial library - * Consolidate PWM device recognition - * Fix Wemo Emulation (#1357) - * Add support for Arilux LC06 (#1414) - * - * 5.10.0b - * Add support for PZEM004T energy sensor to be enabled with define USE_PZEM004T in user_config.h * Change Sonoff Pow Energy MQTT data message and consolidate Status 8 into Status 10 + * Change ADS1115 default voltage range from +/-2V to +/-6V (#1289) + * Change text to Active for 3 minutes (#1364) * Change Wemo SetBinaryState to distinguish from GetBinaryState (#1357) * Change output of HTTP command to valid JSON and Array only (#1363) - * Add support for MH-Z19(B) CO2 sensor to be enabled with define USE_MHZ19 in user_config.h (#561, #1248) - * Add support for SenseAir S8 CO2 sensor to be enabled with define USE_SENSEAIR in user_config.h - * Add support for Domoticz Air Quality sensor to be used by MH-Z19(B) and SenseAir sensors - * - * 5.10.0a - * Add (experimental) support for sensor SHT3x - * Add support for iTead SI7021 temperature and humidity sensor by consolidating DHT22 into AM2301 and using former DHT22 as SI7021 (#735) + * Removed all MQTT, JSON and Command language defines from locale files and set fixed to English (#1473) + * Renamed commands Color2,3,4 to Color3,4,5 * Fix BME280 calculation (#1051) - * Add support for BME680 using adafruit libraries (#1212) - * Change ADS1115 default voltage range from +/-2V to +/-6V (#1289) - * Add multipress support and more user configurable options to Sonoff Dual R2 (#1291) * Fix Sonoff Bridge missed learned key if learned data contains 0x55 (End of Transmission) flag (#1095, #1294) - * Add support for TSL2561 using adafruit library (#661, #1311) - * Add alternative support for SHT3x enabled with define USE_SHT3X_V2 in user_config.h (#1314) - * Add alternative support for SHT3x enabled with define USE_SHT3X_V3 in user_config.h (#1314) * Fix PWM initialization in Dimmer/Color mode (#1321) - * Fix BME680 pressure data (#1356) - * Minor webpage HTML optimizations (#1358) - * Change text to Active for 3 minutes (#1364) + * Fix Wemo Emulation (#1357) + * Fix display of build date and time in non-english locale (#1465) + * Fix Wemo and Hue emulation by adding M-Search response delay (#1486) + * Add libraries Adafruit_BME680-1.0.5, Adafruit_Sensor-1.0.2.02, TasmotaSerial-1.0.0 and TSL2561-Arduino-Library + * Add command Color2 to set color while keeping same dimmer value + * Add device function pointers + * Add support for SenseAir S8 CO2 sensor + * Add color led signal to Carbon Dioxide (CO2) sensors using defines CO2_LOW and CO2_HIGH in user_config.h + * Add support for Domoticz Air Quality sensor to be used by MH-Z19(B) and SenseAir sensors + * Add support for PZEM004T energy sensor + * Add support for iTead SI7021 temperature and humidity sensor by consolidating DHT22 into AM2301 and using former DHT22 as SI7021 (#735) + * Add support for BME680 using adafruit libraries (#1212) + * Add support for MH-Z19(B) CO2 sensor (#561, #1248) + * Add multipress support and more user configurable GPIO to Sonoff Dual R2 (#1291) + * Add support for TSL2561 using adafruit library (#661, #1311) + * Add support for SHT3x (#1314) + * Add support for Arilux LC06 (#1414) + * Add Italian language file (#1449) + * Add 2nd Gen Alexa support to Wemo emulation discovery (#1357, #1450) + * Add define for additional number of WS2812 schemes (#1463) * * 5.10.0 20171201 * Upgrade library ArduinoJson to 5.11.2 diff --git a/sonoff/i18n.h b/sonoff/i18n.h index c0f3b0c91..bcdf337ac 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -75,6 +75,7 @@ #define D_JSON_LOW "Low" #define D_JSON_MAC "Mac" #define D_JSON_MASK "Mask" +#define D_JSON_MINIMAL "minimal" #define D_JSON_NO "No" #define D_JSON_NOISE "Noise" #define D_JSON_NONE "None" @@ -256,7 +257,7 @@ #define D_CMND_IRSEND "IRSend" #define D_CMND_IRHVAC "IRHVAC" -// Commands xsns_03_energy.ino +// Commands xdrv_03_energy.ino #define D_CMND_POWERLOW "PowerLow" #define D_CMND_POWERHIGH "PowerHigh" #define D_CMND_VOLTAGELOW "VoltageLow" @@ -359,7 +360,7 @@ const char kUnitNames[] PROGMEM = D_UNIT_MILLIAMPERE "|" D_UNIT_MILLISECOND "|" D_UNIT_MINUTE "|" - D_UNIT_PPM "|" + D_UNIT_PARTS_PER_MILLION "|" D_UNIT_PRESSURE "|" D_UNIT_SECOND "|" D_UNIT_SECTORS "|" @@ -422,13 +423,13 @@ static const char kMonthNames[] = D_MONTH3LIST; // webserver.ino #ifdef USE_WEBSERVER const char HTTP_SNS_TEMP[] PROGMEM = "%s{s}%s " D_TEMPERATURE "{m}%s°%c{e}"; // {s} = , {m} = , {e} = -const char HTTP_SNS_HUM[] PROGMEM = "%s{s}%s " D_HUMIDITY "{m}%s%{e}"; // {s} = , {m} = , {e} = +const char HTTP_SNS_HUM[] PROGMEM = "%s{s}%s " D_HUMIDITY "{m}%s%%{e}"; // {s} = , {m} = , {e} = const char HTTP_SNS_PRESSURE[] PROGMEM = "%s{s}%s " D_PRESSURE "{m}%s " D_UNIT_PRESSURE "{e}"; // {s} = , {m} = , {e} = const char HTTP_SNS_SEAPRESSURE[] PROGMEM = "%s{s}%s " D_PRESSUREATSEALEVEL "{m}%s " D_UNIT_PRESSURE "{e}"; // {s} = , {m} = , {e} = const char HTTP_SNS_ANALOG[] PROGMEM = "%s{s}%s " D_ANALOG_INPUT "%d{m}%d{e}"; // {s} = , {m} = , {e} = #if defined(USE_MHZ19) || defined(USE_SENSEAIR) -const char HTTP_SNS_CO2[] PROGMEM = "%s{s}%s " D_CO2 "{m}%d " D_UNIT_PPM "{e}"; // {s} = , {m} = , {e} = +const char HTTP_SNS_CO2[] PROGMEM = "%s{s}%s " D_CO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}"; // {s} = , {m} = , {e} = #endif // USE_WEBSERVER const char S_MAIN_MENU[] PROGMEM = D_MAIN_MENU; diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index 3af1998f8..244a036b4 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -124,7 +124,6 @@ #define D_RETAINED "beibehalten" #define D_SAVE "Speichern" #define D_SENSOR "Sensor" -#define D_SERIAL "Seriell" #define D_SSID "SSID" #define D_START "Start" #define D_STD_TIME "STD" @@ -132,7 +131,6 @@ #define D_SUBNET_MASK "Subnetzmaske" #define D_SUBSCRIBE_TO "subscribe to" #define D_SUCCESSFUL "erfolgreich" -#define D_SYS "Sys " // Sys log #define D_TEMPERATURE "Temperatur" #define D_TO "zu" #define D_TOGGLE "An/Aus" @@ -148,10 +146,10 @@ #define D_VERSION "Version" #define D_VOLTAGE "Spannung" #define D_WARMLIGHT "warm" -#define D_WEB "Web" // Web log #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 "level 1-0" #define D_LEVEL_01 "level 0-1" #define D_SERIAL_LOGGING_DISABLED "Serielles logging deaktiviert" @@ -255,7 +253,9 @@ #define D_FULL_TOPIC "full topic" #define D_LOGGING_PARAMETERS "Logging Einstellungen" -#define D_LOG_LEVEL "Log level" +#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" @@ -365,7 +365,7 @@ #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Update timer" -// xsns_03_energy.ino +// xdrv_03_energy.ino #define D_ENERGY_TODAY "Energie heute" #define D_ENERGY_YESTERDAY "Energie gestern" #define D_ENERGY_TOTAL "Energie insgesamt" @@ -386,6 +386,11 @@ #define D_SENSOR_DID_NOT_ACK_COMMAND "Sensor hat ACK-Befehl nicht ausgeführt" #define D_SHT1X_FOUND "SHT1X gefunden" +// xsns_18_pms5003.ino +#define D_STANDARD_CONCENTRATION "Standard Concentration" +#define D_ENVIRONMENTAL_CONCENTRATION "Environmental Concentration" +#define D_PARTICALS_BEYOND "Particals beyond" + // sonoff_template.h // Max string length is 8 characters including suffixes #define D_SENSOR_NONE "None" @@ -413,6 +418,7 @@ #define D_SENSOR_SPI_CS "SPI CS" #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "BkLight" +#define D_SENSOR_PMS5003 "PMS5003" // Units #define D_UNIT_AMPERE "A" @@ -420,11 +426,14 @@ #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 "µs" #define D_UNIT_MILLIAMPERE "mA" #define D_UNIT_MILLISECOND "ms" #define D_UNIT_MINUTE "min" -#define D_UNIT_PPM "ppm" +#define D_UNIT_PARTS_PER_DECILITER "ppd" +#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PRESSURE "hPa" #define D_UNIT_SECOND "sek" #define D_UNIT_SECTORS "Sektoren" diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h index b043618f0..c8ef6f223 100644 --- a/sonoff/language/en-GB.h +++ b/sonoff/language/en-GB.h @@ -124,7 +124,6 @@ #define D_RETAINED "retained" #define D_SAVE "Save" #define D_SENSOR "Sensor" -#define D_SERIAL "Serial" #define D_SSID "SSId" #define D_START "Start" #define D_STD_TIME "STD" @@ -132,7 +131,6 @@ #define D_SUBNET_MASK "Subnet Mask" #define D_SUBSCRIBE_TO "Subscribe to" #define D_SUCCESSFUL "Successful" -#define D_SYS "Sys" // Sys log #define D_TEMPERATURE "Temperature" #define D_TO "to" #define D_TOGGLE "Toggle" @@ -148,10 +146,10 @@ #define D_VERSION "Version" #define D_VOLTAGE "Voltage" #define D_WARMLIGHT "Warm" -#define D_WEB "Web" // Web log #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 "level 1-0" #define D_LEVEL_01 "level 0-1" #define D_SERIAL_LOGGING_DISABLED "Serial logging disabled" @@ -255,7 +253,9 @@ #define D_FULL_TOPIC "Full Topic" #define D_LOGGING_PARAMETERS "Logging parameters" -#define D_LOG_LEVEL "log level" +#define D_SERIAL_LOG_LEVEL "Serial log level" +#define D_WEB_LOG_LEVEL "Web log level" +#define D_SYS_LOG_LEVEL "Syslog level" #define D_MORE_DEBUG "More debug" #define D_SYSLOG_HOST "Syslog host" #define D_SYSLOG_PORT "Syslog port" @@ -365,7 +365,7 @@ #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Update timer" -// xsns_03_energy.ino +// xdrv_03_energy.ino #define D_ENERGY_TODAY "Energy Today" #define D_ENERGY_YESTERDAY "Energy Yesterday" #define D_ENERGY_TOTAL "Energy Total" @@ -386,6 +386,11 @@ #define D_SENSOR_DID_NOT_ACK_COMMAND "Sensor did not ACK command" #define D_SHT1X_FOUND "SHT1X found" +// xsns_18_pms5003.ino +#define D_STANDARD_CONCENTRATION "Standard Concentration" +#define D_ENVIRONMENTAL_CONCENTRATION "Environmental Concentration" +#define D_PARTICALS_BEYOND "Particals beyond" + // sonoff_template.h // Max string length is 8 characters including suffixes #define D_SENSOR_NONE "None" @@ -413,6 +418,7 @@ #define D_SENSOR_SPI_CS "SPI CS" #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "BkLight" +#define D_SENSOR_PMS5003 "PMS5003" // Units #define D_UNIT_AMPERE "A" @@ -420,11 +426,14 @@ #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_PPM "ppm" +#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" diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h new file mode 100644 index 000000000..25b41c67b --- /dev/null +++ b/sonoff/language/fr-FR.h @@ -0,0 +1,469 @@ +/* + fr-FR.h - localization for French - France for Sonoff-Tasmota + + Copyright (C) 2018 Olivier Francais + + 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_FR_FR_H_ +#define _LANGUAGE_FR_FR_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. + * +\*********************************************************************/ + +// "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 "DimLunMarMerJeuVenSam" +#define D_MONTH3LIST "JanFevMarAvrMaiJunJulAutSepOctNovDec" + +// Non JSON decimal separator +#define D_DECIMAL_SEPARATOR "," + +// Common +#define D_ADMIN "Admin" +#define D_AIR_QUALITY "Qualité de l'Air" +#define D_AP "AP" // Access Point +#define D_AS "comme" +#define D_AUTO "AUTO" +#define D_BLINK "Blink" +#define D_BLINKOFF "BlinkOff" +#define D_BOOT_COUNT "Nombre de boot" +#define D_BRIGHTLIGHT "Luminosité" +#define D_BUTTON "Boutton" +#define D_BY "par" // Written by me +#define D_BYTES "Bytes" +#define D_CELSIUS "Celsius" +#define D_CO2 "Dioxyde arbone" +#define D_CODE "code" // Button code +#define D_COLDLIGHT "Froid" +#define D_COMMAND "Commande" +#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_DARKLIGHT "Sombre" +#define D_DEBUG "Debug" +#define D_DISABLED "Désactivé" +#define D_DNS_SERVER "Serveur DNS" +#define D_DONE "Fait" +#define D_DST_TIME "DST" +#define D_EMULATION "Emulation" +#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_FALSE "Faux" +#define D_FILE "Fichier" +#define D_FREE_MEMORY "Memoire libre" +#define D_GAS "Gaz" +#define D_GATEWAY "Passerelle" +#define D_GROUP "Groupe" +#define D_HOST "Host" +#define D_HOSTNAME "Hostname" +#define D_HUMIDITY "Humidité" +#define D_ILLUMINANCE "Éclairement" +#define D_IMMEDIATE "immediat" // Button immediate +#define D_INDEX "Index" +#define D_INFO "Info" +#define D_INITIALIZED "Initialisé" +#define D_IP_ADDRESS "Adresse IP" +#define D_LIGHT "Lumière" +#define D_LWT "LWT" +#define D_MODULE "Module" +#define D_MQTT "MQTT" +#define D_MULTI_PRESS "multi-pression" +#define D_NOISE "Bruit" +#define D_NONE "None" +#define D_OFF "Off" +#define D_OFFLINE "Déconnecté" +#define D_OK "Ok" +#define D_ON "On" +#define D_ONLINE "Connecté" +#define D_PASSWORD "Mot de passe" +#define D_PORT "Port" +#define D_POWER_FACTOR "Facteur de puissance" +#define D_POWERUSAGE "Puissance" +#define D_PRESSURE "Pression" +#define D_PRESSUREATSEALEVEL "PressionMer" +#define D_PROGRAM_FLASH_SIZE "Taille Flash Programme" +#define D_PROGRAM_SIZE "Taille programme" +#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_RETAINED "retenu" +#define D_SAVE "Enregister" +#define D_SENSOR "Capteur" +#define D_SSID "SSID" +#define D_START "Start" +#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_TEMPERATURE "Temperature" +#define D_TO "à" +#define D_TOGGLE "Bascule" +#define D_TOPIC "Topic" +#define D_TRANSMIT "Transmettre" +#define D_TRUE "Vrai" +#define D_UPGRADE "upgrade" +#define D_UPLOAD "Upload" +#define D_UPTIME "Uptime" +#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_WARMLIGHT "Chaud" +#define D_WEB_SERVER "Serveur web" + +// sonoff.ino +#define D_WARNING_MINIMAL_VERSION "WARNING This version does not support persistent settings" +#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_SET_BAUDRATE_TO "Definir baudrate à" +#define D_RECEIVED_TOPIC "Topic reçu" +#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é" +#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" +#define D_WPS_FAILED_WITH_STATUS "WPSconfig ECHOUÉ 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_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_ATTEMPTING_CONNECTION "Tentative de connexion..." +#define D_CHECKING_CONNECTION "Verification connexion..." +#define D_QUERY_DONE "Requête terminé. 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_LOADED_FROM_FLASH_AT "Chargé de la flash à" +#define D_USE_DEFAULTS "Utiliser par défaut" +#define D_ERASED_SECTOR "Secteur effacé" + +// webserver.ino +#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware MINIMAL - merci de mettre à jour" +#define D_WEBSERVER_ACTIVE_ON "Serveur web actif sur" +#define D_WITH_IP_ADDRESS "avec l'adresse IP" +#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_TRYING_TO_CONNECT "Tentative de connexion du module au réseau" + +#define D_RESTART_IN "Redémarrage dans" +#define D_SECONDS "secondes" +#define D_DEVICE_WILL_RESTART "Le module va redémarrer dans quelques secondes" +#define D_BUTTON_TOGGLE "on/off" +#define D_CONFIGURATION "Configuration" +#define D_INFORMATION "Information" +#define D_FIRMWARE_UPGRADE "Mise à jour Firmware" +#define D_CONSOLE "Console" +#define D_CONFIRM_RESTART "Confirmer redémarrage" + +#define D_CONFIGURE_MODULE "Configuration 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_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_MAIN_MENU "Menu principal" + +#define D_MODULE_PARAMETERS "Paramètres module" +#define D_MODULE_TYPE "Type module" +#define D_GPIO "GPIO" +#define D_SERIAL_IN "Serial In" +#define D_SERIAL_OUT "Serial Out" + +#define D_WIFI_PARAMETERS "Paramètres Wifi" +#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_DUPLICATE_ACCESSPOINT "AccessPoint dupliqué" +#define D_SKIPPING_LOW_QUALITY "Passe car mauvaise qualité" +#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 "Mot de passe AP1" +#define D_AP2_SSID "AP2 SSId" +#define D_AP2_PASSWORD "Mot de passe AP2" + +#define D_MQTT_PARAMETERS "Paramètres MQTT" +#define D_CLIENT "Client" +#define D_FULL_TOPIC "topic complet" + +#define D_LOGGING_PARAMETERS "Paramètres journalisation" +#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_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_OTHER_PARAMETERS "Autres paramètres" +#define D_WEB_ADMIN_PASSWORD "Mot de passe Web Admin" +#define D_MQTT_ENABLE "MQTT activé" +#define D_FRIENDLY_NAME "Nom d'usage" +#define D_BELKIN_WEMO "Belkin WeMo" +#define D_HUE_BRIDGE "Hue Bridge" +#define D_SINGLE_DEVICE "module unique" +#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_PROGRAM_VERSION "Version 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" +#define D_MAC_ADDRESS "Adresse MAC" +#define D_MQTT_HOST "Hôte MQTT" +#define D_MQTT_PORT "Port MQTT" +#define D_MQTT_CLIENT "Client MQTT" +#define D_MQTT_USER "Utilisateur MQTT" +#define D_MQTT_TOPIC "Topic MQTT" +#define D_MQTT_GROUP_TOPIC "Groupe topic MQTT" +#define D_MQTT_FULL_TOPIC "Topic complet MQTT" +#define D_MDNS_DISCOVERY "Découverte mDNS" +#define D_MDNS_ADVERTISE "Annonce mDNS" +#define D_ESP_CHIP_ID "ESP Chip Id" +#define D_FLASH_CHIP_ID "Flash Chip Id" +#define D_FLASH_CHIP_SIZE "Taille flash" +#define D_FREE_PROGRAM_SPACE "Espace programme libre" + +#define D_UPGRADE_BY_WEBSERVER "Mise à jour par serveur web" +#define D_OTA_URL "URL OTA" +#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_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_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é" +#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_ENABLE_WEBLOG_FOR_RESPONSE "Activer weblog 2 si response attendue" +#define D_NEED_USER_AND_PASSWORD "Nécessite utilisateur=&password=" + +// 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_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_HUE "Hue" +#define D_HUE_BRIDGE_SETUP "Réglage Hue" +#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" + +// xdrv_02_irremote.ino +#define D_JSON_INVALID_JSON "JSON Invalide" +#define D_JSON_PROTOCOL_NOT_SUPPORTED "Protocole non supporté" +#define D_JSON_IR_PROTOCOL "PROTOCOL" +#define D_JSON_IR_BITS "BITS" +#define D_JSON_IR_DATA "DATA" +#define D_JSON_IRHVAC_VENDOR "VENDOR" +#define D_JSON_IRHVAC_POWER "POWER" +#define D_JSON_IRHVAC_MODE "MODE" +#define D_JSON_IRHVAC_FANSPEED "FANSPEED" +#define D_JSON_IRHVAC_TEMP "TEMP" +#define D_JSON_IRRECEIVED "IrReceived" + +// xdrv_05_domoticz.ino +#define D_DOMOTICZ_PARAMETERS "Paramètres 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" + #define D_DOMOTICZ_VOLTAGE "Voltage" + #define D_DOMOTICZ_CURRENT "Current" + #define D_DOMOTICZ_AIRQUALITY "AirQuality" +#define D_DOMOTICZ_UPDATE_TIMER "Update timer" + +// xsns_03_energy.ino +#define D_ENERGY_TODAY "Energie aujourd'hui" +#define D_ENERGY_YESTERDAY "Energie hier" +#define D_ENERGY_TOTAL "Energie totale" + +// xsns_05_ds18b20.ino +#define D_SENSOR_BUSY "Capteur occupé" +#define D_SENSOR_CRC_ERROR "Erreur CRC capteur" +#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" + +// xsns_07_sht1x.ino +#define D_SENSOR_DID_NOT_ACK_COMMAND "Sensor did not ACK command" +#define D_SHT1X_FOUND "SHT1X found" + +// xsns_18_pms5003.ino +#define D_STANDARD_CONCENTRATION "Standard Concentration" +#define D_ENVIRONMENTAL_CONCENTRATION "Environmental Concentration" +#define D_PARTICALS_BEYOND "Particals beyond" + +// sonoff_template.h +// Max string length is 8 characters including suffixes +#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" + +// Units +#define D_UNIT_AMPERE "A" +#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 "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 "secteurs" +#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_FR_FR_H_ diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index ebc1c65a8..235b4fc88 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -124,7 +124,6 @@ #define D_RETAINED "salvato" #define D_SAVE "Salva" #define D_SENSOR "Sensore" -#define D_SERIAL "Seriale" #define D_SSID "SSId" #define D_START "Start" #define D_STD_TIME "STD" @@ -132,7 +131,6 @@ #define D_SUBNET_MASK "Maschera sottorete" #define D_SUBSCRIBE_TO "Sottoscrivi a" #define D_SUCCESSFUL "Riuscito" -#define D_SYS "Sys" // Sys log #define D_TEMPERATURE "Temperatura" #define D_TO "a" #define D_TOGGLE "Toggle" @@ -148,10 +146,10 @@ #define D_VERSION "Versione" #define D_VOLTAGE "Tensione" #define D_WARMLIGHT "Calda" -#define D_WEB "Web" // Web log #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 "level 1-0" #define D_LEVEL_01 "level 0-1" #define D_SERIAL_LOGGING_DISABLED "Log seriale disabilitato" @@ -255,7 +253,9 @@ #define D_FULL_TOPIC "Full Topic" #define D_LOGGING_PARAMETERS "Parametri Logging" -#define D_LOG_LEVEL "livello di log" +#define D_SERIAL_LOG_LEVEL "Seriale livello di log" +#define D_WEB_LOG_LEVEL "Web livello di log" +#define D_SYS_LOG_LEVEL "Sys livello di log" #define D_MORE_DEBUG "Debug aggiuntivo" #define D_SYSLOG_HOST "Syslog host" #define D_SYSLOG_PORT "Syslog porta" @@ -365,7 +365,7 @@ #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Intervallo di aggiornamento" -// xsns_03_energy.ino +// xdrv_03_energy.ino #define D_ENERGY_TODAY "Energia Oggi" #define D_ENERGY_YESTERDAY "Energia Ieri" #define D_ENERGY_TOTAL "Energia Totale" @@ -386,6 +386,11 @@ #define D_SENSOR_DID_NOT_ACK_COMMAND "Sensore non ha eseguito il comando ACK" #define D_SHT1X_FOUND "SHT1X trovato" +// xsns_18_pms5003.ino +#define D_STANDARD_CONCENTRATION "Standard Concentration" +#define D_ENVIRONMENTAL_CONCENTRATION "Environmental Concentration" +#define D_PARTICALS_BEYOND "Particals beyond" + // sonoff_template.h // Max string length is 8 characters including suffixes #define D_SENSOR_NONE "None" @@ -413,6 +418,7 @@ #define D_SENSOR_SPI_CS "SPI CS" #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "BkLight" +#define D_SENSOR_PMS5003 "PMS5003" // Units #define D_UNIT_AMPERE "A" @@ -420,11 +426,14 @@ #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_PPM "ppm" +#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 "settori" diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h index 822120162..9850c8b0e 100644 --- a/sonoff/language/nl-NL.h +++ b/sonoff/language/nl-NL.h @@ -124,7 +124,6 @@ #define D_RETAINED "retained" #define D_SAVE "Opslaan" #define D_SENSOR "Sensor" -#define D_SERIAL "Serieel" #define D_SSID "SSId" #define D_START "Start" #define D_STD_TIME "WT" @@ -132,7 +131,6 @@ #define D_SUBNET_MASK "Subnet Masker" #define D_SUBSCRIBE_TO "Abonneer op" #define D_SUCCESSFUL "Gelukt" -#define D_SYS "Sys" // Sys log #define D_TEMPERATURE "Temperatuur" #define D_TO "naar" #define D_TOGGLE "Toggle" // Wissel, Tuimel @@ -148,10 +146,10 @@ #define D_VERSION "Versie" #define D_VOLTAGE "Spanning" #define D_WARMLIGHT "Warm" -#define D_WEB "Web" // Web log #define D_WEB_SERVER "Webserver" // sonoff.ino +#define D_WARNING_MINIMAL_VERSION "WAARSCHUWING Deze versie bewaart geen instellingen" #define D_LEVEL_10 "niveau 1-0" #define D_LEVEL_01 "niveau 0-1" #define D_SERIAL_LOGGING_DISABLED "Serieel logging uitgeschakeld" @@ -255,7 +253,9 @@ #define D_FULL_TOPIC "Volledig Topic" #define D_LOGGING_PARAMETERS "Logging parameters" -#define D_LOG_LEVEL "log niveau" +#define D_SERIAL_LOG_LEVEL "Serieel log niveau" +#define D_WEB_LOG_LEVEL "Web log niveau" +#define D_SYS_LOG_LEVEL "Syslog niveau" #define D_MORE_DEBUG "Meer debug" #define D_SYSLOG_HOST "Syslog host" #define D_SYSLOG_PORT "Syslog poort" @@ -365,7 +365,7 @@ #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Bijwerk timer" -// xsns_03_energy.ino +// xdrv_03_energy.ino #define D_ENERGY_TODAY "Verbruik vandaag" #define D_ENERGY_YESTERDAY "Verbruik gisteren" #define D_ENERGY_TOTAL "Verbruik totaal" @@ -386,6 +386,11 @@ #define D_SENSOR_DID_NOT_ACK_COMMAND "Geen opdracht ACK van sensor" #define D_SHT1X_FOUND "SHT1X gevonden" +// xsns_18_pms5003.ino +#define D_STANDARD_CONCENTRATION "Standard Concentration" +#define D_ENVIRONMENTAL_CONCENTRATION "Environmental Concentration" +#define D_PARTICALS_BEYOND "Particals beyond" + // sonoff_template.h // Max string length is 8 characters including suffixes #define D_SENSOR_NONE "Geen" @@ -413,6 +418,7 @@ #define D_SENSOR_SPI_CS "SPI CS" #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "BkLight" +#define D_SENSOR_PMS5003 "PMS5003" // Units #define D_UNIT_AMPERE "A" @@ -420,11 +426,14 @@ #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_PPM "ppm" +#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 "sectoren" diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h index d349ae06a..79e2afbe5 100644 --- a/sonoff/language/pl-PL.h +++ b/sonoff/language/pl-PL.h @@ -124,7 +124,6 @@ #define D_RETAINED "Zachowane" #define D_SAVE "Zapisz" #define D_SENSOR "Czujnik" -#define D_SERIAL "Serial" #define D_SSID "SSID" #define D_START "Start" #define D_STD_TIME "STD" @@ -132,7 +131,6 @@ #define D_SUBNET_MASK "Maska podsieci" #define D_SUBSCRIBE_TO "Subskrybuj do" #define D_SUCCESSFUL "Powodzenie" -#define D_SYS "System " // Sys log #define D_TEMPERATURE "Temperatura" #define D_TO "do" #define D_TOGGLE "Przelacz" @@ -148,10 +146,10 @@ #define D_VERSION "Wersja" #define D_VOLTAGE "Napiecie" #define D_WARMLIGHT "Nagrzanie" -#define D_WEB "Web" // Web log #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 "poziom 1-0" #define D_LEVEL_01 "poziom 0-1" #define D_SERIAL_LOGGING_DISABLED "Wylaczony dziennik na porcie szeregowym" @@ -255,7 +253,9 @@ #define D_FULL_TOPIC "Pelen temat" #define D_LOGGING_PARAMETERS "Opcje dziennika" -#define D_LOG_LEVEL "poziom dziennika" +#define D_SERIAL_LOG_LEVEL "Serial poziom dziennika" +#define D_WEB_LOG_LEVEL "Web poziom dziennika" +#define D_SYS_LOG_LEVEL "System poziom dziennika" #define D_MORE_DEBUG "Wiecej informacji debugujacych" #define D_SYSLOG_HOST "Syslog host" #define D_SYSLOG_PORT "Syslog port" @@ -365,7 +365,7 @@ #define D_DOMOTICZ_AIRQUALITY "AirQuality" #define D_DOMOTICZ_UPDATE_TIMER "Zaktualizuj czasomierz" -// xsns_03_energy.ino +// xdrv_03_energy.ino #define D_ENERGY_TODAY "Energia Dzisiaj" #define D_ENERGY_YESTERDAY "Energia Wczoraj" #define D_ENERGY_TOTAL "Energia suma" @@ -386,6 +386,11 @@ #define D_SENSOR_DID_NOT_ACK_COMMAND "Czujnik nie otrzymal komendy ACK" #define D_SHT1X_FOUND "SHT1X znaleziony" +// xsns_18_pms5003.ino +#define D_STANDARD_CONCENTRATION "Standard Concentration" +#define D_ENVIRONMENTAL_CONCENTRATION "Environmental Concentration" +#define D_PARTICALS_BEYOND "Particals beyond" + // sonoff_template.h // Max string length is 8 characters including suffixes #define D_SENSOR_NONE "Brak" @@ -413,6 +418,7 @@ #define D_SENSOR_SPI_CS "SPI CS" #define D_SENSOR_SPI_DC "SPI DC" #define D_SENSOR_BACKLIGHT "BkLight" +#define D_SENSOR_PMS5003 "PMS5003" // Units #define D_UNIT_AMPERE "A" @@ -420,11 +426,14 @@ #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_PPM "ppm" +#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" diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h new file mode 100644 index 000000000..c1a5ec75b --- /dev/null +++ b/sonoff/language/zh-CN.h @@ -0,0 +1,469 @@ +/* + zh-CN.h - localization for Chinese (Simplified) - China for Sonoff-Tasmota + + Copyright (C) 2018 Theo Arends (translated by killadm) + + 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_CN_H_ +#define _LANGUAGE_ZH_CN_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. + * +\*********************************************************************/ + +// "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_02_irremote.ino +#define D_JSON_INVALID_JSON "无效的JSON" +#define D_JSON_PROTOCOL_NOT_SUPPORTED "协议不支持" +#define D_JSON_IR_PROTOCOL "协议" +#define D_JSON_IR_BITS "BITS" +#define D_JSON_IR_DATA "数据" +#define D_JSON_IRHVAC_VENDOR "供应商" +#define D_JSON_IRHVAC_POWER "电源" +#define D_JSON_IRHVAC_MODE "模式" +#define D_JSON_IRHVAC_FANSPEED "风扇转速" +#define D_JSON_IRHVAC_TEMP "温度" +#define D_JSON_IRRECEIVED "IrReceived" + +// 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 "标准颗粒物浓度" +#define D_ENVIRONMENTAL_CONCENTRATION "大气环境下浓度" +#define D_PARTICALS_BEYOND "颗粒物直径大于" + +// sonoff_template.h +// Max string length is 8 characters including suffixes +#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" + +// 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_CN_H_ diff --git a/sonoff/settings.h b/sonoff/settings.h index 4110de993..381e7ee9f 100644 --- a/sonoff/settings.h +++ b/sonoff/settings.h @@ -44,7 +44,7 @@ typedef union { // Restricted by MISRA-C Rule 18.4 bu uint32_t ws_clock_reverse : 1; // bit 16 (v5.8.1) uint32_t decimal_text : 1; // bit 17 (v5.8.1) uint32_t light_signal : 1; // bit 18 (v5.10.0c) - uint32_t spare19 : 1; + uint32_t hass_discovery : 1; // bit 19 (v5.11.1a) uint32_t voltage_resolution : 1; // Replaced by below uint32_t spare21 : 1; uint32_t spare22 : 1; @@ -262,7 +262,7 @@ struct SYSCFG { struct RTCMEM { uint16_t valid; // 000 byte oswatch_blocked_loop; // 002 - uint8_t unused; // 003 + uint8_t ota_loader; // 003 unsigned long energy_kWhtoday; // 004 unsigned long energy_kWhtotal; // 008 unsigned long pulse_counter[MAX_COUNTERS]; // 00C diff --git a/sonoff/settings.ino b/sonoff/settings.ino index 90b3e025d..2b1a6acc8 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -25,6 +25,31 @@ #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) #endif +#ifndef MTX_ADDRESS1 // Add Display Support for up to eigth Matrices +#define MTX_ADDRESS1 0 +#endif +#ifndef MTX_ADDRESS2 +#define MTX_ADDRESS2 0 +#endif +#ifndef MTX_ADDRESS3 +#define MTX_ADDRESS3 0 +#endif +#ifndef MTX_ADDRESS4 +#define MTX_ADDRESS4 0 +#endif +#ifndef MTX_ADDRESS5 +#define MTX_ADDRESS5 0 +#endif +#ifndef MTX_ADDRESS6 +#define MTX_ADDRESS6 0 +#endif +#ifndef MTX_ADDRESS7 +#define MTX_ADDRESS7 0 +#endif +#ifndef MTX_ADDRESS8 +#define MTX_ADDRESS8 0 +#endif + /*********************************************************************************************\ * RTC memory \*********************************************************************************************/ diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index aeb660e7b..d6a7389dc 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -80,7 +80,7 @@ typedef unsigned long power_t; // Power (Relay) type #define STATES 20 // State loops per second #define SYSLOG_TIMER 600 // Seconds to restore syslog_level #define SERIALLOG_TIMER 600 // Seconds to disable SerialLog -#define OTA_ATTEMPTS 10 // Number of times to try fetching the new firmware +#define OTA_ATTEMPTS 5 // Number of times to try fetching the new firmware #define INPUT_BUFFER_SIZE 250 // Max number of characters in (serial) command buffer #define CMDSZ 24 // Max number of characters in command @@ -137,7 +137,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_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_DATA, FUNC_SET_POWER, FUNC_SHOW_SENSOR}; + FUNC_COMMAND, FUNC_MQTT_SUBSCRIBE, FUNC_MQTT_CONNECTED, 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 88c2f7be9..6be6edc11 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,8 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050A000A -#define VERSION_STRING "5.10.0j" // Would be great to have a macro that fills this from VERSION ... +#define VERSION 0x050B0102 // 5.11.1b // Location specific includes #include "sonoff.h" // Enumaration used in user_config.h @@ -120,6 +119,7 @@ int mqtt_connection_flag = 2; // MQTT connection messages flag int ota_state_flag = 0; // OTA state flag int ota_result = 0; // OTA result byte ota_retry_counter = OTA_ATTEMPTS; // OTA retry counter +char *ota_url; // OTA url string int restart_flag = 0; // Sonoff restart flag int wifi_state_flag = WIFI_RESTART; // Wifi state flag int uptime = 0; // Current uptime in hours @@ -188,6 +188,7 @@ uint8_t xdrv_present = 0; // Number of drivers found boolean (*xdrv_func_ptr[XDRV_MAX])(byte); // Driver Function Pointers uint8_t xsns_present = 0; // Number of External Sensors found boolean (*xsns_func_ptr[XSNS_MAX])(byte); // External Sensor Function Pointers for simple implementation of sensors +char my_version[33]; // Composed version string char my_hostname[33]; // Composed Wifi hostname char mqtt_client[33]; // Composed MQTT Clientname char serial_in_buffer[INPUT_BUFFER_SIZE + 2]; // Receive buffer @@ -394,7 +395,7 @@ void MqttPublishPrefixTopic_P(uint8_t prefix, const char* subtopic, boolean reta * prefix 5 = stat using subtopic or RESULT * prefix 6 = tele using subtopic or RESULT */ - char romram[16]; + char romram[33]; char stopic[TOPSZ]; snprintf_P(romram, sizeof(romram), ((prefix > 3) && !Settings.flag.mqtt_response) ? S_RSLT_RESULT : subtopic); @@ -414,7 +415,7 @@ void MqttPublishPrefixTopic_P(uint8_t prefix, const char* subtopic) void MqttPublishPowerState(byte device) { char stopic[TOPSZ]; - char scommand[16]; + char scommand[33]; if ((device < 1) || (device > devices_present)) { device = 1; @@ -431,7 +432,7 @@ void MqttPublishPowerState(byte device) void MqttPublishPowerBlinkState(byte device) { - char scommand[16]; + char scommand[33]; if ((device < 1) || (device > devices_present)) { device = 1; @@ -467,8 +468,8 @@ void MqttConnected() } if (mqtt_connection_flag) { - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_MODULE "\":\"%s\",\"" D_JSON_VERSION "\":\"" VERSION_STRING "\",\"" D_JSON_FALLBACKTOPIC "\":\"%s\",\"" D_CMND_GROUPTOPIC "\":\"%s\"}"), - my_module.name, mqtt_client, Settings.mqtt_grptopic); + 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(2, PSTR(D_RSLT_INFO "1")); #ifdef USE_WEBSERVER if (Settings.webserver) { @@ -919,12 +920,13 @@ void MqttDataCallback(char* topic, byte* data, unsigned int data_len) } else if ((CMND_POWERONSTATE == command_code) && (Settings.module != MOTOR)) { /* 0 = Keep relays off after power on - * 1 = Turn relays on after power on + * 1 = Turn relays on after power on, if PulseTime set wait for PulseTime seconds, and turn relays off * 2 = Toggle relays after power on * 3 = Set relays to last saved state after power on * 4 = Turn relays on and disable any relay control (used for Sonoff Pow to always measure power) + * 5 = Keep relays off after power on, if PulseTime set wait for PulseTime seconds, and turn relays on */ - if ((payload >= 0) && (payload <= 4)) { + if ((payload >= 0) && (payload <= 5)) { Settings.poweronstate = payload; if (4 == Settings.poweronstate) { for (byte i = 1; i <= devices_present; i++) { @@ -970,7 +972,7 @@ void MqttDataCallback(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_SETOPTION == command_code) && ((index >= 0) && (index <= 18)) || ((index > 31) && (index <= P_MAX_PARAM8 +31))) { + else if ((CMND_SETOPTION == command_code) && ((index >= 0) && (index <= 19)) || ((index > 31) && (index <= P_MAX_PARAM8 +31))) { if (index <= 31) { ptype = 0; // SetOption0 .. 31 } else { @@ -983,6 +985,7 @@ void MqttDataCallback(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 @@ -1222,9 +1225,9 @@ void MqttDataCallback(char* topic, byte* data, unsigned int data_len) // We also need at least 3 chars to make a valid version number string. if (((1 == data_len) && (1 == payload)) || ((data_len >= 3) && NewerVersion(dataBuf))) { ota_state_flag = 3; - snprintf_P(mqtt_data, sizeof(mqtt_data), "{\"%s\":\"" D_JSON_VERSION " " VERSION_STRING " " D_JSON_FROM " %s\"}", command, Settings.ota_url); + snprintf_P(mqtt_data, sizeof(mqtt_data), "{\"%s\":\"" D_JSON_VERSION " %s " D_JSON_FROM " %s\"}", command, my_version, Settings.ota_url); } else { - snprintf_P(mqtt_data, sizeof(mqtt_data), "{\"%s\":\"" D_JSON_ONE_OR_GT "\"}", command, VERSION_STRING); + snprintf_P(mqtt_data, sizeof(mqtt_data), "{\"%s\":\"" D_JSON_ONE_OR_GT "\"}", command, my_version); } } else if (CMND_OTAURL == command_code) { @@ -1607,7 +1610,8 @@ void ExecuteCommandPower(byte device, byte state) DomoticzUpdatePowerState(device); #endif // USE_DOMOTICZ if (device <= MAX_PULSETIMERS) { - pulse_timer[(device -1)] = (power & mask) ? Settings.pulse_timer[(device -1)] : 0; +// pulse_timer[(device -1)] = (power & mask) ? Settings.pulse_timer[(device -1)] : 0; + pulse_timer[(device -1)] = (((5 == Settings.poweronstate) ? ~power : power) & mask) ? Settings.pulse_timer[(device -1)] : 0; } } else if (3 == state) { // Blink @@ -1699,8 +1703,8 @@ void PublishStatus(uint8_t payload) } if ((0 == payload) || (2 == payload)) { - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_STATUS D_STATUS2_FIRMWARE "\":{\"" D_JSON_VERSION "\":\"" VERSION_STRING "\",\"" D_JSON_BUILDDATETIME "\":\"%s\",\"" D_JSON_BOOTVERSION "\":%d,\"" D_JSON_COREVERSION "\":\"" ARDUINO_ESP8266_RELEASE "\",\"" D_JSON_SDKVERSION "\":\"%s\"}}"), - GetBuildDateAndTime().c_str(), ESP.getBootVersion(), ESP.getSdkVersion()); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_STATUS D_STATUS2_FIRMWARE "\":{\"" D_JSON_VERSION "\":\"%s\",\"" D_JSON_BUILDDATETIME "\":\"%s\",\"" D_JSON_BOOTVERSION "\":%d,\"" D_JSON_COREVERSION "\":\"" ARDUINO_ESP8266_RELEASE "\",\"" D_JSON_SDKVERSION "\":\"%s\"}}"), + my_version, GetBuildDateAndTime().c_str(), ESP.getBootVersion(), ESP.getSdkVersion()); MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "2")); } @@ -1765,7 +1769,7 @@ void PublishStatus(uint8_t payload) void MqttShowState() { - char stemp1[16]; + char stemp1[33]; snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s{\"" D_JSON_TIME "\":\"%s\",\"" D_JSON_UPTIME "\":%d"), mqtt_data, GetDateAndTime().c_str(), uptime); #ifdef USE_ADC_VCC @@ -2136,7 +2140,8 @@ void StateLoop() if ((pulse_timer[i] > 0) && (pulse_timer[i] < 112)) { pulse_timer[i]--; if (!pulse_timer[i]) { - ExecuteCommandPower(i +1, 0); +// ExecuteCommandPower(i +1, 0); + ExecuteCommandPower(i +1, (5 == Settings.poweronstate) ? 1: 0); } } } @@ -2224,6 +2229,8 @@ void StateLoop() if (ota_state_flag && (backlog_pointer == backlog_index)) { ota_state_flag--; if (2 == ota_state_flag) { + ota_url = Settings.ota_url; + RtcSettings.ota_loader = 0; // Try requested image first ota_retry_counter = OTA_ATTEMPTS; ESPhttpUpdate.rebootOnUpdate(false); SettingsSave(1); // Free flash for OTA update @@ -2241,10 +2248,32 @@ void StateLoop() ota_result = 0; ota_retry_counter--; if (ota_retry_counter) { -// snprintf_P(log_data, sizeof(log_data), PSTR("OTA: Attempt %d"), OTA_ATTEMPTS - ota_retry_counter); -// AddLog(LOG_LEVEL_INFO); - ota_result = (HTTP_UPDATE_FAILED != ESPhttpUpdate.update(Settings.ota_url)); +#ifndef BE_MINIMAL + if (RtcSettings.ota_loader) { + char *pch = strrchr(Settings.ota_url, '-'); // Change from filename-DE.bin into filename-minimal.bin + char *ech = strrchr(Settings.ota_url, '.'); // Change from filename.bin into filename-minimal.bin + if (!pch) { + pch = ech; + } + if (pch) { + strlcpy(mqtt_data, Settings.ota_url, pch - Settings.ota_url +1); + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s-" D_JSON_MINIMAL "%s"), mqtt_data, ech); // Minimal filename must be filename-minimal + ota_url = mqtt_data; // Try minimal image + } + } +#endif // BE_MINIMAL + snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_UPLOAD "%s"), ota_url); + AddLog(LOG_LEVEL_DEBUG); + ota_result = (HTTP_UPDATE_FAILED != ESPhttpUpdate.update(ota_url)); if (!ota_result) { +#ifndef BE_MINIMAL + int ota_error = ESPhttpUpdate.getLastError(); +// snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_UPLOAD "Ota error %d"), ota_error); +// AddLog(LOG_LEVEL_DEBUG); + if ((HTTP_UE_TOO_LESS_SPACE == ota_error) || (HTTP_UE_BIN_FOR_WRONG_FLASH == ota_error)) { + RtcSettings.ota_loader = 1; // Try minimal image next + } +#endif // BE_MINIMAL ota_state_flag = 2; // Upgrade failed - retry } } @@ -2607,6 +2636,16 @@ void setup() Serial.println(); seriallog_level = LOG_LEVEL_INFO; // Allow specific serial messages until config loaded + snprintf_P(my_version, sizeof(my_version), PSTR("%d.%d.%d"), VERSION >> 24 & 0xff, VERSION >> 16 & 0xff, VERSION >> 8 & 0xff); + if (VERSION & 0x1f) { + idx = strlen(my_version); + my_version[idx] = 96 + (VERSION & 0x1f); + my_version[idx +1] = 0; + } +#ifdef BE_MINIMAL + snprintf_P(my_version, sizeof(my_version), PSTR("%s-" D_JSON_MINIMAL), my_version); +#endif // BE_MINIMAL + SettingsLoad(); SettingsDelta(); @@ -2649,6 +2688,7 @@ void setup() if ((resetInfo.reason == REASON_DEFAULT_RST) || (resetInfo.reason == REASON_EXT_SYS_RST)) { switch (Settings.poweronstate) { case 0: // All off + case 5: // All off but on after PulseTime power = 0; SetDevicePower(power); break; @@ -2682,16 +2722,21 @@ void setup() if ((i < MAX_RELAYS) && (pin[GPIO_REL1 +i] < 99)) { bitWrite(power, i, digitalRead(pin[GPIO_REL1 +i]) ^ bitRead(rel_inverted, i)); } - if ((i < MAX_PULSETIMERS) && bitRead(power, i)) { +// if ((i < MAX_PULSETIMERS) && bitRead(power, i)) { + if ((i < MAX_PULSETIMERS) && (bitRead(power, i) || (5 == Settings.poweronstate))) { pulse_timer[i] = Settings.pulse_timer[i]; } } blink_powersave = power; - snprintf_P(log_data, sizeof(log_data), PSTR(D_PROJECT " %s %s (" D_CMND_TOPIC " %s, " D_FALLBACK " %s, " D_CMND_GROUPTOPIC " %s) " D_VERSION " " VERSION_STRING), - PROJECT, Settings.friendlyname[0], Settings.mqtt_topic, mqtt_client, Settings.mqtt_grptopic); + snprintf_P(log_data, sizeof(log_data), PSTR(D_PROJECT " %s %s (" D_CMND_TOPIC " %s, " D_FALLBACK " %s, " D_CMND_GROUPTOPIC " %s) " D_VERSION " %s"), + PROJECT, Settings.friendlyname[0], Settings.mqtt_topic, mqtt_client, Settings.mqtt_grptopic, my_version); AddLog(LOG_LEVEL_INFO); +#ifdef BE_MINIMAL + snprintf_P(log_data, sizeof(log_data), PSTR(D_WARNING_MINIMAL_VERSION)); + AddLog(LOG_LEVEL_INFO); +#endif // BE_MINIMAL RtcInit(); XSnsInit(); diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h index f0c1c5608..07d51b157 100644 --- a/sonoff/sonoff_template.h +++ b/sonoff/sonoff_template.h @@ -86,7 +86,8 @@ enum UserSelectablePins { GPIO_SAIR_RX, // SenseAir Serial interface GPIO_SPI_CS, // SPI Chip Select GPIO_SPI_DC, // SPI Data Direction - GPIO_BACKLIGHT, + GPIO_BACKLIGHT, // Display backlight control + GPIO_PMS5003, // Plantower PMS5003 Serial interface GPIO_SENSOR_END }; // Text in webpage Module Parameters and commands GPIOS and GPIO @@ -155,7 +156,8 @@ const char kSensors[GPIO_SENSOR_END][9] PROGMEM = { D_SENSOR_SAIR_RX, D_SENSOR_SPI_CS, D_SENSOR_SPI_DC, - D_SENSOR_BACKLIGHT + D_SENSOR_BACKLIGHT, + D_SENSOR_PMS5003 }; // Programmer selectable GPIO functionality offset by user selectable GPIOs @@ -844,6 +846,21 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_LED1, // GPIO15 Led (1 = On, 0 = Off) 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 + } + */ #endif // _SONOFF_TEMPLATE_H_ \ No newline at end of file diff --git a/sonoff/support.ino b/sonoff/support.ino index a03efa378..08476b2c9 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -26,7 +26,7 @@ unsigned long syslog_host_refresh = 0; Ticker tickerOSWatch; -#define OSWATCH_RESET_TIME 30 +#define OSWATCH_RESET_TIME 120 static unsigned long oswatch_last_loop_time; byte oswatch_blocked_loop = 0; @@ -612,6 +612,12 @@ void WifiCheck(uint8_t param) WifiCheckIp(); } if ((WL_CONNECTED == WiFi.status()) && (static_cast(WiFi.localIP()) != 0) && !wifi_config_type) { +#ifdef BE_MINIMAL + if (1 == RtcSettings.ota_loader) { + RtcSettings.ota_loader = 0; + ota_state_flag = 3; + } +#endif // BE_MINIMAL #ifdef USE_DISCOVERY if (!mdns_begun) { mdns_begun = MDNS.begin(my_hostname); diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 103baa65e..d35e643d6 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -29,11 +29,13 @@ \*********************************************************************************************/ // -- Localization -------------------------------- -//#define MY_LANGUAGE en-GB // English in Great Britain. Enabled by Default -//#define MY_LANGUAGE nl-NL // Dutch in the Netherlands //#define MY_LANGUAGE de-DE // German in Germany -//#define MY_LANGUAGE pl-PL // Polish in Poland +//#define MY_LANGUAGE en-GB // English in Great Britain. Enabled by Default +//#define MY_LANGUAGE fr-FR // French in France //#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 zh-CN // Chinese (Simplified) in China // -- Project ------------------------------------- #define PROJECT "sonoff" // PROJECT is used as the default topic delimiter and OTA file name diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index 1b13e8690..4537978e9 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -222,7 +222,7 @@ const char HTTP_FORM_LOG1[] PROGMEM = "
 " D_LOGGING_PARAMETERS " 
" ""; const char HTTP_FORM_LOG2[] PROGMEM = - "
{b0" D_LOG_LEVEL " ({b1)
" "0 " D_NONE "" "1 " D_ERROR "" "2 " D_INFO "" @@ -278,7 +278,7 @@ const char HTTP_COUNTER[] PROGMEM = "
"; const char HTTP_END[] PROGMEM = "
" - "" + "" "" "" ""; @@ -407,6 +407,9 @@ void SetHeader() WebServer->sendHeader(F("Cache-Control"), F("no-cache, no-store, must-revalidate")); WebServer->sendHeader(F("Pragma"), F("no-cache")); WebServer->sendHeader(F("Expires"), F("-1")); +#ifndef ARDUINO_ESP8266_RELEASE_2_3_0 + WebServer->sendHeader(F("Access-Control-Allow-Origin"), F("*")); +#endif } void ShowPage(String &page) @@ -423,6 +426,7 @@ void ShowPage(String &page) } } page += FPSTR(HTTP_END); + page.replace(F("{mv"), my_version); SetHeader(); WebServer->send(200, FPSTR(HDR_CTYPE_HTML), page); } @@ -837,7 +841,7 @@ void HandleLoggingConfiguration() page += FPSTR(HTTP_FORM_LOG2); switch (idx) { case 0: - page.replace(F("{b0"), F(D_SERIAL " ")); + page.replace(F("{b0"), F(D_SERIAL_LOG_LEVEL)); page.replace(F("{b1"), STR(SERIAL_LOG_LEVEL)); page.replace(F("{b2"), F("ls")); for (byte i = LOG_LEVEL_NONE; i < LOG_LEVEL_ALL; i++) { @@ -845,7 +849,7 @@ void HandleLoggingConfiguration() } break; case 1: - page.replace(F("{b0"), F(D_WEB " ")); + page.replace(F("{b0"), F(D_WEB_LOG_LEVEL)); page.replace(F("{b1"), STR(WEB_LOG_LEVEL)); page.replace(F("{b2"), F("lw")); for (byte i = LOG_LEVEL_NONE; i < LOG_LEVEL_ALL; i++) { @@ -853,7 +857,7 @@ void HandleLoggingConfiguration() } break; case 2: - page.replace(F("{b0"), F(D_SYS)); + page.replace(F("{b0"), F(D_SYS_LOG_LEVEL)); page.replace(F("{b1"), STR(SYS_LOG_LEVEL)); page.replace(F("{b2"), F("ll")); for (byte i = LOG_LEVEL_NONE; i < LOG_LEVEL_ALL; i++) { @@ -884,10 +888,14 @@ void HandleOtherConfiguration() page += FPSTR(HTTP_FORM_OTHER); page.replace(F("{p1"), Settings.web_password); page.replace(F("{r1"), (Settings.flag.mqtt_enabled) ? F(" checked") : F("")); - page += FPSTR(HTTP_FORM_OTHER2); - page.replace(F("{1"), F("1")); - page.replace(F("{2"), FRIENDLY_NAME); - page.replace(F("{3"), Settings.friendlyname[0]); + uint8_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : devices_present; + for (byte i = 0; i < maxfn; i++) { + page += FPSTR(HTTP_FORM_OTHER2); + page.replace(F("{1"), String(i +1)); + snprintf_P(stemp, sizeof(stemp), PSTR(FRIENDLY_NAME"%d"), i +1); + page.replace(F("{2"), (i) ? stemp : FRIENDLY_NAME); + page.replace(F("{3"), Settings.friendlyname[i]); + } #ifdef USE_EMULATION page += FPSTR(HTTP_FORM_OTHER3a); for (byte i = 0; i < EMUL_MAX; i++) { @@ -897,15 +905,7 @@ void HandleOtherConfiguration() page.replace(F("{3"), (i == EMUL_NONE) ? F(D_NONE) : (i == EMUL_WEMO) ? F(D_BELKIN_WEMO) : F(D_HUE_BRIDGE)); page.replace(F("{4"), (i == EMUL_NONE) ? F("") : (i == EMUL_WEMO) ? F(" " D_SINGLE_DEVICE) : F(" " D_MULTI_DEVICE)); } - page += F("
"); - uint8_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : devices_present; - for (byte i = 1; i < maxfn; i++) { - page += FPSTR(HTTP_FORM_OTHER2); - page.replace(F("{1"), String(i +1)); - snprintf_P(stemp, sizeof(stemp), PSTR(FRIENDLY_NAME"%d"), i +1); - page.replace(F("{2"), stemp); - page.replace(F("{3"), Settings.friendlyname[i]); - } +// page += F("
"); page += F("
"); #endif // USE_EMULATION page += FPSTR(HTTP_FORM_END); @@ -926,8 +926,7 @@ void HandleBackupConfiguration() WebServer->setContentLength(sizeof(buffer)); char attachment[100]; - snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=Config_%s_" VERSION_STRING ".dmp"), - Settings.friendlyname[0]); + 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)); @@ -1079,7 +1078,7 @@ void HandleResetConfiguration() return; } - char svalue[16]; + char svalue[33]; AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_RESET_CONFIGURATION); @@ -1375,6 +1374,7 @@ void HandleHttpCommand() } else { message += F(D_NEED_USER_AND_PASSWORD "\"}"); } + SetHeader(); WebServer->send(200, FPSTR(HDR_CTYPE_JSON), message); } @@ -1479,7 +1479,7 @@ void HandleInformation() // }2 = String func = FPSTR(HTTP_SCRIPT_INFO_BEGIN); func += F(" + "%s{s}" D_LIGHT "{m}%d%%{e}{s}" D_NOISE "{m}%d%%{e}{s}" D_AIR_QUALITY "{m}%d%%{e}"; // {s} = #endif // USE_WEBSERVER void SonoffScShow(boolean json) diff --git a/sonoff/xsns_15_mhz19.ino b/sonoff/xsns_15_mhz19.ino index 32bf247dd..26bea4fc3 100644 --- a/sonoff/xsns_15_mhz19.ino +++ b/sonoff/xsns_15_mhz19.ino @@ -134,6 +134,7 @@ void Mhz50ms() if (6 == mhz_timer) { // MH-Z19 measuring cycle takes 1005 +5% ms mhz_timer = 0; + MhzSerial->flush(); MhzSerial->write(mhz_cmnd_read_ppm, 9); } diff --git a/sonoff/xsns_17_senseair.ino b/sonoff/xsns_17_senseair.ino index fb90e1e1f..86026a1bd 100644 --- a/sonoff/xsns_17_senseair.ino +++ b/sonoff/xsns_17_senseair.ino @@ -74,6 +74,7 @@ void ModbusSend(uint8_t function_code, uint16_t start_address, uint16_t register frame[7] = (uint8_t)((crc >> 8) & 0xFF); frame[6] = (uint8_t)(crc & 0xFF); + SensairSerial->flush(); SensairSerial->write(frame, sizeof(frame)); }
"); - func += F(D_PROGRAM_VERSION "}2" VERSION_STRING); + func += F(D_PROGRAM_VERSION "}2"); func += my_version; func += F("}1" D_BUILD_DATE_AND_TIME "}2"); func += GetBuildDateAndTime(); func += F("}1" D_CORE_AND_SDK_VERSION "}2" ARDUINO_ESP8266_RELEASE "/"); func += String(ESP.getSdkVersion()); func += F("}1" D_UPTIME "}2"); func += String(uptime); func += F(" Hours"); diff --git a/sonoff/xdrv_01_light.ino b/sonoff/xdrv_01_light.ino index 44801bfc1..4ae7c1d09 100644 --- a/sonoff/xdrv_01_light.ino +++ b/sonoff/xdrv_01_light.ino @@ -188,7 +188,7 @@ void AriluxRfHandler() AddLog(LOG_LEVEL_DEBUG); if (hostcode == stored_hostcode) { - char command[16]; + char command[33]; char value = '-'; command[0] = '\0'; uint8_t keycode = arilux_rf_received_value & 0xFF; @@ -533,7 +533,7 @@ void LightPowerOn() void LightPreparePower() { char scolor[25]; - char scommand[16]; + char scommand[33]; if (Settings.light_dimmer && !(light_power)) { ExecuteCommandPower(devices_present, 7); // No publishPowerState diff --git a/sonoff/xsns_03_energy.ino b/sonoff/xdrv_03_energy.ino similarity index 99% rename from sonoff/xsns_03_energy.ino rename to sonoff/xdrv_03_energy.ino index e0e7db308..2118c9ad7 100644 --- a/sonoff/xsns_03_energy.ino +++ b/sonoff/xdrv_03_energy.ino @@ -1,5 +1,5 @@ /* - xsns_03_energy.ino - HLW8012 (Sonoff Pow) and PZEM004T energy sensor support for Sonoff-Tasmota + xdrv_03_energy.ino - HLW8012 (Sonoff Pow) and PZEM004T energy sensor support for Sonoff-Tasmota Copyright (C) 2018 Theo Arends @@ -304,6 +304,7 @@ void PzemSend(uint8_t cmd) uint8_t *bytes = (uint8_t*)&pzem; pzem.crc = PzemCrc(bytes); + PzemSerial->flush(); PzemSerial->write(bytes, sizeof(pzem)); } diff --git a/sonoff/xdrv_05_domoticz.ino b/sonoff/xdrv_05_domoticz.ino index 745c42c7a..e989f9aff 100644 --- a/sonoff/xdrv_05_domoticz.ino +++ b/sonoff/xdrv_05_domoticz.ino @@ -224,7 +224,7 @@ boolean DomoticzCommand() if (XdrvMailbox.payload >= 0) { Settings.domoticz_switch_idx[XdrvMailbox.index -1] = XdrvMailbox.payload; } - snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_DOMOTICZ_COMMAND_INDEX_NVALUE, command, XdrvMailbox.index, Settings.domoticz_key_idx[XdrvMailbox.index -1]); + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_DOMOTICZ_COMMAND_INDEX_NVALUE, command, XdrvMailbox.index, Settings.domoticz_switch_idx[XdrvMailbox.index -1]); } else if ((CMND_SENSORIDX == command_code) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= DZ_MAX_SENSORS)) { if (XdrvMailbox.payload >= 0) { @@ -398,6 +398,7 @@ void DomoticzSaveSettings() ssensor_indices, Settings.domoticz_update_timer); AddLog(LOG_LEVEL_INFO); } +#endif // USE_WEBSERVER /*********************************************************************************************\ * Interface @@ -431,5 +432,4 @@ boolean Xdrv05(byte function) return result; } -#endif // USE_WEBSERVER #endif // USE_DOMOTICZ diff --git a/sonoff/xsns_04_snfsc.ino b/sonoff/xsns_04_snfsc.ino index 67ee2d5ba..f8c9eeef0 100644 --- a/sonoff/xsns_04_snfsc.ino +++ b/sonoff/xsns_04_snfsc.ino @@ -105,7 +105,7 @@ void SonoffScSerialInput(char *rcvstat) #ifdef USE_WEBSERVER const char HTTP_SNS_SCPLUS[] PROGMEM = - "%s{s}" D_LIGHT "{m}%d%{e}{s}" D_NOISE "{m}%d%{e}{s}" D_AIR_QUALITY "{m}%d%{e}"; // {s} =
, {m} = , {e} =
, {m} = , {e} =