исправления методов-заглушек, часть 1

This commit is contained in:
2025-06-03 18:32:28 +03:00
parent f30e1adb49
commit 55fc322c13
6 changed files with 199 additions and 68 deletions

View File

@@ -132,7 +132,11 @@ void api_driver::obj::StatisticsLogger::setSettings(const nlohmann::json& data)
}
void api_driver::obj::StatisticsLogger::updateCallback(proxy::CpProxy &cp) {
if (!logEn) return;
debug_metrics dm{};
cp.getDebugMetrics(dm);
putItem(dm);
}
void api_driver::obj::StatisticsLogger::putItem(const debug_metrics &item) {
@@ -214,6 +218,11 @@ void api_driver::obj::TerminalNetworkSettings::updateCallback(proxy::CpProxy &cp
}
void api_driver::obj::TerminalNetworkSettings::updateFromJson(nlohmann::json &data) {
managementIp = data.value("managementIp", managementIp);
isL2 = data.value("isL2", isL2);
dataIp = data.value("dataIp", dataIp);
dataMtu = data.value("dataMtu", dataMtu);
serverName = data.value("serverName", serverName);
}
void api_driver::obj::TerminalNetworkSettings::store(proxy::CpProxy& cp) {
@@ -546,6 +555,14 @@ void api_driver::obj::TerminalRxTxSettings::updateCallback(proxy::CpProxy &cp) {
#endif
}
void api_driver::obj::TerminalRxTxSettings::storeMainSettings(proxy::CpProxy &cp) {
cp.setModSettings(mod);
cp.setDemodSettings(dem);
#ifdef API_STRUCT_ACM_ENABLE
cp.setAcmSettings(acm);
#endif
}
struct ModcodDef_t {const char* modulation; const char* speed;};
const static ModcodDef_t ModcodDefs[] = {
@@ -674,11 +691,11 @@ void api_driver::obj::TerminalRxTxSettings::updateMainSettings(const nlohmann::j
}
#ifdef API_OBJECT_DPDI_SETTINGS_ENABLE
double translateCoordinates(uint8_t deg, uint8_t min) {
static double translateCoordinates(uint8_t deg, uint8_t min) {
return static_cast<double>(deg) + static_cast<double>(min) / 60;
}
std::tuple<uint8_t, uint8_t> translateCoordinates(double abs) {
static std::tuple<uint8_t, uint8_t> translateCoordinates(double abs) {
auto deg = static_cast<uint8_t>(abs);
double min_double = (abs - deg) * 60;
auto min = static_cast<uint8_t>(min_double);