Skip to content

Commit 9d16a87

Browse files
cparrapacparrapa
committed
font, hex and examples
1 parent ee86780 commit 9d16a87

33 files changed

Lines changed: 1497 additions & 4559 deletions

File tree

‎resources/app/index.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ window.addEventListener('load', function load(event) {
1414
document.getElementById('versionapp').textContent = " OttoBlockly v" + appVersion
1515
function uploadOK(){
1616
messageDiv.style.color = '#009000'
17-
messageDiv.innerHTML = Blockly.Msg.upload + ': OK' + quitDiv
17+
messageDiv.innerHTML = Blockly.Msg.upload + ': ✅ OK' + quitDiv
1818
}
1919
$('#btn_forum').on('click', function(){
2020
shell.openExternal('http://builders.ottodiy.com/')
@@ -157,7 +157,7 @@ window.addEventListener('load', function load(event) {
157157
return
158158
}
159159
messageDiv.style.color = '#009000'
160-
messageDiv.innerHTML = Blockly.Msg.check + ': OK' + quitDiv
160+
messageDiv.innerHTML = Blockly.Msg.check + ':✅ OK' + quitDiv
161161
})
162162
} else {
163163
//fs.writeFile('./compilation/arduino/ino/sketch.ino', data, function(err){
@@ -197,7 +197,7 @@ window.addEventListener('load', function load(event) {
197197
}
198198

199199
messageDiv.style.color = '#009000'
200-
messageDiv.innerHTML = Blockly.Msg.check + ': OK' + quitDiv
200+
messageDiv.innerHTML = Blockly.Msg.check + ': ✅ OK' + quitDiv
201201
})
202202

203203

@@ -241,7 +241,7 @@ window.addEventListener('load', function load(event) {
241241
}
242242

243243
messageDiv.style.color = '#009000'
244-
messageDiv.innerHTML = Blockly.Msg.check + ': OK' + quitDiv
244+
messageDiv.innerHTML = Blockly.Msg.check + ': ✅ OK' + quitDiv
245245

246246
/*
247247
exec( cmd, {cwd:'./compilation/arduino'}, function(err, stdout, stderr){

‎www/css/blocklino.css‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ html,body {
77
}
88
body {
99
background-color: #2d2d64;
10-
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
10+
font-family: 'Nunito', sans-serif;
1111
margin: 0
12-
1312
}
1413

1514
#div_var {
@@ -63,6 +62,7 @@ body {
6362
}
6463
#title {
6564
position: fixed;
65+
font-weight: bold;
6666
top: 0px;
6767
left: 6px;
6868
color:white
@@ -160,6 +160,8 @@ body {
160160
opacity: 0.9
161161
}
162162
#content_code {
163+
font-family: 'Nunito', sans-serif;
164+
font-weight: bold;
163165
font-size: 16px;
164166
position: absolute;
165167
border: 1px solid #727272;
@@ -194,6 +196,7 @@ body {
194196
}
195197
.blocklyToolboxDiv {
196198
background-color: #f2f2f2 !important;
199+
197200
font-weight: bold;
198201
margin-left: 5px;
199202
width: 210px;

‎www/css/bootstrap.min.3.3.6.css‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎www/examples/avoid/distance.xml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<xml xmlns="http://www.w3.org/1999/xhtml">
2+
<toolbox>toolbox_arduino_all</toolbox>
3+
<block type="base_setup_loop" id="5z;VHZm0^aG5L!uH9jd#" x="-61" y="107">
4+
<statement name="DO">
5+
<block type="otto9_home" id="`ru!;k2?[ACoO^*/]5m`">
6+
<next>
7+
<block type="serial_init" id="=n;5RsGh~kc6O`Sob1a6">
8+
<field name="PINBAUDIOS">9600</field>
9+
</block>
10+
</next>
11+
</block>
12+
</statement>
13+
<statement name="LOOP">
14+
<block type="serial_print" id="*p,J5gA%qN5eNaA|1w$m">
15+
<value name="CONTENT">
16+
<shadow type="text" id="4@S!lvG7`NR1Qc:_r$7q">
17+
<field name="TEXT">Ultrasonic sensor reading:</field>
18+
</shadow>
19+
</value>
20+
<next>
21+
<block type="serial_print" id="#aQK6U,/yu7wboD3ii~%">
22+
<value name="CONTENT">
23+
<shadow type="text" id="8E7%8t(oH=%==yi-Rd6=">
24+
<field name="TEXT">text</field>
25+
</shadow>
26+
<block type="otto9_getdistance" id="I]+/]e*P42[0891wN?%{"></block>
27+
</value>
28+
<next>
29+
<block type="serial_print" id="89Pc{W]aad]!mFZQVuJR">
30+
<value name="CONTENT">
31+
<shadow type="text" id="O[,0*eJ]/eD.]$tsFGLS">
32+
<field name="TEXT">cm</field>
33+
</shadow>
34+
</value>
35+
<next>
36+
<block type="serial_println" id="O#0K6}DSPrMXPd0,5Rm9">
37+
<value name="CONTENT">
38+
<shadow type="text" id=")Wg1OnvKg?S-O~G7w]8C">
39+
<field name="TEXT"></field>
40+
</shadow>
41+
</value>
42+
</block>
43+
</next>
44+
</block>
45+
</next>
46+
</block>
47+
</next>
48+
</block>
49+
</statement>
50+
</block>
51+
</xml>

www/examples/bluetooth/BT_exampleread.bloc renamed to www/examples/bluetooth/bluetooth.xml

File renamed without changes.

‎www/examples/buzzer/Otto_Alarm_V9/Otto_Alarm_V9.ino‎

Lines changed: 0 additions & 95 deletions
This file was deleted.

0 commit comments

Comments
 (0)