diff --git a/src/main/java/kst4contest/controller/ReadUDPbyUCXMessageThread.java b/src/main/java/kst4contest/controller/ReadUDPbyUCXMessageThread.java index 842eb84..0ead91f 100644 --- a/src/main/java/kst4contest/controller/ReadUDPbyUCXMessageThread.java +++ b/src/main/java/kst4contest/controller/ReadUDPbyUCXMessageThread.java @@ -348,78 +348,56 @@ public class ReadUDPbyUCXMessageThread extends Thread { Band workedBand = helper_resolveBandFromLoggerBand(band); switch (band) { - case "144": { + case "144": + case "2m": //minos contest logger + { workedCall.setWorked144(true); break; } - case "432": { - workedCall.setWorked432(true); - break; - } + case "432": + case "70cm": + { + workedCall.setWorked432(true); + break; + } - case "1240": { + case "1240": //ucxlog style + case "1296": //used for n1mm / Dxlog + case "23cm": //minos contest logger + { workedCall.setWorked1240(true); break; } - case "2300": { + case "2300": + case "13cm": + { workedCall.setWorked2300(true); break; } - case "3400": { + case "3400": + case "9cm": + { workedCall.setWorked3400(true); break; } - case "5600": { + case "5600": + case "6cm": + { workedCall.setWorked5600(true); break; } - case "10G": { + case "10G": + case "3cm": + { workedCall.setWorked10G(true); break; } - /** - * cases hotfix for MINOS logger, which tells band like "2m", not "144" - */ - case "2m": { - workedCall.setWorked144(true); - break; - } - - case "70cm": { - workedCall.setWorked432(true); - break; - } - - case "23cm": { - workedCall.setWorked1240(true); - break; - } - - case "13cm": { - workedCall.setWorked2300(true); - break; - } - - case "9cm": { - workedCall.setWorked3400(true); - break; - } - - case "6cm": { - workedCall.setWorked5600(true); - break; - } - - case "3cm": { - workedCall.setWorked10G(true); - break; - } default: System.out.println("[ReadUDPFromUCX, Error:] unexpected band value: \"" + band + "\""); diff --git a/udpReaderBackup.txt b/udpReaderBackup.txt index 983aeaa..57c97d3 100644 --- a/udpReaderBackup.txt +++ b/udpReaderBackup.txt @@ -2366,4 +2366,7 @@ OZ1FDH;Claus;JO55QX;StringProperty [value: null]; wkd true; wkd144 true; wkd432f OZ7KJ;Skive Club;JO46ML;StringProperty [value: 144.225]; wkd true; wkd144 true; wkd432false; wkd1240false; wkd2300false; wkd3400false; wkd5600false; wkd10Gfalse ; 2: 144/432 MHz SM7VUK;Bengt;JO66LI;StringProperty [value: 144.304]; wkd true; wkd144 true; wkd432false; wkd1240false; wkd2300false; wkd3400false; wkd5600false; wkd10Gfalse ; 2: 144/432 MHz OZ1HDF;Ken;JO55UN;StringProperty [value: null]; wkd true; wkd144 true; wkd432false; wkd1240false; wkd2300false; wkd3400false; wkd5600false; wkd10Gfalse ; 2: 144/432 MHz -DO5SA;unknown;unknown;StringProperty [value: null]; wkd true; wkd144 true; wkd432false; wkd1240false; wkd2300false; wkd3400false; wkd5600false; wkd10Gfalse ; null \ No newline at end of file +DO5SA;unknown;unknown;StringProperty [value: null]; wkd true; wkd144 true; wkd432false; wkd1240false; wkd2300false; wkd3400false; wkd5600false; wkd10Gfalse ; null +9A2HM;unknown;unknown;StringProperty [value: null]; wkd true; wkd144 false; wkd432false; wkd1240false; wkd2300false; wkd3400false; wkd5600false; wkd10Gfalse ; null +9A2HM;null;null;StringProperty [value: null]; wkd true; wkd144 false; wkd432true; wkd1240false; wkd2300false; wkd3400false; wkd5600false; wkd10Gfalse ; null +9A2HM;null;null;StringProperty [value: null]; wkd true; wkd144 false; wkd432false; wkd1240false; wkd2300true; wkd3400false; wkd5600false; wkd10Gfalse ; null \ No newline at end of file