Skip to content
Snippets Groups Projects
Commit e2f1ff8a authored by Elisabetta Pianori's avatar Elisabetta Pianori
Browse files

Merge branch 'devel' into 'devel'

Add CPX400SP and TTI MX100TP powersupplies

See merge request !314
parents ff5da74f 0814faf9
No related branches found
No related tags found
2 merge requests!316Merge devel into main,!314Add CPX400SP and TTI MX100TP powersupplies
Pipeline #6981248 passed
...@@ -10,4 +10,4 @@ ...@@ -10,4 +10,4 @@
REGISTER_POWERSUPPLY(TTIXXXSPPs) REGISTER_POWERSUPPLY(TTIXXXSPPs)
TTIXXXSPPs::TTIXXXSPPs(const std::string& name) TTIXXXSPPs::TTIXXXSPPs(const std::string& name)
: TTIPs(name, {"TSX1820P"}, 1) {} : TTIPs(name, {"TSX1820P", "CPX400SP"}, 1) {}
...@@ -10,4 +10,4 @@ ...@@ -10,4 +10,4 @@
REGISTER_POWERSUPPLY(TTIXXXTPPs) REGISTER_POWERSUPPLY(TTIXXXTPPs)
TTIXXXTPPs::TTIXXXTPPs(const std::string& name) TTIXXXTPPs::TTIXXXTPPs(const std::string& name)
: TTIPs(name, {"MX180TP", "QL355TP"}, 3) {} : TTIPs(name, {"MX100TP", "MX180TP", "QL355TP"}, 3) {}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment