Commit 05083c1e authored by Alexander Ryndin's avatar Alexander Ryndin
Browse files

removed defaulttypes, changed Boolean to B, adjusted type mappings and tests

parent 86a99e52
......@@ -6,22 +6,22 @@ import fas.advancedLibrary.*;
component CC_On_Off {
port
in Boolean ParkingBrake_b,
in B ParkingBrake_b,
in (-oo:d:oo) BrakeForce_pedal_pc,
in Boolean CruiseControl_b,
in B CruiseControl_b,
in (-oo:d:oo) V_Vehicle_kmh,
in Boolean Limiter_b,
in B Limiter_b,
in (-oo:d:oo) LeverUp_Stat,
in (-oo:d:oo) LeverDown_Stat,
in Boolean FTS_active_b,
out Boolean CC_active_b;
in B FTS_active_b,
out B CC_active_b;
instance Not<Boolean> not1, not2, not3;
instance Not<B> not1, not2, not3;
instance Greater<(-oo:d:oo)> greater1, greater2, greater3;
instance Less<(-oo:d:oo)> less1;
instance And and1, and2;
instance Or<Boolean> or1, or2;
instance Or<Boolean,4> or3;
instance Or<B> or1, or2;
instance Or<B,4> or3;
instance EdgeRising eRising;
instance EdgeFalling eFalling;
instance RSFlipFlop flipFlop;
......
......@@ -10,20 +10,20 @@ import fas.demo_fas_Fkt_m.tem_m.t_Fkt_m.cc_Set_m.CC_ChangeSetValue;
component CC_SetValue {
port
in Boolean Limiter_b,
in Boolean CC_enabled_b,
in Boolean CruiseControl_b,
in B Limiter_b,
in B CC_enabled_b,
in B CruiseControl_b,
in (-oo:d:oo) V_Vehicle_kmh,
in (-oo:d:oo) LeverUp_Stat,
in (-oo:d:oo) LeverDown_Stat,
in Boolean Enable,
in B Enable,
out (-oo:d:oo) DEMO_FAS_V_CCSetValue;
instance GreaterEquals<(-oo:d:oo)> greaterEq;
instance And and1, and2;
instance And3 and3;
instance Or<(-oo:d:oo)> or1;
instance Not<Boolean> not1, not2, not3, not4;
instance Not<B> not1, not2, not3, not4;
instance SwitchB<(-oo:d:oo)> switch1, switch2;
instance Memory<(-oo:d:oo)>(0) mem1;
instance EdgeRising eRising;
......
......@@ -10,20 +10,20 @@ import fas.demo_fas_Fkt_m.tem_m.t_Fkt_m.cc_Set_m.CC_ChangeSetValue_edited;
component CC_SetValue_edited {
port
in Boolean Limiter_b,
in Boolean CC_enabled_b,
in Boolean CruiseControl_b,
in B Limiter_b,
in B CC_enabled_b,
in B CruiseControl_b,
in (-oo:d:oo) V_Vehicle_kmh,
in (-oo:d:oo) LeverUp_Stat,
in (-oo:d:oo) LeverDown_Stat,
in Boolean Enable,
in B Enable,
out (-oo:d:oo) DEMO_FAS_V_CCSetValue;
instance GreaterEquals<(-oo:d:oo)> greaterEq;
instance And and1, and2;
instance And3 and3;
instance Or<(-oo:d:oo)> or1;
instance Not<Boolean> not1, not2, not3, not4;
instance Not<B> not1, not2, not3, not4;
instance SwitchB<(-oo:d:oo)> switch1, switch2;
instance Memory<(-oo:d:oo)>(0) mem1;
instance EdgeRising eRising;
......
......@@ -11,18 +11,18 @@ component CC_ChangeSetValue {
in (-oo:d:oo) LeverUp_Stat,
in (-oo:d:oo) LeverDown_Stat,
in (-oo:d:oo) DEMO_FAS_V_CCSetValue_Read,
in Boolean Enable,
in B Enable,
out (-oo:d:oo) DEMO_FAS_V_CCSetValue;
instance CC_ChangeSetValue_Lvl2_no_Repeater cc_ChangeSet_noRepeater;
instance CC_ChangeSetValue_Lvl2_Repeater cc_ChangeSet_Repeater;
instance SwitchB<(-oo:d:oo)> switch1, switch2, switch3, switch4, switch5, switch6, switch7, switch8, switch9, switch10, switch11;
instance SwitchB<Boolean> switch12;
instance Memory<Boolean> mem1;
instance SwitchB<B> switch12;
instance Memory<B> mem1;
instance Memory<(-oo:d:oo)> mem2, mem3, mem4, mem5, mem6, mem7, mem8, mem9, mem10, mem11;
instance Equals<Boolean> eq1;
instance Not<Boolean> not1, not2, not3, not4;
instance Equals<B> eq1;
instance Not<B> not1, not2, not3, not4;
connect false/*DEMO_FAS_Repeater*/ -> switch12.in1;
connect mem1.out1 -> switch12.in3;
......
......@@ -10,18 +10,18 @@ component CC_ChangeSetValue_edited {
in (-oo:d:oo) LeverUp_Stat,
in (-oo:d:oo) LeverDown_Stat,
in (-oo:d:oo) DEMO_FAS_V_CCSetValue_Read,
in Boolean Enable,
in Boolean If,
in B Enable,
in B If,
out (-oo:d:oo) DEMO_FAS_V_CCSetValue;
instance CC_ChangeSetValue_Lvl2_no_Repeater cc_ChangeSet_noRepeater;
instance CC_ChangeSetValue_Lvl2_Repeater cc_ChangeSet_Repeater;
instance SwitchB<(-oo:d:oo)> switch1, switch2, switch3, switch4, switch5, switch6, switch7, switch8, switch9, switch10, switch11;
instance SwitchB<Boolean> switch12;
instance Memory<Boolean>(false) mem1;
instance SwitchB<B> switch12;
instance Memory<B>(false) mem1;
instance Memory<(-oo:d:oo)>(0) mem2, mem3, mem4, mem5, mem6, mem7, mem8, mem9, mem10, mem11;
instance Equals<Boolean> eq1;
instance Not<Boolean> not1, not2, not3, not4;
instance Equals<B> eq1;
instance Not<B> not1, not2, not3, not4;
connect If -> switch12.in1;
connect mem1.out1 -> switch12.in3;
......
......@@ -6,16 +6,16 @@ import fas.advancedLibrary.*;
component CC_InitialSetValue {
port
in (-oo:d:oo) V_Vehicle_kmh,
in Boolean trigger,
in B trigger,
in (-oo:d:oo) DEMO_FAS_V_CCSetValue_Read,
in Boolean Enable,
in B Enable,
out (-oo:d:oo) DEMO_FAS_V_CCSetValue;
instance SwitchB<Boolean> switch1, switch2;
instance SwitchB<B> switch1, switch2;
instance SwitchB<(-oo:d:oo)> switch3, switch4;
instance Greater<(-oo:d:oo)> greater1, greater2;
instance Memory<Boolean>(false) mem1;
instance Memory<Boolean>(true) mem2;
instance Memory<B>(false) mem1;
instance Memory<B>(true) mem2;
instance Smaller<(-oo:d:oo)> smaller1;
connect trigger -> greater1.in1, switch1.in1;
......
......@@ -6,16 +6,16 @@ import fas.advancedLibrary.*;
component CC_OnSet_SetValue {
port
in (-oo:d:oo) V_Vehicle_kmh,
in Boolean trigger,
in B trigger,
in (-oo:d:oo) DEMO_FAS_V_CCSetValue_Read,
in Boolean Enable,
in B Enable,
out (-oo:d:oo) DEMO_FAS_V_CCSetValue;
instance SwitchB<Boolean> switch1, switch2;
instance SwitchB<B> switch1, switch2;
instance SwitchB<(-oo:d:oo)> switch3;
instance Greater<(-oo:d:oo)> greater1, greater2;
instance Memory<Boolean>(false) mem1;
instance Memory<Boolean>(true) mem2;
instance Memory<B>(false) mem1;
instance Memory<B>(true) mem2;
connect trigger -> greater1.in1, switch1.in1;
connect Enable -> switch1.cond, switch2.cond;
......
......@@ -5,16 +5,16 @@ import fas.advancedLibrary.*;
component CC_StartUpSetValue {
port
in Boolean trigger,
in B trigger,
in (-oo:d:oo) DEMO_FAS_V_CCSetValue_Read,
in Boolean Enable,
in B Enable,
out (-oo:d:oo) DEMO_FAS_V_CCSetValue_Write;
instance SwitchB<Boolean> switch1, switch2;
instance SwitchB<B> switch1, switch2;
instance SwitchB<(-oo:d:oo)> switch3;
instance Greater<(-oo:d:oo)> greater1, greater2;
instance Memory<Boolean>(false) mem1;
instance Memory<Boolean>(true) mem2;
instance Memory<B>(false) mem1;
instance Memory<B>(true) mem2;
connect trigger -> greater1.in1, switch1.in1;
connect Enable -> switch1.cond, switch2.cond;
......
......@@ -13,18 +13,18 @@ component CC_ChangeSetValue_Lvl2_Repeater {
in (-oo:d:oo) LeverUp_Stat,
in (-oo:d:oo) LeverDown_Stat,
in (-oo:d:oo) DEMO_FAS_V_CCSetValue_Read,
in Boolean Enable,
in Boolean If,
in B Enable,
in B If,
out (-oo:d:oo) DEMO_FAS_V_CCSetValue;
instance Equals<(-oo:d:oo)> eq1, eq2, eq3, eq4;
instance Or4<Boolean> or;
instance Or3<Boolean> or2;
instance Not<Boolean> not1, not2;
instance Memory<Boolean>(0) mem1;
instance Or4<B> or;
instance Or3<B> or2;
instance Not<B> not1, not2;
instance Memory<B>(0) mem1;
instance CountDown cDown;
instance SwitchB<Boolean> switch1, switch2, switch3, switch4, switch5, switch6;
instance SwitchB<B> switch1, switch2, switch3, switch4, switch5, switch6;
instance SysInit sInit;
instance V_SetValue_PlusLvl2 v_SetValuePlus2;
instance V_SetValue_Plus v_SetValuePlus;
......
......@@ -11,7 +11,7 @@ component CC_ChangeSetValue_Lvl2_no_Repeater {
in (-oo:d:oo) LeverUp_Stat,
in (-oo:d:oo) LeverDown_Stat,
in (-oo:d:oo) DEMO_FAS_V_CCSetValue_Read,
in Boolean Enable,
in B Enable,
out (-oo:d:oo) DEMO_FAS_V_CCSetValue;
instance Equals<(-oo:d:oo)> eq1, eq2, eq3, eq4;
......
......@@ -4,11 +4,11 @@ import fas.basicLibrary.*;
component CountDown {
port
in Boolean E,
in Boolean R,
in Boolean Enable,
in B E,
in B R,
in B Enable,
in (-oo:d:oo) IV,
out Boolean y;
out B y;
instance SwitchB<(-oo:d:oo)> switch_R, switch_C, switch1;
instance Memory<(-oo:d:oo)>(0) mem1;
......
......@@ -4,15 +4,15 @@ import fas.basicLibrary.*;
component V_SetValue_Minus {
port
in Boolean trigger,
in Boolean Enable,
in B trigger,
in B Enable,
in (-oo:d:oo) DEMO_FAS_V_CCSetValue_Read,
out (-oo:d:oo) DEMO_FAS_V_CCSetValue;
instance Greater<Boolean> greater1, greater2;
instance SwitchB<Boolean> switch1, switch2;
instance Memory<Boolean>(false) mem1;
instance Memory<Boolean>(true) mem2;
instance Greater<B> greater1, greater2;
instance SwitchB<B> switch1, switch2;
instance Memory<B>(false) mem1;
instance Memory<B>(true) mem2;
instance PlusMinus<(-oo:d:oo)> pm1;
instance SwitchB<(-oo:d:oo)> switch3;
......
......@@ -4,16 +4,16 @@ import fas.basicLibrary.*;
component V_SetValue_MinusLvl2 {
port
in Boolean trigger,
in Boolean Enable,
in B trigger,
in B Enable,
in (-oo:d:oo) DEMO_FAS_V_CCSetValue_Read,
in (-oo:d:oo) in1,
out (-oo:d:oo) DEMO_FAS_V_CCSetValue;
instance Greater<Boolean> greater1, greater2;
instance SwitchB<Boolean> switch1, switch2;
instance Memory<Boolean>(false) mem1;
instance Memory<Boolean>(true) mem2;
instance Greater<B> greater1, greater2;
instance SwitchB<B> switch1, switch2;
instance Memory<B>(false) mem1;
instance Memory<B>(true) mem2;
instance PlusMinus<(-oo:d:oo)> pm1;
instance SwitchB<(-oo:d:oo)> switch3;
//Tag auf >=20 setzen
......
......@@ -4,16 +4,16 @@ import fas.basicLibrary.*;
component V_SetValue_Plus {
port
in Boolean trigger,
in Boolean Enable,
in B trigger,
in B Enable,
in (-oo:d:oo) DEMO_FAS_V_CCSetValue_Read,
in (-oo:d:oo) in1,
out (-oo:d:oo) DEMO_FAS_V_CCSetValue;
instance Greater<Boolean> greater1, greater2;
instance SwitchB<Boolean> switch1, switch2;
instance Memory<Boolean>(false) mem1;
instance Memory<Boolean>(true) mem2;
instance Greater<B> greater1, greater2;
instance SwitchB<B> switch1, switch2;
instance Memory<B>(false) mem1;
instance Memory<B>(true) mem2;
instance SwitchB<(-oo:d:oo)> switch3;
instance Sum<(-oo:d:oo)> sum1;
......
......@@ -4,16 +4,16 @@ import fas.basicLibrary.*;
component V_SetValue_PlusLvl2 {
port
in Boolean trigger,
in Boolean Enable,
in B trigger,
in B Enable,
in (-oo:d:oo) DEMO_FAS_V_CCSetValue_Read,
in (-oo:d:oo) in1,
out (-oo:d:oo) DEMO_FAS_V_CCSetValue_Write;
instance Greater<Boolean> greater1, greater2;
instance SwitchB<Boolean> switch1, switch2;
instance Memory<Boolean>(false) mem1;
instance Memory<Boolean>(true) mem2;
instance Greater<B> greater1, greater2;
instance SwitchB<B> switch1, switch2;
instance Memory<B>(false) mem1;
instance Memory<B>(true) mem2;
instance SwitchB<(-oo:d:oo)> switch3;
instance Mod<(-oo:d:oo)> mod1;
instance MinusPlus<(-oo:d:oo)> mp1;
......
......@@ -4,15 +4,15 @@ import fas.basicLibrary.*;
component V_SetValueMinus {
port
in Boolean trigger,
in Boolean Enable,
in B trigger,
in B Enable,
in (-oo:d:oo) DEMO_FAS_V_CCSetValue_Read,
out (-oo:d:oo) DEMO_FAS_V_CCSetValue;
instance Greater<Boolean> greater1, greater2;
instance SwitchB<Boolean> switch1, switch2;
instance Memory<Boolean>(false) mem1;
instance Memory<Boolean>(true) mem2;
instance Greater<B> greater1, greater2;
instance SwitchB<B> switch1, switch2;
instance Memory<B>(false) mem1;
instance Memory<B>(true) mem2;
instance PlusMinus<(-oo:d:oo)> pm1;
instance SwitchB<(-oo:d:oo)> switch3;
//Tag auf >=20 setzen
......
......@@ -4,16 +4,16 @@ import fas.basicLibrary.*;
component V_SetValueMinusLvl2 {
port
in Boolean trigger,
in Boolean Enable,
in B trigger,
in B Enable,
in (-oo:d:oo) DEMO_FAS_V_CCSetValue_Read,
in (-oo:d:oo) in1,
out (-oo:d:oo) DEMO_FAS_V_CCSetValue;
instance Greater<Boolean> greater1, greater2;
instance SwitchB<Boolean> switch1, switch2;
instance Memory<Boolean>(false) mem1;
instance Memory<Boolean>(true) mem2;
instance Greater<B> greater1, greater2;
instance SwitchB<B> switch1, switch2;
instance Memory<B>(false) mem1;
instance Memory<B>(true) mem2;
instance PlusMinus<(-oo:d:oo)> pm1;
instance SwitchB<(-oo:d:oo)> switch3;
//Tag auf >=20 setzen
......
......@@ -4,16 +4,16 @@ import fas.basicLibrary.*;
component V_SetValuePlus {
port
in Boolean trigger,
in Boolean Enable,
in B trigger,
in B Enable,
in (-oo:d:oo) DEMO_FAS_V_CCSetValue_Read,
in (-oo:d:oo) in1,
out (-oo:d:oo) DEMO_FAS_V_CCSetValue;
instance Greater<Boolean> greater1, greater2;
instance SwitchB<Boolean> switch1, switch2;
instance Memory<Boolean>(false) mem1;
instance Memory<Boolean>(true) mem2;
instance Greater<B> greater1, greater2;
instance SwitchB<B> switch1, switch2;
instance Memory<B>(false) mem1;
instance Memory<B>(true) mem2;
instance SwitchB<(-oo:d:oo)> switch3;
instance Sum<(-oo:d:oo)> sum1;
......
......@@ -4,16 +4,16 @@ import fas.basicLibrary.*;
component V_SetValuePlusLvl2 {
port
in Boolean trigger,
in Boolean Enable,
in B trigger,
in B Enable,
in (-oo:d:oo) DEMO_FAS_V_CCSetValue_Read,
in (-oo:d:oo) in1,
out (-oo:d:oo) DEMO_FAS_V_CCSetValue_Write;
instance Greater<Boolean> greater1, greater2;
instance SwitchB<Boolean> switch1, switch2;
instance Memory<Boolean>(false) mem1;
instance Memory<Boolean>(true) mem2;
instance Greater<B> greater1, greater2;
instance SwitchB<B> switch1, switch2;
instance Memory<B>(false) mem1;
instance Memory<B>(true) mem2;
instance SwitchB<(-oo:d:oo)> switch3;
instance Mod<(-oo:d:oo)> mod1;
instance MinusPlus<(-oo:d:oo)> mp1;
......
package test;
component BasicPortsConstantConnector{
ports out (-oo:oo) out1,out Boolean out2;
ports out (-oo:oo) out1,out B out2;
connect true -> out2;
connect 1.0 -> out1;
}
\ No newline at end of file
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment