Skip to content

Commit

Permalink
Actually fix Windows compiler errors.
Browse files Browse the repository at this point in the history
  • Loading branch information
tmiw committed Nov 23, 2024
1 parent bd7e513 commit 159078d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions src/rig_control/SerialPortRigController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

#include "SerialPortRigController.h"

#include "../util/logging/ulog.h"

SerialPortRigController::SerialPortRigController(std::string serialPort)
: serialPortHandle_(COM_HANDLE_INVALID)
, serialPort_(serialPort)
Expand Down
8 changes: 4 additions & 4 deletions src/rig_control/omnirig/OmniRigController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ void OmniRigController::setFrequencyImpl_(uint64_t frequencyHz)
{
if (rig_ != nullptr && frequencyHz != currFreq_)
{
log_info("Set frequency to %" PRIu64, frequencyHz);
log_info("Set frequency to %lld", frequencyHz);

HRESULT result = E_FAIL;

Expand Down Expand Up @@ -227,12 +227,12 @@ void OmniRigController::setFrequencyImpl_(uint64_t frequencyHz)
if (vfo == PM_VFOA || vfo == PM_VFOAA || vfo == PM_VFOAB)
{
result = rig_->get_FreqA(&tmpFreq);
log_info("Got freq for VFOA: %" PRIu64, tmpFreq);
log_info("Got freq for VFOA: %lld", tmpFreq);
}
else if (vfo == PM_VFOB || vfo == PM_VFOBB || vfo == PM_VFOBA)
{
result = rig_->get_FreqB(&tmpFreq);
log_info("Got freq for VFOB: %" PRIu64, tmpFreq);
log_info("Got freq for VFOB: %lld", tmpFreq);
}
}
}
Expand All @@ -253,7 +253,7 @@ void OmniRigController::setFrequencyImpl_(uint64_t frequencyHz)
else
{
std::stringstream errMsg;
log_error("Could not change frequency to %" PRIu64 " Hz (HRESULT = %d)", frequencyHz, result);
log_error("Could not change frequency to %lld Hz (HRESULT = %d)", frequencyHz, result);
onRigError(this, errMsg.str());
}
}
Expand Down

0 comments on commit 159078d

Please sign in to comment.