Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Landing page #220

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
1e24d58
ardublockly and toolbox styling
mpfeil Apr 24, 2018
a1776a9
add clipboard stuff
mpfeil Apr 24, 2018
e060255
add german translation file for GUI
mpfeil Apr 25, 2018
0215049
moved sensebox stuff to own js file
mpfeil Apr 25, 2018
ce69f01
fix old links closes #6
mpfeil Apr 25, 2018
563bb9b
add translations for own ide buttons
mpfeil Apr 25, 2018
db6545b
add new senseBox MCU #25
mpfeil Apr 25, 2018
0a0af7d
Added german UI translation #5
bgunt May 2, 2018
30d79e8
Merge branch 'master' of https://github.com/sensebox/ardublockly-1
bgunt May 2, 2018
c5d4c15
Update in senseBox MCU profile
janwirwahn May 2, 2018
b1bf3ab
Updated pin config for senseBox MCU
janwirwahn May 3, 2018
fd61750
Compiler settings for senseBox MCU added
janwirwahn May 3, 2018
719187c
add first senseBox blocks and update library
mariopesch May 3, 2018
9bdaa3e
add dummy blocks
mariopesch May 8, 2018
3c890bd
update Blockly
mariopesch May 16, 2018
a791cc5
build new SD Blocks
mariopesch May 17, 2018
72b36ec
clean translations and update blocks
mariopesch May 28, 2018
7135af4
correct uv/light and sd blocks
mariopesch May 29, 2018
a030b37
add blocks for the display (experimental)
mariopesch May 29, 2018
9809502
update german translations, add senseBox logo, clean up blocks
mariopesch May 31, 2018
0ea38b3
fix display blocks :wrench:
mariopesch May 31, 2018
33420aa
correct translation mistakes :de:
mariopesch May 31, 2018
927cc8c
correct spellings :globe_with_meridians:
mariopesch Jun 1, 2018
907fe81
small spelling errors :dash:
mariopesch Jun 1, 2018
0025472
blockly versions
jasperbuss Jun 6, 2018
a2697a1
opacity
jasperbuss Jun 6, 2018
9962e82
fixed issues
jasperbuss Jun 12, 2018
e0efd54
modal
jasperbuss Jun 13, 2018
57bc4ee
modal content
jasperbuss Jun 13, 2018
2d1d9ba
alignments
jasperbuss Jun 13, 2018
e2254d6
descriptions
jasperbuss Jun 13, 2018
047c39a
font style
jasperbuss Jun 13, 2018
22b28e8
responsiveness
jasperbuss Jun 13, 2018
81ed422
bug fix
jasperbuss Jun 13, 2018
14418ad
fonts
jasperbuss Jun 13, 2018
c28f114
bug fixes
jasperbuss Jun 19, 2018
f218572
modal
jasperbuss Sep 4, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions ardublockly/ardublockly.css
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ body {
background-color: #8C7965;
}

.sensebox_green {
background-color: #4EAF47;
}

/********************/
/* Navigation bar */
Expand Down Expand Up @@ -222,7 +225,7 @@ ul.side-nav li.side-menu-end {
border-right: 0;
}
.ide_output_header_normal {
background-color: #006468;
background-color: #4EAF47;
color: #ffffff;
-moz-transition: background-color 0.6s ease-in;;
-o-transition: background-color 0.6s ease-in;
Expand Down Expand Up @@ -315,6 +318,28 @@ ul.side-nav li.side-menu-end {
width: 160px;
z-index: 12;
}
#button_compile_sketch {
position: absolute;
right: 0px;
top: 0px;
width: 55px;
height: 55px;
}
#button_compile_sketch i {
font-size: 2.4rem !important;
line-height: 55px;
}
#button_copy_clipboard {
position: absolute;
right: 72px;
top: 10px;
visibility: visible;
opacity: 1;
-moz-transition: visibility 0.3s linear, opacity 0.3s linear;
-webkit-transition: visibility 0.3s linear, opacity 0.3s linear;
-o-transition: visibility 0.3s linear, opacity 0.3s linear;
transition: visibility 0.3s linear, opacity 0.3s linear;
}
#button_ide_large {
position: absolute;
right: 0px;
Expand Down Expand Up @@ -673,7 +698,7 @@ ul.side-nav li.side-menu-end {
}
.blocklyTreeRow {
background: none !important;
border: none !important;
/* border: none !important; */
margin: 0px 0px !important;
padding: 7px 16px 7px 0px !important;
box-sizing: content-box !important;
Expand Down
1 change: 1 addition & 0 deletions ardublockly/ardublockly_lang.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ var Ardublockly = Ardublockly || {};

/** Lookup for names of supported languages. Keys in ISO 639 format. */
Ardublockly.LANGUAGE_NAME = {
'de': 'Deutsch',
'fr': 'Français',
'en': 'English',
'es': 'Español',
Expand Down
104 changes: 85 additions & 19 deletions ardublockly/ardublockly_toolbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,89 @@ var Ardublockly = Ardublockly || {};
Ardublockly.TOOLBOX_XML =
'<xml>' +
' <sep></sep>' +
' <category id="catLogic" name="Logic">' +
' <category id="catSenseBox_Sensor" name="senseBox Sensors" colour="120">' +
' <block type="sensebox_sensor_temp_hum"></block>' +
' <block type="sensebox_sensor_uv_light"></block>' +
/*' <block type="sensebox_sensor_bmx055_accelerometer"></block>' +
' <block type="sensebox_sensor_bmx055_gyroscope"></block>' +
' <block type="sensebox_sensor_bmx055_compass"></block>' + */
' <block type="sensebox_sensor_sds011"></block>' +
' <block type="sensebox_sensor_pressure"></block>' +
' <block type="sensebox_sensor_ultrasonic_ranger"></block>' +
' <block type="sensebox_sensor_sound"></block>' +
' <block type="sensebox_foto"></block>' +
' <block type="sensebox_button"></block>' +
' <block type="sensebox_poti"></block>' +
' </category>' +
' <category id="catsenseBoxDisplay" name="senseBox display" colour="120">' +
' <block type="sensebox_display_beginDisplay"></block>' +
' <block type="sensebox_display_show"></block>' +
' <block type="sensebox_display_clearDisplay"></block>' +
' <block type="sensebox_display_printDisplay">' +
' <value name="X">' +
' <block type="math_number">' +
' <field name="NUM">0</field>' +
' </block>' +
' </value>' +
' <value name="Y">' +
' <block type="math_number">' +
' <field name="NUM">0</field>' +
' </block>' +
' </value>' +
' <value name="SIZE">' +
' <block type="math_number">' +
' <field name="NUM">1</field>' +
' </block>' +
' </value>' +
' </block>' +
' </category>' +
' <category id="catSenseBox_Output" name="senseBox Output" colour="120">' +
' <block type="sensebox_led"></block>' +
' <block type="sensebox_piezo"></block>' +
' <block type="sensebox_rgb_led">' +
' <value name="RED">' +
' <block type="math_number">' +
' <field name="NUM">0</field>' +
' </block>' +
' </value>' +
' <value name="GREEN">' +
' <block type="math_number">' +
' <field name="NUM">0</field>' +
' </block>' +
' </value>' +
' <value name="BLUE">' +
' <block type="math_number">' +
' <field name="NUM">0</field>' +
' </block>' +
' </value>' +
' </block>' +
' <block type="sensebox_sd_create_file"></block>' +
' <block type="sensebox_sd_open_file"></block>' +
' <block type="sensebox_sd_write_file"></block>' +
' <block type="sensebox_serial_print"></block>' +
' <block type="sensebox_wifi"></block>'+
' <block type="sensebox_osem_connection"></block>'+
' <block type="sensebox_send_to_osem"></block>'+
'</category>' +
' <sep></sep>' +
' <sep></sep>' +
' <category id="catLogic" name="Logic" colour="210">' +
' <block type="controls_if"></block>' +
' <block type="logic_compare"></block>' +
' <block type="logic_operation"></block>' +
' <block type="logic_negate"></block>' +
' <block type="logic_boolean"></block>' +
' <block type="logic_null"></block>' +
' <block type="logic_ternary"></block>' +
' </category>' +
' <sep></sep>' +
' <category id="catLoops" name="Loops">' +
' <block type="controls_repeat_ext">' +
' <value name="TIMES">' +
' <block type="math_number">' +
' <field name="NUM">10</field>' +
' </block>' +
' </value>' +
' </category>' +
' <sep></sep>' +
' <category id="catLoops" name="Loops" colour="10">' +
' <block type="controls_repeat_ext">' +
' <value name="TIMES">' +
' <block type="math_number">' +
' <field name="NUM">10</field>' +
' </block>' +
' </value>' +
' </block>' +
' <block type="controls_whileUntil"></block>' +
' <block type="controls_for">' +
Expand All @@ -51,7 +117,7 @@ Ardublockly.TOOLBOX_XML =
' <block type="controls_flow_statements"></block>' +
' </category>' +
' <sep></sep>' +
' <category id="catMath" name="Math">' +
' <category id="catMath" name="Math" colour="230">' +
' <block type="math_number"></block>' +
' <block type="math_arithmetic"></block>' +
' <block type="math_single"></block>' +
Expand Down Expand Up @@ -95,7 +161,7 @@ Ardublockly.TOOLBOX_XML =
' <block type="base_map"></block>' +
' </category>' +
' <sep></sep>' +
' <category id="catText" name="Text">' +
' <category id="catText" name="Text" colour="160">' +
' <block type="text"></block>' +
' <block type="text_join"></block>' +
' <block type="text_append">' +
Expand All @@ -109,7 +175,7 @@ Ardublockly.TOOLBOX_XML =
//' <!--block type="text_print"></block Part of the serial comms -->' +
' </category>' +
' <sep></sep>' +
' <category id="catVariables" name="Variables">' +
' <category id="catVariables" name="Variables" colour="330">' +
' <block type="variables_get"></block>' +
' <block type="variables_set"></block>' +
' <block type="variables_set">' +
Expand All @@ -120,9 +186,9 @@ Ardublockly.TOOLBOX_XML =
' <block type="variables_set_type"></block>' +
' </category>' +
' <sep></sep>' +
' <category id="catFunctions" name="Functions" custom="PROCEDURE"></category>' +
' <category id="catFunctions" name="Functions" custom="PROCEDURE" colour="290"></category>' +
' <sep></sep>' +
' <category id="catInputOutput" name="Input/Output">' +
' <category id="catInputOutput" name="Input/Output" colour="250">' +
' <block type="io_digitalwrite">' +
' <value name="STATE">' +
' <block type="io_highlow"></block>' +
Expand Down Expand Up @@ -154,7 +220,7 @@ Ardublockly.TOOLBOX_XML =
' </block>' +
' </category>' +
' <sep></sep>' +
' <category id="catTime" name="Time">' +
' <category id="catTime" name="Time" colour="140">' +
' <block type="time_delay">' +
' <value name="DELAY_TIME_MILI">' +
' <block type="math_number">' +
Expand All @@ -174,7 +240,7 @@ Ardublockly.TOOLBOX_XML =
' <block type="infinite_loop"></block>' +
' </category>' +
' <sep></sep>' +
' <category id="catAudio" name="Audio">' +
' <category id="catAudio" name="Audio" colour="250">' +
' <block type="io_tone">' +
' <field name="TONEPIN">0</field>' +
' <value name="FREQUENCY">' +
Expand All @@ -186,7 +252,7 @@ Ardublockly.TOOLBOX_XML =
' <block type="io_notone"></block>' +
' </category>' +
' <sep></sep>' +
' <category id="catMotors" name="Motors">' +
' <category id="catMotors" name="Motors" colour="60">' +
' <block type="servo_write">' +
' <value name="SERVO_ANGLE">' +
' <block type="math_number">' +
Expand Down Expand Up @@ -219,7 +285,7 @@ Ardublockly.TOOLBOX_XML =
' </block>' +
' </category>' +
' <sep></sep>' +
' <category id="catComms" name="Comms">' +
' <category id="catComms" name="Comms" colour="160">' +
' <block type="serial_setup"></block>' +
' <block type="serial_print"></block>' +
' <block type="text_prompt_ext">' +
Expand Down
Binary file added ardublockly/img/Genuino.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ardublockly/img/ardublockly_splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ardublockly/img/ardublockly_splash_orig.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ardublockly/img/blockly.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ardublockly/img/mcu_one_top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ardublockly/img/sensebox_logo_raute.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ardublockly/img/sidenav_header.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ardublockly/img/sidenav_header_orig.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading