Skip to content

Commit f369e93

Browse files
Tnks2UTnks2U
authored
Merge pull request #2986 from wing1008/develop-hw
기타 수정 및 일본어 반영
2 parents 8530b3e + 75432cf commit f369e93

File tree

2 files changed

+74
-39
lines changed

2 files changed

+74
-39
lines changed

‎src/playground/blocks/hardwareLite/block_cocodron_controller_Lite.js‎

Lines changed: 73 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ import _range from 'lodash/range';
1111
this.url = 'http://www.cocodrone.co.kr/kr/';
1212
this.imageName = 'cocodroncontrollerLite.png';
1313
this.title = {
14-
ko: '코코드론조종기기',
14+
ko: '코코드론조종기',
1515
en: 'cocodron controller',
16+
ja: 'ココドローン 操縦機'
1617
};
1718
this.duration = 32;
1819
this.blockMenuBlocks = [
@@ -168,7 +169,7 @@ import _range from 'lodash/range';
168169
// Cocodron_Dron_Controller_move_drone_back:'뒤쪽 ',
169170
Cocodron_Dron_Controller_flip_f: '앞으로 ',
170171
Cocodron_Dron_Controller_flip_b: '뒤로 ',
171-
Cocodron_Dron_Controller_flip_l: '왼쪽으로로 ',
172+
Cocodron_Dron_Controller_flip_l: '왼쪽으로 ',
172173
Cocodron_Dron_Controller_flip_r: '오른쪽으로 ',
173174
Cocodron_Dron_Controller_simultaneousOperations_up: '상승 ',
174175
Cocodron_Dron_Controller_simultaneousOperations_down: '하강 ',
@@ -207,10 +208,10 @@ import _range from 'lodash/range';
207208
'%1 방향으로 %2 %3 만큼 %4 방향으로 %5 %6 이동 ',
208209
},
209210
Device: {
210-
cocodron_dron_controller: '코코드론드론조종기',
211+
cocodron_dron_controller: '코코드론조종기',
211212
},
212213
Menus: {
213-
cocodron_dron_controller: '코코드론드론조종기',
214+
cocodron_dron_controller: '코코드론조종기',
214215
},
215216
Helper: {
216217
Cocodron_Dron_Controller_connect: '바인딩 ',
@@ -248,36 +249,70 @@ import _range from 'lodash/range';
248249
},
249250
en: {
250251
template: {
251-
Cocodron_Dron_Controller_connect: 'Binding',
252-
Cocodron_Dron_Controller_hovering: 'Hovering for %1 seconds',
253-
Cocodron_Dron_Controller_mode: '%1 Mode',
254-
Cocodron_Dron_Controller_opt: 'Optical Sensor',
255-
Cocodron_Dron_Controller_gyroreset: 'Gyro Reset',
256-
Cocodron_Dron_Controller_takeoff: 'Take Off',
257-
Cocodron_Dron_Controller_takeoffV2: 'Take Off %1 %2',
258-
Cocodron_Dron_Controller_land: 'Landing',
259-
Cocodron_Dron_Controller_emergency: 'Emergency Stop',
260-
Cocodron_Dron_Controller_headless: 'Headless Mode',
252+
Cocodron_Dron_Controller_connect: 'Binding ',
253+
Cocodron_Dron_Controller_hovering: 'Hovering for %1 seconds ',
254+
Cocodron_Dron_Controller_mode: '%1 Mode ',
255+
Cocodron_Dron_Controller_opt: 'Optical Sensor ',
256+
Cocodron_Dron_Controller_gyroreset: 'Gyro Reset ',
257+
Cocodron_Dron_Controller_takeoff: 'Take Off ',
258+
Cocodron_Dron_Controller_takeoffV2: 'Take Off %1 %2 ',
259+
Cocodron_Dron_Controller_land: 'Landing ',
260+
Cocodron_Dron_Controller_emergency: 'Emergency Stop ',
261+
Cocodron_Dron_Controller_headless: 'Headless Mode ',
261262
//Cocodron_Dron_Controller_move_drone: 'Move joystick %1 in %2 direction by %3 for %4 ms',
262-
Cocodron_Dron_Controller_up: 'Ascend by %1 for %2 ms',
263-
Cocodron_Dron_Controller_down: 'Descend by %1 for %2 ms',
264-
Cocodron_Dron_Controller_cw: 'Rotate Clockwise by %1 for %2 ms',
265-
Cocodron_Dron_Controller_ccw: 'Rotate Counterclockwise by %1 for %2 ms',
266-
Cocodron_Dron_Controller_move_drone_forward: 'Move Forward by %1 for %2 ms',
267-
Cocodron_Dron_Controller_move_drone_back: 'Move Backward by %1 for %2 ms',
268-
Cocodron_Dron_Controller_move_drone_left: 'Move Left by %1 for %2 ms',
269-
Cocodron_Dron_Controller_move_drone_right: 'Move Right by %1 for %2 ms',
270-
Cocodron_Dron_Controller_funled: 'Change 4-Color LED',
271-
Cocodron_Dron_Controller_flip: '%1 Flip',
272-
Cocodron_Dron_Controller_speed: 'Adjust Speed %1',
263+
Cocodron_Dron_Controller_up: 'Ascend by %1 for %2 ms ',
264+
Cocodron_Dron_Controller_down: 'Descend by %1 for %2 ms ',
265+
Cocodron_Dron_Controller_cw: 'Rotate Clockwise by %1 for %2 ms ',
266+
Cocodron_Dron_Controller_ccw: 'Rotate Counterclockwise by %1 for %2 ms ',
267+
Cocodron_Dron_Controller_move_drone_forward: 'Move Forward by %1 for %2 ms ',
268+
Cocodron_Dron_Controller_move_drone_back: 'Move Backward by %1 for %2 ms ',
269+
Cocodron_Dron_Controller_move_drone_left: 'Move Left by %1 for %2 ms ',
270+
Cocodron_Dron_Controller_move_drone_right: 'Move Right by %1 for %2 ms ',
271+
Cocodron_Dron_Controller_funled: 'Change 4-Color LED ',
272+
Cocodron_Dron_Controller_flip: '%1 Flip ',
273+
Cocodron_Dron_Controller_speed: 'Adjust Speed %1 ',
273274
Cocodron_Dron_Controller_simultaneousOperations:
274-
'Move %1 in %2 %3 while moving %4 in %5 %6',
275+
'Move %1 in %2 %3 while moving %4 in %5 %6 ',
275276
},
276277
Device: {
277-
cocodron_dron_controller: 'cocodrondroncontroller',
278+
cocodron_dron_controller: 'cocodroncontroller',
278279
},
279280
Menus: {
280-
cocodron_dron_controller: 'CocodronDronController',
281+
cocodron_dron_controller: 'CocodronController',
282+
},
283+
},
284+
ja: {
285+
template: {
286+
Cocodron_Dron_Controller_connect: 'バインディング ',
287+
Cocodron_Dron_Controller_hovering: 'ホバーリング %1 秒 ',
288+
Cocodron_Dron_Controller_mode: '%1 モード ',
289+
Cocodron_Dron_Controller_opt: '光学センサー ',
290+
Cocodron_Dron_Controller_gyroreset: 'ジャイロ初期化 ',
291+
Cocodron_Dron_Controller_takeoff: '離陸',
292+
Cocodron_Dron_Controller_takeoffV2: '離陸 %1 %2',
293+
Cocodron_Dron_Controller_land: '着陸 ',
294+
Cocodron_Dron_Controller_emergency: '緊急停止 ',
295+
Cocodron_Dron_Controller_headless: 'ヘッドレスモード ',
296+
//Cocodron_Dron_Controller_move_drone: '%1 조이스틱을 %2 방향으로 %3 만큼 %4 ms 유지 ',
297+
Cocodron_Dron_Controller_up: '%1 上昇 %2 ms キープ ',
298+
Cocodron_Dron_Controller_down: '%1 上昇 %2 ms キープ ',
299+
Cocodron_Dron_Controller_cw: '%1 右回転 %2 ms キープ ',
300+
Cocodron_Dron_Controller_ccw: '%1 左回転 %2 ms キープ ',
301+
Cocodron_Dron_Controller_move_drone_forward: '%1 前方移動 %2 ms キープ ',
302+
Cocodron_Dron_Controller_move_drone_back: '%1 前方移動 %2 ms キープ ',
303+
Cocodron_Dron_Controller_move_drone_left: '%1 左移動 %2 ms キープ ',
304+
Cocodron_Dron_Controller_move_drone_right: '%1 右移動 %2 ms キープ ',
305+
Cocodron_Dron_Controller_funled: '4色LED カラー変更 ',
306+
Cocodron_Dron_Controller_flip: '%1 フリップ ',
307+
Cocodron_Dron_Controller_speed: '速度調整 %1 ',
308+
Cocodron_Dron_Controller_simultaneousOperations:
309+
'%1 方向へ %2 %3 %4 方向へ %5 %6 移動 ',
310+
},
311+
Device: {
312+
cocodron_dron_controller: 'ココドローン 操縦機',
313+
},
314+
Menus: {
315+
cocodron_dron_controller: 'ココドローン 操縦機',
281316
},
282317
},
283318
};
@@ -349,7 +384,7 @@ import _range from 'lodash/range';
349384
class: 'cocodron',
350385
isNotFor: ['cocodroncontrollerLite'],
351386
func(sprite, script) {
352-
const time = script.getField('TIME') * 1000;
387+
const time = script.getField('TIME');
353388

354389
return new Promise((resolve) => {
355390
setTimeout(() => {
@@ -483,7 +518,7 @@ import _range from 'lodash/range';
483518
return new Promise((resolve) => {
484519
setTimeout(() => {
485520
resolve(script.callReturn());
486-
}, 4000);
521+
}, 4500);
487522
});
488523
} else {
489524
console.log('Serial writer not found.');
@@ -658,7 +693,7 @@ import _range from 'lodash/range';
658693
class: 'cocodron',
659694
isNotFor: ['cocodroncontrollerLite'],
660695
func(sprite, script) {
661-
let stick = script.getNumberValue('STICK', script) * 10;
696+
let stick = script.getNumberValue('STICK', script);
662697
let time = script.getNumberValue('TIME', script);
663698

664699
if (stick > 500) {
@@ -708,7 +743,7 @@ import _range from 'lodash/range';
708743
class: 'cocodron',
709744
isNotFor: ['cocodroncontrollerLite'],
710745
func(sprite, script) {
711-
let stick = script.getNumberValue('STICK', script) * 10;
746+
let stick = script.getNumberValue('STICK', script);
712747
let time = script.getNumberValue('TIME', script);
713748

714749
if (stick > 500) {
@@ -759,7 +794,7 @@ import _range from 'lodash/range';
759794
class: 'cocodron',
760795
isNotFor: ['cocodroncontrollerLite'],
761796
func(sprite, script) {
762-
let stick = script.getNumberValue('STICK', script) * 10;
797+
let stick = script.getNumberValue('STICK', script);
763798
let time = script.getNumberValue('TIME', script);
764799

765800
if (stick > 500) {
@@ -807,7 +842,7 @@ import _range from 'lodash/range';
807842
class: 'cocodron',
808843
isNotFor: ['cocodroncontrollerLite'],
809844
func(sprite, script) {
810-
let stick = script.getNumberValue('STICK', script) * 10;
845+
let stick = script.getNumberValue('STICK', script);
811846
let time = script.getNumberValue('TIME', script);
812847

813848
if (stick > 500) {
@@ -855,7 +890,7 @@ import _range from 'lodash/range';
855890
class: 'cocodron',
856891
isNotFor: ['cocodroncontrollerLite'],
857892
func(sprite, script) {
858-
let stick = script.getNumberValue('STICK', script) * 10;
893+
let stick = script.getNumberValue('STICK', script);
859894
let time = script.getNumberValue('TIME', script);
860895

861896
if (stick > 500) {
@@ -904,7 +939,7 @@ import _range from 'lodash/range';
904939
class: 'cocodron',
905940
isNotFor: ['cocodroncontrollerLite'],
906941
func(sprite, script) {
907-
let stick = script.getNumberValue('STICK', script) * 10;
942+
let stick = script.getNumberValue('STICK', script);
908943
let time = script.getNumberValue('TIME', script);
909944

910945
if (stick > 500) {
@@ -953,7 +988,7 @@ import _range from 'lodash/range';
953988
class: 'cocodron',
954989
isNotFor: ['cocodroncontrollerLite'],
955990
func(sprite, script) {
956-
let stick = script.getNumberValue('STICK', script) * 10;
991+
let stick = script.getNumberValue('STICK', script);
957992
let time = script.getNumberValue('TIME', script);
958993

959994
if (stick > 500) {
@@ -1002,7 +1037,7 @@ import _range from 'lodash/range';
10021037
class: 'cocodron',
10031038
isNotFor: ['cocodroncontrollerLite'],
10041039
func(sprite, script) {
1005-
let stick = script.getNumberValue('STICK', script) * 10;
1040+
let stick = script.getNumberValue('STICK', script);
10061041
let time = script.getNumberValue('TIME', script);
10071042

10081043
if (stick > 500) {

‎src/playground/blocks/hardwareLite/metadata_cocodron_controller_Lite.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "cocodroncontrollerLite",
33
"version": "1.0.0",
44
"type": "hardware",
5-
"title": "코코드론조종기기",
5+
"title": "코코드론조종기",
66
"description": "cocodron",
77
"imageName": "cocodroncontrollerLite",
88
"moduleId": "680101"

0 commit comments

Comments
 (0)