From 5e31e7c66f69caf49c250a99f902c5cf00968711 Mon Sep 17 00:00:00 2001 From: Yuan Liu Date: Tue, 24 Jul 2018 20:50:37 +0800 Subject: [PATCH] IOC mediator: Add parking brake and Hvac signals This patch adds new signals about parking brake and Hvac in the signal definition and signal whitelist. Signed-off-by: Yuan Liu Acked-by: Yu Wang --- devicemodel/hw/platform/ioc.c | 127 +++++++++++++++++++++++++++++++++- devicemodel/include/ioc.h | 77 ++++++++++++++++++--- 2 files changed, 192 insertions(+), 12 deletions(-) diff --git a/devicemodel/hw/platform/ioc.c b/devicemodel/hw/platform/ioc.c index ca03e717f..dfdc3e7cc 100644 --- a/devicemodel/hw/platform/ioc.c +++ b/devicemodel/hw/platform/ioc.c @@ -464,6 +464,44 @@ static struct cbc_signal cbc_tx_signal_table[] = { {(uint16_t)CBC_SIG_ID_GYROZ, 16, CBC_ACTIVE}, {(uint16_t)CBC_SIG_ID_IAVMN, 8, CBC_ACTIVE}, {(uint16_t)CBC_SIG_ID_RTST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_PKBK, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_PKBKST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_PKBKAT, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_PKBKAS, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HFSPD, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HFSST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HFDIR, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HFDSTT, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HVACA, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HVASTT, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HAMAX, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HVMST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HAUTO, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HATSTT, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HVDEF, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HDEFSTT, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HDFMAX, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HDMXSTT, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HDUAL, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HDSTT, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HHSMR, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HHSMST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HHSWL, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HHSWST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HPOWR, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HPWSTT, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HRECC, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HRECST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HTEMCB, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HTCSTT, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HTMPST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HTSSTT, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HTMPU, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HTUSTT, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HVTST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HVSSTT, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HRCAT, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HRASTT, 32, CBC_ACTIVE}, }; static struct cbc_signal cbc_rx_signal_table[] = { @@ -476,7 +514,26 @@ static struct cbc_signal cbc_rx_signal_table[] = { {(uint16_t)CBC_SIG_ID_RIVS, 1, CBC_ACTIVE}, {(uint16_t)CBC_SIG_ID_RRMS, 8, CBC_ACTIVE}, {(uint16_t)CBC_SIG_ID_MTAM, 1, CBC_ACTIVE}, - {(uint16_t)CBC_SIG_ID_VICL, 8, CBC_ACTIVE} + {(uint16_t)CBC_SIG_ID_PBST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_PBAT, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HFSS, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HFDST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HVAST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HAMS, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HATST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HDEFST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HDMXST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HDST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HHSMS, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HHSWS, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HPWST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HRCST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HTCST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HTSST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HTUST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HVSST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_HRAST, 32, CBC_ACTIVE}, + {(uint16_t)CBC_SIG_ID_VICL, 8, CBC_ACTIVE}, }; static struct cbc_group cbc_rx_group_table[] = { @@ -495,9 +552,32 @@ static struct cbc_group cbc_tx_group_table[] = { }; static struct wlist_signal wlist_rx_signal_table[] = { + {(uint16_t)CBC_SIG_ID_HRASTT, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_PBST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_PBAT, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HFSS, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HFDST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HVAST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HAMS, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HATST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HDEFST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HDMXST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HDST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HHSMS, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HHSWS, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HPWST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HRCST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HTCST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HTSST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HTUST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HVSST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HRAST, DEFAULT_WLIST_NODE}, }; static struct wlist_signal wlist_tx_signal_table[] = { + {(uint16_t)CBC_SIG_ID_TSA, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_VSPD, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_VESP, DEFAULT_WLIST_NODE}, {(uint16_t)CBC_SIG_ID_ATEMP, DEFAULT_WLIST_NODE}, {(uint16_t)CBC_SIG_ID_VSPD, DEFAULT_WLIST_NODE}, {(uint16_t)CBC_SIG_ID_VESP, DEFAULT_WLIST_NODE}, @@ -506,7 +586,50 @@ static struct wlist_signal wlist_tx_signal_table[] = { {(uint16_t)CBC_SIG_ID_VGP, DEFAULT_WLIST_NODE}, {(uint16_t)CBC_SIG_ID_VAG, DEFAULT_WLIST_NODE}, {(uint16_t)CBC_SIG_ID_VFS, DEFAULT_WLIST_NODE}, - {(uint16_t)CBC_SIG_ID_ALTI, DEFAULT_WLIST_NODE} + {(uint16_t)CBC_SIG_ID_SWUB, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_SWSCB, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_SWPCB, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_SWAMB, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_SWDB, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_ALTI, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_PKBK, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_PKBKST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_PKBKAT, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_PKBKAS, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HFSPD, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HFSST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HFDIR, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HFDSTT, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HVACA, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HVASTT, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HAMAX, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HVMST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HAUTO, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HATSTT, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HVDEF, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HDEFSTT, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HDFMAX, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HDMXSTT, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HDUAL, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HDSTT, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HHSMR, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HHSMST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HHSWL, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HHSWST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HPOWR, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HPWSTT, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HRECC, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HRECST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HTEMCB, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HTCSTT, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HTMPST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HTSSTT, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HTMPU, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HTUSTT, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HVTST, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HVSSTT, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HRCAT, DEFAULT_WLIST_NODE}, + {(uint16_t)CBC_SIG_ID_HRASTT, DEFAULT_WLIST_NODE}, }; static struct wlist_group wlist_rx_group_table[] = { diff --git a/devicemodel/include/ioc.h b/devicemodel/include/ioc.h index 79038dd04..26a81206a 100644 --- a/devicemodel/include/ioc.h +++ b/devicemodel/include/ioc.h @@ -224,16 +224,35 @@ enum cbc_sus_stat_action { * CBC rx signal identity definition. */ enum cbc_rx_signal_id { - CBC_SIG_ID_STFR = 20000, /* SetTunerFrequency */ - CBC_SIG_ID_EGYO = 20001, /* EnableGyro */ - CBC_SIG_ID_WACS = 20002, /* WriteAmplifierConfigurationSequence*/ - CBC_SIG_ID_RIFC = 20003, /* RequestIocFblChecksum */ - CBC_SIG_ID_RIWC = 20004, /* RequestIocWfChecksum */ - CBC_SIG_ID_RIAC = 20005, /* RequestIocAppChecksum */ - CBC_SIG_ID_RIVS = 20006, /* RequestIocVersion */ - CBC_SIG_ID_RRMS = 20007, /* RequestRuntimeMeasurement */ - CBC_SIG_ID_MTAM = 20008, /* MuteAmplifier */ - CBC_SIG_ID_VICL = 651, /* VideoInCtrl */ + CBC_SIG_ID_STFR = 20000, /* SetTunerFrequency */ + CBC_SIG_ID_EGYO = 20001, /* EnableGyro */ + CBC_SIG_ID_WACS = 20002, /* WriteAmplifierConfigurationSequence*/ + CBC_SIG_ID_RIFC = 20003, /* RequestIocFblChecksum */ + CBC_SIG_ID_RIWC = 20004, /* RequestIocWfChecksum */ + CBC_SIG_ID_RIAC = 20005, /* RequestIocAppChecksum */ + CBC_SIG_ID_RIVS = 20006, /* RequestIocVersion */ + CBC_SIG_ID_RRMS = 20007, /* RequestRuntimeMeasurement */ + CBC_SIG_ID_MTAM = 20008, /* MuteAmplifier */ + CBC_SIG_ID_PBST = 20009, /* ParkingBrakeSetting */ + CBC_SIG_ID_PBAT = 20010, /* ParkingBrakeAutomaticSetting */ + CBC_SIG_ID_HFSS = 20011, /* HvacFanSpeedSetting */ + CBC_SIG_ID_HFDST = 20012, /* HvacFanDirectionSetting */ + CBC_SIG_ID_HVAST = 20013, /* HvacAcSetting */ + CBC_SIG_ID_HAMS = 20014, /* HvacAcMaxSetting */ + CBC_SIG_ID_HATST = 20015, /* HvacAutoSetting */ + CBC_SIG_ID_HDEFST = 20016, /* HvacDefrostSetting */ + CBC_SIG_ID_HDMXST = 20017, /* HvacDefrostMaxSetting */ + CBC_SIG_ID_HDST = 20018, /* HvacDualSetting */ + CBC_SIG_ID_HHSMS = 20019, /* HvacHeatingSideMirrorSetting */ + CBC_SIG_ID_HHSWS = 20020, /* HvacHeatingSteeringWheelSetting */ + CBC_SIG_ID_HPWST = 20021, /* HvacPowerSetting */ + CBC_SIG_ID_HRCST = 20022, /* HvacRecirculationSetting */ + CBC_SIG_ID_HTCST = 20023, /* HvacTemperatureCabinSetting */ + CBC_SIG_ID_HTSST = 20024, /* HvacTemperatureSeatSetting */ + CBC_SIG_ID_HTUST = 20025, /* HvacTemperatureUnitsSetting */ + CBC_SIG_ID_HVSST = 20026, /* HvacVentilationSeatSetting */ + CBC_SIG_ID_HRAST = 20027, /* HvacRecirculationAutomaticSetting */ + CBC_SIG_ID_VICL = 651, /* VideoInCtrl */ }; /* @@ -459,6 +478,44 @@ enum cbc_tx_signal_id { CBC_SIG_ID_GYROZ = 929, /* GyroZ */ CBC_SIG_ID_IAVMN = 930, /* IocAppVersionMinor */ CBC_SIG_ID_RTST = 931, /* RuntimeSamplesTaken */ + CBC_SIG_ID_PKBK = 933, /* ParkingBrake */ + CBC_SIG_ID_PKBKST = 934, /* ParkingBrakeSetting */ + CBC_SIG_ID_PKBKAT = 935, /* ParkingBrakeAutomatic */ + CBC_SIG_ID_PKBKAS = 936, /* ParkingBrakeAutomaticSetting */ + CBC_SIG_ID_HFSPD = 937, /* HvacFanSpeed */ + CBC_SIG_ID_HFSST = 938, /* HvacFanSpeedSetting */ + CBC_SIG_ID_HFDIR = 939, /* HvacFanDirection */ + CBC_SIG_ID_HFDSTT = 940, /* HvacFanDirectionSetting */ + CBC_SIG_ID_HVACA = 941, /* HvacAc */ + CBC_SIG_ID_HVASTT = 942, /* HvacAcSetting */ + CBC_SIG_ID_HAMAX = 943, /* HvacAcMax */ + CBC_SIG_ID_HVMST = 944, /* HvacAcMaxSetting */ + CBC_SIG_ID_HAUTO = 945, /* HvacAuto */ + CBC_SIG_ID_HATSTT = 946, /* HvacAutoSetting */ + CBC_SIG_ID_HVDEF = 947, /* HvacDefrost */ + CBC_SIG_ID_HDEFSTT = 948, /* HvacDefrostSetting */ + CBC_SIG_ID_HDFMAX = 949, /* HvacDefrostMax */ + CBC_SIG_ID_HDMXSTT = 950, /* HvacDefrostMaxSetting */ + CBC_SIG_ID_HDUAL = 951, /* HvacDual */ + CBC_SIG_ID_HDSTT = 952, /* HvacDualSetting */ + CBC_SIG_ID_HHSMR = 953, /* HvacHeatingSideMirror */ + CBC_SIG_ID_HHSMST = 954, /* HvacHeatingSideMirrorSetting */ + CBC_SIG_ID_HHSWL = 955, /* HvacHeatingSteeringWheel */ + CBC_SIG_ID_HHSWST = 956, /* HvacHeatingSteeringWheelSetting */ + CBC_SIG_ID_HPOWR = 957, /* HvacPower */ + CBC_SIG_ID_HPWSTT = 958, /* HvacPowerSetting */ + CBC_SIG_ID_HRECC = 959, /* HvacRecirculation */ + CBC_SIG_ID_HRECST = 960, /* HvacRecirculationSetting */ + CBC_SIG_ID_HTEMCB = 961, /* HvacTemperatureCabin */ + CBC_SIG_ID_HTCSTT = 962, /* HvacTemperatureCabinSetting */ + CBC_SIG_ID_HTMPST = 963, /* HvacTemperatureSeat */ + CBC_SIG_ID_HTSSTT = 964, /* HvacTemperatureSeatSetting */ + CBC_SIG_ID_HTMPU = 965, /* HvacTemperatureUnits */ + CBC_SIG_ID_HTUSTT = 966, /* HvacTemperatureUnitsSetting */ + CBC_SIG_ID_HVTST = 967, /* HvacVentilationSeat */ + CBC_SIG_ID_HVSSTT = 968, /* HvacVentilationSeatSetting */ + CBC_SIG_ID_HRCAT = 969, /* HvacRecirculationAutomatic */ + CBC_SIG_ID_HRASTT = 970, /* HvacRecirculationAutomaticSetting */ }; /*