mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2025-05-25 11:25:23 +02:00
214e6c643f
commit b34205b1428aa72b6ad736f4cd95d3e292ba7004
Merge: 8703248 2829716
Author: Neil McKechnie <75813993+Neil-McK@users.noreply.github.com>
Date: Mon Aug 23 10:05:54 2021 +0100
Merge branch 'EX-RAIL' into ackRetry
commit 8703248c49a831a0a9d7d1b897550f646ff72f2a
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com>
Date: Sun Aug 22 16:47:38 2021 -0500
ACK RETRY max 255 with fallback to 3 if greater
And includes LCD lines for power and ACK diags.
commit f5d4522ed777926c38fcaab69ebaa811f29fcc7c
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com>
Date: Sun Aug 22 16:40:13 2021 -0500
ACK RETRY updated datatypes
commit 1dbf23669740d47839f31bd4af6758ffd8fc9829
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com>
Date: Sun Aug 22 16:35:14 2021 -0500
ACK RETRY updated datatypes
commit d93584e9a4be81e685fdd606e055fdac1902fe5c
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com>
Date: Sun Aug 22 13:16:24 2021 -0500
ACK RETRY updated default is 2 retries.
commit f58ebac6703e36afb20290d75a12c285101f09ca
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com>
Date: Sat Aug 21 16:43:21 2021 -0500
ACK RETRY is 3 or less (default is 1)
commit 08350b215a0f1fe832cf862f72cece37dfd7c9da
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com>
Date: Sat Aug 21 11:55:17 2021 -0500
ACK RETRY
LCD display update.
lcd(0, F("RETRY %d %d %d %d"), ackManagerCv, ackManagerRetry, ackRetry, ackRetrySum);
commit 11cd216017bcf3c843789f0553ff6de04c80dd4f
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com>
Date: Sat Aug 21 00:54:28 2021 -0500
ACK RETRY
ACK retry code added to ackManagerSetup and callback.
The default is <D ACK RETRY 1>. For ACK tuning, set retry to zero.
Retry count is captured on the LCD display, and lines in the serial monitor.
commit b67027a1ed45856c79d60599b56b5599f7dc7b4d
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com>
Date: Sat Aug 21 00:33:01 2021 -0500
ACK RETRY variables added
commit 34d2ab3543e8603d9f2d3aafb971791fe51b89aa
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com>
Date: Sat Aug 21 00:23:34 2021 -0500
Update DCCEXParser.cpp
LCD lines added to display power commands and ACK settings, when updated.
Also new command <D ACK RETRY 1>.
commit 8ca4011cb0e991c4816f4e4ec2dd086bdadc9024
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com>
Date: Fri Aug 20 23:58:13 2021 -0500
Update CommandStation-EX.ino
Update LCD row number for Ready and Free RAM.
commit 65711383892333796ce55cd4088dee9b3ad4568d
Author: Harald Barth <haba@kth.se>
Date: Sun Aug 1 22:08:34 2021 +0200
optimize command parser for size
commit c4f659243e07293dc25379d41156f30ae36d75e5
Author: Harald Barth <haba@kth.se>
Date: Sun Aug 1 15:07:06 2021 +0200
optimize for loops for size (and speed)
commit 55b7091d5a53c1b2e9cbdc8c102f7641a44066fb
Author: Harald Barth <haba@kth.se>
Date: Sun Aug 1 12:45:29 2021 +0200
take less progmem for messages
commit 6d7c1925b0f9b8ca267d947822d730297d425020
Author: Harald Barth <haba@kth.se>
Date: Sun Aug 1 11:56:12 2021 +0200
only pragma -O3 critical functions
What is DCC++ EX?
DCC++ EX is the organization maintaining several codebases that together represent a fully open source DCC system. Currently, this includes the following:
- CommandStation-EX - the latest take on the DCC++ command station for controlling your trains. Runs on an Arduino board, and includes advanced features such as a WiThrottle server implementation, turnout operation, general purpose inputs and outputs (I/O), and JMRI integration.
- exWebThrottle - a simple web based controller for your DCC++ command station.
- BaseStation-installer - an installer executable that takes care of downloading and installing DCC++ firmware onto your hardware setup.
- BaseStation-Classic - the original DCC++ software, packaged in a stable release. No active development, bug fixes only.
A basic DCC++ EX hardware setup can use easy to find, widely avalable Arduino boards that you can assemble yourself.
Both CommandStation-EX and BaseStation-Classic support much of the NMRA Digital Command Control (DCC) standards, including:
- simultaneous control of multiple locomotives
- 2-byte and 4-byte locomotive addressing
- 28 or 128-step speed throttling
- Activate/de-activate all accessory function addresses 0-2048
- Control of all cab functions F0-F28 and F29-F68
- Main Track: Write configuration variable bytes and set/clear specific configuration variable (CV) bits (aka Programming on Main or POM)
- Programming Track: Same as the main track with the addition of reading configuration variable bytes
- And manu more custom features. see What's new in CommandStation-EX?
What’s in this Repository?
This repository, CommandStation-EX, contains a complete DCC++ EX Commmand Station sketch designed for compiling and uploading into an Arduino Uno, Mega, or Nano. All sketch files are in the folder named CommandStation-EX and its subforlders.
To utilize this sketch, you can use the following:
- (beginner) our automated installer
- (intermediate) download the latest version from the releases page
- (advanced) use git clone on this repository
Not using the installer? Open the file "CommandStation-EX.ino" in the Arduino IDE. Please do not rename the folder containing the sketch code, nor add any files in that folder. The Arduino IDE relies on the structure and name of the folder to properly display and compile the code. Rename or copy config.example.h to config.h. If you do not have the standard setup, you must edit config.h according to the help texts in config.h.
What's new in CommandStation-EX?
- WiThrottle server built in. Connect Engine Driver or WiThrottle clients directly to your Command Station (or through JMRI as before)
- WiFi and Ethernet shield support
- No more jumpers or soldering!
- Direct support for all the most popular motor control boards including single pin (Arduino) or dual pin (IBT_2) type PWM inputs without the need for an adapter circuit
- I2C Display support (LCD and OLED)
- Improved short circuit detection and automatic reset from an overload
- Current reading, sensing and ACK detection settings in milliAmps instead of just pin readings
- Improved adherence to the NMRA DCC specification
- Complete support for all the old commands and front ends like JMRI
- Railcom cutout (beta)
- Simpler, modular, faster code with an API Library for developers for easy expansion
- New features and functions in JMRI
- Ability to join MAIN and PROG tracks into one MAIN track to run your locos
- "Drive-Away" feature - Throttles with support, like Engine Driver, can allow a loco to be programmed on a usable, electrically isolated programming track and then drive off onto the main track
- Diagnostic commands to test decoders that aren't reading or writing correctly
- Support for Uno, Nano, Mega, Nano Every and Teensy microcontrollers
- User Functions: Filter regular commands (like a turnout or output command) and pass it to your own function or accessory
- Support for LCN (layout control nodes)
- mySetup.h file that acts like an Autoexec.Bat command to send startup commands to the CS
- High Accuracty Waveform option for rock steady DCC signals
- New current response outputs current in mA, overlimit current, and maximum board capable current. Support for new current meter in JMRI
- USB Browser based EX-WebThrottle
- New, simpler, function control command
- Number of locos discovery command
<#> - Emergency stop command <!>
- Release cabs from memory command <-> all cabs, <- CAB> for just one loco address
- Automatic slot (register) management
- Automation (coming soon)
NOTE: DCC-EX is a major rewrite to the code. We started over and rebuilt it from the ground up! For what that means to you, click HERE.
More information
You can learn more at the DCC++ EX website
- November 14, 2020