From 269afa4b769ea2cfa3fce334298ce857b0a8c710 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 15 Feb 2021 10:47:01 +0100 Subject: [PATCH] fix for custom mqtt server --- src/components/Blockly/blocks/mqtt.js | 4 +--- src/components/Blockly/generator/mqtt.js | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/Blockly/blocks/mqtt.js b/src/components/Blockly/blocks/mqtt.js index 2411253..98fee85 100644 --- a/src/components/Blockly/blocks/mqtt.js +++ b/src/components/Blockly/blocks/mqtt.js @@ -49,9 +49,6 @@ Blockly.Blocks["sensebox_mqtt_setup"] = { break; case "custom": - this.getField('server').setValue("server"); - this.getField('port').setValue("port"); - this.getField('passwordmsg').setValue(Blockly.Msg.senseBox_mqtt_password); break; default: @@ -86,3 +83,4 @@ Blockly.Blocks["sensebox_mqtt_subscribe"] = { this.setOutput(true, null); } }; + diff --git a/src/components/Blockly/generator/mqtt.js b/src/components/Blockly/generator/mqtt.js index 03c1af1..7733fb4 100644 --- a/src/components/Blockly/generator/mqtt.js +++ b/src/components/Blockly/generator/mqtt.js @@ -38,7 +38,7 @@ Blockly.Arduino.sensebox_mqtt_publish = function (block) { Blockly.Arduino.definitions_['mqtt_' + feed_client + ''] = 'Adafruit_MQTT_Publish ' + feed_client + ' = Adafruit_MQTT_Publish(&mqtt, "/"USERNAME"/' + feedname + '");' break; case 'custom': - Blockly.Arduino.definitions_['mqtt_' + feed_client + ''] = 'Adafruit_MQTT_Publish ' + feed_client + ' = Adafruit_MQTT_Publish(&mqtt, ' + feedname + ');' + Blockly.Arduino.definitions_['mqtt_' + feed_client + ''] = 'Adafruit_MQTT_Publish ' + feed_client + ' = Adafruit_MQTT_Publish(&mqtt, "' + feedname + '");' break; default: break; @@ -77,4 +77,5 @@ Blockly.Arduino.sensebox_mqtt_subscribe = function (block) { Blockly.Arduino.loopCodeOnce_['mqtt_processPackages'] = 'mqtt.processPackets(10);'; var code = ''; return code; -}; \ No newline at end of file +}; +