comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-08-01 13:12:30 -04:00
Code Issues Projects Releases Wiki Activity

Cleanup: rig thread

Browse Source
This commit is contained in:
Charles J. Cliffe 2021-04-04 22:18:50 -04:00
parent e9a6fc089c
commit 8420f5fb4b
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rig/RigThread.cpp
View File

@ -18,16 +18,14 @@ RigThread::RigThread() {
errorMessage = ""; errorMessage = "";
} }
RigThread::~RigThread() { RigThread::~RigThread() = default;
}
RigList &RigThread::enumerate() { RigList &RigThread::enumerate() {
if (RigThread::rigCaps.empty()) { if (RigThread::rigCaps.empty()) {
rig_set_debug(RIG_DEBUG_ERR); rig_set_debug(RIG_DEBUG_ERR);
rig_load_all_backends(); rig_load_all_backends();
rig_list_foreach(RigThread::add_hamlib_rig, 0); rig_list_foreach(RigThread::add_hamlib_rig, nullptr);
std::sort(RigThread::rigCaps.begin(), RigThread::rigCaps.end(), rigGreater()); std::sort(RigThread::rigCaps.begin(), RigThread::rigCaps.end(), rigGreater());
std::cout << "Loaded " << RigThread::rigCaps.size() << " rig models via hamlib." << std::endl; std::cout << "Loaded " << RigThread::rigCaps.size() << " rig models via hamlib." << std::endl;
} }
@ -44,7 +42,7 @@ void RigThread::initRig(rig_model_t rig_model, std::string rig_file, int serial_
rigModel = rig_model; rigModel = rig_model;
rigFile = rig_file; rigFile = rig_file;
serialRate = serial_rate; serialRate = serial_rate;
}; }
void RigThread::setErrorStateFromHamlibCode(int errcode) { void RigThread::setErrorStateFromHamlibCode(int errcode) {
errorState.store(true); errorState.store(true);
@ -109,7 +107,7 @@ void RigThread::run() {
int retcode, status; int retcode, status;
termStatus = 0; termStatus = 0;
errorState.store(0); errorState.store(false);
std::cout << "Rig thread starting." << std::endl; std::cout << "Rig thread starting." << std::endl;
@ -218,7 +216,7 @@ void RigThread::run() {
} }
std::cout << "Rig thread exiting status " << termStatus << "." << std::endl; std::cout << "Rig thread exiting status " << termStatus << "." << std::endl;
}; }
freq_t RigThread::getFrequency() { freq_t RigThread::getFrequency() {
if (freqChanged.load() && (setOneShot.load() || controlMode.load())) { if (freqChanged.load() && (setOneShot.load() || controlMode.load())) {

8
src/rig/RigThread.h
View File

@ -22,13 +22,11 @@ typedef std::vector<const struct rig_caps *> RigList;
class RigThread : public IOThread { class RigThread : public IOThread {
public: public:
RigThread(); RigThread();
~RigThread(); ~RigThread() override;
void initRig(rig_model_t rig_model, std::string rig_file, int serial_rate); void initRig(rig_model_t rig_model, std::string rig_file, int serial_rate);
virtual void run(); void run() override;
int terminationStatus();
freq_t getFrequency(); freq_t getFrequency();
void setFrequency(freq_t new_freq, bool oneShot); void setFrequency(freq_t new_freq, bool oneShot);