jooby-codec 2.0.0 → 2.1.0
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/dist/analog/CommandBinaryBuffer.d.ts +2 -2
- package/dist/analog/CommandBinaryBuffer.js +5 -5
- package/dist/analog/CommandBinaryBuffer.js.map +1 -1
- package/dist/analog/commands/downlink/GetArchiveDaysMC.d.ts +1 -1
- package/dist/analog/commands/downlink/GetArchiveDaysMC.js +5 -5
- package/dist/analog/commands/downlink/GetArchiveDaysMC.js.map +1 -1
- package/dist/analog/commands/downlink/GetArchiveEvents.d.ts +1 -1
- package/dist/analog/commands/downlink/GetArchiveEvents.js +5 -5
- package/dist/analog/commands/downlink/GetArchiveEvents.js.map +1 -1
- package/dist/analog/commands/downlink/GetArchiveHoursMC.d.ts +1 -1
- package/dist/analog/commands/downlink/GetArchiveHoursMC.js +5 -5
- package/dist/analog/commands/downlink/GetArchiveHoursMC.js.map +1 -1
- package/dist/analog/commands/downlink/GetExAbsArchiveDaysMC.d.ts +1 -1
- package/dist/analog/commands/downlink/GetExAbsArchiveDaysMC.js +5 -5
- package/dist/analog/commands/downlink/GetExAbsArchiveDaysMC.js.map +1 -1
- package/dist/analog/commands/downlink/GetExAbsArchiveHoursMC.d.ts +1 -1
- package/dist/analog/commands/downlink/GetExAbsArchiveHoursMC.js +5 -5
- package/dist/analog/commands/downlink/GetExAbsArchiveHoursMC.js.map +1 -1
- package/dist/analog/commands/uplink/DayMC.d.ts +1 -1
- package/dist/analog/commands/uplink/DayMC.js +6 -6
- package/dist/analog/commands/uplink/DayMC.js.map +1 -1
- package/dist/analog/commands/uplink/ExAbsDayMC.d.ts +1 -1
- package/dist/analog/commands/uplink/ExAbsDayMC.js +5 -5
- package/dist/analog/commands/uplink/ExAbsDayMC.js.map +1 -1
- package/dist/analog/commands/uplink/ExAbsHourMC.d.ts +1 -1
- package/dist/analog/commands/uplink/ExAbsHourMC.js +6 -6
- package/dist/analog/commands/uplink/ExAbsHourMC.js.map +1 -1
- package/dist/analog/commands/uplink/GetArchiveDaysMCResponse.d.ts +1 -1
- package/dist/analog/commands/uplink/GetArchiveDaysMCResponse.js +5 -5
- package/dist/analog/commands/uplink/GetArchiveDaysMCResponse.js.map +1 -1
- package/dist/analog/commands/uplink/GetArchiveEventsResponse.d.ts +1 -1
- package/dist/analog/commands/uplink/GetArchiveEventsResponse.js +7 -7
- package/dist/analog/commands/uplink/GetArchiveEventsResponse.js.map +1 -1
- package/dist/analog/commands/uplink/GetArchiveHoursMCResponse.d.ts +1 -1
- package/dist/analog/commands/uplink/GetArchiveHoursMCResponse.js +3 -3
- package/dist/analog/commands/uplink/GetArchiveHoursMCResponse.js.map +1 -1
- package/dist/analog/commands/uplink/GetExAbsArchiveDaysMCResponse.d.ts +1 -1
- package/dist/analog/commands/uplink/GetExAbsArchiveDaysMCResponse.js +5 -5
- package/dist/analog/commands/uplink/GetExAbsArchiveDaysMCResponse.js.map +1 -1
- package/dist/analog/commands/uplink/GetExAbsArchiveHoursMCResponse.d.ts +1 -1
- package/dist/analog/commands/uplink/GetExAbsArchiveHoursMCResponse.js +5 -5
- package/dist/analog/commands/uplink/GetExAbsArchiveHoursMCResponse.js.map +1 -1
- package/dist/analog/commands/uplink/HourMC.d.ts +1 -1
- package/dist/analog/commands/uplink/HourMC.js +5 -5
- package/dist/analog/commands/uplink/HourMC.js.map +1 -1
- package/dist/analog/commands/uplink/NewEvent.d.ts +1 -1
- package/dist/analog/commands/uplink/NewEvent.js +6 -6
- package/dist/analog/commands/uplink/NewEvent.js.map +1 -1
- package/dist/analog/commands/uplink/Time2000.d.ts +1 -1
- package/dist/analog/commands/uplink/Time2000.js +4 -4
- package/dist/analog/commands/uplink/Time2000.js.map +1 -1
- package/dist/obis-observer/commands/downlink/ReadArchive.d.ts +2 -1
- package/dist/obis-observer/commands/downlink/ReadArchive.js +5 -5
- package/dist/obis-observer/commands/downlink/ReadArchive.js.map +1 -1
- package/dist/obis-observer/commands/uplink/ObservationReport.d.ts +2 -1
- package/dist/obis-observer/commands/uplink/ObservationReport.js +5 -5
- package/dist/obis-observer/commands/uplink/ObservationReport.js.map +1 -1
- package/dist/obis-observer/commands/uplink/ObservationReportString.d.ts +2 -1
- package/dist/obis-observer/commands/uplink/ObservationReportString.js +5 -5
- package/dist/obis-observer/commands/uplink/ObservationReportString.js.map +1 -1
- package/dist/obis-observer/commands/uplink/ReadArchiveResponse.d.ts +2 -1
- package/dist/obis-observer/commands/uplink/ReadArchiveResponse.js +5 -5
- package/dist/obis-observer/commands/uplink/ReadArchiveResponse.js.map +1 -1
- package/dist/utils/time.d.ts +2 -2
- package/dist/utils/time.js +2 -2
- package/dist/utils/time.js.map +1 -1
- package/package.json +1 -1
- package/readme.md +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExAbsHourMC.js","sourceRoot":"","sources":["../../../../src/analog/commands/uplink/ExAbsHourMC.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"ExAbsHourMC.js","sourceRoot":"","sources":["../../../../src/analog/commands/uplink/ExAbsHourMC.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { IChannelDays } from '../../CommandBinaryBuffer.js';
|
|
|
3
3
|
import { TTime2000 } from '../../../utils/time.js';
|
|
4
4
|
interface IGetArchiveDaysMCResponseParameters {
|
|
5
5
|
channelList: Array<IChannelDays>;
|
|
6
|
-
|
|
6
|
+
startTime2000: TTime2000;
|
|
7
7
|
days: number;
|
|
8
8
|
}
|
|
9
9
|
declare class GetArchiveDaysMCResponse extends Command {
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import Command from '../../Command.js';
|
|
2
2
|
import CommandBinaryBuffer from '../../CommandBinaryBuffer.js';
|
|
3
3
|
import { UPLINK } from '../../constants/directions.js';
|
|
4
|
-
import {
|
|
4
|
+
import { getTime2000FromDate } from '../../../utils/time.js';
|
|
5
5
|
const COMMAND_ID = 0x1b;
|
|
6
6
|
const COMMAND_BODY_MAX_SIZE = 5104;
|
|
7
7
|
const examples = [
|
|
8
8
|
{
|
|
9
9
|
name: 'get day values from 2001.03.10 12:00:00 GMT for channel 1',
|
|
10
10
|
parameters: {
|
|
11
|
-
|
|
11
|
+
startTime2000: 2678227200,
|
|
12
12
|
days: 2,
|
|
13
13
|
channelList: [
|
|
14
14
|
{
|
|
@@ -42,12 +42,12 @@ class GetArchiveDaysMCResponse extends Command {
|
|
|
42
42
|
dayList.push(buffer.getExtendedValue());
|
|
43
43
|
}
|
|
44
44
|
});
|
|
45
|
-
return new GetArchiveDaysMCResponse({ channelList, days,
|
|
45
|
+
return new GetArchiveDaysMCResponse({ channelList, days, startTime2000: getTime2000FromDate(date) });
|
|
46
46
|
}
|
|
47
47
|
toBytes() {
|
|
48
48
|
const buffer = new CommandBinaryBuffer(COMMAND_BODY_MAX_SIZE);
|
|
49
|
-
const { days,
|
|
50
|
-
buffer.setDate(
|
|
49
|
+
const { days, startTime2000, channelList } = this.parameters;
|
|
50
|
+
buffer.setDate(startTime2000);
|
|
51
51
|
buffer.setChannels(channelList);
|
|
52
52
|
buffer.setUint8(days);
|
|
53
53
|
channelList.forEach(({ dayList }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetArchiveDaysMCResponse.js","sourceRoot":"","sources":["../../../../src/analog/commands/uplink/GetArchiveDaysMCResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmC,MAAM,8BAA8B,CAAC;AAC/E,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AACrD,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"GetArchiveDaysMCResponse.js","sourceRoot":"","sources":["../../../../src/analog/commands/uplink/GetArchiveDaysMCResponse.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ const examples = [
|
|
|
10
10
|
parameters: {
|
|
11
11
|
eventList: [
|
|
12
12
|
{
|
|
13
|
-
|
|
13
|
+
time2000: 734015840,
|
|
14
14
|
id: events.MAGNET_ON,
|
|
15
15
|
sequenceNumber: 1
|
|
16
16
|
}
|
|
@@ -23,22 +23,22 @@ const examples = [
|
|
|
23
23
|
parameters: {
|
|
24
24
|
eventList: [
|
|
25
25
|
{
|
|
26
|
-
|
|
26
|
+
time2000: 734015840,
|
|
27
27
|
id: events.MAGNET_OFF,
|
|
28
28
|
sequenceNumber: 1
|
|
29
29
|
},
|
|
30
30
|
{
|
|
31
|
-
|
|
31
|
+
time2000: 734025840,
|
|
32
32
|
id: events.MAGNET_ON,
|
|
33
33
|
sequenceNumber: 2
|
|
34
34
|
},
|
|
35
35
|
{
|
|
36
|
-
|
|
36
|
+
time2000: 734035840,
|
|
37
37
|
id: events.ACTIVATE,
|
|
38
38
|
sequenceNumber: 3
|
|
39
39
|
},
|
|
40
40
|
{
|
|
41
|
-
|
|
41
|
+
time2000: 734045840,
|
|
42
42
|
id: events.DEACTIVATE,
|
|
43
43
|
sequenceNumber: 4
|
|
44
44
|
}
|
|
@@ -48,12 +48,12 @@ const examples = [
|
|
|
48
48
|
}
|
|
49
49
|
];
|
|
50
50
|
const getEvent = (buffer) => ({
|
|
51
|
-
|
|
51
|
+
time2000: buffer.getTime(),
|
|
52
52
|
id: buffer.getUint8(),
|
|
53
53
|
sequenceNumber: buffer.getUint8()
|
|
54
54
|
});
|
|
55
55
|
const setEvent = (buffer, event) => {
|
|
56
|
-
buffer.setTime(event.
|
|
56
|
+
buffer.setTime(event.time2000);
|
|
57
57
|
buffer.setUint8(event.id);
|
|
58
58
|
buffer.setUint8(event.sequenceNumber);
|
|
59
59
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetArchiveEventsResponse.js","sourceRoot":"","sources":["../../../../src/analog/commands/uplink/GetArchiveEventsResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AACrD,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAyBpD,MAAM,UAAU,GAAG,IAAI,CAAC;AAGxB,MAAM,qBAAqB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAExC,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,gDAAgD;QACtD,UAAU,EAAE;YACR,SAAS,EAAE;gBACP;oBACI,
|
|
1
|
+
{"version":3,"file":"GetArchiveEventsResponse.js","sourceRoot":"","sources":["../../../../src/analog/commands/uplink/GetArchiveEventsResponse.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { IChannelHours } from '../../CommandBinaryBuffer.js';
|
|
|
3
3
|
import { TTime2000 } from '../../../utils/time.js';
|
|
4
4
|
interface IGetArchiveHoursMCResponseParameters {
|
|
5
5
|
channelList: Array<IChannelHours>;
|
|
6
|
-
|
|
6
|
+
startTime2000: TTime2000;
|
|
7
7
|
hours: number;
|
|
8
8
|
}
|
|
9
9
|
declare class GetArchiveHoursMCResponse extends Command {
|
|
@@ -7,7 +7,7 @@ const examples = [
|
|
|
7
7
|
{
|
|
8
8
|
name: '4 channels at 2023.12.23 12:00:00 GMT',
|
|
9
9
|
parameters: {
|
|
10
|
-
|
|
10
|
+
startTime2000: 756648000,
|
|
11
11
|
hours: 1,
|
|
12
12
|
channelList: [
|
|
13
13
|
{ index: 1, value: 131, diff: [10] },
|
|
@@ -31,8 +31,8 @@ class GetArchiveHoursMCResponse extends Command {
|
|
|
31
31
|
}
|
|
32
32
|
toBytes() {
|
|
33
33
|
const buffer = new CommandBinaryBuffer(COMMAND_BODY_MAX_SIZE);
|
|
34
|
-
const { hours,
|
|
35
|
-
buffer.setChannelsValuesWithHourDiff(hours,
|
|
34
|
+
const { hours, startTime2000, channelList } = this.parameters;
|
|
35
|
+
buffer.setChannelsValuesWithHourDiff(hours, startTime2000, channelList);
|
|
36
36
|
return Command.toBytes(COMMAND_ID, buffer.getBytesToOffset());
|
|
37
37
|
}
|
|
38
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetArchiveHoursMCResponse.js","sourceRoot":"","sources":["../../../../src/analog/commands/uplink/GetArchiveHoursMCResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAoC,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAcrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAKxB,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAElC,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,uCAAuC;QAC7C,UAAU,EAAE;YACR,
|
|
1
|
+
{"version":3,"file":"GetArchiveHoursMCResponse.js","sourceRoot":"","sources":["../../../../src/analog/commands/uplink/GetArchiveHoursMCResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAoC,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAcrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAKxB,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAElC,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,uCAAuC;QAC7C,UAAU,EAAE;YACR,aAAa,EAAE,SAAS;YACxB,KAAK,EAAE,CAAC;YACR,WAAW,EAAE;gBACT,EAAC,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAC;gBAClC,EAAC,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAC;gBAChC,EAAC,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAC;gBAChC,EAAC,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAC;aACpC;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,wCAAwC,EAAC;KACzE;CACJ,CAAC;AA+BF,MAAM,yBAA0B,SAAQ,OAAO;IAC3C,YAAqB,UAAgD;QACjE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAsC;QAGjE,IAAI,CAAC,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IAChG,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,IAAI,yBAAyB,CAAC,MAAM,CAAC,6BAA6B,EAAE,CAAC,CAAC;IACjF,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;QAC9D,MAAM,EAAC,KAAK,EAAE,aAAa,EAAE,WAAW,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAE5D,MAAM,CAAC,6BAA6B,CAAC,KAAK,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;QAExE,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAClE,CAAC;;AAxBe,4BAAE,GAAG,UAAU,CAAC;AAEhB,uCAAa,GAAG,MAAM,CAAC;AAEvB,kCAAQ,GAAG,QAAQ,CAAC;AAEpB,uCAAa,GAAG,IAAI,CAAC;AAsBzC,eAAe,yBAAyB,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { IChannelArchiveDays } from '../../CommandBinaryBuffer.js';
|
|
|
3
3
|
import { TTime2000 } from '../../../utils/time.js';
|
|
4
4
|
interface IGetExAbsArchiveDaysMCResponseParameters {
|
|
5
5
|
channelList: Array<IChannelArchiveDays>;
|
|
6
|
-
|
|
6
|
+
startTime2000: TTime2000;
|
|
7
7
|
days: number;
|
|
8
8
|
}
|
|
9
9
|
declare class GetExAbsArchiveDaysMCResponse extends Command {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import Command from '../../Command.js';
|
|
2
2
|
import CommandBinaryBuffer from '../../CommandBinaryBuffer.js';
|
|
3
|
-
import {
|
|
3
|
+
import { getTime2000FromDate } from '../../../utils/time.js';
|
|
4
4
|
import { UPLINK } from '../../constants/directions.js';
|
|
5
5
|
const COMMAND_ID = 0x0d1f;
|
|
6
6
|
const COMMAND_BODY_MAX_SIZE = 6124;
|
|
@@ -8,7 +8,7 @@ const examples = [
|
|
|
8
8
|
{
|
|
9
9
|
name: 'archive days values at 4 channel from 2023.03.10 00:00:00 GMT',
|
|
10
10
|
parameters: {
|
|
11
|
-
|
|
11
|
+
startTime2000: 731721600,
|
|
12
12
|
days: 2,
|
|
13
13
|
channelList: [
|
|
14
14
|
{
|
|
@@ -42,12 +42,12 @@ class GetExAbsArchiveDaysMCResponse extends Command {
|
|
|
42
42
|
dayList.push(buffer.getExtendedValue());
|
|
43
43
|
}
|
|
44
44
|
});
|
|
45
|
-
return new GetExAbsArchiveDaysMCResponse({ channelList, days,
|
|
45
|
+
return new GetExAbsArchiveDaysMCResponse({ channelList, days, startTime2000: getTime2000FromDate(date) });
|
|
46
46
|
}
|
|
47
47
|
toBytes() {
|
|
48
48
|
const buffer = new CommandBinaryBuffer(COMMAND_BODY_MAX_SIZE);
|
|
49
|
-
const { channelList,
|
|
50
|
-
buffer.setDate(
|
|
49
|
+
const { channelList, startTime2000, days } = this.parameters;
|
|
50
|
+
buffer.setDate(startTime2000);
|
|
51
51
|
buffer.setChannels(channelList);
|
|
52
52
|
buffer.setUint8(days);
|
|
53
53
|
channelList.forEach(({ dayList }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetExAbsArchiveDaysMCResponse.js","sourceRoot":"","sources":["../../../../src/analog/commands/uplink/GetExAbsArchiveDaysMCResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAA0C,MAAM,8BAA8B,CAAC;AACtF,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"GetExAbsArchiveDaysMCResponse.js","sourceRoot":"","sources":["../../../../src/analog/commands/uplink/GetExAbsArchiveDaysMCResponse.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { TTime2000 } from '../../../utils/time.js';
|
|
|
3
3
|
import { IChannelHours } from '../../CommandBinaryBuffer.js';
|
|
4
4
|
interface IGetExAbsArchiveHoursMCResponseParameters {
|
|
5
5
|
channelList: Array<IChannelHours>;
|
|
6
|
-
|
|
6
|
+
startTime2000: TTime2000;
|
|
7
7
|
hours: number;
|
|
8
8
|
}
|
|
9
9
|
declare class GetExAbsArchiveHoursMCResponse extends Command {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import Command from '../../Command.js';
|
|
2
|
-
import {
|
|
2
|
+
import { getTime2000FromDate, getDateFromTime2000 } from '../../../utils/time.js';
|
|
3
3
|
import CommandBinaryBuffer from '../../CommandBinaryBuffer.js';
|
|
4
4
|
import { UPLINK } from '../../constants/directions.js';
|
|
5
5
|
const COMMAND_ID = 0x0c1f;
|
|
@@ -8,7 +8,7 @@ const examples = [
|
|
|
8
8
|
{
|
|
9
9
|
name: '1 channel at 2023.12.23 12:00:00 GMT',
|
|
10
10
|
parameters: {
|
|
11
|
-
|
|
11
|
+
startTime2000: 756648000,
|
|
12
12
|
hours: 1,
|
|
13
13
|
channelList: [
|
|
14
14
|
{ value: 234, index: 2, diff: [2] }
|
|
@@ -42,12 +42,12 @@ class GetExAbsArchiveHoursMCResponse extends Command {
|
|
|
42
42
|
index: channelIndex
|
|
43
43
|
});
|
|
44
44
|
});
|
|
45
|
-
return new GetExAbsArchiveHoursMCResponse({ channelList, hours,
|
|
45
|
+
return new GetExAbsArchiveHoursMCResponse({ channelList, hours, startTime2000: getTime2000FromDate(date) });
|
|
46
46
|
}
|
|
47
47
|
toBytes() {
|
|
48
48
|
const buffer = new CommandBinaryBuffer(COMMAND_BODY_MAX_SIZE);
|
|
49
|
-
const { channelList,
|
|
50
|
-
const date =
|
|
49
|
+
const { channelList, startTime2000, hours } = this.parameters;
|
|
50
|
+
const date = getDateFromTime2000(startTime2000);
|
|
51
51
|
const hour = date.getUTCHours();
|
|
52
52
|
buffer.setDate(date);
|
|
53
53
|
buffer.setHours(hour, hours);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetExAbsArchiveHoursMCResponse.js","sourceRoot":"","sources":["../../../../src/analog/commands/uplink/GetExAbsArchiveHoursMCResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"GetExAbsArchiveHoursMCResponse.js","sourceRoot":"","sources":["../../../../src/analog/commands/uplink/GetExAbsArchiveHoursMCResponse.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { TTime2000 } from '../../../utils/time.js';
|
|
|
4
4
|
import { IChannelHours } from '../../CommandBinaryBuffer.js';
|
|
5
5
|
interface IHourMCParameters {
|
|
6
6
|
channelList: Array<IChannelHours>;
|
|
7
|
-
|
|
7
|
+
startTime2000: TTime2000;
|
|
8
8
|
hours: number;
|
|
9
9
|
}
|
|
10
10
|
declare class HourMC extends CurrentMC {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import Command from '../../Command.js';
|
|
2
2
|
import CurrentMC from './CurrentMC.js';
|
|
3
|
-
import {
|
|
3
|
+
import { getTime2000FromDate, getDateFromTime2000 } from '../../../utils/time.js';
|
|
4
4
|
import CommandBinaryBuffer from '../../CommandBinaryBuffer.js';
|
|
5
5
|
import { UPLINK } from '../../constants/directions.js';
|
|
6
6
|
const COMMAND_ID = 0x17;
|
|
@@ -9,7 +9,7 @@ const examples = [
|
|
|
9
9
|
{
|
|
10
10
|
name: '4 first channels at 2023.12.23 12:00:00 GMT',
|
|
11
11
|
parameters: {
|
|
12
|
-
|
|
12
|
+
startTime2000: 756648000,
|
|
13
13
|
hours: 1,
|
|
14
14
|
channelList: [
|
|
15
15
|
{ index: 1, value: 131, diff: [10] },
|
|
@@ -42,12 +42,12 @@ class HourMC extends CurrentMC {
|
|
|
42
42
|
}
|
|
43
43
|
channelList.push({ value, index: channelIndex, diff });
|
|
44
44
|
});
|
|
45
|
-
return new HourMC({ channelList, hours,
|
|
45
|
+
return new HourMC({ channelList, hours, startTime2000: getTime2000FromDate(date) });
|
|
46
46
|
}
|
|
47
47
|
toBytes() {
|
|
48
48
|
const buffer = new CommandBinaryBuffer(COMMAND_BODY_MAX_SIZE);
|
|
49
|
-
const { channelList,
|
|
50
|
-
const date =
|
|
49
|
+
const { channelList, startTime2000, hours } = this.parameters;
|
|
50
|
+
const date = getDateFromTime2000(startTime2000);
|
|
51
51
|
const hour = date.getUTCHours();
|
|
52
52
|
buffer.setDate(date);
|
|
53
53
|
buffer.setHours(hour, hours);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HourMC.js","sourceRoot":"","sources":["../../../../src/analog/commands/uplink/HourMC.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"HourMC.js","sourceRoot":"","sources":["../../../../src/analog/commands/uplink/HourMC.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAC,mBAAmB,EAAE,mBAAmB,EAAY,MAAM,wBAAwB,CAAC;AAC3F,OAAO,mBAAoC,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAUrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAKxB,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAElC,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,6CAA6C;QACnD,UAAU,EAAE;YACR,aAAa,EAAE,SAAS;YACxB,KAAK,EAAE,CAAC;YACR,WAAW,EAAE;gBACT,EAAC,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAC;gBAClC,EAAC,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAC;gBAClC,EAAC,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAC;gBAChC,EAAC,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAC;aACrC;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,8CAA8C,EAAC;KAC/E;CACJ,CAAC;AA+BF,MAAM,MAAO,SAAQ,SAAS;IAC1B,YAAqB,UAA6B;QAC9C,KAAK,CAAC,UAAU,CAAC,CAAC;QADD,eAAU,GAAV,UAAU,CAAmB;IAElD,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAC9B,MAAM,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACxC,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;QACtC,MAAM,WAAW,GAAyB,EAAE,CAAC;QAC7C,IAAI,KAAK,CAAC;QAEV,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAEvB,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YAE5B,KAAK,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAElC,MAAM,IAAI,GAAkB,EAAE,CAAC;YAE/B,KAAM,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,KAAK,EAAE,EAAE,QAAQ,EAAG;gBACnD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC;aACxC;YAED,WAAW,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAC,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,MAAM,CAAC,EAAC,WAAW,EAAE,KAAK,EAAE,aAAa,EAAE,mBAAmB,CAAC,IAAI,CAAC,EAAC,CAAC,CAAC;IACtF,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;QAC9D,MAAM,EAAC,WAAW,EAAE,aAAa,EAAE,KAAK,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAE5D,MAAM,IAAI,GAAG,mBAAmB,CAAC,aAAa,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAEhC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACrB,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC7B,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAEhC,KAAM,MAAM,EAAC,KAAK,EAAE,IAAI,EAAC,IAAI,WAAW,EAAG;YACvC,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAC/B,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;SACjE;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAClE,CAAC;;AAtDe,SAAE,GAAG,UAAU,CAAC;AAEhB,oBAAa,GAAG,MAAM,CAAC;AAEvB,eAAQ,GAAG,QAAQ,CAAC;AAEpB,oBAAa,GAAG,IAAI,CAAC;AAoDzC,eAAe,MAAM,CAAC"}
|
|
@@ -14,7 +14,7 @@ const examples = [
|
|
|
14
14
|
parameters: {
|
|
15
15
|
id: events.MAGNET_ON,
|
|
16
16
|
sequenceNumber: 2,
|
|
17
|
-
data: {
|
|
17
|
+
data: { time2000: 734015840 }
|
|
18
18
|
},
|
|
19
19
|
hex: { header: '15 06', body: '01 02 2b c0 31 60' }
|
|
20
20
|
},
|
|
@@ -32,7 +32,7 @@ const examples = [
|
|
|
32
32
|
parameters: {
|
|
33
33
|
id: events.ACTIVATE_MTX,
|
|
34
34
|
sequenceNumber: 2,
|
|
35
|
-
data: {
|
|
35
|
+
data: { time2000: 734015840, deviceId: '00 1a 79 88 17 01 23 56' }
|
|
36
36
|
},
|
|
37
37
|
hex: { header: '15 0e', body: '0b 02 2b c0 31 60 00 1a 79 88 17 01 23 56' }
|
|
38
38
|
},
|
|
@@ -115,13 +115,13 @@ class NewEvent extends Command {
|
|
|
115
115
|
case events.OPTOLOW:
|
|
116
116
|
case events.OPTOFLASH:
|
|
117
117
|
case events.JOIN_ACCEPT:
|
|
118
|
-
eventData = {
|
|
118
|
+
eventData = { time2000: buffer.getTime() };
|
|
119
119
|
break;
|
|
120
120
|
case events.BATTERY_ALARM:
|
|
121
121
|
eventData = { voltage: getVoltage(buffer) };
|
|
122
122
|
break;
|
|
123
123
|
case events.ACTIVATE_MTX:
|
|
124
|
-
eventData = {
|
|
124
|
+
eventData = { time2000: buffer.getTime(), deviceId: getDeviceId(buffer) };
|
|
125
125
|
break;
|
|
126
126
|
case events.CONNECT:
|
|
127
127
|
case events.DISCONNECT:
|
|
@@ -154,7 +154,7 @@ class NewEvent extends Command {
|
|
|
154
154
|
case events.OPTOFLASH:
|
|
155
155
|
case events.JOIN_ACCEPT:
|
|
156
156
|
eventData = data;
|
|
157
|
-
buffer.setTime(eventData.
|
|
157
|
+
buffer.setTime(eventData.time2000);
|
|
158
158
|
break;
|
|
159
159
|
case events.BATTERY_ALARM:
|
|
160
160
|
eventData = data;
|
|
@@ -162,7 +162,7 @@ class NewEvent extends Command {
|
|
|
162
162
|
break;
|
|
163
163
|
case events.ACTIVATE_MTX:
|
|
164
164
|
eventData = data;
|
|
165
|
-
buffer.setTime(eventData.
|
|
165
|
+
buffer.setTime(eventData.time2000);
|
|
166
166
|
setDeviceId(buffer, eventData.deviceId);
|
|
167
167
|
break;
|
|
168
168
|
case events.CONNECT:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NewEvent.js","sourceRoot":"","sources":["../../../../src/analog/commands/uplink/NewEvent.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAsC,MAAM,8BAA8B,CAAC;AAClF,OAAO,eAAe,MAAM,mCAAmC,CAAC;AAChE,OAAO,eAAe,MAAM,mCAAmC,CAAC;AAEhE,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AACrD,OAAO,KAAK,aAAa,MAAM,kCAAkC,CAAC;AA4DlE,MAAM,UAAU,GAAG,IAAI,CAAC;AAGxB,MAAM,qBAAqB,GAAG,EAAE,CAAC;AACjC,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAE3B,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,qBAAqB;QAC3B,UAAU,EAAE;YACR,EAAE,EAAE,MAAM,CAAC,SAAS;YACpB,cAAc,EAAE,CAAC;YACjB,IAAI,EAAE,EAAC,
|
|
1
|
+
{"version":3,"file":"NewEvent.js","sourceRoot":"","sources":["../../../../src/analog/commands/uplink/NewEvent.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import Command, { TCommandExampleList } from '../../Command.js';
|
|
|
2
2
|
import { TTime2000 } from '../../../utils/time.js';
|
|
3
3
|
interface ITime2000Parameters {
|
|
4
4
|
sequenceNumber: number;
|
|
5
|
-
|
|
5
|
+
time2000: TTime2000;
|
|
6
6
|
}
|
|
7
7
|
declare class Time2000 extends Command {
|
|
8
8
|
parameters: ITime2000Parameters;
|
|
@@ -6,7 +6,7 @@ const COMMAND_BODY_SIZE = 5;
|
|
|
6
6
|
const examples = [
|
|
7
7
|
{
|
|
8
8
|
name: 'time is 2023.04.03 14:01:17 GMT',
|
|
9
|
-
parameters: { sequenceNumber: 77,
|
|
9
|
+
parameters: { sequenceNumber: 77, time2000: 733845677 },
|
|
10
10
|
hex: { header: '09 05', body: '4d 2b bd 98 ad' }
|
|
11
11
|
}
|
|
12
12
|
];
|
|
@@ -22,7 +22,7 @@ class Time2000 extends Command {
|
|
|
22
22
|
const buffer = new CommandBinaryBuffer(data);
|
|
23
23
|
const parameters = {
|
|
24
24
|
sequenceNumber: buffer.getUint8(),
|
|
25
|
-
|
|
25
|
+
time2000: buffer.getTime()
|
|
26
26
|
};
|
|
27
27
|
if (!buffer.isEmpty) {
|
|
28
28
|
throw new Error('BinaryBuffer is not empty.');
|
|
@@ -30,10 +30,10 @@ class Time2000 extends Command {
|
|
|
30
30
|
return new Time2000(parameters);
|
|
31
31
|
}
|
|
32
32
|
toBytes() {
|
|
33
|
-
const { sequenceNumber,
|
|
33
|
+
const { sequenceNumber, time2000 } = this.parameters;
|
|
34
34
|
const buffer = new CommandBinaryBuffer(COMMAND_BODY_SIZE);
|
|
35
35
|
buffer.setUint8(sequenceNumber);
|
|
36
|
-
buffer.setTime(
|
|
36
|
+
buffer.setTime(time2000);
|
|
37
37
|
return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
|
|
38
38
|
}
|
|
39
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Time2000.js","sourceRoot":"","sources":["../../../../src/analog/commands/uplink/Time2000.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAkBrD,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAE5B,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,iCAAiC;QACvC,UAAU,EAAE,EAAC,cAAc,EAAE,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"Time2000.js","sourceRoot":"","sources":["../../../../src/analog/commands/uplink/Time2000.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAkBrD,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAE5B,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,iCAAiC;QACvC,UAAU,EAAE,EAAC,cAAc,EAAE,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAC;QACrD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAC;KACjD;CACJ,CAAC;AAqBF,MAAM,QAAS,SAAQ,OAAO;IAC1B,YAAqB,UAA+B;QAChD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAqB;IAEpD,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,IAAK,IAAI,CAAC,UAAU,KAAK,iBAAiB,EAAG;YACzC,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;SAC7D;QAED,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,UAAU,GAAG;YACf,cAAc,EAAE,MAAM,CAAC,QAAQ,EAAE;YACjC,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE;SAC7B,CAAC;QAEF,IAAK,CAAC,MAAM,CAAC,OAAO,EAAG;YACnB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;SACjD;QAED,OAAO,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,cAAc,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QACnD,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;QAE1D,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAChC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAEzB,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AArCe,WAAE,GAAG,UAAU,CAAC;AAEhB,sBAAa,GAAG,MAAM,CAAC;AAEvB,iBAAQ,GAAG,QAAQ,CAAC;AAEpB,sBAAa,GAAG,IAAI,CAAC;AAmCzC,eAAe,QAAQ,CAAC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import Command, { TCommandExampleList } from '../../Command.js';
|
|
2
2
|
import { ICommandParameters } from '../../CommandBinaryBuffer.js';
|
|
3
|
+
import { TTime2000 } from '../../../utils/time.js';
|
|
3
4
|
interface IReadArchiveParameters extends ICommandParameters {
|
|
4
5
|
archiveType: number;
|
|
5
|
-
|
|
6
|
+
time2000: TTime2000;
|
|
6
7
|
}
|
|
7
8
|
declare class ReadArchive extends Command {
|
|
8
9
|
parameters: IReadArchiveParameters;
|
|
@@ -10,7 +10,7 @@ const examples = [
|
|
|
10
10
|
parameters: {
|
|
11
11
|
requestId: 33,
|
|
12
12
|
archiveType: archiveTypes.DETAILED,
|
|
13
|
-
|
|
13
|
+
time2000: 756604800
|
|
14
14
|
},
|
|
15
15
|
hex: { header: '11', body: '21 01 2d 18 df 80' }
|
|
16
16
|
},
|
|
@@ -19,7 +19,7 @@ const examples = [
|
|
|
19
19
|
parameters: {
|
|
20
20
|
requestId: 34,
|
|
21
21
|
archiveType: archiveTypes.SUMMARY,
|
|
22
|
-
|
|
22
|
+
time2000: 756619200
|
|
23
23
|
},
|
|
24
24
|
hex: { header: '11', body: '22 02 2d 19 17 c0' }
|
|
25
25
|
}
|
|
@@ -35,18 +35,18 @@ class ReadArchive extends Command {
|
|
|
35
35
|
return new ReadArchive({
|
|
36
36
|
requestId: buffer.getUint8(),
|
|
37
37
|
archiveType: buffer.getUint8(),
|
|
38
|
-
|
|
38
|
+
time2000: buffer.getUint32()
|
|
39
39
|
});
|
|
40
40
|
}
|
|
41
41
|
toBytes() {
|
|
42
42
|
if (typeof this.size !== 'number') {
|
|
43
43
|
throw new Error('unknown or invalid size');
|
|
44
44
|
}
|
|
45
|
-
const { requestId, archiveType,
|
|
45
|
+
const { requestId, archiveType, time2000 } = this.parameters;
|
|
46
46
|
const buffer = new CommandBinaryBuffer(this.size);
|
|
47
47
|
buffer.setUint8(requestId);
|
|
48
48
|
buffer.setUint8(archiveType);
|
|
49
|
-
buffer.setUint32(
|
|
49
|
+
buffer.setUint32(time2000);
|
|
50
50
|
return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
|
|
51
51
|
}
|
|
52
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReadArchive.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/ReadArchive.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAqB,MAAM,8BAA8B,CAAC;AACtG,OAAO,EAAC,QAAQ,EAAC,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"ReadArchive.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/ReadArchive.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAqB,MAAM,8BAA8B,CAAC;AACtG,OAAO,EAAC,QAAQ,EAAC,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAatD,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,eAAe,GAAG,CAAC,CAAC;AAEzC,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,uDAAuD;QAC7D,UAAU,EAAE;YACR,SAAS,EAAE,EAAE;YACb,WAAW,EAAE,YAAY,CAAC,QAAQ;YAClC,QAAQ,EAAE,SAAS;SACtB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,mBAAmB,EAAC;KACjD;IACD;QACI,IAAI,EAAE,sDAAsD;QAC5D,UAAU,EAAE;YACR,SAAS,EAAE,EAAE;YACb,WAAW,EAAE,YAAY,CAAC,OAAO;YACjC,QAAQ,EAAE,SAAS;SACtB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,mBAAmB,EAAC;KACjD;CACJ,CAAC;AAyBF,MAAM,WAAY,SAAQ,OAAO;IAC7B,YAAqB,UAAkC;QACnD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAwB;QAGnD,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;IAC7B,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,IAAI,WAAW,CAAC;YACnB,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,WAAW,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC9B,QAAQ,EAAE,MAAM,CAAC,SAAS,EAAE;SAC/B,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,IAAK,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAG;YACjC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC9C;QAED,MAAM,EAAC,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAC3D,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAElD,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC7B,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAE3B,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AAlCe,cAAE,GAAG,UAAU,CAAC;AAEhB,yBAAa,GAAG,QAAQ,CAAC;AAEzB,oBAAQ,GAAG,QAAQ,CAAC;AAEpB,yBAAa,GAAG,IAAI,CAAC;AAgCzC,eAAe,WAAW,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import Command, { TCommandExampleList } from '../../Command.js';
|
|
2
2
|
import { IShortNameFloat } from '../../CommandBinaryBuffer.js';
|
|
3
|
+
import { TTime2000 } from '../../../utils/time.js';
|
|
3
4
|
interface IObservationReportParameters {
|
|
4
|
-
|
|
5
|
+
time2000: TTime2000;
|
|
5
6
|
shortNameList: Array<IShortNameFloat>;
|
|
6
7
|
}
|
|
7
8
|
declare class ObservationReport extends Command {
|