diff --git a/src/dallassensor.cpp b/src/dallassensor.cpp index 29f46036b..a53cbff6a 100644 --- a/src/dallassensor.cpp +++ b/src/dallassensor.cpp @@ -299,13 +299,13 @@ uint64_t DallasSensor::Sensor::id() const { std::string DallasSensor::Sensor::id_string() const { std::string str(20, '\0'); - snprintf_P(&str[0], - str.capacity() + 1, - "%02X-%04X-%04X-%04X", - (unsigned int)(id_ >> 48) & 0xFF, - (unsigned int)(id_ >> 32) & 0xFFFF, - (unsigned int)(id_ >> 16) & 0xFFFF, - (unsigned int)(id_)&0xFFFF); + snprintf(&str[0], + str.capacity() + 1, + "%02X-%04X-%04X-%04X", + (unsigned int)(id_ >> 48) & 0xFF, + (unsigned int)(id_ >> 32) & 0xFFFF, + (unsigned int)(id_ >> 16) & 0xFFFF, + (unsigned int)(id_)&0xFFFF); return str; } @@ -347,7 +347,7 @@ void DallasSensor::delete_ha_config(uint8_t index, const char * name) { std::string topicname = name; std::replace(topicname.begin(), topicname.end(), '-', '_'); - snprintf_P(topic, sizeof(topic), "homeassistant/sensor/%s/dallassensor_%s/config", Mqtt::base().c_str(), topicname.c_str()); + snprintf(topic, sizeof(topic), "homeassistant/sensor/%s/dallassensor_%s/config", Mqtt::base().c_str(), topicname.c_str()); Mqtt::publish(topic); registered_ha_[index] = false; // forces a recreate of the HA config topic } @@ -461,7 +461,7 @@ bool DallasSensor::command_info(const char * value, const int8_t id, JsonObject uint8_t i = 1; // sensor count for (const auto & sensor : sensors_) { char sensorID[10]; // sensor{1-n} - snprintf_P(sensorID, 10, "sensor%d", i++); + snprintf(sensorID, 10, "sensor%d", i++); if (id == -1) { // show number and id JsonObject dataSensor = json.createNestedObject(sensorID); dataSensor["id"] = sensor.to_string(); @@ -493,7 +493,7 @@ void DallasSensor::publish_values(const bool force) { for (const auto & sensor : sensors_) { char sensorID[10]; // sensor{1-n} - snprintf_P(sensorID, 10, "sensor%d", sensor_no); + snprintf(sensorID, 10, "sensor%d", sensor_no); if (dallas_format_ == Dallas_Format::NUMBER) { // e.g. dallassensor_data = {"sensor1":{"id":"28-EA41-9497-0E03","temp":23.3},"sensor2":{"id":"28-233D-9497-0C03","temp":24.0}} JsonObject dataSensor = doc.createNestedObject(sensorID); @@ -513,28 +513,28 @@ void DallasSensor::publish_values(const bool force) { config["dev_cla"] = FJSON("temperature"); char stat_t[50]; - snprintf_P(stat_t, sizeof(stat_t), "%s/dallassensor_data", Mqtt::base().c_str()); + snprintf(stat_t, sizeof(stat_t), "%s/dallassensor_data", Mqtt::base().c_str()); config["stat_t"] = stat_t; config["unit_of_meas"] = FJSON("°C"); char str[50]; if (dallas_format_ != Dallas_Format::NUMBER) { - snprintf_P(str, sizeof(str), "{{value_json['%s']}}", sensor.to_string().c_str()); + snprintf(str, sizeof(str), "{{value_json['%s']}}", sensor.to_string().c_str()); } else { - snprintf_P(str, sizeof(str), "{{value_json.sensor%d.temp}}", sensor_no); + snprintf(str, sizeof(str), "{{value_json.sensor%d.temp}}", sensor_no); } config["val_tpl"] = str; // name as sensor number not the long unique ID if (dallas_format_ != Dallas_Format::NUMBER) { - snprintf_P(str, sizeof(str), "Dallas Sensor %s", sensor.to_string().c_str()); + snprintf(str, sizeof(str), "Dallas Sensor %s", sensor.to_string().c_str()); } else { - snprintf_P(str, sizeof(str), "Dallas Sensor %d", sensor_no); + snprintf(str, sizeof(str), "Dallas Sensor %d", sensor_no); } config["name"] = str; - snprintf_P(str, sizeof(str), "dallasensor_%s", sensor.to_string().c_str()); + snprintf(str, sizeof(str), "dallasensor_%s", sensor.to_string().c_str()); config["uniq_id"] = str; JsonObject dev = config.createNestedObject("dev"); @@ -543,12 +543,12 @@ void DallasSensor::publish_values(const bool force) { char topic[Mqtt::MQTT_TOPIC_MAX_SIZE]; if (dallas_format_ == Dallas_Format::NUMBER) { - snprintf_P(topic, sizeof(topic), "sensor/%s/dallassensor_%d/config", Mqtt::base().c_str(), sensor_no); + snprintf(topic, sizeof(topic), "sensor/%s/dallassensor_%d/config", Mqtt::base().c_str(), sensor_no); } else { // use '_' as HA doesn't like '-' in the topic name std::string topicname = sensor.to_string(); std::replace(topicname.begin(), topicname.end(), '-', '_'); - snprintf_P(topic, sizeof(topic), "sensor/%s/dallassensor_%s/config", Mqtt::base().c_str(), topicname.c_str()); + snprintf(topic, sizeof(topic), "sensor/%s/dallassensor_%s/config", Mqtt::base().c_str(), topicname.c_str()); } Mqtt::publish_ha(topic, config.as()); diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp index 503df6fa1..8e237a4aa 100644 --- a/src/devices/boiler.cpp +++ b/src/devices/boiler.cpp @@ -287,7 +287,7 @@ bool Boiler::publish_ha_config() { doc["ic"] = F_(icondevice); char stat_t[Mqtt::MQTT_TOPIC_MAX_SIZE]; - snprintf_P(stat_t, sizeof(stat_t), "%s/%s", Mqtt::base().c_str(), Mqtt::tag_to_topic(device_type(), DeviceValueTAG::TAG_NONE).c_str()); + snprintf(stat_t, sizeof(stat_t), "%s/%s", Mqtt::base().c_str(), Mqtt::tag_to_topic(device_type(), DeviceValueTAG::TAG_NONE).c_str()); doc["stat_t"] = stat_t; char name_s[40]; @@ -304,7 +304,7 @@ bool Boiler::publish_ha_config() { ids.add("ems-esp-boiler"); char topic[Mqtt::MQTT_TOPIC_MAX_SIZE]; - snprintf_P(topic, sizeof(topic), "sensor/%s/boiler/config", Mqtt::base().c_str()); + snprintf(topic, sizeof(topic), "sensor/%s/boiler/config", Mqtt::base().c_str()); Mqtt::publish_ha(topic, doc.as()); // publish the config payload with retain flag @@ -791,7 +791,7 @@ void Boiler::process_UBAMaintenanceStatus(std::shared_ptr telegr // ignore if 0, which means all is ok if (Helpers::hasValue(message_code) && message_code > 0) { - snprintf_P(maintenanceMessage_, sizeof(maintenanceMessage_), "H%02d", message_code); + snprintf(maintenanceMessage_, sizeof(maintenanceMessage_), "H%02d", message_code); } } @@ -818,7 +818,7 @@ void Boiler::process_UBAErrorMessage(std::shared_ptr telegram) { uint32_t date = (year - 2000) * 535680UL + month * 44640UL + day * 1440UL + hour * 60 + min; // store only the newest code from telegrams 10 and 11 if (date > lastCodeDate_) { - snprintf_P(lastCode_, sizeof(lastCode_), "%s(%d) %02d.%02d.%d %02d:%02d", code, codeNo, day, month, year, hour, min); + snprintf(lastCode_, sizeof(lastCode_), "%s(%d) %02d.%02d.%d %02d:%02d", code, codeNo, day, month, year, hour, min); lastCodeDate_ = date; } } @@ -844,7 +844,7 @@ void Boiler::process_UBAMaintenanceData(std::shared_ptr telegram uint8_t month = telegram->message_data[3]; uint8_t year = telegram->message_data[4]; if (day > 0 && month > 0) { - snprintf_P(maintenanceDate_, sizeof(maintenanceDate_), "%02d.%02d.%04d", day, month, year + 2000); + snprintf(maintenanceDate_, sizeof(maintenanceDate_), "%02d.%02d.%04d", day, month, year + 2000); } } diff --git a/src/devices/heatpump.cpp b/src/devices/heatpump.cpp index 8806dbb82..3e5b4f584 100644 --- a/src/devices/heatpump.cpp +++ b/src/devices/heatpump.cpp @@ -47,7 +47,7 @@ bool Heatpump::publish_ha_config() { doc["ic"] = F_(icondevice); char stat_t[Mqtt::MQTT_TOPIC_MAX_SIZE]; - snprintf_P(stat_t, sizeof(stat_t), "%s/%s", Mqtt::base().c_str(), Mqtt::tag_to_topic(device_type(), DeviceValueTAG::TAG_NONE).c_str()); + snprintf(stat_t, sizeof(stat_t), "%s/%s", Mqtt::base().c_str(), Mqtt::tag_to_topic(device_type(), DeviceValueTAG::TAG_NONE).c_str()); doc["stat_t"] = stat_t; char name_s[40]; @@ -64,7 +64,7 @@ bool Heatpump::publish_ha_config() { ids.add("ems-esp-heatpump"); char topic[Mqtt::MQTT_TOPIC_MAX_SIZE]; - snprintf_P(topic, sizeof(topic), "sensor/%s/heatpump/config", Mqtt::base().c_str()); + snprintf(topic, sizeof(topic), "sensor/%s/heatpump/config", Mqtt::base().c_str()); Mqtt::publish_ha(topic, doc.as()); // publish the config payload with retain flag return true; diff --git a/src/devices/mixer.cpp b/src/devices/mixer.cpp index 76ab005f3..c8f9b1433 100644 --- a/src/devices/mixer.cpp +++ b/src/devices/mixer.cpp @@ -110,23 +110,23 @@ bool Mixer::publish_ha_config() { char uniq_id[20]; if (type_ == Type::MP) { - snprintf_P(uniq_id, sizeof(uniq_id), "MixerMP"); + snprintf(uniq_id, sizeof(uniq_id), "MixerMP"); } else { - snprintf_P(uniq_id, sizeof(uniq_id), "Mixer%02X", device_id() - 0x20 + 1); + snprintf(uniq_id, sizeof(uniq_id), "Mixer%02X", device_id() - 0x20 + 1); } doc["uniq_id"] = uniq_id; doc["ic"] = F_(icondevice); char stat_t[Mqtt::MQTT_TOPIC_MAX_SIZE]; - snprintf_P(stat_t, sizeof(stat_t), "%s/%s", Mqtt::base().c_str(), Mqtt::tag_to_topic(device_type(), DeviceValueTAG::TAG_NONE).c_str()); + snprintf(stat_t, sizeof(stat_t), "%s/%s", Mqtt::base().c_str(), Mqtt::tag_to_topic(device_type(), DeviceValueTAG::TAG_NONE).c_str()); doc["stat_t"] = stat_t; char name[20]; if (type_ == Type::MP) { - snprintf_P(name, sizeof(name), "Mixer MP"); + snprintf(name, sizeof(name), "Mixer MP"); } else { - snprintf_P(name, sizeof(name), "Mixer %02X", device_id() - 0x20 + 1); + snprintf(name, sizeof(name), "Mixer %02X", device_id() - 0x20 + 1); } doc["name"] = name; @@ -151,11 +151,11 @@ bool Mixer::publish_ha_config() { // determine the topic, if its HC and WWC. This is determined by the incoming telegram types. std::string topic(Mqtt::MQTT_TOPIC_MAX_SIZE, '\0'); if (type_ == Type::HC) { - snprintf_P(&topic[0], topic.capacity() + 1, "sensor/%s/mixer_hc%d/config", Mqtt::base().c_str(), hc_); + snprintf(&topic[0], topic.capacity() + 1, "sensor/%s/mixer_hc%d/config", Mqtt::base().c_str(), hc_); } else if (type_ == Type::WWC) { - snprintf_P(&topic[0], topic.capacity() + 1, "sensor/%s/mixer_wwc%d/config", Mqtt::base().c_str(), hc_); // WWC + snprintf(&topic[0], topic.capacity() + 1, "sensor/%s/mixer_wwc%d/config", Mqtt::base().c_str(), hc_); // WWC } else if (type_ == Type::MP) { - snprintf_P(&topic[0], topic.capacity() + 1, "sensor/%s/mixer_mp/config", Mqtt::base().c_str()); + snprintf(&topic[0], topic.capacity() + 1, "sensor/%s/mixer_mp/config", Mqtt::base().c_str()); } Mqtt::publish_ha(topic, doc.as()); // publish the config payload with retain flag diff --git a/src/devices/solar.cpp b/src/devices/solar.cpp index ba15b8af4..b235d723e 100644 --- a/src/devices/solar.cpp +++ b/src/devices/solar.cpp @@ -194,7 +194,7 @@ bool Solar::publish_ha_config() { doc["ic"] = F_(icondevice); char stat_t[Mqtt::MQTT_TOPIC_MAX_SIZE]; - snprintf_P(stat_t, sizeof(stat_t), "%s/%s", Mqtt::base().c_str(), Mqtt::tag_to_topic(device_type(), DeviceValueTAG::TAG_NONE).c_str()); + snprintf(stat_t, sizeof(stat_t), "%s/%s", Mqtt::base().c_str(), Mqtt::tag_to_topic(device_type(), DeviceValueTAG::TAG_NONE).c_str()); doc["stat_t"] = stat_t; char name_s[40]; @@ -211,7 +211,7 @@ bool Solar::publish_ha_config() { ids.add("ems-esp-solar"); char topic[Mqtt::MQTT_TOPIC_MAX_SIZE]; - snprintf_P(topic, sizeof(topic), "sensor/%s/solar/config", Mqtt::base().c_str()); + snprintf(topic, sizeof(topic), "sensor/%s/solar/config", Mqtt::base().c_str()); Mqtt::publish_ha(topic, doc.as()); // publish the config payload with retain flag return true; diff --git a/src/devices/switch.cpp b/src/devices/switch.cpp index 38ff5c623..06b91a945 100644 --- a/src/devices/switch.cpp +++ b/src/devices/switch.cpp @@ -53,11 +53,11 @@ bool Switch::publish_ha_config() { doc["ic"] = F_(icondevice); char stat_t[Mqtt::MQTT_TOPIC_MAX_SIZE]; - snprintf_P(stat_t, sizeof(stat_t), "%s/%s", Mqtt::base().c_str(), Mqtt::tag_to_topic(device_type(), DeviceValueTAG::TAG_NONE).c_str()); + snprintf(stat_t, sizeof(stat_t), "%s/%s", Mqtt::base().c_str(), Mqtt::tag_to_topic(device_type(), DeviceValueTAG::TAG_NONE).c_str()); doc["stat_t"] = stat_t; char name_s[40]; - snprintf_P(name_s, sizeof(name_s), FSTR_(productid_fmt), device_type_name().c_str()); + snprintf(name_s, sizeof(name_s), FSTR_(productid_fmt), device_type_name().c_str()); doc["name"] = name_s; doc["val_tpl"] = FJSON("{{value_json.id}}"); @@ -70,7 +70,7 @@ bool Switch::publish_ha_config() { ids.add("ems-esp-switch"); char topic[Mqtt::MQTT_TOPIC_MAX_SIZE]; - snprintf_P(topic, sizeof(topic), "sensor/%s/switch/config", Mqtt::base().c_str()); + snprintf(topic, sizeof(topic), "sensor/%s/switch/config", Mqtt::base().c_str()); Mqtt::publish_ha(topic, doc.as()); // publish the config payload with retain flag return true; diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp index f3b1e4df9..9d6c8b316 100644 --- a/src/devices/thermostat.cpp +++ b/src/devices/thermostat.cpp @@ -202,7 +202,7 @@ bool Thermostat::publish_ha_config() { doc["ic"] = F_(icondevice); char stat_t[Mqtt::MQTT_TOPIC_MAX_SIZE]; - snprintf_P(stat_t, sizeof(stat_t), "%s/%s", Mqtt::base().c_str(), Mqtt::tag_to_topic(device_type(), DeviceValueTAG::TAG_NONE).c_str()); + snprintf(stat_t, sizeof(stat_t), "%s/%s", Mqtt::base().c_str(), Mqtt::tag_to_topic(device_type(), DeviceValueTAG::TAG_NONE).c_str()); doc["stat_t"] = stat_t; char name_s[40]; @@ -219,7 +219,7 @@ bool Thermostat::publish_ha_config() { ids.add("ems-esp-thermostat"); char topic[Mqtt::MQTT_TOPIC_MAX_SIZE]; - snprintf_P(topic, sizeof(topic), "sensor/%s/thermostat/config", Mqtt::base().c_str()); + snprintf(topic, sizeof(topic), "sensor/%s/thermostat/config", Mqtt::base().c_str()); Mqtt::publish_ha(topic, doc.as()); // publish the config payload with retain flag return true; @@ -390,13 +390,13 @@ void Thermostat::publish_ha_config_hc(uint8_t hc_num) { StaticJsonDocument doc; char str1[20]; - snprintf_P(str1, sizeof(str1), "Thermostat hc%d", hc_num); + snprintf(str1, sizeof(str1), "Thermostat hc%d", hc_num); char str2[20]; - snprintf_P(str2, sizeof(str2), "thermostat_hc%d", hc_num); + snprintf(str2, sizeof(str2), "thermostat_hc%d", hc_num); char str3[25]; - snprintf_P(str3, sizeof(str3), "~/%s", str2); + snprintf(str3, sizeof(str3), "~/%s", str2); doc["mode_cmd_t"] = str3; doc["temp_cmd_t"] = str3; doc["name"] = str1; @@ -407,23 +407,23 @@ void Thermostat::publish_ha_config_hc(uint8_t hc_num) { char topic_t[Mqtt::MQTT_TOPIC_MAX_SIZE]; if (Mqtt::nested_format() == 1) { - snprintf_P(topic_t, sizeof(topic_t), "~/%s", Mqtt::tag_to_topic(EMSdevice::DeviceType::THERMOSTAT, DeviceValueTAG::TAG_NONE).c_str()); + snprintf(topic_t, sizeof(topic_t), "~/%s", Mqtt::tag_to_topic(EMSdevice::DeviceType::THERMOSTAT, DeviceValueTAG::TAG_NONE).c_str()); char mode_str_tpl[40]; - snprintf_P(mode_str_tpl, sizeof(mode_str_tpl), "{{value_json.hc%d.hamode}}", hc_num); + snprintf(mode_str_tpl, sizeof(mode_str_tpl), "{{value_json.hc%d.hamode}}", hc_num); doc["mode_stat_tpl"] = mode_str_tpl; char seltemp_str[30]; - snprintf_P(seltemp_str, sizeof(seltemp_str), "{{value_json.hc%d.seltemp}}", hc_num); + snprintf(seltemp_str, sizeof(seltemp_str), "{{value_json.hc%d.seltemp}}", hc_num); doc["temp_stat_tpl"] = seltemp_str; char currtemp_str[30]; - snprintf_P(currtemp_str, sizeof(currtemp_str), "{{value_json.hc%d.hatemp}}", hc_num); + snprintf(currtemp_str, sizeof(currtemp_str), "{{value_json.hc%d.hatemp}}", hc_num); doc["curr_temp_tpl"] = currtemp_str; } else { - snprintf_P(topic_t, sizeof(topic_t), "~/%s", Mqtt::tag_to_topic(EMSdevice::DeviceType::THERMOSTAT, DeviceValueTAG::TAG_HC1 + hc_num - 1).c_str()); + snprintf(topic_t, sizeof(topic_t), "~/%s", Mqtt::tag_to_topic(EMSdevice::DeviceType::THERMOSTAT, DeviceValueTAG::TAG_HC1 + hc_num - 1).c_str()); doc["mode_stat_tpl"] = FJSON("{{value_json.hamode}}"); doc["temp_stat_tpl"] = FJSON("{{value_json.seltemp}}"); @@ -452,12 +452,12 @@ void Thermostat::publish_ha_config_hc(uint8_t hc_num) { ids.add("ems-esp-thermostat"); char topic[Mqtt::MQTT_TOPIC_MAX_SIZE]; - snprintf_P(topic, sizeof(topic), "climate/%s/thermostat_hc%d/config", Mqtt::base().c_str(), hc_num); + snprintf(topic, sizeof(topic), "climate/%s/thermostat_hc%d/config", Mqtt::base().c_str(), hc_num); Mqtt::publish_ha(topic, doc.as()); // publish the config payload with retain flag // enable the a special "thermostat_hc" topic to take both mode strings and floats for each of the heating circuits std::string topic2(Mqtt::MQTT_TOPIC_MAX_SIZE, '\0'); - snprintf_P(&topic2[0], topic2.capacity() + 1, "thermostat_hc%d", hc_num); + snprintf(&topic2[0], topic2.capacity() + 1, "thermostat_hc%d", hc_num); register_mqtt_topic(topic2, [=](const char * m) { return thermostat_ha_cmd(m, hc_num); }); } @@ -1120,15 +1120,15 @@ void Thermostat::process_RCTime(std::shared_ptr telegram) { char buf4[6]; char buf5[6]; char buf6[6]; - snprintf_P(dateTime_, - sizeof(dateTime_), - "%s:%s:%s %s/%s/%s", - Helpers::smallitoa(buf1, telegram->message_data[2]), // hour - Helpers::smallitoa(buf2, telegram->message_data[4]), // minute - Helpers::smallitoa(buf3, telegram->message_data[5]), // second - Helpers::smallitoa(buf4, telegram->message_data[3]), // day - Helpers::smallitoa(buf5, telegram->message_data[1]), // month - Helpers::itoa(buf6, (telegram->message_data[0] & 0x7F) + 2000) // year + snprintf(dateTime_, + sizeof(dateTime_), + "%s:%s:%s %s/%s/%s", + Helpers::smallitoa(buf1, telegram->message_data[2]), // hour + Helpers::smallitoa(buf2, telegram->message_data[4]), // minute + Helpers::smallitoa(buf3, telegram->message_data[5]), // second + Helpers::smallitoa(buf4, telegram->message_data[3]), // day + Helpers::smallitoa(buf5, telegram->message_data[1]), // month + Helpers::itoa(buf6, (telegram->message_data[0] & 0x7F) + 2000) // year ); has_update((strcmp(timeold, dateTime_) != 0)); @@ -1148,7 +1148,7 @@ void Thermostat::process_RCError(std::shared_ptr telegram) { buf[2] = telegram->message_data[2]; buf[3] = 0; has_update(telegram->read_value(errorNumber_, 3)); - snprintf_P(errorCode_, sizeof(errorCode_), "%s(%d)", buf, errorNumber_); + snprintf(errorCode_, sizeof(errorCode_), "%s(%d)", buf, errorNumber_); } // 0x12 error log @@ -1170,7 +1170,7 @@ void Thermostat::process_RCErrorMessage(std::shared_ptr telegram uint8_t day = telegram->message_data[7]; uint8_t hour = telegram->message_data[6]; uint8_t min = telegram->message_data[8]; - snprintf_P(lastCode_, sizeof(lastCode_), "%s(%d) %02d.%02d.%d %02d:%02d", code, codeNo, day, month, year, hour, min); + snprintf(lastCode_, sizeof(lastCode_), "%s(%d) %02d.%02d.%d %02d:%02d", code, codeNo, day, month, year, hour, min); } } diff --git a/src/shower.cpp b/src/shower.cpp index 7a55136a0..5ce06d79a 100644 --- a/src/shower.cpp +++ b/src/shower.cpp @@ -126,7 +126,7 @@ void Shower::send_mqtt_stat(bool state, bool force) { ids.add("ems-esp"); char topic[Mqtt::MQTT_TOPIC_MAX_SIZE]; - snprintf_P(topic, sizeof(topic), "binary_sensor/%s/shower_active/config", Mqtt::base().c_str()); + snprintf(topic, sizeof(topic), "binary_sensor/%s/shower_active/config", Mqtt::base().c_str()); Mqtt::publish_ha(topic, doc.as()); // publish the config payload with retain flag } } @@ -161,7 +161,7 @@ void Shower::publish_values() { // only publish shower duration if there is a value if (duration_ > SHOWER_MIN_DURATION) { char s[50]; - snprintf_P(s, 50, "%d minutes and %d seconds", (uint8_t)(duration_ / 60000), (uint8_t)((duration_ / 1000) % 60)); + snprintf(s, 50, "%d minutes and %d seconds", (uint8_t)(duration_ / 60000), (uint8_t)((duration_ / 1000) % 60)); doc["duration"] = s; }