Merge pull request #876 from MatzElectronics/demo

Minor fixes

Author: zfi

src/main/resources/com/parallax/server/blocklyprop/internationalization/translations.properties

@@ -217,7 +217,7 @@ editor.save = Save
 editor.save-as = Save project as
 editor.client.title = BlocklyPropClient
 editor.client.checking = <i class="glyphicon glyphicon-info-sign"></i> Looking for BlocklyPropClient
-editor.client.available = <strong>Select the correct port,</strong> then click <i class="glyphicon glyphicon-save"></i> or <i class="glyphicon glyphicon-arrow-down"></i>.
+editor.client.available = <strong>Select the correct port,</strong> then click <i class="glyphicon glyphicon-arrow-down"></i> or <i class="glyphicon glyphicon-save"></i>.
 editor.client.available.short = <strong>Select the correct port,</strong> then click <i class="glyphicon glyphicon-save"></i>.
 editor.client.not-available = <i class="glyphicon glyphicon-exclamation-sign"></i> BlocklyPropClient <strong>is not running</strong>
 editor.download = Download blocks file

src/main/webapp/WEB-INF/includes/pageparts/editor-menu.jsp

@@ -33,7 +33,7 @@
                     <span class="project-name"></span> <span class="project-owner"></span>
                 </div>
             </div>
-            <div style="width:100%;">
+            <div style="width:100%; padding-bottom: 5px;">
                 <div style="display:inline; padding-left: 10px;">        
                     <a onclick="compile()" data-toggle="tooltip" title="Verify code (compile)" data-placement="bottom" href="#" class="btn btn-success btn-circle"><i class="glyphicon glyphicon-ok"></i></a>
                     <c:if test="${param.editor_lang == 'c'}">
@@ -70,7 +70,9 @@
                             <hr style="line-height:5px; margin:5px;">
                             <li><a id="clear-workspace" href="#"><fmt:message key="editor.clear-workspace" /></a></li>
                             <hr style="line-height:5px; margin:5px;">
+                            <c:if test="${param.editor_lang == 'c'}">
                             <li><a id="download-side" href="#" onclick="downloadPropC()">Download SimpleIDE files</a></li>
+                            </c:if>
                             <li><a id="download-project" href="#"><fmt:message key="editor.download" /></a></li>
                             <li><a id="upload-project" href="#"><fmt:message key="editor.upload" /></a></li>
                             <hr style="line-height:5px; margin:5px;">

src/main/webapp/cdn/blockly/generators/propc/s3.js

@@ -414,7 +414,7 @@ Blockly.Blocks.scribbler_play = {
             .appendField("for a")
             .appendField(new Blockly.FieldDropdown([['sixteenth', '63'], ['dotted sixteenth', '94'], ['eighth', '125'], ['dotted eighth', '188'], ['quarter', '250'], ['dotted quarter', '375'], ['half', '500'], ['dotted half', '750'], ['whole', '1000'], ['dotted whole', '1500']]), 'NOTE_DURATION')
             .appendField("note at a")
-            .appendField(new Blockly.FieldDropdown([['loud', '100'], ['medium', '50'], ['quiet', '25']]), 'NOTE_VOLUME')
+            .appendField(new Blockly.FieldDropdown([['loud', '50'], ['medium', '30'], ['quiet', '15']]), 'NOTE_VOLUME')
             .appendField("volume");
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
@@ -613,7 +613,7 @@ Blockly.propc.play_polyphony = function() {
     var dur = Blockly.propc.valueToCode(this, 'POLYPHONY_DURATION', Blockly.propc.ORDER_ATOMIC) || 250;
     var vol = Blockly.propc.valueToCode(this, 'POLYPHONY_VOLUME', Blockly.propc.ORDER_ATOMIC) || 50;
 
-    return 's3_setVolume(' + vol + ');\ns3_playNote(' + fq1 + ', ' + fq2 + ', ' + dur + ');\n';
+    return 's3_setVolume((' + vol + ' / 2));\ns3_playNote(' + fq1 + ', ' + fq2 + ', ' + dur + ');\n';
 };
 
 Blockly.Blocks.line_sensor = {

src/main/webapp/cdn/blockly/generators/spin/scribbler.js

@@ -275,7 +275,7 @@ Blockly.Blocks.scribbler_play = {
             .appendField("for a")
             .appendField(new Blockly.FieldDropdown([['sixteenth', '63'], ['dotted sixteenth', '94'], ['eighth', '125'], ['dotted eighth', '188'], ['quarter', '250'], ['dotted quarter', '375'], ['half', '500'], ['dotted half', '750'], ['whole', '1000'], ['dotted whole', '1500']]), 'NOTE_DURATION')
             .appendField("note at a")
-            .appendField(new Blockly.FieldDropdown([['loud', '100'], ['medium', '50'], ['quiet', '25']]), 'NOTE_VOLUME')
+            .appendField(new Blockly.FieldDropdown([['loud', '50'], ['medium', '30'], ['quiet', '15']]), 'NOTE_VOLUME')
             .appendField("volume");
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
@@ -909,7 +909,7 @@ Blockly.Spin.play_tone = function () {
     var Frequency = Blockly.Spin.valueToCode(this, 'FREQUENCY', Blockly.Spin.ORDER_ATOMIC) || '0';
     var Note_Duration = Blockly.Spin.valueToCode(this, 'NOTE_DURATION', Blockly.Spin.ORDER_ATOMIC) || '0';
     var Volume = Blockly.Spin.valueToCode(this, 'NOTE_VOLUME', Blockly.Spin.ORDER_ATOMIC) || '0';
-    return 'Scribbler.SetVolume(' + Volume + ')\nScribbler.PlayNote(' + Frequency + ', 0, ' + Note_Duration + ')\n';
+    return 'Scribbler.SetVolume((' + Volume + ' / 2))\nScribbler.PlayNote(' + Frequency + ', 0, ' + Note_Duration + ')\n';
 };
 
 Blockly.Spin.play_polyphony = function () {
@@ -922,7 +922,7 @@ Blockly.Spin.play_polyphony = function () {
     var Frequency2 = Blockly.Spin.valueToCode(this, 'FREQUENCY_2', Blockly.Spin.ORDER_ATOMIC) || '0';
     var Polyphony_Duration = Blockly.Spin.valueToCode(this, 'POLYPHONY_DURATION', Blockly.Spin.ORDER_ATOMIC) || '0';
     var Volume = Blockly.Spin.valueToCode(this, 'POLYPHONY_VOLUME', Blockly.Spin.ORDER_ATOMIC) || '0';
-    return 'Scribbler.SetVolume(' + Volume + ')\nScribbler.PlayNote(' + Frequency1 + ', ' + Frequency2 + ', ' + Polyphony_Duration + ')\n';
+    return 'Scribbler.SetVolume((' + Volume + ' / 2))\nScribbler.PlayNote(' + Frequency1 + ', ' + Frequency2 + ', ' + Polyphony_Duration + ')\n';
 };
 
 Blockly.Spin.line_sensor = function () {

src/main/webapp/cdn/blockly/language/en/_messages.js

@@ -267,7 +267,7 @@ Blockly.MSG_SYSTEM_COUNTER_TOOLTIP = "system counter: 0 to 4,294,967,295 before
 Blockly.MSG_VARIABLES_SET_TOOLTIP = "set variable: name and attach initial value block.";
 Blockly.MSG_VARIABLES_GET_TOOLTIP = "use variable: choose set variables from dropdown.";
 Blockly.MSG_PROCEDURES_DEFNORETURN_TOOLTIP = "define function: group blocks to re-use ending with return; name group.";
-Blockly.MSG_PROCEDURES_CALLNORETURN_TOOLTIP = "return: Required at the end of code enclosed in a “define function” block.";
+Blockly.MSG_PROCEDURES_CALLNORETURN_TOOLTIP = "return: use in a “define function” block to go back to the main code.";
 Blockly.MSG_MAKE_PIN_TOOLTIP = "make PIN (dropdown): Select I/O pin and setting with menus.";
 Blockly.MSG_MAKE_PIN_INPUT_TOOLTIP = "make PIN (programmable): Select I/O pin with value and setting with menu.";
 Blockly.MSG_CHECK_PIN_TOOLTIP = "check PIN (dropdown): Get the state of I/O pin; high = 1, low = 0.";

src/main/webapp/cdn/editor.js

@@ -189,7 +189,7 @@ function hashCode(str) {
 };
 
 function downloadCode() {
-    var projXMLcode = projectData['code'];
+    var projXMLcode = window.frames["content_blocks"].getXml(); //projectData['code'];
         projXMLcode = projXMLcode.substring(42,projXMLcode.length);
         projXMLcode = projXMLcode.substring(0,(projXMLcode.length - 6));
 

src/main/webapp/cdn/style-editor.css

@@ -200,6 +200,10 @@ nav .nav > li > a:first-child {
     border-radius: 15px;
 }
 
+.btn-circle:hover {
+    box-shadow: 2px 2px 5px #89a;
+}
+
 #save-project {
     -webkit-transition: padding-left 1s, background 1s, border 1s;
     transition: padding-left 1s, background 1s, border 1s;

src/main/webapp/cdn/utils.js

@@ -5,7 +5,7 @@ var utils = {
             message: message,
             buttons: {
                 confirm: {
-                    lable: "Ok",
+                    label: "Ok",
                     className: "btn-primary"
                 }
             }
@@ -24,7 +24,7 @@ var utils = {
                     callback: callback
                 },
                 confirm: {
-                    lable: "Confirm",
+                    label: "Confirm",
                     className: "btn-primary",
                     callback: callback
                 }
@@ -45,7 +45,7 @@ var utils = {
                     }
                 },
                 confirm: {
-                    lable: "Confirm",
+                    label: "Confirm",
                     className: "btn-primary",
                     callback: function () {
                         callback(true);

src/main/webapp/editor/blocklyspin.jsp

@@ -61,6 +61,30 @@
             </tr>
         </table>
 
+        <div class="modal fade" id="upload-dialog">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" onclick="clearUploadInfo();" aria-hidden="true">&times;</button>
+                        <h4 class="modal-title" id="compile-dialog-title"><fmt:message key="editor.upload" /></h4>
+                    </div>
+                    <div class="modal-body">
+                        
+                        <label class="control-label"><fmt:message key="editor.upload.selectfile" /></label>
+                        <input id="selectfile" type="file" onchange="uploadHandler(this.files);">
+                        <div id="selectfile-verify-valid" class="alert alert-success" style="display: none;"><span class="glyphicon glyphicon-ok"></span> <fmt:message key="editor.upload.valid" /></div>
+                        <div id="selectfile-verify-notvalid" class="alert alert-danger" style="display: none;"><span class="glyphicon glyphicon-ban-circle"></span> <fmt:message key="editor.upload.notvalid" /></div>
+                        <div id="selectfile-verify-boardtype" class="alert alert-warning" style="display: none;"><span class="glyphicon glyphicon-warning-sign"></span> <fmt:message key="editor.upload.boardtype.warning" /></div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-danger" disabled="true" id="selectfile-replace" onclick="replaceCode();"><fmt:message key="editor.button.replace" /></button>
+                        <button type="button" class="btn btn-primary" disabled="true" id="selectfile-append" onclick="appendCode();"><fmt:message key="editor.button.append" /></button>
+                        <button type="button" class="btn btn-default" onclick="clearUploadInfo();" data-dismiss="modal"><fmt:message key="editor.button.cancel" /></button>
+                    </div>
+                </div><!-- /.modal-content -->
+            </div><!-- /.modal-dialog -->
+        </div><!-- /.modal -->
+
         <div class="modal fade" id="compile-dialog">
             <div class="modal-dialog">
                 <div class="modal-content">

src/main/webapp/frame/framec.jsp

@@ -214,7 +214,7 @@
             <block type="system_counter"></block>
         </category>
 
-        <category name="<fmt:message key="category.s3-simple" />" include="s3" exclude="heb, activity-board" colour=185>
+        <category name="<fmt:message key="category.s3-simple" />" include="s3" colour=185>
             <category name="<fmt:message key="category.s3-simple.simple-control" />" colour=205>
                 <block type="scribbler_loop"></block>
                 <block type="scribbler_limited_loop">
@@ -251,7 +251,7 @@
                 <block type="scribbler_LED"></block>
             </category>
         </category>
-        <category name="<fmt:message key="category.control" />" include="s3" exclude="heb, activity-board" colour=205>
+        <category name="<fmt:message key="category.control" />" include="s3" colour=205>
             <block type="controls_repeat">
                 <mutation TYPE="FOREVER"></mutation>
             </block>
@@ -305,7 +305,7 @@
             </block>
             <block type="set_pins"></block>
         </category>
-        <category name="<fmt:message key="category.communicate" />" include="activity-board" exclude="heb, s3" colour="320">
+        <category name="<fmt:message key="category.communicate" />" include="activity-board,flip" colour="320">
             <category name="<fmt:message key="category.communicate.oled" />">
                 <block type="oled_initialize"></block>
                 <block type="oled_font_loader"></block>
@@ -565,7 +565,7 @@
                 <block type="xbee_receive"></block>
             </category>
         </category>
-        <category name="<fmt:message key="category.sensor-input" />" include="activity-board" exclude="heb, s3" colour="155">
+        <category name="<fmt:message key="category.sensor-input" />" exclude="s3" colour="155">
             <category name="<fmt:message key="category.sensor-input.2axis-joystick" />">
                 <block type="joystick_input_xaxis"></block>
                 <block type="joystick_input_yaxis"></block>
@@ -617,7 +617,7 @@
                 <block type="sound_impact_end"></block>
             </category>
         </category>
-        <category name="<fmt:message key="category.memory" />" include="activity-board" exclude="s3" colour="155">
+        <category name="<fmt:message key="category.memory" />" include="activity-board,flip" colour="155">
             <category name="<fmt:message key="category.memory.eeprom" />">
                 <block type="eeprom_read">
                     <value name="ADDRESS">
@@ -678,8 +678,8 @@
                 </block>
             </category>
         </category>
-        <category name="<fmt:message key="category.audio" />" include="activity-board, heb" exclude="s3" colour="200">
-            <category name="<fmt:message key="category.audio.freqout" />" include="activity-board, heb" exclude="s3">
+        <category name="<fmt:message key="category.audio" />" exclude="s3" colour="200">
+            <category name="<fmt:message key="category.audio.freqout" />" exclude="s3">
                 <block type="base_freqout">
                     <value name="DURATION">
                         <block type="math_number">
@@ -693,7 +693,7 @@
                     </value>
                 </block>
             </category>
-            <category name="<fmt:message key="category.audio.audio" />" include="activity-board" exclude="heb, s3">
+            <category name="<fmt:message key="category.audio.audio" />" include="activity-board">
                 <block type="wav_play"></block>
                 <block type="wav_status"></block>
                 <block type="wav_volume">
@@ -706,7 +706,7 @@
                 <block type="wav_stop"></block>
             </category>
         </category>
-        <category name="<fmt:message key="category.servo" />" include="activity-board, heb" exclude="s3" colour="180">
+        <category name="<fmt:message key="category.servo" />" exclude="s3" colour="180">
             <category name="<fmt:message key="category.servo.standard-servo" />">
                 <block type="servo_move">
                     <value name="ANGLE">
@@ -733,7 +733,7 @@
                 </block>
             </category>
         </category>
-        <category name="<fmt:message key="category.robot" />"  include="activity-board" exclude="heb, s3" colour="295">
+        <category name="<fmt:message key="category.robot" />"  include="activity-board" colour="295">
             <block type="ab_drive_init"></block>
             <block type="ab_drive_speed">
                 <value name="LEFT">
@@ -763,7 +763,7 @@
             <block type="activitybot_calibrate"></block>
             <block type="activitybot_display_calibration"></block>
         </category>
-        <category name="<fmt:message key="category.hackable-electronic-badge" />" include="heb" exclude="s3, activity-board" colour="290">
+        <category name="<fmt:message key="category.hackable-electronic-badge" />" include="heb" colour="290">
             <category name="<fmt:message key="category.communicate.serial-terminal" />">
                 <block type="console_print">
                     <value name="MESSAGE">
@@ -845,7 +845,7 @@
             </category>
         </category>
 
-        <category name="<fmt:message key="category.s3-math" />" include="s3" exclude="heb, activity-board" colour=275>
+        <category name="<fmt:message key="category.s3-math" />" include="s3" colour=275>
             <block type="spin_integer"></block>
             <block type="math_int_angle"></block>
             <block type="scribbler_boolean"></block>
@@ -871,7 +871,7 @@
             <block type="math_advanced"></block>
             <block type="math_inv_trig"></block>
         </category>
-        <category name="<fmt:message key="category.sensor-input" />" include="s3" exclude="heb, activity-board" colour=140>
+        <category name="<fmt:message key="category.sensor-input" />" include="s3" colour=140>
             <category name="<fmt:message key="category.sensor-input.s3-line" />">
                 <block type="scribbler_if_line"></block>
                 <block type="line_sensor"></block>
@@ -901,7 +901,7 @@
                 <block type="analog_input"></block>
             </category>
         </category>
-        <category name="<fmt:message key="category.s3-actions" />" include="s3" exclude="heb, activity-board" colour=185>
+        <category name="<fmt:message key="category.s3-actions" />" include="s3" colour=185>
             <block type="digital_output"></block>
             <category name="<fmt:message key="category.s3-actions.motors" />">
                 <block type="scribbler_drive">
@@ -986,7 +986,7 @@
 		</block>
                 <block type="scribbler_stop_servo"></block>
             </category>
-            <category name="<fmt:message key="category.s3-actions.sound" />" include="s3" exclude="heb, activity-board">
+            <category name="<fmt:message key="category.s3-actions.sound" />" include="s3">
                 <block type="scribbler_play">
                     <field name="NOTE_DURATION">250</field>
                     <field name="NOTE_OCTAVE">4</field>
@@ -1016,10 +1016,10 @@
                     </value>
                 </block>
             </category>
-            <category name="<fmt:message key="category.s3-actions.leds" />" include="s3" exclude="heb, activity-board">
+            <category name="<fmt:message key="category.s3-actions.leds" />" include="s3">
                 <block type="scribbler_LED"></block>
             </category>
-            <category name="<fmt:message key="category.communicate" />" include="s3" exclude="heb, activity-board">
+            <category name="<fmt:message key="category.communicate" />" include="s3">
                 <block type="scribbler_serial_send_text"></block>
                 <block type="scribbler_serial_send_decimal"></block>
                 <block type="scribbler_serial_send_char"></block>
@@ -1039,9 +1039,11 @@
                 <block type="scribbler_serial_rx_byte"></block>
 
             </category>
-            <category name="<fmt:message key="category.s3-actions.reset" />" include="s3" exclude="heb, activity-board">
+<%--
+            <category name="<fmt:message key="category.s3-actions.reset" />" include="s3">
                 <block type="factory_reset"></block>
             </category>
+--%>
         </category>
     </xml>
 </body>