eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

fixed merge conflicts

Browse Source
This commit is contained in:
Jakob Meier
2021-02-17 10:33:19 +01:00
parent c9947bbccc 4d64897640
commit 4d4cf3f694
9 changed files with 285 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bsp_q7s/ObjectFactory.cpp
View File

@ -100,10 +100,10 @@ void ObjectFactory::produce(){
* Setting PCDU devices to mode normal immediately after start up because PCDU is always
* running.
*/
// p60dockhandler->setModeNormal();
p60dockhandler->setModeNormal();
pdu1handler->setModeNormal();
// pdu2handler->setModeNormal();
// acuhandler->setModeNormal();
pdu2handler->setModeNormal();
acuhandler->setModeNormal();
#endif
/* Temperature sensors */
Tmp1075Handler* tmp1075Handler_1 = new Tmp1075Handler(