eddy/mountcontrol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Timur A. Fatkhullin 2025-12-08 17:34:59 +03:00
parent 196ed3be1b
commit 57467ce48f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
asibfm700/asibfm700_netserver_main.cpp
View File

@ -111,16 +111,17 @@ int main(int argc, char* argv[])
logger->info("\n"); logger->info("\n");
logger->set_pattern("[%Y-%m-%d %T.%e][%l]: %v");
std::string mount_cfg_fname = opt_result["config"].as<std::string>(); std::string mount_cfg_fname = opt_result["config"].as<std::string>();
if (mount_cfg_fname.size()) { if (mount_cfg_fname.size()) {
logger->info("Try to load mount configuration from file: {}", mount_cfg_fname); logger->info("Try to load mount configuration from file: {}", mount_cfg_fname);
auto err = mount_cfg.load(mount_cfg_fname); auto err = mount_cfg.load(mount_cfg_fname);
if (err) { if (err) {
logger->error("Cannot load mount configuration (err = {})! Use defaults!", err.message()); logger->error("Cannot load mount configuration (err = {})! Use of defaults!", err.message());
} else { } else {
logger->info("Mount configuration was loaded successfully!"); logger->info("Mount configuration was loaded successfully!");
} }
logger->info("\n");
} }
asibfm700::Asibfm700Mount mount(mount_cfg, logger); asibfm700::Asibfm700Mount mount(mount_cfg, logger);

6
mcc/mcc_slewing_model.h
View File

@ -142,14 +142,14 @@ public:
std::vector<bool> in_zone_vec; std::vector<bool> in_zone_vec;
//t_err = controls->telemetryData(&tdata); // t_err = controls->telemetryData(&tdata);
{ {
std::lock_guard lock{*_currentParamsMutex}; std::lock_guard lock{*_currentParamsMutex};
t_err = controls->waitForTelemetryData(&tdata); t_err = controls->waitForTelemetryData(&tdata);
if (t_err) { if (t_err) {
return *_lastError = return *_lastError =
mcc_deduce_error_code(t_err, MccSimpleSlewingModelErrorCode::ERROR_GET_TELEMETRY); mcc_deduce_error_code(t_err, MccSimpleSlewingModelErrorCode::ERROR_GET_TELEMETRY);
} }
} }
@ -621,7 +621,7 @@ public:
// check for target in p-zone // check for target in p-zone
*_lastError = _checkTargetFunc(); *_lastError = _checkTargetFunc();
if (_lastError->load()) { // return here immidiately if (_lastError->load()) { // return here immediately
return *_lastError; return *_lastError;
} }