diff --git a/front-generator/template/common/setup-methods.js.j2 b/front-generator/template/common/setup-methods.js.j2
index e1a0cf6..bb6a660 100644
--- a/front-generator/template/common/setup-methods.js.j2
+++ b/front-generator/template/common/setup-methods.js.j2
@@ -1,15 +1,15 @@
 {% if 'rxtx' in params and modem == 'scpc' %}
             calcRequiredSnr(frameSizeNormal, modulation, speed) {
                 const snrValues = [
-                    {fs: true, mod: 'qpsk', speed: '1/2', snr: 2.58}, {fs: true, mod: 'qpsk', speed: '2/3', snr: 3.77}, {fs: true, mod: 'qpsk', speed: '3/4', snr: 4.5}, {fs: true, mod: 'qpsk', speed: '4/5', snr: 5.2}, {fs: true, mod: 'qpsk', speed: '5/6', snr: 5.45}, {fs: true, mod: 'qpsk', speed: '8/9', snr: 6.46}, {fs: true, mod: 'qpsk', speed: '9/10', snr: 6.66},
-                    {fs: true, mod: '8psk', speed: '2/3', snr: 8.45}, {fs: true, mod: '8psk', speed: '3/4', snr: 8.77}, {fs: true, mod: '8psk', speed: '5/6', snr: 10.09}, {fs: true, mod: '8psk', speed: '8/9', snr: 10.91}, {fs: true, mod: '8psk', speed: '9/10', snr: 11.3},
-                    {fs: true, mod: '16apsk', speed: '2/3', snr: 11.21}, {fs: true, mod: '16apsk', speed: '3/4', snr: 11.31}, {fs: true, mod: '16apsk', speed: '4/5', snr: 12.04}, {fs: true, mod: '16apsk', speed: '5/6', snr: 12.45}, {fs: true, mod: '16apsk', speed: '8/9', snr: 12.98}, {fs: true, mod: '16apsk', speed: '9/10', snr: 13.14},
-                    {fs: true, mod: '32apsk', speed: '3/4', snr: 13.98}, {fs: true, mod: '32apsk', speed: '4/5', snr: 14.23}, {fs: true, mod: '32apsk', speed: '5/6', snr: 14.92}, {fs: true, mod: '32apsk', speed: '8/9', snr: 16.12}, {fs: true, mod: '32apsk', speed: '9/10', snr: 16.6},
+                    {fs: true, mod: 'qpsk', speed: '1/4', snr: 2.6}, {fs: true, mod: 'qpsk', speed: '1/3', snr: 2.6}, {fs: true, mod: 'qpsk', speed: '2/5', snr: 2.6}, {fs: true, mod: 'qpsk', speed: '1/2', snr: 2.6}, {fs: true, mod: 'qpsk', speed: '3/5', snr: 3.1}, {fs: true, mod: 'qpsk', speed: '2/3', snr: 3.8}, {fs: true, mod: 'qpsk', speed: '3/4', snr: 4.5}, {fs: true, mod: 'qpsk', speed: '4/5', snr: 5.2}, {fs: true, mod: 'qpsk', speed: '5/6', snr: 5.5}, {fs: true, mod: 'qpsk', speed: '8/9', snr: 6.4}, {fs: true, mod: 'qpsk', speed: '9/10', snr: 6.7},
+                    {fs: true, mod: '8psk', speed: '3/5', snr: 7.4}, {fs: true, mod: '8psk', speed: '2/3', snr: 8.4}, {fs: true, mod: '8psk', speed: '3/4', snr: 8.7}, {fs: true, mod: '8psk', speed: '5/6', snr: 10}, {fs: true, mod: '8psk', speed: '8/9', snr: 10.9}, {fs: true, mod: '8psk', speed: '9/10', snr: 11.1},
+                    {fs: true, mod: '16apsk', speed: '2/3', snr: 11.2}, {fs: true, mod: '16apsk', speed: '3/4', snr: 11.3}, {fs: true, mod: '16apsk', speed: '4/5', snr: 12.4}, {fs: true, mod: '16apsk', speed: '5/6', snr: 12.7}, {fs: true, mod: '16apsk', speed: '8/9', snr: 13.1}, {fs: true, mod: '16apsk', speed: '9/10', snr: 13.9},
+                    {fs: true, mod: '32apsk', speed: '3/4', snr: 14.5}, {fs: true, mod: '32apsk', speed: '4/5', snr: 14.7}, {fs: true, mod: '32apsk', speed: '5/6', snr: 14.9}, {fs: true, mod: '32apsk', speed: '8/9', snr: 16.1}, {fs: true, mod: '32apsk', speed: '9/10', snr: 16.6},
 
-                    {fs: false, mod: 'qpsk', speed: '1/2', snr: 4.05}, {fs: false, mod: 'qpsk', speed: '2/3', snr: 4.52}, {fs: false, mod: 'qpsk', speed: '3/4', snr: 5.03}, {fs: false, mod: 'qpsk', speed: '4/5', snr: 6.84}, {fs: false, mod: 'qpsk', speed: '5/6', snr: 7.75}, {fs: false, mod: 'qpsk', speed: '8/9', snr: 8.45},
-                    {fs: false, mod: '8psk', speed: '2/3', snr: 9.86}, {fs: false, mod: '8psk', speed: '3/4', snr: 10.5}, {fs: false, mod: '8psk', speed: '5/6', snr: 11.08}, {fs: false, mod: '8psk', speed: '8/9', snr: 11.25},
-                    {fs: false, mod: '16apsk', speed: '2/3', snr: 11.58}, {fs: false, mod: '16apsk', speed: '3/4', snr: 11.73}, {fs: false, mod: '16apsk', speed: '4/5', snr: 11.92}, {fs: false, mod: '16apsk', speed: '5/6', snr: 12.29}, {fs: false, mod: '16apsk', speed: '8/9', snr: 13.34},
-                    {fs: false, mod: '32apsk', speed: '3/4', snr: 14.16}, {fs: false, mod: '32apsk', speed: '4/5', snr: 14.69}, {fs: false, mod: '32apsk', speed: '5/6', snr: 15.23}, {fs: false, mod: '32apsk', speed: '8/9', snr: 16.48},
+                    {fs: false, mod: 'qpsk', speed: '1/4', snr: 4.1}, {fs: false, mod: 'qpsk', speed: '1/3', snr: 4.1}, {fs: false, mod: 'qpsk', speed: '2/5', snr: 4.1}, {fs: false, mod: 'qpsk', speed: '1/2', snr: 4.1}, {fs: false, mod: 'qpsk', speed: '3/5', snr: 4.6}, {fs: false, mod: 'qpsk', speed: '2/3', snr: 5.1}, {fs: false, mod: 'qpsk', speed: '3/4', snr: 5.3}, {fs: false, mod: 'qpsk', speed: '4/5', snr: 6.8}, {fs: false, mod: 'qpsk', speed: '5/6', snr: 7.8}, {fs: false, mod: 'qpsk', speed: '8/9', snr: 8.5},
+                    {fs: false, mod: '8psk', speed: '3/5', snr: 9.5}, {fs: false, mod: '8psk', speed: '2/3', snr: 9.9}, {fs: false, mod: '8psk', speed: '3/4', snr: 10.5}, {fs: false, mod: '8psk', speed: '5/6', snr: 11.1}, {fs: false, mod: '8psk', speed: '8/9', snr: 11.3},
+                    {fs: false, mod: '16apsk', speed: '2/3', snr: 11.6}, {fs: false, mod: '16apsk', speed: '3/4', snr: 11.8}, {fs: false, mod: '16apsk', speed: '4/5', snr: 12}, {fs: false, mod: '16apsk', speed: '5/6', snr: 12.3}, {fs: false, mod: '16apsk', speed: '8/9', snr: 13.4},
+                    {fs: false, mod: '32apsk', speed: '3/4', snr: 14.1}, {fs: false, mod: '32apsk', speed: '4/5', snr: 14.7}, {fs: false, mod: '32apsk', speed: '5/6', snr: 15.3}, {fs: false, mod: '32apsk', speed: '8/9', snr: 16.5},
                 ]
                 for (let i = 0; i < snrValues.length; i++) {
                     if (snrValues[i].fs === frameSizeNormal && snrValues[i].mod === modulation && snrValues[i].speed === speed) { return snrValues[i].snr }
diff --git a/static/main-scpc.html b/static/main-scpc.html
index 02abf42..0bf34ea 100644
--- a/static/main-scpc.html
+++ b/static/main-scpc.html
@@ -1054,15 +1054,15 @@
             // ========== include from 'common/setup-methods.js.j2'
             calcRequiredSnr(frameSizeNormal, modulation, speed) {
                 const snrValues = [
-                    {fs: true, mod: 'qpsk', speed: '1/2', snr: 2.58}, {fs: true, mod: 'qpsk', speed: '2/3', snr: 3.77}, {fs: true, mod: 'qpsk', speed: '3/4', snr: 4.5}, {fs: true, mod: 'qpsk', speed: '4/5', snr: 5.2}, {fs: true, mod: 'qpsk', speed: '5/6', snr: 5.45}, {fs: true, mod: 'qpsk', speed: '8/9', snr: 6.46}, {fs: true, mod: 'qpsk', speed: '9/10', snr: 6.66},
-                    {fs: true, mod: '8psk', speed: '2/3', snr: 8.45}, {fs: true, mod: '8psk', speed: '3/4', snr: 8.77}, {fs: true, mod: '8psk', speed: '5/6', snr: 10.09}, {fs: true, mod: '8psk', speed: '8/9', snr: 10.91}, {fs: true, mod: '8psk', speed: '9/10', snr: 11.3},
-                    {fs: true, mod: '16apsk', speed: '2/3', snr: 11.21}, {fs: true, mod: '16apsk', speed: '3/4', snr: 11.31}, {fs: true, mod: '16apsk', speed: '4/5', snr: 12.04}, {fs: true, mod: '16apsk', speed: '5/6', snr: 12.45}, {fs: true, mod: '16apsk', speed: '8/9', snr: 12.98}, {fs: true, mod: '16apsk', speed: '9/10', snr: 13.14},
-                    {fs: true, mod: '32apsk', speed: '3/4', snr: 13.98}, {fs: true, mod: '32apsk', speed: '4/5', snr: 14.23}, {fs: true, mod: '32apsk', speed: '5/6', snr: 14.92}, {fs: true, mod: '32apsk', speed: '8/9', snr: 16.12}, {fs: true, mod: '32apsk', speed: '9/10', snr: 16.6},
+                    {fs: true, mod: 'qpsk', speed: '1/4', snr: 2.6}, {fs: true, mod: 'qpsk', speed: '1/3', snr: 2.6}, {fs: true, mod: 'qpsk', speed: '2/5', snr: 2.6}, {fs: true, mod: 'qpsk', speed: '1/2', snr: 2.6}, {fs: true, mod: 'qpsk', speed: '3/5', snr: 3.1}, {fs: true, mod: 'qpsk', speed: '2/3', snr: 3.8}, {fs: true, mod: 'qpsk', speed: '3/4', snr: 4.5}, {fs: true, mod: 'qpsk', speed: '4/5', snr: 5.2}, {fs: true, mod: 'qpsk', speed: '5/6', snr: 5.5}, {fs: true, mod: 'qpsk', speed: '8/9', snr: 6.4}, {fs: true, mod: 'qpsk', speed: '9/10', snr: 6.7},
+                    {fs: true, mod: '8psk', speed: '3/5', snr: 7.4}, {fs: true, mod: '8psk', speed: '2/3', snr: 8.4}, {fs: true, mod: '8psk', speed: '3/4', snr: 8.7}, {fs: true, mod: '8psk', speed: '5/6', snr: 10}, {fs: true, mod: '8psk', speed: '8/9', snr: 10.9}, {fs: true, mod: '8psk', speed: '9/10', snr: 11.1},
+                    {fs: true, mod: '16apsk', speed: '2/3', snr: 11.2}, {fs: true, mod: '16apsk', speed: '3/4', snr: 11.3}, {fs: true, mod: '16apsk', speed: '4/5', snr: 12.4}, {fs: true, mod: '16apsk', speed: '5/6', snr: 12.7}, {fs: true, mod: '16apsk', speed: '8/9', snr: 13.1}, {fs: true, mod: '16apsk', speed: '9/10', snr: 13.9},
+                    {fs: true, mod: '32apsk', speed: '3/4', snr: 14.5}, {fs: true, mod: '32apsk', speed: '4/5', snr: 14.7}, {fs: true, mod: '32apsk', speed: '5/6', snr: 14.9}, {fs: true, mod: '32apsk', speed: '8/9', snr: 16.1}, {fs: true, mod: '32apsk', speed: '9/10', snr: 16.6},
 
-                    {fs: false, mod: 'qpsk', speed: '1/2', snr: 4.05}, {fs: false, mod: 'qpsk', speed: '2/3', snr: 4.52}, {fs: false, mod: 'qpsk', speed: '3/4', snr: 5.03}, {fs: false, mod: 'qpsk', speed: '4/5', snr: 6.84}, {fs: false, mod: 'qpsk', speed: '5/6', snr: 7.75}, {fs: false, mod: 'qpsk', speed: '8/9', snr: 8.45},
-                    {fs: false, mod: '8psk', speed: '2/3', snr: 9.86}, {fs: false, mod: '8psk', speed: '3/4', snr: 10.5}, {fs: false, mod: '8psk', speed: '5/6', snr: 11.08}, {fs: false, mod: '8psk', speed: '8/9', snr: 11.25},
-                    {fs: false, mod: '16apsk', speed: '2/3', snr: 11.58}, {fs: false, mod: '16apsk', speed: '3/4', snr: 11.73}, {fs: false, mod: '16apsk', speed: '4/5', snr: 11.92}, {fs: false, mod: '16apsk', speed: '5/6', snr: 12.29}, {fs: false, mod: '16apsk', speed: '8/9', snr: 13.34},
-                    {fs: false, mod: '32apsk', speed: '3/4', snr: 14.16}, {fs: false, mod: '32apsk', speed: '4/5', snr: 14.69}, {fs: false, mod: '32apsk', speed: '5/6', snr: 15.23}, {fs: false, mod: '32apsk', speed: '8/9', snr: 16.48},
+                    {fs: false, mod: 'qpsk', speed: '1/4', snr: 4.1}, {fs: false, mod: 'qpsk', speed: '1/3', snr: 4.1}, {fs: false, mod: 'qpsk', speed: '2/5', snr: 4.1}, {fs: false, mod: 'qpsk', speed: '1/2', snr: 4.1}, {fs: false, mod: 'qpsk', speed: '3/5', snr: 4.6}, {fs: false, mod: 'qpsk', speed: '2/3', snr: 5.1}, {fs: false, mod: 'qpsk', speed: '3/4', snr: 5.3}, {fs: false, mod: 'qpsk', speed: '4/5', snr: 6.8}, {fs: false, mod: 'qpsk', speed: '5/6', snr: 7.8}, {fs: false, mod: 'qpsk', speed: '8/9', snr: 8.5},
+                    {fs: false, mod: '8psk', speed: '3/5', snr: 9.5}, {fs: false, mod: '8psk', speed: '2/3', snr: 9.9}, {fs: false, mod: '8psk', speed: '3/4', snr: 10.5}, {fs: false, mod: '8psk', speed: '5/6', snr: 11.1}, {fs: false, mod: '8psk', speed: '8/9', snr: 11.3},
+                    {fs: false, mod: '16apsk', speed: '2/3', snr: 11.6}, {fs: false, mod: '16apsk', speed: '3/4', snr: 11.8}, {fs: false, mod: '16apsk', speed: '4/5', snr: 12}, {fs: false, mod: '16apsk', speed: '5/6', snr: 12.3}, {fs: false, mod: '16apsk', speed: '8/9', snr: 13.4},
+                    {fs: false, mod: '32apsk', speed: '3/4', snr: 14.1}, {fs: false, mod: '32apsk', speed: '4/5', snr: 14.7}, {fs: false, mod: '32apsk', speed: '5/6', snr: 15.3}, {fs: false, mod: '32apsk', speed: '8/9', snr: 16.5},
                 ]
                 for (let i = 0; i < snrValues.length; i++) {
                     if (snrValues[i].fs === frameSizeNormal && snrValues[i].mod === modulation && snrValues[i].speed === speed) { return snrValues[i].snr }