motion-master-client 0.0.415 → 0.0.416
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/lib/encoder.d.ts +4 -1
- package/src/lib/encoder.js +9 -0
- package/src/lib/encoder.js.map +1 -1
package/package.json
CHANGED
package/src/lib/encoder.d.ts
CHANGED
|
@@ -117,7 +117,7 @@ export declare function getCirculoEncoderBatteryModeOptions(productId: number |
|
|
|
117
117
|
value: number;
|
|
118
118
|
}[];
|
|
119
119
|
export type EncoderConfigurationSubitemSetBy = 'none' | 'user' | 'firmware' | 'both';
|
|
120
|
-
export type EncoderConfigurationExceptionCase = 'case1' | 'case2' | 'case3';
|
|
120
|
+
export type EncoderConfigurationExceptionCase = 'case1' | 'case2' | 'case3' | 'case4';
|
|
121
121
|
/**
|
|
122
122
|
* Represents the usage of encoder configurations across different firmware versions and products.
|
|
123
123
|
*
|
|
@@ -166,6 +166,9 @@ export interface EncoderConfigurationUsage {
|
|
|
166
166
|
/**
|
|
167
167
|
* Selects the encoder configuration exception case based on the encoder ordinal, type, and product ID
|
|
168
168
|
*
|
|
169
|
+
* A Jasper drive is always case 4, whatever its product ID, encoder port and encoder type, so the firmware
|
|
170
|
+
* version is checked first and on its own.
|
|
171
|
+
*
|
|
169
172
|
* @param productId - The product ID to check against.
|
|
170
173
|
* @param encoderPort - The encoder port to check.
|
|
171
174
|
* @param encoderType - The encoder type to check.
|
package/src/lib/encoder.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getEncoderResolutionBits = exports.getEncoderConfigurationExceptionCase = exports.getCirculoEncoderBatteryModeOptions = exports.getCirculoEncoderBatteryModeDefaultValue = exports.circuloEncoderBatteryModeMap = exports.mapCirculoEncoderRegisterValueToErrors = exports.circuloEncoderRegisterErrors = exports.CirculoEncoderRegisterAddress = void 0;
|
|
4
4
|
const semver_1 = require("semver");
|
|
5
|
+
const firmware_1 = require("./firmware");
|
|
5
6
|
const product_1 = require("./product");
|
|
6
7
|
/**
|
|
7
8
|
* Enum of Circulo encoder register addresses.
|
|
@@ -294,6 +295,9 @@ exports.getCirculoEncoderBatteryModeOptions = getCirculoEncoderBatteryModeOption
|
|
|
294
295
|
/**
|
|
295
296
|
* Selects the encoder configuration exception case based on the encoder ordinal, type, and product ID
|
|
296
297
|
*
|
|
298
|
+
* A Jasper drive is always case 4, whatever its product ID, encoder port and encoder type, so the firmware
|
|
299
|
+
* version is checked first and on its own.
|
|
300
|
+
*
|
|
297
301
|
* @param productId - The product ID to check against.
|
|
298
302
|
* @param encoderPort - The encoder port to check.
|
|
299
303
|
* @param encoderType - The encoder type to check.
|
|
@@ -304,6 +308,11 @@ exports.getCirculoEncoderBatteryModeOptions = getCirculoEncoderBatteryModeOption
|
|
|
304
308
|
function getEncoderConfigurationExceptionCase(productId, encoderPort, encoderType, firmwareMajorMinorVersion) {
|
|
305
309
|
const id = (0, product_1.resolveEncoderProductId)(productId);
|
|
306
310
|
const firmwareVersion = `${firmwareMajorMinorVersion}.0`;
|
|
311
|
+
// Case 4: it's a Jasper drive. Jasper is v10 and every board that runs it has the same integrated encoder,
|
|
312
|
+
// so the firmware version alone decides the case and none of the pre-Jasper cases below can apply.
|
|
313
|
+
if ((0, firmware_1.isJasperFirmware)(firmwareVersion)) {
|
|
314
|
+
return 'case4';
|
|
315
|
+
}
|
|
307
316
|
// Case 1
|
|
308
317
|
const case1EncoderTypes = (0, semver_1.satisfies)(firmwareVersion, '>=5.0 <5.1') ? [4] : [4, 5];
|
|
309
318
|
if ((0, semver_1.satisfies)(firmwareVersion, '>=5.0') &&
|
package/src/lib/encoder.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encoder.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/encoder.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;
|
|
1
|
+
{"version":3,"file":"encoder.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/encoder.ts"],"names":[],"mappings":"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"}
|