Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfe8127b

Browse files
committed
meta: ventura: add ModbusRTUDetect, USBPort config
Add ModbusRTUDetect & USBPort config for Meta's Ventura platform.Tested: Tested on Qemu via emulated Modbus device.```└─ /xyz └─ /xyz/openbmc_project ├─ /xyz/openbmc_project/EntityManager └─ /xyz/openbmc_project/inventory └─ /xyz/openbmc_project/inventory/system ├─ /xyz/openbmc_project/inventory/system/board │ └─ /xyz/openbmc_project/inventory/system/board/Ventura_Modbus │ ├─ /xyz/openbmc_project/inventory/system/board/Ventura_Modbus/DevTTYUSB0 │ ├─ /xyz/openbmc_project/inventory/system/board/Ventura_Modbus/Heat_Exchanger │ └─ /xyz/openbmc_project/inventory/system/board/Ventura_Modbus/Reservoir_Pumping_Unit └─ /xyz/openbmc_project/inventory/system/chassis ├─ /xyz/openbmc_project/inventory/system/chassis/Heat_Exchanger_12_DevTTYUSB0 └─ /xyz/openbmc_project/inventory/system/chassis/Reservoir_Pumping_Unit_12_DevTTYUSB0```Inventory for Heat_Exchanger -```NAME TYPE SIGNATURE RESULT/VALUE FLAGSorg.freedesktop.DBus.Introspectable interface - - -.Introspect method - s -org.freedesktop.DBus.Peer interface - - -.GetMachineId method - s -.Ping method - - -org.freedesktop.DBus.Properties interface - - -.Get method ss v -.GetAll method s a{sv} -.Set method ssv - -.PropertiesChanged signal sa{sv}as - -xyz.openbmc_project.AddObject interface - - -.AddObject method a{sv} - -xyz.openbmc_project.Inventory.Decorator.Asset interface - - -.BuildDate property s "Unknown" emits-change.Manufacturer property s "Unknown" emits-change.Model property s "Unknown" emits-change.PartNumber property s "Unknown" emits-change.SerialNumber property s "Unknown" emits-change.SparePartNumber property s "ABABABAB" emits-changexyz.openbmc_project.Inventory.Item.Chassis interface - - -.Name property s "Heat Exchanger 12 DevTTYUSB0" emits-change.Probe property s "xyz.openbmc_project.Inventory.Source.M… emits-change.Type property s "Chassis" emits-change```Inventory for Reservoir_Pumping_Unit -```NAME TYPE SIGNATURE RESULT/VALUE FLAGSorg.freedesktop.DBus.Introspectable interface - - -.Introspect method - s -org.freedesktop.DBus.Peer interface - - -.GetMachineId method - s -.Ping method - - -org.freedesktop.DBus.Properties interface - - -.Get method ss v -.GetAll method s a{sv} -.Set method ssv - -.PropertiesChanged signal sa{sv}as - -xyz.openbmc_project.AddObject interface - - -.AddObject method a{sv} - -xyz.openbmc_project.Inventory.Decorator.Asset interface - - -.BuildDate property s "ABABABAB" emits-change.Manufacturer property s "Unknown" emits-change.Model property s "ABABABABABABABAB" emits-change.PartNumber property s "Unknown" emits-change.SerialNumber property s "ABABABABABABABAB" emits-change.SparePartNumber property s "ABABABAB" emits-changexyz.openbmc_project.Inventory.Item.Chassis interface - - -.Name property s "Reservoir Pumping Unit 12 DevTTYUSB0" emits-change.Probe property s "xyz.openbmc_project.Inventory.Source.M… emits-change.Type property s "Chassis" emits-change```Change-Id: I31225056989c85bbf6d5226c397541fb4bc3ca1dSigned-off-by: Jagpal Singh Gill <paligill@gmail.com>
1 parent7d5f205 commitfe8127b

File tree

5 files changed

+166
-0
lines changed

5 files changed

+166
-0
lines changed

‎configurations/meson.build‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,9 @@ configs = [
169169
'meta/santabarbara/santabarbara_sitv_pcie.json',
170170
'meta/terminus_2x100g_nic_tsff.json',
171171
'meta/twinlake.json',
172+
'meta/ventura/delta_heat_exchanger.json',
173+
'meta/ventura/delta_heat_exchanger_fans.json',
174+
'meta/ventura/delta_reservoir_pump_unit.json',
172175
'meta/ventura/ventura_cable.json',
173176
'meta/ventura/ventura_fanboard_adc_max.json',
174177
'meta/ventura/ventura_fanboard_adc_ocp_max.json',
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"Exposes": [],
3+
"Name":"$Name",
4+
"Probe":"xyz.openbmc_project.Inventory.Source.Modbus.FRU({'Name': 'Heat Exchanger.*'})",
5+
"Type":"Chassis",
6+
"xyz.openbmc_project.Inventory.Decorator.Asset": {
7+
"BuildDate":"$BuildDate",
8+
"Manufacturer":"$Manufacturer",
9+
"Model":"$Model",
10+
"PartNumber":"$PartNumber",
11+
"SerialNumber":"$SerialNumber",
12+
"SparePartNumber":"$SparePartNumber"
13+
}
14+
}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
[
2+
{
3+
"Exposes": [],
4+
"Name":"$Name",
5+
"Probe":"xyz.openbmc_project.Inventory.Source.Modbus.FRU({'Name': 'Heat Exchanger Fan 1.*'})",
6+
"Type":"Chassis",
7+
"xyz.openbmc_project.Inventory.Decorator.Asset": {
8+
"BuildDate":"$BuildDate",
9+
"Manufacturer":"$Manufacturer",
10+
"Model":"$Model",
11+
"PartNumber":"$PartNumber",
12+
"SerialNumber":"$SerialNumber",
13+
"SparePartNumber":"$SparePartNumber"
14+
}
15+
},
16+
{
17+
"Exposes": [],
18+
"Name":"$Name",
19+
"Probe":"xyz.openbmc_project.Inventory.Source.Modbus.FRU({'Name': 'Heat Exchanger Fan 2.*'})",
20+
"Type":"Chassis",
21+
"xyz.openbmc_project.Inventory.Decorator.Asset": {
22+
"BuildDate":"$BuildDate",
23+
"Manufacturer":"$Manufacturer",
24+
"Model":"$Model",
25+
"PartNumber":"$PartNumber",
26+
"SerialNumber":"$SerialNumber",
27+
"SparePartNumber":"$SparePartNumber"
28+
}
29+
}
30+
]
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"Exposes": [],
3+
"Name":"$Name",
4+
"Probe":"xyz.openbmc_project.Inventory.Source.Modbus.FRU({'Name': 'Reservoir Pumping Unit.*'})",
5+
"Type":"Chassis",
6+
"xyz.openbmc_project.Inventory.Decorator.Asset": {
7+
"BuildDate":"$BuildDate",
8+
"Manufacturer":"$Manufacturer",
9+
"Model":"$Model",
10+
"PartNumber":"$PartNumber",
11+
"SerialNumber":"$SerialNumber",
12+
"SparePartNumber":"$SparePartNumber"
13+
}
14+
}

‎configurations/meta/ventura/ventura_scm.json‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,6 +1067,101 @@
10671067
"SubType":"LeakSensingCable",
10681068
"Type":"GPIOLeakDetector"
10691069
},
1070+
{
1071+
"Address": [
1072+
{
1073+
"RangeEnd":12,
1074+
"RangeStart":12,
1075+
"SerialPort":"DevTTYUSB0"
1076+
}
1077+
],
1078+
"BaudRate":115200,
1079+
"DataParity":"Even",
1080+
"Name":"Reservoir Pumping Unit",
1081+
"Registers": [
1082+
{
1083+
"Address":6604,
1084+
"Name":"Model",
1085+
"Size":8
1086+
},
1087+
{
1088+
"Address":6612,
1089+
"Name":"BuildDate",
1090+
"Size":4
1091+
},
1092+
{
1093+
"Address":6616,
1094+
"Name":"SerialNumber",
1095+
"Size":8
1096+
},
1097+
{
1098+
"Address":6652,
1099+
"Name":"SparePartNumber",
1100+
"Size":4
1101+
}
1102+
],
1103+
"Type":"ModbusRTUDetect"
1104+
},
1105+
{
1106+
"Address": [
1107+
{
1108+
"RangeEnd":12,
1109+
"RangeStart":12,
1110+
"SerialPort":"DevTTYUSB0"
1111+
}
1112+
],
1113+
"BaudRate":115200,
1114+
"DataParity":"Even",
1115+
"Name":"Heat Exchanger",
1116+
"Registers": [
1117+
{
1118+
"Address":6656,
1119+
"Name":"SparePartNumber",
1120+
"Size":4
1121+
}
1122+
],
1123+
"Type":"ModbusRTUDetect"
1124+
},
1125+
{
1126+
"Address": [
1127+
{
1128+
"RangeEnd":12,
1129+
"RangeStart":12,
1130+
"SerialPort":"DevTTYUSB0"
1131+
}
1132+
],
1133+
"BaudRate":115200,
1134+
"DataParity":"Even",
1135+
"Name":"Heat Exchanger Fan 1",
1136+
"Registers": [
1137+
{
1138+
"Address":6660,
1139+
"Name":"SparePartNumber",
1140+
"Size":4
1141+
}
1142+
],
1143+
"Type":"ModbusRTUDetect"
1144+
},
1145+
{
1146+
"Address": [
1147+
{
1148+
"RangeEnd":12,
1149+
"RangeStart":12,
1150+
"SerialPort":"DevTTYUSB0"
1151+
}
1152+
],
1153+
"BaudRate":115200,
1154+
"DataParity":"Even",
1155+
"Name":"Heat Exchanger Fan 2",
1156+
"Registers": [
1157+
{
1158+
"Address":6660,
1159+
"Name":"SparePartNumber",
1160+
"Size":4
1161+
}
1162+
],
1163+
"Type":"ModbusRTUDetect"
1164+
},
10701165
{
10711166
"Address":"0x4b",
10721167
"Bus":9,
@@ -1088,6 +1183,16 @@
10881183
}
10891184
],
10901185
"Type":"TMP75"
1186+
},
1187+
{
1188+
"BaudRate":115200,
1189+
"DeviceAddress":"1e6a1000",
1190+
"DeviceInterface":0,
1191+
"Mode":"RS485",
1192+
"Name":"DevTTYUSB0",
1193+
"Port":0,
1194+
"RTSDelay":100,
1195+
"Type":"USBPort"
10911196
}
10921197
],
10931198
"Name":"Ventura SCM",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp