added basic block to properties, ardublock.xml and

blockmapping.properties

src/main/java/com/ardublock/translator/block/didacticnetwork/PsnReadBooleanBlock.java → src/main/java/com/ardublock/translator/block/didacticnetwork/PsnReadPayloadBooleanBlock.java

@@ -7,9 +7,9 @@ import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 import com.ardublock.translator.block.numbers.StringBlock;
 
 
-public class PsnReadBooleanBlock extends TranslatorBlock
+public class PsnReadPayloadBooleanBlock extends TranslatorBlock
 {
-	public PsnReadBooleanBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
+	public PsnReadPayloadBooleanBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
 	{
 		super(blockId, translator, codePrefix, codeSuffix, label);
 	}

src/main/java/com/ardublock/translator/block/didacticnetwork/PsnReadIntegerBlock.java → src/main/java/com/ardublock/translator/block/didacticnetwork/PsnReadPayloadIntegerBlock.java

@@ -7,9 +7,9 @@ import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 import com.ardublock.translator.block.numbers.StringBlock;
 
 
-public class PsnReadIntegerBlock extends TranslatorBlock
+public class PsnReadPayloadIntegerBlock extends TranslatorBlock
 {
-	public PsnReadIntegerBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
+	public PsnReadPayloadIntegerBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
 	{
 		super(blockId, translator, codePrefix, codeSuffix, label);
 	}

src/main/resources/com/ardublock/block/ardublock.properties

@@ -917,6 +917,12 @@ bg.psn_publish_onchange_bool=pubSubNet publishOnChange
 bg.psn_subscribe=pubSubNet subscribe
 bg.psn_unsubscribe=pubSubNet unsubscribe
 
+bg.psn_read_topic=pubSubNet readTopic
+bg.psn_read_payload=pubSubNet readPayload
+bg.psn_read_payload_bool=pubSubNet readPayloadBoolean
+bg.psn_read_payload_integer=pubSubNet readPayloadInteger
+bg.psn_available=pubSubNet available
+
 bg.psn_broker.description=set up Server
 bg.psn_client.description=set up Client
 bg.psn_callback.description=PubSub-Callback
@@ -931,6 +937,13 @@ bg.psn_publish_onchange_bool.description=publish boolean state on change
 bg.psn_subscribe.description=PubSub subscribe
 bg.psn_unsubscribe.description=PubSub unsubscribe
 
+bg.psn_read_topic.description=read topic as string (char-array)
+bg.psn_read_payload.description=read payload as string (char-array)
+bg.psn_read_payload_bool.description=read received data direct as bool\n!USE ONLY IF BOOL IS SEND!
+bg.psn_read_payload_integer.description=read received data direct as integer\n!USE ONLY IF INTEGER IS SEND!
+bg.psn_available.description=received data on pubSubNet available
+
+
 bc.ps_name=name
 bc.ps_interval=ms
 bc.callback=callback

src/main/resources/com/ardublock/block/ardublock.xml

@@ -2936,6 +2936,43 @@
 			</BlockConnectors>
 		</BlockGenus>
 		
+		<BlockGenus name="psn_available" kind="data" color="130 27 27" initlabel="bg.psn_available" editable-label="yes">
+			<BlockConnectors>
+				<BlockConnector connector-type="boolean" connector-kind="plug">
+				</BlockConnector>
+			</BlockConnectors>
+		</BlockGenus>
+		
+		<BlockGenus name="psn_read_topic" kind="command" color="130 27 27" initlabel="bg.psn_read_payload" editable-label="yes">
+			<BlockConnectors>
+				<BlockConnector connector-type="string" connector-kind="socket" label="bc.topic">
+					<DefaultArg genus-name="variable_string" label="topicVariable" />
+				</BlockConnector>
+			</BlockConnectors>
+		</BlockGenus>
+		
+		<BlockGenus name="psn_read_payload" kind="command" color="130 27 27" initlabel="bg.psn_read_topic" editable-label="yes">
+			<BlockConnectors>
+				<BlockConnector connector-type="string" connector-kind="socket" label="bc.topic">
+					<DefaultArg genus-name="variable_string" label="payloadVariable" />
+				</BlockConnector>
+			</BlockConnectors>
+		</BlockGenus>
+		
+		<BlockGenus name="psn_read_payload_bool" kind="data" color="130 27 27" initlabel="bg.psn_read_payload_bool" editable-label="yes">
+			<BlockConnectors>
+				<BlockConnector connector-type="boolean" connector-kind="plug">
+				</BlockConnector>
+			</BlockConnectors>
+		</BlockGenus>
+		
+		<BlockGenus name="psn_read_payload_integer" kind="data" color="130 27 27" initlabel="bg.psn_read_payload_integer" editable-label="yes">
+			<BlockConnectors>
+				<BlockConnector connector-type="number" connector-kind="plug">
+				</BlockConnector>
+			</BlockConnectors>
+		</BlockGenus>
+		
 		
 		<!-- ******************** Storage *************** -->
 		<BlockGenus name="storageDivider1" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.storageDivider1" color="150 150 150" />

src/main/resources/com/ardublock/block/ardublock_de.properties

@@ -910,6 +910,12 @@ bg.psn_publish_onchange_bool=pubSubNet publishOnChange
 bg.psn_subscribe=pubSubNet subscribe
 bg.psn_unsubscribe=pubSubNet unsubscribe 
 
+bg.psn_read_topic=pubSubNet readTopic
+bg.psn_read_payload=pubSubNet readPayload
+bg.psn_read_payload_bool=pubSubNet readPayloadBoolean
+bg.psn_read_payload_integer=pubSubNet readPayloadInteger
+bg.psn_available=pubSubNet available
+
 bg.psn_broker.description=Broker fuer PubSub Netzwerk erzeugen
 bg.psn_client.description=Client fuer PubSub Netzwerk erzeugen
 bg.psn_callback.description=Funktion wird automatisch aufgefufen wenn neue Daten empfangen werden
@@ -924,6 +930,12 @@ bg.psn_publish_onchange_bool.description=Digitale (bool) Daten bei
 bg.psn_subscribe.description=Topic abonnieren
 bg.psn_unsubscribe.description=Topic nicht mehr abonnieren
 
+bg.psn_read_topic.description=lese topic als String (char-array)
+bg.psn_read_payload.description=lese payload als String (char-array)
+bg.psn_read_payload_bool.description=lese empfangene Daten direkt als bool\n!NUR WENN SICHER BOOL GESENDET WIRD!
+bg.psn_read_payload_integer.description=lese empfangene Daten direkt als integer\n!NUR WENN SICHER INTEGER GESENDET WIRD
+bg.psn_available.description=Daten wurde empfangen und sind verfgbar
+
 bc.ps_name=Name
 bc.ps_interval=ms
 bc.callback=Uebergabefunktion

src/main/resources/com/ardublock/block/ardublock_de_DE.properties

@@ -914,6 +914,12 @@ bg.psn_publish_onchange_bool=pubSubNet publishOnChange
 bg.psn_subscribe=pubSubNet subscribe
 bg.psn_unsubscribe=pubSubNet unsubscribe 
 
+bg.psn_read_topic=pubSubNet readTopic
+bg.psn_read_payload=pubSubNet readPayload
+bg.psn_read_payload_bool=pubSubNet readPayloadBoolean
+bg.psn_read_payload_integer=pubSubNet readPayloadInteger
+bg.psn_available=pubSubNet available
+
 bg.psn_broker.description=Broker fuer PubSub Netzwerk erzeugen
 bg.psn_client.description=Client fuer PubSub Netzwerk erzeugen
 bg.psn_callback.description=Funktion wird automatisch aufgefufen wenn neue Daten empfangen werden
@@ -928,6 +934,12 @@ bg.psn_publish_onchange_bool.description=Digitale (bool) Daten bei
 bg.psn_subscribe.description=Topic abonnieren
 bg.psn_unsubscribe.description=Topic nicht mehr abonnieren
 
+bg.psn_read_topic.description=lese topic als String (char-array)
+bg.psn_read_payload.description=lese payload als String (char-array)
+bg.psn_read_payload_bool.description=lese empfangene Daten direkt als bool\n!NUR WENN SICHER BOOL GESENDET WIRD!
+bg.psn_read_payload_integer.description=lese empfangene Daten direkt als integer\n!NUR WENN SICHER INTEGER GESENDET WIRD
+bg.psn_available.description=Daten wurde empfangen und sind verfgbar
+
 bc.ps_name=Name
 bc.ps_interval=ms 
 bc.callback=Uebergabefunktion

src/main/resources/com/ardublock/block/ardublock_en_GB.properties

@@ -911,6 +911,12 @@ bg.psn_publish_onchange_bool=pubSubNet publishOnChange
 bg.psn_subscribe=pubSubNet subscribe
 bg.psn_unsubscribe=pubSubNet unsubscribe
 
+bg.psn_read_topic=pubSubNet readTopic
+bg.psn_read_payload=pubSubNet readPayload
+bg.psn_read_payload_bool=pubSubNet readPayloadBoolean
+bg.psn_read_payload_integer=pubSubNet readPayloadInteger
+bg.psn_available=pubSubNet available 
+
 bg.psn_broker.description=Broker fuer PubSub Netzwerk erzeugen
 bg.psn_client.description=Client fuer PubSub Netzwerk erzeugen
 bg.psn_callback.description=Funktion wird automatisch aufgefufen wenn neue Daten empfangen werden
@@ -925,6 +931,12 @@ bg.psn_publish_onchange_bool.description=Digitale (bool) Daten bei
 bg.psn_subscribe.description=Topic abonnieren
 bg.psn_unsubscribe.description=Topic nicht mehr abonnieren
 
+bg.psn_read_topic.description=lese topic als String (char-array)
+bg.psn_read_payload.description=lese payload als String (char-array)
+bg.psn_read_payload_bool.description=lese empfangene Daten direkt als bool\n!NUR WENN SICHER BOOL GESENDET WIRD!
+bg.psn_read_payload_integer.description=lese empfangene Daten direkt als integer\n!NUR WENN SICHER INTEGER GESENDET WIRD
+bg.psn_available.description=Daten wurde empfangen und sind verfgbar
+
 bc.ps_name=Name
 bc.ps_interval=ms
 bc.callback=Uebergabefunktion

src/main/resources/com/ardublock/block/block-mapping.properties

@@ -300,6 +300,13 @@ psn_publish_onchange_bool=com.ardublock.translator.block.didacticnetwork.PsnPubl
 psn_subscribe=com.ardublock.translator.block.didacticnetwork.PsnSubscribeBlock
 psn_unsubscribe=com.ardublock.translator.block.didacticnetwork.PsnUnsubscribeBlock
 
+psn_available=com.ardublock.translator.block.didacticnetwork.PsnAvailableBlock
+psn_read_topic=com.ardublock.translator.block.didacticnetwork.PsnReadTopicBlock
+psn_read_payload=com.ardublock.translator.block.didacticnetwork.PsnReadPayloadBlock
+psn_read_payload_bool=com.ardublock.translator.block.didacticnetwork.PsnReadPayloadBooleanBlock
+psn_read_payload_integer=com.ardublock.translator.block.didacticnetwork.PsnReadPayloadIntegerBlock
+
+
 #STORAGE
 #****************************
 eeprom_read=com.ardublock.translator.block.storage.EEPROMReadBlock