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.

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

Workflow test #206

Draft
wants to merge 25 commits into
base: 193-incquery-autosar-uml-bridge
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
75a0a38
Fix typo
kkadosa Dec 5, 2023
bed3deb
Merge branch 'main' into 193-incquery-autosar-uml-bridge
kkadosa Dec 5, 2023
9da924b
Workflow test
kkadosa Dec 5, 2023
fd0974a
Fix errors introduced in formatting
kkadosa Dec 5, 2023
a7bac75
Merge branch '193-incquery-autosar-uml-bridge' into 193-testing
kkadosa Dec 5, 2023
ec61d02
Fixed errors from formatting 2
kkadosa Dec 5, 2023
05e3ec7
Merge branch '193-incquery-autosar-uml-bridge' into 193-testing
kkadosa Dec 5, 2023
92aae5c
Merge branch '193-incquery-autosar-uml-bridge' into 193-testing
kkadosa Dec 6, 2023
12d1036
Removed merge check
kkadosa Dec 6, 2023
8f9b10b
Merge branch '193-incquery-autosar-uml-bridge' into 193-testing
kkadosa Dec 6, 2023
b7a2783
Merge branch '193-incquery-autosar-uml-bridge' into 193-testing
kkadosa Dec 6, 2023
66afd62
Ultra sanity check
kkadosa Dec 8, 2023
673360a
Merge branch '193-incquery-autosar-uml-bridge' into 193-testing
kkadosa Dec 8, 2023
7d9aad7
Punc git merge in the face
kkadosa Dec 8, 2023
7191d10
Test 7
kkadosa Dec 8, 2023
d399c67
Automatic Model Update
Dec 8, 2023
0d12d87
Merge branch '193-incquery-autosar-uml-bridge' into 193-testing
kkadosa Dec 11, 2023
af66957
Merge branch '193-testing' of https://github.com/LieberLieber/LemonTr…
kkadosa Dec 11, 2023
86af853
Merge branch '193-incquery-autosar-uml-bridge' into 193-testing
kkadosa Dec 11, 2023
757380c
Small change
kkadosa Dec 11, 2023
844d09a
Merge branch '193-incquery-autosar-uml-bridge' into 193-testing
kkadosa Dec 18, 2023
26dcae9
Automatic Model Update
Dec 18, 2023
30b4210
Merge branch '193-incquery-autosar-uml-bridge' into 193-testing
kkadosa Dec 18, 2023
134fd50
Minimizing changes
kkadosa Dec 18, 2023
184f6a1
Automatic Model Update
Dec 18, 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 counting-logic.eapx
Git LFS file not shown
4 changes: 2 additions & 2 deletions example-arxml/counting-logic.arxml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<TYPE-TREF DEST="APPLICATION-SW-COMPONENT-TYPE">/CountingLogic/Components/Counter</TYPE-TREF>
</SW-COMPONENT-PROTOTYPE>
<SW-COMPONENT-PROTOTYPE UUID="8894a408-6820-3aa4-bae8-eebe34da1469">
<SHORT-NAME>generator</SHORT-NAME>
<SHORT-NAME>generatorW</SHORT-NAME>
<TYPE-TREF DEST="APPLICATION-SW-COMPONENT-TYPE">/CountingLogic/Components/CountAlterer</TYPE-TREF>
</SW-COMPONENT-PROTOTYPE>
</COMPONENTS>
Expand All @@ -31,7 +31,7 @@
<TARGET-P-PORT-REF DEST="P-PORT-PROTOTYPE">/CountingLogic/Components/Counter/control</TARGET-P-PORT-REF>
</PROVIDER-IREF>
<REQUESTER-IREF>
<CONTEXT-COMPONENT-REF DEST="SW-COMPONENT-PROTOTYPE">/CountingLogic/Components/Application/generator</CONTEXT-COMPONENT-REF>
<CONTEXT-COMPONENT-REF DEST="SW-COMPONENT-PROTOTYPE">/CountingLogic/Components/Application/generatorW</CONTEXT-COMPONENT-REF>
<TARGET-R-PORT-REF DEST="R-PORT-PROTOTYPE">/CountingLogic/Components/CountAlterer/alterCount</TARGET-R-PORT-REF>
</REQUESTER-IREF>
</ASSEMBLY-SW-CONNECTOR>
Expand Down