Merge pull request #620 from entrylabs/develop-hw

1.9.39 버전업

Author: Tnks2U

app/modules/0uboard.js

@@ -90,7 +90,11 @@ Module.prototype.setSerialPort = function (sp) {
 
 // Module.prototype.lostController = function () {};
 
-Module.prototype.requestInitialData = function() {
+Module.prototype.requestInitialData = function(sp) {
+    this.sp = sp;
+    this.sp.binding.openOptions.hupcl=false;
+    this.sp.set({ dtr: false, rts: true });
+    this.sp.set({ dtr: false, rts: false });
     return this.makeSensorReadBuffer(this.sensorTypes.ANALOG, 0);
 };
 

app/modules/0uboard.json

@@ -29,7 +29,7 @@
         "duration": 32,
         "vendor": ["Arduino", "wch.cn", "FTDI"],
         "baudRate": 57600,
-        "lostTimer": 1000,
+        "lostTimer": 5000,
         "firmwarecheck": false
 	}
 }

app/modules/iCOBOT.js

@@ -42,6 +42,7 @@ function Module()
             Left_IR: 0,
             Real_T: 0,
             Real_H: 0,
+            Motor_F: 0,
         },
         Brightness: 0,
         BLeft_IR: 0,
@@ -360,7 +361,7 @@ Module.prototype.handleRemoteData = function(handler)
                         switch(data.type) 
                         {
                             case 2:  // 모터제어
-                                if((port != pre_port_motor) || (data.data.value != pre_data_value_motor) || (data.data.mode != pre_data_mode_motor))
+                                if((port != pre_port_motor) || (data.data.value != pre_data_value_motor) || (data.data.mode != 4) || (data.data.mode != pre_data_mode_motor))
                                 {
                                     //console.log("Motor: ", port, pre_port_motor, data.data.value, pre_data_value_motor, data.data.mode, pre_data_mode_motor);
                                     buffer = Buffer.concat([buffer, self.makeOutputBuffer(data.type, port, data.data)]);
@@ -396,7 +397,7 @@ Module.prototype.handleRemoteData = function(handler)
                                 break;
                             case 5:  // Tone 제어
                                 //console.log("Tone: ", data.data.value, pre_data_value_tone, data.data.duration, pre_data_time_tone);
-                                if((data.data.value != pre_data_value_tone) || (data.data.duration != pre_data_time_tone))
+                                if((data.data.value != pre_data_value_tone) || (7 != pre_data_time_tone))
                                 {
                                     buffer = Buffer.concat([buffer, self.makeOutputBuffer(data.type, port, data.data)]);
                                     pre_data_value_tone = data.data.value;

app/modules/microbit2.json

@@ -34,7 +34,7 @@
         "type": "serial",
         "control": "slave",
         "delimiter": "\r\n",
-        "duration": 64,
+        "duration": 128,
         "vendor": "",
         "baudRate": 115200,
         "commType": "ascii"

app/server/mac/server.txt

@@ -13,7 +13,6 @@ import registerGlobalShortcut from './functions/registerGlobalShortcut';
 import checkUpdate from './functions/checkUpdate';
 import MainRouter from '../mainRouter.build';
 import createLogger from './functions/createLogger';
-import isValidAsarFile from './modifyValidator';
 
 const logger = createLogger('electron/index.ts');
 
@@ -128,18 +127,6 @@ if (!app.requestSingleInstanceLock()) {
                 mainRouter.selectHardware(autoOpenHardwareId);
             }, 1000);
         }
-
-        setTimeout(async () => {
-            try {
-                const result = await isValidAsarFile();
-                if (!result) {
-                    mainWindow?.webContents.send('invalidAsarFile');
-                }
-            } catch (e) {
-                console.log(e);
-                mainWindow?.webContents.send('invalidAsarFile');
-            }
-        }, 2000);
     });
 
     ipcMain.on('hardwareForceClose', () => {

app/server/win/server.exe

@@ -13,6 +13,7 @@ import directoryPaths from './core/directoryPaths';
 import BaseScanner from './core/baseScanner';
 import BaseConnector from './core/baseConnector';
 import SerialConnector from './core/serial/connector';
+import isValidAsarFile from './electron/modifyValidator';
 
 const nativeNodeRequire = require('./nativeNodeRequire.js');
 const logger = createLogger('core/mainRouter.ts');
@@ -239,7 +240,7 @@ class MainRouter {
                 if (connector) {
                     logger.info(
                         `[Device Info] ${config.id} | ${
-                            config?.name?.ko || config?.name?.en || 'noname'
+                        config?.name?.ko || config?.name?.en || 'noname'
                         }`
                     );
                     this.connector = connector;
@@ -536,11 +537,21 @@ class MainRouter {
             this.flasher.kill();
             this.config && this.startScan(this.config);
         });
+        ipcMain.handle('isValidAsarFile', async (event) => {
+            try {
+                const result = await isValidAsarFile();
+                console.log("isValidAsarFile : ", result);
+                return result;
+            } catch (e) {
+                console.log(e);
+                return false;
+            }
+        })
         ipcMain.on('getSharedObject', (e) => {
             e.returnValue = global.sharedObject;
         });
         ipcMain.on('canShowCustomButton', (e) => {
-            if(this.hwModule && this.hwModule.canShowCustomButton) {
+            if (this.hwModule && this.hwModule.canShowCustomButton) {
                 e.returnValue = this.hwModule.canShowCustomButton();
             } else {
                 e.returnValue = false;

app/src/main/electron/index.ts

@@ -27,11 +27,12 @@ class IpcRendererWatchComponent extends React.PureComponent<IProps> {
         ipcRenderer.removeAllListeners('portListScanned');
         ipcRenderer.removeAllListeners('cloudMode');
         ipcRenderer.removeAllListeners('socketConnected');
-        ipcRenderer.removeAllListeners('invalidAsarFile');
 
-        ipcRenderer.on('invalidAsarFile', () => {
-            props.invalidateBuild();
-        });
+        ipcRenderer.invoke('isValidAsarFile').then((result: boolean) => {
+            if(!result){
+                props.invalidateBuild();
+            }
+        })
 
         ipcRenderer.on('console', (event, ...args: any[]) => {
             console.log(...args);

app/src/main/mainRouter.ts

@@ -14,7 +14,7 @@
 !define PRODUCT_NAME "Entry_HW"
 !define PROTOCOL_NAME "entryhw"
 !define APP_NAME "Entry_HW.exe"
-!define PRODUCT_VERSION "1.9.38"
+!define PRODUCT_VERSION "1.9.39"
 !define PRODUCT_PUBLISHER "EntryLabs"
 !define PRODUCT_WEB_SITE "https://www.playentry.org/"
 

app/src/renderer/react/main/components/IpcRendererWatchComponent.tsx

@@ -1,6 +1,6 @@
 {
     "name": "entry-hw",
-    "version": "1.9.38",
+    "version": "1.9.39",
     "description": "엔트리 하드웨어 연결 프로그램",
     "author": "EntryLabs",
     "main": "./app/src/index.bundle.js",