diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnBrokerBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnBrokerBlock.java similarity index 96% rename from src/main/java/com/ardublock/translator/block/communication/PsnBrokerBlock.java rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnBrokerBlock.java index 7a361a40b6959ca8490ad55874d0c85a96874a85..8134f5563edd192adbbfd5bf19d686a39de6cd35 100644 --- a/src/main/java/com/ardublock/translator/block/communication/PsnBrokerBlock.java +++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnBrokerBlock.java @@ -1,4 +1,4 @@ -package com.ardublock.translator.block.communication; +package com.ardublock.translator.block.didacticnetwork; import com.ardublock.translator.Translator; import com.ardublock.translator.block.TranslatorBlock; diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnCallbackBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnCallbackBlock.java similarity index 98% rename from src/main/java/com/ardublock/translator/block/communication/PsnCallbackBlock.java rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnCallbackBlock.java index 8c733a8dc9dcc47d1522a3bff11df77bd65f98a3..7ff453bc38009a91691860a49b552b5bd539ba89 100644 --- a/src/main/java/com/ardublock/translator/block/communication/PsnCallbackBlock.java +++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnCallbackBlock.java @@ -1,4 +1,4 @@ -package com.ardublock.translator.block.communication; +package com.ardublock.translator.block.didacticnetwork; import java.util.ResourceBundle; diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnClientBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnClientBlock.java similarity index 97% rename from src/main/java/com/ardublock/translator/block/communication/PsnClientBlock.java rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnClientBlock.java index 68b708ac41c6ac2ce23aeb97edd8d47280100a36..383e0440034d9a5593aaae18c337b04b1345cd70 100644 --- a/src/main/java/com/ardublock/translator/block/communication/PsnClientBlock.java +++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnClientBlock.java @@ -1,4 +1,4 @@ -package com.ardublock.translator.block.communication; +package com.ardublock.translator.block.didacticnetwork; import com.ardublock.translator.Translator; import com.ardublock.translator.block.TranslatorBlock; diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnDataToSendBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnDataToSendBlock.java similarity index 94% rename from src/main/java/com/ardublock/translator/block/communication/PsnDataToSendBlock.java rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnDataToSendBlock.java index cede9e3befbb7c5f81cd0d5e0e9abe7466febfa1..fe17f5628fa4945758acb7650f48a061f05e9e12 100644 --- a/src/main/java/com/ardublock/translator/block/communication/PsnDataToSendBlock.java +++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnDataToSendBlock.java @@ -1,4 +1,4 @@ -package com.ardublock.translator.block.communication; +package com.ardublock.translator.block.didacticnetwork; import com.ardublock.translator.Translator; import com.ardublock.translator.block.TranslatorBlock; diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnHandleNetBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnHandleNetBlock.java similarity index 94% rename from src/main/java/com/ardublock/translator/block/communication/PsnHandleNetBlock.java rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnHandleNetBlock.java index a0df4ef33b839cc40f9c5ebdcd94f4217afcfa5b..da5422b29c9b70800bf437be20a7f03e29273118 100644 --- a/src/main/java/com/ardublock/translator/block/communication/PsnHandleNetBlock.java +++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnHandleNetBlock.java @@ -1,4 +1,4 @@ -package com.ardublock.translator.block.communication; +package com.ardublock.translator.block.didacticnetwork; import com.ardublock.translator.Translator; import com.ardublock.translator.block.TranslatorBlock; diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnPublishBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnPublishBlock.java similarity index 96% rename from src/main/java/com/ardublock/translator/block/communication/PsnPublishBlock.java rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnPublishBlock.java index f692239b350b16803fcce630f74b0a67c1c326a2..42fd13c4dce30c6e142992abf3cc7642dc8bc5e2 100644 --- a/src/main/java/com/ardublock/translator/block/communication/PsnPublishBlock.java +++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnPublishBlock.java @@ -1,4 +1,4 @@ -package com.ardublock.translator.block.communication; +package com.ardublock.translator.block.didacticnetwork; import com.ardublock.translator.Translator; import com.ardublock.translator.block.TranslatorBlock; diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnPublishOnChangeBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnPublishOnChangeBlock.java similarity index 88% rename from src/main/java/com/ardublock/translator/block/communication/PsnPublishOnChangeBlock.java rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnPublishOnChangeBlock.java index cbdebbf4d9cc40d32fb153b5a0c45faaa702f0e0..c8a6947ce5e78388943aaa502b237f2aee487d32 100644 --- a/src/main/java/com/ardublock/translator/block/communication/PsnPublishOnChangeBlock.java +++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnPublishOnChangeBlock.java @@ -1,4 +1,4 @@ -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+");"; } } diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnPublishOnChangeBoolBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnPublishOnChangeBoolBlock.java similarity index 96% rename from src/main/java/com/ardublock/translator/block/communication/PsnPublishOnChangeBoolBlock.java rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnPublishOnChangeBoolBlock.java index 75c772e64612384e2bc5334bd33706cfc9e61d61..f5611ca747bb6b4f6d58aac092dcf6c7dc30e885 100644 --- a/src/main/java/com/ardublock/translator/block/communication/PsnPublishOnChangeBoolBlock.java +++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnPublishOnChangeBoolBlock.java @@ -1,4 +1,4 @@ -package com.ardublock.translator.block.communication; +package com.ardublock.translator.block.didacticnetwork; import com.ardublock.translator.Translator; import com.ardublock.translator.block.TranslatorBlock; diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnSetInterval.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnSetInterval.java similarity index 95% rename from src/main/java/com/ardublock/translator/block/communication/PsnSetInterval.java rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnSetInterval.java index 39f2196f74e9b3e3225307686d3d6b3162da5f2d..7ae5b94e1651b4cd51feca3ddd6bfd84bf174f46 100644 --- a/src/main/java/com/ardublock/translator/block/communication/PsnSetInterval.java +++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnSetInterval.java @@ -1,4 +1,4 @@ -package com.ardublock.translator.block.communication; +package com.ardublock.translator.block.didacticnetwork; import com.ardublock.translator.Translator; import com.ardublock.translator.block.TranslatorBlock; diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnSubscribeBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnSubscribeBlock.java similarity index 95% rename from src/main/java/com/ardublock/translator/block/communication/PsnSubscribeBlock.java rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnSubscribeBlock.java index 47b14919bb4a4e9fc894ba7d14a54f1ec34d910d..ad1f825cad63a66e400f6afbe32aaf03ac7ce65d 100644 --- a/src/main/java/com/ardublock/translator/block/communication/PsnSubscribeBlock.java +++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnSubscribeBlock.java @@ -1,4 +1,4 @@ -package com.ardublock.translator.block.communication; +package com.ardublock.translator.block.didacticnetwork; import com.ardublock.translator.Translator; import com.ardublock.translator.block.TranslatorBlock; diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnUnsubscribeBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnUnsubscribeBlock.java similarity index 95% rename from src/main/java/com/ardublock/translator/block/communication/PsnUnsubscribeBlock.java rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnUnsubscribeBlock.java index 9cf43a4e19fb5a1b17b82dba268371995bdffc94..a38210e146d14cbe388b79bc46b811546645aac0 100644 --- a/src/main/java/com/ardublock/translator/block/communication/PsnUnsubscribeBlock.java +++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnUnsubscribeBlock.java @@ -1,4 +1,4 @@ -package com.ardublock.translator.block.communication; +package com.ardublock.translator.block.didacticnetwork; import com.ardublock.translator.Translator; import com.ardublock.translator.block.TranslatorBlock; diff --git a/src/main/resources/com/ardublock/block/block-mapping.properties b/src/main/resources/com/ardublock/block/block-mapping.properties index 4a3f53eb8b9d40e3becab22d81dfacbcd9543ce2..320108d044da92aefd6e0d0ef7095c1073774ba7 100644 --- a/src/main/resources/com/ardublock/block/block-mapping.properties +++ b/src/main/resources/com/ardublock/block/block-mapping.properties @@ -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 #****************************