From 55b0a62ca9b01589ac27e9edec569bedb502e895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Corn=C3=A9=20Lukken?= <lukken@astron.nl>
Date: Wed, 21 Aug 2024 13:36:11 +0000
Subject: [PATCH] Resolve L2SS-1977

---
 CDB/stations/cs032.json     | 8 ++++----
 README.md                   | 1 +
 tangostationcontrol/VERSION | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CDB/stations/cs032.json b/CDB/stations/cs032.json
index 4e8c3564a..1205912f1 100644
--- a/CDB/stations/cs032.json
+++ b/CDB/stations/cs032.json
@@ -101,10 +101,10 @@
                 "10.168.162.2"
               ],
               "FPGA_beamlet_output_multiple_hdr_udp_destination_port_RW_default_shorthand": [
-                "10320",
-                "10321",
-                "10322",
-                "10323"
+                "10300",
+                "10301",
+                "10302",
+                "10303"
               ]
             }
           },
diff --git a/README.md b/README.md
index eca5cbcc9..cebdac40e 100644
--- a/README.md
+++ b/README.md
@@ -162,6 +162,7 @@ Next change the version in the following places:
 
 # Release Notes
 
+* 0.42.0 Change CS032 port mappings to prevent beamlet overlap
 * 0.41.1 Reduce log size for value changes and metadata publications drastically
 * 0.41.0 Export `FPGA_jesd204b_rx_err0_R` and `FPGA_jesd204b_rx_err1_R` SDP monitoring data to prometheus
 * 0.40.2 Add `ds_debug_pycharm` command to debug device servers during integration tests
diff --git a/tangostationcontrol/VERSION b/tangostationcontrol/VERSION
index 9ed317fb4..787ffc30a 100644
--- a/tangostationcontrol/VERSION
+++ b/tangostationcontrol/VERSION
@@ -1 +1 @@
-0.41.1
+0.42.0
-- 
GitLab