Skip to content

Develop #9

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
junexi0828 merged 2 commits into from
Mar 31, 2026
Merged

Develop #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f64659d
docs(portfolio): add report appendix and portfolio package
junexi0828 Mar 31, 2026
be8fa19
finalize CANoe runtime closeout and evidence pack
junexi0828 Mar 31, 2026
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
528 changes: 272 additions & 256 deletions canoe/cfg/CAN_v2_topology.cfg
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions canoe/cfg/CAN_v2_topology.stcfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[NStatePersistence]
Signature=VectorStatePersistence
[VGlobalMeasurementIndex]
mMeasurementIndex=173
[VTestConfigurationConfigData]
IT_ACTIVE_BASELINE_NextTestRun=19
ST_ACTIVE_BASELINE_NextTestRun=18
UT_ACTIVE_BASELINE_NextTestRun=34
[VTestExecutable]
IT_ACTIVE_BASELINE_LastReportFile=Report_IT_ACTIVE_BASELINE.vtestreport
IT_ACTIVE_BASELINE_LastReportTmpFile=rpt3817.vtestreport
ST_ACTIVE_BASELINE_LastReportFile=Report_ST_ACTIVE_BASELINE.vtestreport
ST_ACTIVE_BASELINE_LastReportTmpFile=rpt55f7.vtestreport
UT_ACTIVE_BASELINE_LastReportFile=Report_UT_ACTIVE_BASELINE.vtestreport
UT_ACTIVE_BASELINE_LastReportTmpFile=rpt6ad5.vtestreport
24 changes: 12 additions & 12 deletions canoe/cfg/Report_IT_ACTIVE_BASELINE.이준영.settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
<value type="Vector.ReportViewer.ViewModel.ContentModels.ContentModelPersistList">
<ArrayOfContentModelPersist>
<ContentModelPersist d7p1:type="VisualizableNodeModelPersist" xmlns:d7p1="http://www.w3.org/2001/XMLSchema-instance">
<ReportUniqueId>9c592cb0-231c-493b-9bb9-7a269e46b26f</ReportUniqueId>
<NodeName>TC_CANOE_IT_008_CORE_CLUSTER_DIRECTION_OUTPUT</NodeName>
<ReportUniqueId>a26e2067-6b06-4cd5-9eea-64311b05a061</ReportUniqueId>
<NodeName>TC_CANOE_IT_018_EXT_EMERGENCY_PLUS_TTC</NodeName>
<NodeType>TestCase</NodeType>
<DbId>16</DbId>
<DbId>36</DbId>
<IsTreeNode>true</IsTreeNode>
<PathToNode>
<string>TC_CANOE_IT_008_CORE_CLUSTER_DIRECTION_OUTPUT</string>
<string>ClusterDirectionOutput</string>
<string>TC_CANOE_IT_008_CORE_CLUSTER_DIRECTION_OUTPUT</string>
<string>TC_CANOE_IT_018_EXT_EMERGENCY_PLUS_TTC</string>
<string>EmergencyPlusTtc</string>
<string>TC_CANOE_IT_018_EXT_EMERGENCY_PLUS_TTC</string>
</PathToNode>
</ContentModelPersist>
</ArrayOfContentModelPersist>
Expand Down Expand Up @@ -62,15 +62,15 @@
<value type="System.String">
<string>&lt;DockSiteLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SerializationFormat="All" Version="2"&gt;
&lt;AutoHideHost /&gt;
&lt;Content xsi:type="SplitContainer" Orientation="Vertical" DockedSize="1524,676"&gt;
&lt;Content xsi:type="SplitContainer" Orientation="Vertical" DockedSize="1912,894"&gt;
&lt;UIElement xsi:type="SplitContainer" Orientation="Horizontal" DockedSize="554,200"&gt;
&lt;UIElement xsi:type="ToolWindowContainer" DockedSize="350,150" SelectedWindowUniqueId="c8f012ae-c2ef-4f3c-b2c6-6d1229ae06c4"&gt;
&lt;UIElement xsi:type="ToolWindowRef" UniqueId="c8f012ae-c2ef-4f3c-b2c6-6d1229ae06c4" /&gt;
&lt;/UIElement&gt;
&lt;UIElement xsi:type="Workspace"&gt;
&lt;Content xsi:type="TabbedMdiHost"&gt;
&lt;Content xsi:type="TabbedMdiContainer" SelectedWindowUniqueId="217082e6-dc45-442f-a549-8ec72e5d6bb4"&gt;
&lt;UIElement xsi:type="DocumentWindowRef" UniqueId="217082e6-dc45-442f-a549-8ec72e5d6bb4" /&gt;
&lt;Content xsi:type="TabbedMdiContainer" SelectedWindowUniqueId="44198005-e25f-42f1-be94-c15e3729bcdf"&gt;
&lt;UIElement xsi:type="DocumentWindowRef" UniqueId="44198005-e25f-42f1-be94-c15e3729bcdf" /&gt;
&lt;/Content&gt;
&lt;/Content&gt;
&lt;/UIElement&gt;
Expand All @@ -81,10 +81,10 @@
&lt;/UIElement&gt;
&lt;/Content&gt;
&lt;DocumentWindows&gt;
&lt;DocumentWindow UniqueId="217082e6-dc45-442f-a549-8ec72e5d6bb4" SerializationId="TestCase&amp;lt;16&amp;gt;" IsOpen="true" LastActiveDateTime="2026-03-31T10:46:55.04345+09:00" State="Document" Type="Vector.ReportViewer.UI.ContentViews.Controls.ContentViewDocumentWnd, Vector.ReportViewer.UI" /&gt;
&lt;DocumentWindow UniqueId="44198005-e25f-42f1-be94-c15e3729bcdf" SerializationId="TestCase&amp;lt;36&amp;gt;" IsOpen="true" LastActiveDateTime="2026-03-31T13:17:04.9514544+09:00" State="Document" Type="Vector.ReportViewer.UI.ContentViews.Controls.ContentViewDocumentWnd, Vector.ReportViewer.UI" /&gt;
&lt;/DocumentWindows&gt;
&lt;ToolWindows&gt;
&lt;ToolWindow UniqueId="c8f012ae-c2ef-4f3c-b2c6-6d1229ae06c4" Name="mWndExplorer" ContainerDockedSize="350,150" IsOpen="true" LastActiveDateTime="2026-03-31T10:46:53.9204472+09:00" State="Docked" /&gt;
&lt;ToolWindow UniqueId="c8f012ae-c2ef-4f3c-b2c6-6d1229ae06c4" Name="mWndExplorer" ContainerDockedSize="350,150" IsOpen="true" LastActiveDateTime="2026-03-31T13:17:03.7586409+09:00" State="Docked" /&gt;
&lt;ToolWindow UniqueId="e9cddcf6-a3ef-4482-8ed4-30c361c53888" Name="mWndCommentsOverview" ContainerDockedSize="350,150" IsOpen="false" State="Docked" /&gt;
&lt;ToolWindow UniqueId="330e3106-c061-45c0-bd80-dc1b4fc3749b" Name="mWndReassessmentsOverview" ContainerDockedSize="350,150" IsOpen="false" State="Docked" /&gt;
&lt;/ToolWindows&gt;
Expand All @@ -103,7 +103,7 @@
</Location>
<Width>1536</Width>
<Height>864</Height>
<WndState>Normal</WndState>
<WndState>Maximized</WndState>
</WndPosAndSize>
</value>
</item>
Expand Down
70 changes: 33 additions & 37 deletions canoe/cfg/Report_ST_ACTIVE_BASELINE.이준영.settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,12 @@
<value type="Vector.ReportViewer.ViewModel.ContentModels.ContentModelPersistList">
<ArrayOfContentModelPersist>
<ContentModelPersist d7p1:type="VisualizableNodeModelPersist" xmlns:d7p1="http://www.w3.org/2001/XMLSchema-instance">
<ReportUniqueId>64c5fcce-f317-4115-a4da-04aae89952b4</ReportUniqueId>
<NodeName>TC_CANOE_ST_007_CORE_HIGHWAY_POLICY_TRANSITION</NodeName>
<NodeType>TestCase</NodeType>
<DbId>14</DbId>
<ReportUniqueId>ef48a5b0-7f54-4025-829f-b62232d8a3be</ReportUniqueId>
<NodeName>ST_ACTIVE_BASELINE</NodeName>
<NodeType>TestReport</NodeType>
<DbId>1</DbId>
<IsTreeNode>true</IsTreeNode>
<PathToNode>
<string>TC_CANOE_ST_007_CORE_HIGHWAY_POLICY_TRANSITION</string>
<string>HighwayPolicyTransition</string>
<string>TC_CANOE_ST_007_CORE_HIGHWAY_POLICY_TRANSITION</string>
</PathToNode>
<PathToNode />
</ContentModelPersist>
</ArrayOfContentModelPersist>
</value>
Expand Down Expand Up @@ -69,8 +65,8 @@
&lt;/UIElement&gt;
&lt;UIElement xsi:type="Workspace"&gt;
&lt;Content xsi:type="TabbedMdiHost"&gt;
&lt;Content xsi:type="TabbedMdiContainer" SelectedWindowUniqueId="431d7cdd-4bed-4f0a-aa78-2a4b60628571"&gt;
&lt;UIElement xsi:type="DocumentWindowRef" UniqueId="431d7cdd-4bed-4f0a-aa78-2a4b60628571" /&gt;
&lt;Content xsi:type="TabbedMdiContainer" SelectedWindowUniqueId="1c5c72bd-dad5-4746-83bd-790a6a7893c7"&gt;
&lt;UIElement xsi:type="DocumentWindowRef" UniqueId="1c5c72bd-dad5-4746-83bd-790a6a7893c7" /&gt;
&lt;/Content&gt;
&lt;/Content&gt;
&lt;/UIElement&gt;
Expand All @@ -81,10 +77,10 @@
&lt;/UIElement&gt;
&lt;/Content&gt;
&lt;DocumentWindows&gt;
&lt;DocumentWindow UniqueId="431d7cdd-4bed-4f0a-aa78-2a4b60628571" SerializationId="TestCase&amp;lt;14&amp;gt;" IsOpen="true" LastActiveDateTime="2026-03-31T10:46:22.6154476+09:00" State="Document" Type="Vector.ReportViewer.UI.ContentViews.Controls.ContentViewDocumentWnd, Vector.ReportViewer.UI" /&gt;
&lt;DocumentWindow UniqueId="1c5c72bd-dad5-4746-83bd-790a6a7893c7" SerializationId="TestReport&amp;lt;1&amp;gt;" IsOpen="true" LastActiveDateTime="2026-03-31T13:18:59.6765726+09:00" State="Document" Type="Vector.ReportViewer.UI.ContentViews.Controls.ContentViewDocumentWnd, Vector.ReportViewer.UI" /&gt;
&lt;/DocumentWindows&gt;
&lt;ToolWindows&gt;
&lt;ToolWindow UniqueId="8bf22721-4b75-4c29-bf5a-21821ffad2a5" Name="mWndExplorer" ContainerDockedSize="350,150" IsOpen="true" LastActiveDateTime="2026-03-31T10:46:21.2194753+09:00" State="Docked" /&gt;
&lt;ToolWindow UniqueId="8bf22721-4b75-4c29-bf5a-21821ffad2a5" Name="mWndExplorer" ContainerDockedSize="350,150" IsOpen="true" LastActiveDateTime="2026-03-31T13:18:46.9342766+09:00" State="Docked" /&gt;
&lt;ToolWindow UniqueId="702ac093-7d6b-476a-b4d9-d2387e847a39" Name="mWndCommentsOverview" ContainerDockedSize="350,150" IsOpen="false" State="Docked" /&gt;
&lt;ToolWindow UniqueId="1c233ae5-8135-4c15-bad0-785d8d1faf07" Name="mWndReassessmentsOverview" ContainerDockedSize="350,150" IsOpen="false" State="Docked" /&gt;
&lt;/ToolWindows&gt;
Expand Down Expand Up @@ -118,45 +114,25 @@
<value type="Vector.ReportViewer.Data.ViewFilter.FilterSettingsPersistList">
<GlobalFiltersList>
<FilterSettingsPersist>
<Name>Vector.ReportViewer.Data.ViewFilter.ActivitiesVerdictFilter</Name>
<Name>Vector.ReportViewer.Data.ViewFilter.TestTreeElementsVerdictFilter</Name>
<IsActive>false</IsActive>
<FilterDict>
<FilterSettingsPersistDictItem>
<Key>VerdictLevel</Key>
<Value>Pass</Value>
<Value>None</Value>
</FilterSettingsPersistDictItem>
</FilterDict>
</FilterSettingsPersist>
<FilterSettingsPersist>
<Name>Vector.ReportViewer.Data.ViewFilter.TestTreeElementsVerdictFilter</Name>
<Name>Vector.ReportViewer.Data.ViewFilter.ActivitiesVerdictFilter</Name>
<IsActive>false</IsActive>
<FilterDict>
<FilterSettingsPersistDictItem>
<Key>VerdictLevel</Key>
<Value>None</Value>
<Value>Pass</Value>
</FilterSettingsPersistDictItem>
</FilterDict>
</FilterSettingsPersist>
<FilterSettingsPersist>
<Name>Vector.ReportViewer.Data.ViewFilter.WaitsFilterSimple</Name>
<IsActive>false</IsActive>
<FilterDict />
</FilterSettingsPersist>
<FilterSettingsPersist>
<Name>Vector.ReportViewer.Data.ViewFilter.WaitsFilterComplex</Name>
<IsActive>false</IsActive>
<FilterDict />
</FilterSettingsPersist>
<FilterSettingsPersist>
<Name>Vector.ReportViewer.Data.ViewFilter.SkippedsFilter</Name>
<IsActive>false</IsActive>
<FilterDict />
</FilterSettingsPersist>
<FilterSettingsPersist>
<Name>Vector.ReportViewer.Data.ViewFilter.ViolationsFilter</Name>
<IsActive>false</IsActive>
<FilterDict />
</FilterSettingsPersist>
<FilterSettingsPersist>
<Name>Vector.ReportViewer.Data.ViewFilter.ControlCommandIfFilter</Name>
<IsActive>false</IsActive>
Expand Down Expand Up @@ -187,6 +163,26 @@
</FilterSettingsPersistDictItem>
</FilterDict>
</FilterSettingsPersist>
<FilterSettingsPersist>
<Name>Vector.ReportViewer.Data.ViewFilter.WaitsFilterSimple</Name>
<IsActive>false</IsActive>
<FilterDict />
</FilterSettingsPersist>
<FilterSettingsPersist>
<Name>Vector.ReportViewer.Data.ViewFilter.WaitsFilterComplex</Name>
<IsActive>false</IsActive>
<FilterDict />
</FilterSettingsPersist>
<FilterSettingsPersist>
<Name>Vector.ReportViewer.Data.ViewFilter.SkippedsFilter</Name>
<IsActive>false</IsActive>
<FilterDict />
</FilterSettingsPersist>
<FilterSettingsPersist>
<Name>Vector.ReportViewer.Data.ViewFilter.ViolationsFilter</Name>
<IsActive>false</IsActive>
<FilterDict />
</FilterSettingsPersist>
<FilterSettingsPersist>
<Name>Vector.ReportViewer.Data.ViewFilter.CheckStartEndEventFilter</Name>
<IsActive>false</IsActive>
Expand Down
24 changes: 12 additions & 12 deletions canoe/cfg/Report_UT_ACTIVE_BASELINE.이준영.settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
<value type="Vector.ReportViewer.ViewModel.ContentModels.ContentModelPersistList">
<ArrayOfContentModelPersist>
<ContentModelPersist d7p1:type="VisualizableNodeModelPersist" xmlns:d7p1="http://www.w3.org/2001/XMLSchema-instance">
<ReportUniqueId>ed9151de-7243-4f3b-8a6f-6bbc298da054</ReportUniqueId>
<NodeName>TC_CANOE_UT_007_EXT_CLU_CONTEXT_ADJUST</NodeName>
<ReportUniqueId>f9bba7bf-8f05-4af8-8841-4ef87ffc8a0b</ReportUniqueId>
<NodeName>TC_CANOE_UT_INP_059_SRR_FR_INPUT</NodeName>
<NodeType>TestCase</NodeType>
<DbId>14</DbId>
<DbId>118</DbId>
<IsTreeNode>true</IsTreeNode>
<PathToNode>
<string>TC_CANOE_UT_007_EXT_CLU_CONTEXT_ADJUST</string>
<string>CluContextAdjust</string>
<string>TC_CANOE_UT_007_EXT_CLU_CONTEXT_ADJUST</string>
<string>TC_CANOE_UT_INP_059_SRR_FR_INPUT</string>
<string>SrrFrInp</string>
<string>TC_CANOE_UT_INP_059_SRR_FR_INPUT</string>
</PathToNode>
</ContentModelPersist>
</ArrayOfContentModelPersist>
Expand Down Expand Up @@ -62,15 +62,15 @@
<value type="System.String">
<string>&lt;DockSiteLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SerializationFormat="All" Version="2"&gt;
&lt;AutoHideHost /&gt;
&lt;Content xsi:type="SplitContainer" Orientation="Vertical" DockedSize="1524,676"&gt;
&lt;Content xsi:type="SplitContainer" Orientation="Vertical" DockedSize="1912,894"&gt;
&lt;UIElement xsi:type="SplitContainer" Orientation="Horizontal" DockedSize="554,200"&gt;
&lt;UIElement xsi:type="ToolWindowContainer" DockedSize="350,150" SelectedWindowUniqueId="68c662c2-d57a-4f86-83ae-e8f6cc779609"&gt;
&lt;UIElement xsi:type="ToolWindowRef" UniqueId="68c662c2-d57a-4f86-83ae-e8f6cc779609" /&gt;
&lt;/UIElement&gt;
&lt;UIElement xsi:type="Workspace"&gt;
&lt;Content xsi:type="TabbedMdiHost"&gt;
&lt;Content xsi:type="TabbedMdiContainer" SelectedWindowUniqueId="ff4872f0-91ac-4566-9847-2d69dec905d6"&gt;
&lt;UIElement xsi:type="DocumentWindowRef" UniqueId="ff4872f0-91ac-4566-9847-2d69dec905d6" /&gt;
&lt;Content xsi:type="TabbedMdiContainer" SelectedWindowUniqueId="b1d98e08-2411-4ec7-9095-cbe8f30fda0d"&gt;
&lt;UIElement xsi:type="DocumentWindowRef" UniqueId="b1d98e08-2411-4ec7-9095-cbe8f30fda0d" /&gt;
&lt;/Content&gt;
&lt;/Content&gt;
&lt;/UIElement&gt;
Expand All @@ -81,10 +81,10 @@
&lt;/UIElement&gt;
&lt;/Content&gt;
&lt;DocumentWindows&gt;
&lt;DocumentWindow UniqueId="ff4872f0-91ac-4566-9847-2d69dec905d6" SerializationId="TestCase&amp;lt;14&amp;gt;" IsOpen="true" LastActiveDateTime="2026-03-31T11:11:39.6645253+09:00" State="Document" Type="Vector.ReportViewer.UI.ContentViews.Controls.ContentViewDocumentWnd, Vector.ReportViewer.UI" /&gt;
&lt;DocumentWindow UniqueId="b1d98e08-2411-4ec7-9095-cbe8f30fda0d" SerializationId="TestCase&amp;lt;118&amp;gt;" IsOpen="true" LastActiveDateTime="2026-03-31T13:15:21.197353+09:00" State="Document" Type="Vector.ReportViewer.UI.ContentViews.Controls.ContentViewDocumentWnd, Vector.ReportViewer.UI" /&gt;
&lt;/DocumentWindows&gt;
&lt;ToolWindows&gt;
&lt;ToolWindow UniqueId="68c662c2-d57a-4f86-83ae-e8f6cc779609" Name="mWndExplorer" ContainerDockedSize="350,150" IsOpen="true" LastActiveDateTime="2026-03-31T11:11:38.5567894+09:00" State="Docked" /&gt;
&lt;ToolWindow UniqueId="68c662c2-d57a-4f86-83ae-e8f6cc779609" Name="mWndExplorer" ContainerDockedSize="350,150" IsOpen="true" LastActiveDateTime="2026-03-31T13:15:19.7923524+09:00" State="Docked" /&gt;
&lt;ToolWindow UniqueId="db43d143-6fde-487b-a9a0-7ca07eecc88c" Name="mWndCommentsOverview" ContainerDockedSize="350,150" IsOpen="false" State="Docked" /&gt;
&lt;ToolWindow UniqueId="10658099-fd9d-4aae-b7a9-559c472ad681" Name="mWndReassessmentsOverview" ContainerDockedSize="350,150" IsOpen="false" State="Docked" /&gt;
&lt;/ToolWindows&gt;
Expand All @@ -103,7 +103,7 @@
</Location>
<Width>1536</Width>
<Height>864</Height>
<WndState>Normal</WndState>
<WndState>Maximized</WndState>
</WndPosAndSize>
</value>
</item>
Expand Down
14 changes: 14 additions & 0 deletions canoe/cfg/channel_assign/ADAS/ADAS.can
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1620,8 +1620,15 @@ on start
@Core::objectEventCode = 0;
@Core::decelAssistDecisionReq = 0;
@Core::decelAssistReq = 0;
@Core::warningState = 0;
@Core::baseZoneContext = 0;
@Core::speedLimitNorm = 0;
@Core::selectedAlertLevel = 0;
@Core::selectedAlertType = 0;
@CoreState::driverReleaseReason = 0;
@CoreState::decelGateReason = 0;
@CoreState::selectedAlertDecisionLevel = 0;
@CoreState::selectedAlertDecisionType = 0;
if (gEthTxSocket == ethInvalidSocket())
{
write("[ADAS] tx socket unavailable");
Expand Down Expand Up @@ -1652,6 +1659,13 @@ on stopMeasurement
{
cancelTimer(tAdasCycle);
cancelTimer(tArbiter50);
@Core::warningState = 0;
@Core::baseZoneContext = 0;
@Core::speedLimitNorm = 0;
@Core::selectedAlertLevel = 0;
@Core::selectedAlertType = 0;
@CoreState::selectedAlertDecisionLevel = 0;
@CoreState::selectedAlertDecisionType = 0;
ethCloseSocket(gEthTxSocket);
gEthTxSocket = ethInvalidSocket();
ethCloseSocket(gEthSocket);
Expand Down
2 changes: 2 additions & 0 deletions canoe/cfg/channel_assign/ETH_Backbone/TEST_SCN.can
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,8 @@ void stopScenarioExecution()
@Inject::navDirection = 0;
@Inject::zoneDistance = 0;
@Inject::speedLimit = 0;
@Inject::manualAlertOverrideCmd = 0;
@Inject::alertVolumeCmd = 0;
@Inject::emergencyActiveCmd = 0;
@Inject::emergencyType = 0;
@Inject::emergencyDirection = 0;
Expand Down
54 changes: 54 additions & 0 deletions canoe/cfg/channel_assign/ETH_Backbone/V2X.can
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ variables
dword gLastRejectedAlertSrcPort;
int gCrossMyCarEnd;
int gCrossAmbEnd;
int gLastCrossAlertState;
int gLastCrossEmergencyType;
int gLastCrossDirection;
int gLastCrossSourceId;
}


Expand Down Expand Up @@ -161,6 +165,48 @@ void startCrossSceneAnimation()
setTimer(tSceneTimer, 50);
}

void updateCrossSceneTrigger(int alertState,
int emergencyType,
int emergencyDirection,
int sourceId)
{
int sceneIdle;
int shouldTrigger;

sceneIdle = ((((int)@V2X::AnimationTrigger) == 0) &&
clampRange((int)@V2X::MyCarFrame, 0, gCrossMyCarEnd) == 0 &&
clampRange((int)@V2X::AmbFrame, 0, gCrossAmbEnd) == 0);
shouldTrigger = 0;
if (alertState == 1 && emergencyType > 0)
{
if (gLastCrossAlertState == 0 ||
emergencyType != gLastCrossEmergencyType ||
emergencyDirection != gLastCrossDirection ||
sourceId != gLastCrossSourceId ||
sceneIdle == 1)
{
shouldTrigger = 1;
}
}

if (shouldTrigger == 1)
{
@V2X::AnimationTrigger = 1;
startCrossSceneAnimation();
}
else if (alertState == 0 && gLastCrossAlertState == 1)
{
@V2X::AnimationTrigger = 0;
cancelTimer(tSceneTimer);
resetCrossSceneAnimation();
}

gLastCrossAlertState = alertState;
gLastCrossEmergencyType = emergencyType;
gLastCrossDirection = emergencyDirection;
gLastCrossSourceId = sourceId;
}

void bumpIngressHeartbeat()
{
int heartbeat;
Expand Down Expand Up @@ -448,6 +494,10 @@ void publishActiveEmergencyToV2X()
@V2X::alertState = compatAlertState;
@V2X::v2xFrame = (compatAlertState == 1) ? getCompatV2xFrame(compatEmergencyType, compatEta) : 0;
@Infotainment::emergencySound = (compatAlertState == 1 && compatEmergencyType > 0) ? 1 : 0;
updateCrossSceneTrigger(compatAlertState,
compatEmergencyType,
compatEmergencyDirection,
compatSourceId);
publishNormalizedEmergencyIngress();
}

Expand Down Expand Up @@ -690,6 +740,10 @@ on start
gLastRejectedAlertSrcPort = 0;
gCrossMyCarEnd = 26;
gCrossAmbEnd = 31;
gLastCrossAlertState = 0;
gLastCrossEmergencyType = 0;
gLastCrossDirection = 0;
gLastCrossSourceId = 0;
@V2X::ingressHeartbeat = 0;
@V2X::AnimationTrigger = 0;
resetCrossSceneAnimation();
Expand Down
Loading
Loading