Skip to content

[4.50.0] 하드웨어 1.9.69 PR #2991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jul 25, 2025
Merged

[4.50.0] 하드웨어 1.9.69 PR #2991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
db97272
기타 수정 및 일본어 반영
wing1008 Jul 7, 2025
cbe066e
오타 수정
wing1008 Jul 7, 2025
7ed581e
저학년을 위한 쉬운 블록 생성
mkidkm Jul 8, 2025
2cf4fd5
Change Timbo_Queen_Stop and Timbo_Motion_Stop set_value
poqopo Jul 11, 2025
f480109
Base COnfig 변경
poqopo Jul 11, 2025
75432cf
Update block_cocodron_controller_Lite.js
wing1008 Jul 11, 2025
309d249
Merge pull request #2988 from poqopo/develop-hw
Tnks2U Jul 22, 2025
8530b3e
Merge pull request #2987 from mkidkm/develop-hw
Tnks2U Jul 22, 2025
f369e93
Merge pull request #2986 from wing1008/develop-hw
Tnks2U Jul 22, 2025
8921684
feat: Add Lline hardware blocks and image
ppp109403 Jul 23, 2025
23730f3
fix: remove yarn.lock from commit
ppp109403 Jul 23, 2025
15bcd1b
Merge pull request #2990 from pjh109403/final
Tnks2U Jul 23, 2025
f5aebfe
lint : 잇플보드 lint 적용
Tnks2U Jul 24, 2025
81f62b7
feat: 잇플보드 신규 블럭에 isNotFor 추가
Tnks2U Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added images/hardware/Lline.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
288 changes: 284 additions & 4 deletions src/playground/blocks/hardware/block_ITPLE_board.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,15 @@ Entry.ITPLE.setLanguage = function () {
template: {
ITPLE_get_analog_value: '아날로그 %1 번 값',
ITPLE_get_digital_value: '디지털 %1 번 값',
ITPLE_is_key_pressed: '%1 키가 눌러져 있는가?',
ITPLE_value_lighting: '조도 센서 값이 %1 보다 큰가?',
ITPLE_value_sound: '소리 센서 값이 %1 보다 큰가?',
ITPLE_value_mapping: '%1 의 범위를 %2 ~ %3 에서 %4 ~ %5 로 바꾼 값',
ITPLE_get_ultrasonic_value: '초음파센서 Trig %1 Echo %2 값',
ITPLE_toggle_led: '디지털 %1 번 핀 %2 %3',
ITPLE_turn_led: '%1 LED %2 %3',
ITPLE_digital_pwm: '디지털 %1 번 핀을 %2 (으)로 정하기 %3',
ITPLE_set_tone: '디지털 %1 번 핀의 버저를 %2 %3 음으로 %4 초 연주하기 %5',
ITPLE_set_tone: '버저를 %2 %3 음으로 %4 초 연주하기 %5',
ITPLE_get_digital: '디지털 %1 번 센서값',
ITPLE_set_motor_direction: '%1 모터 %2 방향으로 정하기 %3',
ITPLE_set_motor_speed_old: '(V1)%1 모터 %2 속도로 정하기 %3',
Expand All @@ -107,11 +111,15 @@ Entry.ITPLE.setLanguage = function () {
template: {
ITPLE_get_analog_value: 'Analog %1 value',
ITPLE_get_digital_value: 'Digital %1 value',
ITPLE_is_key_pressed: '%1 key pressed',
ITPLE_value_lighting: 'Is light sensor value greater than %1',
ITPLE_value_sound: 'Is sound sensor value greater than %1',
ITPLE_value_mapping: 'Map Value %1 %2 ~ %3 to %4 ~ %5',
ITPLE_get_ultrasonic_value: 'Read ultrasonic sensor trig pin %1 echo pin %2',
ITPLE_toggle_led: 'Digital %1 Pin %2 %3',
ITPLE_turn_led: '%1 LED %2 %3',
ITPLE_digital_pwm: 'Digital %1 Pin %2 %3',
ITPLE_set_tone: 'Play tone pin %1 on note %2 octave %3 beat %4 %5',
ITPLE_set_tone: 'Play tone on note %2 octave %3 beat %4 %5',
ITPLE_get_digital: 'Digital %1 Sensor value',
ITPLE_set_motor_direction: '%1 motor %2 direction %3',
ITPLE_set_motor_speed_old: '(old) %1 motor %2 speed %3',
Expand All @@ -128,10 +136,14 @@ Entry.ITPLE.setLanguage = function () {
Entry.ITPLE.blockMenuBlocks = [
'ITPLE_get_analog_value',
'ITPLE_get_digital_value',
'ITPLE_is_key_pressed',
'ITPLE_value_lighting',
'ITPLE_value_sound',
'ITPLE_value_mapping',
'ITPLE_get_ultrasonic_value',
'ITPLE_get_digital',
'ITPLE_toggle_led',
'ITPLE_turn_led',
'ITPLE_digital_pwm',
'ITPLE_set_tone',
'ITPLE_set_motor_direction',
Expand Down Expand Up @@ -324,6 +336,179 @@ Entry.ITPLE.getBlocks = function () {
],
},
},
ITPLE_is_key_pressed: {
color: EntryStatic.colorSet.block.default.HARDWARE,
outerLine: EntryStatic.colorSet.block.darken.HARDWARE,
fontColor: '#fff',

skeleton: 'basic_boolean_field',

params: [
{
type: 'Dropdown',
options: [
['위', 'UP'],
['아래', 'DOWN'],
['오른쪽', 'RIGHT'],
['왼쪽', 'LEFT'],
],
value: 'UP',
fontSize: 11,
bgColor: EntryStatic.colorSet.block.darken.HARDWARE,
arrowColor: EntryStatic.colorSet.arrow.default.HARDWARE,
},
],

events: {},

def: {
params: [null],
type: 'ITPLE_is_key_pressed',
},

paramsKeyMap: {
KEY: 0,
},
isNotFor: ['ITPLE'],
func(sprite, script) {
const seletedKey = script.getField('KEY');

const analogPortData = Entry.hw.portData.ANALOG;
const digitalPortData = Entry.hw.portData.DIGITAL;

switch (seletedKey) {
case 'UP': {
const value = analogPortData ? analogPortData[0] : 0;
return value === 0;
}
case 'DOWN': {
const value = analogPortData ? analogPortData[1] : 0;
return value === 0;
}
case 'RIGHT': {
const value = digitalPortData ? digitalPortData[8] : 1;
return value === 0;
}
case 'LEFT': {
const value = digitalPortData ? digitalPortData[7] : 1;
return value === 0;
}
default:
return false;
}
},

syntax: {
js: [],
py: [
{
syntax: '위:Arduino.analogRead(0)==0, 아래:Arduino.analogRead(1)==0, 오른쪽:Arduino.digitalRead(8)==0, 왼쪽:Arduino.digitalRead(7)==0',
},
],
},
},
ITPLE_value_lighting: {
// 저학년을 위한 조도센서 블록 생성
color: EntryStatic.colorSet.block.default.HARDWARE,
outerLine: EntryStatic.colorSet.block.darken.HARDWARE,
fontColor: '#fff',

skeleton: 'basic_boolean_field',

params: [
{
type: 'Block',
accept: 'number',
},
],

events: {},

def: {
params: [null],
type: 'ITPLE_value_lighting',
},

paramsKeyMap: {
VALUE: 0,
},
isNotFor: ['ITPLE'],
func(sprite, script) {
const value = script.getValue('VALUE');

const analogPortData = Entry.hw.portData.ANALOG;

if (analogPortData) {
return analogPortData[2] > value;
}
return false;
},

syntax: {
js: [],
py: [
{
syntax: 'Arduino.analogRead(2) > %1',
blockType: 'param',
textParams: [
{
type: 'Block',
accept: 'string',
},
],
},
],
},
},
ITPLE_value_sound: {
// 저학년을 위한 사운드센서 블록 생성
color: EntryStatic.colorSet.block.default.HARDWARE,
outerLine: EntryStatic.colorSet.block.darken.HARDWARE,
fontColor: '#fff',

skeleton: 'basic_boolean_field',

params: [
{
type: 'Block',
accept: 'number',
},
],
events: {},
def: {
params: [null],
type: 'ITPLE_value_sound',
},
paramsKeyMap: {
VALUE: 0,
},
isNotFor: ['ITPLE'],
func(sprite, script) {
const value = script.getValue('VALUE');

const analogPortData = Entry.hw.portData.ANALOG;

if (analogPortData) {
return analogPortData[3] > value;
}
return false;
},
syntax: {
js: [],
py: [
{
syntax: 'Arduino.analogRead(3) > %1',
blockType: 'param',
textParams: [
{
type: 'Block',
accept: 'string',
},
],
},
],
},
},
ITPLE_value_mapping: {
color: EntryStatic.colorSet.block.default.HARDWARE,
outerLine: EntryStatic.colorSet.block.darken.HARDWARE,
Expand Down Expand Up @@ -742,6 +927,100 @@ Entry.ITPLE.getBlocks = function () {
],
},
},
ITPLE_turn_led: {
// 저학년 학생을 위한, 핀 번호 없는 LED 켜기 블록
color: EntryStatic.colorSet.block.default.HARDWARE,
outerLine: EntryStatic.colorSet.block.darken.HARDWARE,
fontColor: '#fff',

skeleton: 'basic',

params: [
{
type: 'Dropdown',
options: [
['빨강', 10],
['파랑', 11],
],
value: 10,
fontSize: 11,
bgColor: EntryStatic.colorSet.block.darken.HARDWARE,
arrowColor: EntryStatic.colorSet.arrow.default.HARDWARE,
},
{
type: 'Dropdown',
options: [
['켜기', 'on'],
['끄기', 'off'],
],
value: 'on',
fontSize: 11,
bgColor: EntryStatic.colorSet.block.darken.HARDWARE,
arrowColor: EntryStatic.colorSet.arrow.default.HARDWARE,
},
{
type: 'Indicator',
img: 'block_icon/hardware_icon.svg',
size: 12,
},
],

events: {},

def: {
params: [null],
type: 'ITPLE_turn_led',
},

paramsKeyMap: {
PORT: 0,
VALUE: 1,
},
class: 'ITPLE',
isNotFor: ['ITPLE'],
func(sprite, script) {
const port = script.getNumberValue('PORT');
let value = script.getValue('VALUE');

if (typeof value === 'string') {
value = value.toLowerCase();
}
if (Entry.ITPLE.highList.indexOf(value) > -1) {
value = 255;
} else if (Entry.ITPLE.lowList.indexOf(value) > -1) {
value = 0;
} else {
throw new Error();
}
if (!Entry.hw.sendQueue.SET) {
Entry.hw.sendQueue.SET = {};
}
Entry.hw.sendQueue.SET[port] = {
type: Entry.ITPLE.sensorTypes.DIGITAL,
data: value,
time: new Date().getTime(),
};
return script.callReturn();
},
syntax: {
js: [],
py: [
{
syntax: 'Arduino.digitalWrite(%1, %2)',
textParams: [
{
type: 'Block',
accept: 'string',
},
{
type: 'Block',
accept: 'string',
},
],
},
],
},
},
ITPLE_digital_pwm: {
color: EntryStatic.colorSet.block.default.HARDWARE,
outerLine: EntryStatic.colorSet.block.darken.HARDWARE,
Expand Down Expand Up @@ -975,6 +1254,7 @@ Entry.ITPLE.getBlocks = function () {
},
},
ITPLE_set_tone: {
// 버저 핀번호 가림 업데이트
color: EntryStatic.colorSet.block.default.HARDWARE,
outerLine: EntryStatic.colorSet.block.darken.HARDWARE,
skeleton: 'basic',
Expand Down Expand Up @@ -1036,7 +1316,7 @@ Entry.ITPLE.getBlocks = function () {
isNotFor: ['ITPLE'],
func(sprite, script) {
const sq = Entry.hw.sendQueue;
const port = script.getNumberValue('PORT', script);
const port = 3;

if (!script.isStart) {
let note = script.getValue('NOTE', script);
Expand Down Expand Up @@ -1117,7 +1397,7 @@ Entry.ITPLE.getBlocks = function () {
js: [],
py: [
{
syntax: 'Arduino.tone(%1, %2, %3, %4)',
syntax: 'Arduino.tone(3, %2, %3, %4)',
textParams: [
{
type: 'Block',
Expand Down
Loading
Loading