diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp index 10eb01e21..f9f114039 100644 --- a/src/mqtt/MQTT.cpp +++ b/src/mqtt/MQTT.cpp @@ -487,11 +487,8 @@ bool MQTT::publish(const char *topic, const uint8_t *payload, size_t length, boo { if (moduleConfig.mqtt.proxy_to_client_enabled) { meshtastic_MqttClientProxyMessage *msg = mqttClientProxyMessagePool.allocZeroed(); - size_t topic_len = strlen(topic); msg->which_payload_variant = meshtastic_MqttClientProxyMessage_data_tag; - if (strncpy(msg->topic, topic, topic_len) == nullptr) { - msg->topic[sizeof(msg->topic) - 1] = 0; - } + strlcpy(msg->topic, topic, sizeof(msg->topic)); if (length > sizeof(msg->payload_variant.data.bytes)) length = sizeof(msg->payload_variant.data.bytes); msg->payload_variant.data.size = length; diff --git a/variants/nrf52840/rak4631/platformio.ini b/variants/nrf52840/rak4631/platformio.ini index 0593cac49..205966529 100644 --- a/variants/nrf52840/rak4631/platformio.ini +++ b/variants/nrf52840/rak4631/platformio.ini @@ -5,7 +5,6 @@ board = wiscore_rak4631 board_level = pr board_check = true build_flags = ${nrf52840_base.build_flags} - -g -I variants/nrf52840/rak4631 -D RAK_4631 -DEINK_DISPLAY_MODEL=GxEPD2_213_BN @@ -24,8 +23,6 @@ lib_deps = beegee-tokyo/RAK12035_SoilMoisture@^1.0.4 # renovate: datasource=git-refs depName=RAK12034-BMX160 packageName=https://github.com/RAKWireless/RAK12034-BMX160 gitBranch=main https://github.com/RAKWireless/RAK12034-BMX160/archive/dcead07ffa267d3c906e9ca4a1330ab989e957e2.zip - # renovate: datasource=custom.pio depName=Bosch BME68x packageName=boschsensortec/library/BME68x Sensor Library - boschsensortec/BME68x Sensor Library@1.3.40408 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm) ; Note: as of 6/2013 the serial/bootloader based programming takes approximately 30 seconds