updated to JPM, JDK ver 11

got this to work with OpenHAB

Author: aploese

.gitignore

@@ -15,3 +15,4 @@ nb-configuration.xml
 nbactions.xml
 .idea
 
+/de.ibapl.fhz4j.parser.cul/nbproject/

de.ibapl.fhz4j.console/src/main/java/de/ibapl/fhz4j/console/Main.java

@@ -48,11 +48,9 @@
 import org.apache.commons.cli.DefaultParser;
 
 import de.ibapl.fhz4j.api.Adapter;
-import de.ibapl.fhz4j.api.FhzAdapter;
-import de.ibapl.fhz4j.api.FhzDataListener;
 import de.ibapl.fhz4j.api.Protocol;
 import de.ibapl.fhz4j.cul.CulAdapter;
-import de.ibapl.fhz4j.parser.cul.CulMessage;
+import de.ibapl.fhz4j.cul.CulMessage;
 import de.ibapl.fhz4j.protocol.em.EmMessage;
 import de.ibapl.fhz4j.protocol.evohome.EvoHomeMessage;
 import de.ibapl.fhz4j.protocol.fht.FhtMessage;
@@ -64,35 +62,38 @@
 import de.ibapl.spsw.logging.LoggingSerialPortSocket;
 import de.ibapl.spsw.logging.TimeStampLogging;
 import de.ibapl.spsw.ser2net.Ser2NetProvider;
+import de.ibapl.fhz4j.api.FhzHandler;
+import de.ibapl.fhz4j.cul.CulMessageListener;
 
 /**
  * DOCUMENT ME!
  *
  * @author Arne Plöse
  */
 public class Main {
-	public final static String FHZ_CONSOLE = "fhz-console";
+
+    public final static String FHZ_CONSOLE = "fhz-console";
 
     private static final Logger LOG = Logger.getLogger(FHZ_CONSOLE);
 
-    private class FhzListener implements FhzDataListener {
-        
-        FhzAdapter fhzAdapter;
+    private class FhzListener implements CulMessageListener {
+
+        FhzHandler fhzAdapter;
 
         @Override
         public void fhtDataParsed(FhtMessage fhtMessage) {
             printTimeStamp();
             System.out.println(fhtMessage.toString());
             //Just testing
             if (true) {
-            	return;
+                return;
             }
-            
+
             if (DEVICES_HOME_CODE.add(fhtMessage.housecode)) {
                 try {
                     if (fhzAdapter != null) {
-                	fhzAdapter.writeFhtTimeAndDate(fhtMessage.housecode, LocalDateTime.now());
-                	fhzAdapter.initFhtReporting(fhtMessage.housecode);
+                        fhzAdapter.writeFhtTimeAndDate(fhtMessage.housecode, LocalDateTime.now());
+                        fhzAdapter.initFhtReporting(fhtMessage.housecode);
                     }
                 } catch (Throwable t) {
                     //no-op
@@ -148,17 +149,23 @@ public void failed(Throwable t) {
             }
         }
 
-		@Override
-		public void culMessageParsed(CulMessage culMessage) {
+        @Override
+        public void culMessageParsed(CulMessage culMessage) {
             printTimeStamp();
             System.err.println(": CUL " + culMessage);
-		}
+        }
 
-		@Override
-		public void evoHomeParsed(EvoHomeMessage evoHomeMsg) {
+        @Override
+        public void evoHomeParsed(EvoHomeMessage evoHomeMsg) {
             printTimeStamp();
             System.out.println(evoHomeMsg.toString());
-		}
+        }
+
+        @Override
+        public void signalStrength(float signalStrength) {
+            printTimeStamp();
+            System.out.append("Signal strength: ").println(signalStrength);
+        }
 
     }
 
@@ -192,17 +199,17 @@ public static void main(String[] args) throws FileNotFoundException, IOException
         optg.addOption(opt);
 
         options.addOptionGroup(optg);
-        
-        opt = new Option(null, "enable-fhz", false, "enable receive of fhz messages");
+
+        opt = new Option(null, "enable-fht", false, "enable receive of fht messages");
         options.addOption(opt);
 
         opt = new Option(null, "enable-evo-home", false, "enable receive of evo home messages");
         options.addOption(opt);
 
-       opt = new Option("s", "scan", false, "scan for serial ports");
- 
+        opt = new Option("s", "scan", false, "scan for serial ports");
+
         options.addOption(opt);
- 
+
         opt = null;
         optg = null;
 
@@ -217,25 +224,24 @@ public static void main(String[] args) throws FileNotFoundException, IOException
             return;
         }
 
-        if (cmd.hasOption("help")  || args.length == 0) {
+        if (cmd.hasOption("help") || args.length == 0) {
             printHelp(options);
 
             return;
         }
         ServiceLoader<SerialPortSocketFactory> sl = ServiceLoader.load(SerialPortSocketFactory.class);
         Iterator<SerialPortSocketFactory> i = sl.iterator();
         if (!i.hasNext()) {
-        	throw new RuntimeException("No provider for SerialPortSocketFactory found, pleas add one to you class path ");
+            throw new RuntimeException("No provider for SerialPortSocketFactory found, pleas add one to you class path ");
         }
         final SerialPortSocketFactory serialPortSocketFactory = i.next();
 
-        
         if (cmd.hasOption("scan")) {
             System.out.println("Java Properties:");
             System.getProperties().forEach((Object key, Object value) -> {
                 System.out.printf("\t\"%s\" = \"%s\"\n", key, value);
             });
-            
+
             final List<String> ports = serialPortSocketFactory.getPortNames(false);
             System.out.println("Serial ports available");
             for (String port : ports) {
@@ -246,15 +252,15 @@ public static void main(String[] args) throws FileNotFoundException, IOException
         }
 
         Set<Protocol> protocols = EnumSet.noneOf(Protocol.class);
-        if (cmd.hasOption("enable-fhz")) {
-        	protocols.add(Protocol.FHZ);
+        if (cmd.hasOption("enable-fht")) {
+            protocols.add(Protocol.FHT);
         }
-        
+
         if (cmd.hasOption("enable-evo-home")) {
-        	protocols.add(Protocol.EVO_HOME);
+            protocols.add(Protocol.EVO_HOME);
         }
-        
-    	final File logFile= File.createTempFile("cul_", ".txt", Paths.get(".").toFile());
+
+        final File logFile = File.createTempFile("cul_", ".txt", Paths.get(".").toFile());
 
         if (cmd.hasOption("ser2net")) {
             new Main().runSer2Net(cmd.getOptionValue("ser2net"), protocols, logFile);
@@ -263,19 +269,19 @@ public static void main(String[] args) throws FileNotFoundException, IOException
         if (cmd.hasOption("port")) {
             new Main().runLocalPort(cmd.getOptionValue("port"), protocols, logFile);
         }
-        
+
     }
 
     private final Set<Short> DEVICES_HOME_CODE = new HashSet<>();
 
     public void runSer2Net(String ser2net, Set<Protocol> protocols, File logFile) {
         try {
             LOG.info("LOG File: " + logFile.getAbsolutePath());
-            String[] split = ser2net.split(":"); 
+            String[] split = ser2net.split(":");
             SerialPortSocket serialPort = LoggingSerialPortSocket.wrapWithAsciiOutputStream(new Ser2NetProvider(split[0], Integer.valueOf(split[1])), new FileOutputStream(logFile), false, TimeStampLogging.NONE);
             run(serialPort, protocols);
         } catch (Exception ex) {
-            throw  new RuntimeException(ex);
+            throw new RuntimeException(ex);
         }
     }
 
@@ -284,71 +290,73 @@ public void runLocalPort(String port, Set<Protocol> protocols, File logFile) {
             ServiceLoader<SerialPortSocketFactory> sl = ServiceLoader.load(SerialPortSocketFactory.class);
             Iterator<SerialPortSocketFactory> i = sl.iterator();
             if (!i.hasNext()) {
-            	throw new RuntimeException("No provider for SerialPortSocketFactory found, pleas add one to you class path ");
+                throw new RuntimeException("No provider for SerialPortSocketFactory found, pleas add one to you class path ");
             }
             final SerialPortSocketFactory serialPortSocketFactory = i.next();
 
             LOG.info("LOG File: " + logFile.getAbsolutePath());
             SerialPortSocket serialPort = LoggingSerialPortSocket.wrapWithAsciiOutputStream(serialPortSocketFactory.createSerialPortSocket(port), new FileOutputStream(logFile), false, TimeStampLogging.UTC);
             run(serialPort, protocols);
         } catch (Exception ex) {
-            throw  new RuntimeException(ex);
+            throw new RuntimeException(ex);
         }
     }
-    
+
     public void run(SerialPortSocket serialPortSocket, Set<Protocol> protocols) throws Exception {
         final FhzListener listener = new FhzListener();
-        try (CulAdapter culAddapter = (CulAdapter)FhzAdapter.open(serialPortSocket, listener)) {
+        try ( CulAdapter culAddapter = new CulAdapter(serialPortSocket, listener)) {
+            culAddapter.open();
             listener.fhzAdapter = culAddapter;
-        try {
             try {
-                Thread.sleep(100);
-            } catch (InterruptedException ex) {
-                LOG.log(Level.SEVERE, null, ex);
-            }
-            if (protocols.contains(Protocol.FHZ)) {
-            	culAddapter.initFhz((short) 0001);
-            culAddapter.initFhtReporting((short)302);
+                try {
+                    Thread.sleep(100);
+                } catch (InterruptedException ex) {
+                    LOG.log(Level.SEVERE, null, ex);
+                }
+                if (protocols.contains(Protocol.FHT)) {
+                    culAddapter.initFhz((short) 0001);
+                    culAddapter.initFhtReporting((short) 302);
 //            fhzAddapter.writeFhtTimeAndDate((short) 302, LocalDateTime.now());
 //            fhzAddapter.writeFhtCycle((short) 302, DayOfWeek.MONDAY, LocalTime.of(5, 0), LocalTime.of(8, 30), null, null);
 //            fhzAddapter.writeFht((short)302, FhtProperty.DESIRED_TEMP, 24.0f);
 //            fhzAddapter.writeFhtModeManu((short)302);
 //            fhzAddapter.writeFhtModeHoliday((short) 302, 16.0f, LocalDate.now().plusMonths(2).plusDays(4));
+                }
+                if (protocols.contains(Protocol.EVO_HOME)) {
+                    culAddapter.initEvoHome();
+                }
+
+            } catch (IOException ex) {
+                LOG.log(Level.SEVERE, ex.getMessage(), ex);
+                throw new RuntimeException("Can't init fhzAdapter" + ex);
             }
-            if (protocols.contains(Protocol.EVO_HOME)) {
-            	culAddapter.initEvoHome();
-            }
+            try {
+                char c;
+                do {
+                    c = (char) System.in.read();
+
+                    switch (c) {
+                        case 'q':
+                            System.out.print("Bye will close down!");
+                            break;
+                        case 'r':
+                            culAddapter.initFhtReporting(DEVICES_HOME_CODE);
+                            break;
+                        default:
+                    }
+                } while (c != 'q');
 
-        } catch (IOException ex) {
-            LOG.log(Level.SEVERE, ex.getMessage(), ex);
-            throw new RuntimeException("Can't init fhzAdapter" + ex);
-        }
-        try {
-            char c;
-            do {
-                c = (char) System.in.read();
-
-                switch (c) {
-                    case 'q':
-                        System.out.print("Bye will close down!");
-                        break;
-                    case 'r':
-                    	culAddapter.initFhtReporting(DEVICES_HOME_CODE);
-                        break;
-                    default:
-                }
-            } while (c != 'q');
+            } catch (IOException ex) {
+                LOG.log(Level.SEVERE, null, ex);
+            }
+            System.out.println("CLOSE");
 
-        } catch (IOException ex) {
-            LOG.log(Level.SEVERE, null, ex);
         }
-        System.out.println("CLOSE");
-
-    }
     }
+
     private static void printHelp(Options opts) {
         HelpFormatter formatter = new HelpFormatter();
         formatter.setWidth(300);
-        formatter.printHelp("openv4j-memory-image", opts);
+        formatter.printHelp("java -jar fhz4j-console-{VERSION}-jar-with-dependencies.jar ", opts);
     }
 }

de.ibapl.fhz4j.parser.cul/bnd.bnd

@@ -1,9 +1,9 @@
 Export-Package: \
  de.ibapl.fhz4j.api,\
+ de.ibapl.fhz4j.cul,\
  de.ibapl.fhz4j.parser.api,\
- de.ibapl.fhz4j.parser.cul,\
- de.ibapl.fhz4j.writer.cul,\
  de.ibapl.fhz4j.protocol.em,\
+ de.ibapl.fhz4j.protocol.evohome,\
  de.ibapl.fhz4j.protocol.fht,\
  de.ibapl.fhz4j.protocol.fs20,\
  de.ibapl.fhz4j.protocol.hms,\

de.ibapl.fhz4j.parser.cul/pom.xml

@@ -21,10 +21,6 @@
             <groupId>de.ibapl.spsw</groupId>
             <artifactId>de.ibapl.spsw.api</artifactId>
         </dependency>
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.dto</artifactId>
-            </dependency>
 			<dependency>
 				<groupId>org.junit.jupiter</groupId>
 				<artifactId>junit-jupiter-api</artifactId>

de.ibapl.fhz4j.parser.cul/src/main/java/de/ibapl/fhz4j/api/EvoHomeAdapter.java de.ibapl.fhz4j.parser.cul/src/main/java/de/ibapl/fhz4j/api/EvoHomeHandler.java

@@ -23,7 +23,7 @@
 
 import java.io.IOException;
 
-public interface EvoHomeAdapter extends Adapter {
+public interface EvoHomeHandler extends Adapter {
 
 	void initEvoHome() throws IOException;