1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-27 06:11:25 +01:00
Go to file
Neil McKechnie d0445f157c Update IODevice.h
Finish changes relating to PWM frequency (doh!)
2023-02-15 22:34:37 +00:00
.github Update FUNDING.yml 2022-03-29 11:59:40 -04:00
.vscode Frightrisk ver4 (#205) 2022-02-16 12:02:11 -05:00
Release - Architecture Doc Update Prod-Release-Notes.md 2021-01-21 10:19:34 -05:00
Release_Notes Squashed commit of the following: 2022-12-26 10:41:15 +00:00
.gitattributes do not touch CR or CRLF of svg files 2020-11-26 15:55:52 +01:00
.gitignore Updated .gitignore (#261) 2022-10-31 19:13:43 +01:00
.travis.yml Initial commit 2020-05-25 01:43:34 -06:00
CommandDistributor.cpp USB Serial fixes for EX-RAIL & debug 2023-02-15 08:51:21 +08:00
CommandDistributor.h Remove #ifdef and merge calcs 2023-01-21 10:18:54 +00:00
CommandStation-EX.ino Oops- forgot to push this one. Name changes again. 2023-02-12 09:18:02 +00:00
config.example.h Add #ifdef selections 2023-01-16 18:16:25 +00:00
CONTRIBUTING.md Create CONTRIBUTING.md 2020-12-08 07:34:59 -05:00
DCC.cpp Update DCC.cpp to remove diagnostic code. 2022-11-22 17:26:11 +00:00
DCC.h Performance improvements in function DCC::issueReminders 2022-11-22 17:24:11 +00:00
DCCACK.cpp make the Adc class functions the normal code path 2022-10-04 21:55:13 +02:00
DCCACK.h rename FAIL to CALLFAIL because of conflict in ESP32 IDE 2022-03-04 23:35:14 +01:00
DCCEX.h Rename LCDDisplay class to Display; renameEXRAIL LCD2 macro to SCREEN 2023-02-11 23:37:09 +00:00
DCCEXParser.cpp Avoid compiler error when no HAL installed. 2023-02-10 15:29:09 +00:00
DCCEXParser.h return success/fail from <f> and <F> command handling (setFn, parsef) 2022-08-20 18:15:18 +02:00
DCCRMT.cpp free memory value updated on ESP 2022-10-20 00:52:19 +02:00
DCCRMT.h Send inverted signal (DCC and DC mode) on ESP32 if signalPin2 defined in MotorDriver 2022-08-13 09:12:53 +02:00
DCCTimer.h DCCTimer_AVR - incorporate Haba's optimisations to ADC scanning 2023-02-07 23:18:59 +00:00
DCCTimerAVR.cpp DCCTimer_AVR - incorporate Haba's optimisations to ADC scanning 2023-02-07 23:18:59 +00:00
DCCTimerESP.cpp make max ADC value a per platform ADC function 2022-10-12 23:45:10 +02:00
DCCTimerMEGAAVR.cpp Add MEGAAVR ADCeee skeleton. 2022-11-02 13:55:10 +08:00
DCCTimerSAMD.cpp Initial STM32F4xx fast ADC read implementation 2023-01-28 13:58:55 +08:00
DCCTimerSTM32.cpp Fixed logic of ADC ready 2023-01-28 14:39:00 +08:00
DCCTimerTEENSY.cpp Add Teensy ADCee class skeleton. 2022-11-02 13:46:16 +08:00
DCCWaveform.cpp Initial STM32F4xx fast ADC read implementation 2023-01-28 13:58:55 +08:00
DCCWaveform.h protect from NULL deref if running without prog track 2022-08-13 01:52:44 +02:00
defines.h Update defines.h - inappropriate define NO_INTERRUPTS replaced with I2C_USE_WIRE. 2023-02-09 00:17:31 +00:00
DIAG.h Rename LCDDisplay class to Display; renameEXRAIL LCD2 macro to SCREEN 2023-02-11 23:37:09 +00:00
Display_Implementation.h A few more name changes to more generic names 2023-02-12 09:01:16 +00:00
Display.cpp A few more name changes to more generic names 2023-02-12 09:01:16 +00:00
Display.h Rename LCDDisplay class to Display; renameEXRAIL LCD2 macro to SCREEN 2023-02-11 23:37:09 +00:00
DisplayInterface.cpp A few more name changes to more generic names 2023-02-12 09:01:16 +00:00
DisplayInterface.h A few more name changes to more generic names 2023-02-12 09:01:16 +00:00
EEStore.cpp (c) and version tag 2022-07-30 23:08:42 +02:00
EEStore.h SAMD Support Initial Patches 2022-05-17 18:06:08 +08:00
ESP32-fixes.cpp need to ifdef that 2022-08-30 09:44:59 +02:00
ESP32-fixes.h need to ifdef that 2022-08-30 09:44:59 +02:00
EthernetInterface.cpp fix static IP addr 2022-12-04 20:09:14 +01:00
EthernetInterface.h Make EthernetInterface code more robust 2022-11-07 11:53:56 +01:00
EXRAIL2.cpp USB Serial fixes for EX-RAIL & debug 2023-02-15 08:51:21 +08:00
EXRAIL2.h Support for multiple displays (OLED etc). 2023-02-11 15:47:50 +00:00
EXRAIL2MacroReset.h Rename LCDDisplay class to Display; renameEXRAIL LCD2 macro to SCREEN 2023-02-11 23:37:09 +00:00
EXRAIL.h Rename RMFT files and references to EXRAIL (#201) 2022-01-30 12:31:26 -05:00
EXRAILMacros.h Rename LCDDisplay class to Display; renameEXRAIL LCD2 macro to SCREEN 2023-02-11 23:37:09 +00:00
FSH.h Ensure correct functions are called for strcpy_P, strncmp_P, strlen_P etc. on non-AVR targets.. 2023-01-23 22:28:43 +00:00
GITHUB_SHA.h version bump 2023-01-29 08:50:19 +01:00
I2CManager_AVR.h Update I2CManager_AVR.h 2023-02-10 19:57:42 +00:00
I2CManager_Mega4809.h I2CManager: Update native drivers for MUX support from the common code. 2023-02-10 15:47:44 +00:00
I2CManager_NonBlocking.h Update I2CManager_NonBlocking.h 2023-02-10 22:58:58 +00:00
I2CManager_SAMD.h Update I2CManager_SAMD.h 2023-02-10 18:21:06 +00:00
I2CManager_STM32.h Update I2CManager_STM32.h 2023-02-10 18:22:35 +00:00
I2CManager_Wire.h I2CManager: Refactor common driver code. 2023-02-10 15:46:50 +00:00
I2CManager.cpp Update I2CManager.cpp 2023-02-14 21:56:11 +00:00
I2CManager.h I2CManager: Refactor common driver code. 2023-02-10 15:46:50 +00:00
installer.json Frightrisk ver4 (#205) 2022-02-16 12:02:11 -05:00
installer.sh installer shell script 2022-09-24 23:32:24 +02:00
IO_AnalogueInputs.h Improve formatting of I2CAddress data type in diagnostics. 2023-02-09 00:16:06 +00:00
IO_DCCAccessory.cpp HAL catch pin overlaps 2022-06-14 15:15:42 +01:00
IO_DFPlayer.h DFPlayer: Avoid jumps in volume when switching song and reducing volume at the same time. 2023-02-04 20:59:19 +00:00
IO_duinoNodes.h renamed macros 2022-12-29 10:38:04 +00:00
IO_ExampleSerial.h IO_ExampleSerial - refactor and update comments 2023-02-03 12:56:19 +00:00
IO_EXFastclock.h IO_EXFastClock - fix compile error due to closing brace outside of #if block. 2023-02-10 15:35:17 +00:00
IO_EXIOExpander.h Improve formatting of I2CAddress data type in diagnostics. 2023-02-09 00:16:06 +00:00
IO_EXTurntable.h Improve formatting of I2CAddress data type in diagnostics. 2023-02-09 00:16:06 +00:00
IO_GPIOBase.h Improve formatting of I2CAddress data type in diagnostics. 2023-02-09 00:16:06 +00:00
IO_HCSR04.h compiler warning fixes and stupid cast for ESP toolchain 2022-10-20 00:53:05 +02:00
IO_MCP23008.h Prepare HAL device drivers to support Extended I2C Addresses 2023-02-07 14:55:14 +00:00
IO_MCP23017.h Prepare HAL device drivers to support Extended I2C Addresses 2023-02-07 14:55:14 +00:00
IO_OLEDDisplay.h A few more name changes to more generic names 2023-02-12 09:01:16 +00:00
IO_PCA9685.cpp Allow frequency of PWM to be set for PCA9685 drivers. 2023-02-15 22:29:21 +00:00
IO_PCA9685pwm.h Allow frequency of PWM to be set for PCA9685 drivers. 2023-02-15 22:29:21 +00:00
IO_PCF8574.h Prepare HAL device drivers to support Extended I2C Addresses 2023-02-07 14:55:14 +00:00
IO_PCF8575.h Prepare HAL device drivers to support Extended I2C Addresses 2023-02-07 14:55:14 +00:00
IO_RotaryEncoder.h Improve formatting of I2CAddress data type in diagnostics. 2023-02-09 00:16:06 +00:00
IO_Servo.cpp Servo driver - split PCA9685 into a filter + PWM driver. 2023-02-07 17:24:05 +00:00
IO_Servo.h Servo driver - split PCA9685 into a filter + PWM driver. 2023-02-07 17:24:05 +00:00
IO_VL53L0X.h IO_VL53L0X: Some bug fixes. 2023-02-10 15:32:41 +00:00
IODevice.cpp Improve IODevice::reset function 2023-02-10 15:30:35 +00:00
IODevice.h Update IODevice.h 2023-02-15 22:34:37 +00:00
LCN.cpp Incoming LCN turnout throw. 2022-03-31 15:46:50 +01:00
LCN.h update copyright notes 2022-01-07 02:28:35 +01:00
LICENSE Create LICENSE 2020-06-12 22:51:42 -06:00
LiquidCrystal_I2C.cpp A few more name changes to more generic names 2023-02-12 09:01:16 +00:00
LiquidCrystal_I2C.h Rename LCDDisplay class to Display; renameEXRAIL LCD2 macro to SCREEN 2023-02-11 23:37:09 +00:00
MotorDriver.cpp Update MotorDriver.cpp 2023-01-14 17:10:45 +00:00
MotorDriver.h make the Adc class functions the normal code path 2022-10-04 21:55:13 +02:00
MotorDrivers.h typo 2022-12-13 15:29:20 +01:00
myAutomation.example.h Remove EXRAIL/ENDEXRAIL from myAutomation.example.h (#215) 2022-03-06 10:07:44 -05:00
myEX-Turntable.example.h Add myEX-Turntable.example.h 2022-08-14 07:11:38 +10:00
myHal.cpp_example.txt Merge branch 'devel' into devel-nmck 2023-02-07 18:05:18 +00:00
objdump.bat smaller random 2022-06-18 13:58:46 +01:00
objdump.sh fix objdump.sh 2020-09-26 22:28:29 +02:00
Outputs.cpp update copyright notes 2022-01-07 02:28:35 +01:00
Outputs.h update copyright notes 2022-01-07 02:28:35 +01:00
platformio.ini Add Arduino M0, and display time on serial monitor. 2023-02-07 17:13:36 +00:00
README.md README.md: dead link to rewrite (#217) 2022-03-24 11:37:29 -04:00
release_notes.md Update release_notes.md 2022-02-17 15:00:59 -05:00
RingStream.cpp Ensure correct functions are called for strcpy_P, strncmp_P, strlen_P etc. on non-AVR targets.. 2023-01-23 22:28:43 +00:00
RingStream.h HIGHMEM + WITHROTTLE 2022-12-16 13:14:48 +00:00
Sensors.cpp update copyright notes 2022-01-07 02:28:35 +01:00
Sensors.h update copyright notes 2022-01-07 02:28:35 +01:00
SerialManager.cpp STM32 additional serial port support 2022-10-24 11:12:56 +08:00
SerialManager.h Command Distributor 2022-06-10 12:22:28 +01:00
SSD1306Ascii.cpp A few more name changes to more generic names 2023-02-12 09:01:16 +00:00
SSD1306Ascii.h Rename LCDDisplay class to Display; renameEXRAIL LCD2 macro to SCREEN 2023-02-11 23:37:09 +00:00
StringBuffer.cpp Command Distributor 2022-06-10 12:22:28 +01:00
StringBuffer.h HIGHMEM + WITHROTTLE 2022-12-16 13:14:48 +00:00
StringFormatter.cpp A few more name changes to more generic names 2023-02-12 09:01:16 +00:00
StringFormatter.h Rename LCDDisplay class to Display; renameEXRAIL LCD2 macro to SCREEN 2023-02-11 23:37:09 +00:00
TrackManager.cpp make compile for other arch but AVR 2022-10-02 22:53:35 +02:00
TrackManager.h do analogRead without need for noInterrupt - first test 2022-10-02 00:43:46 +02:00
Turnouts.cpp USB Serial fixes for EX-RAIL & debug 2023-02-15 08:51:21 +08:00
Turnouts.h When sending all turnouts, keep it short 2022-11-04 23:15:29 +01:00
version.h A few more name changes to more generic names 2023-02-12 09:01:16 +00:00
WifiESP32.cpp ESP32: Experimental BT support, enable with #define SERIAL_BT_COMMANDS 2022-08-28 22:54:26 +02:00
WifiESP32.h first ESP32 compile 2021-10-05 10:39:08 +02:00
WifiInboundHandler.cpp HIGHMEM + WITHROTTLE 2022-12-16 13:14:48 +00:00
WifiInboundHandler.h HIGHMEM + WITHROTTLE 2022-12-16 13:14:48 +00:00
WifiInterface.cpp Ensure correct functions are called for strcpy_P, strncmp_P, strlen_P etc. on non-AVR targets.. 2023-01-23 22:28:43 +00:00
WifiInterface.h add ESP defines 2022-03-04 23:37:27 +01:00
WiThrottle.cpp Remove warnings 2023-01-27 19:42:55 +01:00
WiThrottle.h HIGHMEM + WITHROTTLE 2022-12-16 13:14:48 +00:00

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 many more custom features. see What's new in CommandStation-EX?

Whats 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.

To utilize this sketch, you can use the following:

  1. (beginner) our automated installer
  2. (intermediate) download the latest version from the releases page
  3. (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, you can read HERE.

More information

You can learn more at the DCC++ EX website

  • November 14, 2020