@digipair/skill-mybuddy 0.23.5 → 0.23.7

package/index.cjs.js

@@ -22,181 +22,155 @@ let MyBuddyService = class MyBuddyService {
         const { device, angles, speed = 50 } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].sendAngles(device, angles, speed));
-        connection.close();
         return result;
     }
     async powerOn(params, _pinsSettingsList, context) {
         const { device } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].powerOn(device));
-        connection.close();
         return result;
     }
     async powerOff(params, _pinsSettingsList, context) {
         const { device } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].powerOff(device));
-        connection.close();
         return result;
     }
     async releaseAllServos(params, _pinsSettingsList, context) {
         const { device } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].releaseAllServos(device));
-        connection.close();
         return result;
     }
     async sendAngle(params, _pinsSettingsList, context) {
         const { device, id = 1, degree = 0, speed = 60 } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].sendAngle(device, id, degree, speed));
-        connection.close();
         return result;
     }
     async sendCoords(params, _pinsSettingsList, context) {
         const { device, coords, speed, mode } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].sendCoords(device, coords, speed, mode));
-        connection.close();
         return result;
     }
     async programPause(params, _pinsSettingsList, context) {
         const { device } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].programPause(device));
-        connection.close();
         return result;
     }
     async programResume(params, _pinsSettingsList, context) {
         const { device } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].programResume(device));
-        connection.close();
         return result;
     }
     async stop(params, _pinsSettingsList, context) {
         const { device } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].stop(device));
-        connection.close();
         return result;
     }
     async jogAngle(params, _pinsSettingsList, context) {
         const { device, joint_id, direction, speed } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].jogAngle(device, joint_id, direction, speed));
-        connection.close();
         return result;
     }
     async jogCoord(params, _pinsSettingsList, context) {
         const { device, coord_id, direction, speed } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].jogCoord(device, coord_id, direction, speed));
-        connection.close();
         return result;
     }
     async jogStop(params, _pinsSettingsList, context) {
         const { device } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].jogStop(device));
-        connection.close();
         return result;
     }
     async setEncoder(params, _pinsSettingsList, context) {
         const { device, joint_id, encoder } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].setEncoder(device, joint_id, encoder));
-        connection.close();
         return result;
     }
     async setEncoders(params, _pinsSettingsList, context) {
         const { device, encoders, speed } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].setEncoders(device, encoders, speed));
-        connection.close();
         return result;
     }
     async setSpeed(params, _pinsSettingsList, context) {
         const { device, speed } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].setSpeed(device, speed));
-        connection.close();
         return result;
     }
     async setServoData(params, _pinsSettingsList, context) {
         const { device, servo_no, data_id, value } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].setServoData(device, servo_no, data_id, value));
-        connection.close();
         return result;
     }
     async setServoCalibration(params, _pinsSettingsList, context) {
         const { device, servo_no } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].setServoCalibration(device, servo_no));
-        connection.close();
         return result;
     }
     async releaseServo(params, _pinsSettingsList, context) {
         const { device, servo_no } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].releaseServo(device, servo_no));
-        connection.close();
         return result;
     }
     async focusServo(params, _pinsSettingsList, context) {
         const { device, servo_no } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].focusServo(device, servo_no));
-        connection.close();
         return result;
     }
     async setPinMode(params, _pinsSettingsList, context) {
         const { device, pin_no, pin_mode } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].setPinMode(device, pin_no, pin_mode));
-        connection.close();
         return result;
     }
     async setDigitalOutput(params, _pinsSettingsList, context) {
         const { device, pin_no, pin_signal } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].setDigitalOutput(device, pin_no, pin_signal));
-        connection.close();
         return result;
     }
     async setGripperState(params, _pinsSettingsList, context) {
         const { device, flag, speed } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].setGripperState(device, flag, speed));
-        connection.close();
         return result;
     }
     async setGripperValue(params, _pinsSettingsList, context) {
         const { device, value, speed } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].setGripperValue(device, value, speed));
-        connection.close();
         return result;
     }
     async setGripperIni(params, _pinsSettingsList, context) {
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].setGripperIni());
-        connection.close();
         return result;
     }
     async setBasicOutput(params, _pinsSettingsList, context) {
         const { device, pin_no, pin_signal } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].setBasicOutput(device, pin_no, pin_signal));
-        connection.close();
         return result;
     }
     async setColor(params, _pinsSettingsList, context) {
         const { device, r, g, b } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy__default["default"].setColor(device, r, g, b));
-        connection.close();
         return result;
     }
     // Data Retrieval
@@ -227,10 +201,17 @@ let MyBuddyService = class MyBuddyService {
         return data;
     }
     async isControllerConnect(params, _pinsSettingsList, context) {
+        const { device } = params;
+        let data = null;
         const connection = await this.connect(params, context);
-        const result = connection.write(mybuddy__default["default"].isControllerConnect());
-        connection.close();
-        return result;
+        connection.on('data', (data)=>{
+            if (data[0] === 0xfe && data[1] === 0xfe && data[2] === device && data[4] === parseInt(mybuddy__default["default"].COMMAND.IS_CONTROLLER_CONNECTED, 16)) {
+                data = mybuddy__default["default"].processReceived(data);
+                connection.close();
+            }
+        });
+        connection.write(mybuddy__default["default"].isControllerConnect());
+        return data;
     }
     async getCoords(params, _pinsSettingsList, context) {
         const { device } = params;

package/index.esm.js

@@ -14,181 +14,155 @@ let MyBuddyService = class MyBuddyService {
         const { device, angles, speed = 50 } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.sendAngles(device, angles, speed));
-        connection.close();
         return result;
     }
     async powerOn(params, _pinsSettingsList, context) {
         const { device } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.powerOn(device));
-        connection.close();
         return result;
     }
     async powerOff(params, _pinsSettingsList, context) {
         const { device } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.powerOff(device));
-        connection.close();
         return result;
     }
     async releaseAllServos(params, _pinsSettingsList, context) {
         const { device } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.releaseAllServos(device));
-        connection.close();
         return result;
     }
     async sendAngle(params, _pinsSettingsList, context) {
         const { device, id = 1, degree = 0, speed = 60 } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.sendAngle(device, id, degree, speed));
-        connection.close();
         return result;
     }
     async sendCoords(params, _pinsSettingsList, context) {
         const { device, coords, speed, mode } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.sendCoords(device, coords, speed, mode));
-        connection.close();
         return result;
     }
     async programPause(params, _pinsSettingsList, context) {
         const { device } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.programPause(device));
-        connection.close();
         return result;
     }
     async programResume(params, _pinsSettingsList, context) {
         const { device } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.programResume(device));
-        connection.close();
         return result;
     }
     async stop(params, _pinsSettingsList, context) {
         const { device } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.stop(device));
-        connection.close();
         return result;
     }
     async jogAngle(params, _pinsSettingsList, context) {
         const { device, joint_id, direction, speed } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.jogAngle(device, joint_id, direction, speed));
-        connection.close();
         return result;
     }
     async jogCoord(params, _pinsSettingsList, context) {
         const { device, coord_id, direction, speed } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.jogCoord(device, coord_id, direction, speed));
-        connection.close();
         return result;
     }
     async jogStop(params, _pinsSettingsList, context) {
         const { device } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.jogStop(device));
-        connection.close();
         return result;
     }
     async setEncoder(params, _pinsSettingsList, context) {
         const { device, joint_id, encoder } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.setEncoder(device, joint_id, encoder));
-        connection.close();
         return result;
     }
     async setEncoders(params, _pinsSettingsList, context) {
         const { device, encoders, speed } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.setEncoders(device, encoders, speed));
-        connection.close();
         return result;
     }
     async setSpeed(params, _pinsSettingsList, context) {
         const { device, speed } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.setSpeed(device, speed));
-        connection.close();
         return result;
     }
     async setServoData(params, _pinsSettingsList, context) {
         const { device, servo_no, data_id, value } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.setServoData(device, servo_no, data_id, value));
-        connection.close();
         return result;
     }
     async setServoCalibration(params, _pinsSettingsList, context) {
         const { device, servo_no } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.setServoCalibration(device, servo_no));
-        connection.close();
         return result;
     }
     async releaseServo(params, _pinsSettingsList, context) {
         const { device, servo_no } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.releaseServo(device, servo_no));
-        connection.close();
         return result;
     }
     async focusServo(params, _pinsSettingsList, context) {
         const { device, servo_no } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.focusServo(device, servo_no));
-        connection.close();
         return result;
     }
     async setPinMode(params, _pinsSettingsList, context) {
         const { device, pin_no, pin_mode } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.setPinMode(device, pin_no, pin_mode));
-        connection.close();
         return result;
     }
     async setDigitalOutput(params, _pinsSettingsList, context) {
         const { device, pin_no, pin_signal } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.setDigitalOutput(device, pin_no, pin_signal));
-        connection.close();
         return result;
     }
     async setGripperState(params, _pinsSettingsList, context) {
         const { device, flag, speed } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.setGripperState(device, flag, speed));
-        connection.close();
         return result;
     }
     async setGripperValue(params, _pinsSettingsList, context) {
         const { device, value, speed } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.setGripperValue(device, value, speed));
-        connection.close();
         return result;
     }
     async setGripperIni(params, _pinsSettingsList, context) {
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.setGripperIni());
-        connection.close();
         return result;
     }
     async setBasicOutput(params, _pinsSettingsList, context) {
         const { device, pin_no, pin_signal } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.setBasicOutput(device, pin_no, pin_signal));
-        connection.close();
         return result;
     }
     async setColor(params, _pinsSettingsList, context) {
         const { device, r, g, b } = params;
         const connection = await this.connect(params, context);
         const result = connection.write(mybuddy.setColor(device, r, g, b));
-        connection.close();
         return result;
     }
     // Data Retrieval
@@ -219,10 +193,17 @@ let MyBuddyService = class MyBuddyService {
         return data;
     }
     async isControllerConnect(params, _pinsSettingsList, context) {
+        const { device } = params;
+        let data = null;
         const connection = await this.connect(params, context);
-        const result = connection.write(mybuddy.isControllerConnect());
-        connection.close();
-        return result;
+        connection.on('data', (data)=>{
+            if (data[0] === 0xfe && data[1] === 0xfe && data[2] === device && data[4] === parseInt(mybuddy.COMMAND.IS_CONTROLLER_CONNECTED, 16)) {
+                data = mybuddy.processReceived(data);
+                connection.close();
+            }
+        });
+        connection.write(mybuddy.isControllerConnect());
+        return data;
     }
     async getCoords(params, _pinsSettingsList, context) {
         const { device } = params;

package/libs/skill-mybuddy/src/lib/skill-mybuddy.d.ts

@@ -27,7 +27,7 @@ export declare const setGripperIni: (params: any, pinsSettingsList: PinsSettings
 export declare const setBasicOutput: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
 export declare const setColor: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
 export declare const isPowerOn: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<null>;
-export declare const isControllerConnect: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
+export declare const isControllerConnect: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<null>;
 export declare const getCoords: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<null>;
 export declare const isInPosition: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<null>;
 export declare const getEncoder: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<null>;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@digipair/skill-mybuddy",
-  "version": "0.23.5",
+  "version": "0.23.7",
   "dependencies": {
-    "@marcbuils/mybuddy": "^0.0.8"
+    "@marcbuils/mybuddy": "^0.0.9"
   },
   "main": "./index.cjs.js",
   "module": "./index.esm.js"

package/schema.json

@@ -857,7 +857,17 @@
       "post": {
         "tags": ["service"],
         "summary": "Vérifie si le contrôleur est connecté",
-        "parameters": [],
+        "parameters": [
+          {
+            "name": "device",
+            "summary": "Identifiant du device",
+            "required": true,
+            "description": "Identifiant du device concerné (0 = Tous, 1 = Bras gauche, 2 = Bras droit, 3 = Corps)",
+            "schema": {
+              "type": "number"
+            }
+          }
+        ],
         "x-events": []
       }
     },