@blueid/access-proto 0.22.0 → 0.23.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/BlueCore.proto +2 -2
- package/BlueLock.proto +2 -2
- package/BlueSystem.proto +1 -7
- package/cjs/BlueCore_pb.d.ts +3 -3
- package/cjs/BlueCore_pb.js +1 -1
- package/cjs/BlueLock_pb.d.ts +3 -3
- package/cjs/BlueLock_pb.js +7 -1
- package/cjs/BlueSystem_pb.d.ts +1 -26
- package/cjs/BlueSystem_pb.js +1 -36
- package/es/BlueCore_pb.d.ts +3 -3
- package/es/BlueCore_pb.js +1 -1
- package/es/BlueLock_pb.d.ts +3 -3
- package/es/BlueLock_pb.js +1 -1
- package/es/BlueSystem_pb.d.ts +1 -26
- package/es/BlueSystem_pb.js +1 -6
- package/nanopb/BlueCore.pb.h +9 -8
- package/nanopb/BlueLock.pb.c +1 -1
- package/nanopb/BlueLock.pb.h +7 -8
- package/nanopb/BlueSystem.pb.h +8 -23
- package/package.json +1 -1
- package/swift/BlueCore.pb.swift +15 -14
- package/swift/BlueLock.pb.swift +17 -8
- package/swift/BlueSystem.pb.swift +3 -93
package/BlueCore.proto
CHANGED
|
@@ -395,8 +395,8 @@ message BlueEvent {
|
|
|
395
395
|
|
|
396
396
|
required int32 eventInfo = 5;
|
|
397
397
|
|
|
398
|
-
// Set if
|
|
399
|
-
optional
|
|
398
|
+
// Set if credential related
|
|
399
|
+
optional BlueCredentialId credentialId = 6;
|
|
400
400
|
|
|
401
401
|
// Set if eventId =
|
|
402
402
|
optional string command = 7 [ (nanopb).max_length = 8 ];
|
package/BlueLock.proto
CHANGED
|
@@ -19,8 +19,8 @@ message BlueLockConfig {
|
|
|
19
19
|
// opened by an authenticated user and is within any of the open schedules
|
|
20
20
|
required bool openScheduleByUser = 2 [ default = false ];
|
|
21
21
|
|
|
22
|
-
//
|
|
23
|
-
|
|
22
|
+
// If set keeps the lock closed on federal vacation days
|
|
23
|
+
required bool keepClosedOnHolidays = 20;
|
|
24
24
|
|
|
25
25
|
// Default time in seconds to keep the lock open
|
|
26
26
|
required uint32 defaultOpenTimeSec = 21 [ default = 5 ];
|
package/BlueSystem.proto
CHANGED
|
@@ -208,14 +208,9 @@ message BlueSystemStatus {
|
|
|
208
208
|
required uint32 applicationVersion = 6;
|
|
209
209
|
required BlueLocalTimestamp localTime = 7;
|
|
210
210
|
required BlueSystemSettings settings = 8;
|
|
211
|
-
required uint32 blacklistEntriesCount = 9 [ (nanopb).int_size = IS_16 ];
|
|
212
|
-
required uint32 eventLogEntriesCount = 10 [ (nanopb).int_size = IS_16 ];
|
|
213
|
-
required uint32 eventLogSequenceId = 11;
|
|
214
|
-
required uint32 systemLogEntriesCount = 12 [ (nanopb).int_size = IS_16 ];
|
|
215
|
-
required uint32 systemLogSequenceId = 13;
|
|
216
211
|
|
|
217
212
|
// -- Custom
|
|
218
|
-
optional BlueLockStatus lock =
|
|
213
|
+
optional BlueLockStatus lock = 9;
|
|
219
214
|
}
|
|
220
215
|
|
|
221
216
|
///////////////////////////////////////////////////////////////////////
|
|
@@ -239,7 +234,6 @@ message BlueSystemLogEntry {
|
|
|
239
234
|
required uint32 severity = 3 [ (nanopb).int_size = IS_8 ];
|
|
240
235
|
|
|
241
236
|
required uint32 line = 4 [ (nanopb).int_size = IS_16 ];
|
|
242
|
-
;
|
|
243
237
|
|
|
244
238
|
required string file = 5 [ (nanopb).max_length = 20 ];
|
|
245
239
|
|
package/cjs/BlueCore_pb.d.ts
CHANGED
|
@@ -1271,11 +1271,11 @@ export declare class BlueEvent extends Message<BlueEvent> {
|
|
|
1271
1271
|
eventInfo: number;
|
|
1272
1272
|
|
|
1273
1273
|
/**
|
|
1274
|
-
* Set if
|
|
1274
|
+
* Set if credential related
|
|
1275
1275
|
*
|
|
1276
|
-
* @generated from field: optional
|
|
1276
|
+
* @generated from field: optional BlueCredentialId credentialId = 6;
|
|
1277
1277
|
*/
|
|
1278
|
-
|
|
1278
|
+
credentialId?: BlueCredentialId;
|
|
1279
1279
|
|
|
1280
1280
|
/**
|
|
1281
1281
|
* Set if eventId =
|
package/cjs/BlueCore_pb.js
CHANGED
|
@@ -526,7 +526,7 @@ const BlueEvent = import_protobuf.proto2.makeMessageType(
|
|
|
526
526
|
T: 5
|
|
527
527
|
/* ScalarType.INT32 */
|
|
528
528
|
},
|
|
529
|
-
{ no: 6, name: "
|
|
529
|
+
{ no: 6, name: "credentialId", kind: "message", T: BlueCredentialId, opt: true },
|
|
530
530
|
{ no: 7, name: "command", kind: "scalar", T: 9, opt: true }
|
|
531
531
|
]
|
|
532
532
|
);
|
package/cjs/BlueLock_pb.d.ts
CHANGED
|
@@ -52,11 +52,11 @@ export declare class BlueLockConfig extends Message<BlueLockConfig> {
|
|
|
52
52
|
openScheduleByUser: boolean;
|
|
53
53
|
|
|
54
54
|
/**
|
|
55
|
-
*
|
|
55
|
+
* If set keeps the lock closed on federal vacation days
|
|
56
56
|
*
|
|
57
|
-
* @generated from field:
|
|
57
|
+
* @generated from field: required bool keepClosedOnHolidays = 20;
|
|
58
58
|
*/
|
|
59
|
-
|
|
59
|
+
keepClosedOnHolidays: boolean;
|
|
60
60
|
|
|
61
61
|
/**
|
|
62
62
|
* Default time in seconds to keep the lock open
|
package/cjs/BlueLock_pb.js
CHANGED
|
@@ -38,7 +38,13 @@ const BlueLockConfig = import_protobuf.proto2.makeMessageType(
|
|
|
38
38
|
() => [
|
|
39
39
|
{ no: 1, name: "openSchedules", kind: "message", T: import_BlueCore_pb.BlueLocalTimeSchedule, repeated: true },
|
|
40
40
|
{ no: 2, name: "openScheduleByUser", kind: "scalar", T: 8, default: false },
|
|
41
|
-
{
|
|
41
|
+
{
|
|
42
|
+
no: 20,
|
|
43
|
+
name: "keepClosedOnHolidays",
|
|
44
|
+
kind: "scalar",
|
|
45
|
+
T: 8
|
|
46
|
+
/* ScalarType.BOOL */
|
|
47
|
+
},
|
|
42
48
|
{ no: 21, name: "defaultOpenTimeSec", kind: "scalar", T: 13, default: 5 },
|
|
43
49
|
{ no: 22, name: "extendedOpenTimeSec", kind: "scalar", T: 13, default: 3600 }
|
|
44
50
|
]
|
package/cjs/BlueSystem_pb.d.ts
CHANGED
|
@@ -622,35 +622,10 @@ export declare class BlueSystemStatus extends Message<BlueSystemStatus> {
|
|
|
622
622
|
*/
|
|
623
623
|
settings?: BlueSystemSettings;
|
|
624
624
|
|
|
625
|
-
/**
|
|
626
|
-
* @generated from field: required uint32 blacklistEntriesCount = 9;
|
|
627
|
-
*/
|
|
628
|
-
blacklistEntriesCount: number;
|
|
629
|
-
|
|
630
|
-
/**
|
|
631
|
-
* @generated from field: required uint32 eventLogEntriesCount = 10;
|
|
632
|
-
*/
|
|
633
|
-
eventLogEntriesCount: number;
|
|
634
|
-
|
|
635
|
-
/**
|
|
636
|
-
* @generated from field: required uint32 eventLogSequenceId = 11;
|
|
637
|
-
*/
|
|
638
|
-
eventLogSequenceId: number;
|
|
639
|
-
|
|
640
|
-
/**
|
|
641
|
-
* @generated from field: required uint32 systemLogEntriesCount = 12;
|
|
642
|
-
*/
|
|
643
|
-
systemLogEntriesCount: number;
|
|
644
|
-
|
|
645
|
-
/**
|
|
646
|
-
* @generated from field: required uint32 systemLogSequenceId = 13;
|
|
647
|
-
*/
|
|
648
|
-
systemLogSequenceId: number;
|
|
649
|
-
|
|
650
625
|
/**
|
|
651
626
|
* -- Custom
|
|
652
627
|
*
|
|
653
|
-
* @generated from field: optional BlueLockStatus lock =
|
|
628
|
+
* @generated from field: optional BlueLockStatus lock = 9;
|
|
654
629
|
*/
|
|
655
630
|
lock?: BlueLockStatus;
|
|
656
631
|
|
package/cjs/BlueSystem_pb.js
CHANGED
|
@@ -264,42 +264,7 @@ const BlueSystemStatus = import_protobuf.proto2.makeMessageType(
|
|
|
264
264
|
},
|
|
265
265
|
{ no: 7, name: "localTime", kind: "message", T: import_BlueCore_pb.BlueLocalTimestamp },
|
|
266
266
|
{ no: 8, name: "settings", kind: "message", T: BlueSystemSettings },
|
|
267
|
-
{
|
|
268
|
-
no: 9,
|
|
269
|
-
name: "blacklistEntriesCount",
|
|
270
|
-
kind: "scalar",
|
|
271
|
-
T: 13
|
|
272
|
-
/* ScalarType.UINT32 */
|
|
273
|
-
},
|
|
274
|
-
{
|
|
275
|
-
no: 10,
|
|
276
|
-
name: "eventLogEntriesCount",
|
|
277
|
-
kind: "scalar",
|
|
278
|
-
T: 13
|
|
279
|
-
/* ScalarType.UINT32 */
|
|
280
|
-
},
|
|
281
|
-
{
|
|
282
|
-
no: 11,
|
|
283
|
-
name: "eventLogSequenceId",
|
|
284
|
-
kind: "scalar",
|
|
285
|
-
T: 13
|
|
286
|
-
/* ScalarType.UINT32 */
|
|
287
|
-
},
|
|
288
|
-
{
|
|
289
|
-
no: 12,
|
|
290
|
-
name: "systemLogEntriesCount",
|
|
291
|
-
kind: "scalar",
|
|
292
|
-
T: 13
|
|
293
|
-
/* ScalarType.UINT32 */
|
|
294
|
-
},
|
|
295
|
-
{
|
|
296
|
-
no: 13,
|
|
297
|
-
name: "systemLogSequenceId",
|
|
298
|
-
kind: "scalar",
|
|
299
|
-
T: 13
|
|
300
|
-
/* ScalarType.UINT32 */
|
|
301
|
-
},
|
|
302
|
-
{ no: 14, name: "lock", kind: "message", T: import_BlueLock_pb.BlueLockStatus, opt: true }
|
|
267
|
+
{ no: 9, name: "lock", kind: "message", T: import_BlueLock_pb.BlueLockStatus, opt: true }
|
|
303
268
|
]
|
|
304
269
|
);
|
|
305
270
|
const BlueSystemLogQuery = import_protobuf.proto2.makeMessageType(
|
package/es/BlueCore_pb.d.ts
CHANGED
|
@@ -1271,11 +1271,11 @@ export declare class BlueEvent extends Message<BlueEvent> {
|
|
|
1271
1271
|
eventInfo: number;
|
|
1272
1272
|
|
|
1273
1273
|
/**
|
|
1274
|
-
* Set if
|
|
1274
|
+
* Set if credential related
|
|
1275
1275
|
*
|
|
1276
|
-
* @generated from field: optional
|
|
1276
|
+
* @generated from field: optional BlueCredentialId credentialId = 6;
|
|
1277
1277
|
*/
|
|
1278
|
-
|
|
1278
|
+
credentialId?: BlueCredentialId;
|
|
1279
1279
|
|
|
1280
1280
|
/**
|
|
1281
1281
|
* Set if eventId =
|
package/es/BlueCore_pb.js
CHANGED
|
@@ -413,7 +413,7 @@ export const BlueEvent = proto2.makeMessageType(
|
|
|
413
413
|
{ no: 2, name: "eventTime", kind: "message", T: BlueLocalTimestamp },
|
|
414
414
|
{ no: 4, name: "eventId", kind: "enum", T: proto2.getEnumType(BlueEventId) },
|
|
415
415
|
{ no: 5, name: "eventInfo", kind: "scalar", T: 5 /* ScalarType.INT32 */ },
|
|
416
|
-
{ no: 6, name: "
|
|
416
|
+
{ no: 6, name: "credentialId", kind: "message", T: BlueCredentialId, opt: true },
|
|
417
417
|
{ no: 7, name: "command", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
|
|
418
418
|
],
|
|
419
419
|
);
|
package/es/BlueLock_pb.d.ts
CHANGED
|
@@ -52,11 +52,11 @@ export declare class BlueLockConfig extends Message<BlueLockConfig> {
|
|
|
52
52
|
openScheduleByUser: boolean;
|
|
53
53
|
|
|
54
54
|
/**
|
|
55
|
-
*
|
|
55
|
+
* If set keeps the lock closed on federal vacation days
|
|
56
56
|
*
|
|
57
|
-
* @generated from field:
|
|
57
|
+
* @generated from field: required bool keepClosedOnHolidays = 20;
|
|
58
58
|
*/
|
|
59
|
-
|
|
59
|
+
keepClosedOnHolidays: boolean;
|
|
60
60
|
|
|
61
61
|
/**
|
|
62
62
|
* Default time in seconds to keep the lock open
|
package/es/BlueLock_pb.js
CHANGED
|
@@ -27,7 +27,7 @@ export const BlueLockConfig = proto2.makeMessageType(
|
|
|
27
27
|
() => [
|
|
28
28
|
{ no: 1, name: "openSchedules", kind: "message", T: BlueLocalTimeSchedule, repeated: true },
|
|
29
29
|
{ no: 2, name: "openScheduleByUser", kind: "scalar", T: 8 /* ScalarType.BOOL */, default: false },
|
|
30
|
-
{ no: 20, name: "
|
|
30
|
+
{ no: 20, name: "keepClosedOnHolidays", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
|
|
31
31
|
{ no: 21, name: "defaultOpenTimeSec", kind: "scalar", T: 13 /* ScalarType.UINT32 */, default: 5 },
|
|
32
32
|
{ no: 22, name: "extendedOpenTimeSec", kind: "scalar", T: 13 /* ScalarType.UINT32 */, default: 3600 },
|
|
33
33
|
],
|
package/es/BlueSystem_pb.d.ts
CHANGED
|
@@ -622,35 +622,10 @@ export declare class BlueSystemStatus extends Message<BlueSystemStatus> {
|
|
|
622
622
|
*/
|
|
623
623
|
settings?: BlueSystemSettings;
|
|
624
624
|
|
|
625
|
-
/**
|
|
626
|
-
* @generated from field: required uint32 blacklistEntriesCount = 9;
|
|
627
|
-
*/
|
|
628
|
-
blacklistEntriesCount: number;
|
|
629
|
-
|
|
630
|
-
/**
|
|
631
|
-
* @generated from field: required uint32 eventLogEntriesCount = 10;
|
|
632
|
-
*/
|
|
633
|
-
eventLogEntriesCount: number;
|
|
634
|
-
|
|
635
|
-
/**
|
|
636
|
-
* @generated from field: required uint32 eventLogSequenceId = 11;
|
|
637
|
-
*/
|
|
638
|
-
eventLogSequenceId: number;
|
|
639
|
-
|
|
640
|
-
/**
|
|
641
|
-
* @generated from field: required uint32 systemLogEntriesCount = 12;
|
|
642
|
-
*/
|
|
643
|
-
systemLogEntriesCount: number;
|
|
644
|
-
|
|
645
|
-
/**
|
|
646
|
-
* @generated from field: required uint32 systemLogSequenceId = 13;
|
|
647
|
-
*/
|
|
648
|
-
systemLogSequenceId: number;
|
|
649
|
-
|
|
650
625
|
/**
|
|
651
626
|
* -- Custom
|
|
652
627
|
*
|
|
653
|
-
* @generated from field: optional BlueLockStatus lock =
|
|
628
|
+
* @generated from field: optional BlueLockStatus lock = 9;
|
|
654
629
|
*/
|
|
655
630
|
lock?: BlueLockStatus;
|
|
656
631
|
|
package/es/BlueSystem_pb.js
CHANGED
|
@@ -180,12 +180,7 @@ export const BlueSystemStatus = proto2.makeMessageType(
|
|
|
180
180
|
{ no: 6, name: "applicationVersion", kind: "scalar", T: 13 /* ScalarType.UINT32 */ },
|
|
181
181
|
{ no: 7, name: "localTime", kind: "message", T: BlueLocalTimestamp },
|
|
182
182
|
{ no: 8, name: "settings", kind: "message", T: BlueSystemSettings },
|
|
183
|
-
{ no: 9, name: "
|
|
184
|
-
{ no: 10, name: "eventLogEntriesCount", kind: "scalar", T: 13 /* ScalarType.UINT32 */ },
|
|
185
|
-
{ no: 11, name: "eventLogSequenceId", kind: "scalar", T: 13 /* ScalarType.UINT32 */ },
|
|
186
|
-
{ no: 12, name: "systemLogEntriesCount", kind: "scalar", T: 13 /* ScalarType.UINT32 */ },
|
|
187
|
-
{ no: 13, name: "systemLogSequenceId", kind: "scalar", T: 13 /* ScalarType.UINT32 */ },
|
|
188
|
-
{ no: 14, name: "lock", kind: "message", T: BlueLockStatus, opt: true },
|
|
183
|
+
{ no: 9, name: "lock", kind: "message", T: BlueLockStatus, opt: true },
|
|
189
184
|
],
|
|
190
185
|
);
|
|
191
186
|
|
package/nanopb/BlueCore.pb.h
CHANGED
|
@@ -308,9 +308,9 @@ typedef struct BlueEvent {
|
|
|
308
308
|
BlueLocalTimestamp_t eventTime;
|
|
309
309
|
BlueEventId_t eventId;
|
|
310
310
|
int32_t eventInfo;
|
|
311
|
-
/* Set if
|
|
312
|
-
bool
|
|
313
|
-
|
|
311
|
+
/* Set if credential related */
|
|
312
|
+
bool has_credentialId;
|
|
313
|
+
BlueCredentialId_t credentialId;
|
|
314
314
|
/* Set if eventId = */
|
|
315
315
|
bool has_command;
|
|
316
316
|
char command[9];
|
|
@@ -809,7 +809,7 @@ extern "C" {
|
|
|
809
809
|
#define BLUEBLACKLISTENTRY_INIT_DEFAULT {BLUECREDENTIALID_INIT_DEFAULT, BLUELOCALTIMESTAMP_INIT_DEFAULT}
|
|
810
810
|
#define BLUEBLEMANUFACTURERINFO_INIT_DEFAULT {_BLUEHARDWARETYPE_MIN, _BLUEBATTERYLEVEL_MIN, 0, 0, 0}
|
|
811
811
|
#define BLUEBLEADVERTISEMENTINFO_INIT_DEFAULT {"", 0, 0, BLUEBLEMANUFACTURERINFO_INIT_DEFAULT}
|
|
812
|
-
#define BLUEEVENT_INIT_DEFAULT {0, BLUELOCALTIMESTAMP_INIT_DEFAULT, _BLUEEVENTID_MIN, 0, false,
|
|
812
|
+
#define BLUEEVENT_INIT_DEFAULT {0, BLUELOCALTIMESTAMP_INIT_DEFAULT, _BLUEEVENTID_MIN, 0, false, BLUECREDENTIALID_INIT_DEFAULT, false, ""}
|
|
813
813
|
#define BLUESPHANDSHAKE_INIT_DEFAULT {{0}}
|
|
814
814
|
#define BLUESPHANDSHAKEREPLY_INIT_DEFAULT {{0}, {0, {0}}}
|
|
815
815
|
#define BLUESPTOKENCOMMAND_INIT_DEFAULT {BLUECREDENTIALID_INIT_DEFAULT, BLUELOCALTIMESTAMP_INIT_DEFAULT, BLUELOCALTIMESTAMP_INIT_DEFAULT, "", {0, {0}}}
|
|
@@ -864,7 +864,7 @@ extern "C" {
|
|
|
864
864
|
#define BLUEBLACKLISTENTRY_INIT_ZERO {BLUECREDENTIALID_INIT_ZERO, BLUELOCALTIMESTAMP_INIT_ZERO}
|
|
865
865
|
#define BLUEBLEMANUFACTURERINFO_INIT_ZERO {_BLUEHARDWARETYPE_MIN, _BLUEBATTERYLEVEL_MIN, 0, 0, 0}
|
|
866
866
|
#define BLUEBLEADVERTISEMENTINFO_INIT_ZERO {"", 0, 0, BLUEBLEMANUFACTURERINFO_INIT_ZERO}
|
|
867
|
-
#define BLUEEVENT_INIT_ZERO {0, BLUELOCALTIMESTAMP_INIT_ZERO, _BLUEEVENTID_MIN, 0, false,
|
|
867
|
+
#define BLUEEVENT_INIT_ZERO {0, BLUELOCALTIMESTAMP_INIT_ZERO, _BLUEEVENTID_MIN, 0, false, BLUECREDENTIALID_INIT_ZERO, false, ""}
|
|
868
868
|
#define BLUESPHANDSHAKE_INIT_ZERO {{0}}
|
|
869
869
|
#define BLUESPHANDSHAKEREPLY_INIT_ZERO {{0}, {0, {0}}}
|
|
870
870
|
#define BLUESPTOKENCOMMAND_INIT_ZERO {BLUECREDENTIALID_INIT_ZERO, BLUELOCALTIMESTAMP_INIT_ZERO, BLUELOCALTIMESTAMP_INIT_ZERO, "", {0, {0}}}
|
|
@@ -949,7 +949,7 @@ extern "C" {
|
|
|
949
949
|
#define BLUEEVENT_EVENTTIME_TAG 2
|
|
950
950
|
#define BLUEEVENT_EVENTID_TAG 4
|
|
951
951
|
#define BLUEEVENT_EVENTINFO_TAG 5
|
|
952
|
-
#define
|
|
952
|
+
#define BLUEEVENT_CREDENTIALID_TAG 6
|
|
953
953
|
#define BLUEEVENT_COMMAND_TAG 7
|
|
954
954
|
#define BLUESPHANDSHAKE_TRANSPONDERSALT_TAG 1
|
|
955
955
|
#define BLUESPHANDSHAKEREPLY_TERMINALSALT_TAG 1
|
|
@@ -1174,11 +1174,12 @@ X(a, STATIC, REQUIRED, UINT32, sequenceId, 1) \
|
|
|
1174
1174
|
X(a, STATIC, REQUIRED, MESSAGE, eventTime, 2) \
|
|
1175
1175
|
X(a, STATIC, REQUIRED, UENUM, eventId, 4) \
|
|
1176
1176
|
X(a, STATIC, REQUIRED, INT32, eventInfo, 5) \
|
|
1177
|
-
X(a, STATIC, OPTIONAL,
|
|
1177
|
+
X(a, STATIC, OPTIONAL, MESSAGE, credentialId, 6) \
|
|
1178
1178
|
X(a, STATIC, OPTIONAL, STRING, command, 7)
|
|
1179
1179
|
#define BLUEEVENT_CALLBACK NULL
|
|
1180
1180
|
#define BLUEEVENT_DEFAULT (const pb_byte_t*)"\x20\x01\x00"
|
|
1181
1181
|
#define BlueEvent_t_eventTime_MSGTYPE BlueLocalTimestamp_t
|
|
1182
|
+
#define BlueEvent_t_credentialId_MSGTYPE BlueCredentialId_t
|
|
1182
1183
|
|
|
1183
1184
|
#define BLUESPHANDSHAKE_FIELDLIST(X, a) \
|
|
1184
1185
|
X(a, STATIC, REQUIRED, FIXED_LENGTH_BYTES, transponderSalt, 1)
|
|
@@ -1661,7 +1662,7 @@ extern const pb_msgdesc_t _BlueTestEncodeDecode_t_msg;
|
|
|
1661
1662
|
#define BLUEBLEADVERTISEMENTINFO_SIZE 42
|
|
1662
1663
|
#define BLUEBLEMANUFACTURERINFO_SIZE 17
|
|
1663
1664
|
#define BLUECREDENTIALID_SIZE 12
|
|
1664
|
-
#define BLUEEVENT_SIZE
|
|
1665
|
+
#define BLUEEVENT_SIZE 64
|
|
1665
1666
|
#define BLUELOCALTIMEPERIOD_SIZE 12
|
|
1666
1667
|
#define BLUELOCALTIMESCHEDULE_SIZE 36
|
|
1667
1668
|
#define BLUELOCALTIMESTAMP_SIZE 19
|
package/nanopb/BlueLock.pb.c
CHANGED
package/nanopb/BlueLock.pb.h
CHANGED
|
@@ -26,9 +26,8 @@ typedef struct BlueLockConfig {
|
|
|
26
26
|
/* If set to true then the lock opens by schedule only after it was first
|
|
27
27
|
opened by an authenticated user and is within any of the open schedules */
|
|
28
28
|
bool openScheduleByUser;
|
|
29
|
-
/*
|
|
30
|
-
|
|
31
|
-
uint32_t closedDays[18];
|
|
29
|
+
/* If set keeps the lock closed on federal vacation days */
|
|
30
|
+
bool keepClosedOnHolidays;
|
|
32
31
|
/* Default time in seconds to keep the lock open */
|
|
33
32
|
uint32_t defaultOpenTimeSec;
|
|
34
33
|
/* Extended time in seconds to keep the lock open */
|
|
@@ -55,15 +54,15 @@ extern "C" {
|
|
|
55
54
|
|
|
56
55
|
|
|
57
56
|
/* Initializer values for message structs */
|
|
58
|
-
#define BLUELOCKCONFIG_INIT_DEFAULT {0, {BLUELOCALTIMESCHEDULE_INIT_DEFAULT, BLUELOCALTIMESCHEDULE_INIT_DEFAULT, BLUELOCALTIMESCHEDULE_INIT_DEFAULT, BLUELOCALTIMESCHEDULE_INIT_DEFAULT}, false, 0,
|
|
57
|
+
#define BLUELOCKCONFIG_INIT_DEFAULT {0, {BLUELOCALTIMESCHEDULE_INIT_DEFAULT, BLUELOCALTIMESCHEDULE_INIT_DEFAULT, BLUELOCALTIMESCHEDULE_INIT_DEFAULT, BLUELOCALTIMESCHEDULE_INIT_DEFAULT}, false, 0, 5u, 3600u}
|
|
59
58
|
#define BLUELOCKSTATUS_INIT_DEFAULT {_BLUELOCKSTATE_MIN, 0}
|
|
60
|
-
#define BLUELOCKCONFIG_INIT_ZERO {0, {BLUELOCALTIMESCHEDULE_INIT_ZERO, BLUELOCALTIMESCHEDULE_INIT_ZERO, BLUELOCALTIMESCHEDULE_INIT_ZERO, BLUELOCALTIMESCHEDULE_INIT_ZERO}, 0, 0,
|
|
59
|
+
#define BLUELOCKCONFIG_INIT_ZERO {0, {BLUELOCALTIMESCHEDULE_INIT_ZERO, BLUELOCALTIMESCHEDULE_INIT_ZERO, BLUELOCALTIMESCHEDULE_INIT_ZERO, BLUELOCALTIMESCHEDULE_INIT_ZERO}, 0, 0, 0, 0}
|
|
61
60
|
#define BLUELOCKSTATUS_INIT_ZERO {_BLUELOCKSTATE_MIN, 0}
|
|
62
61
|
|
|
63
62
|
/* Field tags (for use in manual encoding/decoding) */
|
|
64
63
|
#define BLUELOCKCONFIG_OPENSCHEDULES_TAG 1
|
|
65
64
|
#define BLUELOCKCONFIG_OPENSCHEDULEBYUSER_TAG 2
|
|
66
|
-
#define
|
|
65
|
+
#define BLUELOCKCONFIG_KEEPCLOSEDONHOLIDAYS_TAG 20
|
|
67
66
|
#define BLUELOCKCONFIG_DEFAULTOPENTIMESEC_TAG 21
|
|
68
67
|
#define BLUELOCKCONFIG_EXTENDEDOPENTIMESEC_TAG 22
|
|
69
68
|
#define BLUELOCKSTATUS_STATE_TAG 1
|
|
@@ -73,7 +72,7 @@ extern "C" {
|
|
|
73
72
|
#define BLUELOCKCONFIG_FIELDLIST(X, a) \
|
|
74
73
|
X(a, STATIC, REPEATED, MESSAGE, openSchedules, 1) \
|
|
75
74
|
X(a, STATIC, REQUIRED, BOOL, openScheduleByUser, 2) \
|
|
76
|
-
X(a, STATIC,
|
|
75
|
+
X(a, STATIC, REQUIRED, BOOL, keepClosedOnHolidays, 20) \
|
|
77
76
|
X(a, STATIC, REQUIRED, UINT32, defaultOpenTimeSec, 21) \
|
|
78
77
|
X(a, STATIC, REQUIRED, UINT32, extendedOpenTimeSec, 22)
|
|
79
78
|
#define BLUELOCKCONFIG_CALLBACK NULL
|
|
@@ -94,7 +93,7 @@ extern const pb_msgdesc_t BlueLockStatus_t_msg;
|
|
|
94
93
|
#define BLUELOCKSTATUS_FIELDS &BlueLockStatus_t_msg
|
|
95
94
|
|
|
96
95
|
/* Maximum encoded size of messages (where known) */
|
|
97
|
-
#define BLUELOCKCONFIG_SIZE
|
|
96
|
+
#define BLUELOCKCONFIG_SIZE 171
|
|
98
97
|
#define BLUELOCKSTATUS_SIZE 8
|
|
99
98
|
|
|
100
99
|
#ifdef __cplusplus
|
package/nanopb/BlueSystem.pb.h
CHANGED
|
@@ -167,11 +167,6 @@ typedef struct BlueSystemStatus {
|
|
|
167
167
|
uint32_t applicationVersion;
|
|
168
168
|
BlueLocalTimestamp_t localTime;
|
|
169
169
|
BlueSystemSettings_t settings;
|
|
170
|
-
uint16_t blacklistEntriesCount;
|
|
171
|
-
uint16_t eventLogEntriesCount;
|
|
172
|
-
uint32_t eventLogSequenceId;
|
|
173
|
-
uint16_t systemLogEntriesCount;
|
|
174
|
-
uint32_t systemLogSequenceId;
|
|
175
170
|
/* -- Custom */
|
|
176
171
|
bool has_lock;
|
|
177
172
|
BlueLockStatus_t lock;
|
|
@@ -236,7 +231,7 @@ extern "C" {
|
|
|
236
231
|
#define BLUESYSTEMUPDATE_INIT_DEFAULT {false, BLUESYSTEMCONFIG_INIT_DEFAULT, false, BLUESYSTEMTIMEUNIX_INIT_DEFAULT}
|
|
237
232
|
#define BLUESYSTEMSETTINGS_INIT_DEFAULT {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0, 0}
|
|
238
233
|
#define BLUESYSTEMPROVISIONING_INIT_DEFAULT {BlueHardwareType_TestHardware, "", "00000000000000000000", {0, {0}}, {0, {0}}}
|
|
239
|
-
#define BLUESYSTEMSTATUS_INIT_DEFAULT {"", "", "", _BLUEHARDWARETYPE_MIN, _BLUEBATTERYLEVEL_MIN, 0, BLUELOCALTIMESTAMP_INIT_DEFAULT, BLUESYSTEMSETTINGS_INIT_DEFAULT,
|
|
234
|
+
#define BLUESYSTEMSTATUS_INIT_DEFAULT {"", "", "", _BLUEHARDWARETYPE_MIN, _BLUEBATTERYLEVEL_MIN, 0, BLUELOCALTIMESTAMP_INIT_DEFAULT, BLUESYSTEMSETTINGS_INIT_DEFAULT, false, BLUELOCKSTATUS_INIT_DEFAULT}
|
|
240
235
|
#define BLUESYSTEMLOGQUERY_INIT_DEFAULT {0, 0, {0}}
|
|
241
236
|
#define BLUESYSTEMLOGENTRY_INIT_DEFAULT {0, BLUELOCALTIMESTAMP_INIT_DEFAULT, 0, 0, "", ""}
|
|
242
237
|
#define BLUESYSTEMLOGRESULT_INIT_DEFAULT {0, {BLUESYSTEMLOGENTRY_INIT_DEFAULT, BLUESYSTEMLOGENTRY_INIT_DEFAULT, BLUESYSTEMLOGENTRY_INIT_DEFAULT, BLUESYSTEMLOGENTRY_INIT_DEFAULT, BLUESYSTEMLOGENTRY_INIT_DEFAULT, BLUESYSTEMLOGENTRY_INIT_DEFAULT, BLUESYSTEMLOGENTRY_INIT_DEFAULT, BLUESYSTEMLOGENTRY_INIT_DEFAULT, BLUESYSTEMLOGENTRY_INIT_DEFAULT, BLUESYSTEMLOGENTRY_INIT_DEFAULT}}
|
|
@@ -254,7 +249,7 @@ extern "C" {
|
|
|
254
249
|
#define BLUESYSTEMUPDATE_INIT_ZERO {false, BLUESYSTEMCONFIG_INIT_ZERO, false, BLUESYSTEMTIMEUNIX_INIT_ZERO}
|
|
255
250
|
#define BLUESYSTEMSETTINGS_INIT_ZERO {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
|
|
256
251
|
#define BLUESYSTEMPROVISIONING_INIT_ZERO {_BLUEHARDWARETYPE_MIN, "", "", {0, {0}}, {0, {0}}}
|
|
257
|
-
#define BLUESYSTEMSTATUS_INIT_ZERO {"", "", "", _BLUEHARDWARETYPE_MIN, _BLUEBATTERYLEVEL_MIN, 0, BLUELOCALTIMESTAMP_INIT_ZERO, BLUESYSTEMSETTINGS_INIT_ZERO,
|
|
252
|
+
#define BLUESYSTEMSTATUS_INIT_ZERO {"", "", "", _BLUEHARDWARETYPE_MIN, _BLUEBATTERYLEVEL_MIN, 0, BLUELOCALTIMESTAMP_INIT_ZERO, BLUESYSTEMSETTINGS_INIT_ZERO, false, BLUELOCKSTATUS_INIT_ZERO}
|
|
258
253
|
#define BLUESYSTEMLOGQUERY_INIT_ZERO {0, 0, {0}}
|
|
259
254
|
#define BLUESYSTEMLOGENTRY_INIT_ZERO {0, BLUELOCALTIMESTAMP_INIT_ZERO, 0, 0, "", ""}
|
|
260
255
|
#define BLUESYSTEMLOGRESULT_INIT_ZERO {0, {BLUESYSTEMLOGENTRY_INIT_ZERO, BLUESYSTEMLOGENTRY_INIT_ZERO, BLUESYSTEMLOGENTRY_INIT_ZERO, BLUESYSTEMLOGENTRY_INIT_ZERO, BLUESYSTEMLOGENTRY_INIT_ZERO, BLUESYSTEMLOGENTRY_INIT_ZERO, BLUESYSTEMLOGENTRY_INIT_ZERO, BLUESYSTEMLOGENTRY_INIT_ZERO, BLUESYSTEMLOGENTRY_INIT_ZERO, BLUESYSTEMLOGENTRY_INIT_ZERO}}
|
|
@@ -327,12 +322,7 @@ extern "C" {
|
|
|
327
322
|
#define BLUESYSTEMSTATUS_APPLICATIONVERSION_TAG 6
|
|
328
323
|
#define BLUESYSTEMSTATUS_LOCALTIME_TAG 7
|
|
329
324
|
#define BLUESYSTEMSTATUS_SETTINGS_TAG 8
|
|
330
|
-
#define
|
|
331
|
-
#define BLUESYSTEMSTATUS_EVENTLOGENTRIESCOUNT_TAG 10
|
|
332
|
-
#define BLUESYSTEMSTATUS_EVENTLOGSEQUENCEID_TAG 11
|
|
333
|
-
#define BLUESYSTEMSTATUS_SYSTEMLOGENTRIESCOUNT_TAG 12
|
|
334
|
-
#define BLUESYSTEMSTATUS_SYSTEMLOGSEQUENCEID_TAG 13
|
|
335
|
-
#define BLUESYSTEMSTATUS_LOCK_TAG 14
|
|
325
|
+
#define BLUESYSTEMSTATUS_LOCK_TAG 9
|
|
336
326
|
#define BLUESYSTEMLOGQUERY_MAXCOUNT_TAG 1
|
|
337
327
|
#define BLUESYSTEMLOGQUERY_SEQUENCEID_TAG 2
|
|
338
328
|
#define BLUESYSTEMLOGQUERY_FROMHEAD_TAG 3
|
|
@@ -471,12 +461,7 @@ X(a, STATIC, REQUIRED, UENUM, batteryLevel, 5) \
|
|
|
471
461
|
X(a, STATIC, REQUIRED, UINT32, applicationVersion, 6) \
|
|
472
462
|
X(a, STATIC, REQUIRED, MESSAGE, localTime, 7) \
|
|
473
463
|
X(a, STATIC, REQUIRED, MESSAGE, settings, 8) \
|
|
474
|
-
X(a, STATIC,
|
|
475
|
-
X(a, STATIC, REQUIRED, UINT32, eventLogEntriesCount, 10) \
|
|
476
|
-
X(a, STATIC, REQUIRED, UINT32, eventLogSequenceId, 11) \
|
|
477
|
-
X(a, STATIC, REQUIRED, UINT32, systemLogEntriesCount, 12) \
|
|
478
|
-
X(a, STATIC, REQUIRED, UINT32, systemLogSequenceId, 13) \
|
|
479
|
-
X(a, STATIC, OPTIONAL, MESSAGE, lock, 14)
|
|
464
|
+
X(a, STATIC, OPTIONAL, MESSAGE, lock, 9)
|
|
480
465
|
#define BLUESYSTEMSTATUS_CALLBACK NULL
|
|
481
466
|
#define BLUESYSTEMSTATUS_DEFAULT NULL
|
|
482
467
|
#define BlueSystemStatus_t_localTime_MSGTYPE BlueLocalTimestamp_t
|
|
@@ -572,18 +557,18 @@ extern const pb_msgdesc_t BlueBlacklistEntries_t_msg;
|
|
|
572
557
|
#define BLUEBLACKLISTENTRIES_SIZE 2775
|
|
573
558
|
#define BLUEBLECONFIG_SIZE 342
|
|
574
559
|
#define BLUEEVENTLOGQUERY_SIZE 12
|
|
575
|
-
#define BLUEEVENTLOGRESULT_SIZE
|
|
560
|
+
#define BLUEEVENTLOGRESULT_SIZE 3300
|
|
576
561
|
#define BLUEONLINECONFIG_SIZE 224
|
|
577
562
|
#define BLUEOSSCONFIG_SIZE 56
|
|
578
|
-
#define BLUESYSTEMCONFIG_SIZE
|
|
563
|
+
#define BLUESYSTEMCONFIG_SIZE 1657
|
|
579
564
|
#define BLUESYSTEMLOGENTRY_SIZE 152
|
|
580
565
|
#define BLUESYSTEMLOGQUERY_SIZE 9
|
|
581
566
|
#define BLUESYSTEMLOGRESULT_SIZE 1550
|
|
582
567
|
#define BLUESYSTEMPROVISIONING_SIZE 299
|
|
583
568
|
#define BLUESYSTEMSETTINGS_SIZE 48
|
|
584
|
-
#define BLUESYSTEMSTATUS_SIZE
|
|
569
|
+
#define BLUESYSTEMSTATUS_SIZE 134
|
|
585
570
|
#define BLUESYSTEMTIMEUNIX_SIZE 6
|
|
586
|
-
#define BLUESYSTEMUPDATE_SIZE
|
|
571
|
+
#define BLUESYSTEMUPDATE_SIZE 1668
|
|
587
572
|
|
|
588
573
|
#ifdef __cplusplus
|
|
589
574
|
} /* extern "C" */
|
package/package.json
CHANGED
package/swift/BlueCore.pb.swift
CHANGED
|
@@ -1393,15 +1393,15 @@ public struct BlueEvent {
|
|
|
1393
1393
|
/// Clears the value of `eventInfo`. Subsequent reads from it will return its default value.
|
|
1394
1394
|
public mutating func clearEventInfo() {self._eventInfo = nil}
|
|
1395
1395
|
|
|
1396
|
-
/// Set if
|
|
1397
|
-
public var
|
|
1398
|
-
get {return
|
|
1399
|
-
set {
|
|
1396
|
+
/// Set if credential related
|
|
1397
|
+
public var credentialID: BlueCredentialId {
|
|
1398
|
+
get {return _credentialID ?? BlueCredentialId()}
|
|
1399
|
+
set {_credentialID = newValue}
|
|
1400
1400
|
}
|
|
1401
|
-
/// Returns true if `
|
|
1402
|
-
public var
|
|
1403
|
-
/// Clears the value of `
|
|
1404
|
-
public mutating func
|
|
1401
|
+
/// Returns true if `credentialID` has been explicitly set.
|
|
1402
|
+
public var hasCredentialID: Bool {return self._credentialID != nil}
|
|
1403
|
+
/// Clears the value of `credentialID`. Subsequent reads from it will return its default value.
|
|
1404
|
+
public mutating func clearCredentialID() {self._credentialID = nil}
|
|
1405
1405
|
|
|
1406
1406
|
/// Set if eventId =
|
|
1407
1407
|
public var command: String {
|
|
@@ -1421,7 +1421,7 @@ public struct BlueEvent {
|
|
|
1421
1421
|
fileprivate var _eventTime: BlueLocalTimestamp? = nil
|
|
1422
1422
|
fileprivate var _eventID: BlueEventId? = nil
|
|
1423
1423
|
fileprivate var _eventInfo: Int32? = nil
|
|
1424
|
-
fileprivate var
|
|
1424
|
+
fileprivate var _credentialID: BlueCredentialId? = nil
|
|
1425
1425
|
fileprivate var _command: String? = nil
|
|
1426
1426
|
}
|
|
1427
1427
|
|
|
@@ -4199,7 +4199,7 @@ extension BlueEvent: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
|
|
|
4199
4199
|
2: .same(proto: "eventTime"),
|
|
4200
4200
|
4: .same(proto: "eventId"),
|
|
4201
4201
|
5: .same(proto: "eventInfo"),
|
|
4202
|
-
6: .same(proto: "
|
|
4202
|
+
6: .same(proto: "credentialId"),
|
|
4203
4203
|
7: .same(proto: "command"),
|
|
4204
4204
|
]
|
|
4205
4205
|
|
|
@@ -4209,6 +4209,7 @@ extension BlueEvent: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
|
|
|
4209
4209
|
if self._eventID == nil {return false}
|
|
4210
4210
|
if self._eventInfo == nil {return false}
|
|
4211
4211
|
if let v = self._eventTime, !v.isInitialized {return false}
|
|
4212
|
+
if let v = self._credentialID, !v.isInitialized {return false}
|
|
4212
4213
|
return true
|
|
4213
4214
|
}
|
|
4214
4215
|
|
|
@@ -4222,7 +4223,7 @@ extension BlueEvent: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
|
|
|
4222
4223
|
case 2: try { try decoder.decodeSingularMessageField(value: &self._eventTime) }()
|
|
4223
4224
|
case 4: try { try decoder.decodeSingularEnumField(value: &self._eventID) }()
|
|
4224
4225
|
case 5: try { try decoder.decodeSingularInt32Field(value: &self._eventInfo) }()
|
|
4225
|
-
case 6: try { try decoder.
|
|
4226
|
+
case 6: try { try decoder.decodeSingularMessageField(value: &self._credentialID) }()
|
|
4226
4227
|
case 7: try { try decoder.decodeSingularStringField(value: &self._command) }()
|
|
4227
4228
|
default: break
|
|
4228
4229
|
}
|
|
@@ -4246,8 +4247,8 @@ extension BlueEvent: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
|
|
|
4246
4247
|
try { if let v = self._eventInfo {
|
|
4247
4248
|
try visitor.visitSingularInt32Field(value: v, fieldNumber: 5)
|
|
4248
4249
|
} }()
|
|
4249
|
-
try { if let v = self.
|
|
4250
|
-
try visitor.
|
|
4250
|
+
try { if let v = self._credentialID {
|
|
4251
|
+
try visitor.visitSingularMessageField(value: v, fieldNumber: 6)
|
|
4251
4252
|
} }()
|
|
4252
4253
|
try { if let v = self._command {
|
|
4253
4254
|
try visitor.visitSingularStringField(value: v, fieldNumber: 7)
|
|
@@ -4260,7 +4261,7 @@ extension BlueEvent: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
|
|
|
4260
4261
|
if lhs._eventTime != rhs._eventTime {return false}
|
|
4261
4262
|
if lhs._eventID != rhs._eventID {return false}
|
|
4262
4263
|
if lhs._eventInfo != rhs._eventInfo {return false}
|
|
4263
|
-
if lhs.
|
|
4264
|
+
if lhs._credentialID != rhs._credentialID {return false}
|
|
4264
4265
|
if lhs._command != rhs._command {return false}
|
|
4265
4266
|
if lhs.unknownFields != rhs.unknownFields {return false}
|
|
4266
4267
|
return true
|
package/swift/BlueLock.pb.swift
CHANGED
|
@@ -79,8 +79,15 @@ public struct BlueLockConfig {
|
|
|
79
79
|
/// Clears the value of `openScheduleByUser`. Subsequent reads from it will return its default value.
|
|
80
80
|
public mutating func clearOpenScheduleByUser() {self._openScheduleByUser = nil}
|
|
81
81
|
|
|
82
|
-
///
|
|
83
|
-
public var
|
|
82
|
+
/// If set keeps the lock closed on federal vacation days
|
|
83
|
+
public var keepClosedOnHolidays: Bool {
|
|
84
|
+
get {return _keepClosedOnHolidays ?? false}
|
|
85
|
+
set {_keepClosedOnHolidays = newValue}
|
|
86
|
+
}
|
|
87
|
+
/// Returns true if `keepClosedOnHolidays` has been explicitly set.
|
|
88
|
+
public var hasKeepClosedOnHolidays: Bool {return self._keepClosedOnHolidays != nil}
|
|
89
|
+
/// Clears the value of `keepClosedOnHolidays`. Subsequent reads from it will return its default value.
|
|
90
|
+
public mutating func clearKeepClosedOnHolidays() {self._keepClosedOnHolidays = nil}
|
|
84
91
|
|
|
85
92
|
/// Default time in seconds to keep the lock open
|
|
86
93
|
public var defaultOpenTimeSec: UInt32 {
|
|
@@ -107,6 +114,7 @@ public struct BlueLockConfig {
|
|
|
107
114
|
public init() {}
|
|
108
115
|
|
|
109
116
|
fileprivate var _openScheduleByUser: Bool? = nil
|
|
117
|
+
fileprivate var _keepClosedOnHolidays: Bool? = nil
|
|
110
118
|
fileprivate var _defaultOpenTimeSec: UInt32? = nil
|
|
111
119
|
fileprivate var _extendedOpenTimeSec: UInt32? = nil
|
|
112
120
|
}
|
|
@@ -164,13 +172,14 @@ extension BlueLockConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
|
|
|
164
172
|
public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
|
|
165
173
|
1: .same(proto: "openSchedules"),
|
|
166
174
|
2: .same(proto: "openScheduleByUser"),
|
|
167
|
-
20: .same(proto: "
|
|
175
|
+
20: .same(proto: "keepClosedOnHolidays"),
|
|
168
176
|
21: .same(proto: "defaultOpenTimeSec"),
|
|
169
177
|
22: .same(proto: "extendedOpenTimeSec"),
|
|
170
178
|
]
|
|
171
179
|
|
|
172
180
|
public var isInitialized: Bool {
|
|
173
181
|
if self._openScheduleByUser == nil {return false}
|
|
182
|
+
if self._keepClosedOnHolidays == nil {return false}
|
|
174
183
|
if self._defaultOpenTimeSec == nil {return false}
|
|
175
184
|
if self._extendedOpenTimeSec == nil {return false}
|
|
176
185
|
if !SwiftProtobuf.Internal.areAllInitialized(self.openSchedules) {return false}
|
|
@@ -185,7 +194,7 @@ extension BlueLockConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
|
|
|
185
194
|
switch fieldNumber {
|
|
186
195
|
case 1: try { try decoder.decodeRepeatedMessageField(value: &self.openSchedules) }()
|
|
187
196
|
case 2: try { try decoder.decodeSingularBoolField(value: &self._openScheduleByUser) }()
|
|
188
|
-
case 20: try { try decoder.
|
|
197
|
+
case 20: try { try decoder.decodeSingularBoolField(value: &self._keepClosedOnHolidays) }()
|
|
189
198
|
case 21: try { try decoder.decodeSingularUInt32Field(value: &self._defaultOpenTimeSec) }()
|
|
190
199
|
case 22: try { try decoder.decodeSingularUInt32Field(value: &self._extendedOpenTimeSec) }()
|
|
191
200
|
default: break
|
|
@@ -204,9 +213,9 @@ extension BlueLockConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
|
|
|
204
213
|
try { if let v = self._openScheduleByUser {
|
|
205
214
|
try visitor.visitSingularBoolField(value: v, fieldNumber: 2)
|
|
206
215
|
} }()
|
|
207
|
-
if
|
|
208
|
-
try visitor.
|
|
209
|
-
}
|
|
216
|
+
try { if let v = self._keepClosedOnHolidays {
|
|
217
|
+
try visitor.visitSingularBoolField(value: v, fieldNumber: 20)
|
|
218
|
+
} }()
|
|
210
219
|
try { if let v = self._defaultOpenTimeSec {
|
|
211
220
|
try visitor.visitSingularUInt32Field(value: v, fieldNumber: 21)
|
|
212
221
|
} }()
|
|
@@ -219,7 +228,7 @@ extension BlueLockConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
|
|
|
219
228
|
public static func ==(lhs: BlueLockConfig, rhs: BlueLockConfig) -> Bool {
|
|
220
229
|
if lhs.openSchedules != rhs.openSchedules {return false}
|
|
221
230
|
if lhs._openScheduleByUser != rhs._openScheduleByUser {return false}
|
|
222
|
-
if lhs.
|
|
231
|
+
if lhs._keepClosedOnHolidays != rhs._keepClosedOnHolidays {return false}
|
|
223
232
|
if lhs._defaultOpenTimeSec != rhs._defaultOpenTimeSec {return false}
|
|
224
233
|
if lhs._extendedOpenTimeSec != rhs._extendedOpenTimeSec {return false}
|
|
225
234
|
if lhs.unknownFields != rhs.unknownFields {return false}
|
|
@@ -781,51 +781,6 @@ public struct BlueSystemStatus {
|
|
|
781
781
|
/// Clears the value of `settings`. Subsequent reads from it will return its default value.
|
|
782
782
|
public mutating func clearSettings() {_uniqueStorage()._settings = nil}
|
|
783
783
|
|
|
784
|
-
public var blacklistEntriesCount: UInt32 {
|
|
785
|
-
get {return _storage._blacklistEntriesCount ?? 0}
|
|
786
|
-
set {_uniqueStorage()._blacklistEntriesCount = newValue}
|
|
787
|
-
}
|
|
788
|
-
/// Returns true if `blacklistEntriesCount` has been explicitly set.
|
|
789
|
-
public var hasBlacklistEntriesCount: Bool {return _storage._blacklistEntriesCount != nil}
|
|
790
|
-
/// Clears the value of `blacklistEntriesCount`. Subsequent reads from it will return its default value.
|
|
791
|
-
public mutating func clearBlacklistEntriesCount() {_uniqueStorage()._blacklistEntriesCount = nil}
|
|
792
|
-
|
|
793
|
-
public var eventLogEntriesCount: UInt32 {
|
|
794
|
-
get {return _storage._eventLogEntriesCount ?? 0}
|
|
795
|
-
set {_uniqueStorage()._eventLogEntriesCount = newValue}
|
|
796
|
-
}
|
|
797
|
-
/// Returns true if `eventLogEntriesCount` has been explicitly set.
|
|
798
|
-
public var hasEventLogEntriesCount: Bool {return _storage._eventLogEntriesCount != nil}
|
|
799
|
-
/// Clears the value of `eventLogEntriesCount`. Subsequent reads from it will return its default value.
|
|
800
|
-
public mutating func clearEventLogEntriesCount() {_uniqueStorage()._eventLogEntriesCount = nil}
|
|
801
|
-
|
|
802
|
-
public var eventLogSequenceID: UInt32 {
|
|
803
|
-
get {return _storage._eventLogSequenceID ?? 0}
|
|
804
|
-
set {_uniqueStorage()._eventLogSequenceID = newValue}
|
|
805
|
-
}
|
|
806
|
-
/// Returns true if `eventLogSequenceID` has been explicitly set.
|
|
807
|
-
public var hasEventLogSequenceID: Bool {return _storage._eventLogSequenceID != nil}
|
|
808
|
-
/// Clears the value of `eventLogSequenceID`. Subsequent reads from it will return its default value.
|
|
809
|
-
public mutating func clearEventLogSequenceID() {_uniqueStorage()._eventLogSequenceID = nil}
|
|
810
|
-
|
|
811
|
-
public var systemLogEntriesCount: UInt32 {
|
|
812
|
-
get {return _storage._systemLogEntriesCount ?? 0}
|
|
813
|
-
set {_uniqueStorage()._systemLogEntriesCount = newValue}
|
|
814
|
-
}
|
|
815
|
-
/// Returns true if `systemLogEntriesCount` has been explicitly set.
|
|
816
|
-
public var hasSystemLogEntriesCount: Bool {return _storage._systemLogEntriesCount != nil}
|
|
817
|
-
/// Clears the value of `systemLogEntriesCount`. Subsequent reads from it will return its default value.
|
|
818
|
-
public mutating func clearSystemLogEntriesCount() {_uniqueStorage()._systemLogEntriesCount = nil}
|
|
819
|
-
|
|
820
|
-
public var systemLogSequenceID: UInt32 {
|
|
821
|
-
get {return _storage._systemLogSequenceID ?? 0}
|
|
822
|
-
set {_uniqueStorage()._systemLogSequenceID = newValue}
|
|
823
|
-
}
|
|
824
|
-
/// Returns true if `systemLogSequenceID` has been explicitly set.
|
|
825
|
-
public var hasSystemLogSequenceID: Bool {return _storage._systemLogSequenceID != nil}
|
|
826
|
-
/// Clears the value of `systemLogSequenceID`. Subsequent reads from it will return its default value.
|
|
827
|
-
public mutating func clearSystemLogSequenceID() {_uniqueStorage()._systemLogSequenceID = nil}
|
|
828
|
-
|
|
829
784
|
/// -- Custom
|
|
830
785
|
public var lock: BlueLockStatus {
|
|
831
786
|
get {return _storage._lock ?? BlueLockStatus()}
|
|
@@ -1932,12 +1887,7 @@ extension BlueSystemStatus: SwiftProtobuf.Message, SwiftProtobuf._MessageImpleme
|
|
|
1932
1887
|
6: .same(proto: "applicationVersion"),
|
|
1933
1888
|
7: .same(proto: "localTime"),
|
|
1934
1889
|
8: .same(proto: "settings"),
|
|
1935
|
-
9: .same(proto: "
|
|
1936
|
-
10: .same(proto: "eventLogEntriesCount"),
|
|
1937
|
-
11: .same(proto: "eventLogSequenceId"),
|
|
1938
|
-
12: .same(proto: "systemLogEntriesCount"),
|
|
1939
|
-
13: .same(proto: "systemLogSequenceId"),
|
|
1940
|
-
14: .same(proto: "lock"),
|
|
1890
|
+
9: .same(proto: "lock"),
|
|
1941
1891
|
]
|
|
1942
1892
|
|
|
1943
1893
|
fileprivate class _StorageClass {
|
|
@@ -1949,11 +1899,6 @@ extension BlueSystemStatus: SwiftProtobuf.Message, SwiftProtobuf._MessageImpleme
|
|
|
1949
1899
|
var _applicationVersion: UInt32? = nil
|
|
1950
1900
|
var _localTime: BlueLocalTimestamp? = nil
|
|
1951
1901
|
var _settings: BlueSystemSettings? = nil
|
|
1952
|
-
var _blacklistEntriesCount: UInt32? = nil
|
|
1953
|
-
var _eventLogEntriesCount: UInt32? = nil
|
|
1954
|
-
var _eventLogSequenceID: UInt32? = nil
|
|
1955
|
-
var _systemLogEntriesCount: UInt32? = nil
|
|
1956
|
-
var _systemLogSequenceID: UInt32? = nil
|
|
1957
1902
|
var _lock: BlueLockStatus? = nil
|
|
1958
1903
|
|
|
1959
1904
|
static let defaultInstance = _StorageClass()
|
|
@@ -1969,11 +1914,6 @@ extension BlueSystemStatus: SwiftProtobuf.Message, SwiftProtobuf._MessageImpleme
|
|
|
1969
1914
|
_applicationVersion = source._applicationVersion
|
|
1970
1915
|
_localTime = source._localTime
|
|
1971
1916
|
_settings = source._settings
|
|
1972
|
-
_blacklistEntriesCount = source._blacklistEntriesCount
|
|
1973
|
-
_eventLogEntriesCount = source._eventLogEntriesCount
|
|
1974
|
-
_eventLogSequenceID = source._eventLogSequenceID
|
|
1975
|
-
_systemLogEntriesCount = source._systemLogEntriesCount
|
|
1976
|
-
_systemLogSequenceID = source._systemLogSequenceID
|
|
1977
1917
|
_lock = source._lock
|
|
1978
1918
|
}
|
|
1979
1919
|
}
|
|
@@ -1995,11 +1935,6 @@ extension BlueSystemStatus: SwiftProtobuf.Message, SwiftProtobuf._MessageImpleme
|
|
|
1995
1935
|
if _storage._applicationVersion == nil {return false}
|
|
1996
1936
|
if _storage._localTime == nil {return false}
|
|
1997
1937
|
if _storage._settings == nil {return false}
|
|
1998
|
-
if _storage._blacklistEntriesCount == nil {return false}
|
|
1999
|
-
if _storage._eventLogEntriesCount == nil {return false}
|
|
2000
|
-
if _storage._eventLogSequenceID == nil {return false}
|
|
2001
|
-
if _storage._systemLogEntriesCount == nil {return false}
|
|
2002
|
-
if _storage._systemLogSequenceID == nil {return false}
|
|
2003
1938
|
if let v = _storage._localTime, !v.isInitialized {return false}
|
|
2004
1939
|
if let v = _storage._settings, !v.isInitialized {return false}
|
|
2005
1940
|
if let v = _storage._lock, !v.isInitialized {return false}
|
|
@@ -2023,12 +1958,7 @@ extension BlueSystemStatus: SwiftProtobuf.Message, SwiftProtobuf._MessageImpleme
|
|
|
2023
1958
|
case 6: try { try decoder.decodeSingularUInt32Field(value: &_storage._applicationVersion) }()
|
|
2024
1959
|
case 7: try { try decoder.decodeSingularMessageField(value: &_storage._localTime) }()
|
|
2025
1960
|
case 8: try { try decoder.decodeSingularMessageField(value: &_storage._settings) }()
|
|
2026
|
-
case 9: try { try decoder.
|
|
2027
|
-
case 10: try { try decoder.decodeSingularUInt32Field(value: &_storage._eventLogEntriesCount) }()
|
|
2028
|
-
case 11: try { try decoder.decodeSingularUInt32Field(value: &_storage._eventLogSequenceID) }()
|
|
2029
|
-
case 12: try { try decoder.decodeSingularUInt32Field(value: &_storage._systemLogEntriesCount) }()
|
|
2030
|
-
case 13: try { try decoder.decodeSingularUInt32Field(value: &_storage._systemLogSequenceID) }()
|
|
2031
|
-
case 14: try { try decoder.decodeSingularMessageField(value: &_storage._lock) }()
|
|
1961
|
+
case 9: try { try decoder.decodeSingularMessageField(value: &_storage._lock) }()
|
|
2032
1962
|
default: break
|
|
2033
1963
|
}
|
|
2034
1964
|
}
|
|
@@ -2065,23 +1995,8 @@ extension BlueSystemStatus: SwiftProtobuf.Message, SwiftProtobuf._MessageImpleme
|
|
|
2065
1995
|
try { if let v = _storage._settings {
|
|
2066
1996
|
try visitor.visitSingularMessageField(value: v, fieldNumber: 8)
|
|
2067
1997
|
} }()
|
|
2068
|
-
try { if let v = _storage._blacklistEntriesCount {
|
|
2069
|
-
try visitor.visitSingularUInt32Field(value: v, fieldNumber: 9)
|
|
2070
|
-
} }()
|
|
2071
|
-
try { if let v = _storage._eventLogEntriesCount {
|
|
2072
|
-
try visitor.visitSingularUInt32Field(value: v, fieldNumber: 10)
|
|
2073
|
-
} }()
|
|
2074
|
-
try { if let v = _storage._eventLogSequenceID {
|
|
2075
|
-
try visitor.visitSingularUInt32Field(value: v, fieldNumber: 11)
|
|
2076
|
-
} }()
|
|
2077
|
-
try { if let v = _storage._systemLogEntriesCount {
|
|
2078
|
-
try visitor.visitSingularUInt32Field(value: v, fieldNumber: 12)
|
|
2079
|
-
} }()
|
|
2080
|
-
try { if let v = _storage._systemLogSequenceID {
|
|
2081
|
-
try visitor.visitSingularUInt32Field(value: v, fieldNumber: 13)
|
|
2082
|
-
} }()
|
|
2083
1998
|
try { if let v = _storage._lock {
|
|
2084
|
-
try visitor.visitSingularMessageField(value: v, fieldNumber:
|
|
1999
|
+
try visitor.visitSingularMessageField(value: v, fieldNumber: 9)
|
|
2085
2000
|
} }()
|
|
2086
2001
|
}
|
|
2087
2002
|
try unknownFields.traverse(visitor: &visitor)
|
|
@@ -2100,11 +2015,6 @@ extension BlueSystemStatus: SwiftProtobuf.Message, SwiftProtobuf._MessageImpleme
|
|
|
2100
2015
|
if _storage._applicationVersion != rhs_storage._applicationVersion {return false}
|
|
2101
2016
|
if _storage._localTime != rhs_storage._localTime {return false}
|
|
2102
2017
|
if _storage._settings != rhs_storage._settings {return false}
|
|
2103
|
-
if _storage._blacklistEntriesCount != rhs_storage._blacklistEntriesCount {return false}
|
|
2104
|
-
if _storage._eventLogEntriesCount != rhs_storage._eventLogEntriesCount {return false}
|
|
2105
|
-
if _storage._eventLogSequenceID != rhs_storage._eventLogSequenceID {return false}
|
|
2106
|
-
if _storage._systemLogEntriesCount != rhs_storage._systemLogEntriesCount {return false}
|
|
2107
|
-
if _storage._systemLogSequenceID != rhs_storage._systemLogSequenceID {return false}
|
|
2108
2018
|
if _storage._lock != rhs_storage._lock {return false}
|
|
2109
2019
|
return true
|
|
2110
2020
|
}
|