epic update 1

author Dan White <dan@whiteaudio.com>

Fri, 28 Feb 2020 13:54:52 +0000 (07:54 -0600)

committer Dan White <dan@whiteaudio.com>

Fri, 28 Feb 2020 13:54:52 +0000 (07:54 -0600)
author Dan White <dan@whiteaudio.com>
Fri, 28 Feb 2020 13:54:52 +0000 (07:54 -0600)
committer Dan White <dan@whiteaudio.com>
Fri, 28 Feb 2020 13:54:52 +0000 (07:54 -0600)
diff --git a/db-modes.json b/db-modes.json

index 442e29237af08a1a7c325c9acb78fe1c1cb65c1b..1a16f954b35a646b913c17194caee29419a1d7c0 100644 (file)
--- a/db-modes.json
+++ b/db-modes.json
@@ -4,8 +4,12 @@
      "name": "AFSK"
    },
    {
-    "id": 2,
-    "name": "AFSK1k2"
+    "id": 78,
+    "name": "AFSK S-Net"
+  },
+  {
+    "id": 79,
+    "name": "AFSK SALSA"
    },
    {
      "id": 18,
@@ -27,38 +31,6 @@
      "id": 50,
      "name": "BPSK"
    },
-  {
-    "id": 52,
-    "name": "BPSK115k2"
-  },
-  {
-    "id": 67,
-    "name": "BPSK12k5"
-  },
-  {
-    "id": 70,
-    "name": "BPSK14k4"
-  },
-  {
-    "id": 47,
-    "name": "BPSK1k2"
-  },
-  {
-    "id": 65,
-    "name": "BPSK2k4"
-  },
-  {
-    "id": 60,
-    "name": "BPSK400"
-  },
-  {
-    "id": 66,
-    "name": "BPSK4k8"
-  },
-  {
-    "id": 54,
-    "name": "BPSK9k6"
-  },
    {
      "id": 59,
      "name": "CERTO"
@@ -80,8 +52,8 @@
      "name": "DUV"
    },
    {
-    "id": 55,
-    "name": "FFSK1k2"
+    "id": 82,
+    "name": "FFSK"
    },
    {
      "id": 1,
@@ -95,26 +67,6 @@
      "id": 72,
      "name": "FSK"
    },
-  {
-    "id": 51,
-    "name": "FSK19k2"
-  },
-  {
-    "id": 21,
-    "name": "FSK1k2"
-  },
-  {
-    "id": 56,
-    "name": "FSK2k4"
-  },
-  {
-    "id": 46,
-    "name": "FSK4k8"
-  },
-  {
-    "id": 22,
-    "name": "FSK9k6"
-  },
    {
      "id": 75,
      "name": "GFSK"
@@ -123,50 +75,10 @@
      "id": 68,
      "name": "GFSK Rktr"
    },
-  {
-    "id": 29,
-    "name": "GFSK19k2"
-  },
-  {
-    "id": 26,
-    "name": "GFSK1k2"
-  },
-  {
-    "id": 27,
-    "name": "GFSK2k4"
-  },
-  {
-    "id": 15,
-    "name": "GFSK4k8"
-  },
-  {
-    "id": 28,
-    "name": "GFSK9k6"
-  },
    {
      "id": 63,
      "name": "GMSK"
    },
-  {
-    "id": 48,
-    "name": "GMSK19k2"
-  },
-  {
-    "id": 36,
-    "name": "GMSK1k2"
-  },
-  {
-    "id": 37,
-    "name": "GMSK2k4"
-  },
-  {
-    "id": 38,
-    "name": "GMSK4k8"
-  },
-  {
-    "id": 39,
-    "name": "GMSK9k6"
-  },
    {
      "id": 45,
      "name": "HRPT"
@@ -184,28 +96,8 @@
      "name": "MFSK"
    },
    {
-    "id": 34,
-    "name": "MSK19k2"
-  },
-  {
-    "id": 30,
-    "name": "MSK1k2"
-  },
-  {
-    "id": 31,
-    "name": "MSK2k4"
-  },
-  {
-    "id": 35,
-    "name": "MSK38k4"
-  },
-  {
-    "id": 32,
-    "name": "MSK4k8"
-  },
-  {
-    "id": 33,
-    "name": "MSK9k6"
+    "id": 81,
+    "name": "MSK"
    },
    {
      "id": 61,
@@ -223,10 +115,6 @@
      "id": 40,
      "name": "PSK31"
    },
-  {
-    "id": 73,
-    "name": "PSK4k8"
-  },
    {
      "id": 41,
      "name": "PSK63"
@@ -239,10 +127,6 @@
      "id": 42,
      "name": "QPSK31"
    },
-  {
-    "id": 62,
-    "name": "QPSK38k4"
-  },
    {
      "id": 43,
      "name": "QPSK63"
diff --git a/db-satellites.json b/db-satellites.json

index 0b7610f10aab67b293c25358a4046f87c6448edb..15c951a5a6b2db65255edc76e3bc6c19ebd421b2 100644 (file)
--- a/db-satellites.json
+++ b/db-satellites.json
@@ -111,6 +111,15 @@
      "decayed": null,
      "telemetries": []
    },
+  {
+    "norad_cat_id": 26063,
+    "name": "OPAL",
+    "names": "OO-38",
+    "image": "http://db.satnogs.org/media/satellites/opal__1.jpg",
+    "status": "alive",
+    "decayed": null,
+    "telemetries": []
+  },
    {
      "norad_cat_id": 26609,
      "name": "PHASE 3D (AO-40)",
@@ -1581,6 +1590,15 @@
      "decayed": "2017-02-18T00:00:00Z",
      "telemetries": []
    },
+  {
+    "norad_cat_id": 41915,
+    "name": "KAIDUN-1",
+    "names": "CATON-1",
+    "image": "http://db.satnogs.org/media/satellites/KAIDUN-1.jpg",
+    "status": "alive",
+    "decayed": null,
+    "telemetries": []
+  },
    {
      "norad_cat_id": 41930,
      "name": "FREEDOM",
@@ -1684,7 +1702,7 @@
      "norad_cat_id": 42706,
      "name": "PHOENIX",
      "names": "TW01\r\nON01TW",
-    "image": "http://db.satnogs.org/media/satellites/PHOENIX_UCqlyUJ.JPG",
+    "image": null,
      "status": "re-entered",
      "decayed": "2019-05-23T19:04:33Z",
      "telemetries": []
@@ -2119,15 +2137,6 @@
      "decayed": null,
      "telemetries": []
    },
-  {
-    "norad_cat_id": 42830,
-    "name": "MAYAK",
-    "names": "",
-    "image": "http://db.satnogs.org/media/satellites/mayak-satellite.jpg",
-    "status": "alive",
-    "decayed": null,
-    "telemetries": []
-  },
    {
      "norad_cat_id": 42831,
      "name": "FLYING LAPTOP",
@@ -2249,15 +2258,6 @@
      "decayed": null,
      "telemetries": []
    },
-  {
-    "norad_cat_id": 43131,
-    "name": "PICSAT",
-    "names": "",
-    "image": "http://db.satnogs.org/media/satellites/picsat_3B6VCKG.jpg",
-    "status": "alive",
-    "decayed": null,
-    "telemetries": []
-  },
    {
      "norad_cat_id": 43132,
      "name": "PICSAT",
@@ -2276,15 +2276,6 @@
      "decayed": null,
      "telemetries": []
    },
-  {
-    "norad_cat_id": 43134,
-    "name": "SIGMA",
-    "names": "KHUSAT-03",
-    "image": "http://db.satnogs.org/media/satellites/sigma.jpg",
-    "status": "alive",
-    "decayed": null,
-    "telemetries": []
-  },
    {
      "norad_cat_id": 43137,
      "name": "FOX-1D",
@@ -2450,6 +2441,15 @@
        }
      ]
    },
+  {
+    "norad_cat_id": 43553,
+    "name": "RADSAT-G",
+    "names": "",
+    "image": "http://db.satnogs.org/media/satellites/radsat.jpg",
+    "status": "alive",
+    "decayed": null,
+    "telemetries": []
+  },
    {
      "norad_cat_id": 43589,
      "name": "UiTMSat-1",
@@ -3215,6 +3215,32 @@
      "decayed": null,
      "telemetries": []
    },
+  {
+    "norad_cat_id": 44365,
+    "name": "PAINANI-1",
+    "names": "",
+    "image": "http://db.satnogs.org/media/satellites/painani-1.png",
+    "status": "alive",
+    "decayed": null,
+    "telemetries": [
+      {
+        "decoder": "painani"
+      }
+    ]
+  },
+  {
+    "norad_cat_id": 44369,
+    "name": "ACRUX-1",
+    "names": "",
+    "image": "http://db.satnogs.org/media/satellites/MSP_ACRUX-1_reduced-file-size.png",
+    "status": "alive",
+    "decayed": null,
+    "telemetries": [
+      {
+        "decoder": "acrux1"
+      }
+    ]
+  },
    {
      "norad_cat_id": 44387,
      "name": "Meteor-M 2-2",
@@ -3356,7 +3382,7 @@
    {
      "norad_cat_id": 44830,
      "name": "ATL-1",
-    "names": "HA1ATL",
+    "names": "HA1ATL\r\nMO-106\r\nMagyar-OSCAR 106",
      "image": null,
      "status": "alive",
      "decayed": null,
@@ -3365,7 +3391,7 @@
    {
      "norad_cat_id": 44832,
      "name": "SMOG-P",
-    "names": "HA4C",
+    "names": "HA4C\r\nMO-105\r\nMagyar-OSCAR 105",
      "image": null,
      "status": "alive",
      "decayed": null,
@@ -3378,7 +3404,11 @@
      "image": null,
      "status": "alive",
      "decayed": null,
-    "telemetries": []
+    "telemetries": [
+      {
+        "decoder": "duchifat3"
+      }
+    ]
    },
    {
      "norad_cat_id": 44878,
@@ -3395,7 +3425,43 @@
    },
    {
      "norad_cat_id": 44885,
-    "name": "FLORIPASAT-1",
+    "name": "FloripaSat-1",
+    "names": "",
+    "image": null,
+    "status": "alive",
+    "decayed": null,
+    "telemetries": []
+  },
+  {
+    "norad_cat_id": 45113,
+    "name": "Orbital Factory 2",
+    "names": "OF-2",
+    "image": null,
+    "status": "alive",
+    "decayed": null,
+    "telemetries": []
+  },
+  {
+    "norad_cat_id": 45115,
+    "name": "SwampSat-2",
+    "names": "",
+    "image": null,
+    "status": "alive",
+    "decayed": null,
+    "telemetries": []
+  },
+  {
+    "norad_cat_id": 45119,
+    "name": "HuskySat-1",
+    "names": "HS-1",
+    "image": null,
+    "status": "alive",
+    "decayed": null,
+    "telemetries": []
+  },
+  {
+    "norad_cat_id": 45257,
+    "name": "OBJECT RA",
      "names": "",
      "image": null,
      "status": "alive",
@@ -3456,15 +3522,6 @@
      "decayed": null,
      "telemetries": []
    },
-  {
-    "norad_cat_id": 99807,
-    "name": "JAISAT-1",
-    "names": "",
-    "image": null,
-    "status": "alive",
-    "decayed": null,
-    "telemetries": []
-  },
    {
      "norad_cat_id": 99808,
      "name": "SEAM 2.0",
@@ -3501,15 +3558,6 @@
      "decayed": null,
      "telemetries": []
    },
-  {
-    "norad_cat_id": 99814,
-    "name": "SOKRAT",
-    "names": "",
-    "image": null,
-    "status": "alive",
-    "decayed": null,
-    "telemetries": []
-  },
    {
      "norad_cat_id": 99816,
      "name": "ECUADOR-UTE",
@@ -3547,18 +3595,94 @@
      "telemetries": []
    },
    {
-    "norad_cat_id": 99822,
-    "name": "FloripaSat-1",
+    "norad_cat_id": 99823,
+    "name": "CAS-6",
+    "names": "TIANQIN-1\r\nBJ1SO",
+    "image": null,
+    "status": "alive",
+    "decayed": null,
+    "telemetries": []
+  },
+  {
+    "norad_cat_id": 99826,
+    "name": "SALSAT",
+    "names": "DP0WER",
+    "image": "http://db.satnogs.org/media/satellites/csm_Mission_Patch_cut_829a68e1ee.png",
+    "status": "alive",
+    "decayed": null,
+    "telemetries": []
+  },
+  {
+    "norad_cat_id": 99827,
+    "name": "QARMAN",
+    "names": "ON05BE",
+    "image": null,
+    "status": "alive",
+    "decayed": null,
+    "telemetries": [
+      {
+        "decoder": "qarman"
+      }
+    ]
+  },
+  {
+    "norad_cat_id": 99828,
+    "name": "Phoenix (ASU)",
      "names": "",
+    "image": "http://db.satnogs.org/media/satellites/7d68c1754efe89f77663fac20a4af90683b43f02.png",
+    "status": "alive",
+    "decayed": null,
+    "telemetries": []
+  },
+  {
+    "norad_cat_id": 99830,
+    "name": "RadSat-U",
+    "names": "WJ2XXC",
      "image": null,
      "status": "alive",
      "decayed": null,
      "telemetries": []
    },
    {
-    "norad_cat_id": 99823,
-    "name": "CAS-6",
-    "names": "TIANQIN-1\r\nBJ1SO",
+    "norad_cat_id": 99831,
+    "name": "Argus-2",
+    "names": "MVP-Argus\r\nMVP A\r\nSLU-03",
+    "image": "http://db.satnogs.org/media/satellites/DSC00111.png",
+    "status": "alive",
+    "decayed": null,
+    "telemetries": []
+  },
+  {
+    "norad_cat_id": 99832,
+    "name": "EDGECUBE",
+    "names": "",
+    "image": null,
+    "status": "alive",
+    "decayed": null,
+    "telemetries": []
+  },
+  {
+    "norad_cat_id": 99833,
+    "name": "AZTECHSAT-1",
+    "names": "",
+    "image": null,
+    "status": "alive",
+    "decayed": null,
+    "telemetries": []
+  },
+  {
+    "norad_cat_id": 99834,
+    "name": "HARP",
+    "names": "",
+    "image": null,
+    "status": "alive",
+    "decayed": null,
+    "telemetries": []
+  },
+  {
+    "norad_cat_id": 99835,
+    "name": "SORTIE",
+    "names": "Helio 5",
      "image": null,
      "status": "alive",
      "decayed": null,
@@ -3658,15 +3782,6 @@
      "decayed": null,
      "telemetries": []
    },
-  {
-    "norad_cat_id": 99961,
-    "name": "PAINANI-1",
-    "names": "",
-    "image": null,
-    "status": "alive",
-    "decayed": null,
-    "telemetries": []
-  },
    {
      "norad_cat_id": 99962,
      "name": "MEMSAT",
@@ -3677,41 +3792,37 @@
      "telemetries": []
    },
    {
-    "norad_cat_id": 99963,
-    "name": "RADSAT-G",
-    "names": "",
-    "image": "http://db.satnogs.org/media/satellites/radsat.jpg",
+    "norad_cat_id": 99972,
+    "name": "Oculus-ASR",
+    "names": "Nanosat-6",
+    "image": null,
      "status": "alive",
      "decayed": null,
      "telemetries": []
    },
    {
-    "norad_cat_id": 99964,
-    "name": "ACRUX-1",
+    "norad_cat_id": 99980,
+    "name": "MAYAK",
      "names": "",
-    "image": "http://db.satnogs.org/media/satellites/MSP_ACRUX-1_reduced-file-size.png",
+    "image": "http://db.satnogs.org/media/satellites/mayak-satellite.jpg",
      "status": "alive",
      "decayed": null,
-    "telemetries": [
-      {
-        "decoder": "acrux1"
-      }
-    ]
+    "telemetries": []
    },
    {
-    "norad_cat_id": 99972,
-    "name": "Oculus-ASR",
-    "names": "Nanosat-6",
+    "norad_cat_id": 99981,
+    "name": "RSP-00",
+    "names": "8J1RSP",
      "image": null,
      "status": "alive",
      "decayed": null,
      "telemetries": []
    },
    {
-    "norad_cat_id": 99981,
-    "name": "RSP-00",
-    "names": "8J1RSP",
-    "image": null,
+    "norad_cat_id": 99982,
+    "name": "SIGMA",
+    "names": "KHUSAT-03",
+    "image": "http://db.satnogs.org/media/satellites/sigma.jpg",
      "status": "alive",
      "decayed": null,
      "telemetries": []
diff --git a/db-transmitters.json b/db-transmitters.json

index 462722ecd64f4a30a07f42a59a34d83f823fcd69..4ec53a942d7c6f682531ee511afa198cc4a3caad 100644 (file)
--- a/db-transmitters.json
+++ b/db-transmitters.json
@@ -10,9 +10,9 @@
      "downlink_low": 145825000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": "AFSK1k2",
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": "AFSK",
      "invert": true,
      "baud": 1200,
      "norad_cat_id": 26931,
@@ -32,8 +32,8 @@
      "downlink_low": 437470000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -66,7 +66,7 @@
      "service": "Unknown"
    },
    {
-    "uuid": "gmmMUrZydhneJJZRJAYoG",
+    "uuid": "gmmMUrZydhneJJZRJAYoG7",
      "description": "Mode U CW Beacon",
      "alive": true,
      "type": "Transmitter",
@@ -87,28 +87,6 @@
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
-  {
-    "uuid": "2uGo77ULzByLLyshanpctH",
-    "description": "Mode U AFSK TLM",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 437490000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": 0,
-    "norad_cat_id": 27848,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
    {
      "uuid": "iQTQN82FXUCVSFmkYfohh5",
      "description": "Indian Beacon",
@@ -208,8 +186,8 @@
      "downlink_low": 437345000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -242,7 +220,7 @@
      "service": "Unknown"
    },
    {
-    "uuid": "ie2oBdY3zydrkWxEHvXtL",
+    "uuid": "ie2oBdY3zydrkWxEHvXtL7",
      "description": "Mode U TLM 2",
      "alive": true,
      "type": "Transmitter",
@@ -252,8 +230,8 @@
      "downlink_low": 437475000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -263,28 +241,6 @@
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
-  {
-    "uuid": "qFB67RqFJauwWgZCimDUPJ",
-    "description": "Mode L/U Digipeater",
-    "alive": true,
-    "type": "Transceiver",
-    "uplink_low": 1267600000,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 437475000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
-    "uplink_mode": "GMSK9k6",
-    "invert": true,
-    "baud": 0,
-    "norad_cat_id": 32785,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
    {
      "uuid": "WzUhZvVherckTDUttWu3dW",
      "description": "Mode U TLM",
@@ -296,8 +252,8 @@
      "downlink_low": 437485000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -395,50 +351,6 @@
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
-  {
-    "uuid": "RP8r4va9hjC7sADMafUEFM",
-    "description": "Mode U FM 1200",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 437425000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": 0,
-    "norad_cat_id": 33493,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
-  {
-    "uuid": "MqmQZv4wGRtxxfCFUGT5rh",
-    "description": "Mode U FM 9600",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 437425000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": 0,
-    "norad_cat_id": 33493,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
    {
      "uuid": "ZkQJidFbx97FBARSxybeyh",
      "description": "Mode U MSG",
@@ -472,8 +384,8 @@
      "downlink_low": 435950000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -494,8 +406,8 @@
      "downlink_low": 437325000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK19k2",
-    "mode_id": 29,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 19200,
@@ -571,28 +483,6 @@
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
-  {
-    "uuid": "xVq7syPGptNE56YpFTAgGh",
-    "description": "Mode V/U BBS AFSK",
-    "alive": false,
-    "type": "Transceiver",
-    "uplink_low": 145825000,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 435675000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": "AFSK1k2",
-    "invert": true,
-    "baud": 0,
-    "norad_cat_id": 36122,
-    "status": "inactive",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
    {
      "uuid": "NMbzCvfQ2cfTf4XUbDKe5A",
      "description": "CW Beacon",
@@ -626,8 +516,8 @@
      "downlink_low": 437505000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK2k4",
-    "mode_id": 56,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 2400,
@@ -670,8 +560,8 @@
      "downlink_low": 437485000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -692,8 +582,8 @@
      "downlink_low": 437505000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -747,28 +637,6 @@
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
-  {
-    "uuid": "9NWcFmJGg2MpuTLqhd3weM",
-    "description": "AX25 Transponder",
-    "alive": false,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 437435000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": 9600,
-    "norad_cat_id": 40661,
-    "status": "inactive",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
    {
      "uuid": "QsYRjdzExRFdZyJvcEw2GC",
      "description": "CW Beacon",
@@ -802,8 +670,8 @@
      "downlink_low": 145815000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -890,8 +758,8 @@
      "downlink_low": 437445000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -912,8 +780,8 @@
      "downlink_low": 437270000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -956,8 +824,8 @@
      "downlink_low": 145935000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -978,8 +846,8 @@
      "downlink_low": 437481000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -1044,8 +912,8 @@
      "downlink_low": 145868000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -1066,8 +934,8 @@
      "downlink_low": 145930000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -1110,8 +978,8 @@
      "downlink_low": 145980000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -1154,8 +1022,8 @@
      "downlink_low": 145840000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -1264,8 +1132,8 @@
      "downlink_low": 437505000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -1308,8 +1176,8 @@
      "downlink_low": 437425000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK1k2",
-    "mode_id": 36,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -1330,8 +1198,8 @@
      "downlink_low": 437425000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -1352,8 +1220,8 @@
      "downlink_low": 437250000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK19k2",
-    "mode_id": 48,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 19200,
@@ -1374,8 +1242,8 @@
      "downlink_low": 437425000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK4k8",
-    "mode_id": 46,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -1396,8 +1264,8 @@
      "downlink_low": 435645000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -1418,8 +1286,8 @@
      "downlink_low": 437645000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -1440,8 +1308,8 @@
      "downlink_low": 435645000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -1484,8 +1352,8 @@
      "downlink_low": 145640000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -1550,8 +1418,8 @@
      "downlink_low": 145705000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -1616,8 +1484,8 @@
      "downlink_low": 145770000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK19k2",
-    "mode_id": 48,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 19200,
@@ -1682,8 +1550,8 @@
      "downlink_low": 145835000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -1748,8 +1616,8 @@
      "downlink_low": 145890000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -1814,8 +1682,8 @@
      "downlink_low": 145955000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -1858,8 +1726,8 @@
      "downlink_low": 145475000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -1880,8 +1748,8 @@
      "downlink_low": 437950000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -1946,9 +1814,9 @@
      "downlink_low": 144390000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": "AFSK1k2",
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": "AFSK",
      "invert": false,
      "baud": 1200,
      "norad_cat_id": 40908,
@@ -1968,8 +1836,8 @@
      "downlink_low": 437300000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -1979,28 +1847,6 @@
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
-  {
-    "uuid": "uGkkYgeaLDPKLTWHsPB8zY",
-    "description": "9k6 FSK TLM",
-    "alive": false,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 145980000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": 9600,
-    "norad_cat_id": 40897,
-    "status": "inactive",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
    {
      "uuid": "Mp7c66GDw8rsGuqBiwaN2h",
      "description": "1k2 MSK TLM",
@@ -2012,8 +1858,8 @@
      "downlink_low": 437365000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "MSK1k2",
-    "mode_id": 30,
+    "mode": "MSK",
+    "mode_id": 81,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -2034,8 +1880,8 @@
      "downlink_low": 145975000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -2056,8 +1902,8 @@
      "downlink_low": 145825000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -2078,9 +1924,9 @@
      "downlink_low": 145825000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": "AFSK1k2",
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": "AFSK",
      "invert": false,
      "baud": 1200,
      "norad_cat_id": 40654,
@@ -2122,8 +1968,8 @@
      "downlink_low": 437230000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK19k2",
-    "mode_id": 48,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 19200,
@@ -2144,8 +1990,8 @@
      "downlink_low": 437405000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK19k2",
-    "mode_id": 48,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 19200,
@@ -2166,8 +2012,8 @@
      "downlink_low": 438225000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -2210,8 +2056,8 @@
      "downlink_low": 145865000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -2221,28 +2067,6 @@
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
-  {
-    "uuid": "X9Xu5Zcwr79Yu9v86PfCWX",
-    "description": "9k6 FSK TLM",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 437675000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": 9600,
-    "norad_cat_id": 40042,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
    {
      "uuid": "oepFFUCo6qxWgQckFGWt8H",
      "description": "9k6 FSK TLM",
@@ -2254,8 +2078,8 @@
      "downlink_low": 435000000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -2354,40 +2178,18 @@
      "service": "Unknown"
    },
    {
-    "uuid": "D7iEeEbjNj49tusqHgpL4g",
+    "uuid": "WvVrtfb4nKtEr3sJGqZdT7",
      "description": "9k6 FSK TLM",
      "alive": true,
      "type": "Transmitter",
      "uplink_low": null,
      "uplink_high": null,
      "uplink_drift": null,
-    "downlink_low": 437385000,
+    "downlink_low": 437445000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": 9600,
-    "norad_cat_id": 39446,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
-  {
-    "uuid": "WvVrtfb4nKtEr3sJGqZdT",
-    "description": "9k6 FSK TLM",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 437445000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -2397,28 +2199,6 @@
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
-  {
-    "uuid": "8ugpLNzAj7oXw4AToDGeCW",
-    "description": "9k6 FSK TLM",
-    "alive": false,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 437305000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": 9600,
-    "norad_cat_id": 39407,
-    "status": "inactive",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
    {
      "uuid": "SPN3qoyK8tQdYCPsTdBcBA",
      "description": "1k2 AFSK TLM",
@@ -2430,8 +2210,8 @@
      "downlink_low": 437425000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -2574,7 +2354,7 @@
      "service": "Unknown"
    },
    {
-    "uuid": "roUHxm5XRFAYLsdpzRBqx",
+    "uuid": "roUHxm5XRFAYLsdpzRBqx7",
      "description": "AHRPT Downlink",
      "alive": true,
      "type": "Transmitter",
@@ -2628,8 +2408,8 @@
      "downlink_low": 437375000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -2694,8 +2474,8 @@
      "downlink_low": 437100000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -2716,9 +2496,9 @@
      "downlink_low": null,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": "AFSK1k2",
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": "AFSK",
      "invert": false,
      "baud": 1200,
      "norad_cat_id": 41338,
@@ -2760,8 +2540,8 @@
      "downlink_low": 437425000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -2782,9 +2562,9 @@
      "downlink_low": null,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": "AFSK1k2",
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": "AFSK",
      "invert": false,
      "baud": 1200,
      "norad_cat_id": 41339,
@@ -2793,28 +2573,6 @@
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
-  {
-    "uuid": "6QrKoGhVmVAVnsw8SsdQgG",
-    "description": "Telemetry",
-    "alive": false,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 436250000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": null,
-    "norad_cat_id": 41313,
-    "status": "inactive",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
    {
      "uuid": "gBpooS3AUqyvkhCpRQvvW5",
      "description": "PE0SAT - 9k6 FSK TLM",
@@ -2826,8 +2584,8 @@
      "downlink_low": 437384000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -2848,8 +2606,8 @@
      "downlink_low": 437501000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -2870,8 +2628,8 @@
      "downlink_low": 437375500,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -2892,8 +2650,8 @@
      "downlink_low": 437421500,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -2936,8 +2694,8 @@
      "downlink_low": 145935300,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -2958,9 +2716,9 @@
      "downlink_low": 437975000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": "AFSK1k2",
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": "AFSK",
      "invert": false,
      "baud": 1200,
      "norad_cat_id": 40655,
@@ -3013,28 +2771,6 @@
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
-  {
-    "uuid": "aBHGFxMopeCscUYRyiYdXC",
-    "description": "PE0SAT - CW Beacon",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 436848700,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "CW",
-    "mode_id": 6,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": null,
-    "norad_cat_id": 27848,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
    {
      "uuid": "SqKWM4e6CfqZ9JryAZcJTf",
      "description": "PE0SAT - CW Beacon",
@@ -3090,8 +2826,8 @@
      "downlink_low": 145867440,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -3112,8 +2848,8 @@
      "downlink_low": 145973700,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -3134,8 +2870,8 @@
      "downlink_low": 145981400,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -3156,8 +2892,8 @@
      "downlink_low": 438226000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -3178,8 +2914,8 @@
      "downlink_low": 437507000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -3200,8 +2936,8 @@
      "downlink_low": 437269600,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -3222,8 +2958,8 @@
      "downlink_low": 437397000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK19k2",
-    "mode_id": 51,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 19200,
@@ -3244,8 +2980,8 @@
      "downlink_low": 437220000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK19k2",
-    "mode_id": 51,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 19200,
@@ -3288,8 +3024,8 @@
      "downlink_low": 437480000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -3332,8 +3068,8 @@
      "downlink_low": 437325000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -3343,28 +3079,6 @@
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
-  {
-    "uuid": "Dvhbn7HJzGo5hEFJ2kEiFd",
-    "description": "TLM",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 437650000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "CW",
-    "mode_id": 6,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": null,
-    "norad_cat_id": 40958,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
    {
      "uuid": "s8jpdkUffam9RxRArizMQd",
      "description": "PE0SAT - 1k2 BPSK TLM",
@@ -3376,8 +3090,8 @@
      "downlink_low": 145867100,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -3398,8 +3112,8 @@
      "downlink_low": 437300800,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -3420,8 +3134,8 @@
      "downlink_low": 145826800,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -3464,8 +3178,8 @@
      "downlink_low": 437676000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -3486,8 +3200,8 @@
      "downlink_low": 145813660,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -3508,8 +3222,8 @@
      "downlink_low": 145878740,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -3618,8 +3332,8 @@
      "downlink_low": 437526360,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -3651,28 +3365,6 @@
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
-  {
-    "uuid": "yA9kEtgExZb7QvBrpWxu7",
-    "description": "PE0SAT - 1k2 AFSK",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 437501740,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": 1200,
-    "norad_cat_id": 35932,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
    {
      "uuid": "m3AudrFo7YRXBGjH6GovDQ",
      "description": "PE0SAT - 9k6 FSK TLM",
@@ -3684,8 +3376,8 @@
      "downlink_low": 435001000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -3750,8 +3442,8 @@
      "downlink_low": 437356000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -3783,28 +3475,6 @@
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
-  {
-    "uuid": "rLMH4E6ueaCTs37sKD86FU",
-    "description": "TLM",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 437650000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "MSK4k8",
-    "mode_id": 32,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": null,
-    "norad_cat_id": 40958,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
    {
      "uuid": "uArwdNpSBqfcS4GNj2ZfAA",
      "description": "TLM",
@@ -3860,9 +3530,9 @@
      "downlink_low": 145825000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": "AFSK1k2",
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": "AFSK",
      "invert": false,
      "baud": 1200,
      "norad_cat_id": 40931,
@@ -3882,8 +3552,8 @@
      "downlink_low": 437025000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK1k2",
-    "mode_id": 21,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -3904,8 +3574,8 @@
      "downlink_low": 437525000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -3938,128 +3608,62 @@
      "service": "Unknown"
    },
    {
-    "uuid": "vbwB8JMQHhZSDrMH5TGYBK",
-    "description": "Mode U TLM FSK 40k",
+    "uuid": "zp8ej2X6sxfzQudQW4LVfV",
+    "description": "Mode U TLM",
      "alive": true,
      "type": "Transmitter",
      "uplink_low": null,
      "uplink_high": null,
      "uplink_drift": null,
-    "downlink_low": 437445000,
+    "downlink_low": 437100000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK19k2",
-    "mode_id": 51,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
-    "baud": 40000,
-    "norad_cat_id": 41558,
+    "baud": 1200,
+    "norad_cat_id": 41478,
      "status": "active",
      "updated": "2019-04-18T05:39:53.343316Z",
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
    {
-    "uuid": "JvZyP4BkTz7azt5JRqoXxF",
-    "description": "Mode U TLM FSK 40k",
+    "uuid": "WQNpNkMYJ6isL6jfh2uNaS",
+    "description": "Mode S TLM 115k2 Spread Spectrum FSK",
      "alive": true,
-    "type": "Transmitter",
+    "type": "Transponder",
      "uplink_low": null,
      "uplink_high": null,
      "uplink_drift": null,
-    "downlink_low": 436445000,
-    "downlink_high": null,
+    "downlink_low": 2401200000,
+    "downlink_high": 2431200000,
      "downlink_drift": null,
-    "mode": "FSK19k2",
-    "mode_id": 51,
-    "uplink_mode": null,
+    "mode": "FSK",
+    "mode_id": 72,
+    "uplink_mode": "FSK",
      "invert": false,
-    "baud": 40000,
-    "norad_cat_id": 41557,
+    "baud": 115200,
+    "norad_cat_id": 41478,
      "status": "active",
      "updated": "2019-04-18T05:39:53.343316Z",
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
    {
-    "uuid": "P3bU8XcEbeaYMEA5SC9is9",
-    "description": "Mode U/V Linear",
+    "uuid": "5VDMqoeFeGZtgTBLkYfk8N",
+    "description": "Mode U TLM",
      "alive": true,
-    "type": "Transponder",
-    "uplink_low": 436935000,
-    "uplink_high": 436965000,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
      "uplink_drift": null,
-    "downlink_low": 145935000,
-    "downlink_high": 145965000,
+    "downlink_low": 437100000,
+    "downlink_high": null,
      "downlink_drift": null,
-    "mode": "USB",
-    "mode_id": 9,
-    "uplink_mode": "LSB",
-    "invert": true,
-    "baud": null,
-    "norad_cat_id": 41557,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
-  {
-    "uuid": "zp8ej2X6sxfzQudQW4LVfV",
-    "description": "Mode U TLM",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 437100000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": 1200,
-    "norad_cat_id": 41478,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
-  {
-    "uuid": "WQNpNkMYJ6isL6jfh2uNaS",
-    "description": "Mode S TLM 115k2 Spread Spectrum FSK",
-    "alive": true,
-    "type": "Transponder",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 2401200000,
-    "downlink_high": 2431200000,
-    "downlink_drift": null,
-    "mode": "FSK19k2",
-    "mode_id": 51,
-    "uplink_mode": "FSK19k2",
-    "invert": false,
-    "baud": 115200,
-    "norad_cat_id": 41478,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
-  {
-    "uuid": "5VDMqoeFeGZtgTBLkYfk8N",
-    "description": "Mode U TLM",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 437100000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -4080,9 +3684,9 @@
      "downlink_low": 2401200000,
      "downlink_high": 2431200000,
      "downlink_drift": null,
-    "mode": "FSK19k2",
-    "mode_id": 51,
-    "uplink_mode": "FSK19k2",
+    "mode": "FSK",
+    "mode_id": 72,
+    "uplink_mode": "FSK",
      "invert": false,
      "baud": 115200,
      "norad_cat_id": 41477,
@@ -4124,8 +3728,8 @@
      "downlink_low": 437485000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -4146,8 +3750,8 @@
      "downlink_low": 437345000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -4190,8 +3794,8 @@
      "downlink_low": 437425000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -4234,8 +3838,8 @@
      "downlink_low": 437485000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -4300,8 +3904,8 @@
      "downlink_low": 435948500,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -4410,8 +4014,8 @@
      "downlink_low": 437425000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FFSK1k2",
-    "mode_id": 55,
+    "mode": "FFSK",
+    "mode_id": 82,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -4476,8 +4080,8 @@
      "downlink_low": 145970000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -4498,8 +4102,8 @@
      "downlink_low": 2401000000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK115k2",
-    "mode_id": 52,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 115200,
@@ -4564,8 +4168,8 @@
      "downlink_low": 437405000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -4608,8 +4212,8 @@
      "downlink_low": 437425000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -4630,8 +4234,8 @@
      "downlink_low": 437375000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -4674,8 +4278,8 @@
      "downlink_low": 437525000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -4718,8 +4322,8 @@
      "downlink_low": 437425000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK1k2",
-    "mode_id": 36,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -4762,8 +4366,8 @@
      "downlink_low": 437200000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK1k2",
-    "mode_id": 21,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -4806,8 +4410,8 @@
      "downlink_low": 437200000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -4850,8 +4454,8 @@
      "downlink_low": 437225000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK4k8",
-    "mode_id": 15,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -4938,8 +4542,8 @@
      "downlink_low": 145800000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -4982,8 +4586,8 @@
      "downlink_low": 145940000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -5004,9 +4608,9 @@
      "downlink_low": 435950000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
-    "uplink_mode": "GMSK4k8",
+    "mode": "GMSK",
+    "mode_id": 63,
+    "uplink_mode": "GMSK",
      "invert": false,
      "baud": 4800,
      "norad_cat_id": 35933,
@@ -5026,9 +4630,9 @@
      "downlink_low": 435948500,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
-    "uplink_mode": "GMSK4k8",
+    "mode": "GMSK",
+    "mode_id": 63,
+    "uplink_mode": "GMSK",
      "invert": false,
      "baud": 4800,
      "norad_cat_id": 39136,
@@ -5048,8 +4652,8 @@
      "downlink_low": 435950000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -5070,9 +4674,9 @@
      "downlink_low": 435950000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
-    "uplink_mode": "GMSK4k8",
+    "mode": "GMSK",
+    "mode_id": 63,
+    "uplink_mode": "GMSK",
      "invert": false,
      "baud": 4800,
      "norad_cat_id": 41619,
@@ -5114,8 +4718,8 @@
      "downlink_low": 435765000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -5136,8 +4740,8 @@
      "downlink_low": 435769000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -5158,8 +4762,8 @@
      "downlink_low": 435800000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -5180,8 +4784,8 @@
      "downlink_low": 436845000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -5246,8 +4850,8 @@
      "downlink_low": 437405000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -5268,8 +4872,8 @@
      "downlink_low": 437055000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -5290,8 +4894,8 @@
      "downlink_low": 436915000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -5312,8 +4916,8 @@
      "downlink_low": 437020000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -5334,8 +4938,8 @@
      "downlink_low": 436030000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -5356,8 +4960,8 @@
      "downlink_low": 436880000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -5378,8 +4982,8 @@
      "downlink_low": 437740000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -5400,8 +5004,8 @@
      "downlink_low": 145939450,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -5422,8 +5026,8 @@
      "downlink_low": 145935000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -5488,8 +5092,8 @@
      "downlink_low": 436530000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -5532,8 +5136,8 @@
      "downlink_low": 437510000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -5554,8 +5158,8 @@
      "downlink_low": 436510000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -5576,8 +5180,8 @@
      "downlink_low": 436810000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -5598,8 +5202,8 @@
      "downlink_low": 437335000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -5620,8 +5224,8 @@
      "downlink_low": 436775000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -5642,8 +5246,8 @@
      "downlink_low": 436330000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "MSK9k6",
-    "mode_id": 33,
+    "mode": "MSK",
+    "mode_id": 81,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -5686,8 +5290,8 @@
      "downlink_low": 436705000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -5730,8 +5334,8 @@
      "downlink_low": 437370000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -5752,8 +5356,8 @@
      "downlink_low": 436390000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -5840,8 +5444,8 @@
      "downlink_low": 145836000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK4k8",
-    "mode_id": 46,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -5884,8 +5488,8 @@
      "downlink_low": 437100000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -5906,8 +5510,8 @@
      "downlink_low": 437505000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK4k8",
-    "mode_id": 46,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -5950,8 +5554,8 @@
      "downlink_low": 437230000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK2k4",
-    "mode_id": 56,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 2400,
@@ -5994,8 +5598,8 @@
      "downlink_low": 437216000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -6038,8 +5642,8 @@
      "downlink_low": 435950000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -6060,8 +5664,8 @@
      "downlink_low": 436670000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -6082,8 +5686,8 @@
      "downlink_low": 436270000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -6104,8 +5708,8 @@
      "downlink_low": 437240000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "MSK4k8",
-    "mode_id": 32,
+    "mode": "MSK",
+    "mode_id": 81,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -6126,8 +5730,8 @@
      "downlink_low": 437325000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -6170,8 +5774,8 @@
      "downlink_low": 436060000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -6192,8 +5796,8 @@
      "downlink_low": 435975000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -6214,8 +5818,8 @@
      "downlink_low": 436000000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK1k2",
-    "mode_id": 21,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -6236,8 +5840,8 @@
      "downlink_low": 437265000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -6302,8 +5906,8 @@
      "downlink_low": 437375000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -6324,8 +5928,8 @@
      "downlink_low": 437375000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -6346,8 +5950,8 @@
      "downlink_low": 437375000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -6368,8 +5972,8 @@
      "downlink_low": 437375000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -6434,8 +6038,8 @@
      "downlink_low": 145893000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK4k8",
-    "mode_id": 46,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -6500,8 +6104,8 @@
      "downlink_low": 436388200,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -6522,8 +6126,8 @@
      "downlink_low": 435950000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -6566,8 +6170,8 @@
      "downlink_low": 436876500,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -6588,9 +6192,9 @@
      "downlink_low": 436510000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
-    "uplink_mode": "BPSK9k6",
+    "mode": "BPSK",
+    "mode_id": 50,
+    "uplink_mode": "BPSK",
      "invert": false,
      "baud": 9600,
      "norad_cat_id": 42725,
@@ -6654,8 +6258,8 @@
      "downlink_low": 437480000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -6698,8 +6302,8 @@
      "downlink_low": 145860000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -6720,9 +6324,9 @@
      "downlink_low": 435103000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
-    "uplink_mode": "FSK9k6",
+    "mode": "FSK",
+    "mode_id": 72,
+    "uplink_mode": "FSK",
      "invert": false,
      "baud": 9600,
      "norad_cat_id": 30776,
@@ -6742,8 +6346,8 @@
      "downlink_low": 145915000,
      "downlink_high": null,
      "downlink_drift": 13707,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -6764,8 +6368,8 @@
      "downlink_low": 437305000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -6808,8 +6412,8 @@
      "downlink_low": 437486000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "MSK2k4",
-    "mode_id": 31,
+    "mode": "MSK",
+    "mode_id": 81,
      "uplink_mode": null,
      "invert": false,
      "baud": 2400,
@@ -6830,8 +6434,8 @@
      "downlink_low": 437322500,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK19k2",
-    "mode_id": 29,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 19200,
@@ -6874,8 +6478,8 @@
      "downlink_low": 437424000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK2k4",
-    "mode_id": 37,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 2400,
@@ -6918,8 +6522,8 @@
      "downlink_low": 437645000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -6962,8 +6566,8 @@
      "downlink_low": 437095000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -7072,8 +6676,8 @@
      "downlink_low": 145825000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -7182,8 +6786,8 @@
      "downlink_low": 437100000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -7204,12 +6808,12 @@
      "downlink_low": 435780000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
-    "norad_cat_id": 43134,
+    "norad_cat_id": 99982,
      "status": "active",
      "updated": "2019-04-18T05:39:53.343316Z",
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
@@ -7226,9 +6830,9 @@
      "downlink_low": 437265000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
-    "uplink_mode": "FSK9k6",
+    "mode": "FSK",
+    "mode_id": 72,
+    "uplink_mode": "FSK",
      "invert": false,
      "baud": 9600,
      "norad_cat_id": 99939,
@@ -7248,8 +6852,8 @@
      "downlink_low": 437465000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -7270,8 +6874,8 @@
      "downlink_low": 435525000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -7336,8 +6940,8 @@
      "downlink_low": 435350000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -7380,8 +6984,8 @@
      "downlink_low": 435525000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -7402,8 +7006,8 @@
      "downlink_low": 437020000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -7446,9 +7050,9 @@
      "downlink_low": 161787500,
      "downlink_high": 161937500,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
-    "uplink_mode": "GMSK9k6",
+    "mode": "GMSK",
+    "mode_id": 63,
+    "uplink_mode": "GMSK",
      "invert": false,
      "baud": 9600,
      "norad_cat_id": 42828,
@@ -7468,8 +7072,8 @@
      "downlink_low": 436375000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -7490,8 +7094,8 @@
      "downlink_low": 435080000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK1k2",
-    "mode_id": 21,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -7556,8 +7160,8 @@
      "downlink_low": 435350000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -7578,8 +7182,8 @@
      "downlink_low": 436600000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -7688,8 +7292,8 @@
      "downlink_low": 436100000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -7710,8 +7314,8 @@
      "downlink_low": 437350000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -7776,8 +7380,8 @@
      "downlink_low": 437300000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -7798,8 +7402,8 @@
      "downlink_low": 2403000000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -7952,8 +7556,8 @@
      "downlink_low": 435950400,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -7974,8 +7578,8 @@
      "downlink_low": 436090000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -8018,8 +7622,8 @@
      "downlink_low": 437650000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -8040,8 +7644,8 @@
      "downlink_low": 437644000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -8106,8 +7710,8 @@
      "downlink_low": 437325000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -8150,8 +7754,8 @@
      "downlink_low": 436500000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -8172,8 +7776,8 @@
      "downlink_low": 437018000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -8205,28 +7809,6 @@
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
-  {
-    "uuid": "MjcioVaW5TEKRuBzth3Yuc",
-    "description": "S-Band downlink",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 2401835000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "MSK1k2",
-    "mode_id": 30,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": null,
-    "norad_cat_id": 40030,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
    {
      "uuid": "epZQsUEaAW3A357WE3WjgJ",
      "description": "FSK9k6 AX.25 TLM",
@@ -8238,8 +7820,8 @@
      "downlink_low": 437800000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -8326,8 +7908,8 @@
      "downlink_low": 437050000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -8370,8 +7952,8 @@
      "downlink_low": 435550000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -8392,8 +7974,8 @@
      "downlink_low": 437350000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -8414,8 +7996,8 @@
      "downlink_low": 465987500,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK400",
-    "mode_id": 60,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 400,
@@ -8436,8 +8018,8 @@
      "downlink_low": 465987500,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK400",
-    "mode_id": 60,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 400,
@@ -8458,8 +8040,8 @@
      "downlink_low": 465987500,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK400",
-    "mode_id": 60,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 400,
@@ -8480,8 +8062,8 @@
      "downlink_low": 465987500,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK400",
-    "mode_id": 60,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 400,
@@ -8590,8 +8172,8 @@
      "downlink_low": 435670000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -8612,8 +8194,8 @@
      "downlink_low": 435570000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -8700,9 +8282,9 @@
      "downlink_low": 145825000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": "AFSK1k2",
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": "AFSK",
      "invert": false,
      "baud": 1200,
      "norad_cat_id": 43591,
@@ -8722,9 +8304,9 @@
      "downlink_low": 145825000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": "AFSK1k2",
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": "AFSK",
      "invert": false,
      "baud": 1200,
      "norad_cat_id": 43590,
@@ -8744,9 +8326,9 @@
      "downlink_low": 145825000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": "AFSK1k2",
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": "AFSK",
      "invert": false,
      "baud": 1200,
      "norad_cat_id": 43589,
@@ -8810,8 +8392,8 @@
      "downlink_low": 437050000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -8832,8 +8414,8 @@
      "downlink_low": 437050000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -8854,8 +8436,8 @@
      "downlink_low": 465987500,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK400",
-    "mode_id": 60,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 400,
@@ -8876,8 +8458,8 @@
      "downlink_low": 465987500,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK400",
-    "mode_id": 60,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 400,
@@ -8887,94 +8469,6 @@
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
-  {
-    "uuid": "BQHNVvqPs2Lniez5FbNckc",
-    "description": "1K2 FFSK TLM",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 435950000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "FFSK1k2",
-    "mode_id": 55,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": 1200,
-    "norad_cat_id": 43189,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
-  {
-    "uuid": "JzaoM9sEECPEUNSEw59ZDm",
-    "description": "1K2 FFSK TLM",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 435950000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "FFSK1k2",
-    "mode_id": 55,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": 1200,
-    "norad_cat_id": 43188,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
-  {
-    "uuid": "jNtREHXsKo2T4HLMWJRZwR",
-    "description": "1K2 FFSK TLM",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 435950000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "FFSK1k2",
-    "mode_id": 55,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": 1200,
-    "norad_cat_id": 43187,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
-  {
-    "uuid": "PDnTJt7D37Ke8MCxi59CE7",
-    "description": "1K2 FFSK TLM",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 435950000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "FFSK1k2",
-    "mode_id": 55,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": 1200,
-    "norad_cat_id": 43186,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
    {
      "uuid": "4BRuhmTgygWGfgeQ3Y37VW",
      "description": "S-Band Downlink",
@@ -9206,8 +8700,8 @@
      "downlink_low": 437150000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -9250,8 +8744,8 @@
      "downlink_low": 437450000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK19k2",
-    "mode_id": 29,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 19200,
@@ -9272,8 +8766,8 @@
      "downlink_low": 437475000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK19k2",
-    "mode_id": 29,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 19200,
@@ -9294,8 +8788,8 @@
      "downlink_low": 437450000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -9316,8 +8810,8 @@
      "downlink_low": 437275000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -9404,8 +8898,8 @@
      "downlink_low": 437405000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -9426,8 +8920,8 @@
      "downlink_low": 437405000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -9448,8 +8942,8 @@
      "downlink_low": 437425000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -9470,8 +8964,8 @@
      "downlink_low": 437425000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -9536,8 +9030,8 @@
      "downlink_low": 145890000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -9558,8 +9052,8 @@
      "downlink_low": 436930000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "QPSK38k4",
-    "mode_id": 62,
+    "mode": "QPSK",
+    "mode_id": 69,
      "uplink_mode": null,
      "invert": false,
      "baud": 38400,
@@ -9602,8 +9096,8 @@
      "downlink_low": 436200000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -9624,9 +9118,9 @@
      "downlink_low": 436990000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
-    "uplink_mode": "GMSK4k8",
+    "mode": "GMSK",
+    "mode_id": 63,
+    "uplink_mode": "GMSK",
      "invert": false,
      "baud": 4800,
      "norad_cat_id": 43666,
@@ -9646,8 +9140,8 @@
      "downlink_low": 436990000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -9668,9 +9162,9 @@
      "downlink_low": 437390000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
-    "uplink_mode": "GMSK9k6",
+    "mode": "GMSK",
+    "mode_id": 63,
+    "uplink_mode": "GMSK",
      "invert": false,
      "baud": 9600,
      "norad_cat_id": 43677,
@@ -9778,8 +9272,8 @@
      "downlink_low": 437385000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -9833,28 +9327,6 @@
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
-  {
-    "uuid": "f5ZSbAccAwz7NBPF9LWPp9",
-    "description": "FSK4k8",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 435265000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "FSK4k8",
-    "mode_id": 46,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": null,
-    "norad_cat_id": 39492,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
    {
      "uuid": "aS4oVeSSuAkEDEVGmpdcNe",
      "description": "FSK9k6",
@@ -9866,8 +9338,8 @@
      "downlink_low": 436990000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -9910,8 +9382,8 @@
      "downlink_low": 437290000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK1k2",
-    "mode_id": 21,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -9932,8 +9404,8 @@
      "downlink_low": 435785000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -9998,8 +9470,8 @@
      "downlink_low": 435275000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -10020,8 +9492,8 @@
      "downlink_low": 437385000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -10130,8 +9602,8 @@
      "downlink_low": 145950000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK12k5",
-    "mode_id": 67,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 12500,
@@ -10152,8 +9624,8 @@
      "downlink_low": 145920000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK9k6",
-    "mode_id": 18,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -10174,8 +9646,8 @@
      "downlink_low": 437000000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -10196,8 +9668,8 @@
      "downlink_low": 145895000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK4k8",
-    "mode_id": 66,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -10240,8 +9712,8 @@
      "downlink_low": 145895000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -10328,8 +9800,8 @@
      "downlink_low": 437250000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -10350,8 +9822,8 @@
      "downlink_low": 437350000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -10394,9 +9866,9 @@
      "downlink_low": 145943750,
      "downlink_high": 145956250,
      "downlink_drift": null,
-    "mode": "BPSK12k5",
-    "mode_id": 67,
-    "uplink_mode": "BPSK12k5",
+    "mode": "BPSK",
+    "mode_id": 50,
+    "uplink_mode": "BPSK",
      "invert": false,
      "baud": 12500,
      "norad_cat_id": 43780,
@@ -10416,8 +9888,8 @@
      "downlink_low": 437050000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -10438,8 +9910,8 @@
      "downlink_low": 437450000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -10460,8 +9932,8 @@
      "downlink_low": 400625000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -10482,8 +9954,8 @@
      "downlink_low": 400625000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -10504,8 +9976,8 @@
      "downlink_low": 437250000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -10526,8 +9998,8 @@
      "downlink_low": 435835000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -10614,8 +10086,8 @@
      "downlink_low": 437450000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -10636,8 +10108,8 @@
      "downlink_low": 435500000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -10658,8 +10130,8 @@
      "downlink_low": 145860000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -10680,8 +10152,8 @@
      "downlink_low": 2400150000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK14k4",
-    "mode_id": 70,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 14400,
@@ -10724,8 +10196,8 @@
      "downlink_low": 435635000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK1k2",
-    "mode_id": 26,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -10746,8 +10218,8 @@
      "downlink_low": 435635000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -10768,8 +10240,8 @@
      "downlink_low": 437250000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -10790,8 +10262,8 @@
      "downlink_low": 437150000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -10812,8 +10284,8 @@
      "downlink_low": 437475000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -10900,8 +10372,8 @@
      "downlink_low": 437275000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -10922,8 +10394,8 @@
      "downlink_low": 437625000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -10966,8 +10438,8 @@
      "downlink_low": 437775000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -10988,8 +10460,8 @@
      "downlink_low": 435425000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -11032,8 +10504,8 @@
      "downlink_low": 435975000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -11054,8 +10526,8 @@
      "downlink_low": 437625000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK2k4",
-    "mode_id": 65,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 2400,
@@ -11098,8 +10570,8 @@
      "downlink_low": 435200000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -11142,8 +10614,8 @@
      "downlink_low": 437560000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -11164,8 +10636,8 @@
      "downlink_low": 436500000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -11186,8 +10658,8 @@
      "downlink_low": 437150000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -11230,8 +10702,8 @@
      "downlink_low": 437505000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -11274,8 +10746,8 @@
      "downlink_low": 437425000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -11318,8 +10790,8 @@
      "downlink_low": 437250000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK19k2",
-    "mode_id": 48,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 19200,
@@ -11340,8 +10812,8 @@
      "downlink_low": 437305000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -11406,8 +10878,8 @@
      "downlink_low": 437385000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -11428,9 +10900,9 @@
      "downlink_low": 437345000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
-    "uplink_mode": "GMSK9k6",
+    "mode": "GMSK",
+    "mode_id": 63,
+    "uplink_mode": "GMSK",
      "invert": false,
      "baud": 9600,
      "norad_cat_id": 43907,
@@ -11450,9 +10922,9 @@
      "downlink_low": 2405000000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
-    "uplink_mode": "GMSK9k6",
+    "mode": "GMSK",
+    "mode_id": 63,
+    "uplink_mode": "GMSK",
      "invert": false,
      "baud": 9600,
      "norad_cat_id": 43907,
@@ -11516,8 +10988,8 @@
      "downlink_low": 436990000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK4k8",
-    "mode_id": 46,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -11527,28 +10999,6 @@
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
-  {
-    "uuid": "HYEptnddemghSLTTsKm3N5",
-    "description": "Data Downlink System (DDS)",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 2408000000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "QPSK",
-    "mode_id": 69,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": 5000000,
-    "norad_cat_id": 42831,
-    "status": "active",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
    {
      "uuid": "5wz9DRuveTEVMig4NvXE9j",
      "description": "MODE U/U FM VOICE",
@@ -11626,8 +11076,8 @@
      "downlink_low": 435700000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -11648,8 +11098,8 @@
      "downlink_low": 435700000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -11670,8 +11120,8 @@
      "downlink_low": 435500000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -11692,8 +11142,8 @@
      "downlink_low": 435600000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -11714,8 +11164,8 @@
      "downlink_low": 436400000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -11736,8 +11186,8 @@
      "downlink_low": 437475000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK2k4",
-    "mode_id": 27,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 2400,
@@ -11758,8 +11208,8 @@
      "downlink_low": 437150000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK2k4",
-    "mode_id": 27,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 2400,
@@ -11780,8 +11230,8 @@
      "downlink_low": 437475000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK2k4",
-    "mode_id": 27,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 2400,
@@ -11802,8 +11252,8 @@
      "downlink_low": 437150000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK2k4",
-    "mode_id": 27,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 2400,
@@ -11868,8 +11318,8 @@
      "downlink_low": 435900000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -11890,8 +11340,8 @@
      "downlink_low": 435900000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -11934,8 +11384,8 @@
      "downlink_low": 437225000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -11978,8 +11428,8 @@
      "downlink_low": 437505000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -12165,28 +11615,6 @@
      "citation": "CITATION NEEDED - https://xkcd.com/285/",
      "service": "Unknown"
    },
-  {
-    "uuid": "fhX9L7xAX9YtWaks6KqgGV",
-    "description": "GMSK9k6 TLM",
-    "alive": false,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 437500000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": 9600,
-    "norad_cat_id": 44030,
-    "status": "inactive",
-    "updated": "2019-04-18T05:39:53.343316Z",
-    "citation": "CITATION NEEDED - https://xkcd.com/285/",
-    "service": "Unknown"
-  },
    {
      "uuid": "DeWBnHP8rRczvykrQhwJcU",
      "description": "FSK4k8",
@@ -12198,8 +11626,8 @@
      "downlink_low": 145893000,
      "downlink_high": null,
      "downlink_drift": -6854,
-    "mode": "FSK4k8",
-    "mode_id": 46,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -12220,8 +11648,8 @@
      "downlink_low": 437500000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -12242,8 +11670,8 @@
      "downlink_low": 437240000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK1k2",
-    "mode_id": 21,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -12264,8 +11692,8 @@
      "downlink_low": 437505000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK1k2",
-    "mode_id": 21,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -12286,8 +11714,8 @@
      "downlink_low": 435775000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -12308,8 +11736,8 @@
      "downlink_low": 435775000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -12352,8 +11780,8 @@
      "downlink_low": 437505000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK1k2",
-    "mode_id": 21,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -12396,9 +11824,9 @@
      "downlink_low": 10489550000,
      "downlink_high": 10489555000,
      "downlink_drift": null,
-    "mode": "BPSK400",
-    "mode_id": 60,
-    "uplink_mode": "BPSK400",
+    "mode": "BPSK",
+    "mode_id": 50,
+    "uplink_mode": "BPSK",
      "invert": false,
      "baud": 400,
      "norad_cat_id": 43700,
@@ -12550,9 +11978,9 @@
      "downlink_low": 10489795000,
      "downlink_high": 10489800000,
      "downlink_drift": null,
-    "mode": "BPSK400",
-    "mode_id": 60,
-    "uplink_mode": "BPSK400",
+    "mode": "BPSK",
+    "mode_id": 50,
+    "uplink_mode": "BPSK",
      "invert": false,
      "baud": 400,
      "norad_cat_id": 43700,
@@ -12572,8 +12000,8 @@
      "downlink_low": 437600000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -12594,8 +12022,8 @@
      "downlink_low": 437175000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -12638,8 +12066,8 @@
      "downlink_low": 436730000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -12660,8 +12088,8 @@
      "downlink_low": 437265000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -12682,9 +12110,9 @@
      "downlink_low": 145825000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": "AFSK1k2",
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": "AFSK",
      "invert": false,
      "baud": 1200,
      "norad_cat_id": 44104,
@@ -12704,8 +12132,8 @@
      "downlink_low": 437300000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK1k2",
-    "mode_id": 36,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -12726,8 +12154,8 @@
      "downlink_low": 437301500,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK1k2",
-    "mode_id": 36,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -12748,8 +12176,8 @@
      "downlink_low": 437300000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -12814,8 +12242,8 @@
      "downlink_low": 435900000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -12858,8 +12286,8 @@
      "downlink_low": 435275000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK4k8",
-    "mode_id": 66,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -12880,8 +12308,8 @@
      "downlink_low": 435275000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK2k4",
-    "mode_id": 65,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 2400,
@@ -12902,8 +12330,8 @@
      "downlink_low": 435275000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -12946,8 +12374,8 @@
      "downlink_low": 145860000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -12990,8 +12418,8 @@
      "downlink_low": 145815000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -13034,8 +12462,8 @@
      "downlink_low": 24048400000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "BPSK400",
-    "mode_id": 60,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 400,
@@ -13056,8 +12484,8 @@
      "downlink_low": 24048000000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "BPSK400",
-    "mode_id": 60,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 400,
@@ -13078,8 +12506,8 @@
      "downlink_low": 10451400000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "BPSK400",
-    "mode_id": 60,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 400,
@@ -13100,8 +12528,8 @@
      "downlink_low": 10451000000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "BPSK400",
-    "mode_id": 60,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 400,
@@ -13122,8 +12550,8 @@
      "downlink_low": 2400600000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "BPSK400",
-    "mode_id": 60,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 400,
@@ -13144,8 +12572,8 @@
      "downlink_low": 2400200000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "BPSK400",
-    "mode_id": 60,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 400,
@@ -13166,8 +12594,8 @@
      "downlink_low": 435850000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "BPSK400",
-    "mode_id": 60,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 400,
@@ -13188,8 +12616,8 @@
      "downlink_low": 435450000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "BPSK400",
-    "mode_id": 60,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 400,
@@ -13210,8 +12638,8 @@
      "downlink_low": 145898000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "BPSK400",
-    "mode_id": 60,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 400,
@@ -13232,8 +12660,8 @@
      "downlink_low": 437250000,
      "downlink_high": null,
      "downlink_drift": 5718,
-    "mode": "MSK4k8",
-    "mode_id": 32,
+    "mode": "MSK",
+    "mode_id": 81,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -13254,8 +12682,8 @@
      "downlink_low": 437200000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -13276,8 +12704,8 @@
      "downlink_low": 437560000,
      "downlink_high": null,
      "downlink_drift": -3828,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -13320,8 +12748,8 @@
      "downlink_low": 437650000,
      "downlink_high": null,
      "downlink_drift": -10111,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -13342,8 +12770,8 @@
      "downlink_low": 437475000,
      "downlink_high": null,
      "downlink_drift": 2286,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -13540,8 +12968,8 @@
      "downlink_low": 435025000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "PSK4k8",
-    "mode_id": 73,
+    "mode": "PSK",
+    "mode_id": 74,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -13562,8 +12990,8 @@
      "downlink_low": 435025000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -13584,8 +13012,8 @@
      "downlink_low": 145825000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -13694,9 +13122,9 @@
      "downlink_low": 437150000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
-    "uplink_mode": "BPSK1k2",
+    "mode": "BPSK",
+    "mode_id": 50,
+    "uplink_mode": "BPSK",
      "invert": false,
      "baud": 1200,
      "norad_cat_id": 20442,
@@ -13716,8 +13144,8 @@
      "downlink_low": 437822000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -13738,8 +13166,8 @@
      "downlink_low": 435867000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -13848,8 +13276,8 @@
      "downlink_low": 437567800,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -13870,8 +13298,8 @@
      "downlink_low": 437568000,
      "downlink_high": null,
      "downlink_drift": -457,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -14002,8 +13430,8 @@
      "downlink_low": 465987500,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK400",
-    "mode_id": 60,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 400,
@@ -14134,8 +13562,8 @@
      "downlink_low": 437445000,
      "downlink_high": null,
      "downlink_drift": -15316,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -14156,8 +13584,8 @@
      "downlink_low": 437437500,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -14178,9 +13606,9 @@
      "downlink_low": 435225000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
-    "uplink_mode": "FSK9k6",
+    "mode": "FSK",
+    "mode_id": 72,
+    "uplink_mode": "FSK",
      "invert": false,
      "baud": 9600,
      "norad_cat_id": 25397,
@@ -14200,9 +13628,9 @@
      "downlink_low": 435225000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
-    "uplink_mode": "FSK9k6",
+    "mode": "FSK",
+    "mode_id": 72,
+    "uplink_mode": "FSK",
      "invert": false,
      "baud": 9600,
      "norad_cat_id": 25397,
@@ -14222,9 +13650,9 @@
      "downlink_low": 435225000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
-    "uplink_mode": "FSK9k6",
+    "mode": "FSK",
+    "mode_id": 72,
+    "uplink_mode": "FSK",
      "invert": false,
      "baud": 9600,
      "norad_cat_id": 25397,
@@ -14244,9 +13672,9 @@
      "downlink_low": 435225000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
-    "uplink_mode": "FSK9k6",
+    "mode": "FSK",
+    "mode_id": 72,
+    "uplink_mode": "FSK",
      "invert": false,
      "baud": 9600,
      "norad_cat_id": 25397,
@@ -14266,9 +13694,9 @@
      "downlink_low": 435225000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
-    "uplink_mode": "FSK9k6",
+    "mode": "FSK",
+    "mode_id": 72,
+    "uplink_mode": "FSK",
      "invert": false,
      "baud": 9600,
      "norad_cat_id": 25397,
@@ -14288,9 +13716,9 @@
      "downlink_low": 435225000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
-    "uplink_mode": "FSK9k6",
+    "mode": "FSK",
+    "mode_id": 72,
+    "uplink_mode": "FSK",
      "invert": false,
      "baud": 9600,
      "norad_cat_id": 25397,
@@ -14332,9 +13760,9 @@
      "downlink_low": 145825000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": "AFSK1k2",
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": "AFSK",
      "invert": false,
      "baud": 1200,
      "norad_cat_id": 25544,
@@ -14398,9 +13826,9 @@
      "downlink_low": 437550000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": "AFSK1k2",
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": "AFSK",
      "invert": false,
      "baud": 1200,
      "norad_cat_id": 25544,
@@ -14508,9 +13936,9 @@
      "downlink_low": 145800000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": "AFSK1k2",
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": "AFSK",
      "invert": false,
      "baud": 1200,
      "norad_cat_id": 25544,
@@ -14574,8 +14002,8 @@
      "downlink_low": 437375000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -14596,8 +14024,8 @@
      "downlink_low": 437375000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -14618,8 +14046,8 @@
      "downlink_low": 437375000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -14662,9 +14090,9 @@
      "downlink_low": 145900000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": "AFSK1k2",
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": "AFSK",
      "invert": false,
      "baud": 1200,
      "norad_cat_id": 43678,
@@ -14772,8 +14200,8 @@
      "downlink_low": 435300000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -14794,8 +14222,8 @@
      "downlink_low": 436200000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -14816,9 +14244,9 @@
      "downlink_low": 145825000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": "AFSK1k2",
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": "AFSK",
      "invert": false,
      "baud": 1200,
      "norad_cat_id": 44355,
@@ -14838,9 +14266,9 @@
      "downlink_low": 145825000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
-    "uplink_mode": "AFSK1k2",
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": "AFSK",
      "invert": false,
      "baud": 1200,
      "norad_cat_id": 44354,
@@ -14882,8 +14310,8 @@
      "downlink_low": 437505000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK19k2",
-    "mode_id": 51,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 19200,
@@ -14904,8 +14332,8 @@
      "downlink_low": 437505000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -14926,8 +14354,8 @@
      "downlink_low": 437200000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -15102,8 +14530,8 @@
      "downlink_low": 437535000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -15124,8 +14552,8 @@
      "downlink_low": 437485000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -15146,8 +14574,8 @@
      "downlink_low": 465987500,
      "downlink_high": null,
      "downlink_drift": 1073,
-    "mode": "BPSK400",
-    "mode_id": 60,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 400,
@@ -15190,8 +14618,8 @@
      "downlink_low": 437485000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -15212,12 +14640,12 @@
      "downlink_low": 437200000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
-    "norad_cat_id": 99964,
+    "norad_cat_id": 44369,
      "status": "active",
      "updated": "2019-06-30T07:25:53.905836Z",
      "citation": "Multiple observations decoded on station #232 using the FSK decoder (not GMSK, I overrode that) - https://network.satnogs.org/observations/783080/",
@@ -15234,8 +14662,8 @@
      "downlink_low": 437525000,
      "downlink_high": null,
      "downlink_drift": -5257,
-    "mode": "GFSK19k2",
-    "mode_id": 29,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 19200,
@@ -15278,8 +14706,8 @@
      "downlink_low": 435500000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -15322,8 +14750,8 @@
      "downlink_low": 435500000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -15344,8 +14772,8 @@
      "downlink_low": 435500000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -15366,8 +14794,8 @@
      "downlink_low": 436950000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -15388,8 +14816,8 @@
      "downlink_low": 436500000,
      "downlink_high": null,
      "downlink_drift": 2291,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -15410,9 +14838,9 @@
      "downlink_low": 148800000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
-    "uplink_mode": "GFSK9k6",
+    "mode": "GFSK",
+    "mode_id": 75,
+    "uplink_mode": "GFSK",
      "invert": false,
      "baud": 9600,
      "norad_cat_id": 99944,
@@ -15432,8 +14860,8 @@
      "downlink_low": 437125000,
      "downlink_high": null,
      "downlink_drift": 3088,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -15476,8 +14904,8 @@
      "downlink_low": 435450000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -15498,8 +14926,8 @@
      "downlink_low": 435450000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -15542,8 +14970,8 @@
      "downlink_low": 437025000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -15564,8 +14992,8 @@
      "downlink_low": 437025000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -15586,8 +15014,8 @@
      "downlink_low": 437250000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -15613,7 +15041,7 @@
      "uplink_mode": null,
      "invert": false,
      "baud": null,
-    "norad_cat_id": 99807,
+    "norad_cat_id": 44419,
      "status": "active",
      "updated": "2019-07-04T21:45:48.064864Z",
      "citation": "http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=521",
@@ -15635,7 +15063,7 @@
      "uplink_mode": "FM",
      "invert": false,
      "baud": null,
-    "norad_cat_id": 99807,
+    "norad_cat_id": 44419,
      "status": "active",
      "updated": "2019-07-04T21:45:48.067514Z",
      "citation": "http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=521",
@@ -15652,12 +15080,12 @@
      "downlink_low": 435325000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
-    "norad_cat_id": 99807,
+    "norad_cat_id": 44419,
      "status": "active",
      "updated": "2019-07-04T21:45:48.070164Z",
      "citation": "https://www.amsat.org/pipermail/amsat-bb/2019-July/073905.html",
@@ -15674,8 +15102,8 @@
      "downlink_low": 435950000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK1k2",
-    "mode_id": 36,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -15696,8 +15124,8 @@
      "downlink_low": 435950000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK1k2",
-    "mode_id": 36,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -15718,8 +15146,8 @@
      "downlink_low": 435950000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK1k2",
-    "mode_id": 36,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -15740,8 +15168,8 @@
      "downlink_low": 435950000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK1k2",
-    "mode_id": 36,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -15784,8 +15212,8 @@
      "downlink_low": 435950000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -15828,8 +15256,8 @@
      "downlink_low": 145840000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK12k5",
-    "mode_id": 67,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 12500,
@@ -15839,50 +15267,6 @@
      "citation": "https://www.move2space.de/MOVE-II/satellite/radio-amateurs/",
      "service": "Unknown"
    },
-  {
-    "uuid": "6U5FTnY4mgCcxiPgauJhES",
-    "description": "APT S-E RHCP D 1.7KHz",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 137850000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "APT",
-    "mode_id": 44,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": null,
-    "norad_cat_id": 44387,
-    "status": "active",
-    "updated": "2019-07-04T21:45:48.093981Z",
-    "citation": "https://www.wmo-sat.info/oscar/satellites/view/483",
-    "service": "Unknown"
-  },
-  {
-    "uuid": "GEE2LAKDR2zeSYVsM8U2e3",
-    "description": "APT S-E RHCP D 1.7KHz",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 137150000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "APT",
-    "mode_id": 44,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": null,
-    "norad_cat_id": 44387,
-    "status": "active",
-    "updated": "2019-07-04T21:45:48.096692Z",
-    "citation": "https://www.wmo-sat.info/oscar/satellites/view/483",
-    "service": "Unknown"
-  },
    {
      "uuid": "ZgWzj9ALF7FpJoxLzeXdDM",
      "description": "AHRPT S-E RHCP D 3000 kbps",
@@ -15927,28 +15311,6 @@
      "citation": "https://www.wmo-sat.info/oscar/satellites/view/483",
      "service": "Unknown"
    },
-  {
-    "uuid": "bLyAgpua2DYBYAtCnfoZhF",
-    "description": "LRPT S-E RHCP D 80 kbps",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 137912500,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "LRPT",
-    "mode_id": 53,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": null,
-    "norad_cat_id": 44387,
-    "status": "active",
-    "updated": "2019-07-04T21:45:48.104302Z",
-    "citation": "https://www.wmo-sat.info/oscar/satellites/view/483",
-    "service": "Unknown"
-  },
    {
      "uuid": "o5eiLkcaNbq6BX3gv6TB2c",
      "description": "Mode U GFSK4k8 TLM",
@@ -15960,8 +15322,8 @@
      "downlink_low": 437525000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK4k8",
-    "mode_id": 15,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -15982,8 +15344,8 @@
      "downlink_low": 436750000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -16004,8 +15366,8 @@
      "downlink_low": 437750000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -16075,7 +15437,7 @@
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
-    "norad_cat_id": 99814,
+    "norad_cat_id": 44404,
      "status": "active",
      "updated": "2019-07-06T16:58:34.090250Z",
      "citation": "https://r4uab.ru/frequency/",
@@ -16114,8 +15476,8 @@
      "downlink_low": 435950000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -16180,8 +15542,8 @@
      "downlink_low": 435700000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -16202,8 +15564,8 @@
      "downlink_low": 435700000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -16224,8 +15586,8 @@
      "downlink_low": 435700000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -16246,8 +15608,8 @@
      "downlink_low": 435700000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -16268,12 +15630,12 @@
      "downlink_low": 435700000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
-    "norad_cat_id": 99807,
+    "norad_cat_id": 44419,
      "status": "active",
      "updated": "2019-07-08T01:15:04.702216Z",
      "citation": "https://twitter.com/EU1SAT/status/1147947047561154564 and https://twitter.com/EU1SAT/status/1147869496092385280",
@@ -16312,8 +15674,8 @@
      "downlink_low": 437004000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -16378,8 +15740,8 @@
      "downlink_low": 437600000,
      "downlink_high": null,
      "downlink_drift": -2285,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -16466,8 +15828,8 @@
      "downlink_low": 437025000,
      "downlink_high": null,
      "downlink_drift": -1174,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -16488,8 +15850,8 @@
      "downlink_low": 436730000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK4k8",
-    "mode_id": 15,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -16510,8 +15872,8 @@
      "downlink_low": 436730000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -16532,8 +15894,8 @@
      "downlink_low": 436200000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -16576,8 +15938,8 @@
      "downlink_low": 437175000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "FSK1k2",
-    "mode_id": 21,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -16675,28 +16037,6 @@
      "citation": "Move from unknown mode to FM",
      "service": "Unknown"
    },
-  {
-    "uuid": "vx3Eu5TL8mPfVvLQakjDzc",
-    "description": "Unknown signal",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 145957000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "FM",
-    "mode_id": 1,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": null,
-    "norad_cat_id": 41557,
-    "status": "active",
-    "updated": "2019-09-13T17:54:20.441053Z",
-    "citation": "Move from unknown mode to FM",
-    "service": "Unknown"
-  },
    {
      "uuid": "mhCq9NoyceojDk88VKWHUM",
      "description": "Mode V/U FM",
@@ -16730,8 +16070,8 @@
      "downlink_low": 435840000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -16867,7 +16207,7 @@
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
-    "norad_cat_id": 99961,
+    "norad_cat_id": 44365,
      "status": "active",
      "updated": "2019-10-03T22:04:20.877946Z",
      "citation": "http://www.amsatuk.me.uk/iaru/formal_detail.php?serialnum=647",
@@ -16906,8 +16246,8 @@
      "downlink_low": 435800000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -16928,8 +16268,8 @@
      "downlink_low": 435925000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -17038,8 +16378,8 @@
      "downlink_low": 437455000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "FSK1k2",
-    "mode_id": 21,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -17192,8 +16532,8 @@
      "downlink_low": 437250000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -17236,8 +16576,8 @@
      "downlink_low": 437385000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "AFSK9k6",
-    "mode_id": 18,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -17280,8 +16620,8 @@
      "downlink_low": 437290000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "AFSK1k2",
-    "mode_id": 2,
+    "mode": "AFSK",
+    "mode_id": 49,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -17346,8 +16686,8 @@
      "downlink_low": 435950000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -17390,8 +16730,8 @@
      "downlink_low": 437505000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "FSK9k6",
-    "mode_id": 22,
+    "mode": "FSK",
+    "mode_id": 72,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -17412,8 +16752,8 @@
      "downlink_low": 145947000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -17456,8 +16796,8 @@
      "downlink_low": 437000000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "GMSK9k6",
-    "mode_id": 39,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -17478,8 +16818,8 @@
      "downlink_low": 145840000,
      "downlink_high": null,
      "downlink_drift": -5273,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -17489,28 +16829,6 @@
      "citation": "https://network.satnogs.org/observations/1132648/",
      "service": "Unknown"
    },
-  {
-    "uuid": "RYyEQYkVvjMF7v2F8XVang",
-    "description": "LRPT S-E RHCP D 72 kbps",
-    "alive": true,
-    "type": "Transmitter",
-    "uplink_low": null,
-    "uplink_high": null,
-    "uplink_drift": null,
-    "downlink_low": 137900000,
-    "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "LRPT",
-    "mode_id": 53,
-    "uplink_mode": null,
-    "invert": false,
-    "baud": null,
-    "norad_cat_id": 44387,
-    "status": "active",
-    "updated": "2019-11-06T18:10:11.014628Z",
-    "citation": "http://happysat.nl/Meteor/html/Meteor_Status.html",
-    "service": "Unknown"
-  },
    {
      "uuid": "Pfwywu74BnMu72ykCicETX",
      "description": "Mode V/A (A) Lin CW",
@@ -17588,12 +16906,12 @@
      "downlink_low": 437425000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK19k2",
-    "mode_id": 48,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 19200,
-    "norad_cat_id": 99963,
+    "norad_cat_id": 43553,
      "status": "active",
      "updated": "2019-11-20T00:21:21.445815Z",
      "citation": "https://community.libre.space/t/changing-norad-id-for-radsat-g/5002",
@@ -17654,8 +16972,8 @@
      "downlink_low": 437060000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -17808,8 +17126,8 @@
      "downlink_low": 436700000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "BPSK1k2",
-    "mode_id": 47,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -17830,12 +17148,12 @@
      "downlink_low": 437425000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "GFSK9k6",
-    "mode_id": 28,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
-    "norad_cat_id": 99964,
+    "norad_cat_id": 44369,
      "status": "active",
      "updated": "2019-12-02T12:52:04.034420Z",
      "citation": "https://community.libre.space/t/new-satellite-suggestion-acrux-1-launch-on-29th-june-at-4-30utc/4175/25",
@@ -18182,8 +17500,8 @@
      "downlink_low": 436400000,
      "downlink_high": null,
      "downlink_drift": 0,
-    "mode": "BPSK9k6",
-    "mode_id": 54,
+    "mode": "BPSK",
+    "mode_id": 50,
      "uplink_mode": null,
      "invert": false,
      "baud": 9600,
@@ -18270,12 +17588,12 @@
      "downlink_low": 436100000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK2k4",
-    "mode_id": 27,
-    "uplink_mode": "GFSK2k4",
+    "mode": "GFSK",
+    "mode_id": 75,
+    "uplink_mode": "GFSK",
      "invert": false,
      "baud": 2400,
-    "norad_cat_id": 99822,
+    "norad_cat_id": 44885,
      "status": "active",
      "updated": "2019-12-18T17:40:26.855172Z",
      "citation": "https://floripasat.ufsc.br/communication-info/ and http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=646",
@@ -18292,12 +17610,12 @@
      "downlink_low": 145900000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GFSK1k2",
-    "mode_id": 26,
+    "mode": "GFSK",
+    "mode_id": 75,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
-    "norad_cat_id": 99822,
+    "norad_cat_id": 44885,
      "status": "active",
      "updated": "2019-12-18T17:40:26.856467Z",
      "citation": "https://floripasat.ufsc.br/communication-info/ and http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=646",
@@ -18314,8 +17632,8 @@
      "downlink_low": 437429500,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "MSK1k2",
-    "mode_id": 30,
+    "mode": "MSK",
+    "mode_id": 81,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -18336,8 +17654,8 @@
      "downlink_low": 437425000,
      "downlink_high": null,
      "downlink_drift": 4396,
-    "mode": "MSK1k2",
-    "mode_id": 30,
+    "mode": "MSK",
+    "mode_id": 81,
      "uplink_mode": null,
      "invert": false,
      "baud": 1200,
@@ -18380,8 +17698,8 @@
      "downlink_low": 145890000,
      "downlink_high": null,
      "downlink_drift": null,
-    "mode": "GMSK4k8",
-    "mode_id": 38,
+    "mode": "GMSK",
+    "mode_id": 63,
      "uplink_mode": null,
      "invert": false,
      "baud": 4800,
@@ -18436,25 +17754,1301 @@
      "service": "Unknown"
    },
    {
-    "uuid": "qW5N27QuSrN2JMasbNiUhR",
-    "description": "Mode V Imaging",
+    "uuid": "fqnBqnTm3fxX4rbpF55tPS",
+    "description": "CW",
      "alive": true,
      "type": "Transmitter",
      "uplink_low": null,
      "uplink_high": null,
      "uplink_drift": null,
-    "downlink_low": 145800000,
+    "downlink_low": 437485000,
      "downlink_high": null,
-    "downlink_drift": null,
-    "mode": "SSTV",
-    "mode_id": 5,
+    "downlink_drift": 0,
+    "mode": "CW",
+    "mode_id": 6,
      "uplink_mode": null,
      "invert": false,
-    "baud": 0,
-    "norad_cat_id": 25544,
+    "baud": 22,
+    "norad_cat_id": 32791,
      "status": "active",
-    "updated": "2019-12-26T07:19:18.186338Z",
-    "citation": "https://ariss-sstv.blogspot.com/2019/12/sstv-from-december-28-2019-until.html",
-    "service": "Amateur"
+    "updated": "2020-01-06T18:43:57.976042Z",
+    "citation": "https://i.imgur.com/ZjXjoQj.png",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "yA9kEtgExZb7QvBrpWxu77",
+    "description": "PE0SAT - 1k2 BPSK AFSK Tones",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437500000,
+    "downlink_high": null,
+    "downlink_drift": 6263,
+    "mode": "BPSK",
+    "mode_id": 50,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 1200,
+    "norad_cat_id": 35932,
+    "status": "active",
+    "updated": "2020-01-07T19:37:14.623991Z",
+    "citation": "www.pe0sat.nl",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "5NYAQxtjsR4KPRM5uUAyNG",
+    "description": "BPSK G3RUH 1k2",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437600000,
+    "downlink_high": null,
+    "downlink_drift": 0,
+    "mode": "BPSK",
+    "mode_id": 50,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 1200,
+    "norad_cat_id": 41915,
+    "status": "active",
+    "updated": "2020-01-07T19:39:38.927388Z",
+    "citation": "https://twitter.com/CX8AF/status/1214551646488809472",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "qHbFqzuhyYnaexGP64PZXN",
+    "description": "9k6 FSK AX25",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437100000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "FSK",
+    "mode_id": 72,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 9600,
+    "norad_cat_id": 26063,
+    "status": "active",
+    "updated": "2020-01-23T18:57:02.948253Z",
+    "citation": "https://www.pe0sat.nl/satdb/",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "thnvSvLLE92HkvGqsz7o4H",
+    "description": "Mode K Experimental BPSK 1Mbps",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 24049000000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "BPSK",
+    "mode_id": 50,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": null,
+    "norad_cat_id": 45119,
+    "status": "active",
+    "updated": "2020-01-31T18:29:00.317924Z",
+    "citation": "http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=604",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "RgKHem75dh6oR5P7qvpVv6",
+    "description": "Mode U BPSK1k2 TLM",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 435800000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "BPSK",
+    "mode_id": 50,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 1200,
+    "norad_cat_id": 45119,
+    "status": "active",
+    "updated": "2020-01-31T18:29:00.321625Z",
+    "citation": "http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=604",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "8fMPbYXQi2fXPngQXJPykN",
+    "description": "Mode U GMSK9k6",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 436350000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "GMSK",
+    "mode_id": 63,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 9600,
+    "norad_cat_id": 45115,
+    "status": "active",
+    "updated": "2020-01-31T18:29:00.324650Z",
+    "citation": "http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=677",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "TtvWkUwvKLnjbKtjUVgkAg",
+    "description": "Mode V GMSK9k6",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 145875000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "GMSK",
+    "mode_id": 63,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 9600,
+    "norad_cat_id": 45115,
+    "status": "active",
+    "updated": "2020-01-31T18:29:00.325611Z",
+    "citation": "http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=677",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "3R6nkjy5qtwmg3GeRT6fbF",
+    "description": "Mode S QPSK 3Mbps",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 2432000000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "QPSK",
+    "mode_id": 69,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": null,
+    "norad_cat_id": 45115,
+    "status": "active",
+    "updated": "2020-01-31T18:30:13.758466Z",
+    "citation": "http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=677",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "qW5N27QuSrN2JMasbNiUhR",
+    "description": "Mode V Imaging",
+    "alive": false,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 145800000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "SSTV",
+    "mode_id": 5,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 0,
+    "norad_cat_id": 25544,
+    "status": "inactive",
+    "updated": "2020-01-31T18:31:35.085932Z",
+    "citation": "https://ariss-sstv.blogspot.com/",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "3vpxPw6cHaeKXBRJXEAQyX",
+    "description": "Mode V/U Transponder",
+    "alive": true,
+    "type": "Transponder",
+    "uplink_low": 145910000,
+    "uplink_high": 145940000,
+    "uplink_drift": null,
+    "downlink_low": 435810000,
+    "downlink_high": 435839999,
+    "downlink_drift": null,
+    "mode": "CW",
+    "mode_id": 6,
+    "uplink_mode": "CW",
+    "invert": true,
+    "baud": null,
+    "norad_cat_id": 45119,
+    "status": "active",
+    "updated": "2020-02-01T00:45:49.088616Z",
+    "citation": "http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=604",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "BQHNVvqPs2Lniez5FbNckc",
+    "description": "AFSK 1k2 TLM",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 435950000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "AFSK S-Net",
+    "mode_id": 78,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 1200,
+    "norad_cat_id": 43189,
+    "status": "active",
+    "updated": "2020-02-04T21:18:12.122247Z",
+    "citation": "https://www.raumfahrttechnik.tu-berlin.de/menue/amateur_radio/",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "JzaoM9sEECPEUNSEw59ZDm",
+    "description": "AFSK 1k2 TLM",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 435950000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "AFSK S-Net",
+    "mode_id": 78,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 1200,
+    "norad_cat_id": 43188,
+    "status": "active",
+    "updated": "2020-02-04T21:18:12.123067Z",
+    "citation": "https://www.raumfahrttechnik.tu-berlin.de/menue/amateur_radio/",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "jNtREHXsKo2T4HLMWJRZwR",
+    "description": "AFSK 1k2 TLM",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 435950000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "AFSK S-Net",
+    "mode_id": 78,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 1200,
+    "norad_cat_id": 43187,
+    "status": "active",
+    "updated": "2020-02-04T21:18:12.123709Z",
+    "citation": "https://www.raumfahrttechnik.tu-berlin.de/menue/amateur_radio/",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "PDnTJt7D37Ke8MCxi59CE7",
+    "description": "AFSK 1k2 TLM",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 435950000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "AFSK S-Net",
+    "mode_id": 78,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 1200,
+    "norad_cat_id": 43186,
+    "status": "active",
+    "updated": "2020-02-04T21:18:12.124328Z",
+    "citation": "https://www.raumfahrttechnik.tu-berlin.de/menue/amateur_radio/",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "2y8DRYd4fMKKHYrP67s6Fb",
+    "description": "AFSK 1k2 TLM",
+    "alive": false,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 435950000,
+    "downlink_high": null,
+    "downlink_drift": 0,
+    "mode": "AFSK SALSA",
+    "mode_id": 79,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 1200,
+    "norad_cat_id": 99826,
+    "status": "inactive",
+    "updated": "2020-02-04T21:18:27.569041Z",
+    "citation": "https://www.raumfahrttechnik.tu-berlin.de/menue/amateur_radio/",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "TfQwQ8owTDdSXn93of998f",
+    "description": "Mode V/U Transponder",
+    "alive": true,
+    "type": "Transponder",
+    "uplink_low": 145910000,
+    "uplink_high": 145940000,
+    "uplink_drift": null,
+    "downlink_low": 435810000,
+    "downlink_high": 435840000,
+    "downlink_drift": null,
+    "mode": "LSB",
+    "mode_id": 20,
+    "uplink_mode": "USB",
+    "invert": true,
+    "baud": null,
+    "norad_cat_id": 45119,
+    "status": "active",
+    "updated": "2020-02-06T10:29:30.532354Z",
+    "citation": "https://www.amsat.org/linear-satellite-frequency-summary/",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "GEE2LAKDR2zeSYVsM8U2e3",
+    "description": "APT S-E RHCP D 1.7KHz",
+    "alive": false,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 137150000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "APT",
+    "mode_id": 44,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": null,
+    "norad_cat_id": 44387,
+    "status": "inactive",
+    "updated": "2020-02-06T11:54:29.012869Z",
+    "citation": "http://happysat.nl/Meteor/html/Meteor_Status.html",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "6U5FTnY4mgCcxiPgauJhES",
+    "description": "APT S-E RHCP D 1.7KHz",
+    "alive": false,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 137850000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "APT",
+    "mode_id": 44,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": null,
+    "norad_cat_id": 44387,
+    "status": "inactive",
+    "updated": "2020-02-06T11:54:29.015719Z",
+    "citation": "http://happysat.nl/Meteor/html/Meteor_Status.html",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "RYyEQYkVvjMF7v2F8XVang",
+    "description": "LRPT S-E RHCP D 72 kbps",
+    "alive": false,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 137900000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "LRPT",
+    "mode_id": 53,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": null,
+    "norad_cat_id": 44387,
+    "status": "inactive",
+    "updated": "2020-02-06T11:54:29.016992Z",
+    "citation": "http://happysat.nl/Meteor/html/Meteor_Status.html",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "bLyAgpua2DYBYAtCnfoZhF",
+    "description": "LRPT S-E RHCP D 80 kbps",
+    "alive": false,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 137912500,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "LRPT",
+    "mode_id": 53,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": null,
+    "norad_cat_id": 44387,
+    "status": "inactive",
+    "updated": "2020-02-06T11:54:29.018118Z",
+    "citation": "http://happysat.nl/Meteor/html/Meteor_Status.html",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "ryTGEsXHnbooULBhXQzyLE",
+    "description": "Mode U GMSK9k6",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 435040000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "GMSK",
+    "mode_id": 63,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 9600,
+    "norad_cat_id": 45113,
+    "status": "active",
+    "updated": "2020-02-10T17:47:42.693250Z",
+    "citation": "http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=685",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "6TkEnvAocbh49QpAesK5a2",
+    "description": "Mode S GPSK 3-5Mbps",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 2426000000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "QPSK",
+    "mode_id": 69,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": null,
+    "norad_cat_id": 45113,
+    "status": "active",
+    "updated": "2020-02-10T18:00:57.280954Z",
+    "citation": "http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=685",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "5WyN3hmgAeaNQxZMj745RU",
+    "description": "Mode U FSK1k2",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437465000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "FSK",
+    "mode_id": 72,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 1200,
+    "norad_cat_id": 99832,
+    "status": "active",
+    "updated": "2020-02-11T22:05:36.344173Z",
+    "citation": "http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=623",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "HYEptnddemghSLTTsKm3N5",
+    "description": "Data Downlink System (DDS)",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 2408000000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "QPSK",
+    "mode_id": 69,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 5000000,
+    "norad_cat_id": 42831,
+    "status": "active",
+    "updated": "2020-02-12T15:01:42.839436Z",
+    "citation": "2.408 GHz is Amateur Service",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "d8DJwCk324vUxS5Cwdcota",
+    "description": "Mode U GMSK9k6 AX.25 TLM",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437350000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "GMSK",
+    "mode_id": 63,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 9600,
+    "norad_cat_id": 99827,
+    "status": "active",
+    "updated": "2020-02-12T15:16:30.310711Z",
+    "citation": "https://qarman.eu/index.php/amateur-radio and http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=349",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "QQPimx7fpnEatBWLKdsJKb",
+    "description": "Mode U GMSK19k2",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437425000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "GMSK",
+    "mode_id": 63,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 19200,
+    "norad_cat_id": 99830,
+    "status": "active",
+    "updated": "2020-02-12T18:56:24.748978Z",
+    "citation": "http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=551 and https://apps.fcc.gov/oetcf/els/reports/442_Print.cfm?mode=current&application_seq=88514&license_seq=89440",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "MwBGcd7pTZQjn7YSFTLj87",
+    "description": "Mode U GFSK9k6",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437300000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "GFSK",
+    "mode_id": 75,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 9600,
+    "norad_cat_id": 99833,
+    "status": "active",
+    "updated": "2020-02-12T20:03:21.690349Z",
+    "citation": "http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=661 and https://www.upaep.mx/aztechsat/missionoperations",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "YEzAzkVt7Pdh7zNacJND8E",
+    "description": "Mode S QPSK 2Mbps",
+    "alive": false,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 2402500000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "QPSK",
+    "mode_id": 69,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": null,
+    "norad_cat_id": 99828,
+    "status": "invalid",
+    "updated": "2020-02-13T00:32:47.244833Z",
+    "citation": "https://community.libre.space/t/iss-cubesat-deployment-2020-02-17-phoenix-qarman-radsat-u-argus-2-aztechsat-1/5459/8",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "VhnAwGrcYHecHnhmpz6ZA8",
+    "description": "Mode U GMSK9k6 AX.25 TLM",
+    "alive": true,
+    "type": "Transceiver",
+    "uplink_low": 437350000,
+    "uplink_high": null,
+    "uplink_drift": 0,
+    "downlink_low": 437350000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "GMSK",
+    "mode_id": 63,
+    "uplink_mode": "GMSK",
+    "invert": false,
+    "baud": 9600,
+    "norad_cat_id": 99828,
+    "status": "active",
+    "updated": "2020-02-13T00:32:47.246979Z",
+    "citation": "http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=594",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "vx3Eu5TL8mPfVvLQakjDzc",
+    "description": "Unknown signal",
+    "alive": false,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 145957000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "FM",
+    "mode_id": 1,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": null,
+    "norad_cat_id": 41557,
+    "status": "invalid",
+    "updated": "2020-02-15T07:51:40.330669Z",
+    "citation": "https://amsat-uk.org/2016/05/17/nusat-1-ssb-cubesat/",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "P3bU8XcEbeaYMEA5SC9is9",
+    "description": "Mode U/V Linear",
+    "alive": true,
+    "type": "Transponder",
+    "uplink_low": 436935000,
+    "uplink_high": 436965000,
+    "uplink_drift": null,
+    "downlink_low": 145935000,
+    "downlink_high": 145965000,
+    "downlink_drift": null,
+    "mode": "USB",
+    "mode_id": 9,
+    "uplink_mode": "LSB",
+    "invert": true,
+    "baud": null,
+    "norad_cat_id": 41557,
+    "status": "active",
+    "updated": "2020-02-15T07:51:40.332402Z",
+    "citation": "https://amsat-uk.org/2016/05/17/nusat-1-ssb-cubesat/",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "JvZyP4BkTz7azt5JRqoXxF",
+    "description": "Mode U TLM FSK 40k",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 436445000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "FSK",
+    "mode_id": 72,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 40000,
+    "norad_cat_id": 41557,
+    "status": "active",
+    "updated": "2020-02-15T07:51:40.333392Z",
+    "citation": "https://destevez.net/2016/06/trying-to-decode-data-from-nusat/",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "vbwB8JMQHhZSDrMH5TGYBK",
+    "description": "Mode U TLM FSK 40k",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437445000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "FSK",
+    "mode_id": 72,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 40000,
+    "norad_cat_id": 41558,
+    "status": "active",
+    "updated": "2020-02-17T16:07:08.095869Z",
+    "citation": "https://destevez.net/2016/06/trying-to-decode-data-from-nusat/",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "8ugpLNzAj7oXw4AToDGeCW",
+    "description": "9k6 FSK TLM",
+    "alive": false,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437305000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "FSK",
+    "mode_id": 72,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 9600,
+    "norad_cat_id": 39407,
+    "status": "inactive",
+    "updated": "2020-02-17T19:37:45.298826Z",
+    "citation": "https://dk3wn.info/blog/satelliten/vermont-lunar/ and http://www.ne.jp/asahi/hamradio/je9pel/minotaur.htm",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "D7iEeEbjNj49tusqHgpL4g",
+    "description": "9k6 FSK TLM",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437385000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "FSK",
+    "mode_id": 72,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 9600,
+    "norad_cat_id": 39446,
+    "status": "active",
+    "updated": "2020-02-17T19:43:17.296894Z",
+    "citation": "http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=134",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "uGkkYgeaLDPKLTWHsPB8zY",
+    "description": "9k6 FSK TLM",
+    "alive": false,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 145980000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "GFSK",
+    "mode_id": 75,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 9600,
+    "norad_cat_id": 40897,
+    "status": "inactive",
+    "updated": "2020-02-17T19:51:18.812169Z",
+    "citation": "https://web.archive.org/web/20180517012129/http://www.aerospace.unb.br/serpens_radioamateurs",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "X9Xu5Zcwr79Yu9v86PfCWX",
+    "description": "9k6 FSK TLM",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437675000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "FSK",
+    "mode_id": 72,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 9600,
+    "norad_cat_id": 40042,
+    "status": "active",
+    "updated": "2020-02-17T19:57:36.396310Z",
+    "citation": "https://polyitan-1.blogspot.com/2014/06/19-2014-19.html",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "6QrKoGhVmVAVnsw8SsdQgG",
+    "description": "Telemetry",
+    "alive": false,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 436250000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "FSK",
+    "mode_id": 72,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 9600,
+    "norad_cat_id": 41313,
+    "status": "inactive",
+    "updated": "2020-02-17T20:12:50.954367Z",
+    "citation": "http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=380",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "Dvhbn7HJzGo5hEFJ2kEiFd",
+    "description": "TLM",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437650000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "CW",
+    "mode_id": 6,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 25,
+    "norad_cat_id": 40958,
+    "status": "active",
+    "updated": "2020-02-17T20:20:18.762856Z",
+    "citation": "http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=438 and https://www.nasaspaceflight.com/2015/10/china-launches-jilin-1-mission-long-march-2d/",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "rLMH4E6ueaCTs37sKD86FU",
+    "description": "TLM",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437650000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "MSK",
+    "mode_id": 81,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 4800,
+    "norad_cat_id": 40958,
+    "status": "active",
+    "updated": "2020-02-17T20:20:18.763598Z",
+    "citation": "http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=438 and https://www.nasaspaceflight.com/2015/10/china-launches-jilin-1-mission-long-march-2d/",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "aBHGFxMopeCscUYRyiYdXC",
+    "description": "PE0SAT - CW Beacon",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 436848700,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "CW",
+    "mode_id": 6,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 50,
+    "norad_cat_id": 27848,
+    "status": "active",
+    "updated": "2020-02-17T20:25:03.993658Z",
+    "citation": "https://www.pe0sat.vgnet.nl/satellite/cube-nano-picosats/co-57/",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "2uGo77ULzByLLyshanpctH",
+    "description": "Mode U AFSK TLM",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437490000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 1200,
+    "norad_cat_id": 27848,
+    "status": "active",
+    "updated": "2020-02-17T20:25:03.994899Z",
+    "citation": "https://www.pe0sat.vgnet.nl/satellite/cube-nano-picosats/co-57/",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "MqmQZv4wGRtxxfCFUGT5rh",
+    "description": "Mode U FM 9600",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437425000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "GMSK",
+    "mode_id": 63,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 9600,
+    "norad_cat_id": 33493,
+    "status": "active",
+    "updated": "2020-02-17T20:33:35.461765Z",
+    "citation": "http://www.dk3wn.info/sat/afu/sat_prism.shtml",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "RP8r4va9hjC7sADMafUEFM",
+    "description": "Mode U FM 1200",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437425000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 1200,
+    "norad_cat_id": 33493,
+    "status": "active",
+    "updated": "2020-02-17T20:33:35.462976Z",
+    "citation": "http://www.dk3wn.info/sat/afu/sat_prism.shtml",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "xVq7syPGptNE56YpFTAgGh",
+    "description": "Mode V/U BBS AFSK",
+    "alive": false,
+    "type": "Transceiver",
+    "uplink_low": 145825000,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 435675000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": "AFSK",
+    "invert": false,
+    "baud": 1200,
+    "norad_cat_id": 36122,
+    "status": "inactive",
+    "updated": "2020-02-17T20:41:45.634289Z",
+    "citation": "http://www.dk3wn.info/sat/afu/sat_xw1.shtml",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "qFB67RqFJauwWgZCimDUPJ",
+    "description": "Mode L/U Digipeater",
+    "alive": true,
+    "type": "Transceiver",
+    "uplink_low": 1267600000,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437475000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "GMSK",
+    "mode_id": 63,
+    "uplink_mode": "GMSK",
+    "invert": false,
+    "baud": 9600,
+    "norad_cat_id": 32785,
+    "status": "active",
+    "updated": "2020-02-17T20:45:27.344794Z",
+    "citation": "http://lss.mes.titech.ac.jp/ssp/cute1.7/amateur_service_e.html",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "9NWcFmJGg2MpuTLqhd3weM",
+    "description": "AX25 Transponder",
+    "alive": false,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437435000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "FSK",
+    "mode_id": 72,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 9600,
+    "norad_cat_id": 40661,
+    "status": "inactive",
+    "updated": "2020-02-18T10:34:10.658758Z",
+    "citation": "https://dk3wn.info/blog/satelliten/lightsail-1/",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "f5ZSbAccAwz7NBPF9LWPp9",
+    "description": "PSK",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 435265000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "PSK",
+    "mode_id": 74,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 4800,
+    "norad_cat_id": 39492,
+    "status": "active",
+    "updated": "2020-02-18T11:27:27.965383Z",
+    "citation": "http://www.dk3wn.info/p/?p=40486 and https://twitter.com/dk3wn/status/1056977144885194752",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "MjcioVaW5TEKRuBzth3Yuc",
+    "description": "S-Band downlink",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 2401835000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "MSK",
+    "mode_id": 81,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 1200,
+    "norad_cat_id": 40030,
+    "status": "active",
+    "updated": "2020-02-18T11:42:31.682177Z",
+    "citation": "https://directory.eoportal.org/web/eoportal/satellite-missions/d/dtusat-2 and http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=87",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "iP2FA2BQQXrhfEQVcqsBsh",
+    "description": "Mode U OQPSK",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 468000000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "OQPSK",
+    "mode_id": 76,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 3000000,
+    "norad_cat_id": 99835,
+    "status": "active",
+    "updated": "2020-02-18T20:04:39.624031Z",
+    "citation": "Baud rate: https://fcc.report/ELS/Atmospheric-Space-Technology-Research-Associates-ASTRA-LLC/0084-EX-CM-2019 and Mode: L-3 Cadet U - https://pdfs.semanticscholar.org/6541/cf4a6348fdc5af51781a9c1c9b5c67ade65f.pdf",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "6nAkL7DxdHTaZokhbmB4yL",
+    "description": "Mode U QPSK",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 468000000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "QPSK",
+    "mode_id": 69,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 3000000,
+    "norad_cat_id": 99834,
+    "status": "active",
+    "updated": "2020-02-18T20:04:39.625836Z",
+    "citation": "https://pdfs.semanticscholar.org/8a2b/345622ec2a685368b751a77c02d22fbbf8c6.pdf and https://community.libre.space/t/iss-cubesat-deployment-2020-02-17-phoenix-qarman-radsat-u-argus-2-aztechsat-1/5459/11",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "L4KUA9yyq84RqqRCN4jEbh",
+    "description": "Mode U GFSK9k6 TLM",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437290000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "GFSK",
+    "mode_id": 75,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 9600,
+    "norad_cat_id": 99831,
+    "status": "active",
+    "updated": "2020-02-20T18:59:33.805484Z",
+    "citation": "https://www.sluspacelab.com/argus-02",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "fhX9L7xAX9YtWaks6KqgGV",
+    "description": "GMSK9k6 TLM",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437500000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "GMSK",
+    "mode_id": 63,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 9600,
+    "norad_cat_id": 44030,
+    "status": "active",
+    "updated": "2020-02-23T14:26:49.330139Z",
+    "citation": "https://community.libre.space/t/observation-1741980-delphini-1-44030-transmits-9k6-gmsk-not-4k8-gmsk/5557",
+    "service": "Unknown"
+  },
+  {
+    "uuid": "ELP9Su62eJfAqAW9mZF8AP",
+    "description": "Mode U -AFSK 1200",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437275000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "AFSK",
+    "mode_id": 49,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 1200,
+    "norad_cat_id": 32787,
+    "status": "active",
+    "updated": "2020-02-26T01:10:11.281157Z",
+    "citation": "http://www.raumfahrt.fh-aachen.de/compass-1/hams.htm",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "xQNDYwowcibFWgTv6JYC9C",
+    "description": "Mode U - MSK2k4 AX.25",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437275000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "MSK",
+    "mode_id": 81,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 2400,
+    "norad_cat_id": 32787,
+    "status": "active",
+    "updated": "2020-02-26T01:10:11.282925Z",
+    "citation": "http://www.raumfahrt.fh-aachen.de/compass-1/hams.htm",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "PAC8zDxWrXUfWVDDiGyviP",
+    "description": "Mode U - MSK4k8 AX.25",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437275000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "MSK",
+    "mode_id": 81,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 4800,
+    "norad_cat_id": 32787,
+    "status": "active",
+    "updated": "2020-02-26T01:10:11.284176Z",
+    "citation": "http://www.raumfahrt.fh-aachen.de/compass-1/hams.htm",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "HpSxsgvwkKvUcbtzWXKTVJ",
+    "description": "Beacon",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437275000,
+    "downlink_high": null,
+    "downlink_drift": null,
+    "mode": "CW",
+    "mode_id": 6,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 15,
+    "norad_cat_id": 32787,
+    "status": "active",
+    "updated": "2020-02-26T01:10:11.284978Z",
+    "citation": "https://directory.eoportal.org/web/eoportal/satellite-missions/c-missions/compass-1",
+    "service": "Amateur"
+  },
+  {
+    "uuid": "LkiAaYdVcdFLF79mwfZqn4",
+    "description": "Mode U GMSK9k6 AX.25 TLM",
+    "alive": true,
+    "type": "Transmitter",
+    "uplink_low": null,
+    "uplink_high": null,
+    "uplink_drift": null,
+    "downlink_low": 437425000,
+    "downlink_high": null,
+    "downlink_drift": 0,
+    "mode": "GMSK",
+    "mode_id": 63,
+    "uplink_mode": null,
+    "invert": false,
+    "baud": 9600,
+    "norad_cat_id": 43553,
+    "status": "active",
+    "updated": "2020-02-27T02:08:30.131275Z",
+    "citation": "https://network.satnogs.org/observations/1406562/ - fixing wrong frequency",
+    "service": "Unknown"
    }
  ]
diff --git a/do-updates.sh b/do-updates.sh

index 2ac4a0240b21f0d27682c60201f45b9a2474c187..1893018ed150a89d8f40f69ef7ebdb491e9702fd 100755 (executable)
--- a/do-updates.sh
+++ b/do-updates.sh
@@ -5,7 +5,11 @@
  cd ~/ed/scheduling-bazaar
  cd data
  
+echo "*** Fetching database items"
  ../python-files/get-db.sh
+
+echo
+echo "*** Getting observations"
  ../python-files/get-observations.py
  
  exit
diff --git a/observations.json.gz b/observations.json.gz

index 7ca94111f3d965eb097c70afb2ca2f817a30b1c8..931871647ab7c00562a0b8fb32d3acdc77d67f97 100644 (file)

Binary files a/observations.json.gz and b/observations.json.gz differ
author	Dan White <dan@whiteaudio.com>
	Fri, 28 Feb 2020 13:54:52 +0000 (07:54 -0600)
committer	Dan White <dan@whiteaudio.com>
	Fri, 28 Feb 2020 13:54:52 +0000 (07:54 -0600)
db-modes.json		patch \| blob \| history
db-satellites.json		patch \| blob \| history
db-transmitters.json		patch \| blob \| history
do-updates.sh		patch \| blob \| history
observations.json.gz		patch \| blob \| history