1.0.5 Build

Author: kimorkim

Entry.lnk

@@ -0,0 +1,8 @@
+Set WinScriptHost = CreateObject("WScript.shell")
+Set argv = WScript.Arguments
+If argv.Count > 0 Then
+	WinScriptHost.Exec "nw.exe entry " & WScript.Arguments(0)
+Else
+	WinScriptHost.Exec "nw.exe entry"
+End If
+Set WinScriptHost = Nothing

Entry.vbs

@@ -28,7 +28,7 @@
 Name "엔트리"
 
 ; The file to write
-OutFile "엔트리_1.0.4_Setup.exe"
+OutFile "Entry_1.0.5_Setup.exe"
 
 ; The default installation directory
 InstallDir "C:\Entry"

build/entry.nsi

@@ -80,12 +80,12 @@ angular.module('workspace').controller("WorkspaceController",
 		$scope.setOfflineHW = function() {
 			$('#entryCategoryarduino').mouseup(function() {
 					Entry.HW.prototype.downloadConnector = function() {
-						$('#saveArduinoPlugin').attr('nwsaveas', '엔트리_하드웨어_v1.1.1.exe').trigger('click');
+						$('#saveArduinoPlugin').attr('nwsaveas', 'Entry_HW_v1.1.2.exe').trigger('click');
 						$("#saveArduinoPlugin").on("change", function () {
 							var filePath = $('#saveArduinoPlugin').val();
 							if (filePath !== "") {
 								var fs = require("fs");
-									fs.readFile("./hardware/plugin/엔트리_하드웨어_v1.1.1.exe", function (err, stream) {
+									fs.readFile("./hardware/plugin/Entry_HW_v1.1.2.exe", function (err, stream) {
 										fs.writeFile(filePath, stream, 'utf8', function (err) {
 											if (err)
 												alert("Unable to save file");
@@ -105,19 +105,21 @@ angular.module('workspace').controller("WorkspaceController",
 
 
 					Entry.HW.prototype.downloadSource = function() {
-						 $('#saveArduinoCode').attr('nwsaveas', 'entry_arduino.ino').trigger('click');
+						 $('#saveArduinoCode').attr('nwsaveas', 'board.ino').trigger('click');
 						 $("#saveArduinoCode").on("change", function () {
 							var filePath = $('#saveArduinoCode').val();
 							//alert("File Path : " + filePath);
 							if (filePath !== "") {
 								var fs = require("fs");
-									fs.readFile("./hardware/source/entry_arduino.ino", function (err, stream) {
+									fs.readFile("./hardware/source/board.ino", function (err, stream) {
 										fs.writeFile(filePath, stream, 'utf8', function (err) {
 											if (err)
 												alert("Unable to save file");
 											else
 												console.log("File Saved");
-											});
+
+											$("#saveArduinoCode").val('');
+										});
 									});
 							}
 							else {

entry/controllers/workspace.js

@@ -16,7 +16,6 @@ void initPorts () {
 void loop() {
   while (Serial.available()) {
     if (Serial.available() > 0) {
-      
       char c = Serial.read();
       updateDigitalPort(c);
     }
@@ -28,13 +27,13 @@ void loop() {
 
 void sendPinValues() {
   int pinNumber = 0;
-  for (pinNumber = 0; pinNumber < 6; pinNumber++) {
-    sendAnalogValue(pinNumber);
-  }
   for (pinNumber = 0; pinNumber < 14; pinNumber++) {
-    if (!isPortWritable(pinNumber))
       sendDigitalValue(pinNumber);
   }
+  for (pinNumber = 0; pinNumber < 6; pinNumber++) {
+      sendAnalogValue(pinNumber);
+  }
+  
 }
 
 void updateDigitalPort (char c) {

entry/hardware/source/entry_arduino.ino entry/hardware/source/board.inoentry/hardware/source/entry_arduino.ino renamed to entry/hardware/source/board.ino

@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/boolgom/entry-offline.git"
   },
-  "version": "1.0.4",
+  "version": "1.0.5",
   "chromium-args": "--disable-web-security --allow-file-access-from-files --enable-decoder=aac,h264,mp3 --enable-demuxer=mp3,mov --enable-parser=aac,h264,mpegaudio",
   "window": {
     "toolbar": false,

entry/package.json

@@ -34,7 +34,7 @@
                     <a id="btnFileNew" href="">{{'Workspace.file_new' | text}}</a>
                 </li>
 	            <li>
-                    <a href ng-click="loadWorkspace()">{{'Workspace.file_open' | text}}</a>
+                    <a href ng-click="loadWorkspace()">{{'Workspace.file_upload' | text}}</a>
                 </li>
 	        </ul>
 	    </div>