From 527bff8c9f362e032ab42652a6a8dc8128c2af9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anian=20B=C3=BChler?= <anian.buehler@reutlingen-university.de> Date: Tue, 9 Nov 2021 15:23:00 +0100 Subject: [PATCH] updated psn color scheme --- .../com/ardublock/block/ardublock.properties | 80 +++++++++++-------- .../com/ardublock/block/ardublock.xml | 47 +++++------ .../ardublock/block/ardublock_de.properties | 47 ++++++----- .../block/ardublock_en_GB.properties | 60 ++++++-------- 4 files changed, 122 insertions(+), 112 deletions(-) diff --git a/src/main/resources/com/ardublock/block/ardublock.properties b/src/main/resources/com/ardublock/block/ardublock.properties index e76eb6b..0b86b96 100644 --- a/src/main/resources/com/ardublock/block/ardublock.properties +++ b/src/main/resources/com/ardublock/block/ardublock.properties @@ -678,17 +678,11 @@ bc.number_chars=number of characters #COMMUNICATION #**************************** bd.communication=Communication -bd.didacticnetwork = Didactic Network bg.communicationDivider1=| serial | bg.communicationDivider2=| software serial | bg.communicationDivider3=| serial connectors | -bg.communicationDivider4=| PubSub Network | -bg.communicationDivider5=| PubSub publish | -bg.communicationDivider6=| PubSub subscribe | -bg.communicationDivider7=| PubSub callback | - bg.glue_poly=connect bg.glue_msg=connect bg.glue_sb=connect @@ -715,20 +709,6 @@ bg.tele_read_data_frame=read from Frame bg.mqtt_set_frame=set MQTT Frame bg.mqtt_read_frame=read MQTT Frame -bg.psn_broker=PubSub Broker -bg.psn_client=PubSub Client -bg.psn_callback=psnClientCallback -bg.psn_handle_network=PubSub handleNetwork -bg.psn_data_to_send=PubSub isDataToSend? -bg.psn_publish=PubSub publish -bg.psn_publish=psnName publish -bg.psn_publish_analog=psnName publish -bg.psn_publish_onchange=psnName publishOnChange -bg.psn_publish_onchange_bool=psnName publishOnChange -bg.psn_subscribe=PubSub subscribe -bg.psn_unsubscribe=PubSub unsubscribe - - bg.serial_write.description=Send message via Serial bg.serial_print.description=Send message via Serial port bg.serial_read.description=read char via Serial port as byte @@ -749,12 +729,54 @@ bg.glue_digital.description=Glue boolean to string bg.glue_number.description=Glue number to string bg.glue_char.description=Glue char to string bg.glue_string.description=Glue string to string + bg.tele_set_frame.description=write data to telegram-frame bg.tele_read_frame.description=read serial data in telegram-frame-format bg.tele_read_data_frame.description=read data from telegram-frame \n receiver-address 0 reads data from all sender-addresses bg.mqtt_set_frame.description=write data to MQTT-frame\n(letsgoING-IOT-module) bg.mqtt_read_frame.description=read data from MQTT-frame\n(letsgoING-IOT-module) + + +bc.print=print +bc.ln=new line +bc.rx_pin_number=Rx Pin +bc.tx_pin_number=Tx Pin +bc.baudrate=baud + +bc.sendAddress=sender address +bc.recAddress=receiver address +bc.dataLength=data length +bc.sendBuffer=send Buffer +bc.recBuffer=receive Buffer +bc.recFrame=received Frame +bc.recChars=received characters +bc.command=command type +bc.nextChar=next char +bc.dataComplete=data complete + +#DIDACTIC NETWORK +#**************************** +bd.didacticnetwork = Didactic Network + +bg.didacticnetworkDivider1=| PubSub Network | +bg.didacticnetworkDivider2=| PubSub publish | +bg.didacticnetworkDivider3=| PubSub subscribe | +bg.didacticnetworkDivider4=| PubSub callback | + +bg.psn_broker=PubSub Broker +bg.psn_client=PubSub Client +bg.psn_callback=psnClientCallback +bg.psn_handle_network=PubSub handleNetwork +bg.psn_data_to_send=PubSub isDataToSend? +bg.psn_publish=PubSub publish +bg.psn_publish=psnName publish +bg.psn_publish_analog=psnName publish +bg.psn_publish_onchange=psnName publishOnChange +bg.psn_publish_onchange_bool=psnName publishOnChange +bg.psn_subscribe=PubSub subscribe +bg.psn_unsubscribe=PubSub unsubscribe + bg.psn_broker.description=PubSub Server bg.psn_client.description=PubSub Client bg.psn_callback.description=PubSub_Callback @@ -774,26 +796,14 @@ bc.payloadVar=payload var bc.payloadLengthVar=payload length var bc.topicVar=topic var bc.topicLengthVar=topic length var -bc.print=print -bc.ln=new line -bc.rx_pin_number=Rx Pin -bc.tx_pin_number=Tx Pin -bc.baudrate=baud -bc.sendAddress=sender address -bc.recAddress=receiver address -bc.dataLength=data length -bc.sendBuffer=send Buffer -bc.recBuffer=receive Buffer -bc.recFrame=received Frame -bc.recChars=received characters bc.payload=payload bc.payloadLength=payload length bc.threshold=threshold bc.topic=topic bc.topicLength=topic length -bc.command=command type -bc.nextChar=next char -bc.dataComplete=data complete + + + #STORAGE #**************************** diff --git a/src/main/resources/com/ardublock/block/ardublock.xml b/src/main/resources/com/ardublock/block/ardublock.xml index 5acbac8..520e9f6 100644 --- a/src/main/resources/com/ardublock/block/ardublock.xml +++ b/src/main/resources/com/ardublock/block/ardublock.xml @@ -2057,12 +2057,7 @@ <BlockGenus name="communicationDivider1" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.communicationDivider1" color="150 150 150" /> <BlockGenus name="communicationDivider2" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.communicationDivider2" color="150 150 150" /> <BlockGenus name="communicationDivider3" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.communicationDivider3" color="150 150 150" /> - <BlockGenus name="communicationDivider4" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.communicationDivider4" color="150 150 150" /> - <BlockGenus name="communicationDivider5" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.communicationDivider5" color="150 150 150" /> - <BlockGenus name="communicationDivider6" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.communicationDivider6" color="150 150 150" /> - <BlockGenus name="communicationDivider7" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.communicationDivider7" color="150 150 150" /> - - + <BlockGenus name="serial_read" kind="data" color="165 42 42" initlabel="bg.serial_read"> <BlockConnectors> <BlockConnector connector-type="string-list" connector-kind="plug" position-type="mirror" /> @@ -2327,7 +2322,13 @@ </BlockGenus> - <BlockGenus name="psn_broker" kind="command" color="165 42 42" initlabel="bg.psn_broker" editable-label="yes"> + <!-- ******************** DidacticNetwork *************** --> + <BlockGenus name="didacticnetworkDivider1" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.didacticnetworkDivider1" color="150 150 150" /> + <BlockGenus name="didacticnetworkDivider2" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.didacticnetworkDivider2" color="150 150 150" /> + <BlockGenus name="didacticnetworkDivider3" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.didacticnetworkDivider3" color="150 150 150" /> + <BlockGenus name="didacticnetworkDivider4" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.didacticnetworkDivider4" color="150 150 150" /> + + <BlockGenus name="psn_broker" kind="command" color="130 27 27" initlabel="bg.psn_broker" editable-label="yes"> <description> <text>create PubSub Broker</text> </description> @@ -2343,7 +2344,7 @@ </BlockConnector> </BlockConnectors> </BlockGenus> - <BlockGenus name="psn_client" kind="command" color="165 42 42" initlabel="bg.psn_client" editable-label="yes"> + <BlockGenus name="psn_client" kind="command" color="130 27 27" initlabel="bg.psn_client" editable-label="yes"> <description> <text>create PubSub Client</text> </description> @@ -2362,7 +2363,7 @@ </BlockConnector> </BlockConnectors> </BlockGenus> - <BlockGenus name="psn_callback" kind="command" color="165 42 42" initlabel="bg.psn_callback" is-starter="yes" is-terminator="yes" label-unique="yes" editable-label="yes"> + <BlockGenus name="psn_callback" kind="command" color="130 27 27" initlabel="bg.psn_callback" is-starter="yes" is-terminator="yes" label-unique="yes" editable-label="yes"> <description> <text>PubSub Callback</text> </description> @@ -2385,21 +2386,21 @@ <BlockConnector label="bc.commands" connector-type="cmd" connector-kind="socket" /> </BlockConnectors> </BlockGenus> - <BlockGenus name="psn_handle_network" kind="command" color="165 42 42" initlabel="bg.psn_handle_network" editable-label="yes" > + <BlockGenus name="psn_handle_network" kind="command" color="130 27 27" initlabel="bg.psn_handle_network" editable-label="yes" > <!--<BlockConnectors> <BlockConnector connector-type="string" connector-kind="socket" label="bc.ps_name"> <DefaultArg genus-name="string" label="psnName" /> </BlockConnector> </BlockConnectors> --> </BlockGenus> - <BlockGenus name="psn_data_to_send" kind="command" color="165 42 42" initlabel="bg.psn_data_to_send" editable-label="yes"> + <BlockGenus name="psn_data_to_send" kind="command" color="130 27 27" initlabel="bg.psn_data_to_send" editable-label="yes"> <!--<BlockConnectors> <BlockConnector connector-type="string" connector-kind="socket" label="bc.ps_name"> <DefaultArg genus-name="string" label="psnName" /> </BlockConnector> </BlockConnectors>--> </BlockGenus> - <BlockGenus name="psn_subscribe" kind="command" color="165 42 42" initlabel="bg.psn_subscribe" editable-label="yes"> + <BlockGenus name="psn_subscribe" kind="command" color="130 27 27" initlabel="bg.psn_subscribe" editable-label="yes"> <BlockConnectors> <!--<BlockConnector connector-type="string" connector-kind="socket" label="bc.ps_name"> <DefaultArg genus-name="string" label="psnName" /> @@ -2409,7 +2410,7 @@ </BlockConnector> </BlockConnectors> </BlockGenus> - <BlockGenus name="psn_unsubscribe" kind="command" color="165 42 42" initlabel="bg.psn_unsubscribe" editable-label="yes"> + <BlockGenus name="psn_unsubscribe" kind="command" color="130 27 27" initlabel="bg.psn_unsubscribe" editable-label="yes"> <BlockConnectors> <!--<BlockConnector connector-type="string" connector-kind="socket" label="bc.ps_name"> <DefaultArg genus-name="string" label="psnName" /> @@ -2419,7 +2420,7 @@ </BlockConnector> </BlockConnectors> </BlockGenus> - <BlockGenus name="psn_publish" kind="command" color="165 42 42" initlabel="bg.psn_publish" editable-label="yes"> + <BlockGenus name="psn_publish" kind="command" color="130 27 27" initlabel="bg.psn_publish" editable-label="yes"> <BlockConnectors> <!--<BlockConnector connector-type="string" connector-kind="socket" label="bc.ps_name"> <DefaultArg genus-name="string" label="psnName" /> @@ -2431,7 +2432,7 @@ </BlockConnector> </BlockConnectors> </BlockGenus> - <BlockGenus name="psn_publish_analog" kind="command" color="165 42 42" initlabel="bg.psn_publish" editable-label="yes"> + <BlockGenus name="psn_publish_analog" kind="command" color="130 27 27" initlabel="bg.psn_publish" editable-label="yes"> <BlockConnectors> <BlockConnector connector-type="string" connector-kind="socket" label="bc.topic"> <DefaultArg genus-name="string" label="publishTopic" /> @@ -2440,7 +2441,7 @@ </BlockConnector> </BlockConnectors> </BlockGenus> - <BlockGenus name="psn_publish_digital" kind="command" color="165 42 42" initlabel="bg.psn_publish" editable-label="yes"> + <BlockGenus name="psn_publish_digital" kind="command" color="130 27 27" initlabel="bg.psn_publish" editable-label="yes"> <BlockConnectors> <BlockConnector connector-type="string" connector-kind="socket" label="bc.topic"> <DefaultArg genus-name="string" label="publishTopic" /> @@ -2450,7 +2451,7 @@ </BlockConnectors> </BlockGenus> <!-- TODO: add publishOnChange to autoname fcn--> - <BlockGenus name="psn_publish_onchange_bool" kind="command" color="165 42 42" initlabel="bg.psn_publish_onchange" editable-label="yes"> + <BlockGenus name="psn_publish_onchange_bool" kind="command" color="130 27 27" initlabel="bg.psn_publish_onchange" editable-label="yes"> <BlockConnectors> <!--<BlockConnector connector-type="string" connector-kind="socket" label="bc.ps_name"> <DefaultArg genus-name="string" label="psnName" /> @@ -2462,7 +2463,7 @@ </BlockConnector> </BlockConnectors> </BlockGenus> - <BlockGenus name="psn_publish_onchange" kind="command" color="165 42 42" initlabel="bg.psn_publish_onchange" editable-label="yes"> + <BlockGenus name="psn_publish_onchange" kind="command" color="130 27 27" initlabel="bg.psn_publish_onchange" editable-label="yes"> <BlockConnectors> <!--<BlockConnector connector-type="string" connector-kind="socket" label="bc.ps_name"> <DefaultArg genus-name="string" label="psnName" /> @@ -3294,25 +3295,25 @@ <BlockGenusMember>glue_string</BlockGenusMember> </BlockDrawer> - <BlockDrawer button-color="165 42 42" name="bd.didacticnetwork" type="custom"> - <BlockGenusMember>communicationDivider4</BlockGenusMember> + <BlockDrawer button-color="130 27 27" name="bd.didacticnetwork" type="custom"> + <BlockGenusMember>didacticnetworkDivider1</BlockGenusMember> <BlockGenusMember>psn_broker</BlockGenusMember> <BlockGenusMember>psn_client</BlockGenusMember> <BlockGenusMember>psn_handle_network</BlockGenusMember> <BlockGenusMember>psn_data_to_send</BlockGenusMember> - <BlockGenusMember>communicationDivider5</BlockGenusMember> + <BlockGenusMember>didacticnetworkDivider2</BlockGenusMember> <BlockGenusMember>psn_publish</BlockGenusMember> <BlockGenusMember>psn_publish_analog</BlockGenusMember> <BlockGenusMember>psn_publish_digital</BlockGenusMember> <BlockGenusMember>psn_publish_onchange</BlockGenusMember> <BlockGenusMember>psn_publish_onchange_bool</BlockGenusMember> - <BlockGenusMember>communicationDivider6</BlockGenusMember> + <BlockGenusMember>didacticnetworkDivider3</BlockGenusMember> <BlockGenusMember>psn_subscribe</BlockGenusMember> <BlockGenusMember>psn_unsubscribe</BlockGenusMember> - <BlockGenusMember>communicationDivider7</BlockGenusMember> + <BlockGenusMember>didacticnetworkDivider4</BlockGenusMember> <BlockGenusMember>psn_callback</BlockGenusMember> </BlockDrawer> diff --git a/src/main/resources/com/ardublock/block/ardublock_de.properties b/src/main/resources/com/ardublock/block/ardublock_de.properties index f8a767f..9f85036 100644 --- a/src/main/resources/com/ardublock/block/ardublock_de.properties +++ b/src/main/resources/com/ardublock/block/ardublock_de.properties @@ -675,15 +675,10 @@ bc.number_chars=Anzahl Zeichen #COMMUNICATION #**************************** bd.communication=Kommunikation -bd.didacticnetwork = Didaktik Netzwerk bg.communicationDivider1=| Seriell | bg.communicationDivider2=| Software Seriell | bg.communicationDivider3=| Verbinder | -bg.communicationDivider4=| PubSub Netzwerk | -bg.communicationDivider5=| PubSub publish | -bg.communicationDivider6=| PubSub subscribe | -bg.communicationDivider7=| PubSub callback | bg.glue_poly=verbinde bg.glue_msg=verbinde @@ -750,6 +745,32 @@ bg.tele_read_data_frame.description=lese Daten aus dem Telegramm-Rahmen\n HINWEI bg.mqtt_set_frame.description=schreibe Daten in MQTT-Rahmen\n(letsgoING-IOT-Modul) bg.mqtt_read_frame.description=lese Daten aus MQTT-Rahmen\n(letsgoING-IOT-Modul) + +bc.print=print +bc.ln=neue Zeile +bc.rx_pin_number=Rx Pin +bc.tx_pin_number=Tx Pin +bc.baudrate=Baud +bc.sendAddress= Adr. Sender +bc.recAddress=Adr. Empfänger +bc.dataLength=Länge Daten [0-9] +bc.sendBuffer=zu sendender Frame +bc.recFrame=empfangener Frame +bc.recBuffer=Empfangspuffer +bc.recChars=Anz. empfangene Zeichen +bc.nextChar=nächstes Zeichen +bc.dataComplete=Daten komplett +bc.command=Befehlsart + +#DIDACTIC NETWORK +#**************************** +bd.didacticnetwork = Didaktik Netzwerk + +bg.didacticnetworkDivider1=| PubSub Netzwerk | +bg.didacticnetworkDivider2=| PubSub publish | +bg.didacticnetworkDivider3=| PubSub subscribe | +bg.didacticnetworkDivider4=| PubSub callback | + 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 @@ -769,26 +790,12 @@ bc.payloadVar=Nutzdaten-Variable bc.payloadLengthVar=Nutzdaten-Laenge-Variable bc.topicVar=Topic Variable bc.topicLengthVar=Topic-Laenge-Variable -bc.print=print -bc.ln=neue Zeile -bc.rx_pin_number=Rx Pin -bc.tx_pin_number=Tx Pin -bc.baudrate=Baud -bc.sendAddress= Adr. Sender -bc.recAddress=Adr. Empfänger -bc.dataLength=Länge Daten [0-9] -bc.sendBuffer=zu sendender Frame -bc.recFrame=empfangener Frame -bc.recBuffer=Empfangspuffer -bc.recChars=Anz. empfangene Zeichen bc.payload=Nutzdaten bc.payloadLength=Länge Nutzdaten bc.threshold=Schwellwert bc.topic=Topic bc.topicLength=Länge Topic -bc.command=Befehlsart -bc.nextChar=nächstes Zeichen -bc.dataComplete=Daten komplett + #STORAGE #**************************** diff --git a/src/main/resources/com/ardublock/block/ardublock_en_GB.properties b/src/main/resources/com/ardublock/block/ardublock_en_GB.properties index 4dbf200..dea7645 100644 --- a/src/main/resources/com/ardublock/block/ardublock_en_GB.properties +++ b/src/main/resources/com/ardublock/block/ardublock_en_GB.properties @@ -675,17 +675,11 @@ bc.number_chars=Anzahl Zeichen #COMMUNICATION #**************************** bd.communication=Kommunikation -bd.didacticnetwork = Didaktik Netzwerk bg.communicationDivider1=| Seriell | bg.communicationDivider2=| Software Seriell | bg.communicationDivider3=| Verbinder | -bg.communicationDivider4=| PubSub Netzwerk | -bg.communicationDivider5=| PubSub publish | -bg.communicationDivider6=| PubSub subscribe | -bg.communicationDivider7=| PubSub callback | - bg.glue_poly=verbinde bg.glue_msg=verbinde bg.glue_sb=verbinde @@ -712,19 +706,6 @@ bg.tele_read_data_frame=lese Daten aus Frame bg.mqtt_set_frame=erstelle MQTT Frame bg.mqtt_read_frame=lese aus MQTT Frame -bg.psn_broker=Broker psnName -bg.psn_client=Client psnName -bg.psn_callback=psnClientCallback -bg.psn_handle_network=psnName handleNetwork -bg.psn_data_to_send=psnName isDataToSend? -bg.psn_publish=psnName publish -bg.psn_publish_analog=psnName publish -bg.psn_publish_digital=psnName publish -bg.psn_publish_onchange=psnName publishOnChange -bg.psn_publish_onchange_bool=psnName publishOnChange -bg.psn_subscribe=psnName subscribe -bg.psn_unsubscribe=psnName unsubscribe - bg.serial_write.description=Sende Nachricht via Serial bg.serial_print.description=Sende Nachricht via Serial bg.serial_read.description=Lese Zeichen via Serial als kurze analoge Variable ein\n(siehe ASCII-Tabelle) @@ -751,6 +732,32 @@ bg.tele_read_data_frame.description=lese Daten aus dem Telegramm-Rahmen\n HINWEI bg.mqtt_set_frame.description=schreibe Daten in MQTT-Rahmen\n(letsgoING-IOT-Modul) bg.mqtt_read_frame.description=lese Daten aus MQTT-Rahmen\n(letsgoING-IOT-Modul) +bc.print=print +bc.ln=neue Zeile +bc.rx_pin_number=Rx Pin +bc.tx_pin_number=Tx Pin +bc.baudrate=Baud + +bc.sendAddress= Adr. Sender +bc.recAddress=Adr. Empfänger +bc.dataLength=Länge Daten [0-9] +bc.sendBuffer=zu sendender Frame +bc.recFrame=empfangener Frame +bc.recBuffer=Empfangspuffer +bc.recChars=Anz. empfangene Zeichen +bc.command=Befehlsart +bc.nextChar=nächstes Zeichen +bc.dataComplete=Daten komplett + +#DIDACTIC NETWORK +#**************************** +bd.didacticnetwork = Didaktik Netzwerk + +bg.didacticnetworkDivider1=| PubSub Netzwerk | +bg.didacticnetworkDivider2=| PubSub publish | +bg.didacticnetworkDivider3=| PubSub subscribe | +bg.didacticnetworkDivider4=| PubSub callback | + 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 @@ -770,26 +777,11 @@ bc.payloadVar=Nutzdaten-Variable bc.payloadLengthVar=Nutzdaten-Laenge-Variable bc.topicVar=Topic Variable bc.topicLengthVar=Topic-Laenge-Variable -bc.print=print -bc.ln=neue Zeile -bc.rx_pin_number=Rx Pin -bc.tx_pin_number=Tx Pin -bc.baudrate=Baud -bc.sendAddress= Adr. Sender -bc.recAddress=Adr. Empfänger -bc.dataLength=Länge Daten [0-9] -bc.sendBuffer=zu sendender Frame -bc.recFrame=empfangener Frame -bc.recBuffer=Empfangspuffer -bc.recChars=Anz. empfangene Zeichen bc.payload=Nutzdaten bc.payloadLength=Länge Nutzdaten bc.threshold=Schwellwert bc.topic=Topic bc.topicLength=Länge Topic -bc.command=Befehlsart -bc.nextChar=nächstes Zeichen -bc.dataComplete=Daten komplett #STORAGE #**************************** -- GitLab