Merge pull request #563 from entrylabs/develop-hw

Revert "Merge pull request #559 from teamong/develop-hw"

Author: Tnks2U

app/firmwares/mechatro.hex

@@ -1,15 +1,12 @@
 {
-    "id": "1F0110",
+    "id": "1F0102",
     "name": {
-        "en": "Mechatro Nano (old bootloader)",
-        "ko": "메카트로 나노 (올드 부트로더)"
+        "en": "Mechatro Nano+",
+        "ko": "메카트로 나노+"
     },
     "category": "board",
-    "platform": [
-        "win32",
-        "darwin"
-    ],
-    "icon": "mechatro_nano_old_bootloader.png",
+    "platform": ["win32", "darwin"],
+    "icon": "mechatro_nano.png",
     "module": "mechatro.js",
     "driver": [
         {
@@ -27,17 +24,13 @@
     "url": "http://cafe.naver.com/easybread",
     "email": "[email protected]",
     "reconnect": true,
-    "firmwareBaudRate": 57600,
     "firmware": "mechatro",
+    "firmwareBaudRate": 57600,
     "hardware": {
         "type": "serial",
         "control": "slave",
         "duration": 35,
-        "vendor": [
-            "Arduino",
-            "wch.cn",
-            "FTDI"
-        ],
+        "vendor": ["Arduino", "wch.cn", "FTDI"],
         "baudRate": 57600,
         "lostTimer": 1000,
         "firmwarecheck": false

app/modules/mechatro.js

@@ -1,23 +1,20 @@
 {
     "id": "1F0101",
     "name": {
-        "en": "Mechatro Uno/Mano",
-        "ko": "메카트로 우노/나노"
+        "en": "Mechatro Uno+",
+        "ko": "메카트로 우노+"
     },
     "category": "board",
-    "platform": [
-        "win32",
-        "darwin"
-    ],
-    "icon": "mechatro_uno_nano.png",
-    "module": "mechatro.js",
+    "platform": ["win32", "darwin"],
+    "icon": "mechatro_uno.png",
     "url": "http://cafe.naver.com/easybread",
     "email": "[email protected]",
-    "reconnect": true,
+    "module": "mechatro.js",
     "driver": {
         "win32-ia32": "arduino/dpinst-x86.exe",
         "win32-x64": "arduino/dpinst-amd64.exe"
     },
+    "reconnect": true,
     "firmware": [
         {
             "name": "mechatro",
@@ -28,11 +25,7 @@
         "type": "serial",
         "control": "slave",
         "duration": 32,
-        "vendor": [
-            "Arduino",
-            "wch.cn",
-            "FTDI"
-        ],
+        "vendor": ["Arduino", "wch.cn", "FTDI"],
         "baudRate": 57600,
         "lostTimer": 1000,
         "firmwarecheck": false

app/modules/mechatro_nano_old_bootloader.json renamed to app/modules/mechatro_nano.json

@@ -1,14 +1,11 @@
 {
-    "id": "1F0102",
+    "id": "1F0103",
     "name": {
         "en": "Mechatro Uno+BT",
         "ko": "메카트로 우노+블루투스"
     },
     "category": "board",
-    "platform": [
-        "win32",
-        "darwin"
-    ],
+    "platform": ["win32", "darwin"],
     "icon": "mechatro_uno_bt.png",
     "url": "http://cafe.naver.com/easybread",
     "email": "[email protected]",
@@ -23,12 +20,7 @@
         "type": "bluetooth",
         "control": "slave",
         "duration": 32,
-        "vendor": [
-            "Microsoft",
-            "Arduino",
-            "wch.cn",
-            "FTDI"
-        ],
+        "vendor": ["Microsoft", "Arduino", "wch.cn", "FTDI"],
         "baudRate": 57600
     }
 }