Skip to content

Commit 10a0a80

Browse files
author
조현욱[SW교육플랫폼개발]
committed
Merge branch 'master' of https://github.com/entrylabs/entry-hw
2 parents b6f1a48 + bbc36c5 commit 10a0a80

14 files changed

+438
-90
lines changed

app/modules/alux_connect.json

+24-22
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,34 @@
77
"platform": ["win32"],
88
"icon" : "alux_connect.png",
99
"module": "alux_connect.js",
10-
"driver": [{
11-
"win32-ia32": "CH34x_Install_Windows_v3_4/CH34x_Install_Windows_v3_4.exe",
12-
"win32-x64": "CH34x_Install_Windows_v3_4/CH34x_Install_Windows_v3_4.exe",
13-
"translate": "드라이버 설치1"},
10+
"driver": [
1411
{
15-
"win32-ia32": "Easy_Down_Entry/PROBO Easy Down Entry ver8.41.msi",
16-
"win32-x64": "Easy_Down_Entry/PROBO Easy Down Entry ver8.41.msi",
17-
"translate": "드라이버 설치2"}
18-
],
12+
"win32-ia32": "CH34x_Install_Windows_v3_4/CH34x_Install_Windows_v3_4.exe",
13+
"win32-x64": "CH34x_Install_Windows_v3_4/CH34x_Install_Windows_v3_4.exe",
14+
"translate": "CH34x 드라이버"
15+
},
16+
{
17+
"win32-ia32": "Easy_Down_Entry/PROBO Easy Down Entry ver8.41.msi",
18+
"win32-x64": "Easy_Down_Entry/PROBO Easy Down Entry ver8.41.msi",
19+
"translate": "Easy Down Entry 드라이버"
20+
}
21+
],
1922
"url": "https://www.probo.kr/",
20-
"email": "[email protected]",
23+
"email": " [email protected]",
2124
"reconnect": true,
2225
"selectPort": true,
2326
"hardware": {
24-
"type": "serial",
25-
"control": "slave",
26-
"duration": 32,
27-
"baudRate": 115200 ,
28-
"vendor": "Probo",
29-
"firmwarecheck": true,
30-
"parity" : "none",
31-
"dataBits" : 8,
32-
"stopBits" : 1,
33-
"bufferSize" : 255,
34-
"delimiter" : "",
35-
"flowControl" : "Connect"
27+
"type": "serial",
28+
"control": "slave",
29+
"duration": 32,
30+
"baudRate": 115200,
31+
"vendor": "Probo",
32+
"firmwarecheck": true,
33+
"parity" : "none",
34+
"dataBits" : 8,
35+
"stopBits" : 1,
36+
"bufferSize" : 255,
37+
"delimiter" : "",
38+
"flowControl" : "Connect"
3639
}
37-
3840
}

app/modules/alux_technic_normal.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
{
1212
"win32-ia32": "CH34x_Install_Windows_v3_4/CH34x_Install_Windows_v3_4.exe",
1313
"win32-x64": "CH34x_Install_Windows_v3_4/CH34x_Install_Windows_v3_4.exe",
14-
"translate": "드라이버 설치1"
14+
"translate": "CH34x 드라이버"
1515
},
1616
{
1717
"win32-ia32": "Easy_Down_Entry/PROBO Easy Down Entry ver8.41.msi",
1818
"win32-x64": "Easy_Down_Entry/PROBO Easy Down Entry ver8.41.msi",
19-
"translate": "드라이버 설치2"
19+
"translate": "Easy Down Entry 드라이버"
2020
}
2121
],
2222
"url": "https://www.aluxonline.com/",
@@ -32,4 +32,4 @@
3232
"softwareReset": false,
3333
"firmwarecheck": false
3434
}
35-
}
35+
}

app/modules/alux_technic_power.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
{
1212
"win32-ia32": "CH34x_Install_Windows_v3_4/CH34x_Install_Windows_v3_4.exe",
1313
"win32-x64": "CH34x_Install_Windows_v3_4/CH34x_Install_Windows_v3_4.exe",
14-
"translate": "드라이버 설치1"
14+
"translate": "CH34x 드라이버"
1515
},
1616
{
1717
"win32-ia32": "Easy_Down_Entry/PROBO Easy Down Entry ver8.41.msi",
1818
"win32-x64": "Easy_Down_Entry/PROBO Easy Down Entry ver8.41.msi",
19-
"translate": "드라이버 설치2"
19+
"translate": "Easy Down Entry 드라이버"
2020
}
2121
],
2222
"url": "https://www.aluxonline.com/",
@@ -32,4 +32,4 @@
3232
"softwareReset": false,
3333
"firmwarecheck": false
3434
}
35-
}
35+
}

0 commit comments

Comments
 (0)