More work on the new CommandStationDialog Sensor are updated

Author: fransjacobs

src/main/java/jcs/commandStation/GenericController.java

@@ -15,6 +15,8 @@
  */
 package jcs.commandStation;
 
+import java.util.List;
+import jcs.commandStation.entities.Device;
 import jcs.entities.CommandStationBean;
 import jcs.commandStation.entities.InfoBean;
 import jcs.commandStation.events.ConnectionEventListener;
@@ -39,6 +41,8 @@ public interface GenericController {
 
   InfoBean getCommandStationInfo();
 
+  List<Device> getDevices();
+
   String getIp();
 
 }

src/main/java/jcs/commandStation/dccex/DccExCommandStationImpl.java

@@ -16,6 +16,7 @@
 package jcs.commandStation.dccex;
 
 import java.awt.Image;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executors;
 import jcs.JCS;
@@ -26,6 +27,7 @@
 import jcs.commandStation.dccex.connection.DccExMessageListener;
 import jcs.commandStation.dccex.events.CabEvent;
 import jcs.commandStation.dccex.events.DccExMeasurementEvent;
+import jcs.commandStation.entities.Device;
 import jcs.commandStation.events.AccessoryEvent;
 import jcs.commandStation.events.AccessoryEventListener;
 import jcs.commandStation.events.ConnectionEvent;
@@ -57,7 +59,6 @@ public class DccExCommandStationImpl extends AbstractController implements Decod
   private boolean powerStatusSet = false;
 
   //Map<Integer, ChannelBean> measurementChannels;
-
   public DccExCommandStationImpl(CommandStationBean commandStationBean) {
     this(commandStationBean, false);
   }
@@ -96,7 +97,6 @@ public DccExCommandStationImpl(CommandStationBean commandStationBean, boolean au
 //      handleMeasurement(csrq);
 //    }
 //  }
-
   @Override
   public final boolean connect() {
     if (!connected) {
@@ -379,6 +379,12 @@ public InfoBean getCommandStationInfo() {
     return this.infoBean;
   }
 
+  @Override
+  public List<Device> getDevices() {
+    List<Device> devices = new ArrayList<>();
+    return devices;
+  }
+
   @Override
   public boolean isSupportTrackMeasurements() {
     return false; // true;
@@ -393,7 +399,6 @@ public boolean isSupportTrackMeasurements() {
 //    }
 //    return this.measurementChannels;
 //  }
-
   private void fireAllDisconnectionEventListeners(final ConnectionEvent disconnectionEvent) {
     for (ConnectionEventListener listener : this.connectionEventListeners) {
       listener.onConnectionChange(disconnectionEvent);
@@ -534,7 +539,6 @@ private void fireAllAccessoryEventListeners(final AccessoryEvent accessoryEvent)
 //      }
 //    }
 //  }
-
   private void handleInfoMessage(String message) {
     //executor.execute(() -> fireAllPowerEventListeners(powerEvent));
     Logger.trace("Info: " + message);
@@ -704,6 +708,9 @@ public static void main(String[] a) {
 //      ((DccExCommandStationImpl) cs).pause(500L);
 //      cs.power(true);
 //      Logger.trace("Power is: " + (cs.isPower() ? "On" : "Off"));
+    
+  
+
 /////
       //((DccExCommandStationImpl) cs).pause(500L);
 //      cs.changeFunctionValue(8, 0, true);

src/main/java/jcs/commandStation/entities/Device.java

@@ -0,0 +1,153 @@
+/*
+ * Copyright 2025 fransjacobs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jcs.commandStation.entities;
+
+import java.util.Objects;
+
+/**
+ * Command Station Device is an Object to be able to show the Devices that "live"<br>
+ * inside a Command Station. Examples <br>
+ * Marklin CS: <br>
+ * - GFP internal booster device - Link S88 external feedback device ESU-ECoS:<br>
+ * - Ecos device self / booster - Locomotive Manager - Accessories Manager - Feedback Manager
+ */
+public class Device {
+
+  private String id;
+  private String name;
+  private String hardwareVersion;
+  private String softwareVersion;
+  private String serialNumber;
+
+  private Integer size;
+  private Integer channels;
+  private boolean feedback;
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getHardwareVersion() {
+    return hardwareVersion;
+  }
+
+  public void setHardwareVersion(String hardwareVersion) {
+    this.hardwareVersion = hardwareVersion;
+  }
+
+  public String getSoftwareVersion() {
+    return softwareVersion;
+  }
+
+  public void setSoftwareVersion(String softwareVersion) {
+    this.softwareVersion = softwareVersion;
+  }
+
+  public String getSerialNumber() {
+    return serialNumber;
+  }
+
+  public void setSerialNumber(String serialNumber) {
+    this.serialNumber = serialNumber;
+  }
+
+  public Integer getSize() {
+    return size;
+  }
+
+  public void setSize(Integer size) {
+    this.size = size;
+  }
+
+  public Integer getChannels() {
+    return channels;
+  }
+
+  public void setChannels(Integer channels) {
+    this.channels = channels;
+  }
+
+  public boolean isFeedback() {
+    return feedback;
+  }
+
+  public void setFeedback(boolean feedback) {
+    this.feedback = feedback;
+  }
+
+  @Override
+  public int hashCode() {
+    int hash = 3;
+    hash = 67 * hash + Objects.hashCode(this.id);
+    hash = 67 * hash + Objects.hashCode(this.name);
+    hash = 67 * hash + Objects.hashCode(this.hardwareVersion);
+    hash = 67 * hash + Objects.hashCode(this.softwareVersion);
+    hash = 67 * hash + Objects.hashCode(this.serialNumber);
+    hash = 67 * hash + Objects.hashCode(this.size);
+    hash = 67 * hash + Objects.hashCode(this.channels);
+    hash = 67 * hash + Objects.hashCode(this.feedback);
+    return hash;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (obj == null) {
+      return false;
+    }
+    if (getClass() != obj.getClass()) {
+      return false;
+    }
+    final Device other = (Device) obj;
+    if (!Objects.equals(this.id, other.id)) {
+      return false;
+    }
+    if (!Objects.equals(this.name, other.name)) {
+      return false;
+    }
+    if (!Objects.equals(this.hardwareVersion, other.hardwareVersion)) {
+      return false;
+    }
+    if (!Objects.equals(this.softwareVersion, other.softwareVersion)) {
+      return false;
+    }
+    if (!Objects.equals(this.serialNumber, other.serialNumber)) {
+      return false;
+    }
+    if (!Objects.equals(this.size, other.size)) {
+      return false;
+    }
+    if (!Objects.equals(this.feedback, other.feedback)) {
+      return false;
+    }
+    return Objects.equals(this.channels, other.channels);
+  }
+
+}

src/main/java/jcs/commandStation/esu/ecos/EsuEcosCommandStationImpl.java

@@ -51,6 +51,7 @@
 import jcs.commandStation.events.SensorEventListener;
 import jcs.commandStation.autopilot.DriveSimulator;
 import jcs.commandStation.VirtualConnection;
+import jcs.commandStation.entities.Device;
 import static jcs.entities.AccessoryBean.AccessoryValue.GREEN;
 import static jcs.entities.AccessoryBean.AccessoryValue.RED;
 import jcs.entities.LocomotiveBean;
@@ -272,14 +273,14 @@ public void disconnect() {
         Logger.trace("Stopping event handling...");
         eventMessageHandler.quit();
         eventMessageHandler.join();
-        
+
         eventMessageHandler = null;
       }
       if (connected) {
         connection.close();
         connected = false;
       }
-      
+
       EcosConnectionFactory.disconnectAll();
     } catch (Exception ex) {
       Logger.error(ex);
@@ -308,6 +309,40 @@ public InfoBean getCommandStationInfo() {
     return ib;
   }
 
+  @Override
+  public List<Device> getDevices() {
+    List<Device> devices = new ArrayList<>();
+    Device ecos = new Device();
+    ecos.setId(EcosManager.ID + "");
+    ecos.setName(ecosManager.getName());
+    ecos.setSerialNumber(ecosManager.getSerialNumber());
+    ecos.setHardwareVersion(ecosManager.getHardwareVersion());
+    ecos.setSoftwareVersion(ecosManager.getApplicationVersion());
+    devices.add(ecos);
+
+    Device locs = new Device();
+    locs.setId(LocomotiveManager.ID + "");
+    locs.setName("LocomotiveManager");
+    locs.setSize(locomotiveManager.getSize());
+    devices.add(locs);
+
+    Device acm = new Device();
+    acm.setId(AccessoryManager.ID + "");
+    acm.setName("AccessoryManager");
+    acm.setSize(accessoryManager.getSize());
+    devices.add(acm);
+
+    Device fbm = new Device();
+    fbm.setId(FeedbackManager.ID + "");
+    fbm.setName("FeedbackManager");
+    fbm.setSize(feedbackManager.getSize());
+    fbm.setChannels(feedbackManager.getModules().size());
+    fbm.setFeedback(true);
+    devices.add(fbm);
+
+    return devices;
+  }
+
   @Override
   public String getIp() {
     if (this.connection != null && this.connection.isConnected()) {

src/main/java/jcs/commandStation/esu/ecos/net/EcosVirtualConnection.java

@@ -47,6 +47,8 @@ class EcosVirtualConnection implements EcosConnection, VirtualConnection {
 
   private EcosMessageListener messageListener;
   private boolean debug = false;
+  
+  private static String ESU_ECOS_ID = "esu-ecos";
 
   EcosVirtualConnection(InetAddress address) {
     debug = System.getProperty("message.debug", "false").equalsIgnoreCase("true");
@@ -111,7 +113,7 @@ public synchronized EcosMessage sendMessage(EcosMessage message) {
       }
       case EcosMessageFactory.QUERY_LOCOMOTIVES -> {
         //Query the locomotives from the database
-        List<LocomotiveBean> locos = PersistenceFactory.getService().getLocomotives();
+        List<LocomotiveBean> locos = PersistenceFactory.getService().getLocomotivesByCommandStationId(ESU_ECOS_ID);
 
         for (LocomotiveBean loco : locos) {
           //name,addr,protocol

src/main/java/jcs/commandStation/hsis88/HSIImpl.java

@@ -15,6 +15,7 @@
  */
 package jcs.commandStation.hsis88;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -32,6 +33,7 @@
 import jcs.entities.FeedbackModuleBean;
 import jcs.commandStation.entities.InfoBean;
 import jcs.commandStation.VirtualConnection;
+import jcs.commandStation.entities.Device;
 import jcs.entities.SensorBean;
 import jcs.util.RunUtil;
 import org.tinylog.Logger;
@@ -124,7 +126,7 @@ public final synchronized boolean connect() {
 
           //DeviceBean d = new DeviceBean();
           String[] hsiinfo = info.split("/");
-         //d.setName(info);
+          //d.setName(info);
           //d.setUid("0");
 //          for (int i = 0; i < hsiinfo.length; i++) {
 //            switch (i) {
@@ -155,25 +157,15 @@ public final synchronized boolean connect() {
     return connected;
   }
 
-//  @Override
-//  public DeviceBean getDevice() {
-//    return this.mainDevice;
-//  }
-
-//  @Override
-//  public List<DeviceBean> getDevices() {
-//    return null;//this.devices.values().stream().collect(Collectors.toList());
-//  }
-
   @Override
   public InfoBean getCommandStationInfo() {
     return infoBean;
   }
 
-//  @Override
-//  public DeviceBean getFeedbackDevice() {
-//    return this.feedbackDevice;
-//  }
+  public List<Device> getDevices() {
+    List<Device> devices = new ArrayList<>();
+    return devices;
+  }
 
   @Override
   public List<FeedbackModuleBean> getFeedbackModules() {