Skip to content

Commit 9a1add6

Browse files
BossBoxingBossBoxing
committed
FriendBlockly first commit
1 parent 04fa482 commit 9a1add6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+13845
-963
lines changed

‎ardublockly/ardublockly_toolbox.js‎

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ Ardublockly.TOOLBOX_XML =
120120
' <block type="variables_set_type"></block>' +
121121
' </category>' +
122122
' <sep></sep>' +
123-
' <category id="catFunctions" name="Functions" custom="PROCEDURE"></category>' +
123+
' <category id="catFunctions" name="Functions" custom="PROCEDURE">' +
124+
' </category>' +
124125
' <sep></sep>' +
125126
' <category id="catInputOutput" name="Input/Output">' +
126127
' <block type="io_digitalwrite">' +
@@ -231,4 +232,62 @@ Ardublockly.TOOLBOX_XML =
231232
' <block type="spi_transfer"></block>' +
232233
' <block type="spi_transfer_return"></block>' +
233234
' </category>' +
235+
' <sep></sep>' +
236+
' <category id="catIO" name="IO (Friend Robot)">' +
237+
' <block type="io_out">' +
238+
' <value name="STATE">' +
239+
' <block type="io_highlow"></block>' +
240+
' </value>' +
241+
' </block>' +
242+
' <block type="io_in"></block>' +
243+
' <block type="io_analog"></block>' +
244+
' <block type="read_sw_ok"></block>' +
245+
' <block type="read_knob">' +
246+
' <value name="min">' +
247+
' <block type="math_number">' +
248+
' <field name="NUM">0</field>' +
249+
' </block>' +
250+
' </value>' +
251+
' <value name="max">' +
252+
' <block type="math_number">' +
253+
' <field name="NUM">1</field>' +
254+
' </block>' +
255+
' </value>' +
256+
' </block>' +
257+
' </category>' +
258+
' <sep></sep>' +
259+
' <category id="catSensor" name="Sensor (Friend Robot)">' +
260+
' <block type="encoder_read"></block>' +
261+
' <block type="getdist"></block>' +
262+
' </category>' +
263+
' <sep></sep>' +
264+
' <category id="catMotorDC" name="Output (Friend Robot)">' +
265+
' <block type="motor_dc">' +
266+
' <field name="PORT_MOTORDC">1</field>' +
267+
' <value name="POWER_MOTORDC">' +
268+
' <block type="math_number">' +
269+
' <field name="NUM">0</field>' +
270+
' </block>' +
271+
' </value>' +
272+
' </block>' +
273+
' <block type="servo_set">' +
274+
' <value name="SERVO_ANGLE">' +
275+
' <block type="math_number">' +
276+
' <field name="NUM">90</field>' +
277+
' </block>' +
278+
' </value>' +
279+
' </block>' +
280+
' </category>' +
281+
' <sep></sep>' +
282+
' <category id="catOLED" name="OLED (Friend Robot)">' +
283+
' <block type="oledmode"></block>' +
284+
' <block type="oled_set_text_size"></block>' +
285+
' <block type="oled_text"></block>' +
286+
' <block type="oled_variable_text"></block>' +
287+
' <block type="oled_clear"></block>' +
288+
' </category>' +
289+
' <sep></sep>' +
290+
' <category id="catFriendRobot" name="Friend Robot Setup">' +
291+
' <block type="setup_modelnano"></block>' +
292+
' </category>' +
234293
'</xml>';

‎ardublockly/index.html‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1">
66
<meta name="theme-color" content="#00878F">
77
<link rel="icon" href="img/favicon.ico">
8-
<title class="translatable_title">Ardublockly</title>
8+
<title class="translatable_title">Ardublockly (Friend Robot)</title>
99

1010
<!-- Materialize, Prettify, and Ardublockly CSS -->
1111
<link rel="stylesheet" href="materialize/materialize.css" media="screen,projection">
1212
<link rel="stylesheet" href="prettify/arduino.css">
1313
<link rel="stylesheet" href="ardublockly.css" media="screen,projection">
1414

1515
<!-- Ardublockly - These three files contain the compress version -->
16-
<script src="../blockly/blockly_compressed.js"></script>
16+
<!-- <script src="../blockly/blockly_compressed.js"></script>
1717
<script src="../blockly/blocks_compressed.js"></script>
18-
<script src="../blockly/arduino_compressed.js"></script>
18+
<script src="../blockly/arduino_compressed.js"></script> -->
1919
<!-- To use the uncompressed version comment out the above and comment in the ones below -->
20-
<!--script src="../blockly/blockly_uncompressed.js"></script>
20+
<script src="../blockly/blockly_uncompressed.js"></script>
2121
<script src="../blockly/blocks/logic.js"></script>
2222
<script src="../blockly/blocks/loops.js"></script>
2323
<script src="../blockly/blocks/math.js"></script>
@@ -28,6 +28,11 @@
2828
<script src="../blockly/blocks/procedures.js"></script>
2929
<script src="../blockly/blocks/arduino/io.js"></script>
3030
<script src="../blockly/blocks/arduino/map.js"></script>
31+
<script src="../blockly/blocks/arduino/motordc.js"></script>
32+
<script src="../blockly/blocks/arduino/friendrobotsetup.js"></script>
33+
<script src="../blockly/blocks/arduino/oled.js"></script>
34+
<script src="../blockly/blocks/arduino/io_friend_robot.js"></script>
35+
<script src="../blockly/blocks/arduino/sensor.js"></script>
3136
<script src="../blockly/blocks/arduino/procedures.js"></script>
3237
<script src="../blockly/blocks/arduino/serial.js"></script>
3338
<script src="../blockly/blocks/arduino/servo.js"></script>
@@ -44,6 +49,11 @@
4449
<script src="../blockly/generators/arduino/loops.js"></script>
4550
<script src="../blockly/generators/arduino/map.js"></script>
4651
<script src="../blockly/generators/arduino/math.js"></script>
52+
<script src="../blockly/generators/arduino/motordc.js"></script>
53+
<script src="../blockly/generators/arduino/friendrobotsetup.js"></script>
54+
<script src="../blockly/generators/arduino/oled.js"></script>
55+
<script src="../blockly/generators/arduino/io_friend_robot.js"></script>
56+
<script src="../blockly/generators/arduino/sensor.js"></script>
4757
<script src="../blockly/generators/arduino/procedures.js"></script>
4858
<script src="../blockly/generators/arduino/serial.js"></script>
4959
<script src="../blockly/generators/arduino/servo.js"></script>
@@ -52,7 +62,7 @@
5262
<script src="../blockly/generators/arduino/text.js"></script>
5363
<script src="../blockly/generators/arduino/time.js"></script>
5464
<script src="../blockly/generators/arduino/tone.js"></script>
55-
<script src="../blockly/generators/arduino/variables.js"></script-->
65+
<script src="../blockly/generators/arduino/variables.js"></script>
5666

5767
<!-- Default language js files, user selection appended to head on load -->
5868
<script src="../blockly/msg/js/en.js"></script>
@@ -65,7 +75,7 @@
6575
<div class="nav-wrapper container">
6676
<a class="show-on-large button-collapse" href="#" data-activates="slide-out" id="button-collapse"><i class="mdi-navigation-menu"></i></a>
6777
<a id="logo-container" class="brand-logo">
68-
<span class="app_title translatable_title">Ardublockly:</span>
78+
<span class="app_title translatable_title">Ardublockly (Friend Robot):</span>
6979
<!-- Sketch name editable text field -->
7080
<span class="sketch_name_wrapper">
7181
<i class="mdi-image-edit sketch_name_icon"></i>
@@ -91,7 +101,7 @@
91101
<li id="menu_delete"><a href="#"><span class="translatable_deleteAll">Delete All</span><i class="mdi-action-delete left"></i></a></li>
92102
<li id="menu_settings"><a href="#"><span class="translatable_settings">Settings</span><i class="mdi-action-settings left"></i></a></li>
93103
<li id="menu_bug"><a href="https://github.com/carlosperate/ardublockly/wiki" target="_blank"><span class="translatable_documentation">Documentation</span><i class="mdi-action-help left"></i></a></li>
94-
<li id="menu_bug"><a href="http://github.com/carlosperate/ardublockly/issues" target="_blank"><span class="translatable_reportBug">Report Bug</span><i class="mdi-action-bug-report left"></i></a></li>
104+
<li id="menu_bug"><a href="https://forms.gle/VVbgM9ojWMG1aEQU7" target="_blank"><span class="translatable_reportBug">Report Bug</span><i class="mdi-action-bug-report left"></i></a></li>
95105
</ul>
96106
<li class="no-padding">
97107
<ul class="collapsible collapsible-accordion">

‎ardublocklyserver/compilersettings.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ class ServerCompilerSettings(object):
6464
'Atmel atmega328pb Xplained mini':
6565
'atmel:avr:atmega328pb_xplained_mini',
6666
'ESP8266 Huzzah': 'esp8266:esp8266:generic',
67-
'ESP8266 WeMos D1': 'esp8266:esp8266:generic'}
67+
'ESP8266 WeMos D1': 'esp8266:esp8266:generic',
68+
'Model Nano': 'arduino:avr:modelnano'}
6869

6970
# Class dictionary to contain the computer COM ports, dynamic content
7071
__serial_ports = {'port0': 'COM1'}

0 commit comments

Comments
 (0)