Skip to content

Commit

Permalink
1.0.5 Build
Browse files Browse the repository at this point in the history
  • Loading branch information
kimorkim committed Feb 5, 2016
1 parent f69b8f7 commit adfd0ac
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 13 deletions.
Binary file added Entry.lnk
Binary file not shown.
8 changes: 8 additions & 0 deletions Entry.vbs
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion build/entry.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 7 additions & 5 deletions entry/controllers/workspace.js
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ void initPorts () {
void loop() {
while (Serial.available()) {
if (Serial.available() > 0) {

char c = Serial.read();
updateDigitalPort(c);
}
Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion entry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion entry/views/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit adfd0ac

Please sign in to comment.