OpenRoberta#1222: add support for Ultrasonic HC-SR04

chpoulter · Feb 13, 2022 · b0adb86 · b0adb86
1 parent 6176da7
commit b0adb86
Show file tree

Hide file tree

Showing 74 changed files with 297 additions and 58 deletions.
diff --git a/OpenRobertaRobot/src/main/java/de/fhg/iais/roberta/syntax/SC.java b/OpenRobertaRobot/src/main/java/de/fhg/iais/roberta/syntax/SC.java
@@ -137,4 +137,6 @@ public interface SC {
 
     String OLEDSSD1306I2C = "OLEDSSD1306I2C";
 
+    String ULTRASONIC_HCSR04 = "ULTRASONIC_HCSR04";
+
 }
diff --git a/OpenRobertaRobot/src/main/resources/robotCommon.yml b/OpenRobertaRobot/src/main/resources/robotCommon.yml
@@ -30,7 +30,7 @@ block:
   ULTRASONIC_SENSING:
       category: SENSOR
       implementor: de.fhg.iais.roberta.syntax.sensor.generic.UltrasonicSensor
-      type: [robSensors_ultrasonic_getSample,sim_ultrasonic_getSample]
+      type: [robSensors_ultrasonic_getSample,sim_ultrasonic_getSample,robsensors_ultrasonic_hcsr04_getsample]
   INFRARED_SENSING:
       category: SENSOR
       implementor: de.fhg.iais.roberta.syntax.sensor.generic.InfraredSensor
@@ -859,7 +859,7 @@ configuration:
   TEMPERATURE: [robConf_temperature, robBrick_temperature]
   TIMER: [robBrick_timer]
   TOUCH: [robBrick_touch]
-  ULTRASONIC: [robConf_ultrasonic, robBrick_ultrasonic]
+  ULTRASONIC: [robConf_ultrasonic, robConf_ultrasonic_hcsr04, robBrick_ultrasonic]
   WEDO: [robBrick_WeDo-Brick]
   WIRELESS: [robConf_wireless]
   PARTICLE: [robConf_particle]
diff --git a/OpenRobertaServer/staticResources/blockly/blockly_compressed.js b/OpenRobertaServer/staticResources/blockly/blockly_compressed.js
diff --git a/OpenRobertaServer/staticResources/blockly/msg/js/ar.js b/OpenRobertaServer/staticResources/blockly/msg/js/ar.js
@@ -279,6 +279,7 @@ Blockly.Msg.EV3BRICK_TOOLTIP = "Represents the EV3 brick with connected actors a
 Blockly.Msg.EXPAND_ALL = "وسٌّع القطع";
 Blockly.Msg.EXPAND_BLOCK = "وسٌّع القطعة";
 Blockly.Msg.EXTERNAL_INPUTS = "ادخال خارجي";
+Blockly.Msg.FACTOR = "Factor";  // untranslated
 Blockly.Msg.FLAME_GETSAMPLE_TOOLTIP = "Gets the current reading from the flame sensor.";  // untranslated
 Blockly.Msg.FLAME_TOOLTIP = "Represents a flame sensor.";  // untranslated
 Blockly.Msg.FLYOUT_VARIABLE_TEXT = "You need a variable? Please declare it first with a click on the + sign at the »start« block.";  // untranslated
@@ -1691,6 +1692,7 @@ Blockly.Msg.TOUR1_DESCRIPTION13a = "and test your program in the simulation!";
 Blockly.Msg.TOUR1_DESCRIPTION15 = "Perfect,<br>your robot is driving 20 cm forward,<br>this is what you have programmed!";  // untranslated
 Blockly.Msg.TOUR1_DESCRIPTION16 = "Bye and have fun trying out more!";  // untranslated
 Blockly.Msg.ULTRASONIC_GETSAMPLE_TOOLTIP = "Gets the current reading from the ultrasonic sensor in cm. Maximum distance to measure is 255 cm.";  // untranslated
+Blockly.Msg.ULTRASONIC_HCSR04 = "Ultrasonic HC-SR04";  // untranslated
 Blockly.Msg.ULTRASONIC_TOOLTIP = "Represents an ultrasonic sensor.";  // untranslated
 Blockly.Msg.UNDO = "Undo";  // untranslated
 Blockly.Msg.USERGROUP_ADD_MEMBERS = "Add members";  // untranslated
@@ -1835,6 +1837,7 @@ Blockly.Msg.CONTROLS_WHILEUNTIL_INPUT_DO = Blockly.Msg.CONTROLS_REPEAT_INPUT_DO;
 Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP = Blockly.Msg.SOUND_GETSAMPLE_TOOLTIP;
 Blockly.Msg.SENSOR_FLAME_GETSAMPLE_TOOLTIP = Blockly.Msg.FLAME_GETSAMPLE_TOOLTIP;
 Blockly.Msg.ACTION_FOURDIGITDISPLAY = Blockly.Msg.FOURDIGITDISPLAY;
+Blockly.Msg.SENSOR_ULTRASONIC_HCSR04 = Blockly.Msg.ULTRASONIC_HCSR04;
 Blockly.Msg.SENSOR_COLOURTCS3472_COLOUR_GETSAMPLE_TOOLTIP = Blockly.Msg.COLOUR_COLOUR_GETSAMPLE_TOOLTIP;
 Blockly.Msg.SENSOR_HTCOLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP = Blockly.Msg.SENSOR_COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP;
 Blockly.Msg.HTCOLOUR_COLOUR_GETSAMPLE_TOOLTIP = Blockly.Msg.COLOUR_COLOUR_GETSAMPLE_TOOLTIP;

diff --git a/OpenRobertaServer/staticResources/blockly/msg/js/az.js b/OpenRobertaServer/staticResources/blockly/msg/js/az.js
@@ -279,6 +279,7 @@ Blockly.Msg.EV3BRICK_TOOLTIP = "Represents the EV3 brick with connected actors a
 Blockly.Msg.EXPAND_ALL = "Blokları aç";
 Blockly.Msg.EXPAND_BLOCK = "Bloku aç";
 Blockly.Msg.EXTERNAL_INPUTS = "Xarici girişlər";
+Blockly.Msg.FACTOR = "Factor";  // untranslated
 Blockly.Msg.FLAME_GETSAMPLE_TOOLTIP = "Gets the current reading from the flame sensor.";  // untranslated
 Blockly.Msg.FLAME_TOOLTIP = "Represents a flame sensor.";  // untranslated
 Blockly.Msg.FLYOUT_VARIABLE_TEXT = "You need a variable? Please declare it first with a click on the + sign at the »start« block.";  // untranslated
@@ -1691,6 +1692,7 @@ Blockly.Msg.TOUR1_DESCRIPTION13a = "and test your program in the simulation!";
 Blockly.Msg.TOUR1_DESCRIPTION15 = "Perfect,<br>your robot is driving 20 cm forward,<br>this is what you have programmed!";  // untranslated
 Blockly.Msg.TOUR1_DESCRIPTION16 = "Bye and have fun trying out more!";  // untranslated
 Blockly.Msg.ULTRASONIC_GETSAMPLE_TOOLTIP = "Gets the current reading from the ultrasonic sensor in cm. Maximum distance to measure is 255 cm.";  // untranslated
+Blockly.Msg.ULTRASONIC_HCSR04 = "Ultrasonic HC-SR04";  // untranslated
 Blockly.Msg.ULTRASONIC_TOOLTIP = "Represents an ultrasonic sensor.";  // untranslated
 Blockly.Msg.UNDO = "Undo";  // untranslated
 Blockly.Msg.USERGROUP_ADD_MEMBERS = "Add members";  // untranslated
@@ -1835,6 +1837,7 @@ Blockly.Msg.CONTROLS_WHILEUNTIL_INPUT_DO = Blockly.Msg.CONTROLS_REPEAT_INPUT_DO;
 Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP = Blockly.Msg.SOUND_GETSAMPLE_TOOLTIP;
 Blockly.Msg.SENSOR_FLAME_GETSAMPLE_TOOLTIP = Blockly.Msg.FLAME_GETSAMPLE_TOOLTIP;
 Blockly.Msg.ACTION_FOURDIGITDISPLAY = Blockly.Msg.FOURDIGITDISPLAY;
+Blockly.Msg.SENSOR_ULTRASONIC_HCSR04 = Blockly.Msg.ULTRASONIC_HCSR04;
 Blockly.Msg.SENSOR_COLOURTCS3472_COLOUR_GETSAMPLE_TOOLTIP = Blockly.Msg.COLOUR_COLOUR_GETSAMPLE_TOOLTIP;
 Blockly.Msg.SENSOR_HTCOLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP = Blockly.Msg.SENSOR_COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP;
 Blockly.Msg.HTCOLOUR_COLOUR_GETSAMPLE_TOOLTIP = Blockly.Msg.COLOUR_COLOUR_GETSAMPLE_TOOLTIP;

diff --git a/OpenRobertaServer/staticResources/blockly/msg/js/ba.js b/OpenRobertaServer/staticResources/blockly/msg/js/ba.js
@@ -279,6 +279,7 @@ Blockly.Msg.EV3BRICK_TOOLTIP = "Represents the EV3 brick with connected actors a
 Blockly.Msg.EXPAND_ALL = "Блоктарҙы йәйергә";
 Blockly.Msg.EXPAND_BLOCK = "Блокты йәйергә";
 Blockly.Msg.EXTERNAL_INPUTS = "Тышҡы өҫтәлмә";
+Blockly.Msg.FACTOR = "Factor";  // untranslated
 Blockly.Msg.FLAME_GETSAMPLE_TOOLTIP = "Gets the current reading from the flame sensor.";  // untranslated
 Blockly.Msg.FLAME_TOOLTIP = "Represents a flame sensor.";  // untranslated
 Blockly.Msg.FLYOUT_VARIABLE_TEXT = "You need a variable? Please declare it first with a click on the + sign at the »start« block.";  // untranslated
@@ -1691,6 +1692,7 @@ Blockly.Msg.TOUR1_DESCRIPTION13a = "and test your program in the simulation!";
 Blockly.Msg.TOUR1_DESCRIPTION15 = "Perfect,<br>your robot is driving 20 cm forward,<br>this is what you have programmed!";  // untranslated
 Blockly.Msg.TOUR1_DESCRIPTION16 = "Bye and have fun trying out more!";  // untranslated
 Blockly.Msg.ULTRASONIC_GETSAMPLE_TOOLTIP = "Gets the current reading from the ultrasonic sensor in cm. Maximum distance to measure is 255 cm.";  // untranslated
+Blockly.Msg.ULTRASONIC_HCSR04 = "Ultrasonic HC-SR04";  // untranslated
 Blockly.Msg.ULTRASONIC_TOOLTIP = "Represents an ultrasonic sensor.";  // untranslated
 Blockly.Msg.UNDO = "Кире алырға";
 Blockly.Msg.USERGROUP_ADD_MEMBERS = "Add members";  // untranslated
@@ -1835,6 +1837,7 @@ Blockly.Msg.CONTROLS_WHILEUNTIL_INPUT_DO = Blockly.Msg.CONTROLS_REPEAT_INPUT_DO;
 Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP = Blockly.Msg.SOUND_GETSAMPLE_TOOLTIP;
 Blockly.Msg.SENSOR_FLAME_GETSAMPLE_TOOLTIP = Blockly.Msg.FLAME_GETSAMPLE_TOOLTIP;
 Blockly.Msg.ACTION_FOURDIGITDISPLAY = Blockly.Msg.FOURDIGITDISPLAY;
+Blockly.Msg.SENSOR_ULTRASONIC_HCSR04 = Blockly.Msg.ULTRASONIC_HCSR04;
 Blockly.Msg.SENSOR_COLOURTCS3472_COLOUR_GETSAMPLE_TOOLTIP = Blockly.Msg.COLOUR_COLOUR_GETSAMPLE_TOOLTIP;
 Blockly.Msg.SENSOR_HTCOLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP = Blockly.Msg.SENSOR_COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP;
 Blockly.Msg.HTCOLOUR_COLOUR_GETSAMPLE_TOOLTIP = Blockly.Msg.COLOUR_COLOUR_GETSAMPLE_TOOLTIP;

diff --git a/OpenRobertaServer/staticResources/blockly/msg/js/bcc.js b/OpenRobertaServer/staticResources/blockly/msg/js/bcc.js
@@ -279,6 +279,7 @@ Blockly.Msg.EV3BRICK_TOOLTIP = "Represents the EV3 brick with connected actors a
 Blockly.Msg.EXPAND_ALL = "گسترش بلوک‌ها";
 Blockly.Msg.EXPAND_BLOCK = "گسترش بلوک";
 Blockly.Msg.EXTERNAL_INPUTS = "ورودی‌های خارجی";
+Blockly.Msg.FACTOR = "Factor";  // untranslated
 Blockly.Msg.FLAME_GETSAMPLE_TOOLTIP = "Gets the current reading from the flame sensor.";  // untranslated
 Blockly.Msg.FLAME_TOOLTIP = "Represents a flame sensor.";  // untranslated
 Blockly.Msg.FLYOUT_VARIABLE_TEXT = "You need a variable? Please declare it first with a click on the + sign at the »start« block.";  // untranslated
@@ -1691,6 +1692,7 @@ Blockly.Msg.TOUR1_DESCRIPTION13a = "and test your program in the simulation!";
 Blockly.Msg.TOUR1_DESCRIPTION15 = "Perfect,<br>your robot is driving 20 cm forward,<br>this is what you have programmed!";  // untranslated
 Blockly.Msg.TOUR1_DESCRIPTION16 = "Bye and have fun trying out more!";  // untranslated
 Blockly.Msg.ULTRASONIC_GETSAMPLE_TOOLTIP = "Gets the current reading from the ultrasonic sensor in cm. Maximum distance to measure is 255 cm.";  // untranslated
+Blockly.Msg.ULTRASONIC_HCSR04 = "Ultrasonic HC-SR04";  // untranslated
 Blockly.Msg.ULTRASONIC_TOOLTIP = "Represents an ultrasonic sensor.";  // untranslated
 Blockly.Msg.UNDO = "Undo";  // untranslated
 Blockly.Msg.USERGROUP_ADD_MEMBERS = "Add members";  // untranslated
@@ -1835,6 +1837,7 @@ Blockly.Msg.CONTROLS_WHILEUNTIL_INPUT_DO = Blockly.Msg.CONTROLS_REPEAT_INPUT_DO;
 Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP = Blockly.Msg.SOUND_GETSAMPLE_TOOLTIP;
 Blockly.Msg.SENSOR_FLAME_GETSAMPLE_TOOLTIP = Blockly.Msg.FLAME_GETSAMPLE_TOOLTIP;
 Blockly.Msg.ACTION_FOURDIGITDISPLAY = Blockly.Msg.FOURDIGITDISPLAY;
+Blockly.Msg.SENSOR_ULTRASONIC_HCSR04 = Blockly.Msg.ULTRASONIC_HCSR04;
 Blockly.Msg.SENSOR_COLOURTCS3472_COLOUR_GETSAMPLE_TOOLTIP = Blockly.Msg.COLOUR_COLOUR_GETSAMPLE_TOOLTIP;
 Blockly.Msg.SENSOR_HTCOLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP = Blockly.Msg.SENSOR_COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP;
 Blockly.Msg.HTCOLOUR_COLOUR_GETSAMPLE_TOOLTIP = Blockly.Msg.COLOUR_COLOUR_GETSAMPLE_TOOLTIP;

diff --git a/OpenRobertaServer/staticResources/blockly/msg/js/be-tarask.js b/OpenRobertaServer/staticResources/blockly/msg/js/be-tarask.js
@@ -279,6 +279,7 @@ Blockly.Msg.EV3BRICK_TOOLTIP = "Represents the EV3 brick with connected actors a
 Blockly.Msg.EXPAND_ALL = "Разгарнуць блёкі";
 Blockly.Msg.EXPAND_BLOCK = "Разгарнуць блёк";
 Blockly.Msg.EXTERNAL_INPUTS = "Зьнешнія ўваходы";
+Blockly.Msg.FACTOR = "Factor";  // untranslated
 Blockly.Msg.FLAME_GETSAMPLE_TOOLTIP = "Gets the current reading from the flame sensor.";  // untranslated
 Blockly.Msg.FLAME_TOOLTIP = "Represents a flame sensor.";  // untranslated
 Blockly.Msg.FLYOUT_VARIABLE_TEXT = "You need a variable? Please declare it first with a click on the + sign at the »start« block.";  // untranslated
@@ -1691,6 +1692,7 @@ Blockly.Msg.TOUR1_DESCRIPTION13a = "and test your program in the simulation!";
 Blockly.Msg.TOUR1_DESCRIPTION15 = "Perfect,<br>your robot is driving 20 cm forward,<br>this is what you have programmed!";  // untranslated
 Blockly.Msg.TOUR1_DESCRIPTION16 = "Bye and have fun trying out more!";  // untranslated
 Blockly.Msg.ULTRASONIC_GETSAMPLE_TOOLTIP = "Gets the current reading from the ultrasonic sensor in cm. Maximum distance to measure is 255 cm.";  // untranslated
+Blockly.Msg.ULTRASONIC_HCSR04 = "Ultrasonic HC-SR04";  // untranslated
 Blockly.Msg.ULTRASONIC_TOOLTIP = "Represents an ultrasonic sensor.";  // untranslated
 Blockly.Msg.UNDO = "Скасаваць";
 Blockly.Msg.USERGROUP_ADD_MEMBERS = "Add members";  // untranslated
@@ -1835,6 +1837,7 @@ Blockly.Msg.CONTROLS_WHILEUNTIL_INPUT_DO = Blockly.Msg.CONTROLS_REPEAT_INPUT_DO;
 Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP = Blockly.Msg.SOUND_GETSAMPLE_TOOLTIP;
 Blockly.Msg.SENSOR_FLAME_GETSAMPLE_TOOLTIP = Blockly.Msg.FLAME_GETSAMPLE_TOOLTIP;
 Blockly.Msg.ACTION_FOURDIGITDISPLAY = Blockly.Msg.FOURDIGITDISPLAY;
+Blockly.Msg.SENSOR_ULTRASONIC_HCSR04 = Blockly.Msg.ULTRASONIC_HCSR04;
 Blockly.Msg.SENSOR_COLOURTCS3472_COLOUR_GETSAMPLE_TOOLTIP = Blockly.Msg.COLOUR_COLOUR_GETSAMPLE_TOOLTIP;
 Blockly.Msg.SENSOR_HTCOLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP = Blockly.Msg.SENSOR_COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP;
 Blockly.Msg.HTCOLOUR_COLOUR_GETSAMPLE_TOOLTIP = Blockly.Msg.COLOUR_COLOUR_GETSAMPLE_TOOLTIP;

diff --git a/OpenRobertaServer/staticResources/blockly/msg/js/be.js b/OpenRobertaServer/staticResources/blockly/msg/js/be.js
@@ -279,6 +279,7 @@ Blockly.Msg.EV3BRICK_TOOLTIP = "Прадстаўляе праграмны бло
 Blockly.Msg.EXPAND_ALL = "Разгарнуць блокі";
 Blockly.Msg.EXPAND_BLOCK = "Разгарнуць блок";
 Blockly.Msg.EXTERNAL_INPUTS = "Знешнія ўваходы";
+Blockly.Msg.FACTOR = "Factor";  // untranslated
 Blockly.Msg.FLAME_GETSAMPLE_TOOLTIP = "Gets the current reading from the flame sensor.";  // untranslated
 Blockly.Msg.FLAME_TOOLTIP = "Прадстаўляе датчык полымя.";
 Blockly.Msg.FLYOUT_VARIABLE_TEXT = "Вы хочаце стварыць пераменную? Калі ласка, спачатку абнавіце яе, націснуўшы знак \"+\" у меню »start«u00foblock.";
@@ -1691,6 +1692,7 @@ Blockly.Msg.TOUR1_DESCRIPTION13a = "і праверце сваю праграм
 Blockly.Msg.TOUR1_DESCRIPTION15 = "Выдатна,<br> Ваш робат праедзе 20 см наперад,<br> гэта тое, што Вы запраграмавалі!";
 Blockly.Msg.TOUR1_DESCRIPTION16 = "Пакуль і цікавага праграмавання!";
 Blockly.Msg.ULTRASONIC_GETSAMPLE_TOOLTIP = "Gets the current reading from the ultrasonic sensor in cm. Maximum distance to measure is 255 cm.";  // untranslated
+Blockly.Msg.ULTRASONIC_HCSR04 = "Ultrasonic HC-SR04";  // untranslated
 Blockly.Msg.ULTRASONIC_TOOLTIP = "Прадстаўляе ўльтрагукавы датчык.";
 Blockly.Msg.UNDO = "Адкаціць";
 Blockly.Msg.USERGROUP_ADD_MEMBERS = "Add members";  // untranslated
@@ -1835,6 +1837,7 @@ Blockly.Msg.CONTROLS_WHILEUNTIL_INPUT_DO = Blockly.Msg.CONTROLS_REPEAT_INPUT_DO;
 Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP = Blockly.Msg.SOUND_GETSAMPLE_TOOLTIP;
 Blockly.Msg.SENSOR_FLAME_GETSAMPLE_TOOLTIP = Blockly.Msg.FLAME_GETSAMPLE_TOOLTIP;
 Blockly.Msg.ACTION_FOURDIGITDISPLAY = Blockly.Msg.FOURDIGITDISPLAY;
+Blockly.Msg.SENSOR_ULTRASONIC_HCSR04 = Blockly.Msg.ULTRASONIC_HCSR04;
 Blockly.Msg.SENSOR_COLOURTCS3472_COLOUR_GETSAMPLE_TOOLTIP = Blockly.Msg.COLOUR_COLOUR_GETSAMPLE_TOOLTIP;
 Blockly.Msg.SENSOR_HTCOLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP = Blockly.Msg.SENSOR_COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP;
 Blockly.Msg.HTCOLOUR_COLOUR_GETSAMPLE_TOOLTIP = Blockly.Msg.COLOUR_COLOUR_GETSAMPLE_TOOLTIP;

diff --git a/OpenRobertaServer/staticResources/blockly/msg/js/bg.js b/OpenRobertaServer/staticResources/blockly/msg/js/bg.js
@@ -279,6 +279,7 @@ Blockly.Msg.EV3BRICK_TOOLTIP = "Represents the EV3 brick with connected actors a
 Blockly.Msg.EXPAND_ALL = "Покажи блокове";
 Blockly.Msg.EXPAND_BLOCK = "Покажи блок";
 Blockly.Msg.EXTERNAL_INPUTS = "Външни входове";
+Blockly.Msg.FACTOR = "Factor";  // untranslated
 Blockly.Msg.FLAME_GETSAMPLE_TOOLTIP = "Gets the current reading from the flame sensor.";  // untranslated
 Blockly.Msg.FLAME_TOOLTIP = "Represents a flame sensor.";  // untranslated
 Blockly.Msg.FLYOUT_VARIABLE_TEXT = "You need a variable? Please declare it first with a click on the + sign at the »start« block.";  // untranslated
@@ -1691,6 +1692,7 @@ Blockly.Msg.TOUR1_DESCRIPTION13a = "and test your program in the simulation!";
 Blockly.Msg.TOUR1_DESCRIPTION15 = "Perfect,<br>your robot is driving 20 cm forward,<br>this is what you have programmed!";  // untranslated
 Blockly.Msg.TOUR1_DESCRIPTION16 = "Bye and have fun trying out more!";  // untranslated
 Blockly.Msg.ULTRASONIC_GETSAMPLE_TOOLTIP = "Gets the current reading from the ultrasonic sensor in cm. Maximum distance to measure is 255 cm.";  // untranslated
+Blockly.Msg.ULTRASONIC_HCSR04 = "Ultrasonic HC-SR04";  // untranslated
 Blockly.Msg.ULTRASONIC_TOOLTIP = "Represents an ultrasonic sensor.";  // untranslated
 Blockly.Msg.UNDO = "Undo";  // untranslated
 Blockly.Msg.USERGROUP_ADD_MEMBERS = "Add members";  // untranslated
@@ -1835,6 +1837,7 @@ Blockly.Msg.CONTROLS_WHILEUNTIL_INPUT_DO = Blockly.Msg.CONTROLS_REPEAT_INPUT_DO;
 Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP = Blockly.Msg.SOUND_GETSAMPLE_TOOLTIP;
 Blockly.Msg.SENSOR_FLAME_GETSAMPLE_TOOLTIP = Blockly.Msg.FLAME_GETSAMPLE_TOOLTIP;
 Blockly.Msg.ACTION_FOURDIGITDISPLAY = Blockly.Msg.FOURDIGITDISPLAY;
+Blockly.Msg.SENSOR_ULTRASONIC_HCSR04 = Blockly.Msg.ULTRASONIC_HCSR04;
 Blockly.Msg.SENSOR_COLOURTCS3472_COLOUR_GETSAMPLE_TOOLTIP = Blockly.Msg.COLOUR_COLOUR_GETSAMPLE_TOOLTIP;
 Blockly.Msg.SENSOR_HTCOLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP = Blockly.Msg.SENSOR_COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP;
 Blockly.Msg.HTCOLOUR_COLOUR_GETSAMPLE_TOOLTIP = Blockly.Msg.COLOUR_COLOUR_GETSAMPLE_TOOLTIP;

diff --git a/OpenRobertaServer/staticResources/blockly/msg/js/bn.js b/OpenRobertaServer/staticResources/blockly/msg/js/bn.js
@@ -279,6 +279,7 @@ Blockly.Msg.EV3BRICK_TOOLTIP = "Represents the EV3 brick with connected actors a
 Blockly.Msg.EXPAND_ALL = "ব্লকগুলো সম্প্রসারিত কর";
 Blockly.Msg.EXPAND_BLOCK = "ব্লকটি সম্প্রসারিত কর";
 Blockly.Msg.EXTERNAL_INPUTS = "বহি:স্থ ইনপুট";
+Blockly.Msg.FACTOR = "Factor";  // untranslated
 Blockly.Msg.FLAME_GETSAMPLE_TOOLTIP = "Gets the current reading from the flame sensor.";  // untranslated
 Blockly.Msg.FLAME_TOOLTIP = "Represents a flame sensor.";  // untranslated
 Blockly.Msg.FLYOUT_VARIABLE_TEXT = "You need a variable? Please declare it first with a click on the + sign at the »start« block.";  // untranslated
@@ -1691,6 +1692,7 @@ Blockly.Msg.TOUR1_DESCRIPTION13a = "and test your program in the simulation!";
 Blockly.Msg.TOUR1_DESCRIPTION15 = "Perfect,<br>your robot is driving 20 cm forward,<br>this is what you have programmed!";  // untranslated
 Blockly.Msg.TOUR1_DESCRIPTION16 = "Bye and have fun trying out more!";  // untranslated
 Blockly.Msg.ULTRASONIC_GETSAMPLE_TOOLTIP = "Gets the current reading from the ultrasonic sensor in cm. Maximum distance to measure is 255 cm.";  // untranslated
+Blockly.Msg.ULTRASONIC_HCSR04 = "Ultrasonic HC-SR04";  // untranslated
 Blockly.Msg.ULTRASONIC_TOOLTIP = "Represents an ultrasonic sensor.";  // untranslated
 Blockly.Msg.UNDO = "পূর্বাবস্থা";
 Blockly.Msg.USERGROUP_ADD_MEMBERS = "Add members";  // untranslated
@@ -1835,6 +1837,7 @@ Blockly.Msg.CONTROLS_WHILEUNTIL_INPUT_DO = Blockly.Msg.CONTROLS_REPEAT_INPUT_DO;
 Blockly.Msg.SENSOR_SOUND_GETSAMPLE_TOOLTIP = Blockly.Msg.SOUND_GETSAMPLE_TOOLTIP;
 Blockly.Msg.SENSOR_FLAME_GETSAMPLE_TOOLTIP = Blockly.Msg.FLAME_GETSAMPLE_TOOLTIP;
 Blockly.Msg.ACTION_FOURDIGITDISPLAY = Blockly.Msg.FOURDIGITDISPLAY;
+Blockly.Msg.SENSOR_ULTRASONIC_HCSR04 = Blockly.Msg.ULTRASONIC_HCSR04;
 Blockly.Msg.SENSOR_COLOURTCS3472_COLOUR_GETSAMPLE_TOOLTIP = Blockly.Msg.COLOUR_COLOUR_GETSAMPLE_TOOLTIP;
 Blockly.Msg.SENSOR_HTCOLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP = Blockly.Msg.SENSOR_COLOUR_AMBIENTLIGHT_GETSAMPLE_TOOLTIP;
 Blockly.Msg.HTCOLOUR_COLOUR_GETSAMPLE_TOOLTIP = Blockly.Msg.COLOUR_COLOUR_GETSAMPLE_TOOLTIP;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -137,4 +137,6 @@ public interface SC {

		String OLEDSSD1306I2C = "OLEDSSD1306I2C";

		String ULTRASONIC_HCSR04 = "ULTRASONIC_HCSR04";

		}