Skip to content
Snippets Groups Projects
Commit 0584c82a authored by Anian Bühler's avatar Anian Bühler
Browse files

reorganized psn-Blocks from communication to didaktic network

parent 2b974a1e
No related branches found
No related tags found
1 merge request!1dev_prefereences to master
Showing
with 26 additions and 25 deletions
package com.ardublock.translator.block.communication;
package com.ardublock.translator.block.didacticnetwork;
import com.ardublock.translator.Translator;
import com.ardublock.translator.block.TranslatorBlock;
......
package com.ardublock.translator.block.communication;
package com.ardublock.translator.block.didacticnetwork;
import java.util.ResourceBundle;
......
package com.ardublock.translator.block.communication;
package com.ardublock.translator.block.didacticnetwork;
import com.ardublock.translator.Translator;
import com.ardublock.translator.block.TranslatorBlock;
......
package com.ardublock.translator.block.communication;
package com.ardublock.translator.block.didacticnetwork;
import com.ardublock.translator.Translator;
import com.ardublock.translator.block.TranslatorBlock;
......
package com.ardublock.translator.block.communication;
package com.ardublock.translator.block.didacticnetwork;
import com.ardublock.translator.Translator;
import com.ardublock.translator.block.TranslatorBlock;
......
package com.ardublock.translator.block.communication;
package com.ardublock.translator.block.didacticnetwork;
import com.ardublock.translator.Translator;
import com.ardublock.translator.block.TranslatorBlock;
......
package com.ardublock.translator.block.communication;
package com.ardublock.translator.block.didacticnetwork;
import com.ardublock.translator.Translator;
import com.ardublock.translator.block.TranslatorBlock;
......@@ -32,6 +32,7 @@ public class PsnPublishOnChangeBlock extends TranslatorBlock
//String name = tb_name.toCode().replaceAll("\\s*_.new\\b\\s*\"", "").replaceAll("\"", "");
String topic = tb_topic.toCode().replaceAll("\\s*_.new\\b\\s*", "");
String data = tb_data.toCode().replaceAll("\\s*_.new\\b\\s*", "");
String threshold = tb_threshold.toCode().replaceAll("\\s*_.new\\b\\s*", "");
//TODO: test f check for VarBlock is needed
if(!(tb_topic instanceof StringBlock)) {
......@@ -41,6 +42,6 @@ public class PsnPublishOnChangeBlock extends TranslatorBlock
data = data.replaceAll("\"", "");
}
return name + ".publishOnChange("+topic+", "+data+", "+tb_threshold+");";
return name + ".publishOnChange("+topic+", "+data+", "+threshold+");";
}
}
package com.ardublock.translator.block.communication;
package com.ardublock.translator.block.didacticnetwork;
import com.ardublock.translator.Translator;
import com.ardublock.translator.block.TranslatorBlock;
......
package com.ardublock.translator.block.communication;
package com.ardublock.translator.block.didacticnetwork;
import com.ardublock.translator.Translator;
import com.ardublock.translator.block.TranslatorBlock;
......
package com.ardublock.translator.block.communication;
package com.ardublock.translator.block.didacticnetwork;
import com.ardublock.translator.Translator;
import com.ardublock.translator.block.TranslatorBlock;
......
package com.ardublock.translator.block.communication;
package com.ardublock.translator.block.didacticnetwork;
import com.ardublock.translator.Translator;
import com.ardublock.translator.block.TranslatorBlock;
......
......@@ -252,19 +252,19 @@ tele_read_data_frame=com.ardublock.translator.block.communication.TelegramReadDa
mqtt_set_frame=com.ardublock.translator.block.communication.MQTTSetFrameBlock
mqtt_read_frame=com.ardublock.translator.block.communication.MQTTReadFrameBlock
psn_broker=com.ardublock.translator.block.communication.PsnBrokerBlock
psn_client=com.ardublock.translator.block.communication.PsnClientBlock
psn_callback=com.ardublock.translator.block.communication.PsnCallbackBlock
psn_handle_network=com.ardublock.translator.block.communication.PsnHandleNetBlock
psn_data_to_send=com.ardublock.translator.block.communication.PsnDataToSendBlock
psn_set_interval=com.ardublock.translator.block.communication.PsnSetInterval
psn_publish=com.ardublock.translator.block.communication.PsnPublishBlock
psn_publish_analog=com.ardublock.translator.block.communication.PsnPublishBlock
psn_publish_digital=com.ardublock.translator.block.communication.PsnPublishBlock
psn_publish_onchange=com.ardublock.translator.block.communication.PsnPublishOnChangeBlock
psn_publish_onchange_bool=com.ardublock.translator.block.communication.PsnPublishOnChangeBoolBlock
psn_subscribe=com.ardublock.translator.block.communication.PsnSubscribeBlock
psn_unsubscribe=com.ardublock.translator.block.communication.PsnUnsubscribeBlock
psn_broker=com.ardublock.translator.block.didacticnetwork.PsnBrokerBlock
psn_client=com.ardublock.translator.block.didacticnetwork.PsnClientBlock
psn_callback=com.ardublock.translator.block.didacticnetwork.PsnCallbackBlock
psn_handle_network=com.ardublock.translator.block.didacticnetwork.PsnHandleNetBlock
psn_data_to_send=com.ardublock.translator.block.didacticnetwork.PsnDataToSendBlock
psn_set_interval=com.ardublock.translator.block.didacticnetwork.PsnSetInterval
psn_publish=com.ardublock.translator.block.didacticnetwork.PsnPublishBlock
psn_publish_analog=com.ardublock.translator.block.didacticnetwork.PsnPublishBlock
psn_publish_digital=com.ardublock.translator.block.didacticnetwork.PsnPublishBlock
psn_publish_onchange=com.ardublock.translator.block.didacticnetwork.PsnPublishOnChangeBlock
psn_publish_onchange_bool=com.ardublock.translator.block.didacticnetwork.PsnPublishOnChangeBoolBlock
psn_subscribe=com.ardublock.translator.block.didacticnetwork.PsnSubscribeBlock
psn_unsubscribe=com.ardublock.translator.block.didacticnetwork.PsnUnsubscribeBlock
#STORAGE
#****************************
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment