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-01-08 10:05:36 +01:00
parent d6eb4ebb07 8306c555f3
commit 5c307a3eb4
18 changed files with 671 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mission/devices/Tmp1075Handler.cpp
View File

@ -99,10 +99,10 @@ ReturnValue_t Tmp1075Handler::interpretDeviceReply(DeviceCommandId_t id,
#if OBSW_ENHANCED_PRINTOUT == 1
sif::info << "Tmp1075: Temperature: " << tempValue<< " °C" << std::endl;
#endif
ReturnValue_t result = dataset.read(20);
ReturnValue_t result = dataset.read();
if(result == HasReturnvaluesIF::RETURN_OK) {
dataset.temperatureCelcius = tempValue;
dataset.commit(20);
dataset.commit();
}
break;
}