Skip to content
Permalink
Browse files

MERG CBUS Command Station Monitor

Initial Upload
Displays and updates command station slots in a table form.
Listens to the network traffic to display loco id, speed, direction,
from JMRI throttles or MERG CANCABs.
Displays block value ( TD train describer ) if same as alt Td or loco id
  • Loading branch information...
icklesteve committed Oct 18, 2018
1 parent ecce6e7 commit 063d67fabde555c72e5c6dce0a302cd1fc3e13bc
@@ -0,0 +1,48 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">

<html lang="en">
<head>
<meta name="generator" content=
"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 15.17), see www.w3.org">

<title>JMRI: MERG CBUS Console Tool</title>
<meta name="author" content="Steve Young">
<meta name="keywords" content="JMRI MERG CBUS Command station slot monitor cancmd">
<!-- Style -->
<meta http-equiv="Content-Type" content=
"text/html; charset=us-ascii">
<link rel="stylesheet" type="text/css" href="/css/default.css"
media="screen">
<link rel="stylesheet" type="text/css" href="/css/print.css"
media="print">
<link rel="icon" href="/images/jmri.ico" type="image/png">
<link rel="home" title="Home" href="/"><!-- /Style -->
</head>

<body>
<!--#include virtual="/Header" -->

<div class="nomenu" id="mBody">
<div id="mainContent">
<h1>JMRI : MERG CBUS Command Station Monitor</h1>

<p>More info to follow.</p>
<p>Slot monitor for CBUS Command Stations</p>

<h3><a name="opc" id="opc">Supported Operation Codes</a></h3>


<h3>JMRI Help</h3>

<p>You can view this help page within JMRI by selecting Help > Window Help in the top bar of the MERG CBUS Command Station Monitor.</p>

<p><a href="../../../../../../../html/hardware/can/cbus/index.shtml">Main JMRI MERG CBUS Help page</a>.</p>



<!--#include virtual="/Footer" -->
</div><!-- closes #mainContent-->
</div><!-- closes #mBody-->
</body>
</html>
@@ -8,6 +8,7 @@ jmri.jmrix.can.cbus.swing.configtool.ConfigToolPane$Default = Open CBUS Event Ca
jmri.jmrix.can.cbus.swing.eventtable.CbusEventTablePane$Default = Open CBUS Event Table
jmri.jmrix.can.swing.send.CanSendPane$Default = Open CAN Frame Sender
jmri.jmrix.can.cbus.swing.nodeconfig.NodeConfigToolPane$Default = Open CBUS Node Config Tool
jmri.jmrix.can.cbus.swing.cbusslotmonitor.CbusSlotMonitorPane$Default = Open CBUS Command Station Monitor
jmri.jmrix.can.swing.monitor.MonitorPane$Default = Open CAN Monitor

# do not use this file for any regular text keys,
@@ -11,7 +11,7 @@ MenuItemEventCapture = Event Capture Tool
MenuItemEventTable = CBUS Event Table
MenuItemNodeConfig = Node Config Tool
MenuItemCBUS = CBUS

MenuItemCbusSlotMonitor = CBUS Command Station Monitor
CapConfigTitle = CBUS Event Capture Tool
NodeConfigTitle = CBUS Node Configuration Tool

@@ -37,7 +37,8 @@ public CbusMenu(CanSystemConnectionMemo memo) {
new Item("MenuItemSendFrame", "jmri.jmrix.can.swing.send.CanSendPane"),
new Item("MenuItemEventCapture", "jmri.jmrix.can.cbus.swing.configtool.ConfigToolPane"),
new Item("MenuItemEventTable", "jmri.jmrix.can.cbus.swing.eventtable.CbusEventTablePane"),
new Item("MenuItemNodeConfig", "jmri.jmrix.can.cbus.swing.nodeconfig.NodeConfigToolPane")
new Item("MenuItemNodeConfig", "jmri.jmrix.can.cbus.swing.nodeconfig.NodeConfigToolPane"),
new Item("MenuItemCbusSlotMonitor", "jmri.jmrix.can.cbus.swing.cbusslotmonitor.CbusSlotMonitorPane")
};

static class Item {
@@ -0,0 +1,98 @@
package jmri.jmrix.can.cbus.swing.cbusslotmonitor;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.util.Locale;
import javax.annotation.CheckReturnValue;
import javax.annotation.Nullable;
import javax.annotation.ParametersAreNonnullByDefault;

@ParametersAreNonnullByDefault
@CheckReturnValue
@SuppressFBWarnings(value = "NM_SAME_SIMPLE_NAME_AS_SUPERCLASS", justification = "Desired pattern is repeated class names with package-level access to members")

@javax.annotation.concurrent.Immutable

/**
* Provides standard access for resource bundles in a package.
*
* Convention is to provide a subclass of this name in each package, working off
* the local resource bundle name.
*
* @author Bob Jacobsen Copyright (C) 2012
* @since 3.3.1
*/
public class Bundle extends jmri.jmrix.can.cbus.Bundle {

@Nullable
private static final String name = null; // NOI18N

//
// below here is boilerplate to be copied exactly
//
/**
* Provides a translated string for a given key from the package resource
* bundle or parent.
* <p>
* Note that this is intentionally package-local access.
*
* @param key Bundle key to be translated
* @return Internationalized text
*/
static String getMessage(String key) {
return getBundle().handleGetMessage(key);
}

/**
* Merges user data with a translated string for a given key from the
* package resource bundle or parent.
* <p>
* Uses the transformation conventions of the Java MessageFormat utility.
* <p>
* Note that this is intentionally package-local access.
*
* @see java.text.MessageFormat
* @param key Bundle key to be translated
* @param subs One or more objects to be inserted into the message
* @return Internationalized text
*/
static String getMessage(String key, Object... subs) {
return getBundle().handleGetMessage(key, subs);
}

/**
* Merges user data with a translated string for a given key in a given
* locale from the package resource bundle or parent.
* <p>
* Uses the transformation conventions of the Java MessageFormat utility.
* <p>
* Note that this is intentionally package-local access.
*
* @see java.text.MessageFormat
* @param locale The locale to be used
* @param key Bundle key to be translated
* @param subs One or more objects to be inserted into the message
* @return Internationalized text
*/
static String getMessage(Locale locale, String key, Object... subs) {
return getBundle().handleGetMessage(locale, key, subs);
}


private final static Bundle b = new Bundle();

@Override
@Nullable
protected String bundleName() {
return name;
}

protected static jmri.Bundle getBundle() {
return b;
}

@Override
protected String retry(Locale locale, String key) {
return super.getBundle().handleGetMessage(locale,key);
}

}

0 comments on commit 063d67f

Please sign in to comment.
You can’t perform that action at this time.