skyeye-sdk-js 1.4.9 → 1.4.11

package/dist/src/RequestFactory.d.ts

@@ -14,6 +14,8 @@ export declare class RequestFactory {
     getCpuList(): JSONRequest;
     getMemoryValue(cpuName: string, baseAddr: string, length: string, addressWidth?: number): JSONRequest;
     setMemoryValue(cpuName: string, baseAddr: string, value: string, length: string, addressWidth?: number): JSONRequest;
+    getBitValue(cpuName: string, baseAddr: string, bitIndex: number, addressWidth?: number): JSONRequest;
+    setBitValue(cpuName: string, baseAddr: string, bitIndex: number, value: number, addressWidth?: number): JSONRequest;
     enableDeviceWork(deviceName: string): JSONRequest;
     disableDeviceWork(deviceName: string): JSONRequest;
     changeDir(path: string): JSONRequest;

package/dist/src/RequestFactory.js

@@ -91,6 +91,31 @@ class RequestFactory {
         request.setRequest(baseRequest.toJSONString());
         return request;
     }
+    getBitValue(cpuName, baseAddr, bitIndex, addressWidth) {
+        const baseRequest = new BaseRequest_1.BaseRequest("SE_get_bit_value");
+        const args = {};
+        args.cpuname = cpuName;
+        args.baseaddr = "0x" + baseAddr;
+        args.bitindex = bitIndex;
+        args.address_width = addressWidth;
+        baseRequest.setArgs(args);
+        const request = new skyeye_rpc_pb_1.JSONRequest();
+        request.setRequest(baseRequest.toJSONString());
+        return request;
+    }
+    setBitValue(cpuName, baseAddr, bitIndex, value, addressWidth) {
+        const baseRequest = new BaseRequest_1.BaseRequest("SE_set_bit_value");
+        const args = {};
+        args.cpuname = cpuName;
+        args.baseaddr = "0x" + baseAddr;
+        args.bitindex = bitIndex;
+        args.value = value;
+        args.address_width = addressWidth;
+        baseRequest.setArgs(args);
+        const request = new skyeye_rpc_pb_1.JSONRequest();
+        request.setRequest(baseRequest.toJSONString());
+        return request;
+    }
     enableDeviceWork(deviceName) {
         const baseRequest = new BaseRequest_1.BaseRequest("SE_enable_device_work");
         const args = {};

package/dist/src/SkyEyeClient.d.ts

@@ -7,6 +7,7 @@ import { GetRunningStateResponse } from './response/GetRunningStateResponse';
 import { Register } from './models/Register';
 import { GetDeviceTreeResponse } from './response/GetDeviceTreeResponse';
 import { GetAllDeviceInfoResponse } from './response/GetAllDeviceInfoResponse';
+import { GetAllDeviceInfoResponse2 } from './response/GetAllDeviceInfoResponse2';
 import { GetRamAddrInfoResponse } from './response/GetRamAddrInfoResponse';
 import { Device } from './models/Device';
 import { FaultInjectType } from './models/FaultInjectType';
@@ -56,6 +57,8 @@ export declare class SkyEyeClient extends JSONTransmissionClient {
     getAddressingSpaceDefault(baseAddr: string, length: string): Promise<any>;
     setMemoryValue(cpuName: string, baseAddr: string, value: string, length: string, addressWidth?: number): Promise<any>;
     setMemoryValueDefault(baseAddr: string, value: string, length: string, addressWidth?: number): Promise<any>;
+    setBitValue(cpuName: string, baseAddr: string, bitIndex: number, value: number, addressWidth?: number): Promise<any>;
+    getBitValue(cpuName: string, baseAddr: string, bitIndex: number, addressWidth?: number): Promise<any>;
     getCpuRegisters(cpuName: string): Promise<GetCpuRegisterInfoResponse>;
     getCpuRegistersDefault(): Promise<GetCpuRegisterInfoResponse>;
     setCpuRegisterValueDefault(register: Register, value: string): Promise<any>;
@@ -66,6 +69,7 @@ export declare class SkyEyeClient extends JSONTransmissionClient {
     getModuleStatus(): Promise<BaseResponse>;
     getCurrentRunningState(): Promise<GetRunningStateResponse>;
     getAllDeviceInfo(): Promise<GetAllDeviceInfoResponse>;
+    getAllDeviceInfo2(): Promise<GetAllDeviceInfoResponse2>;
     getRamAddrInfo(machName: string, addr: string): Promise<GetRamAddrInfoResponse>;
     setRamFaultInjectDefault(device: Device, addr: string, bit: string, mode: FaultInjectType): Promise<any>;
     setRamFaultInject(boardName: string, deviceName: string, addr: string, bit: string, mode: FaultInjectType): Promise<any>;

package/dist/src/SkyEyeClient.js

@@ -45,6 +45,7 @@ const Register_1 = require("./models/Register");
 const GetDeviceTreeResponse_1 = require("./response/GetDeviceTreeResponse");
 const ParseBoardUtils_1 = require("./utils/ParseBoardUtils");
 const GetAllDeviceInfoResponse_1 = require("./response/GetAllDeviceInfoResponse");
+const GetAllDeviceInfoResponse2_1 = require("./response/GetAllDeviceInfoResponse2");
 const GetRamAddrInfoResponse_1 = require("./response/GetRamAddrInfoResponse");
 const Device_1 = require("./models/Device");
 const FaultInjectType_1 = require("./models/FaultInjectType");
@@ -631,6 +632,28 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             }
         });
     }
+    setBitValue(cpuName, baseAddr, bitIndex, value, addressWidth) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                return yield this.call(RequestFactory_1.RequestFactory.getInstance().setBitValue(cpuName, baseAddr, bitIndex, value, addressWidth));
+            }
+            catch (error) {
+                console.error("Error during getAddressingSpaceDefault:", error);
+                throw error;
+            }
+        });
+    }
+    getBitValue(cpuName, baseAddr, bitIndex, addressWidth) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                return yield this.call(RequestFactory_1.RequestFactory.getInstance().getBitValue(cpuName, baseAddr, bitIndex, addressWidth));
+            }
+            catch (error) {
+                console.error("Error during getAddressingSpaceDefault:", error);
+                throw error;
+            }
+        });
+    }
     getCpuRegisters(cpuName) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = new GetCpuRegisterInfoResponse_1.GetCpuRegisterInfoResponse();
@@ -865,6 +888,26 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             return response;
         });
     }
+    getAllDeviceInfo2() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = new GetAllDeviceInfoResponse2_1.GetAllDeviceInfoResponse2();
+            try {
+                const call = yield this.call(RequestFactory_1.RequestFactory.getInstance().getAllDeviceInfo());
+                if (call != null) {
+                    response.isSuccess = true;
+                    response.result = call;
+                }
+                else {
+                    throw new SkyEyeSDKException_1.SkyEyeSDKException(String(call.error));
+                }
+            }
+            catch (error) {
+                console.error("Error during getAllDeviceInfo:", error);
+                throw error;
+            }
+            return response;
+        });
+    }
     getRamAddrInfo(machName, addr) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = new GetRamAddrInfoResponse_1.GetRamAddrInfoResponse();

package/dist/src/SkyEyeClientFactory.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SkyEyeClientFactory = void 0;
 const SkyEyeClient_1 = require("./SkyEyeClient");
+const GetRunningStateResponse_1 = require("./response/GetRunningStateResponse");
 class SkyEyeClientFactory {
     constructor() { }
     static get instance() {
@@ -31,11 +32,15 @@ class SkyEyeClientFactory {
         return __awaiter(this, void 0, void 0, function* () {
             const client = this.createClient(ip, port);
             const startTime = Date.now();
+            let isTimeout = true;
             while (Date.now() - startTime < time * 1000) {
                 try {
-                    const response = client.getCurrentRunningState();
+                    const response = yield client.getCurrentRunningState();
                     console.log("response:", response);
-                    break;
+                    if (response.getState() !== GetRunningStateResponse_1.StateState.QUITED) {
+                        isTimeout = false;
+                        break;
+                    }
                 }
                 catch (error) {
                     try {
@@ -46,6 +51,9 @@ class SkyEyeClientFactory {
                     }
                 }
             }
+            if (isTimeout) {
+                throw new Error('连接超时');
+            }
             return client;
         });
     }

package/dist/src/response/GetAllDeviceInfoResponse2.d.ts

@@ -0,0 +1,4 @@
+import { BaseResponse } from "./BaseResponse";
+export declare class GetAllDeviceInfoResponse2 extends BaseResponse {
+    result: object;
+}

package/dist/src/response/GetAllDeviceInfoResponse2.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetAllDeviceInfoResponse2 = void 0;
+const BaseResponse_1 = require("./BaseResponse");
+class GetAllDeviceInfoResponse2 extends BaseResponse_1.BaseResponse {
+}
+exports.GetAllDeviceInfoResponse2 = GetAllDeviceInfoResponse2;

package/dist/test.js

@@ -50,15 +50,29 @@ function test() {
         // const fileName = "FMQL45T900_SylixOS.skyeye";
         // const skyeyeDir = "D:/install/SkyEye/opt/skyeye/bin/skyeye.exe"
         // const port = "50066"
-        const pathSkyEye = "D:/data/case/c6713_timer_test";
-        const fileName = "c6k.skyeye";
-        const skyeyeDir = "D:/install/SkyEye/opt/skyeye/bin/skyeye.exe";
+        const pathSkyEye = "G:/SkyEye/demo/c6713_demo";
+        const fileName = "G:/SkyEye/demo/c6713_demo/c6713_demo.skyeye";
+        const skyeyeDir = "G:/SkyEye/opt/skyeye/bin/skyeye.exe";
         const port = "50053";
         const client = SkyEyeClientFactory.instance.createClient('127.0.0.1', port);
         const t = yield client.initSkyEyeAndRun2(pathSkyEye, fileName, port, skyeyeDir);
-        client.runCommand();
-        const response = yield client.runToTime("c67x_core_0", "1");
-        console.log("response:", response);
+        yield client.runCommand();
+        setTimeout(() => __awaiter(this, void 0, void 0, function* () {
+            let response = yield client.stopCommand();
+            console.log("response:", response);
+            response = yield client.getMemoryValue('c67x_core_0', '16120', '1', 8);
+            console.log("response:", response);
+            response = yield client.getBitValue('c67x_core_0', '16120', 1, 8);
+            console.log("response:", response);
+            response = yield client.setBitValue('c67x_core_0', '16120', 1, 0, 8);
+            console.log("response:", response);
+            response = yield client.getMemoryValue('c67x_core_0', '16120', '1', 8);
+            console.log("response:", response);
+            response = yield client.getBitValue('c67x_core_0', '16120', 1, 8);
+            console.log("response:", response);
+        }), 2000);
+        // response = client.setBitValue('c67x_core_0', '0x1000','1',  8)
+        // console.log("response:", response)
         // const responseCpuList = await client.getCpuList()
         // console.log("responseCpuList:", responseCpuList)
         // const client = SkyEyeClientFactory.instance.createClient('127.0.0.1', 50056);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skyeye-sdk-js",
-  "version": "1.4.9",
+  "version": "1.4.11",
   "description": "gRPC to SkyEye",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/RequestFactory.ts

@@ -107,6 +107,32 @@ export class RequestFactory {
         return request;
     }
 
+    public getBitValue(cpuName: string, baseAddr: string, bitIndex: number, addressWidth?: number) {
+        const baseRequest = new BaseRequest("SE_get_bit_value");
+        const args: { [key: string]: any } = {};
+        args.cpuname = cpuName;
+        args.baseaddr = "0x" + baseAddr;
+        args.bitindex = bitIndex;
+        args.address_width = addressWidth;
+        baseRequest.setArgs(args)
+        const request = new JSONRequest()
+        request.setRequest(baseRequest.toJSONString());
+        return request;
+    }
+    public setBitValue(cpuName: string, baseAddr: string, bitIndex: number, value: number, addressWidth?: number) {
+        const baseRequest = new BaseRequest("SE_set_bit_value");
+        const args: { [key: string]: any } = {};
+        args.cpuname = cpuName;
+        args.baseaddr = "0x" + baseAddr;
+        args.bitindex = bitIndex;
+        args.value = value;
+        args.address_width = addressWidth;
+        baseRequest.setArgs(args)
+        const request = new JSONRequest()
+        request.setRequest(baseRequest.toJSONString());
+        return request;
+    }
+
 
 
     public enableDeviceWork(deviceName: string) {

package/src/SkyEyeClient.ts

@@ -12,6 +12,7 @@ import { Register } from './models/Register';
 import { GetDeviceTreeResponse } from './response/GetDeviceTreeResponse';
 import { ParseBoardUtils } from './utils/ParseBoardUtils';
 import { GetAllDeviceInfoResponse } from './response/GetAllDeviceInfoResponse';
+import { GetAllDeviceInfoResponse2 } from './response/GetAllDeviceInfoResponse2';
 import { GetRamAddrInfoResponse } from './response/GetRamAddrInfoResponse';
 import { Device } from './models/Device';
 import { FaultInjectType } from './models/FaultInjectType';
@@ -554,6 +555,23 @@ export class SkyEyeClient extends JSONTransmissionClient {
         }
     }
 
+    public async setBitValue(cpuName: string, baseAddr: string, bitIndex: number, value: number, addressWidth?: number) {
+        try {
+            return await this.call(RequestFactory.getInstance().setBitValue(cpuName, baseAddr, bitIndex , value, addressWidth));
+        } catch (error) {
+            console.error("Error during getAddressingSpaceDefault:", error);
+            throw error;
+        }
+    }
+
+    public async getBitValue(cpuName: string, baseAddr: string, bitIndex: number, addressWidth?: number) {
+        try {
+            return await this.call(RequestFactory.getInstance().getBitValue(cpuName, baseAddr, bitIndex, addressWidth));
+        } catch (error) {
+            console.error("Error during getAddressingSpaceDefault:", error);
+            throw error;
+        }
+    }
 
 
     public async getCpuRegisters(cpuName: string) {
@@ -786,6 +804,24 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
+    public async getAllDeviceInfo2() {
+        const response = new GetAllDeviceInfoResponse2();
+        try {
+            const call = await this.call(RequestFactory.getInstance().getAllDeviceInfo());
+            if (call != null) {
+                response.isSuccess = true;
+                response.result = call;
+            } else {
+                throw new SkyEyeSDKException(String(call.error));
+            }
+        } catch (error) {
+            console.error("Error during getAllDeviceInfo:", error);
+            throw error;
+        }
+        return response;
+    }
+
+
     public async getRamAddrInfo(machName: string, addr: string) {
         const response = new GetRamAddrInfoResponse();
         try {

package/src/SkyEyeClientFactory.ts

@@ -2,6 +2,7 @@ import { SkyEyeClient } from "./SkyEyeClient";
 import { RequestFactory } from "./RequestFactory";
 import { JSONResponse } from "./proto/skyeye_rpc_pb";
 import { time } from "console";
+import { StateState } from "./response/GetRunningStateResponse";
 
 class SkyEyeClientFactory {
     private static _instance: SkyEyeClientFactory;
@@ -26,11 +27,16 @@ class SkyEyeClientFactory {
     public async createConnectedClientTime(ip: string, port: string, time: number): Promise<SkyEyeClient> {
         const client = this.createClient(ip, port);
         const startTime: number = Date.now();
+        let isTimeout = true
         while (Date.now() - startTime < time * 1000) {
             try {
-                const response = client.getCurrentRunningState();
+                const response = await client.getCurrentRunningState();
                 console.log("response:", response);
-                break;
+                if (response.getState() !== StateState.QUITED) {
+                    isTimeout = false
+                    break
+                }
+                
             } catch (error) {
                 try {
                     await new Promise(resolve => setTimeout(resolve, 100));
@@ -39,6 +45,9 @@ class SkyEyeClientFactory {
                 }
             }
         }
+        if (isTimeout) {
+            throw new Error('连接超时')
+        }
         return client;
     }
 }

package/src/response/GetAllDeviceInfoResponse2.ts

@@ -0,0 +1,6 @@
+import { Board } from "../models/Board";
+import { BaseResponse } from "./BaseResponse";
+
+export class GetAllDeviceInfoResponse2 extends BaseResponse{
+    result: object;
+}

package/test.ts

@@ -57,15 +57,30 @@ async function test() {
     // const skyeyeDir = "D:/install/SkyEye/opt/skyeye/bin/skyeye.exe"
     // const port = "50066"
 
-    const pathSkyEye = "D:/data/case/c6713_timer_test";
-    const fileName = "c6k.skyeye";
-    const skyeyeDir = "D:/install/SkyEye/opt/skyeye/bin/skyeye.exe"
+    const pathSkyEye = "G:/SkyEye/demo/c6713_demo";
+    const fileName = "G:/SkyEye/demo/c6713_demo/c6713_demo.skyeye";
+    const skyeyeDir = "G:/SkyEye/opt/skyeye/bin/skyeye.exe"
     const port = "50053"
     const client = SkyEyeClientFactory.instance.createClient('127.0.0.1', port);
     const t = await client.initSkyEyeAndRun2(pathSkyEye, fileName, port, skyeyeDir)
-    client.runCommand();
-    const response = await client.runToTime("c67x_core_0","1");
-    console.log("response:", response)
+    await client.runCommand()
+    setTimeout(async () => {
+        let response = await client.stopCommand()
+        console.log("response:", response)
+        response = await client.getMemoryValue('c67x_core_0', '16120','1', 8)
+        console.log("response:", response)
+        response = await client.getBitValue('c67x_core_0', '16120',1, 8)
+        console.log("response:", response)
+        response = await client.setBitValue('c67x_core_0', '16120',1, 0,  8)
+        console.log("response:", response)
+        response = await client.getMemoryValue('c67x_core_0', '16120','1', 8)
+        console.log("response:", response)
+        response = await client.getBitValue('c67x_core_0', '16120',1, 8)
+        console.log("response:", response)
+    },2000)
+
+    // response = client.setBitValue('c67x_core_0', '0x1000','1',  8)
+    // console.log("response:", response)
 
     // const responseCpuList = await client.getCpuList()
     // console.log("responseCpuList:", responseCpuList)