Skip to content

Commit

Permalink
update the code to the new r09-receiver name
Browse files Browse the repository at this point in the history
  • Loading branch information
marenz2569 committed May 19, 2024
1 parent 6627449 commit 9ae2ca6
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 41 deletions.
48 changes: 24 additions & 24 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
Expand Down Expand Up @@ -119,7 +119,7 @@
, data-accumulator
, datacare
, funnel
, gnuradio-decoder
, r09-receiver
, kindergarten
, microvm
, nixpkgs
Expand Down Expand Up @@ -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
];
}
];
Expand Down
4 changes: 2 additions & 2 deletions modules/traffic-stop-box/radio-config.nix
Original file line number Diff line number Diff line change
@@ -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
Expand Down
20 changes: 10 additions & 10 deletions registry/traffic-stop-box/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -24,15 +24,15 @@
"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;
};
"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;
Expand All @@ -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;
Expand All @@ -52,15 +52,15 @@
"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;
};
"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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 9ae2ca6

Please sign in to comment.