diff --git a/flake.lock b/flake.lock index da2a033..1e3a0c3 100644 --- a/flake.lock +++ b/flake.lock @@ -323,29 +323,6 @@ "type": "github" } }, - "gnuradio-decoder": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "utils": [ - "flake-utils" - ] - }, - "locked": { - "lastModified": 1714253000, - "narHash": "sha256-3c81gxWOt80yOkwvHLjFdZgpKW3HEikPXUliFlfEXTM=", - "owner": "tlm-solutions", - "repo": "gnuradio-decoder", - "rev": "4b012adec883477b19a88d272fd7e7a7900f275a", - "type": "github" - }, - "original": { - "owner": "tlm-solutions", - "repo": "gnuradio-decoder", - "type": "github" - } - }, "json-structs": { "flake": false, "locked": { @@ -691,6 +668,29 @@ "type": "github" } }, + "r09-receiver": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "utils": [ + "flake-utils" + ] + }, + "locked": { + "lastModified": 1716150413, + "narHash": "sha256-wQ/0tqG6bcJ4LCqEJDSc3Bv2X8SkJYlEoYoXqlvBle0=", + "owner": "tlm-solutions", + "repo": "r09-receiver", + "rev": "36a32b34978fe7a6fe50f3a8c73bab9beec334f1", + "type": "github" + }, + "original": { + "owner": "tlm-solutions", + "repo": "r09-receiver", + "type": "github" + } + }, "root": { "inputs": { "borzoi": "borzoi", @@ -700,13 +700,13 @@ "datacare": "datacare", "flake-utils": "flake-utils", "funnel": "funnel", - "gnuradio-decoder": "gnuradio-decoder", "kindergarten": "kindergarten", "lizard": "lizard", "microvm": "microvm", "naersk": "naersk_4", "nixpkgs": "nixpkgs_6", "private-flake-overlays": "private-flake-overlays", + "r09-receiver": "r09-receiver", "sops-nix": "sops-nix", "telegram-decoder": "telegram-decoder", "tlms-rs": "tlms-rs_2", diff --git a/flake.nix b/flake.nix index da00e0b..24c65f8 100644 --- a/flake.nix +++ b/flake.nix @@ -65,8 +65,8 @@ }; }; - gnuradio-decoder = { - url = "github:tlm-solutions/gnuradio-decoder"; + r09-receiver = { + url = "github:tlm-solutions/r09-receiver"; inputs.nixpkgs.follows = "nixpkgs"; inputs.utils.follows = "flake-utils"; }; @@ -119,7 +119,7 @@ , data-accumulator , datacare , funnel - , gnuradio-decoder + , r09-receiver , kindergarten , microvm , nixpkgs @@ -166,11 +166,11 @@ stop-box-modules = [ ./modules/TLMS telegram-decoder.nixosModules.default - gnuradio-decoder.nixosModules.default + r09-receiver.nixosModules.default { nixpkgs.overlays = [ telegram-decoder.overlays.default - gnuradio-decoder.overlays.default + r09-receiver.overlays.default ]; } ]; diff --git a/modules/traffic-stop-box/radio-config.nix b/modules/traffic-stop-box/radio-config.nix index 1176bcc..46fbd0f 100644 --- a/modules/traffic-stop-box/radio-config.nix +++ b/modules/traffic-stop-box/radio-config.nix @@ -1,8 +1,8 @@ { self, config, lib, registry, ... }: { - TLMS.gnuradio = { + TLMS.r09-receiver = { enable = true; - } // registry.gnuradio; + } // registry.r09-receiver; # find all the servers with data-accumulator configured TLMS.telegramDecoder = let diff --git a/registry/traffic-stop-box/default.nix b/registry/traffic-stop-box/default.nix index dfe320b..d734f5e 100644 --- a/registry/traffic-stop-box/default.nix +++ b/registry/traffic-stop-box/default.nix @@ -3,7 +3,7 @@ "0" = { wireguardPublicKey = "qyStvzZdoqcjJJQckw4ZwvsQUa+8TBWtnsRxURqanno="; hostName = "traffic-stop-box-0"; - gnuradio = { frequency = 170790000; offset = 20000; device = ""; RF = 0; IF = 0; BB = 32; }; # dresden - barkhausen + r09-receiver = { frequency = 170790000; offset = 20000; device = ""; RF = 0; IF = 0; BB = 32; }; # dresden - barkhausen wgAddr4 = "10.13.37.100"; arch = "x86_64-linux"; monitoring = true; @@ -14,7 +14,7 @@ "1" = { wireguardPublicKey = "dOPobdvfphx0EHmU7dd5ihslFzZi17XgRDQLMIUYa1w="; hostName = "traffic-stop-box-1"; - gnuradio = { frequency = 170790000; offset = 20000; device = ""; RF = 14; IF = 32; BB = 42; }; # dresden - zentralwerk + r09-receiver = { frequency = 170790000; offset = 20000; device = ""; RF = 14; IF = 32; BB = 42; }; # dresden - zentralwerk wgAddr4 = "10.13.37.101"; arch = "x86_64-linux"; monitoring = true; @@ -24,7 +24,7 @@ "2" = { wireguardPublicKey = "4TUQCToGNhjsCgV9elYE/91Vd/RvMgvMXtF/1Dzlvxo="; hostName = "traffic-stop-box-2"; - gnuradio = { frequency = 153850000; offset = 20000; device = ""; RF = 14; IF = 32; BB = 42; }; # chemnitz + r09-receiver = { frequency = 153850000; offset = 20000; device = ""; RF = 14; IF = 32; BB = 42; }; # chemnitz wgAddr4 = "10.13.37.102"; telegramDecoderConfig = ./config_2.json; publicWireguardEndpoint = null; @@ -32,7 +32,7 @@ "3" = { wireguardPublicKey = "w3AT3EahW1sCK8ZsR7sDTcQj1McXYeWx7fnfQFA7i3o="; hostName = "traffic-stop-box-3"; - gnuradio = { frequency = 170795000; offset = 19400; device = ""; RF = 14; IF = 32; BB = 42; }; # dresden unused + r09-receiver = { frequency = 170795000; offset = 19400; device = ""; RF = 14; IF = 32; BB = 42; }; # dresden unused wgAddr4 = "10.13.37.103"; telegramDecoderConfig = ./config_3.json; publicWireguardEndpoint = null; @@ -41,7 +41,7 @@ "4" = { wireguardPublicKey = "B0wPH0jUxaatRncHMkgDEQ+DzvlbTBrVJY4etxqQgG8="; hostName = "traffic-stop-box-4"; - gnuradio = { frequency = 170790000; offset = 20000; device = ""; RF = 14; IF = 32; BB = 42; }; # dresden Wundstr. 9 + r09-receiver = { frequency = 170790000; offset = 20000; device = ""; RF = 14; IF = 32; BB = 42; }; # dresden Wundstr. 9 wgAddr4 = "10.13.37.104"; arch = "x86_64-linux"; monitoring = true; @@ -52,7 +52,7 @@ "6" = { wireguardPublicKey = "NuLDNmxuHHzDXJSIOPSoihEhLWjARRtavuQvWirNR2I="; hostName = "traffic-stop-box-6"; - gnuradio = { frequency = 150827500; offset = 19550; device = ""; RF = 14; IF = 32; BB = 42; }; # warpzone münster + r09-receiver = { frequency = 150827500; offset = 19550; device = ""; RF = 14; IF = 32; BB = 42; }; # warpzone münster wgAddr4 = "10.13.37.106"; telegramDecoderConfig = ./config_6.json; publicWireguardEndpoint = null; @@ -60,7 +60,7 @@ "7" = { wireguardPublicKey = "sMsdY7dSjlYeIFMqjkh4pJ/ftAYXlyRuxDGbdnGLpEQ="; hostName = "traffic-stop-box-7"; - gnuradio = { frequency = 150827500; offset = 19550; device = ""; RF = 14; IF = 32; BB = 42; }; # drehturm aachen + r09-receiver = { frequency = 150827500; offset = 19550; device = ""; RF = 14; IF = 32; BB = 42; }; # drehturm aachen wgAddr4 = "10.13.37.107"; telegramDecoderConfig = ./config_7.json; publicWireguardEndpoint = null; @@ -69,7 +69,7 @@ "8" = { wireguardPublicKey = "dL9JGsBhaTOmXgGEH/N/GCHbQgVHEjBvIMaRtCsHBHw="; hostName = "traffic-stop-box-8"; - gnuradio = { frequency = 150890000; offset = 20000; device = ""; RF = 14; IF = 32; BB = 42; }; # Hannover Bredero Hochhaus City + r09-receiver = { frequency = 150890000; offset = 20000; device = ""; RF = 14; IF = 32; BB = 42; }; # Hannover Bredero Hochhaus City wgAddr4 = "10.13.37.108"; arch = "aarch64-linux"; monitoring = false; @@ -80,7 +80,7 @@ "9" = { wireguardPublicKey = "j2hGr2rVv7T9kJE15c2IFWjmk0dXuJPev2BXiHZUKk8="; hostName = "traffic-stop-box-9"; - gnuradio = { frequency = 152830000; offset = 20000; device = ""; RF = 14; IF = 32; BB = 42; }; # Hannover Bredero Hochaus Umland + r09-receiver = { frequency = 152830000; offset = 20000; device = ""; RF = 14; IF = 32; BB = 42; }; # Hannover Bredero Hochaus Umland wgAddr4 = "10.13.37.109"; arch = "aarch64-linux"; monitoring = false; @@ -90,7 +90,7 @@ "10" = { wireguardPublicKey = "dL9JGsBhaTOmXgGEH/N/GCHbQgVHEjBvIMaRtCsHBHw="; hostName = "traffic-stop-box-10"; - gnuradio = { frequency = 153850000; offset = 20000; device = ""; RF = 14; IF = 32; BB = 42; }; # CLT + r09-receiver = { frequency = 153850000; offset = 20000; device = ""; RF = 14; IF = 32; BB = 42; }; # CLT wgAddr4 = "10.13.37.110"; telegramDecoderConfig = ./config_10.json; publicWireguardEndpoint = null;