Merge pull request #2832 from entrylabs/develop

4.40.0 master hw
entrylabs · Sep 25, 2024 · 64090a2 · 64090a2
2 parents 8b6c79a + 6750a2d
commit 64090a2
Show file tree

Hide file tree

Showing 15 changed files with 15,464 additions and 2,831 deletions.
diff --git a/extern/lang/ko.js b/extern/lang/ko.js
@@ -5551,6 +5551,8 @@ Lang.Workspace = {
     progress_firmware_hwlite_step2_title: '펌웨어 설치',
     progress_firmware_hwlite_step2_content1: '펌웨어를 설치하고 있습니다.\n잠시만 기다려 주세요.',
     progress_firmware_hwlite_step2_content_complete: '펌웨어 설치가 완료되었습니다.',
+    usbconnect_fail_alert:
+        "기기 연결에 실패했습니다. 연결 상태를 확인하고 '다시 선택'을 눌러 주세요.",
     progress_firmware_hwlite_step2_content_fail: '펌웨어 설치에 실패했습니다.',
     progress_firmware_hwlite_step2_content_select: '설치할 펌웨어 버전을 선택해 주세요',
     select_hwlite_block_duplicated: '1개의 하드웨어만 선택해 주세요.',

diff --git a/images/hw_lite/robotis_robotai_lite.png b/images/hw_lite/robotis_robotai_lite.png
diff --git a/src/class/hardware/webUsbFlasher.ts b/src/class/hardware/webUsbFlasher.ts
@@ -31,7 +31,7 @@ export default class WebUsbFlasher {
 
     // INFO: 연결된 기기에 파라미터로 넘어온 펌웨어를 플래싱
     // TODO: 현재 유일한 지원기종인 microbitble에 맞춰져있음, 추후 지원기기가 늘어나면 로직수정 필요
-    async flashFirmware(firmwareUrl: string, moduleId: string) {
+    async flashFirmware(firmwareUrl: string, percentCallback: Function) {
         try {
             if (!this.device) {
                 throw Error('device undefined');
@@ -57,14 +57,14 @@ export default class WebUsbFlasher {
                 // TODO: 퍼센트 로직도 분리
                 if (sentPages % 128 == 0) {
                     this.flashingPercent = (offset / data.length) * 100;
-                    console.log(this.flashingPercent);
+                    percentCallback && percentCallback(this.flashingPercent);
                 }
                 await this.writeBuffer(cmdData);
                 sentPages++;
                 offset = end;
             }
             this.flashingPercent = (offset / data.length) * 100;
-            console.log(this.flashingPercent);
+            percentCallback && percentCallback(this.flashingPercent);
             this.flashState = 'end';
 
             // INFO: close

diff --git a/src/playground/block_entry.js b/src/playground/block_entry.js
@@ -427,7 +427,7 @@ function getBlocks() {
             },
         },
         hardware_device_name_title: {
-            skeleton: 'basic_text',
+            skeleton: 'basic_text_light',
             color: EntryStatic.colorSet.common.TRANSPARENT,
             template: '%1',
             params: [