diff --git a/Entry.lnk b/Entry.lnk new file mode 100644 index 000000000..84ce08e29 Binary files /dev/null and b/Entry.lnk differ diff --git a/Entry.vbs b/Entry.vbs new file mode 100644 index 000000000..405cf0e12 --- /dev/null +++ b/Entry.vbs @@ -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 \ No newline at end of file diff --git a/build/entry.nsi b/build/entry.nsi index 316df79e5..2cfea25dc 100644 --- a/build/entry.nsi +++ b/build/entry.nsi @@ -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" diff --git a/entry/controllers/workspace.js b/entry/controllers/workspace.js index fc7c77ee7..e1ee26802 100644 --- a/entry/controllers/workspace.js +++ b/entry/controllers/workspace.js @@ -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 { diff --git a/entry/hardware/source/entry_arduino.ino b/entry/hardware/source/board.ino similarity index 96% rename from entry/hardware/source/entry_arduino.ino rename to entry/hardware/source/board.ino index 2825fecc5..145d4175b 100644 --- a/entry/hardware/source/entry_arduino.ino +++ b/entry/hardware/source/board.ino @@ -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) { diff --git a/entry/package.json b/entry/package.json index 1a61a9494..ba2b0a374 100644 --- a/entry/package.json +++ b/entry/package.json @@ -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, diff --git a/entry/views/header.html b/entry/views/header.html index f9bc2c934..5c4b79309 100644 --- a/entry/views/header.html +++ b/entry/views/header.html @@ -34,7 +34,7 @@ {{'Workspace.file_new' | text}}