diff --git a/app/drivers/Easy_Down_Entry/PROBO_Easy_Down_Entry_ver8.38_install.exe b/app/drivers/Easy_Down_Entry/PROBO_Easy_Down_Entry_ver8.38_install.exe new file mode 100644 index 0000000000..ffbf80f65c Binary files /dev/null and b/app/drivers/Easy_Down_Entry/PROBO_Easy_Down_Entry_ver8.38_install.exe differ diff --git a/app/modules/ProboConnect.js b/app/modules/ProboConnect.js index dd4655c19b..18744ece5e 100644 --- a/app/modules/ProboConnect.js +++ b/app/modules/ProboConnect.js @@ -1,3 +1,4 @@ +const Lodash = require('lodash'); const BaseModule = require('./baseModule'); class ProboConnect extends BaseModule { @@ -60,7 +61,28 @@ class ProboConnect extends BaseModule { EC:0, EEPR2:0, EEPR1:0 + }, + Infinite:{ + ROTATION_1:0, + ROTATION_2:0, + ROTATION_3:0, + ROTATION_4:0 + }, + Acceler:{ + AXIS_X1:0, + AXIS_X2:0, + AXIS_X3:0, + AXIS_X4:0, + AXIS_Y1:0, + AXIS_Y2:0, + AXIS_Y3:0, + AXIS_Y4:0, + AXIS_Z1:0, + AXIS_Z2:0, + AXIS_Z3:0, + AXIS_Z4:0, } + }; this.RemoteData = { @@ -87,6 +109,10 @@ class ProboConnect extends BaseModule { ASET1:0 }; + // this.Infinite_Buff = { AA1: 0, AA2: 0, AA3: 0, AA4: 0 }, + // this.Infinite_Count = { AA1: 0, AA2: 0, AA3: 0, AA4: 0 }, + // this.Infinite_Start = { AA1: 0, AA2: 0, AA3: 0, AA4: 0 }, + this.OutputData = new Buffer(22); this.OutputData[0] = 0xAD; @@ -273,6 +299,27 @@ class ProboConnect extends BaseModule { this.InputData.EEPROM.EC = data[13]; this.InputData.EEPROM.EEPR2 = data[14]; this.InputData.EEPROM.EEPR1 = data[15]; + + this.InputData.Infinite.ROTATION_1 = (data[16]>>6)&0xC; + this.InputData.Infinite.ROTATION_2 = (data[16]>>4)&0xC; + this.InputData.Infinite.ROTATION_3 = (data[16]>>2)&0xC; + this.InputData.Infinite.ROTATION_4 = (data[16]>>0)&0xC; + + this.InputData.Acceler.AXIS_X1 = data[4]; + this.InputData.Acceler.AXIS_X2 = data[5]; + this.InputData.Acceler.AXIS_X3 = data[6]; + this.InputData.Acceler.AXIS_X4 = data[7]; + + this.InputData.Acceler.AXIS_Y1 = data[17]; + this.InputData.Acceler.AXIS_Y2 = data[19]; + this.InputData.Acceler.AXIS_Y3 = data[21]; + this.InputData.Acceler.AXIS_Y4 = data[23]; + + this.InputData.Acceler.AXIS_Z1 = data[18]; + this.InputData.Acceler.AXIS_Z2 = data[20]; + this.InputData.Acceler.AXIS_Z3 = data[22]; + this.InputData.Acceler.AXIS_Z4 = data[24]; + } else console.count('CheckSum Err'); @@ -280,6 +327,25 @@ class ProboConnect extends BaseModule { //this.sensors = data; } + // 커스텀 버튼을 사용자에게 보여줄지 여부 + canShowCustomButton() { + return true; + } + + // 커스텀 버튼 클릭시 동작할 로직 + customButtonClicked(key) { + switch (key) { + case "case1": + //버튼 1 로직 + break; + case "case2": + //버튼 2 로직 + break; + default: + console.log(key); + } + } + } module.exports = new ProboConnect(); diff --git a/app/modules/ProboConnect.json b/app/modules/ProboConnect.json index 7652827718..802d966333 100644 --- a/app/modules/ProboConnect.json +++ b/app/modules/ProboConnect.json @@ -4,18 +4,25 @@ "en": "ProboConnect", "ko": "프로보커넥트" }, - "category": "module", "platform": ["win32"], "icon" : "ProboConnect.png", "module": "ProboConnect.js", - "driver": { + "driver": [{ "win32-ia32": "CH34x_Install_Windows_v3_4/CH34x_Install_Windows_v3_4.exe", - "win32-x64": "CH34x_Install_Windows_v3_4/CH34x_Install_Windows_v3_4.exe" - }, + "win32-x64": "CH34x_Install_Windows_v3_4/CH34x_Install_Windows_v3_4.exe", + "translate": "드라이버 설치"}, + { + "win32-ia32": "Easy_Down_Entry/PROBO_Easy_Down_Entry_ver8.38_install.exe", + "win32-x64": "Easy_Down_Entry/PROBO_Easy_Down_Entry_ver8.38_install.exe", + "translate": "펌웨어 설치"} + ], "url": "https://www.probo.kr/", - "email": "alswn5609@naver.com", + "email": "tkddnjs10@naver.com", "reconnect": true, - "selectPort": true, + "select_com_port": true, + "entry": { + "protocol": "json" + }, "hardware": { "type": "serial", "control": "slave", @@ -30,4 +37,5 @@ "delimiter" : "", "flowControl" : "Connect" } -} + +} \ No newline at end of file diff --git a/app/modules/ProboConnect.png b/app/modules/ProboConnect.png index ad12f3b8e0..d40b0e3447 100644 Binary files a/app/modules/ProboConnect.png and b/app/modules/ProboConnect.png differ