багфиксы: сборка и число с запятыми на некоторых локалях в вебке

front-generator/template/common/setup-methods.js.j2

@@ -26,9 +26,9 @@
                 let snr;
                 if (isNaN(calcSnr)) { snr = `ОСШ=?` } else { snr=`ОСШ=${calcSnr}` }
                 if (result > 1024) {
-                    return (result / 1024).toLocaleString() + ' Мбит/с; ' + snr
+                    return toLocaleStringWithSpaces(result / 1024) + ' Мбит/с; ' + snr
                 } else {
-                    return result.toLocaleString() + ' кбит/с; ' + snr
+                    return toLocaleStringWithSpaces(result) + ' кбит/с; ' + snr
                 }
             },
 {% endif %}

front-generator/template/main.html

@@ -75,6 +75,18 @@
         return availableTabs[0]
     }
 
+    function toLocaleStringWithSpaces(num) {
+        if (typeof num !== 'number') {
+            if (typeof num === 'string') { return num }
+            return String(num);
+        }
+        const numberString = num.toString()
+        const [integerPart, fractionalPart] = numberString.split('.')
+        const spacedIntegerPart = integerPart.replace(/\B(?=(\d{3})+(?!\d))/g, " ")
+        if (fractionalPart) { return `${spacedIntegerPart}.${fractionalPart}` }
+        else { return spacedIntegerPart }
+    }
+
     const app = Vue.createApp({
         data() {
             return {
@@ -161,7 +173,7 @@
                 result = Math.round(result / step) * step
                 if ('min' in validation) { if (result <= validation['min']) { result = validation['min'] } }
                 if ('max' in validation) { if (result >= validation['max']) { result = validation['max'] } }
-                return result.toLocaleString()
+                return toLocaleStringWithSpaces(result)
             },
 
             // ========== include from 'common/all-params-methods.js.j2'

src/terminal_api_driver.cpp

@@ -1073,11 +1073,6 @@ std::string api_driver::ApiDriver::loadSettings() const {
     result << ",\"dpdiDelay\":" << dpdiSettings.max_delay;
 #endif
 
-
-#ifdef MODEM_IS_TDMA
-    result << ",\n\"rxTxSatDelay\":" << static_cast<int>(demodSettings.delay_ms);
-#endif
-
     result << ",\n\"rxAgcEn\":" << boolAsStr(demodSettings.is_aru_on);
     result << ",\"rxSpectrumInversion\":" << boolAsStr(demodSettings.is_rvt_iq);
     result << ",\"rxManualGain\":"; writeDouble(result, demodSettings.gain);
@@ -1209,10 +1204,6 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
     demod.gold_seq_is_active = pt.get<unsigned int>("rxGoldan");
 #endif
 
-#ifdef MODEM_IS_TDMA
-    demod.delay_ms = pt.get<unsigned int>("rxTxSatDelay");
-#endif
-
 #ifdef MODEM_IS_SCPC
     // ACM
     acm.period_pack_acm = pt.get<uint32_t>("dvbServicePacketPeriod");

static/main-scpc.html

@@ -567,6 +567,18 @@
         return availableTabs[0]
     }
 
+    function toLocaleStringWithSpaces(num) {
+        if (typeof num !== 'number') {
+            if (typeof num === 'string') { return num }
+            return String(num);
+        }
+        const numberString = num.toString()
+        const [integerPart, fractionalPart] = numberString.split('.')
+        const spacedIntegerPart = integerPart.replace(/\B(?=(\d{3})+(?!\d))/g, " ")
+        if (fractionalPart) { return `${spacedIntegerPart}.${fractionalPart}` }
+        else { return spacedIntegerPart }
+    }
+
     const app = Vue.createApp({
         data() {
             return {
@@ -768,7 +780,7 @@
                 result = Math.round(result / step) * step
                 if ('min' in validation) { if (result <= validation['min']) { result = validation['min'] } }
                 if ('max' in validation) { if (result >= validation['max']) { result = validation['max'] } }
-                return result.toLocaleString()
+                return toLocaleStringWithSpaces(result)
             },
 
             // ========== include from 'common/all-params-methods.js.j2'
@@ -1079,9 +1091,9 @@
                 let snr;
                 if (isNaN(calcSnr)) { snr = `ОСШ=?` } else { snr=`ОСШ=${calcSnr}` }
                 if (result > 1024) {
-                    return (result / 1024).toLocaleString() + ' Мбит/с; ' + snr
+                    return toLocaleStringWithSpaces(result / 1024) + ' Мбит/с; ' + snr
                 } else {
-                    return result.toLocaleString() + ' кбит/с; ' + snr
+                    return toLocaleStringWithSpaces(result) + ' кбит/с; ' + snr
                 }
             },
             // ========== include end from 'common/setup-methods.js.j2'

static/main-tdma.html

@@ -290,6 +290,18 @@
         return availableTabs[0]
     }
 
+    function toLocaleStringWithSpaces(num) {
+        if (typeof num !== 'number') {
+            if (typeof num === 'string') { return num }
+            return String(num);
+        }
+        const numberString = num.toString()
+        const [integerPart, fractionalPart] = numberString.split('.')
+        const spacedIntegerPart = integerPart.replace(/\B(?=(\d{3})+(?!\d))/g, " ")
+        if (fractionalPart) { return `${spacedIntegerPart}.${fractionalPart}` }
+        else { return spacedIntegerPart }
+    }
+
     const app = Vue.createApp({
         data() {
             return {
@@ -446,7 +458,7 @@
                 result = Math.round(result / step) * step
                 if ('min' in validation) { if (result <= validation['min']) { result = validation['min'] } }
                 if ('max' in validation) { if (result >= validation['max']) { result = validation['max'] } }
-                return result.toLocaleString()
+                return toLocaleStringWithSpaces(result)
             },
 
             // ========== include from 'common/all-params-methods.js.j2'