Skip to content

Commit ecdce7c

Browse files
oxxostudiooxxostudio
committed
add ultrasonic tutorial 4
1 parent d82d18d commit ecdce7c

3 files changed

Lines changed: 24 additions & 35 deletions

File tree

‎msg/en.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var MSG = {
1919
catBoard: "Board",
2020
catLed: "Led",
2121
catRGBLed: "RGBLed",
22-
carUltraSonic: "Ultra Sonic",
22+
catUltraSonic: "Ultra Sonic",
2323
catCar: "Car",
2424
listVariable: "list",
2525
textVariable: "text",

‎tutorials/ultrasonic/ultrasonic-4.html‎

Lines changed: 22 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,12 @@
66
<meta name="google" value="notranslate">
77
<title></title>
88
<style>
9-
#light{
10-
width:70%;
11-
margin:0 5px;
12-
}
13-
#light img{
14-
width:100%;
15-
display:none;
16-
}
17-
#light.off img:first-child{
18-
display:inline-block;
19-
}
20-
#light.on img:last-child{
21-
display:inline-block;
9+
#show{
10+
width:80%;
11+
height:150px;
12+
border:1px solid #000;
13+
background:#ccc;
14+
margin:15px 5px;
2215
}
2316
</style>
2417
</head>
@@ -27,10 +20,7 @@
2720
<div id="demoArea">
2821
<div id="demoTitle">...</div>
2922
<div id="demoDescription">...</div>
30-
<div id="light" class="off">
31-
<img src='http://i.imgur.com/T5H4MHE.png'>
32-
<img src='http://i.imgur.com/8qFj2Ou.png'>
33-
</div>
23+
<div id="show"></div>
3424
</div>
3525
<table width="60%" height="100%">
3626
<tr>
@@ -81,6 +71,8 @@ <h1>
8171
<sep></sep>
8272
<category id="catLogic">
8373
<block type="controls_if"></block>
74+
<block type="logic_compare"></block>
75+
<block type="logic_operation"></block>
8476
</category>
8577
<category id="catColour">
8678
<block type="colour_picker"></block>
@@ -111,30 +103,27 @@ <h1>
111103
<field name="rgbled_">rgbled</field>
112104
</block>
113105
</category>
114-
<category id="catTutorials">
115-
<block type="light"></block>
116-
<block type="light_click"></block>
117-
<block type="light_check"></block>
118-
<block type="rgb_led_start_dancing">
119-
<value name="timer">
120-
<block type="variables_get">
121-
<field name="VAR" class="timerVar"></field>
106+
<category id="catUltraSonic">
107+
<block type="variables_set">
108+
<field name="VAR">ultrasonic</field>
109+
<value name="VALUE">
110+
<block type="ultrasonic_new">
111+
<field name="trig_">11</field>
112+
<field name="echo_">10</field>
122113
</block>
123114
</value>
115+
</block>
116+
<block type="ultrasonic_get">
124117
<value name="time">
125118
<block type="math_number">
126119
<field name="NUM">500</field>
127120
</block>
128121
</value>
129122
</block>
130-
<block type="stop_clock">
131-
<value name="timer">
132-
<block type="variables_get">
133-
<field name="VAR" class="timerVar"></field>
134-
</block>
135-
</value>
136-
</block>
137-
<block type="rgb_led_dancing_status"></block>
123+
<block type="ultrasonic_distance"></block>
124+
</category>
125+
<category id="catTutorials">
126+
<block type="rgb_led_area_color"></block>
138127
</category>
139128
<sep></sep>
140129
</xml>

‎tutorials/ultrasonic/ultrasonic-code.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ Code.initLanguage = function() {
435435
else if(tutorialsChapter=='ULTRASONIC04'){
436436
document.getElementById('subTitle').textContent = MSG['subTitleULTRASONIC04'];
437437
document.getElementById('demoDescription').textContent = MSG['demoDescriptionULTRASONIC04'];
438-
var categories = ['catLogic','catColour','catMath','catVariables', 'catBoard', 'catRGBLed', 'catTutorials'];
438+
var categories = ['catLogic','catColour','catMath','catVariables', 'catBoard', 'catRGBLed', 'catUltraSonic', 'catTutorials'];
439439
}
440440

441441
for (var i = 0, cat; cat = categories[i]; i++) {

0 commit comments

Comments
 (0)