From 247915bb139f8d80ce5cdebd18f93d5e97523532 Mon Sep 17 00:00:00 2001 From: Verschwiegener Date: Fri, 18 Oct 2024 03:33:39 +0200 Subject: [PATCH 1/7] Battery Definition #171 --- gdtf-spec.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gdtf-spec.md b/gdtf-spec.md index 4bf17103..148e2d7b 100644 --- a/gdtf-spec.md +++ b/gdtf-spec.md @@ -192,6 +192,7 @@ specified in [Table 1](#user-content-table-1 ). |Int | Integer | Signed integer| |Hex | Integer | Number in hexadecimal notation; Default value: 0| |Float | float | Floating point numeric; Separator: "."| +|Bool | Bool | A boolean value. When representing true inidcate with true, when false indicate with false.| |String | Literal | Text| |Name | restricted Literal | Unique object names; The allowed characters are listed in [AnnexC](#user-content-table-c1) Default value: object type with an index in parent.| |Date | yyyy-mm-ddThh:mm:ss | Date and time corresponding to UTC +00:00 (Coordinated Universal Time): yyyy – year, mm – month, dd – day, hh – hours (24 format), mm – minutes, ss – seconds. Example: “2016-06-21T11:22:48” | @@ -975,6 +976,7 @@ are specified in [table 28](#user-content-table-28 ). | [Weight](#user-content-weight ) | 0 or 1 | Weight of the device including all accessories. | | [PowerConsumption](#user-content-powerconsumption ) | Any | Power information for a given connector. | | [LegHeight](#user-content-legheight ) | 0 or 1 | Height of the legs. | +| [Battery](#user-content-battery ) | 0 or 1 | Definition of Battery from Fixture | @@ -1038,6 +1040,26 @@ currently defined XML attributes of the LegHeight are specified in The LegHeight currently does not have any children. +#### Battery + +This section defines the Battery of the Fixture (XML node ``). The +currently defined XML Attributes of the Battery are specifies in +[table 31.1](#user-content-table-31.1 ). + +
+ +#### Table 31.1. *Battery Attributes* + +| XML Attribute Name | Value Type | Description | +|----|----|----| +| Duration | [Float](#user-content-attrtype-float ) | Defines height duration of the Battery - Battery Duration on max fixture intensity. Unit: Hours. Default value: 0 | +| Standalone | [Bool](#user-content-attrtype-boolean ) | Defines if the Fixture can be used Standalone - Fixture can be unsed without Power Connection. | + +
+ +The Battery currently does not have any children. + + ## Model Collect ### General From 6529cfea0b2b09247a0a9a7328cb7e7c5158101e Mon Sep 17 00:00:00 2001 From: Verschwiegener Date: Fri, 18 Oct 2024 03:35:36 +0200 Subject: [PATCH 2/7] Fixed Spelling --- gdtf-spec.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdtf-spec.md b/gdtf-spec.md index 148e2d7b..fcba7014 100644 --- a/gdtf-spec.md +++ b/gdtf-spec.md @@ -1052,7 +1052,7 @@ currently defined XML Attributes of the Battery are specifies in | XML Attribute Name | Value Type | Description | |----|----|----| -| Duration | [Float](#user-content-attrtype-float ) | Defines height duration of the Battery - Battery Duration on max fixture intensity. Unit: Hours. Default value: 0 | +| Duration | [Float](#user-content-attrtype-float ) | Defines duration of the Battery - Battery Duration on maximum fixture intensity. Unit: Hours. Default value: 0 | | Standalone | [Bool](#user-content-attrtype-boolean ) | Defines if the Fixture can be used Standalone - Fixture can be unsed without Power Connection. | From bc9755044b1f5c970fc949761e2a5e740cd64e9d Mon Sep 17 00:00:00 2001 From: Verschwiegener Date: Fri, 18 Oct 2024 03:36:20 +0200 Subject: [PATCH 3/7] Fixed Spelling --- gdtf-spec.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdtf-spec.md b/gdtf-spec.md index fcba7014..d7d19ca7 100644 --- a/gdtf-spec.md +++ b/gdtf-spec.md @@ -1053,7 +1053,7 @@ currently defined XML Attributes of the Battery are specifies in | XML Attribute Name | Value Type | Description | |----|----|----| | Duration | [Float](#user-content-attrtype-float ) | Defines duration of the Battery - Battery Duration on maximum fixture intensity. Unit: Hours. Default value: 0 | -| Standalone | [Bool](#user-content-attrtype-boolean ) | Defines if the Fixture can be used Standalone - Fixture can be unsed without Power Connection. | +| Standalone | [Bool](#user-content-attrtype-boolean ) | Defines if the Fixture can be used Standalone - Fixture can be used without Power Connection. | From f5753198cbf587abaf06ef3a198706ebcc24060a Mon Sep 17 00:00:00 2001 From: Verschwiegener Date: Fri, 18 Oct 2024 03:39:37 +0200 Subject: [PATCH 4/7] Clearer Battery Description --- gdtf-spec.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdtf-spec.md b/gdtf-spec.md index d7d19ca7..3463e282 100644 --- a/gdtf-spec.md +++ b/gdtf-spec.md @@ -1042,9 +1042,9 @@ The LegHeight currently does not have any children. #### Battery -This section defines the Battery of the Fixture (XML node ``). The -currently defined XML Attributes of the Battery are specifies in -[table 31.1](#user-content-table-31.1 ). +This section defines the Battery of the Fixture (XML node ``) not +used if the Fixtures has not Battery. The currently defined XML Attributes +of the Battery are specifies in [table 31.1](#user-content-table-31.1 ).
From 118997745bfe09c216dbcbf77dd570064697d586 Mon Sep 17 00:00:00 2001 From: Verschwiegener Date: Fri, 18 Oct 2024 11:57:06 +0200 Subject: [PATCH 5/7] Battery Power Modes of Operation --- gdtf-spec.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gdtf-spec.md b/gdtf-spec.md index 3463e282..b3e16b76 100644 --- a/gdtf-spec.md +++ b/gdtf-spec.md @@ -1053,7 +1053,8 @@ of the Battery are specifies in [table 31.1](#user-content-table-31.1 ). | XML Attribute Name | Value Type | Description | |----|----|----| | Duration | [Float](#user-content-attrtype-float ) | Defines duration of the Battery - Battery Duration on maximum fixture intensity. Unit: Hours. Default value: 0 | -| Standalone | [Bool](#user-content-attrtype-boolean ) | Defines if the Fixture can be used Standalone - Fixture can be used without Power Connection. | +| ChargingTime | [Float](#user-content-attrtype-float ) | Defines the charging time - Time it takes to charge Battery. Unit: Hours. | +| BatteryOperation | [Enum](#user-content-attrtype-enum ) | Mode of operation on battery Power. Defined Modes are "Configuration" and "Standalone". Default Value "Standalone" |
From 772b23fc596f08b524b1dd68eb4feef615feabbc Mon Sep 17 00:00:00 2001 From: Verschwiegener Date: Thu, 28 Nov 2024 03:58:32 +0100 Subject: [PATCH 6/7] Moved Battery Definition to WiringObject --- gdtf-spec.md | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/gdtf-spec.md b/gdtf-spec.md index b3e16b76..11568339 100644 --- a/gdtf-spec.md +++ b/gdtf-spec.md @@ -976,7 +976,6 @@ are specified in [table 28](#user-content-table-28 ). | [Weight](#user-content-weight ) | 0 or 1 | Weight of the device including all accessories. | | [PowerConsumption](#user-content-powerconsumption ) | Any | Power information for a given connector. | | [LegHeight](#user-content-legheight ) | 0 or 1 | Height of the legs. | -| [Battery](#user-content-battery ) | 0 or 1 | Definition of Battery from Fixture | @@ -1040,27 +1039,6 @@ currently defined XML attributes of the LegHeight are specified in The LegHeight currently does not have any children. -#### Battery - -This section defines the Battery of the Fixture (XML node ``) not -used if the Fixtures has not Battery. The currently defined XML Attributes -of the Battery are specifies in [table 31.1](#user-content-table-31.1 ). - -
- -#### Table 31.1. *Battery Attributes* - -| XML Attribute Name | Value Type | Description | -|----|----|----| -| Duration | [Float](#user-content-attrtype-float ) | Defines duration of the Battery - Battery Duration on maximum fixture intensity. Unit: Hours. Default value: 0 | -| ChargingTime | [Float](#user-content-attrtype-float ) | Defines the charging time - Time it takes to charge Battery. Unit: Hours. | -| BatteryOperation | [Enum](#user-content-attrtype-enum ) | Mode of operation on battery Power. Defined Modes are "Configuration" and "Standalone". Default Value "Standalone" | - -
- -The Battery currently does not have any children. - - ## Model Collect ### General @@ -1649,7 +1627,7 @@ defined XML attributes of a wiring object geometry are specified in [table 50](# | Model | [Name](#user-content-attrtype-name ) | Link to the corresponding model. | | ConnectorType | [Name](#user-content-attrtype-name ) | The type of the connector. Find a list of predefined types in [Annex D](#user-content-table-d1 ). This is not applicable for Component Types Fuses. Custom type of connector can also be defined, for example "Loose End".| | Position | [Matrix](#user-content-attrtype-matrix ) | Relative position of geometry; Default value: Identity Matrix | -| ComponentType | [Enum](#user-content-attrtype-enum ) | The type of the electrical component used. Defined values are "Input", "Output", "PowerSource", "Consumer", "Fuse", "NetworkProvider", "NetworkInput", "NetworkOutput", "NetworkInOut". | +| ComponentType | [Enum](#user-content-attrtype-enum ) | The type of the electrical component used. Defined values are "Input", "Output", "PowerSource", "Consumer", "Fuse", "NetworkProvider", "NetworkInput", "NetworkOutput", "NetworkInOut", "Battery". | | SignalType | [String](#user-content-attrtype-string ) | The type of the signal used. Predefinded values are "Power", "DMX512", "Protocol", "AES", "AnalogVideo", "AnalogAudio". When you have a custom protocol, you can add it here. | | PinCount | [Int](#user-content-attrtype-int ) | The number of available pins of the connector type to connect internal wiring to it. | | ElectricalPayLoad | [Float](#user-content-attrtype-float ) | The electrical consumption in Watts. Only for [Consumers](#user-content-attrtype-connectortype ). Unit: Watt. | @@ -1665,6 +1643,10 @@ defined XML attributes of a wiring object geometry are specified in [table 50](# | FuseRating | [Enum](#user-content-attrtype-enum ) | Fuse Rating. Defined values are "B", "C", "D", "K", "Z". | | Orientation | [Enum](#user-content-attrtype-enum ) | Where the pins are placed on the object. Defined values are "Left", "Right", "Top", "Bottom". | | WireGroup | [String](#user-content-attrtype-string ) | Name of the group to which this wiring object belong. | +| BatteryType | [Enum](#ser-content-attrtype-enum ) | The Type of the Battery Unit. Defined values are "Soldered", "Replacable", "Quickswap", "External". | +| BatteryOperation | [Enum](#user-content-attrtype-enum ) | The function of the Fixture under Battery Power. Defined values are "Configuration", "Operation". | +| BatteryRuntime | [Float](#user-content-attrtype-float ) | The Runtime of the Fixture under Battery Power. Only for [Operation](#attrtype-batteryoperation ). +| ChargingTime | [Float](#user-content-attrtype-float ) | The Time it takes to charge the Fixture from 0 to 100%. | From 6dd7ecc48895906ad98c5e89c50f88c224dd191d Mon Sep 17 00:00:00 2001 From: Verschwiegener Date: Fri, 13 Dec 2024 13:25:57 +0100 Subject: [PATCH 7/7] Add UN Number --- gdtf-spec.md | 1 + 1 file changed, 1 insertion(+) diff --git a/gdtf-spec.md b/gdtf-spec.md index 11568339..06090f4b 100644 --- a/gdtf-spec.md +++ b/gdtf-spec.md @@ -1647,6 +1647,7 @@ defined XML attributes of a wiring object geometry are specified in [table 50](# | BatteryOperation | [Enum](#user-content-attrtype-enum ) | The function of the Fixture under Battery Power. Defined values are "Configuration", "Operation". | | BatteryRuntime | [Float](#user-content-attrtype-float ) | The Runtime of the Fixture under Battery Power. Only for [Operation](#attrtype-batteryoperation ). | ChargingTime | [Float](#user-content-attrtype-float ) | The Time it takes to charge the Fixture from 0 to 100%. | +| UN | [Integer](#user-content-attrtype-integer ) | Defines the Battery UN number for fixture transport |