From 92b9e5e2aed4173999a5abd727709d8088c0f259 Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Sun, 30 Aug 2020 15:44:28 +0200 Subject: [PATCH] Add to my_user_config SetOption 100, 101, 103,104, 105, 106, 107, 109 --- tasmota/my_user_config.h | 9 ++++++++- tasmota/settings.ino | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index c905371af..5f94c5fc0 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -111,7 +111,7 @@ #define MQTT_SWITCH_RETAIN false // [SwitchRetain] Switch may send retain flag (false = off, true = on) #define MQTT_SENSOR_RETAIN false // [SensorRetain] Sensor may send retain flag (false = off, true = on) #define MQTT_NO_HOLD_RETAIN false // [SetOption62] Disable retain flag on HOLD messages -//#define MQTT_NO_RETAIN // Disable all retain flags (This don't include LWT!) if unsupported by broker (eg Losant) +#define MQTT_NO_RETAIN false // [SetOption104] No Retain - disable all MQTT retained messages, some brokers don't support it: AWS IoT, Losant #define MQTT_STATUS_OFF "OFF" // [StateText1] Command or Status result when turned off (needs to be a string like "0" or "Off") #define MQTT_STATUS_ON "ON" // [StateText2] Command or Status result when turned on (needs to be a string like "1" or "On") @@ -156,12 +156,14 @@ #define MQTT_BUTTON_SWITCH_FORCE_LOCAL false // [SetOption61] Force local operation when button/switch topic is set (false = off, true = on) #define MQTT_INDEX_SEPARATOR false // [SetOption64] Enable "_" instead of "-" as sensor index separator #define MQTT_TUYA_RECEIVED false // [SetOption66] Enable TuyaMcuReceived messages over Mqtt +#define MQTT_TLS_ENABLED false // [SetOption103] Enable TLS mode (requires TLS version) // -- HTTP ---------------------------------------- #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 "Tasmota" // [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) +#define EMULATION_HUE_1ST_GEN false // [Emulation] Force SetOption109 1 - if you only have Echo Dot 2nd gen devices #define CORS_DOMAIN "" // [Cors] CORS Domain for preflight requests // -- HTTP Options -------------------------------- @@ -302,6 +304,9 @@ #define LIGHT_SLIDER_POWER false // [SetOption77] Do not power off if slider moved to far left #define LIGHT_ALEXA_CT_RANGE false // [SetOption82] Reduced CT range for Alexa #define LIGHT_PWM_CT_MODE false // [SetOption92] Set PWM Mode from regular PWM to ColorTemp control (Xiaomi Philips ...) a.k.a. module 48 mode +#define LIGHT_WHITE_BLEND_MODE false // [SetOption105] White Blend Mode - used to be `RGBWWTable` last value `0`, now deprecated in favor of this option +#define LIGHT_VIRTUAL_CT false // [SetOption106] Virtual CT - Creates a virtual White ColorTemp for RGBW lights +#define LIGHT_VIRTUAL_CT_CW false // [SetOption107] Virtual CT Channel - signals whether the hardware white is cold CW (true) or warm WW (false) // -- Energy -------------------------------------- #define ENERGY_VOLTAGE_ALWAYS false // [SetOption21] Enable show voltage even if powered off @@ -320,6 +325,8 @@ #define SHUTTER_SUPPORT false // [SetOption80] Enable shutter support #define PCF8574_INVERT_PORTS false // [SetOption81] Invert all ports on PCF8574 devices #define ZIGBEE_FRIENDLY_NAMES false // [SetOption83] Enable Zigbee FriendlyNames instead of ShortAddresses when possible +#define ZIGBEE_RMV_ZBRECEIVED false // [SetOption100] Remove ZbReceived form JSON message +#define ZIGBEE_INDEX_EP false // [SetOption101] Add the source endpoint as suffix to attributes, ex `Power3` instead of `Power` if sent from endpoint 3 /*********************************************************************************************\ * END OF SECTION 1 diff --git a/tasmota/settings.ino b/tasmota/settings.ino index 32cc85335..a26c89b3d 100644 --- a/tasmota/settings.ino +++ b/tasmota/settings.ino @@ -863,6 +863,7 @@ void SettingsDefaultSet2(void) // Webserver flag2.emulation |= EMULATION; + flag4.alexa_gen_1 |= EMULATION_HUE_1ST_GEN; flag3.gui_hostname_ip |= GUI_SHOW_HOSTNAME; flag3.mdns_enabled |= MDNS_ENABLED; Settings.webserver = WEB_SERVER; @@ -1023,6 +1024,9 @@ void SettingsDefaultSet2(void) flag3.slider_dimmer_stay_on |= LIGHT_SLIDER_POWER; flag4.alexa_ct_range |= LIGHT_ALEXA_CT_RANGE; flag4.pwm_ct_mode |= LIGHT_PWM_CT_MODE; + flag4.white_blend_mode |= LIGHT_WHITE_BLEND_MODE; + flag4.virtual_ct |= LIGHT_VIRTUAL_CT; + flag4.virtual_ct_cw |= LIGHT_VIRTUAL_CT_CW; Settings.pwm_frequency = PWM_FREQ; Settings.pwm_range = PWM_RANGE; @@ -1116,6 +1120,10 @@ void SettingsDefaultSet2(void) flag3.shutter_mode |= SHUTTER_SUPPORT; flag3.pcf8574_ports_inverted |= PCF8574_INVERT_PORTS; flag4.zigbee_use_names |= ZIGBEE_FRIENDLY_NAMES; + flag4.remove_zbreceived |= ZIGBEE_RMV_ZBRECEIVED; + flag4.zb_index_ep |= ZIGBEE_INDEX_EP; + flag4.mqtt_tls |= MQTT_TLS_ENABLED; + flag4.mqtt_no_retain |= MQTT_NO_RETAIN; #ifdef USER_TEMPLATE JsonTemplate(USER_TEMPLATE);