Skip to content

Commit f5260f8

Browse files
BossBoxingBossBoxing
committed
add logo
1 parent 932216d commit f5260f8

38 files changed

+1052
-258
lines changed

‎ardublockly/ardublockly.css‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ body {
3535
user-select: none;
3636
}
3737

38-
3938
/*********************/
4039
/* Arduino Colours */
4140
/*********************/
@@ -671,6 +670,19 @@ ul.side-nav li.side-menu-end {
671670
overflow-x: hidden;
672671
overflow-y: auto;
673672
}
673+
/* Changes color of the icon to white. */
674+
.customIcon {
675+
color: white;
676+
}
677+
/* Stacks the icon on top of the label. */
678+
.blocklyTreeRowContentContainer {
679+
display: flex;
680+
flex-direction: column;
681+
align-items: center;
682+
}
683+
.blocklyTreeRow {
684+
height: initial;
685+
}
674686
.blocklyTreeRow {
675687
background: none !important;
676688
border: none !important;

‎ardublockly/ardublockly_blockly.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,9 @@ Ardublockly.changeBlocklyArduinoBoard = function(newBoard) {
214214
Ardublockly.updateToolboxLanguage = function() {
215215
var categories = ['catLogic', 'catLoops', 'catMath', 'catText',
216216
'catVariables', 'catFunctions', 'catInputOutput',
217-
'catTime', 'catAudio', 'catMotors', 'catComms'];
217+
'catTime', 'catAudio', 'catMotors', 'catComms',
218+
'catIO','catSensor','catMotorDC','catOLED','catFriendRobot'
219+
];
218220
var categoryNodes = Ardublockly.xmlTree.getElementsByTagName('category');
219221
for (var i = 0, cat; cat = categoryNodes[i]; i++) {
220222
var catId = cat.getAttribute('id');
@@ -323,4 +325,4 @@ Ardublockly.ajaxRequest = function() {
323325
}
324326
}
325327
return request;
326-
};
328+
};

‎ardublockly/ardublockly_lang.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ var Ardublockly = Ardublockly || {};
1111

1212
/** Lookup for names of supported languages. Keys in ISO 639 format. */
1313
Ardublockly.LANGUAGE_NAME = {
14-
'fr': 'Français',
14+
// 'fr': 'Français',
1515
'en': 'English',
16-
'es': 'Español',
17-
'nl': 'Nederlands',
18-
'pt': 'Português',
19-
'it': 'Italiano',
20-
'ru': 'Русский'
16+
'th': 'ภาษาไทย',
17+
// 'es': 'Español',
18+
// 'nl': 'Nederlands',
19+
// 'pt': 'Português',
20+
// 'it': 'Italiano',
21+
// 'ru': 'Русский'
2122
};
2223

2324
/**

‎ardublockly/ardublockly_toolbox.js‎

Lines changed: 140 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ Ardublockly.TOOLBOX_XML =
1818
' <block type="logic_operation"></block>' +
1919
' <block type="logic_negate"></block>' +
2020
' <block type="logic_boolean"></block>' +
21-
' <block type="logic_null"></block>' +
22-
' <block type="logic_ternary"></block>' +
21+
// ' <block type="logic_null"></block>' +
22+
// ' <block type="logic_ternary"></block>' +
2323
' </category>' +
2424
' <sep></sep>' +
2525
' <category id="catLoops" name="Loops">' +
@@ -67,47 +67,47 @@ Ardublockly.TOOLBOX_XML =
6767
' </block>' +
6868
' <block type="math_round"></block>' +
6969
' <block type="math_modulo"></block>' +
70-
' <block type="math_constrain">' +
71-
' <value name="LOW">' +
72-
' <block type="math_number">' +
73-
' <field name="NUM">1</field>' +
74-
' </block>' +
75-
' </value>' +
76-
' <value name="HIGH">' +
77-
' <block type="math_number">' +
78-
' <field name="NUM">100</field>' +
79-
' </block>' +
80-
' </value>' +
81-
' </block>' +
82-
' <block type="math_random_int">' +
83-
' <value name="FROM">' +
84-
' <block type="math_number">' +
85-
' <field name="NUM">1</field>' +
86-
' </block>' +
87-
' </value>' +
88-
' <value name="TO">' +
89-
' <block type="math_number">' +
90-
' <field name="NUM">100</field>' +
91-
' </block>' +
92-
' </value>' +
93-
' </block>' +
94-
' <block type="math_random_float"></block>' +
70+
// ' <block type="math_constrain">' +
71+
// ' <value name="LOW">' +
72+
// ' <block type="math_number">' +
73+
// ' <field name="NUM">1</field>' +
74+
// ' </block>' +
75+
// ' </value>' +
76+
// ' <value name="HIGH">' +
77+
// ' <block type="math_number">' +
78+
// ' <field name="NUM">100</field>' +
79+
// ' </block>' +
80+
// ' </value>' +
81+
// ' </block>' +
82+
// ' <block type="math_random_int">' +
83+
// ' <value name="FROM">' +
84+
// ' <block type="math_number">' +
85+
// ' <field name="NUM">1</field>' +
86+
// ' </block>' +
87+
// ' </value>' +
88+
// ' <value name="TO">' +
89+
// ' <block type="math_number">' +
90+
// ' <field name="NUM">100</field>' +
91+
// ' </block>' +
92+
// ' </value>' +
93+
// ' </block>' +
94+
// ' <block type="math_random_float"></block>' +
9595
' <block type="base_map"></block>' +
9696
' </category>' +
97-
' <sep></sep>' +
98-
' <category id="catText" name="Text">' +
99-
' <block type="text"></block>' +
100-
' <block type="text_join"></block>' +
101-
' <block type="text_append">' +
102-
' <value name="TEXT">' +
103-
' <block type="text"></block>' +
104-
' </value>' +
105-
' </block>' +
106-
' <block type="text_length"></block>' +
107-
' <block type="text_isEmpty"></block>' +
97+
// ' <sep></sep>' +
98+
// ' <category id="catText" name="Text">' +
99+
// ' <block type="text"></block>' +
100+
// ' <block type="text_join"></block>' +
101+
// ' <block type="text_append">' +
102+
// ' <value name="TEXT">' +
103+
// ' <block type="text"></block>' +
104+
// ' </value>' +
105+
// ' </block>' +
106+
// ' <block type="text_length"></block>' +
107+
// ' <block type="text_isEmpty"></block>' +
108108
//' <!--block type="text_trim"></block Need to update block -->' +
109109
//' <!--block type="text_print"></block Part of the serial comms -->' +
110-
' </category>' +
110+
// ' </category>' +
111111
' <sep></sep>' +
112112
' <category id="catVariables" name="Variables">' +
113113
' <block type="variables_get"></block>' +
@@ -122,38 +122,38 @@ Ardublockly.TOOLBOX_XML =
122122
' <sep></sep>' +
123123
' <category id="catFunctions" name="Functions" custom="PROCEDURE">' +
124124
' </category>' +
125-
' <sep></sep>' +
126-
' <category id="catInputOutput" name="Input/Output">' +
127-
' <block type="io_digitalwrite">' +
128-
' <value name="STATE">' +
129-
' <block type="io_highlow"></block>' +
130-
' </value>' +
131-
' </block>' +
132-
' <block type="io_digitalread"></block>' +
133-
' <block type="io_builtin_led">' +
134-
' <value name="STATE">' +
135-
' <block type="io_highlow"></block>' +
136-
' </value>' +
137-
' </block>' +
138-
' <block type="io_analogwrite"></block>' +
139-
' <block type="io_analogread"></block>' +
140-
' <block type="io_highlow"></block>' +
141-
' <block type="io_pulsein">' +
142-
' <value name="PULSETYPE">' +
143-
' <shadow type="io_highlow"></shadow>' +
144-
' </value>' +
145-
' </block>' +
146-
' <block type="io_pulsetimeout">' +
147-
' <value name="PULSETYPE">' +
148-
' <shadow type="io_highlow"></shadow>' +
149-
' </value>' +
150-
' <value name="TIMEOUT">' +
151-
' <shadow type="math_number">' +
152-
' <field name="NUM">100</field>' +
153-
' </shadow>' +
154-
' </value>'+
155-
' </block>' +
156-
' </category>' +
125+
// ' <sep></sep>' +
126+
// ' <category id="catInputOutput" name="Input/Output">' +
127+
// ' <block type="io_digitalwrite">' +
128+
// ' <value name="STATE">' +
129+
// ' <block type="io_highlow"></block>' +
130+
// ' </value>' +
131+
// ' </block>' +
132+
// ' <block type="io_digitalread"></block>' +
133+
// ' <block type="io_builtin_led">' +
134+
// ' <value name="STATE">' +
135+
// ' <block type="io_highlow"></block>' +
136+
// ' </value>' +
137+
// ' </block>' +
138+
// ' <block type="io_analogwrite"></block>' +
139+
// ' <block type="io_analogread"></block>' +
140+
// ' <block type="io_highlow"></block>' +
141+
// ' <block type="io_pulsein">' +
142+
// ' <value name="PULSETYPE">' +
143+
// ' <shadow type="io_highlow"></shadow>' +
144+
// ' </value>' +
145+
// ' </block>' +
146+
// ' <block type="io_pulsetimeout">' +
147+
// ' <value name="PULSETYPE">' +
148+
// ' <shadow type="io_highlow"></shadow>' +
149+
// ' </value>' +
150+
// ' <value name="TIMEOUT">' +
151+
// ' <shadow type="math_number">' +
152+
// ' <field name="NUM">100</field>' +
153+
// ' </shadow>' +
154+
// ' </value>'+
155+
// ' </block>' +
156+
// ' </category>' +
157157
' <sep></sep>' +
158158
' <category id="catTime" name="Time">' +
159159
' <block type="time_delay">' +
@@ -163,82 +163,83 @@ Ardublockly.TOOLBOX_XML =
163163
' </block>' +
164164
' </value>' +
165165
' </block>' +
166-
' <block type="time_delaymicros">' +
167-
' <value name="DELAY_TIME_MICRO">' +
168-
' <block type="math_number">' +
169-
' <field name="NUM">100</field>' +
170-
' </block>' +
171-
' </value>' +
172-
' </block>' +
173-
' <block type="time_millis"></block>' +
174-
' <block type="time_micros"></block>' +
166+
// ' <block type="time_delaymicros">' +
167+
// ' <value name="DELAY_TIME_MICRO">' +
168+
// ' <block type="math_number">' +
169+
// ' <field name="NUM">100</field>' +
170+
// ' </block>' +
171+
// ' </value>' +
172+
// ' </block>' +
173+
// ' <block type="time_millis"></block>' +
174+
// ' <block type="time_micros"></block>' +
175175
' <block type="infinite_loop"></block>' +
176176
' </category>' +
177-
' <sep></sep>' +
178-
' <category id="catAudio" name="Audio">' +
179-
' <block type="io_tone">' +
180-
' <field name="TONEPIN">0</field>' +
181-
' <value name="FREQUENCY">' +
182-
' <shadow type="math_number">' +
183-
' <field name="NUM">220</field>' +
184-
' </shadow>' +
185-
' </value>' +
186-
' </block>' +
187-
' <block type="io_notone"></block>' +
188-
' </category>' +
189-
' <sep></sep>' +
190-
' <category id="catMotors" name="Motors">' +
191-
' <block type="servo_write">' +
192-
' <value name="SERVO_ANGLE">' +
193-
' <block type="math_number">' +
194-
' <field name="NUM">90</field>' +
195-
' </block>' +
196-
' </value>' +
197-
' </block>' +
198-
' <block type="servo_read"></block>' +
199-
' <block type="stepper_config">' +
200-
' <field name="STEPPER_NUMBER_OF_PINS">2</field>' +
201-
' <field name="STEPPER_PIN1">1</field>' +
202-
' <field name="STEPPER_PIN2">2</field>' +
203-
' <value name="STEPPER_STEPS">' +
204-
' <block type="math_number">' +
205-
' <field name="NUM">100</field>' +
206-
' </block>' +
207-
' </value>' +
208-
' <value name="STEPPER_SPEED">' +
209-
' <block type="math_number">' +
210-
' <field name="NUM">10</field>' +
211-
' </block>' +
212-
' </value>' +
213-
' </block>' +
214-
' <block type="stepper_step">' +
215-
' <value name="STEPPER_STEPS">' +
216-
' <block type="math_number">' +
217-
' <field name="NUM">10</field>' +
218-
' </block>' +
219-
' </value>' +
220-
' </block>' +
221-
' </category>' +
222-
' <sep></sep>' +
223-
' <category id="catComms" name="Comms">' +
224-
' <block type="serial_setup"></block>' +
225-
' <block type="serial_print"></block>' +
226-
' <block type="text_prompt_ext">' +
227-
' <value name="TEXT">' +
228-
' <block type="text"></block>' +
229-
' </value>' +
230-
' </block>' +
231-
' <block type="spi_setup"></block>' +
232-
' <block type="spi_transfer"></block>' +
233-
' <block type="spi_transfer_return"></block>' +
234-
' </category>' +
177+
// ' <sep></sep>' +
178+
// ' <category id="catAudio" name="Audio">' +
179+
// ' <block type="io_tone">' +
180+
// ' <field name="TONEPIN">0</field>' +
181+
// ' <value name="FREQUENCY">' +
182+
// ' <shadow type="math_number">' +
183+
// ' <field name="NUM">220</field>' +
184+
// ' </shadow>' +
185+
// ' </value>' +
186+
// ' </block>' +
187+
// ' <block type="io_notone"></block>' +
188+
// ' </category>' +
189+
// ' <sep></sep>' +
190+
// ' <category id="catMotors" name="Motors">' +
191+
// ' <block type="servo_write">' +
192+
// ' <value name="SERVO_ANGLE">' +
193+
// ' <block type="math_number">' +
194+
// ' <field name="NUM">90</field>' +
195+
// ' </block>' +
196+
// ' </value>' +
197+
// ' </block>' +
198+
// ' <block type="servo_read"></block>' +
199+
// ' <block type="stepper_config">' +
200+
// ' <field name="STEPPER_NUMBER_OF_PINS">2</field>' +
201+
// ' <field name="STEPPER_PIN1">1</field>' +
202+
// ' <field name="STEPPER_PIN2">2</field>' +
203+
// ' <value name="STEPPER_STEPS">' +
204+
// ' <block type="math_number">' +
205+
// ' <field name="NUM">100</field>' +
206+
// ' </block>' +
207+
// ' </value>' +
208+
// ' <value name="STEPPER_SPEED">' +
209+
// ' <block type="math_number">' +
210+
// ' <field name="NUM">10</field>' +
211+
// ' </block>' +
212+
// ' </value>' +
213+
// ' </block>' +
214+
// ' <block type="stepper_step">' +
215+
// ' <value name="STEPPER_STEPS">' +
216+
// ' <block type="math_number">' +
217+
// ' <field name="NUM">10</field>' +
218+
// ' </block>' +
219+
// ' </value>' +
220+
// ' </block>' +
221+
// ' </category>' +
222+
// ' <sep></sep>' +
223+
// ' <category id="catComms" name="Comms">' +
224+
// ' <block type="serial_setup"></block>' +
225+
// ' <block type="serial_print"></block>' +
226+
// ' <block type="text_prompt_ext">' +
227+
// ' <value name="TEXT">' +
228+
// ' <block type="text"></block>' +
229+
// ' </value>' +
230+
// ' </block>' +
231+
// ' <block type="spi_setup"></block>' +
232+
// ' <block type="spi_transfer"></block>' +
233+
// ' <block type="spi_transfer_return"></block>' +
234+
// ' </category>' +
235235
' <sep></sep>' +
236236
' <category id="catIO" name="IO (Friend Robot)">' +
237237
' <block type="io_out">' +
238238
' <value name="STATE">' +
239239
' <block type="io_highlow"></block>' +
240240
' </value>' +
241241
' </block>' +
242+
' <block type="io_highlow"></block>' +
242243
' <block type="io_in"></block>' +
243244
' <block type="io_analog"></block>' +
244245
' <block type="read_sw_ok"></block>' +
@@ -259,6 +260,7 @@ Ardublockly.TOOLBOX_XML =
259260
' <category id="catSensor" name="Sensor (Friend Robot)">' +
260261
' <block type="encoder_read"></block>' +
261262
' <block type="getdist"></block>' +
263+
' <block type="ultrasonic"></block>' +
262264
' </category>' +
263265
' <sep></sep>' +
264266
' <category id="catMotorDC" name="Output (Friend Robot)">' +

0 commit comments

Comments
 (0)