Skip to content

maint: add .gitattributes files and upgrade 2025R2 #21

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

Merged
ansloddos merged 3 commits into from
Sep 1, 2025
Merged

maint: add .gitattributes files and upgrade 2025R2 #21

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08e7e12
add .gitattributes files
ansloddos Aug 6, 2025
f10b98e
upgrade 2025R2
ansloddos Aug 6, 2025
301141a
move to scade-actions v2.2
ansloddos Sep 1, 2025
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
16 changes: 16 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
######################################################
# GitHub Linguist overrides for SCADE-specific files #
######################################################

# Architect project info, may be confused with Dlang
*.di linguist-vendored
# Model Coverage results, may be confused with MaxScript
*.mcr linguist-vendored
# Task pragmas, may be confused with Papyrus
*.psc linguist-vendored
# A661 look definitions, may be confused with Scheme
*.sld linguist-vendored
# Test scenarios, may be confused with SugarSS
*.sss linguist-vendored
# Test records, may be confused with GAP, Scilab
*.tst linguist-vendored
8 changes: 4 additions & 4 deletions .github/workflows/ci_cd_night.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
strategy:
matrix:
os: [windows-latest]
scade-version: ['24.2']
scade-version: ['25.2']
fail-fast: false
steps:
- name: "Install Git and clone project"
Expand All @@ -55,7 +55,7 @@ jobs:
uses: ansys/scade-actions/get-scade-dir@v2
id: get-scade-dir
with:
scade-version: "24.2"
scade-version: "25.2"

- name: "Check Rules"
uses: ansys/scade-actions/[email protected]
Expand All @@ -70,7 +70,7 @@ jobs:
strategy:
matrix:
os: [windows-latest]
scade-version: ['24.2']
scade-version: ['25.2']
fail-fast: false
needs: [rules-checker]
steps:
Expand All @@ -81,7 +81,7 @@ jobs:
uses: ansys/scade-actions/get-scade-dir@v2
id: get-scade-dir
with:
scade-version: "24.2"
scade-version: "25.2"

- name: "Generate Standalone"
uses: ansys/scade-actions/suite-code@v2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci_cd_pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
strategy:
matrix:
os: [windows-latest]
scade-version: ['24.2']
scade-version: ['25.2']
fail-fast: false
needs: [code-style]
steps:
Expand All @@ -77,7 +77,7 @@ jobs:
uses: ansys/scade-actions/get-scade-dir@v2
id: get-scade-dir
with:
scade-version: "24.2"
scade-version: "25.2"

- name: "Check Rules"
uses: ansys/scade-actions/[email protected]
Expand All @@ -92,7 +92,7 @@ jobs:
strategy:
matrix:
os: [windows-latest]
scade-version: ['24.2']
scade-version: ['25.2']
fail-fast: false
needs: [rules-checker]
steps:
Expand All @@ -103,7 +103,7 @@ jobs:
uses: ansys/scade-actions/get-scade-dir@v2
id: get-scade-dir
with:
scade-version: "24.2"
scade-version: "25.2"

- name: "Generate Standalone"
uses: ansys/scade-actions/suite-code@v2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci_cd_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
strategy:
matrix:
os: [windows-latest]
scade-version: ['24.2']
scade-version: ['25.2']
fail-fast: false
needs: [code-style]
steps:
Expand All @@ -64,7 +64,7 @@ jobs:
uses: ansys/scade-actions/get-scade-dir@v2
id: get-scade-dir
with:
scade-version: "24.2"
scade-version: "25.2"

- name: "Check Rules"
uses: ansys/scade-actions/[email protected]
Expand All @@ -79,7 +79,7 @@ jobs:
strategy:
matrix:
os: [windows-latest]
scade-version: ['24.2']
scade-version: ['25.2']
fail-fast: false
needs: [rules-checker]
steps:
Expand All @@ -90,7 +90,7 @@ jobs:
uses: ansys/scade-actions/get-scade-dir@v2
id: get-scade-dir
with:
scade-version: "24.2"
scade-version: "25.2"

- name: "Generate Standalone"
uses: ansys/scade-actions/suite-code@v2
Expand Down
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Multi-touch Cockpit
:target: https://www.ansys.com/fr-fr/products/embedded-software/
:alt: Ansys SCADE Suite, Display, Test

.. |version| image:: https://img.shields.io/badge/version-2024R2-blue
.. |version| image:: https://img.shields.io/badge/version-2025R2-blue
:alt: version

.. |CI-CD| image:: https://github.com/ansys/scade-example-multi-touch-cockpit/actions/workflows/ci_cd_main.yml/badge.svg
Expand Down
2 changes: 1 addition & 1 deletion doc/source/description.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Multi-touch cockpit interface
:target: https://www.ansys.com/fr-fr/products/embedded-software/
:alt: Ansys SCADE Suite, Display, Test

.. |version| image:: https://img.shields.io/badge/version-2024R2-blue
.. |version| image:: https://img.shields.io/badge/version-2025R2-blue
:alt: version

.. |license| image:: https://img.shields.io/badge/License-MIT-yellow.svg
Expand Down
9 changes: 6 additions & 3 deletions model/scade-display/GCS.etp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Project id="1" oid_count="243">
<Project id="1" oid_count="244">
<props>
<Prop id="1" name="@STUDIO:PRODUCT">
<value>DISPLAY</value>
</Prop>
<Prop id="3" name="@SDY:RELEASE">
<value>24.1</value>
<value>25.2</value>
</Prop>
<Prop id="4" name="@SDY:RATIO">
<value>1.0</value>
Expand Down Expand Up @@ -139,7 +139,6 @@
</Prop>
<Prop id="73" name="@SDY:@SDYREP:OUTPUT">
<value>%ModelName%_Report</value>
<configuration>70</configuration>
</Prop>
<Prop id="74" name="@SDYREP:INTERNATIONALIZATION">
<configuration>70</configuration>
Expand Down Expand Up @@ -309,6 +308,10 @@ $(CreatedDate)</value>
<value>1</value>
<configuration>21</configuration>
</Prop>
<Prop id="244" name="@SDYREP:OUTPUT">
<value>%ModelName%_Report</value>
<configuration>70</configuration>
</Prop>
</props>
<roots>
<Folder id="11" extensions="sct;swt;sst;sft;stt" name="Resource Files">
Expand Down
72 changes: 10 additions & 62 deletions model/scade-display/GCS.sgfx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1187,77 +1187,25 @@
</tessellate>
</properties>
</rectangle>
<rectangle oid="6539b1a4-2955-43c3-8643-2a814f739116">
<bitmap oid="4635125f-48f2-4fbc-a125-d5735e951c7c">
<pathFromRoot value="1,5"/>
<properties name="ansys">
<visible>
<init>true</init>
</visible>
<firstPoint>
<x>
<init>-637.0</init>
</x>
<y>
<init>-383.0</init>
</y>
</firstPoint>
<thirdPoint>
<position>
<x>
<init>-486.0</init>
<init>-639.0</init>
</x>
<y>
<init>-331.0</init>
<init>-398.0</init>
</y>
</thirdPoint>
<lineWidth>
<init>0</init>
</lineWidth>
<lineStipple>
<init>0</init>
</lineStipple>
<lineCap>
<init>round</init>
</lineCap>
<haloing>
<init>false</init>
</haloing>
<haloColor>
<init>-1</init>
</haloColor>
<outlineColor>
<init>-1</init>
</outlineColor>
<outlineOpacity>
<init>255</init>
</outlineOpacity>
<fillColor>
<init>-1</init>
</fillColor>
<fillOpacity>
<init>255</init>
</fillOpacity>
<polygonSmooth>
<init>true</init>
</polygonSmooth>
<textureControl>
<init>false</init>
</textureControl>
<texture horizAlign="center" horizPattern="1.0" vertAlign="middle" vertPattern="1.0">
<textureId>
<init>102</init>
</textureId>
</texture>
<gradient>
<init>-1</init>
</gradient>
<modulate>
<init>false</init>
</modulate>
<tessellate>
<init>false</init>
</tessellate>
</position>
<textureId>
<init>102</init>
</textureId>
</properties>
</rectangle>
</bitmap>
</children>
</container>
<container oid="a925e021-eabb-4bd9-89bd-644748b98a16">
Expand Down Expand Up @@ -4964,5 +4912,5 @@
</children>
</specification>

<!-- crc32 : 4239869854 -->
<!-- crc32 : 2203509111 -->

6 changes: 3 additions & 3 deletions model/scade-display/altitudeWidget.ogfx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
</angle>
</rotate>
<orientation clockwise="false"/>
<static editorLinked="true" generateStaticSequence="true" maxX="-409.25" maxY="472.00012" minX="-593.5" minY="113.000015">
<static editorLinked="true" generateStaticSequence="true" maxX="-429.0" maxY="469.0" minX="-593.5" minY="113.0">
<init>false</init>
</static>
</properties>
Expand Down Expand Up @@ -230,7 +230,7 @@
</angle>
</rotate>
<orientation clockwise="false"/>
<static editorLinked="true" generateStaticSequence="true" maxX="80.00001" maxY="-9.499981" minX="-104.24999" minY="-39.74998">
<static editorLinked="true" generateStaticSequence="true" maxX="-20.249992" maxY="-9.749981" minX="-104.24999" minY="-39.749996">
<init>false</init>
</static>
</properties>
Expand Down Expand Up @@ -797,5 +797,5 @@
</children>
</object>

<!-- crc32 : 1898831834 -->
<!-- crc32 : 2123745132 -->

4 changes: 2 additions & 2 deletions model/scade-display/headingWidget.ogfx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@
</angle>
</rotate>
<orientation clockwise="false"/>
<static editorLinked="true" generateStaticSequence="true" maxX="57.312523" maxY="193.18748" minX="-23.0" minY="163.0">
<static editorLinked="true" generateStaticSequence="true" maxX="39.5" maxY="193.0" minX="-23.0" minY="163.0">
<init>false</init>
</static>
</properties>
Expand Down Expand Up @@ -689,5 +689,5 @@
</children>
</object>

<!-- crc32 : 414027839 -->
<!-- crc32 : 4129583092 -->

Loading
Loading