Skip to content

Commit

Permalink
Merge pull request #2810 from entrylabs/develop
Browse files Browse the repository at this point in the history 
[4.39.0] master <= develop
  • Loading branch information
@Tnks2U
Tnks2U authored Aug 27, 2024
2 parents 19ee2da + 4bdf3c4 commit 3a27491
Show file tree
Hide file tree
Showing 26 changed files with 4,693 additions and 347 deletions.
29 changes: 25 additions & 4 deletions extern/lang/ko.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,15 @@ Lang.Blocks = {
ARDUINO_open_connector: '연결 프로그램 열기',
ARDUINO_download_source: '• 엔트리 아두이노 소스',
ARDUINO_reconnect: '하드웨어 연결하기',
hardware_connect_helper: '하드웨어 연결 도움말',
hardware_noti_installed: '프로그램을 설치해 연결할 때',
hardware_noti_not_installed: '프로그램 설치 없이 연결할 때',
hardware_program_download: '연결 프로그램 다운로드',
hardware_device_name_title: '연결한 하드웨어:',
hardware_device_name_content: '없음',
hardware_connected_noti: '하드웨어 연결 프로그램을\n확인해 주세요.',
arduino_noti_text:
'하드웨어 연결은 PC에서만 지원됩니다.\n브라우저로 연결할 때는\n연결 프로그램이 필요하지 않습니다.',
'하드웨어 연결은\n데스크톱 PC에서만 지원됩니다.\n \n태블릿 PC 연결 지원에 대해서는 \n하드웨어 제조사에 문의해 주세요.',
arduino_lite_alert:
'하드웨어를 찾을 수 없습니다.\n하드웨어에 펌웨어가 설치되었는지,\nPC와 하드웨어가 연결되어 있는지 \n다시 확인해 주세요.',
arduino_lite_reconnect: '하드웨어 다시 연결',
Expand All @@ -325,6 +332,7 @@ Lang.Blocks = {
arduino_lite_guide: '• 아두이노 연결 가이드',
arduino_lite_connected_noti: '하드웨어를 선택한 상태에서\n작품을 저장해 주세요.',
ARDUINO_LITE: '하드웨어 라이트',
ROBOT_connect_helper: '로봇 연결 도움말',
ROBOT_reconnect: '로봇 연결하기',
ARDUINO_program: '프로그램 실행하기',
ARDUINO_cloud_pc_connector: '클라우드 PC 연결하기',
Expand Down Expand Up @@ -5524,9 +5532,22 @@ Lang.Workspace = {
'인공지능 블록이 작품에 조립되어 있어 불러오기를 해제할 수 없습니다.',
confirm_firmware_hwlite_block_msg:
'%1 을(를)\n 엔트리에서 사용하려면\n 먼저 펌웨어를 설치해야 합니다.',
confirm_firmware_hwlite_block_title: '펌웨어 설치 확인',
confirm_firmware_hwlite_block_download: '펌웨어 설치',
confirm_firmware_hwlite_block_title: '펌웨어 설치 필요',
confirm_firmware_hwlite_block_download: '펌웨어 다운로드',
confirm_firmware_hwlite_block_usb_connect: 'USB 연결',
confirm_firmware_hwlite_block_pass: '이미 설치함',
confirm_firmware_hwlite_block_usb_connect: 'USB 연결',
progress_firmware_hwlite_title: '펌웨어 설치',
progress_firmware_hwlite_step1_title: 'USB 연결 확인',
progress_firmware_hwlite_step1_content1: 'USB로 기기와 PC를 연결하고 아래 버튼을 눌러 주세요.',
progress_firmware_hwlite_step1_content2:
'브라우저에서 연결할 기기를 선택해 주세요.\nUSB 통신을 기다리고 있어요.',
progress_firmware_hwlite_step1_content3: 'USB와 통신을 확인했습니다.',
progress_firmware_hwlite_step2_title: '펌웨어 설치',
progress_firmware_hwlite_step2_content1: '펌웨어를 설치하고 있습니다.\n잠시만 기다려 주세요.',
progress_firmware_hwlite_step2_content_complete: '펌웨어 설치가 완료되었습니다.',
progress_firmware_hwlite_step2_content_fail: '펌웨어 설치에 실패했습니다.',
progress_firmware_hwlite_step2_content_select: '설치할 펌웨어 버전을 선택해 주세요',
select_hwlite_block_duplicated: '1개의 하드웨어만 선택해 주세요.',
select_hwlite_block_none: '연결할 하드웨어를 선택해 주세요.',
select_firmware_hwlite_title: '펌웨어 다운로드',
Expand Down Expand Up @@ -7336,7 +7357,7 @@ Lang.template = {
expansion_block_descriptions: '확장 블록은 인터넷이 연결되어 있어야 정상적으로 동작합니다.',
aiUtilize_block_descriptions: '불러올 인공지능 블록을 선택해 주세요.',
hardware_lite_descriptions:
'하드웨어 연결/작동 시 예기치 못한 문제가 발생할 수 있습니다.\r\n 하드웨어 웹 연결 중 문제 발생 시 엔트리 고객센터 또는 해당 하드웨어 업체의 고객센터에 연락해 주세요.',
'하드웨어 연결/작동 시 예기치 못한 문제가 발생할 수 있습니다.\n 하드웨어 웹 연결 중 문제 발생 시 엔트리 고객센터 또는 해당 하드웨어 업체의 고객센터에 연락해 주세요.',
weather_title_text: '날씨',
translate_title_text: '번역',
festival_title_text: '행사',
Expand Down
15 changes: 11 additions & 4 deletions extern/util/static.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,18 +486,24 @@ EntryStatic.getAllBlocks = function () {
{
category: 'arduino',
blocks: [
'hardware_connect_helper',
'hardware_noti_installed',
'arduino_reconnect',
'arduino_open',
'hardware_program_download',
'arduino_cloud_pc_open',
'arduino_connect',
// 'arduino_connect',
'arduino_lite_disconnect',
'arduino_lite_device_name',
'hardware_device_name_title',
'hardware_device_name_content',
'hardware_connected_noti',
'arduino_lite_connected_noti',
'arduino_lite_reconnect',
'hardware_noti_not_installed',
'arduino_lite_download_firmware',
'arduino_download_connector',
// 'arduino_download_connector',
// 'download_guide',
'arduino_download_source',
// 'arduino_download_source',
'arduino_lite_connect',
'arduino_lite_guide',
'arduino_noti',
Expand Down Expand Up @@ -779,6 +785,7 @@ EntryStatic.colorSet = {
common: {
WHITE: '#FFFFFF',
DARK: '#000000',
GRAY: '#6c8696',
TRANSPARENT: 'transparent',
BUTTON: '#4f80ff',
BUTTON_BACKGROUND: '#eee',
Expand Down
143 changes: 28 additions & 115 deletions extern/util/static_mini.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ EntryStatic.searchProjectOption = [
},
];

EntryStatic.getAllBlocks = function() {
EntryStatic.getAllBlocks = function () {
return [
{
category: 'start',
Expand Down Expand Up @@ -432,136 +432,48 @@ EntryStatic.getAllBlocks = function() {
],
},
{
category: 'hw_motor',
category: 'hw_sensor',
visible: false,
blocks: [
'practical_course_dummy',
// 'practical_course_move_for_secs',
// 'practical_course_move_for_secs2',
// 'practical_course_move_for',
// 'practical_course_move_for2',
// 'practical_course_stop_for',
// 'practical_course_set_servo2',
//roborobo
// 'roborobo_move_for_secs',
// 'roborobo_move_for',
// 'roborobo_turn_for',
// 'roborobo_stop_for',
//robotis
// 'robotis_aux_move_for',
// 'robotis_aux_stop_for',
// 'robotis_set_servo_joint',
// 'robotis_set_servo_wheel',
// 'robotis_move_for_secs',
// 'robotis_move_for_secs_dream',
// 'robotis_aux_move_for_dream',
// 'robotis_aux_stop_for_dream',
// //'robotis_set_servo_wheel_dream',
// //'robotis_set_servo_joint_dream',
// 'robotis_set_servo_mode_dream',
// 'robotis_set_servo_speed_dream',
// 'robotis_set_servo_position_dream',
// 'robotis_servo_stop_for_dream',
].concat(EntryStatic.DynamicPracticalHardwareBlocks['hw_motor']),
blocks: ['practical_course_dummy'].concat(
EntryStatic.DynamicPracticalHardwareBlocks['hw_sensor']
),
},
{
category: 'hw_melody',
category: 'hw_motor',
visible: false,
blocks: [
'practical_course_dummy',
// 'practical_course_melody_note_for',
//robotis
// 'robotis_melody_note_for',
].concat(EntryStatic.DynamicPracticalHardwareBlocks['hw_melody']),
blocks: ['practical_course_dummy'].concat(
EntryStatic.DynamicPracticalHardwareBlocks['hw_motor']
),
},
{
category: 'hw_sensor',
category: 'hw_led',
visible: false,
blocks: [
'practical_course_dummy',
// 'practical_course_touch_value',
// 'practical_course_touch_value_boolean',
// 'practical_course_light_value',
// 'practical_course_light_value_boolean',
// 'practical_course_sound_value',
// 'practical_course_sound_value_boolean',
// 'practical_course_irs_value',
// 'practical_course_irs_value_boolean',
//roborobo
// 'roborobo_touch_value',
// 'roborobo_touch_value_boolean',
// 'roborobo_light_value',
// 'roborobo_light_value_boolean',
// 'roborobo_sound_value',
// 'roborobo_sound_value_boolean',
// 'roborobo_irs_value',
// 'roborobo_irs_value_boolean',
//robotis
// 'robotis_touch_value',
// 'robotis_touch_value_boolean',
// 'robotis_irs_value',
// 'robotis_irs_value_boolean',
// 'robotis_light_value',
// 'robotis_light_value_boolean',
// 'robotis_detectedsound_value',
// 'robotis_detectingsound_value',
// 'robotis_detectedsound_value_boolean',
// 'robotis_detectingsound_value_boolean',
// 'robotis_detectedsound_value_init',
// 'robotis_color_value',
// 'robotis_color_value_boolean',
// 'robotis_humidity_value',
// 'robotis_humidity_value_boolean',
// 'robotis_temperature_value',
// 'robotis_temperature_value_boolean',
// 'robotis_userbutton_value',
// 'robotis_userbutton_value_boolean',
// 'robotis_touch_value_dream',
// 'robotis_touch_value_boolean_dream',
// 'robotis_irs_value_dream',
// 'robotis_irs_value_boolean_dream',
// 'robotis_irsInner_value_dream',
// 'robotis_light_value_dream',
// 'robotis_light_value_boolean_dream',
// 'robotis_color_value_dream',
// 'robotis_color_value_boolean_dream',
// 'robotis_humidity_value_dream',
// 'robotis_humidity_value_boolean_dream',
// 'robotis_temperature_value_dream',
// 'robotis_temperature_value_boolean_dream',
].concat(EntryStatic.DynamicPracticalHardwareBlocks['hw_sensor']),
blocks: ['practical_course_dummy'].concat(
EntryStatic.DynamicPracticalHardwareBlocks['hw_led']
),
},
{
category: 'hw_led',
category: 'hw_melody',
visible: false,
blocks: [
'practical_course_dummy',
// 'practical_course_diode_secs_toggle',
// 'practical_course_diode_toggle',
// 'practical_course_diode_inout_toggle',
// 'practical_course_diode_set_output',
// 'practical_course_diode_input_value',
//roborobo
// 'roborobo_diode_secs_toggle',
// 'roborobo_diode_toggle',
// 'roborobo_diode_inout_toggle',
// 'roborobo_diode_set_output',
// 'roborobo_diode_input_value',
//robotis
// 'robotis_set_led',
// 'robotis_set_led_dream',
].concat(EntryStatic.DynamicPracticalHardwareBlocks['hw_led']),
blocks: ['practical_course_dummy'].concat(
EntryStatic.DynamicPracticalHardwareBlocks['hw_melody']
),
},
{
category: 'hw_robot',
blocks: [
'robot_connect_helper',
'robot_reconnect',
'arduino_open',
'arduino_cloud_pc_open',
'arduino_connect',
'arduino_download_connector',
'hardware_program_download',
// 'arduino_download_connector',
// 'download_guide',
'arduino_connected',
'hardware_device_name_title',
'hardware_device_name_content',
'hardware_connected_noti',
'robot_noti',
],
},
{
Expand Down Expand Up @@ -711,7 +623,7 @@ EntryStatic.artPeriodOptions = [
},
];

EntryStatic.getCategoryByBlock = function(blockName) {
EntryStatic.getCategoryByBlock = function (blockName) {
if (!blockName) {
return false;
}
Expand Down Expand Up @@ -1026,6 +938,7 @@ EntryStatic.colorSet = {
common: {
WHITE: '#FFFFFF',
DARK: '#000000',
GRAY: '#6c8696',
TRANSPARENT: 'transparent',
BUTTON: '#4f80ff',
BUTTON_BACKGROUND: '#eee',
Expand All @@ -1040,7 +953,7 @@ EntryStatic.initOptions = {
sceneEditable: false,
};

EntryStatic.hwCategoryList = ['hw_motor', 'hw_melody', 'hw_sensor', 'hw_led'];
EntryStatic.hwCategoryList = ['hw_sensor', 'hw_motor', 'hw_led', 'hw_melody'];

EntryStatic.DynamicPracticalHardwareBlocks = {};

Expand Down Expand Up @@ -1076,7 +989,7 @@ EntryStatic.COMMAND_TYPES = {
redo: 303,
};

EntryStatic.getDefaultFontFamily = function() {
EntryStatic.getDefaultFontFamily = function () {
const localLang = Lang || {};
const type = localLang.type;
const fallbackType = localLang.fallbackType;
Expand Down
11 changes: 10 additions & 1 deletion images/dcmotor.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 10 additions & 1 deletion images/dcmotor_on.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 7 additions & 1 deletion images/diode.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 7 additions & 1 deletion images/diode_on.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/hw_lite/arduinolite.png
100755 → 100644
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/hw_lite/whalesbotlite.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 7 additions & 1 deletion images/melody.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 7 additions & 1 deletion images/melody_on.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 3a27491

Please sign in to comment.