Merge branch 'develop' of github.com:jketterl/openwebrx into develop

This commit is contained in:
Jakob Ketterl 2020-08-30 23:26:45 +02:00
commit 805039ec02

View File

@ -4,7 +4,7 @@
"lower_bound": 1810000, "lower_bound": 1810000,
"upper_bound": 2000000, "upper_bound": 2000000,
"frequencies": { "frequencies": {
"psk31": 1838000, "bpsk31": 1838000,
"ft8": 1840000, "ft8": 1840000,
"wspr": 1836600, "wspr": 1836600,
"jt65": 1838000, "jt65": 1838000,
@ -17,7 +17,7 @@
"lower_bound": 3500000, "lower_bound": 3500000,
"upper_bound": 3800000, "upper_bound": 3800000,
"frequencies": { "frequencies": {
"psk31": 3580000, "bpsk31": 3580000,
"ft8": 3573000, "ft8": 3573000,
"wspr": 3592600, "wspr": 3592600,
"jt65": 3570000, "jt65": 3570000,
@ -40,7 +40,7 @@
"lower_bound": 7000000, "lower_bound": 7000000,
"upper_bound": 7200000, "upper_bound": 7200000,
"frequencies": { "frequencies": {
"psk31": 7040000, "bpsk31": 7040000,
"ft8": 7074000, "ft8": 7074000,
"wspr": 7038600, "wspr": 7038600,
"jt65": 7076000, "jt65": 7076000,
@ -54,7 +54,7 @@
"lower_bound": 10100000, "lower_bound": 10100000,
"upper_bound": 10150000, "upper_bound": 10150000,
"frequencies": { "frequencies": {
"psk31": 10141000, "bpsk31": 10141000,
"ft8": 10136000, "ft8": 10136000,
"wspr": 10138700, "wspr": 10138700,
"jt65": 10138000, "jt65": 10138000,
@ -68,7 +68,7 @@
"lower_bound": 14000000, "lower_bound": 14000000,
"upper_bound": 14350000, "upper_bound": 14350000,
"frequencies": { "frequencies": {
"psk31": 14070000, "bpsk31": 14070000,
"ft8": 14074000, "ft8": 14074000,
"wspr": 14095600, "wspr": 14095600,
"jt65": 14076000, "jt65": 14076000,
@ -82,7 +82,7 @@
"lower_bound": 18068000, "lower_bound": 18068000,
"upper_bound": 18168000, "upper_bound": 18168000,
"frequencies": { "frequencies": {
"psk31": 18098000, "bpsk31": 18098000,
"ft8": 18100000, "ft8": 18100000,
"wspr": 18104600, "wspr": 18104600,
"jt65": 18102000, "jt65": 18102000,
@ -96,7 +96,7 @@
"lower_bound": 21000000, "lower_bound": 21000000,
"upper_bound": 21450000, "upper_bound": 21450000,
"frequencies": { "frequencies": {
"psk31": 21070000, "bpsk31": 21070000,
"ft8": 21074000, "ft8": 21074000,
"wspr": 21094600, "wspr": 21094600,
"jt65": 21076000, "jt65": 21076000,
@ -110,7 +110,7 @@
"lower_bound": 24890000, "lower_bound": 24890000,
"upper_bound": 24990000, "upper_bound": 24990000,
"frequencies": { "frequencies": {
"psk31": 24920000, "bpsk31": 24920000,
"ft8": 24915000, "ft8": 24915000,
"wspr": 24924600, "wspr": 24924600,
"jt65": 24917000, "jt65": 24917000,
@ -124,7 +124,7 @@
"lower_bound": 28000000, "lower_bound": 28000000,
"upper_bound": 29700000, "upper_bound": 29700000,
"frequencies": { "frequencies": {
"psk31": [28070000, 28120000], "bpsk31": [28070000, 28120000],
"ft8": 28074000, "ft8": 28074000,
"wspr": 28124600, "wspr": 28124600,
"jt65": 28076000, "jt65": 28076000,
@ -138,7 +138,7 @@
"lower_bound": 50030000, "lower_bound": 50030000,
"upper_bound": 51000000, "upper_bound": 51000000,
"frequencies": { "frequencies": {
"psk31": 50305000, "bpsk31": 50305000,
"ft8": 50313000, "ft8": 50313000,
"wspr": 50293000, "wspr": 50293000,
"jt65": 50310000, "jt65": 50310000,