simpler structure

qmk · Nov 2, 2015 · 9e21388 · 9e21388
1 parent 5fbf1a1
commit 9e21388
Show file tree

Hide file tree

Showing 21 changed files with 7 additions and 2,654 deletions.
diff --git a/app.js b/app.js
@@ -93,11 +93,7 @@ function sendHex(file, callback) {
 };
 
 function dfu_folder() {
- if (process.platform == "win32") {
-  return escapeShell(__dirname);
- } else {
-  return escapeShell(__dirname + "/usr/local/bin/");
- }
+  return escapeShell(__dirname + "/dfu/");
 };
 
 function dfu_location() {
@@ -114,7 +110,7 @@ var escapeShell = function(cmd) {
 
 function eraseChip(callback) {
   var command = dfu_location() + " atmega32u4 erase --force";
-  sendStatus(command + "\n");
+  sendStatus("<b>" +command + "</b>\n");
   exec(command, {cwd: dfu_folder()},
     function(error, stdout, stderr) {
     sendStatus(stdout);
@@ -129,7 +125,7 @@ function eraseChip(callback) {
 
 function flashChip(file, callback) {
   var command = dfu_location() + " atmega32u4 flash " + file;
-  sendStatus(command + "\n");
+  sendStatus("<b>" +command + "</b>\n");
   exec(command, {cwd: dfu_folder()},
     function(error, stdout, stderr) {
     sendStatus(stdout);
@@ -144,7 +140,7 @@ function flashChip(file, callback) {
 
 function resetChip(callback) {
   var command = dfu_location() + " atmega32u4 reset";
-  sendStatus(command + "\n");
+  sendStatus("<b>" +command + "</b>\n");
   exec(command, {cwd: dfu_folder()},
     function(error, stdout, stderr) {
     sendStatus(stdout);

diff --git a/dfu-prog-usb-1.2.2/COPYING_GPL.txt b/dfu-prog-usb-1.2.2/COPYING_GPL.txt
diff --git a/dfu-prog-usb-1.2.2/amd64/libusb0.dll b/dfu-prog-usb-1.2.2/amd64/libusb0.dll
diff --git a/dfu-prog-usb-1.2.2/amd64/libusb0.sys b/dfu-prog-usb-1.2.2/amd64/libusb0.sys
diff --git a/dfu-prog-usb-1.2.2/atmel_usb_dfu.cat b/dfu-prog-usb-1.2.2/atmel_usb_dfu.cat
diff --git a/dfu-prog-usb-1.2.2/atmel_usb_dfu.inf b/dfu-prog-usb-1.2.2/atmel_usb_dfu.inf
diff --git a/dfu-prog-usb-1.2.2/ia64/libusb0.dll b/dfu-prog-usb-1.2.2/ia64/libusb0.dll
diff --git a/dfu-prog-usb-1.2.2/ia64/libusb0.sys b/dfu-prog-usb-1.2.2/ia64/libusb0.sys
diff --git a/dfu-prog-usb-1.2.2/x86/libusb0.sys b/dfu-prog-usb-1.2.2/x86/libusb0.sys
diff --git a/dfu-prog-usb-1.2.2/x86/libusb0_x86.dll b/dfu-prog-usb-1.2.2/x86/libusb0_x86.dll
diff --git a/dfu-programmer.exe b/dfu-programmer.exe
diff --git a/dist.sh b/dist.sh
@@ -4,5 +4,5 @@ cp -R * /Users/j/Downloads/dfu-programmer-app-win32/resources/app/
 rm /Users/j/Downloads/dfu-programmer-app-darwin.zip
 rm /Users/j/Downloads/dfu-programmer-app-win32.zip
 cd /Users/j/Downloads
-zip -r /Users/j/Downloads/dfu-programmer-app-darwin.zip dfu-programmer-app-darwin/
-zip -r /Users/j/Downloads/dfu-programmer-app-win32.zip dfu-programmer-app-win32/
+zip -r /Users/j/Downloads/dfu-programmer-app-darwin.zip dfu-programmer-app-darwin/ -x node_modules
+zip -r /Users/j/Downloads/dfu-programmer-app-win32.zip dfu-programmer-app-win32/ -x node_modules
diff --git a/package.json b/package.json
@@ -23,5 +23,6 @@
   },
   "homepage": "https://github.com/jackhumbert/dfu-programmer-app#readme",
   "devDependencies": {
+    "electron-prebuilt": "^0.34.2"
   }
 }
diff --git a/usr/local/bin/dfu-programmer b/usr/local/bin/dfu-programmer