diff --git a/api/api.md b/api/api.md index 4efe17e743..d0c6b66ce1 100644 --- a/api/api.md +++ b/api/api.md @@ -3370,6 +3370,8 @@ This is used internally by the Network Server. | `desired_beacon_frequency` | [`FrequencyValue`](#ttn.lorawan.v3.FrequencyValue) | | The frequency of the class B beacon (Hz) Network Server should configure device to use via MAC commands. If unset, the default value from Network Server configuration will be used. | | `desired_max_eirp` | [`DeviceEIRPValue`](#ttn.lorawan.v3.DeviceEIRPValue) | | Maximum EIRP (dBm). If unset, the default value from regional parameters specification will be used. | | `class_b_c_downlink_interval` | [`google.protobuf.Duration`](#google.protobuf.Duration) | | The minimum duration passed before a network-initiated(e.g. Class B or C) downlink following an arbitrary downlink. | +| `uplink_dwell_time` | [`BoolValue`](#ttn.lorawan.v3.BoolValue) | | Whether uplink dwell time is set (400ms). If unset, the default value from Network Server configuration or regional parameters specification will be used. | +| `downlink_dwell_time` | [`BoolValue`](#ttn.lorawan.v3.BoolValue) | | Whether downlink dwell time is set (400ms). If unset, the default value from Network Server configuration or regional parameters specification will be used. | #### Field Rules diff --git a/api/api.swagger.json b/api/api.swagger.json index b0ab862432..9878d98b72 100644 --- a/api/api.swagger.json +++ b/api/api.swagger.json @@ -15920,6 +15920,14 @@ "class_b_c_downlink_interval": { "type": "string", "description": "The minimum duration passed before a network-initiated(e.g. Class B or C) downlink following an arbitrary downlink." + }, + "uplink_dwell_time": { + "$ref": "#/definitions/lorawanv3BoolValue", + "description": "Whether uplink dwell time is set (400ms).\nIf unset, the default value from Network Server configuration or regional parameters specification will be used." + }, + "downlink_dwell_time": { + "$ref": "#/definitions/lorawanv3BoolValue", + "description": "Whether downlink dwell time is set (400ms).\nIf unset, the default value from Network Server configuration or regional parameters specification will be used." } } }, diff --git a/api/end_device.proto b/api/end_device.proto index c6ac2c0b6b..c329b36e02 100644 --- a/api/end_device.proto +++ b/api/end_device.proto @@ -266,6 +266,13 @@ message MACSettings { DeviceEIRPValue desired_max_eirp = 30; // The minimum duration passed before a network-initiated(e.g. Class B or C) downlink following an arbitrary downlink. google.protobuf.Duration class_b_c_downlink_interval = 31; + + // Whether uplink dwell time is set (400ms). + // If unset, the default value from Network Server configuration or regional parameters specification will be used. + BoolValue uplink_dwell_time = 32; + // Whether downlink dwell time is set (400ms). + // If unset, the default value from Network Server configuration or regional parameters specification will be used. + BoolValue downlink_dwell_time = 33; } // MACState represents the state of MAC layer of the device. diff --git a/pkg/band/as_923_rp1_v1_0_2_rev_b.go b/pkg/band/as_923_rp1_v1_0_2_rev_b.go index 9076567e38..65027b3fb1 100644 --- a/pkg/band/as_923_rp1_v1_0_2_rev_b.go +++ b/pkg/band/as_923_rp1_v1_0_2_rev_b.go @@ -116,4 +116,11 @@ var AS_923_RP1_v1_0_2_RevB = Band{ PingSlotFrequency: uint64Ptr(as923BeaconFrequency(as923Group1Offset)), TxParamSetupReqSupport: true, + + // Based on LoRaMac-node 4.4.1. + // https://github.com/Lora-net/LoRaMac-node/blob/1cdd9ccec4c9f05b616e7112059be4a9e358c571/src/mac/region/RegionAS923.h#L116-L124 + BootDwellTime: DwellTime{ + Uplinks: boolPtr(true), + Downlinks: boolPtr(true), + }, } diff --git a/pkg/band/as_923_rp1_v1_0_3_rev_a.go b/pkg/band/as_923_rp1_v1_0_3_rev_a.go index 1a9140477f..22b5f91fc1 100644 --- a/pkg/band/as_923_rp1_v1_0_3_rev_a.go +++ b/pkg/band/as_923_rp1_v1_0_3_rev_a.go @@ -116,4 +116,12 @@ var AS_923_RP1_v1_0_3_RevA = Band{ PingSlotFrequency: uint64Ptr(as923BeaconFrequency(as923Group1Offset)), TxParamSetupReqSupport: true, + + // Based on LoRaMac-node 4.4.7. + // https://github.com/Lora-net/LoRaMac-node/blob/e54d3ecf3407c2b9a0abe86ce406de76b2b5a180/src/mac/region/RegionAS923.h#L142-L145 + // https://github.com/Lora-net/LoRaMac-node/blob/e54d3ecf3407c2b9a0abe86ce406de76b2b5a180/src/mac/region/RegionCommon.h#L102-L105 + BootDwellTime: DwellTime{ + Uplinks: boolPtr(true), + Downlinks: boolPtr(false), + }, } diff --git a/pkg/band/as_923_rp2_v1_0_1.go b/pkg/band/as_923_rp2_v1_0_1.go index 4470ca9ba9..04316acc81 100644 --- a/pkg/band/as_923_rp2_v1_0_1.go +++ b/pkg/band/as_923_rp2_v1_0_1.go @@ -118,5 +118,13 @@ var as923RP2101Band = func(id string, offset as923GroupOffset) Band { PingSlotFrequency: uint64Ptr(as923BeaconFrequency(offset)), TxParamSetupReqSupport: true, + + // Based on LoRaMac-node 4.6.0. + // https://github.com/Lora-net/LoRaMac-node/blob/fe8247e2b84101fe701531a5f9ef14f035743af4/src/mac/region/RegionAS923.h#L161-L164 + // https://github.com/Lora-net/LoRaMac-node/blob/fe8247e2b84101fe701531a5f9ef14f035743af4/src/mac/region/RegionCommon.h#L97-L100 + BootDwellTime: DwellTime{ + Uplinks: boolPtr(true), + Downlinks: boolPtr(false), + }, } } diff --git a/pkg/band/au_915_928_rp1_v1_0_3_rev_a.go b/pkg/band/au_915_928_rp1_v1_0_3_rev_a.go index 091c819d90..30b423ff5e 100644 --- a/pkg/band/au_915_928_rp1_v1_0_3_rev_a.go +++ b/pkg/band/au_915_928_rp1_v1_0_3_rev_a.go @@ -115,4 +115,9 @@ var AU_915_928_RP1_v1_0_3_RevA = Band{ }, TxParamSetupReqSupport: true, + + BootDwellTime: DwellTime{ + Uplinks: boolPtr(true), + Downlinks: boolPtr(false), + }, } diff --git a/pkg/band/au_915_928_rp1_v1_1_rev_a.go b/pkg/band/au_915_928_rp1_v1_1_rev_a.go index 79f0f49327..a96efefca8 100644 --- a/pkg/band/au_915_928_rp1_v1_1_rev_a.go +++ b/pkg/band/au_915_928_rp1_v1_1_rev_a.go @@ -110,4 +110,9 @@ var AU_915_928_RP1_v1_1_RevA = Band{ }, TxParamSetupReqSupport: false, + + BootDwellTime: DwellTime{ + Uplinks: boolPtr(true), + Downlinks: boolPtr(false), + }, } diff --git a/pkg/band/au_915_928_rp1_v1_1_rev_b.go b/pkg/band/au_915_928_rp1_v1_1_rev_b.go index bc30b228d1..2ced9b29b7 100644 --- a/pkg/band/au_915_928_rp1_v1_1_rev_b.go +++ b/pkg/band/au_915_928_rp1_v1_1_rev_b.go @@ -114,4 +114,9 @@ var AU_915_928_RP1_v1_1_RevB = Band{ }, TxParamSetupReqSupport: true, + + BootDwellTime: DwellTime{ + Uplinks: boolPtr(true), + Downlinks: boolPtr(false), + }, } diff --git a/pkg/band/au_915_928_rp2_v1_0_0.go b/pkg/band/au_915_928_rp2_v1_0_0.go index eb23d269dd..aab412624e 100644 --- a/pkg/band/au_915_928_rp2_v1_0_0.go +++ b/pkg/band/au_915_928_rp2_v1_0_0.go @@ -114,4 +114,9 @@ var AU_915_928_RP2_v1_0_0 = Band{ }, TxParamSetupReqSupport: true, + + BootDwellTime: DwellTime{ + Uplinks: boolPtr(true), + Downlinks: boolPtr(false), + }, } diff --git a/pkg/band/au_915_928_rp2_v1_0_1.go b/pkg/band/au_915_928_rp2_v1_0_1.go index 2e884ae8c2..e0b530565e 100644 --- a/pkg/band/au_915_928_rp2_v1_0_1.go +++ b/pkg/band/au_915_928_rp2_v1_0_1.go @@ -114,4 +114,9 @@ var AU_915_928_RP2_v1_0_1 = Band{ }, TxParamSetupReqSupport: true, + + BootDwellTime: DwellTime{ + Uplinks: boolPtr(true), + Downlinks: boolPtr(false), + }, } diff --git a/pkg/band/au_915_928_rp2_v1_0_2.go b/pkg/band/au_915_928_rp2_v1_0_2.go index bf14f87d2c..81d686cbf9 100644 --- a/pkg/band/au_915_928_rp2_v1_0_2.go +++ b/pkg/band/au_915_928_rp2_v1_0_2.go @@ -114,4 +114,9 @@ var AU_915_928_RP2_v1_0_2 = Band{ }, TxParamSetupReqSupport: true, + + BootDwellTime: DwellTime{ + Uplinks: boolPtr(true), + Downlinks: boolPtr(false), + }, } diff --git a/pkg/band/band.go b/pkg/band/band.go index 731593123c..d4f2a702bc 100644 --- a/pkg/band/band.go +++ b/pkg/band/band.go @@ -100,6 +100,15 @@ type Band struct { // DefaultRx2Parameters are the default parameters that determine the settings for a Tx sent during Rx2. DefaultRx2Parameters Rx2Parameters + + // BootDwellTime contains the dwell time values expected for a device on boot. + BootDwellTime DwellTime +} + +// DwellTime contains the band dwell time settings. +type DwellTime struct { + Uplinks *bool + Downlinks *bool } // MaxTxPowerIndex returns the maximum TxPower index for the band. @@ -154,3 +163,5 @@ func (b Band) FindDownlinkDataRate(dr *ttnpb.DataRate) (ttnpb.DataRateIndex, Dat } return 0, DataRate{}, false } + +func boolPtr(v bool) *bool { return &v } diff --git a/pkg/band/reference_test.go b/pkg/band/reference_test.go index 39a878e1f2..433dd2e73d 100644 --- a/pkg/band/reference_test.go +++ b/pkg/band/reference_test.go @@ -127,6 +127,8 @@ type serializableBand struct { Rx1DataRate map[string]ttnpb.DataRateIndex DefaultRx2Parameters band.Rx2Parameters + + BootDwellTime band.DwellTime } func makeRx1Channel(f func(uint8) (uint8, error)) map[uint8]uint8 { @@ -216,6 +218,8 @@ func makeBand(b band.Band) serializableBand { // Missing: ParseChMask DefaultRx2Parameters: b.DefaultRx2Parameters, + + BootDwellTime: b.BootDwellTime, } } diff --git a/pkg/band/testdata/AS_923_2_RP002_V1_0_1.json b/pkg/band/testdata/AS_923_2_RP002_V1_0_1.json index 691bdedea0..45e9317537 100644 --- a/pkg/band/testdata/AS_923_2_RP002_V1_0_1.json +++ b/pkg/band/testdata/AS_923_2_RP002_V1_0_1.json @@ -683,5 +683,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 2, "Frequency": 921400000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/testdata/AS_923_2_RP002_V1_0_2.json b/pkg/band/testdata/AS_923_2_RP002_V1_0_2.json index 691bdedea0..1efe9d1542 100644 --- a/pkg/band/testdata/AS_923_2_RP002_V1_0_2.json +++ b/pkg/band/testdata/AS_923_2_RP002_V1_0_2.json @@ -683,5 +683,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 2, "Frequency": 921400000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/AS_923_3_RP002_V1_0_1.json b/pkg/band/testdata/AS_923_3_RP002_V1_0_1.json index 2720f02659..92bdf61b72 100644 --- a/pkg/band/testdata/AS_923_3_RP002_V1_0_1.json +++ b/pkg/band/testdata/AS_923_3_RP002_V1_0_1.json @@ -683,5 +683,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 2, "Frequency": 916600000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/testdata/AS_923_3_RP002_V1_0_2.json b/pkg/band/testdata/AS_923_3_RP002_V1_0_2.json index 2720f02659..d2995b46ab 100644 --- a/pkg/band/testdata/AS_923_3_RP002_V1_0_2.json +++ b/pkg/band/testdata/AS_923_3_RP002_V1_0_2.json @@ -683,5 +683,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 2, "Frequency": 916600000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/AS_923_PHY_V1_0_2_REV_A.json b/pkg/band/testdata/AS_923_PHY_V1_0_2_REV_A.json index f2d31cd714..a908ec541a 100644 --- a/pkg/band/testdata/AS_923_PHY_V1_0_2_REV_A.json +++ b/pkg/band/testdata/AS_923_PHY_V1_0_2_REV_A.json @@ -681,5 +681,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 2, "Frequency": 923200000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/AS_923_PHY_V1_0_2_REV_B.json b/pkg/band/testdata/AS_923_PHY_V1_0_2_REV_B.json index dca36a8db3..ebac942e64 100644 --- a/pkg/band/testdata/AS_923_PHY_V1_0_2_REV_B.json +++ b/pkg/band/testdata/AS_923_PHY_V1_0_2_REV_B.json @@ -683,5 +683,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 2, "Frequency": 923200000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": true } } \ No newline at end of file diff --git a/pkg/band/testdata/AS_923_PHY_V1_0_3_REV_A.json b/pkg/band/testdata/AS_923_PHY_V1_0_3_REV_A.json index dca36a8db3..5979d1a5ae 100644 --- a/pkg/band/testdata/AS_923_PHY_V1_0_3_REV_A.json +++ b/pkg/band/testdata/AS_923_PHY_V1_0_3_REV_A.json @@ -683,5 +683,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 2, "Frequency": 923200000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/testdata/AS_923_PHY_V1_1_REV_A.json b/pkg/band/testdata/AS_923_PHY_V1_1_REV_A.json index dca36a8db3..501b896379 100644 --- a/pkg/band/testdata/AS_923_PHY_V1_1_REV_A.json +++ b/pkg/band/testdata/AS_923_PHY_V1_1_REV_A.json @@ -683,5 +683,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 2, "Frequency": 923200000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/AS_923_PHY_V1_1_REV_B.json b/pkg/band/testdata/AS_923_PHY_V1_1_REV_B.json index dca36a8db3..501b896379 100644 --- a/pkg/band/testdata/AS_923_PHY_V1_1_REV_B.json +++ b/pkg/band/testdata/AS_923_PHY_V1_1_REV_B.json @@ -683,5 +683,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 2, "Frequency": 923200000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/AS_923_RP002_V1_0_0.json b/pkg/band/testdata/AS_923_RP002_V1_0_0.json index 9c108102ff..369755ef12 100644 --- a/pkg/band/testdata/AS_923_RP002_V1_0_0.json +++ b/pkg/band/testdata/AS_923_RP002_V1_0_0.json @@ -683,5 +683,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 2, "Frequency": 923200000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/AS_923_RP002_V1_0_1.json b/pkg/band/testdata/AS_923_RP002_V1_0_1.json index 2313b00a76..3fa3417052 100644 --- a/pkg/band/testdata/AS_923_RP002_V1_0_1.json +++ b/pkg/band/testdata/AS_923_RP002_V1_0_1.json @@ -683,5 +683,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 2, "Frequency": 923200000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/testdata/AS_923_RP002_V1_0_2.json b/pkg/band/testdata/AS_923_RP002_V1_0_2.json index 2313b00a76..75b9aa01f0 100644 --- a/pkg/band/testdata/AS_923_RP002_V1_0_2.json +++ b/pkg/band/testdata/AS_923_RP002_V1_0_2.json @@ -683,5 +683,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 2, "Frequency": 923200000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/AU_915_928_PHY_V1_0_1.json b/pkg/band/testdata/AU_915_928_PHY_V1_0_1.json index f3bba3c736..bd35087550 100644 --- a/pkg/band/testdata/AU_915_928_PHY_V1_0_1.json +++ b/pkg/band/testdata/AU_915_928_PHY_V1_0_1.json @@ -931,5 +931,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 8, "Frequency": 923300000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/AU_915_928_PHY_V1_0_2_REV_A.json b/pkg/band/testdata/AU_915_928_PHY_V1_0_2_REV_A.json index f3bba3c736..bd35087550 100644 --- a/pkg/band/testdata/AU_915_928_PHY_V1_0_2_REV_A.json +++ b/pkg/band/testdata/AU_915_928_PHY_V1_0_2_REV_A.json @@ -931,5 +931,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 8, "Frequency": 923300000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/AU_915_928_PHY_V1_0_2_REV_B.json b/pkg/band/testdata/AU_915_928_PHY_V1_0_2_REV_B.json index a72a563e36..fdb60c73bf 100644 --- a/pkg/band/testdata/AU_915_928_PHY_V1_0_2_REV_B.json +++ b/pkg/band/testdata/AU_915_928_PHY_V1_0_2_REV_B.json @@ -955,5 +955,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 8, "Frequency": 923300000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/AU_915_928_PHY_V1_0_3_REV_A.json b/pkg/band/testdata/AU_915_928_PHY_V1_0_3_REV_A.json index b026338c08..e5d6215153 100644 --- a/pkg/band/testdata/AU_915_928_PHY_V1_0_3_REV_A.json +++ b/pkg/band/testdata/AU_915_928_PHY_V1_0_3_REV_A.json @@ -960,5 +960,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 8, "Frequency": 923300000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/testdata/AU_915_928_PHY_V1_1_REV_A.json b/pkg/band/testdata/AU_915_928_PHY_V1_1_REV_A.json index 7600ac8683..c8626410e4 100644 --- a/pkg/band/testdata/AU_915_928_PHY_V1_1_REV_A.json +++ b/pkg/band/testdata/AU_915_928_PHY_V1_1_REV_A.json @@ -955,5 +955,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 8, "Frequency": 923300000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/testdata/AU_915_928_PHY_V1_1_REV_B.json b/pkg/band/testdata/AU_915_928_PHY_V1_1_REV_B.json index 3d63c19c7e..c20c175027 100644 --- a/pkg/band/testdata/AU_915_928_PHY_V1_1_REV_B.json +++ b/pkg/band/testdata/AU_915_928_PHY_V1_1_REV_B.json @@ -959,5 +959,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 8, "Frequency": 923300000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/testdata/AU_915_928_RP002_V1_0_0.json b/pkg/band/testdata/AU_915_928_RP002_V1_0_0.json index 3d63c19c7e..c20c175027 100644 --- a/pkg/band/testdata/AU_915_928_RP002_V1_0_0.json +++ b/pkg/band/testdata/AU_915_928_RP002_V1_0_0.json @@ -959,5 +959,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 8, "Frequency": 923300000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/testdata/AU_915_928_RP002_V1_0_1.json b/pkg/band/testdata/AU_915_928_RP002_V1_0_1.json index 3d63c19c7e..c20c175027 100644 --- a/pkg/band/testdata/AU_915_928_RP002_V1_0_1.json +++ b/pkg/band/testdata/AU_915_928_RP002_V1_0_1.json @@ -959,5 +959,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 8, "Frequency": 923300000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/testdata/AU_915_928_RP002_V1_0_2.json b/pkg/band/testdata/AU_915_928_RP002_V1_0_2.json index faf6dd11da..2111e27500 100644 --- a/pkg/band/testdata/AU_915_928_RP002_V1_0_2.json +++ b/pkg/band/testdata/AU_915_928_RP002_V1_0_2.json @@ -971,5 +971,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 8, "Frequency": 923300000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_0.json b/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_0.json index 129bb3a670..7b62c82090 100644 --- a/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_0.json +++ b/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_0.json @@ -1096,5 +1096,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 486900000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_1.json b/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_1.json index a34e56aab6..da1e43822e 100644 --- a/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_1.json +++ b/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_1.json @@ -1107,5 +1107,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 486900000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_2.json b/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_2.json index a34e56aab6..da1e43822e 100644 --- a/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_2.json +++ b/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_2.json @@ -1107,5 +1107,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 486900000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_470_510_20_B_RP002_V1_0_0.json b/pkg/band/testdata/CN_470_510_20_B_RP002_V1_0_0.json index a055ab066d..94038dc59b 100644 --- a/pkg/band/testdata/CN_470_510_20_B_RP002_V1_0_0.json +++ b/pkg/band/testdata/CN_470_510_20_B_RP002_V1_0_0.json @@ -1096,5 +1096,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 498300000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_470_510_20_B_RP002_V1_0_1.json b/pkg/band/testdata/CN_470_510_20_B_RP002_V1_0_1.json index 875ad144ae..5f8902e4e2 100644 --- a/pkg/band/testdata/CN_470_510_20_B_RP002_V1_0_1.json +++ b/pkg/band/testdata/CN_470_510_20_B_RP002_V1_0_1.json @@ -1107,5 +1107,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 498300000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_470_510_20_B_RP002_V1_0_2.json b/pkg/band/testdata/CN_470_510_20_B_RP002_V1_0_2.json index 875ad144ae..5f8902e4e2 100644 --- a/pkg/band/testdata/CN_470_510_20_B_RP002_V1_0_2.json +++ b/pkg/band/testdata/CN_470_510_20_B_RP002_V1_0_2.json @@ -1107,5 +1107,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 498300000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_470_510_26_A_RP002_V1_0_0.json b/pkg/band/testdata/CN_470_510_26_A_RP002_V1_0_0.json index a99f9483bd..715976986f 100644 --- a/pkg/band/testdata/CN_470_510_26_A_RP002_V1_0_0.json +++ b/pkg/band/testdata/CN_470_510_26_A_RP002_V1_0_0.json @@ -816,5 +816,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 492500000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_470_510_26_A_RP002_V1_0_1.json b/pkg/band/testdata/CN_470_510_26_A_RP002_V1_0_1.json index 9517a41b0e..d044be0015 100644 --- a/pkg/band/testdata/CN_470_510_26_A_RP002_V1_0_1.json +++ b/pkg/band/testdata/CN_470_510_26_A_RP002_V1_0_1.json @@ -827,5 +827,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 492500000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_470_510_26_A_RP002_V1_0_2.json b/pkg/band/testdata/CN_470_510_26_A_RP002_V1_0_2.json index 9517a41b0e..d044be0015 100644 --- a/pkg/band/testdata/CN_470_510_26_A_RP002_V1_0_2.json +++ b/pkg/band/testdata/CN_470_510_26_A_RP002_V1_0_2.json @@ -827,5 +827,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 492500000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_470_510_26_B_RP002_V1_0_0.json b/pkg/band/testdata/CN_470_510_26_B_RP002_V1_0_0.json index 6f5fd91089..cf2253969b 100644 --- a/pkg/band/testdata/CN_470_510_26_B_RP002_V1_0_0.json +++ b/pkg/band/testdata/CN_470_510_26_B_RP002_V1_0_0.json @@ -816,5 +816,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 502500000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_470_510_26_B_RP002_V1_0_1.json b/pkg/band/testdata/CN_470_510_26_B_RP002_V1_0_1.json index 80b6e7e058..a0baad8f66 100644 --- a/pkg/band/testdata/CN_470_510_26_B_RP002_V1_0_1.json +++ b/pkg/band/testdata/CN_470_510_26_B_RP002_V1_0_1.json @@ -827,5 +827,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 502500000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_470_510_26_B_RP002_V1_0_2.json b/pkg/band/testdata/CN_470_510_26_B_RP002_V1_0_2.json index 80b6e7e058..a0baad8f66 100644 --- a/pkg/band/testdata/CN_470_510_26_B_RP002_V1_0_2.json +++ b/pkg/band/testdata/CN_470_510_26_B_RP002_V1_0_2.json @@ -827,5 +827,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 502500000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_470_510_PHY_V1_0_1.json b/pkg/band/testdata/CN_470_510_PHY_V1_0_1.json index 8960105ce5..afe237c690 100644 --- a/pkg/band/testdata/CN_470_510_PHY_V1_0_1.json +++ b/pkg/band/testdata/CN_470_510_PHY_V1_0_1.json @@ -1176,5 +1176,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 505300000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_470_510_PHY_V1_0_2_REV_A.json b/pkg/band/testdata/CN_470_510_PHY_V1_0_2_REV_A.json index 8960105ce5..afe237c690 100644 --- a/pkg/band/testdata/CN_470_510_PHY_V1_0_2_REV_A.json +++ b/pkg/band/testdata/CN_470_510_PHY_V1_0_2_REV_A.json @@ -1176,5 +1176,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 505300000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_470_510_PHY_V1_0_2_REV_B.json b/pkg/band/testdata/CN_470_510_PHY_V1_0_2_REV_B.json index 5013de735f..2a0b05ff96 100644 --- a/pkg/band/testdata/CN_470_510_PHY_V1_0_2_REV_B.json +++ b/pkg/band/testdata/CN_470_510_PHY_V1_0_2_REV_B.json @@ -1176,5 +1176,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 505300000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_470_510_PHY_V1_0_3_REV_A.json b/pkg/band/testdata/CN_470_510_PHY_V1_0_3_REV_A.json index bff6246c85..3ae0c4e8ed 100644 --- a/pkg/band/testdata/CN_470_510_PHY_V1_0_3_REV_A.json +++ b/pkg/band/testdata/CN_470_510_PHY_V1_0_3_REV_A.json @@ -1176,5 +1176,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 505300000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_470_510_PHY_V1_1_REV_A.json b/pkg/band/testdata/CN_470_510_PHY_V1_1_REV_A.json index bff6246c85..3ae0c4e8ed 100644 --- a/pkg/band/testdata/CN_470_510_PHY_V1_1_REV_A.json +++ b/pkg/band/testdata/CN_470_510_PHY_V1_1_REV_A.json @@ -1176,5 +1176,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 505300000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_470_510_PHY_V1_1_REV_B.json b/pkg/band/testdata/CN_470_510_PHY_V1_1_REV_B.json index bff6246c85..3ae0c4e8ed 100644 --- a/pkg/band/testdata/CN_470_510_PHY_V1_1_REV_B.json +++ b/pkg/band/testdata/CN_470_510_PHY_V1_1_REV_B.json @@ -1176,5 +1176,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 505300000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_779_787_PHY_V1_0.json b/pkg/band/testdata/CN_779_787_PHY_V1_0.json index 95475d772d..04efa4feb7 100644 --- a/pkg/band/testdata/CN_779_787_PHY_V1_0.json +++ b/pkg/band/testdata/CN_779_787_PHY_V1_0.json @@ -561,5 +561,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 786000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_779_787_PHY_V1_0_1.json b/pkg/band/testdata/CN_779_787_PHY_V1_0_1.json index 95475d772d..04efa4feb7 100644 --- a/pkg/band/testdata/CN_779_787_PHY_V1_0_1.json +++ b/pkg/band/testdata/CN_779_787_PHY_V1_0_1.json @@ -561,5 +561,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 786000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_779_787_PHY_V1_0_2_REV_A.json b/pkg/band/testdata/CN_779_787_PHY_V1_0_2_REV_A.json index 95475d772d..04efa4feb7 100644 --- a/pkg/band/testdata/CN_779_787_PHY_V1_0_2_REV_A.json +++ b/pkg/band/testdata/CN_779_787_PHY_V1_0_2_REV_A.json @@ -561,5 +561,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 786000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_779_787_PHY_V1_0_2_REV_B.json b/pkg/band/testdata/CN_779_787_PHY_V1_0_2_REV_B.json index 95475d772d..04efa4feb7 100644 --- a/pkg/band/testdata/CN_779_787_PHY_V1_0_2_REV_B.json +++ b/pkg/band/testdata/CN_779_787_PHY_V1_0_2_REV_B.json @@ -561,5 +561,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 786000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_779_787_PHY_V1_0_3_REV_A.json b/pkg/band/testdata/CN_779_787_PHY_V1_0_3_REV_A.json index 95475d772d..04efa4feb7 100644 --- a/pkg/band/testdata/CN_779_787_PHY_V1_0_3_REV_A.json +++ b/pkg/band/testdata/CN_779_787_PHY_V1_0_3_REV_A.json @@ -561,5 +561,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 786000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_779_787_PHY_V1_1_REV_A.json b/pkg/band/testdata/CN_779_787_PHY_V1_1_REV_A.json index 95475d772d..04efa4feb7 100644 --- a/pkg/band/testdata/CN_779_787_PHY_V1_1_REV_A.json +++ b/pkg/band/testdata/CN_779_787_PHY_V1_1_REV_A.json @@ -561,5 +561,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 786000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_779_787_PHY_V1_1_REV_B.json b/pkg/band/testdata/CN_779_787_PHY_V1_1_REV_B.json index 95475d772d..04efa4feb7 100644 --- a/pkg/band/testdata/CN_779_787_PHY_V1_1_REV_B.json +++ b/pkg/band/testdata/CN_779_787_PHY_V1_1_REV_B.json @@ -561,5 +561,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 786000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_779_787_RP002_V1_0_0.json b/pkg/band/testdata/CN_779_787_RP002_V1_0_0.json index 95475d772d..04efa4feb7 100644 --- a/pkg/band/testdata/CN_779_787_RP002_V1_0_0.json +++ b/pkg/band/testdata/CN_779_787_RP002_V1_0_0.json @@ -561,5 +561,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 786000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_779_787_RP002_V1_0_1.json b/pkg/band/testdata/CN_779_787_RP002_V1_0_1.json index 95475d772d..04efa4feb7 100644 --- a/pkg/band/testdata/CN_779_787_RP002_V1_0_1.json +++ b/pkg/band/testdata/CN_779_787_RP002_V1_0_1.json @@ -561,5 +561,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 786000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/CN_779_787_RP002_V1_0_2.json b/pkg/band/testdata/CN_779_787_RP002_V1_0_2.json index 95475d772d..04efa4feb7 100644 --- a/pkg/band/testdata/CN_779_787_RP002_V1_0_2.json +++ b/pkg/band/testdata/CN_779_787_RP002_V1_0_2.json @@ -561,5 +561,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 786000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_433_PHY_V1_0.json b/pkg/band/testdata/EU_433_PHY_V1_0.json index b6ddfa981a..4153140145 100644 --- a/pkg/band/testdata/EU_433_PHY_V1_0.json +++ b/pkg/band/testdata/EU_433_PHY_V1_0.json @@ -531,5 +531,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 434665000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_433_PHY_V1_0_1.json b/pkg/band/testdata/EU_433_PHY_V1_0_1.json index b6ddfa981a..4153140145 100644 --- a/pkg/band/testdata/EU_433_PHY_V1_0_1.json +++ b/pkg/band/testdata/EU_433_PHY_V1_0_1.json @@ -531,5 +531,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 434665000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_433_PHY_V1_0_2_REV_A.json b/pkg/band/testdata/EU_433_PHY_V1_0_2_REV_A.json index b6ddfa981a..4153140145 100644 --- a/pkg/band/testdata/EU_433_PHY_V1_0_2_REV_A.json +++ b/pkg/band/testdata/EU_433_PHY_V1_0_2_REV_A.json @@ -531,5 +531,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 434665000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_433_PHY_V1_0_2_REV_B.json b/pkg/band/testdata/EU_433_PHY_V1_0_2_REV_B.json index b6ddfa981a..4153140145 100644 --- a/pkg/band/testdata/EU_433_PHY_V1_0_2_REV_B.json +++ b/pkg/band/testdata/EU_433_PHY_V1_0_2_REV_B.json @@ -531,5 +531,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 434665000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_433_PHY_V1_0_3_REV_A.json b/pkg/band/testdata/EU_433_PHY_V1_0_3_REV_A.json index b6ddfa981a..4153140145 100644 --- a/pkg/band/testdata/EU_433_PHY_V1_0_3_REV_A.json +++ b/pkg/band/testdata/EU_433_PHY_V1_0_3_REV_A.json @@ -531,5 +531,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 434665000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_433_PHY_V1_1_REV_A.json b/pkg/band/testdata/EU_433_PHY_V1_1_REV_A.json index b6ddfa981a..4153140145 100644 --- a/pkg/band/testdata/EU_433_PHY_V1_1_REV_A.json +++ b/pkg/band/testdata/EU_433_PHY_V1_1_REV_A.json @@ -531,5 +531,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 434665000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_433_PHY_V1_1_REV_B.json b/pkg/band/testdata/EU_433_PHY_V1_1_REV_B.json index b6ddfa981a..4153140145 100644 --- a/pkg/band/testdata/EU_433_PHY_V1_1_REV_B.json +++ b/pkg/band/testdata/EU_433_PHY_V1_1_REV_B.json @@ -531,5 +531,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 434665000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_433_RP002_V1_0_0.json b/pkg/band/testdata/EU_433_RP002_V1_0_0.json index b6ddfa981a..4153140145 100644 --- a/pkg/band/testdata/EU_433_RP002_V1_0_0.json +++ b/pkg/band/testdata/EU_433_RP002_V1_0_0.json @@ -531,5 +531,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 434665000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_433_RP002_V1_0_1.json b/pkg/band/testdata/EU_433_RP002_V1_0_1.json index b6ddfa981a..4153140145 100644 --- a/pkg/band/testdata/EU_433_RP002_V1_0_1.json +++ b/pkg/band/testdata/EU_433_RP002_V1_0_1.json @@ -531,5 +531,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 434665000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_433_RP002_V1_0_2.json b/pkg/band/testdata/EU_433_RP002_V1_0_2.json index b6ddfa981a..4153140145 100644 --- a/pkg/band/testdata/EU_433_RP002_V1_0_2.json +++ b/pkg/band/testdata/EU_433_RP002_V1_0_2.json @@ -531,5 +531,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 434665000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_863_870_PHY_V1_0.json b/pkg/band/testdata/EU_863_870_PHY_V1_0.json index 9ca9a0a6bd..f691030a55 100644 --- a/pkg/band/testdata/EU_863_870_PHY_V1_0.json +++ b/pkg/band/testdata/EU_863_870_PHY_V1_0.json @@ -561,5 +561,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 869525000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_863_870_PHY_V1_0_1.json b/pkg/band/testdata/EU_863_870_PHY_V1_0_1.json index 9ca9a0a6bd..f691030a55 100644 --- a/pkg/band/testdata/EU_863_870_PHY_V1_0_1.json +++ b/pkg/band/testdata/EU_863_870_PHY_V1_0_1.json @@ -561,5 +561,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 869525000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_863_870_PHY_V1_0_2_REV_A.json b/pkg/band/testdata/EU_863_870_PHY_V1_0_2_REV_A.json index 9ca9a0a6bd..f691030a55 100644 --- a/pkg/band/testdata/EU_863_870_PHY_V1_0_2_REV_A.json +++ b/pkg/band/testdata/EU_863_870_PHY_V1_0_2_REV_A.json @@ -561,5 +561,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 869525000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_863_870_PHY_V1_0_2_REV_B.json b/pkg/band/testdata/EU_863_870_PHY_V1_0_2_REV_B.json index 1a1991a7f9..cd30659a7e 100644 --- a/pkg/band/testdata/EU_863_870_PHY_V1_0_2_REV_B.json +++ b/pkg/band/testdata/EU_863_870_PHY_V1_0_2_REV_B.json @@ -563,5 +563,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 869525000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_863_870_PHY_V1_0_3_REV_A.json b/pkg/band/testdata/EU_863_870_PHY_V1_0_3_REV_A.json index 1a1991a7f9..cd30659a7e 100644 --- a/pkg/band/testdata/EU_863_870_PHY_V1_0_3_REV_A.json +++ b/pkg/band/testdata/EU_863_870_PHY_V1_0_3_REV_A.json @@ -563,5 +563,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 869525000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_863_870_PHY_V1_1_REV_A.json b/pkg/band/testdata/EU_863_870_PHY_V1_1_REV_A.json index 1a1991a7f9..cd30659a7e 100644 --- a/pkg/band/testdata/EU_863_870_PHY_V1_1_REV_A.json +++ b/pkg/band/testdata/EU_863_870_PHY_V1_1_REV_A.json @@ -563,5 +563,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 869525000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_863_870_PHY_V1_1_REV_B.json b/pkg/band/testdata/EU_863_870_PHY_V1_1_REV_B.json index 1a1991a7f9..cd30659a7e 100644 --- a/pkg/band/testdata/EU_863_870_PHY_V1_1_REV_B.json +++ b/pkg/band/testdata/EU_863_870_PHY_V1_1_REV_B.json @@ -563,5 +563,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 869525000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_863_870_RP002_V1_0_0.json b/pkg/band/testdata/EU_863_870_RP002_V1_0_0.json index 1a1991a7f9..cd30659a7e 100644 --- a/pkg/band/testdata/EU_863_870_RP002_V1_0_0.json +++ b/pkg/band/testdata/EU_863_870_RP002_V1_0_0.json @@ -563,5 +563,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 869525000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_863_870_RP002_V1_0_1.json b/pkg/band/testdata/EU_863_870_RP002_V1_0_1.json index 1a1991a7f9..cd30659a7e 100644 --- a/pkg/band/testdata/EU_863_870_RP002_V1_0_1.json +++ b/pkg/band/testdata/EU_863_870_RP002_V1_0_1.json @@ -563,5 +563,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 869525000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/EU_863_870_RP002_V1_0_2.json b/pkg/band/testdata/EU_863_870_RP002_V1_0_2.json index 6079e30cae..59fec1b94a 100644 --- a/pkg/band/testdata/EU_863_870_RP002_V1_0_2.json +++ b/pkg/band/testdata/EU_863_870_RP002_V1_0_2.json @@ -611,5 +611,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 869525000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/IN_865_867_PHY_V1_0_2_REV_B.json b/pkg/band/testdata/IN_865_867_PHY_V1_0_2_REV_B.json index 9fccf8dea7..b4729f33af 100644 --- a/pkg/band/testdata/IN_865_867_PHY_V1_0_2_REV_B.json +++ b/pkg/band/testdata/IN_865_867_PHY_V1_0_2_REV_B.json @@ -684,5 +684,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 2, "Frequency": 866550000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/IN_865_867_PHY_V1_0_3_REV_A.json b/pkg/band/testdata/IN_865_867_PHY_V1_0_3_REV_A.json index 9fccf8dea7..b4729f33af 100644 --- a/pkg/band/testdata/IN_865_867_PHY_V1_0_3_REV_A.json +++ b/pkg/band/testdata/IN_865_867_PHY_V1_0_3_REV_A.json @@ -684,5 +684,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 2, "Frequency": 866550000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/IN_865_867_PHY_V1_1_REV_A.json b/pkg/band/testdata/IN_865_867_PHY_V1_1_REV_A.json index 9fccf8dea7..b4729f33af 100644 --- a/pkg/band/testdata/IN_865_867_PHY_V1_1_REV_A.json +++ b/pkg/band/testdata/IN_865_867_PHY_V1_1_REV_A.json @@ -684,5 +684,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 2, "Frequency": 866550000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/IN_865_867_PHY_V1_1_REV_B.json b/pkg/band/testdata/IN_865_867_PHY_V1_1_REV_B.json index 9fccf8dea7..b4729f33af 100644 --- a/pkg/band/testdata/IN_865_867_PHY_V1_1_REV_B.json +++ b/pkg/band/testdata/IN_865_867_PHY_V1_1_REV_B.json @@ -684,5 +684,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 2, "Frequency": 866550000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/IN_865_867_RP002_V1_0_0.json b/pkg/band/testdata/IN_865_867_RP002_V1_0_0.json index 965568f542..75eb6d366a 100644 --- a/pkg/band/testdata/IN_865_867_RP002_V1_0_0.json +++ b/pkg/band/testdata/IN_865_867_RP002_V1_0_0.json @@ -684,5 +684,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 2, "Frequency": 866550000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/IN_865_867_RP002_V1_0_1.json b/pkg/band/testdata/IN_865_867_RP002_V1_0_1.json index 965568f542..75eb6d366a 100644 --- a/pkg/band/testdata/IN_865_867_RP002_V1_0_1.json +++ b/pkg/band/testdata/IN_865_867_RP002_V1_0_1.json @@ -684,5 +684,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 2, "Frequency": 866550000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/IN_865_867_RP002_V1_0_2.json b/pkg/band/testdata/IN_865_867_RP002_V1_0_2.json index 965568f542..75eb6d366a 100644 --- a/pkg/band/testdata/IN_865_867_RP002_V1_0_2.json +++ b/pkg/band/testdata/IN_865_867_RP002_V1_0_2.json @@ -684,5 +684,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 2, "Frequency": 866550000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/ISM_2400_PHY_V1_0.json b/pkg/band/testdata/ISM_2400_PHY_V1_0.json index 1401dc400e..9aa862e49e 100644 --- a/pkg/band/testdata/ISM_2400_PHY_V1_0.json +++ b/pkg/band/testdata/ISM_2400_PHY_V1_0.json @@ -534,5 +534,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 2423000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/ISM_2400_PHY_V1_0_1.json b/pkg/band/testdata/ISM_2400_PHY_V1_0_1.json index 1401dc400e..9aa862e49e 100644 --- a/pkg/band/testdata/ISM_2400_PHY_V1_0_1.json +++ b/pkg/band/testdata/ISM_2400_PHY_V1_0_1.json @@ -534,5 +534,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 2423000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/ISM_2400_PHY_V1_0_2_REV_A.json b/pkg/band/testdata/ISM_2400_PHY_V1_0_2_REV_A.json index 1401dc400e..9aa862e49e 100644 --- a/pkg/band/testdata/ISM_2400_PHY_V1_0_2_REV_A.json +++ b/pkg/band/testdata/ISM_2400_PHY_V1_0_2_REV_A.json @@ -534,5 +534,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 2423000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/ISM_2400_PHY_V1_0_2_REV_B.json b/pkg/band/testdata/ISM_2400_PHY_V1_0_2_REV_B.json index 1401dc400e..9aa862e49e 100644 --- a/pkg/band/testdata/ISM_2400_PHY_V1_0_2_REV_B.json +++ b/pkg/band/testdata/ISM_2400_PHY_V1_0_2_REV_B.json @@ -534,5 +534,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 2423000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/ISM_2400_PHY_V1_0_3_REV_A.json b/pkg/band/testdata/ISM_2400_PHY_V1_0_3_REV_A.json index 1401dc400e..9aa862e49e 100644 --- a/pkg/band/testdata/ISM_2400_PHY_V1_0_3_REV_A.json +++ b/pkg/band/testdata/ISM_2400_PHY_V1_0_3_REV_A.json @@ -534,5 +534,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 2423000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/ISM_2400_PHY_V1_1_REV_A.json b/pkg/band/testdata/ISM_2400_PHY_V1_1_REV_A.json index 1401dc400e..9aa862e49e 100644 --- a/pkg/band/testdata/ISM_2400_PHY_V1_1_REV_A.json +++ b/pkg/band/testdata/ISM_2400_PHY_V1_1_REV_A.json @@ -534,5 +534,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 2423000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/ISM_2400_PHY_V1_1_REV_B.json b/pkg/band/testdata/ISM_2400_PHY_V1_1_REV_B.json index 1401dc400e..9aa862e49e 100644 --- a/pkg/band/testdata/ISM_2400_PHY_V1_1_REV_B.json +++ b/pkg/band/testdata/ISM_2400_PHY_V1_1_REV_B.json @@ -534,5 +534,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 2423000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/ISM_2400_RP002_V1_0_0.json b/pkg/band/testdata/ISM_2400_RP002_V1_0_0.json index 1401dc400e..9aa862e49e 100644 --- a/pkg/band/testdata/ISM_2400_RP002_V1_0_0.json +++ b/pkg/band/testdata/ISM_2400_RP002_V1_0_0.json @@ -534,5 +534,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 2423000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/ISM_2400_RP002_V1_0_1.json b/pkg/band/testdata/ISM_2400_RP002_V1_0_1.json index 1401dc400e..9aa862e49e 100644 --- a/pkg/band/testdata/ISM_2400_RP002_V1_0_1.json +++ b/pkg/band/testdata/ISM_2400_RP002_V1_0_1.json @@ -534,5 +534,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 2423000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/ISM_2400_RP002_V1_0_2.json b/pkg/band/testdata/ISM_2400_RP002_V1_0_2.json index 1401dc400e..9aa862e49e 100644 --- a/pkg/band/testdata/ISM_2400_RP002_V1_0_2.json +++ b/pkg/band/testdata/ISM_2400_RP002_V1_0_2.json @@ -534,5 +534,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 2423000000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/KR_920_923_PHY_V1_0_2_REV_A.json b/pkg/band/testdata/KR_920_923_PHY_V1_0_2_REV_A.json index c13d2efae6..21c49868c2 100644 --- a/pkg/band/testdata/KR_920_923_PHY_V1_0_2_REV_A.json +++ b/pkg/band/testdata/KR_920_923_PHY_V1_0_2_REV_A.json @@ -485,5 +485,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 921900000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/KR_920_923_PHY_V1_0_2_REV_B.json b/pkg/band/testdata/KR_920_923_PHY_V1_0_2_REV_B.json index 33804ab9b0..3f542845f5 100644 --- a/pkg/band/testdata/KR_920_923_PHY_V1_0_2_REV_B.json +++ b/pkg/band/testdata/KR_920_923_PHY_V1_0_2_REV_B.json @@ -486,5 +486,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 921900000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/KR_920_923_PHY_V1_0_3_REV_A.json b/pkg/band/testdata/KR_920_923_PHY_V1_0_3_REV_A.json index 33804ab9b0..3f542845f5 100644 --- a/pkg/band/testdata/KR_920_923_PHY_V1_0_3_REV_A.json +++ b/pkg/band/testdata/KR_920_923_PHY_V1_0_3_REV_A.json @@ -486,5 +486,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 921900000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/KR_920_923_PHY_V1_1_REV_A.json b/pkg/band/testdata/KR_920_923_PHY_V1_1_REV_A.json index 33804ab9b0..3f542845f5 100644 --- a/pkg/band/testdata/KR_920_923_PHY_V1_1_REV_A.json +++ b/pkg/band/testdata/KR_920_923_PHY_V1_1_REV_A.json @@ -486,5 +486,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 921900000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/KR_920_923_PHY_V1_1_REV_B.json b/pkg/band/testdata/KR_920_923_PHY_V1_1_REV_B.json index 33804ab9b0..3f542845f5 100644 --- a/pkg/band/testdata/KR_920_923_PHY_V1_1_REV_B.json +++ b/pkg/band/testdata/KR_920_923_PHY_V1_1_REV_B.json @@ -486,5 +486,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 921900000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/KR_920_923_RP002_V1_0_0.json b/pkg/band/testdata/KR_920_923_RP002_V1_0_0.json index 33804ab9b0..3f542845f5 100644 --- a/pkg/band/testdata/KR_920_923_RP002_V1_0_0.json +++ b/pkg/band/testdata/KR_920_923_RP002_V1_0_0.json @@ -486,5 +486,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 921900000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/KR_920_923_RP002_V1_0_1.json b/pkg/band/testdata/KR_920_923_RP002_V1_0_1.json index 33804ab9b0..3f542845f5 100644 --- a/pkg/band/testdata/KR_920_923_RP002_V1_0_1.json +++ b/pkg/band/testdata/KR_920_923_RP002_V1_0_1.json @@ -486,5 +486,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 921900000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/KR_920_923_RP002_V1_0_2.json b/pkg/band/testdata/KR_920_923_RP002_V1_0_2.json index 33804ab9b0..3f542845f5 100644 --- a/pkg/band/testdata/KR_920_923_RP002_V1_0_2.json +++ b/pkg/band/testdata/KR_920_923_RP002_V1_0_2.json @@ -486,5 +486,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 921900000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/RU_864_870_PHY_V1_0_3_REV_A.json b/pkg/band/testdata/RU_864_870_PHY_V1_0_3_REV_A.json index e8a4609fe7..a3f922dfbf 100644 --- a/pkg/band/testdata/RU_864_870_PHY_V1_0_3_REV_A.json +++ b/pkg/band/testdata/RU_864_870_PHY_V1_0_3_REV_A.json @@ -523,5 +523,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 869100000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/RU_864_870_PHY_V1_1_REV_A.json b/pkg/band/testdata/RU_864_870_PHY_V1_1_REV_A.json index e8a4609fe7..a3f922dfbf 100644 --- a/pkg/band/testdata/RU_864_870_PHY_V1_1_REV_A.json +++ b/pkg/band/testdata/RU_864_870_PHY_V1_1_REV_A.json @@ -523,5 +523,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 869100000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/RU_864_870_PHY_V1_1_REV_B.json b/pkg/band/testdata/RU_864_870_PHY_V1_1_REV_B.json index e8a4609fe7..a3f922dfbf 100644 --- a/pkg/band/testdata/RU_864_870_PHY_V1_1_REV_B.json +++ b/pkg/band/testdata/RU_864_870_PHY_V1_1_REV_B.json @@ -523,5 +523,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 869100000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/RU_864_870_RP002_V1_0_0.json b/pkg/band/testdata/RU_864_870_RP002_V1_0_0.json index e8a4609fe7..a3f922dfbf 100644 --- a/pkg/band/testdata/RU_864_870_RP002_V1_0_0.json +++ b/pkg/band/testdata/RU_864_870_RP002_V1_0_0.json @@ -523,5 +523,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 869100000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/RU_864_870_RP002_V1_0_1.json b/pkg/band/testdata/RU_864_870_RP002_V1_0_1.json index e8a4609fe7..a3f922dfbf 100644 --- a/pkg/band/testdata/RU_864_870_RP002_V1_0_1.json +++ b/pkg/band/testdata/RU_864_870_RP002_V1_0_1.json @@ -523,5 +523,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 869100000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/RU_864_870_RP002_V1_0_2.json b/pkg/band/testdata/RU_864_870_RP002_V1_0_2.json index e8a4609fe7..a3f922dfbf 100644 --- a/pkg/band/testdata/RU_864_870_RP002_V1_0_2.json +++ b/pkg/band/testdata/RU_864_870_RP002_V1_0_2.json @@ -523,5 +523,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 0, "Frequency": 869100000 + }, + "BootDwellTime": { + "Uplinks": null, + "Downlinks": null } } \ No newline at end of file diff --git a/pkg/band/testdata/US_902_928_PHY_V1_0.json b/pkg/band/testdata/US_902_928_PHY_V1_0.json index 1a564c3405..7af688aa3f 100644 --- a/pkg/band/testdata/US_902_928_PHY_V1_0.json +++ b/pkg/band/testdata/US_902_928_PHY_V1_0.json @@ -893,5 +893,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 8, "Frequency": 923300000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/testdata/US_902_928_PHY_V1_0_1.json b/pkg/band/testdata/US_902_928_PHY_V1_0_1.json index 1a564c3405..7af688aa3f 100644 --- a/pkg/band/testdata/US_902_928_PHY_V1_0_1.json +++ b/pkg/band/testdata/US_902_928_PHY_V1_0_1.json @@ -893,5 +893,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 8, "Frequency": 923300000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/testdata/US_902_928_PHY_V1_0_2_REV_A.json b/pkg/band/testdata/US_902_928_PHY_V1_0_2_REV_A.json index 1a564c3405..7af688aa3f 100644 --- a/pkg/band/testdata/US_902_928_PHY_V1_0_2_REV_A.json +++ b/pkg/band/testdata/US_902_928_PHY_V1_0_2_REV_A.json @@ -893,5 +893,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 8, "Frequency": 923300000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/testdata/US_902_928_PHY_V1_0_2_REV_B.json b/pkg/band/testdata/US_902_928_PHY_V1_0_2_REV_B.json index 09270baecb..ca1888ff72 100644 --- a/pkg/band/testdata/US_902_928_PHY_V1_0_2_REV_B.json +++ b/pkg/band/testdata/US_902_928_PHY_V1_0_2_REV_B.json @@ -893,5 +893,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 8, "Frequency": 923300000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/testdata/US_902_928_PHY_V1_0_3_REV_A.json b/pkg/band/testdata/US_902_928_PHY_V1_0_3_REV_A.json index c4984cce66..ff87a1b2b5 100644 --- a/pkg/band/testdata/US_902_928_PHY_V1_0_3_REV_A.json +++ b/pkg/band/testdata/US_902_928_PHY_V1_0_3_REV_A.json @@ -898,5 +898,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 8, "Frequency": 923300000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/testdata/US_902_928_PHY_V1_1_REV_A.json b/pkg/band/testdata/US_902_928_PHY_V1_1_REV_A.json index ff010166c5..0e9e1fea0a 100644 --- a/pkg/band/testdata/US_902_928_PHY_V1_1_REV_A.json +++ b/pkg/band/testdata/US_902_928_PHY_V1_1_REV_A.json @@ -897,5 +897,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 8, "Frequency": 923300000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/testdata/US_902_928_PHY_V1_1_REV_B.json b/pkg/band/testdata/US_902_928_PHY_V1_1_REV_B.json index ff010166c5..0e9e1fea0a 100644 --- a/pkg/band/testdata/US_902_928_PHY_V1_1_REV_B.json +++ b/pkg/band/testdata/US_902_928_PHY_V1_1_REV_B.json @@ -897,5 +897,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 8, "Frequency": 923300000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/testdata/US_902_928_RP002_V1_0_0.json b/pkg/band/testdata/US_902_928_RP002_V1_0_0.json index ff010166c5..0e9e1fea0a 100644 --- a/pkg/band/testdata/US_902_928_RP002_V1_0_0.json +++ b/pkg/band/testdata/US_902_928_RP002_V1_0_0.json @@ -897,5 +897,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 8, "Frequency": 923300000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/testdata/US_902_928_RP002_V1_0_1.json b/pkg/band/testdata/US_902_928_RP002_V1_0_1.json index ff010166c5..0e9e1fea0a 100644 --- a/pkg/band/testdata/US_902_928_RP002_V1_0_1.json +++ b/pkg/band/testdata/US_902_928_RP002_V1_0_1.json @@ -897,5 +897,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 8, "Frequency": 923300000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/testdata/US_902_928_RP002_V1_0_2.json b/pkg/band/testdata/US_902_928_RP002_V1_0_2.json index f6e61a9114..ff55a5c273 100644 --- a/pkg/band/testdata/US_902_928_RP002_V1_0_2.json +++ b/pkg/band/testdata/US_902_928_RP002_V1_0_2.json @@ -921,5 +921,9 @@ "DefaultRx2Parameters": { "DataRateIndex": 8, "Frequency": 923300000 + }, + "BootDwellTime": { + "Uplinks": true, + "Downlinks": false } } \ No newline at end of file diff --git a/pkg/band/us_902_928_rp1_v1_0_2.go b/pkg/band/us_902_928_rp1_v1_0_2.go index 9e9b744cd1..0ff486b7ff 100644 --- a/pkg/band/us_902_928_rp1_v1_0_2.go +++ b/pkg/band/us_902_928_rp1_v1_0_2.go @@ -112,4 +112,9 @@ var US_902_928_RP1_V1_0_2 = Band{ CodingRate: "4/5", ComputeFrequency: makeBeaconFrequencyFunc(usAuBeaconFrequencies), }, + + BootDwellTime: DwellTime{ + Uplinks: boolPtr(true), + Downlinks: boolPtr(false), + }, } diff --git a/pkg/band/us_902_928_rp1_v1_0_2_rev_b.go b/pkg/band/us_902_928_rp1_v1_0_2_rev_b.go index 2230a3c941..e5173480ad 100644 --- a/pkg/band/us_902_928_rp1_v1_0_2_rev_b.go +++ b/pkg/band/us_902_928_rp1_v1_0_2_rev_b.go @@ -112,4 +112,9 @@ var US_902_928_RP1_V1_0_2_Rev_B = Band{ CodingRate: "4/5", ComputeFrequency: makeBeaconFrequencyFunc(usAuBeaconFrequencies), }, + + BootDwellTime: DwellTime{ + Uplinks: boolPtr(true), + Downlinks: boolPtr(false), + }, } diff --git a/pkg/band/us_902_928_rp1_v1_0_3_rev_a.go b/pkg/band/us_902_928_rp1_v1_0_3_rev_a.go index 947ca96fc5..3cf0af0ebe 100644 --- a/pkg/band/us_902_928_rp1_v1_0_3_rev_a.go +++ b/pkg/band/us_902_928_rp1_v1_0_3_rev_a.go @@ -117,4 +117,9 @@ var US_902_928_RP1_V1_0_3_Rev_A = Band{ CodingRate: "4/5", ComputeFrequency: makeBeaconFrequencyFunc(usAuBeaconFrequencies), }, + + BootDwellTime: DwellTime{ + Uplinks: boolPtr(true), + Downlinks: boolPtr(false), + }, } diff --git a/pkg/band/us_902_928_rp1_v1_1_rev_a.go b/pkg/band/us_902_928_rp1_v1_1_rev_a.go index 57b3a9adac..5de0a0e9f7 100644 --- a/pkg/band/us_902_928_rp1_v1_1_rev_a.go +++ b/pkg/band/us_902_928_rp1_v1_1_rev_a.go @@ -116,4 +116,9 @@ var US_902_928_RP1_V1_1_Rev_A = Band{ CodingRate: "4/5", ComputeFrequency: makeBeaconFrequencyFunc(usAuBeaconFrequencies), }, + + BootDwellTime: DwellTime{ + Uplinks: boolPtr(true), + Downlinks: boolPtr(false), + }, } diff --git a/pkg/band/us_902_928_rp1_v1_1_rev_b.go b/pkg/band/us_902_928_rp1_v1_1_rev_b.go index 709747a322..30de05f8f8 100644 --- a/pkg/band/us_902_928_rp1_v1_1_rev_b.go +++ b/pkg/band/us_902_928_rp1_v1_1_rev_b.go @@ -116,4 +116,9 @@ var US_902_928_RP1_V1_1_Rev_B = Band{ CodingRate: "4/5", ComputeFrequency: makeBeaconFrequencyFunc(usAuBeaconFrequencies), }, + + BootDwellTime: DwellTime{ + Uplinks: boolPtr(true), + Downlinks: boolPtr(false), + }, } diff --git a/pkg/band/us_902_928_rp2_v1_0_0.go b/pkg/band/us_902_928_rp2_v1_0_0.go index df6bd1be92..15f664fb96 100644 --- a/pkg/band/us_902_928_rp2_v1_0_0.go +++ b/pkg/band/us_902_928_rp2_v1_0_0.go @@ -116,4 +116,9 @@ var US_902_928_RP2_V1_0_0 = Band{ CodingRate: "4/5", ComputeFrequency: makeBeaconFrequencyFunc(usAuBeaconFrequencies), }, + + BootDwellTime: DwellTime{ + Uplinks: boolPtr(true), + Downlinks: boolPtr(false), + }, } diff --git a/pkg/band/us_902_928_rp2_v1_0_1.go b/pkg/band/us_902_928_rp2_v1_0_1.go index cf89429bf9..92b39c2dca 100644 --- a/pkg/band/us_902_928_rp2_v1_0_1.go +++ b/pkg/band/us_902_928_rp2_v1_0_1.go @@ -116,4 +116,9 @@ var US_902_928_RP2_V1_0_1 = Band{ CodingRate: "4/5", ComputeFrequency: makeBeaconFrequencyFunc(usAuBeaconFrequencies), }, + + BootDwellTime: DwellTime{ + Uplinks: boolPtr(true), + Downlinks: boolPtr(false), + }, } diff --git a/pkg/band/us_902_928_rp2_v1_0_2.go b/pkg/band/us_902_928_rp2_v1_0_2.go index 054d3ad861..70916a5dfe 100644 --- a/pkg/band/us_902_928_rp2_v1_0_2.go +++ b/pkg/band/us_902_928_rp2_v1_0_2.go @@ -118,4 +118,9 @@ var US_902_928_RP2_V1_0_2 = Band{ CodingRate: "4/5", ComputeFrequency: makeBeaconFrequencyFunc(usAuBeaconFrequencies), }, + + BootDwellTime: DwellTime{ + Uplinks: boolPtr(true), + Downlinks: boolPtr(false), + }, } diff --git a/pkg/band/us_902_928_ts1_v1_0.go b/pkg/band/us_902_928_ts1_v1_0.go index f834fe95bb..ee6044a402 100644 --- a/pkg/band/us_902_928_ts1_v1_0.go +++ b/pkg/band/us_902_928_ts1_v1_0.go @@ -112,4 +112,9 @@ var US_902_928_TS1_V1_0 = Band{ CodingRate: "4/5", ComputeFrequency: makeBeaconFrequencyFunc(usAuBeaconFrequencies), }, + + BootDwellTime: DwellTime{ + Uplinks: boolPtr(true), + Downlinks: boolPtr(false), + }, } diff --git a/pkg/band/us_902_928_ts1_v1_0_1.go b/pkg/band/us_902_928_ts1_v1_0_1.go index 99610b5f94..d6d52e2721 100644 --- a/pkg/band/us_902_928_ts1_v1_0_1.go +++ b/pkg/band/us_902_928_ts1_v1_0_1.go @@ -112,4 +112,9 @@ var US_902_928_TS1_V1_0_1 = Band{ CodingRate: "4/5", ComputeFrequency: makeBeaconFrequencyFunc(usAuBeaconFrequencies), }, + + BootDwellTime: DwellTime{ + Uplinks: boolPtr(true), + Downlinks: boolPtr(false), + }, } diff --git a/pkg/networkserver/downlink.go b/pkg/networkserver/downlink.go index 9651915c43..973c2078b7 100644 --- a/pkg/networkserver/downlink.go +++ b/pkg/networkserver/downlink.go @@ -1052,7 +1052,7 @@ func appendRecentDownlink(recent []*ttnpb.DownlinkMessage, down *ttnpb.DownlinkM return recent } -func rx1Parameters(phy *band.Band, macState *ttnpb.MACState, up *ttnpb.UplinkMessage) (uint64, ttnpb.DataRateIndex, band.DataRate, error) { +func rx1Parameters(phy *band.Band, fp *frequencyplans.FrequencyPlan, macState *ttnpb.MACState, up *ttnpb.UplinkMessage) (uint64, ttnpb.DataRateIndex, band.DataRate, error) { if up.DeviceChannelIndex > math.MaxUint8 { return 0, 0, band.DataRate{}, errInvalidChannelIndex.New() } @@ -1079,7 +1079,7 @@ func rx1Parameters(phy *band.Band, macState *ttnpb.MACState, up *ttnpb.UplinkMes if !ok { return 0, 0, band.DataRate{}, errDataRateNotFound.New() } - drIdx, err = phy.Rx1DataRate(drIdx, macState.CurrentParameters.Rx1DataRateOffset, macState.CurrentParameters.DownlinkDwellTime.GetValue()) + drIdx, err = phy.Rx1DataRate(drIdx, macState.CurrentParameters.Rx1DataRateOffset, mac.DeviceExpectedDownlinkDwellTime(macState, fp, phy)) if err != nil { return 0, 0, band.DataRate{}, err } @@ -1091,7 +1091,7 @@ func rx1Parameters(phy *band.Band, macState *ttnpb.MACState, up *ttnpb.UplinkMes } // maximumUplinkLength returns the maximum length of the next uplink after ups. -func maximumUplinkLength(fp *frequencyplans.FrequencyPlan, phy *band.Band, ups ...*ttnpb.UplinkMessage) (uint16, error) { +func maximumUplinkLength(macState *ttnpb.MACState, fp *frequencyplans.FrequencyPlan, phy *band.Band, ups ...*ttnpb.UplinkMessage) (uint16, error) { // NOTE: If no data uplink is found, we assume ADR is off on the device and, hence, data rate index 0 is used in computation. maxUpDRIdx := ttnpb.DataRateIndex_DATA_RATE_0 loop: @@ -1114,7 +1114,7 @@ loop: if !ok { return 0, errDataRateIndexNotFound.WithAttributes("index", maxUpDRIdx) } - return dr.MaxMACPayloadSize(fp.DwellTime.GetUplinks()), nil + return dr.MaxMACPayloadSize(mac.DeviceExpectedUplinkDwellTime(macState, fp, phy)), nil } // downlinkRetryInterval is the time interval, which defines the interval between downlink task retries. @@ -1207,7 +1207,7 @@ func (ns *NetworkServer) attemptClassADataDownlink(ctx context.Context, dev *ttn attemptRX2 bool ) if !slot.RX1().Before(now) { - freq, drIdx, dr, err := rx1Parameters(phy, dev.MacState, slot.Uplink) + freq, drIdx, dr, err := rx1Parameters(phy, fp, dev.MacState, slot.Uplink) if err != nil { log.FromContext(ctx).WithError(err).Error("Failed to compute RX1 parameters") } else { @@ -1246,7 +1246,7 @@ func (ns *NetworkServer) attemptClassADataDownlink(ctx context.Context, dev *ttn transmitAt = slot.RX2() maxDR = rx2DR } - downDwellTime := fp.DwellTime.GetDownlinks() + downDwellTime := mac.DeviceExpectedDownlinkDwellTime(dev.MacState, fp, phy) genDown, genState, err := ns.generateDataDownlink(ctx, dev, phy, ttnpb.Class_CLASS_A, transmitAt, maxDR.MaxMACPayloadSize(downDwellTime), @@ -1399,7 +1399,7 @@ func (ns *NetworkServer) attemptNetworkInitiatedDataDownlink(ctx context.Context } genDown, genState, err := ns.generateDataDownlink(ctx, dev, phy, slot.Class, latestTime(slot.Time, time.Now()), - dr.MaxMACPayloadSize(fp.DwellTime.GetDownlinks()), + dr.MaxMACPayloadSize(mac.DeviceExpectedDownlinkDwellTime(dev.MacState, fp, phy)), maxUpLength, ) var sets []string @@ -1690,7 +1690,7 @@ func (ns *NetworkServer) processDownlinkTask(ctx context.Context, consumerID str attemptRX2 bool ) if !rx1.Before(now) { - freq, _, dr, err := rx1Parameters(phy, dev.PendingMacState, up) + freq, _, dr, err := rx1Parameters(phy, fp, dev.PendingMacState, up) if err != nil { log.FromContext(ctx).WithError(err).Error("Failed to compute RX1 parameters") } else { @@ -1837,7 +1837,7 @@ func (ns *NetworkServer) processDownlinkTask(ctx context.Context, consumerID str var maxUpLength uint16 = math.MaxUint16 if !dev.Multicast && dev.MacState.LorawanVersion == ttnpb.MACVersion_MAC_V1_1 { - maxUpLength, err = maximumUplinkLength(fp, phy, dev.MacState.RecentUplinks...) + maxUpLength, err = maximumUplinkLength(dev.MacState, fp, phy, dev.MacState.RecentUplinks...) if err != nil { logger.WithError(err).Error("Failed to determine maximum uplink length") return dev, nil, nil diff --git a/pkg/networkserver/grpc.go b/pkg/networkserver/grpc.go index 668096522e..89885c5c87 100644 --- a/pkg/networkserver/grpc.go +++ b/pkg/networkserver/grpc.go @@ -74,6 +74,8 @@ func (ns *NetworkServer) GetDefaultMACSettings(ctx context.Context, req *ttnpb.G DesiredPingSlotFrequency: &ttnpb.FrequencyValue{Value: mac.DeviceDesiredPingSlotFrequency(nil, phy, fp, ns.defaultMACSettings)}, DesiredBeaconFrequency: ns.defaultMACSettings.GetBeaconFrequency(), DesiredMaxEirp: &ttnpb.DeviceEIRPValue{Value: lorawan.Float32ToDeviceEIRP(mac.DeviceDesiredMaxEIRP(nil, phy, fp, ns.defaultMACSettings))}, + UplinkDwellTime: mac.DeviceUplinkDwellTime(nil, phy, ns.defaultMACSettings), + DownlinkDwellTime: mac.DeviceDownlinkDwellTime(nil, phy, ns.defaultMACSettings), } return settings, nil } diff --git a/pkg/networkserver/grpc_asns.go b/pkg/networkserver/grpc_asns.go index 775f29f511..c3a25ec05f 100644 --- a/pkg/networkserver/grpc_asns.go +++ b/pkg/networkserver/grpc_asns.go @@ -27,6 +27,7 @@ import ( "go.thethings.network/lorawan-stack/v3/pkg/log" . "go.thethings.network/lorawan-stack/v3/pkg/networkserver/internal" "go.thethings.network/lorawan-stack/v3/pkg/networkserver/internal/time" + "go.thethings.network/lorawan-stack/v3/pkg/networkserver/mac" "go.thethings.network/lorawan-stack/v3/pkg/ttnpb" "go.thethings.network/lorawan-stack/v3/pkg/unique" ) @@ -214,9 +215,10 @@ func matchQueuedApplicationDownlinks(ctx context.Context, dev *ttnpb.EndDevice, if err != nil { return err } - var maxDownLen uint16 = 0 + var maxDownLen uint16 + downDwellTime := mac.DeviceExpectedDownlinkDwellTime(dev.MacState, fp, phy) for _, dr := range phy.DataRates { - if n := dr.MaxMACPayloadSize(fp.DwellTime.GetDownlinks()); n > maxDownLen { + if n := dr.MaxMACPayloadSize(downDwellTime); n > maxDownLen { maxDownLen = n } } diff --git a/pkg/networkserver/grpc_deviceregistry.go b/pkg/networkserver/grpc_deviceregistry.go index 0c7794ca33..2994e2162f 100644 --- a/pkg/networkserver/grpc_deviceregistry.go +++ b/pkg/networkserver/grpc_deviceregistry.go @@ -1184,6 +1184,8 @@ func (ns *NetworkServer) Set(ctx context.Context, req *ttnpb.SetEndDeviceRequest "mac_settings.desired_rx2_data_rate_index.value", "mac_settings.ping_slot_data_rate_index.value", "mac_settings.desired_ping_slot_data_rate_index.value", + "mac_settings.uplink_dwell_time.value", + "mac_settings.downlink_dwell_time.value", "mac_state.current_parameters.adr_data_rate_index", "mac_state.current_parameters.adr_tx_power_index", "mac_state.current_parameters.channels", @@ -1347,6 +1349,48 @@ func (ns *NetworkServer) Set(ctx context.Context, req *ttnpb.SetEndDeviceRequest return nil, err } } + if st.HasSetField( + "frequency_plan_id", + "lorawan_phy_version", + "mac_settings.uplink_dwell_time.value", + ) { + if err := st.WithField(func(dev *ttnpb.EndDevice) error { + return withPHY(func(phy *band.Band, fp *frequencyplans.FrequencyPlan) error { + if dev.GetMacSettings().GetUplinkDwellTime() == nil { + return nil + } + if !phy.TxParamSetupReqSupport { + return newInvalidFieldValueError("mac_settings.uplink_dwell_time.value") + } + return nil + }) + }, + "mac_settings.uplink_dwell_time.value", + ); err != nil { + return nil, err + } + } + if st.HasSetField( + "frequency_plan_id", + "lorawan_phy_version", + "mac_settings.downlink_dwell_time.value", + ) { + if err := st.WithField(func(dev *ttnpb.EndDevice) error { + return withPHY(func(phy *band.Band, fp *frequencyplans.FrequencyPlan) error { + if dev.GetMacSettings().GetDownlinkDwellTime() == nil { + return nil + } + if !phy.TxParamSetupReqSupport { + return newInvalidFieldValueError("mac_settings.downlink_dwell_time.value") + } + return nil + }) + }, + "mac_settings.downlink_dwell_time.value", + ); err != nil { + return nil, err + } + } if st.HasSetField( "frequency_plan_id", "lorawan_phy_version", diff --git a/pkg/networkserver/mac/utils.go b/pkg/networkserver/mac/utils.go index f2e4c403fb..3e71581af9 100644 --- a/pkg/networkserver/mac/utils.go +++ b/pkg/networkserver/mac/utils.go @@ -222,6 +222,32 @@ func DeviceDefaultPingSlotPeriodicity(dev *ttnpb.EndDevice, defaults ttnpb.MACSe } } +func DeviceUplinkDwellTime(dev *ttnpb.EndDevice, phy *band.Band, defaults ttnpb.MACSettings) *ttnpb.BoolValue { + switch { + case !phy.TxParamSetupReqSupport: + return nil + case dev.GetMacSettings().GetUplinkDwellTime() != nil: + return &ttnpb.BoolValue{Value: dev.MacSettings.UplinkDwellTime.Value} + case defaults.UplinkDwellTime != nil: + return &ttnpb.BoolValue{Value: defaults.UplinkDwellTime.Value} + default: + return nil + } +} + +func DeviceDownlinkDwellTime(dev *ttnpb.EndDevice, phy *band.Band, defaults ttnpb.MACSettings) *ttnpb.BoolValue { + switch { + case !phy.TxParamSetupReqSupport: + return nil + case dev.GetMacSettings().GetDownlinkDwellTime() != nil: + return &ttnpb.BoolValue{Value: dev.MacSettings.DownlinkDwellTime.Value} + case defaults.DownlinkDwellTime != nil: + return &ttnpb.BoolValue{Value: defaults.DownlinkDwellTime.Value} + default: + return nil + } +} + func DeviceDesiredMaxEIRP(dev *ttnpb.EndDevice, phy *band.Band, fp *frequencyplans.FrequencyPlan, defaults ttnpb.MACSettings) float32 { switch { case dev.GetMacSettings().GetDesiredMaxEirp() != nil: @@ -233,18 +259,26 @@ func DeviceDesiredMaxEIRP(dev *ttnpb.EndDevice, phy *band.Band, fp *frequencypla } } -func DeviceDesiredUplinkDwellTime(fp *frequencyplans.FrequencyPlan) *ttnpb.BoolValue { - if fp.DwellTime.Uplinks == nil { +func DeviceDesiredUplinkDwellTime(phy *band.Band, fp *frequencyplans.FrequencyPlan) *ttnpb.BoolValue { + switch { + case !phy.TxParamSetupReqSupport: return nil + case fp.DwellTime.Uplinks != nil: + return &ttnpb.BoolValue{Value: *fp.DwellTime.Uplinks} + default: + return &ttnpb.BoolValue{Value: true} } - return &ttnpb.BoolValue{Value: *fp.DwellTime.Uplinks} } -func DeviceDesiredDownlinkDwellTime(fp *frequencyplans.FrequencyPlan) *ttnpb.BoolValue { - if fp.DwellTime.Downlinks == nil { +func DeviceDesiredDownlinkDwellTime(phy *band.Band, fp *frequencyplans.FrequencyPlan) *ttnpb.BoolValue { + switch { + case !phy.TxParamSetupReqSupport: return nil + case fp.DwellTime.Downlinks != nil: + return &ttnpb.BoolValue{Value: *fp.DwellTime.Downlinks} + default: + return &ttnpb.BoolValue{Value: true} } - return &ttnpb.BoolValue{Value: *fp.DwellTime.Downlinks} } func DeviceDefaultRX1Delay(dev *ttnpb.EndDevice, phy *band.Band, defaults ttnpb.MACSettings) ttnpb.RxDelay { @@ -607,6 +641,8 @@ func NewState(dev *ttnpb.EndDevice, fps *frequencyplans.Store, defaults ttnpb.MA PingSlotFrequency: DeviceDefaultPingSlotFrequency(dev, phy, defaults), BeaconFrequency: DeviceDefaultBeaconFrequency(dev, defaults), Channels: DeviceDefaultChannels(dev, phy, defaults), + UplinkDwellTime: DeviceUplinkDwellTime(dev, phy, defaults), + DownlinkDwellTime: DeviceDownlinkDwellTime(dev, phy, defaults), AdrAckLimitExponent: &ttnpb.ADRAckLimitExponentValue{Value: phy.ADRAckLimit}, AdrAckDelayExponent: &ttnpb.ADRAckDelayExponentValue{Value: phy.ADRAckDelay}, PingSlotDataRateIndexValue: DeviceDefaultPingSlotDataRateIndexValue(dev, phy, defaults), @@ -627,8 +663,8 @@ func NewState(dev *ttnpb.EndDevice, fps *frequencyplans.Store, defaults ttnpb.MA PingSlotFrequency: DeviceDesiredPingSlotFrequency(dev, phy, fp, defaults), BeaconFrequency: DeviceDesiredBeaconFrequency(dev, defaults), Channels: DeviceDesiredChannels(dev, phy, fp, defaults), - UplinkDwellTime: DeviceDesiredUplinkDwellTime(fp), - DownlinkDwellTime: DeviceDesiredDownlinkDwellTime(fp), + UplinkDwellTime: DeviceDesiredUplinkDwellTime(phy, fp), + DownlinkDwellTime: DeviceDesiredDownlinkDwellTime(phy, fp), AdrAckLimitExponent: DeviceDesiredADRAckLimitExponent(dev, phy, defaults), AdrAckDelayExponent: DeviceDesiredADRAckDelayExponent(dev, phy, defaults), PingSlotDataRateIndexValue: DeviceDesiredPingSlotDataRateIndexValue(dev, phy, fp, defaults), @@ -643,3 +679,29 @@ func NewState(dev *ttnpb.EndDevice, fps *frequencyplans.Store, defaults ttnpb.MA DesiredParameters: desired, }, nil } + +func DeviceExpectedUplinkDwellTime(macState *ttnpb.MACState, fp *frequencyplans.FrequencyPlan, phy *band.Band) bool { + switch { + case macState.GetCurrentParameters().GetUplinkDwellTime() != nil: + return macState.CurrentParameters.UplinkDwellTime.Value + case phy.BootDwellTime.Uplinks != nil: + return *phy.BootDwellTime.Uplinks + case fp.DwellTime.Uplinks != nil: + return *fp.DwellTime.Uplinks + default: + return false + } +} + +func DeviceExpectedDownlinkDwellTime(macState *ttnpb.MACState, fp *frequencyplans.FrequencyPlan, phy *band.Band) bool { + switch { + case macState.GetCurrentParameters().GetDownlinkDwellTime() != nil: + return macState.CurrentParameters.DownlinkDwellTime.Value + case phy.BootDwellTime.Downlinks != nil: + return *phy.BootDwellTime.Downlinks + case fp.DwellTime.Downlinks != nil: + return *fp.DwellTime.Downlinks + default: + return true + } +} diff --git a/pkg/networkserver/networkserver_flow_test.go b/pkg/networkserver/networkserver_flow_test.go index b74b591cf8..22715b876a 100644 --- a/pkg/networkserver/networkserver_flow_test.go +++ b/pkg/networkserver/networkserver_flow_test.go @@ -39,7 +39,11 @@ import ( "go.thethings.network/lorawan-stack/v3/pkg/util/test/assertions/should" ) -func frequencyPlanMACCommands(macVersion ttnpb.MACVersion, phyVersion ttnpb.PHYVersion, fpID string, otaa bool) ([]MACCommander, []events.Builder) { +// frequencyPlanMACCommands generates the MAC command and event builders that are expected +// for a particular MAC and PHY version pair, in the provided frequency plan, if OTAA is enabled. +// The returned bool value represents the FPending flag, which may be set for pairs where +// the MAC commands do not fit a singular transmission. +func frequencyPlanMACCommands(macVersion ttnpb.MACVersion, phyVersion ttnpb.PHYVersion, fpID string, otaa bool) ([]MACCommander, []events.Builder, bool) { switch fpID { case test.EUFrequencyPlanID: linkADRReq := &ttnpb.MACCommand_LinkADRReq{ @@ -52,7 +56,7 @@ func frequencyPlanMACCommands(macVersion ttnpb.MACVersion, phyVersion ttnpb.PHYV linkADRReq, }, []events.Builder{ mac.EvtEnqueueLinkADRRequest.With(events.WithData(linkADRReq)), - } + }, false case test.USFrequencyPlanID: linkADRReqs := []MACCommander{ &ttnpb.MACCommand_LinkADRReq{ @@ -72,8 +76,8 @@ func frequencyPlanMACCommands(macVersion ttnpb.MACVersion, phyVersion ttnpb.PHYV default: return false } - } - if !otaa || beforeRP001_V1_0_3_REV_A(phyVersion) { + }(phyVersion) + if !otaa || beforeRP001_V1_0_3_REV_A { linkADRReqs = append([]MACCommander{ &ttnpb.MACCommand_LinkADRReq{ ChannelMask: []bool{false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false}, @@ -89,26 +93,46 @@ func frequencyPlanMACCommands(macVersion ttnpb.MACVersion, phyVersion ttnpb.PHYV req := req evBuilders = append(evBuilders, mac.EvtEnqueueLinkADRRequest.With(events.WithData(req))) } - return linkADRReqs, evBuilders + return linkADRReqs, evBuilders, false case test.ASAUFrequencyPlanID: newChannelReq := &ttnpb.MACCommand_NewChannelReq{ ChannelIndex: 7, Frequency: 924600000, MaxDataRateIndex: ttnpb.DataRateIndex_DATA_RATE_5, } - linkADRReq := &ttnpb.MACCommand_LinkADRReq{ - ChannelMask: []bool{true, true, true, true, true, true, true, true, false, false, false, false, false, false, false, false}, - DataRateIndex: ttnpb.DataRateIndex_DATA_RATE_5, - TxPowerIndex: 1, - NbTrans: 1, - } - return []MACCommander{ - newChannelReq, - linkADRReq, - }, []events.Builder{ - mac.EvtEnqueueNewChannelRequest.With(events.WithData(newChannelReq)), - mac.EvtEnqueueLinkADRRequest.With(events.WithData(linkADRReq)), + macCommanders := []MACCommander{newChannelReq} + evBuilders := []events.Builder{mac.EvtEnqueueNewChannelRequest.With(events.WithData(newChannelReq))} + + fPending := true + // The boot time settings of RP001-1.0.2B devices enable downlink dwell time, which limits the number + // of MAC commands that can be part of the downlink. As such, the LinkADRReq is not sent as part of + // the initial downlink on this version. + if phyVersion != ttnpb.PHYVersion_PHY_V1_0_2_REV_B { + linkADRReq := &ttnpb.MACCommand_LinkADRReq{ + ChannelMask: []bool{true, true, true, true, true, true, true, true, false, false, false, false, false, false, false, false}, + DataRateIndex: ttnpb.DataRateIndex_DATA_RATE_5, + TxPowerIndex: 1, + NbTrans: 1, } + + macCommanders = append(macCommanders, linkADRReq) + evBuilders = append(evBuilders, mac.EvtEnqueueLinkADRRequest.With(events.WithData(linkADRReq))) + fPending = false + } + + var maxEIRPIndex = ttnpb.DeviceEIRP(5) + // The maximum EIRP in the RP001-1.0.2A version is 14 dB only, while the other versions use 16 dB. + if phyVersion == ttnpb.PHYVersion_PHY_V1_0_2_REV_A { + maxEIRPIndex = ttnpb.DeviceEIRP(4) + } + txParamSetupReq := &ttnpb.MACCommand_TxParamSetupReq{ + MaxEirpIndex: maxEIRPIndex, + DownlinkDwellTime: false, + UplinkDwellTime: false, + } + macCommanders = append(macCommanders, txParamSetupReq) + evBuilders = append(evBuilders, mac.EvtEnqueueTxParamSetupRequest.With(events.WithData(txParamSetupReq))) + return macCommanders, evBuilders, fPending default: panic(fmt.Errorf("unknown LinkADRReqs for %s frequency plan", fpID)) } @@ -231,7 +255,7 @@ func makeOTAAFlowTest(conf OTAAFlowTestConfig) func(context.Context, TestEnviron return } - fpCmders, fpEvBuilders := frequencyPlanMACCommands(dev.MacState.LorawanVersion, dev.LorawanPhyVersion, dev.FrequencyPlanId, true) + fpCmders, fpEvBuilders, fPending := frequencyPlanMACCommands(dev.MacState.LorawanVersion, dev.LorawanPhyVersion, dev.FrequencyPlanId, true) downEvBuilders := append(conf.DownlinkEventBuilders, fpEvBuilders...) downCmders = append(downCmders, conf.DownlinkMACCommanders...) downCmders = append(downCmders, fpCmders...) @@ -250,6 +274,8 @@ func makeOTAAFlowTest(conf OTAAFlowTestConfig) func(context.Context, TestEnviron FCtrl: &ttnpb.FCtrl{ Adr: true, Ack: true, + + FPending: fPending, }, FRMPayload: frmPayload, FOpts: fOpts, diff --git a/pkg/networkserver/networkserver_util_internal_test.go b/pkg/networkserver/networkserver_util_internal_test.go index 8711f4daee..782392ee1c 100644 --- a/pkg/networkserver/networkserver_util_internal_test.go +++ b/pkg/networkserver/networkserver_util_internal_test.go @@ -1083,7 +1083,7 @@ func (env TestEnvironment) AssertScheduleDownlink(ctx context.Context, conf Down rx1DRIdx := test.Must(phy.Rx1DataRate( drIdx, conf.MACState.CurrentParameters.Rx1DataRateOffset, - conf.MACState.CurrentParameters.DownlinkDwellTime.GetValue()), + mac.DeviceExpectedDownlinkDwellTime(conf.MACState, fp, phy)), ).(ttnpb.DataRateIndex) rx1DR := phy.DataRates[rx1DRIdx] txReq.Rx1DataRate = rx1DR.Rate @@ -1593,6 +1593,8 @@ func (env TestEnvironment) AssertJoin(ctx context.Context, conf JoinAssertionCon PingSlotFrequency: mac.DeviceDefaultPingSlotFrequency(dev, phy, defaultMACSettings), BeaconFrequency: mac.DeviceDefaultBeaconFrequency(dev, defaultMACSettings), Channels: mac.DeviceDefaultChannels(dev, phy, defaultMACSettings), + UplinkDwellTime: mac.DeviceUplinkDwellTime(dev, phy, defaultMACSettings), + DownlinkDwellTime: mac.DeviceDownlinkDwellTime(dev, phy, defaultMACSettings), AdrAckLimitExponent: &ttnpb.ADRAckLimitExponentValue{Value: phy.ADRAckLimit}, AdrAckDelayExponent: &ttnpb.ADRAckDelayExponentValue{Value: phy.ADRAckDelay}, PingSlotDataRateIndexValue: mac.DeviceDefaultPingSlotDataRateIndexValue(dev, phy, defaultMACSettings), @@ -1611,8 +1613,8 @@ func (env TestEnvironment) AssertJoin(ctx context.Context, conf JoinAssertionCon PingSlotFrequency: mac.DeviceDesiredPingSlotFrequency(dev, phy, fp, defaultMACSettings), BeaconFrequency: mac.DeviceDesiredBeaconFrequency(dev, defaultMACSettings), Channels: mac.DeviceDesiredChannels(dev, phy, fp, defaultMACSettings), - UplinkDwellTime: mac.DeviceDesiredUplinkDwellTime(fp), - DownlinkDwellTime: mac.DeviceDesiredDownlinkDwellTime(fp), + UplinkDwellTime: mac.DeviceDesiredUplinkDwellTime(phy, fp), + DownlinkDwellTime: mac.DeviceDesiredDownlinkDwellTime(phy, fp), AdrAckLimitExponent: mac.DeviceDesiredADRAckLimitExponent(dev, phy, defaultMACSettings), AdrAckDelayExponent: mac.DeviceDesiredADRAckDelayExponent(dev, phy, defaultMACSettings), PingSlotDataRateIndexValue: mac.DeviceDesiredPingSlotDataRateIndexValue(dev, phy, fp, defaultMACSettings), diff --git a/pkg/ttnpb/end_device.go b/pkg/ttnpb/end_device.go index e94db66294..72df291b25 100644 --- a/pkg/ttnpb/end_device.go +++ b/pkg/ttnpb/end_device.go @@ -187,6 +187,14 @@ func (v *MACSettings) FieldIsZero(p string) bool { return v.UseAdr == nil case "use_adr.value": return v.UseAdr.FieldIsZero("value") + case "uplink_dwell_time": + return v.UplinkDwellTime == nil + case "uplink_dwell_time.value": + return v.UplinkDwellTime.FieldIsZero("value") + case "downlink_dwell_time": + return v.DownlinkDwellTime == nil + case "downlink_dwell_time.value": + return v.DownlinkDwellTime.FieldIsZero("value") } panic(fmt.Sprintf("unknown path '%s'", p)) } @@ -993,6 +1001,14 @@ func (v *EndDevice) FieldIsZero(p string) bool { return v.MacSettings.FieldIsZero("use_adr") case "mac_settings.use_adr.value": return v.MacSettings.FieldIsZero("use_adr.value") + case "mac_settings.uplink_dwell_time": + return v.MacSettings.FieldIsZero("uplink_dwell_time") + case "mac_settings.uplink_dwell_time.value": + return v.MacSettings.FieldIsZero("uplink_dwell_time.value") + case "mac_settings.downlink_dwell_time": + return v.MacSettings.FieldIsZero("downlink_dwell_time") + case "mac_settings.downlink_dwell_time.value": + return v.MacSettings.FieldIsZero("downlink_dwell_time.value") case "mac_state": return v.MacState == nil case "max_frequency": diff --git a/pkg/ttnpb/end_device.pb.go b/pkg/ttnpb/end_device.pb.go index ba1bc05798..0a5fe47fcf 100644 --- a/pkg/ttnpb/end_device.pb.go +++ b/pkg/ttnpb/end_device.pb.go @@ -740,9 +740,15 @@ type MACSettings struct { DesiredMaxEirp *DeviceEIRPValue `protobuf:"bytes,30,opt,name=desired_max_eirp,json=desiredMaxEirp,proto3" json:"desired_max_eirp,omitempty"` // The minimum duration passed before a network-initiated(e.g. Class B or C) downlink following an arbitrary downlink. ClassBCDownlinkInterval *types.Duration `protobuf:"bytes,31,opt,name=class_b_c_downlink_interval,json=classBCDownlinkInterval,proto3" json:"class_b_c_downlink_interval,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // Whether uplink dwell time is set (400ms). + // If unset, the default value from Network Server configuration or regional parameters specification will be used. + UplinkDwellTime *BoolValue `protobuf:"bytes,32,opt,name=uplink_dwell_time,json=uplinkDwellTime,proto3" json:"uplink_dwell_time,omitempty"` + // Whether downlink dwell time is set (400ms). + // If unset, the default value from Network Server configuration or regional parameters specification will be used. + DownlinkDwellTime *BoolValue `protobuf:"bytes,33,opt,name=downlink_dwell_time,json=downlinkDwellTime,proto3" json:"downlink_dwell_time,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *MACSettings) Reset() { *m = MACSettings{} } @@ -979,6 +985,20 @@ func (m *MACSettings) GetClassBCDownlinkInterval() *types.Duration { return nil } +func (m *MACSettings) GetUplinkDwellTime() *BoolValue { + if m != nil { + return m.UplinkDwellTime + } + return nil +} + +func (m *MACSettings) GetDownlinkDwellTime() *BoolValue { + if m != nil { + return m.DownlinkDwellTime + } + return nil +} + // MACState represents the state of MAC layer of the device. // MACState is reset on each join for OTAA or ResetInd for ABP devices. // This is used internally by the Network Server. @@ -2691,305 +2711,305 @@ func init() { } var fileDescriptor_a656ee0551c94a80 = []byte{ - // 4787 bytes of a gzipped FileDescriptorProto + // 4800 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x7b, 0x4b, 0x6c, 0x1b, 0x49, - 0x7a, 0xbf, 0x9b, 0xa2, 0x24, 0xf2, 0x93, 0x44, 0x52, 0xa5, 0x57, 0x8b, 0xf2, 0x43, 0x43, 0xcb, - 0x36, 0xe5, 0xb5, 0xa8, 0x11, 0x3d, 0xda, 0xff, 0xda, 0xf3, 0x9f, 0xf5, 0x90, 0x92, 0xbc, 0xa6, - 0xfc, 0x18, 0x4d, 0x5b, 0x96, 0x67, 0xc6, 0xe3, 0xe9, 0x6d, 0x75, 0x97, 0xa8, 0x1e, 0x91, 0xdd, - 0xbd, 0xd5, 0x45, 0x59, 0x9a, 0x19, 0x23, 0x83, 0x45, 0x82, 0x20, 0x0b, 0x24, 0x87, 0x41, 0x80, - 0x20, 0x7b, 0xc9, 0x9e, 0x02, 0x64, 0x0f, 0x01, 0x72, 0x08, 0x90, 0x43, 0x90, 0xcd, 0x25, 0xc0, - 0x5c, 0x02, 0xec, 0x35, 0x39, 0xec, 0x25, 0x97, 0x60, 0x2f, 0x39, 0x47, 0x87, 0x20, 0xa8, 0xea, - 0xea, 0x07, 0xd9, 0xa4, 0x44, 0x8f, 0x67, 0xb0, 0x9b, 0x93, 0x9a, 0x55, 0xdf, 0xf7, 0xab, 0xea, - 0xfa, 0x1e, 0xf5, 0x3d, 0x5a, 0x50, 0x68, 0xd8, 0x44, 0x7b, 0xa1, 0x59, 0x4b, 0x2e, 0xd5, 0xf4, - 0x83, 0x65, 0xcd, 0x31, 0x97, 0xb1, 0x65, 0xa8, 0x06, 0x3e, 0x34, 0x75, 0x5c, 0x72, 0x88, 0x4d, - 0x6d, 0x94, 0xa1, 0xd4, 0x2a, 0x09, 0xba, 0xd2, 0xe1, 0xcd, 0x7c, 0xa5, 0x6e, 0xd2, 0xfd, 0xd6, - 0x6e, 0x49, 0xb7, 0x9b, 0xcb, 0xd8, 0x3a, 0xb4, 0x8f, 0x1d, 0x62, 0x1f, 0x1d, 0x2f, 0x73, 0x62, - 0x7d, 0xa9, 0x8e, 0xad, 0xa5, 0x43, 0xad, 0x61, 0x1a, 0x1a, 0xc5, 0xcb, 0xb1, 0x07, 0x0f, 0x32, - 0xbf, 0x14, 0x81, 0xa8, 0xdb, 0x75, 0xdb, 0x63, 0xde, 0x6d, 0xed, 0xf1, 0x5f, 0xfc, 0x07, 0x7f, - 0x12, 0xe4, 0x6b, 0x11, 0xf2, 0xed, 0x7d, 0xbc, 0xbd, 0x6f, 0x5a, 0x75, 0xb7, 0x66, 0x19, 0x2d, - 0x97, 0x12, 0x13, 0xbb, 0xd1, 0xa5, 0xeb, 0xf6, 0xd2, 0xa7, 0xae, 0x6d, 0x2d, 0x6b, 0x96, 0x65, - 0x53, 0x8d, 0x9a, 0xb6, 0xe5, 0x0a, 0x90, 0x8b, 0x75, 0xdb, 0xae, 0x37, 0x70, 0xb8, 0x94, 0xd1, - 0x22, 0x9c, 0x40, 0xcc, 0xcf, 0x77, 0xce, 0xef, 0x99, 0xb8, 0x61, 0xa8, 0x4d, 0xcd, 0x3d, 0x10, - 0x14, 0xe7, 0x3b, 0x29, 0x5c, 0x4a, 0x5a, 0x3a, 0x15, 0xb3, 0x97, 0x3a, 0x67, 0xa9, 0xd9, 0xc4, - 0x2e, 0xd5, 0x9a, 0x4e, 0xaf, 0x0d, 0xbc, 0x20, 0x9a, 0xe3, 0x60, 0xe2, 0x6f, 0xf0, 0x72, 0x5c, - 0x16, 0xa6, 0x81, 0x2d, 0x6a, 0xee, 0x99, 0x21, 0xd1, 0xf9, 0x38, 0xd1, 0x01, 0x3e, 0xf6, 0x67, - 0x2f, 0xc5, 0x67, 0x7d, 0xc1, 0x89, 0x97, 0x8c, 0x13, 0x34, 0xb1, 0xeb, 0x6a, 0x75, 0x7c, 0x0a, - 0x84, 0x63, 0xea, 0xb4, 0x45, 0xf0, 0x69, 0x10, 0x54, 0x33, 0x34, 0xaa, 0x79, 0x14, 0x85, 0xff, - 0x1a, 0x80, 0xe1, 0xc7, 0xd8, 0x75, 0x4d, 0xdb, 0x42, 0x1f, 0x41, 0xca, 0xc0, 0x87, 0xaa, 0x66, - 0x18, 0x44, 0x4e, 0xcc, 0x4b, 0xc5, 0xd1, 0xea, 0x9d, 0xaf, 0x7f, 0x73, 0xe9, 0xdc, 0xbf, 0xff, - 0xe6, 0xd2, 0xff, 0xab, 0xdb, 0x25, 0xba, 0x8f, 0x29, 0x17, 0x66, 0xc9, 0xc2, 0xf4, 0x85, 0x4d, - 0x0e, 0x96, 0xdb, 0xc1, 0x0f, 0x6f, 0x2e, 0x3b, 0x07, 0xf5, 0x65, 0x7a, 0xec, 0x60, 0xb7, 0xb4, - 0x8e, 0x0f, 0x2b, 0x86, 0x41, 0x94, 0x61, 0xc3, 0x7b, 0x40, 0xb7, 0x20, 0xc9, 0xde, 0x5d, 0x1e, - 0x98, 0x97, 0x8a, 0x23, 0xe5, 0xb9, 0x52, 0xbb, 0x9e, 0x96, 0xc4, 0x16, 0xee, 0xe3, 0x63, 0xb7, - 0x9a, 0x3a, 0xa9, 0x0e, 0xfe, 0x4c, 0x4a, 0xe4, 0x24, 0x85, 0xb3, 0xa0, 0x37, 0x60, 0xac, 0xa1, - 0xb9, 0x54, 0xdd, 0x53, 0x75, 0x8b, 0xaa, 0x2d, 0x47, 0x4e, 0xce, 0x4b, 0xc5, 0x31, 0x05, 0xd8, - 0xe0, 0xdd, 0x35, 0x8b, 0x3e, 0x71, 0x50, 0x11, 0xc6, 0x39, 0x89, 0x25, 0x88, 0x0c, 0xfb, 0x85, - 0x25, 0x0f, 0x72, 0x32, 0xce, 0xfb, 0x88, 0xd1, 0xad, 0xdb, 0x2f, 0xac, 0x80, 0x52, 0x8b, 0x52, - 0x0e, 0x85, 0x94, 0x95, 0x80, 0xb2, 0x04, 0x93, 0x9c, 0x52, 0xb7, 0xad, 0xbd, 0x28, 0xf1, 0x30, - 0x27, 0xce, 0xb1, 0xb9, 0x35, 0xdb, 0xda, 0x0b, 0xe8, 0x6f, 0x01, 0xb8, 0x54, 0x23, 0x14, 0x1b, - 0xaa, 0x46, 0xe5, 0x14, 0x7f, 0xcf, 0x7c, 0xc9, 0xd3, 0xa3, 0x92, 0xaf, 0x47, 0xa5, 0x6d, 0x5f, - 0xd1, 0x94, 0xb4, 0xa0, 0xae, 0x50, 0x84, 0xe1, 0xfc, 0x4f, 0x5a, 0xb8, 0xc5, 0x38, 0x1d, 0xa7, - 0x61, 0xea, 0x5c, 0xd5, 0xf9, 0x6a, 0x0d, 0xd3, 0x3a, 0x70, 0xe5, 0xf4, 0xfc, 0x40, 0x71, 0xa4, - 0x7c, 0xb9, 0xf3, 0xd0, 0x2a, 0x21, 0xf1, 0xba, 0xa0, 0x55, 0xf2, 0x1e, 0x50, 0x97, 0x29, 0x77, - 0x33, 0x99, 0x92, 0x72, 0x89, 0xc2, 0x22, 0xa4, 0xab, 0xb6, 0xdd, 0xd8, 0xd1, 0x1a, 0x2d, 0x8c, - 0x26, 0x61, 0xf0, 0x90, 0x3d, 0xc8, 0xd2, 0xbc, 0x54, 0x4c, 0x29, 0xde, 0x8f, 0xdb, 0x43, 0xbf, - 0xfd, 0xe5, 0x6c, 0x42, 0x96, 0x0a, 0x7f, 0x97, 0x85, 0xb1, 0x87, 0x95, 0xb5, 0x2d, 0x8d, 0x68, - 0x4d, 0x4c, 0x31, 0x71, 0xd1, 0x2c, 0xa4, 0x9a, 0xda, 0x91, 0x8a, 0x4d, 0xe2, 0x70, 0x96, 0x84, - 0x32, 0xdc, 0xd4, 0x8e, 0x36, 0x4c, 0xe2, 0xa0, 0x1d, 0x98, 0xd0, 0x0c, 0xa2, 0x32, 0xdd, 0x52, - 0x89, 0x46, 0xb1, 0x6a, 0x5a, 0x06, 0x3e, 0xe2, 0xc2, 0xca, 0x94, 0x2f, 0x74, 0xee, 0x7d, 0x5d, - 0xa3, 0x9a, 0xa2, 0x51, 0x5c, 0x63, 0x44, 0x5c, 0xe4, 0x3f, 0xe5, 0x22, 0xcf, 0x69, 0x06, 0x69, - 0x9b, 0x43, 0x6f, 0x01, 0x62, 0xb8, 0xf4, 0x48, 0x75, 0xec, 0x17, 0x98, 0x08, 0x58, 0x2e, 0xdc, - 0xea, 0xf0, 0x49, 0x35, 0x79, 0x3d, 0x21, 0x67, 0x95, 0xac, 0x66, 0x90, 0xed, 0xa3, 0x2d, 0x46, - 0xe0, 0x71, 0x2d, 0xc2, 0x28, 0xe3, 0xb2, 0x76, 0x55, 0x4a, 0x34, 0xcb, 0xf5, 0x44, 0x1c, 0xd2, - 0x83, 0x66, 0x90, 0x47, 0xbb, 0xdb, 0x6c, 0x0a, 0x5d, 0x85, 0x31, 0x46, 0xaa, 0xe9, 0x07, 0x6a, - 0xc3, 0x6c, 0x9a, 0xd4, 0x93, 0x70, 0x35, 0x21, 0x4b, 0xca, 0x88, 0x66, 0x90, 0x8a, 0x7e, 0xf0, - 0x80, 0x0d, 0x47, 0xe9, 0x0c, 0xdc, 0xd0, 0x8e, 0xb9, 0x8c, 0xdb, 0xe8, 0xd6, 0xd9, 0x30, 0xfa, - 0x21, 0xa4, 0xc9, 0xd1, 0x8a, 0xa0, 0x49, 0xf3, 0xd7, 0x9f, 0xe9, 0x7c, 0x7d, 0xe5, 0x88, 0xd3, - 0x46, 0x5e, 0x3c, 0x45, 0x8e, 0x56, 0x3c, 0xfe, 0x0f, 0x61, 0x92, 0xf3, 0x07, 0x07, 0x69, 0xef, - 0xed, 0xb9, 0x98, 0xca, 0xc0, 0xa1, 0x2e, 0xf6, 0x3a, 0xc9, 0xf7, 0x38, 0x55, 0x04, 0x71, 0x9c, - 0x21, 0xb6, 0x4d, 0x32, 0x19, 0x91, 0xa3, 0x72, 0x4c, 0x46, 0x23, 0xaf, 0x28, 0x23, 0x72, 0x54, - 0x6e, 0x97, 0x51, 0x09, 0xc6, 0x18, 0xee, 0x1e, 0xc1, 0x3f, 0x69, 0x61, 0x4b, 0x3f, 0x96, 0x47, - 0xe7, 0xa5, 0x62, 0xb2, 0x9a, 0x3e, 0xa9, 0x0e, 0x95, 0x93, 0xc5, 0x5f, 0xfc, 0xe9, 0x90, 0x32, - 0x4a, 0x8e, 0xca, 0x77, 0xfd, 0x69, 0xf4, 0x18, 0x32, 0x4c, 0x8d, 0x8c, 0x16, 0x3d, 0x56, 0xf5, - 0x63, 0xbd, 0x81, 0xe5, 0x31, 0xbe, 0x85, 0xb8, 0x8a, 0xd7, 0xeb, 0x04, 0xd7, 0x35, 0x8a, 0x8d, - 0xf5, 0x16, 0x3d, 0x5e, 0x63, 0xa4, 0x91, 0x8d, 0x8c, 0x36, 0xb5, 0xa3, 0x60, 0x1c, 0x19, 0x30, - 0x43, 0xf0, 0xa7, 0xb6, 0x69, 0xa9, 0xcc, 0x9b, 0xab, 0x0e, 0x26, 0xa6, 0x6d, 0x98, 0xba, 0x49, - 0x8f, 0xe5, 0x0c, 0x47, 0x2f, 0xc4, 0xa4, 0xc0, 0xc9, 0x99, 0x49, 0x6e, 0x1c, 0x39, 0xb6, 0x85, - 0xad, 0xe8, 0xf1, 0x4d, 0x91, 0x60, 0x76, 0x2b, 0x84, 0x42, 0x75, 0x90, 0xc5, 0x2a, 0xba, 0xdd, - 0xb2, 0x68, 0xdb, 0x32, 0xd9, 0xee, 0x2f, 0xe1, 0x2d, 0xb3, 0xc6, 0xc8, 0xbb, 0xac, 0x33, 0x4d, - 0xc2, 0xe9, 0xe8, 0x42, 0x6f, 0xc3, 0x84, 0x63, 0x5a, 0x75, 0xd5, 0x6d, 0xd8, 0x34, 0x72, 0xb2, - 0x39, 0x7e, 0xb2, 0x23, 0x27, 0xd5, 0x54, 0x79, 0x48, 0x3e, 0xc7, 0xcf, 0x76, 0x9c, 0xd1, 0x3d, - 0x6e, 0xd8, 0x34, 0x3c, 0xe0, 0x67, 0x30, 0x1b, 0x32, 0x77, 0x8a, 0x7b, 0xbc, 0x1f, 0x71, 0x33, - 0xb5, 0x9e, 0xf2, 0x81, 0xdb, 0xa5, 0xfd, 0x7d, 0xc8, 0xed, 0x62, 0x4d, 0xb7, 0xad, 0xc8, 0xb6, - 0x50, 0x7c, 0x5b, 0x59, 0x8f, 0x28, 0xdc, 0xd4, 0x7d, 0x48, 0xe9, 0xfb, 0x9a, 0x65, 0xe1, 0x86, - 0x2b, 0x4f, 0x70, 0x97, 0x76, 0xa5, 0x73, 0x0f, 0x6d, 0xde, 0xa6, 0xb4, 0xe6, 0x51, 0xf3, 0xc3, - 0xfa, 0x4a, 0x4a, 0xa4, 0x24, 0x25, 0x00, 0x40, 0x1b, 0x30, 0xde, 0x72, 0x98, 0x5f, 0x53, 0x8d, - 0x17, 0xb8, 0xd1, 0xe0, 0x32, 0x97, 0x27, 0xb9, 0xd7, 0x9d, 0xed, 0x44, 0x0d, 0xfc, 0x9d, 0x92, - 0xf5, 0x78, 0xd6, 0x19, 0x0b, 0x93, 0x2c, 0xaa, 0xc1, 0x84, 0xef, 0x67, 0xa3, 0x40, 0x53, 0x67, - 0x01, 0x8d, 0xfb, 0x5c, 0x21, 0xd4, 0x73, 0x98, 0x6e, 0xf3, 0x23, 0x2a, 0x16, 0xc2, 0x96, 0xa7, - 0x39, 0x5a, 0x31, 0xa6, 0xdc, 0xeb, 0x8a, 0xef, 0x5c, 0x7c, 0xbd, 0xf0, 0xc0, 0x27, 0x22, 0x6e, - 0xc7, 0x9f, 0x89, 0xc2, 0x73, 0xd7, 0x12, 0xc2, 0xcf, 0x9c, 0x06, 0xcf, 0x7d, 0x4a, 0x57, 0xf8, - 0xb6, 0x19, 0x54, 0x87, 0x4b, 0x3d, 0x35, 0x46, 0xf5, 0xee, 0x08, 0x99, 0xaf, 0x53, 0x38, 0x55, - 0x6f, 0xbc, 0x15, 0xf2, 0x5d, 0x15, 0x87, 0xcf, 0xe5, 0x7f, 0x9d, 0x80, 0x61, 0x21, 0x58, 0xa6, - 0x49, 0x42, 0x88, 0xa1, 0x26, 0x49, 0x5d, 0x34, 0xc9, 0x23, 0x0a, 0x35, 0xe9, 0x07, 0x80, 0x02, - 0xa9, 0x85, 0x9c, 0x89, 0x4e, 0xa7, 0x13, 0x08, 0x29, 0xe4, 0xdc, 0x81, 0x89, 0xa6, 0x69, 0xc5, - 0x4c, 0x62, 0xe0, 0x15, 0x3d, 0x60, 0xd3, 0xb4, 0xda, 0x6d, 0x82, 0xe1, 0x32, 0x8f, 0xf6, 0x9a, - 0xb7, 0x1f, 0x73, 0x68, 0x6d, 0xb8, 0x97, 0x61, 0x0c, 0x5b, 0xda, 0x6e, 0x03, 0xab, 0xde, 0x19, - 0xf0, 0x8b, 0x2f, 0xa5, 0x8c, 0x7a, 0x83, 0x4f, 0xf8, 0xd8, 0x66, 0x32, 0x95, 0xc8, 0x0d, 0x6c, - 0x26, 0x53, 0x03, 0xb9, 0x64, 0xe1, 0x64, 0x10, 0x72, 0x1b, 0x96, 0xb1, 0xce, 0xb3, 0x82, 0x1d, - 0x4c, 0x78, 0x64, 0xf7, 0x23, 0x18, 0x30, 0x0d, 0x97, 0x1f, 0xed, 0x48, 0xf9, 0x7b, 0x9d, 0xbb, - 0xe9, 0x24, 0xaf, 0x85, 0x91, 0x6c, 0x24, 0x18, 0x63, 0x08, 0xe8, 0x21, 0x64, 0x05, 0xa3, 0x7a, - 0xe8, 0x11, 0xf3, 0x53, 0xcf, 0x94, 0xf3, 0x5d, 0x2c, 0x59, 0xc0, 0x45, 0xde, 0x2f, 0x23, 0x08, - 0xfc, 0x7d, 0x6d, 0xc3, 0x84, 0x0f, 0xe7, 0xec, 0x1f, 0x07, 0x90, 0x03, 0xdd, 0x21, 0xb7, 0xee, - 0x7d, 0x18, 0x87, 0x1c, 0x17, 0x04, 0x5b, 0xfb, 0xc7, 0x3e, 0xea, 0x4d, 0x18, 0x0f, 0x94, 0x42, - 0x75, 0x1a, 0x9a, 0xa5, 0x9a, 0x06, 0x97, 0x44, 0x9a, 0x07, 0x00, 0x24, 0x21, 0xbf, 0xab, 0x64, - 0x03, 0x8a, 0xad, 0x86, 0x66, 0xd5, 0x0c, 0x34, 0x0f, 0x43, 0xce, 0xbe, 0x4d, 0x6d, 0x57, 0x1e, - 0x9c, 0x1f, 0x28, 0xa6, 0x7d, 0x9f, 0x93, 0x03, 0x45, 0x8c, 0xa3, 0x22, 0xe4, 0xdc, 0x96, 0xe3, - 0xd8, 0x84, 0xba, 0xaa, 0xde, 0xd0, 0x5c, 0x57, 0xdd, 0xe5, 0x61, 0x45, 0x4a, 0xc9, 0xf8, 0xe3, - 0x6b, 0x6c, 0xb8, 0xda, 0x85, 0x52, 0xe7, 0x41, 0x45, 0x27, 0xe5, 0x1a, 0x7a, 0x08, 0x93, 0x06, - 0xde, 0xd3, 0x5a, 0x0d, 0xaa, 0x36, 0x35, 0x5d, 0x75, 0x31, 0xa5, 0x2c, 0xc4, 0x16, 0xe1, 0xe3, - 0x5c, 0x97, 0x43, 0x7d, 0x2c, 0x48, 0x14, 0x24, 0x18, 0x1f, 0x6a, 0xba, 0x3f, 0xc6, 0xb4, 0x85, - 0x69, 0x77, 0x68, 0x12, 0x2c, 0xfc, 0x48, 0x2a, 0xa3, 0x4d, 0x33, 0xe2, 0x86, 0x19, 0x91, 0x76, - 0x14, 0x21, 0x02, 0x41, 0xa4, 0x1d, 0xb5, 0x11, 0x05, 0xaf, 0xc0, 0xae, 0x27, 0x1e, 0x23, 0xa4, - 0x94, 0x51, 0x7f, 0x70, 0xd3, 0x36, 0x2d, 0x74, 0x03, 0x10, 0xc1, 0x2e, 0x16, 0x24, 0xaa, 0x65, - 0x5b, 0x3a, 0x76, 0xf9, 0xdd, 0x9f, 0x52, 0x72, 0xde, 0x0c, 0xa3, 0x7b, 0xc4, 0xc7, 0x91, 0x06, - 0xfe, 0x96, 0xd5, 0x3d, 0x9b, 0x34, 0x35, 0xca, 0x7c, 0x3c, 0xbf, 0xf8, 0xbb, 0x38, 0xaf, 0x87, - 0x5e, 0xa6, 0xb3, 0xa5, 0x1d, 0x37, 0x6c, 0xcd, 0xb8, 0x1b, 0xd0, 0x47, 0x14, 0x72, 0x5c, 0xa0, - 0x85, 0x93, 0x85, 0xbf, 0x9f, 0x80, 0x91, 0xc8, 0x19, 0xa1, 0x0a, 0x64, 0x85, 0xa4, 0xb8, 0x5b, - 0xb7, 0x5b, 0x54, 0xd8, 0xc0, 0x6c, 0x2c, 0x30, 0x5f, 0x17, 0x19, 0xa6, 0x32, 0xc6, 0x39, 0xaa, - 0xdb, 0x1e, 0x3d, 0x7a, 0x0a, 0x53, 0xa1, 0x5f, 0x8c, 0x5e, 0xf6, 0x09, 0x0e, 0x14, 0xbb, 0xec, - 0xb7, 0x84, 0xe7, 0xf3, 0xae, 0x72, 0xe1, 0x70, 0x9d, 0xb6, 0x41, 0xef, 0x7e, 0xff, 0xf8, 0xb4, - 0x2b, 0x7a, 0xa0, 0x6f, 0x57, 0xdb, 0xe3, 0x8e, 0x7e, 0xd4, 0x3d, 0x7a, 0x48, 0x72, 0xdc, 0x58, - 0x0c, 0x19, 0xc8, 0x5d, 0x5c, 0x6e, 0xf1, 0x80, 0xa2, 0xd6, 0xe5, 0xce, 0x9f, 0xed, 0x0b, 0x2c, - 0x16, 0x06, 0x04, 0x42, 0xd1, 0x03, 0xa1, 0x0c, 0xf6, 0x27, 0x94, 0x35, 0x5f, 0x28, 0xb7, 0xa2, - 0x21, 0xf6, 0x10, 0x67, 0x3e, 0xdf, 0x23, 0xc4, 0xf6, 0x36, 0x11, 0x46, 0xd7, 0xdb, 0x3d, 0xa2, - 0xeb, 0xe1, 0xee, 0xe2, 0x6c, 0x0f, 0xa0, 0xc5, 0xf1, 0xc4, 0x03, 0xeb, 0xf7, 0xbb, 0x07, 0xd6, - 0xa9, 0xbe, 0xc5, 0x18, 0x8f, 0xa9, 0xd7, 0x3a, 0x63, 0xea, 0x74, 0x5f, 0xc7, 0xdd, 0x1e, 0x68, - 0xdf, 0x85, 0xfc, 0x9e, 0xa6, 0x53, 0x9b, 0x1c, 0xab, 0x0e, 0x37, 0xc8, 0x00, 0xcf, 0xc4, 0xae, - 0x0c, 0xf3, 0x03, 0xc5, 0x64, 0xe0, 0xe9, 0x7e, 0xac, 0xc8, 0x82, 0x76, 0x8b, 0x93, 0xde, 0x0d, - 0x29, 0xd1, 0xa3, 0x58, 0xc0, 0x3e, 0xd2, 0x23, 0xe8, 0x88, 0x07, 0xec, 0x62, 0x5f, 0x6d, 0xb1, - 0xfa, 0x7d, 0x98, 0x0a, 0xdc, 0xcb, 0xcd, 0xb2, 0xba, 0x6b, 0x8a, 0xf4, 0x9e, 0x3b, 0x8f, 0xd3, - 0x03, 0x2f, 0x9f, 0xef, 0x66, 0xb9, 0x6a, 0xf2, 0xfc, 0x1f, 0x95, 0x61, 0xb8, 0xe5, 0x62, 0x55, - 0x33, 0x88, 0xf0, 0x26, 0xa7, 0xb0, 0x0f, 0xb5, 0x5c, 0x5c, 0x31, 0x08, 0xba, 0x0d, 0x2c, 0x05, - 0x54, 0x9b, 0x1a, 0xa9, 0x9b, 0x16, 0xcf, 0x0f, 0x98, 0xbb, 0xed, 0xd4, 0xbf, 0xbb, 0x0d, 0x5b, - 0x13, 0x42, 0x4f, 0x6b, 0x06, 0x79, 0xc8, 0xa9, 0xd1, 0xdb, 0x30, 0x2a, 0xdc, 0x9e, 0xb7, 0xe7, - 0xec, 0x59, 0x8b, 0x82, 0x47, 0xce, 0x37, 0xfb, 0x3e, 0xcc, 0xb8, 0x54, 0xa3, 0x2d, 0x37, 0x9e, - 0xa5, 0xe4, 0xce, 0xb2, 0x82, 0x29, 0x8f, 0xb3, 0x33, 0x25, 0xd9, 0x01, 0x59, 0x40, 0xc6, 0x53, - 0x92, 0x71, 0x61, 0x1c, 0x9d, 0x98, 0x4f, 0x6a, 0x16, 0xbd, 0x59, 0xf6, 0xb6, 0x37, 0xed, 0x71, - 0xc7, 0x32, 0x90, 0x7b, 0x30, 0x6e, 0x60, 0xd7, 0x24, 0xd8, 0x50, 0x43, 0x6b, 0x43, 0x7d, 0x58, - 0x5b, 0x56, 0xb0, 0x29, 0xbe, 0xd1, 0xe9, 0x70, 0xbe, 0x0d, 0xa9, 0xd3, 0xf8, 0x26, 0xfa, 0x37, - 0x3e, 0x39, 0x82, 0xdd, 0x6e, 0x83, 0x3f, 0x86, 0xb9, 0x70, 0x91, 0xb8, 0x2d, 0x4e, 0xf6, 0x6d, - 0x8b, 0x33, 0xc1, 0x12, 0x1d, 0x26, 0xa9, 0xc0, 0x54, 0x74, 0x85, 0xd0, 0x34, 0xa7, 0xfa, 0x32, - 0xcd, 0x89, 0x10, 0x37, 0xb4, 0xd0, 0xe7, 0x30, 0xed, 0x63, 0x76, 0x58, 0xd8, 0xf4, 0x2b, 0x5a, - 0x98, 0x0f, 0xff, 0x30, 0x6a, 0x68, 0x0d, 0xb8, 0xe8, 0xc3, 0xf7, 0x48, 0x4e, 0x66, 0x5e, 0x31, - 0x39, 0xc9, 0x0b, 0xbc, 0x4a, 0x97, 0x1c, 0xa5, 0xcb, 0x6a, 0x1d, 0xb9, 0x8a, 0xfc, 0x8a, 0xb9, - 0x4a, 0xfb, 0x6a, 0xed, 0x29, 0xcb, 0x01, 0xbc, 0xe1, 0xaf, 0xd6, 0xfb, 0x26, 0x9d, 0xeb, 0x5b, - 0xec, 0xbe, 0x8a, 0x6e, 0x75, 0xbd, 0x50, 0x9f, 0x87, 0xda, 0xd5, 0xed, 0x62, 0x3d, 0xdf, 0x97, - 0x06, 0xc8, 0x1d, 0x4b, 0x84, 0x6a, 0xf0, 0x01, 0xf8, 0x73, 0x6a, 0xec, 0x9e, 0xbd, 0xd0, 0x17, - 0xb6, 0xaf, 0x46, 0xd5, 0x8e, 0xeb, 0xb6, 0x06, 0xb9, 0xa8, 0x82, 0xf1, 0xd2, 0xdd, 0x45, 0x8e, - 0x78, 0x29, 0x76, 0x28, 0x3c, 0x0b, 0xd8, 0xa8, 0x29, 0x5b, 0x1e, 0x64, 0x26, 0xd4, 0x28, 0x5e, - 0xe2, 0x7b, 0x0a, 0x73, 0x7e, 0x38, 0xa5, 0x07, 0xe5, 0x49, 0xd5, 0xb4, 0x28, 0x26, 0x87, 0x5a, - 0x43, 0xbe, 0x74, 0x96, 0xff, 0x9a, 0xf1, 0x42, 0xab, 0x35, 0xbf, 0x24, 0x59, 0x13, 0x9c, 0x85, - 0xbf, 0x99, 0x86, 0x14, 0x8b, 0xdb, 0xa8, 0x46, 0x31, 0xda, 0x01, 0xa4, 0xb7, 0x08, 0xc1, 0xcc, - 0x93, 0x05, 0xb5, 0x00, 0x11, 0xb7, 0x5d, 0x38, 0xb5, 0x60, 0x10, 0x0d, 0x0e, 0x05, 0x44, 0xa4, - 0x76, 0xb9, 0xc3, 0xe2, 0x4f, 0x21, 0xc1, 0x10, 0x37, 0xf1, 0x8a, 0xb8, 0xbe, 0x04, 0x43, 0xdc, - 0x2a, 0x8c, 0x7a, 0x3d, 0x18, 0x2f, 0xd6, 0x17, 0xd9, 0xcb, 0x54, 0x27, 0xa2, 0x97, 0x1b, 0x84, - 0x89, 0xcb, 0x88, 0xc7, 0xc4, 0x87, 0xbb, 0xe5, 0x55, 0xc9, 0xd7, 0xc8, 0xab, 0x9e, 0x42, 0x3e, - 0xa8, 0x5d, 0x9b, 0xa4, 0x89, 0x8d, 0x50, 0x5a, 0x9a, 0x1f, 0x6d, 0x9d, 0x56, 0x9b, 0x9e, 0xf1, - 0xab, 0xdb, 0x9c, 0xd9, 0x17, 0x57, 0x85, 0xa2, 0x55, 0x90, 0x39, 0xb0, 0x81, 0x0f, 0x55, 0x71, - 0xe7, 0x04, 0x65, 0x79, 0xaf, 0x8a, 0x3e, 0xc1, 0xe6, 0xd7, 0xf1, 0xe1, 0x63, 0x3e, 0x2b, 0xea, - 0xf3, 0x3d, 0x83, 0xe8, 0xe1, 0xd7, 0x0c, 0xa2, 0x31, 0x9c, 0x77, 0xb0, 0x65, 0x30, 0xec, 0x6e, - 0xa5, 0x73, 0x11, 0x80, 0xf5, 0x57, 0x39, 0x17, 0x40, 0x5d, 0xe6, 0xd0, 0x06, 0xe4, 0x44, 0x81, - 0x9e, 0x60, 0xd7, 0xb1, 0x2d, 0x17, 0xfb, 0x45, 0xf9, 0x6e, 0xf2, 0x59, 0xb3, 0x9b, 0x4d, 0xcd, - 0x32, 0x94, 0xac, 0xc7, 0xa3, 0xf8, 0x2c, 0x0c, 0xc6, 0xdf, 0x2d, 0x37, 0x4f, 0x97, 0x7a, 0x31, - 0xd8, 0x19, 0x30, 0x82, 0x47, 0x11, 0x2c, 0xe8, 0x7d, 0x40, 0x62, 0x37, 0x3c, 0xed, 0xd2, 0x74, - 0x1d, 0x3b, 0x54, 0x04, 0x64, 0x97, 0xbb, 0xa5, 0x8c, 0xcc, 0xac, 0x4a, 0x2c, 0x13, 0xab, 0x70, - 0x52, 0x45, 0xbc, 0x4c, 0x38, 0x82, 0x76, 0x60, 0xd2, 0xdf, 0x19, 0xc7, 0x14, 0xdb, 0x13, 0xe1, - 0xd8, 0xc2, 0xa9, 0xa0, 0x62, 0x5f, 0x0a, 0x12, 0x08, 0x91, 0x31, 0xf4, 0x26, 0x8b, 0xb6, 0xd5, - 0x17, 0xa6, 0x65, 0xd8, 0x2f, 0x5c, 0x55, 0x3b, 0xd4, 0xcc, 0x86, 0xb6, 0x2b, 0xca, 0xbd, 0x29, - 0x05, 0x91, 0xa3, 0xa7, 0xde, 0x54, 0xc5, 0x9f, 0x41, 0xeb, 0x90, 0x21, 0x58, 0xc7, 0x5c, 0xa5, - 0xbc, 0xee, 0x47, 0x86, 0x9f, 0x50, 0xcc, 0x42, 0xbd, 0xda, 0x87, 0xc8, 0x13, 0x95, 0x31, 0x8f, - 0xc9, 0x1b, 0x74, 0xd1, 0x26, 0xe4, 0x04, 0x4a, 0xd8, 0x45, 0xc9, 0x72, 0x9c, 0xb8, 0xd3, 0x13, - 0x04, 0x3e, 0x52, 0xd6, 0x63, 0x0c, 0xda, 0x26, 0x68, 0x0f, 0x0a, 0x5e, 0x73, 0xc9, 0x6b, 0x7b, - 0xa9, 0xa6, 0x65, 0x52, 0x93, 0xdd, 0xbf, 0x6d, 0x46, 0x95, 0x3b, 0xd3, 0xa8, 0x2e, 0xf2, 0x4e, - 0x94, 0x07, 0x52, 0xf3, 0x31, 0x22, 0xb6, 0x45, 0xe0, 0x22, 0xc1, 0x9f, 0x62, 0x9d, 0x8a, 0xdb, - 0xb3, 0xe3, 0x26, 0xc3, 0xae, 0x3c, 0x3e, 0x3f, 0x70, 0x76, 0x35, 0x29, 0x7b, 0x52, 0x1d, 0xfd, - 0x4a, 0x4a, 0xe7, 0xb2, 0x05, 0xe1, 0x1c, 0xf2, 0x3e, 0x6a, 0xa5, 0xa3, 0xb5, 0x82, 0x5d, 0xb4, - 0x05, 0x17, 0xda, 0xd6, 0x6c, 0xef, 0xb2, 0x60, 0x57, 0x46, 0xf3, 0x03, 0xc5, 0xb1, 0x6a, 0xe6, - 0xa4, 0x3a, 0xf2, 0x95, 0x94, 0xca, 0x65, 0x0b, 0x5e, 0xfb, 0x64, 0x36, 0x02, 0x19, 0x6d, 0xbb, - 0x60, 0x96, 0x72, 0x4f, 0x06, 0x88, 0xd1, 0x5c, 0x63, 0x82, 0xe7, 0x1a, 0x02, 0xa8, 0xe0, 0x57, - 0xe8, 0x26, 0x7c, 0xda, 0x68, 0xb2, 0xb1, 0x0e, 0x39, 0xcf, 0xc9, 0x44, 0x8e, 0x77, 0xf2, 0xcc, - 0xe3, 0xcd, 0x70, 0xc7, 0x13, 0x1e, 0xa7, 0x0d, 0xc1, 0x2e, 0x23, 0x47, 0x49, 0x34, 0xab, 0x8e, - 0x5d, 0x79, 0x8a, 0xeb, 0xc2, 0x5b, 0x3d, 0xf5, 0x5a, 0x11, 0x9c, 0xfe, 0x79, 0x29, 0x9c, 0x6d, - 0xc3, 0xa2, 0xe4, 0x98, 0x17, 0xec, 0xbb, 0x4c, 0x06, 0xbe, 0x91, 0x9d, 0xa3, 0xbe, 0xcf, 0xc6, - 0x42, 0xdf, 0x38, 0x1d, 0xfa, 0xc6, 0x8a, 0x41, 0xd6, 0xf8, 0xac, 0xe7, 0x1b, 0xf3, 0xff, 0x2d, - 0xc1, 0x48, 0xd4, 0x64, 0xde, 0x87, 0xa0, 0x6c, 0x19, 0xd6, 0x83, 0x86, 0xc4, 0xeb, 0x77, 0x4a, - 0xfe, 0x81, 0x5f, 0xea, 0x88, 0x5c, 0x51, 0x39, 0x9f, 0x3d, 0x28, 0x83, 0xfc, 0x7f, 0x48, 0x91, - 0x23, 0x11, 0xbf, 0x0f, 0xf7, 0xdb, 0x90, 0x1a, 0x26, 0xde, 0x10, 0x5a, 0x86, 0x61, 0x7d, 0x4f, - 0x6d, 0x98, 0xae, 0xdf, 0xd5, 0x9c, 0x8e, 0x5d, 0x6d, 0x77, 0x1f, 0x98, 0x2e, 0x55, 0x86, 0xf4, - 0x3d, 0xf6, 0xd7, 0xeb, 0x33, 0x46, 0x8b, 0x92, 0x9b, 0xc9, 0x54, 0x32, 0x37, 0xb8, 0x99, 0x4c, - 0x0d, 0xe6, 0x86, 0x36, 0x93, 0xa9, 0x74, 0x0e, 0x36, 0x93, 0x29, 0xc8, 0x8d, 0xe4, 0xff, 0x6a, - 0x00, 0x20, 0xe2, 0x85, 0x2e, 0xc3, 0xb0, 0xe3, 0x15, 0x7c, 0xf8, 0x75, 0x3f, 0xca, 0x6b, 0xb9, - 0x9f, 0x25, 0x73, 0xe3, 0xf2, 0x1b, 0x8a, 0x3f, 0x83, 0xee, 0xc1, 0xb0, 0xef, 0x9d, 0x12, 0xfd, - 0x7b, 0xa7, 0xc8, 0xf9, 0xf8, 0xec, 0xaf, 0xd3, 0x93, 0x5e, 0x85, 0xac, 0x6e, 0x13, 0x82, 0x1b, - 0xde, 0x7d, 0x63, 0x1a, 0xae, 0x9c, 0xe4, 0x65, 0xc3, 0xd1, 0x93, 0x6a, 0xfa, 0x2b, 0x69, 0xa8, - 0x90, 0x24, 0x09, 0xd9, 0x50, 0x32, 0x11, 0xa2, 0x9a, 0xe1, 0xb6, 0x75, 0xd8, 0x07, 0xbf, 0xe5, - 0x0e, 0xfb, 0x36, 0x0c, 0x59, 0x98, 0xaa, 0xa6, 0xc1, 0x95, 0x65, 0xb4, 0xfa, 0x8e, 0x40, 0x5e, - 0x7d, 0x55, 0xe4, 0x47, 0x98, 0xd6, 0xd6, 0x95, 0x41, 0x0b, 0xd3, 0x9a, 0x91, 0xff, 0x95, 0x04, - 0x63, 0x6d, 0x7a, 0xde, 0xab, 0x82, 0x2e, 0x7d, 0x47, 0x15, 0xf4, 0xc4, 0x6b, 0x56, 0xd0, 0xf3, - 0x1f, 0x41, 0xa6, 0xc3, 0x50, 0xef, 0xc1, 0x90, 0x70, 0x03, 0x12, 0x77, 0x03, 0x57, 0x7b, 0x2a, - 0x50, 0x1b, 0x63, 0xa4, 0x0d, 0x25, 0xf8, 0xf3, 0x04, 0xe6, 0x4e, 0xf1, 0x14, 0x28, 0x07, 0x03, - 0x07, 0x58, 0x74, 0x34, 0x14, 0xf6, 0x88, 0xde, 0xf1, 0xfb, 0xed, 0x9e, 0xea, 0x5e, 0xeb, 0x6f, - 0x65, 0xd7, 0x6f, 0xcc, 0x27, 0x7e, 0x20, 0x15, 0xfe, 0x49, 0x82, 0xb9, 0xa0, 0x62, 0x5f, 0x69, - 0xd1, 0x7d, 0x6c, 0x51, 0x11, 0xaf, 0xac, 0xd9, 0x06, 0x46, 0x4b, 0xd1, 0x96, 0x7e, 0xba, 0x3a, - 0x73, 0x52, 0x9d, 0x24, 0xa8, 0x9c, 0xfb, 0xe4, 0x59, 0x65, 0xe9, 0xa3, 0x37, 0x97, 0x6e, 0x3d, - 0xff, 0x7c, 0xe5, 0xc6, 0xcd, 0xf2, 0xcb, 0x05, 0x01, 0x89, 0x6e, 0x01, 0xf0, 0x0f, 0x7e, 0xd4, - 0x3d, 0x62, 0x37, 0xc5, 0xb6, 0x4e, 0xfd, 0x6c, 0x81, 0x53, 0xdf, 0x25, 0x76, 0x13, 0xad, 0x42, - 0xca, 0x63, 0xa5, 0xb6, 0xb0, 0xa1, 0xd3, 0x18, 0x87, 0x39, 0xed, 0xb6, 0x5d, 0xf8, 0xcb, 0x0b, - 0x90, 0x0e, 0x5e, 0x00, 0xbd, 0x1b, 0x6d, 0x4d, 0x2c, 0xf4, 0x6c, 0x4d, 0x9c, 0xd2, 0x93, 0xb8, - 0x05, 0xa0, 0x13, 0xac, 0x89, 0x0f, 0x2f, 0xfa, 0x78, 0x03, 0x41, 0x5d, 0x61, 0x1e, 0x00, 0x5a, - 0x8e, 0xe1, 0xb3, 0x9e, 0xfd, 0x0e, 0x69, 0x41, 0x5d, 0xa1, 0x68, 0x0e, 0x92, 0x96, 0xd6, 0xc4, - 0xed, 0x7d, 0x85, 0xb2, 0xc2, 0x07, 0xd1, 0x75, 0x18, 0x31, 0xb0, 0xab, 0x13, 0xd3, 0x61, 0x62, - 0xe1, 0xa6, 0xee, 0x75, 0x14, 0xc8, 0x80, 0xfc, 0xeb, 0xac, 0x12, 0x9d, 0x44, 0x5f, 0x4a, 0x00, - 0x1a, 0xa5, 0xc4, 0xdc, 0x6d, 0x51, 0xcc, 0x3c, 0x3d, 0x53, 0xc9, 0xc5, 0x9e, 0x07, 0x51, 0xaa, - 0x04, 0xb4, 0x5c, 0xc9, 0xaa, 0xab, 0x27, 0xd5, 0xf2, 0xcf, 0xa5, 0xe5, 0x1c, 0x14, 0x16, 0x48, - 0x41, 0x5e, 0x28, 0x5f, 0xfc, 0xe4, 0x99, 0xb6, 0xf4, 0x19, 0x93, 0x74, 0xf1, 0xce, 0xed, 0x67, - 0x4b, 0xcf, 0xef, 0xf8, 0x3f, 0x17, 0x3f, 0x2f, 0xdf, 0x78, 0xb9, 0x70, 0x9d, 0xed, 0xe1, 0x6b, - 0x49, 0x89, 0xac, 0x89, 0x1e, 0xc0, 0x88, 0xc8, 0x3a, 0xb8, 0x27, 0x1b, 0x7e, 0xe5, 0x36, 0x91, - 0x02, 0x87, 0xfe, 0x18, 0xf3, 0x8d, 0xc8, 0xc5, 0x84, 0x27, 0x44, 0x0e, 0xb1, 0xf7, 0xcc, 0x06, - 0x66, 0x4e, 0x29, 0xd5, 0xde, 0x7f, 0xc9, 0x09, 0x92, 0x2d, 0x8f, 0xa2, 0x66, 0xa0, 0x7f, 0x91, - 0x60, 0xda, 0x0f, 0xb1, 0xd8, 0x24, 0x26, 0xdc, 0x4f, 0x62, 0xd7, 0xe5, 0x95, 0xcf, 0x74, 0xf5, - 0xcf, 0xa4, 0x93, 0xea, 0xcf, 0x24, 0xf2, 0xc7, 0x52, 0xf9, 0x0f, 0xa5, 0x4f, 0x8a, 0x77, 0x6e, - 0xb3, 0xd7, 0xd3, 0x96, 0x3e, 0x13, 0x6a, 0xfd, 0x45, 0xe4, 0x39, 0x7c, 0xfc, 0x78, 0xe9, 0xf9, - 0xf5, 0xc8, 0xc4, 0xe2, 0xc7, 0xa5, 0xc5, 0xeb, 0x8c, 0xaf, 0xb2, 0xf4, 0x91, 0x38, 0x95, 0x2f, - 0x22, 0xcf, 0xe1, 0x23, 0xe7, 0x0b, 0x27, 0x16, 0x8b, 0x77, 0x6e, 0xdf, 0x7e, 0x26, 0xac, 0x67, - 0xf5, 0xe5, 0xe2, 0x9d, 0x85, 0x2f, 0x3e, 0x59, 0x50, 0x26, 0xc5, 0x76, 0x1f, 0xf3, 0xdd, 0x56, - 0xbc, 0xcd, 0xa2, 0x0a, 0xc8, 0x1d, 0xaf, 0x71, 0x80, 0x0f, 0xd4, 0x86, 0xb6, 0x8b, 0x1b, 0xf2, - 0x72, 0x54, 0x11, 0xbe, 0xcc, 0x29, 0x53, 0x6d, 0x08, 0xf7, 0xf1, 0xc1, 0x03, 0x46, 0x86, 0xfe, - 0x55, 0x82, 0x7c, 0x34, 0x9d, 0xe9, 0x38, 0x0e, 0xf8, 0xfd, 0x3c, 0x0e, 0x39, 0xb2, 0xe5, 0xf6, - 0x23, 0xa9, 0xc1, 0xf9, 0x2e, 0xaf, 0x13, 0x1e, 0xcb, 0x9b, 0x1d, 0xc7, 0x32, 0x1b, 0x43, 0x0a, - 0x8e, 0xe6, 0x6d, 0x98, 0xea, 0x02, 0x65, 0x1a, 0xf2, 0x4a, 0x54, 0xbf, 0x0c, 0x65, 0x22, 0x06, - 0x51, 0x33, 0xd0, 0xaf, 0x24, 0x98, 0xe0, 0xe9, 0x4d, 0xc7, 0x81, 0x8e, 0xfc, 0x7e, 0x1e, 0xe8, - 0x38, 0xdb, 0x6b, 0xfb, 0x49, 0x52, 0x48, 0x37, 0x6c, 0xef, 0xad, 0x5c, 0x79, 0x94, 0xbb, 0x8a, - 0x62, 0x6f, 0x57, 0xf1, 0xc0, 0x27, 0xf5, 0x3c, 0xc5, 0x8d, 0x93, 0xea, 0xe2, 0xcf, 0xa5, 0xab, - 0xfd, 0xf9, 0x09, 0x25, 0x5c, 0x08, 0xad, 0xc0, 0xb0, 0xf8, 0xae, 0x50, 0x2e, 0x73, 0xdf, 0x30, - 0x13, 0x4f, 0xd8, 0xf9, 0xb4, 0xe2, 0xd3, 0x75, 0x6d, 0x96, 0x8e, 0xf5, 0xdd, 0x2c, 0xcd, 0xf4, - 0x68, 0x96, 0xc6, 0x8a, 0x24, 0xd9, 0x6f, 0xbf, 0xf9, 0x9c, 0xfb, 0x0e, 0x9a, 0xcf, 0xe3, 0x67, - 0x34, 0x9f, 0x63, 0x7d, 0x5b, 0xd4, 0x4f, 0xdf, 0x76, 0xa2, 0x9f, 0xbe, 0xed, 0x64, 0xdf, 0x7d, - 0xdb, 0xa9, 0x1e, 0x7d, 0xdb, 0x55, 0x48, 0x13, 0xdb, 0xa6, 0x2a, 0x8f, 0x95, 0xbd, 0xa2, 0xb4, - 0x1c, 0x4b, 0x1f, 0x6c, 0x9b, 0xb2, 0x40, 0x59, 0x49, 0x11, 0xf1, 0x84, 0xb6, 0x82, 0x78, 0x74, - 0x86, 0xc7, 0xa3, 0xb7, 0x5e, 0x37, 0x16, 0x45, 0x3f, 0x84, 0xd1, 0xb6, 0x26, 0xb9, 0x7c, 0x76, - 0x93, 0x7c, 0xa4, 0x19, 0xe9, 0x8e, 0xaf, 0x42, 0x9a, 0xf3, 0xb3, 0x00, 0x4b, 0x34, 0x2f, 0xe5, - 0x5e, 0x01, 0x98, 0x92, 0x62, 0x9c, 0xbc, 0x1e, 0xb9, 0x0e, 0xe3, 0x7e, 0x6d, 0x24, 0x64, 0xbf, - 0x71, 0x06, 0xbb, 0x5f, 0xb4, 0x79, 0xe8, 0xa3, 0xac, 0xc0, 0xb0, 0xeb, 0x25, 0x14, 0x72, 0xbe, - 0xbb, 0x0d, 0x89, 0x7c, 0x43, 0xf1, 0xe9, 0xd0, 0xbb, 0xe0, 0xa3, 0xa8, 0x3e, 0xeb, 0xdc, 0xe9, - 0xac, 0x19, 0x41, 0xef, 0x7f, 0xd1, 0xbb, 0x00, 0x99, 0xa0, 0x5c, 0xc7, 0xa5, 0xcc, 0xeb, 0xd4, - 0x63, 0xca, 0xa8, 0x28, 0xd2, 0x71, 0x09, 0xa3, 0xab, 0x90, 0x6d, 0xb9, 0xd8, 0x08, 0xa9, 0x5c, - 0xf9, 0x02, 0x4b, 0xfb, 0x95, 0x31, 0x36, 0xec, 0x93, 0xb9, 0x8c, 0x8e, 0xa3, 0x85, 0x4a, 0xc3, - 0x0b, 0xc9, 0xe2, 0xcb, 0xd9, 0x40, 0x63, 0xd0, 0x15, 0x41, 0x47, 0x3e, 0x15, 0x0d, 0xa9, 0x37, - 0x79, 0x69, 0x58, 0x2c, 0xab, 0x7c, 0xca, 0x1b, 0x4d, 0x6f, 0xc6, 0xc9, 0x56, 0xe4, 0xf9, 0x18, - 0xd9, 0x0a, 0xfa, 0x00, 0xe6, 0x3a, 0x4b, 0x8e, 0x04, 0xeb, 0xd8, 0x3c, 0xf4, 0x82, 0xb6, 0x37, - 0xfa, 0x2b, 0x66, 0x06, 0x15, 0x49, 0x45, 0xf0, 0x56, 0x28, 0xda, 0x80, 0x11, 0xaf, 0xd8, 0xe1, - 0x89, 0xb4, 0xd0, 0xc3, 0xf0, 0x19, 0x09, 0x97, 0x61, 0xc4, 0xf0, 0xc1, 0x09, 0x46, 0xd1, 0x33, - 0x40, 0xbb, 0xfc, 0xfb, 0x83, 0x63, 0xd5, 0xc1, 0x44, 0xc7, 0x16, 0xd5, 0xea, 0x58, 0xbe, 0x7c, - 0x66, 0x4b, 0x91, 0x57, 0x6a, 0x00, 0x2e, 0x9c, 0x3b, 0xf7, 0xe5, 0x9d, 0xa5, 0x73, 0xe7, 0xce, - 0x9d, 0x53, 0xc6, 0x05, 0xce, 0x56, 0x00, 0x83, 0xae, 0x41, 0x36, 0xa8, 0x06, 0x88, 0x66, 0xe5, - 0xc2, 0xbc, 0x54, 0x1c, 0x54, 0x32, 0xfe, 0xb0, 0x68, 0x4a, 0x9e, 0xf5, 0x0d, 0x71, 0xf1, 0x5b, - 0xf9, 0x86, 0x18, 0xdd, 0x03, 0x88, 0x7c, 0xbc, 0xb1, 0xf8, 0x6a, 0x1f, 0x6f, 0x28, 0x11, 0x5e, - 0xf4, 0x3e, 0x64, 0x1c, 0x62, 0x1f, 0x9a, 0x4c, 0x51, 0xbd, 0x2b, 0xfc, 0x3a, 0xf7, 0x92, 0xd7, - 0x4f, 0xaa, 0xd7, 0xc8, 0x15, 0x79, 0xa1, 0xfc, 0xc6, 0xe9, 0x17, 0x14, 0xbb, 0x21, 0xc7, 0x22, - 0x08, 0x35, 0x83, 0x5b, 0xaa, 0x3f, 0xc0, 0xac, 0x86, 0xe5, 0x92, 0xf2, 0xf7, 0x84, 0xc9, 0x74, - 0x0a, 0xe2, 0x31, 0xff, 0x87, 0x00, 0x25, 0x17, 0xe5, 0x60, 0x59, 0x17, 0x3a, 0x0f, 0xe9, 0x66, - 0xab, 0xc1, 0x72, 0x2a, 0x97, 0xca, 0x4b, 0xdc, 0x29, 0x86, 0x03, 0xa8, 0x0e, 0xb3, 0x7a, 0x43, - 0x33, 0x9b, 0xaa, 0xd6, 0x96, 0x7a, 0xa9, 0xba, 0x6d, 0x60, 0xb9, 0x74, 0x46, 0xe4, 0x1c, 0x4f, - 0xd7, 0x78, 0x4f, 0xc4, 0x6c, 0x76, 0xc9, 0xe3, 0x4a, 0x30, 0xe1, 0x1e, 0x98, 0x8e, 0x2a, 0xea, - 0x1e, 0xaa, 0x4e, 0x8e, 0x1d, 0x6a, 0xcb, 0x37, 0xf9, 0x86, 0xc6, 0xd9, 0x94, 0x38, 0xdf, 0x35, - 0x3e, 0x81, 0x9e, 0xc1, 0xf9, 0x2e, 0xf4, 0xaa, 0x7d, 0x88, 0x09, 0x31, 0x0d, 0x2c, 0xbf, 0xd5, - 0xc3, 0x50, 0xc2, 0x36, 0xf5, 0x6c, 0x0c, 0xf4, 0x3d, 0xc1, 0x8c, 0xde, 0x81, 0x51, 0x4d, 0xa7, - 0xe6, 0xa1, 0x9f, 0x2a, 0xad, 0x9e, 0x69, 0x75, 0x23, 0x01, 0x7d, 0x85, 0xe6, 0xdf, 0x81, 0x6c, - 0x47, 0xda, 0x12, 0xcd, 0x8d, 0xd3, 0x5e, 0x6e, 0x3c, 0x19, 0xcd, 0x8d, 0xd3, 0x91, 0x94, 0x37, - 0xbf, 0x03, 0x99, 0xf6, 0x50, 0xa6, 0x0b, 0x77, 0xa9, 0x3d, 0xb3, 0x8e, 0x79, 0x66, 0x1f, 0x20, - 0x82, 0xbb, 0x99, 0x4c, 0x5d, 0xc9, 0x5d, 0xdd, 0x4c, 0xa6, 0xae, 0xe6, 0xae, 0x6d, 0x26, 0x53, - 0xd7, 0x72, 0xc5, 0xc2, 0x3d, 0x80, 0x40, 0x58, 0x2e, 0xba, 0x0d, 0x23, 0xe1, 0x7f, 0xd8, 0xf8, - 0xd5, 0x82, 0xd9, 0x9e, 0xd2, 0x55, 0x00, 0x07, 0xbc, 0x85, 0x3f, 0x80, 0x31, 0x51, 0xa2, 0xd9, - 0x22, 0x78, 0xcf, 0x3c, 0x42, 0x3b, 0x91, 0xda, 0x8f, 0x57, 0xdd, 0x7a, 0xfb, 0x5b, 0xa9, 0xfb, - 0x4c, 0xc3, 0x50, 0x03, 0x5b, 0x75, 0xba, 0xcf, 0xdf, 0x7c, 0x4c, 0x11, 0xbf, 0x0a, 0x1f, 0xc3, - 0xf4, 0x1a, 0x4f, 0x74, 0xc3, 0xfd, 0x89, 0xba, 0x57, 0x15, 0x20, 0x7c, 0xad, 0xe0, 0x83, 0xa8, - 0x5e, 0x6f, 0x15, 0x49, 0xb7, 0xd3, 0xc1, 0xfb, 0x15, 0xfe, 0x42, 0x82, 0xe9, 0x27, 0x3c, 0x19, - 0xfe, 0x2e, 0xe0, 0x59, 0x62, 0x1e, 0xfe, 0x4b, 0x4f, 0xcf, 0x9c, 0xfe, 0x2e, 0x23, 0x79, 0xa8, - 0xb9, 0x07, 0x4a, 0x7a, 0xcf, 0x7f, 0x2c, 0xfc, 0xb5, 0x04, 0x13, 0x3f, 0xc2, 0x34, 0xb6, 0xad, - 0x6d, 0xc8, 0x84, 0xdb, 0x52, 0xbf, 0x79, 0xcd, 0x61, 0x14, 0x87, 0xf3, 0xee, 0xeb, 0x6c, 0xf4, - 0xdf, 0x24, 0xb8, 0x12, 0xdd, 0x68, 0x64, 0xb9, 0xbb, 0x36, 0xd9, 0x78, 0x52, 0x73, 0xfd, 0xad, - 0x7f, 0x00, 0x29, 0x7e, 0xe7, 0xe2, 0x96, 0x29, 0x54, 0xe7, 0x1b, 0x17, 0xf7, 0x36, 0x9e, 0xd4, - 0xbe, 0xff, 0x96, 0x32, 0xcc, 0xe0, 0x36, 0x5a, 0x26, 0xda, 0x01, 0xa6, 0x47, 0x1c, 0x38, 0xf1, - 0x6d, 0x00, 0x0f, 0x19, 0xf8, 0x70, 0xa3, 0x65, 0x16, 0x4e, 0x12, 0x30, 0xf5, 0xc0, 0x74, 0xc3, - 0x97, 0x0b, 0xde, 0xe5, 0x3d, 0xc8, 0x46, 0x2f, 0xa8, 0x50, 0x0e, 0x57, 0x4f, 0xb9, 0x9a, 0xa2, - 0xa5, 0x86, 0x8c, 0x16, 0x1d, 0x7f, 0x1d, 0x09, 0xa0, 0x5f, 0x48, 0x30, 0x68, 0x13, 0x03, 0x13, - 0x5e, 0xfa, 0x49, 0x57, 0xff, 0x44, 0x3a, 0xa9, 0xfe, 0x91, 0x44, 0x7e, 0x2a, 0x29, 0xe7, 0x94, - 0x74, 0xa0, 0x28, 0x0a, 0x2c, 0x85, 0xcf, 0x81, 0x20, 0x94, 0xf4, 0x52, 0xf0, 0xe8, 0x9f, 0xa1, - 0x92, 0x5a, 0xf2, 0x9f, 0x78, 0x1d, 0x48, 0x19, 0x5c, 0xe2, 0x7f, 0xa2, 0xf5, 0x1e, 0x65, 0x74, - 0x29, 0xfa, 0x2b, 0x52, 0xba, 0x52, 0x46, 0x96, 0x22, 0x3f, 0xbc, 0x8d, 0xa1, 0x8b, 0x30, 0xe8, - 0xfd, 0x53, 0x0a, 0xff, 0xa7, 0x27, 0xae, 0x86, 0xd7, 0x07, 0xe4, 0xff, 0x1c, 0x56, 0xbc, 0x61, - 0x84, 0x20, 0xe9, 0xb0, 0x70, 0xc3, 0xfb, 0x67, 0x27, 0xfe, 0x5c, 0xf8, 0x73, 0x09, 0x26, 0x1e, - 0x77, 0xb1, 0x80, 0xdf, 0xb1, 0x61, 0xfe, 0xad, 0x04, 0x73, 0x0a, 0x4b, 0x2e, 0x2a, 0x96, 0xf1, - 0x7f, 0xc2, 0x40, 0xff, 0x51, 0x82, 0xf1, 0x60, 0xad, 0x6d, 0xdc, 0x74, 0x1a, 0x2c, 0xdc, 0xfb, - 0xdd, 0x9e, 0x22, 0x2a, 0xc2, 0x48, 0x53, 0x73, 0x78, 0x37, 0x9d, 0xdd, 0x80, 0x03, 0xed, 0x65, - 0x0f, 0x10, 0x73, 0xf7, 0xf1, 0x71, 0xe1, 0x1f, 0x24, 0x98, 0x89, 0x6d, 0xdf, 0x0b, 0xc6, 0x82, - 0xea, 0xa5, 0xd4, 0xce, 0xde, 0xb5, 0x7a, 0x99, 0x88, 0x56, 0x67, 0xbe, 0x96, 0xda, 0xab, 0x97, - 0xdb, 0x90, 0xe5, 0x15, 0x3e, 0x7c, 0x44, 0xb1, 0xe5, 0xf2, 0xb2, 0xc4, 0x00, 0x6f, 0x84, 0x7c, - 0xef, 0xa4, 0x5a, 0xfc, 0x4a, 0xba, 0x92, 0x33, 0x64, 0xa9, 0x70, 0x89, 0x5c, 0x28, 0xcf, 0x7d, - 0x52, 0xbc, 0x73, 0xfb, 0xe3, 0x92, 0x1f, 0xc3, 0x7d, 0xbe, 0x72, 0x63, 0xe5, 0xfb, 0x2f, 0x17, - 0x3f, 0x5f, 0xb9, 0x51, 0x7e, 0xb9, 0xa0, 0x64, 0x18, 0xc6, 0x46, 0x00, 0x51, 0xf8, 0x1f, 0x09, - 0xe4, 0x1e, 0x5b, 0x77, 0xd1, 0x4b, 0x18, 0xf6, 0xc2, 0x48, 0xff, 0x46, 0x5e, 0xed, 0x79, 0xfa, - 0x1d, 0xac, 0x25, 0xf1, 0xf7, 0x9b, 0x94, 0x43, 0xfc, 0x35, 0xf3, 0x3a, 0x8c, 0x46, 0x61, 0xba, - 0x84, 0x22, 0x67, 0x15, 0xf9, 0x7b, 0x6c, 0x2f, 0x5a, 0xe4, 0xff, 0x1c, 0x2e, 0xad, 0xd9, 0xd6, - 0x21, 0x26, 0x34, 0x46, 0xec, 0x9b, 0xcb, 0x3a, 0xa4, 0xbd, 0x2d, 0xb1, 0xd0, 0xd9, 0x93, 0xe3, - 0xb5, 0x93, 0x6a, 0x7f, 0x2f, 0x93, 0xf2, 0x38, 0x6b, 0x06, 0xf3, 0x1f, 0x3c, 0x4a, 0xe6, 0xde, - 0x5f, 0xe1, 0xcf, 0xd7, 0x9f, 0x00, 0x84, 0x49, 0x0f, 0x1a, 0x87, 0xb1, 0xad, 0xf7, 0x9e, 0x6e, - 0x28, 0xea, 0x93, 0x47, 0xf7, 0x1f, 0xbd, 0xf7, 0xf4, 0x51, 0xee, 0x5c, 0x38, 0x54, 0xad, 0x6c, - 0x6f, 0x6f, 0x28, 0x1f, 0xe6, 0x24, 0x84, 0x20, 0xe3, 0x0d, 0x6d, 0x7c, 0xb0, 0xbd, 0xa1, 0x3c, - 0xaa, 0x3c, 0xc8, 0x25, 0xf2, 0x63, 0xbf, 0xfd, 0xe5, 0x6c, 0x5a, 0x96, 0xae, 0x0f, 0xf2, 0x99, - 0xea, 0xea, 0x3f, 0xff, 0xc7, 0x45, 0xe9, 0xa3, 0xe5, 0x57, 0xb8, 0x58, 0xa8, 0xe5, 0xec, 0xee, - 0x0e, 0x71, 0x7b, 0xb8, 0xf9, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x5b, 0x7e, 0xfd, 0xdb, 0xff, - 0x3c, 0x00, 0x00, + 0x7a, 0xbf, 0x9b, 0xa2, 0x24, 0xf2, 0x93, 0x44, 0x52, 0xa5, 0x57, 0x8b, 0xf2, 0x43, 0xa6, 0x65, + 0x9b, 0xf2, 0x5a, 0xd4, 0x88, 0x1e, 0xed, 0x7f, 0xed, 0xf9, 0xcf, 0x7a, 0x48, 0x49, 0x5e, 0x4b, + 0x7e, 0x8c, 0xa6, 0x2d, 0xcb, 0x33, 0xe3, 0xf1, 0xf4, 0xb6, 0xba, 0x4b, 0x54, 0x8f, 0xc8, 0xee, + 0xde, 0xea, 0xa2, 0x2c, 0xcd, 0x8c, 0x91, 0xc1, 0x22, 0x41, 0x90, 0x05, 0x92, 0xc3, 0x20, 0x40, + 0x90, 0xbd, 0x64, 0x4f, 0x01, 0xb2, 0x87, 0x00, 0xb9, 0xe5, 0x10, 0x64, 0x73, 0x09, 0x32, 0x97, + 0x00, 0x7b, 0x4d, 0x0e, 0x7b, 0xc9, 0x25, 0xd8, 0x4b, 0xce, 0xd1, 0x21, 0x08, 0xaa, 0xba, 0xfa, + 0x41, 0x36, 0x29, 0x51, 0x63, 0x0f, 0x76, 0x73, 0x52, 0xb3, 0xea, 0xfb, 0x7e, 0x55, 0x5d, 0xdf, + 0xa3, 0xbe, 0x47, 0x0b, 0x0a, 0x75, 0x9b, 0x68, 0x2f, 0x35, 0x6b, 0xc1, 0xa5, 0x9a, 0xbe, 0xbf, + 0xa8, 0x39, 0xe6, 0x22, 0xb6, 0x0c, 0xd5, 0xc0, 0x07, 0xa6, 0x8e, 0x4b, 0x0e, 0xb1, 0xa9, 0x8d, + 0x32, 0x94, 0x5a, 0x25, 0x41, 0x57, 0x3a, 0xb8, 0x95, 0xaf, 0xd4, 0x4c, 0xba, 0xd7, 0xdc, 0x29, + 0xe9, 0x76, 0x63, 0x11, 0x5b, 0x07, 0xf6, 0x91, 0x43, 0xec, 0xc3, 0xa3, 0x45, 0x4e, 0xac, 0x2f, + 0xd4, 0xb0, 0xb5, 0x70, 0xa0, 0xd5, 0x4d, 0x43, 0xa3, 0x78, 0x31, 0xf6, 0xe0, 0x41, 0xe6, 0x17, + 0x22, 0x10, 0x35, 0xbb, 0x66, 0x7b, 0xcc, 0x3b, 0xcd, 0x5d, 0xfe, 0x8b, 0xff, 0xe0, 0x4f, 0x82, + 0x7c, 0x25, 0x42, 0xbe, 0xb5, 0x87, 0xb7, 0xf6, 0x4c, 0xab, 0xe6, 0xae, 0x5b, 0x46, 0xd3, 0xa5, + 0xc4, 0xc4, 0x6e, 0x74, 0xe9, 0x9a, 0xbd, 0xf0, 0x99, 0x6b, 0x5b, 0x8b, 0x9a, 0x65, 0xd9, 0x54, + 0xa3, 0xa6, 0x6d, 0xb9, 0x02, 0xe4, 0x62, 0xcd, 0xb6, 0x6b, 0x75, 0x1c, 0x2e, 0x65, 0x34, 0x09, + 0x27, 0x10, 0xf3, 0xb3, 0xed, 0xf3, 0xbb, 0x26, 0xae, 0x1b, 0x6a, 0x43, 0x73, 0xf7, 0x05, 0xc5, + 0xf9, 0x76, 0x0a, 0x97, 0x92, 0xa6, 0x4e, 0xc5, 0xec, 0xa5, 0xf6, 0x59, 0x6a, 0x36, 0xb0, 0x4b, + 0xb5, 0x86, 0xd3, 0x6d, 0x03, 0x2f, 0x89, 0xe6, 0x38, 0x98, 0xf8, 0x1b, 0xbc, 0x12, 0x97, 0x85, + 0x69, 0x60, 0x8b, 0x9a, 0xbb, 0x66, 0x48, 0x74, 0x3e, 0x4e, 0xb4, 0x8f, 0x8f, 0xfc, 0xd9, 0x4b, + 0xf1, 0x59, 0x5f, 0x70, 0xe2, 0x25, 0xe3, 0x04, 0x0d, 0xec, 0xba, 0x5a, 0x0d, 0x9f, 0x00, 0xe1, + 0x98, 0x3a, 0x6d, 0x12, 0x7c, 0x12, 0x04, 0xd5, 0x0c, 0x8d, 0x6a, 0x1e, 0x45, 0xe1, 0xbf, 0xfa, + 0x60, 0xf0, 0x09, 0x76, 0x5d, 0xd3, 0xb6, 0xd0, 0xc7, 0x90, 0x32, 0xf0, 0x81, 0xaa, 0x19, 0x06, + 0x91, 0x13, 0xb3, 0x52, 0x71, 0xb8, 0x7a, 0xf7, 0x9b, 0xdf, 0x5c, 0x3a, 0xf7, 0xef, 0xbf, 0xb9, + 0xf4, 0xff, 0x6a, 0x76, 0x89, 0xee, 0x61, 0xca, 0x85, 0x59, 0xb2, 0x30, 0x7d, 0x69, 0x93, 0xfd, + 0xc5, 0x56, 0xf0, 0x83, 0x5b, 0x8b, 0xce, 0x7e, 0x6d, 0x91, 0x1e, 0x39, 0xd8, 0x2d, 0xad, 0xe2, + 0x83, 0x8a, 0x61, 0x10, 0x65, 0xd0, 0xf0, 0x1e, 0xd0, 0x6d, 0x48, 0xb2, 0x77, 0x97, 0xfb, 0x66, + 0xa5, 0xe2, 0x50, 0x79, 0xa6, 0xd4, 0xaa, 0xa7, 0x25, 0xb1, 0x85, 0x07, 0xf8, 0xc8, 0xad, 0xa6, + 0x8e, 0xab, 0xfd, 0x3f, 0x93, 0x12, 0x39, 0x49, 0xe1, 0x2c, 0xe8, 0x32, 0x8c, 0xd4, 0x35, 0x97, + 0xaa, 0xbb, 0xaa, 0x6e, 0x51, 0xb5, 0xe9, 0xc8, 0xc9, 0x59, 0xa9, 0x38, 0xa2, 0x00, 0x1b, 0xbc, + 0xb7, 0x62, 0xd1, 0xa7, 0x0e, 0x2a, 0xc2, 0x28, 0x27, 0xb1, 0x04, 0x91, 0x61, 0xbf, 0xb4, 0xe4, + 0x7e, 0x4e, 0xc6, 0x79, 0x1f, 0x33, 0xba, 0x55, 0xfb, 0xa5, 0x15, 0x50, 0x6a, 0x51, 0xca, 0x81, + 0x90, 0xb2, 0x12, 0x50, 0x96, 0x60, 0x9c, 0x53, 0xea, 0xb6, 0xb5, 0x1b, 0x25, 0x1e, 0xe4, 0xc4, + 0x39, 0x36, 0xb7, 0x62, 0x5b, 0xbb, 0x01, 0xfd, 0x6d, 0x00, 0x97, 0x6a, 0x84, 0x62, 0x43, 0xd5, + 0xa8, 0x9c, 0xe2, 0xef, 0x99, 0x2f, 0x79, 0x7a, 0x54, 0xf2, 0xf5, 0xa8, 0xb4, 0xe5, 0x2b, 0x9a, + 0x92, 0x16, 0xd4, 0x15, 0x8a, 0x30, 0x9c, 0xff, 0x49, 0x13, 0x37, 0x19, 0xa7, 0xe3, 0xd4, 0x4d, + 0x9d, 0xab, 0x3a, 0x5f, 0xad, 0x6e, 0x5a, 0xfb, 0xae, 0x9c, 0x9e, 0xed, 0x2b, 0x0e, 0x95, 0xaf, + 0xb4, 0x1f, 0x5a, 0x25, 0x24, 0x5e, 0x15, 0xb4, 0x4a, 0xde, 0x03, 0xea, 0x30, 0xe5, 0x6e, 0x24, + 0x53, 0x52, 0x2e, 0x51, 0x98, 0x87, 0x74, 0xd5, 0xb6, 0xeb, 0xdb, 0x5a, 0xbd, 0x89, 0xd1, 0x38, + 0xf4, 0x1f, 0xb0, 0x07, 0x59, 0x9a, 0x95, 0x8a, 0x29, 0xc5, 0xfb, 0x71, 0x67, 0xe0, 0xb7, 0xbf, + 0x9c, 0x4e, 0xc8, 0x52, 0xe1, 0xef, 0xb2, 0x30, 0xf2, 0xa8, 0xb2, 0xb2, 0xa9, 0x11, 0xad, 0x81, + 0x29, 0x26, 0x2e, 0x9a, 0x86, 0x54, 0x43, 0x3b, 0x54, 0xb1, 0x49, 0x1c, 0xce, 0x92, 0x50, 0x06, + 0x1b, 0xda, 0xe1, 0x9a, 0x49, 0x1c, 0xb4, 0x0d, 0x63, 0x9a, 0x41, 0x54, 0xa6, 0x5b, 0x2a, 0xd1, + 0x28, 0x56, 0x4d, 0xcb, 0xc0, 0x87, 0x5c, 0x58, 0x99, 0xf2, 0x85, 0xf6, 0xbd, 0xaf, 0x6a, 0x54, + 0x53, 0x34, 0x8a, 0xd7, 0x19, 0x11, 0x17, 0xf9, 0x4f, 0xb9, 0xc8, 0x73, 0x9a, 0x41, 0x5a, 0xe6, + 0xd0, 0xdb, 0x80, 0x18, 0x2e, 0x3d, 0x54, 0x1d, 0xfb, 0x25, 0x26, 0x02, 0x96, 0x0b, 0xb7, 0x3a, + 0x78, 0x5c, 0x4d, 0xde, 0x48, 0xc8, 0x59, 0x25, 0xab, 0x19, 0x64, 0xeb, 0x70, 0x93, 0x11, 0x78, + 0x5c, 0xf3, 0x30, 0xcc, 0xb8, 0xac, 0x1d, 0x95, 0x12, 0xcd, 0x72, 0x3d, 0x11, 0x87, 0xf4, 0xa0, + 0x19, 0xe4, 0xf1, 0xce, 0x16, 0x9b, 0x42, 0xd7, 0x60, 0x84, 0x91, 0x6a, 0xfa, 0xbe, 0x5a, 0x37, + 0x1b, 0x26, 0xf5, 0x24, 0x5c, 0x4d, 0xc8, 0x92, 0x32, 0xa4, 0x19, 0xa4, 0xa2, 0xef, 0x3f, 0x64, + 0xc3, 0x51, 0x3a, 0x03, 0xd7, 0xb5, 0x23, 0x2e, 0xe3, 0x16, 0xba, 0x55, 0x36, 0x8c, 0x7e, 0x08, + 0x69, 0x72, 0xb8, 0x24, 0x68, 0xd2, 0xfc, 0xf5, 0xa7, 0xda, 0x5f, 0x5f, 0x39, 0xe4, 0xb4, 0x91, + 0x17, 0x4f, 0x91, 0xc3, 0x25, 0x8f, 0xff, 0x23, 0x18, 0xe7, 0xfc, 0xc1, 0x41, 0xda, 0xbb, 0xbb, + 0x2e, 0xa6, 0x32, 0x70, 0xa8, 0x8b, 0xdd, 0x4e, 0xf2, 0x7d, 0x4e, 0x15, 0x41, 0x1c, 0x65, 0x88, + 0x2d, 0x93, 0x4c, 0x46, 0xe4, 0xb0, 0x1c, 0x93, 0xd1, 0xd0, 0x19, 0x65, 0x44, 0x0e, 0xcb, 0xad, + 0x32, 0x2a, 0xc1, 0x08, 0xc3, 0xdd, 0x25, 0xf8, 0x27, 0x4d, 0x6c, 0xe9, 0x47, 0xf2, 0xf0, 0xac, + 0x54, 0x4c, 0x56, 0xd3, 0xc7, 0xd5, 0x81, 0x72, 0xb2, 0xf8, 0x8b, 0x3f, 0x1d, 0x50, 0x86, 0xc9, + 0x61, 0xf9, 0x9e, 0x3f, 0x8d, 0x9e, 0x40, 0x86, 0xa9, 0x91, 0xd1, 0xa4, 0x47, 0xaa, 0x7e, 0xa4, + 0xd7, 0xb1, 0x3c, 0xc2, 0xb7, 0x10, 0x57, 0xf1, 0x5a, 0x8d, 0xe0, 0x9a, 0x46, 0xb1, 0xb1, 0xda, + 0xa4, 0x47, 0x2b, 0x8c, 0x34, 0xb2, 0x91, 0xe1, 0x86, 0x76, 0x18, 0x8c, 0x23, 0x03, 0xa6, 0x08, + 0xfe, 0xcc, 0x36, 0x2d, 0x95, 0x79, 0x73, 0xd5, 0xc1, 0xc4, 0xb4, 0x0d, 0x53, 0x37, 0xe9, 0x91, + 0x9c, 0xe1, 0xe8, 0x85, 0x98, 0x14, 0x38, 0x39, 0x33, 0xc9, 0xb5, 0x43, 0xc7, 0xb6, 0xb0, 0x15, + 0x3d, 0xbe, 0x09, 0x12, 0xcc, 0x6e, 0x86, 0x50, 0xa8, 0x06, 0xb2, 0x58, 0x45, 0xb7, 0x9b, 0x16, + 0x6d, 0x59, 0x26, 0xdb, 0xf9, 0x25, 0xbc, 0x65, 0x56, 0x18, 0x79, 0x87, 0x75, 0x26, 0x49, 0x38, + 0x1d, 0x5d, 0xe8, 0x1d, 0x18, 0x73, 0x4c, 0xab, 0xa6, 0xba, 0x75, 0x9b, 0x46, 0x4e, 0x36, 0xc7, + 0x4f, 0x76, 0xe8, 0xb8, 0x9a, 0x2a, 0x0f, 0xc8, 0xe7, 0xf8, 0xd9, 0x8e, 0x32, 0xba, 0x27, 0x75, + 0x9b, 0x86, 0x07, 0xfc, 0x1c, 0xa6, 0x43, 0xe6, 0x76, 0x71, 0x8f, 0xf6, 0x22, 0x6e, 0xa6, 0xd6, + 0x13, 0x3e, 0x70, 0xab, 0xb4, 0xbf, 0x0f, 0xb9, 0x1d, 0xac, 0xe9, 0xb6, 0x15, 0xd9, 0x16, 0x8a, + 0x6f, 0x2b, 0xeb, 0x11, 0x85, 0x9b, 0x7a, 0x00, 0x29, 0x7d, 0x4f, 0xb3, 0x2c, 0x5c, 0x77, 0xe5, + 0x31, 0xee, 0xd2, 0xae, 0xb6, 0xef, 0xa1, 0xc5, 0xdb, 0x94, 0x56, 0x3c, 0x6a, 0x7e, 0x58, 0x5f, + 0x4b, 0x89, 0x94, 0xa4, 0x04, 0x00, 0x68, 0x0d, 0x46, 0x9b, 0x0e, 0xf3, 0x6b, 0xaa, 0xf1, 0x12, + 0xd7, 0xeb, 0x5c, 0xe6, 0xf2, 0x38, 0xf7, 0xba, 0xd3, 0xed, 0xa8, 0x81, 0xbf, 0x53, 0xb2, 0x1e, + 0xcf, 0x2a, 0x63, 0x61, 0x92, 0x45, 0xeb, 0x30, 0xe6, 0xfb, 0xd9, 0x28, 0xd0, 0xc4, 0x69, 0x40, + 0xa3, 0x3e, 0x57, 0x08, 0xf5, 0x02, 0x26, 0x5b, 0xfc, 0x88, 0x8a, 0x85, 0xb0, 0xe5, 0x49, 0x8e, + 0x56, 0x8c, 0x29, 0xf7, 0xaa, 0xe2, 0x3b, 0x17, 0x5f, 0x2f, 0x3c, 0xf0, 0xb1, 0x88, 0xdb, 0xf1, + 0x67, 0xa2, 0xf0, 0xdc, 0xb5, 0x84, 0xf0, 0x53, 0x27, 0xc1, 0x73, 0x9f, 0xd2, 0x11, 0xbe, 0x65, + 0x06, 0xd5, 0xe0, 0x52, 0x57, 0x8d, 0x51, 0xbd, 0x3b, 0x42, 0xe6, 0xeb, 0x14, 0x4e, 0xd4, 0x1b, + 0x6f, 0x85, 0x7c, 0x47, 0xc5, 0xe1, 0x73, 0xf9, 0x5f, 0x27, 0x60, 0x50, 0x08, 0x96, 0x69, 0x92, + 0x10, 0x62, 0xa8, 0x49, 0x52, 0x07, 0x4d, 0xf2, 0x88, 0x42, 0x4d, 0xfa, 0x01, 0xa0, 0x40, 0x6a, + 0x21, 0x67, 0xa2, 0xdd, 0xe9, 0x04, 0x42, 0x0a, 0x39, 0xb7, 0x61, 0xac, 0x61, 0x5a, 0x31, 0x93, + 0xe8, 0x3b, 0xa3, 0x07, 0x6c, 0x98, 0x56, 0xab, 0x4d, 0x30, 0x5c, 0xe6, 0xd1, 0x5e, 0xf3, 0xf6, + 0x63, 0x0e, 0xad, 0x05, 0xf7, 0x0a, 0x8c, 0x60, 0x4b, 0xdb, 0xa9, 0x63, 0xd5, 0x3b, 0x03, 0x7e, + 0xf1, 0xa5, 0x94, 0x61, 0x6f, 0xf0, 0x29, 0x1f, 0xdb, 0x48, 0xa6, 0x12, 0xb9, 0xbe, 0x8d, 0x64, + 0xaa, 0x2f, 0x97, 0x2c, 0x1c, 0xf7, 0x43, 0x6e, 0xcd, 0x32, 0x56, 0x79, 0x56, 0xb0, 0x8d, 0x09, + 0x8f, 0xec, 0x7e, 0x04, 0x7d, 0xa6, 0xe1, 0xf2, 0xa3, 0x1d, 0x2a, 0x7f, 0xaf, 0x7d, 0x37, 0xed, + 0xe4, 0xeb, 0x61, 0x24, 0x1b, 0x09, 0xc6, 0x18, 0x02, 0x7a, 0x04, 0x59, 0xc1, 0xa8, 0x1e, 0x78, + 0xc4, 0xfc, 0xd4, 0x33, 0xe5, 0x7c, 0x07, 0x4b, 0x16, 0x70, 0x91, 0xf7, 0xcb, 0x08, 0x02, 0x7f, + 0x5f, 0x5b, 0x30, 0xe6, 0xc3, 0x39, 0x7b, 0x47, 0x01, 0x64, 0x5f, 0x67, 0xc8, 0xcd, 0xfb, 0x1f, + 0xc5, 0x21, 0x47, 0x05, 0xc1, 0xe6, 0xde, 0x91, 0x8f, 0x7a, 0x0b, 0x46, 0x03, 0xa5, 0x50, 0x9d, + 0xba, 0x66, 0xa9, 0xa6, 0xc1, 0x25, 0x91, 0xe6, 0x01, 0x00, 0x49, 0xc8, 0xef, 0x29, 0xd9, 0x80, + 0x62, 0xb3, 0xae, 0x59, 0xeb, 0x06, 0x9a, 0x85, 0x01, 0x67, 0xcf, 0xa6, 0xb6, 0x2b, 0xf7, 0xcf, + 0xf6, 0x15, 0xd3, 0xbe, 0xcf, 0xc9, 0x81, 0x22, 0xc6, 0x51, 0x11, 0x72, 0x6e, 0xd3, 0x71, 0x6c, + 0x42, 0x5d, 0x55, 0xaf, 0x6b, 0xae, 0xab, 0xee, 0xf0, 0xb0, 0x22, 0xa5, 0x64, 0xfc, 0xf1, 0x15, + 0x36, 0x5c, 0xed, 0x40, 0xa9, 0xf3, 0xa0, 0xa2, 0x9d, 0x72, 0x05, 0x3d, 0x82, 0x71, 0x03, 0xef, + 0x6a, 0xcd, 0x3a, 0x55, 0x1b, 0x9a, 0xae, 0xba, 0x98, 0x52, 0x16, 0x62, 0x8b, 0xf0, 0x71, 0xa6, + 0xc3, 0xa1, 0x3e, 0x11, 0x24, 0x0a, 0x12, 0x8c, 0x8f, 0x34, 0xdd, 0x1f, 0x63, 0xda, 0xc2, 0xb4, + 0x3b, 0x34, 0x09, 0x16, 0x7e, 0x24, 0x95, 0xe1, 0x86, 0x19, 0x71, 0xc3, 0x8c, 0x48, 0x3b, 0x8c, + 0x10, 0x81, 0x20, 0xd2, 0x0e, 0x5b, 0x88, 0x82, 0x57, 0x60, 0xd7, 0x13, 0x8f, 0x11, 0x52, 0xca, + 0xb0, 0x3f, 0xb8, 0x61, 0x9b, 0x16, 0xba, 0x09, 0x88, 0x60, 0x17, 0x0b, 0x12, 0xd5, 0xb2, 0x2d, + 0x1d, 0xbb, 0xfc, 0xee, 0x4f, 0x29, 0x39, 0x6f, 0x86, 0xd1, 0x3d, 0xe6, 0xe3, 0x48, 0x03, 0x7f, + 0xcb, 0xea, 0xae, 0x4d, 0x1a, 0x1a, 0x65, 0x3e, 0x9e, 0x5f, 0xfc, 0x1d, 0x9c, 0xd7, 0x23, 0x2f, + 0xd3, 0xd9, 0xd4, 0x8e, 0xea, 0xb6, 0x66, 0xdc, 0x0b, 0xe8, 0x23, 0x0a, 0x39, 0x2a, 0xd0, 0xc2, + 0xc9, 0xc2, 0xbf, 0x8c, 0xc3, 0x50, 0xe4, 0x8c, 0x50, 0x05, 0xb2, 0x42, 0x52, 0xdc, 0xad, 0xdb, + 0x4d, 0x2a, 0x6c, 0x60, 0x3a, 0x16, 0x98, 0xaf, 0x8a, 0x0c, 0x53, 0x19, 0xe1, 0x1c, 0xd5, 0x2d, + 0x8f, 0x1e, 0x3d, 0x83, 0x89, 0xd0, 0x2f, 0x46, 0x2f, 0xfb, 0x04, 0x07, 0x8a, 0x5d, 0xf6, 0x9b, + 0xc2, 0xf3, 0x79, 0x57, 0xb9, 0x70, 0xb8, 0x4e, 0xcb, 0xa0, 0x77, 0xbf, 0x7f, 0x72, 0xd2, 0x15, + 0xdd, 0xd7, 0xb3, 0xab, 0xed, 0x72, 0x47, 0x3f, 0xee, 0x1c, 0x3d, 0x24, 0x39, 0x6e, 0x2c, 0x86, + 0x0c, 0xe4, 0x2e, 0x2e, 0xb7, 0x78, 0x40, 0xb1, 0xde, 0xe1, 0xce, 0x9f, 0xee, 0x09, 0x2c, 0x16, + 0x06, 0x04, 0x42, 0xd1, 0x03, 0xa1, 0xf4, 0xf7, 0x26, 0x94, 0x15, 0x5f, 0x28, 0xb7, 0xa3, 0x21, + 0xf6, 0x00, 0x67, 0x3e, 0xdf, 0x25, 0xc4, 0xf6, 0x36, 0x11, 0x46, 0xd7, 0x5b, 0x5d, 0xa2, 0xeb, + 0xc1, 0xce, 0xe2, 0x6c, 0x0d, 0xa0, 0xc5, 0xf1, 0xc4, 0x03, 0xeb, 0x0f, 0x3a, 0x07, 0xd6, 0xa9, + 0x9e, 0xc5, 0x18, 0x8f, 0xa9, 0x57, 0xda, 0x63, 0xea, 0x74, 0x4f, 0xc7, 0xdd, 0x1a, 0x68, 0xdf, + 0x83, 0xfc, 0xae, 0xa6, 0x53, 0x9b, 0x1c, 0xa9, 0x0e, 0x37, 0xc8, 0x00, 0xcf, 0xc4, 0xae, 0x0c, + 0xb3, 0x7d, 0xc5, 0x64, 0xe0, 0xe9, 0x7e, 0xac, 0xc8, 0x82, 0x76, 0x93, 0x93, 0xde, 0x0b, 0x29, + 0xd1, 0xe3, 0x58, 0xc0, 0x3e, 0xd4, 0x25, 0xe8, 0x88, 0x07, 0xec, 0x62, 0x5f, 0x2d, 0xb1, 0xfa, + 0x03, 0x98, 0x08, 0xdc, 0xcb, 0xad, 0xb2, 0xba, 0x63, 0x8a, 0xf4, 0x9e, 0x3b, 0x8f, 0x93, 0x03, + 0x2f, 0x9f, 0xef, 0x56, 0xb9, 0x6a, 0xf2, 0xfc, 0x1f, 0x95, 0x61, 0xb0, 0xe9, 0x62, 0x55, 0x33, + 0x88, 0xf0, 0x26, 0x27, 0xb0, 0x0f, 0x34, 0x5d, 0x5c, 0x31, 0x08, 0xba, 0x03, 0x2c, 0x05, 0x54, + 0x1b, 0x1a, 0xa9, 0x99, 0x16, 0xcf, 0x0f, 0x98, 0xbb, 0x6d, 0xd7, 0xbf, 0x7b, 0x75, 0x5b, 0x13, + 0x42, 0x4f, 0x6b, 0x06, 0x79, 0xc4, 0xa9, 0xd1, 0x3b, 0x30, 0x2c, 0xdc, 0x9e, 0xb7, 0xe7, 0xec, + 0x69, 0x8b, 0x82, 0x47, 0xce, 0x37, 0xfb, 0x01, 0x4c, 0xb9, 0x54, 0xa3, 0x4d, 0x37, 0x9e, 0xa5, + 0xe4, 0x4e, 0xb3, 0x82, 0x09, 0x8f, 0xb3, 0x3d, 0x25, 0xd9, 0x06, 0x59, 0x40, 0xc6, 0x53, 0x92, + 0x51, 0x61, 0x1c, 0xed, 0x98, 0x4f, 0xd7, 0x2d, 0x7a, 0xab, 0xec, 0x6d, 0x6f, 0xd2, 0xe3, 0x8e, + 0x65, 0x20, 0xf7, 0x61, 0xd4, 0xc0, 0xae, 0x49, 0xb0, 0xa1, 0x86, 0xd6, 0x86, 0x7a, 0xb0, 0xb6, + 0xac, 0x60, 0x53, 0x7c, 0xa3, 0xd3, 0xe1, 0x7c, 0x0b, 0x52, 0xbb, 0xf1, 0x8d, 0xf5, 0x6e, 0x7c, + 0x72, 0x04, 0xbb, 0xd5, 0x06, 0x7f, 0x0c, 0x33, 0xe1, 0x22, 0x71, 0x5b, 0x1c, 0xef, 0xd9, 0x16, + 0xa7, 0x82, 0x25, 0xda, 0x4c, 0x52, 0x81, 0x89, 0xe8, 0x0a, 0xa1, 0x69, 0x4e, 0xf4, 0x64, 0x9a, + 0x63, 0x21, 0x6e, 0x68, 0xa1, 0x2f, 0x60, 0xd2, 0xc7, 0x6c, 0xb3, 0xb0, 0xc9, 0x33, 0x5a, 0x98, + 0x0f, 0xff, 0x28, 0x6a, 0x68, 0x75, 0xb8, 0xe8, 0xc3, 0x77, 0x49, 0x4e, 0xa6, 0xce, 0x98, 0x9c, + 0xe4, 0x05, 0x5e, 0xa5, 0x43, 0x8e, 0xd2, 0x61, 0xb5, 0xb6, 0x5c, 0x45, 0x3e, 0x63, 0xae, 0xd2, + 0xba, 0x5a, 0x6b, 0xca, 0xb2, 0x0f, 0x97, 0xfd, 0xd5, 0xba, 0xdf, 0xa4, 0x33, 0x3d, 0x8b, 0xdd, + 0x57, 0xd1, 0xcd, 0x8e, 0x17, 0xea, 0x8b, 0x50, 0xbb, 0x3a, 0x5d, 0xac, 0xe7, 0x7b, 0xd2, 0x00, + 0xb9, 0x6d, 0x89, 0x50, 0x0d, 0x3e, 0x04, 0x7f, 0x4e, 0x8d, 0xdd, 0xb3, 0x17, 0x7a, 0xc2, 0xf6, + 0xd5, 0xa8, 0xda, 0x76, 0xdd, 0xae, 0x43, 0x2e, 0xaa, 0x60, 0xbc, 0x74, 0x77, 0x91, 0x23, 0x5e, + 0x8a, 0x1d, 0x0a, 0xcf, 0x02, 0xd6, 0xd6, 0x95, 0x4d, 0x0f, 0x32, 0x13, 0x6a, 0x14, 0x2f, 0xf1, + 0x3d, 0x83, 0x19, 0x3f, 0x9c, 0xd2, 0x83, 0xf2, 0xa4, 0x6a, 0x5a, 0x14, 0x93, 0x03, 0xad, 0x2e, + 0x5f, 0x3a, 0xcd, 0x7f, 0x4d, 0x79, 0xa1, 0xd5, 0x8a, 0x5f, 0x92, 0x5c, 0x17, 0x9c, 0x9d, 0x93, + 0xf9, 0xd9, 0x37, 0x95, 0xcc, 0x5f, 0x3e, 0x7b, 0x32, 0x5f, 0xf8, 0x9b, 0x49, 0x48, 0xb1, 0x48, + 0x92, 0x6a, 0x14, 0xa3, 0x6d, 0x40, 0x7a, 0x93, 0x10, 0xcc, 0x7c, 0x6b, 0x50, 0x9d, 0x10, 0x91, + 0xe4, 0x85, 0x13, 0x4b, 0x18, 0xd1, 0x70, 0x55, 0x40, 0x44, 0xaa, 0xa9, 0xdb, 0x2c, 0x22, 0x16, + 0x3a, 0x15, 0xe2, 0x26, 0xce, 0x88, 0xeb, 0xeb, 0x54, 0x88, 0x5b, 0x85, 0x61, 0xaf, 0x2b, 0xe4, + 0x65, 0x1f, 0x22, 0x9f, 0x9a, 0x68, 0x47, 0xf4, 0xb2, 0x95, 0x30, 0x95, 0x1a, 0xf2, 0x98, 0xf8, + 0x70, 0xa7, 0x4c, 0x2f, 0xf9, 0x1a, 0x99, 0xde, 0x33, 0xc8, 0x07, 0xd5, 0x74, 0x93, 0x34, 0xb0, + 0x11, 0xea, 0x8f, 0xe6, 0xc7, 0x7f, 0x27, 0x55, 0xcb, 0xa7, 0xfc, 0x7a, 0x3b, 0x67, 0xf6, 0x15, + 0xa8, 0x42, 0xd1, 0x32, 0xc8, 0x1c, 0xd8, 0xc0, 0x07, 0xaa, 0xb8, 0x05, 0x83, 0x46, 0x81, 0x57, + 0xd7, 0x1f, 0x63, 0xf3, 0xab, 0xf8, 0xe0, 0x09, 0x9f, 0x15, 0x1d, 0x83, 0xae, 0x61, 0xfd, 0xe0, + 0x6b, 0x86, 0xf5, 0x18, 0xce, 0x3b, 0xd8, 0x32, 0x18, 0x76, 0xa7, 0x62, 0xbe, 0x08, 0x09, 0x7b, + 0xab, 0xe5, 0x0b, 0xa0, 0x0e, 0x73, 0x68, 0x0d, 0x72, 0xa2, 0x65, 0x40, 0xb0, 0xeb, 0xd8, 0x96, + 0x8b, 0xfd, 0x36, 0x41, 0x27, 0xf9, 0xac, 0xd8, 0x8d, 0x86, 0x66, 0x19, 0x4a, 0xd6, 0xe3, 0x51, + 0x7c, 0x16, 0x06, 0xe3, 0xef, 0x96, 0x3b, 0x0c, 0x97, 0x7a, 0x51, 0xe1, 0x29, 0x30, 0x82, 0x47, + 0x11, 0x2c, 0xe8, 0x03, 0x40, 0x62, 0x37, 0x3c, 0x11, 0xd4, 0x74, 0x1d, 0x3b, 0x54, 0x84, 0x88, + 0x57, 0x3a, 0x25, 0xb1, 0xcc, 0xac, 0x4a, 0x2c, 0x37, 0xac, 0x70, 0x52, 0x45, 0xbc, 0x4c, 0x38, + 0x82, 0xb6, 0x61, 0xdc, 0xdf, 0x19, 0xc7, 0x14, 0xdb, 0x13, 0x01, 0xe2, 0xdc, 0x89, 0xa0, 0x62, + 0x5f, 0x0a, 0x12, 0x08, 0x91, 0x31, 0xf4, 0x16, 0x8b, 0xff, 0xd5, 0x97, 0xa6, 0x65, 0xd8, 0x2f, + 0x5d, 0x55, 0x3b, 0xd0, 0xcc, 0xba, 0xb6, 0x23, 0x0a, 0xd0, 0x29, 0x05, 0x91, 0xc3, 0x67, 0xde, + 0x54, 0xc5, 0x9f, 0x41, 0xab, 0x90, 0x21, 0x58, 0xc7, 0x5c, 0xa5, 0xbc, 0x7e, 0x4c, 0x86, 0x9f, + 0x50, 0xcc, 0x42, 0xbd, 0x6a, 0x8c, 0xc8, 0x5c, 0x95, 0x11, 0x8f, 0xc9, 0x1b, 0x74, 0xd1, 0x06, + 0xe4, 0x04, 0x4a, 0xd8, 0xd7, 0xc9, 0x72, 0x9c, 0xb8, 0x1b, 0x16, 0x04, 0x3e, 0x52, 0xd6, 0x63, + 0x0c, 0x1a, 0x39, 0x68, 0x17, 0x0a, 0x5e, 0xbb, 0xcb, 0x6b, 0xc4, 0xa9, 0xa6, 0x65, 0x52, 0x93, + 0x45, 0x04, 0x2d, 0x46, 0x95, 0x3b, 0xd5, 0xa8, 0x2e, 0xf2, 0xde, 0x98, 0x07, 0xb2, 0xee, 0x63, + 0x44, 0x6c, 0x8b, 0xc0, 0x45, 0x82, 0x3f, 0xc3, 0x3a, 0x15, 0xf7, 0x79, 0xdb, 0xdd, 0x8a, 0x5d, + 0x79, 0x74, 0xb6, 0xef, 0xf4, 0xfa, 0x56, 0xf6, 0xb8, 0x3a, 0xfc, 0xb5, 0x94, 0xce, 0x65, 0x0b, + 0xc2, 0x39, 0xe4, 0x7d, 0xd4, 0x4a, 0x5b, 0xb3, 0x07, 0xbb, 0x68, 0x13, 0x2e, 0xb4, 0xac, 0xd9, + 0xda, 0xf7, 0xc1, 0xae, 0x8c, 0x66, 0xfb, 0x8a, 0x23, 0xd5, 0xcc, 0x71, 0x75, 0xe8, 0x6b, 0x29, + 0x95, 0xcb, 0x16, 0xbc, 0x86, 0xce, 0x74, 0x04, 0x32, 0xda, 0x08, 0xc2, 0x2e, 0xaa, 0xc0, 0x78, + 0x80, 0x18, 0xcd, 0x7e, 0xc6, 0x78, 0xf6, 0x23, 0x80, 0x0a, 0x7e, 0xcd, 0x70, 0xcc, 0xa7, 0x8d, + 0xa6, 0x3f, 0xab, 0x90, 0xf3, 0x9c, 0x4c, 0xe4, 0x78, 0xc7, 0x4f, 0x3d, 0xde, 0x0c, 0x77, 0x3c, + 0xe1, 0x71, 0xda, 0x10, 0xec, 0x32, 0x72, 0x94, 0x44, 0xb3, 0x6a, 0xd8, 0x95, 0x27, 0xb8, 0x2e, + 0xbc, 0xdd, 0x55, 0xaf, 0x15, 0xc1, 0xe9, 0x9f, 0x97, 0xc2, 0xd9, 0xd6, 0x2c, 0x4a, 0x8e, 0x78, + 0x0b, 0xa1, 0xc3, 0x64, 0xe0, 0x1b, 0xd9, 0x39, 0xea, 0x7b, 0x6c, 0x2c, 0xf4, 0x8d, 0x93, 0xa1, + 0x6f, 0xac, 0x18, 0x64, 0x85, 0xcf, 0x7a, 0xbe, 0x31, 0xff, 0xdf, 0x12, 0x0c, 0x45, 0x4d, 0xe6, + 0x03, 0x08, 0x2e, 0xc8, 0xb0, 0x42, 0x35, 0x20, 0x5e, 0xbf, 0x5d, 0xf2, 0x0f, 0xfd, 0xe2, 0x4b, + 0xe4, 0x8a, 0xca, 0xf9, 0xec, 0x41, 0x61, 0xe6, 0xff, 0x43, 0x8a, 0x1c, 0x8a, 0x8c, 0x62, 0xb0, + 0xd7, 0x16, 0xd9, 0x20, 0xf1, 0x86, 0xd0, 0x22, 0x0c, 0xea, 0xbb, 0x6a, 0xdd, 0x74, 0xfd, 0x3e, + 0xeb, 0x64, 0xec, 0x6a, 0xbb, 0xf7, 0xd0, 0x74, 0xa9, 0x32, 0xa0, 0xef, 0xb2, 0xbf, 0x5e, 0xe7, + 0x33, 0x5a, 0x26, 0xdd, 0x48, 0xa6, 0x92, 0xb9, 0xfe, 0x8d, 0x64, 0xaa, 0x3f, 0x37, 0xb0, 0x91, + 0x4c, 0xa5, 0x73, 0xb0, 0x91, 0x4c, 0x41, 0x6e, 0x28, 0xff, 0x57, 0x7d, 0x00, 0x11, 0x2f, 0x74, + 0x05, 0x06, 0x1d, 0xaf, 0x04, 0xc5, 0xaf, 0xfb, 0x61, 0x5e, 0x5d, 0xfe, 0x3c, 0x99, 0x1b, 0x95, + 0x2f, 0x2b, 0xfe, 0x0c, 0xba, 0x0f, 0x83, 0xbe, 0x77, 0x4a, 0xf4, 0xee, 0x9d, 0x22, 0xe7, 0xe3, + 0xb3, 0xbf, 0x4e, 0x97, 0x7c, 0x19, 0xb2, 0xba, 0x4d, 0x08, 0xae, 0x7b, 0xf7, 0x8d, 0x69, 0xb8, + 0x72, 0x92, 0x17, 0x32, 0x87, 0x8f, 0xab, 0xe9, 0xaf, 0xa5, 0x81, 0x42, 0x92, 0x24, 0x64, 0x43, + 0xc9, 0x44, 0x88, 0xd6, 0x0d, 0xb7, 0xa5, 0xe7, 0xdf, 0xff, 0x86, 0x7b, 0xfe, 0x5b, 0x30, 0x60, + 0x61, 0xaa, 0x9a, 0x06, 0x57, 0x96, 0xe1, 0xea, 0xbb, 0x02, 0x79, 0xf9, 0xac, 0xc8, 0x8f, 0x31, + 0x5d, 0x5f, 0x55, 0xfa, 0x2d, 0x4c, 0xd7, 0x8d, 0xfc, 0xaf, 0x24, 0x18, 0x69, 0xd1, 0xf3, 0x6e, + 0x35, 0x7d, 0xe9, 0x3b, 0xaa, 0xe9, 0x27, 0x5e, 0xb3, 0xa6, 0x9f, 0xff, 0x18, 0x32, 0x6d, 0x86, + 0x7a, 0x1f, 0x06, 0x84, 0x1b, 0x90, 0xb8, 0x1b, 0xb8, 0xd6, 0x55, 0x81, 0x5a, 0x18, 0x23, 0x8d, + 0x31, 0xc1, 0x9f, 0x27, 0x30, 0x73, 0x82, 0xa7, 0x40, 0x39, 0xe8, 0xdb, 0xc7, 0xa2, 0xc7, 0xa2, + 0xb0, 0x47, 0xf4, 0xae, 0xff, 0x05, 0x80, 0xa7, 0xba, 0xd7, 0x7b, 0x5b, 0xd9, 0xf5, 0x3f, 0x15, + 0x48, 0xfc, 0x40, 0x2a, 0xfc, 0xa3, 0x04, 0x33, 0x41, 0x0f, 0xa1, 0xd2, 0xa4, 0x7b, 0xd8, 0xa2, + 0x22, 0x5e, 0x59, 0xb1, 0x0d, 0x8c, 0x16, 0xa2, 0x1f, 0x19, 0xa4, 0xab, 0x53, 0xc7, 0xd5, 0x71, + 0x82, 0xca, 0xb9, 0x4f, 0x9f, 0x57, 0x16, 0x3e, 0x7e, 0x6b, 0xe1, 0xf6, 0x8b, 0x2f, 0x96, 0x6e, + 0xde, 0x2a, 0xbf, 0x9a, 0x13, 0x90, 0xe8, 0x36, 0x00, 0xff, 0x04, 0x49, 0xdd, 0x25, 0x76, 0x43, + 0x6c, 0xeb, 0xc4, 0x0f, 0x29, 0x38, 0xf5, 0x3d, 0x62, 0x37, 0xd0, 0x32, 0xa4, 0x3c, 0x56, 0x6a, + 0x0b, 0x1b, 0x3a, 0x89, 0x71, 0x90, 0xd3, 0x6e, 0xd9, 0x85, 0xbf, 0xbc, 0x00, 0xe9, 0xe0, 0x05, + 0xd0, 0x7b, 0xd1, 0x66, 0xc9, 0x5c, 0xd7, 0x66, 0xc9, 0x09, 0x5d, 0x92, 0xdb, 0x00, 0x3a, 0xc1, + 0x9a, 0xf8, 0x14, 0xa4, 0x87, 0x37, 0x10, 0xd4, 0x15, 0xe6, 0x01, 0xa0, 0xe9, 0x18, 0x3e, 0xeb, + 0xe9, 0xef, 0x90, 0x16, 0xd4, 0x15, 0x8a, 0x66, 0x20, 0x69, 0x69, 0x0d, 0xdc, 0xda, 0xe9, 0x28, + 0x2b, 0x7c, 0x10, 0xdd, 0x80, 0x21, 0x03, 0xbb, 0x3a, 0x31, 0x1d, 0x26, 0x16, 0x6e, 0xea, 0x5e, + 0x8f, 0x83, 0xf4, 0xc9, 0xbf, 0xce, 0x2a, 0xd1, 0x49, 0xf4, 0x95, 0x04, 0xa0, 0x51, 0x4a, 0xcc, + 0x9d, 0x26, 0xc5, 0xcc, 0xd3, 0x33, 0x95, 0x9c, 0xef, 0x7a, 0x10, 0xa5, 0x4a, 0x40, 0xcb, 0x95, + 0xac, 0xba, 0x7c, 0x5c, 0x2d, 0xff, 0x5c, 0x5a, 0xcc, 0x41, 0x61, 0x8e, 0x14, 0xe4, 0xb9, 0xf2, + 0xc5, 0x4f, 0x9f, 0x6b, 0x0b, 0x9f, 0x33, 0x49, 0x17, 0xef, 0xde, 0x79, 0xbe, 0xf0, 0xe2, 0xae, + 0xff, 0x73, 0xfe, 0x8b, 0xf2, 0xcd, 0x57, 0x73, 0x37, 0xd8, 0x1e, 0xbe, 0x91, 0x94, 0xc8, 0x9a, + 0xe8, 0x21, 0x0c, 0x89, 0xac, 0x83, 0x7b, 0xb2, 0xc1, 0x33, 0x37, 0xae, 0x14, 0x38, 0xf0, 0xc7, + 0x98, 0x6f, 0x44, 0x2e, 0x26, 0x3c, 0x21, 0x72, 0x88, 0xbd, 0x6b, 0xd6, 0x31, 0x73, 0x4a, 0xa9, + 0xd6, 0x8e, 0x50, 0x4e, 0x90, 0x6c, 0x7a, 0x14, 0xeb, 0x06, 0xfa, 0x67, 0x09, 0x26, 0xfd, 0x10, + 0x8b, 0x4d, 0x62, 0xc2, 0xfd, 0x24, 0x76, 0x5d, 0x5e, 0x8b, 0x4d, 0x57, 0xff, 0x4c, 0x3a, 0xae, + 0xfe, 0x4c, 0x22, 0x7f, 0x2c, 0x95, 0xff, 0x50, 0xfa, 0xb4, 0x78, 0xf7, 0x0e, 0x7b, 0x3d, 0x6d, + 0xe1, 0x73, 0xa1, 0xd6, 0x5f, 0x46, 0x9e, 0xc3, 0xc7, 0x4f, 0x16, 0x5e, 0xdc, 0x88, 0x4c, 0xcc, + 0x7f, 0x52, 0x9a, 0xbf, 0xc1, 0xf8, 0x2a, 0x0b, 0x1f, 0x8b, 0x53, 0xf9, 0x32, 0xf2, 0x1c, 0x3e, + 0x72, 0xbe, 0x70, 0x62, 0xbe, 0x78, 0xf7, 0xce, 0x9d, 0xe7, 0xc2, 0x7a, 0x96, 0x5f, 0xcd, 0xdf, + 0x9d, 0xfb, 0xf2, 0xd3, 0x39, 0x65, 0x5c, 0x6c, 0xf7, 0x09, 0xdf, 0x6d, 0xc5, 0xdb, 0x2c, 0xaa, + 0x80, 0xdc, 0xf6, 0x1a, 0xfb, 0x78, 0x5f, 0xad, 0x6b, 0x3b, 0xb8, 0x2e, 0x2f, 0x46, 0x15, 0xe1, + 0xab, 0x9c, 0x32, 0xd1, 0x82, 0xf0, 0x00, 0xef, 0x3f, 0x64, 0x64, 0xe8, 0x5f, 0x25, 0xc8, 0x47, + 0xd3, 0x99, 0xb6, 0xe3, 0x80, 0xdf, 0xcf, 0xe3, 0x90, 0x23, 0x5b, 0x6e, 0x3d, 0x92, 0x75, 0x38, + 0xdf, 0xe1, 0x75, 0xc2, 0x63, 0x79, 0xab, 0xed, 0x58, 0xa6, 0x63, 0x48, 0xc1, 0xd1, 0xbc, 0x03, + 0x13, 0x1d, 0xa0, 0x4c, 0x43, 0x5e, 0x8a, 0xea, 0x97, 0xa1, 0x8c, 0xc5, 0x20, 0xd6, 0x0d, 0xf4, + 0x2b, 0x09, 0xc6, 0x78, 0x7a, 0xd3, 0x76, 0xa0, 0x43, 0xbf, 0x9f, 0x07, 0x3a, 0xca, 0xf6, 0xda, + 0x7a, 0x92, 0x14, 0xd2, 0x75, 0xdb, 0x7b, 0x2b, 0x57, 0x1e, 0xe6, 0xae, 0xa2, 0xd8, 0xdd, 0x55, + 0x3c, 0xf4, 0x49, 0x3d, 0x4f, 0x71, 0xf3, 0xb8, 0x3a, 0xff, 0x73, 0xe9, 0x5a, 0x6f, 0x7e, 0x42, + 0x09, 0x17, 0x42, 0x4b, 0x30, 0x28, 0xbe, 0x74, 0x94, 0xcb, 0xdc, 0x37, 0x4c, 0xc5, 0x13, 0x76, + 0x3e, 0xad, 0xf8, 0x74, 0x1d, 0xdb, 0xb7, 0x23, 0x3d, 0xb7, 0x6f, 0x33, 0x5d, 0xda, 0xb7, 0xb1, + 0x22, 0x49, 0xf6, 0xcd, 0xb7, 0xc3, 0x73, 0xdf, 0x41, 0x3b, 0x7c, 0xf4, 0x94, 0x76, 0x78, 0xac, + 0x93, 0x8c, 0x7a, 0xe9, 0x24, 0x8f, 0xf5, 0xd2, 0x49, 0x1e, 0xef, 0xb9, 0x93, 0x3c, 0xd1, 0xa5, + 0x93, 0xbc, 0x0c, 0x69, 0x62, 0xdb, 0x54, 0xe5, 0xb1, 0xb2, 0x57, 0x26, 0x97, 0x63, 0xe9, 0x83, + 0x6d, 0x53, 0x16, 0x28, 0x2b, 0x29, 0x22, 0x9e, 0xd0, 0x66, 0x10, 0x8f, 0x4e, 0xf1, 0x78, 0xf4, + 0xf6, 0xeb, 0xc6, 0xa2, 0xe8, 0x87, 0x30, 0xdc, 0xd2, 0xb6, 0x97, 0x4f, 0x6f, 0xdb, 0x0f, 0x35, + 0x22, 0xfd, 0xfa, 0x65, 0x48, 0x73, 0x7e, 0x16, 0x60, 0x89, 0x76, 0xaa, 0xdc, 0x2d, 0x00, 0x53, + 0x52, 0x8c, 0x93, 0xd7, 0x23, 0x57, 0x61, 0xd4, 0xaf, 0x8d, 0x84, 0xec, 0x37, 0x4f, 0x61, 0xf7, + 0x8b, 0x36, 0x8f, 0x7c, 0x94, 0x25, 0x18, 0x74, 0xbd, 0x84, 0x42, 0xce, 0x77, 0xb6, 0x21, 0x91, + 0x6f, 0x28, 0x3e, 0x1d, 0x7a, 0x0f, 0x7c, 0x14, 0xd5, 0x67, 0x9d, 0x39, 0x99, 0x35, 0x23, 0xe8, + 0xfd, 0x6f, 0x8c, 0xe7, 0x20, 0x13, 0x94, 0xeb, 0xb8, 0x94, 0x79, 0xe5, 0x7c, 0x44, 0x19, 0x16, + 0x45, 0x3a, 0x2e, 0x61, 0x74, 0x0d, 0xb2, 0x4d, 0x17, 0x1b, 0x21, 0x95, 0x2b, 0x5f, 0x60, 0x69, + 0xbf, 0x32, 0xc2, 0x86, 0x7d, 0x32, 0x97, 0xd1, 0x71, 0xb4, 0x50, 0x69, 0x78, 0x69, 0x5b, 0x7c, + 0xcb, 0x1b, 0x68, 0x0c, 0xba, 0x2a, 0xe8, 0xc8, 0x67, 0xa2, 0x45, 0xf6, 0x16, 0x2f, 0x56, 0x8b, + 0x65, 0x95, 0xcf, 0x78, 0xeb, 0xeb, 0xad, 0x38, 0xd9, 0x12, 0x2f, 0x42, 0xb7, 0x92, 0x2d, 0xa1, + 0x0f, 0x61, 0xa6, 0xbd, 0xe4, 0x48, 0xb0, 0x8e, 0xcd, 0x03, 0x2f, 0x68, 0xbb, 0xdc, 0x5b, 0x31, + 0x33, 0xa8, 0x48, 0x2a, 0x82, 0xb7, 0x42, 0xd1, 0x1a, 0x0c, 0x79, 0xc5, 0x0e, 0x4f, 0xa4, 0x85, + 0x2e, 0x86, 0xcf, 0x48, 0xb8, 0x0c, 0x23, 0x86, 0x0f, 0x4e, 0x30, 0x8a, 0x9e, 0x03, 0xda, 0xe1, + 0x5f, 0x44, 0x1c, 0xa9, 0x0e, 0x26, 0x3a, 0xb6, 0xa8, 0x56, 0xc3, 0xf2, 0x95, 0x53, 0x9b, 0x9c, + 0xbc, 0x52, 0x03, 0x70, 0xe1, 0xdc, 0xb9, 0xaf, 0xee, 0x2e, 0x9c, 0x3b, 0x77, 0xee, 0x9c, 0x32, + 0x2a, 0x70, 0x36, 0x03, 0x18, 0x74, 0x1d, 0xb2, 0x41, 0x35, 0x40, 0xb4, 0x4f, 0xe7, 0x66, 0xa5, + 0x62, 0xbf, 0x92, 0xf1, 0x87, 0x45, 0x9b, 0xf4, 0xb4, 0xaf, 0x9a, 0x8b, 0x6f, 0xe4, 0xab, 0x66, + 0x74, 0x1f, 0x20, 0xf2, 0x39, 0xc9, 0xfc, 0xd9, 0x3e, 0x27, 0x51, 0x22, 0xbc, 0xe8, 0x03, 0xc8, + 0x38, 0xc4, 0x3e, 0x30, 0x99, 0xa2, 0x7a, 0x57, 0xf8, 0x0d, 0xee, 0x25, 0x6f, 0x1c, 0x57, 0xaf, + 0x93, 0xab, 0xf2, 0x5c, 0xf9, 0xf2, 0xc9, 0x17, 0x14, 0xbb, 0x21, 0x47, 0x22, 0x08, 0xeb, 0x06, + 0xb7, 0x54, 0x7f, 0x80, 0x59, 0x0d, 0xcb, 0x25, 0xe5, 0xef, 0x09, 0x93, 0x69, 0x17, 0xc4, 0x13, + 0xfe, 0x2f, 0x0a, 0x4a, 0x2e, 0xca, 0xc1, 0xb2, 0x2e, 0x74, 0x1e, 0xd2, 0x8d, 0x66, 0x9d, 0xe5, + 0x54, 0x2e, 0x95, 0x17, 0xb8, 0x53, 0x0c, 0x07, 0x50, 0x0d, 0xa6, 0xf5, 0xba, 0x66, 0x36, 0x54, + 0xad, 0x25, 0xf5, 0x52, 0x75, 0xdb, 0xc0, 0x72, 0xe9, 0x94, 0xc8, 0x39, 0x9e, 0xae, 0xf1, 0x2e, + 0x8d, 0xd9, 0xe8, 0x90, 0xc7, 0x95, 0x60, 0xcc, 0xdd, 0x37, 0x1d, 0x55, 0xd4, 0x3d, 0x54, 0x9d, + 0x1c, 0x39, 0xd4, 0x96, 0x6f, 0xf1, 0x0d, 0x8d, 0xb2, 0x29, 0x71, 0xbe, 0x2b, 0x7c, 0x02, 0x3d, + 0x87, 0xf3, 0x1d, 0xe8, 0x55, 0xfb, 0x00, 0x13, 0x62, 0x1a, 0x58, 0x7e, 0xbb, 0x8b, 0xa1, 0x84, + 0x8d, 0x99, 0xe9, 0x18, 0xe8, 0xfb, 0x82, 0x19, 0xbd, 0x0b, 0xc3, 0x9a, 0x4e, 0xcd, 0x03, 0x3f, + 0x55, 0x5a, 0x3e, 0xd5, 0xea, 0x86, 0x02, 0xfa, 0x0a, 0xcd, 0xbf, 0x0b, 0xd9, 0xb6, 0xb4, 0x25, + 0x9a, 0x1b, 0xa7, 0xbd, 0xdc, 0x78, 0x3c, 0x9a, 0x1b, 0xa7, 0x23, 0x29, 0x6f, 0x7e, 0x1b, 0x32, + 0xad, 0xa1, 0x4c, 0x07, 0xee, 0x52, 0x6b, 0x66, 0x1d, 0xf3, 0xcc, 0x3e, 0x40, 0x04, 0x77, 0x23, + 0x99, 0xba, 0x9a, 0xbb, 0xb6, 0x91, 0x4c, 0x5d, 0xcb, 0x5d, 0xdf, 0x48, 0xa6, 0xae, 0xe7, 0x8a, + 0x85, 0xfb, 0x00, 0x81, 0xb0, 0x5c, 0x74, 0x07, 0x86, 0xc2, 0xff, 0xf9, 0xf1, 0xab, 0x05, 0xd3, + 0x5d, 0xa5, 0xab, 0x00, 0x0e, 0x78, 0x0b, 0x7f, 0x00, 0x23, 0xa2, 0x44, 0xb3, 0x49, 0xf0, 0xae, + 0x79, 0x88, 0xb6, 0x23, 0xb5, 0x1f, 0xaf, 0xba, 0xf5, 0xce, 0x1b, 0xa9, 0xfb, 0x4c, 0xc2, 0x40, + 0x1d, 0x5b, 0x35, 0xba, 0xc7, 0xdf, 0x7c, 0x44, 0x11, 0xbf, 0x0a, 0x9f, 0xc0, 0xe4, 0x0a, 0x4f, + 0x74, 0xc3, 0xfd, 0x89, 0xba, 0x57, 0x15, 0x20, 0x7c, 0xad, 0xe0, 0x13, 0xad, 0x6e, 0x6f, 0x15, + 0x49, 0xb7, 0xd3, 0xc1, 0xfb, 0x15, 0xfe, 0x42, 0x82, 0xc9, 0xa7, 0x3c, 0x19, 0xfe, 0x2e, 0xe0, + 0x59, 0x62, 0x1e, 0xfe, 0x93, 0x51, 0xd7, 0x9c, 0xfe, 0x1e, 0x23, 0x79, 0xa4, 0xb9, 0xfb, 0x4a, + 0x7a, 0xd7, 0x7f, 0x2c, 0xfc, 0xb5, 0x04, 0x63, 0x3f, 0xc2, 0x34, 0xb6, 0xad, 0x2d, 0xc8, 0x84, + 0xdb, 0x52, 0xbf, 0x7d, 0xcd, 0x61, 0x18, 0x87, 0xf3, 0xee, 0xeb, 0x6c, 0xf4, 0xdf, 0x24, 0xb8, + 0x1a, 0xdd, 0x68, 0x64, 0xb9, 0x7b, 0x36, 0x59, 0x7b, 0xba, 0xee, 0xfa, 0x5b, 0xff, 0x10, 0x52, + 0xfc, 0xce, 0xc5, 0x4d, 0x53, 0xa8, 0xce, 0xb7, 0x2e, 0xee, 0xad, 0x3d, 0x5d, 0xff, 0xfe, 0xdb, + 0xca, 0x20, 0x83, 0x5b, 0x6b, 0x9a, 0x68, 0x1b, 0x98, 0x1e, 0x71, 0xe0, 0xc4, 0x9b, 0x00, 0x1e, + 0x30, 0xf0, 0xc1, 0x5a, 0xd3, 0x2c, 0x1c, 0x27, 0x60, 0xe2, 0xa1, 0xe9, 0x86, 0x2f, 0x17, 0xbc, + 0xcb, 0xfb, 0x90, 0x8d, 0x5e, 0x50, 0xa1, 0x1c, 0xae, 0x9d, 0x70, 0x35, 0x45, 0x4b, 0x0d, 0x19, + 0x2d, 0x3a, 0xfe, 0x3a, 0x12, 0x40, 0xbf, 0x90, 0xa0, 0xdf, 0x26, 0x06, 0x26, 0xbc, 0xf4, 0x93, + 0xae, 0xfe, 0x89, 0x74, 0x5c, 0xfd, 0x23, 0x89, 0xfc, 0x54, 0x52, 0xce, 0x29, 0xe9, 0x40, 0x51, + 0x14, 0x58, 0x08, 0x9f, 0x03, 0x41, 0x28, 0xe9, 0x85, 0xe0, 0xd1, 0x3f, 0x43, 0x25, 0xb5, 0xe0, + 0x3f, 0xf1, 0x3a, 0x90, 0xd2, 0xbf, 0xc0, 0xff, 0x44, 0xeb, 0x3d, 0xca, 0xf0, 0x42, 0xf4, 0x57, + 0xa4, 0x74, 0xa5, 0x0c, 0x2d, 0x44, 0x7e, 0x78, 0x1b, 0x43, 0x17, 0xa1, 0xdf, 0xfb, 0x37, 0x19, + 0xfe, 0x6f, 0x58, 0x5c, 0x0d, 0x6f, 0xf4, 0xc9, 0xff, 0x39, 0xa8, 0x78, 0xc3, 0x08, 0x41, 0xd2, + 0x61, 0xe1, 0x86, 0xf7, 0xef, 0x57, 0xfc, 0xb9, 0xf0, 0xe7, 0x12, 0x8c, 0x3d, 0xe9, 0x60, 0x01, + 0xbf, 0x63, 0xc3, 0xfc, 0x5b, 0x09, 0x66, 0x14, 0x96, 0x5c, 0x54, 0x2c, 0xe3, 0xff, 0x84, 0x81, + 0xfe, 0x83, 0x04, 0xa3, 0xc1, 0x5a, 0x5b, 0xb8, 0xe1, 0xd4, 0x59, 0xb8, 0xf7, 0xbb, 0x3d, 0x45, + 0x54, 0x84, 0xa1, 0x86, 0xe6, 0xf0, 0x6e, 0x3a, 0xbb, 0x01, 0xfb, 0x5a, 0xcb, 0x1e, 0x20, 0xe6, + 0x1e, 0xe0, 0xa3, 0xc2, 0xdf, 0x4b, 0x30, 0x15, 0xdb, 0xbe, 0x17, 0x8c, 0x05, 0xd5, 0x4b, 0xa9, + 0x95, 0xbd, 0x63, 0xf5, 0x32, 0x11, 0xad, 0xce, 0x7c, 0x23, 0xb5, 0x56, 0x2f, 0xb7, 0x20, 0xcb, + 0x2b, 0x7c, 0xf8, 0x90, 0x62, 0xcb, 0xe5, 0x65, 0x89, 0x3e, 0xde, 0x08, 0xf9, 0xde, 0x71, 0xb5, + 0xf8, 0xb5, 0x74, 0x35, 0x67, 0xc8, 0x52, 0xe1, 0x12, 0xb9, 0x50, 0x9e, 0xf9, 0xb4, 0x78, 0xf7, + 0xce, 0x27, 0x25, 0x3f, 0x86, 0xfb, 0x62, 0xe9, 0xe6, 0xd2, 0xf7, 0x5f, 0xcd, 0x7f, 0xb1, 0x74, + 0xb3, 0xfc, 0x6a, 0x4e, 0xc9, 0x30, 0x8c, 0xb5, 0x00, 0xa2, 0xf0, 0x3f, 0x12, 0xc8, 0x5d, 0xb6, + 0xee, 0xa2, 0x57, 0x30, 0xe8, 0x85, 0x91, 0xfe, 0x8d, 0xbc, 0xdc, 0xf5, 0xf4, 0xdb, 0x58, 0x4b, + 0xe2, 0xef, 0xb7, 0x29, 0x87, 0xf8, 0x6b, 0xe6, 0x75, 0x18, 0x8e, 0xc2, 0x74, 0x08, 0x45, 0x4e, + 0x2b, 0xf2, 0x77, 0xd9, 0x5e, 0xb4, 0xc8, 0xff, 0x05, 0x5c, 0x5a, 0xb1, 0xad, 0x03, 0x4c, 0x68, + 0x8c, 0xd8, 0x37, 0x97, 0x55, 0x48, 0x7b, 0x5b, 0x62, 0xa1, 0xb3, 0x27, 0xc7, 0xeb, 0xc7, 0xd5, + 0xde, 0x5e, 0x26, 0xe5, 0x71, 0xae, 0x1b, 0xcc, 0x7f, 0xf0, 0x28, 0x99, 0x7b, 0x7f, 0x85, 0x3f, + 0xdf, 0x78, 0x0a, 0x10, 0x26, 0x3d, 0x68, 0x14, 0x46, 0x36, 0xdf, 0x7f, 0xb6, 0xa6, 0xa8, 0x4f, + 0x1f, 0x3f, 0x78, 0xfc, 0xfe, 0xb3, 0xc7, 0xb9, 0x73, 0xe1, 0x50, 0xb5, 0xb2, 0xb5, 0xb5, 0xa6, + 0x7c, 0x94, 0x93, 0x10, 0x82, 0x8c, 0x37, 0xb4, 0xf6, 0xe1, 0xd6, 0x9a, 0xf2, 0xb8, 0xf2, 0x30, + 0x97, 0xc8, 0x8f, 0xfc, 0xf6, 0x97, 0xd3, 0x69, 0x59, 0xba, 0xd1, 0xcf, 0x67, 0xaa, 0xcb, 0xff, + 0xf4, 0x1f, 0x17, 0xa5, 0x8f, 0x17, 0xcf, 0x70, 0xb1, 0x50, 0xcb, 0xd9, 0xd9, 0x19, 0xe0, 0xf6, + 0x70, 0xeb, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xfb, 0x48, 0xe3, 0xa6, 0x91, 0x3d, 0x00, 0x00, } diff --git a/pkg/ttnpb/end_device.pb.paths.fm.go b/pkg/ttnpb/end_device.pb.paths.fm.go index 07e80b0814..1c982794aa 100644 --- a/pkg/ttnpb/end_device.pb.paths.fm.go +++ b/pkg/ttnpb/end_device.pb.paths.fm.go @@ -136,6 +136,8 @@ var EndDeviceVersionFieldPathsNested = []string{ "default_mac_settings.desired_rx2_data_rate_index.value", "default_mac_settings.desired_rx2_frequency", "default_mac_settings.desired_rx2_frequency.value", + "default_mac_settings.downlink_dwell_time", + "default_mac_settings.downlink_dwell_time.value", "default_mac_settings.factory_preset_frequencies", "default_mac_settings.max_duty_cycle", "default_mac_settings.max_duty_cycle.value", @@ -159,6 +161,8 @@ var EndDeviceVersionFieldPathsNested = []string{ "default_mac_settings.status_time_periodicity", "default_mac_settings.supports_32_bit_f_cnt", "default_mac_settings.supports_32_bit_f_cnt.value", + "default_mac_settings.uplink_dwell_time", + "default_mac_settings.uplink_dwell_time.value", "default_mac_settings.use_adr", "default_mac_settings.use_adr.value", "frequency_plan_id", @@ -223,6 +227,8 @@ var MACSettingsFieldPathsNested = []string{ "desired_rx2_data_rate_index.value", "desired_rx2_frequency", "desired_rx2_frequency.value", + "downlink_dwell_time", + "downlink_dwell_time.value", "factory_preset_frequencies", "max_duty_cycle", "max_duty_cycle.value", @@ -246,6 +252,8 @@ var MACSettingsFieldPathsNested = []string{ "status_time_periodicity", "supports_32_bit_f_cnt", "supports_32_bit_f_cnt.value", + "uplink_dwell_time", + "uplink_dwell_time.value", "use_adr", "use_adr.value", } @@ -267,6 +275,7 @@ var MACSettingsFieldPathsTopLevel = []string{ "desired_rx1_delay", "desired_rx2_data_rate_index", "desired_rx2_frequency", + "downlink_dwell_time", "factory_preset_frequencies", "max_duty_cycle", "ping_slot_data_rate_index", @@ -280,6 +289,7 @@ var MACSettingsFieldPathsTopLevel = []string{ "status_count_periodicity", "status_time_periodicity", "supports_32_bit_f_cnt", + "uplink_dwell_time", "use_adr", } var MACStateFieldPathsNested = []string{ @@ -515,6 +525,8 @@ var EndDeviceFieldPathsNested = []string{ "mac_settings.desired_rx2_data_rate_index.value", "mac_settings.desired_rx2_frequency", "mac_settings.desired_rx2_frequency.value", + "mac_settings.downlink_dwell_time", + "mac_settings.downlink_dwell_time.value", "mac_settings.factory_preset_frequencies", "mac_settings.max_duty_cycle", "mac_settings.max_duty_cycle.value", @@ -538,6 +550,8 @@ var EndDeviceFieldPathsNested = []string{ "mac_settings.status_time_periodicity", "mac_settings.supports_32_bit_f_cnt", "mac_settings.supports_32_bit_f_cnt.value", + "mac_settings.uplink_dwell_time", + "mac_settings.uplink_dwell_time.value", "mac_settings.use_adr", "mac_settings.use_adr.value", "mac_state", @@ -1031,6 +1045,8 @@ var CreateEndDeviceRequestFieldPathsNested = []string{ "end_device.mac_settings.desired_rx2_data_rate_index.value", "end_device.mac_settings.desired_rx2_frequency", "end_device.mac_settings.desired_rx2_frequency.value", + "end_device.mac_settings.downlink_dwell_time", + "end_device.mac_settings.downlink_dwell_time.value", "end_device.mac_settings.factory_preset_frequencies", "end_device.mac_settings.max_duty_cycle", "end_device.mac_settings.max_duty_cycle.value", @@ -1054,6 +1070,8 @@ var CreateEndDeviceRequestFieldPathsNested = []string{ "end_device.mac_settings.status_time_periodicity", "end_device.mac_settings.supports_32_bit_f_cnt", "end_device.mac_settings.supports_32_bit_f_cnt.value", + "end_device.mac_settings.uplink_dwell_time", + "end_device.mac_settings.uplink_dwell_time.value", "end_device.mac_settings.use_adr", "end_device.mac_settings.use_adr.value", "end_device.mac_state", @@ -1482,6 +1500,8 @@ var UpdateEndDeviceRequestFieldPathsNested = []string{ "end_device.mac_settings.desired_rx2_data_rate_index.value", "end_device.mac_settings.desired_rx2_frequency", "end_device.mac_settings.desired_rx2_frequency.value", + "end_device.mac_settings.downlink_dwell_time", + "end_device.mac_settings.downlink_dwell_time.value", "end_device.mac_settings.factory_preset_frequencies", "end_device.mac_settings.max_duty_cycle", "end_device.mac_settings.max_duty_cycle.value", @@ -1505,6 +1525,8 @@ var UpdateEndDeviceRequestFieldPathsNested = []string{ "end_device.mac_settings.status_time_periodicity", "end_device.mac_settings.supports_32_bit_f_cnt", "end_device.mac_settings.supports_32_bit_f_cnt.value", + "end_device.mac_settings.uplink_dwell_time", + "end_device.mac_settings.uplink_dwell_time.value", "end_device.mac_settings.use_adr", "end_device.mac_settings.use_adr.value", "end_device.mac_state", @@ -1975,6 +1997,8 @@ var SetEndDeviceRequestFieldPathsNested = []string{ "end_device.mac_settings.desired_rx2_data_rate_index.value", "end_device.mac_settings.desired_rx2_frequency", "end_device.mac_settings.desired_rx2_frequency.value", + "end_device.mac_settings.downlink_dwell_time", + "end_device.mac_settings.downlink_dwell_time.value", "end_device.mac_settings.factory_preset_frequencies", "end_device.mac_settings.max_duty_cycle", "end_device.mac_settings.max_duty_cycle.value", @@ -1998,6 +2022,8 @@ var SetEndDeviceRequestFieldPathsNested = []string{ "end_device.mac_settings.status_time_periodicity", "end_device.mac_settings.supports_32_bit_f_cnt", "end_device.mac_settings.supports_32_bit_f_cnt.value", + "end_device.mac_settings.uplink_dwell_time", + "end_device.mac_settings.uplink_dwell_time.value", "end_device.mac_settings.use_adr", "end_device.mac_settings.use_adr.value", "end_device.mac_state", @@ -2443,6 +2469,8 @@ var EndDeviceTemplateFieldPathsNested = []string{ "end_device.mac_settings.desired_rx2_data_rate_index.value", "end_device.mac_settings.desired_rx2_frequency", "end_device.mac_settings.desired_rx2_frequency.value", + "end_device.mac_settings.downlink_dwell_time", + "end_device.mac_settings.downlink_dwell_time.value", "end_device.mac_settings.factory_preset_frequencies", "end_device.mac_settings.max_duty_cycle", "end_device.mac_settings.max_duty_cycle.value", @@ -2466,6 +2494,8 @@ var EndDeviceTemplateFieldPathsNested = []string{ "end_device.mac_settings.status_time_periodicity", "end_device.mac_settings.supports_32_bit_f_cnt", "end_device.mac_settings.supports_32_bit_f_cnt.value", + "end_device.mac_settings.uplink_dwell_time", + "end_device.mac_settings.uplink_dwell_time.value", "end_device.mac_settings.use_adr", "end_device.mac_settings.use_adr.value", "end_device.mac_state", diff --git a/pkg/ttnpb/end_device.pb.setters.fm.go b/pkg/ttnpb/end_device.pb.setters.fm.go index 26036e15e6..7bdfc73ed0 100644 --- a/pkg/ttnpb/end_device.pb.setters.fm.go +++ b/pkg/ttnpb/end_device.pb.setters.fm.go @@ -1263,6 +1263,56 @@ func (dst *MACSettings) SetFields(src *MACSettings, paths ...string) error { } else { dst.ClassBCDownlinkInterval = nil } + case "uplink_dwell_time": + if len(subs) > 0 { + var newDst, newSrc *BoolValue + if (src == nil || src.UplinkDwellTime == nil) && dst.UplinkDwellTime == nil { + continue + } + if src != nil { + newSrc = src.UplinkDwellTime + } + if dst.UplinkDwellTime != nil { + newDst = dst.UplinkDwellTime + } else { + newDst = &BoolValue{} + dst.UplinkDwellTime = newDst + } + if err := newDst.SetFields(newSrc, subs...); err != nil { + return err + } + } else { + if src != nil { + dst.UplinkDwellTime = src.UplinkDwellTime + } else { + dst.UplinkDwellTime = nil + } + } + case "downlink_dwell_time": + if len(subs) > 0 { + var newDst, newSrc *BoolValue + if (src == nil || src.DownlinkDwellTime == nil) && dst.DownlinkDwellTime == nil { + continue + } + if src != nil { + newSrc = src.DownlinkDwellTime + } + if dst.DownlinkDwellTime != nil { + newDst = dst.DownlinkDwellTime + } else { + newDst = &BoolValue{} + dst.DownlinkDwellTime = newDst + } + if err := newDst.SetFields(newSrc, subs...); err != nil { + return err + } + } else { + if src != nil { + dst.DownlinkDwellTime = src.DownlinkDwellTime + } else { + dst.DownlinkDwellTime = nil + } + } default: return fmt.Errorf("invalid field: '%s'", name) diff --git a/pkg/ttnpb/end_device.pb.validate.go b/pkg/ttnpb/end_device.pb.validate.go index 42ff207525..b7cf240451 100644 --- a/pkg/ttnpb/end_device.pb.validate.go +++ b/pkg/ttnpb/end_device.pb.validate.go @@ -1081,6 +1081,30 @@ func (m *MACSettings) ValidateFields(paths ...string) error { } } + case "uplink_dwell_time": + + if v, ok := interface{}(m.GetUplinkDwellTime()).(interface{ ValidateFields(...string) error }); ok { + if err := v.ValidateFields(subs...); err != nil { + return MACSettingsValidationError{ + field: "uplink_dwell_time", + reason: "embedded message failed validation", + cause: err, + } + } + } + + case "downlink_dwell_time": + + if v, ok := interface{}(m.GetDownlinkDwellTime()).(interface{ ValidateFields(...string) error }); ok { + if err := v.ValidateFields(subs...); err != nil { + return MACSettingsValidationError{ + field: "downlink_dwell_time", + reason: "embedded message failed validation", + cause: err, + } + } + } + default: return MACSettingsValidationError{ field: name, diff --git a/pkg/ttnpb/end_device_json.pb.go b/pkg/ttnpb/end_device_json.pb.go index 5b3b5a8008..b41bcdafae 100644 --- a/pkg/ttnpb/end_device_json.pb.go +++ b/pkg/ttnpb/end_device_json.pb.go @@ -898,6 +898,16 @@ func (x *MACSettings) MarshalProtoJSON(s *jsonplugin.MarshalState) { gogo.MarshalDuration(s, x.ClassBCDownlinkInterval) } } + if x.UplinkDwellTime != nil || s.HasField("uplink_dwell_time") { + s.WriteMoreIf(&wroteField) + s.WriteObjectField("uplink_dwell_time") + x.UplinkDwellTime.MarshalProtoJSON(s.WithField("uplink_dwell_time")) + } + if x.DownlinkDwellTime != nil || s.HasField("downlink_dwell_time") { + s.WriteMoreIf(&wroteField) + s.WriteObjectField("downlink_dwell_time") + x.DownlinkDwellTime.MarshalProtoJSON(s.WithField("downlink_dwell_time")) + } s.WriteObjectEnd() } @@ -1172,6 +1182,22 @@ func (x *MACSettings) UnmarshalProtoJSON(s *jsonplugin.UnmarshalState) { return } x.ClassBCDownlinkInterval = v + case "uplink_dwell_time", "uplinkDwellTime": + s.AddField("uplink_dwell_time") + if s.ReadNil() { + x.UplinkDwellTime = nil + return + } + x.UplinkDwellTime = &BoolValue{} + x.UplinkDwellTime.UnmarshalProtoJSON(s.WithField("uplink_dwell_time", false)) + case "downlink_dwell_time", "downlinkDwellTime": + s.AddField("downlink_dwell_time") + if s.ReadNil() { + x.DownlinkDwellTime = nil + return + } + x.DownlinkDwellTime = &BoolValue{} + x.DownlinkDwellTime.UnmarshalProtoJSON(s.WithField("downlink_dwell_time", false)) } }) } diff --git a/pkg/ttnpb/field_mask_validation.go b/pkg/ttnpb/field_mask_validation.go index 088df106b2..f955858df4 100644 --- a/pkg/ttnpb/field_mask_validation.go +++ b/pkg/ttnpb/field_mask_validation.go @@ -142,6 +142,10 @@ var nsEndDeviceReadFieldPaths = [...]string{ "mac_settings.supports_32_bit_f_cnt.value", "mac_settings.use_adr", "mac_settings.use_adr.value", + "mac_settings.uplink_dwell_time", + "mac_settings.uplink_dwell_time.value", + "mac_settings.downlink_dwell_time", + "mac_settings.downlink_dwell_time.value", "mac_state", "mac_state.current_parameters", "mac_state.current_parameters.adr_ack_delay_exponent", @@ -636,6 +640,10 @@ var RPCFieldMaskPaths = map[string]RPCFieldMaskPathValue{ "mac_settings.supports_32_bit_f_cnt.value", "mac_settings.use_adr", "mac_settings.use_adr.value", + "mac_settings.uplink_dwell_time", + "mac_settings.uplink_dwell_time.value", + "mac_settings.downlink_dwell_time", + "mac_settings.downlink_dwell_time.value", "mac_state", "mac_state.current_parameters", "mac_state.current_parameters.adr_ack_delay_exponent", diff --git a/pkg/ttnpb/qrcodegenerator.pb.paths.fm.go b/pkg/ttnpb/qrcodegenerator.pb.paths.fm.go index 1eac20d7a0..974340efb6 100644 --- a/pkg/ttnpb/qrcodegenerator.pb.paths.fm.go +++ b/pkg/ttnpb/qrcodegenerator.pb.paths.fm.go @@ -93,6 +93,8 @@ var GenerateEndDeviceQRCodeRequestFieldPathsNested = []string{ "end_device.mac_settings.desired_rx2_data_rate_index.value", "end_device.mac_settings.desired_rx2_frequency", "end_device.mac_settings.desired_rx2_frequency.value", + "end_device.mac_settings.downlink_dwell_time", + "end_device.mac_settings.downlink_dwell_time.value", "end_device.mac_settings.factory_preset_frequencies", "end_device.mac_settings.max_duty_cycle", "end_device.mac_settings.max_duty_cycle.value", @@ -116,6 +118,8 @@ var GenerateEndDeviceQRCodeRequestFieldPathsNested = []string{ "end_device.mac_settings.status_time_periodicity", "end_device.mac_settings.supports_32_bit_f_cnt", "end_device.mac_settings.supports_32_bit_f_cnt.value", + "end_device.mac_settings.uplink_dwell_time", + "end_device.mac_settings.uplink_dwell_time.value", "end_device.mac_settings.use_adr", "end_device.mac_settings.use_adr.value", "end_device.mac_state", diff --git a/pkg/util/test/frequencyplans.go b/pkg/util/test/frequencyplans.go index 775961483e..f8a2c09a05 100644 --- a/pkg/util/test/frequencyplans.go +++ b/pkg/util/test/frequencyplans.go @@ -244,6 +244,10 @@ lora-standard-channel: frequency: 904600000 data-rate: 12 radio: 0 +dwell-time: + uplinks: true + downlinks: false + duration: 400ms radios: - enable: true chip-type: SX1257 @@ -264,7 +268,10 @@ clock-source: 1` sub-bands: - min-frequency: 915000000 max-frequency: 928000000 - max-eirp: 30 +dwell-time: + uplinks: false + downlinks: false +max-eirp: 30 uplink-channels: - frequency: 923200000 min-data-rate: 0 diff --git a/sdk/js/generated/api-definition.json b/sdk/js/generated/api-definition.json index 27c572c6ae..337aadac8b 100644 --- a/sdk/js/generated/api-definition.json +++ b/sdk/js/generated/api-definition.json @@ -3521,6 +3521,10 @@ "mac_settings.supports_32_bit_f_cnt.value", "mac_settings.use_adr", "mac_settings.use_adr.value", + "mac_settings.uplink_dwell_time", + "mac_settings.uplink_dwell_time.value", + "mac_settings.downlink_dwell_time", + "mac_settings.downlink_dwell_time.value", "mac_state", "mac_state.current_parameters", "mac_state.current_parameters.adr_ack_delay_exponent", @@ -3833,6 +3837,10 @@ "mac_settings.supports_32_bit_f_cnt.value", "mac_settings.use_adr", "mac_settings.use_adr.value", + "mac_settings.uplink_dwell_time", + "mac_settings.uplink_dwell_time.value", + "mac_settings.downlink_dwell_time", + "mac_settings.downlink_dwell_time.value", "mac_state", "mac_state.current_parameters", "mac_state.current_parameters.adr_ack_delay_exponent", @@ -4137,6 +4145,10 @@ "mac_settings.supports_32_bit_f_cnt.value", "mac_settings.use_adr", "mac_settings.use_adr.value", + "mac_settings.uplink_dwell_time", + "mac_settings.uplink_dwell_time.value", + "mac_settings.downlink_dwell_time", + "mac_settings.downlink_dwell_time.value", "mac_state", "mac_state.current_parameters", "mac_state.current_parameters.adr_ack_delay_exponent", diff --git a/sdk/js/generated/api.json b/sdk/js/generated/api.json index 16bc6e129a..84780aa170 100644 --- a/sdk/js/generated/api.json +++ b/sdk/js/generated/api.json @@ -14812,6 +14812,30 @@ "isoneof": false, "oneofdecl": "", "defaultValue": "" + }, + { + "name": "uplink_dwell_time", + "description": "Whether uplink dwell time is set (400ms).\nIf unset, the default value from Network Server configuration or regional parameters specification will be used.", + "label": "", + "type": "BoolValue", + "longType": "BoolValue", + "fullType": "ttn.lorawan.v3.BoolValue", + "ismap": false, + "isoneof": false, + "oneofdecl": "", + "defaultValue": "" + }, + { + "name": "downlink_dwell_time", + "description": "Whether downlink dwell time is set (400ms).\nIf unset, the default value from Network Server configuration or regional parameters specification will be used.", + "label": "", + "type": "BoolValue", + "longType": "BoolValue", + "fullType": "ttn.lorawan.v3.BoolValue", + "ismap": false, + "isoneof": false, + "oneofdecl": "", + "defaultValue": "" } ] }, diff --git a/sdk/js/generated/device-entity-map.json b/sdk/js/generated/device-entity-map.json index 089b106d3d..dc9fa19e57 100644 --- a/sdk/js/generated/device-entity-map.json +++ b/sdk/js/generated/device-entity-map.json @@ -719,6 +719,26 @@ "ns", "ns" ] + }, + "uplink_dwell_time": { + "_root": [ + "ns", + "ns" + ], + "value": [ + "ns", + "ns" + ] + }, + "downlink_dwell_time": { + "_root": [ + "ns", + "ns" + ], + "value": [ + "ns", + "ns" + ] } }, "mac_state": {