16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

Update requirements

This commit is contained in:
Matt 2017-02-09 09:35:07 -05:00
parent 76cd62449e
commit 236908993e
6 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/build_mac.sh Normal file
View File

@ -0,0 +1,21 @@
#!/bin/bash
mkdir ../../mcopy_build_mac/Electron.app/Contents/Resources/app/css
mkdir ../../mcopy_build_mac/Electron.app/Contents/Resources/app/data
mkdir ../../mcopy_build_mac/Electron.app/Contents/Resources/app/fonts
mkdir ../../mcopy_build_mac/Electron.app/Contents/Resources/app/js
mkdir ../../mcopy_build_mac/Electron.app/Contents/Resources/app/lib
mkdir ../../mcopy_build_mac/Electron.app/Contents/Resources/app/logs
cp -R ./css/* ../../mcopy_build_mac/Electron.app/Contents/Resources/app/css
cp -R ./fonts/* ../../mcopy_build_mac/Electron.app/Contents/Resources/app/fonts
cp -R ./js/* ../../mcopy_build_mac/Electron.app/Contents/Resources/app/js
cp -R ./lib/* ../../mcopy_build_mac/Electron.app/Contents/Resources/app/lib
cp ./data/cfg.json.default ../../mcopy_build_mac/Electron.app/Contents/Resources/app/data/
cp ./index.html ../../mcopy_build_mac/Electron.app/Contents/Resources/app/
cp ./main.js ../../mcopy_build_mac/Electron.app/Contents/Resources/app/
cp ./package.json ../../mcopy_build_mac/Electron.app/Contents/Resources/app/
cd ../../mcopy_build_mac/Electron.app/Contents/Resources/app/ && npm install && ./node_modules/.bin/electron-rebuild

2
app/js/app.js
View File

@ -3041,7 +3041,7 @@ var remote = require('remote'),
dialog = require('electron').remote.dialog,
notifier = require('node-notifier'),
fs = require('fs'),
uuid = require('node-uuid'),
uuid = require('uuid'),
moment = require('moment'),
humanizeDuration = require('humanize-duration')
ipcRenderer = require('electron').ipcRenderer,

5
app/main.js
View File

@ -1,3 +1,4 @@
var electron = require('electron'),
fs = require('fs'),
Menu = require('menu'),
@ -7,7 +8,7 @@ var electron = require('electron'),
winston = require('winston'),
moment = require('moment'),
BrowserWindow = electron.BrowserWindow,
uuid = require('node-uuid'),
uuid = require('uuid'),
Q = require('q'),
events = require('events'),
ee = new events.EventEmitter(),
@ -20,6 +21,8 @@ var electron = require('electron'),
capture = require('./lib/capture-report.js')(ee),
log = {};
console.log(process.version);
mcopy.cfg = {};
mcopy.cfgFile = './data/cfg.json';
mcopy.cfgInit = function () {

23
app/package.json
View File

@ -23,20 +23,21 @@
},
"homepage": "https://github.com/sixteenmillimeter/mcopy#readme",
"devDependencies": {
"electron-packager": "^6.0.2",
"electron-prebuilt": "^0.37.5",
"electron-rebuild": "^1.1.3",
"electron-inspector": "^0.1.4",
"electron-packager": "^8.4.0",
"electron-prebuilt": "^1.4.12",
"electron-rebuild": "^1.4.0",
"gulp": "^3.9.1",
"gulp-concat": "^2.6.0",
"gulp-less": "^3.0.5"
"gulp-concat": "^2.6.1",
"gulp-less": "^3.3.0"
},
"dependencies": {
"humanize-duration": "^3.7.0",
"moment": "^2.12.0",
"node-notifier": "^4.5.0",
"node-uuid": "^1.4.7",
"humanize-duration": "^3.10.0",
"moment": "^2.17.1",
"node-notifier": "^4.6.1",
"q": "^1.4.1",
"serialport": "^2.1.0",
"winston": "^2.2.0"
"serialport": "^4.0.7",
"uuid": "^3.0.1",
"winston": "^2.3.0"
}
}

2
app/src/index.js
View File

@ -2,7 +2,7 @@ var remote = require('remote'),
dialog = require('electron').remote.dialog,
notifier = require('node-notifier'),
fs = require('fs'),
uuid = require('node-uuid'),
uuid = require('uuid'),
moment = require('moment'),
humanizeDuration = require('humanize-duration')
ipcRenderer = require('electron').ipcRenderer,

8
ino/mcopy_light_tests/mcopy_light_tests.ino
View File

@ -41,11 +41,11 @@ const int serialDelay = 5;
void setup () {
Serial.begin(57600);
Serial.flush();
Serial.setTimeout(serialDelay);
Serial.setTimeout(serialDelay);
//pixieSerial.begin(115200); // Pixie REQUIRES this baud rate
light.begin();
light.setPixelColor(0, 0, 0, 0);
light.show();
light.begin();
light.setPixelColor(0, 0, 0, 0);
light.show();
}
void loop () {