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

STR time #611

Merged
muellerr merged 25 commits from str_set_time into main 2023-07-14 12:43:21 +02:00
Conversation 1 Commits 25 Files Changed 8 +77 -16
6 changed files with 77 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 16f26d7758 - Show all commits

6
linux/acs/StrComHandler.cpp
View File

@@ -683,7 +683,7 @@ ReturnValue_t StrComHandler::sendMessage(CookieIF* cookie, const uint8_t* sendDa
const uint8_t* txFrame; const uint8_t* txFrame;
size_t frameLen; size_t frameLen;
datalinkLayer.encodeFrame(sendData, sendLen, &txFrame, frameLen); datalinkLayer.encodeFrame(sendData, sendLen, &txFrame, frameLen);
if(PACKET_WIRETAPPING) { if (PACKET_WIRETAPPING) {
sif::debug << "Sendign STR frame" << std::endl; sif::debug << "Sendign STR frame" << std::endl;
arrayprinter::print(txFrame, frameLen); arrayprinter::print(txFrame, frameLen);
} }
@@ -789,7 +789,7 @@ ReturnValue_t StrComHandler::handleSerialReception() {
<< std::endl; << std::endl;
return FAILED; return FAILED;
} else if (bytesRead > 0) { } else if (bytesRead > 0) {
if(PACKET_WIRETAPPING) { if (PACKET_WIRETAPPING) {
sif::info << "Received " << bytesRead << " bytes from the STR" << std::endl; sif::info << "Received " << bytesRead << " bytes from the STR" << std::endl;
arrayprinter::print(recBuf.data(), bytesRead); arrayprinter::print(recBuf.data(), bytesRead);
} }
@@ -806,7 +806,7 @@ ReturnValue_t StrComHandler::readOneReply(uint32_t failParameter) {
handleSerialReception(); handleSerialReception();
result = datalinkLayer.checkRingBufForFrame(&replyPtr, replyLen); result = datalinkLayer.checkRingBufForFrame(&replyPtr, replyLen);
if (result == returnvalue::OK) { if (result == returnvalue::OK) {
if(PACKET_WIRETAPPING) { if (PACKET_WIRETAPPING) {
sif::debug << "Received STR reply frame" << std::endl; sif::debug << "Received STR reply frame" << std::endl;
arrayprinter::print(replyPtr, replyLen); arrayprinter::print(replyPtr, replyLen);
} }

3
mission/acs/str/StarTrackerHandler.cpp
View File

@@ -469,7 +469,8 @@ ReturnValue_t StarTrackerHandler::buildCommandFromCommand(DeviceCommandId_t devi
SetTimeActionRequest setTimeRequest{}; SetTimeActionRequest setTimeRequest{};
timeval tv; timeval tv;
Clock::getClock(&tv); Clock::getClock(&tv);
setTimeRequest.unixTime = (static_cast<uint64_t>(tv.tv_sec) * 1000 * 1000) + (static_cast<uint64_t>(tv.tv_usec)); setTimeRequest.unixTime =
(static_cast<uint64_t>(tv.tv_sec) * 1000 * 1000) + (static_cast<uint64_t>(tv.tv_usec));
arc_pack_settime_action_req(&setTimeRequest, commandBuffer, &rawPacketLen); arc_pack_settime_action_req(&setTimeRequest, commandBuffer, &rawPacketLen);
size_t serLen = 0; size_t serLen = 0;
// Time in milliseconds. Manual serialization because arcsec API ignores endianness. // Time in milliseconds. Manual serialization because arcsec API ignores endianness.