Merge remote-tracking branch 'entrylabs/develop-hw' into develop-hw

entrylabs · Oct 22, 2024 · eae4129 · eae4129
2 parents deee0d0 + cdb83f0
commit eae4129
Show file tree

Hide file tree

Showing 24 changed files with 20,693 additions and 2,955 deletions.
diff --git a/extern/lang/en.js b/extern/lang/en.js
@@ -1124,8 +1124,8 @@ Lang.Blocks = {
     EXPANSION_WEATHER_finedust: 'concentration of fine dust(㎍)',
     ardublock_motor_forward: 'Forward',
     ardublock_motor_backward: 'Backward',
-    ARDUINO_on: 'On',
-    ARDUINO_off: 'Off',
+    ARDUINO_on: 'Turn on',
+    ARDUINO_off: 'Turn off',
     EXPANSION_FESTIVAL_title: 'Title',
     EXPANSION_FESTIVAL_area: 'area',
     EXPANSION_FESTIVAL_start_date: 'start date',

diff --git a/images/hw_lite/arduinolite.png b/images/hw_lite/arduinolite.png
diff --git a/images/hw_lite/robotis_robotai_lite.png b/images/hw_lite/robotis_robotai_lite.png
diff --git a/images/hw_lite/whalesbotlite.png b/images/hw_lite/whalesbotlite.png
diff --git a/src/playground/blocks/hardware/block_altino_lite.js b/src/playground/blocks/hardware/block_altino_lite.js
@@ -16,6 +16,7 @@ Entry.AltinoLite = {
         dot6: 0,
         dot7: 0,
         dot8: 0,
+        ir: 0
     },
     setZero: function() {
         var portMap = Entry.AltinoLite.PORT_MAP;
@@ -68,6 +69,7 @@ Entry.AltinoLite.blockMenuBlocks = [
     'altino_lite_dot_display_hex',
     'altino_lite_dot_display_matrix_on',
     'altino_lite_dot_display_matrix_off',
+    'altino_lite_ir_reset',
 ];
 
 Entry.AltinoLite.setLanguage = function() {
@@ -150,6 +152,7 @@ Entry.AltinoLite.setLanguage = function() {
                 altino_lite_sound: '소리 %1 %2 %3',
                 altino_lite_steering_hex: '조향 %1%2',
                 altino_lite_steering: '조향 %1°%2',
+                altino_lite_ir_reset: '알티노 라이트 IR 센서 초기화',
             },
         },
         en: {
@@ -230,6 +233,7 @@ Entry.AltinoLite.setLanguage = function() {
                 altino_lite_sound: 'Sound %1 %2 %3',
                 altino_lite_steering_hex: 'Steering %1%2',
                 altino_lite_steering: 'Steering %1°%2',
+                altino_lite_ir_reset: 'Reset Altino lite IR Sensor',
             },
         },
     };
@@ -562,7 +566,7 @@ Entry.AltinoLite.getBlocks = function() {
             skeleton: 'basic',
             statements: [],
             params: [
-                {
+                {                    
                     type: 'Dropdown',
                     options: [
                         ['1-' + Lang.Blocks.altino_lite_sound_oct, '1'],
@@ -1385,6 +1389,40 @@ Entry.AltinoLite.getBlocks = function() {
             },
             syntax: { js: [], py: ['AltinoLite.dot_display_hex(%1, %2, %3, %4, %5, %6, %7, %8)'] },
         },
+        altino_lite_ir_reset: {
+            color: EntryStatic.colorSet.block.default.HARDWARE,
+            outerLine: EntryStatic.colorSet.block.darken.HARDWARE,
+            skeleton: 'basic',
+            statements: [],
+            params: [
+                {
+                    type: 'Indicator',
+                    img: 'block_icon/hardware_icon.svg',
+                    size: 12,
+                },
+            ],
+            events: {},
+            def: {
+                params: [
+                    null,
+                ],
+                type: 'altino_lite_ir_reset',
+            },
+            paramsKeyMap: {
+                DEVICE : 0,
+            },
+            class: 'altino_lite_output',
+            isNotFor: ['altino_lite'],
+            func: function(sprite, script) {
+                var sq = Entry.hw.sendQueue;
+
+                // sq.rightWheel = 300;//script.getNumberValue('rightWheel');
+                // sq.leftWheel = 300;//script.getNumberValue('leftWheel');
+                sq.ir = 6;
+                return script.callReturn();
+            },
+            syntax: { js: [], py: ['AltinoLite.ir_reset'] },
+        },
         //endregion Altino 알티노
     };
 };