Skip to content

Commit d7c08bf

Browse files
ansloddosansloddos
authored
maint: add .gitattributes files and upgrade 2025R2 (#21)
* add .gitattributes files * upgrade 2025R2 * move to scade-actions v2.2
1 parent 87dae2a commit d7c08bf

File tree

14 files changed

+145
-171
lines changed

14 files changed

+145
-171
lines changed

‎.gitattributes‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
######################################################
2+
# GitHub Linguist overrides for SCADE-specific files #
3+
######################################################
4+
5+
# Architect project info, may be confused with Dlang
6+
*.di linguist-vendored
7+
# Model Coverage results, may be confused with MaxScript
8+
*.mcr linguist-vendored
9+
# Task pragmas, may be confused with Papyrus
10+
*.psc linguist-vendored
11+
# A661 look definitions, may be confused with Scheme
12+
*.sld linguist-vendored
13+
# Test scenarios, may be confused with SugarSS
14+
*.sss linguist-vendored
15+
# Test records, may be confused with GAP, Scilab
16+
*.tst linguist-vendored

‎.github/workflows/ci_cd_night.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,21 @@ jobs:
4545
strategy:
4646
matrix:
4747
os: [windows-latest]
48-
scade-version: ['24.2']
48+
scade-version: ['25.2']
4949
fail-fast: false
5050
steps:
5151
- name: "Install Git and clone project"
5252
uses: actions/checkout@v4
5353

5454
- name: "Get SCADE installation directory"
55-
uses: ansys/scade-actions/get-scade-dir@v2
55+
uses: ansys/scade-actions/get-scade-dir@v2.2
5656
id: get-scade-dir
5757
with:
58-
scade-version: "24.2"
58+
scade-version: "25.2"
5959

6060
- name: "Check Rules"
61-
uses: ansys/scade-actions/[email protected]
61+
uses: ansys/scade-actions/[email protected]
62+
6263
with:
6364
scade-dir: ${{ steps.get-scade-dir.outputs.scade-directory }}
6465
project: 'model/scade-suite/GlassCockpit.etp'
@@ -70,21 +71,21 @@ jobs:
7071
strategy:
7172
matrix:
7273
os: [windows-latest]
73-
scade-version: ['24.2']
74+
scade-version: ['25.2']
7475
fail-fast: false
7576
needs: [rules-checker]
7677
steps:
7778
- name: "Install Git and clone project"
7879
uses: actions/checkout@v4
7980

8081
- name: "Get SCADE installation directory"
81-
uses: ansys/scade-actions/get-scade-dir@v2
82+
uses: ansys/scade-actions/get-scade-dir@v2.2
8283
id: get-scade-dir
8384
with:
84-
scade-version: "24.2"
85+
scade-version: "25.2"
8586

8687
- name: "Generate Standalone"
87-
uses: ansys/scade-actions/suite-code@v2
88+
uses: ansys/scade-actions/suite-code@v2.2
8889
with:
8990
scade-dir: ${{ steps.get-scade-dir.outputs.scade-directory }}
9091
project: 'model/scade-suite/GlassCockpit.etp'

‎.github/workflows/ci_cd_pr.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,21 +66,21 @@ jobs:
6666
strategy:
6767
matrix:
6868
os: [windows-latest]
69-
scade-version: ['24.2']
69+
scade-version: ['25.2']
7070
fail-fast: false
7171
needs: [code-style]
7272
steps:
7373
- name: "Install Git and clone project"
7474
uses: actions/checkout@v4
7575

7676
- name: "Get SCADE installation directory"
77-
uses: ansys/scade-actions/get-scade-dir@v2
77+
uses: ansys/scade-actions/get-scade-dir@v2.2
7878
id: get-scade-dir
7979
with:
80-
scade-version: "24.2"
80+
scade-version: "25.2"
8181

8282
- name: "Check Rules"
83-
uses: ansys/scade-actions/suite-rules@v2.1
83+
uses: ansys/scade-actions/suite-rules@v2.2
8484
with:
8585
scade-dir: ${{ steps.get-scade-dir.outputs.scade-directory }}
8686
project: 'model/scade-suite/GlassCockpit.etp'
@@ -92,21 +92,21 @@ jobs:
9292
strategy:
9393
matrix:
9494
os: [windows-latest]
95-
scade-version: ['24.2']
95+
scade-version: ['25.2']
9696
fail-fast: false
9797
needs: [rules-checker]
9898
steps:
9999
- name: "Install Git and clone project"
100100
uses: actions/checkout@v4
101101

102102
- name: "Get SCADE installation directory"
103-
uses: ansys/scade-actions/get-scade-dir@v2
103+
uses: ansys/scade-actions/get-scade-dir@v2.2
104104
id: get-scade-dir
105105
with:
106-
scade-version: "24.2"
106+
scade-version: "25.2"
107107

108108
- name: "Generate Standalone"
109-
uses: ansys/scade-actions/suite-code@v2
109+
uses: ansys/scade-actions/suite-code@v2.2
110110
with:
111111
scade-dir: ${{ steps.get-scade-dir.outputs.scade-directory }}
112112
project: 'model/scade-suite/GlassCockpit.etp'

‎.github/workflows/ci_cd_release.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,21 @@ jobs:
5353
strategy:
5454
matrix:
5555
os: [windows-latest]
56-
scade-version: ['24.2']
56+
scade-version: ['25.2']
5757
fail-fast: false
5858
needs: [code-style]
5959
steps:
6060
- name: "Install Git and clone project"
6161
uses: actions/checkout@v4
6262

6363
- name: "Get SCADE installation directory"
64-
uses: ansys/scade-actions/get-scade-dir@v2
64+
uses: ansys/scade-actions/get-scade-dir@v2.2
6565
id: get-scade-dir
6666
with:
67-
scade-version: "24.2"
67+
scade-version: "25.2"
6868

6969
- name: "Check Rules"
70-
uses: ansys/scade-actions/suite-rules@v2.1
70+
uses: ansys/scade-actions/suite-rules@v2.2
7171
with:
7272
scade-dir: ${{ steps.get-scade-dir.outputs.scade-directory }}
7373
project: 'model/scade-suite/GlassCockpit.etp'
@@ -79,21 +79,21 @@ jobs:
7979
strategy:
8080
matrix:
8181
os: [windows-latest]
82-
scade-version: ['24.2']
82+
scade-version: ['25.2']
8383
fail-fast: false
8484
needs: [rules-checker]
8585
steps:
8686
- name: "Install Git and clone project"
8787
uses: actions/checkout@v4
8888

8989
- name: "Get SCADE installation directory"
90-
uses: ansys/scade-actions/get-scade-dir@v2
90+
uses: ansys/scade-actions/get-scade-dir@v2.2
9191
id: get-scade-dir
9292
with:
93-
scade-version: "24.2"
93+
scade-version: "25.2"
9494

9595
- name: "Generate Standalone"
96-
uses: ansys/scade-actions/suite-code@v2
96+
uses: ansys/scade-actions/suite-code@v2.2
9797
with:
9898
scade-dir: ${{ steps.get-scade-dir.outputs.scade-directory }}
9999
project: 'model/scade-suite/GlassCockpit.etp'

‎README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Multi-touch Cockpit
1010
:target: https://www.ansys.com/fr-fr/products/embedded-software/
1111
:alt: Ansys SCADE Suite, Display, Test
1212

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

1616
.. |CI-CD| image:: https://github.com/ansys/scade-example-multi-touch-cockpit/actions/workflows/ci_cd_main.yml/badge.svg

‎doc/source/description.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Multi-touch cockpit interface
1010
:target: https://www.ansys.com/fr-fr/products/embedded-software/
1111
:alt: Ansys SCADE Suite, Display, Test
1212

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

1616
.. |license| image:: https://img.shields.io/badge/License-MIT-yellow.svg

‎model/scade-display/GCS.etp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<Project id="1" oid_count="243">
2+
<Project id="1" oid_count="244">
33
<props>
44
<Prop id="1" name="@STUDIO:PRODUCT">
55
<value>DISPLAY</value>
66
</Prop>
77
<Prop id="3" name="@SDY:RELEASE">
8-
<value>24.1</value>
8+
<value>25.2</value>
99
</Prop>
1010
<Prop id="4" name="@SDY:RATIO">
1111
<value>1.0</value>
@@ -139,7 +139,6 @@
139139
</Prop>
140140
<Prop id="73" name="@SDY:@SDYREP:OUTPUT">
141141
<value>%ModelName%_Report</value>
142-
<configuration>70</configuration>
143142
</Prop>
144143
<Prop id="74" name="@SDYREP:INTERNATIONALIZATION">
145144
<configuration>70</configuration>
@@ -309,6 +308,10 @@ $(CreatedDate)</value>
309308
<value>1</value>
310309
<configuration>21</configuration>
311310
</Prop>
311+
<Prop id="244" name="@SDYREP:OUTPUT">
312+
<value>%ModelName%_Report</value>
313+
<configuration>70</configuration>
314+
</Prop>
312315
</props>
313316
<roots>
314317
<Folder id="11" extensions="sct;swt;sst;sft;stt" name="Resource Files">

‎model/scade-display/GCS.sgfx‎

Lines changed: 10 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,77 +1187,25 @@
11871187
</tessellate>
11881188
</properties>
11891189
</rectangle>
1190-
<rectangle oid="6539b1a4-2955-43c3-8643-2a814f739116">
1190+
<bitmap oid="4635125f-48f2-4fbc-a125-d5735e951c7c">
11911191
<pathFromRoot value="1,5"/>
11921192
<properties name="ansys">
11931193
<visible>
11941194
<init>true</init>
11951195
</visible>
1196-
<firstPoint>
1197-
<x>
1198-
<init>-637.0</init>
1199-
</x>
1200-
<y>
1201-
<init>-383.0</init>
1202-
</y>
1203-
</firstPoint>
1204-
<thirdPoint>
1196+
<position>
12051197
<x>
1206-
<init>-486.0</init>
1198+
<init>-639.0</init>
12071199
</x>
12081200
<y>
1209-
<init>-331.0</init>
1201+
<init>-398.0</init>
12101202
</y>
1211-
</thirdPoint>
1212-
<lineWidth>
1213-
<init>0</init>
1214-
</lineWidth>
1215-
<lineStipple>
1216-
<init>0</init>
1217-
</lineStipple>
1218-
<lineCap>
1219-
<init>round</init>
1220-
</lineCap>
1221-
<haloing>
1222-
<init>false</init>
1223-
</haloing>
1224-
<haloColor>
1225-
<init>-1</init>
1226-
</haloColor>
1227-
<outlineColor>
1228-
<init>-1</init>
1229-
</outlineColor>
1230-
<outlineOpacity>
1231-
<init>255</init>
1232-
</outlineOpacity>
1233-
<fillColor>
1234-
<init>-1</init>
1235-
</fillColor>
1236-
<fillOpacity>
1237-
<init>255</init>
1238-
</fillOpacity>
1239-
<polygonSmooth>
1240-
<init>true</init>
1241-
</polygonSmooth>
1242-
<textureControl>
1243-
<init>false</init>
1244-
</textureControl>
1245-
<texture horizAlign="center" horizPattern="1.0" vertAlign="middle" vertPattern="1.0">
1246-
<textureId>
1247-
<init>102</init>
1248-
</textureId>
1249-
</texture>
1250-
<gradient>
1251-
<init>-1</init>
1252-
</gradient>
1253-
<modulate>
1254-
<init>false</init>
1255-
</modulate>
1256-
<tessellate>
1257-
<init>false</init>
1258-
</tessellate>
1203+
</position>
1204+
<textureId>
1205+
<init>102</init>
1206+
</textureId>
12591207
</properties>
1260-
</rectangle>
1208+
</bitmap>
12611209
</children>
12621210
</container>
12631211
<container oid="a925e021-eabb-4bd9-89bd-644748b98a16">
@@ -4964,5 +4912,5 @@
49644912
</children>
49654913
</specification>
49664914

4967-
<!-- crc32 : 4239869854 -->
4915+
<!-- crc32 : 2203509111 -->
49684916

‎model/scade-display/altitudeWidget.ogfx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
</angle>
8989
</rotate>
9090
<orientation clockwise="false"/>
91-
<static editorLinked="true" generateStaticSequence="true" maxX="-409.25" maxY="472.00012" minX="-593.5" minY="113.000015">
91+
<static editorLinked="true" generateStaticSequence="true" maxX="-429.0" maxY="469.0" minX="-593.5" minY="113.0">
9292
<init>false</init>
9393
</static>
9494
</properties>
@@ -230,7 +230,7 @@
230230
</angle>
231231
</rotate>
232232
<orientation clockwise="false"/>
233-
<static editorLinked="true" generateStaticSequence="true" maxX="80.00001" maxY="-9.499981" minX="-104.24999" minY="-39.74998">
233+
<static editorLinked="true" generateStaticSequence="true" maxX="-20.249992" maxY="-9.749981" minX="-104.24999" minY="-39.749996">
234234
<init>false</init>
235235
</static>
236236
</properties>
@@ -797,5 +797,5 @@
797797
</children>
798798
</object>
799799

800-
<!-- crc32 : 1898831834 -->
800+
<!-- crc32 : 2123745132 -->
801801

‎model/scade-display/headingWidget.ogfx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@
570570
</angle>
571571
</rotate>
572572
<orientation clockwise="false"/>
573-
<static editorLinked="true" generateStaticSequence="true" maxX="57.312523" maxY="193.18748" minX="-23.0" minY="163.0">
573+
<static editorLinked="true" generateStaticSequence="true" maxX="39.5" maxY="193.0" minX="-23.0" minY="163.0">
574574
<init>false</init>
575575
</static>
576576
</properties>
@@ -689,5 +689,5 @@
689689
</children>
690690
</object>
691691

692-
<!-- crc32 : 414027839 -->
692+
<!-- crc32 : 4129583092 -->
693693

0 commit comments

Comments
 (0)