Skip to content

Commit

Permalink
Merge pull request #170 from MediaTek-Labs/dev
Browse files Browse the repository at this point in the history 
v2.15.0
  • Loading branch information
@x43x61x69
x43x61x69 authored Aug 31, 2017
2 parents 809600f + aae2f87 commit 073a790
Show file tree
Hide file tree
Showing 29 changed files with 2,375 additions and 612 deletions.
Empty file added .manifest.5196.json
View file
Empty file.
Empty file added .manifest.5247.json
View file
Empty file.
148 changes: 148 additions & 0 deletions blockly/apps/blocklyduino/category.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,13 @@
</category>

<category id="category_serial">
<block type="serial_init">
<value name="SPEED">
<block type="math_number">
<field name="NUM">9600</field>
</block>
</value>
</block>
<block type="serial_available"></block>
<block type="serial_print">
<value name="CONTENT">
Expand Down Expand Up @@ -503,6 +510,147 @@
</block>
</category>
</category>
<category id="category_robot">
<category id="category_otto">
<block type="otto_init"></block>
<block type="otto_calibrate">
<value name="YL">
<block type="math_number">
<field name="NUM">0</field>
</block>
</value>
<value name="YR">
<block type="math_number">
<field name="NUM">0</field>
</block>
</value>
<value name="RL">
<block type="math_number">
<field name="NUM">0</field>
</block>
</value>
<value name="RR">
<block type="math_number">
<field name="NUM">0</field>
</block>
</value>
</block>
<block type="otto_home"></block>
<block type="otto_walk">
<value name="DISTANCE">
<block type="math_number">
<field name="NUM">4</field>
</block>
</value>
<value name="DURATION">
<block type="math_number">
<field name="NUM">1000</field>
</block>
</value>
</block>
<block type="otto_turn">
<value name="DISTANCE">
<block type="math_number">
<field name="NUM">4</field>
</block>
</value>
<value name="DURATION">
<block type="math_number">
<field name="NUM">1000</field>
</block>
</value>
</block>
<block type="otto_bend">
<value name="DISTANCE">
<block type="math_number">
<field name="NUM">1</field>
</block>
</value>
<value name="DURATION">
<block type="math_number">
<field name="NUM">1400</field>
</block>
</value>
</block>
<block type="otto_shake_leg">
<value name="DISTANCE">
<block type="math_number">
<field name="NUM">1</field>
</block>
</value>
<value name="DURATION">
<block type="math_number">
<field name="NUM">2000</field>
</block>
</value>
</block>
<block type="otto_freestyle">
<value name="DISTANCE">
<block type="math_number">
<field name="NUM">1</field>
</block>
</value>
<value name="DURATION">
<block type="math_number">
<field name="NUM">1000</field>
</block>
</value>
<value name="HEIGHT">
<block type="otto_height"></block>
</value>
</block>
<block type="otto_moonwalk">
<value name="DISTANCE">
<block type="math_number">
<field name="NUM">4</field>
</block>
</value>
<value name="DURATION">
<block type="math_number">
<field name="NUM">1000</field>
</block>
</value>
<value name="HEIGHT">
<block type="otto_height"></block>
</value>
</block>
<block type="otto_crusaito">
<value name="DISTANCE">
<block type="math_number">
<field name="NUM">4</field>
</block>
</value>
<value name="DURATION">
<block type="math_number">
<field name="NUM">1000</field>
</block>
</value>
<value name="HEIGHT">
<block type="otto_height"></block>
</value>
</block>
<block type="otto_flapping">
<value name="DISTANCE">
<block type="math_number">
<field name="NUM">4</field>
</block>
</value>
<value name="DURATION">
<block type="math_number">
<field name="NUM">1000</field>
</block>
</value>
<value name="HEIGHT">
<block type="otto_height"></block>
</value>
</block>
<block type="otto_height"></block>
<block type="otto_ultrasonic_init"></block>
<block type="otto_ultrasonic_distance"></block>
<block type="otto_buzzer_init"></block>
<block type="otto_buzzer_sing"></block>
</category>
</category>
</category>
<category id="category_beta">
<category id="category_grove">
Expand Down
148 changes: 148 additions & 0 deletions blockly/apps/blocklyduino/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,13 @@
</category>

<category id="category_serial">
<block type="serial_init">
<value name="SPEED">
<block type="math_number">
<field name="NUM">9600</field>
</block>
</value>
</block>
<block type="serial_available"></block>
<block type="serial_print">
<value name="CONTENT">
Expand Down Expand Up @@ -691,6 +698,147 @@
</block>
</category>
</category>
<category id="category_robot">
<category id="category_otto">
<block type="otto_init"></block>
<block type="otto_calibrate">
<value name="YL">
<block type="math_number">
<field name="NUM">0</field>
</block>
</value>
<value name="YR">
<block type="math_number">
<field name="NUM">0</field>
</block>
</value>
<value name="RL">
<block type="math_number">
<field name="NUM">0</field>
</block>
</value>
<value name="RR">
<block type="math_number">
<field name="NUM">0</field>
</block>
</value>
</block>
<block type="otto_home"></block>
<block type="otto_walk">
<value name="DISTANCE">
<block type="math_number">
<field name="NUM">4</field>
</block>
</value>
<value name="DURATION">
<block type="math_number">
<field name="NUM">1000</field>
</block>
</value>
</block>
<block type="otto_turn">
<value name="DISTANCE">
<block type="math_number">
<field name="NUM">4</field>
</block>
</value>
<value name="DURATION">
<block type="math_number">
<field name="NUM">1000</field>
</block>
</value>
</block>
<block type="otto_bend">
<value name="DISTANCE">
<block type="math_number">
<field name="NUM">1</field>
</block>
</value>
<value name="DURATION">
<block type="math_number">
<field name="NUM">1400</field>
</block>
</value>
</block>
<block type="otto_shake_leg">
<value name="DISTANCE">
<block type="math_number">
<field name="NUM">1</field>
</block>
</value>
<value name="DURATION">
<block type="math_number">
<field name="NUM">2000</field>
</block>
</value>
</block>
<block type="otto_freestyle">
<value name="DISTANCE">
<block type="math_number">
<field name="NUM">1</field>
</block>
</value>
<value name="DURATION">
<block type="math_number">
<field name="NUM">1000</field>
</block>
</value>
<value name="HEIGHT">
<block type="otto_height"></block>
</value>
</block>
<block type="otto_moonwalk">
<value name="DISTANCE">
<block type="math_number">
<field name="NUM">4</field>
</block>
</value>
<value name="DURATION">
<block type="math_number">
<field name="NUM">1000</field>
</block>
</value>
<value name="HEIGHT">
<block type="otto_height"></block>
</value>
</block>
<block type="otto_crusaito">
<value name="DISTANCE">
<block type="math_number">
<field name="NUM">4</field>
</block>
</value>
<value name="DURATION">
<block type="math_number">
<field name="NUM">1000</field>
</block>
</value>
<value name="HEIGHT">
<block type="otto_height"></block>
</value>
</block>
<block type="otto_flapping">
<value name="DISTANCE">
<block type="math_number">
<field name="NUM">4</field>
</block>
</value>
<value name="DURATION">
<block type="math_number">
<field name="NUM">1000</field>
</block>
</value>
<value name="HEIGHT">
<block type="otto_height"></block>
</value>
</block>
<block type="otto_height"></block>
<block type="otto_ultrasonic_init"></block>
<block type="otto_ultrasonic_distance"></block>
<block type="otto_buzzer_init"></block>
<block type="otto_buzzer_sing"></block>
</category>
</category>
</category>
<category id="category_beta">
<category id="category_grove">
Expand Down
3 changes: 3 additions & 0 deletions blockly/apps/blocklyduino/js/setCategoryCharacter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ function setCategoryCharacter() {
$('#category_linkit_ble').attr('name',Blockly.Msg.CATEGORY_LINKIT_BLE);
$('#category_linkit_ble_ibeacon').attr('name',Blockly.Msg.CATEGORY_LINKIT_BLE_BEACON);

// Otto
$('#category_otto').attr('name',Blockly.Msg.CATEGORY_OTTO);

// External
$('#category_external').attr('name',Blockly.Msg.CATEGORY_EXTERNAL);
$('#category_beta').attr('name',Blockly.Msg.CATEGORY_BETA);
Expand Down
Loading

0 comments on commit 073a790

Please sign in to comment.