Skip to content

Commit 5e31e7c

Browse files
yliu80lijinxia
yliu80
authored and
lijinxia
committed
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 <yuan1.liu@intel.com> Acked-by: Yu Wang <yu1.wang@intel.com>
1 parent 457ecd6 commit 5e31e7c

File tree

2 files changed

+192
-12
lines changed

2 files changed

+192
-12
lines changed

‎devicemodel/hw/platform/ioc.c

Lines changed: 125 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,44 @@ static struct cbc_signal cbc_tx_signal_table[] = {
464464
{(uint16_t)CBC_SIG_ID_GYROZ, 16, CBC_ACTIVE},
465465
{(uint16_t)CBC_SIG_ID_IAVMN, 8, CBC_ACTIVE},
466466
{(uint16_t)CBC_SIG_ID_RTST, 32, CBC_ACTIVE},
467+
{(uint16_t)CBC_SIG_ID_PKBK, 32, CBC_ACTIVE},
468+
{(uint16_t)CBC_SIG_ID_PKBKST, 32, CBC_ACTIVE},
469+
{(uint16_t)CBC_SIG_ID_PKBKAT, 32, CBC_ACTIVE},
470+
{(uint16_t)CBC_SIG_ID_PKBKAS, 32, CBC_ACTIVE},
471+
{(uint16_t)CBC_SIG_ID_HFSPD, 32, CBC_ACTIVE},
472+
{(uint16_t)CBC_SIG_ID_HFSST, 32, CBC_ACTIVE},
473+
{(uint16_t)CBC_SIG_ID_HFDIR, 32, CBC_ACTIVE},
474+
{(uint16_t)CBC_SIG_ID_HFDSTT, 32, CBC_ACTIVE},
475+
{(uint16_t)CBC_SIG_ID_HVACA, 32, CBC_ACTIVE},
476+
{(uint16_t)CBC_SIG_ID_HVASTT, 32, CBC_ACTIVE},
477+
{(uint16_t)CBC_SIG_ID_HAMAX, 32, CBC_ACTIVE},
478+
{(uint16_t)CBC_SIG_ID_HVMST, 32, CBC_ACTIVE},
479+
{(uint16_t)CBC_SIG_ID_HAUTO, 32, CBC_ACTIVE},
480+
{(uint16_t)CBC_SIG_ID_HATSTT, 32, CBC_ACTIVE},
481+
{(uint16_t)CBC_SIG_ID_HVDEF, 32, CBC_ACTIVE},
482+
{(uint16_t)CBC_SIG_ID_HDEFSTT, 32, CBC_ACTIVE},
483+
{(uint16_t)CBC_SIG_ID_HDFMAX, 32, CBC_ACTIVE},
484+
{(uint16_t)CBC_SIG_ID_HDMXSTT, 32, CBC_ACTIVE},
485+
{(uint16_t)CBC_SIG_ID_HDUAL, 32, CBC_ACTIVE},
486+
{(uint16_t)CBC_SIG_ID_HDSTT, 32, CBC_ACTIVE},
487+
{(uint16_t)CBC_SIG_ID_HHSMR, 32, CBC_ACTIVE},
488+
{(uint16_t)CBC_SIG_ID_HHSMST, 32, CBC_ACTIVE},
489+
{(uint16_t)CBC_SIG_ID_HHSWL, 32, CBC_ACTIVE},
490+
{(uint16_t)CBC_SIG_ID_HHSWST, 32, CBC_ACTIVE},
491+
{(uint16_t)CBC_SIG_ID_HPOWR, 32, CBC_ACTIVE},
492+
{(uint16_t)CBC_SIG_ID_HPWSTT, 32, CBC_ACTIVE},
493+
{(uint16_t)CBC_SIG_ID_HRECC, 32, CBC_ACTIVE},
494+
{(uint16_t)CBC_SIG_ID_HRECST, 32, CBC_ACTIVE},
495+
{(uint16_t)CBC_SIG_ID_HTEMCB, 32, CBC_ACTIVE},
496+
{(uint16_t)CBC_SIG_ID_HTCSTT, 32, CBC_ACTIVE},
497+
{(uint16_t)CBC_SIG_ID_HTMPST, 32, CBC_ACTIVE},
498+
{(uint16_t)CBC_SIG_ID_HTSSTT, 32, CBC_ACTIVE},
499+
{(uint16_t)CBC_SIG_ID_HTMPU, 32, CBC_ACTIVE},
500+
{(uint16_t)CBC_SIG_ID_HTUSTT, 32, CBC_ACTIVE},
501+
{(uint16_t)CBC_SIG_ID_HVTST, 32, CBC_ACTIVE},
502+
{(uint16_t)CBC_SIG_ID_HVSSTT, 32, CBC_ACTIVE},
503+
{(uint16_t)CBC_SIG_ID_HRCAT, 32, CBC_ACTIVE},
504+
{(uint16_t)CBC_SIG_ID_HRASTT, 32, CBC_ACTIVE},
467505
};
468506

469507
static struct cbc_signal cbc_rx_signal_table[] = {
@@ -476,7 +514,26 @@ static struct cbc_signal cbc_rx_signal_table[] = {
476514
{(uint16_t)CBC_SIG_ID_RIVS, 1, CBC_ACTIVE},
477515
{(uint16_t)CBC_SIG_ID_RRMS, 8, CBC_ACTIVE},
478516
{(uint16_t)CBC_SIG_ID_MTAM, 1, CBC_ACTIVE},
479-
{(uint16_t)CBC_SIG_ID_VICL, 8, CBC_ACTIVE}
517+
{(uint16_t)CBC_SIG_ID_PBST, 32, CBC_ACTIVE},
518+
{(uint16_t)CBC_SIG_ID_PBAT, 32, CBC_ACTIVE},
519+
{(uint16_t)CBC_SIG_ID_HFSS, 32, CBC_ACTIVE},
520+
{(uint16_t)CBC_SIG_ID_HFDST, 32, CBC_ACTIVE},
521+
{(uint16_t)CBC_SIG_ID_HVAST, 32, CBC_ACTIVE},
522+
{(uint16_t)CBC_SIG_ID_HAMS, 32, CBC_ACTIVE},
523+
{(uint16_t)CBC_SIG_ID_HATST, 32, CBC_ACTIVE},
524+
{(uint16_t)CBC_SIG_ID_HDEFST, 32, CBC_ACTIVE},
525+
{(uint16_t)CBC_SIG_ID_HDMXST, 32, CBC_ACTIVE},
526+
{(uint16_t)CBC_SIG_ID_HDST, 32, CBC_ACTIVE},
527+
{(uint16_t)CBC_SIG_ID_HHSMS, 32, CBC_ACTIVE},
528+
{(uint16_t)CBC_SIG_ID_HHSWS, 32, CBC_ACTIVE},
529+
{(uint16_t)CBC_SIG_ID_HPWST, 32, CBC_ACTIVE},
530+
{(uint16_t)CBC_SIG_ID_HRCST, 32, CBC_ACTIVE},
531+
{(uint16_t)CBC_SIG_ID_HTCST, 32, CBC_ACTIVE},
532+
{(uint16_t)CBC_SIG_ID_HTSST, 32, CBC_ACTIVE},
533+
{(uint16_t)CBC_SIG_ID_HTUST, 32, CBC_ACTIVE},
534+
{(uint16_t)CBC_SIG_ID_HVSST, 32, CBC_ACTIVE},
535+
{(uint16_t)CBC_SIG_ID_HRAST, 32, CBC_ACTIVE},
536+
{(uint16_t)CBC_SIG_ID_VICL, 8, CBC_ACTIVE},
480537
};
481538

482539
static struct cbc_group cbc_rx_group_table[] = {
@@ -495,9 +552,32 @@ static struct cbc_group cbc_tx_group_table[] = {
495552
};
496553

497554
static struct wlist_signal wlist_rx_signal_table[] = {
555+
{(uint16_t)CBC_SIG_ID_HRASTT, DEFAULT_WLIST_NODE},
556+
{(uint16_t)CBC_SIG_ID_PBST, DEFAULT_WLIST_NODE},
557+
{(uint16_t)CBC_SIG_ID_PBAT, DEFAULT_WLIST_NODE},
558+
{(uint16_t)CBC_SIG_ID_HFSS, DEFAULT_WLIST_NODE},
559+
{(uint16_t)CBC_SIG_ID_HFDST, DEFAULT_WLIST_NODE},
560+
{(uint16_t)CBC_SIG_ID_HVAST, DEFAULT_WLIST_NODE},
561+
{(uint16_t)CBC_SIG_ID_HAMS, DEFAULT_WLIST_NODE},
562+
{(uint16_t)CBC_SIG_ID_HATST, DEFAULT_WLIST_NODE},
563+
{(uint16_t)CBC_SIG_ID_HDEFST, DEFAULT_WLIST_NODE},
564+
{(uint16_t)CBC_SIG_ID_HDMXST, DEFAULT_WLIST_NODE},
565+
{(uint16_t)CBC_SIG_ID_HDST, DEFAULT_WLIST_NODE},
566+
{(uint16_t)CBC_SIG_ID_HHSMS, DEFAULT_WLIST_NODE},
567+
{(uint16_t)CBC_SIG_ID_HHSWS, DEFAULT_WLIST_NODE},
568+
{(uint16_t)CBC_SIG_ID_HPWST, DEFAULT_WLIST_NODE},
569+
{(uint16_t)CBC_SIG_ID_HRCST, DEFAULT_WLIST_NODE},
570+
{(uint16_t)CBC_SIG_ID_HTCST, DEFAULT_WLIST_NODE},
571+
{(uint16_t)CBC_SIG_ID_HTSST, DEFAULT_WLIST_NODE},
572+
{(uint16_t)CBC_SIG_ID_HTUST, DEFAULT_WLIST_NODE},
573+
{(uint16_t)CBC_SIG_ID_HVSST, DEFAULT_WLIST_NODE},
574+
{(uint16_t)CBC_SIG_ID_HRAST, DEFAULT_WLIST_NODE},
498575
};
499576

500577
static struct wlist_signal wlist_tx_signal_table[] = {
578+
{(uint16_t)CBC_SIG_ID_TSA, DEFAULT_WLIST_NODE},
579+
{(uint16_t)CBC_SIG_ID_VSPD, DEFAULT_WLIST_NODE},
580+
{(uint16_t)CBC_SIG_ID_VESP, DEFAULT_WLIST_NODE},
501581
{(uint16_t)CBC_SIG_ID_ATEMP, DEFAULT_WLIST_NODE},
502582
{(uint16_t)CBC_SIG_ID_VSPD, DEFAULT_WLIST_NODE},
503583
{(uint16_t)CBC_SIG_ID_VESP, DEFAULT_WLIST_NODE},
@@ -506,7 +586,50 @@ static struct wlist_signal wlist_tx_signal_table[] = {
506586
{(uint16_t)CBC_SIG_ID_VGP, DEFAULT_WLIST_NODE},
507587
{(uint16_t)CBC_SIG_ID_VAG, DEFAULT_WLIST_NODE},
508588
{(uint16_t)CBC_SIG_ID_VFS, DEFAULT_WLIST_NODE},
509-
{(uint16_t)CBC_SIG_ID_ALTI, DEFAULT_WLIST_NODE}
589+
{(uint16_t)CBC_SIG_ID_SWUB, DEFAULT_WLIST_NODE},
590+
{(uint16_t)CBC_SIG_ID_SWSCB, DEFAULT_WLIST_NODE},
591+
{(uint16_t)CBC_SIG_ID_SWPCB, DEFAULT_WLIST_NODE},
592+
{(uint16_t)CBC_SIG_ID_SWAMB, DEFAULT_WLIST_NODE},
593+
{(uint16_t)CBC_SIG_ID_SWDB, DEFAULT_WLIST_NODE},
594+
{(uint16_t)CBC_SIG_ID_ALTI, DEFAULT_WLIST_NODE},
595+
{(uint16_t)CBC_SIG_ID_PKBK, DEFAULT_WLIST_NODE},
596+
{(uint16_t)CBC_SIG_ID_PKBKST, DEFAULT_WLIST_NODE},
597+
{(uint16_t)CBC_SIG_ID_PKBKAT, DEFAULT_WLIST_NODE},
598+
{(uint16_t)CBC_SIG_ID_PKBKAS, DEFAULT_WLIST_NODE},
599+
{(uint16_t)CBC_SIG_ID_HFSPD, DEFAULT_WLIST_NODE},
600+
{(uint16_t)CBC_SIG_ID_HFSST, DEFAULT_WLIST_NODE},
601+
{(uint16_t)CBC_SIG_ID_HFDIR, DEFAULT_WLIST_NODE},
602+
{(uint16_t)CBC_SIG_ID_HFDSTT, DEFAULT_WLIST_NODE},
603+
{(uint16_t)CBC_SIG_ID_HVACA, DEFAULT_WLIST_NODE},
604+
{(uint16_t)CBC_SIG_ID_HVASTT, DEFAULT_WLIST_NODE},
605+
{(uint16_t)CBC_SIG_ID_HAMAX, DEFAULT_WLIST_NODE},
606+
{(uint16_t)CBC_SIG_ID_HVMST, DEFAULT_WLIST_NODE},
607+
{(uint16_t)CBC_SIG_ID_HAUTO, DEFAULT_WLIST_NODE},
608+
{(uint16_t)CBC_SIG_ID_HATSTT, DEFAULT_WLIST_NODE},
609+
{(uint16_t)CBC_SIG_ID_HVDEF, DEFAULT_WLIST_NODE},
610+
{(uint16_t)CBC_SIG_ID_HDEFSTT, DEFAULT_WLIST_NODE},
611+
{(uint16_t)CBC_SIG_ID_HDFMAX, DEFAULT_WLIST_NODE},
612+
{(uint16_t)CBC_SIG_ID_HDMXSTT, DEFAULT_WLIST_NODE},
613+
{(uint16_t)CBC_SIG_ID_HDUAL, DEFAULT_WLIST_NODE},
614+
{(uint16_t)CBC_SIG_ID_HDSTT, DEFAULT_WLIST_NODE},
615+
{(uint16_t)CBC_SIG_ID_HHSMR, DEFAULT_WLIST_NODE},
616+
{(uint16_t)CBC_SIG_ID_HHSMST, DEFAULT_WLIST_NODE},
617+
{(uint16_t)CBC_SIG_ID_HHSWL, DEFAULT_WLIST_NODE},
618+
{(uint16_t)CBC_SIG_ID_HHSWST, DEFAULT_WLIST_NODE},
619+
{(uint16_t)CBC_SIG_ID_HPOWR, DEFAULT_WLIST_NODE},
620+
{(uint16_t)CBC_SIG_ID_HPWSTT, DEFAULT_WLIST_NODE},
621+
{(uint16_t)CBC_SIG_ID_HRECC, DEFAULT_WLIST_NODE},
622+
{(uint16_t)CBC_SIG_ID_HRECST, DEFAULT_WLIST_NODE},
623+
{(uint16_t)CBC_SIG_ID_HTEMCB, DEFAULT_WLIST_NODE},
624+
{(uint16_t)CBC_SIG_ID_HTCSTT, DEFAULT_WLIST_NODE},
625+
{(uint16_t)CBC_SIG_ID_HTMPST, DEFAULT_WLIST_NODE},
626+
{(uint16_t)CBC_SIG_ID_HTSSTT, DEFAULT_WLIST_NODE},
627+
{(uint16_t)CBC_SIG_ID_HTMPU, DEFAULT_WLIST_NODE},
628+
{(uint16_t)CBC_SIG_ID_HTUSTT, DEFAULT_WLIST_NODE},
629+
{(uint16_t)CBC_SIG_ID_HVTST, DEFAULT_WLIST_NODE},
630+
{(uint16_t)CBC_SIG_ID_HVSSTT, DEFAULT_WLIST_NODE},
631+
{(uint16_t)CBC_SIG_ID_HRCAT, DEFAULT_WLIST_NODE},
632+
{(uint16_t)CBC_SIG_ID_HRASTT, DEFAULT_WLIST_NODE},
510633
};
511634

512635
static struct wlist_group wlist_rx_group_table[] = {

‎devicemodel/include/ioc.h

Lines changed: 67 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -224,16 +224,35 @@ enum cbc_sus_stat_action {
224224
* CBC rx signal identity definition.
225225
*/
226226
enum cbc_rx_signal_id {
227-
CBC_SIG_ID_STFR = 20000, /* SetTunerFrequency */
228-
CBC_SIG_ID_EGYO = 20001, /* EnableGyro */
229-
CBC_SIG_ID_WACS = 20002, /* WriteAmplifierConfigurationSequence*/
230-
CBC_SIG_ID_RIFC = 20003, /* RequestIocFblChecksum */
231-
CBC_SIG_ID_RIWC = 20004, /* RequestIocWfChecksum */
232-
CBC_SIG_ID_RIAC = 20005, /* RequestIocAppChecksum */
233-
CBC_SIG_ID_RIVS = 20006, /* RequestIocVersion */
234-
CBC_SIG_ID_RRMS = 20007, /* RequestRuntimeMeasurement */
235-
CBC_SIG_ID_MTAM = 20008, /* MuteAmplifier */
236-
CBC_SIG_ID_VICL = 651, /* VideoInCtrl */
227+
CBC_SIG_ID_STFR = 20000, /* SetTunerFrequency */
228+
CBC_SIG_ID_EGYO = 20001, /* EnableGyro */
229+
CBC_SIG_ID_WACS = 20002, /* WriteAmplifierConfigurationSequence*/
230+
CBC_SIG_ID_RIFC = 20003, /* RequestIocFblChecksum */
231+
CBC_SIG_ID_RIWC = 20004, /* RequestIocWfChecksum */
232+
CBC_SIG_ID_RIAC = 20005, /* RequestIocAppChecksum */
233+
CBC_SIG_ID_RIVS = 20006, /* RequestIocVersion */
234+
CBC_SIG_ID_RRMS = 20007, /* RequestRuntimeMeasurement */
235+
CBC_SIG_ID_MTAM = 20008, /* MuteAmplifier */
236+
CBC_SIG_ID_PBST = 20009, /* ParkingBrakeSetting */
237+
CBC_SIG_ID_PBAT = 20010, /* ParkingBrakeAutomaticSetting */
238+
CBC_SIG_ID_HFSS = 20011, /* HvacFanSpeedSetting */
239+
CBC_SIG_ID_HFDST = 20012, /* HvacFanDirectionSetting */
240+
CBC_SIG_ID_HVAST = 20013, /* HvacAcSetting */
241+
CBC_SIG_ID_HAMS = 20014, /* HvacAcMaxSetting */
242+
CBC_SIG_ID_HATST = 20015, /* HvacAutoSetting */
243+
CBC_SIG_ID_HDEFST = 20016, /* HvacDefrostSetting */
244+
CBC_SIG_ID_HDMXST = 20017, /* HvacDefrostMaxSetting */
245+
CBC_SIG_ID_HDST = 20018, /* HvacDualSetting */
246+
CBC_SIG_ID_HHSMS = 20019, /* HvacHeatingSideMirrorSetting */
247+
CBC_SIG_ID_HHSWS = 20020, /* HvacHeatingSteeringWheelSetting */
248+
CBC_SIG_ID_HPWST = 20021, /* HvacPowerSetting */
249+
CBC_SIG_ID_HRCST = 20022, /* HvacRecirculationSetting */
250+
CBC_SIG_ID_HTCST = 20023, /* HvacTemperatureCabinSetting */
251+
CBC_SIG_ID_HTSST = 20024, /* HvacTemperatureSeatSetting */
252+
CBC_SIG_ID_HTUST = 20025, /* HvacTemperatureUnitsSetting */
253+
CBC_SIG_ID_HVSST = 20026, /* HvacVentilationSeatSetting */
254+
CBC_SIG_ID_HRAST = 20027, /* HvacRecirculationAutomaticSetting */
255+
CBC_SIG_ID_VICL = 651, /* VideoInCtrl */
237256
};
238257

239258
/*
@@ -459,6 +478,44 @@ enum cbc_tx_signal_id {
459478
CBC_SIG_ID_GYROZ = 929, /* GyroZ */
460479
CBC_SIG_ID_IAVMN = 930, /* IocAppVersionMinor */
461480
CBC_SIG_ID_RTST = 931, /* RuntimeSamplesTaken */
481+
CBC_SIG_ID_PKBK = 933, /* ParkingBrake */
482+
CBC_SIG_ID_PKBKST = 934, /* ParkingBrakeSetting */
483+
CBC_SIG_ID_PKBKAT = 935, /* ParkingBrakeAutomatic */
484+
CBC_SIG_ID_PKBKAS = 936, /* ParkingBrakeAutomaticSetting */
485+
CBC_SIG_ID_HFSPD = 937, /* HvacFanSpeed */
486+
CBC_SIG_ID_HFSST = 938, /* HvacFanSpeedSetting */
487+
CBC_SIG_ID_HFDIR = 939, /* HvacFanDirection */
488+
CBC_SIG_ID_HFDSTT = 940, /* HvacFanDirectionSetting */
489+
CBC_SIG_ID_HVACA = 941, /* HvacAc */
490+
CBC_SIG_ID_HVASTT = 942, /* HvacAcSetting */
491+
CBC_SIG_ID_HAMAX = 943, /* HvacAcMax */
492+
CBC_SIG_ID_HVMST = 944, /* HvacAcMaxSetting */
493+
CBC_SIG_ID_HAUTO = 945, /* HvacAuto */
494+
CBC_SIG_ID_HATSTT = 946, /* HvacAutoSetting */
495+
CBC_SIG_ID_HVDEF = 947, /* HvacDefrost */
496+
CBC_SIG_ID_HDEFSTT = 948, /* HvacDefrostSetting */
497+
CBC_SIG_ID_HDFMAX = 949, /* HvacDefrostMax */
498+
CBC_SIG_ID_HDMXSTT = 950, /* HvacDefrostMaxSetting */
499+
CBC_SIG_ID_HDUAL = 951, /* HvacDual */
500+
CBC_SIG_ID_HDSTT = 952, /* HvacDualSetting */
501+
CBC_SIG_ID_HHSMR = 953, /* HvacHeatingSideMirror */
502+
CBC_SIG_ID_HHSMST = 954, /* HvacHeatingSideMirrorSetting */
503+
CBC_SIG_ID_HHSWL = 955, /* HvacHeatingSteeringWheel */
504+
CBC_SIG_ID_HHSWST = 956, /* HvacHeatingSteeringWheelSetting */
505+
CBC_SIG_ID_HPOWR = 957, /* HvacPower */
506+
CBC_SIG_ID_HPWSTT = 958, /* HvacPowerSetting */
507+
CBC_SIG_ID_HRECC = 959, /* HvacRecirculation */
508+
CBC_SIG_ID_HRECST = 960, /* HvacRecirculationSetting */
509+
CBC_SIG_ID_HTEMCB = 961, /* HvacTemperatureCabin */
510+
CBC_SIG_ID_HTCSTT = 962, /* HvacTemperatureCabinSetting */
511+
CBC_SIG_ID_HTMPST = 963, /* HvacTemperatureSeat */
512+
CBC_SIG_ID_HTSSTT = 964, /* HvacTemperatureSeatSetting */
513+
CBC_SIG_ID_HTMPU = 965, /* HvacTemperatureUnits */
514+
CBC_SIG_ID_HTUSTT = 966, /* HvacTemperatureUnitsSetting */
515+
CBC_SIG_ID_HVTST = 967, /* HvacVentilationSeat */
516+
CBC_SIG_ID_HVSSTT = 968, /* HvacVentilationSeatSetting */
517+
CBC_SIG_ID_HRCAT = 969, /* HvacRecirculationAutomatic */
518+
CBC_SIG_ID_HRASTT = 970, /* HvacRecirculationAutomaticSetting */
462519
};
463520

464521
/*

0 commit comments

Comments
 (0)