изменил везде настройки CinC на настройки DPDI, что верно и что используется теперь в TDMA модеме

2025-04-01 17:18:34 +03:00
parent fe3b45dc9e
commit 1b6b8b5329
8 changed files with 198 additions and 127 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -297,8 +297,8 @@ public:
                rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
            }
        }));
-#ifdef MODEM_IS_SCPC
-        s.resources.emplace_back(std::make_unique<http::auth::AuthRequiredResource>("/api/set/cinc", this->auth, http::auth::User::EDIT_SETTINGS, [this](const auto& req, auto& rep) {
+
+        s.resources.emplace_back(std::make_unique<http::auth::AuthRequiredResource>("/api/set/dpdi", this->auth, http::auth::User::EDIT_SETTINGS, [this](const auto& req, auto& rep) {
            if (req.method != "POST") {
                http::server::stockReply(http::server::bad_request, rep);
                return;
@@ -313,19 +313,19 @@ public:
                boost::property_tree::ptree pt;
                read_json(ss, pt);

-                api->setCincSettings(pt);
+                api->setDpdiSettings(pt);

                std::string result = R"({"status":"ok","settings":)";
                result += api->loadSettings();
                result += "}";
                rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
            } catch (std::exception& e) {
-                BOOST_LOG_TRIVIAL(error) << "WebHandle(/api/set/cinc): Can't set CinC settings: " << e.what();
+                BOOST_LOG_TRIVIAL(error) << "WebHandle(/api/set/dpdi): Can't set DPDI settings: " << e.what();
                const std::string result = R"({"status": "error", "error": )" + api_driver::buildEscapedString(e.what()) + "}";
                rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
            }
        }));
-#endif
+
        s.resources.emplace_back(std::make_unique<http::auth::AuthRequiredResource>("/api/set/rxtx", this->auth, http::auth::User::EDIT_SETTINGS, [this](const auto& req, auto& rep) {
            if (req.method != "POST") {
                http::server::stockReply(http::server::bad_request, rep);
--- a/src/terminal_api_driver.cpp
+++ b/src/terminal_api_driver.cpp
@@ -298,8 +298,8 @@ private:
        demodulator_settings demod{};
 #ifdef MODEM_IS_SCPC
        ACM_parameters_serv_ acm{};
-        DPDI_parmeters dpdi{};
 #endif
+        DPDI_parmeters dpdi{};
        buc_lnb_settings bucLnb{};

        std::lock_guard lock(this->cpApiMutex);
@@ -307,8 +307,8 @@ private:
        logCpApiError("api_driver::TerminalApiDaemon::updateSettings()->CP_GetDemodulatorSettings()", CP_GetDemodulatorSettings(sid, demod));
 #ifdef MODEM_IS_SCPC
        logCpApiError("api_driver::TerminalApiDaemon::updateSettings()->CP_GetAcmParams()", CP_GetAcmParams(sid, &acm));
-        logCpApiError("api_driver::TerminalApiDaemon::updateSettings()->CP_GetDpdiParams()", CP_GetDpdiParams(sid, &dpdi));
 #endif
+        logCpApiError("api_driver::TerminalApiDaemon::updateSettings()->CP_GetDpdiParams()", CP_GetDpdiParams(sid, &dpdi));
        logCpApiError("api_driver::TerminalApiDaemon::updateSettings()->CP_GetBUC_LNB_settings()", CP_GetBUC_LNB_settings(sid, bucLnb));

        {
@@ -317,8 +317,8 @@ private:
            this->demodSettings = demod;
 #ifdef MODEM_IS_SCPC
            this->acmSettings = acm;
-            this->dpdiSettings = dpdi;
 #endif
+            this->dpdiSettings = dpdi;
            this->bucLnbSettings = bucLnb;
        }
    }
@@ -544,8 +544,8 @@ private:
    demodulator_settings demodSettings{};
 #ifdef MODEM_IS_SCPC
    ACM_parameters_serv_ acmSettings{};
-    DPDI_parmeters dpdiSettings{};
 #endif
+    DPDI_parmeters dpdiSettings{};
    buc_lnb_settings bucLnbSettings{};

    std::shared_mutex networkSettingsMutex;
@@ -611,27 +611,27 @@ public:
    /**
     * Получение настроек, копирует текущие значения в структуры, переданные по указателю. Если передан пустой указатель, копирования не произойдет.
     */
+    void getSettings(
+        modulator_settings* mod, demodulator_settings* demod,
 #ifdef MODEM_IS_SCPC
-    void getSettings(modulator_settings* mod, demodulator_settings* demod, ACM_parameters_serv_* acm, DPDI_parmeters* dpdi, buc_lnb_settings* bucLnb) {
-        if (mod || demod || acm || dpdi || bucLnb) {
+        ACM_parameters_serv_* acm,
+#endif
+        DPDI_parmeters* dpdi, buc_lnb_settings* bucLnb) {
+        if (mod || demod ||
+#ifdef MODEM_IS_SCPC
+            acm ||
+#endif
+            dpdi || bucLnb) {
            std::shared_lock lock(this->settingsMutex);
            if (mod) { *mod = this->modSettings; }
            if (demod) { *demod = this->demodSettings; }
+#ifdef MODEM_IS_SCPC
            if (acm) { *acm = this->acmSettings; }
+#endif
            if (dpdi) { *dpdi = this->dpdiSettings; }
            if (bucLnb) { *bucLnb = this->bucLnbSettings; }
        }
    }
-#else
-    void getSettings(modulator_settings* mod, demodulator_settings* demod, buc_lnb_settings* bucLnb) {
-        if (mod || demod || bucLnb) {
-            std::shared_lock lock(this->settingsMutex);
-            if (mod) { *mod = this->modSettings; }
-            if (demod) { *demod = this->demodSettings; }
-            if (bucLnb) { *bucLnb = this->bucLnbSettings; }
-        }
-    }
-#endif

 #ifdef MODEM_IS_SCPC
    bool getIsCinC() {
@@ -699,21 +699,19 @@ public:
    }
 #endif

-#ifdef MODEM_IS_SCPC
-    void setSettingsCinc(DPDI_parmeters& s, bool readback = true) {
+    void setSettingsDpdi(DPDI_parmeters& s, bool readback = true) {
        std::lock_guard lock(this->cpApiMutex);
-        logCpApiError("api_driver::TerminalApiDaemon::setSettingsCinc()->CP_SetDmaDebug(begin_save_config)", CP_SetDmaDebug(sid, "begin_save_config", ""));
-        logCpApiError("api_driver::TerminalApiDaemon::setSettingsCinc()->CP_SetDpdiParams()", CP_SetDpdiParams(sid, s));
+        logCpApiError("api_driver::TerminalApiDaemon::setSettingsDpdi()->CP_SetDmaDebug(begin_save_config)", CP_SetDmaDebug(sid, "begin_save_config", ""));
+        logCpApiError("api_driver::TerminalApiDaemon::setSettingsDpdi()->CP_SetDpdiParams()", CP_SetDpdiParams(sid, s));
        if (readback) {
-            logCpApiError("api_driver::TerminalApiDaemon::setSettingsCinc()->CP_GetDpdiParams()", CP_GetDpdiParams(this->sid, &s));
+            logCpApiError("api_driver::TerminalApiDaemon::setSettingsDpdi()->CP_GetDpdiParams()", CP_GetDpdiParams(this->sid, &s));
            {
                std::lock_guard lock2{this->settingsMutex};
                this->dpdiSettings = s;
            }
        }
-        logCpApiError("api_driver::TerminalApiDaemon::setSettingsCinc()->CP_SetDmaDebug(save_config)", CP_SetDmaDebug(sid, "save_config", ""));
+        logCpApiError("api_driver::TerminalApiDaemon::setSettingsDpdi()->CP_SetDmaDebug(save_config)", CP_SetDmaDebug(sid, "save_config", ""));
    }
-#endif

    void setSettingsBucLnb(buc_lnb_settings& bucLnb, bool readback = true) {
        std::lock_guard lock(this->cpApiMutex);
@@ -824,7 +822,7 @@ static void writeDouble(std::ostream& out, double value, int prec = 2) {
        out << std::fixed << std::setprecision(prec) << value;
    }
 }
-#ifdef MODEM_IS_SCPC
+
 double translateCoordinates(uint8_t deg, uint8_t min) {
    return static_cast<double>(deg) + static_cast<double>(min) / 60;
 }
@@ -835,7 +833,6 @@ std::tuple<uint8_t, uint8_t> translateCoordinates(double abs) {
    auto min = static_cast<uint8_t>(min_double);
    return std::make_tuple(deg, min);
 }
-#endif


 std::string api_driver::ApiDriver::loadTerminalState() const {
@@ -876,7 +873,7 @@ std::string api_driver::ApiDriver::loadTerminalState() const {
 #else
    {
        modulator_settings modSet{};
-        daemon->getSettings(&modSet, nullptr, nullptr);
+        daemon->getSettings(&modSet, nullptr, nullptr, nullptr);
        result << ",\"tx.centerFreq\":"; writeDouble(result, modSet.central_freq_in_kGz);
        result << ",\"tx.symSpeed\":"; writeDouble(result, (static_cast<double>(modSet.baudrate) / 1000.0));
    }
@@ -1018,12 +1015,12 @@ std::string api_driver::ApiDriver::loadSettings() const {
    demodulator_settings demodSettings{};
    buc_lnb_settings bucLnb{};
    TerminalNetworkSettings network;
+    DPDI_parmeters dpdiSettings{};
 #ifdef MODEM_IS_SCPC
    ACM_parameters_serv_ acmSettings{};
-    DPDI_parmeters dpdiSettings{};
    daemon->getSettings(&modSettings, &demodSettings, &acmSettings, &dpdiSettings, &bucLnb);
 #else
-    daemon->getSettings(&modSettings, &demodSettings, &bucLnb);
+    daemon->getSettings(&modSettings, &demodSettings, &dpdiSettings, &bucLnb);
 #endif
    daemon->getNetworkSettings(network);

@@ -1060,16 +1057,23 @@ std::string api_driver::ApiDriver::loadSettings() const {
    result << ",\"aupcMinAttenuation\":"; writeDouble(result, acmSettings.min_attenuation_aupc);
    result << ",\"aupcMaxAttenuation\":"; writeDouble(result, acmSettings.max_attenuation_aupc);
    result << ",\"aupcRequiredSnr\":"; writeDouble(result, acmSettings.snr_threashold_aupc);
-
-    result << ",\n\"cincIsPositional\":" << boolAsStr(!dpdiSettings.is_delay_window);
-    result << ",\"cincSearchBandwidth\":" << dpdiSettings.freq_offset; // полоса поиска в кГц
-    result << ",\"cincPositionStationLatitude\":"; writeDouble(result, translateCoordinates(dpdiSettings.latitude_station_grad, dpdiSettings.latitude_station_minute), 6);
-    result << ",\"cincPositionStationLongitude\":"; writeDouble(result, translateCoordinates(dpdiSettings.longitude_station_grad, dpdiSettings.longitude_station_minute), 6);
-    result << ",\"cincPositionSatelliteLongitude\":"; writeDouble(result, translateCoordinates(dpdiSettings.longitude_sattelite_grad, dpdiSettings.longitude_sattelite_minute), 6);
-    result << ",\"cincDelayMin\":" << dpdiSettings.min_delay;
-    result << ",\"cincDelayMax\":" << dpdiSettings.max_delay;
 #endif

+    result << ",\n\"dpdiIsPositional\":" << boolAsStr(!dpdiSettings.is_delay_window);
+#ifdef MODEM_IS_SCPC
+    result << ",\"dpdiSearchBandwidth\":" << dpdiSettings.freq_offset; // полоса поиска в кГц
+#endif
+    result << ",\"dpdiPositionStationLatitude\":"; writeDouble(result, translateCoordinates(dpdiSettings.latitude_station_grad, dpdiSettings.latitude_station_minute), 6);
+    result << ",\"dpdiPositionStationLongitude\":"; writeDouble(result, translateCoordinates(dpdiSettings.longitude_station_grad, dpdiSettings.longitude_station_minute), 6);
+    result << ",\"dpdiPositionSatelliteLongitude\":"; writeDouble(result, translateCoordinates(dpdiSettings.longitude_sattelite_grad, dpdiSettings.longitude_sattelite_minute), 6);
+#ifdef MODEM_IS_SCPC
+    result << ",\"dpdiDelayMin\":" << dpdiSettings.min_delay;
+    result << ",\"dpdiDelayMax\":" << dpdiSettings.max_delay;
+#else
+    result << ",\"dpdiDelay\":" << dpdiSettings.max_delay;
+#endif
+
+
 #ifdef MODEM_IS_TDMA
    result << ",\n\"rxTxSatDelay\":" << static_cast<int>(demodSettings.delay_ms);
 #endif
@@ -1168,7 +1172,7 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
    ACM_parameters_serv_ acm{};
    daemon->getSettings(&mod, &demod, &acm, nullptr, nullptr);
 #else
-    daemon->getSettings(&mod, &demod, nullptr);
+    daemon->getSettings(&mod, &demod, nullptr, nullptr);
 #endif

    // для модулятора
@@ -1227,38 +1231,48 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
 #endif
 }

-#ifdef MODEM_IS_SCPC
-void api_driver::ApiDriver::setCincSettings(boost::property_tree::ptree &pt) {
+void api_driver::ApiDriver::setDpdiSettings(boost::property_tree::ptree &pt) {
    DPDI_parmeters s{};
+#ifdef MODEM_IS_SCPC
+    this->daemon->getSettings(nullptr, nullptr, nullptr, &s, nullptr);
+#else
+    this->daemon->getSettings(nullptr, nullptr, &s, nullptr);
+#endif

-    s.is_delay_window = !pt.get<bool>("cincIsPositional");
-    s.freq_offset = pt.get<uint32_t>("cincSearchBandwidth");
+    s.is_delay_window = !pt.get<bool>("dpdiIsPositional");
+#ifdef MODEM_IS_SCPC
+    s.freq_offset = pt.get<uint32_t>("dpdiSearchBandwidth");
+#endif

-    auto ctmp = translateCoordinates(pt.get<double>("cincPositionStationLatitude"));
+    auto ctmp = translateCoordinates(pt.get<double>("dpdiPositionStationLatitude"));
    s.latitude_station_grad = std::get<0>(ctmp);
    s.latitude_station_minute = std::get<1>(ctmp);

-    ctmp = translateCoordinates(pt.get<double>("cincPositionStationLongitude"));
+    ctmp = translateCoordinates(pt.get<double>("dpdiPositionStationLongitude"));
    s.longitude_station_grad = std::get<0>(ctmp);
    s.longitude_station_minute = std::get<1>(ctmp);

-    ctmp = translateCoordinates(pt.get<double>("cincPositionSatelliteLongitude"));
+    ctmp = translateCoordinates(pt.get<double>("dpdiPositionSatelliteLongitude"));
    s.longitude_sattelite_grad = std::get<0>(ctmp);
    s.longitude_sattelite_minute = std::get<1>(ctmp);

-    s.min_delay = pt.get<uint32_t>("cincDelayMin");
-    s.max_delay = pt.get<uint32_t>("cincDelayMax");
-
-    this->daemon->setSettingsCinc(s);
-}
+#ifdef MODEM_IS_SCPC
+    s.min_delay = pt.get<uint32_t>("dpdiDelayMin");
+    s.max_delay = pt.get<uint32_t>("dpdiDelayMax");
+#else
+    s.min_delay = 0;
+    s.max_delay = pt.get<uint32_t>("dpdiDelay");
 #endif

+    this->daemon->setSettingsDpdi(s);
+}
+
 void api_driver::ApiDriver::setBucLnbSettings(boost::property_tree::ptree &pt) {
    buc_lnb_settings s{};
 #ifdef MODEM_IS_SCPC
    daemon->getSettings(nullptr, nullptr, nullptr, nullptr, &s);
 #else
-    daemon->getSettings(nullptr, nullptr, &s);
+    daemon->getSettings(nullptr, nullptr, nullptr, &s);
 #endif

    auto tmp = pt.get<int>("bucPowering");
--- a/src/terminal_api_driver.h
+++ b/src/terminal_api_driver.h
@@ -48,12 +48,13 @@ namespace api_driver {
        */
        void setRxTxSettings(boost::property_tree::ptree &pt);

-#ifdef MODEM_IS_SCPC
+
        /**
-        * Установить настройки CinC, readback можно получить используя loadTerminalState.
+        * Установить настройки DPDI, readback можно получить используя loadTerminalState.
+        * @note Для TDMA и SCPC модемов эти настройки доступны
        */
-        void setCincSettings(boost::property_tree::ptree &pt);
-#endif
+        void setDpdiSettings(boost::property_tree::ptree &pt);
+
        /**
        * Установить настройки BUC и LNB, readback можно получить используя loadTerminalState.
        */