Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Hvendor and Hname as attributes of accept, require and deny elements #228

Merged
merged 2 commits into from
Apr 12, 2023
Merged

Add Hvendor and Hname as attributes of accept, require and deny elements #228

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51ccb6f
Add Hvendor and Hname as attributes of accept, require and deny elements
silviooliva Apr 12, 2023
a3d265b
Redefine Hvendor as xs:string
silviooliva Apr 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doxygen/pack.dxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "Open-CMSIS-Pack"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = "Version 1.7.21"
PROJECT_NUMBER = "Version 1.7.22"

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
6 changes: 6 additions & 0 deletions doxygen/src/General.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ Pack\\Tutorials | Tutorials for \ref cp_Packs "Creating Packs" |
<th>Version</th>
<th>Description</th>
</tr>
<tr>
<td>1.7.22</td>
<td>
- added 'Hvendor' and 'Hname' as attributes of the \ref element_accept "accept", \ref element_require "require" and \ref element_deny "deny" elements
</td>
</tr>
<tr>
<td>1.7.21</td>
<td>
Expand Down
18 changes: 18 additions & 0 deletions doxygen/src/conditions_schema.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ be ignored.
<description>False if the device is from ST and the device name starts with "STM32"</description>
<deny Dvendor="STMicroelectronics:13" Dname="STM32*"/> <!-- device name must not start with STM32 and be from vendor ST-->
</condition>

<condition id="HTS221 Part"> <!-- defines the condition with ID "HTS221 Part" -->
<description>True if the target part is the HTS221TR</description>
<require Hvendor="STMicroelectronics:13" Hname="HTS221TR"/> <!-- part name must be HTS221TR and be from vendor ST-->
</condition>
</conditions>
\endcode

Expand Down Expand Up @@ -347,6 +352,19 @@ A \ref element_condition "condition" becomes \token{true} when:
<td>xs:string</td>
<td>optional</td>
</tr>
<tr>
<td>Hvendor</td>
<td>Specifies the vendor of the part. Use predefined values as listed in the table \ref DeviceVendorEnum "Device Vendor".</td>
<td>\ref DeviceVendorEnum</td>
<td>optional</td>
</tr>
<tr>
<td>Hname<b>*</b></td>
<td>Specifies the name of the part.
</td>
<td>xs:string</td>
<td>optional</td>
</tr>
<tr>
<td>Tcompiler</td>
<td>Specifies a compiler toolchain (ARMCC, GCC, IAR, Tasking, ...). Use predefined values as listed in table \ref CompilerEnumType "Compiler Types".</td>
Expand Down
12 changes: 8 additions & 4 deletions schema/PACK.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@
See the License for the specific language governing permissions and
limitations under the License.

$Date: 05. Apr 2023
$Revision: 1.7.21
$Date: 12. Apr 2023
$Revision: 1.7.22
$Project: Schema File for Package Description File Format Specification

Package file name convention <vendor>.<name>.<version>.pack
SchemaVersion=1.7.21
SchemaVersion=1.7.22

12. Apr 2023: v1.7.22
- added Hvendor and Hname as attributes of the accept, require and deny elements
05. Apr 2023: v1.7.21
- added 'Himax:178' to DeviceVendorEnum
- added 'Renesas' to CompilerEnumType
Expand Down Expand Up @@ -188,7 +190,7 @@

-->

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="qualified" version="1.7.21">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="qualified" version="1.7.22">

<!-- NonNegativeInteger specifies the format in which numbers are represented in hexadecimal or decimal format -->
<xs:simpleType name="NonNegativeInteger">
Expand Down Expand Up @@ -1286,6 +1288,8 @@
<xs:attribute name="Bvendor" type="xs:string" />
<xs:attribute name="Bname" type="xs:string" />
<xs:attribute name="Brevision" type="xs:string" />
<xs:attribute name="Hvendor" type="DeviceVendorEnum" />
silviooliva marked this conversation as resolved.
Show resolved Hide resolved
<xs:attribute name="Hname" type="xs:string" /> <!-- can contain wildcards ?* in condition -->
<xs:attribute name="Tcompiler" type="CompilerEnumType" />
<!-- Toptions can only be used in combination with Tcompiler and the strings are predefined by the specification -->
<xs:attribute name="Toptions" type="CompilerOptionsEnumType" />
Expand Down