Merge pull request #877 from MatzElectronics/demo

Minor fixes (lcd, upload dialog)

Author: zfi

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

@@ -672,7 +672,7 @@ Blockly.propc.debug_lcd_set_cursor = function () {
     if(Blockly.propc.setups_['setup_debug_lcd'] === undefined) {
         return '//Missing Serial LCD initialize block\n';
     } else {
-        return 'writeChar(debug_lcd, (128 + (constrain(' + row + ', 0, 3) * 20) + constrain(' + column + ', 0, 20)));\n';
+        return 'writeChar(debug_lcd, (128 + (constrain(' + row + ', 0, 3) * 20) + constrain(' + column + ', 0, 19)));\n';
     }
 };
 

src/main/webapp/cdn/editor.js

@@ -300,6 +300,8 @@ function uploadHandler(files) {
                 uploadBoardType = xmlString.substring((boardIndex + 40), xmlString.indexOf('</text>', (boardIndex + 41)));
                 if(uploadBoardType !== projectData['board']) {
                     document.getElementById("selectfile-verify-boardtype").style.display = "block";
+                } else {
+                    document.getElementById("selectfile-verify-boardtype").style.display = "none";                    
                 }
             }
         };