diff --git a/PVList.md b/PVList.md
new file mode 100644
index 0000000..6c988ed
--- /dev/null
+++ b/PVList.md
@@ -0,0 +1,405 @@
+# IPMI Manager Process Variables naming list
+
+This document has the purpose of making it easier to understand the PV
+substitution tree in this IOC and to ensure that it follows LNLS's naming
+convention. It is also useful for any user to check which PVs are available.
+
+Each new record created, or aliased from the ipmiComm module, must be
+documented here.
+
+```
+AREA=IA-{{01..20}RaBPM|20RaBPMTL} # Area = LNLS uTCA crates
+DIS=CO # Discipline = Control
+```
+
+## MCH
+
+### `$(AREA):$(DIS)-MCH_Base:`
+
+
+link state
+asyn
+
+
+
+sensors
+ TempCPU{-Mon|Prs-Cte}
+ TempIO{-Mon|Prs-Cte}
+ VoltBase1V2{-Mon|Prs-Cte}
+ VoltBase1V5{-Mon|Prs-Cte}
+ VoltBase1V8{-Mon|Prs-Cte}
+ VoltBase2V5{-Mon|Prs-Cte}
+ VoltBase3V3{-Mon|Prs-Cte}
+ VoltBase12V{-Mon|Prs-Cte}
+ CurrBase{-Mon|Prs-Cte}
+
+
+
+
+FRU
+ Status-Cte
+ FruId-Cte
+ BoardManuf-Cte
+ BoardName-Cte
+ BoardSN-Cte
+ BoardPN-Cte
+ ProdManuf-Cte
+ ProdName-Cte
+ ProdSN-Cte
+ ProdPN-Cte
+ PowerCtl-Sel
+ SoftRst-Cmd
+ SoftRstSts-Mon
+
+
+
+
+### `$(AREA):$(DIS)-MCH_ClkSw:`
+
+
+sensors
+ TempDCDC{-Mon|Prs-Cte}
+ TempDCDCMax{-Mon|Prs-Cte}
+ TempMux{-Mon|Prs-Cte}
+ TempMuxMax{-Mon|Prs-Cte}
+ Volt3V3{-Mon|Prs-Cte}
+ Volt12V{-Mon|Prs-Cte}
+
+
+
+
+FRU
+ Status-Cte
+ FruId-Cte
+ BoardManuf-Cte
+ BoardName-Cte
+ BoardSN-Cte
+ BoardPN-Cte
+ ProdManuf-Cte
+ ProdName-Cte
+ ProdSN-Cte
+ ProdPN-Cte
+ PowerCtl-Sel
+ SoftRst-Cmd
+ SoftRstSts-Mon
+
+
+
+### `$(AREA):$(DIS)-MCH_PCI_Hub:`
+
+
+sensors
+ TempDCDC{-Mon|Prs-Cte}
+ TempDCDCMax{-Mon|Prs-Cte}
+ TempSwitch{-Mon|Prs-Cte}
+ TempSwitchMax{-Mon|Prs-Cte}
+ TempPCB{-Mon|Prs-Cte}
+ TempPCBMax{-Mon|Prs-Cte}
+ Volt0V9{-Mon|Prs-Cte}
+ Volt0V9Analog{-Mon|Prs-Cte}
+ Volt1V8{-Mon|Prs-Cte}
+ Volt3V3{-Mon|Prs-Cte}
+ Volt12V{-Mon|Prs-Cte}
+
+
+
+
+FRU
+ Status-Cte
+ FruId-Cte
+ BoardManuf-Cte
+ BoardName-Cte
+ BoardSN-Cte
+ BoardPN-Cte
+ ProdManuf-Cte
+ ProdName-Cte
+ ProdSN-Cte
+ ProdPN-Cte
+ PowerCtl-Sel
+ SoftRst-Cmd
+ SoftRstSts-Mon
+
+
+
+### `$(AREA):$(DIS)-MCH_RTM_CPU:`
+
+
+sensors
+ TempPCB{-Mon|Prs-Cte}
+ TempPCBMax{-Mon|Prs-Cte}
+ TempDCDC{-Mon|Prs-Cte}
+ TempDCDCMax{-Mon|Prs-Cte}
+ TempComExCPU{-Mon|Prs-Cte}
+ TempComExPCH{-Mon|Prs-Cte}
+ TempComExDDR{-Mon|Prs-Cte}
+ Volt1V0{-Mon|Prs-Cte}
+ Volt1V8{-Mon|Prs-Cte}
+ Volt3V3{-Mon|Prs-Cte}
+ Volt5V{-Mon|Prs-Cte}
+ VoltVBAT{-Mon|Prs-Cte}
+ Volt12VInt{-Mon|Prs-Cte}
+
+
+
+
+FRU
+ Status-Cte
+ FruId-Cte
+ BoardManuf-Cte
+ BoardName-Cte
+ BoardSN-Cte
+ BoardPN-Cte
+ ProdManuf-Cte
+ ProdName-Cte
+ ProdSN-Cte
+ ProdPN-Cte
+ PowerCtl-Sel
+ SoftRst-Cmd
+ SoftRstSts-Mon
+
+
+
+## Cooling Unit
+
+### `$(AREA):$(DIS)-CU{Top|Bot}:`
+
+
+sensors
+ TempLM75{-Mon|Prs-Cte}
+ TempLM75_2{-Mon|Prs-Cte}
+ Volt3V3{-Mon|Prs-Cte}
+ Volt12V{-Mon|Prs-Cte}
+ Volt12V_1{-Mon|Prs-Cte}
+ SFan1{-Mon|Prs-Cte}
+ SFan2{-Mon|Prs-Cte}
+ SFan3{-Mon|Prs-Cte}
+ SFan4{-Mon|Prs-Cte}
+ SFan5{-Mon|Prs-Cte}
+ SFan6{-Mon|Prs-Cte}
+
+
+
+
+FRU
+ Status-Cte
+ FruId-Cte
+ BoardManuf-Cte
+ BoardName-Cte
+ BoardSN-Cte
+ BoardPN-Cte
+ ProdManuf-Cte
+ ProdName-Cte
+ ProdSN-Cte
+ ProdPN-Cte
+ PowerCtl-Sel
+ Pwr-Mon
+ SoftRst-Cmd
+ SoftRstSts-Mon
+
+
+
+## Power Module
+
+### `$(AREA):$(DIS)-PM-{2|4}:`
+
+
+sensors
+ TempDCDC{-Mon|Prs-Cte}
+ TempPath{-Mon|Prs-Cte}
+ TempCooler{-Mon|Prs-Cte}
+ TempTrafo{-Mon|Prs-Cte}
+ VoltMP{-Mon|Prs-Cte}
+ VoltSMP{-Mon|Prs-Cte}
+ VoltSMPP{-Mon|Prs-Cte}
+ VoltPP{-Mon|Prs-Cte}
+ Volt12VHHV{-Mon|Prs-Cte}
+ CurrSum{-Mon|Prs-Cte}
+ CurrCh01{-Mon|Prs-Cte}
+ CurrCh02{-Mon|Prs-Cte}
+ CurrCh03{-Mon|Prs-Cte}
+ CurrCh04{-Mon|Prs-Cte}
+ CurrCh05{-Mon|Prs-Cte}
+ CurrCh06{-Mon|Prs-Cte}
+ CurrCh07{-Mon|Prs-Cte}
+ CurrCh08{-Mon|Prs-Cte}
+ CurrCh09{-Mon|Prs-Cte}
+ CurrCh10{-Mon|Prs-Cte}
+ CurrCh11{-Mon|Prs-Cte}
+ CurrCh12{-Mon|Prs-Cte}
+ CurrCh13{-Mon|Prs-Cte}
+ CurrCh14{-Mon|Prs-Cte}
+ CurrCh15{-Mon|Prs-Cte}
+ CurrCh16{-Mon|Prs-Cte}
+
+
+
+
+FRU
+ Status-Cte
+ FruId-Cte
+ BoardManuf-Cte
+ BoardName-Cte
+ BoardSN-Cte
+ BoardPN-Cte
+ ProdManuf-Cte
+ ProdName-Cte
+ ProdSN-Cte
+ ProdPN-Cte
+ PowerCtl-Sel
+ SoftRst-Cmd
+ SoftRstSts-Mon
+
+
+
+## AMC
+
+### `$(AREA):$(DIS)-AMC-{1,3..12}:`
+
+Slots related to AFCv3.1.
+
+
+sensors
+ FMC{1|2}{Volt|Curr}12V{-Mon|Prs-Cte}
+ FMC{1|2}{Volt|Curr}VADJ{-Mon|Prs-Cte}
+ FMC{1|2}{Volt|Curr}3V3{-Mon|Prs-Cte}
+ TempFPGA{-Mon|Prs-Cte}
+ TempUC{-Mon|Prs-Cte}
+ TempClkSwitch{-Mon|Prs-Cte}
+ TempDCDC{-Mon|Prs-Cte}
+ TempRAM{-Mon|Prs-Cte}
+
+
+
+
+FRU
+ Status-Cte
+ FruId-Cte
+ BoardManuf-Cte
+ BoardName-Cte
+ BoardSN-Cte
+ BoardPN-Cte
+ ProdManuf-Cte
+ ProdName-Cte
+ ProdSN-Cte
+ ProdPN-Cte
+ PowerCtl-Sel
+ Pwr-Mon
+ SoftRst-Cmd
+ SoftRstSts-Mon
+
+
+
+### `$(AREA):$(DIS)-AMC-2:`
+
+Slots related to AFCv4.0.
+
+
+sensors
+ AMC{Volt|Curr}12V{-Mon|Prs-Cte}
+ RTM{Volt|Curr}12V{-Mon|Prs-Cte}
+ FMC{1|2}{Volt|Curr}VADJ{-Mon|Prs-Cte}
+ FMC{1|2}{Volt|Curr}3V3{-Mon|Prs-Cte}
+ TempFPGA{-Mon|Prs-Cte}
+ TempUC{-Mon|Prs-Cte}
+ TempClkSwitch{-Mon|Prs-Cte}
+ TempDCDC{-Mon|Prs-Cte}
+ TempRAM{-Mon|Prs-Cte}
+
+
+
+
+FRU
+ Status-Cte
+ FruId-Cte
+ BoardManuf-Cte
+ BoardName-Cte
+ BoardSN-Cte
+ BoardPN-Cte
+ ProdManuf-Cte
+ ProdName-Cte
+ ProdSN-Cte
+ ProdPN-Cte
+ PowerCtl-Sel
+ Pwr-Mon
+ SoftRst-Cmd
+ SoftRstSts-Mon
+
+
+
+## RTM
+
+### `$(AREA):$(DIS)-RTM_8SFP:`
+
+RTM connected to AFCv3.1-Timing (Slot 1).
+
+
+sensors
+ TempRTM1{-Mon|Prs-Cte}
+ TempRTM2{-Mon|Prs-Cte}
+
+
+
+
+FRU
+ Status-Cte
+ FruId-Cte
+ BoardManuf-Cte
+ BoardName-Cte
+ BoardSN-Cte
+ BoardPN-Cte
+ ProdManuf-Cte
+ ProdName-Cte
+ ProdSN-Cte
+ ProdPN-Cte
+ PowerCtl-Sel
+ SoftRst-Cmd
+ SoftRstSts-Mon
+
+
+
+### `$(AREA):$(DIS)-RTM_LAMP:`
+
+RTM connected to AFCv4.0-FOFB (Slot 2).
+
+
+sensors
+ TempRTM1{-Mon|Prs-Cte}
+ TempRTM2{-Mon|Prs-Cte}
+ TempRTM3{-Mon|Prs-Cte}
+
+
+
+
+FRU
+ Status-Cte
+ FruId-Cte
+ BoardManuf-Cte
+ BoardName-Cte
+ BoardSN-Cte
+ BoardPN-Cte
+ ProdManuf-Cte
+ ProdName-Cte
+ ProdSN-Cte
+ ProdPN-Cte
+ PowerCtl-Sel
+ SoftRst-Cmd
+ SoftRstSts-Mon
+
+
+
+## System
+
+### `$(AREA):$(DIS)-Crate:`
+
+
+System Common
+ MCHType-Cte
+ DbgLvl-Sel
+ Online-Mon
+ Init-Mon
+ InitBypass-Cmd
+ Connect-Cmd
+ Rst-Cmd
+ SensorScanPeriod-Sel
+
+
diff --git a/README.md b/README.md
index 253de1c..a8037c8 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@ Status](https://github.com/lnls-dig/ipmi-mgr-epics-ioc/actions/workflows/build.y
This repository contains the EPICS Input/Output Controller (IOC) used at LNLS
for managing uTCA crates, based on
[ipmiComm](https://github.com/slac-epics-modules/ipmiComm) support module.
+The available PVs are listed [here](PVList.md).
## Running the IOC
diff --git a/docker-compose.yml b/docker-compose.yml
index 489baba..e051de1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,6 +11,5 @@ services:
REPONAME: ipmi-mgr-epics-ioc
RUNDIR: /opt/ipmi-mgr-epics-ioc/iocBoot/iocIpmiMgr
environment:
- P: ${P}
- R: ${R}
+ AREA: ${AREA}
IPADDR: ${IPADDR}
diff --git a/iocBoot/iocIpmiMgr/st.cmd b/iocBoot/iocIpmiMgr/st.cmd
index c94ecf4..6006a4a 100755
--- a/iocBoot/iocIpmiMgr/st.cmd
+++ b/iocBoot/iocIpmiMgr/st.cmd
@@ -16,8 +16,8 @@ drvAsynIPPortConfigure ("$(PORT)","$(IPADDR):623 udp",0,0,0)
mchInit("$(PORT)")
## Load record instances
-dbLoadRecords("$(TOP)/db/asynRecord.db","P=${P}, R=${R}:asyn,PORT=$(PORT),ADDR=0,OMAX=80,IMAX=80")
-dbLoadRecords("${TOP}/db/microtca_bpm_crate.db", "link=$(PORT),P=$(P),R=$(R):,dev=$(P)$(R),unit=''")
+dbLoadRecords("$(TOP)/db/asynRecord.db","P=${AREA}:, R=CO-MCH_Base:asyn,PORT=$(PORT),ADDR=0,OMAX=80,IMAX=80")
+dbLoadRecords("${TOP}/db/microtca_bpm_crate.db", "link=$(PORT),AREA=$(AREA):,DIS='CO-',id='',prefix='',unit=''")
# < save_restore.cmd
diff --git a/ipmiMgrApp/Db/afcv3.substitutions b/ipmiMgrApp/Db/afcv3.substitutions
index 07fadfb..7e44ed1 100644
--- a/ipmiMgrApp/Db/afcv3.substitutions
+++ b/ipmiMgrApp/Db/afcv3.substitutions
@@ -29,34 +29,34 @@
file "fru_common_alias.db"
{
- pattern { id , fruid }
- { $(id) , $(fruid) }
+ pattern { dev , fruid }
+ { $(dev), $(fruid) }
}
file "power_mngr.db"
{
- pattern { id , power_channel }
- { $(id) , $(power_channel) }
+ pattern { dev , power_channel }
+ { $(dev), $(power_channel) }
}
file "sensor_ai_alias.db"
{
- pattern { attr , sensinst , type , fruid , prefix , aliasprefix }
- { FMC1Volt12V , 1 , 2 , $(fruid) , $(id) , alias_$(id) }
- { FMC1VoltVADJ , 2 , 2 , $(fruid) , $(id) , alias_$(id) }
- { FMC1Volt3V3 , 3 , 2 , $(fruid) , $(id) , alias_$(id) }
- { FMC2Volt12V , 4 , 2 , $(fruid) , $(id) , alias_$(id) }
- { FMC2VoltVADJ , 5 , 2 , $(fruid) , $(id) , alias_$(id) }
- { FMC2Volt3V3 , 6 , 2 , $(fruid) , $(id) , alias_$(id) }
- { FMC1Curr12V , 1 , 3 , $(fruid) , $(id) , alias_$(id) }
- { FMC1CurrVADJ , 2 , 3 , $(fruid) , $(id) , alias_$(id) }
- { FMC1Curr3V3 , 3 , 3 , $(fruid) , $(id) , alias_$(id) }
- { FMC2Curr12V , 4 , 3 , $(fruid) , $(id) , alias_$(id) }
- { FMC2CurrVADJ , 5 , 3 , $(fruid) , $(id) , alias_$(id) }
- { FMC2Curr3V3 , 6 , 3 , $(fruid) , $(id) , alias_$(id) }
- { TempFPGA , 1 , 1 , $(fruid) , $(id) , alias_$(id) }
- { TempUC , 2 , 1 , $(fruid) , $(id) , alias_$(id) }
- { TempClkSwitch , 3 , 1 , $(fruid) , $(id) , alias_$(id) }
- { TempDCDC , 4 , 1 , $(fruid) , $(id) , alias_$(id) }
- { TempRAM , 5 , 1 , $(fruid) , $(id) , alias_$(id) }
+ pattern { attr , sensinst, type, fruid , aliasprefix , dev }
+ { FMC1Volt12V , 1 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { FMC1VoltVADJ , 2 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { FMC1Volt3V3 , 3 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { FMC2Volt12V , 4 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { FMC2VoltVADJ , 5 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { FMC2Volt3V3 , 6 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { FMC1Curr12V , 1 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { FMC1CurrVADJ , 2 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { FMC1Curr3V3 , 3 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { FMC2Curr12V , 4 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { FMC2CurrVADJ , 5 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { FMC2Curr3V3 , 6 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { TempFPGA , 1 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempUC , 2 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempClkSwitch, 3 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempDCDC , 4 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempRAM , 5 , 1 , $(fruid), alias_$(dev), $(dev) }
}
diff --git a/ipmiMgrApp/Db/afcv4.substitutions b/ipmiMgrApp/Db/afcv4.substitutions
index 22029ca..2394827 100644
--- a/ipmiMgrApp/Db/afcv4.substitutions
+++ b/ipmiMgrApp/Db/afcv4.substitutions
@@ -31,38 +31,38 @@
file "fru_common_alias.db"
{
- pattern { id , fruid }
- { $(id) , $(fruid) }
+ pattern { dev , fruid }
+ { $(dev), $(fruid)}
}
file "power_mngr.db"
{
- pattern { id , power_channel }
- { $(id) , $(power_channel) }
+ pattern { dev , power_channel }
+ { $(dev), $(power_channel)}
}
file "sensor_ai_alias.db"
{
- pattern { attr , sensinst , type , fruid , prefix , aliasprefix }
- { AMCVolt12V , 1 , 2 , $(fruid) , $(id) , alias_$(id) }
- { RTMVolt12V , 2 , 2 , $(fruid) , $(id) , alias_$(id) }
- { FMC1Volt12V , 3 , 2 , $(fruid) , $(id) , alias_$(id) }
- { FMC1VoltVADJ , 4 , 2 , $(fruid) , $(id) , alias_$(id) }
- { FMC1Volt3V3 , 5 , 2 , $(fruid) , $(id) , alias_$(id) }
- { FMC2Volt12V , 6 , 2 , $(fruid) , $(id) , alias_$(id) }
- { FMC2VoltVADJ , 7 , 2 , $(fruid) , $(id) , alias_$(id) }
- { FMC2Volt3V3 , 8 , 2 , $(fruid) , $(id) , alias_$(id) }
- { AMCCurr12V , 1 , 3 , $(fruid) , $(id) , alias_$(id) }
- { RTMCurr12V , 2 , 3 , $(fruid) , $(id) , alias_$(id) }
- { FMC1Curr12V , 3 , 3 , $(fruid) , $(id) , alias_$(id) }
- { FMC1CurrVADJ , 4 , 3 , $(fruid) , $(id) , alias_$(id) }
- { FMC1Curr3V3 , 5 , 3 , $(fruid) , $(id) , alias_$(id) }
- { FMC2Curr12V , 6 , 3 , $(fruid) , $(id) , alias_$(id) }
- { FMC2CurrVADJ , 7 , 3 , $(fruid) , $(id) , alias_$(id) }
- { FMC2Curr3V3 , 8 , 3 , $(fruid) , $(id) , alias_$(id) }
- { TempFPGA , 1 , 1 , $(fruid) , $(id) , alias_$(id) }
- { TempUC , 2 , 1 , $(fruid) , $(id) , alias_$(id) }
- { TempClkSwitch , 3 , 1 , $(fruid) , $(id) , alias_$(id) }
- { TempDCDC , 4 , 1 , $(fruid) , $(id) , alias_$(id) }
- { TempRAM , 5 , 1 , $(fruid) , $(id) , alias_$(id) }
+ pattern { attr , sensinst, type, fruid , aliasprefix , dev }
+ { AMCVolt12V , 1 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { RTMVolt12V , 2 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { FMC1Volt12V , 3 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { FMC1VoltVADJ , 4 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { FMC1Volt3V3 , 5 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { FMC2Volt12V , 6 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { FMC2VoltVADJ , 7 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { FMC2Volt3V3 , 8 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { AMCCurr12V , 1 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { RTMCurr12V , 2 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { FMC1Curr12V , 3 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { FMC1CurrVADJ , 4 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { FMC1Curr3V3 , 5 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { FMC2Curr12V , 6 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { FMC2CurrVADJ , 7 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { FMC2Curr3V3 , 8 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { TempFPGA , 1 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempUC , 2 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempClkSwitch, 3 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempDCDC , 4 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempRAM , 5 , 1 , $(fruid), alias_$(dev), $(dev) }
}
diff --git a/ipmiMgrApp/Db/cooling_unit.substitutions b/ipmiMgrApp/Db/cooling_unit.substitutions
index 5db12e0..5b9df3d 100644
--- a/ipmiMgrApp/Db/cooling_unit.substitutions
+++ b/ipmiMgrApp/Db/cooling_unit.substitutions
@@ -25,28 +25,28 @@
file "fru_common_alias.db"
{
- pattern { id , fruid }
- { $(id) , $(fruid) }
+ pattern { dev , fruid }
+ { $(dev), $(fruid) }
}
file "power_mngr.db"
{
- pattern { id , power_channel }
- { $(id) , $(power_channel) }
+ pattern { dev , power_channel }
+ { $(dev), $(power_channel) }
}
file "sensor_ai_alias.db"
{
- pattern { attr , sensinst , type , fruid , prefix , aliasprefix }
- { LM75Temp1 , 1 , 1 , $(fruid) , $(id) , alias_$(id) }
- { LM75Temp2 , 2 , 1 , $(fruid) , $(id) , alias_$(id) }
- { 3V3 , 1 , 2 , $(fruid) , $(id) , alias_$(id) }
- { 12V , 2 , 2 , $(fruid) , $(id) , alias_$(id) }
- { 12V_1 , 3 , 2 , $(fruid) , $(id) , alias_$(id) }
- { Fan1 , 1 , 4 , $(fruid) , $(id) , alias_$(id) }
- { Fan2 , 2 , 4 , $(fruid) , $(id) , alias_$(id) }
- { Fan3 , 3 , 4 , $(fruid) , $(id) , alias_$(id) }
- { Fan4 , 4 , 4 , $(fruid) , $(id) , alias_$(id) }
- { Fan5 , 5 , 4 , $(fruid) , $(id) , alias_$(id) }
- { Fan6 , 6 , 4 , $(fruid) , $(id) , alias_$(id) }
+ pattern { attr , sensinst, type, fruid , aliasprefix , dev }
+ { TempLM75 , 1 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempLM75_2, 2 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { Volt3V3 , 1 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { Volt12V , 2 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { Volt12V_1 , 3 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { SFan1 , 1 , 4 , $(fruid), alias_$(dev), $(dev) }
+ { SFan2 , 2 , 4 , $(fruid), alias_$(dev), $(dev) }
+ { SFan3 , 3 , 4 , $(fruid), alias_$(dev), $(dev) }
+ { SFan4 , 4 , 4 , $(fruid), alias_$(dev), $(dev) }
+ { SFan5 , 5 , 4 , $(fruid), alias_$(dev), $(dev) }
+ { SFan6 , 6 , 4 , $(fruid), alias_$(dev), $(dev) }
}
diff --git a/ipmiMgrApp/Db/fru_common_alias.template b/ipmiMgrApp/Db/fru_common_alias.template
index 4791a75..39ae016 100644
--- a/ipmiMgrApp/Db/fru_common_alias.template
+++ b/ipmiMgrApp/Db/fru_common_alias.template
@@ -1,55 +1,45 @@
include "fru_common.db"
-alias("$(dev):$(id)$(unit):P", "$(P)$(R)$(id)Prs-Sts")
-
-alias("$(dev):$(id)$(unit):FRUID", "$(P)$(R)$(id)FruId-Cte")
-
-alias("$(dev):$(id)$(unit):BMANUF", "$(P)$(R)$(id)BoardManuf-Cte")
-
-alias("$(dev):$(id)$(unit):BPRODNAME", "$(P)$(R)$(id)BoardName-Cte")
-
-alias("$(dev):$(id)$(unit):BSN", "$(P)$(R)$(id)BoardSN-Cte")
-
-alias("$(dev):$(id)$(unit):BPARTNUMBER", "$(P)$(R)$(id)BoardPN-Cte")
-
-alias("$(dev):$(id)$(unit):PMANUF", "$(P)$(R)$(id)ProdManuf-Cte")
-
-alias("$(dev):$(id)$(unit):PPRODNAME", "$(P)$(R)$(id)ProdName-Cte")
-
-alias("$(dev):$(id)$(unit):PSN", "$(P)$(R)$(id)ProdSN-Cte")
-
-alias("$(dev):$(id)$(unit):PPARTNUMBER", "$(P)$(R)$(id)ProdPN-Cte")
-
-alias("$(dev):$(id)$(unit):POWERCTL", "$(P)$(R)$(id)PowerCtl-Sel")
-
-record(sseq, "$(P)$(R)$(id)SoftRst-Cmd") {
+alias("$(dev):$(id)$(unit):P", "$(AREA)$(DIS)$(dev):Status-Cte")
+alias("$(dev):$(id)$(unit):FRUID", "$(AREA)$(DIS)$(dev):FruId-Cte")
+alias("$(dev):$(id)$(unit):BMANUF", "$(AREA)$(DIS)$(dev):BoardManuf-Cte")
+alias("$(dev):$(id)$(unit):BPRODNAME", "$(AREA)$(DIS)$(dev):BoardName-Cte")
+alias("$(dev):$(id)$(unit):BSN", "$(AREA)$(DIS)$(dev):BoardSN-Cte")
+alias("$(dev):$(id)$(unit):BPARTNUMBER", "$(AREA)$(DIS)$(dev):BoardPN-Cte")
+alias("$(dev):$(id)$(unit):PMANUF", "$(AREA)$(DIS)$(dev):ProdManuf-Cte")
+alias("$(dev):$(id)$(unit):PPRODNAME", "$(AREA)$(DIS)$(dev):ProdName-Cte")
+alias("$(dev):$(id)$(unit):PSN", "$(AREA)$(DIS)$(dev):ProdSN-Cte")
+alias("$(dev):$(id)$(unit):PPARTNUMBER", "$(AREA)$(DIS)$(dev):ProdPN-Cte")
+alias("$(dev):$(id)$(unit):POWERCTL", "$(AREA)$(DIS)$(dev):PowerCtl-Sel")
+
+record(sseq, "$(AREA)$(DIS)$(dev):SoftRst-Cmd") {
field(DESC, "Power cycle system")
field(SELM, "All")
field(PINI, "NO")
#Set 'Restarting' State
- field(LNK1, "$(P)$(R)$(id)SoftRstSts-Mon CA")
+ field(LNK1, "$(AREA)$(DIS)$(dev):SoftRstSts-Mon CA")
field(DO1, "1")
field(WAIT1, "Wait")
#Send a shutdown command
- field(LNK2, "$(P)$(R)$(id)PowerCtl-Sel CA")
+ field(LNK2, "$(AREA)$(DIS)$(dev):PowerCtl-Sel CA")
field(DO2, "0")
field(WAIT2, "Wait")
#Set 'Waiting for Power On' state
- field(LNK3, "$(P)$(R)$(id)SoftRstSts-Mon CA")
+ field(LNK3, "$(AREA)$(DIS)$(dev):SoftRstSts-Mon CA")
field(DO3, "2")
field(WAIT3, "Wait")
#After 15 seconds, send a start command
field(DLY4, "15")
- field(LNK4, "$(P)$(R)$(id)PowerCtl-Sel CA")
+ field(LNK4, "$(AREA)$(DIS)$(dev):PowerCtl-Sel CA")
field(DO4, "1")
field(WAIT4, "Wait")
#After 15 seconds, set 'Idle' state
field(DLY5, "15")
- field(LNK5, "$(P)$(R)$(id)SoftRstSts-Mon CA")
+ field(LNK5, "$(AREA)$(DIS)$(dev):SoftRstSts-Mon CA")
field(DO5, "0")
field(WAIT5, "Wait")
}
-record(mbbo, "$(P)$(R)$(id)SoftRstSts-Mon") {
+record(mbbo, "$(AREA)$(DIS)$(dev):SoftRstSts-Mon") {
field(DESC, "Fru Power State")
field(ZRST, "Idle")
field(ONST, "Restarting")
diff --git a/ipmiMgrApp/Db/mch_base.substitutions b/ipmiMgrApp/Db/mch_base.substitutions
index dcc24ce..7ab8a5d 100644
--- a/ipmiMgrApp/Db/mch_base.substitutions
+++ b/ipmiMgrApp/Db/mch_base.substitutions
@@ -20,20 +20,20 @@
file "fru_common_alias.db"
{
- pattern { id , fruid }
- { $(suffix) , $(fruid) }
+ pattern { dev , fruid }
+ { $(dev), $(fruid) }
}
file "sensor_ai_alias.db"
{
- pattern { attr , sensinst , type , fruid , prefix , aliasprefix }
- { TempCPU , 1 , 1 , $(fruid) , $(suffix) , alias_$(suffix) }
- { TempIO , 2 , 1 , $(fruid) , $(suffix) , alias_$(suffix) }
- { VoltBA1V2 , 1 , 2 , $(fruid) , $(suffix) , alias_$(suffix) }
- { VoltBA1V5 , 2 , 2 , $(fruid) , $(suffix) , alias_$(suffix) }
- { VoltBA1V8 , 3 , 2 , $(fruid) , $(suffix) , alias_$(suffix) }
- { VoltBA2V5 , 4 , 2 , $(fruid) , $(suffix) , alias_$(suffix) }
- { VoltBA3V3 , 5 , 2 , $(fruid) , $(suffix) , alias_$(suffix) }
- { VoltBA12V , 6 , 2 , $(fruid) , $(suffix) , alias_$(suffix) }
- { Curr , 1 , 3 , $(fruid) , $(suffix) , alias_$(suffix) }
+ pattern { attr , sensinst, type, fruid , aliasprefix , dev }
+ { TempCPU , 1 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempIO , 2 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { VoltBase1V2, 1 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { VoltBase1V5, 2 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { VoltBase1V8, 3 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { VoltBase2V5, 4 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { VoltBase3V3, 5 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { VoltBase12V, 6 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { CurrBase , 1 , 3 , $(fruid), alias_$(dev), $(dev) }
}
diff --git a/ipmiMgrApp/Db/mch_clk_switch.substitutions b/ipmiMgrApp/Db/mch_clk_switch.substitutions
index 394bde0..63f51e4 100644
--- a/ipmiMgrApp/Db/mch_clk_switch.substitutions
+++ b/ipmiMgrApp/Db/mch_clk_switch.substitutions
@@ -14,17 +14,17 @@
file "fru_common_alias.db"
{
- pattern { id , fruid }
- { $(suffix) , $(fruid) }
+ pattern { dev , fruid }
+ { $(dev), $(fruid) }
}
file "sensor_ai_alias.db"
{
- pattern { attr , sensinst , type , fruid , prefix , aliasprefix }
- { DTemp , 1 , 1 , $(fruid) , $(suffix) , alias_$(suffix) }
- { DMaxTemp , 2 , 1 , $(fruid) , $(suffix) , alias_$(suffix) }
- { MTemp , 3 , 1 , $(fruid) , $(suffix) , alias_$(suffix) }
- { MMaxTemp , 4 , 1 , $(fruid) , $(suffix) , alias_$(suffix) }
- { Volt3V3 , 1 , 2 , $(fruid) , $(suffix) , alias_$(suffix) }
- { Volt12V , 2 , 2 , $(fruid) , $(suffix) , alias_$(suffix) }
+ pattern { attr , sensinst, type, fruid , aliasprefix , dev }
+ { TempDCDC , 1 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempDCDCMax, 2 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempMux , 3 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempMuxMax , 4 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { Volt3V3 , 1 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { Volt12V , 2 , 2 , $(fruid), alias_$(dev), $(dev) }
}
diff --git a/ipmiMgrApp/Db/mch_nat.substitutions b/ipmiMgrApp/Db/mch_nat.substitutions
index 730c018..9469039 100644
--- a/ipmiMgrApp/Db/mch_nat.substitutions
+++ b/ipmiMgrApp/Db/mch_nat.substitutions
@@ -26,24 +26,24 @@
file "mch_base.db"
{
- pattern { suffix , fruid }
- { $(id)Base , 3 }
+ pattern { dev , fruid }
+ { $(dev)_Base, 3 }
}
file "mch_clk_switch.db"
{
- pattern { suffix , fruid }
- { $(id)ClkSw , 60 }
+ pattern { dev , fruid }
+ { $(dev)_ClkSw, 60 }
}
file "mch_pci_hub.db"
{
- pattern { suffix , fruid }
- { $(id)PciHub , 61 }
+ pattern { dev , fruid }
+ { $(dev)_PCI_Hub, 61 }
}
file "rtm_cpu.db"
{
- pattern { suffix , fruid }
- { $(id)RtmCpu , 64 }
+ pattern { dev , fruid }
+ { $(dev)_RTM_CPU, 64 }
}
diff --git a/ipmiMgrApp/Db/mch_pci_hub.substitutions b/ipmiMgrApp/Db/mch_pci_hub.substitutions
index c5416de..e5a1d93 100644
--- a/ipmiMgrApp/Db/mch_pci_hub.substitutions
+++ b/ipmiMgrApp/Db/mch_pci_hub.substitutions
@@ -19,22 +19,22 @@
file "fru_common_alias.db"
{
- pattern { id , fruid }
- { $(suffix) , $(fruid) }
+ pattern { dev , fruid }
+ { $(dev), $(fruid) }
}
file "sensor_ai_alias.db"
{
- pattern { attr , sensinst , type , fruid , prefix , aliasprefix }
- { DTemp , 1 , 1 , $(fruid) , $(suffix) , alias_$(suffix) }
- { DMaxTemp , 2 , 1 , $(fruid) , $(suffix) , alias_$(suffix) }
- { STemp , 3 , 1 , $(fruid) , $(suffix) , alias_$(suffix) }
- { SMaxTemp , 4 , 1 , $(fruid) , $(suffix) , alias_$(suffix) }
- { PTemp , 5 , 1 , $(fruid) , $(suffix) , alias_$(suffix) }
- { PMaxTemp , 6 , 1 , $(fruid) , $(suffix) , alias_$(suffix) }
- { Volt0V9 , 1 , 2 , $(fruid) , $(suffix) , alias_$(suffix) }
- { Volt0V9Ana , 2 , 2 , $(fruid) , $(suffix) , alias_$(suffix) }
- { Volt1V8 , 3 , 2 , $(fruid) , $(suffix) , alias_$(suffix) }
- { Volt3V3 , 4 , 2 , $(fruid) , $(suffix) , alias_$(suffix) }
- { Volt12V , 5 , 2 , $(fruid) , $(suffix) , alias_$(suffix) }
+ pattern { attr , sensinst, type, fruid , aliasprefix , dev }
+ { TempDCDC , 1 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempDCDCMax , 2 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempSwitch , 3 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempSwitchMax, 4 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempPCB , 5 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempPCBMax , 6 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { Volt0V9 , 1 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { Volt0V9Analog, 2 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { Volt1V8 , 3 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { Volt3V3 , 4 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { Volt12V , 5 , 2 , $(fruid), alias_$(dev), $(dev) }
}
diff --git a/ipmiMgrApp/Db/microtca_bpm_crate.substitutions b/ipmiMgrApp/Db/microtca_bpm_crate.substitutions
index 317bbd0..ec9defb 100644
--- a/ipmiMgrApp/Db/microtca_bpm_crate.substitutions
+++ b/ipmiMgrApp/Db/microtca_bpm_crate.substitutions
@@ -14,60 +14,60 @@
file "system_common_alias.db"
{
- pattern { id, location }
- { "", "" }
+ pattern { dev , location }
+ { Crate, $(AREA) }
}
file "power_module.db"
{
- pattern { id , fruid }
- { PM2 , 51 }
- { PM4 , 53 }
+ pattern { dev , fruid }
+ { PM-2, 51 }
+ { PM-4, 53 }
}
file "mch_nat.db"
{
- pattern { id , power_channel}
- { MCH , 01}
+ pattern { dev, power_channel }
+ { MCH, 01 }
}
file "cooling_unit.db"
{
- pattern { id , fruid, power_channel }
- { CUTop , 40 , 03}
- { CUBot , 41 , 04}
+ pattern { dev , fruid, power_channel }
+ { CUTop, 40 , 03 }
+ { CUBot, 41 , 04 }
}
file "afcv3.db"
{
- pattern { id , fruid, power_channel }
- { AMC1 , 5 , 05}
- { AMC3 , 7 , 07}
- { AMC4 , 8 , 08}
- { AMC5 , 9 , 09}
- { AMC6 , 10 , 10}
- { AMC7 , 11 , 11}
- { AMC8 , 12 , 12}
- { AMC9 , 13 , 13}
- { AMC10 , 14 , 14}
- { AMC11 , 15 , 15}
- { AMC12 , 16 , 16}
+ pattern { dev , fruid, power_channel }
+ { AMC-1 , 5 , 05 }
+ { AMC-3 , 7 , 07 }
+ { AMC-4 , 8 , 08 }
+ { AMC-5 , 9 , 09 }
+ { AMC-6 , 10 , 10 }
+ { AMC-7 , 11 , 11 }
+ { AMC-8 , 12 , 12 }
+ { AMC-9 , 13 , 13 }
+ { AMC-10, 14 , 14 }
+ { AMC-11, 15 , 15 }
+ { AMC-12, 16 , 16 }
}
file "afcv4.db"
{
- pattern { id , fruid, power_channel }
- { AMC2 , 6 , 06}
+ pattern { dev , fruid, power_channel }
+ { AMC-2, 6 , 06 }
}
file "rtm_8sfp.db"
{
- pattern { id , fruid }
- { Rtm8sfp , 90 }
+ pattern { dev , fruid }
+ { RTM_8SFP, 90 }
}
file "rtm_lamp.db"
{
- pattern { id , fruid }
- { RtmLamp , 91 }
+ pattern { dev , fruid }
+ { RTM_LAMP, 91 }
}
diff --git a/ipmiMgrApp/Db/power_mngr.template b/ipmiMgrApp/Db/power_mngr.template
index 1efdf1c..915bd92 100644
--- a/ipmiMgrApp/Db/power_mngr.template
+++ b/ipmiMgrApp/Db/power_mngr.template
@@ -1 +1 @@
-alias("$(P)$(R)PM2CurrCh$(power_channel)-Mon", "$(P)$(R)$(id)Pwr")
+alias("$(AREA)$(DIS)PM-2:CurrCh$(power_channel)-Mon", "$(AREA)$(DIS)$(dev):Pwr-Mon")
diff --git a/ipmiMgrApp/Db/power_module.substitutions b/ipmiMgrApp/Db/power_module.substitutions
index dc4fece..af86435 100644
--- a/ipmiMgrApp/Db/power_module.substitutions
+++ b/ipmiMgrApp/Db/power_module.substitutions
@@ -43,37 +43,37 @@
file "fru_common_alias.db"
{
- pattern { id , fruid }
- { $(id) , $(fruid) }
+ pattern { dev , fruid }
+ { $(dev), $(fruid) }
}
file "sensor_ai_alias.db"
{
- pattern { attr , sensinst , type , fruid , prefix , aliasprefix }
- { TempCpu0 , 1 , 1 , $(fruid) , $(id) , alias_$(id) }
- { TempPath , 2 , 1 , $(fruid) , $(id) , alias_$(id) }
- { TempCool , 3 , 1 , $(fruid) , $(id) , alias_$(id) }
- { TempTraf , 4 , 1 , $(fruid) , $(id) , alias_$(id) }
- { VoltMP00V , 1 , 2 , $(fruid) , $(id) , alias_$(id) }
- { VoltSMP0V , 2 , 2 , $(fruid) , $(id) , alias_$(id) }
- { VoltSMPPV , 3 , 2 , $(fruid) , $(id) , alias_$(id) }
- { VoltPP00V , 4 , 2 , $(fruid) , $(id) , alias_$(id) }
- { Volt12HHV , 5 , 2 , $(fruid) , $(id) , alias_$(id) }
- { CurrSum , 1 , 3 , $(fruid) , $(id) , alias_$(id) }
- { CurrCh01 , 2 , 3 , $(fruid) , $(id) , alias_$(id) }
- { CurrCh02 , 3 , 3 , $(fruid) , $(id) , alias_$(id) }
- { CurrCh03 , 4 , 3 , $(fruid) , $(id) , alias_$(id) }
- { CurrCh04 , 5 , 3 , $(fruid) , $(id) , alias_$(id) }
- { CurrCh05 , 6 , 3 , $(fruid) , $(id) , alias_$(id) }
- { CurrCh06 , 7 , 3 , $(fruid) , $(id) , alias_$(id) }
- { CurrCh07 , 8 , 3 , $(fruid) , $(id) , alias_$(id) }
- { CurrCh08 , 9 , 3 , $(fruid) , $(id) , alias_$(id) }
- { CurrCh09 , 10 , 3 , $(fruid) , $(id) , alias_$(id) }
- { CurrCh10 , 11 , 3 , $(fruid) , $(id) , alias_$(id) }
- { CurrCh11 , 12 , 3 , $(fruid) , $(id) , alias_$(id) }
- { CurrCh12 , 13 , 3 , $(fruid) , $(id) , alias_$(id) }
- { CurrCh13 , 14 , 3 , $(fruid) , $(id) , alias_$(id) }
- { CurrCh14 , 15 , 3 , $(fruid) , $(id) , alias_$(id) }
- { CurrCh15 , 16 , 3 , $(fruid) , $(id) , alias_$(id) }
- { CurrCh16 , 17 , 3 , $(fruid) , $(id) , alias_$(id) }
+ pattern { attr , sensinst, type, fruid , aliasprefix , dev }
+ { TempDCDC , 1 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempPath , 2 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempCooler, 3 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempTrafo , 4 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { VoltMP , 1 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { VoltSMP , 2 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { VoltSMPP , 3 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { VoltPP , 4 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { Volt12VHHV, 5 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { CurrSum , 1 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { CurrCh01 , 2 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { CurrCh02 , 3 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { CurrCh03 , 4 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { CurrCh04 , 5 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { CurrCh05 , 6 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { CurrCh06 , 7 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { CurrCh07 , 8 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { CurrCh08 , 9 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { CurrCh09 , 10 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { CurrCh10 , 11 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { CurrCh11 , 12 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { CurrCh12 , 13 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { CurrCh13 , 14 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { CurrCh14 , 15 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { CurrCh15 , 16 , 3 , $(fruid), alias_$(dev), $(dev) }
+ { CurrCh16 , 17 , 3 , $(fruid), alias_$(dev), $(dev) }
}
diff --git a/ipmiMgrApp/Db/rtm_8sfp.substitutions b/ipmiMgrApp/Db/rtm_8sfp.substitutions
index cef5fb0..4a3199b 100644
--- a/ipmiMgrApp/Db/rtm_8sfp.substitutions
+++ b/ipmiMgrApp/Db/rtm_8sfp.substitutions
@@ -16,13 +16,13 @@
file "fru_common_alias.db"
{
- pattern { id , fruid }
- { $(id) , $(fruid) }
+ pattern { dev , fruid }
+ { $(dev), $(fruid) }
}
file "sensor_ai_alias.db"
{
- pattern { attr , sensinst , type , fruid , prefix , aliasprefix }
- { TempRTM1 , 1 , 1 , $(fruid) , $(id) , alias_$(id) }
- { TempRTM2 , 2 , 1 , $(fruid) , $(id) , alias_$(id) }
+ pattern { attr , sensinst, type, fruid , aliasprefix , dev }
+ { TempRTM1, 1 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempRTM2, 2 , 1 , $(fruid), alias_$(dev), $(dev) }
}
diff --git a/ipmiMgrApp/Db/rtm_cpu.substitutions b/ipmiMgrApp/Db/rtm_cpu.substitutions
index 89243b6..0032520 100644
--- a/ipmiMgrApp/Db/rtm_cpu.substitutions
+++ b/ipmiMgrApp/Db/rtm_cpu.substitutions
@@ -26,24 +26,24 @@
file "fru_common_alias.db"
{
- pattern { id , fruid }
- { $(suffix) , $(fruid) }
+ pattern { dev , fruid }
+ { $(dev), $(fruid) }
}
file "sensor_ai_alias.db"
{
- pattern { attr , sensinst , type , fruid , prefix , aliasprefix}
- { PcbTemp , 1 , 1 , $(fruid) , $(suffix) , alias_$(suffix) }
- { PcbMaxTemp , 2 , 1 , $(fruid) , $(suffix) , alias_$(suffix) }
- { DcDcTemp , 3 , 1 , $(fruid) , $(suffix) , alias_$(suffix) }
- { DcDcMaxTemp , 4 , 1 , $(fruid) , $(suffix) , alias_$(suffix) }
- { ComExCpuTemp , 5 , 1 , $(fruid) , $(suffix) , alias_$(suffix) }
- { ComExPchTemp , 6 , 1 , $(fruid) , $(suffix) , alias_$(suffix) }
- { ComExDdrTemp , 7 , 1 , $(fruid) , $(suffix) , alias_$(suffix) }
- { 1V0 , 1 , 2 , $(fruid) , $(suffix) , alias_$(suffix) }
- { 1V8 , 2 , 2 , $(fruid) , $(suffix) , alias_$(suffix) }
- { 3V3 , 3 , 2 , $(fruid) , $(suffix) , alias_$(suffix) }
- { 5V , 4 , 2 , $(fruid) , $(suffix) , alias_$(suffix) }
- { VBAT , 5 , 2 , $(fruid) , $(suffix) , alias_$(suffix) }
- { Int12V , 6 , 2 , $(fruid) , $(suffix) , alias_$(suffix) }
+ pattern { attr , sensinst, type, fruid , aliasprefix , dev }
+ { TempPCB , 1 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempPCBMax , 2 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempDCDC , 3 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempDCDCMax , 4 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempComExCPU, 5 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempComExPCH, 6 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempComExDDR, 7 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { Volt1V0 , 1 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { Volt1V8 , 2 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { Volt3V3 , 3 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { Volt5V , 4 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { VoltVBAT , 5 , 2 , $(fruid), alias_$(dev), $(dev) }
+ { Volt12VInt , 6 , 2 , $(fruid), alias_$(dev), $(dev) }
}
diff --git a/ipmiMgrApp/Db/rtm_lamp.substitutions b/ipmiMgrApp/Db/rtm_lamp.substitutions
index 83ca5cc..e9c21bd 100644
--- a/ipmiMgrApp/Db/rtm_lamp.substitutions
+++ b/ipmiMgrApp/Db/rtm_lamp.substitutions
@@ -17,14 +17,14 @@
file "fru_common_alias.db"
{
- pattern { id , fruid }
- { $(id) , $(fruid) }
+ pattern { dev , fruid }
+ { $(dev) , $(fruid) }
}
file "sensor_ai_alias.db"
{
- pattern { attr , sensinst , type , fruid , prefix , aliasprefix}
- { TempRTM1 , 1 , 1 , $(fruid) , $(id) , alias_$(id) }
- { TempRTM2 , 2 , 1 , $(fruid) , $(id) , alias_$(id) }
- { TempRTM3 , 3 , 1 , $(fruid) , $(id) , alias_$(id) }
+ pattern { attr , sensinst, type, fruid , aliasprefix , dev }
+ { TempRTM1, 1 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempRTM2, 2 , 1 , $(fruid), alias_$(dev), $(dev) }
+ { TempRTM3, 3 , 1 , $(fruid), alias_$(dev), $(dev) }
}
diff --git a/ipmiMgrApp/Db/sensor_ai_alias.template b/ipmiMgrApp/Db/sensor_ai_alias.template
index 72fd1bb..53e7942 100644
--- a/ipmiMgrApp/Db/sensor_ai_alias.template
+++ b/ipmiMgrApp/Db/sensor_ai_alias.template
@@ -1,5 +1,4 @@
include "sensor_ai.db"
-alias("$(dev):$(prefix)$(attr)$(sensinst)", "$(P)$(R)$(prefix)$(attr)-Mon")
-
-alias("$(dev):$(prefix)$(attr)$(sensinst)P", "$(P)$(R)$(prefix)$(attr)Prs-Sts")
+alias("$(dev):$(prefix)$(attr)$(sensinst)", "$(AREA)$(DIS)$(dev):$(attr)-Mon")
+alias("$(dev):$(prefix)$(attr)$(sensinst)P", "$(AREA)$(DIS)$(dev):$(attr)Prs-Cte")
diff --git a/ipmiMgrApp/Db/system_common_alias.template b/ipmiMgrApp/Db/system_common_alias.template
index cb13548..3b77f18 100644
--- a/ipmiMgrApp/Db/system_common_alias.template
+++ b/ipmiMgrApp/Db/system_common_alias.template
@@ -1,17 +1,10 @@
include "system_common.db"
-alias("$(dev):TYPE_RAW", "$(P)$(R)$(id)MCHType-Cte")
-
-alias("$(dev):DBG", "$(P)$(R)$(id)DbgLvl-Sel")
-
-alias("$(dev):ONLNSTAT", "$(P)$(R)$(id)Online-Sts")
-
-alias("$(dev):INIT", "$(P)$(R)$(id)Init-Sts")
-
-alias("$(dev):INITBYP", "$(P)$(R)$(id)InitBypass-Cmd")
-
-alias("$(dev):CONNECT", "$(P)$(R)$(id)Connect-Cmd")
-
-alias("$(dev):RESET", "$(P)$(R)$(id)Rst-Cmd")
-
-alias("$(dev):SENSOR_SCAN_PERIOD", "$(P)$(R)$(id)SensorScanPeriod-Sel")
+alias("$(dev):TYPE_RAW", "$(AREA)$(DIS)$(dev):MCHType-Cte")
+alias("$(dev):DBG", "$(AREA)$(DIS)$(dev):DbgLvl-Sel")
+alias("$(dev):ONLNSTAT", "$(AREA)$(DIS)$(dev):Online-Mon")
+alias("$(dev):INIT", "$(AREA)$(DIS)$(dev):Init-Mon")
+alias("$(dev):INITBYP", "$(AREA)$(DIS)$(dev):InitBypass-Cmd")
+alias("$(dev):CONNECT", "$(AREA)$(DIS)$(dev):Connect-Cmd")
+alias("$(dev):RESET", "$(AREA)$(DIS)$(dev):Rst-Cmd")
+alias("$(dev):SENSOR_SCAN_PERIOD", "$(AREA)$(DIS)$(dev):SensorScanPeriod-Sel")