schuelerlabor-cleverlab/smarti
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feat/blockly-gallery

Browse Source
This commit is contained in:
Mario Pesch
2020-10-29 08:50:41 +01:00
committed by GitHub
parent 14947267d1 104d432278
commit bc819f224b
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/Blockly/msg/de.js
+1 -2
View File
@@ -775,5 +775,4 @@ Blockly.Msg.senseBox_telegram_send = "Sende Nachricht"
Blockly.Msg.senseBox_scd30 = "CO2 Sensor (Sensirion SCD30)";
export const De = Blockly.Msg;
export const De = Blockly.Msg;
src/components/Blockly/msg/en.js
+1 -1
View File
@@ -757,4 +757,4 @@ Blockly.Msg.sensebox_web_readHTML_filename = "File:";
Blockly.Msg.senseBox_scd30 = "CO2 Sensor (Sensirion SCD30)";
export const En = Blockly.Msg;
export const En = Blockly.Msg;
src/components/Blockly/toolbox/Toolbox.js
+6 -6
View File
@@ -206,7 +206,7 @@ class Toolbox extends React.Component {
<Block type="sensebox_send_to_osem" />
</Category>
<Category id="catSenseBoxOutput_LoRa" name=" LoRa" colour={getColour().sensebox}>
<Category id="catSenseBoxOutput_LoRa_activation" name=" Activation" colour={getColour().sensebox}>
<Category id="catSenseBoxOutput_LoRa_activation" name=" Aktiviereung" colour={getColour().sensebox}>
<Block type="sensebox_lora_initialize_otaa" />
<Block type="sensebox_lora_initialize_abp" />
</Category>
@@ -225,7 +225,7 @@ class Toolbox extends React.Component {
<Block type="sensebox_lora_cayenne_gps" />
</Category>
</Category>
<Category name="Logic" colour={getColour().logic}>
<Category name="Logik" colour={getColour().logic}>
<Block type="controls_if" />
<Block type="controls_ifelse" />
<Block type="logic_compare" />
@@ -234,7 +234,7 @@ class Toolbox extends React.Component {
<Block type="logic_boolean" />
<Block type="switch_case" />
</Category>
<Category id="loops" name="Loops" colour={getColour().loops}>
<Category id="loops" name="Schleifen" colour={getColour().loops}>
<Block type="controls_repeat_ext">
<Value name="TIMES">
<Block type="math_number">
@@ -273,7 +273,7 @@ class Toolbox extends React.Component {
<Block type="text_length" />
<Block type="text_isEmpty" />
</Category>
<Category id="time" name="Time" colour={getColour().time}>
<Category id="time" name="Zeit" colour={getColour().time}>
<Block type="time_delay">
<Value name="DELAY_TIME_MILI">
<Block type="math_number">
@@ -293,7 +293,7 @@ class Toolbox extends React.Component {
<Block type="infinite_loop"></Block>
<Block type="sensebox_interval_timer"></Block>
</Category>
<Category id="catMath" name="Math" colour={getColour().math}>
<Category id="catMath" name="Mathematik" colour={getColour().math}>
<Block type="math_number"></Block>
<Block type="math_arithmetic"></Block>
<Block type="math_single"></Block>
@@ -353,7 +353,7 @@ class Toolbox extends React.Component {
<Block type="lists_length" />
</Category>
<sep></sep>
<Category name="Input/Output" colour={getColour().io}>
<Category name="Eingang/Ausgang" colour={getColour().io}>
<Block type="io_digitalwrite"></Block>
<Block type="io_digitalread"></Block>
<Block type="io_builtin_led"></Block>